diff --git a/src/main/gnome-shell/gdm3-dark-blue.css b/src/main/gnome-shell/gdm3-dark-blue.css
index 138381f8..d3f2f845 100644
--- a/src/main/gnome-shell/gdm3-dark-blue.css
+++ b/src/main/gnome-shell/gdm3-dark-blue.css
@@ -62,7 +62,7 @@ stage {
   box-shadow: none;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content {
+.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);
@@ -354,7 +354,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #2E7CF7;
   border: none;
@@ -418,7 +418,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -560,7 +559,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -1627,16 +1626,6 @@ StEntry StLabel.hint-text {
   selected-color: #2E7CF7;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(36, 36, 36, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -1748,7 +1737,19 @@ StEntry StLabel.hint-text {
   background-color: #2E7CF7;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0.75);
   padding: 8px;
   spacing: 0;
 }
@@ -1766,6 +1767,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gdm3-dark-green.css b/src/main/gnome-shell/gdm3-dark-green.css
index e577b208..4b96c3b1 100644
--- a/src/main/gnome-shell/gdm3-dark-green.css
+++ b/src/main/gnome-shell/gdm3-dark-green.css
@@ -62,7 +62,7 @@ stage {
   box-shadow: none;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content {
+.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);
@@ -354,7 +354,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #79B757;
   border: none;
@@ -418,7 +418,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -560,7 +559,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -1627,16 +1626,6 @@ StEntry StLabel.hint-text {
   selected-color: #79B757;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(36, 36, 36, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -1748,7 +1737,19 @@ StEntry StLabel.hint-text {
   background-color: #79B757;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0.75);
   padding: 8px;
   spacing: 0;
 }
@@ -1766,6 +1767,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gdm3-dark-grey.css b/src/main/gnome-shell/gdm3-dark-grey.css
index 6b831609..4d43ba31 100644
--- a/src/main/gnome-shell/gdm3-dark-grey.css
+++ b/src/main/gnome-shell/gdm3-dark-grey.css
@@ -62,7 +62,7 @@ stage {
   box-shadow: none;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content {
+.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);
@@ -354,7 +354,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #8C8C8C;
   border: none;
@@ -418,7 +418,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -560,7 +559,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -1627,16 +1626,6 @@ StEntry StLabel.hint-text {
   selected-color: #8C8C8C;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(36, 36, 36, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -1748,7 +1737,19 @@ StEntry StLabel.hint-text {
   background-color: #8C8C8C;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0.75);
   padding: 8px;
   spacing: 0;
 }
@@ -1766,6 +1767,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gdm3-dark-orange.css b/src/main/gnome-shell/gdm3-dark-orange.css
index ef89e0e9..1b365ff4 100644
--- a/src/main/gnome-shell/gdm3-dark-orange.css
+++ b/src/main/gnome-shell/gdm3-dark-orange.css
@@ -62,7 +62,7 @@ stage {
   box-shadow: none;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content {
+.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);
@@ -354,7 +354,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #E9873A;
   border: none;
@@ -418,7 +418,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -560,7 +559,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -1627,16 +1626,6 @@ StEntry StLabel.hint-text {
   selected-color: #E9873A;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(36, 36, 36, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -1748,7 +1737,19 @@ StEntry StLabel.hint-text {
   background-color: #E9873A;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0.75);
   padding: 8px;
   spacing: 0;
 }
@@ -1766,6 +1767,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gdm3-dark-pink.css b/src/main/gnome-shell/gdm3-dark-pink.css
index 0e268d2a..ebb02dff 100644
--- a/src/main/gnome-shell/gdm3-dark-pink.css
+++ b/src/main/gnome-shell/gdm3-dark-pink.css
@@ -62,7 +62,7 @@ stage {
   box-shadow: none;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content {
+.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);
@@ -354,7 +354,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #E55E9C;
   border: none;
@@ -418,7 +418,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -560,7 +559,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -1627,16 +1626,6 @@ StEntry StLabel.hint-text {
   selected-color: #E55E9C;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(36, 36, 36, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -1748,7 +1737,19 @@ StEntry StLabel.hint-text {
   background-color: #E55E9C;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0.75);
   padding: 8px;
   spacing: 0;
 }
@@ -1766,6 +1767,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gdm3-dark-purple.css b/src/main/gnome-shell/gdm3-dark-purple.css
index 03d965ee..03a85190 100644
--- a/src/main/gnome-shell/gdm3-dark-purple.css
+++ b/src/main/gnome-shell/gdm3-dark-purple.css
@@ -62,7 +62,7 @@ stage {
   box-shadow: none;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content {
+.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);
@@ -354,7 +354,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #9A57A3;
   border: none;
@@ -418,7 +418,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -560,7 +559,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -1627,16 +1626,6 @@ StEntry StLabel.hint-text {
   selected-color: #9A57A3;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(36, 36, 36, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -1748,7 +1737,19 @@ StEntry StLabel.hint-text {
   background-color: #9A57A3;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0.75);
   padding: 8px;
   spacing: 0;
 }
@@ -1766,6 +1767,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gdm3-dark-red.css b/src/main/gnome-shell/gdm3-dark-red.css
index 3d1b10f0..590484ef 100644
--- a/src/main/gnome-shell/gdm3-dark-red.css
+++ b/src/main/gnome-shell/gdm3-dark-red.css
@@ -62,7 +62,7 @@ stage {
   box-shadow: none;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content {
+.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);
@@ -354,7 +354,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #ED5F5D;
   border: none;
@@ -418,7 +418,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -560,7 +559,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -1627,16 +1626,6 @@ StEntry StLabel.hint-text {
   selected-color: #ED5F5D;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(36, 36, 36, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -1748,7 +1737,19 @@ StEntry StLabel.hint-text {
   background-color: #ED5F5D;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0.75);
   padding: 8px;
   spacing: 0;
 }
@@ -1766,6 +1767,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gdm3-dark-yellow.css b/src/main/gnome-shell/gdm3-dark-yellow.css
index 72f6778a..01ff33b4 100644
--- a/src/main/gnome-shell/gdm3-dark-yellow.css
+++ b/src/main/gnome-shell/gdm3-dark-yellow.css
@@ -62,7 +62,7 @@ stage {
   box-shadow: none;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content {
+.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);
@@ -354,7 +354,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #F3BA4B;
   border: none;
@@ -418,7 +418,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -560,7 +559,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -1627,16 +1626,6 @@ StEntry StLabel.hint-text {
   selected-color: #F3BA4B;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(36, 36, 36, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -1748,7 +1737,19 @@ StEntry StLabel.hint-text {
   background-color: #F3BA4B;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0.75);
   padding: 8px;
   spacing: 0;
 }
@@ -1766,6 +1767,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gdm3-light-blue.css b/src/main/gnome-shell/gdm3-light-blue.css
index 09e54132..21cf22f2 100644
--- a/src/main/gnome-shell/gdm3-light-blue.css
+++ b/src/main/gnome-shell/gdm3-light-blue.css
@@ -62,7 +62,7 @@ stage {
   box-shadow: none;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content {
+.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);
@@ -354,7 +354,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #2E7CF7;
   border: none;
@@ -418,7 +418,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -560,7 +559,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -1627,16 +1626,6 @@ StEntry StLabel.hint-text {
   selected-color: #2E7CF7;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(245, 245, 245, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -1748,7 +1737,19 @@ StEntry StLabel.hint-text {
   background-color: #2E7CF7;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0);
   padding: 8px;
   spacing: 0;
 }
@@ -1766,6 +1767,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gdm3-light-green.css b/src/main/gnome-shell/gdm3-light-green.css
index f5a5de3b..6c84cfcb 100644
--- a/src/main/gnome-shell/gdm3-light-green.css
+++ b/src/main/gnome-shell/gdm3-light-green.css
@@ -62,7 +62,7 @@ stage {
   box-shadow: none;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content {
+.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);
@@ -354,7 +354,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #79B757;
   border: none;
@@ -418,7 +418,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -560,7 +559,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -1627,16 +1626,6 @@ StEntry StLabel.hint-text {
   selected-color: #79B757;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(245, 245, 245, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -1748,7 +1737,19 @@ StEntry StLabel.hint-text {
   background-color: #79B757;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0);
   padding: 8px;
   spacing: 0;
 }
@@ -1766,6 +1767,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gdm3-light-grey.css b/src/main/gnome-shell/gdm3-light-grey.css
index 7959e46b..856dd86a 100644
--- a/src/main/gnome-shell/gdm3-light-grey.css
+++ b/src/main/gnome-shell/gdm3-light-grey.css
@@ -62,7 +62,7 @@ stage {
   box-shadow: none;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content {
+.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);
@@ -354,7 +354,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #8C8C8C;
   border: none;
@@ -418,7 +418,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -560,7 +559,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -1627,16 +1626,6 @@ StEntry StLabel.hint-text {
   selected-color: #8C8C8C;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(245, 245, 245, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -1748,7 +1737,19 @@ StEntry StLabel.hint-text {
   background-color: #8C8C8C;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0);
   padding: 8px;
   spacing: 0;
 }
@@ -1766,6 +1767,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gdm3-light-orange.css b/src/main/gnome-shell/gdm3-light-orange.css
index edb9ab64..6dbf0e4f 100644
--- a/src/main/gnome-shell/gdm3-light-orange.css
+++ b/src/main/gnome-shell/gdm3-light-orange.css
@@ -62,7 +62,7 @@ stage {
   box-shadow: none;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content {
+.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);
@@ -354,7 +354,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #E9873A;
   border: none;
@@ -418,7 +418,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -560,7 +559,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -1627,16 +1626,6 @@ StEntry StLabel.hint-text {
   selected-color: #E9873A;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(245, 245, 245, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -1748,7 +1737,19 @@ StEntry StLabel.hint-text {
   background-color: #E9873A;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0);
   padding: 8px;
   spacing: 0;
 }
@@ -1766,6 +1767,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gdm3-light-pink.css b/src/main/gnome-shell/gdm3-light-pink.css
index 2776657d..e831ae6f 100644
--- a/src/main/gnome-shell/gdm3-light-pink.css
+++ b/src/main/gnome-shell/gdm3-light-pink.css
@@ -62,7 +62,7 @@ stage {
   box-shadow: none;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content {
+.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);
@@ -354,7 +354,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #E55E9C;
   border: none;
@@ -418,7 +418,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -560,7 +559,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -1627,16 +1626,6 @@ StEntry StLabel.hint-text {
   selected-color: #E55E9C;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(245, 245, 245, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -1748,7 +1737,19 @@ StEntry StLabel.hint-text {
   background-color: #E55E9C;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0);
   padding: 8px;
   spacing: 0;
 }
@@ -1766,6 +1767,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gdm3-light-purple.css b/src/main/gnome-shell/gdm3-light-purple.css
index 9d2d05b2..b6f4e8be 100644
--- a/src/main/gnome-shell/gdm3-light-purple.css
+++ b/src/main/gnome-shell/gdm3-light-purple.css
@@ -62,7 +62,7 @@ stage {
   box-shadow: none;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content {
+.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);
@@ -354,7 +354,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #9A57A3;
   border: none;
@@ -418,7 +418,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -560,7 +559,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -1627,16 +1626,6 @@ StEntry StLabel.hint-text {
   selected-color: #9A57A3;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(245, 245, 245, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -1748,7 +1737,19 @@ StEntry StLabel.hint-text {
   background-color: #9A57A3;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0);
   padding: 8px;
   spacing: 0;
 }
@@ -1766,6 +1767,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gdm3-light-red.css b/src/main/gnome-shell/gdm3-light-red.css
index 3f9cac84..bc71dcc6 100644
--- a/src/main/gnome-shell/gdm3-light-red.css
+++ b/src/main/gnome-shell/gdm3-light-red.css
@@ -62,7 +62,7 @@ stage {
   box-shadow: none;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content {
+.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);
@@ -354,7 +354,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #ED5F5D;
   border: none;
@@ -418,7 +418,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -560,7 +559,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -1627,16 +1626,6 @@ StEntry StLabel.hint-text {
   selected-color: #ED5F5D;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(245, 245, 245, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -1748,7 +1737,19 @@ StEntry StLabel.hint-text {
   background-color: #ED5F5D;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0);
   padding: 8px;
   spacing: 0;
 }
@@ -1766,6 +1767,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gdm3-light-yellow.css b/src/main/gnome-shell/gdm3-light-yellow.css
index 48ed76dd..245833af 100644
--- a/src/main/gnome-shell/gdm3-light-yellow.css
+++ b/src/main/gnome-shell/gdm3-light-yellow.css
@@ -62,7 +62,7 @@ stage {
   box-shadow: none;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content {
+.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);
@@ -354,7 +354,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #F3BA4B;
   border: none;
@@ -418,7 +418,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -560,7 +559,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -1627,16 +1626,6 @@ StEntry StLabel.hint-text {
   selected-color: #F3BA4B;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(245, 245, 245, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -1748,7 +1737,19 @@ StEntry StLabel.hint-text {
   background-color: #F3BA4B;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0);
   padding: 8px;
   spacing: 0;
 }
@@ -1766,6 +1767,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
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 12107a9e..e8ecb722 100644
--- a/src/main/gnome-shell/gnome-shell-dark-alt-blue.css
+++ b/src/main/gnome-shell/gnome-shell-dark-alt-blue.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.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);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #2E7CF7;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3294,16 +3293,6 @@ StEntry StLabel.hint-text {
   selected-color: #2E7CF7;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(36, 36, 36, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3415,7 +3404,19 @@ StEntry StLabel.hint-text {
   background-color: #2E7CF7;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0.75);
   padding: 8px;
   spacing: 0;
 }
@@ -3433,6 +3434,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
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 822e9b31..54f4567e 100644
--- a/src/main/gnome-shell/gnome-shell-dark-alt-green.css
+++ b/src/main/gnome-shell/gnome-shell-dark-alt-green.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.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);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #79B757;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3294,16 +3293,6 @@ StEntry StLabel.hint-text {
   selected-color: #79B757;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(36, 36, 36, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3415,7 +3404,19 @@ StEntry StLabel.hint-text {
   background-color: #79B757;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0.75);
   padding: 8px;
   spacing: 0;
 }
@@ -3433,6 +3434,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
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 c78e673c..c6dc017d 100644
--- a/src/main/gnome-shell/gnome-shell-dark-alt-grey.css
+++ b/src/main/gnome-shell/gnome-shell-dark-alt-grey.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.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);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #8C8C8C;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3294,16 +3293,6 @@ StEntry StLabel.hint-text {
   selected-color: #8C8C8C;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(36, 36, 36, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3415,7 +3404,19 @@ StEntry StLabel.hint-text {
   background-color: #8C8C8C;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0.75);
   padding: 8px;
   spacing: 0;
 }
@@ -3433,6 +3434,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
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 5c2f8897..2453c66f 100644
--- a/src/main/gnome-shell/gnome-shell-dark-alt-orange.css
+++ b/src/main/gnome-shell/gnome-shell-dark-alt-orange.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.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);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #E9873A;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3294,16 +3293,6 @@ StEntry StLabel.hint-text {
   selected-color: #E9873A;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(36, 36, 36, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3415,7 +3404,19 @@ StEntry StLabel.hint-text {
   background-color: #E9873A;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0.75);
   padding: 8px;
   spacing: 0;
 }
@@ -3433,6 +3434,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
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 91727576..426a7543 100644
--- a/src/main/gnome-shell/gnome-shell-dark-alt-pink.css
+++ b/src/main/gnome-shell/gnome-shell-dark-alt-pink.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.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);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #E55E9C;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3294,16 +3293,6 @@ StEntry StLabel.hint-text {
   selected-color: #E55E9C;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(36, 36, 36, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3415,7 +3404,19 @@ StEntry StLabel.hint-text {
   background-color: #E55E9C;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0.75);
   padding: 8px;
   spacing: 0;
 }
@@ -3433,6 +3434,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
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 7851c034..c9f8ebfb 100644
--- a/src/main/gnome-shell/gnome-shell-dark-alt-purple.css
+++ b/src/main/gnome-shell/gnome-shell-dark-alt-purple.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.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);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #9A57A3;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3294,16 +3293,6 @@ StEntry StLabel.hint-text {
   selected-color: #9A57A3;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(36, 36, 36, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3415,7 +3404,19 @@ StEntry StLabel.hint-text {
   background-color: #9A57A3;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0.75);
   padding: 8px;
   spacing: 0;
 }
@@ -3433,6 +3434,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
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 71976dcb..3940bbfb 100644
--- a/src/main/gnome-shell/gnome-shell-dark-alt-red.css
+++ b/src/main/gnome-shell/gnome-shell-dark-alt-red.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.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);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #ED5F5D;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3294,16 +3293,6 @@ StEntry StLabel.hint-text {
   selected-color: #ED5F5D;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(36, 36, 36, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3415,7 +3404,19 @@ StEntry StLabel.hint-text {
   background-color: #ED5F5D;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0.75);
   padding: 8px;
   spacing: 0;
 }
@@ -3433,6 +3434,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
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 957bb8a7..a321c7f8 100644
--- a/src/main/gnome-shell/gnome-shell-dark-alt-yellow.css
+++ b/src/main/gnome-shell/gnome-shell-dark-alt-yellow.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.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);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #F3BA4B;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3294,16 +3293,6 @@ StEntry StLabel.hint-text {
   selected-color: #F3BA4B;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(36, 36, 36, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3415,7 +3404,19 @@ StEntry StLabel.hint-text {
   background-color: #F3BA4B;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0.75);
   padding: 8px;
   spacing: 0;
 }
