diff --git a/clients/ui/bff/internal/mocks/static_data_mock.go b/clients/ui/bff/internal/mocks/static_data_mock.go
index 05474fd8b..bb0408c27 100644
--- a/clients/ui/bff/internal/mocks/static_data_mock.go
+++ b/clients/ui/bff/internal/mocks/static_data_mock.go
@@ -184,6 +184,18 @@ func newCustomProperties() *map[string]openapi.MetadataValue {
 				MetadataType: "MetadataStringValue",
 			},
 		},
+		"AWS_KEY": {
+			MetadataStringValue: &openapi.MetadataStringValue{
+				StringValue:  "asdf89asdf098asdfa",
+				MetadataType: "MetadataStringValue",
+			},
+		},
+		"AWS_PASSWORD": {
+			MetadataStringValue: &openapi.MetadataStringValue{
+				StringValue:  "*AadfeDs34adf",
+				MetadataType: "MetadataStringValue",
+			},
+		},
 	}
 
 	return &result
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelPropertiesTableRow.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelPropertiesTableRow.tsx
index 74002b76f..ef78584ba 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelPropertiesTableRow.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelPropertiesTableRow.tsx
@@ -13,6 +13,7 @@ import {
 import { CheckIcon, TimesIcon } from '@patternfly/react-icons';
 import { KeyValuePair } from '~/types';
 import { EitherNotBoth } from '~/typeHelpers';
+import FormFieldset from '~/app/pages/modelRegistry/screens/components/FormFieldset';
 
 type ModelPropertiesTableRowProps = {
   allExistingKeys: string[];
@@ -94,19 +95,27 @@ const ModelPropertiesTableRow: React.FC<ModelPropertiesTableRowProps> = ({
       <Td dataLabel="Key" width={45} modifier="breakWord">
         {isEditing ? (
           <>
-            <TextInput
-              data-testid={isAddRow ? `add-property-key-input` : `edit-property-${key}-key-input`}
-              aria-label={
-                isAddRow
-                  ? 'Key input for new property'
-                  : `Key input for editing property with key ${key}`
+            <FormFieldset
+              className="tr-fieldset-wrapper"
+              component={
+                <TextInput
+                  data-testid={
+                    isAddRow ? `add-property-key-input` : `edit-property-${key}-key-input`
+                  }
+                  aria-label={
+                    isAddRow
+                      ? 'Key input for new property'
+                      : `Key input for editing property with key ${key}`
+                  }
+                  isRequired
+                  type="text"
+                  value={unsavedKey}
+                  onChange={(_event, str) => setUnsavedKey(str)}
+                  validated={keyValidationError ? 'error' : 'default'}
+                />
               }
-              isRequired
-              type="text"
-              value={unsavedKey}
-              onChange={(_event, str) => setUnsavedKey(str)}
-              validated={keyValidationError ? 'error' : 'default'}
             />
+
             {keyValidationError && (
               <FormHelperText>
                 <HelperText>
@@ -121,17 +130,24 @@ const ModelPropertiesTableRow: React.FC<ModelPropertiesTableRowProps> = ({
       </Td>
       <Td dataLabel="Value" width={45} modifier="breakWord">
         {isEditing ? (
-          <TextInput
-            data-testid={isAddRow ? `add-property-value-input` : `edit-property-${key}-value-input`}
-            aria-label={
-              isAddRow
-                ? 'Value input for new property'
-                : `Value input for editing property with key ${key}`
+          <FormFieldset
+            className="tr-fieldset-wrapper"
+            component={
+              <TextInput
+                data-testid={
+                  isAddRow ? `add-property-value-input` : `edit-property-${key}-value-input`
+                }
+                aria-label={
+                  isAddRow
+                    ? 'Value input for new property'
+                    : `Value input for editing property with key ${key}`
+                }
+                isRequired
+                type="text"
+                value={unsavedValue}
+                onChange={(_event, str) => setUnsavedValue(str)}
+              />
             }
-            isRequired
-            type="text"
-            value={unsavedValue}
-            onChange={(_event, str) => setUnsavedValue(str)}
           />
         ) : (
           <ExpandableSection
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersions/ModelVersionListView.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersions/ModelVersionListView.tsx
index 4373e9352..efb41f568 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersions/ModelVersionListView.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/ModelVersions/ModelVersionListView.tsx
@@ -7,7 +7,7 @@ import {
   DropdownList,
   MenuToggle,
   MenuToggleElement,
-  SearchInput,
+  TextInput,
   ToolbarContent,
   ToolbarFilter,
   ToolbarGroup,
@@ -32,6 +32,7 @@ import {
 import { asEnumMember } from '~/app/utils';
 import ModelVersionsTable from '~/app/pages/modelRegistry/screens/ModelVersions/ModelVersionsTable';
 import SimpleSelect from '~/app/components/SimpleSelect';
+import FormFieldset from '~/app/pages/modelRegistry/screens/components/FormFieldset';
 
 type ModelVersionListViewProps = {
   modelVersions: ModelVersion[];
@@ -147,15 +148,21 @@ const ModelVersionListView: React.FC<ModelVersionListViewProps> = ({
                   />
                 </ToolbarFilter>
                 <ToolbarItem>
-                  <SearchInput
-                    placeholder={`Find by ${searchType.toLowerCase()}`}
-                    value={search}
-                    onChange={(_, searchValue) => {
-                      setSearch(searchValue);
-                    }}
-                    onClear={() => setSearch('')}
-                    style={{ minWidth: '200px' }}
-                    data-testid="model-versions-table-search"
+                  <FormFieldset
+                    className="toolbar-fieldset-wrapper"
+                    component={
+                      <TextInput
+                        value={search}
+                        type="text"
+                        onChange={(_, searchValue) => {
+                          setSearch(searchValue);
+                        }}
+                        style={{ minWidth: '200px' }}
+                        data-testid="model-versions-table-search"
+                        aria-label="Search"
+                      />
+                    }
+                    field={`Find by ${searchType.toLowerCase()}`}
                   />
                 </ToolbarItem>
               </ToolbarGroup>
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/components/FormFieldset.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/screens/components/FormFieldset.tsx
index 8d3d10912..8869aef30 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/components/FormFieldset.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/components/FormFieldset.tsx
@@ -2,7 +2,7 @@ import React, { ReactNode } from 'react';
 
 interface FormFieldsetProps {
   component: ReactNode;
-  field: string;
+  field?: string;
   className?: string;
 }
 
@@ -10,9 +10,11 @@ const FormFieldset: React.FC<FormFieldsetProps> = ({ component, field, className
   <div className={className ?? 'form-fieldset-wrapper'}>
     {component}
     <fieldset aria-hidden="true" className="form-fieldset">
-      <legend className="form-fieldset-legend">
-        <span>{field}</span>
-      </legend>
+      {field && (
+        <legend className="form-fieldset-legend">
+          <span>{field}</span>
+        </legend>
+      )}
     </fieldset>
   </div>
 );
diff --git a/clients/ui/frontend/src/components/EditableTextDescriptionListGroup.tsx b/clients/ui/frontend/src/components/EditableTextDescriptionListGroup.tsx
index dd93cbf6b..17ed82a7d 100644
--- a/clients/ui/frontend/src/components/EditableTextDescriptionListGroup.tsx
+++ b/clients/ui/frontend/src/components/EditableTextDescriptionListGroup.tsx
@@ -3,6 +3,7 @@ import { ExpandableSection, TextArea } from '@patternfly/react-core';
 import DashboardDescriptionListGroup, {
   DashboardDescriptionListGroupProps,
 } from '~/components/DashboardDescriptionListGroup';
+import FormFieldset from '~/app/pages/modelRegistry/screens/components/FormFieldset';
 
 type EditableTextDescriptionListGroupProps = Pick<
   DashboardDescriptionListGroupProps,
@@ -35,14 +36,17 @@ const EditableTextDescriptionListGroup: React.FC<EditableTextDescriptionListGrou
       isEditing={isEditing}
       isSavingEdits={isSavingEdits}
       contentWhenEditing={
-        <TextArea
-          data-testid={`edit-text-area-${title}`}
-          aria-label={`Text box for editing ${title}`}
-          value={unsavedValue}
-          onChange={(_event, v) => setUnsavedValue(v)}
-          isDisabled={isSavingEdits}
-          rows={24}
-          resizeOrientation="vertical"
+        <FormFieldset
+          component={
+            <TextArea
+              data-testid={`edit-text-area-${title}`}
+              aria-label={`Text box for editing ${title}`}
+              value={unsavedValue}
+              onChange={(_event, v) => setUnsavedValue(v)}
+              isDisabled={isSavingEdits}
+              rows={24}
+            />
+          }
         />
       }
       onEditClick={() => {
diff --git a/clients/ui/frontend/src/style/MUI-theme.scss b/clients/ui/frontend/src/style/MUI-theme.scss
index 437ab1eed..4a5d38eed 100644
--- a/clients/ui/frontend/src/style/MUI-theme.scss
+++ b/clients/ui/frontend/src/style/MUI-theme.scss
@@ -15,11 +15,13 @@
 
   // Button
   --mui-button-font-weight: 500;
+  --mui-button--hover--BorderWidth: 1px;
   --mui-button--PaddingBlockStart: 6px;
   --mui-button--PaddingBlockEnd: 6px;
   --mui-button--PaddingInlineStart: 16px;
   --mui-button--PaddingInlineEnd: 16px;
   --mui-button--LineHeight: 1.75;
+  --mui-link-underlineColor: rgba(33, 150, 243, 0.4);
 
   // Menu item
   --mui-menu__item--PaddingBlockStart: 6px;
@@ -104,10 +106,12 @@
   --pf-t--global--font--family--300: Roboto, Courier, monospace;
 }
 
+.pf-v6-c-action-list__item .pf-v6-c-button {
+  --pf-v6-c-button--BorderRadius: 50%;
+}
+
 .pf-v6-c-alert {
-  --pf-v6-c-alert--m-warning__title--Color: var(
-    --pf-t--global--text--color--status--warning--default
-  );
+  --pf-v6-c-alert--m-warning__title--Color: var(--pf-t--global--text--color--status--warning--default);
   --pf-v6-c-alert__icon--MarginInlineEnd: var(--mui-alert__icon--MarginInlineEnd);
   --pf-v6-c-alert__title--FontWeight: var(--mui-alert-warning-font-weight);
   --pf-v6-c-alert__icon--MarginBlockStart: var(--mui-alert__icon--MarginBlockStart);
@@ -134,10 +138,34 @@
   --pf-v6-c-button--PaddingInlineStart: var(--mui-button--PaddingInlineStart);
   --pf-v6-c-button--PaddingInlineEnd: var(--mui-button--PaddingInlineEnd);
   --pf-v6-c-button--LineHeight: var(--mui-button--LineHeight);
+
   text-transform: var(--mui-text-transform);
   letter-spacing: 0.02857em;
 }
 
+.pf-v6-c-button.pf-m-link.pf-m-inline {
+  --pf-v6-c-button--hover--Color: var(--mui-palette-primary-main);
+  text-decoration-color: var(--mui-link-underlineColor);
+
+  &:hover {
+    text-decoration-color: initial;
+  }
+}
+
+.pf-v6-c-button.pf-m-link.pf-m-inline .pf-v6-c-button__icon {
+  // Keep icon color the same on hover
+  color: inherit;
+}
+
+.pf-v6-c-button.pf-m-secondary:hover {
+  --pf-v6-c-button--BorderWidth: var(--mui-button--hover--BorderWidth);
+  --pf-v6-c-button--BackgroundColor: rgba(33, 150, 243, 0.04);
+}
+
+.pf-v6-c-description-list__text .pf-v6-l-split__item.pf-m-fill {
+  align-content: center;
+}
+
 .pf-v6-c-form__group {
   position: relative;
 }
@@ -192,7 +220,7 @@
 }
 
 .pf-v6-c-form-control > :is(input, select, textarea) {
-  padding-block-start: 0px; 
+  padding-block-start: 0px;
   padding-block-end: 0px;
 }
 
@@ -204,6 +232,10 @@
   padding: 8px 14px;
 }
 
+.tr-fieldset-wrapper .form-fieldset {
+  inset: 0px;
+}
+
 .pf-v6-c-form-control input {
   padding: 16.5px 14px;
 }
@@ -287,7 +319,8 @@
 }
 
 .form-fieldset-wrapper,
-.toolbar-fieldset-wrapper {
+.toolbar-fieldset-wrapper,
+.tr-fieldset-wrapper {
   position: relative;
   width: 100%;
 }
@@ -296,7 +329,8 @@
   border-color: var(--mui-palette-common-black);
 }
 
-.toolbar-fieldset-wrapper:focus-within .form-fieldset {
+.toolbar-fieldset-wrapper:focus-within .form-fieldset,
+.tr-fieldset-wrapper:focus-within .form-fieldset {
   border-color: var(--mui-palette-primary-main);
   border-width: 2px;
   padding: 7px 7px;
@@ -306,10 +340,7 @@
 .form-fieldset {
   text-align: left;
   position: absolute;
-  bottom: 0;
-  right: 0;
-  top: -5px;
-  left: 0;
+  inset: -5px 0px 0px;
   margin: 0;
   padding: 0 8px;
   pointer-events: none;
@@ -334,6 +365,10 @@
   max-width: 100%;
 }
 
+.toolbar-fieldset-wrapper .form-fieldset-legend span {
+  font-weight: var(--pf-t--global--font--weight--200);
+}
+
 .toolbar-fieldset-wrapper:focus-within {
   color: var(--mui-palette-primary-main);
 }
@@ -342,6 +377,7 @@
   color: var(--mui-palette-primary-main);
 }
 
+.tr-fieldset-wrapper .pf-v6-c-form-control,
 .toolbar-fieldset-wrapper .pf-v6-c-form-control,
 .form-fieldset-wrapper .pf-v6-c-form-control {
   &::before,
@@ -382,9 +418,7 @@
 .pf-v6-c-menu-toggle {
   --pf-v6-c-menu-toggle__toggle-icon--MinHeight: var(--mui-menu-toggle__toggle-icon--MinHeight);
   --pf-v6-c-menu-toggle__controls--MinWidth: var(--mui-menu-toggle__controls--MinWidth);
-  --pf-v6-c-menu-toggle--expanded--BackgroundColor: var(
-    --mui-menu-toggle--expanded--BackgroundColor
-  );
+  --pf-v6-c-menu-toggle--expanded--BackgroundColor: var(--mui-menu-toggle--expanded--BackgroundColor);
   --pf-v6-c-menu-toggle--expanded--BorderColor: var(--mui-menu-toggle--expanded--BorderColor);
   --pf-v6-c-menu-toggle--PaddingInlineStart: var(--mui-menu-toggle--PaddingInlineStart);
   --pf-v6-c-menu-toggle--PaddingInlineEnd: var(--mui-menu-toggle--PaddingInlineEnd);
@@ -392,9 +426,7 @@
   --pf-v6-c-menu-toggle--expanded--Color: var(--mui-palette-common-black);
   --pf-v6-c-menu-toggle--hover--BorderColor: var(--mui-menu-toggle--hover--BorderColor);
   --pf-v6-c-menu-toggle--BorderColor: var(--mui-menu-toggle--BorderColor);
-  --pf-v6-c-menu-toggle--hover--BackgroundColor: var(
-    --pf-t--global--background--color--action--plain--hover
-  );
+  --pf-v6-c-menu-toggle--hover--BackgroundColor: var(--pf-t--global--background--color--action--plain--hover);
   --pf-v6-c-menu-toggle--m-split-button--m-action--m-primary--expanded--child--BackgroundColor: var(
     --pf-t--global--color--brand--default
   );
@@ -422,11 +454,8 @@
   --pf-v6-c-menu-toggle--expanded--Color: var(--pf-t--global--text--color--on-brand--clicked);
 }
 
-.pf-v6-c-menu-toggle.pf-m-primary.pf-m-split-button
-  .pf-v6-c-menu-toggle__button[aria-expanded='true'] {
-  --pf-v6-c-menu-toggle--m-split-button--m-action--m-primary--child--BackgroundColor: var(
-    --mui-palette-primary-dark
-  );
+.pf-v6-c-menu-toggle.pf-m-primary.pf-m-split-button .pf-v6-c-menu-toggle__button[aria-expanded="true"] {
+  --pf-v6-c-menu-toggle--m-split-button--m-action--m-primary--child--BackgroundColor: var(--mui-palette-primary-dark);
 }
 
 .pf-v6-c-menu-toggle__button:has(.pf-v6-c-menu-toggle__toggle-icon) {
@@ -485,7 +514,7 @@
 
 /* Custom radio circle */
 .pf-v6-c-radio__label::before {
-  content: '';
+  content: "";
   position: absolute;
   left: 0;
   top: 50%;
@@ -505,7 +534,7 @@
 
 /* Inner dot for checked state */
 .pf-v6-c-radio__input:checked + .pf-v6-c-radio__label::after {
-  content: '';
+  content: "";
   position: absolute;
   left: 5px;
   /* Center the dot */
@@ -534,15 +563,11 @@
   --pf-v6-c-table--cell--PaddingInlineEnd: var(--mui-table--cell--PaddingInlineEnd);
   --pf-v6-c-table--cell--PaddingBlockStart: var(--mui-table--cell--PaddingBlockStart);
   --pf-v6-c-table--cell--PaddingBlockEnd: var(--mui-table--cell--PaddingBlockEnd);
-  --pf-v6-c-table--cell--first-last-child--PaddingInline: var(
-    --mui-table--cell--first-last-child--PaddingInline
-  );
+  --pf-v6-c-table--cell--first-last-child--PaddingInline: var(--mui-table--cell--first-last-child--PaddingInline);
   --pf-v6-c-table__thead--cell--FontWeight: var(--mui-button-font-weight);
   --pf-v6-c-table__thead--cell--FontSize: var(--mui-table__thead--cell--FontSize);
   --pf-v6-c-table__tr--BorderBlockEndColor: var(--mui-palette-grey-300);
-  --pf-v6-c-table__sort-indicator--MarginInlineStart: var(
-    --mui-table__sort-indicator--MarginInlineStart
-  );
+  --pf-v6-c-table__sort-indicator--MarginInlineStart: var(--mui-table__sort-indicator--MarginInlineStart);
 
   letter-spacing: 0.01071em;
 }
@@ -579,12 +604,12 @@
   opacity: 0.6;
 }
 
-.pf-v6-c-table__sort[aria-sort='ascending'] .pf-v6-c-table__sort-indicator {
+.pf-v6-c-table__sort[aria-sort="ascending"] .pf-v6-c-table__sort-indicator {
   transform: rotate(180deg);
   align-self: end;
 }
 
-.pf-v6-c-table__sort[aria-sort='descending'] .pf-v6-c-table__sort-indicator {
+.pf-v6-c-table__sort[aria-sort="descending"] .pf-v6-c-table__sort-indicator {
   align-self: start;
 }
 
@@ -599,16 +624,14 @@
   --pf-v6-c-tabs__link--hover--BackgroundColor: var(--mui-tabs__link--hover--BackgroundColor);
   --pf-v6-c-tabs__item--PaddingBlockStart: var(--mui-tabs__item--PaddingBlockStart);
   --pf-v6-c-tabs__item--PaddingBlockEnd: var(--mui-tabs__item--PaddingBlockEnd);
-  --pf-v6-c-tabs__item--PaddingInlineStart: var(--mui-tabs__link--PaddingInlineStart);
+  --pf-v6-c-tabs__item--PaddingInlineStart: none;
   --pf-v6-c-tabs__item--PaddingInlineEnd: var(--mui-tabs__item--PaddingInlineEnd);
   --pf-v6-c-tabs__link--PaddingBlockStart: var(--mui-tabs__link--PaddingBlockStart);
   --pf-v6-c-tabs__link--PaddingBlockEnd: var(--mui-tabs__link--PaddingBlockEnd);
   --pf-v6-c-tabs__link--PaddingInlineStart: var(--mui-tabs__link--PaddingInlineStart);
   --pf-v6-c-tabs__link--PaddingInlineEnd: var(--mui-tabs__link--PaddingInlineEnd);
   --pf-v6-c-tabs__item--m-current__link--Color: var(--pf-t--global--text--color--brand--default);
-  --pf-v6-c-tabs__item--m-current__link--after--BorderWidth: var(
-    --mui-tabs__item--m-current__link--after--BorderWidth
-  );
+  --pf-v6-c-tabs__item--m-current__link--after--BorderWidth: var(--mui-tabs__item--m-current__link--after--BorderWidth);
   --pf-v6-c-tabs__link--FontSize: 0.875rem;
 }
 
@@ -626,6 +649,10 @@
   --pf-v6-c-tab-content__body--m-padding--PaddingInlineStart: var(--pf-t--global--spacer--lg);
 }
 
+.pf-v6-c-table__td.pf-v6-c-table__action.pf-m-width-10 {
+  align-content: center;
+}
+
 .pf-v6-c-label {
   --pf-v6-c-label--BorderRadius: 16px;
   --pf-v6-c-label--FontSize: 0.8125rem;
@@ -633,6 +660,7 @@
   --pf-v6-c-label--PaddingInlineEnd: 0;
   height: 24px;
 }
+
 .pf-v6-c-label.pf-m-overflow {
   border: 1px solid var(--mui-palette-grey-400);
 
@@ -673,6 +701,11 @@
   --pf-v6-c-modal-box--BorderRadius: var(--mui-shape-borderRadius);
 }
 
+.pf-v6-c-page__main-container {
+  border-radius: var(--mui-shape-borderRadius);
+  box-shadow: var(--mui-shadows-1);
+}
+
 .pf-v6-c-pagination {
   --pf-v6-c-pagination__total-items--Display: block;
 }
@@ -692,5 +725,5 @@
 }
 
 .pf-v6-c-pagination__page-menu::before {
-  content: 'Rows per page:';
+  content: "Rows per page:";
 }