diff --git a/clients/ui/frontend/src/app/app.css b/clients/ui/frontend/src/app/app.css
index 06f062d46b..c66c6942e5 100644
--- a/clients/ui/frontend/src/app/app.css
+++ b/clients/ui/frontend/src/app/app.css
@@ -3,3 +3,13 @@ body,
 #root {
   height: 100%;
 }
+
+.toolbar-fieldset-wrapper {
+  flex: 1 1 0;
+  min-width: 0;
+}
+
+.toolbar-fieldset-wrapper > .pf-v6-c-input-group__item:not(.pf-m-search-action) {
+  flex: 1 1 0;
+  min-width: 0;
+}
diff --git a/clients/ui/frontend/src/app/pages/modelCatalogSettings/components/SourceDetailsSection.tsx b/clients/ui/frontend/src/app/pages/modelCatalogSettings/components/SourceDetailsSection.tsx
index 0e01a56fe6..b21ba39763 100644
--- a/clients/ui/frontend/src/app/pages/modelCatalogSettings/components/SourceDetailsSection.tsx
+++ b/clients/ui/frontend/src/app/pages/modelCatalogSettings/components/SourceDetailsSection.tsx
@@ -9,8 +9,7 @@ import {
   Flex,
   FlexItem,
 } from '@patternfly/react-core';
