diff --git a/src/main/gnome-shell/gdm3-dark-blue.css b/src/main/gnome-shell/gdm3-dark-blue.css
index 84205c7..c2d9ddc 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 a642384..2d791f6 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 86c98f8..24673ea 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 4907e75..4ad24fe 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 2692fec..5e851d3 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 74dc575..010fbf1 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 1621a29..845489a 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 dd3b92a..a495de4 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 fdc4e7a..8e1e5e4 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 3d77f07..53dd248 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 871ac33..e4127b2 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 c9ed722..d94d1c7 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 3b9e873..0c562f3 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 4f18ebb..7f0dade 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 4058656..a41bfa2 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 91339b9..22c3971 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 0e5ec66..674dd00 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 eb4cc6e..96b762c 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 cd873e5..bd57a85 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 13dc9c7..322a37f 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 28141fd..679cb1a 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 15cb8ad..c95b2b8 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 8305c59..a03b6c1 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 2b03f31..29af708 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 b2436bb..f99e982 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 e8b6a1d..e2fdb31 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 1927610..638b346 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 cd873e5..bd57a85 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 13dc9c7..322a37f 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 28141fd..679cb1a 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 15cb8ad..c95b2b8 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 8305c59..a03b6c1 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 2b03f31..29af708 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 b2436bb..f99e982 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 8c38d98..254061f 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 adffc01..d19768c 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 beb76b6..e38e65f 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 04ee284..d74be45 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 f859e9f..1a69688 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 29cfe7d..5e8432b 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 fea1190..6d36de1 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 160effb..f64a37a 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 336c78b..1366d1b 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 8c38d98..254061f 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 adffc01..d19768c 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 beb76b6..e38e65f 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 04ee284..d74be45 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 f859e9f..1a69688 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 29cfe7d..5e8432b 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 fea1190..6d36de1 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 160effb..f64a37a 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 336c78b..1366d1b 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 e8b6a1d..e2fdb31 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 1927610..638b346 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 7b949fa..cfaf0fb 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 1701902..a0846df 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 bfec66d..4652b69 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 0b9895a..6326dcb 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 8bd0322..5e322d5 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 b29aa17..3264abd 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 8f7c84d..362994c 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 0ee6c9c..574d966 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 a06f621..3cded35 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 c4c599c..5337db1 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 e3f09cd..13a5e29 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 d90173d..ea409f1 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 c538957..3fd260d 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 47ac4be..0592f94 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 0a97fd5..03ba8ca 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 fca6ecb..787f15f 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 fc7ea5f..bc65678 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 0ca6173..6e20b67 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 b86222b..6b5d802 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 c80dec2..97960fa 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 1f16f58..c6210b3 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 4c6e812..4f6ba45 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 c4c31c4..fa400a1 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 c80dec2..97960fa 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 57d2f7f..c69555a 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 fc7ea5f..bc65678 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 0ca6173..6e20b67 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 b86222b..6b5d802 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 c80dec2..97960fa 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 1f16f58..c6210b3 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 4c6e812..4f6ba45 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 c4c31c4..fa400a1 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 1535389..4c33062 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 57d2f7f..c69555a 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 cf4095d..15df45c 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 8d266ff..878f903 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 81f30b2..00ed8a2 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 b349760..e600adf 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 f495848..d2d9691 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 {