diff --git a/share/themes/Kali-Dark/gtk-3.0/gtk.css b/share/themes/Kali-Dark/gtk-3.0/gtk.css
index a64aa008..9c9453b0 100644
--- a/share/themes/Kali-Dark/gtk-3.0/gtk.css
+++ b/share/themes/Kali-Dark/gtk-3.0/gtk.css
@@ -15,7 +15,7 @@
   outline-style: dashed;
   outline-offset: -3px;
   outline-width: 1px;
-  -gtk-outline-radius: 3px;
+  -gtk-outline-radius: 2px;
   -gtk-secondary-caret-color: #2777ff; }
 
 /***************
@@ -238,7 +238,7 @@ entry {
   padding-left: 8px;
   padding-right: 8px;
   border: 1px solid;
-  border-radius: 5px;
+  border-radius: 4px;
   transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   color: white;
   border-color: #0d0e11;
@@ -486,7 +486,7 @@ button {
   min-width: 16px;
   padding: 2px 6px;
   border: 1px solid;
-  border-radius: 5px;
+  border-radius: 4px;
   transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   color: #eeeeec;
   outline-color: rgba(238, 238, 236, 0.3);
@@ -1249,22 +1249,22 @@ stacksidebar row.needs-attention > label, .stack-switcher > button.needs-attenti
   -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, .linked > button:first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat {
-  border-top-left-radius: 5px;
-  border-bottom-left-radius: 5px;
-  -gtk-outline-top-left-radius: 5px;
-  -gtk-outline-bottom-left-radius: 5px; }
+  border-top-left-radius: 4px;
+  border-bottom-left-radius: 4px;
+  -gtk-outline-top-left-radius: 4px;
+  -gtk-outline-bottom-left-radius: 4px; }
 
 .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;
-  -gtk-outline-top-right-radius: 5px;
-  -gtk-outline-bottom-right-radius: 5px; }
+  border-top-right-radius: 4px;
+  border-bottom-right-radius: 4px;
+  -gtk-outline-top-right-radius: 4px;
+  -gtk-outline-bottom-right-radius: 4px; }
 
 .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; }
+  border-radius: 4px;
+  -gtk-outline-radius: 4px; }
 
 .linked.vertical > combobox > box > button.combo, .linked.vertical > spinbutton:not(.vertical), .linked.vertical > entry, .linked.vertical > button {
   border-style: solid solid none solid;
@@ -1272,22 +1272,22 @@ stacksidebar row.needs-attention > label, .stack-switcher > button.needs-attenti
   -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 {
-  border-top-left-radius: 5px;
-  border-top-right-radius: 5px;
-  -gtk-outline-top-left-radius: 5px;
-  -gtk-outline-top-right-radius: 5px; }
+  border-top-left-radius: 4px;
+  border-top-right-radius: 4px;
+  -gtk-outline-top-left-radius: 4px;
+  -gtk-outline-top-right-radius: 4px; }
 
 .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;
-  -gtk-outline-bottom-left-radius: 5px;
-  -gtk-outline-bottom-right-radius: 5px; }
+  border-bottom-left-radius: 4px;
+  border-bottom-right-radius: 4px;
+  -gtk-outline-bottom-left-radius: 4px;
+  -gtk-outline-bottom-right-radius: 4px; }
 
 .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;
-  -gtk-outline-radius: 5px; }
+  border-radius: 4px;
+  -gtk-outline-radius: 4px; }
 
 .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,
@@ -1308,7 +1308,7 @@ modelbutton.flat,
   min-height: 26px;
   padding-left: 5px;
   padding-right: 5px;
-  border-radius: 5px;
+  border-radius: 4px;
   outline-offset: -2px; }
   modelbutton.flat:hover,
   .menuitem.button.flat:hover {
@@ -1471,9 +1471,9 @@ spinbutton {
         spinbutton:not(.vertical) button:backdrop:disabled:dir(rtl) {
           border-style: none solid none none; }
       spinbutton:not(.vertical) button:dir(ltr):last-child {
-        border-radius: 0 5px 5px 0; }
+        border-radius: 0 4px 4px 0; }
       spinbutton:not(.vertical) button:dir(rtl):first-child {
-        border-radius: 5px 0 0 5px; }
+        border-radius: 4px 0 0 4px; }
   .osd spinbutton:not(.vertical) button {
     border-color: transparent;
     background-color: transparent;
@@ -1524,9 +1524,9 @@ spinbutton {
       -gtk-icon-shadow: none;
       box-shadow: none; }
     .osd spinbutton:not(.vertical) button:dir(ltr):last-child {
-      border-radius: 0 5px 5px 0; }
+      border-radius: 0 4px 4px 0; }
     .osd spinbutton:not(.vertical) button:dir(rtl):first-child {
-      border-radius: 5px 0 0 5px; }
+      border-radius: 4px 0 0 4px; }
   spinbutton.vertical:disabled {
     color: #888a8d; }
   spinbutton.vertical:backdrop:disabled {
@@ -1544,10 +1544,10 @@ spinbutton {
     min-width: 32px;
     padding: 0; }
   spinbutton.vertical button.up {
-    border-radius: 5px 5px 0 0;
+    border-radius: 4px 4px 0 0;
     border-style: solid solid none solid; }
   spinbutton.vertical button.down {
-    border-radius: 0 0 5px 5px;
+    border-radius: 0 0 4px 4px;
     border-style: none solid solid solid; }
   .osd spinbutton.vertical button:first-child {
     color: white;
@@ -1953,8 +1953,8 @@ headerbar.titlebar headerbar:not(.titlebar) {
   box-shadow: none; }
 
 .background .titlebar:backdrop, .background .titlebar {
-  border-top-left-radius: 8px;
-  border-top-right-radius: 8px; }
+  border-top-left-radius: 7px;
+  border-top-right-radius: 7px; }
 
 .background.tiled .titlebar:backdrop, .background.tiled .titlebar,
 .background.tiled-top .titlebar:backdrop,
@@ -2322,7 +2322,7 @@ popover.background {
   box-shadow: 0 1px 2px rgba(0, 0, 0, 0.3); }
   .csd popover.background, popover.background {
     border: 1px solid #0d0e11;
-    border-radius: 9px; }
+    border-radius: 8px; }
   .csd popover.background {
     background-clip: padding-box;
     border-color: rgba(13, 14, 17, 0.9); }
@@ -4074,8 +4074,8 @@ messagedialog .titlebar {
   border-top-right-radius: 7px; }
 
 messagedialog.csd.background {
-  border-bottom-left-radius: 9px;
-  border-bottom-right-radius: 9px; }
+  border-bottom-left-radius: 8px;
+  border-bottom-right-radius: 8px; }
 
 messagedialog.csd .dialog-action-area button {
   padding: 10px 14px;
@@ -4085,11 +4085,11 @@ messagedialog.csd .dialog-action-area button {
   -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; }
+    border-bottom-left-radius: 6px;
+    -gtk-outline-bottom-left-radius: 6px; }
   messagedialog.csd .dialog-action-area button:last-child {
-    border-bottom-right-radius: 7px;
-    -gtk-outline-bottom-right-radius: 7px; }
+    border-bottom-right-radius: 6px;
+    -gtk-outline-bottom-right-radius: 6px; }
 
 filechooser .dialog-action-box {
   border-top: 1px solid #0d0e11; }
@@ -4495,7 +4495,7 @@ colorchooser .popover.osd {
  * Window Decorations *
  *********************/
 decoration {
-  border-radius: 8px 8px 0 0;
+  border-radius: 7px 7px 0 0;
   border-width: 0px;
   box-shadow: 0 3px 9px 1px rgba(0, 0, 0, 0.5), 0 0 0 1px rgba(13, 14, 17, 0.9);
   margin: 10px; }
