diff --git a/src/openforms/js/components/admin/form_design/DataRemoval.js b/src/openforms/js/components/admin/form_design/DataRemoval.js
index 1eb1e06bbd..f0804cc834 100644
--- a/src/openforms/js/components/admin/form_design/DataRemoval.js
+++ b/src/openforms/js/components/admin/form_design/DataRemoval.js
@@ -41,7 +41,7 @@ const DataRemoval = ({submissionsRemovalOptions, onChange}) => {
   } = submissionsRemovalOptions;
 
   return (
-    <Fieldset extraClassName="admin-fieldset">
+    <Fieldset>
       <FormRow>
         <Field
           name="form.submissionsRemovalOptions.successfulSubmissionsRemovalLimit"
diff --git a/src/openforms/js/components/admin/form_design/FormStepsNav.js b/src/openforms/js/components/admin/form_design/FormStepsNav.js
index 5add066c80..e32bd62f10 100644
--- a/src/openforms/js/components/admin/form_design/FormStepsNav.js
+++ b/src/openforms/js/components/admin/form_design/FormStepsNav.js
@@ -52,7 +52,11 @@ const FormStepNavItem = ({
           onClick={() => onReorder('down')}
         />
       </div>
-      <button type="button" onClick={onActivate} className="button button--plain">
+      <button
+        type="button"
+        onClick={onActivate}
+        className="button button--plain list__item-text list__item-text--allow-wrap"
+      >
         {hasErrors ? <ErrorIcon text={iconTitle} extraClassname="icon icon--danger" /> : null}
         {name}
       </button>
diff --git a/src/openforms/js/components/admin/form_design/PaymentFields.js b/src/openforms/js/components/admin/form_design/PaymentFields.js
index feafc9aae2..14e2b552d4 100644
--- a/src/openforms/js/components/admin/form_design/PaymentFields.js
+++ b/src/openforms/js/components/admin/form_design/PaymentFields.js
@@ -18,7 +18,6 @@ const PaymentFields = ({backends = [], selectedBackend = '', backendOptions = {}
 
   return (
     <Fieldset
-      extraClassName="admin-fieldset"
       title={
         <FormattedMessage
           description="Payment provider fieldset title"
diff --git a/src/openforms/js/components/admin/form_design/PriceLogic.js b/src/openforms/js/components/admin/form_design/PriceLogic.js
index c4c9d1ece2..0071338d02 100644
--- a/src/openforms/js/components/admin/form_design/PriceLogic.js
+++ b/src/openforms/js/components/admin/form_design/PriceLogic.js
@@ -62,7 +62,6 @@ export const PriceLogic = ({variableKey, onFieldChange}) => {
 
   return (
     <Fieldset
-      extraClassName="admin-fieldset"
       title={
         <FormattedMessage
           description="Dynamic pricing fieldset title"
diff --git a/src/openforms/js/components/admin/form_design/ProductFields.js b/src/openforms/js/components/admin/form_design/ProductFields.js
index 685af23be6..3509d44a7f 100644
--- a/src/openforms/js/components/admin/form_design/ProductFields.js
+++ b/src/openforms/js/components/admin/form_design/ProductFields.js
@@ -32,7 +32,6 @@ const ProductFields = ({selectedProduct = null, onChange}) => {
   const productChoices = products.map(product => [product.url, product.name]);
   return (
     <Fieldset
-      extraClassName="admin-fieldset"
       title={<FormattedMessage description="Product fieldset title" defaultMessage="Product" />}
     >
       <FormRow>
diff --git a/src/openforms/js/components/admin/form_design/RegistrationFields.js b/src/openforms/js/components/admin/form_design/RegistrationFields.js
index d2aa9bcde5..306ef1670d 100644
--- a/src/openforms/js/components/admin/form_design/RegistrationFields.js
+++ b/src/openforms/js/components/admin/form_design/RegistrationFields.js
@@ -53,7 +53,6 @@ const BackendOptionsFormRow = ({backendType = null, currentOptions = {}, onChang
           />
         }
         schema={backendType.schema}
-        uiSchema={BACKEND_OPTIONS_FORMS[backendType.id]?.uiSchema || {}}
         formData={currentOptions}
         onChange={({formData}) =>
           onChange({target: {name: `form.registrationBackends.${index}.options`, value: formData}})
@@ -85,7 +84,6 @@ const BackendFields = ({index = 0, backend, availableBackends = [], onChange, on
   return (
     <Fieldset
       style={{'--of-add-another-text': `"${addAnotherMsg}"`}}
-      extraClassName="admin-fieldset"
       title={
         <>
           {backend.name || backend.key}
diff --git a/src/openforms/js/components/admin/form_design/RegistrationFields.stories.js b/src/openforms/js/components/admin/form_design/RegistrationFields.stories.js
index 726b9cc2fa..6ab9f34a03 100644
--- a/src/openforms/js/components/admin/form_design/RegistrationFields.stories.js
+++ b/src/openforms/js/components/admin/form_design/RegistrationFields.stories.js
@@ -16,6 +16,7 @@ import {
   mockRoleTypesGet as mockZGWApisRoleTypesGet,
 } from 'components/admin/form_design/registrations/zgw/mocks';
 import {
+  AdminChangeFormDecorator,
   FormDecorator,
   ValidationErrorsDecorator,
 } from 'components/admin/form_design/story-decorators';
@@ -25,7 +26,7 @@ import RegistrationFields from './RegistrationFields';
 
 export default {
   title: 'Form design / Registration / RegistrationFields',
-  decorators: [ValidationErrorsDecorator, FormDecorator],
+  decorators: [ValidationErrorsDecorator, FormDecorator, AdminChangeFormDecorator],
   component: RegistrationFields,
   args: {
     availableBackends: [
@@ -389,25 +390,6 @@ export default {
           type: 'object',
         },
       },
-      {
-        id: 'microsoft-graph',
-        label: 'Microsoft Graph (OneDrive/SharePoint)',
-        schema: {
-          type: 'object',
-          properties: {
-            folderPath: {
-              type: 'string',
-              minLength: 1,
-              title: 'maplocatie',
-            },
-            driveId: {
-              type: 'string',
-              minLength: 1,
-              title: 'drive-ID',
-            },
-          },
-        },
-      },
     ],
     configuredBackends: [],
     onChange: fn(),
@@ -650,15 +632,6 @@ export const ConfiguredBackends = {
         backend: 'exception-demo',
         options: {extraLine: 'Filled out option'},
       },
-      {
-        key: 'backend9',
-        name: 'MS Graph',
-        backend: 'microsoft-graph',
-        options: {
-          folderPath: '/formSubmissions',
-          driveId: 'myDrive',
-        },
-      },
       {
         key: 'backend10',
         name: 'Camunda',
diff --git a/src/openforms/js/components/admin/form_design/authentication/LoAOverrideOption.stories.js b/src/openforms/js/components/admin/form_design/authentication/LoAOverrideOption.stories.js
index d40cf737af..c40f03290e 100644
--- a/src/openforms/js/components/admin/form_design/authentication/LoAOverrideOption.stories.js
+++ b/src/openforms/js/components/admin/form_design/authentication/LoAOverrideOption.stories.js
@@ -1,10 +1,18 @@
 import {expect, within} from '@storybook/test';
 
+import {AdminChangeFormDecorator} from 'components/admin/form_design/story-decorators';
+
 import LoAOverrideOption from './LoAOverrideOption';
 
 export default {
   title: 'Form design/ Authentication / LoA override option',
   component: LoAOverrideOption,
+  decorators: [AdminChangeFormDecorator],
+  parameters: {
+    adminChangeForm: {
+      wrapFieldset: true,
+    },
+  },
 };
 
 export const Default = {
diff --git a/src/openforms/js/components/admin/form_design/logic/actions/dmn/DMNActionConfig.js b/src/openforms/js/components/admin/form_design/logic/actions/dmn/DMNActionConfig.js
index ebb0982d80..3dc1b3d461 100644
--- a/src/openforms/js/components/admin/form_design/logic/actions/dmn/DMNActionConfig.js
+++ b/src/openforms/js/components/admin/form_design/logic/actions/dmn/DMNActionConfig.js
@@ -194,7 +194,7 @@ const DMNActionConfig = ({initialValues, onSave}) => {
       >
         {formik => (
           <Form>
-            <fieldset className="admin-fieldset aligned">
+            <fieldset className="aligned">
               <div className="form-row form-row--no-bottom-line">
                 <Field
                   name="pluginId"
@@ -232,7 +232,7 @@ const DMNActionConfig = ({initialValues, onSave}) => {
                 />
               }
             >
-              <fieldset className="admin-fieldset aligned">
+              <fieldset className="aligned">
                 <div className="form-row form-row--no-bottom-line">
                   <DecisionDefinitionIdField />
                 </div>
diff --git a/src/openforms/js/components/admin/form_design/logic/actions/dmn/DMNParametersForm.js b/src/openforms/js/components/admin/form_design/logic/actions/dmn/DMNParametersForm.js
index da394dcf0c..92a357e9d4 100644
--- a/src/openforms/js/components/admin/form_design/logic/actions/dmn/DMNParametersForm.js
+++ b/src/openforms/js/components/admin/form_design/logic/actions/dmn/DMNParametersForm.js
@@ -194,6 +194,7 @@ const DMNParametersForm = () => {
             loading={loading}
             name="inputMapping"
             directionIcon={<FAIcon icon="arrow-right-long" aria-hidden="true" />}
+            variableName="formVariable"
             propertyChoices={dmnParams.inputs}
             propertyName="dmnVariable"
             propertyHeading={dmnVariableColumnLabel}
@@ -211,6 +212,7 @@ const DMNParametersForm = () => {
             loading={loading}
             name="outputMapping"
             directionIcon={<FAIcon icon="arrow-left-long" aria-hidden="true" />}
+            variableName="formVariable"
             propertyChoices={dmnParams.outputs}
             propertyName="dmnVariable"
             propertyHeading={dmnVariableColumnLabel}
diff --git a/src/openforms/js/components/admin/form_design/registrations/index.js b/src/openforms/js/components/admin/form_design/registrations/index.js
index dafbebd58f..c5de3f8053 100644
--- a/src/openforms/js/components/admin/form_design/registrations/index.js
+++ b/src/openforms/js/components/admin/form_design/registrations/index.js
@@ -13,7 +13,6 @@ import ZGWOptionsForm from './zgw';
 /**
  * @typedef {{
  *   form: React.FC,
- *   uiSchema?: Object,
  *   onStepEdit?: (...args: any) => Object | null,
  *   onUserDefinedVariableEdit?: (...args: any) => Object | null,
  *   configurableFromVariables?: boolean | (options: Object) => boolean,
diff --git a/src/openforms/js/components/admin/form_design/registrations/objectsapi/AddressNlObjectsApiVariableConfigurationEditor.js b/src/openforms/js/components/admin/form_design/registrations/objectsapi/AddressNlObjectsApiVariableConfigurationEditor.js
index f6b5f624c4..86e8ffec86 100644
--- a/src/openforms/js/components/admin/form_design/registrations/objectsapi/AddressNlObjectsApiVariableConfigurationEditor.js
+++ b/src/openforms/js/components/admin/form_design/registrations/objectsapi/AddressNlObjectsApiVariableConfigurationEditor.js
@@ -135,25 +135,24 @@ export const AddressNlEditor = ({
   return (
     <>
       <FormRow>
-        <Field name="specificTargetPaths" disabled={!!mappedVariable.targetPath}>
-          <Checkbox
-            name="specificTargetPathsCheckbox"
-            label={
-              <FormattedMessage
-                defaultMessage="Map specific subfields"
-                description="'Map specific subfields' checkbox label"
-              />
-            }
-            helpText={
-              <FormattedMessage
-                description="'Map specific subfields' checkbox help text"
-                defaultMessage="Whether to map the specific subfield of addressNl component"
-              />
-            }
-            checked={specificTargetPaths}
-            onChange={onSpecificTargetPathsChange}
-          />
-        </Field>
+        <Checkbox
+          name="specificTargetPathsCheckbox"
+          label={
+            <FormattedMessage
+              defaultMessage="Map specific subfields"
+              description="'Map specific subfields' checkbox label"
+            />
+          }
+          helpText={
+            <FormattedMessage
+              description="'Map specific subfields' checkbox help text"
+              defaultMessage="Whether to map the specific subfield of addressNl component"
+            />
+          }
+          checked={specificTargetPaths}
+          onChange={onSpecificTargetPathsChange}
+          disabled={!!mappedVariable.targetPath}
+        />
       </FormRow>
       <FormRow>
         <Field
diff --git a/src/openforms/js/components/admin/form_design/registrations/objectsapi/fields/DocumentTypes.js b/src/openforms/js/components/admin/form_design/registrations/objectsapi/fields/DocumentTypes.js
index 3203b5b9a3..5106707b38 100644
--- a/src/openforms/js/components/admin/form_design/registrations/objectsapi/fields/DocumentTypes.js
+++ b/src/openforms/js/components/admin/form_design/registrations/objectsapi/fields/DocumentTypes.js
@@ -88,7 +88,7 @@ const DocumentType = ({name, label, loading, options, isDisabled, helpText}) =>
 
   return (
     <FormRow>
-      <Field name={name} label={label} helpText={helpText} noManageChildProps>
+      <Field name={name} label={label} helpText={helpText} disabled={isDisabled} noManageChildProps>
         <>
           <ReactSelect
             name={name}
diff --git a/src/openforms/js/components/admin/form_design/story-decorators.js b/src/openforms/js/components/admin/form_design/story-decorators.js
index fad8d5f766..52cf23441d 100644
--- a/src/openforms/js/components/admin/form_design/story-decorators.js
+++ b/src/openforms/js/components/admin/form_design/story-decorators.js
@@ -1,7 +1,9 @@
 import {fn} from '@storybook/test';
 import {Form, Formik} from 'formik';
+import {Fragment} from 'react';
 
 import {FeatureFlagsContext, FormContext} from 'components/admin/form_design/Context';
+import Fieldset from 'components/admin/forms/Fieldset';
 import {ReactSelectContext} from 'components/admin/forms/ReactSelect';
 import {ValidationErrorsProvider} from 'components/admin/forms/ValidationErrors';
 import {ModalContext} from 'components/admin/modals';
@@ -29,6 +31,18 @@ export const FormLogicDecorator = (Story, {args}) => (
   </FormLogicContext.Provider>
 );
 
+// provide necessary django elements to get the right styling
+export const AdminChangeFormDecorator = (Story, {parameters}) => {
+  const Wrapper = parameters?.adminChangeForm?.wrapFieldset ? Fieldset : Fragment;
+  return (
+    <form>
+      <Wrapper>
+        <Story />
+      </Wrapper>
+    </form>
+  );
+};
+
 export const FormDecorator = (Story, {args}) => (
   <FormContext.Provider
     value={{
diff --git a/src/openforms/js/components/admin/form_design/variables/ServiceFetchConfigurationForm.js b/src/openforms/js/components/admin/form_design/variables/ServiceFetchConfigurationForm.js
index 1f40e27b2e..dccb2891f9 100644
--- a/src/openforms/js/components/admin/form_design/variables/ServiceFetchConfigurationForm.js
+++ b/src/openforms/js/components/admin/form_design/variables/ServiceFetchConfigurationForm.js
@@ -60,7 +60,6 @@ const ServiceFetchConfigurationForm = ({formik, selectExisting = false}) => {
                 description="Service fetch configuration modal basic fieldset title"
               />
             }
-            extraClassName="admin-fieldset"
           >
             <FormRow>
               <Field
@@ -239,7 +238,6 @@ const ServiceFetchConfigurationForm = ({formik, selectExisting = false}) => {
                 description="Service fetch configuration modal data extraction fieldset title"
               />
             }
-            extraClassName="admin-fieldset"
           >
             <FormRow>
               <Field
@@ -348,7 +346,6 @@ const ServiceFetchConfigurationForm = ({formik, selectExisting = false}) => {
                 description="Service fetch configuration try it out tabpanel full request fieldset title"
               />
             }
-            extraClassName="admin-fieldset"
           >
             <FormRow>
               {/* TODO https://github.com/open-formulieren/open-forms/issues/2777 */}
@@ -367,7 +364,6 @@ const ServiceFetchConfigurationForm = ({formik, selectExisting = false}) => {
                 description="Service fetch configuration try it out tabpanel data extraction fieldset title"
               />
             }
-            extraClassName="admin-fieldset"
           >
             <FormRow>
               {/* TODO https://github.com/open-formulieren/open-forms/issues/2777 */}
diff --git a/src/openforms/js/components/admin/form_design/variables/ServiceFetchConfigurationForm.stories.js b/src/openforms/js/components/admin/form_design/variables/ServiceFetchConfigurationForm.stories.js
index f2327e5947..b2a5500cf4 100644
--- a/src/openforms/js/components/admin/form_design/variables/ServiceFetchConfigurationForm.stories.js
+++ b/src/openforms/js/components/admin/form_design/variables/ServiceFetchConfigurationForm.stories.js
@@ -1,6 +1,10 @@
 import {useFormik} from 'formik';
 
-import {FormLogicDecorator} from '../story-decorators';
+import {
+  AdminChangeFormDecorator,
+  FormLogicDecorator,
+} from 'components/admin/form_design/story-decorators';
+
 import ServiceFetchConfigurationForm from './ServiceFetchConfigurationForm';
 
 const Template = ({initialValues = {}, selectExisting}) => {
@@ -25,7 +29,7 @@ const Template = ({initialValues = {}, selectExisting}) => {
 
 export default {
   title: 'Form design/Service Fetch/ServiceFetchConfigurationForm',
-  decorators: [FormLogicDecorator],
+  decorators: [FormLogicDecorator, AdminChangeFormDecorator],
   component: ServiceFetchConfigurationForm,
   render: Template.bind({}),
 
diff --git a/src/openforms/js/components/admin/forms/Field.js b/src/openforms/js/components/admin/forms/Field.js
index 08f1c0884a..e01c0eeb2b 100644
--- a/src/openforms/js/components/admin/forms/Field.js
+++ b/src/openforms/js/components/admin/forms/Field.js
@@ -77,40 +77,48 @@ const Field = ({
     modifiedChildren = React.cloneElement(children, childProps);
   }
   const [hasErrors, formattedErrors] = normalizeErrors(errors, intl);
-  const className = classNames({
+
+  const fieldClassName = classNames('flex-container', {
     fieldBox: fieldBox,
     errors: hasErrors,
-    'field--disabled': disabled,
   });
+  const wrapperClassName = classNames({'field--disabled': disabled});
+
+  const fieldInputMarkup = (
+    <div className={fieldClassName}>
+      {label && (
+        <label className={required ? 'required' : ''} htmlFor={htmlFor}>
+          {label}
+        </label>
+      )}
+      {modifiedChildren}
+    </div>
+  );
+
+  const errorsMarkup = hasErrors && (
+    <ErrorList classNamePrefix={errorClassPrefix} classNameModifier={errorClassModifier}>
+      {formattedErrors}
+    </ErrorList>
+  );
+
+  const helpMarkup = helpText && (
+    <div className="help" id={`id_${name}_helptext`}>
+      <div>{helpText}</div>
+    </div>
+  );
 
-  return (
+  return fieldBox ? (
+    <div className={wrapperClassName}>
+      {errorsMarkup}
+      {fieldInputMarkup}
+      {helpMarkup}
+    </div>
+  ) : (
     <>
-      {!fieldBox && hasErrors ? (
-        <ErrorList classNamePrefix={errorClassPrefix} classNameModifier={errorClassModifier}>
-          {formattedErrors}
-        </ErrorList>
-      ) : null}
-      <div className={className}>
-        {fieldBox && hasErrors ? (
-          <ErrorList classNamePrefix={errorClassPrefix} classNameModifier={errorClassModifier}>
-            {formattedErrors}
-          </ErrorList>
-        ) : null}
-
-        <div className="flex-container">
-          {label && (
-            <label className={required ? 'required' : ''} htmlFor={htmlFor}>
-              {label}
-            </label>
-          )}
-          {modifiedChildren}
-        </div>
-
-        {helpText ? (
-          <div className="help" id={`id_${name}_helptext`}>
-            <div>{helpText}</div>
-          </div>
-        ) : null}
+      {errorsMarkup}
+      <div className={wrapperClassName}>
+        {fieldInputMarkup}
+        {helpMarkup}
       </div>
     </>
   );
@@ -123,7 +131,17 @@ Field.propTypes = {
   helpText: PropTypes.node,
   required: PropTypes.bool,
   errors: PropTypes.oneOfType([
-    PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.string, PropTypes.array])),
+    PropTypes.arrayOf(
+      PropTypes.oneOfType([
+        PropTypes.string,
+        PropTypes.array,
+        // react-intl message
+        PropTypes.shape({
+          defaultMessage: PropTypes.any,
+          id: PropTypes.string,
+        }),
+      ])
+    ),
     PropTypes.string,
   ]),
   fieldBox: PropTypes.bool,
diff --git a/src/openforms/js/components/admin/forms/Field.stories.js b/src/openforms/js/components/admin/forms/Field.stories.js
index e53e6724a5..cffe2af65f 100644
--- a/src/openforms/js/components/admin/forms/Field.stories.js
+++ b/src/openforms/js/components/admin/forms/Field.stories.js
@@ -1,3 +1,5 @@
+import {AdminChangeFormDecorator} from 'components/admin/form_design/story-decorators';
+
 import Field from './Field';
 import {TextInput} from './Inputs';
 
@@ -5,6 +7,13 @@ export default {
   title: 'Admin/Django/Field',
   component: Field,
 
+  decorators: [AdminChangeFormDecorator],
+  parameters: {
+    adminChangeForm: {
+      wrapFieldset: true,
+    },
+  },
+
   args: {
     children: <TextInput />,
   },
diff --git a/src/openforms/js/components/admin/forms/Fieldset.stories.js b/src/openforms/js/components/admin/forms/Fieldset.stories.js
index b492809357..5e969b40eb 100644
--- a/src/openforms/js/components/admin/forms/Fieldset.stories.js
+++ b/src/openforms/js/components/admin/forms/Fieldset.stories.js
@@ -1,3 +1,5 @@
+import {AdminChangeFormDecorator} from 'components/admin/form_design/story-decorators';
+
 import Field from './Field';
 import Fieldset from './Fieldset';
 import FormRow from './FormRow';
@@ -23,6 +25,7 @@ export default {
   title: 'Admin/Django/Fieldset',
   component: Fieldset,
   render,
+  decorators: [AdminChangeFormDecorator],
 
   argTypes: {
     children: {
diff --git a/src/openforms/js/components/admin/forms/FormRow.js b/src/openforms/js/components/admin/forms/FormRow.js
index 50b88f0f2e..a5ab2d5108 100644
--- a/src/openforms/js/components/admin/forms/FormRow.js
+++ b/src/openforms/js/components/admin/forms/FormRow.js
@@ -10,10 +10,13 @@ const FormRow = ({fields = [], children}) => {
   let hasErrors = false;
   const validationErrors = useContext(ValidationErrorContext);
 
+  let hasAnyFieldBox = false;
   // process (validation) errors here
   const processedChildren = React.Children.map(children, child => {
     // check if it *looks* like a field
-    let {name, errors} = child.props;
+    let {name, errors, fieldBox = false} = child.props;
+    if (fieldBox) hasAnyFieldBox = true;
+
     if (!name) return child;
 
     const childErrors = validationErrors
@@ -45,7 +48,12 @@ const FormRow = ({fields = [], children}) => {
     {errors: processedChildren.length === 1 && hasErrors},
     ...fieldClasses
   );
-  return <div className={className}>{processedChildren}</div>;
+  const inner = hasAnyFieldBox ? (
+    <div className="flex-container form-multiline">{processedChildren}</div>
+  ) : (
+    processedChildren
+  );
+  return <div className={className}>{inner}</div>;
 };
 
 FormRow.propTypes = {
diff --git a/src/openforms/js/components/admin/forms/FormRow.stories.js b/src/openforms/js/components/admin/forms/FormRow.stories.js
index 2193fdaa4a..004353abde 100644
--- a/src/openforms/js/components/admin/forms/FormRow.stories.js
+++ b/src/openforms/js/components/admin/forms/FormRow.stories.js
@@ -1,20 +1,18 @@
+import {AdminChangeFormDecorator} from 'components/admin/form_design/story-decorators';
+
 import Field from './Field';
-import Fieldset from './Fieldset';
 import FormRow from './FormRow';
 import {TextInput} from './Inputs';
 
-const FormDecorator = Story => (
-  <form>
-    <Fieldset>
-      <Story />
-    </Fieldset>
-  </form>
-);
-
 export default {
   title: 'Admin/Django/FormRow',
   component: FormRow,
-  decorators: [FormDecorator],
+  decorators: [AdminChangeFormDecorator],
+  parameters: {
+    adminChangeForm: {
+      wrapFieldset: true,
+    },
+  },
 };
 
 export const SingleField = {
diff --git a/src/openforms/js/components/admin/forms/Inputs.js b/src/openforms/js/components/admin/forms/Inputs.js
index 97a4584763..7cec193bbe 100644
--- a/src/openforms/js/components/admin/forms/Inputs.js
+++ b/src/openforms/js/components/admin/forms/Inputs.js
@@ -102,18 +102,18 @@ const Checkbox = ({name, label, helpText, noVCheckbox = false, ...extraProps}) =
   name = prefix ? `${prefix}-${name}` : name;
   const idFor = disabled ? undefined : `id_${name}`;
   return (
-    <div
-      className={classNames('flex-container', 'checkbox-row', {'checkbox-row--disabled': disabled})}
-    >
-      <input type="checkbox" name={name} id={idFor} {...extraProps} />{' '}
-      <label className={classNames('inline', {vCheckboxLabel: !noVCheckbox})} htmlFor={idFor}>
-        {label}
-      </label>
-      {helpText ? (
+    <div className={classNames({'field--disabled': disabled})}>
+      <div className="flex-container checkbox-row">
+        <input type="checkbox" name={name} id={idFor} {...extraProps} />{' '}
+        <label className={classNames('inline', {vCheckboxLabel: !noVCheckbox})} htmlFor={idFor}>
+          {label}
+        </label>
+      </div>
+      {helpText && (
         <div className="help">
           <div>{helpText}</div>
         </div>
-      ) : null}
+      )}
     </div>
   );
 };
diff --git a/src/openforms/js/components/admin/forms/Inputs.stories.js b/src/openforms/js/components/admin/forms/Inputs.stories.js
index d2242c8535..0a4dfa976e 100644
--- a/src/openforms/js/components/admin/forms/Inputs.stories.js
+++ b/src/openforms/js/components/admin/forms/Inputs.stories.js
@@ -1,5 +1,7 @@
 import flatpickr from 'flatpickr';
 
+import {AdminChangeFormDecorator} from 'components/admin/form_design/story-decorators';
+
 import {
   Checkbox,
   DateInput,
@@ -20,6 +22,13 @@ export const CheckboxStory = {
   name: 'Checkbox',
   render: args => <Checkbox {...args} />,
 
+  decorators: [AdminChangeFormDecorator],
+  parameters: {
+    adminChangeForm: {
+      wrapFieldset: true,
+    },
+  },
+
   args: {
     name: 'Checkbox',
     label: 'Checkbox',
diff --git a/src/openforms/scss/admin/_admin_theme.scss b/src/openforms/scss/admin/_admin_theme.scss
index e8f89a92fd..974f052e57 100644
--- a/src/openforms/scss/admin/_admin_theme.scss
+++ b/src/openforms/scss/admin/_admin_theme.scss
@@ -8,7 +8,6 @@ DO NOT PUT ANY TARGET APP-SPECIFIC RULES HERE.
 
 @use './themes/dark' as dark-theme;
 @use './themes/light' as light-theme;
-@use './tooltip';
 
 @import 'microscope-sass/lib/bem';
 
diff --git a/src/openforms/scss/admin/_tooltip.scss b/src/openforms/scss/admin/_tooltip.scss
deleted file mode 100644
index 892434b194..0000000000
--- a/src/openforms/scss/admin/_tooltip.scss
+++ /dev/null
@@ -1,113 +0,0 @@
-/**
- * Replace the form field help text with a tooltip icon by default,
- * displaying the content on hover.
- *
- * Appearance/variables can be tweaked in ../vars.scss.
- *
- * The django markup (since 4.2) is typically of the form:
- *
- *   <div class="form-row">
- *     <ul class="errorlist">...</ul>
- *     <div>
- *       <!-- possibly there are errors here too -->
- *       <div class="flex-container"></div>
- *       <div class="help"><div>...</div></div>
- *     </div>
- *   </div>
- *
- * The implementation uses the :has pseudo selector to target the relevant nodes, so
- * that we don't have to override the django field templates/markup. Modern browsers
- * support this, on old browsers this will degrade to the default django admin styles.
- *
- * There are a number of cases to consider when applying this CSS:
- *
- * - form row with a single field or multiple fields (.fieldBox selector present or not)
- * - form field with or without validation errors - complicated by the above.
- *
- * They require specific attention to the styling.
- */
-
-// ensure that we *only* display the tooltip icon in the 'normal' state
-div.help {
-  cursor: help;
-  block-size: var(--of-admin-tooltip-size);
-  inline-size: var(--of-admin-tooltip-size);
-
-  background-image: url(../admin/img/icon-unknown.svg);
-  background-repeat: no-repeat;
-  background-size: var(--of-admin-tooltip-size);
-  margin-inline: 0 !important;
-  margin-block: 0 !important;
-  padding-inline: 0 !important;
-  padding-block: 0 !important;
-
-  position: relative; // provides an anchor for the nested div absolute positioning
-
-  // the actual content is nested in a div, so we can easily hide it by default
-  > div {
-    display: none;
-  }
-
-  // On hover of the icon, we display the real help text content.
-  &:hover {
-    background-image: none;
-
-    > div {
-      display: block;
-      position: absolute;
-      top: 1px;
-      z-index: 10;
-
-      block-size: auto;
-      inline-size: max-content;
-      max-inline-size: 300px;
-      padding-block: 5px 3px;
-      padding-inline: 5px 5px;
-
-      background-color: var(--of-admin-tooltip-background-color);
-      border: solid 1px var(--of-admin-tooltip-border-color);
-
-      color: var(--of-admin-tooltip-color);
-    }
-  }
-}
-
-// Unsure why Django hides the overflow here :/
-.form-row:has(.help) {
-  overflow: visible;
-}
-
-// field on a single form row with multiple fields, without validation errors
-div:has(> .fieldBox + .help) {
-  display: grid;
-  grid-template-columns: auto var(--of-admin-tooltip-size);
-  column-gap: 2px;
-
-  // move the margin right (djagno's styles) from fieldbox to the parent so that the
-  // tooltip is not too far away
-  margin-right: 20px;
-  > .fieldBox {
-    margin-right: 0;
-  }
-}
-
-// field on a single form row with multiple fields, with validation errors
-div:has(> .errorlist + .fieldBox + .help) {
-  // split the 1-row, 2-columns up into 2-rows, 2 columns and make sure the top
-  // row is assigned to the validation errors.
-  // The rest of the styles are shared with the regular fieldBox styles.
-  grid-template-areas:
-    'errors errors'
-    'field tooltip';
-
-  > .errorlist {
-    grid-area: errors;
-    margin-bottom: 0;
-  }
-}
-
-// field, alone on single form row (with/without validation errors)
-div:has(> .help):not(:has(> .fieldBox)) {
-  display: flex;
-  column-gap: 2px;
-}
diff --git a/src/openforms/scss/components/admin/_list.scss b/src/openforms/scss/components/admin/_list.scss
index 0f018c9ea6..8f099b3ef0 100644
--- a/src/openforms/scss/components/admin/_list.scss
+++ b/src/openforms/scss/components/admin/_list.scss
@@ -36,6 +36,13 @@
       align-items: center;
     }
   }
+
+  &__item-text {
+    &--allow-wrap {
+      word-break: break-all;
+      overflow-wrap: anywhere;
+    }
+  }
 }
 
 .list__item--active {
diff --git a/src/openforms/scss/components/builder/_builder.scss b/src/openforms/scss/components/builder/_builder.scss
index 531646cf19..0a96fcc0d7 100644
--- a/src/openforms/scss/components/builder/_builder.scss
+++ b/src/openforms/scss/components/builder/_builder.scss
@@ -157,28 +157,6 @@ div.flatpickr-calendar.open {
   }
 }
 
-// rjsf styling competing with bootstrap, competing with django admin.....
-.admin-fieldset {
-  margin-bottom: 0;
-
-  .form-row {
-    &,
-    * {
-      box-sizing: border-box !important;
-    }
-  }
-
-  .form-row {
-    display: block;
-    margin-left: 0;
-    margin-right: 0;
-
-    ul.errorlist {
-      padding-left: 0px;
-    }
-  }
-}
-
 .gu-transit {
   // #748 client requested increased contrast for this element
   // here we clobber formio's compiled 0.2 opacity of the drag-and-drop target indicator