diff --git a/data/theme/gnome-shell-sass/_drawing.scss b/data/theme/gnome-shell-sass/_drawing.scss
index 54ff9d4a0..d5d959f07 100644
--- a/data/theme/gnome-shell-sass/_drawing.scss
+++ b/data/theme/gnome-shell-sass/_drawing.scss
@@ -218,7 +218,8 @@
 
   &:drop {
     .overview-icon {
-      background-color: transparentize($selected_bg_color, .15);
+      border: 2px solid $selected_bg_color; //already 2px transparent so no jumping
+      background-color: transparentize($selected_bg_color, .8);
     }
   }
 
diff --git a/data/theme/gnome-shell-sass/_widgets.scss b/data/theme/gnome-shell-sass/_widgets.scss
index 87dab2ad7..a8d0aa9f4 100644
--- a/data/theme/gnome-shell-sass/_widgets.scss
+++ b/data/theme/gnome-shell-sass/_widgets.scss
@@ -37,8 +37,8 @@
 @import 'widgets/window-picker';
 @import 'widgets/search-entry';
 @import 'widgets/search-results';
-@import 'widgets/app-grid';
 @import 'widgets/dash';
+@import 'widgets/app-grid';
 @import 'widgets/workspace-thumbnails';
 // A11y / misc
 @import 'widgets/a11y';
diff --git a/data/theme/gnome-shell-sass/widgets/_app-grid.scss b/data/theme/gnome-shell-sass/widgets/_app-grid.scss
index da17e5321..bbe721600 100644
--- a/data/theme/gnome-shell-sass/widgets/_app-grid.scss
+++ b/data/theme/gnome-shell-sass/widgets/_app-grid.scss
@@ -34,15 +34,14 @@ $app_grid_fg_color: #fff;
 
 /* App Folders */
 .app-well-app.app-folder {
-  background-color: transparentize($osd_bg_color, 0.8);
+  background-color: darken($system_bg_color, 3%);
   border-radius: $base_border_radius + 4px; // same as %icon_tile
 }
 
 // expanded folder
-.app-folder-dialog {
+.app-folder-dialog { //style like the dash
   border-radius: $modal_radius * 1.5;
-  border: 1px solid $osd_outer_borders_color;
-  background-color: transparentize(darken($osd_bg_color,10%), 0.05);
+  background-color: $dash_background_color;
   padding: 12px;
 
   & .folder-name-container {