@@ -4515,7 +4515,7 @@ decoration {
     border-radius: 5px;
     box-shadow: none; }
   messagedialog.csd decoration {
-    border-radius: 8px;
+    border-radius: 7px;
     box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(13, 14, 17, 0.8); }
   .solid-csd decoration {
     margin: 0;
@@ -5501,7 +5501,7 @@ infobar.error:backdrop > revealer > box, infobar.error > revealer > box, infobar
 .app-notification.frame {
   padding: 5px 10px;
   margin: 20px;
-  border-radius: 5px;
+  border-radius: 4px;
   border: 1px solid rgba(13, 14, 17, 0.65);
   box-shadow: 0 1px 6px rgba(0, 0, 0, 0.5);
   background-image: none; }
@@ -5531,7 +5531,7 @@ placessidebar row {
  * Window Decorations *
  *********************/
 decoration {
-  border-radius: 9px 9px 5px 5px;
+  border-radius: 8px 8px 5px 5px;
   border: 1px solid #272a34;
   box-shadow: 0 2px 8px 0 rgba(0, 0, 0, 0.4), 0 0 0 1px rgba(13, 14, 17, 0.75); }
   decoration:backdrop {
@@ -5580,7 +5580,7 @@ filechooser placessidebar.sidebar,
   .nautilus-window placessidebar.sidebar row.sidebar-row:selected {
     margin-left: 6px;
     margin-right: 6px;
-    border-radius: 5px;
+    border-radius: 4px;
     box-shadow: 0 1px 4px rgba(39, 119, 255, 0.5);
     transition: box-shadow 200ms ease-out; }
     filechooser placessidebar.sidebar row.sidebar-row:selected:backdrop,
@@ -5616,7 +5616,7 @@ filechooser placessidebar.sidebar,
     box-shadow: none;
     border-color: #0d0e11; }
   .nautilus-window .floating-bar.bottom.left, .nautilus-window .floating-bar.bottom.right {
-    border-radius: 5px;
+    border-radius: 4px;
     border-style: solid; }
 
 .path-bar-box:backdrop {
@@ -5678,7 +5678,7 @@ filechooser placessidebar.sidebar,
   margin: 0 5px; }
   #whiskermenu-window scrolledwindow.frame treeview {
     background: transparent;
-    border-radius: 5px; }
+    border-radius: 4px; }
     #whiskermenu-window scrolledwindow.frame treeview:hover, #whiskermenu-window scrolledwindow.frame treeview:active, #whiskermenu-window scrolledwindow.frame treeview:selected {
       background-color: rgba(0, 0, 0, 0.27);
       color: inherit; }
