diff --git a/src/sass/gnome-shell/_common.scss b/src/sass/gnome-shell/_common.scss
index c209d2a..3c852ba 100644
--- a/src/sass/gnome-shell/_common.scss
+++ b/src/sass/gnome-shell/_common.scss
@@ -29,32 +29,7 @@ stage {
   color: $fg_color;
 }
 
-%button {
-  @include button(normal);
-  &:hover { @include button(hover); }
-  &:active { @include button(active); }
-  &:insensitive { @include button(insensitive); }
-  &:focus { @include button(focus); }
-}
-
-%flat_button {
-  @include button(flat-normal);
-  &:hover { @include button(flat-hover); }
-  &:active { @include button(flat-active); }
-  &:insensitive { @include button(flat-insensitive); }
-  &:focus { @include button(flat-focus); }
-}
-
 // Common Stylings
-%icon_tile {
-  color: $light_alt_fg_color;
-  border-radius: $bd_radius * 1.5;
-  padding: 6px;
-  border: none;
-  transition-duration: $longer_duration;
-  text-align: center;
-}
-
 %osd_panel {
   color: $fg_color;
   background-color: $base_color;
@@ -75,28 +50,6 @@ stage {
   color: $light_hint_fg_color;
 }
 
-%popover_bubble {
-  border-radius: $mn_radius;
-  border: none;
-  box-shadow: none;
-  background-color: if($variant == 'light', rgba(white, 0.75), rgba(lighten($base_color, 8%), 0.75));
-  text-shadow: none;
-  color: $alt_fg_color;
-  transition: none;
-
-  &:hover, &:focus {
-    color: $fg_color;
-    background-color: if($variant == 'light', rgba(white, 1), rgba(lighten($base_color, 15%), 0.75));
-    box-shadow: 0 3px 5px rgba(black, 0.1);
-  }
-
-  &:active {
-    color: $fg_color;
-    background-color: if($variant == 'light', rgba(white, 0.65), rgba(lighten($base_color, 10%), 0.75));
-    box-shadow: none;
-  }
-}
-
 %bubble_button {
   @include button(normal);
   padding: $container_padding * 2;
@@ -124,44 +77,3 @@ stage {
     border-radius: 0 0 $bt_radius $bt_radius;
   }
 }
-
-%theme_dialogs {
-  background-color: $dialog_bg_color;
-  border-radius: $wm_radius;
-  border: solid rgba(black, 0.75);
-  border-width: if($variant=='light', 0, 1px);
-  box-shadow: 3px 3px 8px -3px rgba(black, 0.65);
-}
-
-%overview_scrollbar {
-  StBin#trough {
-    background-color: $light_divider_color;
-  }
-
-  StButton#vhandle, StButton#hhandle {
-    background-color: $light_hint_fg_color;
-    &:hover { background-color: $light_alt_fg_color; }
-    &:active { background-color: $light_alt_fg_color; }
-  }
-}
-
-%last_dialog_button {
-  color: white;
-  background-color: $primary_color;
-  box-shadow: inset 0 1px 0 0 rgba(white,0.1);
-
-  &:hover {
-    color: white;
-    background-color: lighten($primary_color, 9%);
-  }
-
-  &:active {
-    color: white;
-    background-color: darken($primary_color, 5%);
-  }
-
-  &:insensitive {
-    background-color: rgba($primary_color, 0.05);
-    color: rgba($primary_color, 0.35);
-  }
-}
diff --git a/src/sass/gnome-shell/common/_app-grid.scss b/src/sass/gnome-shell/common/_app-grid.scss
index e797ccd..705f344 100644
--- a/src/sass/gnome-shell/common/_app-grid.scss
+++ b/src/sass/gnome-shell/common/_app-grid.scss
@@ -3,6 +3,15 @@
 
 $app_grid_fg_color: #fff;
 
