diff --git a/src/_functions.scss b/src/_functions.scss
--- a/src/_functions.scss
+++ b/src/_functions.scss
@@ -69,19 +69,19 @@
 // Titlebar color
 @function t_color($c: text) {
   @if $c == text {
-    @return $WindowForegroundNormal;
+    @return $WMactiveForeground;
   }
   @if $c == background {
-    @return $WindowBackgroundNormal;
+    @return $WMactiveBackground;
   }
   @if $c == background-light {
     @return $WindowBackgroundNormal;
   }
   @if $c == backdrop-text {
     @return $WMinactiveForeground;
   }
   @if $c == backdrop-background {
-    @return $WindowBackgroundNormal;
+    @return $WMinactiveBackground;
   }
 }
 
diff --git a/src/gtk320/widgets/_headerbar.scss b/src/gtk320/widgets/_headerbar.scss
--- a/src/gtk320/widgets/_headerbar.scss
+++ b/src/gtk320/widgets/_headerbar.scss
@@ -13,7 +13,8 @@
   border-style: solid;
   border-color: $border_color;
   color: t_color(text);
-  background-image: linear-gradient(to bottom,t_color(background-light),t_color(background));
+  background-image: none;
+  background-color: t_color(background);
   &:backdrop {
     border-color: transparent;
     background-image: none;
diff --git a/src/render_assets.py b/src/render_assets.py
--- a/src/render_assets.py
+++ b/src/render_assets.py
@@ -732,16 +732,13 @@
 view_fg = Color(_colors, 'ViewForegroundNormal')
 view_hover = Color(_colors, 'ViewDecorationHover')
 view_active = Color(_colors, 'ViewDecorationFocus')
-titlebutton = Color(_colors, 'WindowForegroundNormal')
-titlebutton_active = Color(
-    _colors, 'WindowBackgroundNormal', 'WindowForegroundNormal', 0.3)
+titlebutton = Color(_colors, 'WMactiveForeground')
+titlebutton_active = Color(_colors, 'WMactiveForeground')
 closebutton_hover = Color(_colors, 'ViewForegroundNegative')
 closebutton_hover.lighten_color(0.5)
 closebutton_active = Color(_colors, 'ViewForegroundNegative')
-titlebutton_inactive = Color(_colors, 'WindowForegroundNormal')
-titlebutton_inactive_active = Color(
-    _colors, 'WindowBackgroundNormal', 'WindowForegroundNormal', 0.3)
-
+titlebutton_inactive = Color(_colors, 'WMinactiveForeground')
+titlebutton_inactive_active = Color(_colors, 'WMinactiveForeground')
 tooltip_fg = Color(_colors, 'TooltipForegroundNormal')
 tooltip_bg = Color(_colors, 'TooltipBackgroundNormal')