@@ -5706,7 +5706,7 @@ wnck-pager {
 .lightdm-gtk-greeter #login_window {
   border: 0;
   background-color: rgba(35, 37, 46, 0.8);
-  border-radius: 5px;
+  border-radius: 4px;
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.15); }
   .lightdm-gtk-greeter #login_window entry {
     background: rgba(35, 37, 46, 0.4);
@@ -5719,7 +5719,7 @@ wnck-pager {
     padding-top: 20px;
     background: #23252e;
     border-top: 1px solid rgba(0, 0, 0, 0.1);
-    border-radius: 0 0 5px 5px;
+    border-radius: 0 0 4px 4px;
     box-shadow: inset 0 -4px rgba(0, 0, 0, 0.2), inset 0 1px 2px rgba(0, 0, 0, 0.27); }
     .lightdm-gtk-greeter #login_window #buttonbox_frame button {
       border: 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 a64aa008..9c9453b0 100644
--- a/share/themes/Kali-Light/gtk-3.0/gtk-dark.css
+++ b/share/themes/Kali-Light/gtk-3.0/gtk-dark.css
@@ -15,7 +15,7 @@
   outline-style: dashed;
   outline-offset: -3px;
   outline-width: 1px;
-  -gtk-outline-radius: 3px;
+  -gtk-outline-radius: 2px;
   -gtk-secondary-caret-color: #2777ff; }
 
 /***************
@@ -238,7 +238,7 @@ entry {
   padding-left: 8px;
   padding-right: 8px;
   border: 1px solid;
-  border-radius: 5px;
+  border-radius: 4px;
   transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   color: white;
   border-color: #0d0e11;
@@ -486,7 +486,7 @@ button {
   min-width: 16px;
   padding: 2px 6px;
   border: 1px solid;
-  border-radius: 5px;
+  border-radius: 4px;
   transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   color: #eeeeec;
   outline-color: rgba(238, 238, 236, 0.3);
@@ -1249,22 +1249,22 @@ stacksidebar row.needs-attention > label, .stack-switcher > button.needs-attenti
   -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, .linked > button:first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat {
-  border-top-left-radius: 5px;
-  border-bottom-left-radius: 5px;
-  -gtk-outline-top-left-radius: 5px;
-  -gtk-outline-bottom-left-radius: 5px; }
+  border-top-left-radius: 4px;
+  border-bottom-left-radius: 4px;
+  -gtk-outline-top-left-radius: 4px;
+  -gtk-outline-bottom-left-radius: 4px; }
 
 .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;
-  -gtk-outline-top-right-radius: 5px;
-  -gtk-outline-bottom-right-radius: 5px; }
+  border-top-right-radius: 4px;
+  border-bottom-right-radius: 4px;
+  -gtk-outline-top-right-radius: 4px;
+  -gtk-outline-bottom-right-radius: 4px; }
 
 .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; }
+  border-radius: 4px;
+  -gtk-outline-radius: 4px; }
 
 .linked.vertical > combobox > box > button.combo, .linked.vertical > spinbutton:not(.vertical), .linked.vertical > entry, .linked.vertical > button {
   border-style: solid solid none solid;
@@ -1272,22 +1272,22 @@ stacksidebar row.needs-attention > label, .stack-switcher > button.needs-attenti
   -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 {
-  border-top-left-radius: 5px;
-  border-top-right-radius: 5px;
-  -gtk-outline-top-left-radius: 5px;
-  -gtk-outline-top-right-radius: 5px; }
+  border-top-left-radius: 4px;
+  border-top-right-radius: 4px;
+  -gtk-outline-top-left-radius: 4px;
+  -gtk-outline-top-right-radius: 4px; }
 
 .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;
-  -gtk-outline-bottom-left-radius: 5px;
-  -gtk-outline-bottom-right-radius: 5px; }
+  border-bottom-left-radius: 4px;
+  border-bottom-right-radius: 4px;
+  -gtk-outline-bottom-left-radius: 4px;
+  -gtk-outline-bottom-right-radius: 4px; }
 
 .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;
-  -gtk-outline-radius: 5px; }
+  border-radius: 4px;
+  -gtk-outline-radius: 4px; }
 
 .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,
@@ -1308,7 +1308,7 @@ modelbutton.flat,
   min-height: 26px;
   padding-left: 5px;
   padding-right: 5px;
-  border-radius: 5px;
+  border-radius: 4px;
   outline-offset: -2px; }
   modelbutton.flat:hover,
   .menuitem.button.flat:hover {
@@ -1471,9 +1471,9 @@ spinbutton {
         spinbutton:not(.vertical) button:backdrop:disabled:dir(rtl) {
           border-style: none solid none none; }
       spinbutton:not(.vertical) button:dir(ltr):last-child {
-        border-radius: 0 5px 5px 0; }
+        border-radius: 0 4px 4px 0; }
       spinbutton:not(.vertical) button:dir(rtl):first-child {
-        border-radius: 5px 0 0 5px; }
+        border-radius: 4px 0 0 4px; }
   .osd spinbutton:not(.vertical) button {
     border-color: transparent;
     background-color: transparent;
@@ -1524,9 +1524,9 @@ spinbutton {
       -gtk-icon-shadow: none;
       box-shadow: none; }
     .osd spinbutton:not(.vertical) button:dir(ltr):last-child {
-      border-radius: 0 5px 5px 0; }
+      border-radius: 0 4px 4px 0; }
     .osd spinbutton:not(.vertical) button:dir(rtl):first-child {
-      border-radius: 5px 0 0 5px; }
+      border-radius: 4px 0 0 4px; }
   spinbutton.vertical:disabled {
     color: #888a8d; }
   spinbutton.vertical:backdrop:disabled {
@@ -1544,10 +1544,10 @@ spinbutton {
     min-width: 32px;
     padding: 0; }
   spinbutton.vertical button.up {
-    border-radius: 5px 5px 0 0;
+    border-radius: 4px 4px 0 0;
     border-style: solid solid none solid; }
   spinbutton.vertical button.down {
-    border-radius: 0 0 5px 5px;
+    border-radius: 0 0 4px 4px;
     border-style: none solid solid solid; }
   .osd spinbutton.vertical button:first-child {
     color: white;
@@ -1953,8 +1953,8 @@ headerbar.titlebar headerbar:not(.titlebar) {
   box-shadow: none; }
 
 .background .titlebar:backdrop, .background .titlebar {
-  border-top-left-radius: 8px;
-  border-top-right-radius: 8px; }
+  border-top-left-radius: 7px;
+  border-top-right-radius: 7px; }
 
 .background.tiled .titlebar:backdrop, .background.tiled .titlebar,
 .background.tiled-top .titlebar:backdrop,
@@ -2322,7 +2322,7 @@ popover.background {
   box-shadow: 0 1px 2px rgba(0, 0, 0, 0.3); }
   .csd popover.background, popover.background {
     border: 1px solid #0d0e11;
-    border-radius: 9px; }
+    border-radius: 8px; }
   .csd popover.background {
     background-clip: padding-box;
     border-color: rgba(13, 14, 17, 0.9); }
@@ -4074,8 +4074,8 @@ messagedialog .titlebar {
   border-top-right-radius: 7px; }
 
 messagedialog.csd.background {
-  border-bottom-left-radius: 9px;
-  border-bottom-right-radius: 9px; }
+  border-bottom-left-radius: 8px;
+  border-bottom-right-radius: 8px; }
 
 messagedialog.csd .dialog-action-area button {
   padding: 10px 14px;
@@ -4085,11 +4085,11 @@ messagedialog.csd .dialog-action-area button {
   -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; }
+    border-bottom-left-radius: 6px;
+    -gtk-outline-bottom-left-radius: 6px; }
   messagedialog.csd .dialog-action-area button:last-child {
-    border-bottom-right-radius: 7px;
-    -gtk-outline-bottom-right-radius: 7px; }
+    border-bottom-right-radius: 6px;
+    -gtk-outline-bottom-right-radius: 6px; }
 
 filechooser .dialog-action-box {
   border-top: 1px solid #0d0e11; }
@@ -4495,7 +4495,7 @@ colorchooser .popover.osd {
  * Window Decorations *
  *********************/
 decoration {
-  border-radius: 8px 8px 0 0;
+  border-radius: 7px 7px 0 0;
   border-width: 0px;
   box-shadow: 0 3px 9px 1px rgba(0, 0, 0, 0.5), 0 0 0 1px rgba(13, 14, 17, 0.9);
   margin: 10px; }
