diff --git a/app/soapbox/features/soapbox_config/components/color-with-picker.tsx b/app/soapbox/features/soapbox_config/components/color-with-picker.tsx
index 6178140e6..711883807 100644
--- a/app/soapbox/features/soapbox_config/components/color-with-picker.tsx
+++ b/app/soapbox/features/soapbox_config/components/color-with-picker.tsx
@@ -38,13 +38,13 @@ const ColorWithPicker: React.FC<IColorWithPicker> = ({ buttonId, label, value, o
   };
 
   return (
-    <div className='label_input__color'>
+    <div>
       <label>{label}</label>
 
       <div
         ref={node}
         id={buttonId}
-        className='color-swatch'
+        className='w-8 h-8 rounded-md'
         role='presentation'
         style={{ background: value }}
         title={value}
diff --git a/app/soapbox/features/soapbox_config/index.tsx b/app/soapbox/features/soapbox_config/index.tsx
index 90d30e742..2ccdf144a 100644
--- a/app/soapbox/features/soapbox_config/index.tsx
+++ b/app/soapbox/features/soapbox_config/index.tsx
@@ -179,7 +179,7 @@ const SoapboxConfig: React.FC = () => {
 
   return (
     <Column label={intl.formatMessage(messages.heading)}>
-      <Form onSubmit={handleSubmit} className='simple_form space-y-4'>
+      <Form onSubmit={handleSubmit}>
         <fieldset className='space-y-6' disabled={isLoading}>
           <SitePreview soapbox={soapbox} />
 
@@ -229,7 +229,7 @@ const SoapboxConfig: React.FC = () => {
             />
           </FormGroup>
 
-          <Stack space={2}>
+          <Stack space={2} className='simple_form'>
             <Checkbox
               name='verifiedCanEditName'
               label={intl.formatMessage(messages.verifiedCanEditNameLabel)}