diff --git a/share/themes/Kali-Dark/gtk-3.0/gtk.css b/share/themes/Kali-Dark/gtk-3.0/gtk.css
index e289e21e..234b447a 100644
--- a/share/themes/Kali-Dark/gtk-3.0/gtk.css
+++ b/share/themes/Kali-Dark/gtk-3.0/gtk.css
@@ -5152,16 +5152,18 @@ scale slider {
  ***************/
 .titlebar,
 headerbar {
-  border-color: #0d0e11;
+  border-color: black;
   background: #0d0e11 -gtk-scaled(url("assets/kali-headerbar-logo-dark.png"), url("assets/kali-headerbar-logo-dark@2.png")), linear-gradient(to top, #16171d, #1a1c23);
   box-shadow: inset 0 1px rgba(238, 238, 236, 0.07);
+  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.75);
   background-repeat: no-repeat;
   background-position: left; }
   .titlebar:backdrop,
   headerbar:backdrop {
     background-image: -gtk-scaled(url("assets/kali-headerbar-logo-dark.png"), url("assets/kali-headerbar-logo-dark@2.png"));
     background-repeat: no-repeat;
-    background-position: left; }
+    background-position: left;
+    box-shadow: none; }
   .titlebar viewswitcher button > stack > box.narrow,
   .titlebar hdyviewswitcher > button box.narrow,
   headerbar viewswitcher button > stack > box.narrow,
@@ -5183,11 +5185,13 @@ headerbar {
       margin: 0; }
   dialog .titlebar, dialog .titlebar:backdrop, dialog headerbar, dialog headerbar:backdrop {
     background: #23252e;
-    border: 0; }
+    border: 0;
+    box-shadow: none; }
 
 paned headerbar:first-child, hdyleaflet headerbar:first-child, headerbar.titlebar headerbar:first-child {
-  border-color: transparent;
-  background: #272a34; }
+  border-color: #16171d;
+  background: #272a34;
+  box-shadow: none; }
   paned headerbar:first-child:backdrop, hdyleaflet headerbar:first-child:backdrop, headerbar.titlebar headerbar:first-child:backdrop {
     background: #292c37; }
 
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 e289e21e..234b447a 100644
--- a/share/themes/Kali-Light/gtk-3.0/gtk-dark.css
+++ b/share/themes/Kali-Light/gtk-3.0/gtk-dark.css
@@ -5152,16 +5152,18 @@ scale slider {
  ***************/
 .titlebar,
 headerbar {
-  border-color: #0d0e11;
+  border-color: black;
   background: #0d0e11 -gtk-scaled(url("assets/kali-headerbar-logo-dark.png"), url("assets/kali-headerbar-logo-dark@2.png")), linear-gradient(to top, #16171d, #1a1c23);
   box-shadow: inset 0 1px rgba(238, 238, 236, 0.07);
+  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.75);
   background-repeat: no-repeat;
   background-position: left; }
   .titlebar:backdrop,
   headerbar:backdrop {
     background-image: -gtk-scaled(url("assets/kali-headerbar-logo-dark.png"), url("assets/kali-headerbar-logo-dark@2.png"));
     background-repeat: no-repeat;
-    background-position: left; }
+    background-position: left;
+    box-shadow: none; }
   .titlebar viewswitcher button > stack > box.narrow,
   .titlebar hdyviewswitcher > button box.narrow,
   headerbar viewswitcher button > stack > box.narrow,
@@ -5183,11 +5185,13 @@ headerbar {
       margin: 0; }
   dialog .titlebar, dialog .titlebar:backdrop, dialog headerbar, dialog headerbar:backdrop {
     background: #23252e;
-    border: 0; }
+    border: 0;
+    box-shadow: none; }
 
 paned headerbar:first-child, hdyleaflet headerbar:first-child, headerbar.titlebar headerbar:first-child {
-  border-color: transparent;
-  background: #272a34; }
+  border-color: #16171d;
+  background: #272a34;
+  box-shadow: none; }
   paned headerbar:first-child:backdrop, hdyleaflet headerbar:first-child:backdrop, headerbar.titlebar headerbar:first-child:backdrop {
     background: #292c37; }
 
diff --git a/share/themes/Kali-Light/gtk-3.0/gtk.css b/share/themes/Kali-Light/gtk-3.0/gtk.css
index fd9eb741..0c86c489 100644
--- a/share/themes/Kali-Light/gtk-3.0/gtk.css
+++ b/share/themes/Kali-Light/gtk-3.0/gtk.css
@@ -5173,16 +5173,18 @@ scale slider {
  ***************/
 .titlebar,
 headerbar {
-  border-color: #d9d9d9;
-  background: #fafafa -gtk-scaled(url("assets/kali-headerbar-logo.png"), url("assets/kali-headerbar-logo@2.png")), linear-gradient(to top, whitesmoke, #fcfcfc);
+  border-color: #cccccc;
+  background: #f2f2f2 -gtk-scaled(url("assets/kali-headerbar-logo.png"), url("assets/kali-headerbar-logo@2.png")), linear-gradient(to top, #ededed, whitesmoke);
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.8);
+  box-shadow: 0 1px 4px rgba(204, 204, 204, 0.75);
   background-repeat: no-repeat;
   background-position: left; }
   .titlebar:backdrop,
   headerbar:backdrop {
     background-image: -gtk-scaled(url("assets/kali-headerbar-logo.png"), url("assets/kali-headerbar-logo@2.png"));
     background-repeat: no-repeat;
-    background-position: left; }
+    background-position: left;
+    box-shadow: none; }
   .titlebar viewswitcher button > stack > box.narrow,
   .titlebar hdyviewswitcher > button box.narrow,
   headerbar viewswitcher button > stack > box.narrow,
@@ -5204,11 +5206,13 @@ headerbar {
       margin: 0; }
   dialog .titlebar, dialog .titlebar:backdrop, dialog headerbar, dialog headerbar:backdrop {
     background: #ffffff;
-    border: 0; }
+    border: 0;
+    box-shadow: none; }
 
 paned headerbar:first-child, hdyleaflet headerbar:first-child, headerbar.titlebar headerbar:first-child {
-  border-color: transparent;
-  background: #fafafa; }
+  border-color: #e0e0e0;
+  background: #fafafa;
+  box-shadow: none; }
   paned headerbar:first-child:backdrop, hdyleaflet headerbar:first-child:backdrop, headerbar.titlebar headerbar:first-child:backdrop {
     background: #f7f7f7; }