@@ -4515,7 +4515,7 @@ decoration {
     border-radius: 5px;
     box-shadow: none; }
   messagedialog.csd decoration {
-    border-radius: 8px;
+    border-radius: 7px;
     box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(13, 14, 17, 0.8); }
   .solid-csd decoration {
     margin: 0;
@@ -5501,7 +5501,7 @@ infobar.error:backdrop > revealer > box, infobar.error > revealer > box, infobar
 .app-notification.frame {
   padding: 5px 10px;
   margin: 20px;
-  border-radius: 5px;
+  border-radius: 4px;
   border: 1px solid rgba(13, 14, 17, 0.65);
   box-shadow: 0 1px 6px rgba(0, 0, 0, 0.5);
   background-image: none; }
@@ -5531,7 +5531,7 @@ placessidebar row {
  * Window Decorations *
  *********************/
 decoration {
-  border-radius: 9px 9px 5px 5px;
+  border-radius: 8px 8px 5px 5px;
   border: 1px solid #272a34;
   box-shadow: 0 2px 8px 0 rgba(0, 0, 0, 0.4), 0 0 0 1px rgba(13, 14, 17, 0.75); }
   decoration:backdrop {
@@ -5580,7 +5580,7 @@ filechooser placessidebar.sidebar,
   .nautilus-window placessidebar.sidebar row.sidebar-row:selected {
     margin-left: 6px;
     margin-right: 6px;
-    border-radius: 5px;
+    border-radius: 4px;
     box-shadow: 0 1px 4px rgba(39, 119, 255, 0.5);
     transition: box-shadow 200ms ease-out; }
     filechooser placessidebar.sidebar row.sidebar-row:selected:backdrop,
@@ -5616,7 +5616,7 @@ filechooser placessidebar.sidebar,
     box-shadow: none;
     border-color: #0d0e11; }
   .nautilus-window .floating-bar.bottom.left, .nautilus-window .floating-bar.bottom.right {
-    border-radius: 5px;
+    border-radius: 4px;
     border-style: solid; }
 
 .path-bar-box:backdrop {
@@ -5678,7 +5678,7 @@ filechooser placessidebar.sidebar,
   margin: 0 5px; }
   #whiskermenu-window scrolledwindow.frame treeview {
     background: transparent;
-    border-radius: 5px; }
+    border-radius: 4px; }
     #whiskermenu-window scrolledwindow.frame treeview:hover, #whiskermenu-window scrolledwindow.frame treeview:active, #whiskermenu-window scrolledwindow.frame treeview:selected {
       background-color: rgba(0, 0, 0, 0.27);
       color: inherit; }
