diff --git a/data/theme/_common.scss b/data/theme/_common.scss
index 7128b3a67..747e1cf9b 100644
--- a/data/theme/_common.scss
+++ b/data/theme/_common.scss
@@ -131,6 +131,19 @@ StScrollBar {
   &:focus:checked Stbin { background-image: url("checkbox-focused.svg"); }
 }
 
+/* Switches */
+.toggle-switch {
+    width: 65px;
+    height: 22px;
+    background-size: contain;
+}
+
+  @each $v in us, intl {
+    .toggle-switch-#{$v} {
+      background-image: url("toggle-off-#{$v}.svg");    
+      &:checked { background-image: url("toggle-on-#{$v}.svg"); }
+    }
+  }
 
 /* links */
 .shell-link {
diff --git a/data/theme/_gnome-shell-old.scss b/data/theme/_gnome-shell-old.scss
index cc364b75a..d3d2904f6 100644
--- a/data/theme/_gnome-shell-old.scss
+++ b/data/theme/_gnome-shell-old.scss
@@ -18,30 +18,6 @@
  */
 
 
-/* Switches */
-.toggle-switch {
-    width: 65px;
-    height: 22px;
-}
-
-.toggle-switch-us {
-    background-image: url("toggle-off-us.svg");
-    background-size: contain;
-}
-.toggle-switch-us:checked {
-    background-image: url("toggle-on-us.svg");
-    background-size: contain;
-}
-
-.toggle-switch-intl {
-    background-image: url("toggle-off-intl.svg");
-    background-size: contain;
-}
-.toggle-switch-intl:checked {
-    background-image: url("toggle-on-intl.svg");
-    background-size: contain;
-}
-
 /* Network */
 
 .nm-dialog {
diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css
index 6c08f2114..b3a64e042 100644
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@ -16,27 +16,6 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/* Switches */
-.toggle-switch {
-  width: 65px;
-  height: 22px; }
-
-.toggle-switch-us {
-  background-image: url("toggle-off-us.svg");
-  background-size: contain; }
-
-.toggle-switch-us:checked {
-  background-image: url("toggle-on-us.svg");
-  background-size: contain; }
-
-.toggle-switch-intl {
-  background-image: url("toggle-off-intl.svg");
-  background-size: contain; }
-
-.toggle-switch-intl:checked {
-  background-image: url("toggle-on-intl.svg");
-  background-size: contain; }
-
 /* Network */
 .nm-dialog {
   max-height: 500px;
@@ -1877,6 +1856,22 @@ StScrollBar {
 .check-box:focus:checked Stbin {
   background-image: url("checkbox-focused.svg"); }
 
+/* Switches */
+.toggle-switch {
+  width: 65px;
+  height: 22px;
+  background-size: contain; }
+
+.toggle-switch-us {
+  background-image: url("toggle-off-us.svg"); }
+  .toggle-switch-us:checked {
+    background-image: url("toggle-on-us.svg"); }
+
+.toggle-switch-intl {
+  background-image: url("toggle-off-intl.svg"); }
+  .toggle-switch-intl:checked {
+    background-image: url("toggle-on-intl.svg"); }
+
 /* links */
 .shell-link {
   color: #4a90d9; }