diff --git a/scss/content/_form-alt-input-types.scss b/scss/content/_form-alt-input-types.scss
index 3512feb0..5dd94e9a 100644
--- a/scss/content/_form-alt-input-types.scss
+++ b/scss/content/_form-alt-input-types.scss
@@ -7,23 +7,30 @@
 [type="color"] {
 
   // Wrapper
-  &::-webkit-color-swatch-wrapper {
+  @mixin color-wrapper {
     padding: 0;
   }
+  
+  &::-webkit-color-swatch-wrapper {
+    @include color-wrapper;
+  }
 
   &::-moz-focus-inner {
-    padding: 0;
+    @include color-wrapper;
   }
 
   // Swatch
-  &::-webkit-color-swatch {
+  @mixin color-swatch {
     border: none;
     border-radius: calc(var(--border-radius) * 0.5);
   }
+  
+  &::-webkit-color-swatch {
+    @include color-swatch;
+  }
 
   &::-moz-color-swatch {
-    border: none;
-    border-radius: calc(var(--border-radius) * 0.5);
+    @include color-swatch;
   }
 }