@@ -5706,7 +5706,7 @@ wnck-pager {
 .lightdm-gtk-greeter #login_window {
   border: 0;
   background-color: rgba(35, 37, 46, 0.8);
-  border-radius: 5px;
+  border-radius: 4px;
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.15); }
   .lightdm-gtk-greeter #login_window entry {
     background: rgba(35, 37, 46, 0.4);
@@ -5719,7 +5719,7 @@ wnck-pager {
     padding-top: 20px;
     background: #23252e;
     border-top: 1px solid rgba(0, 0, 0, 0.1);
-    border-radius: 0 0 5px 5px;
+    border-radius: 0 0 4px 4px;
     box-shadow: inset 0 -4px rgba(0, 0, 0, 0.2), inset 0 1px 2px rgba(0, 0, 0, 0.27); }
     .lightdm-gtk-greeter #login_window #buttonbox_frame button {
       border: 0;
diff --git a/share/themes/Kali-Light/gtk-3.0/gtk.css b/share/themes/Kali-Light/gtk-3.0/gtk.css
index e6dc53b1..b021c4ec 100644
--- a/share/themes/Kali-Light/gtk-3.0/gtk.css
+++ b/share/themes/Kali-Light/gtk-3.0/gtk.css
@@ -15,7 +15,7 @@
   outline-style: dashed;
   outline-offset: -3px;
   outline-width: 1px;
