diff --git a/gtk-3.20/scss/_global.scss b/gtk-3.20/scss/_global.scss
index 7c803d7..1c732c1 100755
--- a/gtk-3.20/scss/_global.scss
+++ b/gtk-3.20/scss/_global.scss
@@ -38,9 +38,9 @@ $scrollbar_slider_active_color: if($variant == 'light', darken($selected_bg_colo
 
 $switch_disabled_bg_color: #d8d8d8;
 $switch_disabled_border_color: #ccc;
-$switch_disabled_fg_color: mix(#444, #f0f0f0, 0.5);
+$switch_disabled_fg_color: mix(#444, #f0f0f0, .5);
 $switch_disabled_slider_bg_color: #e8eaec;
-$switch_bg_color: #fbfbfb;
+$switch_bg_color: mix($bg_color, $base_color, .3);
 $switch_fg_color: #8e969e;
 $switch_slider_bg_color: #fbfbfb;
 
diff --git a/gtk-3.20/scss/widgets/_toggle.scss b/gtk-3.20/scss/widgets/_toggle.scss
index fd12735..a8f6b1a 100755
--- a/gtk-3.20/scss/widgets/_toggle.scss
+++ b/gtk-3.20/scss/widgets/_toggle.scss
@@ -51,12 +51,19 @@ $suffix: if($variant == "dark", "-dark", "");
         @include toggle("radio");
         min-width: 16px;
         min-height: 16px;
+        margin-right: $spacing;
     }
 
     check {
         @include toggle("checkbox");
         min-width: 16px;
         min-height: 16px;
+        margin-right: $spacing;
+    }
+
+    radio:dir(rtl), check:dir(rtl) {
+        margin-right: 0;
+        margin-left: $spacing;
     }
 
     iconview.content-view.cell.check {
@@ -77,7 +84,6 @@ $suffix: if($variant == "dark", "-dark", "");
         padding: $spacing;
         border: none;
         outline: none;
-        transition: all 0.4s linear;
         transition: background-color 0.3s linear;
         min-width: 93px;
         min-height: 25px;
@@ -86,7 +92,7 @@ $suffix: if($variant == "dark", "-dark", "");
 
         slider {
             background-color: $switch_slider_bg_color;
-            transition: all 0.3s linear;
+            transition: all 0.3s ease-in;
             box-shadow: 0px 1px 3px 0px rgba(0, 0, 0, 0.1);
             border-radius: $roundness;
         }