@@ -3433,6 +3434,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-dark-alt.css b/src/main/gnome-shell/gnome-shell-dark-alt.css
index adbf13d7..df10a1dc 100644
--- a/src/main/gnome-shell/gnome-shell-dark-alt.css
+++ b/src/main/gnome-shell/gnome-shell-dark-alt.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.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);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #0860F2;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3294,16 +3293,6 @@ StEntry StLabel.hint-text {
   selected-color: #0860F2;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(36, 36, 36, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3415,7 +3404,19 @@ StEntry StLabel.hint-text {
   background-color: #0860F2;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0.75);
   padding: 8px;
   spacing: 0;
 }
@@ -3433,6 +3434,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-dark-blue.css b/src/main/gnome-shell/gnome-shell-dark-blue.css
index 12107a9e..e8ecb722 100644
--- a/src/main/gnome-shell/gnome-shell-dark-blue.css
+++ b/src/main/gnome-shell/gnome-shell-dark-blue.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.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);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #2E7CF7;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3294,16 +3293,6 @@ StEntry StLabel.hint-text {
   selected-color: #2E7CF7;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(36, 36, 36, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3415,7 +3404,19 @@ StEntry StLabel.hint-text {
   background-color: #2E7CF7;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0.75);
   padding: 8px;
   spacing: 0;
 }
@@ -3433,6 +3434,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-dark-green.css b/src/main/gnome-shell/gnome-shell-dark-green.css
index 822e9b31..54f4567e 100644
--- a/src/main/gnome-shell/gnome-shell-dark-green.css
+++ b/src/main/gnome-shell/gnome-shell-dark-green.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.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);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #79B757;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3294,16 +3293,6 @@ StEntry StLabel.hint-text {
   selected-color: #79B757;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(36, 36, 36, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3415,7 +3404,19 @@ StEntry StLabel.hint-text {
   background-color: #79B757;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0.75);
   padding: 8px;
   spacing: 0;
 }
@@ -3433,6 +3434,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-dark-grey.css b/src/main/gnome-shell/gnome-shell-dark-grey.css
index c78e673c..c6dc017d 100644
--- a/src/main/gnome-shell/gnome-shell-dark-grey.css
+++ b/src/main/gnome-shell/gnome-shell-dark-grey.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.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);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #8C8C8C;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3294,16 +3293,6 @@ StEntry StLabel.hint-text {
   selected-color: #8C8C8C;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(36, 36, 36, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3415,7 +3404,19 @@ StEntry StLabel.hint-text {
   background-color: #8C8C8C;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0.75);
   padding: 8px;
   spacing: 0;
 }
@@ -3433,6 +3434,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-dark-orange.css b/src/main/gnome-shell/gnome-shell-dark-orange.css
index 5c2f8897..2453c66f 100644
--- a/src/main/gnome-shell/gnome-shell-dark-orange.css
+++ b/src/main/gnome-shell/gnome-shell-dark-orange.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.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);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #E9873A;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3294,16 +3293,6 @@ StEntry StLabel.hint-text {
   selected-color: #E9873A;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(36, 36, 36, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3415,7 +3404,19 @@ StEntry StLabel.hint-text {
   background-color: #E9873A;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0.75);
   padding: 8px;
   spacing: 0;
 }
@@ -3433,6 +3434,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-dark-pink.css b/src/main/gnome-shell/gnome-shell-dark-pink.css
index 91727576..426a7543 100644
--- a/src/main/gnome-shell/gnome-shell-dark-pink.css
+++ b/src/main/gnome-shell/gnome-shell-dark-pink.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.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);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #E55E9C;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3294,16 +3293,6 @@ StEntry StLabel.hint-text {
   selected-color: #E55E9C;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(36, 36, 36, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3415,7 +3404,19 @@ StEntry StLabel.hint-text {
   background-color: #E55E9C;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0.75);
   padding: 8px;
   spacing: 0;
 }
