diff --git a/src/themes/Kali/sass/gtk3/upstream/_drawing.scss b/src/themes/Kali/sass/gtk3/upstream/_drawing.scss
index 510eba9a..dd560ce5 100644
--- a/src/themes/Kali/sass/gtk3/upstream/_drawing.scss
+++ b/src/themes/Kali/sass/gtk3/upstream/_drawing.scss
@@ -193,11 +193,12 @@
   //
   // normal button
   //
+    $light_c: lighten($c, 7%);
     color: $tc;
     outline-color: transparentize($tc, 0.7);
-    border-color: if($c != $bg_color, _border_color($c), $borders_color);
-    border-bottom-color: if($c != $bg_color, _border_color($c, true), $alt_borders_color);
-    background-image: image(lighten($c, 7%)),
+    border-color: if($c != $bg_color, _border_color($light_c), $borders_color);
+    border-bottom-color: if($c != $bg_color, _border_color($light_c, true), $alt_borders_color);
+    background-image: image($light_c),
                       $backimage;
     //@include _button_text_shadow($tc, $c);
     @include _shadows(inset 0 1px $_hilight_color, $_button_edge, $_button_shadow);
diff --git a/src/themes/Kali/sass/gtk3/upstream/_drawing.scss.patch b/src/themes/Kali/sass/gtk3/upstream/_drawing.scss.patch
index 41e5652d..81b71b2a 100644
--- a/src/themes/Kali/sass/gtk3/upstream/_drawing.scss.patch
+++ b/src/themes/Kali/sass/gtk3/upstream/_drawing.scss.patch
@@ -7,28 +7,34 @@
 ---
 >   $_button_shadow: inset 0 -1px 0px transparentize(if($c != $bg_color, _border_color($c), $borders_color), .25),
 >                          0  1px 2px transparentize($shadow_color, 0.03);
-199,200c200
+194a196
+>     $light_c: lighten($c, 7%);
+197,200c199,201
+<     border-color: if($c != $bg_color, _border_color($c), $borders_color);
+<     border-bottom-color: if($c != $bg_color, _border_color($c, true), $alt_borders_color);
 <     background-image: if($variant == 'light', linear-gradient(to top, darken($c, 4%) 2px, $c),
 <                                               linear-gradient(to top, darken($c,1%) 2px, $c)),
 ---
->     background-image: image(lighten($c, 7%)),
-202c202
+>     border-color: if($c != $bg_color, _border_color($light_c), $borders_color);
+>     border-bottom-color: if($c != $bg_color, _border_color($light_c, true), $alt_borders_color);
+>     background-image: image($light_c),
+202c203
 <     @include _button_text_shadow($tc, $c);
 ---
 >     //@include _button_text_shadow($tc, $c);
-215c215
+215c216
 <       background-image: linear-gradient(to top, $c, lighten($c, 1%) 1px),
 ---
 >       background-image: image(darken($c, 4%)),
-217c217
+217c218
 <       @include _button_text_shadow($tc, lighten($c, 6%));
 ---
 >       //@include _button_text_shadow($tc, lighten($c, 6%));
-223c223
+223c224
 <       @include _button_text_shadow($tc,lighten($c, 6%));
 ---
 >       //@include _button_text_shadow($tc,lighten($c, 6%));
-235c235
+235c236
 <     @include _button_text_shadow($tc, $c);
 ---
 >     //@include _button_text_shadow($tc, $c);