diff --git a/src/sass/gnome-shell/_drawing.scss b/src/sass/gnome-shell/_drawing.scss
index c830d2e..31b07aa 100644
--- a/src/sass/gnome-shell/_drawing.scss
+++ b/src/sass/gnome-shell/_drawing.scss
@@ -211,7 +211,7 @@
     color: $tc;
     text-shadow: none;
     icon-shadow: none;
-    box-shadow: none;
+    box-shadow: none !important;
   }
 
   @if $t == hover {
diff --git a/src/sass/gnome-shell/common/_base.scss b/src/sass/gnome-shell/common/_base.scss
index 151ab8f..30eaf6d 100644
--- a/src/sass/gnome-shell/common/_base.scss
+++ b/src/sass/gnome-shell/common/_base.scss
@@ -15,10 +15,10 @@
 
 // Outline for low res icons
 .lowres-icon {
-  icon-shadow: 0 1px 2px rgba(black, 0.3);
+  icon-shadow: 0 1px 2px rgba(black, 0.15);
 }
 
 // Dropshadow for large icons
 .icon-dropshadow {
-  icon-shadow: 0 1px 5px rgba(black, 0.8);
+  icon-shadow: 0 2px 5px rgba(black, 0.15);
 }
diff --git a/src/sass/gnome-shell/common/_message-list.scss b/src/sass/gnome-shell/common/_message-list.scss
index 584b01f..61b38ca 100644
--- a/src/sass/gnome-shell/common/_message-list.scss
+++ b/src/sass/gnome-shell/common/_message-list.scss
@@ -66,11 +66,10 @@
 
 // message bubbles
 .message {
-  margin: 3px 4px;
-  padding: $base_padding;
-
   .popup-menu & {
     @extend %popover_bubble;
+    padding: $base_padding;
+    margin: 3px 4px;
   }
 
   // icon container
@@ -167,7 +166,9 @@
 .media-message-cover-icon {
   icon-size: 32px !important;
   margin: 0 0 0 4px !important;
+
   &:rtl { margin: 0 4px 0 0 !important; }
+
   &.fallback {
     icon-size: 16px !important;
     padding: 8px;
diff --git a/src/sass/gnome-shell/common/_notifications.scss b/src/sass/gnome-shell/common/_notifications.scss
index 99d7775..1e7d5fc 100644
--- a/src/sass/gnome-shell/common/_notifications.scss
+++ b/src/sass/gnome-shell/common/_notifications.scss
@@ -5,26 +5,33 @@
   font-size: 1em;
   width: 34em;
   min-height: $menuitem_size * 2;
-  margin: 5px;
-  border-radius: $bt_radius;
+  margin: $base_padding;
+  border-radius: $wm_radius;
   color: $fg_color;
   background-color: $menu_bg;
-  border: none;
+  border: 1px solid if($variant=='light', rgba(black, 0), rgba(black, 0.75));
   text-shadow: none;
   box-shadow: 0 3px 5px rgba(0, 0, 0, 0.25);
   @include font(body-1);
 
   &:hover { background-color: rgba($menu_bg, 1); box-shadow: 0 5px 12px rgba(0, 0, 0, 0.25); }
+
   &:focus { background-color: $menu_bg; }
 
-  .notification-icon { padding: 5px; }
-  .notification-content { padding: 5px; spacing: 5px; }
+  .notification-icon { padding: $base_padding; }
+
+  .notification-content {
+    padding: $base_padding;
+    spacing: $base_padding;
+  }
+
   .secondary-icon { icon-size: em(16px); }
+
   .notification-actions {
     background-color: transparent;
     padding-top: 0;
     border-top: 1px solid $borders_color;
-    spacing: 1px;
+    spacing: 0;
   }
 
   .notification-button {
@@ -35,16 +42,16 @@
     font-weight: 500;
     border-width: 0;
 
-    &:first-child { border-radius: 0 0 0 $bt_radius; }
+    &:first-child { border-radius: 0 0 0 $wm_radius; }
 
-    &:last-child { border-radius: 0 0 $bt_radius 0; }
+    &:last-child { border-radius: 0 0 $wm_radius 0; }
 
-    &:only-child, &:first-child:last-child { border-radius: 0 0 $bt_radius $bt_radius; }
+    &:only-child, &:first-child:last-child { border-radius: 0 0 $wm_radius $wm_radius; }
 
     &:focus {
       background-color: transparent;
       color: $alt_fg_color;
-      box-shadow: inset 0 0 0 2px $divider_color;
+      box-shadow: inset 0 0 0 2px $divider_color !important;
     }
 
     &:hover, &:focus:hover {
diff --git a/src/sass/gnome-shell/common/_panel.scss b/src/sass/gnome-shell/common/_panel.scss
index 03b4374..e236129 100644
--- a/src/sass/gnome-shell/common/_panel.scss
+++ b/src/sass/gnome-shell/common/_panel.scss
@@ -176,9 +176,9 @@ $panel_height: $menuitem_size;
     // .panel-status-menu-box .system-status-icon { margin: 0; }
     .panel-status-menu-box StLabel { padding: 0 0 0 $base_padding / 2; }
 
-    // .appindicator-trayicons-box { margin: 0 $base_padding; }
+    .appindicator-trayicons-box { margin: 0 $base_padding; }
 
-    // .appindicator-box { margin: 0 0; }
+    // .appindicator-box { margin: 0; }
 
     // .panel-status-indicators-box,
     // .panel-status-menu-box {
diff --git a/src/sass/gnome-shell/common/_popovers.scss b/src/sass/gnome-shell/common/_popovers.scss
index dc4e2ff..0ecc0b0 100644
--- a/src/sass/gnome-shell/common/_popovers.scss
+++ b/src/sass/gnome-shell/common/_popovers.scss
@@ -103,7 +103,8 @@ $popop_menuitem_radius: $wm_radius - 4px;
   spacing: $base_spacing;
   padding: $base_padding * 1.5 $base_padding * 2;
   color: $alt_fg_color;
-  text-shadow: none;
+  text-shadow: none !important;
+  icon-shadow: none !important;
   border-radius: $popop_menuitem_radius;
   font-weight: normal;
   transition: none;
@@ -175,7 +176,10 @@ $popop_menuitem_radius: $wm_radius - 4px;
 
 // symbolic icons in popover
 .popup-menu-arrow,
-.popup-menu-icon { icon-size: $base_icon_size; }
+.popup-menu-icon {
+  icon-size: $base_icon_size;
+  icon-shadow: none !important;
+}
 
 // container for radio and check boxes
 .popup-menu-ornament {