-import { UpdateObjectAtPropAndValue } from 'mod-arch-shared';
-import FormFieldset from '~/app/pages/modelRegistry/screens/components/FormFieldset';
+import { UpdateObjectAtPropAndValue, ThemeAwareFormGroupWrapper } from 'mod-arch-shared';
 import FormSection from '~/app/pages/modelRegistry/components/pf-overrides/FormSection';
 import { ManageSourceFormData } from '~/app/pages/modelCatalogSettings/useManageSourceData';
 import {
@@ -55,24 +54,31 @@ const SourceDetailsSection: React.FC<SourceDetailsSectionProps> = ({
     />
   );
 
+  const nameHelperTextNode = hasNameError ? (
+    <FormHelperText>
+      <HelperText>
+        <HelperTextItem variant="error" data-testid="source-name-error">
+          {isSourceNameEmpty(formData.name)
+            ? VALIDATION_MESSAGES.NAME_REQUIRED
+            : formData.name.length > SOURCE_NAME_CHARACTER_LIMIT
+              ? `Cannot exceed ${SOURCE_NAME_CHARACTER_LIMIT} characters`
+              : null}
+        </HelperTextItem>
+      </HelperText>
+    </FormHelperText>
+  ) : undefined;
+
   return (
     <FormSection>
-      <FormGroup label={FORM_LABELS.NAME} isRequired fieldId="source-name">
-        <FormFieldset component={nameInput} field="Name" data-testid="source-name-readonly" />
-        {hasNameError && (
-          <FormHelperText>
-            <HelperText>
-              <HelperTextItem variant="error" data-testid="source-name-error">
-                {isSourceNameEmpty(formData.name)
-                  ? VALIDATION_MESSAGES.NAME_REQUIRED
-                  : formData.name.length > SOURCE_NAME_CHARACTER_LIMIT
-                    ? `Cannot exceed ${SOURCE_NAME_CHARACTER_LIMIT} characters`
-                    : null}
-              </HelperTextItem>
-            </HelperText>
-          </FormHelperText>
-        )}
-      </FormGroup>
+      <ThemeAwareFormGroupWrapper
+        label={FORM_LABELS.NAME}
+        fieldId="source-name"
+        isRequired
+        hasError={hasNameError}
+        helperTextNode={nameHelperTextNode}
+      >
+        {nameInput}
+      </ThemeAwareFormGroupWrapper>
 
       <FormGroup
         label={FORM_LABELS.SOURCE_TYPE}
diff --git a/clients/ui/frontend/src/app/pages/modelCatalogSettings/components/YamlSection.tsx b/clients/ui/frontend/src/app/pages/modelCatalogSettings/components/YamlSection.tsx
index 8e73da13d8..d9c210613e 100644
--- a/clients/ui/frontend/src/app/pages/modelCatalogSettings/components/YamlSection.tsx
+++ b/clients/ui/frontend/src/app/pages/modelCatalogSettings/components/YamlSection.tsx
@@ -11,9 +11,8 @@ import {
   HelperTextItem,
 } from '@patternfly/react-core';
 import { OpenDrawerRightIcon } from '@patternfly/react-icons';
-import { UpdateObjectAtPropAndValue } from 'mod-arch-shared';
+import { UpdateObjectAtPropAndValue, FormFieldset } from 'mod-arch-shared';
 import { useThemeContext } from 'mod-arch-kubeflow';
-import FormFieldset from '~/app/pages/modelRegistry/screens/components/FormFieldset';
 import FormSection from '~/app/pages/modelRegistry/components/pf-overrides/FormSection';
 import { ManageSourceFormData } from '~/app/pages/modelCatalogSettings/useManageSourceData';
 import { validateYamlContent } from '~/app/pages/modelCatalogSettings/utils/validation';
@@ -152,7 +151,7 @@ const YamlSection: React.FC<YamlSectionProps> = ({
         isRequired
         fieldId="yaml-content"
       >
-        <FormFieldset component={yamlInput} field="YAML" />
+        {isMUITheme ? <FormFieldset component={yamlInput} field="YAML" /> : yamlInput}
         {yamlHelperTxtNode}
       </FormGroup>
     </FormSection>
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/PrefilledModelRegistryField.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/PrefilledModelRegistryField.tsx
index d16cfcad0e..99999dd41f 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/PrefilledModelRegistryField.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/PrefilledModelRegistryField.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
-import { FormGroup, TextInput } from '@patternfly/react-core';
-import FormFieldset from '~/app/pages/modelRegistry/screens/components/FormFieldset';
+import { TextInput } from '@patternfly/react-core';
+import { ThemeAwareFormGroupWrapper } from 'mod-arch-shared';
 
 type PrefilledModelRegistryFieldProps = {
   mrName?: string;
@@ -12,9 +12,14 @@ const PrefilledModelRegistryField: React.FC<PrefilledModelRegistryFieldProps> =
   );
 
   return (
-    <FormGroup className="form-group-disabled" label="Model registry" isRequired fieldId="mr-name">
-      <FormFieldset component={mrNameInput} field="Model Registry" />
-    </FormGroup>
+    <ThemeAwareFormGroupWrapper
+      className="form-group-disabled"
+      label="Model registry"
+      fieldId="mr-name"
+      isRequired
+    >
+      {mrNameInput}
+    </ThemeAwareFormGroupWrapper>
   );
 };
 
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/RegisterModelDetailsFormSection.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/RegisterModelDetailsFormSection.tsx
index 65fe626aef..b10bdfe97f 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/RegisterModelDetailsFormSection.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/RegisterModelDetailsFormSection.tsx
@@ -7,8 +7,12 @@ import {
   TextInput,
 } from '@patternfly/react-core';
 import React from 'react';
-import { UpdateObjectAtPropAndValue } from 'mod-arch-shared';
-import FormFieldset from '~/app/pages/modelRegistry/screens/components/FormFieldset';
+import {
+  UpdateObjectAtPropAndValue,
+  FormFieldset,
+  ThemeAwareFormGroupWrapper,
+} from 'mod-arch-shared';
+import { useThemeContext } from 'mod-arch-kubeflow';
 import FormSection from '~/app/pages/modelRegistry/components/pf-overrides/FormSection';
 import { MR_CHARACTER_LIMIT } from './const';
 import RegisterModelTypeField from './RegisterModelTypeField';
@@ -32,6 +36,8 @@ const RegisterModelDetailsFormSection = <D extends RegisterModelFormData>({
   isModelTypeRequired = false,
   isModelTypeReadOnly = false,
 }: RegisterModelDetailsFormSectionProp<D>): React.ReactNode => {
+  const { isMUITheme } = useThemeContext();
+
   const modelNameInput = (
     <TextInput
       isRequired
@@ -55,32 +61,47 @@ const RegisterModelDetailsFormSection = <D extends RegisterModelFormData>({
     />
   );
 
+  const modelNameHelperTextNode = hasModelNameError ? (
+    <FormHelperText>
+      <HelperText>
+        <HelperTextItem variant="error" data-testid="model-name-error">
+          {isModelNameDuplicate
+            ? 'Model name already exists'
+            : `Cannot exceed ${MR_CHARACTER_LIMIT} characters`}
+        </HelperTextItem>
+      </HelperText>
+    </FormHelperText>
+  ) : undefined;
+
+  const modelDescriptionHelperTextNode = (
+    <FormHelperText>
+      <HelperText>
+        <HelperTextItem>Enter a brief summary of the model&apos;s key details.</HelperTextItem>
+      </HelperText>
+    </FormHelperText>
+  );
+
   return (
     <FormSection
       title="Model details"
       description="Provide model details that apply to every version of this model."
     >
-      <FormGroup label="Model name" isRequired fieldId="model-name">
-        <FormFieldset component={modelNameInput} field="Model Name" />
-        {hasModelNameError && (
-          <FormHelperText>
-            <HelperText>
-              <HelperTextItem variant="error" data-testid="model-name-error">
-                {isModelNameDuplicate
-                  ? 'Model name already exists'
-                  : `Cannot exceed ${MR_CHARACTER_LIMIT} characters`}
-              </HelperTextItem>
-            </HelperText>
-          </FormHelperText>
-        )}
-      </FormGroup>
+      <ThemeAwareFormGroupWrapper
+        label="Model name"
+        fieldId="model-name"
+        isRequired
+        hasError={hasModelNameError}
+        helperTextNode={modelNameHelperTextNode}
+      >
+        {modelNameInput}
+      </ThemeAwareFormGroupWrapper>
       <FormGroup label="Model description" fieldId="model-description">
-        <FormFieldset component={modelDescriptionInput} field="Model Description" />
-        <FormHelperText>
-          <HelperText>
-            <HelperTextItem>Enter a brief summary of the model&apos;s key details.</HelperTextItem>
-          </HelperText>
-        </FormHelperText>
+        {isMUITheme ? (
+          <FormFieldset component={modelDescriptionInput} field="Model Description" />
+        ) : (
+          modelDescriptionInput
+        )}
+        {modelDescriptionHelperTextNode}
       </FormGroup>
       <RegisterModelTypeField
         modelCustomProperties={formData.modelCustomProperties}
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/RegisterModelTypeField.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/RegisterModelTypeField.tsx
index ac7ca5757c..b06ee3397c 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/RegisterModelTypeField.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/RegisterModelTypeField.tsx
@@ -1,11 +1,9 @@
-import { FormGroup } from '@patternfly/react-core';
 import React from 'react';
-import { SimpleSelect } from 'mod-arch-shared';
+import { SimpleSelect, ThemeAwareFormGroupWrapper } from 'mod-arch-shared';
 import { SimpleSelectOption } from 'mod-arch-shared/dist/components/SimpleSelect';
 import { ModelRegistryCustomProperties } from '~/app/types';
 import { ModelType } from '~/concepts/modelCatalog/const';
 import { formatModelTypeDisplay } from '~/app/pages/modelCatalog/utils/modelCatalogUtils';
-import FormFieldset from '~/app/pages/modelRegistry/screens/components/FormFieldset';
 import {
   buildCustomPropertiesWithModelType,
   getModelTypeStoredValueFromCustomProperties,
@@ -55,25 +53,24 @@ const RegisterModelTypeField: React.FC<RegisterModelTypeFieldProps> = ({
   };
 
   return (
-    <FormGroup label="Model type" isRequired={isRequired} fieldId="register-model-type">
-      <FormFieldset
-        field="Model type"
-        component={
-          <SimpleSelect
-            options={selectOptions}
-            value={stored ?? undefined}
-            onChange={handleChange}
-            placeholder="Select model type"
-            isFullWidth
-            isDisabled={isReadOnly}
-            dataTestId="register-model-type-select"
-            previewDescription={false}
-            popperProps={{ direction: 'down' }}
-            toggleProps={{ id: 'register-model-type-toggle' }}
-          />
-        }
+    <ThemeAwareFormGroupWrapper
+      label="Model type"
+      fieldId="register-model-type"
+      isRequired={isRequired}
+    >
+      <SimpleSelect
+        options={selectOptions}
+        value={stored ?? undefined}
+        onChange={handleChange}
+        placeholder="Select model type"
+        isFullWidth
+        isDisabled={isReadOnly}
+        dataTestId="register-model-type-select"
+        previewDescription={false}
+        popperProps={{ direction: 'down' }}
+        toggleProps={{ id: 'register-model-type-toggle' }}
       />
-    </FormGroup>
+    </ThemeAwareFormGroupWrapper>
   );
 };
 
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/RegisteredModelSelector.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/RegisteredModelSelector.tsx
index 0ee96a0aa0..396fe31e9f 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/RegisteredModelSelector.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/RegisteredModelSelector.tsx
@@ -1,9 +1,8 @@
 import React from 'react';
-import { FormGroup, TextInput } from '@patternfly/react-core';
-import { TypeaheadSelect } from 'mod-arch-shared';
+import { TextInput } from '@patternfly/react-core';
+import { ThemeAwareFormGroupWrapper, TypeaheadSelect } from 'mod-arch-shared';
 import { TypeaheadSelectOption } from 'mod-arch-shared/dist/components/TypeaheadSelect';
 import { RegisteredModel } from '~/app/types';
-import FormFieldset from '~/app/pages/modelRegistry/screens/components/FormFieldset';
 
 type RegisteredModelSelectorProps = {
   registeredModels: RegisteredModel[];
@@ -46,9 +45,14 @@ const RegisteredModelSelector: React.FC<RegisteredModelSelectorProps> = ({
         See related PatternFly issue https://github.com/patternfly/patternfly-react/issues/10842
     */
     return (
-      <FormGroup label="Model name" className="form-group-disabled" isRequired fieldId="model-name">
-        <FormFieldset component={modelNameInput} field="Model Name" />
-      </FormGroup>
+      <ThemeAwareFormGroupWrapper
+        label="Model name"
+        className="form-group-disabled"
+        fieldId="model-name"
+        isRequired
+      >
+        {modelNameInput}
+      </ThemeAwareFormGroupWrapper>
     );
   }
 
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/RegistrationCommonFormSections.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/RegistrationCommonFormSections.tsx
index 11cb37aaba..744c2aba7a 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/RegistrationCommonFormSections.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/RegistrationCommonFormSections.tsx
@@ -11,10 +11,12 @@ import {
   ToggleGroupItem,
 } from '@patternfly/react-core';
 import spacing from '@patternfly/react-styles/css/utilities/Spacing/spacing';
-import { UpdateObjectAtPropAndValue } from 'mod-arch-shared';
-// import { DataConnection, UpdateObjectAtPropAndValue } from '~/pages/projects/types';
-// import { convertAWSSecretData } from '~/pages/projects/screens/detail/data-connections/utils';
-import FormFieldset from '~/app/pages/modelRegistry/screens/components/FormFieldset';
+import {
+  UpdateObjectAtPropAndValue,
+  FormFieldset,
+  ThemeAwareFormGroupWrapper,
+} from 'mod-arch-shared';
+import { useThemeContext } from 'mod-arch-kubeflow';
 import { ModelVersion } from '~/app/types';
 import FormSection from '~/app/pages/modelRegistry/components/pf-overrides/FormSection';
 import { RegistrationMode } from '~/app/pages/modelRegistry/screens/const';
@@ -23,7 +25,6 @@ import RegistrationModelLocationFields from './RegistrationModelLocationFields';
 import RegisterAndStoreFields from './RegisterAndStoreFields';
 import { isNameValid, isOciUri } from './utils';
 import { MR_CHARACTER_LIMIT } from './const';
-// import { ConnectionModal } from './ConnectionModal';
 
 type RegistrationCommonFormSectionsProps<D extends RegistrationCommonFormData> = {
   formData: D;
@@ -50,6 +51,7 @@ const RegistrationCommonFormSections = <D extends RegistrationCommonFormData>({
   namespaceCannotCheck,
   registryName,
 }: RegistrationCommonFormSectionsProps<D>): React.ReactNode => {
+  const { isMUITheme } = useThemeContext();
   const isVersionNameValid = isNameValid(formData.versionName);
   const registrationMode = formData.registrationMode || RegistrationMode.Register;
 
@@ -122,6 +124,21 @@ const RegistrationCommonFormSections = <D extends RegistrationCommonFormData>({
     />
   );
 
+  const versionNameHelperTextNode = latestVersion ? (
+    <FormHelperText>
+      <HelperText>
+        <HelperTextItem>Current version is {latestVersion.name}</HelperTextItem>
+      </HelperText>
+      {!isVersionNameValid && (
+        <HelperText>
+          <HelperTextItem variant="error">
+            Cannot exceed {MR_CHARACTER_LIMIT} characters
+          </HelperTextItem>
+        </HelperText>
+      )}
+    </FormHelperText>
+  ) : undefined;
+
   return (
     <>
       <FormSection
@@ -132,35 +149,31 @@ const RegistrationCommonFormSections = <D extends RegistrationCommonFormData>({
             : 'Configure details for the version of this model.'
         }
       >
-        <FormGroup label="Version name" isRequired fieldId="version-name">
-          <FormFieldset component={versionNameInput} field="Version Name" />
-          {latestVersion && (
-            <FormHelperText>
-              <HelperText>
-                <HelperTextItem>Current version is {latestVersion.name}</HelperTextItem>
-              </HelperText>
-              {!isVersionNameValid && (
-                <HelperText>
-                  <HelperTextItem variant="error">
-                    Cannot exceed {MR_CHARACTER_LIMIT} characters
-                  </HelperTextItem>
-                </HelperText>
-              )}
-            </FormHelperText>
-          )}
-        </FormGroup>
+        <ThemeAwareFormGroupWrapper
+          label="Version name"
+          fieldId="version-name"
+          isRequired
+          hasError={!isVersionNameValid}
+          helperTextNode={versionNameHelperTextNode}
+        >
+          {versionNameInput}
+        </ThemeAwareFormGroupWrapper>
         <FormGroup label="Version description" fieldId="version-description">
-          <FormFieldset component={versionDescriptionInput} field="Version Description" />
-        </FormGroup>
-        <FormGroup label="Source model format" fieldId="source-model-format">
-          <FormFieldset component={sourceModelFormatInput} field="Source Model Format" />
-        </FormGroup>
-        <FormGroup label="Source model format version" fieldId="source-model-format-version">
-          <FormFieldset
-            component={sourceModelFormatVersionInput}
-            field="Source Model Format Version"
-          />
+          {isMUITheme ? (
+            <FormFieldset component={versionDescriptionInput} field="Version Description" />
+          ) : (
+            versionDescriptionInput
+          )}
         </FormGroup>
+        <ThemeAwareFormGroupWrapper label="Source model format" fieldId="source-model-format">
+          {sourceModelFormatInput}
+        </ThemeAwareFormGroupWrapper>
+        <ThemeAwareFormGroupWrapper
+          label="Source model format version"
+          fieldId="source-model-format-version"
+        >
+          {sourceModelFormatVersionInput}
+        </ThemeAwareFormGroupWrapper>
       </FormSection>
       <FormSection
         title={isRegistryStorageAvailable ? 'Model location and storage' : 'Model location'}
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/RegistrationDestinationLocationFields.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/RegistrationDestinationLocationFields.tsx
index 588a101778..dd96b22935 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/RegistrationDestinationLocationFields.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/RegistrationDestinationLocationFields.tsx
@@ -1,8 +1,7 @@
 import React from 'react';
-import { FormGroup, TextInput } from '@patternfly/react-core';
-import { UpdateObjectAtPropAndValue } from 'mod-arch-shared';
+import { TextInput } from '@patternfly/react-core';
+import { UpdateObjectAtPropAndValue, ThemeAwareFormGroupWrapper } from 'mod-arch-shared';
 import PasswordInput from '~/app/shared/components/PasswordInput';
-import FormFieldset from '~/app/pages/modelRegistry/screens/components/FormFieldset';
 import { RegistrationCommonFormData } from './useRegisterModelData';
 
 type RegistrationDestinationLocationFieldsProps<D extends RegistrationCommonFormData> = {
@@ -67,18 +66,18 @@ const RegistrationDestinationLocationFields = <D extends RegistrationCommonFormD
 
   return (
     <>
-      <FormGroup label="Registry" isRequired fieldId="destination-oci-registry">
-        <FormFieldset component={ociRegistryInput} field="Registry" />
-      </FormGroup>
-      <FormGroup label="URI" isRequired fieldId="destination-oci-uri">
-        <FormFieldset component={ociUriInput} field="URI" />
-      </FormGroup>
-      <FormGroup label="Username" isRequired fieldId="destination-oci-username">
-        <FormFieldset component={ociUsernameInput} field="Username" />
-      </FormGroup>
-      <FormGroup label="Password" isRequired fieldId="destination-oci-password">
-        <FormFieldset component={ociPasswordInput} field="Password" />
-      </FormGroup>
+      <ThemeAwareFormGroupWrapper label="Registry" fieldId="destination-oci-registry" isRequired>
+        {ociRegistryInput}
+      </ThemeAwareFormGroupWrapper>
+      <ThemeAwareFormGroupWrapper label="URI" fieldId="destination-oci-uri" isRequired>
+        {ociUriInput}
+      </ThemeAwareFormGroupWrapper>
+      <ThemeAwareFormGroupWrapper label="Username" fieldId="destination-oci-username" isRequired>
+        {ociUsernameInput}
+      </ThemeAwareFormGroupWrapper>
+      <ThemeAwareFormGroupWrapper label="Password" fieldId="destination-oci-password" isRequired>
+        {ociPasswordInput}
+      </ThemeAwareFormGroupWrapper>
     </>
   );
 };
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/RegistrationModelLocationFields.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/RegistrationModelLocationFields.tsx
index 52af4cd4de..4ecedda74e 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/RegistrationModelLocationFields.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/RegisterModel/RegistrationModelLocationFields.tsx
@@ -1,17 +1,8 @@
 import React from 'react';
-import {
-  FormGroup,
-  TextInput,
-  Radio,
-  HelperText,
-  HelperTextItem,
-  TextInputGroupMain,
-  TextInputGroup,
-} from '@patternfly/react-core';
+import { TextInput, Radio, TextInputGroupMain, TextInputGroup } from '@patternfly/react-core';
 import spacing from '@patternfly/react-styles/css/utilities/Spacing/spacing';
-import { UpdateObjectAtPropAndValue } from 'mod-arch-shared';
+import { UpdateObjectAtPropAndValue, ThemeAwareFormGroupWrapper } from 'mod-arch-shared';
 import PasswordInput from '~/app/shared/components/PasswordInput';
-import FormFieldset from '~/app/pages/modelRegistry/screens/components/FormFieldset';
 import { ModelLocationType, RegistrationCommonFormData } from './useRegisterModelData';
 
 type RegistrationModelLocationFieldsProps<D extends RegistrationCommonFormData> = {
@@ -116,6 +107,10 @@ const RegistrationModelLocationFields = <D extends RegistrationCommonFormData>({
     />
   );
 
+  const pathHelperTextNode = (
+    <span>Enter a path to a model or folder. This path cannot point to a root folder.</span>
+  );
+
   return (
     <>
       <Radio
@@ -130,51 +125,56 @@ const RegistrationModelLocationFields = <D extends RegistrationCommonFormData>({
       />
       {modelLocationType === ModelLocationType.ObjectStorage && (
         <>
-          <FormGroup
+          <ThemeAwareFormGroupWrapper
             className={spacing.mlLg}
             label="Endpoint"
-            isRequired
             fieldId="location-endpoint"
+            isRequired
           >
-            <FormFieldset component={endpointInput} field="Endpoint" />
-          </FormGroup>
-          <FormGroup className={spacing.mlLg} label="Bucket" isRequired fieldId="location-bucket">
-            <FormFieldset component={bucketInput} field="Bucket" />
-          </FormGroup>
-          <FormGroup className={spacing.mlLg} label="Region" fieldId="location-region">
-            <FormFieldset component={regionInput} field="Region" />
-          </FormGroup>
-          <FormGroup
-            className={`location-path` + ` ${spacing.mlLg}`}
-            label="Path"
+            {endpointInput}
+          </ThemeAwareFormGroupWrapper>
+          <ThemeAwareFormGroupWrapper
+            className={spacing.mlLg}
+            label="Bucket"
+            fieldId="location-bucket"
             isRequired
+          >
+            {bucketInput}
+          </ThemeAwareFormGroupWrapper>
+          <ThemeAwareFormGroupWrapper
+            className={spacing.mlLg}
+            label="Region"
+            fieldId="location-region"
+          >
+            {regionInput}
+          </ThemeAwareFormGroupWrapper>
+          <ThemeAwareFormGroupWrapper
+            className={`location-path ${spacing.mlLg}`}
+            label="Path"
             fieldId="location-path"
+            isRequired
+            helperTextNode={pathHelperTextNode}
           >
-            <FormFieldset component={pathInput} field="Path" />
-            <HelperText>
-              <HelperTextItem>
-                Enter a path to a model or folder. This path cannot point to a root folder.
-              </HelperTextItem>
-            </HelperText>
-          </FormGroup>
+            {pathInput}
+          </ThemeAwareFormGroupWrapper>
           {includeCredentialFields && (
             <>
-              <FormGroup
+              <ThemeAwareFormGroupWrapper
                 className={spacing.mlLg}
                 label="Access Key ID"
-                isRequired
                 fieldId="location-s3-access-key-id"
+                isRequired
               >
-                <FormFieldset component={s3AccessKeyIdInput} field="Access Key ID" />
-              </FormGroup>
-              <FormGroup
+                {s3AccessKeyIdInput}
+              </ThemeAwareFormGroupWrapper>
+              <ThemeAwareFormGroupWrapper
                 className={spacing.mlLg}
                 label="Secret Access Key"
-                isRequired
                 fieldId="location-s3-secret-access-key"
+                isRequired
               >
-                <FormFieldset component={s3SecretAccessKeyInput} field="Secret Access Key" />
-              </FormGroup>
+                {s3SecretAccessKeyInput}
+              </ThemeAwareFormGroupWrapper>
             </>
           )}
         </>
@@ -189,11 +189,14 @@ const RegistrationModelLocationFields = <D extends RegistrationCommonFormData>({
         id="location-type-uri"
       />
       {modelLocationType === ModelLocationType.URI && (
-        <>
-          <FormGroup className={spacing.mlLg} label="URI" isRequired fieldId="location-uri">
-            <FormFieldset component={uriInput} field="URI" />
-          </FormGroup>
-        </>
+        <ThemeAwareFormGroupWrapper
+          className={spacing.mlLg}
+          label="URI"
+          fieldId="location-uri"
+          isRequired
+        >
+          {uriInput}
+        </ThemeAwareFormGroupWrapper>
       )}
     </>
   );
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/components/FormFieldset.scss b/clients/ui/frontend/src/app/pages/modelRegistry/screens/components/FormFieldset.scss
deleted file mode 100644
index dacb608533..0000000000
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/components/FormFieldset.scss
+++ /dev/null
@@ -1,9 +0,0 @@
-.toolbar-fieldset-wrapper {
-  flex: 1 1 0;
-  min-width: 0;
-
-  > .pf-v6-c-input-group__item:not(.pf-m-search-action) {
-    flex: 1 1 0;
-    min-width: 0;
-  }
-}
\ No newline at end of file
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
deleted file mode 100644
index 431e8ede89..0000000000
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/components/FormFieldset.tsx
+++ /dev/null
@@ -1,38 +0,0 @@
-import { useThemeContext } from 'mod-arch-kubeflow';
-import React, { CSSProperties, ReactNode } from 'react';
-import './FormFieldset.scss';
-
-interface FormFieldsetProps {
-  component: ReactNode;
-  field?: string;
-  className?: string;
-  fieldsetStyle?: CSSProperties;
-}
-
-const FormFieldset: React.FC<FormFieldsetProps> = ({
-  component,
-  field,
-  className,
-  fieldsetStyle,
-}) => {
-  const { isMUITheme } = useThemeContext();
-
-  if (!isMUITheme) {
-    return <>{component}</>;
-  }
-
-  return (
-    <div className={className ?? 'form-fieldset-wrapper'}>
-      {component}
-      <fieldset aria-hidden="true" className="form-fieldset" style={fieldsetStyle}>
-        {field && (
-          <legend className="form-fieldset-legend">
-            <span>{field}</span>
-          </legend>
-        )}
-      </fieldset>
-    </div>
-  );
-};
-
-export default FormFieldset;
diff --git a/clients/ui/frontend/src/app/pages/modelRegistry/screens/components/ModelPropertiesTableRow.tsx b/clients/ui/frontend/src/app/pages/modelRegistry/screens/components/ModelPropertiesTableRow.tsx
index aac582a6df..5730855907 100644
--- a/clients/ui/frontend/src/app/pages/modelRegistry/screens/components/ModelPropertiesTableRow.tsx
+++ b/clients/ui/frontend/src/app/pages/modelRegistry/screens/components/ModelPropertiesTableRow.tsx
@@ -11,8 +11,8 @@ import {
 } from '@patternfly/react-core';
 import { CheckIcon, ExternalLinkAltIcon, TimesIcon } from '@patternfly/react-icons';
 import { KeyValuePair, EitherNotBoth } from 'mod-arch-core';
+import { FormFieldset } from 'mod-arch-shared';
 import { useThemeContext } from 'mod-arch-kubeflow';
-import FormFieldset from '~/app/pages/modelRegistry/screens/components/FormFieldset';
 import { isValidHttpUrl } from '~/app/pages/modelRegistry/screens/utils';
 import useDeletePropertiesModalAvailability from '~/app/hooks/useDeletePropertiesModalAvailability';
 import DeletePropertiesModal from './DeletePropertiesModal';
diff --git a/clients/ui/frontend/src/concepts/k8s/K8sNameDescriptionField/K8sNameDescriptionField.tsx b/clients/ui/frontend/src/concepts/k8s/K8sNameDescriptionField/K8sNameDescriptionField.tsx
index 5d3b4e8b30..4b6aa0cae7 100644
--- a/clients/ui/frontend/src/concepts/k8s/K8sNameDescriptionField/K8sNameDescriptionField.tsx
+++ b/clients/ui/frontend/src/concepts/k8s/K8sNameDescriptionField/K8sNameDescriptionField.tsx
@@ -7,8 +7,9 @@ import {
   TextArea,
   TextInput,
 } from '@patternfly/react-core';
+import { FormFieldset, ThemeAwareFormGroupWrapper } from 'mod-arch-shared';
+import { useThemeContext } from 'mod-arch-kubeflow';
 import ResourceNameDefinitionTooltip from '~/concepts/k8s/ResourceNameDefinitionTooltip';
-import FormFieldset from '~/app/pages/modelRegistry/screens/components/FormFieldset';
 import {
   K8sNameDescriptionFieldData,
   K8sNameDescriptionFieldUpdateFunction,
@@ -56,6 +57,7 @@ const K8sNameDescriptionField: React.FC<K8sNameDescriptionFieldProps> = ({
   nameHelperText,
   hideDescription,
 }) => {
+  const { isMUITheme } = useThemeContext();
   const [showK8sField, setShowK8sField] = React.useState(false);
 
   const { name, description, k8sName } = data;
@@ -86,36 +88,43 @@ const K8sNameDescriptionField: React.FC<K8sNameDescriptionFieldProps> = ({
     />
   );
 
+  const nameHelperTextNode =
+    nameHelperText || (!showK8sField && !k8sName.state.immutable) ? (
+      <HelperText>
+        {nameHelperText && <HelperTextItem>{nameHelperText}</HelperTextItem>}
+        {!showK8sField && !k8sName.state.immutable && (
+          <>
+            {k8sName.value && (
+              <HelperTextItem>
+                The resource name will be <b>{k8sName.value}</b>.
+              </HelperTextItem>
+            )}
+            <HelperTextItem>
+              <Button
+                data-testid={`${dataTestId}-editResourceLink`}
+                variant="link"
+                isInline
+                onClick={() => setShowK8sField(true)}
+              >
+                Edit resource name
+              </Button>{' '}
+              <ResourceNameDefinitionTooltip />
+            </HelperTextItem>
+          </>
+        )}
+      </HelperText>
+    ) : null;
+
   return (
     <>
-      <FormGroup label={nameLabel} isRequired fieldId={`${dataTestId}-name`}>
-        <FormFieldset component={nameInput} field="Name" />
-        {nameHelperText || (!showK8sField && !k8sName.state.immutable) ? (
-          <HelperText>
-            {nameHelperText && <HelperTextItem>{nameHelperText}</HelperTextItem>}
-            {!showK8sField && !k8sName.state.immutable && (
-              <>
-                {k8sName.value && (
-                  <HelperTextItem>
-                    The resource name will be <b>{k8sName.value}</b>.
-                  </HelperTextItem>
-                )}
-                <HelperTextItem>
-                  <Button
-                    data-testid={`${dataTestId}-editResourceLink`}
-                    variant="link"
-                    isInline
-                    onClick={() => setShowK8sField(true)}
-                  >
-                    Edit resource name
-                  </Button>{' '}
-                  <ResourceNameDefinitionTooltip />
-                </HelperTextItem>
-              </>
-            )}
-          </HelperText>
-        ) : null}
-      </FormGroup>
+      <ThemeAwareFormGroupWrapper
+        label={nameLabel}
+        fieldId={`${dataTestId}-name`}
+        isRequired
+        helperTextNode={nameHelperTextNode}
+      >
+        {nameInput}
+      </ThemeAwareFormGroupWrapper>
 
       <ResourceNameField
         allowEdit={showK8sField}
@@ -126,7 +135,11 @@ const K8sNameDescriptionField: React.FC<K8sNameDescriptionFieldProps> = ({
 
       {!hideDescription && (
         <FormGroup label={descriptionLabel} fieldId={`${dataTestId}-description`}>
-          <FormFieldset component={descriptionTextArea} field="Description" />
+          {isMUITheme ? (
+            <FormFieldset component={descriptionTextArea} field="Description" />
+          ) : (
+            descriptionTextArea
+          )}
         </FormGroup>
       )}
     </>
diff --git a/clients/ui/frontend/src/concepts/k8s/K8sNameDescriptionField/ResourceNameField.tsx b/clients/ui/frontend/src/concepts/k8s/K8sNameDescriptionField/ResourceNameField.tsx
index 51929c26fa..1148c7dc91 100644
--- a/clients/ui/frontend/src/concepts/k8s/K8sNameDescriptionField/ResourceNameField.tsx
+++ b/clients/ui/frontend/src/concepts/k8s/K8sNameDescriptionField/ResourceNameField.tsx
@@ -1,12 +1,6 @@
 import * as React from 'react';
-import {
-  FormGroup,
-  HelperText,
-  HelperTextItem,
-  TextInput,
-  ValidatedOptions,
-} from '@patternfly/react-core';
-import FormFieldset from '~/app/pages/modelRegistry/screens/components/FormFieldset';
+import { HelperText, HelperTextItem, TextInput, ValidatedOptions } from '@patternfly/react-core';
+import { ThemeAwareFormGroupWrapper } from 'mod-arch-shared';
 import { K8sNameDescriptionFieldData, K8sNameDescriptionFieldUpdateFunction } from './types';
 
 type ResourceNameFieldProps = {
@@ -25,9 +19,9 @@ const ResourceNameField: React.FC<ResourceNameFieldProps> = ({
 }) => {
   if (k8sName.state.immutable) {
     return (
-      <FormGroup label="Resource name" fieldId={`${dataTestId}-resource-name`}>
-        <FormFieldset component={<div>{k8sName.value}</div>} field="Resource name" />
-      </FormGroup>
+      <ThemeAwareFormGroupWrapper label="Resource name" fieldId={`${dataTestId}-resource-name`}>
+        <div>{k8sName.value}</div>
+      </ThemeAwareFormGroupWrapper>
     );
   }
 
@@ -56,36 +50,39 @@ const ResourceNameField: React.FC<ResourceNameFieldProps> = ({
     />
   );
 
+  const helperTextNode = (
+    <HelperText>
+      {k8sName.state.invalidLength && (
+        <HelperTextItem variant="error">
+          Cannot exceed {k8sName.state.maxLength} characters
+        </HelperTextItem>
+      )}
+      {k8sName.state.invalidCharacters && (
+        <HelperTextItem variant="error">
+          Must start and end with a lowercase letter or number. Valid characters include lowercase
+          letters, numbers, and hyphens (-).
+        </HelperTextItem>
+      )}
+      {!k8sName.state.invalidLength && !k8sName.state.invalidCharacters && (
+        <HelperTextItem>
+          The resource name is used to identify your resource, and is generated based on the name
+          you enter. The resource name cannot be edited after creation.
+        </HelperTextItem>
+      )}
+    </HelperText>
+  );
+
   return (
-    <>
-      <FormGroup
-        label="Resource name"
-        className="resource-name"
-        isRequired
-        fieldId={`${dataTestId}-resource-name`}
-      >
-        <FormFieldset component={textInput} field="Resource name" />
-      </FormGroup>
-      <HelperText>
-        {k8sName.state.invalidLength && (
-          <HelperTextItem variant="error">
-            Cannot exceed {k8sName.state.maxLength} characters
-          </HelperTextItem>
-        )}
-        {k8sName.state.invalidCharacters && (
-          <HelperTextItem variant="error">
-            Must start and end with a lowercase letter or number. Valid characters include lowercase
-            letters, numbers, and hyphens (-).
-          </HelperTextItem>
-        )}
-        {!k8sName.state.invalidLength && !k8sName.state.invalidCharacters && (
-          <HelperTextItem>
-            The resource name is used to identify your resource, and is generated based on the name
-            you enter. The resource name cannot be edited after creation.
-          </HelperTextItem>
-        )}
-      </HelperText>
-    </>
+    <ThemeAwareFormGroupWrapper
+      label="Resource name"
+      className="resource-name"
+      fieldId={`${dataTestId}-resource-name`}
+      isRequired
+      hasError={k8sName.state.invalidLength || k8sName.state.invalidCharacters}
+      helperTextNode={helperTextNode}
+    >
+      {textInput}
+    </ThemeAwareFormGroupWrapper>
   );
 };