diff --git a/src/sass/gnome-shell/common/_popovers.scss b/src/sass/gnome-shell/common/_popovers.scss
index 4855349a..1e110abc 100644
--- a/src/sass/gnome-shell/common/_popovers.scss
+++ b/src/sass/gnome-shell/common/_popovers.scss
@@ -2,12 +2,12 @@
 
 //.the popover itself
 .popup-menu-boxpointer {
-  -arrow-border-radius: $menu_radius - 3px;
+  -arrow-border-radius: $menu_radius;
   -arrow-background-color: transparent;
   -arrow-border-width: 0;
   -arrow-border-color: transparent;
-  -arrow-base: $base_padding * 2;
-  -arrow-rise: $base_padding;
+  -arrow-base: 30px - $menu_radius;
+  -arrow-rise: 0;
   -arrow-box-shadow: none; //dreaming. bug #689995
   background: transparent; // needs to reset?
 }
@@ -19,8 +19,8 @@
   padding: 0;
   font-weight: normal;
   border-radius: $menu_radius;
-  box-shadow: 0 3px 6px rgba(black, 0.08);
-  margin: 0 $base_padding / 2;
+  box-shadow: 0 3px 8px -5px rgba(black, 0.12);
+  margin: $base_padding $base_padding 8px;
   @include fontsize($font_size - 1);
 
   .popup-menu-content {
diff --git a/src/sass/gnome-shell/common/_quick-settings.scss b/src/sass/gnome-shell/common/_quick-settings.scss
index a16bc151..736e1193 100644
--- a/src/sass/gnome-shell/common/_quick-settings.scss
+++ b/src/sass/gnome-shell/common/_quick-settings.scss
@@ -1,18 +1,11 @@
 .quick-settings {
   padding: $base_padding * 3 !important;
   border-radius: $base_radius + $base_padding * 3 !important;
+  margin-top: $base_padding !important;
 
   .icon-button, .button {
     padding: $base_padding * 1.75;
   }
-
-  &.popup-menu {
-    border-radius: $base_radius + $base_padding * 3 !important;
-  }
-
-  .popup-menu-content {
-    padding: $base_padding * 2 !important;
-  }
 }
 
 .quick-settings-grid {
diff --git a/src/sass/gtk/_common-3.0.scss b/src/sass/gtk/_common-3.0.scss
index 91e689c4..899902a4 100644
--- a/src/sass/gtk/_common-3.0.scss
+++ b/src/sass/gtk/_common-3.0.scss
@@ -997,7 +997,7 @@ toolbar {
   @at-root %toolbar_osd, &.osd {
     transition: $transition-shadow;
     padding: $space-size;
-    border-radius: $corner-radius;
+    border-radius: $window-radius;
     box-shadow: $shadow-z4, inset 0 1px highlight($surface);
     background-color: $surface;
 
@@ -3026,6 +3026,8 @@ row {
     &.text-button:not(:disabled) { color: $primary; }
   }
 
+  > box > label { margin-left: $space-size * 1.5; }
+
   &.frame,
   border { border-style: none; }
 }
diff --git a/src/sass/gtk/_common-4.0.scss b/src/sass/gtk/_common-4.0.scss
index 31824340..05c0a4ed 100644
--- a/src/sass/gtk/_common-4.0.scss
+++ b/src/sass/gtk/_common-4.0.scss
@@ -2176,6 +2176,7 @@ magnifier {
 
   &:hover:not(:checked):not(:selected) {
     @include button(flat-hover);
+    box-shadow: none;
   }
 
   &:disabled {
@@ -3962,8 +3963,8 @@ columnview {
 .app-notification {
   @extend %toolbar_osd;
   margin: $space-size;
-  border-spacing: $space-size;
-  padding: $space-size;
+  border-spacing: 0;
+  padding: 0;
   border: none;
   background-image: none;
 
@@ -3973,6 +3974,8 @@ columnview {
     &.text-button:not(:disabled) { color: $primary; }
   }
 
+  > box > label { margin-left: $space-size * 1.5; }
+
   &.frame,
   border { border: none; }
 }