diff --git a/src/main/gtk-3.0/gtk-dark.css b/src/main/gtk-3.0/gtk-dark.css
index f1617210..1ea3509e 100644
--- a/src/main/gtk-3.0/gtk-dark.css
+++ b/src/main/gtk-3.0/gtk-dark.css
@@ -3342,6 +3342,7 @@ switch {
   background-color: rgba(255, 255, 255, 0.5);
   background-clip: padding-box;
   font-size: 0;
+  color: transparent;
 }
 
 switch:checked {
@@ -3352,21 +3353,17 @@ switch:disabled {
   opacity: 0.5;
 }
 
-switch image {
-  margin: -8px;
-  -gtk-icon-transform: scale(0);
-}
-
 switch slider {
   transition: all 75ms cubic-bezier(0, 0, 0.2, 1);
   min-width: 20px;
   min-height: 20px;
-  margin: 1px;
+  margin: 0;
   border-radius: 9999px;
   outline: none;
   box-shadow: none;
   background-color: white;
   border: none;
+  color: transparent;
 }
 
 switch:focus slider, switch:hover slider, switch:focus:hover slider {
diff --git a/src/main/gtk-3.0/gtk-light.css b/src/main/gtk-3.0/gtk-light.css
index c8c40724..83d14772 100644
--- a/src/main/gtk-3.0/gtk-light.css
+++ b/src/main/gtk-3.0/gtk-light.css
@@ -3342,6 +3342,7 @@ switch {
   background-color: rgba(0, 0, 0, 0.38);
   background-clip: padding-box;
   font-size: 0;
+  color: transparent;
 }
 
 switch:checked {
@@ -3352,11 +3353,6 @@ switch:disabled {
   opacity: 0.5;
 }
 
-switch image {
-  margin: -8px;
-  -gtk-icon-transform: scale(0);
-}
-
 switch slider {
   transition: all 75ms cubic-bezier(0, 0, 0.2, 1);
   min-width: 20px;
@@ -3367,6 +3363,7 @@ switch slider {
   box-shadow: none;
   background-color: white;
   border: none;
+  color: transparent;
 }
 
 switch:focus slider, switch:hover slider, switch:focus:hover slider {
diff --git a/src/main/gtk-3.0/gtk.css b/src/main/gtk-3.0/gtk.css
index 171acc0a..8650d687 100644
--- a/src/main/gtk-3.0/gtk.css
+++ b/src/main/gtk-3.0/gtk.css
@@ -3351,6 +3351,7 @@ switch {
   background-color: rgba(0, 0, 0, 0.38);
   background-clip: padding-box;
   font-size: 0;
+  color: transparent;
 }
 
 switch:checked {
@@ -3361,11 +3362,6 @@ switch:disabled {
   opacity: 0.5;
 }
 
-switch image {
-  margin: -8px;
-  -gtk-icon-transform: scale(0);
-}
-
 switch slider {
   transition: all 75ms cubic-bezier(0, 0, 0.2, 1);
   min-width: 20px;
@@ -3376,6 +3372,7 @@ switch slider {
   box-shadow: none;
   background-color: white;
   border: none;
+  color: transparent;
 }
 
 switch:focus slider, switch:hover slider, switch:focus:hover slider {
diff --git a/src/sass/gtk/_common-3.0.scss b/src/sass/gtk/_common-3.0.scss
index 25f66f28..a8d55f09 100644
--- a/src/sass/gtk/_common-3.0.scss
+++ b/src/sass/gtk/_common-3.0.scss
@@ -2172,6 +2172,7 @@ switch {
   background-color: $text-disabled;
   background-clip: padding-box;
   font-size: 0;
+  color: transparent;
 
   &:checked {
     background-color: $primary;
@@ -2180,21 +2181,22 @@ switch {
   &:disabled { opacity: 0.5; }
 
   // hide on/off icons for >=3.24.5
-  image {
-    margin: -8px;
-    -gtk-icon-transform: scale(0);
-  }
+  // image {
+  //   margin: -8px;
+  //   -gtk-icon-transform: scale(0);
+  // }
 
   slider {
     transition: all $duration $ease-out;
     min-width: $small-size - 4px;
     min-height: $small-size - 4px;
-    margin: 1px;
+    margin: if($variant == 'light', 1px, 0);
     border-radius: $circular-radius;
     outline: none;
     box-shadow: none;
     background-color: white;
     border: none;
+    color: transparent;
   }
 
   &:focus slider,