diff --git a/src/gnome-shell/sass/widgets/_dialogs.scss b/src/gnome-shell/sass/widgets/_dialogs.scss
index 67a5514..98bd6d6 100644
--- a/src/gnome-shell/sass/widgets/_dialogs.scss
+++ b/src/gnome-shell/sass/widgets/_dialogs.scss
@@ -9,7 +9,7 @@ $mdborder_color: if($variant == 'light', transparent, rgba($white, 0.15));
   color: $fg_color;
   background-color: $base_color;
   border: 0 solid $mdborder_color;
-  box-shadow: $shadow_0;
+  box-shadow: inset 0 1px rgba(white, 0.1);
 
   .modal-dialog-content-box {
     margin: 32px 40px;
diff --git a/src/gnome-shell/sass/widgets/_popovers.scss b/src/gnome-shell/sass/widgets/_popovers.scss
index 4237cbd..a3da854 100644
--- a/src/gnome-shell/sass/widgets/_popovers.scss
+++ b/src/gnome-shell/sass/widgets/_popovers.scss
@@ -2,7 +2,7 @@
 
 //.the popover itself
 .popup-menu-boxpointer {
-  -arrow-border-radius: $buttons_radius - 4px;
+  -arrow-border-radius: $buttons_radius;
   -arrow-background-color: transparent;
   -arrow-border-width: 0;
   -arrow-border-color: transparent;
diff --git a/src/gnome-shell/shell-40-0/gnome-shell-compact.css b/src/gnome-shell/shell-40-0/gnome-shell-compact.css
index 9bda15d..342281c 100644
--- a/src/gnome-shell/shell-40-0/gnome-shell-compact.css
+++ b/src/gnome-shell/shell-40-0/gnome-shell-compact.css
@@ -337,7 +337,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 /* Popovers/Menus */
 .popup-menu-boxpointer, .candidate-popup-boxpointer {
-  -arrow-border-radius: 8px;
+  -arrow-border-radius: 12px;
   -arrow-background-color: transparent;
   -arrow-border-width: 0;
   -arrow-border-color: transparent;
@@ -1306,7 +1306,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   color: rgba(0, 0, 0, 0.87);
   background-color: #ffffff;
   border: 0 solid transparent;
-  box-shadow: 0 0 transparent;
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
 }
 
 .modal-dialog .modal-dialog-content-box {
diff --git a/src/gnome-shell/shell-40-0/gnome-shell-dark-compact.css b/src/gnome-shell/shell-40-0/gnome-shell-dark-compact.css
index c8f96cc..f90d142 100644
--- a/src/gnome-shell/shell-40-0/gnome-shell-dark-compact.css
+++ b/src/gnome-shell/shell-40-0/gnome-shell-dark-compact.css
@@ -337,7 +337,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 /* Popovers/Menus */
 .popup-menu-boxpointer, .candidate-popup-boxpointer {
-  -arrow-border-radius: 8px;
+  -arrow-border-radius: 12px;
   -arrow-background-color: transparent;
   -arrow-border-width: 0;
   -arrow-border-color: transparent;
@@ -1306,7 +1306,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   color: rgba(255, 255, 255, 0.9);
   background-color: #202020;
   border: 0 solid rgba(255, 255, 255, 0.15);
-  box-shadow: 0 0 transparent;
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
 }
 
 .modal-dialog .modal-dialog-content-box {
diff --git a/src/gnome-shell/shell-40-0/gnome-shell-dark.css b/src/gnome-shell/shell-40-0/gnome-shell-dark.css
index 0e75494..39de5f4 100644
--- a/src/gnome-shell/shell-40-0/gnome-shell-dark.css
+++ b/src/gnome-shell/shell-40-0/gnome-shell-dark.css
@@ -337,7 +337,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 /* Popovers/Menus */
 .popup-menu-boxpointer, .candidate-popup-boxpointer {
-  -arrow-border-radius: 8px;
+  -arrow-border-radius: 12px;
   -arrow-background-color: transparent;
   -arrow-border-width: 0;
   -arrow-border-color: transparent;
@@ -1306,7 +1306,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   color: rgba(255, 255, 255, 0.9);
   background-color: #202020;
   border: 0 solid rgba(255, 255, 255, 0.15);
-  box-shadow: 0 0 transparent;
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
 }
 
 .modal-dialog .modal-dialog-content-box {
diff --git a/src/gnome-shell/shell-40-0/gnome-shell.css b/src/gnome-shell/shell-40-0/gnome-shell.css
index 429f65b..59154ba 100644
--- a/src/gnome-shell/shell-40-0/gnome-shell.css
+++ b/src/gnome-shell/shell-40-0/gnome-shell.css
@@ -337,7 +337,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 /* Popovers/Menus */
 .popup-menu-boxpointer, .candidate-popup-boxpointer {
-  -arrow-border-radius: 8px;
+  -arrow-border-radius: 12px;
   -arrow-background-color: transparent;
   -arrow-border-width: 0;
   -arrow-border-color: transparent;
@@ -1306,7 +1306,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   color: rgba(0, 0, 0, 0.87);
   background-color: #ffffff;
   border: 0 solid transparent;
-  box-shadow: 0 0 transparent;
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
 }
 
 .modal-dialog .modal-dialog-content-box {