diff --git a/src/sass/gnome-shell/_drawing.scss b/src/sass/gnome-shell/_drawing.scss
index 6f73aa2..c830d2e 100644
--- a/src/sass/gnome-shell/_drawing.scss
+++ b/src/sass/gnome-shell/_drawing.scss
@@ -252,8 +252,10 @@
     color: $tc;
     text-shadow: none;
     icon-shadow: none;
-    box-shadow: none;
-    // box-shadow: inset 0px 0px 0px 2px $divider_color;
+
+    &, &:hover, &:active {
+      box-shadow: none !important;
+    }
   }
 
   @if $t == flat-hover {
diff --git a/src/sass/gnome-shell/common/_misc.scss b/src/sass/gnome-shell/common/_misc.scss
index 0c47af5..b81fb5a 100644
--- a/src/sass/gnome-shell/common/_misc.scss
+++ b/src/sass/gnome-shell/common/_misc.scss
@@ -11,7 +11,7 @@
   color: $light_alt_fg_color;
   border-radius: $circular_radius;
   border: none;
-  box-shadow: 0 3px 8px rgba(black, 0.25);
+  // box-shadow: 0 3px 8px rgba(black, 0.25);
   icon-size: $base_icon_size * 4; // 64px
 
   &:hover {
@@ -19,7 +19,7 @@
   }
 
   & StIcon {
-    background-color: transparentize($light_alt_fg_color, 0.95);
+    background-color: $light_track_color;
     border-radius: $circular_radius;
     padding: $base_padding * 2; // 12px
     width: $base_icon_size * 2.5; height:  $base_icon_size * 2.5; // 40px;