diff --git a/src/sass/gtk/_common-3.0.scss b/src/sass/gtk/_common-3.0.scss
index ece1b8e..a9fba45 100644
--- a/src/sass/gtk/_common-3.0.scss
+++ b/src/sass/gtk/_common-3.0.scss
@@ -1451,38 +1451,36 @@ actionbar {
 
 // Headerbar Buttons
 %headerbar_buttons {
-  &:not(.flat) {
-    @include button(header-normal);
+  @include button(header-normal);
 
-    &:backdrop { opacity: 0.65; background-image: none; }
+  &:backdrop { opacity: 0.65; background-image: none; }
 
-    &:hover {
-      @include button(header-hover);
-      transition: $button_transition;
-    }
+  &:hover {
+    @include button(header-hover);
+    transition: $button_transition;
+  }
 
-    &:active {
-      @include button(header-active);
-      transition: $button_transition;
-      transition-duration: 300ms;
-    }
+  &:active {
+    @include button(header-active);
+    transition: $button_transition;
+    transition-duration: 300ms;
+  }
 
-    &:checked {
-      @include button(header-checked);
-      transition: $button_transition;
-      transition-duration: 300ms;
+  &:checked {
+    @include button(header-checked);
+    transition: $button_transition;
+    transition-duration: 300ms;
 
-      &:hover { background-image: none; }
-
-      &:disabled {
-        @include button(header-insensitive-active);
-      }
-    }
+    &:hover { background-image: none; }
 
     &:disabled {
-      @include button(header-insensitive);
+      @include button(header-insensitive-active);
     }
   }
+
+  &:disabled {
+    @include button(header-insensitive);
+  }
 }
 
 headerbar {
diff --git a/src/sass/gtk/apps/_nemo.scss b/src/sass/gtk/apps/_nemo.scss
index fa26e86..bed8e56 100644
--- a/src/sass/gtk/apps/_nemo.scss
+++ b/src/sass/gtk/apps/_nemo.scss
@@ -37,9 +37,6 @@
         &:hover { color: $dark_sidebar_fg; }
       }
     }
-
-    // .NemoSidebar {
-    // }
   }
 
   paned > separator { background-image: image($solid_borders_color); }