diff --git a/src/sass/_colors.scss b/src/sass/_colors.scss
index 580076b..33a18e2 100644
--- a/src/sass/_colors.scss
+++ b/src/sass/_colors.scss
@@ -20,6 +20,7 @@ $hint_fg_color:                     if($variant == 'light', #565656, #999999);
 $track_color:                       if($variant == 'light', rgba(black, 0.20), rgba(white, 0.16));
 $visit_color:                       if($variant == 'light', rgba(black, 0.16), rgba(white, 0.12));
 $divider_color:                     if($variant == 'light', rgba(black, 0.12), rgba(white, 0.1));
+$fill_color:                        if($variant == 'light', rgba(black, 0.06), rgba(white, 0.05));
 
 $light_fg_color:                    white;
 $light_alt_fg_color:                rgba(white, 0.85);
@@ -216,10 +217,10 @@ $button_active_image:               linear-gradient(0deg, $button_active_bottom
 $button_active_hover_image:         linear-gradient(0deg, $button_active_hover_bottom 0%, $button_active_hover_top 100%);
 
 // WM colors
-$wm_outline_light: 0 0 0 2px rgba(black, 0.03), 0 0 0 1px rgba(black, 0.12);
-$wm_outline_dark: 0 0 0 2px rgba(black, 0.1), 0 0 0 1px rgba(black, 0.75);
-$wm_shadow: if($variant=='light', rgba(black, 0.15), rgba(black, 0.35));
-$wm_outline: if($variant=='light', $wm_outline_light, $wm_outline_dark);
+$wm_outline_light:                  0 0 0 2px rgba(black, 0.03), 0 0 0 1px rgba(black, 0.12);
+$wm_outline_dark:                   0 0 0 2px rgba(black, 0.1), 0 0 0 1px rgba(black, 0.75);
+$wm_shadow:                         if($variant=='light', rgba(black, 0.15), rgba(black, 0.35));
+$wm_outline:                        if($variant=='light', $wm_outline_light, $wm_outline_dark);
 
 // WM Buttons
 
diff --git a/src/sass/gtk/_common-3.0.scss b/src/sass/gtk/_common-3.0.scss
index c52d2c8..3c3601a 100644
--- a/src/sass/gtk/_common-3.0.scss
+++ b/src/sass/gtk/_common-3.0.scss
@@ -1691,8 +1691,17 @@ headerbar {
       min-height: 0;
       min-width: 120px;
       padding: 0 0;
+      background-color: transparent;
 
-      > stack > box { padding: 0 $container_padding * 2; }
+      > stack > box {
+        padding: 0 $container_padding * 2;
+
+        &.narrow {
+          font-size: 10px;
+
+          image { margin-top: $container_padding / 2; }
+        }
+      }
     }
 
     > box > separator.titlebutton { @extend %header_separator; }
@@ -4158,6 +4167,37 @@ stackswitcher {
   // button.circular { @extend %circular_button; }
 }
 
+.background viewswitcher {
+  button:not(.suggested-action):not(.destructive-action) {
+    margin: 0;
+    padding: 0;
+    box-shadow: none;
+    background-color: $fill_color;
+    background-image: none;
+    @extend %linked;
+
+    > stack > box {
+      padding: $container_padding $container_padding * 2;
+
+      &.narrow { font-size: 10px; }
+    }
+
+    &:hover {
+      background-color: $divider_color;
+      color: $fg_color
+    }
+
+    &:active, &:checked {
+      background-color: $track_color;
+      color: $fg_color;
+      border-color: if($variant=='light', $borders_color, $dark_borders_color);
+      background-clip: if($variant=='light', border-box, padding-box);
+
+      & + button { border-left-color: if($variant=='light', rgba(black, 0.3), $dark_borders_color); }
+    }
+  }
+}
+
 //
 // Dnd
 //