-  -gtk-outline-radius: 3px;
+  -gtk-outline-radius: 2px;
   -gtk-secondary-caret-color: #2777ff; }
 
 /***************
@@ -238,7 +238,7 @@ entry {
   padding-left: 8px;
   padding-right: 8px;
   border: 1px solid;
-  border-radius: 5px;
+  border-radius: 4px;
   transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   color: black;
   border-color: #d9d9d9;
@@ -486,7 +486,7 @@ button {
   min-width: 16px;
   padding: 2px 6px;
   border: 1px solid;
-  border-radius: 5px;
+  border-radius: 4px;
   transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   color: #5c616c;
   outline-color: rgba(92, 97, 108, 0.3);
@@ -1252,22 +1252,22 @@ stacksidebar row.needs-attention > label, .stack-switcher > button.needs-attenti
   -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, .linked > button:first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat {
-  border-top-left-radius: 5px;
-  border-bottom-left-radius: 5px;
-  -gtk-outline-top-left-radius: 5px;
-  -gtk-outline-bottom-left-radius: 5px; }
+  border-top-left-radius: 4px;
+  border-bottom-left-radius: 4px;
+  -gtk-outline-top-left-radius: 4px;
+  -gtk-outline-bottom-left-radius: 4px; }
 
 .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;
-  -gtk-outline-top-right-radius: 5px;
-  -gtk-outline-bottom-right-radius: 5px; }
+  border-top-right-radius: 4px;
+  border-bottom-right-radius: 4px;
+  -gtk-outline-top-right-radius: 4px;
+  -gtk-outline-bottom-right-radius: 4px; }
 
 .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; }
+  border-radius: 4px;
+  -gtk-outline-radius: 4px; }
 
 .linked.vertical > combobox > box > button.combo, .linked.vertical > spinbutton:not(.vertical), .linked.vertical > entry, .linked.vertical > button {
   border-style: solid solid none solid;
@@ -1275,22 +1275,22 @@ stacksidebar row.needs-attention > label, .stack-switcher > button.needs-attenti
   -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 {
-  border-top-left-radius: 5px;
-  border-top-right-radius: 5px;
-  -gtk-outline-top-left-radius: 5px;
-  -gtk-outline-top-right-radius: 5px; }
+  border-top-left-radius: 4px;
+  border-top-right-radius: 4px;
+  -gtk-outline-top-left-radius: 4px;
+  -gtk-outline-top-right-radius: 4px; }
 
 .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;
-  -gtk-outline-bottom-left-radius: 5px;
-  -gtk-outline-bottom-right-radius: 5px; }
+  border-bottom-left-radius: 4px;
+  border-bottom-right-radius: 4px;
+  -gtk-outline-bottom-left-radius: 4px;
+  -gtk-outline-bottom-right-radius: 4px; }
 
 .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;
-  -gtk-outline-radius: 5px; }
+  border-radius: 4px;
+  -gtk-outline-radius: 4px; }
 
 .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,
@@ -1311,7 +1311,7 @@ modelbutton.flat,
   min-height: 26px;
   padding-left: 5px;
   padding-right: 5px;
-  border-radius: 5px;
+  border-radius: 4px;
   outline-offset: -2px; }
   modelbutton.flat:hover,
   .menuitem.button.flat:hover {
@@ -1480,9 +1480,9 @@ spinbutton {
         spinbutton:not(.vertical) button:backdrop:disabled:dir(rtl) {
           border-style: none solid none none; }
       spinbutton:not(.vertical) button:dir(ltr):last-child {
-        border-radius: 0 5px 5px 0; }
+        border-radius: 0 4px 4px 0; }
       spinbutton:not(.vertical) button:dir(rtl):first-child {
-        border-radius: 5px 0 0 5px; }
+        border-radius: 4px 0 0 4px; }
   .osd spinbutton:not(.vertical) button {
     border-color: transparent;
     background-color: transparent;
@@ -1533,9 +1533,9 @@ spinbutton {
       -gtk-icon-shadow: none;
       box-shadow: none; }
     .osd spinbutton:not(.vertical) button:dir(ltr):last-child {
-      border-radius: 0 5px 5px 0; }
+      border-radius: 0 4px 4px 0; }
     .osd spinbutton:not(.vertical) button:dir(rtl):first-child {
-      border-radius: 5px 0 0 5px; }
+      border-radius: 4px 0 0 4px; }
   spinbutton.vertical:disabled {
     color: #aeb0b6; }
   spinbutton.vertical:backdrop:disabled {
@@ -1553,10 +1553,10 @@ spinbutton {
     min-width: 32px;
     padding: 0; }
   spinbutton.vertical button.up {
-    border-radius: 5px 5px 0 0;
+    border-radius: 4px 4px 0 0;
     border-style: solid solid none solid; }
   spinbutton.vertical button.down {
-    border-radius: 0 0 5px 5px;
+    border-radius: 0 0 4px 4px;
     border-style: none solid solid solid; }
   .osd spinbutton.vertical button:first-child {
     color: white;
@@ -1962,8 +1962,8 @@ headerbar.titlebar headerbar:not(.titlebar) {
   box-shadow: none; }
 
 .background .titlebar:backdrop, .background .titlebar {
-  border-top-left-radius: 8px;
-  border-top-right-radius: 8px; }
+  border-top-left-radius: 7px;
+  border-top-right-radius: 7px; }
 
 .background.tiled .titlebar:backdrop, .background.tiled .titlebar,
 .background.tiled-top .titlebar:backdrop,
@@ -2333,7 +2333,7 @@ popover.background {
   box-shadow: 0 1px 2px rgba(0, 0, 0, 0.3); }
   .csd popover.background, popover.background {
     border: 1px solid #d9d9d9;
-    border-radius: 9px; }
+    border-radius: 8px; }
   .csd popover.background {
     background-clip: padding-box;
     border-color: rgba(0, 0, 0, 0.23); }
@@ -4096,8 +4096,8 @@ messagedialog .titlebar {
   border-top-right-radius: 7px; }
 
 messagedialog.csd.background {
-  border-bottom-left-radius: 9px;
-  border-bottom-right-radius: 9px; }
+  border-bottom-left-radius: 8px;
+  border-bottom-right-radius: 8px; }
 
 messagedialog.csd .dialog-action-area button {
   padding: 10px 14px;
@@ -4107,11 +4107,11 @@ messagedialog.csd .dialog-action-area button {
   -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; }
+    border-bottom-left-radius: 6px;
+    -gtk-outline-bottom-left-radius: 6px; }
   messagedialog.csd .dialog-action-area button:last-child {
-    border-bottom-right-radius: 7px;
-    -gtk-outline-bottom-right-radius: 7px; }
+    border-bottom-right-radius: 6px;
+    -gtk-outline-bottom-right-radius: 6px; }
 
 filechooser .dialog-action-box {
   border-top: 1px solid #d9d9d9; }
@@ -4517,7 +4517,7 @@ colorchooser .popover.osd {
  * Window Decorations *
  *********************/
 decoration {
-  border-radius: 8px 8px 0 0;
+  border-radius: 7px 7px 0 0;
   border-width: 0px;
   box-shadow: 0 3px 9px 1px rgba(0, 0, 0, 0.5), 0 0 0 1px rgba(0, 0, 0, 0.23);
   margin: 10px; }