@@ -3433,6 +3434,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-dark-purple.css b/src/main/gnome-shell/gnome-shell-dark-purple.css
index 7851c034..c9f8ebfb 100644
--- a/src/main/gnome-shell/gnome-shell-dark-purple.css
+++ b/src/main/gnome-shell/gnome-shell-dark-purple.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.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);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #9A57A3;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3294,16 +3293,6 @@ StEntry StLabel.hint-text {
   selected-color: #9A57A3;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(36, 36, 36, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3415,7 +3404,19 @@ StEntry StLabel.hint-text {
   background-color: #9A57A3;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0.75);
   padding: 8px;
   spacing: 0;
 }
@@ -3433,6 +3434,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-dark-red.css b/src/main/gnome-shell/gnome-shell-dark-red.css
index 71976dcb..3940bbfb 100644
--- a/src/main/gnome-shell/gnome-shell-dark-red.css
+++ b/src/main/gnome-shell/gnome-shell-dark-red.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.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);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #ED5F5D;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3294,16 +3293,6 @@ StEntry StLabel.hint-text {
   selected-color: #ED5F5D;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(36, 36, 36, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3415,7 +3404,19 @@ StEntry StLabel.hint-text {
   background-color: #ED5F5D;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0.75);
   padding: 8px;
   spacing: 0;
 }
@@ -3433,6 +3434,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
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 73dab021..5d1121e5 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
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.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);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #2E7CF7;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3294,16 +3293,6 @@ StEntry StLabel.hint-text {
   selected-color: #2E7CF7;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: #242424;
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3415,7 +3404,19 @@ StEntry StLabel.hint-text {
   background-color: #2E7CF7;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0.75);
   padding: 8px;
   spacing: 0;
 }
@@ -3433,6 +3434,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
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 4ef75ca3..c04bba9c 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
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.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);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #79B757;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3294,16 +3293,6 @@ StEntry StLabel.hint-text {
   selected-color: #79B757;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: #242424;
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3415,7 +3404,19 @@ StEntry StLabel.hint-text {
   background-color: #79B757;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0.75);
   padding: 8px;
   spacing: 0;
 }
@@ -3433,6 +3434,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
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 651bd04c..5d119cf8 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
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.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);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #8C8C8C;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3294,16 +3293,6 @@ StEntry StLabel.hint-text {
   selected-color: #8C8C8C;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: #242424;
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3415,7 +3404,19 @@ StEntry StLabel.hint-text {
   background-color: #8C8C8C;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0.75);
   padding: 8px;
   spacing: 0;
 }
@@ -3433,6 +3434,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
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 01daebde..f926e9d7 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
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.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);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #E9873A;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3294,16 +3293,6 @@ StEntry StLabel.hint-text {
   selected-color: #E9873A;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: #242424;
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3415,7 +3404,19 @@ StEntry StLabel.hint-text {
   background-color: #E9873A;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0.75);
   padding: 8px;
   spacing: 0;
 }
@@ -3433,6 +3434,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
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 ef940615..f8d62a7b 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
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.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);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #E55E9C;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3294,16 +3293,6 @@ StEntry StLabel.hint-text {
   selected-color: #E55E9C;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: #242424;
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3415,7 +3404,19 @@ StEntry StLabel.hint-text {
   background-color: #E55E9C;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0.75);
   padding: 8px;
   spacing: 0;
 }
@@ -3433,6 +3434,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
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 ca2215a0..be211c56 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
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.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);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #9A57A3;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3294,16 +3293,6 @@ StEntry StLabel.hint-text {
   selected-color: #9A57A3;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: #242424;
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3415,7 +3404,19 @@ StEntry StLabel.hint-text {
   background-color: #9A57A3;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0.75);
   padding: 8px;
   spacing: 0;
 }
@@ -3433,6 +3434,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
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 a4aa28d6..30196bcf 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
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.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);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #ED5F5D;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3294,16 +3293,6 @@ StEntry StLabel.hint-text {
   selected-color: #ED5F5D;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: #242424;
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3415,7 +3404,19 @@ StEntry StLabel.hint-text {
   background-color: #ED5F5D;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0.75);
   padding: 8px;
   spacing: 0;
 }
@@ -3433,6 +3434,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
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 bfcdadcd..785de38a 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
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.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);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #F3BA4B;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3294,16 +3293,6 @@ StEntry StLabel.hint-text {
   selected-color: #F3BA4B;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: #242424;
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3415,7 +3404,19 @@ StEntry StLabel.hint-text {
   background-color: #F3BA4B;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0.75);
   padding: 8px;
   spacing: 0;
 }
@@ -3433,6 +3434,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
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 5d3499fd..0ef4e52b 100644
--- a/src/main/gnome-shell/gnome-shell-dark-solid-alt.css
+++ b/src/main/gnome-shell/gnome-shell-dark-solid-alt.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.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);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #0860F2;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3294,16 +3293,6 @@ StEntry StLabel.hint-text {
   selected-color: #0860F2;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: #242424;
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3415,7 +3404,19 @@ StEntry StLabel.hint-text {
   background-color: #0860F2;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0.75);
   padding: 8px;
   spacing: 0;
 }
@@ -3433,6 +3434,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
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 73dab021..5d1121e5 100644
--- a/src/main/gnome-shell/gnome-shell-dark-solid-blue.css
+++ b/src/main/gnome-shell/gnome-shell-dark-solid-blue.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.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);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #2E7CF7;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3294,16 +3293,6 @@ StEntry StLabel.hint-text {
   selected-color: #2E7CF7;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: #242424;
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3415,7 +3404,19 @@ StEntry StLabel.hint-text {
   background-color: #2E7CF7;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0.75);
   padding: 8px;
   spacing: 0;
 }
@@ -3433,6 +3434,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
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 4ef75ca3..c04bba9c 100644
--- a/src/main/gnome-shell/gnome-shell-dark-solid-green.css
+++ b/src/main/gnome-shell/gnome-shell-dark-solid-green.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.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);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #79B757;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3294,16 +3293,6 @@ StEntry StLabel.hint-text {
   selected-color: #79B757;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: #242424;
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3415,7 +3404,19 @@ StEntry StLabel.hint-text {
   background-color: #79B757;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0.75);
   padding: 8px;
   spacing: 0;
 }
@@ -3433,6 +3434,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
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 651bd04c..5d119cf8 100644
--- a/src/main/gnome-shell/gnome-shell-dark-solid-grey.css
+++ b/src/main/gnome-shell/gnome-shell-dark-solid-grey.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.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);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #8C8C8C;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3294,16 +3293,6 @@ StEntry StLabel.hint-text {
   selected-color: #8C8C8C;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: #242424;
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3415,7 +3404,19 @@ StEntry StLabel.hint-text {
   background-color: #8C8C8C;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0.75);
   padding: 8px;
   spacing: 0;
 }
@@ -3433,6 +3434,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
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 01daebde..f926e9d7 100644
--- a/src/main/gnome-shell/gnome-shell-dark-solid-orange.css
+++ b/src/main/gnome-shell/gnome-shell-dark-solid-orange.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.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);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #E9873A;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3294,16 +3293,6 @@ StEntry StLabel.hint-text {
   selected-color: #E9873A;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: #242424;
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3415,7 +3404,19 @@ StEntry StLabel.hint-text {
   background-color: #E9873A;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0.75);
   padding: 8px;
   spacing: 0;
 }
@@ -3433,6 +3434,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
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 ef940615..f8d62a7b 100644
--- a/src/main/gnome-shell/gnome-shell-dark-solid-pink.css
+++ b/src/main/gnome-shell/gnome-shell-dark-solid-pink.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.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);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #E55E9C;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3294,16 +3293,6 @@ StEntry StLabel.hint-text {
   selected-color: #E55E9C;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: #242424;
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3415,7 +3404,19 @@ StEntry StLabel.hint-text {
   background-color: #E55E9C;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0.75);
   padding: 8px;
   spacing: 0;
 }
@@ -3433,6 +3434,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
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 ca2215a0..be211c56 100644
--- a/src/main/gnome-shell/gnome-shell-dark-solid-purple.css
+++ b/src/main/gnome-shell/gnome-shell-dark-solid-purple.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.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);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #9A57A3;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3294,16 +3293,6 @@ StEntry StLabel.hint-text {
   selected-color: #9A57A3;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: #242424;
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3415,7 +3404,19 @@ StEntry StLabel.hint-text {
   background-color: #9A57A3;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0.75);
   padding: 8px;
   spacing: 0;
 }
@@ -3433,6 +3434,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
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 a4aa28d6..30196bcf 100644
--- a/src/main/gnome-shell/gnome-shell-dark-solid-red.css
+++ b/src/main/gnome-shell/gnome-shell-dark-solid-red.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.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);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #ED5F5D;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3294,16 +3293,6 @@ StEntry StLabel.hint-text {
   selected-color: #ED5F5D;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: #242424;
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3415,7 +3404,19 @@ StEntry StLabel.hint-text {
   background-color: #ED5F5D;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0.75);
   padding: 8px;
   spacing: 0;
 }
@@ -3433,6 +3434,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
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 bfcdadcd..785de38a 100644
--- a/src/main/gnome-shell/gnome-shell-dark-solid-yellow.css
+++ b/src/main/gnome-shell/gnome-shell-dark-solid-yellow.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.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);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #F3BA4B;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3294,16 +3293,6 @@ StEntry StLabel.hint-text {
   selected-color: #F3BA4B;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: #242424;
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3415,7 +3404,19 @@ StEntry StLabel.hint-text {
   background-color: #F3BA4B;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0.75);
   padding: 8px;
   spacing: 0;
 }
@@ -3433,6 +3434,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-dark-yellow.css b/src/main/gnome-shell/gnome-shell-dark-yellow.css
index 957bb8a7..a321c7f8 100644
--- a/src/main/gnome-shell/gnome-shell-dark-yellow.css
+++ b/src/main/gnome-shell/gnome-shell-dark-yellow.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.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);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #F3BA4B;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3294,16 +3293,6 @@ StEntry StLabel.hint-text {
   selected-color: #F3BA4B;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(36, 36, 36, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3415,7 +3404,19 @@ StEntry StLabel.hint-text {
   background-color: #F3BA4B;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0.75);
   padding: 8px;
   spacing: 0;
 }
