diff --git a/share/themes/Kali-Dark/gtk-3.0/gtk.css b/share/themes/Kali-Dark/gtk-3.0/gtk.css
index c729bc20..04536596 100644
--- a/share/themes/Kali-Dark/gtk-3.0/gtk.css
+++ b/share/themes/Kali-Dark/gtk-3.0/gtk.css
@@ -5537,11 +5537,8 @@ headerbar.default-decoration {
   .default-decoration.titlebar:not(headerbar) button.titlebutton,
   headerbar.default-decoration button.titlebutton {
     min-height: 0;
-    min-width: 0; }
-    .default-decoration.titlebar:not(headerbar) button.titlebutton,
-    headerbar.default-decoration button.titlebutton,
-    headerbar.default-decoration button.titlebutton:last-child {
-      margin: 0; }
+    min-width: 0;
+    margin: 0; }
 
 paned headerbar:first-child,
 hdyleaflet headerbar:first-child,
@@ -6095,6 +6092,7 @@ list.tweak-categories separator {
 .xfce4-panel button {
   border: 0;
   border-radius: 0;
+  min-width: 30px;
   box-shadow: none;
   text-shadow: none;
   background: transparent;
@@ -6102,11 +6100,11 @@ list.tweak-categories separator {
   .xfce4-panel button:hover {
     background: rgba(0, 0, 0, 0.2); }
   .xfce4-panel button:not(#whiskermenu-button):checked, .xfce4-panel button:not(#whiskermenu-button):active {
-    box-shadow: inset 0 4px 0 #2777ff;
+    box-shadow: inset 0 -2px 0 #2777ff;
     background: rgba(0, 0, 0, 0.2); }
 
 .xfce4-panel.vertical button:not(#whiskermenu-button):checked, .xfce4-panel.vertical button:not(#whiskermenu-button):active {
-  box-shadow: inset 4px 0 0 #2777ff; }
+  box-shadow: inset 2px 0 0 #2777ff; }
 
 /* XFCE4 NOTIFICATIONS & LOGOUT DIALOG */
 #XfceNotifyWindow, .xfsm-logout-dialog, .xfsm-logout-dialog button {
@@ -6155,7 +6153,7 @@ list.tweak-categories separator {
       background-color: rgba(0, 0, 0, 0.27);
       color: inherit; }
 
-/* XFCE4 panel action & battery buttons */
+/* XFCE4 panel action */
 #XfcePanelWindowWrapper > widget > box > #xfce-panel-button > image {
   -gtk-icon-style: symbolic;
   -gtk-icon-transform: scale(0.7); }
diff --git a/share/themes/Kali-Light/gtk-3.0/gtk-dark.css b/share/themes/Kali-Light/gtk-3.0/gtk-dark.css
index c729bc20..04536596 100644
--- a/share/themes/Kali-Light/gtk-3.0/gtk-dark.css
+++ b/share/themes/Kali-Light/gtk-3.0/gtk-dark.css
@@ -5537,11 +5537,8 @@ headerbar.default-decoration {
   .default-decoration.titlebar:not(headerbar) button.titlebutton,
   headerbar.default-decoration button.titlebutton {
     min-height: 0;
-    min-width: 0; }
-    .default-decoration.titlebar:not(headerbar) button.titlebutton,
-    headerbar.default-decoration button.titlebutton,
-    headerbar.default-decoration button.titlebutton:last-child {
-      margin: 0; }
+    min-width: 0;
+    margin: 0; }
 
 paned headerbar:first-child,
 hdyleaflet headerbar:first-child,
@@ -6095,6 +6092,7 @@ list.tweak-categories separator {
 .xfce4-panel button {
   border: 0;
   border-radius: 0;
+  min-width: 30px;
   box-shadow: none;
   text-shadow: none;
   background: transparent;
@@ -6102,11 +6100,11 @@ list.tweak-categories separator {
   .xfce4-panel button:hover {
     background: rgba(0, 0, 0, 0.2); }
   .xfce4-panel button:not(#whiskermenu-button):checked, .xfce4-panel button:not(#whiskermenu-button):active {
-    box-shadow: inset 0 4px 0 #2777ff;
+    box-shadow: inset 0 -2px 0 #2777ff;
     background: rgba(0, 0, 0, 0.2); }
 
 .xfce4-panel.vertical button:not(#whiskermenu-button):checked, .xfce4-panel.vertical button:not(#whiskermenu-button):active {
-  box-shadow: inset 4px 0 0 #2777ff; }
+  box-shadow: inset 2px 0 0 #2777ff; }
 
 /* XFCE4 NOTIFICATIONS & LOGOUT DIALOG */
 #XfceNotifyWindow, .xfsm-logout-dialog, .xfsm-logout-dialog button {
@@ -6155,7 +6153,7 @@ list.tweak-categories separator {
       background-color: rgba(0, 0, 0, 0.27);
       color: inherit; }
 
-/* XFCE4 panel action & battery buttons */
+/* XFCE4 panel action */
 #XfcePanelWindowWrapper > widget > box > #xfce-panel-button > image {
   -gtk-icon-style: symbolic;
   -gtk-icon-transform: scale(0.7); }
diff --git a/share/themes/Kali-Light/gtk-3.0/gtk.css b/share/themes/Kali-Light/gtk-3.0/gtk.css
index 4540caf1..e9bb2fa0 100644
--- a/share/themes/Kali-Light/gtk-3.0/gtk.css
+++ b/share/themes/Kali-Light/gtk-3.0/gtk.css
@@ -5558,11 +5558,8 @@ headerbar.default-decoration {
   .default-decoration.titlebar:not(headerbar) button.titlebutton,
   headerbar.default-decoration button.titlebutton {
     min-height: 0;
-    min-width: 0; }
-    .default-decoration.titlebar:not(headerbar) button.titlebutton,
-    headerbar.default-decoration button.titlebutton,
-    headerbar.default-decoration button.titlebutton:last-child {
-      margin: 0; }
+    min-width: 0;
+    margin: 0; }
 
 paned headerbar:first-child,
 hdyleaflet headerbar:first-child,
@@ -6116,6 +6113,7 @@ list.tweak-categories separator {
 .xfce4-panel button {
   border: 0;
   border-radius: 0;
+  min-width: 30px;
   box-shadow: none;
   text-shadow: none;
   background: transparent;
@@ -6123,11 +6121,11 @@ list.tweak-categories separator {
   .xfce4-panel button:hover {
     background: #ffffff; }
   .xfce4-panel button:not(#whiskermenu-button):checked, .xfce4-panel button:not(#whiskermenu-button):active {
-    box-shadow: inset 0 4px 0 #2777ff;
+    box-shadow: inset 0 -2px 0 #2777ff;
     background: #ffffff; }
 
 .xfce4-panel.vertical button:not(#whiskermenu-button):checked, .xfce4-panel.vertical button:not(#whiskermenu-button):active {
-  box-shadow: inset 4px 0 0 #2777ff; }
+  box-shadow: inset 2px 0 0 #2777ff; }
 
 /* XFCE4 NOTIFICATIONS & LOGOUT DIALOG */
 #XfceNotifyWindow, .xfsm-logout-dialog, .xfsm-logout-dialog button {
@@ -6164,7 +6162,7 @@ list.tweak-categories separator {
       background-color: rgba(0, 0, 0, 0.07);
       color: inherit; }
 
-/* XFCE4 panel action & battery buttons */
+/* XFCE4 panel action */
 #XfcePanelWindowWrapper > widget > box > #xfce-panel-button > image {
   -gtk-icon-style: symbolic;
   -gtk-icon-transform: scale(0.7); }