diff --git a/share/themes/Kali-Dark/gtk-3.0/gtk.css b/share/themes/Kali-Dark/gtk-3.0/gtk.css
index a5734b50..8d791ade 100644
--- a/share/themes/Kali-Dark/gtk-3.0/gtk.css
+++ b/share/themes/Kali-Dark/gtk-3.0/gtk.css
@@ -4685,11 +4685,12 @@ popover.emoji-completion .emoji:hover {
   background: #2e313d; }
 
 * {
-  outline-color: alpha(currentColor,0.07);
   outline-style: solid;
-  outline-offset: -2px;
+  outline-offset: -4px;
   outline-width: 2px;
-  -gtk-outline-radius: 6px; }
+  -gtk-outline-radius: 3px; }
+  *, *:hover, *:active, *:checked, *:focus, * button, * button:hover, * button:active, * button:checked, * button:focus {
+    outline-color: alpha(currentColor,0.07); }
 
 .titlebar stackswitcher button:checked:active, .titlebar stackswitcher button:checked,
 .titlebar button.toggle:active,
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 a5734b50..8d791ade 100644
--- a/share/themes/Kali-Light/gtk-3.0/gtk-dark.css
+++ b/share/themes/Kali-Light/gtk-3.0/gtk-dark.css
@@ -4685,11 +4685,12 @@ popover.emoji-completion .emoji:hover {
   background: #2e313d; }
 
 * {
-  outline-color: alpha(currentColor,0.07);
   outline-style: solid;
-  outline-offset: -2px;
+  outline-offset: -4px;
   outline-width: 2px;
-  -gtk-outline-radius: 6px; }
+  -gtk-outline-radius: 3px; }
+  *, *:hover, *:active, *:checked, *:focus, * button, * button:hover, * button:active, * button:checked, * button:focus {
+    outline-color: alpha(currentColor,0.07); }
 
 .titlebar stackswitcher button:checked:active, .titlebar stackswitcher button:checked,
 .titlebar button.toggle:active,
diff --git a/share/themes/Kali-Light/gtk-3.0/gtk.css b/share/themes/Kali-Light/gtk-3.0/gtk.css
index b8273acf..fb23a3bf 100644
--- a/share/themes/Kali-Light/gtk-3.0/gtk.css
+++ b/share/themes/Kali-Light/gtk-3.0/gtk.css
@@ -4706,11 +4706,12 @@ popover.emoji-completion .emoji:hover {
   background: white; }
 
 * {
-  outline-color: alpha(currentColor,0.07);
   outline-style: solid;
-  outline-offset: -2px;
+  outline-offset: -4px;
   outline-width: 2px;
-  -gtk-outline-radius: 6px; }
+  -gtk-outline-radius: 3px; }
+  *, *:hover, *:active, *:checked, *:focus, * button, * button:hover, * button:active, * button:checked, * button:focus {
+    outline-color: alpha(currentColor,0.15); }
 
 .titlebar stackswitcher button:checked:active, .titlebar stackswitcher button:checked,
 .titlebar button.toggle:active,
diff --git a/src/themes/Kali/sass/gtk-sass/_common-tweaks.scss b/src/themes/Kali/sass/gtk-sass/_common-tweaks.scss
index 016b0fb2..4b6bd4f2 100644
--- a/src/themes/Kali/sass/gtk-sass/_common-tweaks.scss
+++ b/src/themes/Kali/sass/gtk-sass/_common-tweaks.scss
@@ -1,9 +1,14 @@
 * {
-  outline-color: gtkalpha(currentColor, 0.07);
   outline-style: solid;
-  outline-offset: -2px;
+  outline-offset: -4px;
   outline-width: 2px;
-  -gtk-outline-radius: 6px;
+  -gtk-outline-radius: 3px;
+
+  &, & button {
+    &, &:hover, &:active, &:checked, &:focus {
+      outline-color: gtkalpha(currentColor, if($variant == 'light', 0.15, 0.07));
+    }
+  }
 }
 
 %button_active,