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
index 80872d56..42c7d7f1 100644
--- a/share/themes/Kali-Dark/gnome-shell/assets/toggle-off-light.svg
+++ b/share/themes/Kali-Dark/gnome-shell/assets/toggle-off-light.svg
@@ -1 +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="292.18" width="48" height="24" rx="12" ry="12" fill="#3081e3" style="fill:#bbb"/><rect x="-22" y="294.18" width="20" height="20" rx="10" ry="10" fill="#f8f7f7" style="fill:#fff"/></g></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="292.18" width="48" height="24" rx="12" ry="12" style="fill:#ccc"/><rect x="-22" y="294.18" width="20" height="20" rx="10" ry="10" style="fill:#fff"/></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 3b374e23..9a151666 100644
--- a/share/themes/Kali-Dark/gnome-shell/gnome-shell.css
+++ b/share/themes/Kali-Dark/gnome-shell/gnome-shell.css
@@ -2584,6 +2584,11 @@ $_osd_color: if($variant=='light', black, $fg_color);
   }
 }
 
+/* Switches */
+.toggle-switch {
+  height: 22px;
+  width: 44px; }
+
 /* Slider */
 .slider {
   -barlevel-background-color: #0d0e11;
@@ -2606,7 +2611,8 @@ $_osd_color: if($variant=='light', black, $fg_color);
   font-weight: normal; }
 
 .message-list-controls {
-  spacing: 12px; }
+  spacing: 12px;
+  font-size: 10pt; }
 
 /* Window Picker */
 .window-caption {
diff --git a/share/themes/Kali-Light/gnome-shell/gnome-shell.css b/share/themes/Kali-Light/gnome-shell/gnome-shell.css
index 780d24a7..6641b502 100644
--- a/share/themes/Kali-Light/gnome-shell/gnome-shell.css
+++ b/share/themes/Kali-Light/gnome-shell/gnome-shell.css
@@ -2580,6 +2580,11 @@ $_osd_color: if($variant=='light', black, $fg_color);
   }
 }
 
+/* Switches */
+.toggle-switch {
+  height: 22px;
+  width: 44px; }
+
 /* Slider */
 .slider {
   -barlevel-background-color: #d9d9d9;
@@ -2602,7 +2607,8 @@ $_osd_color: if($variant=='light', black, $fg_color);
   font-weight: normal; }
 
 .message-list-controls {
-  spacing: 12px; }
+  spacing: 12px;
+  font-size: 10pt; }
 
 /* Window Picker */
 .window-caption {
diff --git a/src/themes/Kali/sass/gnome-shell/_common-tweaks.scss b/src/themes/Kali/sass/gnome-shell/_common-tweaks.scss
index a3981673..3e503998 100644
--- a/src/themes/Kali/sass/gnome-shell/_common-tweaks.scss
+++ b/src/themes/Kali/sass/gnome-shell/_common-tweaks.scss
@@ -24,6 +24,12 @@ $_osd_color: if($variant=='light', black, $fg_color);
   }
 }
 
+/* Switches */
+.toggle-switch {
+  height: 22px;
+  width: 44px;
+}
+
 /* Slider */
 .slider {
   -barlevel-background-color: $borders_color;
@@ -47,7 +53,10 @@ $_osd_color: if($variant=='light', black, $fg_color);
   font-weight: normal;
 }
 
-.message-list-controls { spacing: $base_padding * 2; }
+.message-list-controls {
+  spacing: $base_padding * 2;
+  @include fontsize(10);
+}
 
 /* Window Picker */
 // Window titles