diff --git a/src/components/ThemeSettings/components/SettingColorComponent.tsx b/src/components/ThemeSettings/components/SettingColorComponent.tsx
index 9c300e7f6..34e282a39 100644
--- a/src/components/ThemeSettings/components/SettingColorComponent.tsx
+++ b/src/components/ThemeSettings/components/SettingColorComponent.tsx
@@ -34,7 +34,7 @@ function EditPencil({ className, color }) {
     );
 }
 
-function ColorPicker(props: ColorPickerProps) {
+function ColorPicker(props: ColorPickerProps & { width: number; height: number; }) {
     const [color, setColor] = useState(props.value);
 
     const correctedColor = color ? `#${color.toString(16).padStart(6, "0")}` : "#000000";
@@ -48,7 +48,9 @@ function ColorPicker(props: ColorPickerProps) {
             {popoutProps => (
                 <div {...popoutProps} className={cl("swatch")} style={{
                     backgroundColor: correctedColor,
-                    borderColor: correctedColor
+                    borderColor: correctedColor,
+                    width: props.width,
+                    height: props.height
                 }}>
                     <EditPencil
                         className={cl("swatch-pencil")}
@@ -84,6 +86,8 @@ export function SettingColorComponent({ label, name, themeSettings }: Props) {
             <div className={cl("swatch-row")}>
                 <span>{label}</span>
                 <ColorPicker
+                    width={40} /* same as a switch */
+                    height={24}
                     key={name}
                     value={normalizedValue}
                     onChange={handleChange}
diff --git a/src/components/ThemeSettings/components/colorStyles.css b/src/components/ThemeSettings/components/colorStyles.css
index 887e3f713..b76f0bedd 100644
--- a/src/components/ThemeSettings/components/colorStyles.css
+++ b/src/components/ThemeSettings/components/colorStyles.css
@@ -2,8 +2,6 @@
     display: flex;
     align-items: center;
     justify-content: center;
-    width: 69px;
-    height: 50px;
     box-sizing: border-box;
     position: relative;
     border: 1px solid;