+%icon_tile {
+  color: $light_alt_fg_color;
+  border-radius: $bd_radius * 1.5;
+  padding: 6px;
+  border: none;
+  transition-duration: $longer_duration;
+  text-align: center;
+}
+
 %app-well-app,
 .show-apps,
 .app-well-app,
diff --git a/src/sass/gnome-shell/common/_buttons.scss b/src/sass/gnome-shell/common/_buttons.scss
index a3ca317..fcb8cd5 100644
--- a/src/sass/gnome-shell/common/_buttons.scss
+++ b/src/sass/gnome-shell/common/_buttons.scss
@@ -6,7 +6,11 @@
   border-radius: $bt_radius;
 
   &, .popup-menu & {
-    @extend %flat_button;
+    @include button(flat-normal);
+    &:hover { @include button(flat-hover); }
+    &:active { @include button(flat-active); }
+    &:insensitive { @include button(flat-insensitive); }
+    &:focus { @include button(flat-focus); }
     border: none;
   }
 }
diff --git a/src/sass/gnome-shell/common/_dialogs.scss b/src/sass/gnome-shell/common/_dialogs.scss
index 374c540..9509bbd 100644
--- a/src/sass/gnome-shell/common/_dialogs.scss
+++ b/src/sass/gnome-shell/common/_dialogs.scss
@@ -1,5 +1,34 @@
 /* Modal Dialogs */
 
+%theme_dialogs {
+  background-color: $dialog_bg_color;
+  border-radius: $wm_radius;
+  border: solid rgba(black, 0.75);
+  border-width: if($variant=='light', 0, 1px);
+  box-shadow: 3px 3px 8px -3px rgba(black, 0.65);
+}
+
+%last_dialog_button {
+  color: white;
+  background-color: $primary_color;
+  box-shadow: inset 0 1px 0 0 rgba(white,0.1);
+
+  &:hover {
+    color: white;
+    background-color: lighten($primary_color, 9%);
+  }
+
+  &:active {
+    color: white;
+    background-color: darken($primary_color, 5%);
+  }
+
+  &:insensitive {
+    background-color: rgba($primary_color, 0.05);
+    color: rgba($primary_color, 0.35);
+  }
+}
+
 .headline {
   @include font(title);
 }
diff --git a/src/sass/gnome-shell/common/_entries.scss b/src/sass/gnome-shell/common/_entries.scss
index 6470003..d51f356 100644
--- a/src/sass/gnome-shell/common/_entries.scss
+++ b/src/sass/gnome-shell/common/_entries.scss
@@ -1,7 +1,7 @@
 /* Entries */
 
 StEntry {
-  padding: 2px 8px;
+  padding: 8px;
   margin: 3px;
   border-width: 0;
   color: $fg_color;
diff --git a/src/sass/gnome-shell/common/_looking-glass.scss b/src/sass/gnome-shell/common/_looking-glass.scss
index 2aa2923..d44f3fd 100644
--- a/src/sass/gnome-shell/common/_looking-glass.scss
+++ b/src/sass/gnome-shell/common/_looking-glass.scss
@@ -78,7 +78,6 @@
   border: none;
   border-radius: $bt_radius;
   @include font(button);
-  @extend %flat_button;
 
   &:hover { border: none; }
 }
diff --git a/src/sass/gnome-shell/common/_notifications.scss b/src/sass/gnome-shell/common/_notifications.scss
index 0221414..3804c7b 100644
--- a/src/sass/gnome-shell/common/_notifications.scss
+++ b/src/sass/gnome-shell/common/_notifications.scss
@@ -8,11 +8,11 @@
   margin: 5px;
   border-radius: $bt_radius;
   color: $fg_color;
-  background-color: rgba($base_color, 0.92);
+  background-color: $base_color;
   border: none;
   box-shadow: 0 3px 8px rgba(black, 0.25);
 
-  &:hover { background-color: rgba($base_color, 0.95); }
+  &:hover, &:selected { background-color: rgba($base_color, 1); box-shadow: 0 5px 12px rgba(black, 0.35); }
   &:focus { background-color: $base_color; }
 
   .notification-icon { padding: 5px; }
