diff --git a/src/sass/libadwaita/apps/_nautilus.scss b/src/sass/libadwaita/apps/_nautilus.scss
index fb114cb2..53a03dda 100644
--- a/src/sass/libadwaita/apps/_nautilus.scss
+++ b/src/sass/libadwaita/apps/_nautilus.scss
@@ -37,12 +37,20 @@
   background-color: gtkalpha(currentColor, 0.05);
   border-radius: $button_radius;
   padding: 0;
+
+  @if $colortype == 'fixed' {
+    color: $window_fg_color;
+  }
 }
 
 #NautilusPathButton {
   margin: 0;
   border-radius: $button_radius;
   @extend %button_basic_flat;
+
+  @if $colortype == 'fixed' {
+    @extend %header_button_reset;
+  }
 }
 
 list.operations-list {
diff --git a/src/sass/libadwaita/widgets/_header-bar.scss b/src/sass/libadwaita/widgets/_header-bar.scss
index 4b42721f..08d1e3c3 100644
--- a/src/sass/libadwaita/widgets/_header-bar.scss
+++ b/src/sass/libadwaita/widgets/_header-bar.scss
@@ -239,10 +239,6 @@ $titlebutton_close: $button-close;
       box-shadow: none;
     }
 
-    &:active > image {
-      background-color: gtkalpha(black, if($topbar == 'dark', 0.25, 0.12));
-    }
-
     &:hover, &:active {
       color: if($colorscheme != 'dracula', white, rgba(black, 0.5));
     }
@@ -256,11 +252,13 @@ $titlebutton_close: $button-close;
     }
   }
 
+  $button-opacity: if($topbar == 'dark', 25%, 12%);
+
   &.minimize { // Window minimize button
     > image { background-color: $titlebutton_min; }
 
     &:active > image {
-      background-color: gtkmix($headerbar_fg_color, $titlebutton_min, 25%);
+      background-color: gtkmix(black, $titlebutton_min, $button-opacity);
     }
   }
 
@@ -268,7 +266,7 @@ $titlebutton_close: $button-close;
     > image { background-color: $titlebutton_max; }
 
     &:active > image {
-      background-color: gtkmix($headerbar_fg_color, $titlebutton_max, 25%);
+      background-color: gtkmix(black, $titlebutton_max, $button-opacity);
     }
   }
 
@@ -276,7 +274,7 @@ $titlebutton_close: $button-close;
     > image { background-color: $titlebutton_close; }
 
     &:active > image {
-      background-color: gtkmix($headerbar_fg_color, $titlebutton_close, 25%);
+      background-color: gtkmix(black, $titlebutton_close, $button-opacity);
     }
   }
 }
@@ -289,7 +287,7 @@ $titlebutton_close: $button-close;
   margin-right: $base_padding / 2 + 1px;
 
   &.minimize, &.maximize, &.close {
-    color: gtkalpha($headerbar_fg_color, 0.75);
+    color: gtkalpha(currentColor, 0.75);
 
     &, &:hover, &:active, &:backdrop {
       background: none;
@@ -299,13 +297,13 @@ $titlebutton_close: $button-close;
     > image { background-color: gtkalpha(currentColor, 0.1); }
 
     &:hover {
-      color: $headerbar_fg_color;
+      color: currentColor;
 
       > image { background-color: gtkalpha(currentColor, 0.15); }
     }
 
     &:active {
-      color: $headerbar_fg_color;
+      color: currentColor;
 
       > image { background-color: gtkalpha(currentColor, 0.2); }
     }
@@ -317,19 +315,19 @@ $titlebutton_close: $button-close;
 }
 
 windowcontrols {
-  border-spacing: 6px;
+  border-spacing: $base_padding;
 
   &:not(.empty) {
     &.start:dir(ltr),
     &.end:dir(rtl) {
-      margin-right: 6px;
-      margin-left: 6px;
+      margin-right: $base_padding;
+      margin-left: $base_padding;
     }
 
     &.start:dir(rtl),
     &.end:dir(ltr) {
-      margin-left: 6px;
-      margin-right: 6px;
+      margin-left: $base_padding;
+      margin-right: $base_padding;
     }
   }
 
@@ -348,7 +346,7 @@ windowcontrols {
   }
 
   > .icon {
-    margin: 9px;
+    margin: $base_padding * 1.5;
   }
 }
 
diff --git a/src/sass/libadwaita/widgets/_sidebars.scss b/src/sass/libadwaita/widgets/_sidebars.scss
index 39a0ce26..46028662 100644
--- a/src/sass/libadwaita/widgets/_sidebars.scss
+++ b/src/sass/libadwaita/widgets/_sidebars.scss
@@ -172,6 +172,95 @@ stacksidebar row {
   }
 }
 
+%header_button_reset {
+  color: $window_fg_color;
+
+  &:focus:not(:hover):not(:active) { color: $window_fg_color; }
+
+  &:hover { color: $window_fg_color; }
+
+  &.keyboard-activating, &:active { color: $window_fg_color; }
+
+  &:disabled { color: $window_fg_color; }
+
+  &:checked {
+    color: $window_fg_color;
+
+    &:hover { color: $window_fg_color; }
+
+    &:active { color: $window_fg_color; }
+
+    &:disabled { color: $window_fg_color; }
+  }
+}
+
+@if $colortype == 'fixed' {
+  .content-pane {
+    headerbar {
+      color: $window_fg_color;
+
+      button:not(.suggested-action):not(.destructive-action) {
+        @extend %header_button_reset;
+      }
+
+      entry {
+        color: $window_fg_color;
+      }
+
+      windowcontrols {
+        > button:not(.suggested-action):not(.destructive-action) {
+          @if $window_button == 'mac' {
+            &.minimize, &.maximize, &.close {
+              color: transparent;
+
+              &:hover, &:active {
+                color: if($colorscheme != 'dracula', white, rgba(black, 0.5));
+              }
+
+              &:backdrop {
+                > image { background-color: gtkalpha($window_fg_color, 0.3); }
+          
+                &:hover, &:active {
+                  color: gtkalpha($window_fg_color, 0.45);
+                }
+              }
+            }
+          } @else {
+            &.minimize, &.maximize, &.close {
+              color: gtkalpha(currentColor, 0.75);
+
+              &:hover {
+                color: currentColor;
+              }
+
+              &:active {
+                color: currentColor;
+              }
+            }
+          }
+        }
+      }
+
+      switch {
+        background-color: gtkalpha($window_fg_color, .15);
+
+        &:hover { background-color: gtkalpha($window_fg_color, .2); }
+        &:active { background-color: gtkalpha($window_fg_color, .25); }
+
+        &:hover > slider,
+        &:active > slider {
+          box-shadow: 0 2px 3px transparent, 0 0 0 6px gtkalpha($window_fg_color, .1);
+        }
+
+        &:checked {
+          background-color: $accent_bg_color;
+        }
+      }
+    }
+  }
+}
+
+
 /**********************
  * Navigation Sidebar *
  **********************/