diff --git a/src/main/gnome-shell/gdm3-dark.css b/src/main/gnome-shell/gdm3-dark.css
index fab8243..0fdf584 100644
--- a/src/main/gnome-shell/gdm3-dark.css
+++ b/src/main/gnome-shell/gdm3-dark.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);
@@ -1627,16 +1627,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;
@@ -1748,7 +1738,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;
 }
@@ -1766,6 +1768,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.css b/src/main/gnome-shell/gdm3-light.css
index 66a491b..f0f6cd0 100644
--- a/src/main/gnome-shell/gdm3-light.css
+++ b/src/main/gnome-shell/gdm3-light.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);
@@ -1627,16 +1627,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;
@@ -1748,7 +1738,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;
 }
@@ -1766,6 +1768,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.css b/src/main/gnome-shell/gnome-shell-dark-solid.css
index 211d9a7..ce37ea8 100644
--- a/src/main/gnome-shell/gnome-shell-dark-solid.css
+++ b/src/main/gnome-shell/gnome-shell-dark-solid.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);
@@ -3294,16 +3294,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 +3405,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 +3435,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.css b/src/main/gnome-shell/gnome-shell-dark.css
index 8ec1ceb..0c050fd 100644
--- a/src/main/gnome-shell/gnome-shell-dark.css
+++ b/src/main/gnome-shell/gnome-shell-dark.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);
@@ -3294,16 +3294,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 +3405,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 +3435,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.css b/src/main/gnome-shell/gnome-shell-light-solid.css
index a4397f8..3be3c22 100644
--- a/src/main/gnome-shell/gnome-shell-light-solid.css
+++ b/src/main/gnome-shell/gnome-shell-light-solid.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);
@@ -3298,16 +3298,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 +3409,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 +3439,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.css b/src/main/gnome-shell/gnome-shell-light.css
index a29cfe3..7fd1c75 100644
--- a/src/main/gnome-shell/gnome-shell-light.css
+++ b/src/main/gnome-shell/gnome-shell-light.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);
@@ -3294,16 +3294,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;
@@ -3415,7 +3405,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;
 }
@@ -3433,6 +3435,7 @@ StEntry StLabel.hint-text {
   transition-duration: 0ms;
   min-height: 28px;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: 6px;
 }
 
diff --git a/src/sass/gnome-shell/widgets/_popovers.scss b/src/sass/gnome-shell/widgets/_popovers.scss
index c865667..d25f244 100644
--- a/src/sass/gnome-shell/widgets/_popovers.scss
+++ b/src/sass/gnome-shell/widgets/_popovers.scss
@@ -128,17 +128,6 @@ $popop_menuitem_radius: $wm_radius - 4px;
   }
 }
 
-.candidate-popup-boxpointer {
-  -arrow-border-radius: 2px;
-  -arrow-background-color: $dialog_bg_color;
-  -arrow-border-width: 0;
-  -arrow-border-color: transparent;
-  -arrow-base: 5px;
-  -arrow-rise: 5px;
-  background-color: transparent;
-  @extend %theme_dialogs;
-}
-
 .popup-separator-menu-item {
   margin: 0 0;
   padding: 0 0;
@@ -243,7 +232,20 @@ $popop_menuitem_radius: $wm_radius - 4px;
 }
 
 // IBus Candidate Popup
+.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 {
+  @extend %theme_dialogs;
+  box-shadow: 0 8px 16px 0 rgba(black, 0.25);
+  border: 1px solid if($variant=='light', rgba(black, 0), rgba(black, 0.75));
   padding: 8px;
   spacing: 0;
 }
@@ -258,6 +260,7 @@ $popop_menuitem_radius: $wm_radius - 4px;
   transition-duration: 0ms; // FIXME: needs more natural transitions
   min-height: $menuitem_size;
   padding: 0 8px;
+  margin-right: 2px;
   border-radius: $bt_radius;
   &:hover { background-color: $divider_color; color: $fg_color; }
   &:active { background-color: $track_color; color: $fg_color; }