diff --git a/src/sass/gnome-shell/common/_popovers.scss b/src/sass/gnome-shell/common/_popovers.scss
index e149268..8ab8d96 100644
--- a/src/sass/gnome-shell/common/_popovers.scss
+++ b/src/sass/gnome-shell/common/_popovers.scss
@@ -2,6 +2,28 @@
 
 $popop_menuitem_radius: $wm_radius - 4px;
 
+%popover_bubble {
+  border-radius: $mn_radius;
+  border: none;
+  box-shadow: none;
+  background-color: if($variant == 'light', rgba(white, 0.75), rgba(lighten($base_color, 8%), 0.75));
+  text-shadow: none;
+  color: $alt_fg_color;
+  transition: none;
+
+  &:hover, &:focus {
+    color: $fg_color;
+    background-color: if($variant == 'light', rgba(white, 1), rgba(lighten($base_color, 15%), 0.75));
+    box-shadow: 0 3px 5px rgba(black, 0.1);
+  }
+
+  &:active {
+    color: $fg_color;
+    background-color: if($variant == 'light', rgba(white, 0.65), rgba(lighten($base_color, 10%), 0.75));
+    box-shadow: none;
+  }
+}
+
 //.the popover itself
 .popup-menu-boxpointer {
   -arrow-border-radius: 2px;
@@ -12,12 +34,6 @@ $popop_menuitem_radius: $wm_radius - 4px;
   -arrow-rise: 0;
   -arrow-box-shadow: none; //dreaming. bug #689995
   background: transparent; // needs to reset?
-
-  StEntry {
-    selection-background-color: $light_alt_fg_color;
-    selected-background-color: $light_alt_fg_color;
-    selected-color: $primary_color;
-  }
 }
 
 // container of the popover menu
@@ -118,6 +134,18 @@ $popop_menuitem_radius: $wm_radius - 4px;
     -boxpointer-gap: $base_margin; // distance from the panel
     margin-bottom: 1.75em;
   }
+
+  StEntry {
+    selection-background-color: $light_alt_fg_color;
+    selected-background-color: $light_alt_fg_color;
+    selected-color: $primary_color;
+    caret-color: $fg_color;
+
+    StLabel.hint-text {
+      margin-left: 2px;
+      color: transparentize($fg_color, 0.3);
+    }
+  }
 }
 // symbolic icons in popover
 .popup-menu-arrow,
diff --git a/src/sass/gnome-shell/extensions/_misc.scss b/src/sass/gnome-shell/extensions/_misc.scss
index c1489f6..b4c5be4 100644
--- a/src/sass/gnome-shell/extensions/_misc.scss
+++ b/src/sass/gnome-shell/extensions/_misc.scss
@@ -21,6 +21,7 @@
     &:focus { @include button(flat-focus); }
     &:active { @include button(flat-active); }
     &:insensitive { @include button(flat-disabled); }
+    border: 1px solid transparent;
   }
 
   &-current {
diff --git a/src/sass/gnome-shell/widgets-3-28/_other.scss b/src/sass/gnome-shell/widgets-3-28/_other.scss
index 16ad54e..26c9bb8 100644
--- a/src/sass/gnome-shell/widgets-3-28/_other.scss
+++ b/src/sass/gnome-shell/widgets-3-28/_other.scss
@@ -285,5 +285,15 @@
 #panel.lock-screen { background-color: $alt_dark_bg_color; }
 
 #screenShieldNotifications {
-  StScrollBar { @extend %overview_scrollbar; }
+  StScrollBar {
+    StBin#trough {
+      background-color: $light_divider_color;
+    }
+
+    StButton#vhandle, StButton#hhandle {
+      background-color: $light_hint_fg_color;
+      &:hover { background-color: $light_alt_fg_color; }
+      &:active { background-color: $light_alt_fg_color; }
+    }
+  }
 }