diff --git a/src/sass/gtk/_apps-4.0.scss b/src/sass/gtk/_apps-4.0.scss
index 020f3f4..c5c7267 100644
--- a/src/sass/gtk/_apps-4.0.scss
+++ b/src/sass/gtk/_apps-4.0.scss
@@ -41,3 +41,8 @@ window.background.csd {
     }
   }
 }
+
+window.nightthemeswitcher headerbar {
+  background: $header_bg;
+  color: $header_fg;
+}
diff --git a/src/sass/gtk/_common-3.0.scss b/src/sass/gtk/_common-3.0.scss
index f2563d4..4d2cb4e 100644
--- a/src/sass/gtk/_common-3.0.scss
+++ b/src/sass/gtk/_common-3.0.scss
@@ -1775,14 +1775,17 @@ headerbar {
     }
   }
 
-  &.default-decoration,
-  .csd &.default-decoration,             // needed under wayland, since all gtk3 windows are csd windows
-  &.default-decoration:backdrop,
-  .csd &.default-decoration:backdrop {
+  &.default-decoration,             // needed under wayland, since all gtk3 windows are csd windows
+  &.default-decoration:backdrop {
     // box-shadow: none;
     border: none;
   }
 
+  .csd &.default-decoration,
+  .csd &.default-decoration:backdrop {
+    border-bottom: 1px solid $header_border;
+  }
+
   separator.titlebutton { @extend %header_separator; }
 
   // Fixes split headerbars
diff --git a/src/sass/gtk/_common-4.0.scss b/src/sass/gtk/_common-4.0.scss
index 6f42494..72407b4 100644
--- a/src/sass/gtk/_common-4.0.scss
+++ b/src/sass/gtk/_common-4.0.scss
@@ -1712,6 +1712,16 @@ headerbar {
         }
       }
     }
+
+    box.linked > button {
+      background-color: $fill_color;
+
+      &:hover { background-color: $divider_color; }
+
+      &:active { background-color: $track_color; }
+
+      &:checked { background-color: $visit_color; }
+    }
   }
 
   // Selectionmode
@@ -1795,14 +1805,6 @@ headerbar {
     }
   }
 
-  &.default-decoration,
-  .csd &.default-decoration,             // needed under wayland, since all gtk3 windows are csd windows
-  &.default-decoration:backdrop,
-  .csd &.default-decoration:backdrop {
-    // box-shadow: none;
-    border: none;
-  }
-
   separator.titlebutton { @extend %header_separator; }
 }