@@ -3433,6 +3434,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
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 94268b89..2b00e7c5 100644
--- a/src/main/gnome-shell/gnome-shell-light-alt-blue.css
+++ b/src/main/gnome-shell/gnome-shell-light-alt-blue.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.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);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #2E7CF7;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3298,16 +3297,6 @@ StEntry StLabel.hint-text {
   selected-color: #2E7CF7;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(245, 245, 245, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3419,7 +3408,19 @@ StEntry StLabel.hint-text {
   background-color: #2E7CF7;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0);
   padding: 8px;
   spacing: 0;
 }
@@ -3437,6 +3438,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
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 6525117f..13e7d8ff 100644
--- a/src/main/gnome-shell/gnome-shell-light-alt-green.css
+++ b/src/main/gnome-shell/gnome-shell-light-alt-green.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.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);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #79B757;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3298,16 +3297,6 @@ StEntry StLabel.hint-text {
   selected-color: #79B757;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(245, 245, 245, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3419,7 +3408,19 @@ StEntry StLabel.hint-text {
   background-color: #79B757;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0);
   padding: 8px;
   spacing: 0;
 }
@@ -3437,6 +3438,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
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 4ce14d39..626b2d98 100644
--- a/src/main/gnome-shell/gnome-shell-light-alt-grey.css
+++ b/src/main/gnome-shell/gnome-shell-light-alt-grey.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.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);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #8C8C8C;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3298,16 +3297,6 @@ StEntry StLabel.hint-text {
   selected-color: #8C8C8C;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(245, 245, 245, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3419,7 +3408,19 @@ StEntry StLabel.hint-text {
   background-color: #8C8C8C;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0);
   padding: 8px;
   spacing: 0;
 }
@@ -3437,6 +3438,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
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 ce56d2b2..7e96569c 100644
--- a/src/main/gnome-shell/gnome-shell-light-alt-orange.css
+++ b/src/main/gnome-shell/gnome-shell-light-alt-orange.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.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);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #E9873A;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3298,16 +3297,6 @@ StEntry StLabel.hint-text {
   selected-color: #E9873A;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(245, 245, 245, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3419,7 +3408,19 @@ StEntry StLabel.hint-text {
   background-color: #E9873A;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0);
   padding: 8px;
   spacing: 0;
 }
@@ -3437,6 +3438,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
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 06733797..44e23008 100644
--- a/src/main/gnome-shell/gnome-shell-light-alt-pink.css
+++ b/src/main/gnome-shell/gnome-shell-light-alt-pink.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.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);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #E55E9C;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3298,16 +3297,6 @@ StEntry StLabel.hint-text {
   selected-color: #E55E9C;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(245, 245, 245, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3419,7 +3408,19 @@ StEntry StLabel.hint-text {
   background-color: #E55E9C;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0);
   padding: 8px;
   spacing: 0;
 }
@@ -3437,6 +3438,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
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 192d6817..75f2d12d 100644
--- a/src/main/gnome-shell/gnome-shell-light-alt-purple.css
+++ b/src/main/gnome-shell/gnome-shell-light-alt-purple.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.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);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #9A57A3;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3298,16 +3297,6 @@ StEntry StLabel.hint-text {
   selected-color: #9A57A3;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(245, 245, 245, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3419,7 +3408,19 @@ StEntry StLabel.hint-text {
   background-color: #9A57A3;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0);
   padding: 8px;
   spacing: 0;
 }
@@ -3437,6 +3438,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
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 dbe647dc..261e2d89 100644
--- a/src/main/gnome-shell/gnome-shell-light-alt-red.css
+++ b/src/main/gnome-shell/gnome-shell-light-alt-red.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.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);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #ED5F5D;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3298,16 +3297,6 @@ StEntry StLabel.hint-text {
   selected-color: #ED5F5D;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(245, 245, 245, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3419,7 +3408,19 @@ StEntry StLabel.hint-text {
   background-color: #ED5F5D;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0);
   padding: 8px;
   spacing: 0;
 }
@@ -3437,6 +3438,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
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 b347a533..227df755 100644
--- a/src/main/gnome-shell/gnome-shell-light-alt-yellow.css
+++ b/src/main/gnome-shell/gnome-shell-light-alt-yellow.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.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);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #F3BA4B;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3298,16 +3297,6 @@ StEntry StLabel.hint-text {
   selected-color: #F3BA4B;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(245, 245, 245, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3419,7 +3408,19 @@ StEntry StLabel.hint-text {
   background-color: #F3BA4B;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0);
   padding: 8px;
   spacing: 0;
 }
@@ -3437,6 +3438,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-light-alt.css b/src/main/gnome-shell/gnome-shell-light-alt.css
index 8cbb6fcc..e8dd8715 100644
--- a/src/main/gnome-shell/gnome-shell-light-alt.css
+++ b/src/main/gnome-shell/gnome-shell-light-alt.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.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);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #0860F2;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3298,16 +3297,6 @@ StEntry StLabel.hint-text {
   selected-color: #0860F2;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(245, 245, 245, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3419,7 +3408,19 @@ StEntry StLabel.hint-text {
   background-color: #0860F2;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0);
   padding: 8px;
   spacing: 0;
 }
@@ -3437,6 +3438,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-light-blue.css b/src/main/gnome-shell/gnome-shell-light-blue.css
index ce4d1846..03ca85b2 100644
--- a/src/main/gnome-shell/gnome-shell-light-blue.css
+++ b/src/main/gnome-shell/gnome-shell-light-blue.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.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);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #2E7CF7;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3294,16 +3293,6 @@ StEntry StLabel.hint-text {
   selected-color: #2E7CF7;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(245, 245, 245, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3415,7 +3404,19 @@ StEntry StLabel.hint-text {
   background-color: #2E7CF7;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0);
   padding: 8px;
   spacing: 0;
 }
@@ -3433,6 +3434,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-light-green.css b/src/main/gnome-shell/gnome-shell-light-green.css
index 80b51141..c5c01834 100644
--- a/src/main/gnome-shell/gnome-shell-light-green.css
+++ b/src/main/gnome-shell/gnome-shell-light-green.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.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);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #79B757;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3294,16 +3293,6 @@ StEntry StLabel.hint-text {
   selected-color: #79B757;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(245, 245, 245, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3415,7 +3404,19 @@ StEntry StLabel.hint-text {
   background-color: #79B757;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0);
   padding: 8px;
   spacing: 0;
 }
@@ -3433,6 +3434,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-light-grey.css b/src/main/gnome-shell/gnome-shell-light-grey.css
index 5ae0ed5c..041a7137 100644
--- a/src/main/gnome-shell/gnome-shell-light-grey.css
+++ b/src/main/gnome-shell/gnome-shell-light-grey.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.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);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #8C8C8C;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3294,16 +3293,6 @@ StEntry StLabel.hint-text {
   selected-color: #8C8C8C;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(245, 245, 245, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3415,7 +3404,19 @@ StEntry StLabel.hint-text {
   background-color: #8C8C8C;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0);
   padding: 8px;
   spacing: 0;
 }
@@ -3433,6 +3434,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-light-orange.css b/src/main/gnome-shell/gnome-shell-light-orange.css
index c84dddc0..b6b09c6f 100644
--- a/src/main/gnome-shell/gnome-shell-light-orange.css
+++ b/src/main/gnome-shell/gnome-shell-light-orange.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.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);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #E9873A;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3294,16 +3293,6 @@ StEntry StLabel.hint-text {
   selected-color: #E9873A;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(245, 245, 245, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3415,7 +3404,19 @@ StEntry StLabel.hint-text {
   background-color: #E9873A;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0);
   padding: 8px;
   spacing: 0;
 }
@@ -3433,6 +3434,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-light-pink.css b/src/main/gnome-shell/gnome-shell-light-pink.css
index 0482cb54..8a309300 100644
--- a/src/main/gnome-shell/gnome-shell-light-pink.css
+++ b/src/main/gnome-shell/gnome-shell-light-pink.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.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);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #E55E9C;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3294,16 +3293,6 @@ StEntry StLabel.hint-text {
   selected-color: #E55E9C;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(245, 245, 245, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3415,7 +3404,19 @@ StEntry StLabel.hint-text {
   background-color: #E55E9C;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0);
   padding: 8px;
   spacing: 0;
 }
@@ -3433,6 +3434,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-light-purple.css b/src/main/gnome-shell/gnome-shell-light-purple.css
index 30fe31e7..88e5a7c4 100644
--- a/src/main/gnome-shell/gnome-shell-light-purple.css
+++ b/src/main/gnome-shell/gnome-shell-light-purple.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.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);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #9A57A3;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3294,16 +3293,6 @@ StEntry StLabel.hint-text {
   selected-color: #9A57A3;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(245, 245, 245, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3415,7 +3404,19 @@ StEntry StLabel.hint-text {
   background-color: #9A57A3;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0);
   padding: 8px;
   spacing: 0;
 }
@@ -3433,6 +3434,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-light-red.css b/src/main/gnome-shell/gnome-shell-light-red.css
index fd6a8033..ddf3c806 100644
--- a/src/main/gnome-shell/gnome-shell-light-red.css
+++ b/src/main/gnome-shell/gnome-shell-light-red.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.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);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #ED5F5D;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3294,16 +3293,6 @@ StEntry StLabel.hint-text {
   selected-color: #ED5F5D;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(245, 245, 245, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3415,7 +3404,19 @@ StEntry StLabel.hint-text {
   background-color: #ED5F5D;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0);
   padding: 8px;
   spacing: 0;
 }
@@ -3433,6 +3434,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
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 161aacca..423bdb28 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
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.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);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #2E7CF7;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3298,16 +3297,6 @@ StEntry StLabel.hint-text {
   selected-color: #2E7CF7;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: #f5f5f5;
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3419,7 +3408,19 @@ StEntry StLabel.hint-text {
   background-color: #2E7CF7;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0);
   padding: 8px;
   spacing: 0;
 }
@@ -3437,6 +3438,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
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 8ba2495c..a7f308fa 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
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.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);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #79B757;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3298,16 +3297,6 @@ StEntry StLabel.hint-text {
   selected-color: #79B757;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: #f5f5f5;
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3419,7 +3408,19 @@ StEntry StLabel.hint-text {
   background-color: #79B757;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0);
   padding: 8px;
   spacing: 0;
 }
@@ -3437,6 +3438,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
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 d5f531f1..40aa2c1f 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
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.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);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #8C8C8C;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3298,16 +3297,6 @@ StEntry StLabel.hint-text {
   selected-color: #8C8C8C;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: #f5f5f5;
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3419,7 +3408,19 @@ StEntry StLabel.hint-text {
   background-color: #8C8C8C;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0);
   padding: 8px;
   spacing: 0;
 }
