diff --git a/share/themes/Kali-Dark/gnome-shell/assets/toggle-off-dark.svg b/share/themes/Kali-Dark/gnome-shell/assets/toggle-off-dark.svg
deleted file mode 100644
index 3ea0ddd4..00000000
--- a/share/themes/Kali-Dark/gnome-shell/assets/toggle-off-dark.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg version="1.1" viewBox="0 0 46 22" xmlns="http://www.w3.org/2000/svg"><rect x=".625" y=".535" width="44.446" height="20.911" rx="10.455" ry="10.073" fill="#0d0e11" stroke="#000" stroke-linecap="round" stroke-linejoin="round"/><rect x=".543" y=".535" width="21.143" height="20.911" rx="10.455" ry="10.455" fill="#2e313d" stroke="#000" stroke-linecap="round" stroke-linejoin="round"/></svg>
diff --git a/share/themes/Kali-Dark/gnome-shell/assets/toggle-off-light.svg b/share/themes/Kali-Dark/gnome-shell/assets/toggle-off-light.svg
new file mode 100644
index 00000000..654f88c3
--- /dev/null
+++ b/share/themes/Kali-Dark/gnome-shell/assets/toggle-off-light.svg
@@ -0,0 +1 @@
+<svg version="1.1" viewBox="0 0 48 26" xmlns="http://www.w3.org/2000/svg"><g transform="matrix(-1 0 0 1 0 -291.18)"><rect x="-48" y="291.18" width="48" height="26" rx="13" ry="13" fill="#3081e3" style="fill:#bbb"/><rect x="-24" y="293.18" width="22" height="22" rx="11" ry="11" fill="#f8f7f7" style="fill:#fff"/></g></svg>
diff --git a/share/themes/Kali-Dark/gnome-shell/assets/toggle-off.svg b/share/themes/Kali-Dark/gnome-shell/assets/toggle-off.svg
index 178435fc..cba25060 100644
--- a/share/themes/Kali-Dark/gnome-shell/assets/toggle-off.svg
+++ b/share/themes/Kali-Dark/gnome-shell/assets/toggle-off.svg
@@ -1 +1 @@
-<svg version="1.1" viewBox="0 0 46 22" xmlns="http://www.w3.org/2000/svg"><rect x=".625" y=".535" width="44.446" height="20.911" rx="10.455" ry="10.073" style="fill:#e8e8e8;stroke-linecap:round;stroke-linejoin:round;stroke:#d1d1d1"/><rect x=".543" y=".535" width="21.143" height="20.911" rx="10.455" ry="10.455" style="fill:#fff;stroke-linecap:round;stroke-linejoin:round;stroke:#bcbcbc"/></svg>
+<svg version="1.1" viewBox="0 0 48 26" xmlns="http://www.w3.org/2000/svg"><g transform="matrix(-1 0 0 1 0 -291.18)"><rect x="-48" y="291.18" width="48" height="26" rx="13" ry="13" fill="#3081e3" style="fill:#fff"/><rect x="-24" y="293.18" width="22" height="22" rx="11" ry="11" fill="#f8f7f7" style="fill:#23252e"/></g></svg>
diff --git a/share/themes/Kali-Dark/gnome-shell/assets/toggle-on-dark.svg b/share/themes/Kali-Dark/gnome-shell/assets/toggle-on-dark.svg
deleted file mode 100644
index e814fbba..00000000
--- a/share/themes/Kali-Dark/gnome-shell/assets/toggle-on-dark.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg version="1.1" viewBox="0 0 46 22" xmlns="http://www.w3.org/2000/svg"><rect transform="scale(-1,1)" x="-44.989" y=".535" width="44.446" height="20.911" rx="10.455" ry="10.073" fill="#2777ff" stroke="#00348d" stroke-linecap="round" stroke-linejoin="round"/><rect transform="scale(-1,1)" x="-45.071" y=".535" width="21.143" height="20.911" rx="10.455" ry="10.455" fill="#2e313d" stroke="#000" stroke-linecap="round" stroke-linejoin="round"/></svg>
diff --git a/share/themes/Kali-Dark/gnome-shell/assets/toggle-on-light.svg b/share/themes/Kali-Dark/gnome-shell/assets/toggle-on-light.svg
new file mode 100644
index 00000000..6368ef17
--- /dev/null
+++ b/share/themes/Kali-Dark/gnome-shell/assets/toggle-on-light.svg
@@ -0,0 +1 @@
+<svg version="1.1" viewBox="0 0 48 26" xmlns="http://www.w3.org/2000/svg"><g transform="translate(0 -291.18)"><rect y="291.18" width="48" height="26" ry="13" fill="#3081e3" style="fill:#2777ff"/><rect x="24" y="293.18" width="22" height="22" rx="11" ry="11" fill="#f8f7f7"/></g></svg>
diff --git a/share/themes/Kali-Dark/gnome-shell/assets/toggle-on.svg b/share/themes/Kali-Dark/gnome-shell/assets/toggle-on.svg
index 47e93acb..9bbee49d 100644
--- a/share/themes/Kali-Dark/gnome-shell/assets/toggle-on.svg
+++ b/share/themes/Kali-Dark/gnome-shell/assets/toggle-on.svg
@@ -1 +1 @@
-<svg version="1.1" viewBox="0 0 46 22" xmlns="http://www.w3.org/2000/svg"><rect transform="scale(-1,1)" x="-44.989" y=".535" width="44.446" height="20.911" rx="10.455" ry="10.073" style="fill:#2777ff;stroke-linecap:round;stroke-linejoin:round;stroke:#0051da"/><rect transform="scale(-1,1)" x="-45.071" y=".535" width="21.143" height="20.911" rx="10.455" ry="10.455" style="fill:#fff;stroke-linecap:round;stroke-linejoin:round;stroke:#0051da"/></svg>
+<svg version="1.1" viewBox="0 0 48 26" xmlns="http://www.w3.org/2000/svg"><g transform="translate(0 -291.18)"><rect y="291.18" width="48" height="26" rx="13" ry="13" fill="#3081e3" style="fill:#2777ff"/><rect x="24" y="293.18" width="22" height="22" rx="11" ry="11" fill="#f8f7f7" style="fill:#23252e"/></g></svg>
diff --git a/share/themes/Kali-Dark/gnome-shell/gnome-shell.css b/share/themes/Kali-Dark/gnome-shell/gnome-shell.css
index 39d0c174..231dc88e 100644
--- a/share/themes/Kali-Dark/gnome-shell/gnome-shell.css
+++ b/share/themes/Kali-Dark/gnome-shell/gnome-shell.css
@@ -2584,17 +2584,8 @@ $_osd_color: if($variant=='light', black, $fg_color);
   -barlevel-border-width: 0;
   -slider-handle-radius: 0; }
 
