diff --git a/share/themes/Kali-Dark/gtk-3.0/gtk.css b/share/themes/Kali-Dark/gtk-3.0/gtk.css
index b121f4bd..1c07ca35 100644
--- a/share/themes/Kali-Dark/gtk-3.0/gtk.css
+++ b/share/themes/Kali-Dark/gtk-3.0/gtk.css
@@ -4793,6 +4793,10 @@ entry {
   box-shadow: inset 0 3px 5px -4px rgba(0, 0, 0, 0.3);
   background-color: #1b1d24; }
 
+headerbar spinbutton:not(.vertical),
+headerbar entry {
+  background: #272a34; }
+
 /**********
  * Slider *
  **********/
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 b121f4bd..1c07ca35 100644
--- a/share/themes/Kali-Light/gtk-3.0/gtk-dark.css
+++ b/share/themes/Kali-Light/gtk-3.0/gtk-dark.css
@@ -4793,6 +4793,10 @@ entry {
   box-shadow: inset 0 3px 5px -4px rgba(0, 0, 0, 0.3);
   background-color: #1b1d24; }
 
+headerbar spinbutton:not(.vertical),
+headerbar entry {
+  background: #272a34; }
+
 /**********
  * Slider *
  **********/
diff --git a/share/themes/Kali-Light/gtk-3.0/gtk.css b/share/themes/Kali-Light/gtk-3.0/gtk.css
index 9bf59fac..0a3f54ed 100644
--- a/share/themes/Kali-Light/gtk-3.0/gtk.css
+++ b/share/themes/Kali-Light/gtk-3.0/gtk.css
@@ -4814,6 +4814,10 @@ spinbutton:not(.vertical),
 entry {
   box-shadow: inset 0 3px 5px -4px rgba(0, 0, 0, 0.1); }
 
+headerbar spinbutton:not(.vertical),
+headerbar entry {
+  background: #fafafa; }
+
 /**********
  * Slider *
  **********/
diff --git a/src/themes/Kali/sass/gtk-sass/_common-tweaks.scss b/src/themes/Kali/sass/gtk-sass/_common-tweaks.scss
index b4d701ca..b8e50daf 100644
--- a/src/themes/Kali/sass/gtk-sass/_common-tweaks.scss
+++ b/src/themes/Kali/sass/gtk-sass/_common-tweaks.scss
@@ -37,6 +37,11 @@ entry {
   }
 }
 
+headerbar %entry,
+headerbar entry {
+  background: $base_color;
+}
+
 /**********
  * Slider *
  **********/