From cc2ea538f048533ed26533ca476410edf0a5bae6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ruiz=20de=20Alegr=C3=ADa?= <daniel@drasite.com>
Date: Fri, 18 Dec 2020 18:18:16 +0100
Subject: [PATCH] GTK3: update gtk 3.24.24

---
 share/themes/Kali-Dark/gtk-3.0/gtk.css        | 84 +++++++++++--------
 share/themes/Kali-Light/gtk-3.0/gtk-dark.css  | 84 +++++++++++--------
 share/themes/Kali-Light/gtk-3.0/gtk.css       | 84 +++++++++++--------
 .../gtk-sass/libhandy/_fallback-base.scss     | 26 ++++++
 .../Kali/sass/gtk-sass/libhandy/sync.sh       |  2 +-
 .../Kali/sass/gtk-sass/upstream/_colors.scss  |  1 -
 .../Kali/sass/gtk-sass/upstream/_common.scss  | 11 +--
 .../Kali/sass/gtk-sass/upstream/_drawing.scss | 61 ++++++--------
 .../gtk-sass/upstream/_drawing.scss.patch     |  7 +-
 .../Kali/sass/gtk-sass/upstream/sync.sh       |  2 +-
 10 files changed, 215 insertions(+), 147 deletions(-)

diff --git a/share/themes/Kali-Dark/gtk-3.0/gtk.css b/share/themes/Kali-Dark/gtk-3.0/gtk.css
index aa1aa432..5dbaeb43 100644
--- a/share/themes/Kali-Dark/gtk-3.0/gtk.css
+++ b/share/themes/Kali-Dark/gtk-3.0/gtk.css
@@ -518,10 +518,10 @@ button {
     outline-color: rgba(238, 238, 236, 0.3);
     border-color: #0d0e11;
     border-bottom-color: black;
+    background-image: linear-gradient(to top, #20232b, #252831 1px);
     text-shadow: 0 -1px rgba(0, 0, 0, 0.825255);
     -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.825255);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
-    background-image: linear-gradient(to top, #20232b, #252831 1px);
     -gtk-icon-effect: highlight; }
   notebook > header > tabs > arrow:active, notebook > header > tabs > arrow:checked,
   button:active,
@@ -821,10 +821,10 @@ button.suggested-action {
     outline-color: rgba(255, 255, 255, 0.3);
     border-color: #005af3;
     border-bottom-color: #0047c0;
+    background-image: linear-gradient(to top, #2274ff, #2c7aff 1px);
     text-shadow: 0 -1px rgba(0, 0, 0, 0.490824);
     -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.490824);
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0.2), inset 0 -1px 0 rgba(0, 90, 243, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
-    background-image: linear-gradient(to top, #2274ff, #2c7aff 1px); }
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.2), inset 0 -1px 0 rgba(0, 90, 243, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27); }
   
   button.suggested-action:active,
   button.suggested-action:checked {
@@ -971,10 +971,10 @@ button.destructive-action {
     outline-color: rgba(255, 255, 255, 0.3);
     border-color: #790e0e;
     border-bottom-color: #4b0909;
+    background-image: linear-gradient(to top, #a21313, #ab1414 1px);
     text-shadow: 0 -1px rgba(0, 0, 0, 0.660235);
     -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.660235);
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0 rgba(121, 14, 14, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
-    background-image: linear-gradient(to top, #a21313, #ab1414 1px); }
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0 rgba(121, 14, 14, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27); }
   
   button.destructive-action:active,
   button.destructive-action:checked {
@@ -1147,11 +1147,10 @@ button.circular {
     outline-color: rgba(238, 238, 236, 0.3);
     border-color: #0d0e11;
     border-bottom-color: black;
-    background-image: linear-gradient(to top, #292c37 2px, #2e313d);
+    background-image: linear-gradient(to top, #292c37 2px, #2e313d), linear-gradient(to top, black 25%, #0d0e11 50%);
     text-shadow: 0 -1px rgba(0, 0, 0, 0.873255);
     -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.873255);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
-    background-image: linear-gradient(to top, #292c37 2px, #2e313d), linear-gradient(to top, black 25%, #0d0e11 50%);
     border-color: transparent; }
   
   button.circular:hover:not(.osd):not(:checked):not(:active):not(:disabled):not(:backdrop) {
@@ -1159,11 +1158,10 @@ button.circular {
     outline-color: rgba(238, 238, 236, 0.3);
     border-color: #0d0e11;
     border-bottom-color: black;
+    background-image: linear-gradient(to top, #20232b, #252831 1px), linear-gradient(to top, black 25%, #0d0e11 50%);
     text-shadow: 0 -1px rgba(0, 0, 0, 0.825255);
     -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.825255);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
-    background-image: linear-gradient(to top, #20232b, #252831 1px);
-    background-image: linear-gradient(to top, #20232b, #252831 1px), linear-gradient(to top, black 25%, #0d0e11 50%);
     border-color: transparent; }
 
 stacksidebar row.needs-attention > label, .stack-switcher > button.needs-attention > label,
@@ -1194,10 +1192,10 @@ stacksidebar row.needs-attention > label, .stack-switcher > button.needs-attenti
     outline-color: rgba(238, 238, 236, 0.3);
     border-color: #0d0e11;
     border-bottom-color: black;
+    background-image: linear-gradient(to top, #20232b, #252831 1px);
     text-shadow: 0 -1px rgba(0, 0, 0, 0.825255);
     -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.825255);
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
-    background-image: linear-gradient(to top, #20232b, #252831 1px); }
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27); }
   .inline-toolbar toolbutton > button:active, .inline-toolbar toolbutton > button:checked {
     color: #eeeeec;
     outline-color: rgba(238, 238, 236, 0.3);
@@ -1337,10 +1335,10 @@ list row button.image-button:not(.flat) {
     outline-color: rgba(238, 238, 236, 0.3);
     border-color: #0d0e11;
     border-bottom-color: black;
+    background-image: linear-gradient(to top, #20232b, #252831 1px);
     text-shadow: 0 -1px rgba(0, 0, 0, 0.825255);
     -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.825255);
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
-    background-image: linear-gradient(to top, #20232b, #252831 1px); }
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27); }
   list row button.image-button:not(.flat):active, list row button.image-button:not(.flat):checked {
     color: #eeeeec;
     outline-color: rgba(238, 238, 236, 0.3);
@@ -1757,10 +1755,10 @@ headerbar {
         outline-color: rgba(255, 255, 255, 0.3);
         border-color: #005af3;
         border-bottom-color: #0047c0;
+        background-image: linear-gradient(to top, #2274ff, #2c7aff 1px);
         text-shadow: 0 -1px rgba(0, 0, 0, 0.490824);
         -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.490824);
-        box-shadow: inset 0 1px rgba(255, 255, 255, 0.2), inset 0 -1px 0 rgba(0, 90, 243, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
-        background-image: linear-gradient(to top, #2274ff, #2c7aff 1px); }
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0.2), inset 0 -1px 0 rgba(0, 90, 243, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27); }
       .selection-mode .titlebar:not(headerbar) button:active, .selection-mode .titlebar:not(headerbar) button:checked, .selection-mode.titlebar:not(headerbar) button:active, .selection-mode.titlebar:not(headerbar) button:checked, .selection-mode headerbar button:active, .selection-mode headerbar button:checked, .selection-mode headerbar button.toggle:checked, .selection-mode headerbar button.toggle:active,
       headerbar.selection-mode button:active,
       headerbar.selection-mode button:checked,
@@ -1854,10 +1852,10 @@ headerbar {
           outline-color: rgba(238, 238, 236, 0.3);
           border-color: #0d0e11;
           border-bottom-color: black;
+          background-image: linear-gradient(to top, #20232b, #252831 1px);
           text-shadow: 0 -1px rgba(0, 0, 0, 0.825255);
           -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.825255);
           box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
-          background-image: linear-gradient(to top, #20232b, #252831 1px);
           border-color: #00348d; }
         .selection-mode .titlebar:not(headerbar) button.suggested-action:active, .selection-mode.titlebar:not(headerbar) button.suggested-action:active, .selection-mode headerbar button.suggested-action:active,
         headerbar.selection-mode button.suggested-action:active {
@@ -2138,7 +2136,7 @@ treeview.view header button, treeview.view header button:hover, treeview.view he
   padding: 0 6px;
   background-image: none;
   border-style: none solid solid none;
-  border-color: #23252e;
+  border-color: #4f5159;
   border-radius: 0;
   text-shadow: none; }
   treeview.view header button:disabled {
@@ -2728,8 +2726,8 @@ switch {
     color: #eeeeec;
     outline-color: rgba(238, 238, 236, 0.3);
     border-color: #040405;
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), 0 1px rgba(0, 0, 0, 0.3), inset 0 -1px 0 rgba(26, 28, 35, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
-    background-image: linear-gradient(to bottom, #303340 20%, #272a34 90%); }
+    background-image: linear-gradient(to bottom, #303340 20%, #272a34 90%);
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), 0 1px rgba(0, 0, 0, 0.3), inset 0 -1px 0 rgba(26, 28, 35, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27); }
   switch:checked > slider {
     border: 1px solid #00215a; }
   switch:disabled slider {
@@ -3188,8 +3186,8 @@ scale {
       color: #eeeeec;
       outline-color: rgba(238, 238, 236, 0.3);
       border-color: black;
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), 0 1px rgba(0, 0, 0, 0.3), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
-      background-image: linear-gradient(to bottom, #23252e 20%, #1a1c23 90%); }
+      background-image: linear-gradient(to bottom, #23252e 20%, #1a1c23 90%);
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), 0 1px rgba(0, 0, 0, 0.3), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27); }
     scale slider:active {
       border-color: #00348d; }
     scale slider:disabled {
@@ -4295,10 +4293,10 @@ infobar {
         outline-color: rgba(238, 238, 236, 0.3);
         border-color: #0d0e11;
         border-bottom-color: black;
+        background-image: linear-gradient(to top, #20232b, #252831 1px);
         text-shadow: 0 -1px rgba(0, 0, 0, 0.825255);
         -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.825255);
-        box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
-        background-image: linear-gradient(to top, #20232b, #252831 1px); }
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27); }
       infobar.info button:active, infobar.info button:checked, infobar.question button:active, infobar.question button:checked, infobar.warning button:active, infobar.warning button:checked, infobar.error button:active, infobar.error button:checked {
         color: #eeeeec;
         outline-color: rgba(238, 238, 236, 0.3);
@@ -4444,10 +4442,10 @@ colorswatch#add-color-button {
       outline-color: rgba(238, 238, 236, 0.3);
       border-color: #0d0e11;
       border-bottom-color: black;
+      background-image: linear-gradient(to top, #20232b, #252831 1px);
       text-shadow: 0 -1px rgba(0, 0, 0, 0.825255);
       -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.825255);
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
-      background-image: linear-gradient(to top, #20232b, #252831 1px); }
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27); }
     colorswatch#add-color-button overlay:backdrop {
       color: #888a8d;
       border-color: #16171d;
@@ -4783,33 +4781,41 @@ row.expander {
   row.expander image.expander-row-arrow:disabled {
     color: #888a8d; }
 
+flap > dimming,
 deck > dimming,
 leaflet > dimming {
   background: rgba(0, 0, 0, 0.24); }
 
+flap > border,
 deck > border,
 leaflet > border {
   min-width: 1px;
   min-height: 1px;
   background: #0d0e11; }
 
+flap > shadow,
 deck > shadow,
 leaflet > shadow {
   min-width: 56px;
   min-height: 56px; }
+  flap > shadow.left,
   deck > shadow.left,
   leaflet > shadow.left {
     background-image: linear-gradient(to right, rgba(0, 0, 0, 0.1), rgba(0, 0, 0, 0.02) 40px, rgba(0, 0, 0, 0) 56px), linear-gradient(to right, rgba(0, 0, 0, 0.06), rgba(0, 0, 0, 0.02) 7px, rgba(0, 0, 0, 0) 24px); }
+  flap > shadow.right,
   deck > shadow.right,
   leaflet > shadow.right {
     background-image: linear-gradient(to left, rgba(0, 0, 0, 0.1), rgba(0, 0, 0, 0.02) 40px, rgba(0, 0, 0, 0) 56px), linear-gradient(to left, rgba(0, 0, 0, 0.06), rgba(0, 0, 0, 0.02) 7px, rgba(0, 0, 0, 0) 24px); }
+  flap > shadow.up,
   deck > shadow.up,
   leaflet > shadow.up {
     background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1), rgba(0, 0, 0, 0.02) 40px, rgba(0, 0, 0, 0) 56px), linear-gradient(to bottom, rgba(0, 0, 0, 0.06), rgba(0, 0, 0, 0.02) 7px, rgba(0, 0, 0, 0) 24px); }
+  flap > shadow.down,
   deck > shadow.down,
   leaflet > shadow.down {
     background-image: linear-gradient(to top, rgba(0, 0, 0, 0.1), rgba(0, 0, 0, 0.02) 40px, rgba(0, 0, 0, 0) 56px), linear-gradient(to top, rgba(0, 0, 0, 0.06), rgba(0, 0, 0, 0.02) 7px, rgba(0, 0, 0, 0) 24px); }
 
+flap > outline,
 deck > outline,
 leaflet > outline {
   min-width: 1px;
@@ -4864,11 +4870,23 @@ avatar {
     color: #d8d7d3; }
   avatar.contrasted {
     color: #fff; }
+  avatar.image {
+    background: none; }
 
 viewswitchertitle viewswitcher {
   margin-left: 12px;
   margin-right: 12px; }
 
+statuspage > scrolledwindow > viewport > box {
+  margin: 36px 12px; }
+  statuspage > scrolledwindow > viewport > box > clamp > box > .icon {
+    margin-bottom: 36px;
+    opacity: 0.5; }
+  statuspage > scrolledwindow > viewport > box > clamp > box > .title {
+    margin-bottom: 12px; }
+  statuspage > scrolledwindow > viewport > box > clamp > box > .description {
+    margin-bottom: 36px; }
+
 /***************************
  * Check and Radio buttons *
  ***************************/
@@ -5270,10 +5288,10 @@ notebook > header {
         outline-color: rgba(238, 238, 236, 0.3);
         border-color: #0d0e11;
         border-bottom-color: black;
+        background-image: linear-gradient(to top, #20232b, #252831 1px);
         text-shadow: 0 -1px rgba(0, 0, 0, 0.825255);
         -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.825255);
-        box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
-        background-image: linear-gradient(to top, #20232b, #252831 1px); }
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27); }
       notebook > header.top > tabs > tab:checked,
       notebook > header.top > tabs > tab.reorderable-page:checked, notebook > header.bottom > tabs > tab:checked,
       notebook > header.bottom > tabs > tab.reorderable-page:checked, notebook > header.left > tabs > tab:checked,
@@ -5347,10 +5365,10 @@ infobar.info button, infobar.info.action:hover button {
     outline-color: rgba(255, 255, 255, 0.3);
     border-color: #005af3;
     border-bottom-color: #0047c0;
+    background-image: linear-gradient(to top, #2274ff, #2c7aff 1px);
     text-shadow: 0 -1px rgba(0, 0, 0, 0.490824);
     -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.490824);
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0.2), inset 0 -1px 0 rgba(0, 90, 243, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
-    background-image: linear-gradient(to top, #2274ff, #2c7aff 1px); }
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.2), inset 0 -1px 0 rgba(0, 90, 243, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27); }
   infobar.info button:active, infobar.info button:checked, infobar.info.action:hover button:active, infobar.info.action:hover button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
@@ -5402,10 +5420,10 @@ infobar.question button, infobar.warning button, infobar.question.action:hover b
     outline-color: rgba(255, 255, 255, 0.3);
     border-color: #ca6400;
     border-bottom-color: #974b00;
+    background-image: linear-gradient(to top, #f87a00, #ff8003 1px);
     text-shadow: 0 -1px rgba(0, 0, 0, 0.555137);
     -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.555137);
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), inset 0 -1px 0 rgba(202, 100, 0, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
-    background-image: linear-gradient(to top, #f87a00, #ff8003 1px); }
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), inset 0 -1px 0 rgba(202, 100, 0, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27); }
   infobar.question button:active, infobar.question button:checked, infobar.warning button:active, infobar.warning button:checked, infobar.question.action:hover button:active, infobar.question.action:hover button:checked, infobar.warning.action:hover button:active, infobar.warning.action:hover button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
@@ -5456,10 +5474,10 @@ infobar.error:backdrop > revealer > box, infobar.error > revealer > box, infobar
       outline-color: rgba(255, 255, 255, 0.3);
       border-color: #911212;
       border-bottom-color: #640c0c;
+      background-image: linear-gradient(to top, #ba1616, #c41818 1px);
       text-shadow: 0 -1px rgba(0, 0, 0, 0.616314);
       -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.616314);
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0 rgba(145, 18, 18, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
-      background-image: linear-gradient(to top, #ba1616, #c41818 1px); }
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0 rgba(145, 18, 18, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27); }
     infobar.error:backdrop > revealer > box button:active, infobar.error:backdrop > revealer > box button:checked, infobar.error > revealer > box button:active, infobar.error > revealer > box button:checked, infobar.error.action:hover:backdrop > revealer > box button:active, infobar.error.action:hover:backdrop > revealer > box button:checked, infobar.error.action:hover > revealer > box button:active, infobar.error.action:hover > revealer > box button:checked {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
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 aa1aa432..5dbaeb43 100644
--- a/share/themes/Kali-Light/gtk-3.0/gtk-dark.css
+++ b/share/themes/Kali-Light/gtk-3.0/gtk-dark.css
@@ -518,10 +518,10 @@ button {
     outline-color: rgba(238, 238, 236, 0.3);
     border-color: #0d0e11;
     border-bottom-color: black;
+    background-image: linear-gradient(to top, #20232b, #252831 1px);
     text-shadow: 0 -1px rgba(0, 0, 0, 0.825255);
     -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.825255);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
-    background-image: linear-gradient(to top, #20232b, #252831 1px);
     -gtk-icon-effect: highlight; }
   notebook > header > tabs > arrow:active, notebook > header > tabs > arrow:checked,
   button:active,
@@ -821,10 +821,10 @@ button.suggested-action {
     outline-color: rgba(255, 255, 255, 0.3);
     border-color: #005af3;
     border-bottom-color: #0047c0;
+    background-image: linear-gradient(to top, #2274ff, #2c7aff 1px);
     text-shadow: 0 -1px rgba(0, 0, 0, 0.490824);
     -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.490824);
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0.2), inset 0 -1px 0 rgba(0, 90, 243, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
-    background-image: linear-gradient(to top, #2274ff, #2c7aff 1px); }
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.2), inset 0 -1px 0 rgba(0, 90, 243, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27); }
   
   button.suggested-action:active,
   button.suggested-action:checked {
@@ -971,10 +971,10 @@ button.destructive-action {
     outline-color: rgba(255, 255, 255, 0.3);
     border-color: #790e0e;
     border-bottom-color: #4b0909;
+    background-image: linear-gradient(to top, #a21313, #ab1414 1px);
     text-shadow: 0 -1px rgba(0, 0, 0, 0.660235);
     -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.660235);
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0 rgba(121, 14, 14, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
-    background-image: linear-gradient(to top, #a21313, #ab1414 1px); }
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0 rgba(121, 14, 14, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27); }
   
   button.destructive-action:active,
   button.destructive-action:checked {
@@ -1147,11 +1147,10 @@ button.circular {
     outline-color: rgba(238, 238, 236, 0.3);
     border-color: #0d0e11;
     border-bottom-color: black;
-    background-image: linear-gradient(to top, #292c37 2px, #2e313d);
+    background-image: linear-gradient(to top, #292c37 2px, #2e313d), linear-gradient(to top, black 25%, #0d0e11 50%);
     text-shadow: 0 -1px rgba(0, 0, 0, 0.873255);
     -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.873255);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
-    background-image: linear-gradient(to top, #292c37 2px, #2e313d), linear-gradient(to top, black 25%, #0d0e11 50%);
     border-color: transparent; }
   
   button.circular:hover:not(.osd):not(:checked):not(:active):not(:disabled):not(:backdrop) {
@@ -1159,11 +1158,10 @@ button.circular {
     outline-color: rgba(238, 238, 236, 0.3);
     border-color: #0d0e11;
     border-bottom-color: black;
+    background-image: linear-gradient(to top, #20232b, #252831 1px), linear-gradient(to top, black 25%, #0d0e11 50%);
     text-shadow: 0 -1px rgba(0, 0, 0, 0.825255);
     -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.825255);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
-    background-image: linear-gradient(to top, #20232b, #252831 1px);
-    background-image: linear-gradient(to top, #20232b, #252831 1px), linear-gradient(to top, black 25%, #0d0e11 50%);
     border-color: transparent; }
 
 stacksidebar row.needs-attention > label, .stack-switcher > button.needs-attention > label,
@@ -1194,10 +1192,10 @@ stacksidebar row.needs-attention > label, .stack-switcher > button.needs-attenti
     outline-color: rgba(238, 238, 236, 0.3);
     border-color: #0d0e11;
     border-bottom-color: black;
+    background-image: linear-gradient(to top, #20232b, #252831 1px);
     text-shadow: 0 -1px rgba(0, 0, 0, 0.825255);
     -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.825255);
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
-    background-image: linear-gradient(to top, #20232b, #252831 1px); }
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27); }
   .inline-toolbar toolbutton > button:active, .inline-toolbar toolbutton > button:checked {
     color: #eeeeec;
     outline-color: rgba(238, 238, 236, 0.3);
@@ -1337,10 +1335,10 @@ list row button.image-button:not(.flat) {
     outline-color: rgba(238, 238, 236, 0.3);
     border-color: #0d0e11;
     border-bottom-color: black;
+    background-image: linear-gradient(to top, #20232b, #252831 1px);
     text-shadow: 0 -1px rgba(0, 0, 0, 0.825255);
     -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.825255);
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
-    background-image: linear-gradient(to top, #20232b, #252831 1px); }
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27); }
   list row button.image-button:not(.flat):active, list row button.image-button:not(.flat):checked {
     color: #eeeeec;
     outline-color: rgba(238, 238, 236, 0.3);
@@ -1757,10 +1755,10 @@ headerbar {
         outline-color: rgba(255, 255, 255, 0.3);
         border-color: #005af3;
         border-bottom-color: #0047c0;
+        background-image: linear-gradient(to top, #2274ff, #2c7aff 1px);
         text-shadow: 0 -1px rgba(0, 0, 0, 0.490824);
         -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.490824);
-        box-shadow: inset 0 1px rgba(255, 255, 255, 0.2), inset 0 -1px 0 rgba(0, 90, 243, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
-        background-image: linear-gradient(to top, #2274ff, #2c7aff 1px); }
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0.2), inset 0 -1px 0 rgba(0, 90, 243, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27); }
       .selection-mode .titlebar:not(headerbar) button:active, .selection-mode .titlebar:not(headerbar) button:checked, .selection-mode.titlebar:not(headerbar) button:active, .selection-mode.titlebar:not(headerbar) button:checked, .selection-mode headerbar button:active, .selection-mode headerbar button:checked, .selection-mode headerbar button.toggle:checked, .selection-mode headerbar button.toggle:active,
       headerbar.selection-mode button:active,
       headerbar.selection-mode button:checked,
@@ -1854,10 +1852,10 @@ headerbar {
           outline-color: rgba(238, 238, 236, 0.3);
           border-color: #0d0e11;
           border-bottom-color: black;
+          background-image: linear-gradient(to top, #20232b, #252831 1px);
           text-shadow: 0 -1px rgba(0, 0, 0, 0.825255);
           -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.825255);
           box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
-          background-image: linear-gradient(to top, #20232b, #252831 1px);
           border-color: #00348d; }
         .selection-mode .titlebar:not(headerbar) button.suggested-action:active, .selection-mode.titlebar:not(headerbar) button.suggested-action:active, .selection-mode headerbar button.suggested-action:active,
         headerbar.selection-mode button.suggested-action:active {
@@ -2138,7 +2136,7 @@ treeview.view header button, treeview.view header button:hover, treeview.view he
   padding: 0 6px;
   background-image: none;
   border-style: none solid solid none;
-  border-color: #23252e;
+  border-color: #4f5159;
   border-radius: 0;
   text-shadow: none; }
   treeview.view header button:disabled {
@@ -2728,8 +2726,8 @@ switch {
     color: #eeeeec;
     outline-color: rgba(238, 238, 236, 0.3);
     border-color: #040405;
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), 0 1px rgba(0, 0, 0, 0.3), inset 0 -1px 0 rgba(26, 28, 35, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
-    background-image: linear-gradient(to bottom, #303340 20%, #272a34 90%); }
+    background-image: linear-gradient(to bottom, #303340 20%, #272a34 90%);
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), 0 1px rgba(0, 0, 0, 0.3), inset 0 -1px 0 rgba(26, 28, 35, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27); }
   switch:checked > slider {
     border: 1px solid #00215a; }
   switch:disabled slider {
@@ -3188,8 +3186,8 @@ scale {
       color: #eeeeec;
       outline-color: rgba(238, 238, 236, 0.3);
       border-color: black;
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), 0 1px rgba(0, 0, 0, 0.3), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
-      background-image: linear-gradient(to bottom, #23252e 20%, #1a1c23 90%); }
+      background-image: linear-gradient(to bottom, #23252e 20%, #1a1c23 90%);
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), 0 1px rgba(0, 0, 0, 0.3), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27); }
     scale slider:active {
       border-color: #00348d; }
     scale slider:disabled {
@@ -4295,10 +4293,10 @@ infobar {
         outline-color: rgba(238, 238, 236, 0.3);
         border-color: #0d0e11;
         border-bottom-color: black;
+        background-image: linear-gradient(to top, #20232b, #252831 1px);
         text-shadow: 0 -1px rgba(0, 0, 0, 0.825255);
         -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.825255);
-        box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
-        background-image: linear-gradient(to top, #20232b, #252831 1px); }
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27); }
       infobar.info button:active, infobar.info button:checked, infobar.question button:active, infobar.question button:checked, infobar.warning button:active, infobar.warning button:checked, infobar.error button:active, infobar.error button:checked {
         color: #eeeeec;
         outline-color: rgba(238, 238, 236, 0.3);
@@ -4444,10 +4442,10 @@ colorswatch#add-color-button {
       outline-color: rgba(238, 238, 236, 0.3);
       border-color: #0d0e11;
       border-bottom-color: black;
+      background-image: linear-gradient(to top, #20232b, #252831 1px);
       text-shadow: 0 -1px rgba(0, 0, 0, 0.825255);
       -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.825255);
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
-      background-image: linear-gradient(to top, #20232b, #252831 1px); }
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27); }
     colorswatch#add-color-button overlay:backdrop {
       color: #888a8d;
       border-color: #16171d;
@@ -4783,33 +4781,41 @@ row.expander {
   row.expander image.expander-row-arrow:disabled {
     color: #888a8d; }
 
+flap > dimming,
 deck > dimming,
 leaflet > dimming {
   background: rgba(0, 0, 0, 0.24); }
 
+flap > border,
 deck > border,
 leaflet > border {
   min-width: 1px;
   min-height: 1px;
   background: #0d0e11; }
 
+flap > shadow,
 deck > shadow,
 leaflet > shadow {
   min-width: 56px;
   min-height: 56px; }
+  flap > shadow.left,
   deck > shadow.left,
   leaflet > shadow.left {
     background-image: linear-gradient(to right, rgba(0, 0, 0, 0.1), rgba(0, 0, 0, 0.02) 40px, rgba(0, 0, 0, 0) 56px), linear-gradient(to right, rgba(0, 0, 0, 0.06), rgba(0, 0, 0, 0.02) 7px, rgba(0, 0, 0, 0) 24px); }
+  flap > shadow.right,
   deck > shadow.right,
   leaflet > shadow.right {
     background-image: linear-gradient(to left, rgba(0, 0, 0, 0.1), rgba(0, 0, 0, 0.02) 40px, rgba(0, 0, 0, 0) 56px), linear-gradient(to left, rgba(0, 0, 0, 0.06), rgba(0, 0, 0, 0.02) 7px, rgba(0, 0, 0, 0) 24px); }
+  flap > shadow.up,
   deck > shadow.up,
   leaflet > shadow.up {
     background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1), rgba(0, 0, 0, 0.02) 40px, rgba(0, 0, 0, 0) 56px), linear-gradient(to bottom, rgba(0, 0, 0, 0.06), rgba(0, 0, 0, 0.02) 7px, rgba(0, 0, 0, 0) 24px); }
+  flap > shadow.down,
   deck > shadow.down,
   leaflet > shadow.down {
     background-image: linear-gradient(to top, rgba(0, 0, 0, 0.1), rgba(0, 0, 0, 0.02) 40px, rgba(0, 0, 0, 0) 56px), linear-gradient(to top, rgba(0, 0, 0, 0.06), rgba(0, 0, 0, 0.02) 7px, rgba(0, 0, 0, 0) 24px); }
 
+flap > outline,
 deck > outline,
 leaflet > outline {
   min-width: 1px;
@@ -4864,11 +4870,23 @@ avatar {
     color: #d8d7d3; }
   avatar.contrasted {
     color: #fff; }
+  avatar.image {
+    background: none; }
 
 viewswitchertitle viewswitcher {
   margin-left: 12px;
   margin-right: 12px; }
 
+statuspage > scrolledwindow > viewport > box {
+  margin: 36px 12px; }
+  statuspage > scrolledwindow > viewport > box > clamp > box > .icon {
+    margin-bottom: 36px;
+    opacity: 0.5; }
+  statuspage > scrolledwindow > viewport > box > clamp > box > .title {
+    margin-bottom: 12px; }
+  statuspage > scrolledwindow > viewport > box > clamp > box > .description {
+    margin-bottom: 36px; }
+
 /***************************
  * Check and Radio buttons *
  ***************************/
@@ -5270,10 +5288,10 @@ notebook > header {
         outline-color: rgba(238, 238, 236, 0.3);
         border-color: #0d0e11;
         border-bottom-color: black;
+        background-image: linear-gradient(to top, #20232b, #252831 1px);
         text-shadow: 0 -1px rgba(0, 0, 0, 0.825255);
         -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.825255);
-        box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
-        background-image: linear-gradient(to top, #20232b, #252831 1px); }
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27); }
       notebook > header.top > tabs > tab:checked,
       notebook > header.top > tabs > tab.reorderable-page:checked, notebook > header.bottom > tabs > tab:checked,
       notebook > header.bottom > tabs > tab.reorderable-page:checked, notebook > header.left > tabs > tab:checked,
@@ -5347,10 +5365,10 @@ infobar.info button, infobar.info.action:hover button {
     outline-color: rgba(255, 255, 255, 0.3);
     border-color: #005af3;
     border-bottom-color: #0047c0;
+    background-image: linear-gradient(to top, #2274ff, #2c7aff 1px);
     text-shadow: 0 -1px rgba(0, 0, 0, 0.490824);
     -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.490824);
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0.2), inset 0 -1px 0 rgba(0, 90, 243, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
-    background-image: linear-gradient(to top, #2274ff, #2c7aff 1px); }
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.2), inset 0 -1px 0 rgba(0, 90, 243, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27); }
   infobar.info button:active, infobar.info button:checked, infobar.info.action:hover button:active, infobar.info.action:hover button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
@@ -5402,10 +5420,10 @@ infobar.question button, infobar.warning button, infobar.question.action:hover b
     outline-color: rgba(255, 255, 255, 0.3);
     border-color: #ca6400;
     border-bottom-color: #974b00;
+    background-image: linear-gradient(to top, #f87a00, #ff8003 1px);
     text-shadow: 0 -1px rgba(0, 0, 0, 0.555137);
     -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.555137);
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), inset 0 -1px 0 rgba(202, 100, 0, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
-    background-image: linear-gradient(to top, #f87a00, #ff8003 1px); }
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), inset 0 -1px 0 rgba(202, 100, 0, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27); }
   infobar.question button:active, infobar.question button:checked, infobar.warning button:active, infobar.warning button:checked, infobar.question.action:hover button:active, infobar.question.action:hover button:checked, infobar.warning.action:hover button:active, infobar.warning.action:hover button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
@@ -5456,10 +5474,10 @@ infobar.error:backdrop > revealer > box, infobar.error > revealer > box, infobar
       outline-color: rgba(255, 255, 255, 0.3);
       border-color: #911212;
       border-bottom-color: #640c0c;
+      background-image: linear-gradient(to top, #ba1616, #c41818 1px);
       text-shadow: 0 -1px rgba(0, 0, 0, 0.616314);
       -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.616314);
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0 rgba(145, 18, 18, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
-      background-image: linear-gradient(to top, #ba1616, #c41818 1px); }
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0 rgba(145, 18, 18, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27); }
     infobar.error:backdrop > revealer > box button:active, infobar.error:backdrop > revealer > box button:checked, infobar.error > revealer > box button:active, infobar.error > revealer > box button:checked, infobar.error.action:hover:backdrop > revealer > box button:active, infobar.error.action:hover:backdrop > revealer > box button:checked, infobar.error.action:hover > revealer > box button:active, infobar.error.action:hover > revealer > box button:checked {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
diff --git a/share/themes/Kali-Light/gtk-3.0/gtk.css b/share/themes/Kali-Light/gtk-3.0/gtk.css
index b10a5b6f..a45a4477 100644
--- a/share/themes/Kali-Light/gtk-3.0/gtk.css
+++ b/share/themes/Kali-Light/gtk-3.0/gtk.css
@@ -518,10 +518,10 @@ button {
     outline-color: rgba(92, 97, 108, 0.3);
     border-color: #d9d9d9;
     border-bottom-color: #c2c2c2;
+    background-image: linear-gradient(to top, #ffffff, white 1px);
     text-shadow: 0 1px rgba(255, 255, 255, 0.769231);
     -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231);
     box-shadow: inset 0 1px white, inset 0 -1px 0 rgba(217, 217, 217, 0.75), 0 1px 2px rgba(0, 0, 0, 0.07);
-    background-image: linear-gradient(to top, #ffffff, white 1px);
     -gtk-icon-effect: highlight; }
   notebook > header > tabs > arrow:active, notebook > header > tabs > arrow:checked,
   button:active,
@@ -824,10 +824,10 @@ button.suggested-action {
     outline-color: rgba(255, 255, 255, 0.3);
     border-color: #005af3;
     border-bottom-color: #0047c0;
+    background-image: linear-gradient(to top, #2777ff, #2c7aff 1px);
     text-shadow: 0 -1px rgba(0, 0, 0, 0.490824);
     -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.490824);
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0.2), inset 0 -1px 0 rgba(0, 90, 243, 0.75), 0 1px 2px rgba(0, 0, 0, 0.07);
-    background-image: linear-gradient(to top, #2777ff, #2c7aff 1px); }
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.2), inset 0 -1px 0 rgba(0, 90, 243, 0.75), 0 1px 2px rgba(0, 0, 0, 0.07); }
   
   button.suggested-action:active,
   button.suggested-action:checked {
@@ -974,10 +974,10 @@ button.destructive-action {
     outline-color: rgba(255, 255, 255, 0.3);
     border-color: #a61414;
     border-bottom-color: #790e0e;
+    background-image: linear-gradient(to top, #d41919, #d91a1a 1px);
     text-shadow: 0 -1px rgba(0, 0, 0, 0.580235);
     -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.580235);
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0.2), inset 0 -1px 0 rgba(166, 20, 20, 0.75), 0 1px 2px rgba(0, 0, 0, 0.07);
-    background-image: linear-gradient(to top, #d41919, #d91a1a 1px); }
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.2), inset 0 -1px 0 rgba(166, 20, 20, 0.75), 0 1px 2px rgba(0, 0, 0, 0.07); }
   
   button.destructive-action:active,
   button.destructive-action:checked {
@@ -1150,11 +1150,10 @@ button.circular {
     outline-color: rgba(92, 97, 108, 0.3);
     border-color: #d9d9d9;
     border-bottom-color: #c2c2c2;
-    background-image: linear-gradient(to top, white 2px, white);
+    background-image: linear-gradient(to top, white 2px, white), linear-gradient(to top, #c2c2c2 25%, #d9d9d9 50%);
     text-shadow: 0 1px rgba(255, 255, 255, 0.769231);
     -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231);
     box-shadow: inset 0 1px white, inset 0 -1px 0 rgba(217, 217, 217, 0.75), 0 1px 2px rgba(0, 0, 0, 0.07);
-    background-image: linear-gradient(to top, white 2px, white), linear-gradient(to top, #c2c2c2 25%, #d9d9d9 50%);
     border-color: transparent; }
   
   button.circular:hover:not(.osd):not(:checked):not(:active):not(:disabled):not(:backdrop) {
@@ -1162,11 +1161,10 @@ button.circular {
     outline-color: rgba(92, 97, 108, 0.3);
     border-color: #d9d9d9;
     border-bottom-color: #c2c2c2;
+    background-image: linear-gradient(to top, #ffffff, white 1px), linear-gradient(to top, #c2c2c2 25%, #d9d9d9 50%);
     text-shadow: 0 1px rgba(255, 255, 255, 0.769231);
     -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231);
     box-shadow: inset 0 1px white, inset 0 -1px 0 rgba(217, 217, 217, 0.75), 0 1px 2px rgba(0, 0, 0, 0.07);
-    background-image: linear-gradient(to top, #ffffff, white 1px);
-    background-image: linear-gradient(to top, #ffffff, white 1px), linear-gradient(to top, #c2c2c2 25%, #d9d9d9 50%);
     border-color: transparent; }
 
 stacksidebar row.needs-attention > label, .stack-switcher > button.needs-attention > label,
@@ -1197,10 +1195,10 @@ stacksidebar row.needs-attention > label, .stack-switcher > button.needs-attenti
     outline-color: rgba(92, 97, 108, 0.3);
     border-color: #d9d9d9;
     border-bottom-color: #c2c2c2;
+    background-image: linear-gradient(to top, #ffffff, white 1px);
     text-shadow: 0 1px rgba(255, 255, 255, 0.769231);
     -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231);
-    box-shadow: inset 0 1px white, inset 0 -1px 0 rgba(217, 217, 217, 0.75), 0 1px 2px rgba(0, 0, 0, 0.07);
-    background-image: linear-gradient(to top, #ffffff, white 1px); }
+    box-shadow: inset 0 1px white, inset 0 -1px 0 rgba(217, 217, 217, 0.75), 0 1px 2px rgba(0, 0, 0, 0.07); }
   .inline-toolbar toolbutton > button:active, .inline-toolbar toolbutton > button:checked {
     color: #5c616c;
     outline-color: rgba(92, 97, 108, 0.3);
@@ -1346,10 +1344,10 @@ list row button.image-button:not(.flat) {
     outline-color: rgba(92, 97, 108, 0.3);
     border-color: #d9d9d9;
     border-bottom-color: #c2c2c2;
+    background-image: linear-gradient(to top, #ffffff, white 1px);
     text-shadow: 0 1px rgba(255, 255, 255, 0.769231);
     -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231);
-    box-shadow: inset 0 1px white, inset 0 -1px 0 rgba(217, 217, 217, 0.75), 0 1px 2px rgba(0, 0, 0, 0.07);
-    background-image: linear-gradient(to top, #ffffff, white 1px); }
+    box-shadow: inset 0 1px white, inset 0 -1px 0 rgba(217, 217, 217, 0.75), 0 1px 2px rgba(0, 0, 0, 0.07); }
   list row button.image-button:not(.flat):active, list row button.image-button:not(.flat):checked {
     color: #5c616c;
     outline-color: rgba(92, 97, 108, 0.3);
@@ -1766,10 +1764,10 @@ headerbar {
         outline-color: rgba(255, 255, 255, 0.3);
         border-color: #005af3;
         border-bottom-color: #0047c0;
+        background-image: linear-gradient(to top, #2777ff, #2c7aff 1px);
         text-shadow: 0 -1px rgba(0, 0, 0, 0.490824);
         -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.490824);
-        box-shadow: inset 0 1px rgba(255, 255, 255, 0.2), inset 0 -1px 0 rgba(0, 90, 243, 0.75), 0 1px 2px rgba(0, 0, 0, 0.07);
-        background-image: linear-gradient(to top, #2777ff, #2c7aff 1px); }
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0.2), inset 0 -1px 0 rgba(0, 90, 243, 0.75), 0 1px 2px rgba(0, 0, 0, 0.07); }
       .selection-mode .titlebar:not(headerbar) button:active, .selection-mode .titlebar:not(headerbar) button:checked, .selection-mode.titlebar:not(headerbar) button:active, .selection-mode.titlebar:not(headerbar) button:checked, .selection-mode headerbar button:active, .selection-mode headerbar button:checked, .selection-mode headerbar button.toggle:checked, .selection-mode headerbar button.toggle:active,
       headerbar.selection-mode button:active,
       headerbar.selection-mode button:checked,
@@ -1863,10 +1861,10 @@ headerbar {
           outline-color: rgba(92, 97, 108, 0.3);
           border-color: #d9d9d9;
           border-bottom-color: #c2c2c2;
+          background-image: linear-gradient(to top, #ffffff, white 1px);
           text-shadow: 0 1px rgba(255, 255, 255, 0.769231);
           -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231);
           box-shadow: inset 0 1px white, inset 0 -1px 0 rgba(217, 217, 217, 0.75), 0 1px 2px rgba(0, 0, 0, 0.07);
-          background-image: linear-gradient(to top, #ffffff, white 1px);
           border-color: #0051da; }
         .selection-mode .titlebar:not(headerbar) button.suggested-action:active, .selection-mode.titlebar:not(headerbar) button.suggested-action:active, .selection-mode headerbar button.suggested-action:active,
         headerbar.selection-mode button.suggested-action:active {
@@ -2149,7 +2147,7 @@ treeview.view header button, treeview.view header button:hover, treeview.view he
   padding: 0 6px;
   background-image: none;
   border-style: none solid solid none;
-  border-color: #ffffff;
+  border-color: #dfdfdf;
   border-radius: 0;
   text-shadow: none; }
   treeview.view header button:disabled {
@@ -2740,8 +2738,8 @@ switch {
     color: #5c616c;
     outline-color: rgba(92, 97, 108, 0.3);
     border-color: #c2c2c2;
-    box-shadow: inset 0 1px white, 0 1px rgba(0, 0, 0, 0.1), inset 0 -1px 0 rgba(217, 217, 217, 0.75), 0 1px 2px rgba(0, 0, 0, 0.07);
-    background-image: linear-gradient(to bottom, white 10%, white 90%); }
+    background-image: linear-gradient(to bottom, white 10%, white 90%);
+    box-shadow: inset 0 1px white, 0 1px rgba(0, 0, 0, 0.1), inset 0 -1px 0 rgba(217, 217, 217, 0.75), 0 1px 2px rgba(0, 0, 0, 0.07); }
   switch:checked > slider {
     border: 1px solid #0047c0; }
   switch:disabled slider {
@@ -3210,8 +3208,8 @@ scale {
       color: #5c616c;
       outline-color: rgba(92, 97, 108, 0.3);
       border-color: #c2c2c2;
-      box-shadow: inset 0 1px white, 0 1px rgba(0, 0, 0, 0.1), inset 0 -1px 0 rgba(217, 217, 217, 0.75), 0 1px 2px rgba(0, 0, 0, 0.07);
-      background-image: linear-gradient(to bottom, white 10%, white 90%); }
+      background-image: linear-gradient(to bottom, white 10%, white 90%);
+      box-shadow: inset 0 1px white, 0 1px rgba(0, 0, 0, 0.1), inset 0 -1px 0 rgba(217, 217, 217, 0.75), 0 1px 2px rgba(0, 0, 0, 0.07); }
     scale slider:active {
       border-color: #0051da; }
     scale slider:disabled {
@@ -4317,10 +4315,10 @@ infobar {
         outline-color: rgba(92, 97, 108, 0.3);
         border-color: #d9d9d9;
         border-bottom-color: #c2c2c2;
+        background-image: linear-gradient(to top, #ffffff, white 1px);
         text-shadow: 0 1px rgba(255, 255, 255, 0.769231);
         -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231);
-        box-shadow: inset 0 1px white, inset 0 -1px 0 rgba(217, 217, 217, 0.75), 0 1px 2px rgba(0, 0, 0, 0.07);
-        background-image: linear-gradient(to top, #ffffff, white 1px); }
+        box-shadow: inset 0 1px white, inset 0 -1px 0 rgba(217, 217, 217, 0.75), 0 1px 2px rgba(0, 0, 0, 0.07); }
       infobar.info button:active, infobar.info button:checked, infobar.question button:active, infobar.question button:checked, infobar.warning button:active, infobar.warning button:checked, infobar.error button:active, infobar.error button:checked {
         color: #5c616c;
         outline-color: rgba(92, 97, 108, 0.3);
@@ -4466,10 +4464,10 @@ colorswatch#add-color-button {
       outline-color: rgba(92, 97, 108, 0.3);
       border-color: #d9d9d9;
       border-bottom-color: #c2c2c2;
+      background-image: linear-gradient(to top, #ffffff, white 1px);
       text-shadow: 0 1px rgba(255, 255, 255, 0.769231);
       -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231);
-      box-shadow: inset 0 1px white, inset 0 -1px 0 rgba(217, 217, 217, 0.75), 0 1px 2px rgba(0, 0, 0, 0.07);
-      background-image: linear-gradient(to top, #ffffff, white 1px); }
+      box-shadow: inset 0 1px white, inset 0 -1px 0 rgba(217, 217, 217, 0.75), 0 1px 2px rgba(0, 0, 0, 0.07); }
     colorswatch#add-color-button overlay:backdrop {
       color: #aeb0b6;
       border-color: #e0e0e0;
@@ -4805,33 +4803,41 @@ row.expander {
   row.expander image.expander-row-arrow:disabled {
     color: #aeb0b6; }
 
+flap > dimming,
 deck > dimming,
 leaflet > dimming {
   background: rgba(0, 0, 0, 0.12); }
 
+flap > border,
 deck > border,
 leaflet > border {
   min-width: 1px;
   min-height: 1px;
   background: #d9d9d9; }
 
+flap > shadow,
 deck > shadow,
 leaflet > shadow {
   min-width: 56px;
   min-height: 56px; }
+  flap > shadow.left,
   deck > shadow.left,
   leaflet > shadow.left {
     background-image: linear-gradient(to right, rgba(0, 0, 0, 0.05), rgba(0, 0, 0, 0.01) 40px, rgba(0, 0, 0, 0) 56px), linear-gradient(to right, rgba(0, 0, 0, 0.03), rgba(0, 0, 0, 0.01) 7px, rgba(0, 0, 0, 0) 24px); }
+  flap > shadow.right,
   deck > shadow.right,
   leaflet > shadow.right {
     background-image: linear-gradient(to left, rgba(0, 0, 0, 0.05), rgba(0, 0, 0, 0.01) 40px, rgba(0, 0, 0, 0) 56px), linear-gradient(to left, rgba(0, 0, 0, 0.03), rgba(0, 0, 0, 0.01) 7px, rgba(0, 0, 0, 0) 24px); }
+  flap > shadow.up,
   deck > shadow.up,
   leaflet > shadow.up {
     background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.05), rgba(0, 0, 0, 0.01) 40px, rgba(0, 0, 0, 0) 56px), linear-gradient(to bottom, rgba(0, 0, 0, 0.03), rgba(0, 0, 0, 0.01) 7px, rgba(0, 0, 0, 0) 24px); }
+  flap > shadow.down,
   deck > shadow.down,
   leaflet > shadow.down {
     background-image: linear-gradient(to top, rgba(0, 0, 0, 0.05), rgba(0, 0, 0, 0.01) 40px, rgba(0, 0, 0, 0) 56px), linear-gradient(to top, rgba(0, 0, 0, 0.03), rgba(0, 0, 0, 0.01) 7px, rgba(0, 0, 0, 0) 24px); }
 
+flap > outline,
 deck > outline,
 leaflet > outline {
   min-width: 1px;
@@ -4886,11 +4892,23 @@ avatar {
     color: #d8d7d3; }
   avatar.contrasted {
     color: #fff; }
+  avatar.image {
+    background: none; }
 
 viewswitchertitle viewswitcher {
   margin-left: 12px;
   margin-right: 12px; }
 
+statuspage > scrolledwindow > viewport > box {
+  margin: 36px 12px; }
+  statuspage > scrolledwindow > viewport > box > clamp > box > .icon {
+    margin-bottom: 36px;
+    opacity: 0.5; }
+  statuspage > scrolledwindow > viewport > box > clamp > box > .title {
+    margin-bottom: 12px; }
+  statuspage > scrolledwindow > viewport > box > clamp > box > .description {
+    margin-bottom: 36px; }
+
 /***************************
  * Check and Radio buttons *
  ***************************/
@@ -5291,10 +5309,10 @@ notebook > header {
         outline-color: rgba(92, 97, 108, 0.3);
         border-color: #d9d9d9;
         border-bottom-color: #c2c2c2;
+        background-image: linear-gradient(to top, #ffffff, white 1px);
         text-shadow: 0 1px rgba(255, 255, 255, 0.769231);
         -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231);
-        box-shadow: inset 0 1px white, inset 0 -1px 0 rgba(217, 217, 217, 0.75), 0 1px 2px rgba(0, 0, 0, 0.07);
-        background-image: linear-gradient(to top, #ffffff, white 1px); }
+        box-shadow: inset 0 1px white, inset 0 -1px 0 rgba(217, 217, 217, 0.75), 0 1px 2px rgba(0, 0, 0, 0.07); }
       notebook > header.top > tabs > tab:checked,
       notebook > header.top > tabs > tab.reorderable-page:checked, notebook > header.bottom > tabs > tab:checked,
       notebook > header.bottom > tabs > tab.reorderable-page:checked, notebook > header.left > tabs > tab:checked,
@@ -5368,10 +5386,10 @@ infobar.info button, infobar.info.action:hover button {
     outline-color: rgba(255, 255, 255, 0.3);
     border-color: #005af3;
     border-bottom-color: #0047c0;
+    background-image: linear-gradient(to top, #2777ff, #2c7aff 1px);
     text-shadow: 0 -1px rgba(0, 0, 0, 0.490824);
     -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.490824);
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0.2), inset 0 -1px 0 rgba(0, 90, 243, 0.75), 0 1px 2px rgba(0, 0, 0, 0.07);
-    background-image: linear-gradient(to top, #2777ff, #2c7aff 1px); }
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.2), inset 0 -1px 0 rgba(0, 90, 243, 0.75), 0 1px 2px rgba(0, 0, 0, 0.07); }
   infobar.info button:active, infobar.info button:checked, infobar.info.action:hover button:active, infobar.info.action:hover button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
@@ -5423,10 +5441,10 @@ infobar.question button, infobar.warning button, infobar.question.action:hover b
     outline-color: rgba(255, 255, 255, 0.3);
     border-color: #ca6400;
     border-bottom-color: #974b00;
+    background-image: linear-gradient(to top, #fd7d00, #ff8003 1px);
     text-shadow: 0 -1px rgba(0, 0, 0, 0.555137);
     -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.555137);
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0.2), inset 0 -1px 0 rgba(202, 100, 0, 0.75), 0 1px 2px rgba(0, 0, 0, 0.07);
-    background-image: linear-gradient(to top, #fd7d00, #ff8003 1px); }
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.2), inset 0 -1px 0 rgba(202, 100, 0, 0.75), 0 1px 2px rgba(0, 0, 0, 0.07); }
   infobar.question button:active, infobar.question button:checked, infobar.warning button:active, infobar.warning button:checked, infobar.question.action:hover button:active, infobar.question.action:hover button:checked, infobar.warning.action:hover button:active, infobar.warning.action:hover button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
@@ -5477,10 +5495,10 @@ infobar.error:backdrop > revealer > box, infobar.error > revealer > box, infobar
       outline-color: rgba(255, 255, 255, 0.3);
       border-color: #911212;
       border-bottom-color: #640c0c;
+      background-image: linear-gradient(to top, #bf1717, #c41818 1px);
       text-shadow: 0 -1px rgba(0, 0, 0, 0.616314);
       -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.616314);
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), inset 0 -1px 0 rgba(145, 18, 18, 0.75), 0 1px 2px rgba(0, 0, 0, 0.07);
-      background-image: linear-gradient(to top, #bf1717, #c41818 1px); }
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), inset 0 -1px 0 rgba(145, 18, 18, 0.75), 0 1px 2px rgba(0, 0, 0, 0.07); }
     infobar.error:backdrop > revealer > box button:active, infobar.error:backdrop > revealer > box button:checked, infobar.error > revealer > box button:active, infobar.error > revealer > box button:checked, infobar.error.action:hover:backdrop > revealer > box button:active, infobar.error.action:hover:backdrop > revealer > box button:checked, infobar.error.action:hover > revealer > box button:active, infobar.error.action:hover > revealer > box button:checked {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
diff --git a/src/themes/Kali/sass/gtk-sass/libhandy/_fallback-base.scss b/src/themes/Kali/sass/gtk-sass/libhandy/_fallback-base.scss
index b821d956..0f5cb6cf 100644
--- a/src/themes/Kali/sass/gtk-sass/libhandy/_fallback-base.scss
+++ b/src/themes/Kali/sass/gtk-sass/libhandy/_fallback-base.scss
@@ -69,6 +69,7 @@ row.expander {
 
 // Shadows
 
+flap,
 deck,
 leaflet {
   > dimming {
@@ -136,6 +137,8 @@ avatar {
   }
 
   &.contrasted { color: #fff; }
+
+  &.image { background: none; }
 }
 
 // HdyViewSwitcherTitle
@@ -144,3 +147,26 @@ viewswitchertitle viewswitcher {
   margin-left: 12px;
   margin-right: 12px;
 }
+
+// HdyStatusPage
+
+statuspage > scrolledwindow > viewport > box {
+  margin: 36px 12px;
+
+  > clamp > box {
+    > .icon {
+      margin-bottom: 36px;
+      opacity: 0.5;
+    }
+
+    > .title {
+      margin-bottom: 12px;
+    }
+
+    > .description {
+      margin-bottom: 36px;
+    }
+  }
+}
+
+
diff --git a/src/themes/Kali/sass/gtk-sass/libhandy/sync.sh b/src/themes/Kali/sass/gtk-sass/libhandy/sync.sh
index 5f22bbc2..23db21f0 100755
--- a/src/themes/Kali/sass/gtk-sass/libhandy/sync.sh
+++ b/src/themes/Kali/sass/gtk-sass/libhandy/sync.sh
@@ -7,7 +7,7 @@ RESET='\033[0m'
 while read file;
 do
 	echo
-	echo " $GREEN[ * ]$RESET Downloading file $file"
+	echo -e " $GREEN[ * ]$RESET Downloading file $file"
 	wget https://gitlab.gnome.org/GNOME/libhandy/-/raw/master/src/themes/$file --timestamping --quiet
 done <<- EOF
 	_definitions.scss
diff --git a/src/themes/Kali/sass/gtk-sass/upstream/_colors.scss b/src/themes/Kali/sass/gtk-sass/upstream/_colors.scss
index 7a7c14bb..32dd7625 100644
--- a/src/themes/Kali/sass/gtk-sass/upstream/_colors.scss
+++ b/src/themes/Kali/sass/gtk-sass/upstream/_colors.scss
@@ -1,7 +1,6 @@
 // When color definition differs for dark and light variant
 // it gets @if ed depending on $variant
 
-
 $base_color: if($variant == 'light', #ffffff, lighten(desaturate(#241f31, 100%), 2%));
 $text_color: if($variant == 'light', black, white);
 $bg_color: if($variant == 'light', #f6f5f4, darken(desaturate(#3d3846, 100%), 4%));
diff --git a/src/themes/Kali/sass/gtk-sass/upstream/_common.scss b/src/themes/Kali/sass/gtk-sass/upstream/_common.scss
index 68fa54e5..7e5715a4 100644
--- a/src/themes/Kali/sass/gtk-sass/upstream/_common.scss
+++ b/src/themes/Kali/sass/gtk-sass/upstream/_common.scss
@@ -916,16 +916,14 @@ button {
     $_border_bg: linear-gradient(to top, $alt-borders-color 25%, $borders-color 50%);
 
     &:not(.flat):not(.osd):not(:checked):not(:active):not(:disabled):not(:backdrop) {
-      @include button(normal);
+      @include button(normal, $backimage: $_border_bg);
 
-      background-image: $button_fill, $_border_bg;
       border-color: transparent;
     }
 
     &:hover:not(.osd):not(:checked):not(:active):not(:disabled):not(:backdrop) {
-      @include button(hover);
+      @include button(hover, $backimage: $_border_bg);
 
-      background-image: $button_fill, $_border_bg;
       border-color: transparent;
     }
 
@@ -1947,6 +1945,9 @@ filechooser .path-bar.linked > button {
 /**************
  * Tree Views *
  **************/
+
+$_treeview_borders_color: if($variant=='light',mix($borders_color, $base_color,80%),mix($fg_color, $base_color, 20%));
+
 treeview.view {
   @at-root * {
     -GtkTreeView-horizontal-separator: 4;
@@ -2130,7 +2131,7 @@ treeview.view {
   padding: 0 6px;
   background-image: none;
   border-style: none solid solid none;
-  border-color: $bg_color;
+  border-color: $_treeview_borders_color;
   border-radius: 0;
   text-shadow: none;
 
diff --git a/src/themes/Kali/sass/gtk-sass/upstream/_drawing.scss b/src/themes/Kali/sass/gtk-sass/upstream/_drawing.scss
index 05e5bf4d..f405f8c6 100644
--- a/src/themes/Kali/sass/gtk-sass/upstream/_drawing.scss
+++ b/src/themes/Kali/sass/gtk-sass/upstream/_drawing.scss
@@ -166,7 +166,7 @@
   }
 }
 
-@mixin button($t, $c:$bg_color, $tc:$fg_color, $edge: none) {
+@mixin button($t, $c:$bg_color, $tc:$fg_color, $edge: none, $backimage: null) {
 //
 // Button drawing function
 //
@@ -175,13 +175,13 @@
 // $tc:   optional text color for colored* types
 // $edge: set to none to not draw the bottom edge or specify a color to not
 //        use the default one
+// $backimage: additional background-image behind the default one
+//             (for the button.circular hack)
 //
 // possible $t values:
 // normal, hover, active, insensitive, insensitive-active,
 // backdrop, backdrop-active, backdrop-insensitive, backdrop-insensitive-active,
 // osd, osd-hover, osd-active, osd-insensitive, osd-backdrop, undecorated
-//
-// This mixin sets the $button_fill global variable which containts the button background-image
 //
   $_hilight_color: _button_hilight_color($c);
   $_button_edge: if($edge == none, none, _widget_edge($edge));
@@ -196,8 +196,8 @@
     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);
-    $button_fill: linear-gradient(to top, if($c != $bg_color, $c, lighten($c, 3%)) 2px, lighten($c, 5%)) !global;
-    background-image: $button_fill;
+    background-image: linear-gradient(to top, if($c != $bg_color, $c, lighten($c, 3%)) 2px, lighten($c, 5%)),
+                      $backimage;
     @include _button_text_shadow($tc, $c);
     @include _shadows(inset 0 1px $_hilight_color, $_button_edge, $_button_shadow);
   }
@@ -211,16 +211,17 @@
     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);
     @if $variant == 'light' {
-      $button_fill: linear-gradient(to top, $c, lighten($c, 1%) 1px) !global;
+      background-image: linear-gradient(to top, $c, lighten($c, 1%) 1px),
+                        $backimage;
       @include _button_text_shadow($tc, lighten($c, 6%));
       @include _shadows(inset 0 1px _button_hilight_color(lighten($c, 6%)), $_button_edge, $_button_shadow);
     }
     @else {
-      $button_fill: linear-gradient(to top, darken($c,1%), lighten($c, 1%) 1px) !global;
+      background-image: linear-gradient(to top, darken($c,1%), lighten($c, 1%) 1px),
+                        $backimage;
       @include _button_text_shadow($tc,lighten($c, 6%));
       @include _shadows(inset 0 1px _button_hilight_color(darken($c, 2%)), $_button_edge, $_button_shadow);
     }
-    background-image: $button_fill;
   }
 
   @if $t==normal-alt {
@@ -251,16 +252,15 @@
     outline-color: transparentize($tc, 0.7);
     border-color: if($c != $bg_color, _border_color($c, true), $alt_borders_color);
     @if $variant == 'light' {
-      $button_fill: linear-gradient(to bottom, lighten($c, 9%) 10%, lighten($c, 4%) 90%) !global;
+      background-image: linear-gradient(to bottom, lighten($c, 9%) 10%, lighten($c, 4%) 90%);
       @include _shadows(inset 0 1px _button_hilight_color(lighten($c, 6%)),
                         $_button_edge, $_button_shadow);
     }
     @else {
-      $button_fill: linear-gradient(to bottom, $c 20%, darken($c, 4%) 90%) !global;
+      background-image: linear-gradient(to bottom, $c 20%, darken($c, 4%) 90%);
       @include _shadows(inset 0 1px $_hilight_color,
                         $_button_edge, $_button_shadow);
     }
-    background-image: $button_fill;
   }
 
   @else if $t==active {
@@ -270,8 +270,7 @@
     color: $tc;
     outline-color: transparentize($tc, 0.7);
     border-color: if($c != $bg_color, _border_color($c), $borders_color);
-    $button_fill: if($variant == 'light', image(darken($c, 14%)), image(darken($c, 9%))) !global;
-    background-image: $button_fill;
+    background-image: if($variant == 'light', image(darken($c, 14%)), image(darken($c, 9%)));
     @include _shadows(inset 0 1px transparentize($_hilight_color, 1), $_button_edge);
 
     text-shadow: none;
@@ -286,8 +285,7 @@
 
     color: if($tc != $fg_color, mix($tc, $_bg, 50%), $insensitive_fg_color);
     border-color: if($c != $bg_color, _border_color($c), $insensitive_borders_color);
-    $button_fill: image($_bg) !global;
-    background-image: $button_fill;
+    background-image: image($_bg);
     text-shadow: none;
     -gtk-icon-shadow: none;
     // white with 0 alpha to avoid an ugly transition, since no color means
@@ -304,8 +302,7 @@
 
     color: if($c != $bg_color, mix($tc, $_bg, 60%), $insensitive_fg_color);
     border-color: $_bc;
-    $button_fill: image($_bg) !global;
-    background-image: $button_fill;
+    background-image: image($_bg);
     // white with 0 alpha to avoid an ugly transition, since no color means
     // black with 0 alpha
     @include _shadows(inset 0 1px transparentize(white, 1), $_button_edge);
@@ -320,8 +317,7 @@
 
     color: if($tc != $fg_color, mix($tc, $_bg, 80%), $backdrop_fg_color);
     border-color: if($c != $bg_color, $_bc, $backdrop_borders_color);
-    $button_fill: image($_bg) !global;
-    background-image: $button_fill;
+    background-image: image($_bg);
     text-shadow: none;
     -gtk-icon-shadow: none;
     @include _shadows(inset 0 1px transparentize(white, 1), $_blank_edge);
@@ -336,8 +332,7 @@
 
     color: if($tc != $fg_color, mix($tc, $_bg, 80%), $backdrop_fg_color);
     border-color: if($c != $bg_color, $_bc, $backdrop_borders_color);
-    $button_fill: image($_bg) !global;
-    background-image: $button_fill;
+    background-image: image($_bg);
     @include _shadows(inset 0 1px transparentize(white, 1), $_blank_edge);
   }
 
@@ -351,8 +346,7 @@
 
     color: if($c != $bg_color, mix($tc, $_bg, 35%), $backdrop_insensitive_color);
     border-color: if($c != $bg_color, $_bc, $backdrop_borders_color);
-    $button_fill: image($_bg) !global;
-    background-image: $button_fill;
+    background-image: image($_bg);
     text-shadow: none;
     -gtk-icon-shadow: none;
     // white with 0 alpha to avoid an ugly transition, since no color means
@@ -370,8 +364,7 @@
 
     color: if($c != $bg_color, mix($tc, $_bg, 35%), $backdrop_insensitive_color);
     border-color: if($c != $bg_color, $_bc, $backdrop_borders_color);
-    $button_fill: image($_bg) !global;
-    background-image: $button_fill;
+    background-image: image($_bg);
     @include _shadows(inset 0 1px transparentize(white, 1), $_blank_edge);
   }
 
@@ -384,8 +377,7 @@
     color: $osd_fg_color;
     border-color: $osd_borders_color;
     background-color: transparent;
-    $button_fill: image($_bg) !global;
-    background-image: $button_fill;
+    background-image: image($_bg);
     background-clip: padding-box;
     box-shadow: inset 0 1px transparentize(white, 0.9);
     text-shadow: 0 1px black;
@@ -402,8 +394,7 @@
     color: white;
     border-color: $osd_borders_color;
     background-color: transparent;
-    $button_fill: image($_bg) !global;
-    background-image: $button_fill;
+    background-image: image($_bg);
     background-clip: padding-box;
     box-shadow: inset 0 1px transparentize(white, 0.9);
     text-shadow: 0 1px black;
@@ -420,8 +411,7 @@
     color: white;
     border-color: $osd_borders_color;
     background-color: transparent;
-    $button_fill: image($_bg) !global;
-    background-image: $button_fill;
+    background-image: image($_bg);
     background-clip: padding-box;
     box-shadow: none;
     text-shadow: none;
@@ -436,8 +426,7 @@
     color: $osd_insensitive_fg_color;
     border-color: $osd_borders_color;
     background-color: transparent;
-    $button_fill: image($osd_insensitive_bg_color) !global;
-    background-image: $button_fill;
+    background-image: image($osd_insensitive_bg_color);
     background-clip: padding-box;
     box-shadow: none;
     text-shadow: none;
@@ -453,8 +442,7 @@
     color: $osd_fg_color;
     border-color: $osd_borders_color;
     background-color: transparent;
-    $button_fill: image($_bg) !global;
-    background-image: $button_fill;
+    background-image: image($_bg);
     background-clip: padding-box;
     box-shadow: none;
     text-shadow: none;
@@ -467,8 +455,7 @@
   //
     border-color: transparent;
     background-color: transparent;
-    $button_fill: none !global;
-    background-image: $button_fill;
+    background-image: none;
 
     @include _shadows(inset 0 1px transparentize(white, 1), $_blank_edge);
 
diff --git a/src/themes/Kali/sass/gtk-sass/upstream/_drawing.scss.patch b/src/themes/Kali/sass/gtk-sass/upstream/_drawing.scss.patch
index 75bda0b9..dbe0743d 100644
--- a/src/themes/Kali/sass/gtk-sass/upstream/_drawing.scss.patch
+++ b/src/themes/Kali/sass/gtk-sass/upstream/_drawing.scss.patch
@@ -7,7 +7,8 @@
 ---
 >   $_button_shadow: inset 0 -1px 0 transparentize(if($c != $bg_color, _border_color($c), $borders_color), .25), 0 1px 2px transparentize($shadow_color, 0.03);
 199,200c199
-<     $button_fill: if($variant == 'light', linear-gradient(to top, darken($c, 4%) 2px, $c),
-<                                           linear-gradient(to top, darken($c,1%) 2px, $c)) !global;
+<     background-image: if($variant == 'light', linear-gradient(to top, darken($c, 4%) 2px, $c),
+<                                               linear-gradient(to top, darken($c,1%) 2px, $c)),
 ---
->     $button_fill: linear-gradient(to top, if($c != $bg_color, $c, lighten($c, 3%)) 2px, lighten($c, 5%)) !global;
+>     background-image: linear-gradient(to top, if($c != $bg_color, $c, lighten($c, 3%)) 2px, lighten($c, 5%)),
+
diff --git a/src/themes/Kali/sass/gtk-sass/upstream/sync.sh b/src/themes/Kali/sass/gtk-sass/upstream/sync.sh
index f2f0293a..622a146a 100755
--- a/src/themes/Kali/sass/gtk-sass/upstream/sync.sh
+++ b/src/themes/Kali/sass/gtk-sass/upstream/sync.sh
@@ -4,7 +4,7 @@ GREEN='\033[0;32m'
 YELLOW='\033[0;33m'
 RESET='\033[0m'
 
-VERSION=3.24.23
+VERSION=3.24.24
 
 echo
 echo -e " $YELLOW[ i ]$RESET Upstream version $VERSION"