-/* Switches */
+/* Popovers/Menus */
 /*
-.toggle-switch {
-  background-image: if($variant == 'light', url("assets/toggle-off.svg"), 
-                                            url("assets/toggle-off-dark.svg"));
-  &:checked {
-    background-image: if($variant == 'light', url("assets/toggle-on.svg"), 
-                                              url("assets/toggle-on-dark.svg"));
-  }
-}
-
 // menu items
 .popup-menu-item {
     &.selected, &:active {
diff --git a/share/themes/Kali-Light/gnome-shell/gnome-shell.css b/share/themes/Kali-Light/gnome-shell/gnome-shell.css
index 2a78ccf8..2ea51656 100644
--- a/share/themes/Kali-Light/gnome-shell/gnome-shell.css
+++ b/share/themes/Kali-Light/gnome-shell/gnome-shell.css
@@ -2580,17 +2580,8 @@ $_osd_color: if($variant=='light', black, $fg_color);
   -barlevel-border-width: 0;
   -slider-handle-radius: 0; }
 
-/* Switches */
+/* Popovers/Menus */
 /*
-.toggle-switch {
-  background-image: if($variant == 'light', url("assets/toggle-off.svg"), 
-                                            url("assets/toggle-off-dark.svg"));
-  &:checked {
-    background-image: if($variant == 'light', url("assets/toggle-on.svg"), 
-                                              url("assets/toggle-on-dark.svg"));
-  }
-}
-
 // menu items
 .popup-menu-item {
     &.selected, &:active {
diff --git a/src/themes/Kali/sass/gnome-shell/_common-tweaks.scss b/src/themes/Kali/sass/gnome-shell/_common-tweaks.scss
index 445f05b8..f42c968e 100644
--- a/src/themes/Kali/sass/gnome-shell/_common-tweaks.scss
+++ b/src/themes/Kali/sass/gnome-shell/_common-tweaks.scss
@@ -31,17 +31,8 @@ $_osd_color: if($variant=='light', black, $fg_color);
   -slider-handle-radius: 0;
 }
 
-/* Switches */
+/* Popovers/Menus */
 /*
-.toggle-switch {
-  background-image: if($variant == 'light', url("assets/toggle-off.svg"), 
-                                            url("assets/toggle-off-dark.svg"));
-  &:checked {
-    background-image: if($variant == 'light', url("assets/toggle-on.svg"), 
-                                              url("assets/toggle-on-dark.svg"));
-  }
-}
-
 // menu items
 .popup-menu-item {
     &.selected, &:active {