diff --git a/gtk-3.20/scss/widgets/_actionbar.scss b/gtk-3.20/scss/widgets/_actionbar.scss
index 261701b..3c6aa02 100644
--- a/gtk-3.20/scss/widgets/_actionbar.scss
+++ b/gtk-3.20/scss/widgets/_actionbar.scss
@@ -15,9 +15,9 @@
 }
 
 
-/***************
- ! Search bars *
-****************/
+/****************************
+ ! Search and Location bars *
+*****************************/
 
 @include exports("searchbar") {
     searchbar,
@@ -51,12 +51,13 @@
 
 
 /******************
-* selection mode *
-******************/
+ ! Selection mode *
+*******************/
 
 @include exports("selectionmode") {
-    .selection-mode {
-        &.header-bar, &.toolbar {
+    headerbar,
+    .titlebar:not(headerbar) {
+        &.selection-mode {
             @include toolbar($selected_bg_color, $selected_fg_color);
 
             button {
@@ -65,22 +66,34 @@
                 &.suggested-action { @extend .suggested-action; }
             }
 
-            .selection-menu.button {
-                border: 0;
-                background-color: transparent;
+            &:backdrop {
+                background-color: $backdrop_selected_bg_color;
                 background-image: none;
-                color: shade($selected_bg_color, $contrast);
+            }
 
-                &:hover { color: shade($selected_bg_color, ($contrast - .1)); }
+            .selection-menu {
+                &:backdrop, & {
+                    color: shade($selected_bg_color, $contrast);
+                    background-color: transparent;
+                    background-image: none;
+                    box-shadow: none;
+                    border: 0;
 
-                &:active { color: shade($selected_bg_color, ($contrast - .05)); }
+                    &:hover { color: shade($selected_bg_color, ($contrast - .1)); }
+
+                    &:active { color: shade($selected_bg_color, ($contrast - .05)); }
+
+                    .arrow {
+                        -gtk-icon-source: -gtk-icontheme('pan-down-symbolic');
+                        color: transparentize($selected_fg_color, .5);
+                        -gtk-icon-shadow: none;
+                    }
+                }
             }
 
             .dim-label {
-                &, .selection-menu.button & { color: shade($selected_bg_color, ($contrast - .1)); }
+                &, .selection-menu & { color: shade($selected_bg_color, ($contrast - .1)); }
             }
         }
-
-        &.toolbar { padding: $spacing; }
     }
 }