diff --git a/share/themes/Kali-Dark/gtk-3.0/gtk.css b/share/themes/Kali-Dark/gtk-3.0/gtk.css
index 97634e3e..003fa553 100644
--- a/share/themes/Kali-Dark/gtk-3.0/gtk.css
+++ b/share/themes/Kali-Dark/gtk-3.0/gtk.css
@@ -492,7 +492,7 @@ button {
   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: image(#2e313d);
   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); }
   button.titlebutton, button.sidebar-button, notebook > header > tabs > arrow, notebook > header > tabs > arrow.flat,
   button.flat {
@@ -798,7 +798,7 @@ 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 2px, #4187ff);
+  background-image: image(#4187ff);
   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.flat {
@@ -944,7 +944,7 @@ button.destructive-action {
   outline-color: rgba(255, 255, 255, 0.3);
   border-color: #790e0e;
   border-bottom-color: #4b0909;
-  background-image: linear-gradient(to top, #a61414 2px, #bd1616);
+  background-image: image(#bd1616);
   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.flat {
@@ -1135,7 +1135,7 @@ 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), linear-gradient(to top, black 25%, #0d0e11 50%);
+    background-image: image(#2e313d), linear-gradient(to top, black 25%, #0d0e11 50%);
     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);
     border-color: transparent; }
   
@@ -1167,7 +1167,7 @@ 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, #292c37 2px, #2e313d);
+  background-image: image(#2e313d);
   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:hover {
     color: #eeeeec;
@@ -1715,7 +1715,7 @@ headerbar {
       outline-color: rgba(255, 255, 255, 0.3);
       border-color: #005af3;
       border-bottom-color: #0047c0;
-      background-image: linear-gradient(to top, #2777ff 2px, #4187ff);
+      background-image: image(#4187ff);
       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 button.titlebutton, .selection-mode .titlebar:not(headerbar) button.flat, .selection-mode.titlebar:not(headerbar) button.flat, .selection-mode headerbar button.flat,
       headerbar.selection-mode button.flat {
@@ -1815,7 +1815,7 @@ headerbar {
         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: image(#2e313d);
         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);
         border-color: #00348d; }
         .selection-mode .titlebar:not(headerbar) button.suggested-action:hover, .selection-mode.titlebar:not(headerbar) button.suggested-action:hover, .selection-mode headerbar button.suggested-action:hover,
@@ -4250,7 +4250,7 @@ infobar {
       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: image(#2e313d);
       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:hover, infobar.question button:hover, infobar.warning button:hover, infobar.error button:hover {
         color: #eeeeec;
@@ -4395,7 +4395,7 @@ 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, #292c37 2px, #2e313d);
+    background-image: image(#2e313d);
     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:hover {
       color: #eeeeec;
@@ -5136,7 +5136,7 @@ scale slider {
   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: image(#2e313d);
   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);
   border-color: black; }
   switch:hover slider, switch slider:active,
@@ -5203,7 +5203,7 @@ treeview.view {
     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: image(#2e313d);
     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); }
     treeview.view header button:hover, treeview.view header button:active {
       border-color: #0d0e11; }
@@ -5252,7 +5252,7 @@ notebook > header {
         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: image(#2e313d);
         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: #272a34; }
         notebook > header.top > tabs > tab:checked:backdrop,
@@ -5307,7 +5307,7 @@ infobar.info.action:hover button.flat {
   outline-color: rgba(255, 255, 255, 0.3);
   border-color: #005af3;
   border-bottom-color: #0047c0;
-  background-image: linear-gradient(to top, #2777ff 2px, #4187ff);
+  background-image: image(#4187ff);
   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:hover,
   infobar.info button.flat:hover, infobar.info.action:hover button:hover,
@@ -5382,7 +5382,7 @@ infobar.warning.action:hover button.flat {
   outline-color: rgba(255, 255, 255, 0.3);
   border-color: #ca6400;
   border-bottom-color: #974b00;
-  background-image: linear-gradient(to top, #fd7d00 2px, #ff8a18);
+  background-image: image(#ff8a18);
   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:hover,
   infobar.question button.flat:hover, infobar.warning button:hover,
@@ -5476,7 +5476,7 @@ 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 2px, #d61a1a);
+    background-image: image(#d61a1a);
     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.27); }
     infobar.error:backdrop > revealer > box button:hover,
     infobar.error:backdrop > revealer > box button.flat:hover, infobar.error > revealer > box button:hover,
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 97634e3e..003fa553 100644
--- a/share/themes/Kali-Light/gtk-3.0/gtk-dark.css
+++ b/share/themes/Kali-Light/gtk-3.0/gtk-dark.css
@@ -492,7 +492,7 @@ button {
   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: image(#2e313d);
   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); }
   button.titlebutton, button.sidebar-button, notebook > header > tabs > arrow, notebook > header > tabs > arrow.flat,
   button.flat {
@@ -798,7 +798,7 @@ 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 2px, #4187ff);
+  background-image: image(#4187ff);
   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.flat {
@@ -944,7 +944,7 @@ button.destructive-action {
   outline-color: rgba(255, 255, 255, 0.3);
   border-color: #790e0e;
   border-bottom-color: #4b0909;
-  background-image: linear-gradient(to top, #a61414 2px, #bd1616);
+  background-image: image(#bd1616);
   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.flat {
@@ -1135,7 +1135,7 @@ 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), linear-gradient(to top, black 25%, #0d0e11 50%);
+    background-image: image(#2e313d), linear-gradient(to top, black 25%, #0d0e11 50%);
     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);
     border-color: transparent; }
   
@@ -1167,7 +1167,7 @@ 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, #292c37 2px, #2e313d);
+  background-image: image(#2e313d);
   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:hover {
     color: #eeeeec;
@@ -1715,7 +1715,7 @@ headerbar {
       outline-color: rgba(255, 255, 255, 0.3);
       border-color: #005af3;
       border-bottom-color: #0047c0;
-      background-image: linear-gradient(to top, #2777ff 2px, #4187ff);
+      background-image: image(#4187ff);
       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 button.titlebutton, .selection-mode .titlebar:not(headerbar) button.flat, .selection-mode.titlebar:not(headerbar) button.flat, .selection-mode headerbar button.flat,
       headerbar.selection-mode button.flat {
@@ -1815,7 +1815,7 @@ headerbar {
         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: image(#2e313d);
         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);
         border-color: #00348d; }
         .selection-mode .titlebar:not(headerbar) button.suggested-action:hover, .selection-mode.titlebar:not(headerbar) button.suggested-action:hover, .selection-mode headerbar button.suggested-action:hover,
@@ -4250,7 +4250,7 @@ infobar {
       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: image(#2e313d);
       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:hover, infobar.question button:hover, infobar.warning button:hover, infobar.error button:hover {
         color: #eeeeec;
@@ -4395,7 +4395,7 @@ 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, #292c37 2px, #2e313d);
+    background-image: image(#2e313d);
     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:hover {
       color: #eeeeec;
@@ -5136,7 +5136,7 @@ scale slider {
   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: image(#2e313d);
   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);
   border-color: black; }
   switch:hover slider, switch slider:active,
@@ -5203,7 +5203,7 @@ treeview.view {
     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: image(#2e313d);
     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); }
     treeview.view header button:hover, treeview.view header button:active {
       border-color: #0d0e11; }
@@ -5252,7 +5252,7 @@ notebook > header {
         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: image(#2e313d);
         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: #272a34; }
         notebook > header.top > tabs > tab:checked:backdrop,
@@ -5307,7 +5307,7 @@ infobar.info.action:hover button.flat {
   outline-color: rgba(255, 255, 255, 0.3);
   border-color: #005af3;
   border-bottom-color: #0047c0;
-  background-image: linear-gradient(to top, #2777ff 2px, #4187ff);
+  background-image: image(#4187ff);
   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:hover,
   infobar.info button.flat:hover, infobar.info.action:hover button:hover,
@@ -5382,7 +5382,7 @@ infobar.warning.action:hover button.flat {
   outline-color: rgba(255, 255, 255, 0.3);
   border-color: #ca6400;
   border-bottom-color: #974b00;
-  background-image: linear-gradient(to top, #fd7d00 2px, #ff8a18);
+  background-image: image(#ff8a18);
   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:hover,
   infobar.question button.flat:hover, infobar.warning button:hover,
@@ -5476,7 +5476,7 @@ 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 2px, #d61a1a);
+    background-image: image(#d61a1a);
     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.27); }
     infobar.error:backdrop > revealer > box button:hover,
     infobar.error:backdrop > revealer > box button.flat:hover, infobar.error > revealer > box button:hover,
diff --git a/share/themes/Kali-Light/gtk-3.0/gtk.css b/share/themes/Kali-Light/gtk-3.0/gtk.css
index a8178027..d9255eaa 100644
--- a/share/themes/Kali-Light/gtk-3.0/gtk.css
+++ b/share/themes/Kali-Light/gtk-3.0/gtk.css
@@ -492,7 +492,7 @@ button {
   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: image(white);
   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); }
   button.titlebutton, button.sidebar-button, notebook > header > tabs > arrow, notebook > header > tabs > arrow.flat,
   button.flat {
@@ -801,7 +801,7 @@ 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 2px, #4187ff);
+  background-image: image(#4187ff);
   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.flat {
@@ -947,7 +947,7 @@ 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 2px, #e52222);
+  background-image: image(#e52222);
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), inset 0 -1px 0 rgba(166, 20, 20, 0.75), 0 1px 2px rgba(0, 0, 0, 0.07); }
   
   button.destructive-action.flat {
@@ -1138,7 +1138,7 @@ 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), linear-gradient(to top, #c2c2c2 25%, #d9d9d9 50%);
+    background-image: image(white), linear-gradient(to top, #c2c2c2 25%, #d9d9d9 50%);
     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);
     border-color: transparent; }
   
@@ -1170,7 +1170,7 @@ 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, white 2px, white);
+  background-image: image(white);
   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:hover {
     color: #5c616c;
@@ -1724,7 +1724,7 @@ headerbar {
       outline-color: rgba(255, 255, 255, 0.3);
       border-color: #005af3;
       border-bottom-color: #0047c0;
-      background-image: linear-gradient(to top, #2777ff 2px, #4187ff);
+      background-image: image(#4187ff);
       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 button.titlebutton, .selection-mode .titlebar:not(headerbar) button.flat, .selection-mode.titlebar:not(headerbar) button.flat, .selection-mode headerbar button.flat,
       headerbar.selection-mode button.flat {
@@ -1824,7 +1824,7 @@ headerbar {
         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: image(white);
         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);
         border-color: #0051da; }
         .selection-mode .titlebar:not(headerbar) button.suggested-action:hover, .selection-mode.titlebar:not(headerbar) button.suggested-action:hover, .selection-mode headerbar button.suggested-action:hover,
@@ -4272,7 +4272,7 @@ infobar {
       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: image(white);
       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:hover, infobar.question button:hover, infobar.warning button:hover, infobar.error button:hover {
         color: #5c616c;
@@ -4417,7 +4417,7 @@ 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, white 2px, white);
+    background-image: image(white);
     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:hover {
       color: #5c616c;
@@ -5157,7 +5157,7 @@ scale slider {
   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: image(white);
   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);
   border-color: #bababa; }
   switch:hover slider, switch slider:active,
@@ -5224,7 +5224,7 @@ treeview.view {
     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: image(white);
     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); }
     treeview.view header button:hover, treeview.view header button:active {
       border-color: #d9d9d9; }
@@ -5273,7 +5273,7 @@ notebook > header {
         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: image(white);
         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: #fafafa; }
         notebook > header.top > tabs > tab:checked:backdrop,
@@ -5328,7 +5328,7 @@ infobar.info.action:hover button.flat {
   outline-color: rgba(255, 255, 255, 0.3);
   border-color: #005af3;
   border-bottom-color: #0047c0;
-  background-image: linear-gradient(to top, #2777ff 2px, #4187ff);
+  background-image: image(#4187ff);
   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:hover,
   infobar.info button.flat:hover, infobar.info.action:hover button:hover,
@@ -5403,7 +5403,7 @@ infobar.warning.action:hover button.flat {
   outline-color: rgba(255, 255, 255, 0.3);
   border-color: #ca6400;
   border-bottom-color: #974b00;
-  background-image: linear-gradient(to top, #fd7d00 2px, #ff8a18);
+  background-image: image(#ff8a18);
   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.07); }
   infobar.question button:hover,
   infobar.question button.flat:hover, infobar.warning button:hover,
@@ -5497,7 +5497,7 @@ 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 2px, #d61a1a);
+    background-image: image(#d61a1a);
     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:hover,
     infobar.error:backdrop > revealer > box button.flat:hover, infobar.error > revealer > box button:hover,
diff --git a/src/themes/Kali/sass/gtk-sass/upstream-gtk-3/_drawing.scss b/src/themes/Kali/sass/gtk-sass/upstream-gtk-3/_drawing.scss
index 8c22df30..178b8588 100644
--- a/src/themes/Kali/sass/gtk-sass/upstream-gtk-3/_drawing.scss
+++ b/src/themes/Kali/sass/gtk-sass/upstream-gtk-3/_drawing.scss
@@ -196,7 +196,7 @@
     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: linear-gradient(to top, if($c != $bg_color, $c, lighten($c, 3%)) 2px, lighten($c, 5%)),
+    background-image: image(lighten($c, 5%)),
                       $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/gtk-sass/upstream-gtk-3/_drawing.scss.patch b/src/themes/Kali/sass/gtk-sass/upstream-gtk-3/_drawing.scss.patch
index fd572879..94e5ec46 100644
--- a/src/themes/Kali/sass/gtk-sass/upstream-gtk-3/_drawing.scss.patch
+++ b/src/themes/Kali/sass/gtk-sass/upstream-gtk-3/_drawing.scss.patch
@@ -10,7 +10,7 @@
 <     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: linear-gradient(to top, if($c != $bg_color, $c, lighten($c, 3%)) 2px, lighten($c, 5%)),
+>     background-image: image(lighten($c, 5%)),
 202c201
 <     @include _button_text_shadow($tc, $c);
 ---