@@ -4537,7 +4537,7 @@ decoration {
     border-radius: 5px;
     box-shadow: none; }
   messagedialog.csd decoration {
-    border-radius: 8px;
+    border-radius: 7px;
     box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(0, 0, 0, 0.13); }
   .solid-csd decoration {
     margin: 0;
@@ -5522,7 +5522,7 @@ infobar.error:backdrop > revealer > box, infobar.error > revealer > box, infobar
 .app-notification.frame {
   padding: 5px 10px;
   margin: 20px;
-  border-radius: 5px;
+  border-radius: 4px;
   border: 1px solid rgba(0, 0, 0, 0);
   box-shadow: 0 1px 6px rgba(0, 0, 0, 0.15);
   background-image: none; }
@@ -5552,7 +5552,7 @@ placessidebar row {
  * Window Decorations *
  *********************/
 decoration {
-  border-radius: 9px 9px 5px 5px;
+  border-radius: 8px 8px 5px 5px;
   border: 1px solid #fafafa;
   box-shadow: 0 2px 8px 0 rgba(0, 0, 0, 0.4), 0 0 0 1px rgba(0, 0, 0, 0.1); }
   decoration:backdrop {
@@ -5601,7 +5601,7 @@ filechooser placessidebar.sidebar,
   .nautilus-window placessidebar.sidebar row.sidebar-row:selected {
     margin-left: 6px;
     margin-right: 6px;
-    border-radius: 5px;
+    border-radius: 4px;
     box-shadow: 0 1px 4px rgba(39, 119, 255, 0.5);
     transition: box-shadow 200ms ease-out; }
     filechooser placessidebar.sidebar row.sidebar-row:selected:backdrop,
@@ -5637,7 +5637,7 @@ filechooser placessidebar.sidebar,
     box-shadow: none;
     border-color: #d9d9d9; }
   .nautilus-window .floating-bar.bottom.left, .nautilus-window .floating-bar.bottom.right {
-    border-radius: 5px;
+    border-radius: 4px;
     border-style: solid; }
 
 .path-bar-box:backdrop {
@@ -5687,7 +5687,7 @@ filechooser placessidebar.sidebar,
   margin: 0 5px; }
   #whiskermenu-window scrolledwindow.frame treeview {
     background: transparent;
-    border-radius: 5px; }
+    border-radius: 4px; }
     #whiskermenu-window scrolledwindow.frame treeview:hover, #whiskermenu-window scrolledwindow.frame treeview:active, #whiskermenu-window scrolledwindow.frame treeview:selected {
       background-color: rgba(0, 0, 0, 0.07);
       color: inherit; }