@@ -3437,6 +3438,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
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 bfb4edde..3d4cefb7 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
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.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);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #E9873A;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3298,16 +3297,6 @@ StEntry StLabel.hint-text {
   selected-color: #E9873A;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: #f5f5f5;
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3419,7 +3408,19 @@ StEntry StLabel.hint-text {
   background-color: #E9873A;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0);
   padding: 8px;
   spacing: 0;
 }
@@ -3437,6 +3438,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
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 621c5b5b..b9b0135d 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
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.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);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #E55E9C;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3298,16 +3297,6 @@ StEntry StLabel.hint-text {
   selected-color: #E55E9C;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: #f5f5f5;
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3419,7 +3408,19 @@ StEntry StLabel.hint-text {
   background-color: #E55E9C;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0);
   padding: 8px;
   spacing: 0;
 }
@@ -3437,6 +3438,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
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 1a3d2349..2ba3df47 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
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.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);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #9A57A3;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3298,16 +3297,6 @@ StEntry StLabel.hint-text {
   selected-color: #9A57A3;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: #f5f5f5;
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3419,7 +3408,19 @@ StEntry StLabel.hint-text {
   background-color: #9A57A3;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0);
   padding: 8px;
   spacing: 0;
 }
@@ -3437,6 +3438,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
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 3f3e66b9..f9476d10 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
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.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);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #ED5F5D;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3298,16 +3297,6 @@ StEntry StLabel.hint-text {
   selected-color: #ED5F5D;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: #f5f5f5;
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3419,7 +3408,19 @@ StEntry StLabel.hint-text {
   background-color: #ED5F5D;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0);
   padding: 8px;
   spacing: 0;
 }
@@ -3437,6 +3438,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
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 bfb4edde..3d4cefb7 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
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.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);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #E9873A;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3298,16 +3297,6 @@ StEntry StLabel.hint-text {
   selected-color: #E9873A;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: #f5f5f5;
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3419,7 +3408,19 @@ StEntry StLabel.hint-text {
   background-color: #E9873A;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0);
   padding: 8px;
   spacing: 0;
 }
@@ -3437,6 +3438,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
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 6e67c3c0..889075de 100644
--- a/src/main/gnome-shell/gnome-shell-light-solid-alt.css
+++ b/src/main/gnome-shell/gnome-shell-light-solid-alt.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.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);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #0860F2;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3298,16 +3297,6 @@ StEntry StLabel.hint-text {
   selected-color: #0860F2;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: #f5f5f5;
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3419,7 +3408,19 @@ StEntry StLabel.hint-text {
   background-color: #0860F2;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0);
   padding: 8px;
   spacing: 0;
 }
@@ -3437,6 +3438,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
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 161aacca..423bdb28 100644
--- a/src/main/gnome-shell/gnome-shell-light-solid-blue.css
+++ b/src/main/gnome-shell/gnome-shell-light-solid-blue.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.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);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #2E7CF7;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3298,16 +3297,6 @@ StEntry StLabel.hint-text {
   selected-color: #2E7CF7;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: #f5f5f5;
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3419,7 +3408,19 @@ StEntry StLabel.hint-text {
   background-color: #2E7CF7;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0);
   padding: 8px;
   spacing: 0;
 }
@@ -3437,6 +3438,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
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 8ba2495c..a7f308fa 100644
--- a/src/main/gnome-shell/gnome-shell-light-solid-green.css
+++ b/src/main/gnome-shell/gnome-shell-light-solid-green.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.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);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #79B757;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3298,16 +3297,6 @@ StEntry StLabel.hint-text {
   selected-color: #79B757;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: #f5f5f5;
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3419,7 +3408,19 @@ StEntry StLabel.hint-text {
   background-color: #79B757;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0);
   padding: 8px;
   spacing: 0;
 }
@@ -3437,6 +3438,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
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 d5f531f1..40aa2c1f 100644
--- a/src/main/gnome-shell/gnome-shell-light-solid-grey.css
+++ b/src/main/gnome-shell/gnome-shell-light-solid-grey.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.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);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #8C8C8C;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3298,16 +3297,6 @@ StEntry StLabel.hint-text {
   selected-color: #8C8C8C;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: #f5f5f5;
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3419,7 +3408,19 @@ StEntry StLabel.hint-text {
   background-color: #8C8C8C;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0);
   padding: 8px;
   spacing: 0;
 }
@@ -3437,6 +3438,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
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 bfb4edde..3d4cefb7 100644
--- a/src/main/gnome-shell/gnome-shell-light-solid-orange.css
+++ b/src/main/gnome-shell/gnome-shell-light-solid-orange.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.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);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #E9873A;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3298,16 +3297,6 @@ StEntry StLabel.hint-text {
   selected-color: #E9873A;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: #f5f5f5;
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3419,7 +3408,19 @@ StEntry StLabel.hint-text {
   background-color: #E9873A;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0);
   padding: 8px;
   spacing: 0;
 }
@@ -3437,6 +3438,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
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 621c5b5b..b9b0135d 100644
--- a/src/main/gnome-shell/gnome-shell-light-solid-pink.css
+++ b/src/main/gnome-shell/gnome-shell-light-solid-pink.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.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);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #E55E9C;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3298,16 +3297,6 @@ StEntry StLabel.hint-text {
   selected-color: #E55E9C;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: #f5f5f5;
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3419,7 +3408,19 @@ StEntry StLabel.hint-text {
   background-color: #E55E9C;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0);
   padding: 8px;
   spacing: 0;
 }
@@ -3437,6 +3438,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
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 1a3d2349..2ba3df47 100644
--- a/src/main/gnome-shell/gnome-shell-light-solid-purple.css
+++ b/src/main/gnome-shell/gnome-shell-light-solid-purple.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.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);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #9A57A3;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3298,16 +3297,6 @@ StEntry StLabel.hint-text {
   selected-color: #9A57A3;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: #f5f5f5;
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3419,7 +3408,19 @@ StEntry StLabel.hint-text {
   background-color: #9A57A3;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0);
   padding: 8px;
   spacing: 0;
 }
@@ -3437,6 +3438,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
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 3f3e66b9..f9476d10 100644
--- a/src/main/gnome-shell/gnome-shell-light-solid-red.css
+++ b/src/main/gnome-shell/gnome-shell-light-solid-red.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.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);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #ED5F5D;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3298,16 +3297,6 @@ StEntry StLabel.hint-text {
   selected-color: #ED5F5D;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: #f5f5f5;
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3419,7 +3408,19 @@ StEntry StLabel.hint-text {
   background-color: #ED5F5D;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0);
   padding: 8px;
   spacing: 0;
 }
@@ -3437,6 +3438,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
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 f0055902..b3291ae2 100644
--- a/src/main/gnome-shell/gnome-shell-light-solid-yellow.css
+++ b/src/main/gnome-shell/gnome-shell-light-solid-yellow.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.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);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #F3BA4B;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3298,16 +3297,6 @@ StEntry StLabel.hint-text {
   selected-color: #F3BA4B;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: #f5f5f5;
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3419,7 +3408,19 @@ StEntry StLabel.hint-text {
   background-color: #F3BA4B;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0);
   padding: 8px;
   spacing: 0;
 }
@@ -3437,6 +3438,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gnome-shell/gnome-shell-light-yellow.css b/src/main/gnome-shell/gnome-shell-light-yellow.css
index a3c622d3..b6dfb4c4 100644
--- a/src/main/gnome-shell/gnome-shell-light-yellow.css
+++ b/src/main/gnome-shell/gnome-shell-light-yellow.css
@@ -157,7 +157,7 @@ stage {
   border-radius: 0 0 6px 6px;
 }
 
