diff --git a/data/theme/_common.scss b/data/theme/_common.scss
index 864d0f0d0..179c89212 100644
--- a/data/theme/_common.scss
+++ b/data/theme/_common.scss
@@ -104,6 +104,21 @@ StScrollBar {
   }
 }
 
+/* Check Boxes */
+
+.check-box {
+  StBoxLayout { spacing: .8em; }
+  StBin {
+    width: 24px;
+    height: 22px;
+    background-image: url("checkbox-off.svg");
+  }
+  &:focus Stbin { background-image: url("checkbox-off-focused.svg"); }
+  &:checked Stbin { background-image: url("checkbox.svg"); }
+  &:focus:checked Stbin { background-image: url("checkbox-focused.svg"); }
+}
+
+
 /* links */
 .shell-link {
   color: $link_color;
diff --git a/data/theme/_gnome-shell-old.scss b/data/theme/_gnome-shell-old.scss
index e161d496d..3d079c8da 100644
--- a/data/theme/_gnome-shell-old.scss
+++ b/data/theme/_gnome-shell-old.scss
@@ -21,29 +21,7 @@
 
 /* default text style */
 
-/* Check Boxes */
 
-.check-box StBoxLayout {
-    spacing: .8em;
-}
-
-.check-box StBin {
-    width: 24px;
-    height: 22px;
-    background-image: url("checkbox-off.svg");
-}
-
-.check-box:focus StBin {
-    background-image: url("checkbox-off-focused.svg");
-}
-
-.check-box:checked StBin {
-    background-image: url("checkbox.svg");
-}
-
-.check-box:focus:checked StBin {
-    background-image: url("checkbox-focused.svg");
-}
 
 /* Slider */
 
diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css
index 8412a040d..8d8e1e6f6 100644
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@ -18,24 +18,6 @@
  */
 /* Text Styles */
 /* default text style */
-/* Check Boxes */
-.check-box StBoxLayout {
-  spacing: .8em; }
-
-.check-box StBin {
-  width: 24px;
-  height: 22px;
-  background-image: url("checkbox-off.svg"); }
-
-.check-box:focus StBin {
-  background-image: url("checkbox-off-focused.svg"); }
-
-.check-box:checked StBin {
-  background-image: url("checkbox.svg"); }
-
-.check-box:focus:checked StBin {
-  background-image: url("checkbox-focused.svg"); }
-
 /* Slider */
 .slider {
   height: 1em;
@@ -1907,6 +1889,20 @@ StScrollBar {
     StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
       background-color: #215d9c; }
 
+/* Check Boxes */
+.check-box StBoxLayout {
+  spacing: .8em; }
+.check-box StBin {
+  width: 24px;
+  height: 22px;
+  background-image: url("checkbox-off.svg"); }
+.check-box:focus Stbin {
+  background-image: url("checkbox-off-focused.svg"); }
+.check-box:checked Stbin {
+  background-image: url("checkbox.svg"); }
+.check-box:focus:checked Stbin {
+  background-image: url("checkbox-focused.svg"); }
+
 /* links */
 .shell-link {
   color: #4a90d9; }