diff --git a/src/components/switch/switch-theme.scss b/src/components/switch/switch-theme.scss
index 48c81fbf2c..22d923ce73 100644
--- a/src/components/switch/switch-theme.scss
+++ b/src/components/switch/switch-theme.scss
@@ -9,6 +9,14 @@ md-switch.md-THEME_NAME-theme {
     background-color: '{{background-500}}';
   }
 
+  &.md-focused:not([disabled]) {
+    &:not(.md-checked) {
+      .md-thumb:before {
+        background-color: '{{foreground-4}}';
+      }
+    }
+  }
+
   &.md-checked {
     .md-ink-ripple {
       color: '{{accent-color}}';
diff --git a/src/components/switch/switch.scss b/src/components/switch/switch.scss
index 6ee9f60c2f..a32ea061df 100644
--- a/src/components/switch/switch.scss
+++ b/src/components/switch/switch.scss
@@ -68,12 +68,6 @@ md-switch {
       right: -8px;
       bottom: -8px;
     }
-
-    &:not(.md-checked) {
-      .md-thumb:before {
-        background-color: rgba(0, 0, 0, 0.12);
-      }
-    }
   }
 
   .md-label {