@@ -5715,7 +5715,7 @@ wnck-pager {
 .lightdm-gtk-greeter #login_window {
   border: 0;
   background-color: rgba(255, 255, 255, 0.9);
-  border-radius: 5px;
+  border-radius: 4px;
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.15); }
   .lightdm-gtk-greeter #login_window entry {
     background: rgba(255, 255, 255, 0.4);
@@ -5728,7 +5728,7 @@ wnck-pager {
     padding-top: 20px;
     background: #ffffff;
     border-top: 1px solid rgba(0, 0, 0, 0.1);
-    border-radius: 0 0 5px 5px;
+    border-radius: 0 0 4px 4px;
     box-shadow: inset 0 -4px rgba(0, 0, 0, 0.2), inset 0 1px 2px rgba(0, 0, 0, 0.07); }
     .lightdm-gtk-greeter #login_window #buttonbox_frame button {
       border: 0;
diff --git a/src/themes/Kali/sass/gtk-sass/_common-tweaks.scss b/src/themes/Kali/sass/gtk-sass/_common-tweaks.scss
index a47e46f4..df3713da 100644
--- a/src/themes/Kali/sass/gtk-sass/_common-tweaks.scss
+++ b/src/themes/Kali/sass/gtk-sass/_common-tweaks.scss
@@ -270,7 +270,7 @@ notebook {
     }
 
     tab {
-      border-radius: $button_radius - 1px;
+      border-radius: $button_radius;
       transition: $button_transition;
       min-height: 24px;
 
@@ -401,7 +401,7 @@ placessidebar {
  *********************/
 decoration {
   $_border_width: 1px;
-  border-radius: $window_radius+$_border_width $window_radius+$_border_width $button_radius $button_radius;
+  border-radius: $window_radius+$_border_width $window_radius+$_border_width $button_radius+$_border_width $button_radius+$_border_width;
   border: $_border_width solid $base_color;
 
   box-shadow: 0 2px 8px 0 transparentize(black, 0.6),
diff --git a/src/themes/Kali/sass/gtk-sass/upstream/_common.scss b/src/themes/Kali/sass/gtk-sass/upstream/_common.scss
index 316c4aac..68fa54e5 100644
--- a/src/themes/Kali/sass/gtk-sass/upstream/_common.scss
+++ b/src/themes/Kali/sass/gtk-sass/upstream/_common.scss
@@ -6,7 +6,7 @@ $ease-out-quad: cubic-bezier(0.25, 0.46, 0.45, 0.94);
 $asset_suffix: if($variant=='dark', '-dark', '');
 $backdrop_transition: 200ms ease-out;
 $button_transition: all 200ms $ease-out-quad;
-$button_radius: 5px;
+$button_radius: 4px;
 $menu_radius: 5px;
 $window_radius: $button_radius + 3;
 $popover_radius: $button_radius + 4;
diff --git a/src/themes/Kali/sass/gtk-sass/upstream/_common.scss.patch b/src/themes/Kali/sass/gtk-sass/upstream/_common.scss.patch
index 30fe8b26..c0c35ebb 100644
--- a/src/themes/Kali/sass/gtk-sass/upstream/_common.scss.patch
+++ b/src/themes/Kali/sass/gtk-sass/upstream/_common.scss.patch
@@ -1,3 +1,8 @@
+9c9
+< $button_radius: 5px;
+---
+> $button_radius: 4px;
+
 15c15
 < $_sizevariant: 'default'; //compact otherwise
 ---
diff --git a/src/themes/Kali/sass/gtk-sass/upstream/sync.sh b/src/themes/Kali/sass/gtk-sass/upstream/sync.sh
index ad01e5a8..f2f0293a 100755
--- a/src/themes/Kali/sass/gtk-sass/upstream/sync.sh
+++ b/src/themes/Kali/sass/gtk-sass/upstream/sync.sh
@@ -7,18 +7,18 @@ RESET='\033[0m'
 VERSION=3.24.23
 
 echo
-echo " $YELLOW[ i ]$RESET Upstream version $VERSION"
+echo -e " $YELLOW[ i ]$RESET Upstream version $VERSION"
 echo
 
 while read file;
 do
 	echo
-	echo " $GREEN[ * ]$RESET Downloading file $file"
+	echo -e " $GREEN[ * ]$RESET Downloading file $file"
 	wget https://gitlab.gnome.org/GNOME/gtk/raw/$VERSION/gtk/theme/Adwaita/$file --timestamping --quiet
 
 	if [ -f $file.patch ]
 	then
-		echo " $YELLOW[ ~ ]$RESET Apply patch"
+		echo -e " $YELLOW[ ~ ]$RESET Apply patch"
 		patch $file $file.patch --quiet
 	fi
 done <<- EOF