-.candidate-popup-boxpointer, .popup-menu .popup-menu-content, .modal-dialog {
+.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);
@@ -449,7 +449,7 @@ stage {
 }
 
 .calendar-today {
-  font-weight: bold !important;
+  font-weight: bold;
   color: rgba(255, 255, 255, 0.85);
   background-color: #F3BA4B;
   border: none;
@@ -513,7 +513,6 @@ stage {
   font-weight: bold;
 }
 
-/* Events */
 .events-button .events-box {
   spacing: 6px;
 }
@@ -655,7 +654,7 @@ stage {
 }
 
 .message {
-  margin: 2px 4px 6px;
+  margin: 0 4px;
 }
 
 .message:first-child {
@@ -3294,16 +3293,6 @@ StEntry StLabel.hint-text {
   selected-color: #F3BA4B;
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: rgba(245, 245, 245, 0.95);
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -3415,7 +3404,19 @@ StEntry StLabel.hint-text {
   background-color: #F3BA4B;
 }
 
+.candidate-popup-boxpointer {
+  -arrow-border-radius: 2px;
+  -arrow-background-color: transparent;
+  -arrow-border-width: 0;
+  -arrow-border-color: transparent;
+  -arrow-base: 64px;
+  -arrow-rise: 12px;
+  background-color: transparent;
+}
+
 .candidate-popup-content {
+  box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.25);
+  border: 1px solid rgba(0, 0, 0, 0);
   padding: 8px;
   spacing: 0;
 }
@@ -3433,6 +3434,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/main/gtk-3.0/gtk-dark-blue.css b/src/main/gtk-3.0/gtk-dark-blue.css
index cc4fe745..a11091fd 100644
--- a/src/main/gtk-3.0/gtk-dark-blue.css
+++ b/src/main/gtk-3.0/gtk-dark-blue.css
@@ -10067,17 +10067,12 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
 
 .budgie-run-dialog, .budgie-session-dialog,
 .budgie-polkit-dialog {
-  border-radius: 12px;
   background-color: #333333;
   border: 1px solid rgba(77, 77, 77, 0.95);
 }
 
-.background.budgie-run-dialog, .background.budgie-session-dialog,
-.background.budgie-polkit-dialog {
-  border-radius: 12px;
-}
-
-.budgie-run-dialog decoration, .budgie-session-dialog decoration,
+.budgie-run-dialog, .budgie-session-dialog,
+.budgie-polkit-dialog, .budgie-run-dialog decoration, .budgie-session-dialog decoration,
 .budgie-polkit-dialog decoration {
   border-radius: 12px;
 }
diff --git a/src/main/gtk-3.0/gtk-dark-green.css b/src/main/gtk-3.0/gtk-dark-green.css
index 6ef18bea..03636821 100644
--- a/src/main/gtk-3.0/gtk-dark-green.css
+++ b/src/main/gtk-3.0/gtk-dark-green.css
@@ -10067,17 +10067,12 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
 
 .budgie-run-dialog, .budgie-session-dialog,
 .budgie-polkit-dialog {
-  border-radius: 12px;
   background-color: #333333;
   border: 1px solid rgba(77, 77, 77, 0.95);
 }
 
-.background.budgie-run-dialog, .background.budgie-session-dialog,
-.background.budgie-polkit-dialog {
-  border-radius: 12px;
-}
-
-.budgie-run-dialog decoration, .budgie-session-dialog decoration,
+.budgie-run-dialog, .budgie-session-dialog,
+.budgie-polkit-dialog, .budgie-run-dialog decoration, .budgie-session-dialog decoration,
 .budgie-polkit-dialog decoration {
   border-radius: 12px;
 }
diff --git a/src/main/gtk-3.0/gtk-dark-grey.css b/src/main/gtk-3.0/gtk-dark-grey.css
index 133054df..6063bc31 100644
--- a/src/main/gtk-3.0/gtk-dark-grey.css
+++ b/src/main/gtk-3.0/gtk-dark-grey.css
@@ -10067,17 +10067,12 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
 
 .budgie-run-dialog, .budgie-session-dialog,
 .budgie-polkit-dialog {
-  border-radius: 12px;
   background-color: #333333;
   border: 1px solid rgba(77, 77, 77, 0.95);
 }
 
-.background.budgie-run-dialog, .background.budgie-session-dialog,
-.background.budgie-polkit-dialog {
-  border-radius: 12px;
-}
-
-.budgie-run-dialog decoration, .budgie-session-dialog decoration,
+.budgie-run-dialog, .budgie-session-dialog,
+.budgie-polkit-dialog, .budgie-run-dialog decoration, .budgie-session-dialog decoration,
 .budgie-polkit-dialog decoration {
   border-radius: 12px;
 }
diff --git a/src/main/gtk-3.0/gtk-dark-orange.css b/src/main/gtk-3.0/gtk-dark-orange.css
index d805cb29..ce356d32 100644
--- a/src/main/gtk-3.0/gtk-dark-orange.css
+++ b/src/main/gtk-3.0/gtk-dark-orange.css
@@ -10067,17 +10067,12 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
 
 .budgie-run-dialog, .budgie-session-dialog,
 .budgie-polkit-dialog {
-  border-radius: 12px;
   background-color: #333333;
   border: 1px solid rgba(77, 77, 77, 0.95);
 }
 
-.background.budgie-run-dialog, .background.budgie-session-dialog,
-.background.budgie-polkit-dialog {
-  border-radius: 12px;
-}
-
-.budgie-run-dialog decoration, .budgie-session-dialog decoration,
+.budgie-run-dialog, .budgie-session-dialog,
+.budgie-polkit-dialog, .budgie-run-dialog decoration, .budgie-session-dialog decoration,
 .budgie-polkit-dialog decoration {
   border-radius: 12px;
 }
diff --git a/src/main/gtk-3.0/gtk-dark-pink.css b/src/main/gtk-3.0/gtk-dark-pink.css
index ed012111..3840cce4 100644
--- a/src/main/gtk-3.0/gtk-dark-pink.css
+++ b/src/main/gtk-3.0/gtk-dark-pink.css
@@ -10067,17 +10067,12 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
 
 .budgie-run-dialog, .budgie-session-dialog,
 .budgie-polkit-dialog {
-  border-radius: 12px;
   background-color: #333333;
   border: 1px solid rgba(77, 77, 77, 0.95);
 }
 
-.background.budgie-run-dialog, .background.budgie-session-dialog,
-.background.budgie-polkit-dialog {
-  border-radius: 12px;
-}
-
-.budgie-run-dialog decoration, .budgie-session-dialog decoration,
+.budgie-run-dialog, .budgie-session-dialog,
+.budgie-polkit-dialog, .budgie-run-dialog decoration, .budgie-session-dialog decoration,
 .budgie-polkit-dialog decoration {
   border-radius: 12px;
 }
diff --git a/src/main/gtk-3.0/gtk-dark-purple.css b/src/main/gtk-3.0/gtk-dark-purple.css
index aea4c457..46d59bb4 100644
--- a/src/main/gtk-3.0/gtk-dark-purple.css
+++ b/src/main/gtk-3.0/gtk-dark-purple.css
@@ -10067,17 +10067,12 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
 
 .budgie-run-dialog, .budgie-session-dialog,
 .budgie-polkit-dialog {
-  border-radius: 12px;
   background-color: #333333;
   border: 1px solid rgba(77, 77, 77, 0.95);
 }
 
-.background.budgie-run-dialog, .background.budgie-session-dialog,
-.background.budgie-polkit-dialog {
-  border-radius: 12px;
-}
-
-.budgie-run-dialog decoration, .budgie-session-dialog decoration,
+.budgie-run-dialog, .budgie-session-dialog,
+.budgie-polkit-dialog, .budgie-run-dialog decoration, .budgie-session-dialog decoration,
 .budgie-polkit-dialog decoration {
   border-radius: 12px;
 }
diff --git a/src/main/gtk-3.0/gtk-dark-red.css b/src/main/gtk-3.0/gtk-dark-red.css
index 13bd1fb7..3ce5ab06 100644
--- a/src/main/gtk-3.0/gtk-dark-red.css
+++ b/src/main/gtk-3.0/gtk-dark-red.css
@@ -10067,17 +10067,12 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
 
 .budgie-run-dialog, .budgie-session-dialog,
 .budgie-polkit-dialog {
-  border-radius: 12px;
   background-color: #333333;
   border: 1px solid rgba(77, 77, 77, 0.95);
 }
 
-.background.budgie-run-dialog, .background.budgie-session-dialog,
-.background.budgie-polkit-dialog {
-  border-radius: 12px;
-}
-
-.budgie-run-dialog decoration, .budgie-session-dialog decoration,
+.budgie-run-dialog, .budgie-session-dialog,
+.budgie-polkit-dialog, .budgie-run-dialog decoration, .budgie-session-dialog decoration,
 .budgie-polkit-dialog decoration {
   border-radius: 12px;
 }
diff --git a/src/main/gtk-3.0/gtk-dark-solid-blue.css b/src/main/gtk-3.0/gtk-dark-solid-blue.css
index db4ee2cb..b8348338 100644
--- a/src/main/gtk-3.0/gtk-dark-solid-blue.css
+++ b/src/main/gtk-3.0/gtk-dark-solid-blue.css
@@ -10071,17 +10071,12 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
 
 .budgie-run-dialog, .budgie-session-dialog,
 .budgie-polkit-dialog {
-  border-radius: 12px;
   background-color: #333333;
   border: 1px solid #4d4d4d;
 }
 
-.background.budgie-run-dialog, .background.budgie-session-dialog,
-.background.budgie-polkit-dialog {
-  border-radius: 12px;
-}
-
-.budgie-run-dialog decoration, .budgie-session-dialog decoration,
+.budgie-run-dialog, .budgie-session-dialog,
+.budgie-polkit-dialog, .budgie-run-dialog decoration, .budgie-session-dialog decoration,
 .budgie-polkit-dialog decoration {
   border-radius: 12px;
 }
diff --git a/src/main/gtk-3.0/gtk-dark-solid-green.css b/src/main/gtk-3.0/gtk-dark-solid-green.css
index a7130795..475e4f98 100644
--- a/src/main/gtk-3.0/gtk-dark-solid-green.css
+++ b/src/main/gtk-3.0/gtk-dark-solid-green.css
@@ -10071,17 +10071,12 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
 
 .budgie-run-dialog, .budgie-session-dialog,
 .budgie-polkit-dialog {
-  border-radius: 12px;
   background-color: #333333;
   border: 1px solid #4d4d4d;
 }
 
-.background.budgie-run-dialog, .background.budgie-session-dialog,
-.background.budgie-polkit-dialog {
-  border-radius: 12px;
-}
-
-.budgie-run-dialog decoration, .budgie-session-dialog decoration,
+.budgie-run-dialog, .budgie-session-dialog,
+.budgie-polkit-dialog, .budgie-run-dialog decoration, .budgie-session-dialog decoration,
 .budgie-polkit-dialog decoration {
   border-radius: 12px;
 }
diff --git a/src/main/gtk-3.0/gtk-dark-solid-grey.css b/src/main/gtk-3.0/gtk-dark-solid-grey.css
index 7af7370d..3d208aa9 100644
--- a/src/main/gtk-3.0/gtk-dark-solid-grey.css
+++ b/src/main/gtk-3.0/gtk-dark-solid-grey.css
@@ -10071,17 +10071,12 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
 
 .budgie-run-dialog, .budgie-session-dialog,
 .budgie-polkit-dialog {
-  border-radius: 12px;
   background-color: #333333;
   border: 1px solid #4d4d4d;
 }
 
-.background.budgie-run-dialog, .background.budgie-session-dialog,
-.background.budgie-polkit-dialog {
-  border-radius: 12px;
-}
-
-.budgie-run-dialog decoration, .budgie-session-dialog decoration,
+.budgie-run-dialog, .budgie-session-dialog,
+.budgie-polkit-dialog, .budgie-run-dialog decoration, .budgie-session-dialog decoration,
 .budgie-polkit-dialog decoration {
   border-radius: 12px;
 }
diff --git a/src/main/gtk-3.0/gtk-dark-solid-orange.css b/src/main/gtk-3.0/gtk-dark-solid-orange.css
index 9165361c..406a90ab 100644
--- a/src/main/gtk-3.0/gtk-dark-solid-orange.css
+++ b/src/main/gtk-3.0/gtk-dark-solid-orange.css
@@ -10071,17 +10071,12 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
 
 .budgie-run-dialog, .budgie-session-dialog,
 .budgie-polkit-dialog {
-  border-radius: 12px;
   background-color: #333333;
   border: 1px solid #4d4d4d;
 }
 
-.background.budgie-run-dialog, .background.budgie-session-dialog,
-.background.budgie-polkit-dialog {
-  border-radius: 12px;
-}
-
-.budgie-run-dialog decoration, .budgie-session-dialog decoration,
+.budgie-run-dialog, .budgie-session-dialog,
+.budgie-polkit-dialog, .budgie-run-dialog decoration, .budgie-session-dialog decoration,
 .budgie-polkit-dialog decoration {
   border-radius: 12px;
 }
diff --git a/src/main/gtk-3.0/gtk-dark-solid-pink.css b/src/main/gtk-3.0/gtk-dark-solid-pink.css
index 6154855f..90d95571 100644
--- a/src/main/gtk-3.0/gtk-dark-solid-pink.css
+++ b/src/main/gtk-3.0/gtk-dark-solid-pink.css
@@ -10071,17 +10071,12 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
 
 .budgie-run-dialog, .budgie-session-dialog,
 .budgie-polkit-dialog {
-  border-radius: 12px;
   background-color: #333333;
   border: 1px solid #4d4d4d;
 }
 
-.background.budgie-run-dialog, .background.budgie-session-dialog,
-.background.budgie-polkit-dialog {
-  border-radius: 12px;
-}
-
-.budgie-run-dialog decoration, .budgie-session-dialog decoration,
+.budgie-run-dialog, .budgie-session-dialog,
+.budgie-polkit-dialog, .budgie-run-dialog decoration, .budgie-session-dialog decoration,
 .budgie-polkit-dialog decoration {
   border-radius: 12px;
 }
diff --git a/src/main/gtk-3.0/gtk-dark-solid-purple.css b/src/main/gtk-3.0/gtk-dark-solid-purple.css
index 9c0fcb31..90941dd9 100644
--- a/src/main/gtk-3.0/gtk-dark-solid-purple.css
+++ b/src/main/gtk-3.0/gtk-dark-solid-purple.css
@@ -10071,17 +10071,12 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
 
 .budgie-run-dialog, .budgie-session-dialog,
 .budgie-polkit-dialog {
-  border-radius: 12px;
   background-color: #333333;
   border: 1px solid #4d4d4d;
 }
 
-.background.budgie-run-dialog, .background.budgie-session-dialog,
-.background.budgie-polkit-dialog {
-  border-radius: 12px;
-}
-
-.budgie-run-dialog decoration, .budgie-session-dialog decoration,
+.budgie-run-dialog, .budgie-session-dialog,
+.budgie-polkit-dialog, .budgie-run-dialog decoration, .budgie-session-dialog decoration,
 .budgie-polkit-dialog decoration {
   border-radius: 12px;
 }
diff --git a/src/main/gtk-3.0/gtk-dark-solid-red.css b/src/main/gtk-3.0/gtk-dark-solid-red.css
index e06eff54..b6b22111 100644
--- a/src/main/gtk-3.0/gtk-dark-solid-red.css
+++ b/src/main/gtk-3.0/gtk-dark-solid-red.css
@@ -10071,17 +10071,12 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
 
 .budgie-run-dialog, .budgie-session-dialog,
 .budgie-polkit-dialog {
-  border-radius: 12px;
   background-color: #333333;
   border: 1px solid #4d4d4d;
 }
 
-.background.budgie-run-dialog, .background.budgie-session-dialog,
-.background.budgie-polkit-dialog {
-  border-radius: 12px;
-}
-
-.budgie-run-dialog decoration, .budgie-session-dialog decoration,
+.budgie-run-dialog, .budgie-session-dialog,
+.budgie-polkit-dialog, .budgie-run-dialog decoration, .budgie-session-dialog decoration,
 .budgie-polkit-dialog decoration {
   border-radius: 12px;
 }
diff --git a/src/main/gtk-3.0/gtk-dark-solid-yellow.css b/src/main/gtk-3.0/gtk-dark-solid-yellow.css
index 640376bf..49662225 100644
--- a/src/main/gtk-3.0/gtk-dark-solid-yellow.css
+++ b/src/main/gtk-3.0/gtk-dark-solid-yellow.css
@@ -10071,17 +10071,12 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
 
 .budgie-run-dialog, .budgie-session-dialog,
 .budgie-polkit-dialog {
-  border-radius: 12px;
   background-color: #333333;
   border: 1px solid #4d4d4d;
 }
 
-.background.budgie-run-dialog, .background.budgie-session-dialog,
-.background.budgie-polkit-dialog {
-  border-radius: 12px;
-}
-
-.budgie-run-dialog decoration, .budgie-session-dialog decoration,
+.budgie-run-dialog, .budgie-session-dialog,
+.budgie-polkit-dialog, .budgie-run-dialog decoration, .budgie-session-dialog decoration,
 .budgie-polkit-dialog decoration {
   border-radius: 12px;
 }
diff --git a/src/main/gtk-3.0/gtk-dark-yellow.css b/src/main/gtk-3.0/gtk-dark-yellow.css
index d1eea9c2..70ce8139 100644
--- a/src/main/gtk-3.0/gtk-dark-yellow.css
+++ b/src/main/gtk-3.0/gtk-dark-yellow.css
@@ -10067,17 +10067,12 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
 
 .budgie-run-dialog, .budgie-session-dialog,
 .budgie-polkit-dialog {
-  border-radius: 12px;
   background-color: #333333;
   border: 1px solid rgba(77, 77, 77, 0.95);
 }
 
-.background.budgie-run-dialog, .background.budgie-session-dialog,
-.background.budgie-polkit-dialog {
-  border-radius: 12px;
-}
-
-.budgie-run-dialog decoration, .budgie-session-dialog decoration,
+.budgie-run-dialog, .budgie-session-dialog,
+.budgie-polkit-dialog, .budgie-run-dialog decoration, .budgie-session-dialog decoration,
 .budgie-polkit-dialog decoration {
   border-radius: 12px;
 }
diff --git a/src/main/gtk-3.0/gtk-light-blue.css b/src/main/gtk-3.0/gtk-light-blue.css
index 80496a07..5a1b4f15 100644
--- a/src/main/gtk-3.0/gtk-light-blue.css
+++ b/src/main/gtk-3.0/gtk-light-blue.css
@@ -10105,16 +10105,11 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
 
 .budgie-run-dialog, .budgie-session-dialog,
 .budgie-polkit-dialog {
-  border-radius: 12px;
   background-color: #f5f5f5;
 }
 
-.background.budgie-run-dialog, .background.budgie-session-dialog,
-.background.budgie-polkit-dialog {
-  border-radius: 12px;
-}
-
-.budgie-run-dialog decoration, .budgie-session-dialog decoration,
+.budgie-run-dialog, .budgie-session-dialog,
+.budgie-polkit-dialog, .budgie-run-dialog decoration, .budgie-session-dialog decoration,
 .budgie-polkit-dialog decoration {
   border-radius: 12px;
 }
diff --git a/src/main/gtk-3.0/gtk-light-green.css b/src/main/gtk-3.0/gtk-light-green.css
index 40e1210d..a8e2e994 100644
--- a/src/main/gtk-3.0/gtk-light-green.css
+++ b/src/main/gtk-3.0/gtk-light-green.css
@@ -10105,16 +10105,11 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
 
 .budgie-run-dialog, .budgie-session-dialog,
 .budgie-polkit-dialog {
-  border-radius: 12px;
   background-color: #f5f5f5;
 }
 
-.background.budgie-run-dialog, .background.budgie-session-dialog,
-.background.budgie-polkit-dialog {
-  border-radius: 12px;
-}
-
-.budgie-run-dialog decoration, .budgie-session-dialog decoration,
+.budgie-run-dialog, .budgie-session-dialog,
+.budgie-polkit-dialog, .budgie-run-dialog decoration, .budgie-session-dialog decoration,
 .budgie-polkit-dialog decoration {
   border-radius: 12px;
 }
diff --git a/src/main/gtk-3.0/gtk-light-grey.css b/src/main/gtk-3.0/gtk-light-grey.css
index 929ad455..f3e70db9 100644
--- a/src/main/gtk-3.0/gtk-light-grey.css
+++ b/src/main/gtk-3.0/gtk-light-grey.css
@@ -10105,16 +10105,11 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
 
 .budgie-run-dialog, .budgie-session-dialog,
 .budgie-polkit-dialog {
-  border-radius: 12px;
   background-color: #f5f5f5;
 }
 
-.background.budgie-run-dialog, .background.budgie-session-dialog,
-.background.budgie-polkit-dialog {
-  border-radius: 12px;
-}
-
-.budgie-run-dialog decoration, .budgie-session-dialog decoration,
+.budgie-run-dialog, .budgie-session-dialog,
+.budgie-polkit-dialog, .budgie-run-dialog decoration, .budgie-session-dialog decoration,
 .budgie-polkit-dialog decoration {
   border-radius: 12px;
 }
diff --git a/src/main/gtk-3.0/gtk-light-orange.css b/src/main/gtk-3.0/gtk-light-orange.css
index 14b8c734..28545b4f 100644
--- a/src/main/gtk-3.0/gtk-light-orange.css
+++ b/src/main/gtk-3.0/gtk-light-orange.css
@@ -10105,16 +10105,11 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
 
 .budgie-run-dialog, .budgie-session-dialog,
 .budgie-polkit-dialog {
-  border-radius: 12px;
   background-color: #f5f5f5;
 }
 
-.background.budgie-run-dialog, .background.budgie-session-dialog,
-.background.budgie-polkit-dialog {
-  border-radius: 12px;
-}
-
-.budgie-run-dialog decoration, .budgie-session-dialog decoration,
+.budgie-run-dialog, .budgie-session-dialog,
+.budgie-polkit-dialog, .budgie-run-dialog decoration, .budgie-session-dialog decoration,
 .budgie-polkit-dialog decoration {
   border-radius: 12px;
 }
diff --git a/src/main/gtk-3.0/gtk-light-pink.css b/src/main/gtk-3.0/gtk-light-pink.css
index ddbfb171..a8a34e97 100644
--- a/src/main/gtk-3.0/gtk-light-pink.css
+++ b/src/main/gtk-3.0/gtk-light-pink.css
@@ -10105,16 +10105,11 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
 
 .budgie-run-dialog, .budgie-session-dialog,
 .budgie-polkit-dialog {
-  border-radius: 12px;
   background-color: #f5f5f5;
 }
 
-.background.budgie-run-dialog, .background.budgie-session-dialog,
-.background.budgie-polkit-dialog {
-  border-radius: 12px;
-}
-
-.budgie-run-dialog decoration, .budgie-session-dialog decoration,
+.budgie-run-dialog, .budgie-session-dialog,
+.budgie-polkit-dialog, .budgie-run-dialog decoration, .budgie-session-dialog decoration,
 .budgie-polkit-dialog decoration {
   border-radius: 12px;
 }
diff --git a/src/main/gtk-3.0/gtk-light-purple.css b/src/main/gtk-3.0/gtk-light-purple.css
index e9b29064..46f41c02 100644
--- a/src/main/gtk-3.0/gtk-light-purple.css
+++ b/src/main/gtk-3.0/gtk-light-purple.css
@@ -10105,16 +10105,11 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
 
 .budgie-run-dialog, .budgie-session-dialog,
 .budgie-polkit-dialog {
-  border-radius: 12px;
   background-color: #f5f5f5;
 }
 
-.background.budgie-run-dialog, .background.budgie-session-dialog,
-.background.budgie-polkit-dialog {
-  border-radius: 12px;
-}
-
-.budgie-run-dialog decoration, .budgie-session-dialog decoration,
+.budgie-run-dialog, .budgie-session-dialog,
+.budgie-polkit-dialog, .budgie-run-dialog decoration, .budgie-session-dialog decoration,
 .budgie-polkit-dialog decoration {
   border-radius: 12px;
 }
diff --git a/src/main/gtk-3.0/gtk-light-red.css b/src/main/gtk-3.0/gtk-light-red.css
index 9b8e0982..31aa1a04 100644
--- a/src/main/gtk-3.0/gtk-light-red.css
+++ b/src/main/gtk-3.0/gtk-light-red.css
@@ -10105,16 +10105,11 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
 
 .budgie-run-dialog, .budgie-session-dialog,
 .budgie-polkit-dialog {
-  border-radius: 12px;
   background-color: #f5f5f5;
 }
 
-.background.budgie-run-dialog, .background.budgie-session-dialog,
-.background.budgie-polkit-dialog {
-  border-radius: 12px;
-}
-
-.budgie-run-dialog decoration, .budgie-session-dialog decoration,
+.budgie-run-dialog, .budgie-session-dialog,
+.budgie-polkit-dialog, .budgie-run-dialog decoration, .budgie-session-dialog decoration,
 .budgie-polkit-dialog decoration {
   border-radius: 12px;
 }
diff --git a/src/main/gtk-3.0/gtk-light-solid-blue.css b/src/main/gtk-3.0/gtk-light-solid-blue.css
index 1b0e8e79..81e3c9a7 100644
--- a/src/main/gtk-3.0/gtk-light-solid-blue.css
+++ b/src/main/gtk-3.0/gtk-light-solid-blue.css
@@ -10109,16 +10109,11 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
 
 .budgie-run-dialog, .budgie-session-dialog,
 .budgie-polkit-dialog {
-  border-radius: 12px;
   background-color: #f5f5f5;
 }
 
-.background.budgie-run-dialog, .background.budgie-session-dialog,
-.background.budgie-polkit-dialog {
-  border-radius: 12px;
-}
-
-.budgie-run-dialog decoration, .budgie-session-dialog decoration,
+.budgie-run-dialog, .budgie-session-dialog,
+.budgie-polkit-dialog, .budgie-run-dialog decoration, .budgie-session-dialog decoration,
 .budgie-polkit-dialog decoration {
   border-radius: 12px;
 }
diff --git a/src/main/gtk-3.0/gtk-light-solid-green.css b/src/main/gtk-3.0/gtk-light-solid-green.css
index 741c5091..201fb006 100644
--- a/src/main/gtk-3.0/gtk-light-solid-green.css
+++ b/src/main/gtk-3.0/gtk-light-solid-green.css
@@ -10109,16 +10109,11 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
 
 .budgie-run-dialog, .budgie-session-dialog,
 .budgie-polkit-dialog {
-  border-radius: 12px;
   background-color: #f5f5f5;
 }
 
-.background.budgie-run-dialog, .background.budgie-session-dialog,
-.background.budgie-polkit-dialog {
-  border-radius: 12px;
-}
-
-.budgie-run-dialog decoration, .budgie-session-dialog decoration,
+.budgie-run-dialog, .budgie-session-dialog,
+.budgie-polkit-dialog, .budgie-run-dialog decoration, .budgie-session-dialog decoration,
 .budgie-polkit-dialog decoration {
   border-radius: 12px;
 }
diff --git a/src/main/gtk-3.0/gtk-light-solid-grey.css b/src/main/gtk-3.0/gtk-light-solid-grey.css
index 6e282c33..177fe0c0 100644
--- a/src/main/gtk-3.0/gtk-light-solid-grey.css
+++ b/src/main/gtk-3.0/gtk-light-solid-grey.css
@@ -10109,16 +10109,11 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
 
 .budgie-run-dialog, .budgie-session-dialog,
 .budgie-polkit-dialog {
-  border-radius: 12px;
   background-color: #f5f5f5;
 }
 
-.background.budgie-run-dialog, .background.budgie-session-dialog,
-.background.budgie-polkit-dialog {
-  border-radius: 12px;
-}
-
-.budgie-run-dialog decoration, .budgie-session-dialog decoration,
+.budgie-run-dialog, .budgie-session-dialog,
+.budgie-polkit-dialog, .budgie-run-dialog decoration, .budgie-session-dialog decoration,
 .budgie-polkit-dialog decoration {
   border-radius: 12px;
 }
diff --git a/src/main/gtk-3.0/gtk-light-solid-orange.css b/src/main/gtk-3.0/gtk-light-solid-orange.css
index 6d398413..20e08836 100644
--- a/src/main/gtk-3.0/gtk-light-solid-orange.css
+++ b/src/main/gtk-3.0/gtk-light-solid-orange.css
@@ -10109,16 +10109,11 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
 
 .budgie-run-dialog, .budgie-session-dialog,
 .budgie-polkit-dialog {
-  border-radius: 12px;
   background-color: #f5f5f5;
 }
 
-.background.budgie-run-dialog, .background.budgie-session-dialog,
-.background.budgie-polkit-dialog {
-  border-radius: 12px;
-}
-
-.budgie-run-dialog decoration, .budgie-session-dialog decoration,
+.budgie-run-dialog, .budgie-session-dialog,
+.budgie-polkit-dialog, .budgie-run-dialog decoration, .budgie-session-dialog decoration,
 .budgie-polkit-dialog decoration {
   border-radius: 12px;
 }
diff --git a/src/main/gtk-3.0/gtk-light-solid-pink.css b/src/main/gtk-3.0/gtk-light-solid-pink.css
index ef311941..c19fec22 100644
--- a/src/main/gtk-3.0/gtk-light-solid-pink.css
+++ b/src/main/gtk-3.0/gtk-light-solid-pink.css
@@ -10109,16 +10109,11 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
 
 .budgie-run-dialog, .budgie-session-dialog,
 .budgie-polkit-dialog {
-  border-radius: 12px;
   background-color: #f5f5f5;
 }
 
-.background.budgie-run-dialog, .background.budgie-session-dialog,
-.background.budgie-polkit-dialog {
-  border-radius: 12px;
-}
-
-.budgie-run-dialog decoration, .budgie-session-dialog decoration,
+.budgie-run-dialog, .budgie-session-dialog,
+.budgie-polkit-dialog, .budgie-run-dialog decoration, .budgie-session-dialog decoration,
 .budgie-polkit-dialog decoration {
   border-radius: 12px;
 }
diff --git a/src/main/gtk-3.0/gtk-light-solid-purple.css b/src/main/gtk-3.0/gtk-light-solid-purple.css
index f5ddfb2d..d3bce785 100644
--- a/src/main/gtk-3.0/gtk-light-solid-purple.css
+++ b/src/main/gtk-3.0/gtk-light-solid-purple.css
@@ -10109,16 +10109,11 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
 
 .budgie-run-dialog, .budgie-session-dialog,
 .budgie-polkit-dialog {
-  border-radius: 12px;
   background-color: #f5f5f5;
 }
 
-.background.budgie-run-dialog, .background.budgie-session-dialog,
-.background.budgie-polkit-dialog {
-  border-radius: 12px;
-}
-
-.budgie-run-dialog decoration, .budgie-session-dialog decoration,
+.budgie-run-dialog, .budgie-session-dialog,
+.budgie-polkit-dialog, .budgie-run-dialog decoration, .budgie-session-dialog decoration,
 .budgie-polkit-dialog decoration {
   border-radius: 12px;
 }
diff --git a/src/main/gtk-3.0/gtk-light-solid-red.css b/src/main/gtk-3.0/gtk-light-solid-red.css
index dda6032a..aae5e14e 100644
--- a/src/main/gtk-3.0/gtk-light-solid-red.css
+++ b/src/main/gtk-3.0/gtk-light-solid-red.css
@@ -10109,16 +10109,11 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
 
 .budgie-run-dialog, .budgie-session-dialog,
 .budgie-polkit-dialog {
-  border-radius: 12px;
   background-color: #f5f5f5;
 }
 
-.background.budgie-run-dialog, .background.budgie-session-dialog,
-.background.budgie-polkit-dialog {
-  border-radius: 12px;
-}
-
-.budgie-run-dialog decoration, .budgie-session-dialog decoration,
+.budgie-run-dialog, .budgie-session-dialog,
+.budgie-polkit-dialog, .budgie-run-dialog decoration, .budgie-session-dialog decoration,
 .budgie-polkit-dialog decoration {
   border-radius: 12px;
 }
diff --git a/src/main/gtk-3.0/gtk-light-solid-yellow.css b/src/main/gtk-3.0/gtk-light-solid-yellow.css
index 187e6584..3c12e7dd 100644
--- a/src/main/gtk-3.0/gtk-light-solid-yellow.css
+++ b/src/main/gtk-3.0/gtk-light-solid-yellow.css
@@ -10109,16 +10109,11 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
 
 .budgie-run-dialog, .budgie-session-dialog,
 .budgie-polkit-dialog {
-  border-radius: 12px;
   background-color: #f5f5f5;
 }
 
-.background.budgie-run-dialog, .background.budgie-session-dialog,
-.background.budgie-polkit-dialog {
-  border-radius: 12px;
-}
-
-.budgie-run-dialog decoration, .budgie-session-dialog decoration,
+.budgie-run-dialog, .budgie-session-dialog,
+.budgie-polkit-dialog, .budgie-run-dialog decoration, .budgie-session-dialog decoration,
 .budgie-polkit-dialog decoration {
   border-radius: 12px;
 }
diff --git a/src/main/gtk-3.0/gtk-light-yellow.css b/src/main/gtk-3.0/gtk-light-yellow.css
index 155c514a..6c7fb88f 100644
--- a/src/main/gtk-3.0/gtk-light-yellow.css
+++ b/src/main/gtk-3.0/gtk-light-yellow.css
@@ -10105,16 +10105,11 @@ window.budgie-switcher-window .drop-shadow, .drop-shadow {
 
 .budgie-run-dialog, .budgie-session-dialog,
 .budgie-polkit-dialog {
-  border-radius: 12px;
   background-color: #f5f5f5;
 }
 
-.background.budgie-run-dialog, .background.budgie-session-dialog,
-.background.budgie-polkit-dialog {
-  border-radius: 12px;
-}
-
-.budgie-run-dialog decoration, .budgie-session-dialog decoration,
+.budgie-run-dialog, .budgie-session-dialog,
+.budgie-polkit-dialog, .budgie-run-dialog decoration, .budgie-session-dialog decoration,
 .budgie-polkit-dialog decoration {
   border-radius: 12px;
 }