diff --git a/theme/gnome-shell/.css/controls.css b/theme/gnome-shell/.css/controls.css
index 74cea9f..0a48fba 100644
--- a/theme/gnome-shell/.css/controls.css
+++ b/theme/gnome-shell/.css/controls.css
@@ -1,26 +1,6 @@
 /* Check Boxes */
 
-.check-box StBoxLayout {
-	spacing: .8em;
-}
-
-.check-box StBin {
-	width: 24px;
-	height: 24px;
-	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");
-}
+/* .toggle-switch styled in ..46, 47.. */
 
 
 /* Toggles */
diff --git a/theme/gnome-shell/.versions/..46/.css/chekbox.css b/theme/gnome-shell/.versions/..46/.css/chekbox.css
new file mode 100644
index 0000000..b9b016c
--- /dev/null
+++ b/theme/gnome-shell/.versions/..46/.css/chekbox.css
@@ -0,0 +1,21 @@
+.check-box StBoxLayout {
+	spacing: .8em;
+}
+
+.check-box StBin {
+	width: 24px;
+	height: 24px;
+	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");
+}
diff --git a/theme/gnome-shell/checkbox-focused.svg b/theme/gnome-shell/.versions/..46/checkbox-focused.svg
similarity index 100%
rename from theme/gnome-shell/checkbox-focused.svg
rename to theme/gnome-shell/.versions/..46/checkbox-focused.svg
diff --git a/theme/gnome-shell/checkbox-off-focused.svg b/theme/gnome-shell/.versions/..46/checkbox-off-focused.svg
similarity index 100%
rename from theme/gnome-shell/checkbox-off-focused.svg
rename to theme/gnome-shell/.versions/..46/checkbox-off-focused.svg
diff --git a/theme/gnome-shell/checkbox-off.svg b/theme/gnome-shell/.versions/..46/checkbox-off.svg
similarity index 100%
rename from theme/gnome-shell/checkbox-off.svg
rename to theme/gnome-shell/.versions/..46/checkbox-off.svg
diff --git a/theme/gnome-shell/checkbox.svg b/theme/gnome-shell/.versions/..46/checkbox.svg
similarity index 100%
rename from theme/gnome-shell/checkbox.svg
rename to theme/gnome-shell/.versions/..46/checkbox.svg
diff --git a/theme/gnome-shell/.versions/47../.css/checkbox.css b/theme/gnome-shell/.versions/47../.css/checkbox.css
new file mode 100644
index 0000000..07c8c59
--- /dev/null
+++ b/theme/gnome-shell/.versions/47../.css/checkbox.css
@@ -0,0 +1,41 @@
+/* Check Boxes */
+
+.check-box StBoxLayout { spacing: .8em; }
+
+.check-box StBin {
+    border-radius: 7px;
+    padding: 2px;
+}
+
+.check-box:focus StBin {
+    /* Trick due to St limitations. It needs a background to draw a box-shadow */
+    background-color: rgba(0, 0, 0, 0.01);
+    box-shadow: inset 0 0 0 2px BORDER-SHADOW;
+}
+
+.check-box StIcon {
+    icon-size: 14px;
+    padding: 1px;
+    color: transparent;
+    border-radius: 6px;
+    border: 2px solid TEXT-DISABLED-COLOR;
+    transition-duration: 150ms;
+}
+
+.check-box:hover StIcon,
+.check-box:active StIcon {
+    border-color: TEXT-SECONDARY-COLOR;
+    background-color: ACCENT-OPACITY-COLOR;
+}
+
+.check-box:checked StIcon {
+    background-color: BUTTON-COLOR;
+    color: BUTTON-TEXT-COLOR;
+    border-color: transparent;
+}
+
+.check-box:checked:hover StIcon,
+.check-box:checked:active StIcon {
+    background-color: BUTTON_HOVER;
+    color: BUTTON-TEXT-COLOR;
+}
\ No newline at end of file
diff --git a/theme/gnome-shell/.versions/47../.css/toggle.css b/theme/gnome-shell/.versions/47../.css/toggle.css
index 8311dca..a3024e9 100644
--- a/theme/gnome-shell/.versions/47../.css/toggle.css
+++ b/theme/gnome-shell/.versions/47../.css/toggle.css
@@ -5,6 +5,7 @@
 	margin: 3px;
 	border-radius: 99px;
 	background-color: TEXT-SECONDARY-COLOR;
+	box-shadow: 0 2px 4px rgba(0, 0, 0, .2);
 }
 
 .toggle-switch:checked .handle {