diff --git a/release/WhiteSur-dark-3-38.tar.xz b/release/WhiteSur-dark-3-38.tar.xz
index a5a48449..7a560d91 100644
Binary files a/release/WhiteSur-dark-3-38.tar.xz and b/release/WhiteSur-dark-3-38.tar.xz differ
diff --git a/release/WhiteSur-dark-40-0.tar.xz b/release/WhiteSur-dark-40-0.tar.xz
index 87d1329b..396b9ebc 100644
Binary files a/release/WhiteSur-dark-40-0.tar.xz and b/release/WhiteSur-dark-40-0.tar.xz differ
diff --git a/release/WhiteSur-dark-solid-3-38.tar.xz b/release/WhiteSur-dark-solid-3-38.tar.xz
index 5ba74330..b6bb72af 100644
Binary files a/release/WhiteSur-dark-solid-3-38.tar.xz and b/release/WhiteSur-dark-solid-3-38.tar.xz differ
diff --git a/release/WhiteSur-dark-solid-40-0.tar.xz b/release/WhiteSur-dark-solid-40-0.tar.xz
index 327c0757..1210372d 100644
Binary files a/release/WhiteSur-dark-solid-40-0.tar.xz and b/release/WhiteSur-dark-solid-40-0.tar.xz differ
diff --git a/release/WhiteSur-light-3-38.tar.xz b/release/WhiteSur-light-3-38.tar.xz
index 6027a164..c831a3e4 100644
Binary files a/release/WhiteSur-light-3-38.tar.xz and b/release/WhiteSur-light-3-38.tar.xz differ
diff --git a/release/WhiteSur-light-40-0.tar.xz b/release/WhiteSur-light-40-0.tar.xz
index c43e5d0a..7dd44c83 100644
Binary files a/release/WhiteSur-light-40-0.tar.xz and b/release/WhiteSur-light-40-0.tar.xz differ
diff --git a/release/WhiteSur-light-solid-3-38.tar.xz b/release/WhiteSur-light-solid-3-38.tar.xz
index 59bf5a5c..e2c94cbd 100644
Binary files a/release/WhiteSur-light-solid-3-38.tar.xz and b/release/WhiteSur-light-solid-3-38.tar.xz differ
diff --git a/release/WhiteSur-light-solid-40-0.tar.xz b/release/WhiteSur-light-solid-40-0.tar.xz
index f8a9aada..a5af0026 100644
Binary files a/release/WhiteSur-light-solid-40-0.tar.xz and b/release/WhiteSur-light-solid-40-0.tar.xz differ
diff --git a/src/sass/_colors.scss b/src/sass/_colors.scss
index 0bd717d4..d9d491d3 100644
--- a/src/sass/_colors.scss
+++ b/src/sass/_colors.scss
@@ -72,7 +72,7 @@ $light_borders_color:               if($variant == 'light', rgba(black, 0.08), r
 $dark_borders_color:                if($variant == 'light', rgba(black, 0.08), rgba(black, 0.15));
 $solid_borders_color:               if($variant == 'light', darken($bg_color, 12%), lighten($bg_color, 8%));
 $dark_solid_borders_color:          if($variant == 'light', darken($bg_color, 12%), darken($bg_color, 5%));
-$highlight_color:                   if($variant == 'light', rgba(white, 0.65), rgba(white, 0.1));
+$highlight_color:                   if($variant == 'light', rgba(white, 0.15), rgba(white, 0.1));
 
 // Background colors
 $dark_bg_color:                     rgba(black, 0.6);
@@ -103,7 +103,7 @@ $disabled_bg_color:                 if($variant == 'light', mix($bg_color, $base
 // Headerbar colors
 $header_bg:                         if($variant == 'light', #ffffff, #373737);
 $dark_header_bg:                    if($trans == 'true', rgba($base_color, 0.95), $base_color);
-$header_highlight:                  if($variant == 'dark', #434343, #f5f5f5);
+$header_highlight:                  if($variant == 'dark', #434343, #f5f5f5); // For metacity
 
 $header_bg_backdrop:                if($variant == 'light', darken($header_bg, 0%), darken($header_bg, 0%));
 $header_border:                     if($variant == 'light', mix(black, $header_bg, 12%), mix(black, $header_bg, 75%));
diff --git a/src/sass/gtk/_common-3.0.scss b/src/sass/gtk/_common-3.0.scss
index e0a55d5b..26173a91 100644
--- a/src/sass/gtk/_common-3.0.scss
+++ b/src/sass/gtk/_common-3.0.scss
@@ -1716,7 +1716,7 @@ headerbar {
     }
 
     button:not(.flat):not(.suggested-action):not(.destructive-action):not(.titlebutton) {
-      // @include button(undecorated);
+      @include button(undecorated);
       @extend %selected-button;
     }
 
diff --git a/src/sass/gtk/apps/_gnome-3.22.scss b/src/sass/gtk/apps/_gnome-3.22.scss
index 1b2232c9..53678b92 100644
--- a/src/sass/gtk/apps/_gnome-3.22.scss
+++ b/src/sass/gtk/apps/_gnome-3.22.scss
@@ -1704,12 +1704,36 @@ window.background.csd {
 //
 
 window.background.csd {
+  > deck > box > leaflet { // >= 40.0
+    > headerbar:first-child {
+      @extend %side_headerbar_left;
+
+      &.selection-mode { color: $header_fg; }
+    }
+
+    > headerbar:last-child {
+      @extend %side_headerbar_right;
+
+      &.selection-mode {
+        color: $header_fg;
+        border-color: $header_border;
+
+        > button:not(.flat):not(.suggested-action):not(.destructive-action):not(.titlebutton) { @extend %headerbar_buttons; }
+      }
+    }
+  }
+
+  > deck > box > overlay > leaflet > overlay > widget > stack {
+    background-color: $base_color;
+  }
+
   > headerbar.titlebar.selection-mode {
     > hdyleaflet > headerbar,
     > leaflet > headerbar {
       color: $header_fg;
+      border-color: $header_border;
 
-      > button { @extend %headerbar_buttons; }
+      > button:not(.flat):not(.suggested-action):not(.destructive-action):not(.titlebutton) { @extend %headerbar_buttons; }
     }
   }
 
@@ -1728,12 +1752,11 @@ window.background.csd {
   }
 
   > overlay > hdyleaflet,
-  > overlay > leaflet {
-    > stack > frame > grid.vertical {
+  > overlay > leaflet,
+  > deck > box > overlay > leaflet { // >= 40.0
+    > stack {
       background-color: rgba($dark_sidebar_bg, 1);
       border-bottom-left-radius: $wm_radius;
-
-      // list.contacts-contact-list {}
     }
 
     > separator.sidebar {