diff --git a/src/main/gnome-shell/gdm3-dark-blue.css b/src/main/gnome-shell/gdm3-dark-blue.css
index 84205c7e..c2d9ddcc 100644
--- a/src/main/gnome-shell/gdm3-dark-blue.css
+++ b/src/main/gnome-shell/gdm3-dark-blue.css
@@ -65,9 +65,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content {
   background-color: rgba(36, 36, 36, 0.95);
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 1px;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough {
@@ -559,11 +559,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -1497,7 +1493,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0.75);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gdm3-dark-green.css b/src/main/gnome-shell/gdm3-dark-green.css
index a6423843..2d791f66 100644
--- a/src/main/gnome-shell/gdm3-dark-green.css
+++ b/src/main/gnome-shell/gdm3-dark-green.css
@@ -65,9 +65,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content {
   background-color: rgba(36, 36, 36, 0.95);
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 1px;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough {
@@ -559,11 +559,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -1497,7 +1493,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0.75);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gdm3-dark-grey.css b/src/main/gnome-shell/gdm3-dark-grey.css
index 86c98f81..24673ea3 100644
--- a/src/main/gnome-shell/gdm3-dark-grey.css
+++ b/src/main/gnome-shell/gdm3-dark-grey.css
@@ -65,9 +65,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content {
   background-color: rgba(36, 36, 36, 0.95);
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 1px;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough {
@@ -559,11 +559,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -1497,7 +1493,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0.75);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gdm3-dark-orange.css b/src/main/gnome-shell/gdm3-dark-orange.css
index 4907e75e..4ad24fee 100644
--- a/src/main/gnome-shell/gdm3-dark-orange.css
+++ b/src/main/gnome-shell/gdm3-dark-orange.css
@@ -65,9 +65,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content {
   background-color: rgba(36, 36, 36, 0.95);
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 1px;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough {
@@ -559,11 +559,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -1497,7 +1493,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0.75);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gdm3-dark-pink.css b/src/main/gnome-shell/gdm3-dark-pink.css
index 2692fecf..5e851d3f 100644
--- a/src/main/gnome-shell/gdm3-dark-pink.css
+++ b/src/main/gnome-shell/gdm3-dark-pink.css
@@ -65,9 +65,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content {
   background-color: rgba(36, 36, 36, 0.95);
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 1px;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough {
@@ -559,11 +559,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -1497,7 +1493,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0.75);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gdm3-dark-purple.css b/src/main/gnome-shell/gdm3-dark-purple.css
index 74dc5754..010fbf11 100644
--- a/src/main/gnome-shell/gdm3-dark-purple.css
+++ b/src/main/gnome-shell/gdm3-dark-purple.css
@@ -65,9 +65,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content {
   background-color: rgba(36, 36, 36, 0.95);
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 1px;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough {
@@ -559,11 +559,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -1497,7 +1493,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0.75);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gdm3-dark-red.css b/src/main/gnome-shell/gdm3-dark-red.css
index 1621a299..845489ad 100644
--- a/src/main/gnome-shell/gdm3-dark-red.css
+++ b/src/main/gnome-shell/gdm3-dark-red.css
@@ -65,9 +65,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content {
   background-color: rgba(36, 36, 36, 0.95);
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 1px;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough {
@@ -559,11 +559,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -1497,7 +1493,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0.75);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gdm3-dark-yellow.css b/src/main/gnome-shell/gdm3-dark-yellow.css
index dd3b92ab..a495de47 100644
--- a/src/main/gnome-shell/gdm3-dark-yellow.css
+++ b/src/main/gnome-shell/gdm3-dark-yellow.css
@@ -65,9 +65,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content {
   background-color: rgba(36, 36, 36, 0.95);
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 1px;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough {
@@ -559,11 +559,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -1497,7 +1493,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0.75);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gdm3-dark.css b/src/main/gnome-shell/gdm3-dark.css
index fdc4e7a9..8e1e5e4d 100644
--- a/src/main/gnome-shell/gdm3-dark.css
+++ b/src/main/gnome-shell/gdm3-dark.css
@@ -65,9 +65,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content {
   background-color: rgba(36, 36, 36, 0.95);
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 1px;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough {
@@ -559,11 +559,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -1497,7 +1493,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0.75);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gdm3-light-blue.css b/src/main/gnome-shell/gdm3-light-blue.css
index 3d77f071..53dd2489 100644
--- a/src/main/gnome-shell/gdm3-light-blue.css
+++ b/src/main/gnome-shell/gdm3-light-blue.css
@@ -65,9 +65,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content {
   background-color: rgba(245, 245, 245, 0.95);
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 0;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough {
@@ -559,11 +559,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -1497,7 +1493,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gdm3-light-green.css b/src/main/gnome-shell/gdm3-light-green.css
index 871ac33a..e4127b27 100644
--- a/src/main/gnome-shell/gdm3-light-green.css
+++ b/src/main/gnome-shell/gdm3-light-green.css
@@ -65,9 +65,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content {
   background-color: rgba(245, 245, 245, 0.95);
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 0;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough {
@@ -559,11 +559,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -1497,7 +1493,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gdm3-light-grey.css b/src/main/gnome-shell/gdm3-light-grey.css
index c9ed722d..d94d1c70 100644
--- a/src/main/gnome-shell/gdm3-light-grey.css
+++ b/src/main/gnome-shell/gdm3-light-grey.css
@@ -65,9 +65,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content {
   background-color: rgba(245, 245, 245, 0.95);
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 0;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough {
@@ -559,11 +559,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -1497,7 +1493,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gdm3-light-orange.css b/src/main/gnome-shell/gdm3-light-orange.css
index 3b9e873f..0c562f33 100644
--- a/src/main/gnome-shell/gdm3-light-orange.css
+++ b/src/main/gnome-shell/gdm3-light-orange.css
@@ -65,9 +65,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content {
   background-color: rgba(245, 245, 245, 0.95);
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 0;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough {
@@ -559,11 +559,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -1497,7 +1493,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gdm3-light-pink.css b/src/main/gnome-shell/gdm3-light-pink.css
index 4f18ebb4..7f0dade3 100644
--- a/src/main/gnome-shell/gdm3-light-pink.css
+++ b/src/main/gnome-shell/gdm3-light-pink.css
@@ -65,9 +65,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content {
   background-color: rgba(245, 245, 245, 0.95);
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 0;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough {
@@ -559,11 +559,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -1497,7 +1493,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gdm3-light-purple.css b/src/main/gnome-shell/gdm3-light-purple.css
index 40586562..a41bfa2b 100644
--- a/src/main/gnome-shell/gdm3-light-purple.css
+++ b/src/main/gnome-shell/gdm3-light-purple.css
@@ -65,9 +65,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content {
   background-color: rgba(245, 245, 245, 0.95);
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 0;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough {
@@ -559,11 +559,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -1497,7 +1493,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gdm3-light-red.css b/src/main/gnome-shell/gdm3-light-red.css
index 91339b98..22c39712 100644
--- a/src/main/gnome-shell/gdm3-light-red.css
+++ b/src/main/gnome-shell/gdm3-light-red.css
@@ -65,9 +65,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content {
   background-color: rgba(245, 245, 245, 0.95);
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 0;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough {
@@ -559,11 +559,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -1497,7 +1493,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gdm3-light-yellow.css b/src/main/gnome-shell/gdm3-light-yellow.css
index 0e5ec66a..674dd00c 100644
--- a/src/main/gnome-shell/gdm3-light-yellow.css
+++ b/src/main/gnome-shell/gdm3-light-yellow.css
@@ -65,9 +65,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content {
   background-color: rgba(245, 245, 245, 0.95);
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 0;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough {
@@ -559,11 +559,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -1497,7 +1493,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gdm3-light.css b/src/main/gnome-shell/gdm3-light.css
index eb4cc6e7..96b762c4 100644
--- a/src/main/gnome-shell/gdm3-light.css
+++ b/src/main/gnome-shell/gdm3-light.css
@@ -65,9 +65,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content {
   background-color: rgba(245, 245, 245, 0.95);
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 0;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough {
@@ -559,11 +559,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -1497,7 +1493,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gnome-shell-dark-alt-blue.css b/src/main/gnome-shell/gnome-shell-dark-alt-blue.css
index cd873e56..bd57a859 100644
--- a/src/main/gnome-shell/gnome-shell-dark-alt-blue.css
+++ b/src/main/gnome-shell/gnome-shell-dark-alt-blue.css
@@ -160,9 +160,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: rgba(36, 36, 36, 0.95);
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 1px;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -654,11 +654,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -3164,7 +3160,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0.75);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gnome-shell-dark-alt-green.css b/src/main/gnome-shell/gnome-shell-dark-alt-green.css
index 13dc9c79..322a37f7 100644
--- a/src/main/gnome-shell/gnome-shell-dark-alt-green.css
+++ b/src/main/gnome-shell/gnome-shell-dark-alt-green.css
@@ -160,9 +160,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: rgba(36, 36, 36, 0.95);
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 1px;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -654,11 +654,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -3164,7 +3160,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0.75);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gnome-shell-dark-alt-grey.css b/src/main/gnome-shell/gnome-shell-dark-alt-grey.css
index 28141fd3..679cb1a1 100644
--- a/src/main/gnome-shell/gnome-shell-dark-alt-grey.css
+++ b/src/main/gnome-shell/gnome-shell-dark-alt-grey.css
@@ -160,9 +160,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: rgba(36, 36, 36, 0.95);
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 1px;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -654,11 +654,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -3164,7 +3160,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0.75);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gnome-shell-dark-alt-orange.css b/src/main/gnome-shell/gnome-shell-dark-alt-orange.css
index 15cb8ad8..c95b2b87 100644
--- a/src/main/gnome-shell/gnome-shell-dark-alt-orange.css
+++ b/src/main/gnome-shell/gnome-shell-dark-alt-orange.css
@@ -160,9 +160,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: rgba(36, 36, 36, 0.95);
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 1px;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -654,11 +654,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -3164,7 +3160,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0.75);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gnome-shell-dark-alt-pink.css b/src/main/gnome-shell/gnome-shell-dark-alt-pink.css
index 8305c59e..a03b6c1f 100644
--- a/src/main/gnome-shell/gnome-shell-dark-alt-pink.css
+++ b/src/main/gnome-shell/gnome-shell-dark-alt-pink.css
@@ -160,9 +160,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: rgba(36, 36, 36, 0.95);
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 1px;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -654,11 +654,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -3164,7 +3160,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0.75);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gnome-shell-dark-alt-purple.css b/src/main/gnome-shell/gnome-shell-dark-alt-purple.css
index 2b03f316..29af7089 100644
--- a/src/main/gnome-shell/gnome-shell-dark-alt-purple.css
+++ b/src/main/gnome-shell/gnome-shell-dark-alt-purple.css
@@ -160,9 +160,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: rgba(36, 36, 36, 0.95);
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 1px;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -654,11 +654,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -3164,7 +3160,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0.75);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gnome-shell-dark-alt-red.css b/src/main/gnome-shell/gnome-shell-dark-alt-red.css
index b2436bb8..f99e982f 100644
--- a/src/main/gnome-shell/gnome-shell-dark-alt-red.css
+++ b/src/main/gnome-shell/gnome-shell-dark-alt-red.css
@@ -160,9 +160,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: rgba(36, 36, 36, 0.95);
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 1px;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -654,11 +654,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -3164,7 +3160,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0.75);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gnome-shell-dark-alt-yellow.css b/src/main/gnome-shell/gnome-shell-dark-alt-yellow.css
index e8b6a1d3..e2fdb311 100644
--- a/src/main/gnome-shell/gnome-shell-dark-alt-yellow.css
+++ b/src/main/gnome-shell/gnome-shell-dark-alt-yellow.css
@@ -160,9 +160,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: rgba(36, 36, 36, 0.95);
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 1px;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -654,11 +654,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -3164,7 +3160,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0.75);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gnome-shell-dark-alt.css b/src/main/gnome-shell/gnome-shell-dark-alt.css
index 19276100..638b3460 100644
--- a/src/main/gnome-shell/gnome-shell-dark-alt.css
+++ b/src/main/gnome-shell/gnome-shell-dark-alt.css
@@ -160,9 +160,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: rgba(36, 36, 36, 0.95);
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 1px;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -654,11 +654,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -3164,7 +3160,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0.75);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gnome-shell-dark-blue.css b/src/main/gnome-shell/gnome-shell-dark-blue.css
index cd873e56..bd57a859 100644
--- a/src/main/gnome-shell/gnome-shell-dark-blue.css
+++ b/src/main/gnome-shell/gnome-shell-dark-blue.css
@@ -160,9 +160,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: rgba(36, 36, 36, 0.95);
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 1px;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -654,11 +654,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -3164,7 +3160,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0.75);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gnome-shell-dark-green.css b/src/main/gnome-shell/gnome-shell-dark-green.css
index 13dc9c79..322a37f7 100644
--- a/src/main/gnome-shell/gnome-shell-dark-green.css
+++ b/src/main/gnome-shell/gnome-shell-dark-green.css
@@ -160,9 +160,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: rgba(36, 36, 36, 0.95);
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 1px;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -654,11 +654,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -3164,7 +3160,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0.75);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gnome-shell-dark-grey.css b/src/main/gnome-shell/gnome-shell-dark-grey.css
index 28141fd3..679cb1a1 100644
--- a/src/main/gnome-shell/gnome-shell-dark-grey.css
+++ b/src/main/gnome-shell/gnome-shell-dark-grey.css
@@ -160,9 +160,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: rgba(36, 36, 36, 0.95);
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 1px;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -654,11 +654,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -3164,7 +3160,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0.75);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gnome-shell-dark-orange.css b/src/main/gnome-shell/gnome-shell-dark-orange.css
index 15cb8ad8..c95b2b87 100644
--- a/src/main/gnome-shell/gnome-shell-dark-orange.css
+++ b/src/main/gnome-shell/gnome-shell-dark-orange.css
@@ -160,9 +160,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: rgba(36, 36, 36, 0.95);
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 1px;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -654,11 +654,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -3164,7 +3160,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0.75);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gnome-shell-dark-pink.css b/src/main/gnome-shell/gnome-shell-dark-pink.css
index 8305c59e..a03b6c1f 100644
--- a/src/main/gnome-shell/gnome-shell-dark-pink.css
+++ b/src/main/gnome-shell/gnome-shell-dark-pink.css
@@ -160,9 +160,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: rgba(36, 36, 36, 0.95);
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 1px;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -654,11 +654,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -3164,7 +3160,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0.75);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gnome-shell-dark-purple.css b/src/main/gnome-shell/gnome-shell-dark-purple.css
index 2b03f316..29af7089 100644
--- a/src/main/gnome-shell/gnome-shell-dark-purple.css
+++ b/src/main/gnome-shell/gnome-shell-dark-purple.css
@@ -160,9 +160,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: rgba(36, 36, 36, 0.95);
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 1px;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -654,11 +654,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -3164,7 +3160,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0.75);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gnome-shell-dark-red.css b/src/main/gnome-shell/gnome-shell-dark-red.css
index b2436bb8..f99e982f 100644
--- a/src/main/gnome-shell/gnome-shell-dark-red.css
+++ b/src/main/gnome-shell/gnome-shell-dark-red.css
@@ -160,9 +160,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: rgba(36, 36, 36, 0.95);
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 1px;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -654,11 +654,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -3164,7 +3160,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0.75);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gnome-shell-dark-solid-alt-blue.css b/src/main/gnome-shell/gnome-shell-dark-solid-alt-blue.css
index 8c38d985..254061f9 100644
--- a/src/main/gnome-shell/gnome-shell-dark-solid-alt-blue.css
+++ b/src/main/gnome-shell/gnome-shell-dark-solid-alt-blue.css
@@ -160,9 +160,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: #242424;
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 1px;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -654,11 +654,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -3164,7 +3160,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0.75);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gnome-shell-dark-solid-alt-green.css b/src/main/gnome-shell/gnome-shell-dark-solid-alt-green.css
index adffc01c..d19768ca 100644
--- a/src/main/gnome-shell/gnome-shell-dark-solid-alt-green.css
+++ b/src/main/gnome-shell/gnome-shell-dark-solid-alt-green.css
@@ -160,9 +160,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: #242424;
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 1px;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -654,11 +654,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -3164,7 +3160,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0.75);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gnome-shell-dark-solid-alt-grey.css b/src/main/gnome-shell/gnome-shell-dark-solid-alt-grey.css
index beb76b6c..e38e65f5 100644
--- a/src/main/gnome-shell/gnome-shell-dark-solid-alt-grey.css
+++ b/src/main/gnome-shell/gnome-shell-dark-solid-alt-grey.css
@@ -160,9 +160,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: #242424;
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 1px;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -654,11 +654,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -3164,7 +3160,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0.75);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gnome-shell-dark-solid-alt-orange.css b/src/main/gnome-shell/gnome-shell-dark-solid-alt-orange.css
index 04ee2847..d74be454 100644
--- a/src/main/gnome-shell/gnome-shell-dark-solid-alt-orange.css
+++ b/src/main/gnome-shell/gnome-shell-dark-solid-alt-orange.css
@@ -160,9 +160,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: #242424;
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 1px;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -654,11 +654,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -3164,7 +3160,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0.75);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gnome-shell-dark-solid-alt-pink.css b/src/main/gnome-shell/gnome-shell-dark-solid-alt-pink.css
index f859e9ff..1a69688f 100644
--- a/src/main/gnome-shell/gnome-shell-dark-solid-alt-pink.css
+++ b/src/main/gnome-shell/gnome-shell-dark-solid-alt-pink.css
@@ -160,9 +160,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: #242424;
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 1px;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -654,11 +654,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -3164,7 +3160,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0.75);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gnome-shell-dark-solid-alt-purple.css b/src/main/gnome-shell/gnome-shell-dark-solid-alt-purple.css
index 29cfe7d2..5e8432b9 100644
--- a/src/main/gnome-shell/gnome-shell-dark-solid-alt-purple.css
+++ b/src/main/gnome-shell/gnome-shell-dark-solid-alt-purple.css
@@ -160,9 +160,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: #242424;
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 1px;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -654,11 +654,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -3164,7 +3160,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0.75);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gnome-shell-dark-solid-alt-red.css b/src/main/gnome-shell/gnome-shell-dark-solid-alt-red.css
index fea11908..6d36de17 100644
--- a/src/main/gnome-shell/gnome-shell-dark-solid-alt-red.css
+++ b/src/main/gnome-shell/gnome-shell-dark-solid-alt-red.css
@@ -160,9 +160,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: #242424;
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 1px;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -654,11 +654,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -3164,7 +3160,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0.75);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gnome-shell-dark-solid-alt-yellow.css b/src/main/gnome-shell/gnome-shell-dark-solid-alt-yellow.css
index 160effb9..f64a37ae 100644
--- a/src/main/gnome-shell/gnome-shell-dark-solid-alt-yellow.css
+++ b/src/main/gnome-shell/gnome-shell-dark-solid-alt-yellow.css
@@ -160,9 +160,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: #242424;
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 1px;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -654,11 +654,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -3164,7 +3160,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0.75);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gnome-shell-dark-solid-alt.css b/src/main/gnome-shell/gnome-shell-dark-solid-alt.css
index 336c78be..1366d1ba 100644
--- a/src/main/gnome-shell/gnome-shell-dark-solid-alt.css
+++ b/src/main/gnome-shell/gnome-shell-dark-solid-alt.css
@@ -160,9 +160,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: #242424;
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 1px;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -654,11 +654,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -3164,7 +3160,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0.75);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gnome-shell-dark-solid-blue.css b/src/main/gnome-shell/gnome-shell-dark-solid-blue.css
index 8c38d985..254061f9 100644
--- a/src/main/gnome-shell/gnome-shell-dark-solid-blue.css
+++ b/src/main/gnome-shell/gnome-shell-dark-solid-blue.css
@@ -160,9 +160,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: #242424;
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 1px;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -654,11 +654,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -3164,7 +3160,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0.75);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gnome-shell-dark-solid-green.css b/src/main/gnome-shell/gnome-shell-dark-solid-green.css
index adffc01c..d19768ca 100644
--- a/src/main/gnome-shell/gnome-shell-dark-solid-green.css
+++ b/src/main/gnome-shell/gnome-shell-dark-solid-green.css
@@ -160,9 +160,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: #242424;
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 1px;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -654,11 +654,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -3164,7 +3160,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0.75);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gnome-shell-dark-solid-grey.css b/src/main/gnome-shell/gnome-shell-dark-solid-grey.css
index beb76b6c..e38e65f5 100644
--- a/src/main/gnome-shell/gnome-shell-dark-solid-grey.css
+++ b/src/main/gnome-shell/gnome-shell-dark-solid-grey.css
@@ -160,9 +160,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: #242424;
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 1px;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -654,11 +654,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -3164,7 +3160,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0.75);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gnome-shell-dark-solid-orange.css b/src/main/gnome-shell/gnome-shell-dark-solid-orange.css
index 04ee2847..d74be454 100644
--- a/src/main/gnome-shell/gnome-shell-dark-solid-orange.css
+++ b/src/main/gnome-shell/gnome-shell-dark-solid-orange.css
@@ -160,9 +160,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: #242424;
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 1px;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -654,11 +654,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -3164,7 +3160,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0.75);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gnome-shell-dark-solid-pink.css b/src/main/gnome-shell/gnome-shell-dark-solid-pink.css
index f859e9ff..1a69688f 100644
--- a/src/main/gnome-shell/gnome-shell-dark-solid-pink.css
+++ b/src/main/gnome-shell/gnome-shell-dark-solid-pink.css
@@ -160,9 +160,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: #242424;
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 1px;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -654,11 +654,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -3164,7 +3160,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0.75);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gnome-shell-dark-solid-purple.css b/src/main/gnome-shell/gnome-shell-dark-solid-purple.css
index 29cfe7d2..5e8432b9 100644
--- a/src/main/gnome-shell/gnome-shell-dark-solid-purple.css
+++ b/src/main/gnome-shell/gnome-shell-dark-solid-purple.css
@@ -160,9 +160,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: #242424;
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 1px;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -654,11 +654,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -3164,7 +3160,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0.75);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gnome-shell-dark-solid-red.css b/src/main/gnome-shell/gnome-shell-dark-solid-red.css
index fea11908..6d36de17 100644
--- a/src/main/gnome-shell/gnome-shell-dark-solid-red.css
+++ b/src/main/gnome-shell/gnome-shell-dark-solid-red.css
@@ -160,9 +160,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: #242424;
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 1px;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -654,11 +654,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -3164,7 +3160,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0.75);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gnome-shell-dark-solid-yellow.css b/src/main/gnome-shell/gnome-shell-dark-solid-yellow.css
index 160effb9..f64a37ae 100644
--- a/src/main/gnome-shell/gnome-shell-dark-solid-yellow.css
+++ b/src/main/gnome-shell/gnome-shell-dark-solid-yellow.css
@@ -160,9 +160,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: #242424;
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 1px;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -654,11 +654,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -3164,7 +3160,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0.75);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gnome-shell-dark-solid.css b/src/main/gnome-shell/gnome-shell-dark-solid.css
index 336c78be..1366d1ba 100644
--- a/src/main/gnome-shell/gnome-shell-dark-solid.css
+++ b/src/main/gnome-shell/gnome-shell-dark-solid.css
@@ -160,9 +160,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: #242424;
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 1px;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -654,11 +654,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -3164,7 +3160,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0.75);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gnome-shell-dark-yellow.css b/src/main/gnome-shell/gnome-shell-dark-yellow.css
index e8b6a1d3..e2fdb311 100644
--- a/src/main/gnome-shell/gnome-shell-dark-yellow.css
+++ b/src/main/gnome-shell/gnome-shell-dark-yellow.css
@@ -160,9 +160,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: rgba(36, 36, 36, 0.95);
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 1px;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -654,11 +654,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -3164,7 +3160,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0.75);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gnome-shell-dark.css b/src/main/gnome-shell/gnome-shell-dark.css
index 19276100..638b3460 100644
--- a/src/main/gnome-shell/gnome-shell-dark.css
+++ b/src/main/gnome-shell/gnome-shell-dark.css
@@ -160,9 +160,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: rgba(36, 36, 36, 0.95);
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 1px;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -654,11 +654,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -3164,7 +3160,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0.75);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gnome-shell-light-alt-blue.css b/src/main/gnome-shell/gnome-shell-light-alt-blue.css
index 7b949fa1..cfaf0fbb 100644
--- a/src/main/gnome-shell/gnome-shell-light-alt-blue.css
+++ b/src/main/gnome-shell/gnome-shell-light-alt-blue.css
@@ -160,9 +160,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: rgba(245, 245, 245, 0.95);
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 0;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -654,11 +654,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -3168,7 +3164,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gnome-shell-light-alt-green.css b/src/main/gnome-shell/gnome-shell-light-alt-green.css
index 17019028..a0846dff 100644
--- a/src/main/gnome-shell/gnome-shell-light-alt-green.css
+++ b/src/main/gnome-shell/gnome-shell-light-alt-green.css
@@ -160,9 +160,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: rgba(245, 245, 245, 0.95);
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 0;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -654,11 +654,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -3168,7 +3164,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gnome-shell-light-alt-grey.css b/src/main/gnome-shell/gnome-shell-light-alt-grey.css
index bfec66d5..4652b697 100644
--- a/src/main/gnome-shell/gnome-shell-light-alt-grey.css
+++ b/src/main/gnome-shell/gnome-shell-light-alt-grey.css
@@ -160,9 +160,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: rgba(245, 245, 245, 0.95);
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 0;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -654,11 +654,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -3168,7 +3164,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gnome-shell-light-alt-orange.css b/src/main/gnome-shell/gnome-shell-light-alt-orange.css
index 0b9895a8..6326dcbc 100644
--- a/src/main/gnome-shell/gnome-shell-light-alt-orange.css
+++ b/src/main/gnome-shell/gnome-shell-light-alt-orange.css
@@ -160,9 +160,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: rgba(245, 245, 245, 0.95);
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 0;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -654,11 +654,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -3168,7 +3164,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gnome-shell-light-alt-pink.css b/src/main/gnome-shell/gnome-shell-light-alt-pink.css
index 8bd03225..5e322d5a 100644
--- a/src/main/gnome-shell/gnome-shell-light-alt-pink.css
+++ b/src/main/gnome-shell/gnome-shell-light-alt-pink.css
@@ -160,9 +160,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: rgba(245, 245, 245, 0.95);
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 0;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -654,11 +654,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -3168,7 +3164,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gnome-shell-light-alt-purple.css b/src/main/gnome-shell/gnome-shell-light-alt-purple.css
index b29aa17d..3264abd7 100644
--- a/src/main/gnome-shell/gnome-shell-light-alt-purple.css
+++ b/src/main/gnome-shell/gnome-shell-light-alt-purple.css
@@ -160,9 +160,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: rgba(245, 245, 245, 0.95);
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 0;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -654,11 +654,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -3168,7 +3164,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gnome-shell-light-alt-red.css b/src/main/gnome-shell/gnome-shell-light-alt-red.css
index 8f7c84d1..362994cd 100644
--- a/src/main/gnome-shell/gnome-shell-light-alt-red.css
+++ b/src/main/gnome-shell/gnome-shell-light-alt-red.css
@@ -160,9 +160,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: rgba(245, 245, 245, 0.95);
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 0;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -654,11 +654,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -3168,7 +3164,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gnome-shell-light-alt-yellow.css b/src/main/gnome-shell/gnome-shell-light-alt-yellow.css
index 0ee6c9cc..574d966c 100644
--- a/src/main/gnome-shell/gnome-shell-light-alt-yellow.css
+++ b/src/main/gnome-shell/gnome-shell-light-alt-yellow.css
@@ -160,9 +160,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: rgba(245, 245, 245, 0.95);
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 0;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -654,11 +654,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -3168,7 +3164,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gnome-shell-light-alt.css b/src/main/gnome-shell/gnome-shell-light-alt.css
index a06f6217..3cded35f 100644
--- a/src/main/gnome-shell/gnome-shell-light-alt.css
+++ b/src/main/gnome-shell/gnome-shell-light-alt.css
@@ -160,9 +160,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: rgba(245, 245, 245, 0.95);
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 0;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -654,11 +654,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -3168,7 +3164,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gnome-shell-light-blue.css b/src/main/gnome-shell/gnome-shell-light-blue.css
index c4c599c6..5337db11 100644
--- a/src/main/gnome-shell/gnome-shell-light-blue.css
+++ b/src/main/gnome-shell/gnome-shell-light-blue.css
@@ -160,9 +160,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: rgba(245, 245, 245, 0.95);
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 0;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -654,11 +654,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -3164,7 +3160,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gnome-shell-light-green.css b/src/main/gnome-shell/gnome-shell-light-green.css
index e3f09cdc..13a5e29d 100644
--- a/src/main/gnome-shell/gnome-shell-light-green.css
+++ b/src/main/gnome-shell/gnome-shell-light-green.css
@@ -160,9 +160,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: rgba(245, 245, 245, 0.95);
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 0;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -654,11 +654,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -3164,7 +3160,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gnome-shell-light-grey.css b/src/main/gnome-shell/gnome-shell-light-grey.css
index d90173d6..ea409f19 100644
--- a/src/main/gnome-shell/gnome-shell-light-grey.css
+++ b/src/main/gnome-shell/gnome-shell-light-grey.css
@@ -160,9 +160,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: rgba(245, 245, 245, 0.95);
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 0;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -654,11 +654,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -3164,7 +3160,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gnome-shell-light-orange.css b/src/main/gnome-shell/gnome-shell-light-orange.css
index c5389574..3fd260da 100644
--- a/src/main/gnome-shell/gnome-shell-light-orange.css
+++ b/src/main/gnome-shell/gnome-shell-light-orange.css
@@ -160,9 +160,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: rgba(245, 245, 245, 0.95);
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 0;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -654,11 +654,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -3164,7 +3160,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gnome-shell-light-pink.css b/src/main/gnome-shell/gnome-shell-light-pink.css
index 47ac4beb..0592f942 100644
--- a/src/main/gnome-shell/gnome-shell-light-pink.css
+++ b/src/main/gnome-shell/gnome-shell-light-pink.css
@@ -160,9 +160,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: rgba(245, 245, 245, 0.95);
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 0;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -654,11 +654,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -3164,7 +3160,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gnome-shell-light-purple.css b/src/main/gnome-shell/gnome-shell-light-purple.css
index 0a97fd50..03ba8ca5 100644
--- a/src/main/gnome-shell/gnome-shell-light-purple.css
+++ b/src/main/gnome-shell/gnome-shell-light-purple.css
@@ -160,9 +160,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: rgba(245, 245, 245, 0.95);
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 0;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -654,11 +654,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -3164,7 +3160,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gnome-shell-light-red.css b/src/main/gnome-shell/gnome-shell-light-red.css
index fca6ecbd..787f15f8 100644
--- a/src/main/gnome-shell/gnome-shell-light-red.css
+++ b/src/main/gnome-shell/gnome-shell-light-red.css
@@ -160,9 +160,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: rgba(245, 245, 245, 0.95);
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 0;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -654,11 +654,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -3164,7 +3160,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gnome-shell-light-solid-alt-blue.css b/src/main/gnome-shell/gnome-shell-light-solid-alt-blue.css
index fc7ea5f1..bc656781 100644
--- a/src/main/gnome-shell/gnome-shell-light-solid-alt-blue.css
+++ b/src/main/gnome-shell/gnome-shell-light-solid-alt-blue.css
@@ -160,9 +160,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: #f5f5f5;
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 0;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -654,11 +654,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -3168,7 +3164,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gnome-shell-light-solid-alt-green.css b/src/main/gnome-shell/gnome-shell-light-solid-alt-green.css
index 0ca61736..6e20b67a 100644
--- a/src/main/gnome-shell/gnome-shell-light-solid-alt-green.css
+++ b/src/main/gnome-shell/gnome-shell-light-solid-alt-green.css
@@ -160,9 +160,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: #f5f5f5;
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 0;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -654,11 +654,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -3168,7 +3164,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gnome-shell-light-solid-alt-grey.css b/src/main/gnome-shell/gnome-shell-light-solid-alt-grey.css
index b86222b0..6b5d8021 100644
--- a/src/main/gnome-shell/gnome-shell-light-solid-alt-grey.css
+++ b/src/main/gnome-shell/gnome-shell-light-solid-alt-grey.css
@@ -160,9 +160,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: #f5f5f5;
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 0;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -654,11 +654,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -3168,7 +3164,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gnome-shell-light-solid-alt-orange.css b/src/main/gnome-shell/gnome-shell-light-solid-alt-orange.css
index c80dec29..97960fa3 100644
--- a/src/main/gnome-shell/gnome-shell-light-solid-alt-orange.css
+++ b/src/main/gnome-shell/gnome-shell-light-solid-alt-orange.css
@@ -160,9 +160,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: #f5f5f5;
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 0;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -654,11 +654,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -3168,7 +3164,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gnome-shell-light-solid-alt-pink.css b/src/main/gnome-shell/gnome-shell-light-solid-alt-pink.css
index 1f16f585..c6210b3a 100644
--- a/src/main/gnome-shell/gnome-shell-light-solid-alt-pink.css
+++ b/src/main/gnome-shell/gnome-shell-light-solid-alt-pink.css
@@ -160,9 +160,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: #f5f5f5;
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 0;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -654,11 +654,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -3168,7 +3164,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gnome-shell-light-solid-alt-purple.css b/src/main/gnome-shell/gnome-shell-light-solid-alt-purple.css
index 4c6e8121..4f6ba455 100644
--- a/src/main/gnome-shell/gnome-shell-light-solid-alt-purple.css
+++ b/src/main/gnome-shell/gnome-shell-light-solid-alt-purple.css
@@ -160,9 +160,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: #f5f5f5;
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 0;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -654,11 +654,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -3168,7 +3164,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gnome-shell-light-solid-alt-red.css b/src/main/gnome-shell/gnome-shell-light-solid-alt-red.css
index c4c31c4d..fa400a18 100644
--- a/src/main/gnome-shell/gnome-shell-light-solid-alt-red.css
+++ b/src/main/gnome-shell/gnome-shell-light-solid-alt-red.css
@@ -160,9 +160,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: #f5f5f5;
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 0;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -654,11 +654,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -3168,7 +3164,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gnome-shell-light-solid-alt-yellow.css b/src/main/gnome-shell/gnome-shell-light-solid-alt-yellow.css
index c80dec29..97960fa3 100644
--- a/src/main/gnome-shell/gnome-shell-light-solid-alt-yellow.css
+++ b/src/main/gnome-shell/gnome-shell-light-solid-alt-yellow.css
@@ -160,9 +160,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: #f5f5f5;
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 0;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -654,11 +654,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -3168,7 +3164,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gnome-shell-light-solid-alt.css b/src/main/gnome-shell/gnome-shell-light-solid-alt.css
index 57d2f7ff..c69555ad 100644
--- a/src/main/gnome-shell/gnome-shell-light-solid-alt.css
+++ b/src/main/gnome-shell/gnome-shell-light-solid-alt.css
@@ -160,9 +160,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: #f5f5f5;
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 0;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -654,11 +654,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -3168,7 +3164,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gnome-shell-light-solid-blue.css b/src/main/gnome-shell/gnome-shell-light-solid-blue.css
index fc7ea5f1..bc656781 100644
--- a/src/main/gnome-shell/gnome-shell-light-solid-blue.css
+++ b/src/main/gnome-shell/gnome-shell-light-solid-blue.css
@@ -160,9 +160,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: #f5f5f5;
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 0;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -654,11 +654,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -3168,7 +3164,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gnome-shell-light-solid-green.css b/src/main/gnome-shell/gnome-shell-light-solid-green.css
index 0ca61736..6e20b67a 100644
--- a/src/main/gnome-shell/gnome-shell-light-solid-green.css
+++ b/src/main/gnome-shell/gnome-shell-light-solid-green.css
@@ -160,9 +160,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: #f5f5f5;
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 0;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -654,11 +654,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -3168,7 +3164,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gnome-shell-light-solid-grey.css b/src/main/gnome-shell/gnome-shell-light-solid-grey.css
index b86222b0..6b5d8021 100644
--- a/src/main/gnome-shell/gnome-shell-light-solid-grey.css
+++ b/src/main/gnome-shell/gnome-shell-light-solid-grey.css
@@ -160,9 +160,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: #f5f5f5;
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 0;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -654,11 +654,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -3168,7 +3164,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gnome-shell-light-solid-orange.css b/src/main/gnome-shell/gnome-shell-light-solid-orange.css
index c80dec29..97960fa3 100644
--- a/src/main/gnome-shell/gnome-shell-light-solid-orange.css
+++ b/src/main/gnome-shell/gnome-shell-light-solid-orange.css
@@ -160,9 +160,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: #f5f5f5;
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 0;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -654,11 +654,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -3168,7 +3164,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gnome-shell-light-solid-pink.css b/src/main/gnome-shell/gnome-shell-light-solid-pink.css
index 1f16f585..c6210b3a 100644
--- a/src/main/gnome-shell/gnome-shell-light-solid-pink.css
+++ b/src/main/gnome-shell/gnome-shell-light-solid-pink.css
@@ -160,9 +160,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: #f5f5f5;
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 0;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -654,11 +654,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -3168,7 +3164,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gnome-shell-light-solid-purple.css b/src/main/gnome-shell/gnome-shell-light-solid-purple.css
index 4c6e8121..4f6ba455 100644
--- a/src/main/gnome-shell/gnome-shell-light-solid-purple.css
+++ b/src/main/gnome-shell/gnome-shell-light-solid-purple.css
@@ -160,9 +160,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: #f5f5f5;
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 0;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -654,11 +654,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -3168,7 +3164,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gnome-shell-light-solid-red.css b/src/main/gnome-shell/gnome-shell-light-solid-red.css
index c4c31c4d..fa400a18 100644
--- a/src/main/gnome-shell/gnome-shell-light-solid-red.css
+++ b/src/main/gnome-shell/gnome-shell-light-solid-red.css
@@ -160,9 +160,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: #f5f5f5;
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 0;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -654,11 +654,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -3168,7 +3164,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gnome-shell-light-solid-yellow.css b/src/main/gnome-shell/gnome-shell-light-solid-yellow.css
index 15353892..4c330627 100644
--- a/src/main/gnome-shell/gnome-shell-light-solid-yellow.css
+++ b/src/main/gnome-shell/gnome-shell-light-solid-yellow.css
@@ -160,9 +160,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: #f5f5f5;
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 0;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -654,11 +654,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -3168,7 +3164,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gnome-shell-light-solid.css b/src/main/gnome-shell/gnome-shell-light-solid.css
index 57d2f7ff..c69555ad 100644
--- a/src/main/gnome-shell/gnome-shell-light-solid.css
+++ b/src/main/gnome-shell/gnome-shell-light-solid.css
@@ -160,9 +160,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: #f5f5f5;
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 0;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -654,11 +654,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -3168,7 +3164,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gnome-shell-light-yellow.css b/src/main/gnome-shell/gnome-shell-light-yellow.css
index cf4095da..15df45c2 100644
--- a/src/main/gnome-shell/gnome-shell-light-yellow.css
+++ b/src/main/gnome-shell/gnome-shell-light-yellow.css
@@ -160,9 +160,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: rgba(245, 245, 245, 0.95);
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 0;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -654,11 +654,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -3164,7 +3160,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/main/gnome-shell/gnome-shell-light.css b/src/main/gnome-shell/gnome-shell-light.css
index 8d266ffd..878f903c 100644
--- a/src/main/gnome-shell/gnome-shell-light.css
+++ b/src/main/gnome-shell/gnome-shell-light.css
@@ -160,9 +160,9 @@ stage {
 .candidate-popup-content, .popup-menu .popup-menu-content, .modal-dialog {
   background-color: rgba(245, 245, 245, 0.95);
   border-radius: 12px;
-  box-shadow: inset 0 0 1px 0 rgba(255, 255, 255, 0.2);
   border: solid rgba(0, 0, 0, 0.75);
   border-width: 0;
+  box-shadow: 3px 3px 8px -3px rgba(0, 0, 0, 0.65);
 }
 
 #screenShieldNotifications StScrollBar StBin#trough, #overview StScrollBar StBin#trough {
@@ -654,11 +654,7 @@ stage {
 }
 
 .message {
-  margin: 0 4px;
-}
-
-.message:first-child {
-  margin-top: 8px;
+  margin: 0 4px 6px;
 }
 
 .message .message-icon-bin {
@@ -3164,7 +3160,7 @@ StEntry StLabel.hint-text {
   padding: 6px 0 !important;
   box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
   border: 1px solid rgba(0, 0, 0, 0);
-  margin: 4px 8px !important;
+  margin: 4px 8px 4px 12px !important;
 }
 
 .popup-menu .popup-menu-item {
diff --git a/src/sass/gnome-shell/widgets/_base.scss b/src/sass/gnome-shell/widgets/_base.scss
index 81f30b22..00ed8a29 100644
--- a/src/sass/gnome-shell/widgets/_base.scss
+++ b/src/sass/gnome-shell/widgets/_base.scss
@@ -120,9 +120,9 @@ stage {
 %theme_dialogs {
   background-color: $dialog_bg_color;
   border-radius: $wm_radius;
-  box-shadow: inset 0 0 1px 0 rgba(white, 0.2);
   border: solid rgba(black, 0.75);
   border-width: if($variant=='light', 0, 1px);
+  box-shadow: 3px 3px 8px -3px rgba(black, 0.65);
 }
 
 %overview_scrollbar {
diff --git a/src/sass/gnome-shell/widgets/_calendar.scss b/src/sass/gnome-shell/widgets/_calendar.scss
index b3497601..e600adf6 100644
--- a/src/sass/gnome-shell/widgets/_calendar.scss
+++ b/src/sass/gnome-shell/widgets/_calendar.scss
@@ -355,11 +355,9 @@
 }
 
 .message {
-  margin: 0 4px;
+  margin: 0 4px 6px;
   @extend %popover_bubble;
 
-  &:first-child { margin-top: 8px; }
-
   // icon container
   .message-icon-bin {
     margin: 8px 0;
diff --git a/src/sass/gnome-shell/widgets/_popovers.scss b/src/sass/gnome-shell/widgets/_popovers.scss
index f4958489..d2d9691c 100644
--- a/src/sass/gnome-shell/widgets/_popovers.scss
+++ b/src/sass/gnome-shell/widgets/_popovers.scss
@@ -12,7 +12,7 @@ $popop_menuitem_radius: $wm_radius - 4px;
     @extend %theme_dialogs;
     box-shadow: 0 8px 16px 0 rgba(black, 0.25);
     border: 1px solid if($variant=='light', rgba(black, 0), rgba(black, 0.75));
-    margin: 4px 8px !important;
+    margin: 4px 8px 4px 12px !important;
   }
 
   .popup-menu-item {