diff --git a/share/themes/Kali-Dark/gtk-3.0/gtk.css b/share/themes/Kali-Dark/gtk-3.0/gtk.css
index ab215b3b..77254522 100644
--- a/share/themes/Kali-Dark/gtk-3.0/gtk.css
+++ b/share/themes/Kali-Dark/gtk-3.0/gtk.css
@@ -5288,12 +5288,27 @@ headerbar {
   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);
   background-repeat: no-repeat;
-  background-position: left; }
+  background-position: left;
+  background-size: auto 150%; }
   .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; }
+  .titlebar.default-decoration,
+  headerbar.default-decoration {
+    min-height: 0;
+    padding: 3px;
+    border: 0; }
+    .titlebar.default-decoration:backdrop,
+    headerbar.default-decoration:backdrop {
+      background-color: #272a34; }
+    .titlebar.default-decoration button.titlebutton,
+    headerbar.default-decoration button.titlebutton {
+      min-height: 20px;
+      min-width: 20px;
+      margin: 0 4px;
+      padding: 0; }
 
 /**************
  * GtkInfoBar *
@@ -5531,6 +5546,9 @@ decoration {
   messagedialog.csd decoration {
     box-shadow: 0 1px 4px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(13, 14, 17, 0.65); }
 
+button.titlebutton:not(.appmenu) {
+  margin: 0; }
+
 button.titlebutton:backdrop {
   background: transparent; }
   button.titlebutton:backdrop:not(:hover) {
diff --git a/share/themes/Kali-Light/gtk-3.0/gtk-dark.css b/share/themes/Kali-Light/gtk-3.0/gtk-dark.css
index ab215b3b..77254522 100644
--- a/share/themes/Kali-Light/gtk-3.0/gtk-dark.css
+++ b/share/themes/Kali-Light/gtk-3.0/gtk-dark.css
@@ -5288,12 +5288,27 @@ headerbar {
   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);
   background-repeat: no-repeat;
-  background-position: left; }
+  background-position: left;
+  background-size: auto 150%; }
   .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; }
+  .titlebar.default-decoration,
+  headerbar.default-decoration {
+    min-height: 0;
+    padding: 3px;
+    border: 0; }
+    .titlebar.default-decoration:backdrop,
+    headerbar.default-decoration:backdrop {
+      background-color: #272a34; }
+    .titlebar.default-decoration button.titlebutton,
+    headerbar.default-decoration button.titlebutton {
+      min-height: 20px;
+      min-width: 20px;
+      margin: 0 4px;
+      padding: 0; }
 
 /**************
  * GtkInfoBar *
@@ -5531,6 +5546,9 @@ decoration {
   messagedialog.csd decoration {
     box-shadow: 0 1px 4px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(13, 14, 17, 0.65); }
 
+button.titlebutton:not(.appmenu) {
+  margin: 0; }
+
 button.titlebutton:backdrop {
   background: transparent; }
   button.titlebutton:backdrop:not(:hover) {
diff --git a/share/themes/Kali-Light/gtk-3.0/gtk.css b/share/themes/Kali-Light/gtk-3.0/gtk.css
index 199e7e58..750aa7fc 100644
--- a/share/themes/Kali-Light/gtk-3.0/gtk.css
+++ b/share/themes/Kali-Light/gtk-3.0/gtk.css
@@ -5311,12 +5311,27 @@ headerbar {
   background: #fafafa -gtk-scaled(url("assets/kali-headerbar-logo.png"), url("assets/kali-headerbar-logo@2.png")), linear-gradient(to top, whitesmoke, #fcfcfc);
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.8);
   background-repeat: no-repeat;
-  background-position: left; }
+  background-position: left;
+  background-size: auto 150%; }
   .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; }
+  .titlebar.default-decoration,
+  headerbar.default-decoration {
+    min-height: 0;
+    padding: 3px;
+    border: 0; }
+    .titlebar.default-decoration:backdrop,
+    headerbar.default-decoration:backdrop {
+      background-color: #fafafa; }
+    .titlebar.default-decoration button.titlebutton,
+    headerbar.default-decoration button.titlebutton {
+      min-height: 20px;
+      min-width: 20px;
+      margin: 0 4px;
+      padding: 0; }
 
 /**************
  * GtkInfoBar *
@@ -5554,6 +5569,9 @@ decoration {
   messagedialog.csd decoration {
     box-shadow: 0 1px 4px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(0, 0, 0, 0); }
 
+button.titlebutton:not(.appmenu) {
+  margin: 0; }
+
 button.titlebutton:backdrop {
   background: transparent; }
   button.titlebutton:backdrop:not(:hover) {
diff --git a/src/themes/Kali/sass/gtk-sass/_common-tweaks.scss b/src/themes/Kali/sass/gtk-sass/_common-tweaks.scss
index 32424bf4..2ebb8958 100644
--- a/src/themes/Kali/sass/gtk-sass/_common-tweaks.scss
+++ b/src/themes/Kali/sass/gtk-sass/_common-tweaks.scss
@@ -108,6 +108,7 @@ headerbar {
                           $ov: -gtk-scaled(url('#{$_scale_asset}.png'), url('#{$_scale_asset}@2.png')));
   background-repeat: no-repeat;
   background-position: left;
+  background-size: auto 150%;
 
   &:backdrop {
     background-image: -gtk-scaled(url('#{$_scale_asset}.png'), url('#{$_scale_asset}@2.png'));
@@ -119,6 +120,21 @@ headerbar {
   button.toggle {
     &:active, &:checked { @extend %button_active; }
   }
+
+  &.default-decoration {
+    min-height: 0;
+    padding: 3px;
+    border: 0;
+
+    &:backdrop { background-color: $base_color; }
+
+    button.titlebutton {
+      min-height: 20px;
+      min-width: 20px;
+      margin: 0 4px;
+      padding: 0;
+    }
+  }
 }
 
 /**************
@@ -264,6 +280,7 @@ decoration {
 
 // Window Close button
 button.titlebutton {
+  &:not(.appmenu) { margin: 0; }
   &:backdrop {
     background: transparent;
     &:not(:hover) { border-color: transparent; }