From 71d7ce57c6f5bd63320d3637e22a7a320a6a3580 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ruiz=20de=20Alegr=C3=ADa?= <daniel@drasite.com>
Date: Wed, 8 Jul 2020 16:45:23 +0200
Subject: [PATCH] GTK: Upload for gtk 3.24.21

---
 share/themes/Kali-Dark/gtk-3.0/gtk.css        | 124 +++++++-----------
 share/themes/Kali-Light/gtk-3.0/gtk-dark.css  | 124 +++++++-----------
 share/themes/Kali-Light/gtk-3.0/gtk.css       | 124 +++++++-----------
 .../Kali/sass/gtk-sass/_common-tweaks.scss    |   4 -
 .../Kali/sass/gtk-sass/upstream/_common.scss  | 119 ++++++-----------
 .../Kali/sass/gtk-sass/upstream/sync.sh       |   2 +-
 6 files changed, 189 insertions(+), 308 deletions(-)

diff --git a/share/themes/Kali-Dark/gtk-3.0/gtk.css b/share/themes/Kali-Dark/gtk-3.0/gtk.css
index 226a8ba4..4d2db48f 100644
--- a/share/themes/Kali-Dark/gtk-3.0/gtk.css
+++ b/share/themes/Kali-Dark/gtk-3.0/gtk.css
@@ -1120,10 +1120,6 @@ button.file separator {
 button.font > box > box > label {
   font-weight: bold; }
 
-.inline-toolbar button, .inline-toolbar button:backdrop {
-  border-radius: 2px;
-  border-width: 1px; }
-
 .primary-toolbar button {
   -gtk-icon-shadow: none; }
 
@@ -1240,55 +1236,51 @@ stacksidebar row.needs-attention > label, .stack-switcher > button.needs-attenti
         background-image: image(#1a1d23);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
 
-.linked > combobox > box > button.combo:dir(ltr), .linked > combobox > box > button.combo:dir(rtl), filechooser .path-bar.linked > button, .linked:not(.vertical) > spinbutton:not(.vertical), .linked:not(.vertical) > entry, .inline-toolbar button, .inline-toolbar button:backdrop, .linked > button, .linked > button:hover, .linked > button:active, .linked > button:checked, .linked > button:backdrop, toolbar.inline-toolbar toolbutton > button.flat,
-toolbar.inline-toolbar toolbutton:backdrop > button.flat {
-  border-radius: 0;
+.linked:not(.vertical) > combobox > box > button.combo, filechooser .path-bar.linked > button, .linked:not(.vertical) > spinbutton:not(.vertical), .linked:not(.vertical) > entry, .inline-toolbar button, .linked > button, toolbar.inline-toolbar toolbutton > button.flat {
   border-right-style: none;
+  border-radius: 0;
   -gtk-outline-radius: 0; }
 
-.linked:not(.vertical) > combobox:first-child > box > button.combo, combobox.linked button:nth-child(2):dir(rtl), filechooser .path-bar.linked > button:dir(rtl):last-child, filechooser .path-bar.linked > button:dir(ltr):first-child, .linked:not(.vertical) > spinbutton:first-child:not(.vertical), .linked:not(.vertical) > entry:first-child, .inline-toolbar button:first-child, .inline-toolbar button:first-child:backdrop, .linked > button:first-child, .linked > button:first-child:hover, .linked > button:first-child:active, .linked > button:first-child:checked, .linked > button:first-child:backdrop, toolbar.inline-toolbar toolbutton:first-child > button.flat {
+.linked:not(.vertical) > combobox:first-child > box > button.combo, combobox.linked button:nth-child(2):dir(rtl), filechooser .path-bar.linked > button:dir(rtl):last-child, filechooser .path-bar.linked > button:dir(ltr):first-child, .linked:not(.vertical) > spinbutton:first-child:not(.vertical), .linked:not(.vertical) > entry:first-child, .inline-toolbar button:first-child, .linked > button:first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat {
   border-top-left-radius: 5px;
   border-bottom-left-radius: 5px;
-  border-top-right-radius: 0;
-  border-bottom-right-radius: 0;
-  border-right-style: none;
-  -gtk-outline-bottom-left-radius: 5px;
   -gtk-outline-top-left-radius: 5px;
-  -gtk-outline-top-right-radius: 0;
-  -gtk-outline-bottom-right-radius: 0; }
+  -gtk-outline-bottom-left-radius: 5px; }
 
-.linked:not(.vertical) > combobox:last-child > box > button.combo, combobox.linked button:nth-child(2):dir(ltr), filechooser .path-bar.linked > button:dir(rtl):first-child, filechooser .path-bar.linked > button:dir(ltr):last-child, .linked:not(.vertical) > spinbutton:last-child:not(.vertical), .linked:not(.vertical) > entry:last-child, .inline-toolbar button:last-child, .inline-toolbar button:last-child:backdrop, .linked > button:last-child, .linked > button:last-child:hover, .linked > button:last-child:active, .linked > button:last-child:checked, .linked > button:last-child:backdrop, toolbar.inline-toolbar toolbutton:last-child > button.flat {
-  border-top-left-radius: 0;
-  border-bottom-left-radius: 0;
+.linked:not(.vertical) > combobox:last-child > box > button.combo, combobox.linked button:nth-child(2):dir(ltr), filechooser .path-bar.linked > button:dir(rtl):first-child, filechooser .path-bar.linked > button:dir(ltr):last-child, .linked:not(.vertical) > spinbutton:last-child:not(.vertical), .linked:not(.vertical) > entry:last-child, .inline-toolbar button:last-child, .linked > button:last-child, toolbar.inline-toolbar toolbutton:last-child > button.flat {
+  border-right-style: solid;
   border-top-right-radius: 5px;
   border-bottom-right-radius: 5px;
-  border-right-style: solid;
-  -gtk-outline-bottom-right-radius: 5px;
   -gtk-outline-top-right-radius: 5px;
-  -gtk-outline-bottom-left-radius: 0;
-  -gtk-outline-top-left-radius: 0; }
+  -gtk-outline-bottom-right-radius: 5px; }
 
-.linked:not(.vertical) > combobox:only-child > box > button.combo, filechooser .path-bar.linked > button:only-child, .linked:not(.vertical) > spinbutton:only-child:not(.vertical), .linked:not(.vertical) > entry:only-child, .inline-toolbar button:only-child, .inline-toolbar button:only-child:backdrop, .linked > button:only-child, .linked > button:only-child:hover, .linked > button:only-child:active, .linked > button:only-child:checked, .linked > button:only-child:backdrop, toolbar.inline-toolbar toolbutton:only-child > button.flat {
-  border-radius: 5px;
+.linked:not(.vertical) > combobox:only-child > box > button.combo, filechooser .path-bar.linked > button:only-child, .linked:not(.vertical) > spinbutton:only-child:not(.vertical), .linked:not(.vertical) > entry:only-child, .inline-toolbar button:only-child, .linked > button:only-child, toolbar.inline-toolbar toolbutton:only-child > button.flat {
   border-style: solid;
+  border-radius: 5px;
   -gtk-outline-radius: 5px; }
 
-.linked.vertical > combobox > box > button.combo, .linked.vertical > spinbutton:not(.vertical), .linked.vertical > entry, .linked.vertical > button, .linked.vertical > button:hover, .linked.vertical > button:active, .linked.vertical > button:checked, .linked.vertical > button:backdrop {
+.linked.vertical > combobox > box > button.combo, .linked.vertical > spinbutton:not(.vertical), .linked.vertical > entry, .linked.vertical > button {
   border-style: solid solid none solid;
-  border-radius: 0; }
+  border-radius: 0;
+  -gtk-outline-radius: 0; }
 
-.linked.vertical > combobox:first-child > box > button.combo, .linked.vertical > spinbutton:first-child:not(.vertical), .linked.vertical > entry:first-child, .linked.vertical > button:first-child, .linked.vertical > button:first-child:hover, .linked.vertical > button:first-child:active, .linked.vertical > button:first-child:checked, .linked.vertical > button:first-child:backdrop {
+.linked.vertical > combobox:first-child > box > button.combo, .linked.vertical > spinbutton:first-child:not(.vertical), .linked.vertical > entry:first-child, .linked.vertical > button:first-child {
   border-top-left-radius: 5px;
-  border-top-right-radius: 5px; }
+  border-top-right-radius: 5px;
+  -gtk-outline-top-left-radius: 5px;
+  -gtk-outline-top-right-radius: 5px; }
 
-.linked.vertical > combobox:last-child > box > button.combo, .linked.vertical > spinbutton:last-child:not(.vertical), .linked.vertical > entry:last-child, .linked.vertical > button:last-child, .linked.vertical > button:last-child:hover, .linked.vertical > button:last-child:active, .linked.vertical > button:last-child:checked, .linked.vertical > button:last-child:backdrop {
+.linked.vertical > combobox:last-child > box > button.combo, .linked.vertical > spinbutton:last-child:not(.vertical), .linked.vertical > entry:last-child, .linked.vertical > button:last-child {
+  border-bottom-style: solid;
   border-bottom-left-radius: 5px;
   border-bottom-right-radius: 5px;
-  border-style: solid; }
+  -gtk-outline-bottom-left-radius: 5px;
+  -gtk-outline-bottom-right-radius: 5px; }
 
-.linked.vertical > combobox:only-child > box > button.combo, .linked.vertical > spinbutton:only-child:not(.vertical), .linked.vertical > entry:only-child, .linked.vertical > button:only-child, .linked.vertical > button:only-child:hover, .linked.vertical > button:only-child:active, .linked.vertical > button:only-child:checked, .linked.vertical > button:only-child:backdrop {
+.linked.vertical > combobox:only-child > box > button.combo, .linked.vertical > spinbutton:only-child:not(.vertical), .linked.vertical > entry:only-child, .linked.vertical > button:only-child {
+  border-style: solid;
   border-radius: 5px;
-  border-style: solid; }
+  -gtk-outline-radius: 5px; }
 
 .scale-popup button:backdrop:hover, .scale-popup button:backdrop:disabled, .scale-popup button:backdrop, .scale-popup button:hover, calendar.button, button:link:hover, button:link:active, button:link:checked,
 button:visited:hover,
@@ -2361,41 +2353,41 @@ notebook > header {
     notebook > header.top > tabs {
       margin-bottom: -2px; }
       notebook > header.top > tabs > tab:hover {
-        box-shadow: inset 0 -3px #0d0e11; }
+        box-shadow: inset 0 -4px #0d0e11; }
       notebook > header.top > tabs > tab:backdrop {
         box-shadow: none; }
       notebook > header.top > tabs > tab:checked {
-        box-shadow: inset 0 -3px #2777ff; }
+        box-shadow: inset 0 -4px #2777ff; }
   notebook > header.bottom {
     border-top-style: solid; }
     notebook > header.bottom > tabs {
       margin-top: -2px; }
       notebook > header.bottom > tabs > tab:hover {
-        box-shadow: inset 0 3px #0d0e11; }
+        box-shadow: inset 0 4px #0d0e11; }
       notebook > header.bottom > tabs > tab:backdrop {
         box-shadow: none; }
       notebook > header.bottom > tabs > tab:checked {
-        box-shadow: inset 0 3px #2777ff; }
+        box-shadow: inset 0 4px #2777ff; }
   notebook > header.left {
     border-right-style: solid; }
     notebook > header.left > tabs {
       margin-right: -2px; }
       notebook > header.left > tabs > tab:hover {
-        box-shadow: inset -3px 0 #0d0e11; }
+        box-shadow: inset -4px 0 #0d0e11; }
       notebook > header.left > tabs > tab:backdrop {
         box-shadow: none; }
       notebook > header.left > tabs > tab:checked {
-        box-shadow: inset -3px 0 #2777ff; }
+        box-shadow: inset -4px 0 #2777ff; }
   notebook > header.right {
     border-left-style: solid; }
     notebook > header.right > tabs {
       margin-left: -2px; }
       notebook > header.right > tabs > tab:hover {
-        box-shadow: inset 3px 0 #0d0e11; }
+        box-shadow: inset 4px 0 #0d0e11; }
       notebook > header.right > tabs > tab:backdrop {
         box-shadow: none; }
       notebook > header.right > tabs > tab:checked {
-        box-shadow: inset 3px 0 #2777ff; }
+        box-shadow: inset 4px 0 #2777ff; }
   notebook > header.top > tabs > arrow {
     border-top-style: none; }
   notebook > header.bottom > tabs > arrow {
@@ -2444,12 +2436,13 @@ notebook > header {
     min-width: 30px;
     padding: 3px 12px;
     outline-offset: -5px;
-    color: #888a8d;
-    font-weight: bold;
+    color: #eeeeec;
+    font-weight: normal;
     border-width: 1px;
     border-color: transparent; }
     notebook > header tab:hover {
-      color: #bbbcbd; }
+      color: #eeeeec;
+      background-color: #1a1c23; }
       notebook > header tab.reorderable-page:hover {
         border-color: rgba(13, 14, 17, 0.3);
         background-color: rgba(35, 37, 46, 0.2); }
@@ -2761,7 +2754,7 @@ switch {
  * Check and Radio items *
  *************************/
 .view.content-view.check:not(list), iconview.content-view.check:not(list),
-.content-view .tile check:not(list) {
+.content-view:not(list) check {
   margin: 4px;
   min-width: 32px;
   min-height: 32px;
@@ -2776,7 +2769,7 @@ switch {
   -gtk-icon-shadow: none; }
 
 .view.content-view.check:hover:not(list), iconview.content-view.check:hover:not(list),
-.content-view .tile check:hover:not(list) {
+.content-view:not(list) check:hover {
   margin: 4px;
   min-width: 32px;
   min-height: 32px;
@@ -2791,7 +2784,7 @@ switch {
   -gtk-icon-shadow: none; }
 
 .view.content-view.check:active:not(list), iconview.content-view.check:active:not(list),
-.content-view .tile check:active:not(list) {
+.content-view:not(list) check:active {
   margin: 4px;
   min-width: 32px;
   min-height: 32px;
@@ -2806,7 +2799,7 @@ switch {
   -gtk-icon-shadow: none; }
 
 .view.content-view.check:backdrop:not(list), iconview.content-view.check:backdrop:not(list),
-.content-view .tile check:backdrop:not(list) {
+.content-view:not(list) check:backdrop {
   margin: 4px;
   min-width: 32px;
   min-height: 32px;
@@ -2821,7 +2814,7 @@ switch {
   -gtk-icon-shadow: none; }
 
 .view.content-view.check:checked:not(list), iconview.content-view.check:checked:not(list),
-.content-view .tile check:checked:not(list) {
+.content-view:not(list) check:checked {
   margin: 4px;
   min-width: 32px;
   min-height: 32px;
@@ -2836,7 +2829,7 @@ switch {
   -gtk-icon-shadow: none; }
 
 .view.content-view.check:checked:hover:not(list), iconview.content-view.check:checked:hover:not(list),
-.content-view .tile check:checked:hover:not(list) {
+.content-view:not(list) check:checked:hover {
   margin: 4px;
   min-width: 32px;
   min-height: 32px;
@@ -2851,7 +2844,7 @@ switch {
   -gtk-icon-shadow: none; }
 
 .view.content-view.check:checked:active:not(list), iconview.content-view.check:checked:active:not(list),
-.content-view .tile check:checked:active:not(list) {
+.content-view:not(list) check:checked:active {
   margin: 4px;
   min-width: 32px;
   min-height: 32px;
@@ -2866,7 +2859,7 @@ switch {
   -gtk-icon-shadow: none; }
 
 .view.content-view.check:backdrop:checked:not(list), iconview.content-view.check:backdrop:checked:not(list),
-.content-view .tile check:backdrop:checked:not(list) {
+.content-view:not(list) check:backdrop:checked {
   margin: 4px;
   min-width: 32px;
   min-height: 32px;
@@ -4079,31 +4072,16 @@ messagedialog.csd.background {
 
 messagedialog.csd .dialog-action-area button {
   padding: 10px 14px;
-  border-radius: 0;
-  border-left-style: solid;
   border-right-style: none;
-  border-bottom-style: none; }
-  messagedialog.csd .dialog-action-area button:first-child:not(:only-child) {
+  border-bottom-style: none;
+  border-radius: 0;
+  -gtk-outline-radius: 0; }
+  messagedialog.csd .dialog-action-area button:first-child {
     border-left-style: none;
     border-bottom-left-radius: 7px;
-    -gtk-outline-bottom-left-radius: 7px;
-    -gtk-outline-top-left-radius: 0px;
-    -gtk-outline-top-right-radius: 0px;
-    -gtk-outline-bottom-right-radius: 0px; }
-  messagedialog.csd .dialog-action-area button:last-child:not(:only-child) {
+    -gtk-outline-bottom-left-radius: 7px; }
+  messagedialog.csd .dialog-action-area button:last-child {
     border-bottom-right-radius: 7px;
-    -gtk-outline-bottom-right-radius: 7px;
-    -gtk-outline-top-right-radius: 0px;
-    -gtk-outline-bottom-left-radius: 0px;
-    -gtk-outline-top-left-radius: 0px; }
-  messagedialog.csd .dialog-action-area button:only-child {
-    border-top-right-radius: 0;
-    border-top-left-radius: 0;
-    border-bottom-left-radius: 7px;
-    border-bottom-right-radius: 7px;
-    -gtk-outline-top-right-radius: 0px;
-    -gtk-outline-top-left-radius: 0px;
-    -gtk-outline-bottom-left-radius: 7px;
     -gtk-outline-bottom-right-radius: 7px; }
 
 filechooser .dialog-action-box {
@@ -4521,8 +4499,6 @@ decoration {
     border-radius: 0; }
   .popup decoration {
     box-shadow: none; }
-  .csd decoration {
-    background-color: black; }
   .ssd decoration {
     box-shadow: 0 0 0 1px rgba(13, 14, 17, 0.9); }
   .csd.popup decoration {
@@ -5161,8 +5137,6 @@ decoration {
   messagedialog.csd decoration {
     border-width: 0;
     box-shadow: 0 1px 4px rgba(0, 0, 0, 0.2); }
-  window.csd decoration {
-    background: black; }
 
 button.titlebutton:not(.appmenu) {
   margin: 0; }
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 226a8ba4..4d2db48f 100644
--- a/share/themes/Kali-Light/gtk-3.0/gtk-dark.css
+++ b/share/themes/Kali-Light/gtk-3.0/gtk-dark.css
@@ -1120,10 +1120,6 @@ button.file separator {
 button.font > box > box > label {
   font-weight: bold; }
 
-.inline-toolbar button, .inline-toolbar button:backdrop {
-  border-radius: 2px;
-  border-width: 1px; }
-
 .primary-toolbar button {
   -gtk-icon-shadow: none; }
 
@@ -1240,55 +1236,51 @@ stacksidebar row.needs-attention > label, .stack-switcher > button.needs-attenti
         background-image: image(#1a1d23);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
 
-.linked > combobox > box > button.combo:dir(ltr), .linked > combobox > box > button.combo:dir(rtl), filechooser .path-bar.linked > button, .linked:not(.vertical) > spinbutton:not(.vertical), .linked:not(.vertical) > entry, .inline-toolbar button, .inline-toolbar button:backdrop, .linked > button, .linked > button:hover, .linked > button:active, .linked > button:checked, .linked > button:backdrop, toolbar.inline-toolbar toolbutton > button.flat,
-toolbar.inline-toolbar toolbutton:backdrop > button.flat {
-  border-radius: 0;
+.linked:not(.vertical) > combobox > box > button.combo, filechooser .path-bar.linked > button, .linked:not(.vertical) > spinbutton:not(.vertical), .linked:not(.vertical) > entry, .inline-toolbar button, .linked > button, toolbar.inline-toolbar toolbutton > button.flat {
   border-right-style: none;
+  border-radius: 0;
   -gtk-outline-radius: 0; }
 
-.linked:not(.vertical) > combobox:first-child > box > button.combo, combobox.linked button:nth-child(2):dir(rtl), filechooser .path-bar.linked > button:dir(rtl):last-child, filechooser .path-bar.linked > button:dir(ltr):first-child, .linked:not(.vertical) > spinbutton:first-child:not(.vertical), .linked:not(.vertical) > entry:first-child, .inline-toolbar button:first-child, .inline-toolbar button:first-child:backdrop, .linked > button:first-child, .linked > button:first-child:hover, .linked > button:first-child:active, .linked > button:first-child:checked, .linked > button:first-child:backdrop, toolbar.inline-toolbar toolbutton:first-child > button.flat {
+.linked:not(.vertical) > combobox:first-child > box > button.combo, combobox.linked button:nth-child(2):dir(rtl), filechooser .path-bar.linked > button:dir(rtl):last-child, filechooser .path-bar.linked > button:dir(ltr):first-child, .linked:not(.vertical) > spinbutton:first-child:not(.vertical), .linked:not(.vertical) > entry:first-child, .inline-toolbar button:first-child, .linked > button:first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat {
   border-top-left-radius: 5px;
   border-bottom-left-radius: 5px;
-  border-top-right-radius: 0;
-  border-bottom-right-radius: 0;
-  border-right-style: none;
-  -gtk-outline-bottom-left-radius: 5px;
   -gtk-outline-top-left-radius: 5px;
-  -gtk-outline-top-right-radius: 0;
-  -gtk-outline-bottom-right-radius: 0; }
+  -gtk-outline-bottom-left-radius: 5px; }
 
-.linked:not(.vertical) > combobox:last-child > box > button.combo, combobox.linked button:nth-child(2):dir(ltr), filechooser .path-bar.linked > button:dir(rtl):first-child, filechooser .path-bar.linked > button:dir(ltr):last-child, .linked:not(.vertical) > spinbutton:last-child:not(.vertical), .linked:not(.vertical) > entry:last-child, .inline-toolbar button:last-child, .inline-toolbar button:last-child:backdrop, .linked > button:last-child, .linked > button:last-child:hover, .linked > button:last-child:active, .linked > button:last-child:checked, .linked > button:last-child:backdrop, toolbar.inline-toolbar toolbutton:last-child > button.flat {
-  border-top-left-radius: 0;
-  border-bottom-left-radius: 0;
+.linked:not(.vertical) > combobox:last-child > box > button.combo, combobox.linked button:nth-child(2):dir(ltr), filechooser .path-bar.linked > button:dir(rtl):first-child, filechooser .path-bar.linked > button:dir(ltr):last-child, .linked:not(.vertical) > spinbutton:last-child:not(.vertical), .linked:not(.vertical) > entry:last-child, .inline-toolbar button:last-child, .linked > button:last-child, toolbar.inline-toolbar toolbutton:last-child > button.flat {
+  border-right-style: solid;
   border-top-right-radius: 5px;
   border-bottom-right-radius: 5px;
-  border-right-style: solid;
-  -gtk-outline-bottom-right-radius: 5px;
   -gtk-outline-top-right-radius: 5px;
-  -gtk-outline-bottom-left-radius: 0;
-  -gtk-outline-top-left-radius: 0; }
+  -gtk-outline-bottom-right-radius: 5px; }
 
-.linked:not(.vertical) > combobox:only-child > box > button.combo, filechooser .path-bar.linked > button:only-child, .linked:not(.vertical) > spinbutton:only-child:not(.vertical), .linked:not(.vertical) > entry:only-child, .inline-toolbar button:only-child, .inline-toolbar button:only-child:backdrop, .linked > button:only-child, .linked > button:only-child:hover, .linked > button:only-child:active, .linked > button:only-child:checked, .linked > button:only-child:backdrop, toolbar.inline-toolbar toolbutton:only-child > button.flat {
-  border-radius: 5px;
+.linked:not(.vertical) > combobox:only-child > box > button.combo, filechooser .path-bar.linked > button:only-child, .linked:not(.vertical) > spinbutton:only-child:not(.vertical), .linked:not(.vertical) > entry:only-child, .inline-toolbar button:only-child, .linked > button:only-child, toolbar.inline-toolbar toolbutton:only-child > button.flat {
   border-style: solid;
+  border-radius: 5px;
   -gtk-outline-radius: 5px; }
 
-.linked.vertical > combobox > box > button.combo, .linked.vertical > spinbutton:not(.vertical), .linked.vertical > entry, .linked.vertical > button, .linked.vertical > button:hover, .linked.vertical > button:active, .linked.vertical > button:checked, .linked.vertical > button:backdrop {
+.linked.vertical > combobox > box > button.combo, .linked.vertical > spinbutton:not(.vertical), .linked.vertical > entry, .linked.vertical > button {
   border-style: solid solid none solid;
-  border-radius: 0; }
+  border-radius: 0;
+  -gtk-outline-radius: 0; }
 
-.linked.vertical > combobox:first-child > box > button.combo, .linked.vertical > spinbutton:first-child:not(.vertical), .linked.vertical > entry:first-child, .linked.vertical > button:first-child, .linked.vertical > button:first-child:hover, .linked.vertical > button:first-child:active, .linked.vertical > button:first-child:checked, .linked.vertical > button:first-child:backdrop {
+.linked.vertical > combobox:first-child > box > button.combo, .linked.vertical > spinbutton:first-child:not(.vertical), .linked.vertical > entry:first-child, .linked.vertical > button:first-child {
   border-top-left-radius: 5px;
-  border-top-right-radius: 5px; }
+  border-top-right-radius: 5px;
+  -gtk-outline-top-left-radius: 5px;
+  -gtk-outline-top-right-radius: 5px; }
 
-.linked.vertical > combobox:last-child > box > button.combo, .linked.vertical > spinbutton:last-child:not(.vertical), .linked.vertical > entry:last-child, .linked.vertical > button:last-child, .linked.vertical > button:last-child:hover, .linked.vertical > button:last-child:active, .linked.vertical > button:last-child:checked, .linked.vertical > button:last-child:backdrop {
+.linked.vertical > combobox:last-child > box > button.combo, .linked.vertical > spinbutton:last-child:not(.vertical), .linked.vertical > entry:last-child, .linked.vertical > button:last-child {
+  border-bottom-style: solid;
   border-bottom-left-radius: 5px;
   border-bottom-right-radius: 5px;
-  border-style: solid; }
+  -gtk-outline-bottom-left-radius: 5px;
+  -gtk-outline-bottom-right-radius: 5px; }
 
-.linked.vertical > combobox:only-child > box > button.combo, .linked.vertical > spinbutton:only-child:not(.vertical), .linked.vertical > entry:only-child, .linked.vertical > button:only-child, .linked.vertical > button:only-child:hover, .linked.vertical > button:only-child:active, .linked.vertical > button:only-child:checked, .linked.vertical > button:only-child:backdrop {
+.linked.vertical > combobox:only-child > box > button.combo, .linked.vertical > spinbutton:only-child:not(.vertical), .linked.vertical > entry:only-child, .linked.vertical > button:only-child {
+  border-style: solid;
   border-radius: 5px;
-  border-style: solid; }
+  -gtk-outline-radius: 5px; }
 
 .scale-popup button:backdrop:hover, .scale-popup button:backdrop:disabled, .scale-popup button:backdrop, .scale-popup button:hover, calendar.button, button:link:hover, button:link:active, button:link:checked,
 button:visited:hover,
@@ -2361,41 +2353,41 @@ notebook > header {
     notebook > header.top > tabs {
       margin-bottom: -2px; }
       notebook > header.top > tabs > tab:hover {
-        box-shadow: inset 0 -3px #0d0e11; }
+        box-shadow: inset 0 -4px #0d0e11; }
       notebook > header.top > tabs > tab:backdrop {
         box-shadow: none; }
       notebook > header.top > tabs > tab:checked {
-        box-shadow: inset 0 -3px #2777ff; }
+        box-shadow: inset 0 -4px #2777ff; }
   notebook > header.bottom {
     border-top-style: solid; }
     notebook > header.bottom > tabs {
       margin-top: -2px; }
       notebook > header.bottom > tabs > tab:hover {
-        box-shadow: inset 0 3px #0d0e11; }
+        box-shadow: inset 0 4px #0d0e11; }
       notebook > header.bottom > tabs > tab:backdrop {
         box-shadow: none; }
       notebook > header.bottom > tabs > tab:checked {
-        box-shadow: inset 0 3px #2777ff; }
+        box-shadow: inset 0 4px #2777ff; }
   notebook > header.left {
     border-right-style: solid; }
     notebook > header.left > tabs {
       margin-right: -2px; }
       notebook > header.left > tabs > tab:hover {
-        box-shadow: inset -3px 0 #0d0e11; }
+        box-shadow: inset -4px 0 #0d0e11; }
       notebook > header.left > tabs > tab:backdrop {
         box-shadow: none; }
       notebook > header.left > tabs > tab:checked {
-        box-shadow: inset -3px 0 #2777ff; }
+        box-shadow: inset -4px 0 #2777ff; }
   notebook > header.right {
     border-left-style: solid; }
     notebook > header.right > tabs {
       margin-left: -2px; }
       notebook > header.right > tabs > tab:hover {
-        box-shadow: inset 3px 0 #0d0e11; }
+        box-shadow: inset 4px 0 #0d0e11; }
       notebook > header.right > tabs > tab:backdrop {
         box-shadow: none; }
       notebook > header.right > tabs > tab:checked {
-        box-shadow: inset 3px 0 #2777ff; }
+        box-shadow: inset 4px 0 #2777ff; }
   notebook > header.top > tabs > arrow {
     border-top-style: none; }
   notebook > header.bottom > tabs > arrow {
@@ -2444,12 +2436,13 @@ notebook > header {
     min-width: 30px;
     padding: 3px 12px;
     outline-offset: -5px;
-    color: #888a8d;
-    font-weight: bold;
+    color: #eeeeec;
+    font-weight: normal;
     border-width: 1px;
     border-color: transparent; }
     notebook > header tab:hover {
-      color: #bbbcbd; }
+      color: #eeeeec;
+      background-color: #1a1c23; }
       notebook > header tab.reorderable-page:hover {
         border-color: rgba(13, 14, 17, 0.3);
         background-color: rgba(35, 37, 46, 0.2); }
@@ -2761,7 +2754,7 @@ switch {
  * Check and Radio items *
  *************************/
 .view.content-view.check:not(list), iconview.content-view.check:not(list),
-.content-view .tile check:not(list) {
+.content-view:not(list) check {
   margin: 4px;
   min-width: 32px;
   min-height: 32px;
@@ -2776,7 +2769,7 @@ switch {
   -gtk-icon-shadow: none; }
 
 .view.content-view.check:hover:not(list), iconview.content-view.check:hover:not(list),
-.content-view .tile check:hover:not(list) {
+.content-view:not(list) check:hover {
   margin: 4px;
   min-width: 32px;
   min-height: 32px;
@@ -2791,7 +2784,7 @@ switch {
   -gtk-icon-shadow: none; }
 
 .view.content-view.check:active:not(list), iconview.content-view.check:active:not(list),
-.content-view .tile check:active:not(list) {
+.content-view:not(list) check:active {
   margin: 4px;
   min-width: 32px;
   min-height: 32px;
@@ -2806,7 +2799,7 @@ switch {
   -gtk-icon-shadow: none; }
 
 .view.content-view.check:backdrop:not(list), iconview.content-view.check:backdrop:not(list),
-.content-view .tile check:backdrop:not(list) {
+.content-view:not(list) check:backdrop {
   margin: 4px;
   min-width: 32px;
   min-height: 32px;
@@ -2821,7 +2814,7 @@ switch {
   -gtk-icon-shadow: none; }
 
 .view.content-view.check:checked:not(list), iconview.content-view.check:checked:not(list),
-.content-view .tile check:checked:not(list) {
+.content-view:not(list) check:checked {
   margin: 4px;
   min-width: 32px;
   min-height: 32px;
@@ -2836,7 +2829,7 @@ switch {
   -gtk-icon-shadow: none; }
 
 .view.content-view.check:checked:hover:not(list), iconview.content-view.check:checked:hover:not(list),
-.content-view .tile check:checked:hover:not(list) {
+.content-view:not(list) check:checked:hover {
   margin: 4px;
   min-width: 32px;
   min-height: 32px;
@@ -2851,7 +2844,7 @@ switch {
   -gtk-icon-shadow: none; }
 
 .view.content-view.check:checked:active:not(list), iconview.content-view.check:checked:active:not(list),
-.content-view .tile check:checked:active:not(list) {
+.content-view:not(list) check:checked:active {
   margin: 4px;
   min-width: 32px;
   min-height: 32px;
@@ -2866,7 +2859,7 @@ switch {
   -gtk-icon-shadow: none; }
 
 .view.content-view.check:backdrop:checked:not(list), iconview.content-view.check:backdrop:checked:not(list),
-.content-view .tile check:backdrop:checked:not(list) {
+.content-view:not(list) check:backdrop:checked {
   margin: 4px;
   min-width: 32px;
   min-height: 32px;
@@ -4079,31 +4072,16 @@ messagedialog.csd.background {
 
 messagedialog.csd .dialog-action-area button {
   padding: 10px 14px;
-  border-radius: 0;
-  border-left-style: solid;
   border-right-style: none;
-  border-bottom-style: none; }
-  messagedialog.csd .dialog-action-area button:first-child:not(:only-child) {
+  border-bottom-style: none;
+  border-radius: 0;
+  -gtk-outline-radius: 0; }
+  messagedialog.csd .dialog-action-area button:first-child {
     border-left-style: none;
     border-bottom-left-radius: 7px;
-    -gtk-outline-bottom-left-radius: 7px;
-    -gtk-outline-top-left-radius: 0px;
-    -gtk-outline-top-right-radius: 0px;
-    -gtk-outline-bottom-right-radius: 0px; }
-  messagedialog.csd .dialog-action-area button:last-child:not(:only-child) {
+    -gtk-outline-bottom-left-radius: 7px; }
+  messagedialog.csd .dialog-action-area button:last-child {
     border-bottom-right-radius: 7px;
-    -gtk-outline-bottom-right-radius: 7px;
-    -gtk-outline-top-right-radius: 0px;
-    -gtk-outline-bottom-left-radius: 0px;
-    -gtk-outline-top-left-radius: 0px; }
-  messagedialog.csd .dialog-action-area button:only-child {
-    border-top-right-radius: 0;
-    border-top-left-radius: 0;
-    border-bottom-left-radius: 7px;
-    border-bottom-right-radius: 7px;
-    -gtk-outline-top-right-radius: 0px;
-    -gtk-outline-top-left-radius: 0px;
-    -gtk-outline-bottom-left-radius: 7px;
     -gtk-outline-bottom-right-radius: 7px; }
 
 filechooser .dialog-action-box {
@@ -4521,8 +4499,6 @@ decoration {
     border-radius: 0; }
   .popup decoration {
     box-shadow: none; }
-  .csd decoration {
-    background-color: black; }
   .ssd decoration {
     box-shadow: 0 0 0 1px rgba(13, 14, 17, 0.9); }
   .csd.popup decoration {
@@ -5161,8 +5137,6 @@ decoration {
   messagedialog.csd decoration {
     border-width: 0;
     box-shadow: 0 1px 4px rgba(0, 0, 0, 0.2); }
-  window.csd decoration {
-    background: black; }
 
 button.titlebutton:not(.appmenu) {
   margin: 0; }
diff --git a/share/themes/Kali-Light/gtk-3.0/gtk.css b/share/themes/Kali-Light/gtk-3.0/gtk.css
index 9eb2c7a5..778256fa 100644
--- a/share/themes/Kali-Light/gtk-3.0/gtk.css
+++ b/share/themes/Kali-Light/gtk-3.0/gtk.css
@@ -1123,10 +1123,6 @@ button.file separator {
 button.font > box > box > label {
   font-weight: bold; }
 
-.inline-toolbar button, .inline-toolbar button:backdrop {
-  border-radius: 2px;
-  border-width: 1px; }
-
 .primary-toolbar button {
   -gtk-icon-shadow: none; }
 
@@ -1243,55 +1239,51 @@ stacksidebar row.needs-attention > label, .stack-switcher > button.needs-attenti
         background-image: image(#eaeaea);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
 
-.linked > combobox > box > button.combo:dir(ltr), .linked > combobox > box > button.combo:dir(rtl), filechooser .path-bar.linked > button, .linked:not(.vertical) > spinbutton:not(.vertical), .linked:not(.vertical) > entry, .inline-toolbar button, .inline-toolbar button:backdrop, .linked > button, .linked > button:hover, .linked > button:active, .linked > button:checked, .linked > button:backdrop, toolbar.inline-toolbar toolbutton > button.flat,
-toolbar.inline-toolbar toolbutton:backdrop > button.flat {
-  border-radius: 0;
+.linked:not(.vertical) > combobox > box > button.combo, filechooser .path-bar.linked > button, .linked:not(.vertical) > spinbutton:not(.vertical), .linked:not(.vertical) > entry, .inline-toolbar button, .linked > button, toolbar.inline-toolbar toolbutton > button.flat {
   border-right-style: none;
+  border-radius: 0;
   -gtk-outline-radius: 0; }
 
-.linked:not(.vertical) > combobox:first-child > box > button.combo, combobox.linked button:nth-child(2):dir(rtl), filechooser .path-bar.linked > button:dir(rtl):last-child, filechooser .path-bar.linked > button:dir(ltr):first-child, .linked:not(.vertical) > spinbutton:first-child:not(.vertical), .linked:not(.vertical) > entry:first-child, .inline-toolbar button:first-child, .inline-toolbar button:first-child:backdrop, .linked > button:first-child, .linked > button:first-child:hover, .linked > button:first-child:active, .linked > button:first-child:checked, .linked > button:first-child:backdrop, toolbar.inline-toolbar toolbutton:first-child > button.flat {
+.linked:not(.vertical) > combobox:first-child > box > button.combo, combobox.linked button:nth-child(2):dir(rtl), filechooser .path-bar.linked > button:dir(rtl):last-child, filechooser .path-bar.linked > button:dir(ltr):first-child, .linked:not(.vertical) > spinbutton:first-child:not(.vertical), .linked:not(.vertical) > entry:first-child, .inline-toolbar button:first-child, .linked > button:first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat {
   border-top-left-radius: 5px;
   border-bottom-left-radius: 5px;
-  border-top-right-radius: 0;
-  border-bottom-right-radius: 0;
-  border-right-style: none;
-  -gtk-outline-bottom-left-radius: 5px;
   -gtk-outline-top-left-radius: 5px;
-  -gtk-outline-top-right-radius: 0;
-  -gtk-outline-bottom-right-radius: 0; }
+  -gtk-outline-bottom-left-radius: 5px; }
 
-.linked:not(.vertical) > combobox:last-child > box > button.combo, combobox.linked button:nth-child(2):dir(ltr), filechooser .path-bar.linked > button:dir(rtl):first-child, filechooser .path-bar.linked > button:dir(ltr):last-child, .linked:not(.vertical) > spinbutton:last-child:not(.vertical), .linked:not(.vertical) > entry:last-child, .inline-toolbar button:last-child, .inline-toolbar button:last-child:backdrop, .linked > button:last-child, .linked > button:last-child:hover, .linked > button:last-child:active, .linked > button:last-child:checked, .linked > button:last-child:backdrop, toolbar.inline-toolbar toolbutton:last-child > button.flat {
-  border-top-left-radius: 0;
-  border-bottom-left-radius: 0;
+.linked:not(.vertical) > combobox:last-child > box > button.combo, combobox.linked button:nth-child(2):dir(ltr), filechooser .path-bar.linked > button:dir(rtl):first-child, filechooser .path-bar.linked > button:dir(ltr):last-child, .linked:not(.vertical) > spinbutton:last-child:not(.vertical), .linked:not(.vertical) > entry:last-child, .inline-toolbar button:last-child, .linked > button:last-child, toolbar.inline-toolbar toolbutton:last-child > button.flat {
+  border-right-style: solid;
   border-top-right-radius: 5px;
   border-bottom-right-radius: 5px;
-  border-right-style: solid;
-  -gtk-outline-bottom-right-radius: 5px;
   -gtk-outline-top-right-radius: 5px;
-  -gtk-outline-bottom-left-radius: 0;
-  -gtk-outline-top-left-radius: 0; }
+  -gtk-outline-bottom-right-radius: 5px; }
 
-.linked:not(.vertical) > combobox:only-child > box > button.combo, filechooser .path-bar.linked > button:only-child, .linked:not(.vertical) > spinbutton:only-child:not(.vertical), .linked:not(.vertical) > entry:only-child, .inline-toolbar button:only-child, .inline-toolbar button:only-child:backdrop, .linked > button:only-child, .linked > button:only-child:hover, .linked > button:only-child:active, .linked > button:only-child:checked, .linked > button:only-child:backdrop, toolbar.inline-toolbar toolbutton:only-child > button.flat {
-  border-radius: 5px;
+.linked:not(.vertical) > combobox:only-child > box > button.combo, filechooser .path-bar.linked > button:only-child, .linked:not(.vertical) > spinbutton:only-child:not(.vertical), .linked:not(.vertical) > entry:only-child, .inline-toolbar button:only-child, .linked > button:only-child, toolbar.inline-toolbar toolbutton:only-child > button.flat {
   border-style: solid;
+  border-radius: 5px;
   -gtk-outline-radius: 5px; }
 
-.linked.vertical > combobox > box > button.combo, .linked.vertical > spinbutton:not(.vertical), .linked.vertical > entry, .linked.vertical > button, .linked.vertical > button:hover, .linked.vertical > button:active, .linked.vertical > button:checked, .linked.vertical > button:backdrop {
+.linked.vertical > combobox > box > button.combo, .linked.vertical > spinbutton:not(.vertical), .linked.vertical > entry, .linked.vertical > button {
   border-style: solid solid none solid;
-  border-radius: 0; }
+  border-radius: 0;
+  -gtk-outline-radius: 0; }
 
-.linked.vertical > combobox:first-child > box > button.combo, .linked.vertical > spinbutton:first-child:not(.vertical), .linked.vertical > entry:first-child, .linked.vertical > button:first-child, .linked.vertical > button:first-child:hover, .linked.vertical > button:first-child:active, .linked.vertical > button:first-child:checked, .linked.vertical > button:first-child:backdrop {
+.linked.vertical > combobox:first-child > box > button.combo, .linked.vertical > spinbutton:first-child:not(.vertical), .linked.vertical > entry:first-child, .linked.vertical > button:first-child {
   border-top-left-radius: 5px;
-  border-top-right-radius: 5px; }
+  border-top-right-radius: 5px;
+  -gtk-outline-top-left-radius: 5px;
+  -gtk-outline-top-right-radius: 5px; }
 
-.linked.vertical > combobox:last-child > box > button.combo, .linked.vertical > spinbutton:last-child:not(.vertical), .linked.vertical > entry:last-child, .linked.vertical > button:last-child, .linked.vertical > button:last-child:hover, .linked.vertical > button:last-child:active, .linked.vertical > button:last-child:checked, .linked.vertical > button:last-child:backdrop {
+.linked.vertical > combobox:last-child > box > button.combo, .linked.vertical > spinbutton:last-child:not(.vertical), .linked.vertical > entry:last-child, .linked.vertical > button:last-child {
+  border-bottom-style: solid;
   border-bottom-left-radius: 5px;
   border-bottom-right-radius: 5px;
-  border-style: solid; }
+  -gtk-outline-bottom-left-radius: 5px;
+  -gtk-outline-bottom-right-radius: 5px; }
 
-.linked.vertical > combobox:only-child > box > button.combo, .linked.vertical > spinbutton:only-child:not(.vertical), .linked.vertical > entry:only-child, .linked.vertical > button:only-child, .linked.vertical > button:only-child:hover, .linked.vertical > button:only-child:active, .linked.vertical > button:only-child:checked, .linked.vertical > button:only-child:backdrop {
+.linked.vertical > combobox:only-child > box > button.combo, .linked.vertical > spinbutton:only-child:not(.vertical), .linked.vertical > entry:only-child, .linked.vertical > button:only-child {
+  border-style: solid;
   border-radius: 5px;
-  border-style: solid; }
+  -gtk-outline-radius: 5px; }
 
 .scale-popup button:backdrop:hover, .scale-popup button:backdrop:disabled, .scale-popup button:backdrop, .scale-popup button:hover, calendar.button, button:link:hover, button:link:active, button:link:checked,
 button:visited:hover,
@@ -2372,41 +2364,41 @@ notebook > header {
     notebook > header.top > tabs {
       margin-bottom: -2px; }
       notebook > header.top > tabs > tab:hover {
-        box-shadow: inset 0 -3px #d9d9d9; }
+        box-shadow: inset 0 -4px #d9d9d9; }
       notebook > header.top > tabs > tab:backdrop {
         box-shadow: none; }
       notebook > header.top > tabs > tab:checked {
-        box-shadow: inset 0 -3px #2777ff; }
+        box-shadow: inset 0 -4px #2777ff; }
   notebook > header.bottom {
     border-top-style: solid; }
     notebook > header.bottom > tabs {
       margin-top: -2px; }
       notebook > header.bottom > tabs > tab:hover {
-        box-shadow: inset 0 3px #d9d9d9; }
+        box-shadow: inset 0 4px #d9d9d9; }
       notebook > header.bottom > tabs > tab:backdrop {
         box-shadow: none; }
       notebook > header.bottom > tabs > tab:checked {
-        box-shadow: inset 0 3px #2777ff; }
+        box-shadow: inset 0 4px #2777ff; }
   notebook > header.left {
     border-right-style: solid; }
     notebook > header.left > tabs {
       margin-right: -2px; }
       notebook > header.left > tabs > tab:hover {
-        box-shadow: inset -3px 0 #d9d9d9; }
+        box-shadow: inset -4px 0 #d9d9d9; }
       notebook > header.left > tabs > tab:backdrop {
         box-shadow: none; }
       notebook > header.left > tabs > tab:checked {
-        box-shadow: inset -3px 0 #2777ff; }
+        box-shadow: inset -4px 0 #2777ff; }
   notebook > header.right {
     border-left-style: solid; }
     notebook > header.right > tabs {
       margin-left: -2px; }
       notebook > header.right > tabs > tab:hover {
-        box-shadow: inset 3px 0 #d9d9d9; }
+        box-shadow: inset 4px 0 #d9d9d9; }
       notebook > header.right > tabs > tab:backdrop {
         box-shadow: none; }
       notebook > header.right > tabs > tab:checked {
-        box-shadow: inset 3px 0 #2777ff; }
+        box-shadow: inset 4px 0 #2777ff; }
   notebook > header.top > tabs > arrow {
     border-top-style: none; }
   notebook > header.bottom > tabs > arrow {
@@ -2455,12 +2447,13 @@ notebook > header {
     min-width: 30px;
     padding: 3px 12px;
     outline-offset: -5px;
-    color: #aeb0b6;
-    font-weight: bold;
+    color: #5c616c;
+    font-weight: normal;
     border-width: 1px;
     border-color: transparent; }
     notebook > header tab:hover {
-      color: #858991; }
+      color: #5c616c;
+      background-color: whitesmoke; }
       notebook > header tab.reorderable-page:hover {
         border-color: rgba(217, 217, 217, 0.3);
         background-color: rgba(255, 255, 255, 0.2); }
@@ -2780,7 +2773,7 @@ switch {
  * Check and Radio items *
  *************************/
 .view.content-view.check:not(list), iconview.content-view.check:not(list),
-.content-view .tile check:not(list) {
+.content-view:not(list) check {
   margin: 4px;
   min-width: 32px;
   min-height: 32px;
@@ -2795,7 +2788,7 @@ switch {
   -gtk-icon-shadow: none; }
 
 .view.content-view.check:hover:not(list), iconview.content-view.check:hover:not(list),
-.content-view .tile check:hover:not(list) {
+.content-view:not(list) check:hover {
   margin: 4px;
   min-width: 32px;
   min-height: 32px;
@@ -2810,7 +2803,7 @@ switch {
   -gtk-icon-shadow: none; }
 
 .view.content-view.check:active:not(list), iconview.content-view.check:active:not(list),
-.content-view .tile check:active:not(list) {
+.content-view:not(list) check:active {
   margin: 4px;
   min-width: 32px;
   min-height: 32px;
@@ -2825,7 +2818,7 @@ switch {
   -gtk-icon-shadow: none; }
 
 .view.content-view.check:backdrop:not(list), iconview.content-view.check:backdrop:not(list),
-.content-view .tile check:backdrop:not(list) {
+.content-view:not(list) check:backdrop {
   margin: 4px;
   min-width: 32px;
   min-height: 32px;
@@ -2840,7 +2833,7 @@ switch {
   -gtk-icon-shadow: none; }
 
 .view.content-view.check:checked:not(list), iconview.content-view.check:checked:not(list),
-.content-view .tile check:checked:not(list) {
+.content-view:not(list) check:checked {
   margin: 4px;
   min-width: 32px;
   min-height: 32px;
@@ -2855,7 +2848,7 @@ switch {
   -gtk-icon-shadow: none; }
 
 .view.content-view.check:checked:hover:not(list), iconview.content-view.check:checked:hover:not(list),
-.content-view .tile check:checked:hover:not(list) {
+.content-view:not(list) check:checked:hover {
   margin: 4px;
   min-width: 32px;
   min-height: 32px;
@@ -2870,7 +2863,7 @@ switch {
   -gtk-icon-shadow: none; }
 
 .view.content-view.check:checked:active:not(list), iconview.content-view.check:checked:active:not(list),
-.content-view .tile check:checked:active:not(list) {
+.content-view:not(list) check:checked:active {
   margin: 4px;
   min-width: 32px;
   min-height: 32px;
@@ -2885,7 +2878,7 @@ switch {
   -gtk-icon-shadow: none; }
 
 .view.content-view.check:backdrop:checked:not(list), iconview.content-view.check:backdrop:checked:not(list),
-.content-view .tile check:backdrop:checked:not(list) {
+.content-view:not(list) check:backdrop:checked {
   margin: 4px;
   min-width: 32px;
   min-height: 32px;
@@ -4101,31 +4094,16 @@ messagedialog.csd.background {
 
 messagedialog.csd .dialog-action-area button {
   padding: 10px 14px;
-  border-radius: 0;
-  border-left-style: solid;
   border-right-style: none;
-  border-bottom-style: none; }
-  messagedialog.csd .dialog-action-area button:first-child:not(:only-child) {
+  border-bottom-style: none;
+  border-radius: 0;
+  -gtk-outline-radius: 0; }
+  messagedialog.csd .dialog-action-area button:first-child {
     border-left-style: none;
     border-bottom-left-radius: 7px;
-    -gtk-outline-bottom-left-radius: 7px;
-    -gtk-outline-top-left-radius: 0px;
-    -gtk-outline-top-right-radius: 0px;
-    -gtk-outline-bottom-right-radius: 0px; }
-  messagedialog.csd .dialog-action-area button:last-child:not(:only-child) {
+    -gtk-outline-bottom-left-radius: 7px; }
+  messagedialog.csd .dialog-action-area button:last-child {
     border-bottom-right-radius: 7px;
-    -gtk-outline-bottom-right-radius: 7px;
-    -gtk-outline-top-right-radius: 0px;
-    -gtk-outline-bottom-left-radius: 0px;
-    -gtk-outline-top-left-radius: 0px; }
-  messagedialog.csd .dialog-action-area button:only-child {
-    border-top-right-radius: 0;
-    border-top-left-radius: 0;
-    border-bottom-left-radius: 7px;
-    border-bottom-right-radius: 7px;
-    -gtk-outline-top-right-radius: 0px;
-    -gtk-outline-top-left-radius: 0px;
-    -gtk-outline-bottom-left-radius: 7px;
     -gtk-outline-bottom-right-radius: 7px; }
 
 filechooser .dialog-action-box {
@@ -4543,8 +4521,6 @@ decoration {
     border-radius: 0; }
   .popup decoration {
     box-shadow: none; }
-  .csd decoration {
-    background-color: black; }
   .ssd decoration {
     box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.23); }
   .csd.popup decoration {
@@ -5182,8 +5158,6 @@ decoration {
   messagedialog.csd decoration {
     border-width: 0;
     box-shadow: 0 1px 4px rgba(0, 0, 0, 0.2); }
-  window.csd decoration {
-    background: white; }
 
 button.titlebutton:not(.appmenu) {
   margin: 0; }
diff --git a/src/themes/Kali/sass/gtk-sass/_common-tweaks.scss b/src/themes/Kali/sass/gtk-sass/_common-tweaks.scss
index b8e50daf..ceb19830 100644
--- a/src/themes/Kali/sass/gtk-sass/_common-tweaks.scss
+++ b/src/themes/Kali/sass/gtk-sass/_common-tweaks.scss
@@ -356,10 +356,6 @@ decoration {
     border-width: 0;
     box-shadow: 0 1px 4px transparentize(black, 0.8);
   }
-
-  window.csd & {
-   background: if($variant=='light', white, black);
-  }
 }
 
 // Window Close button
diff --git a/src/themes/Kali/sass/gtk-sass/upstream/_common.scss b/src/themes/Kali/sass/gtk-sass/upstream/_common.scss
index 4a63e4f7..708c8b08 100644
--- a/src/themes/Kali/sass/gtk-sass/upstream/_common.scss
+++ b/src/themes/Kali/sass/gtk-sass/upstream/_common.scss
@@ -886,25 +886,13 @@ button {
   &.font { > box > box > label { font-weight: bold; }}
 
   // inline-toolbar buttons
-  .inline-toolbar &, .inline-toolbar &:backdrop {
-    border-radius: 2px;
-    border-width: 1px;
-    @extend %linked;
-  }
+  .inline-toolbar & { @extend %linked; }
 
   .primary-toolbar & { -gtk-icon-shadow: none; } // tango icons don't need shadows
 
-  .linked > &,
-  .linked > &:hover,
-  .linked > &:active,
-  .linked > &:checked,
-  .linked > &:backdrop { @extend %linked; }
+  .linked > & { @extend %linked; }
 
-  .linked.vertical > &,
-  .linked.vertical > &:hover,
-  .linked.vertical > &:active,
-  .linked.vertical > &:checked,
-  .linked.vertical > &:backdrop { @extend %linked_vertical; }
+  .linked.vertical > & { @extend %linked_vertical; }
 
   &.circular { // The Bloody Circul Button
     border-radius: 9999px;
@@ -1004,8 +992,7 @@ button {
 }
 
 // More inline toolbar buttons
-toolbar.inline-toolbar toolbutton,
-toolbar.inline-toolbar toolbutton:backdrop {
+toolbar.inline-toolbar toolbutton {
   > button.flat { @extend %linked_middle; }
 
   &:first-child > button.flat { @extend %linked_left; }
@@ -1016,38 +1003,29 @@ toolbar.inline-toolbar toolbutton:backdrop {
 }
 
 %linked_middle {
-  border-radius: 0;
   border-right-style: none;
+  border-radius: 0;
   -gtk-outline-radius: 0;
 }
 
 %linked_left {
     border-top-left-radius: $button_radius;
     border-bottom-left-radius: $button_radius;
-    border-top-right-radius: 0;
-    border-bottom-right-radius: 0;
-    border-right-style: none;
-    -gtk-outline-bottom-left-radius: $button_radius;
     -gtk-outline-top-left-radius: $button_radius;
-    -gtk-outline-top-right-radius: 0;
-    -gtk-outline-bottom-right-radius: 0;
+    -gtk-outline-bottom-left-radius: $button_radius;
 }
 
 %linked_right {
-    border-top-left-radius: 0;
-    border-bottom-left-radius: 0;
+    border-right-style: solid;
     border-top-right-radius: $button_radius;
     border-bottom-right-radius: $button_radius;
-    border-right-style: solid;
-    -gtk-outline-bottom-right-radius: $button_radius;
     -gtk-outline-top-right-radius: $button_radius;
-    -gtk-outline-bottom-left-radius: 0;
-    -gtk-outline-top-left-radius: 0;
+    -gtk-outline-bottom-right-radius: $button_radius;
 }
 
 %linked_only_child {
-    border-radius: $button_radius;
     border-style: solid;
+    border-radius: $button_radius;
     -gtk-outline-radius: $button_radius;
 }
 
@@ -1081,25 +1059,31 @@ toolbar.inline-toolbar toolbutton:backdrop {
 %linked_vertical_middle {
   border-style: solid solid none solid;
   border-radius: 0;
+  -gtk-outline-radius: 0;
 }
 
 %linked_vertical_top {
   border-top-left-radius: $button_radius;
   border-top-right-radius: $button_radius;
+  -gtk-outline-top-left-radius: $button_radius;
+  -gtk-outline-top-right-radius: $button_radius;
 }
 
 %linked_vertical_bottom {
+  border-bottom-style: solid;
   border-bottom-left-radius: $button_radius;
   border-bottom-right-radius: $button_radius;
-  border-style: solid;
+  -gtk-outline-bottom-left-radius: $button_radius;
+  -gtk-outline-bottom-right-radius: $button_radius;
 }
 
 %linked_vertical_only_child {
-  border-radius: $button_radius;
   border-style: solid;
+  border-radius: $button_radius;
+  -gtk-outline-radius: $button_radius;
 }
 
-%linked_vertical{
+%linked_vertical {
   @extend %linked_vertical_middle;
 
   &:first-child { @extend %linked_vertical_top; }
@@ -1471,21 +1455,17 @@ combobox {
   }
 }
 
-.linked > combobox > box > button.combo {
-  // the combo is a composite widget so the way we do button linking doesn't
-  // work, special case needed. See
-  // https://bugzilla.gnome.org/show_bug.cgi?id=733979
-
-  &:dir(ltr),
-  &:dir(rtl) { @extend %linked_middle; } // specificity bump
-}
+// the combo is a composite widget so the way we do button linking doesn't
+// work, special case needed. See
+// https://bugzilla.gnome.org/show_bug.cgi?id=733979
 
+.linked:not(.vertical) > combobox > box > button.combo { @extend %linked_middle; }
 .linked:not(.vertical) > combobox:first-child > box > button.combo { @extend %linked_left; }
 .linked:not(.vertical) > combobox:last-child > box > button.combo { @extend %linked_right; }
 .linked:not(.vertical) > combobox:only-child > box > button.combo { @extend %linked_only_child; }
 
 .linked.vertical > combobox > box > button.combo { @extend %linked_vertical_middle; }
-.linked.vertical > combobox:first-child > box > button.combo { @extend %linked_vertical_top;}
+.linked.vertical > combobox:first-child > box > button.combo { @extend %linked_vertical_top; }
 .linked.vertical > combobox:last-child > box > button.combo { @extend %linked_vertical_bottom; }
 .linked.vertical > combobox:only-child > box > button.combo { @extend %linked_vertical_only_child; }
 
@@ -2396,11 +2376,11 @@ notebook {
       > tabs {
         margin-bottom: -2px;
         > tab {
-          &:hover { box-shadow: inset 0 -3px $borders_color; }
+          &:hover { box-shadow: inset 0 -4px $borders_color; }
 
           &:backdrop { box-shadow: none; }
 
-          &:checked { box-shadow: inset 0 -3px $selected_bg_color; }
+          &:checked { box-shadow: inset 0 -4px $selected_bg_color; }
         }
       }
     }
@@ -2410,11 +2390,11 @@ notebook {
       > tabs {
         margin-top: -2px;
         > tab {
-          &:hover { box-shadow: inset 0 3px $borders_color; }
+          &:hover { box-shadow: inset 0 4px $borders_color; }
 
           &:backdrop { box-shadow: none; }
 
-          &:checked { box-shadow: inset 0 3px $selected_bg_color; }
+          &:checked { box-shadow: inset 0 4px $selected_bg_color; }
         }
       }
     }
@@ -2424,11 +2404,11 @@ notebook {
       > tabs {
         margin-right: -2px;
         > tab {
-          &:hover { box-shadow: inset -3px 0 $borders_color; }
+          &:hover { box-shadow: inset -4px 0 $borders_color; }
 
           &:backdrop { box-shadow: none; }
 
-          &:checked { box-shadow: inset -3px 0 $selected_bg_color; }
+          &:checked { box-shadow: inset -4px 0 $selected_bg_color; }
         }
       }
     }
@@ -2438,11 +2418,11 @@ notebook {
       > tabs {
         margin-left: -2px;
         > tab {
-          &:hover { box-shadow: inset 3px 0 $borders_color; }
+          &:hover { box-shadow: inset 4px 0 $borders_color; }
 
           &:backdrop { box-shadow: none; }
 
-          &:checked { box-shadow: inset 3px 0 $selected_bg_color; }
+          &:checked { box-shadow: inset 4px 0 $selected_bg_color; }
         }
       }
     }
@@ -2520,14 +2500,15 @@ notebook {
 
       outline-offset: -5px;
 
-      color: $insensitive_fg_color;
-      font-weight: bold;
+      color: $fg_color;
+      font-weight: normal;
 
       border-width: 1px;         // for reorderable tabs
       border-color: transparent; //
 
       &:hover {
-        color: mix($insensitive_fg_color, $fg_color, 50%);
+        color: $fg_color;
+        background-color: darken($bg_color,4%);
 
         &.reorderable-page {
           border-color: transparentize($borders_color, 0.7);
@@ -2949,7 +2930,7 @@ switch {
   (':backdrop:checked', '-gtk-icontheme(\'object-select-symbolic\')', '#{transparentize($osd_fg_color, 0.2)}', '#{desaturate($checkradio_bg_color, 100%)}'), {
 
   .view.content-view.check#{$check_state}:not(list),
-  .content-view .tile check#{$check_state}:not(list) {
+  .content-view:not(list) check#{$check_state} {
     margin: 4px;
     min-width: 32px;
     min-height: 32px;
@@ -3993,36 +3974,20 @@ messagedialog { // Message Dialog styling
 
     .dialog-action-area button {
       padding: 10px 14px; // labels are not vertically centered on message dialog, this is a workaround
-      border-radius: 0;
-      border-left-style: solid;
       border-right-style: none;
       border-bottom-style: none;
+      border-radius: 0;
+      -gtk-outline-radius: 0;
 
-      &:first-child:not(:only-child) {
+      &:first-child {
         border-left-style: none;
         border-bottom-left-radius: $button_radius + 2;
         -gtk-outline-bottom-left-radius: $button_radius + 2;
-        -gtk-outline-top-left-radius: 0px;
-        -gtk-outline-top-right-radius: 0px;
-        -gtk-outline-bottom-right-radius: 0px;
       }
-  
-      &:last-child:not(:only-child) {
+
+      &:last-child {
         border-bottom-right-radius: $button_radius + 2;
         -gtk-outline-bottom-right-radius: $button_radius + 2;
-        -gtk-outline-top-right-radius: 0px;
-        -gtk-outline-bottom-left-radius: 0px;
-        -gtk-outline-top-left-radius: 0px;
-      }
-      &:only-child {
-        border-top-right-radius: 0;
-        border-top-left-radius: 0;
-        border-bottom-left-radius: $button_radius + 2;
-        border-bottom-right-radius: $button_radius + 2;
-        -gtk-outline-top-right-radius: 0px;
-        -gtk-outline-top-left-radius: 0px;
-        -gtk-outline-bottom-left-radius: $button_radius + 2;
-        -gtk-outline-bottom-right-radius: $button_radius + 2;
       }
     }
   }
@@ -4610,8 +4575,6 @@ decoration {
 
   .popup & { box-shadow: none; }
 
-  .csd & { background-color: black; } // transparent makes gtk3 leak light on the corners #2537
-
   // server-side decorations as used by mutter
   .ssd & { box-shadow: 0 0 0 1px $_wm_border; } //just doing borders, wm draws actual shadows
 
diff --git a/src/themes/Kali/sass/gtk-sass/upstream/sync.sh b/src/themes/Kali/sass/gtk-sass/upstream/sync.sh
index 5d2f1ec6..87af9bec 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.20
+VERSION=3.24.21
 
 echo
 echo -e " $YELLOW[ i ]$RESET Upstream version $VERSION"