diff --git a/src/sass/gtk/_common-3.0.scss b/src/sass/gtk/_common-3.0.scss
index 577c6526..cba64578 100644
--- a/src/sass/gtk/_common-3.0.scss
+++ b/src/sass/gtk/_common-3.0.scss
@@ -709,9 +709,13 @@ button {
 
     &:checked:hover { background-image: none; }
 
-    &.toggle.popup {
+    &.toggle.popup:not(.colored) {
       min-width: $menuitem_size - 8px;
     }
+
+    &.toggle.popup.colored {
+      min-width: $menuitem_size - 4px;
+    }
   }
 
   &:hover {
diff --git a/src/sass/gtk/apps/_elementary.scss b/src/sass/gtk/apps/_elementary.scss
index d1564d80..d1735ca3 100644
--- a/src/sass/gtk/apps/_elementary.scss
+++ b/src/sass/gtk/apps/_elementary.scss
@@ -59,10 +59,13 @@
 
       row.activatable {
         margin: 0;
-        background: none;
+
+        &:not(:selected) {
+          background: none;
+        }
 
         > widget > revealer > deck > overlay > grid {
-          background-color: $base_color;
+          background-color: $menu_bg;
           border-radius: $bt_radius;
           box-shadow: 0 2px 3px rgba(black, 0.15), inset 0 1px $header_highlight, $wm_outline;
         }