diff --git a/src/main/gnome-shell/gdm3-dark-blue.css b/src/main/gnome-shell/gdm3-dark-blue.css
index 4e7bca8a..4d976cf3 100644
--- a/src/main/gnome-shell/gdm3-dark-blue.css
+++ b/src/main/gnome-shell/gdm3-dark-blue.css
@@ -1739,12 +1739,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #999999;
 }
 
@@ -1754,8 +1755,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -1775,35 +1775,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
diff --git a/src/main/gnome-shell/gdm3-dark-green.css b/src/main/gnome-shell/gdm3-dark-green.css
index 6be5aaec..5cc0735f 100644
--- a/src/main/gnome-shell/gdm3-dark-green.css
+++ b/src/main/gnome-shell/gdm3-dark-green.css
@@ -1739,12 +1739,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #999999;
 }
 
@@ -1754,8 +1755,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -1775,35 +1775,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
diff --git a/src/main/gnome-shell/gdm3-dark-grey.css b/src/main/gnome-shell/gdm3-dark-grey.css
index d72be165..f0700bb1 100644
--- a/src/main/gnome-shell/gdm3-dark-grey.css
+++ b/src/main/gnome-shell/gdm3-dark-grey.css
@@ -1739,12 +1739,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #999999;
 }
 
@@ -1754,8 +1755,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -1775,35 +1775,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
diff --git a/src/main/gnome-shell/gdm3-dark-orange.css b/src/main/gnome-shell/gdm3-dark-orange.css
index ab3fca09..2c017791 100644
--- a/src/main/gnome-shell/gdm3-dark-orange.css
+++ b/src/main/gnome-shell/gdm3-dark-orange.css
@@ -1739,12 +1739,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #999999;
 }
 
@@ -1754,8 +1755,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -1775,35 +1775,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
diff --git a/src/main/gnome-shell/gdm3-dark-pink.css b/src/main/gnome-shell/gdm3-dark-pink.css
index 6a122eb4..9d49711f 100644
--- a/src/main/gnome-shell/gdm3-dark-pink.css
+++ b/src/main/gnome-shell/gdm3-dark-pink.css
@@ -1739,12 +1739,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #999999;
 }
 
@@ -1754,8 +1755,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -1775,35 +1775,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
diff --git a/src/main/gnome-shell/gdm3-dark-purple.css b/src/main/gnome-shell/gdm3-dark-purple.css
index 6cf25ec4..01849016 100644
--- a/src/main/gnome-shell/gdm3-dark-purple.css
+++ b/src/main/gnome-shell/gdm3-dark-purple.css
@@ -1739,12 +1739,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #999999;
 }
 
@@ -1754,8 +1755,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -1775,35 +1775,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
diff --git a/src/main/gnome-shell/gdm3-dark-red.css b/src/main/gnome-shell/gdm3-dark-red.css
index 6f99de71..f2db8033 100644
--- a/src/main/gnome-shell/gdm3-dark-red.css
+++ b/src/main/gnome-shell/gdm3-dark-red.css
@@ -1739,12 +1739,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #999999;
 }
 
@@ -1754,8 +1755,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -1775,35 +1775,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
diff --git a/src/main/gnome-shell/gdm3-dark-yellow.css b/src/main/gnome-shell/gdm3-dark-yellow.css
index bb5eca82..35c00f2d 100644
--- a/src/main/gnome-shell/gdm3-dark-yellow.css
+++ b/src/main/gnome-shell/gdm3-dark-yellow.css
@@ -1739,12 +1739,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #999999;
 }
 
@@ -1754,8 +1755,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -1775,35 +1775,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
diff --git a/src/main/gnome-shell/gdm3-dark.css b/src/main/gnome-shell/gdm3-dark.css
index 287c36d5..0ef11187 100644
--- a/src/main/gnome-shell/gdm3-dark.css
+++ b/src/main/gnome-shell/gdm3-dark.css
@@ -1739,12 +1739,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #999999;
 }
 
@@ -1754,8 +1755,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -1775,35 +1775,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
diff --git a/src/main/gnome-shell/gdm3-light-blue.css b/src/main/gnome-shell/gdm3-light-blue.css
index 5c925e2c..dee0e895 100644
--- a/src/main/gnome-shell/gdm3-light-blue.css
+++ b/src/main/gnome-shell/gdm3-light-blue.css
@@ -1739,12 +1739,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #565656;
 }
 
@@ -1754,8 +1755,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -1775,35 +1775,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
diff --git a/src/main/gnome-shell/gdm3-light-green.css b/src/main/gnome-shell/gdm3-light-green.css
index 7423947f..2e62ccca 100644
--- a/src/main/gnome-shell/gdm3-light-green.css
+++ b/src/main/gnome-shell/gdm3-light-green.css
@@ -1739,12 +1739,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #565656;
 }
 
@@ -1754,8 +1755,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -1775,35 +1775,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
diff --git a/src/main/gnome-shell/gdm3-light-grey.css b/src/main/gnome-shell/gdm3-light-grey.css
index 977f774a..1a87b260 100644
--- a/src/main/gnome-shell/gdm3-light-grey.css
+++ b/src/main/gnome-shell/gdm3-light-grey.css
@@ -1739,12 +1739,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #565656;
 }
 
@@ -1754,8 +1755,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -1775,35 +1775,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
diff --git a/src/main/gnome-shell/gdm3-light-orange.css b/src/main/gnome-shell/gdm3-light-orange.css
index 9cc441b2..7195d5e8 100644
--- a/src/main/gnome-shell/gdm3-light-orange.css
+++ b/src/main/gnome-shell/gdm3-light-orange.css
@@ -1739,12 +1739,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #565656;
 }
 
@@ -1754,8 +1755,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -1775,35 +1775,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
diff --git a/src/main/gnome-shell/gdm3-light-pink.css b/src/main/gnome-shell/gdm3-light-pink.css
index e62627bc..d8d3f510 100644
--- a/src/main/gnome-shell/gdm3-light-pink.css
+++ b/src/main/gnome-shell/gdm3-light-pink.css
@@ -1739,12 +1739,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #565656;
 }
 
@@ -1754,8 +1755,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -1775,35 +1775,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
diff --git a/src/main/gnome-shell/gdm3-light-purple.css b/src/main/gnome-shell/gdm3-light-purple.css
index dd327a58..212cf9c8 100644
--- a/src/main/gnome-shell/gdm3-light-purple.css
+++ b/src/main/gnome-shell/gdm3-light-purple.css
@@ -1739,12 +1739,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #565656;
 }
 
@@ -1754,8 +1755,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -1775,35 +1775,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
diff --git a/src/main/gnome-shell/gdm3-light-red.css b/src/main/gnome-shell/gdm3-light-red.css
index 3eaedc9f..7a862feb 100644
--- a/src/main/gnome-shell/gdm3-light-red.css
+++ b/src/main/gnome-shell/gdm3-light-red.css
@@ -1739,12 +1739,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #565656;
 }
 
@@ -1754,8 +1755,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -1775,35 +1775,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
diff --git a/src/main/gnome-shell/gdm3-light-yellow.css b/src/main/gnome-shell/gdm3-light-yellow.css
index c509ac38..e02912a2 100644
--- a/src/main/gnome-shell/gdm3-light-yellow.css
+++ b/src/main/gnome-shell/gdm3-light-yellow.css
@@ -1739,12 +1739,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #565656;
 }
 
@@ -1754,8 +1755,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -1775,35 +1775,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
diff --git a/src/main/gnome-shell/gdm3-light.css b/src/main/gnome-shell/gdm3-light.css
index 95cffcf2..0e9f3509 100644
--- a/src/main/gnome-shell/gdm3-light.css
+++ b/src/main/gnome-shell/gdm3-light.css
@@ -1739,12 +1739,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #565656;
 }
 
@@ -1754,8 +1755,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -1775,35 +1775,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
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 94043d29..7c40aa2d 100644
--- a/src/main/gnome-shell/gnome-shell-dark-alt-blue.css
+++ b/src/main/gnome-shell/gnome-shell-dark-alt-blue.css
@@ -2800,7 +2800,6 @@ StEntry StLabel.hint-text {
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
 
 .app-folder-dialog .folder-name-container .folder-name-entry:focus, .search-entry:focus {
@@ -3406,12 +3405,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #999999;
 }
 
@@ -3421,8 +3421,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -3442,35 +3441,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
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 c7723dcd..c4381b60 100644
--- a/src/main/gnome-shell/gnome-shell-dark-alt-green.css
+++ b/src/main/gnome-shell/gnome-shell-dark-alt-green.css
@@ -2800,7 +2800,6 @@ StEntry StLabel.hint-text {
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
 
 .app-folder-dialog .folder-name-container .folder-name-entry:focus, .search-entry:focus {
@@ -3406,12 +3405,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #999999;
 }
 
@@ -3421,8 +3421,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -3442,35 +3441,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
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 445bca80..91a2e284 100644
--- a/src/main/gnome-shell/gnome-shell-dark-alt-grey.css
+++ b/src/main/gnome-shell/gnome-shell-dark-alt-grey.css
@@ -2800,7 +2800,6 @@ StEntry StLabel.hint-text {
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
 
 .app-folder-dialog .folder-name-container .folder-name-entry:focus, .search-entry:focus {
@@ -3406,12 +3405,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #999999;
 }
 
@@ -3421,8 +3421,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -3442,35 +3441,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
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 a30828f6..f9d95c18 100644
--- a/src/main/gnome-shell/gnome-shell-dark-alt-orange.css
+++ b/src/main/gnome-shell/gnome-shell-dark-alt-orange.css
@@ -2800,7 +2800,6 @@ StEntry StLabel.hint-text {
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
 
 .app-folder-dialog .folder-name-container .folder-name-entry:focus, .search-entry:focus {
@@ -3406,12 +3405,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #999999;
 }
 
@@ -3421,8 +3421,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -3442,35 +3441,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
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 91cbc6ac..ff598ddc 100644
--- a/src/main/gnome-shell/gnome-shell-dark-alt-pink.css
+++ b/src/main/gnome-shell/gnome-shell-dark-alt-pink.css
@@ -2800,7 +2800,6 @@ StEntry StLabel.hint-text {
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
 
 .app-folder-dialog .folder-name-container .folder-name-entry:focus, .search-entry:focus {
@@ -3406,12 +3405,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #999999;
 }
 
@@ -3421,8 +3421,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -3442,35 +3441,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
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 5270fb50..da9a93d2 100644
--- a/src/main/gnome-shell/gnome-shell-dark-alt-purple.css
+++ b/src/main/gnome-shell/gnome-shell-dark-alt-purple.css
@@ -2800,7 +2800,6 @@ StEntry StLabel.hint-text {
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
 
 .app-folder-dialog .folder-name-container .folder-name-entry:focus, .search-entry:focus {
@@ -3406,12 +3405,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #999999;
 }
 
@@ -3421,8 +3421,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -3442,35 +3441,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
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 a63f996c..b01b0178 100644
--- a/src/main/gnome-shell/gnome-shell-dark-alt-red.css
+++ b/src/main/gnome-shell/gnome-shell-dark-alt-red.css
@@ -2800,7 +2800,6 @@ StEntry StLabel.hint-text {
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
 
 .app-folder-dialog .folder-name-container .folder-name-entry:focus, .search-entry:focus {
@@ -3406,12 +3405,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #999999;
 }
 
@@ -3421,8 +3421,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -3442,35 +3441,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
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 78033f62..eb187157 100644
--- a/src/main/gnome-shell/gnome-shell-dark-alt-yellow.css
+++ b/src/main/gnome-shell/gnome-shell-dark-alt-yellow.css
@@ -2800,7 +2800,6 @@ StEntry StLabel.hint-text {
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
 
 .app-folder-dialog .folder-name-container .folder-name-entry:focus, .search-entry:focus {
@@ -3406,12 +3405,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #999999;
 }
 
@@ -3421,8 +3421,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -3442,35 +3441,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
diff --git a/src/main/gnome-shell/gnome-shell-dark-alt.css b/src/main/gnome-shell/gnome-shell-dark-alt.css
index d222631c..4047219a 100644
--- a/src/main/gnome-shell/gnome-shell-dark-alt.css
+++ b/src/main/gnome-shell/gnome-shell-dark-alt.css
@@ -2800,7 +2800,6 @@ StEntry StLabel.hint-text {
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
 
 .app-folder-dialog .folder-name-container .folder-name-entry:focus, .search-entry:focus {
@@ -3406,12 +3405,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #999999;
 }
 
@@ -3421,8 +3421,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -3442,35 +3441,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
diff --git a/src/main/gnome-shell/gnome-shell-dark-blue.css b/src/main/gnome-shell/gnome-shell-dark-blue.css
index 94043d29..7c40aa2d 100644
--- a/src/main/gnome-shell/gnome-shell-dark-blue.css
+++ b/src/main/gnome-shell/gnome-shell-dark-blue.css
@@ -2800,7 +2800,6 @@ StEntry StLabel.hint-text {
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
 
 .app-folder-dialog .folder-name-container .folder-name-entry:focus, .search-entry:focus {
@@ -3406,12 +3405,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #999999;
 }
 
@@ -3421,8 +3421,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -3442,35 +3441,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
diff --git a/src/main/gnome-shell/gnome-shell-dark-green.css b/src/main/gnome-shell/gnome-shell-dark-green.css
index c7723dcd..c4381b60 100644
--- a/src/main/gnome-shell/gnome-shell-dark-green.css
+++ b/src/main/gnome-shell/gnome-shell-dark-green.css
@@ -2800,7 +2800,6 @@ StEntry StLabel.hint-text {
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
 
 .app-folder-dialog .folder-name-container .folder-name-entry:focus, .search-entry:focus {
@@ -3406,12 +3405,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #999999;
 }
 
@@ -3421,8 +3421,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -3442,35 +3441,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
diff --git a/src/main/gnome-shell/gnome-shell-dark-grey.css b/src/main/gnome-shell/gnome-shell-dark-grey.css
index 445bca80..91a2e284 100644
--- a/src/main/gnome-shell/gnome-shell-dark-grey.css
+++ b/src/main/gnome-shell/gnome-shell-dark-grey.css
@@ -2800,7 +2800,6 @@ StEntry StLabel.hint-text {
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
 
 .app-folder-dialog .folder-name-container .folder-name-entry:focus, .search-entry:focus {
@@ -3406,12 +3405,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #999999;
 }
 
@@ -3421,8 +3421,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -3442,35 +3441,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
diff --git a/src/main/gnome-shell/gnome-shell-dark-orange.css b/src/main/gnome-shell/gnome-shell-dark-orange.css
index a30828f6..f9d95c18 100644
--- a/src/main/gnome-shell/gnome-shell-dark-orange.css
+++ b/src/main/gnome-shell/gnome-shell-dark-orange.css
@@ -2800,7 +2800,6 @@ StEntry StLabel.hint-text {
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
 
 .app-folder-dialog .folder-name-container .folder-name-entry:focus, .search-entry:focus {
@@ -3406,12 +3405,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #999999;
 }
 
@@ -3421,8 +3421,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -3442,35 +3441,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
diff --git a/src/main/gnome-shell/gnome-shell-dark-pink.css b/src/main/gnome-shell/gnome-shell-dark-pink.css
index 91cbc6ac..ff598ddc 100644
--- a/src/main/gnome-shell/gnome-shell-dark-pink.css
+++ b/src/main/gnome-shell/gnome-shell-dark-pink.css
@@ -2800,7 +2800,6 @@ StEntry StLabel.hint-text {
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
 
 .app-folder-dialog .folder-name-container .folder-name-entry:focus, .search-entry:focus {
@@ -3406,12 +3405,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #999999;
 }
 
@@ -3421,8 +3421,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -3442,35 +3441,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
diff --git a/src/main/gnome-shell/gnome-shell-dark-purple.css b/src/main/gnome-shell/gnome-shell-dark-purple.css
index 5270fb50..da9a93d2 100644
--- a/src/main/gnome-shell/gnome-shell-dark-purple.css
+++ b/src/main/gnome-shell/gnome-shell-dark-purple.css
@@ -2800,7 +2800,6 @@ StEntry StLabel.hint-text {
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
 
 .app-folder-dialog .folder-name-container .folder-name-entry:focus, .search-entry:focus {
@@ -3406,12 +3405,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #999999;
 }
 
@@ -3421,8 +3421,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -3442,35 +3441,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
diff --git a/src/main/gnome-shell/gnome-shell-dark-red.css b/src/main/gnome-shell/gnome-shell-dark-red.css
index a63f996c..b01b0178 100644
--- a/src/main/gnome-shell/gnome-shell-dark-red.css
+++ b/src/main/gnome-shell/gnome-shell-dark-red.css
@@ -2800,7 +2800,6 @@ StEntry StLabel.hint-text {
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
 
 .app-folder-dialog .folder-name-container .folder-name-entry:focus, .search-entry:focus {
@@ -3406,12 +3405,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #999999;
 }
 
@@ -3421,8 +3421,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -3442,35 +3441,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
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 df8e7a7d..263a54d8 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
@@ -2800,7 +2800,6 @@ StEntry StLabel.hint-text {
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
 
 .app-folder-dialog .folder-name-container .folder-name-entry:focus, .search-entry:focus {
@@ -3406,12 +3405,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #999999;
 }
 
@@ -3421,8 +3421,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -3442,35 +3441,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
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 84bd2982..8431f8fc 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
@@ -2800,7 +2800,6 @@ StEntry StLabel.hint-text {
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
 
 .app-folder-dialog .folder-name-container .folder-name-entry:focus, .search-entry:focus {
@@ -3406,12 +3405,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #999999;
 }
 
@@ -3421,8 +3421,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -3442,35 +3441,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
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 c6480a49..48c21234 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
@@ -2800,7 +2800,6 @@ StEntry StLabel.hint-text {
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
 
 .app-folder-dialog .folder-name-container .folder-name-entry:focus, .search-entry:focus {
@@ -3406,12 +3405,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #999999;
 }
 
@@ -3421,8 +3421,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -3442,35 +3441,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
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 04900b23..d6e4462f 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
@@ -2800,7 +2800,6 @@ StEntry StLabel.hint-text {
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
 
 .app-folder-dialog .folder-name-container .folder-name-entry:focus, .search-entry:focus {
@@ -3406,12 +3405,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #999999;
 }
 
@@ -3421,8 +3421,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -3442,35 +3441,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
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 63760ec9..d23ec8f6 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
@@ -2800,7 +2800,6 @@ StEntry StLabel.hint-text {
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
 
 .app-folder-dialog .folder-name-container .folder-name-entry:focus, .search-entry:focus {
@@ -3406,12 +3405,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #999999;
 }
 
@@ -3421,8 +3421,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -3442,35 +3441,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
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 e1394999..80f373cf 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
@@ -2800,7 +2800,6 @@ StEntry StLabel.hint-text {
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
 
 .app-folder-dialog .folder-name-container .folder-name-entry:focus, .search-entry:focus {
@@ -3406,12 +3405,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #999999;
 }
 
@@ -3421,8 +3421,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -3442,35 +3441,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
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 7aee02d0..63f0699f 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
@@ -2800,7 +2800,6 @@ StEntry StLabel.hint-text {
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
 
 .app-folder-dialog .folder-name-container .folder-name-entry:focus, .search-entry:focus {
@@ -3406,12 +3405,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #999999;
 }
 
@@ -3421,8 +3421,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -3442,35 +3441,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
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 aa8ac19b..9f27e65b 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
@@ -2800,7 +2800,6 @@ StEntry StLabel.hint-text {
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
 
 .app-folder-dialog .folder-name-container .folder-name-entry:focus, .search-entry:focus {
@@ -3406,12 +3405,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #999999;
 }
 
@@ -3421,8 +3421,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -3442,35 +3441,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
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 d049f9a4..1900123e 100644
--- a/src/main/gnome-shell/gnome-shell-dark-solid-alt.css
+++ b/src/main/gnome-shell/gnome-shell-dark-solid-alt.css
@@ -2800,7 +2800,6 @@ StEntry StLabel.hint-text {
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
 
 .app-folder-dialog .folder-name-container .folder-name-entry:focus, .search-entry:focus {
@@ -3406,12 +3405,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #999999;
 }
 
@@ -3421,8 +3421,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -3442,35 +3441,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
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 df8e7a7d..263a54d8 100644
--- a/src/main/gnome-shell/gnome-shell-dark-solid-blue.css
+++ b/src/main/gnome-shell/gnome-shell-dark-solid-blue.css
@@ -2800,7 +2800,6 @@ StEntry StLabel.hint-text {
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
 
 .app-folder-dialog .folder-name-container .folder-name-entry:focus, .search-entry:focus {
@@ -3406,12 +3405,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #999999;
 }
 
@@ -3421,8 +3421,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -3442,35 +3441,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
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 84bd2982..8431f8fc 100644
--- a/src/main/gnome-shell/gnome-shell-dark-solid-green.css
+++ b/src/main/gnome-shell/gnome-shell-dark-solid-green.css
@@ -2800,7 +2800,6 @@ StEntry StLabel.hint-text {
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
 
 .app-folder-dialog .folder-name-container .folder-name-entry:focus, .search-entry:focus {
@@ -3406,12 +3405,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #999999;
 }
 
@@ -3421,8 +3421,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -3442,35 +3441,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
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 c6480a49..48c21234 100644
--- a/src/main/gnome-shell/gnome-shell-dark-solid-grey.css
+++ b/src/main/gnome-shell/gnome-shell-dark-solid-grey.css
@@ -2800,7 +2800,6 @@ StEntry StLabel.hint-text {
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
 
 .app-folder-dialog .folder-name-container .folder-name-entry:focus, .search-entry:focus {
@@ -3406,12 +3405,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #999999;
 }
 
@@ -3421,8 +3421,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -3442,35 +3441,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
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 04900b23..d6e4462f 100644
--- a/src/main/gnome-shell/gnome-shell-dark-solid-orange.css
+++ b/src/main/gnome-shell/gnome-shell-dark-solid-orange.css
@@ -2800,7 +2800,6 @@ StEntry StLabel.hint-text {
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
 
 .app-folder-dialog .folder-name-container .folder-name-entry:focus, .search-entry:focus {
@@ -3406,12 +3405,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #999999;
 }
 
@@ -3421,8 +3421,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -3442,35 +3441,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
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 63760ec9..d23ec8f6 100644
--- a/src/main/gnome-shell/gnome-shell-dark-solid-pink.css
+++ b/src/main/gnome-shell/gnome-shell-dark-solid-pink.css
@@ -2800,7 +2800,6 @@ StEntry StLabel.hint-text {
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
 
 .app-folder-dialog .folder-name-container .folder-name-entry:focus, .search-entry:focus {
@@ -3406,12 +3405,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #999999;
 }
 
@@ -3421,8 +3421,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -3442,35 +3441,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
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 e1394999..80f373cf 100644
--- a/src/main/gnome-shell/gnome-shell-dark-solid-purple.css
+++ b/src/main/gnome-shell/gnome-shell-dark-solid-purple.css
@@ -2800,7 +2800,6 @@ StEntry StLabel.hint-text {
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
 
 .app-folder-dialog .folder-name-container .folder-name-entry:focus, .search-entry:focus {
@@ -3406,12 +3405,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #999999;
 }
 
@@ -3421,8 +3421,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -3442,35 +3441,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
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 7aee02d0..63f0699f 100644
--- a/src/main/gnome-shell/gnome-shell-dark-solid-red.css
+++ b/src/main/gnome-shell/gnome-shell-dark-solid-red.css
@@ -2800,7 +2800,6 @@ StEntry StLabel.hint-text {
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
 
 .app-folder-dialog .folder-name-container .folder-name-entry:focus, .search-entry:focus {
@@ -3406,12 +3405,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #999999;
 }
 
@@ -3421,8 +3421,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -3442,35 +3441,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
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 aa8ac19b..9f27e65b 100644
--- a/src/main/gnome-shell/gnome-shell-dark-solid-yellow.css
+++ b/src/main/gnome-shell/gnome-shell-dark-solid-yellow.css
@@ -2800,7 +2800,6 @@ StEntry StLabel.hint-text {
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
 
 .app-folder-dialog .folder-name-container .folder-name-entry:focus, .search-entry:focus {
@@ -3406,12 +3405,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #999999;
 }
 
@@ -3421,8 +3421,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -3442,35 +3441,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
diff --git a/src/main/gnome-shell/gnome-shell-dark-solid.css b/src/main/gnome-shell/gnome-shell-dark-solid.css
index d049f9a4..1900123e 100644
--- a/src/main/gnome-shell/gnome-shell-dark-solid.css
+++ b/src/main/gnome-shell/gnome-shell-dark-solid.css
@@ -2800,7 +2800,6 @@ StEntry StLabel.hint-text {
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
 
 .app-folder-dialog .folder-name-container .folder-name-entry:focus, .search-entry:focus {
@@ -3406,12 +3405,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #999999;
 }
 
@@ -3421,8 +3421,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -3442,35 +3441,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
diff --git a/src/main/gnome-shell/gnome-shell-dark-yellow.css b/src/main/gnome-shell/gnome-shell-dark-yellow.css
index 78033f62..eb187157 100644
--- a/src/main/gnome-shell/gnome-shell-dark-yellow.css
+++ b/src/main/gnome-shell/gnome-shell-dark-yellow.css
@@ -2800,7 +2800,6 @@ StEntry StLabel.hint-text {
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
 
 .app-folder-dialog .folder-name-container .folder-name-entry:focus, .search-entry:focus {
@@ -3406,12 +3405,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #999999;
 }
 
@@ -3421,8 +3421,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -3442,35 +3441,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
diff --git a/src/main/gnome-shell/gnome-shell-dark.css b/src/main/gnome-shell/gnome-shell-dark.css
index d222631c..4047219a 100644
--- a/src/main/gnome-shell/gnome-shell-dark.css
+++ b/src/main/gnome-shell/gnome-shell-dark.css
@@ -2800,7 +2800,6 @@ StEntry StLabel.hint-text {
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
 
 .app-folder-dialog .folder-name-container .folder-name-entry:focus, .search-entry:focus {
@@ -3406,12 +3405,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #999999;
 }
 
@@ -3421,8 +3421,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -3442,35 +3441,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
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 54f808e9..9a280191 100644
--- a/src/main/gnome-shell/gnome-shell-light-alt-blue.css
+++ b/src/main/gnome-shell/gnome-shell-light-alt-blue.css
@@ -2800,7 +2800,6 @@ StEntry StLabel.hint-text {
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
 
 .app-folder-dialog .folder-name-container .folder-name-entry:focus, .search-entry:focus {
@@ -3410,12 +3409,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #565656;
 }
 
@@ -3425,8 +3425,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -3446,35 +3445,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
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 cf00b82d..b4dbc0e9 100644
--- a/src/main/gnome-shell/gnome-shell-light-alt-green.css
+++ b/src/main/gnome-shell/gnome-shell-light-alt-green.css
@@ -2800,7 +2800,6 @@ StEntry StLabel.hint-text {
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
 
 .app-folder-dialog .folder-name-container .folder-name-entry:focus, .search-entry:focus {
@@ -3410,12 +3409,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #565656;
 }
 
@@ -3425,8 +3425,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -3446,35 +3445,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
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 1eca8da8..30ab8048 100644
--- a/src/main/gnome-shell/gnome-shell-light-alt-grey.css
+++ b/src/main/gnome-shell/gnome-shell-light-alt-grey.css
@@ -2800,7 +2800,6 @@ StEntry StLabel.hint-text {
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
 
 .app-folder-dialog .folder-name-container .folder-name-entry:focus, .search-entry:focus {
@@ -3410,12 +3409,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #565656;
 }
 
@@ -3425,8 +3425,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -3446,35 +3445,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
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 6fdf20dd..aba01e02 100644
--- a/src/main/gnome-shell/gnome-shell-light-alt-orange.css
+++ b/src/main/gnome-shell/gnome-shell-light-alt-orange.css
@@ -2800,7 +2800,6 @@ StEntry StLabel.hint-text {
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
 
 .app-folder-dialog .folder-name-container .folder-name-entry:focus, .search-entry:focus {
@@ -3410,12 +3409,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #565656;
 }
 
@@ -3425,8 +3425,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -3446,35 +3445,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
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 e8cb9f38..c86e1f64 100644
--- a/src/main/gnome-shell/gnome-shell-light-alt-pink.css
+++ b/src/main/gnome-shell/gnome-shell-light-alt-pink.css
@@ -2800,7 +2800,6 @@ StEntry StLabel.hint-text {
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
 
 .app-folder-dialog .folder-name-container .folder-name-entry:focus, .search-entry:focus {
@@ -3410,12 +3409,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #565656;
 }
 
@@ -3425,8 +3425,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -3446,35 +3445,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
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 492a3356..6d97407e 100644
--- a/src/main/gnome-shell/gnome-shell-light-alt-purple.css
+++ b/src/main/gnome-shell/gnome-shell-light-alt-purple.css
@@ -2800,7 +2800,6 @@ StEntry StLabel.hint-text {
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
 
 .app-folder-dialog .folder-name-container .folder-name-entry:focus, .search-entry:focus {
@@ -3410,12 +3409,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #565656;
 }
 
@@ -3425,8 +3425,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -3446,35 +3445,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
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 a29d54dc..4eaa23a3 100644
--- a/src/main/gnome-shell/gnome-shell-light-alt-red.css
+++ b/src/main/gnome-shell/gnome-shell-light-alt-red.css
@@ -2800,7 +2800,6 @@ StEntry StLabel.hint-text {
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
 
 .app-folder-dialog .folder-name-container .folder-name-entry:focus, .search-entry:focus {
@@ -3410,12 +3409,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #565656;
 }
 
@@ -3425,8 +3425,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -3446,35 +3445,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
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 8bfdb3e8..0624ae19 100644
--- a/src/main/gnome-shell/gnome-shell-light-alt-yellow.css
+++ b/src/main/gnome-shell/gnome-shell-light-alt-yellow.css
@@ -2800,7 +2800,6 @@ StEntry StLabel.hint-text {
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
 
 .app-folder-dialog .folder-name-container .folder-name-entry:focus, .search-entry:focus {
@@ -3410,12 +3409,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #565656;
 }
 
@@ -3425,8 +3425,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -3446,35 +3445,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
diff --git a/src/main/gnome-shell/gnome-shell-light-alt.css b/src/main/gnome-shell/gnome-shell-light-alt.css
index 5c672b03..ba92996e 100644
--- a/src/main/gnome-shell/gnome-shell-light-alt.css
+++ b/src/main/gnome-shell/gnome-shell-light-alt.css
@@ -2800,7 +2800,6 @@ StEntry StLabel.hint-text {
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
 
 .app-folder-dialog .folder-name-container .folder-name-entry:focus, .search-entry:focus {
@@ -3410,12 +3409,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #565656;
 }
 
@@ -3425,8 +3425,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -3446,35 +3445,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
diff --git a/src/main/gnome-shell/gnome-shell-light-blue.css b/src/main/gnome-shell/gnome-shell-light-blue.css
index fd049161..02f8a69f 100644
--- a/src/main/gnome-shell/gnome-shell-light-blue.css
+++ b/src/main/gnome-shell/gnome-shell-light-blue.css
@@ -2800,7 +2800,6 @@ StEntry StLabel.hint-text {
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
 
 .app-folder-dialog .folder-name-container .folder-name-entry:focus, .search-entry:focus {
@@ -3406,12 +3405,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #565656;
 }
 
@@ -3421,8 +3421,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -3442,35 +3441,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
diff --git a/src/main/gnome-shell/gnome-shell-light-green.css b/src/main/gnome-shell/gnome-shell-light-green.css
index 19dd6f4c..b6fb3740 100644
--- a/src/main/gnome-shell/gnome-shell-light-green.css
+++ b/src/main/gnome-shell/gnome-shell-light-green.css
@@ -2800,7 +2800,6 @@ StEntry StLabel.hint-text {
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
 
 .app-folder-dialog .folder-name-container .folder-name-entry:focus, .search-entry:focus {
@@ -3406,12 +3405,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #565656;
 }
 
@@ -3421,8 +3421,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -3442,35 +3441,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
diff --git a/src/main/gnome-shell/gnome-shell-light-grey.css b/src/main/gnome-shell/gnome-shell-light-grey.css
index 5f2892a3..f7f8a4bc 100644
--- a/src/main/gnome-shell/gnome-shell-light-grey.css
+++ b/src/main/gnome-shell/gnome-shell-light-grey.css
@@ -2800,7 +2800,6 @@ StEntry StLabel.hint-text {
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
 
 .app-folder-dialog .folder-name-container .folder-name-entry:focus, .search-entry:focus {
@@ -3406,12 +3405,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #565656;
 }
 
@@ -3421,8 +3421,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -3442,35 +3441,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
diff --git a/src/main/gnome-shell/gnome-shell-light-orange.css b/src/main/gnome-shell/gnome-shell-light-orange.css
index db3de937..fb4caf0c 100644
--- a/src/main/gnome-shell/gnome-shell-light-orange.css
+++ b/src/main/gnome-shell/gnome-shell-light-orange.css
@@ -2800,7 +2800,6 @@ StEntry StLabel.hint-text {
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
 
 .app-folder-dialog .folder-name-container .folder-name-entry:focus, .search-entry:focus {
@@ -3406,12 +3405,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #565656;
 }
 
@@ -3421,8 +3421,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -3442,35 +3441,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
diff --git a/src/main/gnome-shell/gnome-shell-light-pink.css b/src/main/gnome-shell/gnome-shell-light-pink.css
index 0504f7a0..6fe644aa 100644
--- a/src/main/gnome-shell/gnome-shell-light-pink.css
+++ b/src/main/gnome-shell/gnome-shell-light-pink.css
@@ -2800,7 +2800,6 @@ StEntry StLabel.hint-text {
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
 
 .app-folder-dialog .folder-name-container .folder-name-entry:focus, .search-entry:focus {
@@ -3406,12 +3405,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #565656;
 }
 
@@ -3421,8 +3421,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -3442,35 +3441,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
diff --git a/src/main/gnome-shell/gnome-shell-light-purple.css b/src/main/gnome-shell/gnome-shell-light-purple.css
index 05adba53..ec4898fb 100644
--- a/src/main/gnome-shell/gnome-shell-light-purple.css
+++ b/src/main/gnome-shell/gnome-shell-light-purple.css
@@ -2800,7 +2800,6 @@ StEntry StLabel.hint-text {
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
 
 .app-folder-dialog .folder-name-container .folder-name-entry:focus, .search-entry:focus {
@@ -3406,12 +3405,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #565656;
 }
 
@@ -3421,8 +3421,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -3442,35 +3441,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
diff --git a/src/main/gnome-shell/gnome-shell-light-red.css b/src/main/gnome-shell/gnome-shell-light-red.css
index 52cfaf7a..84a74b26 100644
--- a/src/main/gnome-shell/gnome-shell-light-red.css
+++ b/src/main/gnome-shell/gnome-shell-light-red.css
@@ -2800,7 +2800,6 @@ StEntry StLabel.hint-text {
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
 
 .app-folder-dialog .folder-name-container .folder-name-entry:focus, .search-entry:focus {
@@ -3406,12 +3405,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #565656;
 }
 
@@ -3421,8 +3421,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -3442,35 +3441,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
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 cf1a9f9f..a6e57e6c 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
@@ -2800,7 +2800,6 @@ StEntry StLabel.hint-text {
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
 
 .app-folder-dialog .folder-name-container .folder-name-entry:focus, .search-entry:focus {
@@ -3410,12 +3409,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #565656;
 }
 
@@ -3425,8 +3425,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -3446,35 +3445,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
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 2147682d..bec84092 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
@@ -2800,7 +2800,6 @@ StEntry StLabel.hint-text {
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
 
 .app-folder-dialog .folder-name-container .folder-name-entry:focus, .search-entry:focus {
@@ -3410,12 +3409,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #565656;
 }
 
@@ -3425,8 +3425,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -3446,35 +3445,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
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 ac58ad8c..a5ba4e6a 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
@@ -2800,7 +2800,6 @@ StEntry StLabel.hint-text {
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
 
 .app-folder-dialog .folder-name-container .folder-name-entry:focus, .search-entry:focus {
@@ -3410,12 +3409,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #565656;
 }
 
@@ -3425,8 +3425,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -3446,35 +3445,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
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 7197bdf8..afc359c3 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
@@ -2800,7 +2800,6 @@ StEntry StLabel.hint-text {
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
 
 .app-folder-dialog .folder-name-container .folder-name-entry:focus, .search-entry:focus {
@@ -3410,12 +3409,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #565656;
 }
 
@@ -3425,8 +3425,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -3446,35 +3445,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
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 1c8faf24..5caa3be7 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
@@ -2800,7 +2800,6 @@ StEntry StLabel.hint-text {
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
 
 .app-folder-dialog .folder-name-container .folder-name-entry:focus, .search-entry:focus {
@@ -3410,12 +3409,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #565656;
 }
 
@@ -3425,8 +3425,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -3446,35 +3445,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
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 4caa7fcd..58bff9ad 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
@@ -2800,7 +2800,6 @@ StEntry StLabel.hint-text {
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
 
 .app-folder-dialog .folder-name-container .folder-name-entry:focus, .search-entry:focus {
@@ -3410,12 +3409,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #565656;
 }
 
@@ -3425,8 +3425,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -3446,35 +3445,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
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 f90f5b7c..27044c34 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
@@ -2800,7 +2800,6 @@ StEntry StLabel.hint-text {
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
 
 .app-folder-dialog .folder-name-container .folder-name-entry:focus, .search-entry:focus {
@@ -3410,12 +3409,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #565656;
 }
 
@@ -3425,8 +3425,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -3446,35 +3445,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
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 7197bdf8..afc359c3 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
@@ -2800,7 +2800,6 @@ StEntry StLabel.hint-text {
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
 
 .app-folder-dialog .folder-name-container .folder-name-entry:focus, .search-entry:focus {
@@ -3410,12 +3409,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #565656;
 }
 
@@ -3425,8 +3425,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -3446,35 +3445,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
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 7a24bfc8..3dc4add0 100644
--- a/src/main/gnome-shell/gnome-shell-light-solid-alt.css
+++ b/src/main/gnome-shell/gnome-shell-light-solid-alt.css
@@ -2800,7 +2800,6 @@ StEntry StLabel.hint-text {
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
 
 .app-folder-dialog .folder-name-container .folder-name-entry:focus, .search-entry:focus {
@@ -3410,12 +3409,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #565656;
 }
 
@@ -3425,8 +3425,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -3446,35 +3445,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
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 cf1a9f9f..a6e57e6c 100644
--- a/src/main/gnome-shell/gnome-shell-light-solid-blue.css
+++ b/src/main/gnome-shell/gnome-shell-light-solid-blue.css
@@ -2800,7 +2800,6 @@ StEntry StLabel.hint-text {
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
 
 .app-folder-dialog .folder-name-container .folder-name-entry:focus, .search-entry:focus {
@@ -3410,12 +3409,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #565656;
 }
 
@@ -3425,8 +3425,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -3446,35 +3445,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
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 2147682d..bec84092 100644
--- a/src/main/gnome-shell/gnome-shell-light-solid-green.css
+++ b/src/main/gnome-shell/gnome-shell-light-solid-green.css
@@ -2800,7 +2800,6 @@ StEntry StLabel.hint-text {
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
 
 .app-folder-dialog .folder-name-container .folder-name-entry:focus, .search-entry:focus {
@@ -3410,12 +3409,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #565656;
 }
 
@@ -3425,8 +3425,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -3446,35 +3445,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
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 ac58ad8c..a5ba4e6a 100644
--- a/src/main/gnome-shell/gnome-shell-light-solid-grey.css
+++ b/src/main/gnome-shell/gnome-shell-light-solid-grey.css
@@ -2800,7 +2800,6 @@ StEntry StLabel.hint-text {
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
 
 .app-folder-dialog .folder-name-container .folder-name-entry:focus, .search-entry:focus {
@@ -3410,12 +3409,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #565656;
 }
 
@@ -3425,8 +3425,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -3446,35 +3445,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
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 7197bdf8..afc359c3 100644
--- a/src/main/gnome-shell/gnome-shell-light-solid-orange.css
+++ b/src/main/gnome-shell/gnome-shell-light-solid-orange.css
@@ -2800,7 +2800,6 @@ StEntry StLabel.hint-text {
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
 
 .app-folder-dialog .folder-name-container .folder-name-entry:focus, .search-entry:focus {
@@ -3410,12 +3409,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #565656;
 }
 
@@ -3425,8 +3425,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -3446,35 +3445,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
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 1c8faf24..5caa3be7 100644
--- a/src/main/gnome-shell/gnome-shell-light-solid-pink.css
+++ b/src/main/gnome-shell/gnome-shell-light-solid-pink.css
@@ -2800,7 +2800,6 @@ StEntry StLabel.hint-text {
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
 
 .app-folder-dialog .folder-name-container .folder-name-entry:focus, .search-entry:focus {
@@ -3410,12 +3409,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #565656;
 }
 
@@ -3425,8 +3425,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -3446,35 +3445,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
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 4caa7fcd..58bff9ad 100644
--- a/src/main/gnome-shell/gnome-shell-light-solid-purple.css
+++ b/src/main/gnome-shell/gnome-shell-light-solid-purple.css
@@ -2800,7 +2800,6 @@ StEntry StLabel.hint-text {
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
 
 .app-folder-dialog .folder-name-container .folder-name-entry:focus, .search-entry:focus {
@@ -3410,12 +3409,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #565656;
 }
 
@@ -3425,8 +3425,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -3446,35 +3445,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
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 f90f5b7c..27044c34 100644
--- a/src/main/gnome-shell/gnome-shell-light-solid-red.css
+++ b/src/main/gnome-shell/gnome-shell-light-solid-red.css
@@ -2800,7 +2800,6 @@ StEntry StLabel.hint-text {
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
 
 .app-folder-dialog .folder-name-container .folder-name-entry:focus, .search-entry:focus {
@@ -3410,12 +3409,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #565656;
 }
 
@@ -3425,8 +3425,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -3446,35 +3445,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
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 0f8c1767..ea9502c7 100644
--- a/src/main/gnome-shell/gnome-shell-light-solid-yellow.css
+++ b/src/main/gnome-shell/gnome-shell-light-solid-yellow.css
@@ -2800,7 +2800,6 @@ StEntry StLabel.hint-text {
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
 
 .app-folder-dialog .folder-name-container .folder-name-entry:focus, .search-entry:focus {
@@ -3410,12 +3409,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #565656;
 }
 
@@ -3425,8 +3425,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -3446,35 +3445,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
diff --git a/src/main/gnome-shell/gnome-shell-light-solid.css b/src/main/gnome-shell/gnome-shell-light-solid.css
index 7a24bfc8..3dc4add0 100644
--- a/src/main/gnome-shell/gnome-shell-light-solid.css
+++ b/src/main/gnome-shell/gnome-shell-light-solid.css
@@ -2800,7 +2800,6 @@ StEntry StLabel.hint-text {
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
 
 .app-folder-dialog .folder-name-container .folder-name-entry:focus, .search-entry:focus {
@@ -3410,12 +3409,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #565656;
 }
 
@@ -3425,8 +3425,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -3446,35 +3445,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
diff --git a/src/main/gnome-shell/gnome-shell-light-yellow.css b/src/main/gnome-shell/gnome-shell-light-yellow.css
index 0d323d74..938f80e6 100644
--- a/src/main/gnome-shell/gnome-shell-light-yellow.css
+++ b/src/main/gnome-shell/gnome-shell-light-yellow.css
@@ -2800,7 +2800,6 @@ StEntry StLabel.hint-text {
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
 
 .app-folder-dialog .folder-name-container .folder-name-entry:focus, .search-entry:focus {
@@ -3406,12 +3405,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #565656;
 }
 
@@ -3421,8 +3421,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -3442,35 +3441,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
diff --git a/src/main/gnome-shell/gnome-shell-light.css b/src/main/gnome-shell/gnome-shell-light.css
index 83a58022..25a6b095 100644
--- a/src/main/gnome-shell/gnome-shell-light.css
+++ b/src/main/gnome-shell/gnome-shell-light.css
@@ -2800,7 +2800,6 @@ StEntry StLabel.hint-text {
   background-color: rgba(255, 255, 255, 0.12);
   border-radius: 8px;
   border-color: transparent;
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05);
 }
 
 .app-folder-dialog .folder-name-container .folder-name-entry:focus, .search-entry:focus {
@@ -3406,12 +3405,13 @@ StEntry StLabel.hint-text {
 .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;
+  margin: 2px 8px;
+  padding: 6px;
+  spacing: 4px;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: #565656;
 }
 
@@ -3421,8 +3421,7 @@ StEntry StLabel.hint-text {
 
 .candidate-box {
   transition-duration: 0ms;
-  min-height: 28px;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: 6px;
 }
@@ -3442,35 +3441,33 @@ StEntry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.85);
 }
 
+.candidate-box:last-child {
+  margin-right: 0;
+}
+
 .candidate-page-button-box {
-  height: 28px;
+  height: 2em;
 }
 
 .vertical .candidate-page-button-box {
-  padding-top: 0;
+  padding-top: 0.5em;
 }
 
 .horizontal .candidate-page-button-box {
-  padding-left: 0;
+  padding-left: 0.5em;
 }
 
 .candidate-page-button {
-  min-width: 28px;
-  min-height: 28px;
-  padding: 0;
-}
-
-.candidate-page-button-previous {
-  border-radius: 6px;
-  border-right-width: 0;
+  padding: 4px;
 }
 
+.candidate-page-button-previous,
 .candidate-page-button-next {
   border-radius: 6px;
 }
 
 .candidate-page-button-icon {
-  icon-size: 1.2307692308em;
+  icon-size: 1em;
 }
 
 .screen-shield-arrows {
diff --git a/src/main/gtk-3.0/gtk-dark-blue.css b/src/main/gtk-3.0/gtk-dark-blue.css
index 9068d9d4..ad50bad4 100644
--- a/src/main/gtk-3.0/gtk-dark-blue.css
+++ b/src/main/gtk-3.0/gtk-dark-blue.css
@@ -7255,7 +7255,8 @@ window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sideba
 
 .geary-main-window.background.csd stack#conversation_viewer,
 window#GearyMainWindow.background.csd stack#conversation_viewer {
-  border-bottom-right-radius: 12px;
+  background-color: #242424;
+  border-bottom-right-radius: 13px;
 }
 
 .geary-main-window.background.csd stack#conversation_viewer scrolledwindow.geary-conversation-scroller viewport.frame,
diff --git a/src/main/gtk-3.0/gtk-dark-green.css b/src/main/gtk-3.0/gtk-dark-green.css
index 468f6545..0ba83279 100644
--- a/src/main/gtk-3.0/gtk-dark-green.css
+++ b/src/main/gtk-3.0/gtk-dark-green.css
@@ -7255,7 +7255,8 @@ window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sideba
 
 .geary-main-window.background.csd stack#conversation_viewer,
 window#GearyMainWindow.background.csd stack#conversation_viewer {
-  border-bottom-right-radius: 12px;
+  background-color: #242424;
+  border-bottom-right-radius: 13px;
 }
 
 .geary-main-window.background.csd stack#conversation_viewer scrolledwindow.geary-conversation-scroller viewport.frame,
diff --git a/src/main/gtk-3.0/gtk-dark-grey.css b/src/main/gtk-3.0/gtk-dark-grey.css
index 2c969a55..7611f99c 100644
--- a/src/main/gtk-3.0/gtk-dark-grey.css
+++ b/src/main/gtk-3.0/gtk-dark-grey.css
@@ -7255,7 +7255,8 @@ window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sideba
 
 .geary-main-window.background.csd stack#conversation_viewer,
 window#GearyMainWindow.background.csd stack#conversation_viewer {
-  border-bottom-right-radius: 12px;
+  background-color: #242424;
+  border-bottom-right-radius: 13px;
 }
 
 .geary-main-window.background.csd stack#conversation_viewer scrolledwindow.geary-conversation-scroller viewport.frame,
diff --git a/src/main/gtk-3.0/gtk-dark-orange.css b/src/main/gtk-3.0/gtk-dark-orange.css
index ccce8e34..3e2583df 100644
--- a/src/main/gtk-3.0/gtk-dark-orange.css
+++ b/src/main/gtk-3.0/gtk-dark-orange.css
@@ -7255,7 +7255,8 @@ window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sideba
 
 .geary-main-window.background.csd stack#conversation_viewer,
 window#GearyMainWindow.background.csd stack#conversation_viewer {
-  border-bottom-right-radius: 12px;
+  background-color: #242424;
+  border-bottom-right-radius: 13px;
 }
 
 .geary-main-window.background.csd stack#conversation_viewer scrolledwindow.geary-conversation-scroller viewport.frame,
diff --git a/src/main/gtk-3.0/gtk-dark-pink.css b/src/main/gtk-3.0/gtk-dark-pink.css
index de41e1c8..1ce38610 100644
--- a/src/main/gtk-3.0/gtk-dark-pink.css
+++ b/src/main/gtk-3.0/gtk-dark-pink.css
@@ -7255,7 +7255,8 @@ window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sideba
 
 .geary-main-window.background.csd stack#conversation_viewer,
 window#GearyMainWindow.background.csd stack#conversation_viewer {
-  border-bottom-right-radius: 12px;
+  background-color: #242424;
+  border-bottom-right-radius: 13px;
 }
 
 .geary-main-window.background.csd stack#conversation_viewer scrolledwindow.geary-conversation-scroller viewport.frame,
diff --git a/src/main/gtk-3.0/gtk-dark-purple.css b/src/main/gtk-3.0/gtk-dark-purple.css
index f0107703..2db37093 100644
--- a/src/main/gtk-3.0/gtk-dark-purple.css
+++ b/src/main/gtk-3.0/gtk-dark-purple.css
@@ -7255,7 +7255,8 @@ window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sideba
 
 .geary-main-window.background.csd stack#conversation_viewer,
 window#GearyMainWindow.background.csd stack#conversation_viewer {
-  border-bottom-right-radius: 12px;
+  background-color: #242424;
+  border-bottom-right-radius: 13px;
 }
 
 .geary-main-window.background.csd stack#conversation_viewer scrolledwindow.geary-conversation-scroller viewport.frame,
diff --git a/src/main/gtk-3.0/gtk-dark-red.css b/src/main/gtk-3.0/gtk-dark-red.css
index 6a17b486..f43545fe 100644
--- a/src/main/gtk-3.0/gtk-dark-red.css
+++ b/src/main/gtk-3.0/gtk-dark-red.css
@@ -7255,7 +7255,8 @@ window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sideba
 
 .geary-main-window.background.csd stack#conversation_viewer,
 window#GearyMainWindow.background.csd stack#conversation_viewer {
-  border-bottom-right-radius: 12px;
+  background-color: #242424;
+  border-bottom-right-radius: 13px;
 }
 
 .geary-main-window.background.csd stack#conversation_viewer scrolledwindow.geary-conversation-scroller viewport.frame,
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 310d4274..ebb1bab0 100644
--- a/src/main/gtk-3.0/gtk-dark-solid-blue.css
+++ b/src/main/gtk-3.0/gtk-dark-solid-blue.css
@@ -7259,7 +7259,8 @@ window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sideba
 
 .geary-main-window.background.csd stack#conversation_viewer,
 window#GearyMainWindow.background.csd stack#conversation_viewer {
-  border-bottom-right-radius: 12px;
+  background-color: #242424;
+  border-bottom-right-radius: 13px;
 }
 
 .geary-main-window.background.csd stack#conversation_viewer scrolledwindow.geary-conversation-scroller viewport.frame,
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 0d867fa1..3bff9906 100644
--- a/src/main/gtk-3.0/gtk-dark-solid-green.css
+++ b/src/main/gtk-3.0/gtk-dark-solid-green.css
@@ -7259,7 +7259,8 @@ window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sideba
 
 .geary-main-window.background.csd stack#conversation_viewer,
 window#GearyMainWindow.background.csd stack#conversation_viewer {
-  border-bottom-right-radius: 12px;
+  background-color: #242424;
+  border-bottom-right-radius: 13px;
 }
 
 .geary-main-window.background.csd stack#conversation_viewer scrolledwindow.geary-conversation-scroller viewport.frame,
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 404f7151..d632c6ad 100644
--- a/src/main/gtk-3.0/gtk-dark-solid-grey.css
+++ b/src/main/gtk-3.0/gtk-dark-solid-grey.css
@@ -7259,7 +7259,8 @@ window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sideba
 
 .geary-main-window.background.csd stack#conversation_viewer,
 window#GearyMainWindow.background.csd stack#conversation_viewer {
-  border-bottom-right-radius: 12px;
+  background-color: #242424;
+  border-bottom-right-radius: 13px;
 }
 
 .geary-main-window.background.csd stack#conversation_viewer scrolledwindow.geary-conversation-scroller viewport.frame,
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 1a0153ca..144b7bc0 100644
--- a/src/main/gtk-3.0/gtk-dark-solid-orange.css
+++ b/src/main/gtk-3.0/gtk-dark-solid-orange.css
@@ -7259,7 +7259,8 @@ window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sideba
 
 .geary-main-window.background.csd stack#conversation_viewer,
 window#GearyMainWindow.background.csd stack#conversation_viewer {
-  border-bottom-right-radius: 12px;
+  background-color: #242424;
+  border-bottom-right-radius: 13px;
 }
 
 .geary-main-window.background.csd stack#conversation_viewer scrolledwindow.geary-conversation-scroller viewport.frame,
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 f8871433..a98debd4 100644
--- a/src/main/gtk-3.0/gtk-dark-solid-pink.css
+++ b/src/main/gtk-3.0/gtk-dark-solid-pink.css
@@ -7259,7 +7259,8 @@ window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sideba
 
 .geary-main-window.background.csd stack#conversation_viewer,
 window#GearyMainWindow.background.csd stack#conversation_viewer {
-  border-bottom-right-radius: 12px;
+  background-color: #242424;
+  border-bottom-right-radius: 13px;
 }
 
 .geary-main-window.background.csd stack#conversation_viewer scrolledwindow.geary-conversation-scroller viewport.frame,
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 d73f7566..3a16f15c 100644
--- a/src/main/gtk-3.0/gtk-dark-solid-purple.css
+++ b/src/main/gtk-3.0/gtk-dark-solid-purple.css
@@ -7259,7 +7259,8 @@ window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sideba
 
 .geary-main-window.background.csd stack#conversation_viewer,
 window#GearyMainWindow.background.csd stack#conversation_viewer {
-  border-bottom-right-radius: 12px;
+  background-color: #242424;
+  border-bottom-right-radius: 13px;
 }
 
 .geary-main-window.background.csd stack#conversation_viewer scrolledwindow.geary-conversation-scroller viewport.frame,
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 75e1d46c..c2111e84 100644
--- a/src/main/gtk-3.0/gtk-dark-solid-red.css
+++ b/src/main/gtk-3.0/gtk-dark-solid-red.css
@@ -7259,7 +7259,8 @@ window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sideba
 
 .geary-main-window.background.csd stack#conversation_viewer,
 window#GearyMainWindow.background.csd stack#conversation_viewer {
-  border-bottom-right-radius: 12px;
+  background-color: #242424;
+  border-bottom-right-radius: 13px;
 }
 
 .geary-main-window.background.csd stack#conversation_viewer scrolledwindow.geary-conversation-scroller viewport.frame,
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 76949065..5a4ff54e 100644
--- a/src/main/gtk-3.0/gtk-dark-solid-yellow.css
+++ b/src/main/gtk-3.0/gtk-dark-solid-yellow.css
@@ -7259,7 +7259,8 @@ window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sideba
 
 .geary-main-window.background.csd stack#conversation_viewer,
 window#GearyMainWindow.background.csd stack#conversation_viewer {
-  border-bottom-right-radius: 12px;
+  background-color: #242424;
+  border-bottom-right-radius: 13px;
 }
 
 .geary-main-window.background.csd stack#conversation_viewer scrolledwindow.geary-conversation-scroller viewport.frame,
diff --git a/src/main/gtk-3.0/gtk-dark-solid.css b/src/main/gtk-3.0/gtk-dark-solid.css
index 3eee88c2..9325d065 100644
--- a/src/main/gtk-3.0/gtk-dark-solid.css
+++ b/src/main/gtk-3.0/gtk-dark-solid.css
@@ -7259,7 +7259,8 @@ window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sideba
 
 .geary-main-window.background.csd stack#conversation_viewer,
 window#GearyMainWindow.background.csd stack#conversation_viewer {
-  border-bottom-right-radius: 12px;
+  background-color: #242424;
+  border-bottom-right-radius: 13px;
 }
 
 .geary-main-window.background.csd stack#conversation_viewer scrolledwindow.geary-conversation-scroller viewport.frame,
diff --git a/src/main/gtk-3.0/gtk-dark-yellow.css b/src/main/gtk-3.0/gtk-dark-yellow.css
index 0fa8a7f6..adef04f7 100644
--- a/src/main/gtk-3.0/gtk-dark-yellow.css
+++ b/src/main/gtk-3.0/gtk-dark-yellow.css
@@ -7255,7 +7255,8 @@ window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sideba
 
 .geary-main-window.background.csd stack#conversation_viewer,
 window#GearyMainWindow.background.csd stack#conversation_viewer {
-  border-bottom-right-radius: 12px;
+  background-color: #242424;
+  border-bottom-right-radius: 13px;
 }
 
 .geary-main-window.background.csd stack#conversation_viewer scrolledwindow.geary-conversation-scroller viewport.frame,
diff --git a/src/main/gtk-3.0/gtk-dark.css b/src/main/gtk-3.0/gtk-dark.css
index cad4dbf3..ef388120 100644
--- a/src/main/gtk-3.0/gtk-dark.css
+++ b/src/main/gtk-3.0/gtk-dark.css
@@ -7255,7 +7255,8 @@ window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sideba
 
 .geary-main-window.background.csd stack#conversation_viewer,
 window#GearyMainWindow.background.csd stack#conversation_viewer {
-  border-bottom-right-radius: 12px;
+  background-color: #242424;
+  border-bottom-right-radius: 13px;
 }
 
 .geary-main-window.background.csd stack#conversation_viewer scrolledwindow.geary-conversation-scroller viewport.frame,
diff --git a/src/main/gtk-3.0/gtk-light-blue.css b/src/main/gtk-3.0/gtk-light-blue.css
index 4584fd96..48321af4 100644
--- a/src/main/gtk-3.0/gtk-light-blue.css
+++ b/src/main/gtk-3.0/gtk-light-blue.css
@@ -7271,7 +7271,8 @@ window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sideba
 
 .geary-main-window.background.csd stack#conversation_viewer,
 window#GearyMainWindow.background.csd stack#conversation_viewer {
-  border-bottom-right-radius: 12px;
+  background-color: #ffffff;
+  border-bottom-right-radius: 13px;
 }
 
 .geary-main-window.background.csd stack#conversation_viewer scrolledwindow.geary-conversation-scroller viewport.frame,
diff --git a/src/main/gtk-3.0/gtk-light-green.css b/src/main/gtk-3.0/gtk-light-green.css
index 65517fd9..f7ca4e21 100644
--- a/src/main/gtk-3.0/gtk-light-green.css
+++ b/src/main/gtk-3.0/gtk-light-green.css
@@ -7271,7 +7271,8 @@ window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sideba
 
 .geary-main-window.background.csd stack#conversation_viewer,
 window#GearyMainWindow.background.csd stack#conversation_viewer {
-  border-bottom-right-radius: 12px;
+  background-color: #ffffff;
+  border-bottom-right-radius: 13px;
 }
 
 .geary-main-window.background.csd stack#conversation_viewer scrolledwindow.geary-conversation-scroller viewport.frame,
diff --git a/src/main/gtk-3.0/gtk-light-grey.css b/src/main/gtk-3.0/gtk-light-grey.css
index d7a295e6..ed26ff28 100644
--- a/src/main/gtk-3.0/gtk-light-grey.css
+++ b/src/main/gtk-3.0/gtk-light-grey.css
@@ -7271,7 +7271,8 @@ window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sideba
 
 .geary-main-window.background.csd stack#conversation_viewer,
 window#GearyMainWindow.background.csd stack#conversation_viewer {
-  border-bottom-right-radius: 12px;
+  background-color: #ffffff;
+  border-bottom-right-radius: 13px;
 }
 
 .geary-main-window.background.csd stack#conversation_viewer scrolledwindow.geary-conversation-scroller viewport.frame,
diff --git a/src/main/gtk-3.0/gtk-light-orange.css b/src/main/gtk-3.0/gtk-light-orange.css
index 6891d204..cad83352 100644
--- a/src/main/gtk-3.0/gtk-light-orange.css
+++ b/src/main/gtk-3.0/gtk-light-orange.css
@@ -7271,7 +7271,8 @@ window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sideba
 
 .geary-main-window.background.csd stack#conversation_viewer,
 window#GearyMainWindow.background.csd stack#conversation_viewer {
-  border-bottom-right-radius: 12px;
+  background-color: #ffffff;
+  border-bottom-right-radius: 13px;
 }
 
 .geary-main-window.background.csd stack#conversation_viewer scrolledwindow.geary-conversation-scroller viewport.frame,
diff --git a/src/main/gtk-3.0/gtk-light-pink.css b/src/main/gtk-3.0/gtk-light-pink.css
index 3ee1c962..7794d7c4 100644
--- a/src/main/gtk-3.0/gtk-light-pink.css
+++ b/src/main/gtk-3.0/gtk-light-pink.css
@@ -7271,7 +7271,8 @@ window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sideba
 
 .geary-main-window.background.csd stack#conversation_viewer,
 window#GearyMainWindow.background.csd stack#conversation_viewer {
-  border-bottom-right-radius: 12px;
+  background-color: #ffffff;
+  border-bottom-right-radius: 13px;
 }
 
 .geary-main-window.background.csd stack#conversation_viewer scrolledwindow.geary-conversation-scroller viewport.frame,
diff --git a/src/main/gtk-3.0/gtk-light-purple.css b/src/main/gtk-3.0/gtk-light-purple.css
index ed9f0eaa..36449698 100644
--- a/src/main/gtk-3.0/gtk-light-purple.css
+++ b/src/main/gtk-3.0/gtk-light-purple.css
@@ -7271,7 +7271,8 @@ window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sideba
 
 .geary-main-window.background.csd stack#conversation_viewer,
 window#GearyMainWindow.background.csd stack#conversation_viewer {
-  border-bottom-right-radius: 12px;
+  background-color: #ffffff;
+  border-bottom-right-radius: 13px;
 }
 
 .geary-main-window.background.csd stack#conversation_viewer scrolledwindow.geary-conversation-scroller viewport.frame,
diff --git a/src/main/gtk-3.0/gtk-light-red.css b/src/main/gtk-3.0/gtk-light-red.css
index f7d096e7..5674a0d9 100644
--- a/src/main/gtk-3.0/gtk-light-red.css
+++ b/src/main/gtk-3.0/gtk-light-red.css
@@ -7271,7 +7271,8 @@ window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sideba
 
 .geary-main-window.background.csd stack#conversation_viewer,
 window#GearyMainWindow.background.csd stack#conversation_viewer {
-  border-bottom-right-radius: 12px;
+  background-color: #ffffff;
+  border-bottom-right-radius: 13px;
 }
 
 .geary-main-window.background.csd stack#conversation_viewer scrolledwindow.geary-conversation-scroller viewport.frame,
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 bc5fee78..bc061505 100644
--- a/src/main/gtk-3.0/gtk-light-solid-blue.css
+++ b/src/main/gtk-3.0/gtk-light-solid-blue.css
@@ -7275,7 +7275,8 @@ window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sideba
 
 .geary-main-window.background.csd stack#conversation_viewer,
 window#GearyMainWindow.background.csd stack#conversation_viewer {
-  border-bottom-right-radius: 12px;
+  background-color: #ffffff;
+  border-bottom-right-radius: 13px;
 }
 
 .geary-main-window.background.csd stack#conversation_viewer scrolledwindow.geary-conversation-scroller viewport.frame,
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 b98e331f..17ef0b05 100644
--- a/src/main/gtk-3.0/gtk-light-solid-green.css
+++ b/src/main/gtk-3.0/gtk-light-solid-green.css
@@ -7275,7 +7275,8 @@ window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sideba
 
 .geary-main-window.background.csd stack#conversation_viewer,
 window#GearyMainWindow.background.csd stack#conversation_viewer {
-  border-bottom-right-radius: 12px;
+  background-color: #ffffff;
+  border-bottom-right-radius: 13px;
 }
 
 .geary-main-window.background.csd stack#conversation_viewer scrolledwindow.geary-conversation-scroller viewport.frame,
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 a335b0e8..a168cb59 100644
--- a/src/main/gtk-3.0/gtk-light-solid-grey.css
+++ b/src/main/gtk-3.0/gtk-light-solid-grey.css
@@ -7275,7 +7275,8 @@ window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sideba
 
 .geary-main-window.background.csd stack#conversation_viewer,
 window#GearyMainWindow.background.csd stack#conversation_viewer {
-  border-bottom-right-radius: 12px;
+  background-color: #ffffff;
+  border-bottom-right-radius: 13px;
 }
 
 .geary-main-window.background.csd stack#conversation_viewer scrolledwindow.geary-conversation-scroller viewport.frame,
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 a913440e..74288533 100644
--- a/src/main/gtk-3.0/gtk-light-solid-orange.css
+++ b/src/main/gtk-3.0/gtk-light-solid-orange.css
@@ -7275,7 +7275,8 @@ window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sideba
 
 .geary-main-window.background.csd stack#conversation_viewer,
 window#GearyMainWindow.background.csd stack#conversation_viewer {
-  border-bottom-right-radius: 12px;
+  background-color: #ffffff;
+  border-bottom-right-radius: 13px;
 }
 
 .geary-main-window.background.csd stack#conversation_viewer scrolledwindow.geary-conversation-scroller viewport.frame,
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 c20a422d..4bbe6584 100644
--- a/src/main/gtk-3.0/gtk-light-solid-pink.css
+++ b/src/main/gtk-3.0/gtk-light-solid-pink.css
@@ -7275,7 +7275,8 @@ window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sideba
 
 .geary-main-window.background.csd stack#conversation_viewer,
 window#GearyMainWindow.background.csd stack#conversation_viewer {
-  border-bottom-right-radius: 12px;
+  background-color: #ffffff;
+  border-bottom-right-radius: 13px;
 }
 
 .geary-main-window.background.csd stack#conversation_viewer scrolledwindow.geary-conversation-scroller viewport.frame,
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 be1f5df8..e333a716 100644
--- a/src/main/gtk-3.0/gtk-light-solid-purple.css
+++ b/src/main/gtk-3.0/gtk-light-solid-purple.css
@@ -7275,7 +7275,8 @@ window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sideba
 
 .geary-main-window.background.csd stack#conversation_viewer,
 window#GearyMainWindow.background.csd stack#conversation_viewer {
-  border-bottom-right-radius: 12px;
+  background-color: #ffffff;
+  border-bottom-right-radius: 13px;
 }
 
 .geary-main-window.background.csd stack#conversation_viewer scrolledwindow.geary-conversation-scroller viewport.frame,
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 f637ad9e..31993345 100644
--- a/src/main/gtk-3.0/gtk-light-solid-red.css
+++ b/src/main/gtk-3.0/gtk-light-solid-red.css
@@ -7275,7 +7275,8 @@ window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sideba
 
 .geary-main-window.background.csd stack#conversation_viewer,
 window#GearyMainWindow.background.csd stack#conversation_viewer {
-  border-bottom-right-radius: 12px;
+  background-color: #ffffff;
+  border-bottom-right-radius: 13px;
 }
 
 .geary-main-window.background.csd stack#conversation_viewer scrolledwindow.geary-conversation-scroller viewport.frame,
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 fdd36e69..47aa4f34 100644
--- a/src/main/gtk-3.0/gtk-light-solid-yellow.css
+++ b/src/main/gtk-3.0/gtk-light-solid-yellow.css
@@ -7275,7 +7275,8 @@ window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sideba
 
 .geary-main-window.background.csd stack#conversation_viewer,
 window#GearyMainWindow.background.csd stack#conversation_viewer {
-  border-bottom-right-radius: 12px;
+  background-color: #ffffff;
+  border-bottom-right-radius: 13px;
 }
 
 .geary-main-window.background.csd stack#conversation_viewer scrolledwindow.geary-conversation-scroller viewport.frame,
diff --git a/src/main/gtk-3.0/gtk-light-solid.css b/src/main/gtk-3.0/gtk-light-solid.css
index f92cfe32..23cba89c 100644
--- a/src/main/gtk-3.0/gtk-light-solid.css
+++ b/src/main/gtk-3.0/gtk-light-solid.css
@@ -7275,7 +7275,8 @@ window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sideba
 
 .geary-main-window.background.csd stack#conversation_viewer,
 window#GearyMainWindow.background.csd stack#conversation_viewer {
-  border-bottom-right-radius: 12px;
+  background-color: #ffffff;
+  border-bottom-right-radius: 13px;
 }
 
 .geary-main-window.background.csd stack#conversation_viewer scrolledwindow.geary-conversation-scroller viewport.frame,
diff --git a/src/main/gtk-3.0/gtk-light-yellow.css b/src/main/gtk-3.0/gtk-light-yellow.css
index 2dae4d2c..e07567e7 100644
--- a/src/main/gtk-3.0/gtk-light-yellow.css
+++ b/src/main/gtk-3.0/gtk-light-yellow.css
@@ -7271,7 +7271,8 @@ window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sideba
 
 .geary-main-window.background.csd stack#conversation_viewer,
 window#GearyMainWindow.background.csd stack#conversation_viewer {
-  border-bottom-right-radius: 12px;
+  background-color: #ffffff;
+  border-bottom-right-radius: 13px;
 }
 
 .geary-main-window.background.csd stack#conversation_viewer scrolledwindow.geary-conversation-scroller viewport.frame,
diff --git a/src/main/gtk-3.0/gtk-light.css b/src/main/gtk-3.0/gtk-light.css
index b928cbc6..84a0d308 100644
--- a/src/main/gtk-3.0/gtk-light.css
+++ b/src/main/gtk-3.0/gtk-light.css
@@ -7271,7 +7271,8 @@ window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sideba
 
 .geary-main-window.background.csd stack#conversation_viewer,
 window#GearyMainWindow.background.csd stack#conversation_viewer {
-  border-bottom-right-radius: 12px;
+  background-color: #ffffff;
+  border-bottom-right-radius: 13px;
 }
 
 .geary-main-window.background.csd stack#conversation_viewer scrolledwindow.geary-conversation-scroller viewport.frame,
diff --git a/src/sass/gnome-shell/_drawing.scss b/src/sass/gnome-shell/_drawing.scss
index b7a26ea9..4c85a89b 100644
--- a/src/sass/gnome-shell/_drawing.scss
+++ b/src/sass/gnome-shell/_drawing.scss
@@ -155,7 +155,7 @@
     background-color: rgba(white, 0.12);
     border-radius: $bd_radius;
     border-color: transparent;
-    box-shadow: inset 0 0 0 1px rgba(white, 0.05);
+    // box-shadow: inset 0 0 0 1px rgba(white, 0.05);
   }
 
   @if $t == focus {
diff --git a/src/sass/gnome-shell/widgets/_popovers.scss b/src/sass/gnome-shell/widgets/_popovers.scss
index d2d9691c..0e311975 100644
--- a/src/sass/gnome-shell/widgets/_popovers.scss
+++ b/src/sass/gnome-shell/widgets/_popovers.scss
@@ -248,39 +248,38 @@ $popop_menuitem_radius: $wm_radius - 4px;
   @extend %theme_dialogs;
   box-shadow: 0 8px 16px 0 rgba(black, 0.25);
   border: 1px solid if($variant=='light', rgba(black, 0), rgba(black, 0.75));
-  padding: 8px;
-  spacing: 0;
+  margin: ($container_padding / 2) 8px;
+  padding: $container_padding + 2px;
+  spacing: $container_padding;
 }
 
 .candidate-index {
-  padding: 0 4px 0 0;
+  padding: 0 0.5em 0 0;
   color: $hint_fg_color;
   .candidate-box:selected & { color: $light_hint_fg_color; }
 }
 
 .candidate-box {
   transition-duration: 0ms; // FIXME: needs more natural transitions
-  min-height: $menuitem_size;
-  padding: 0 8px;
+  padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: $bt_radius;
   &:hover { background-color: $divider_color; color: $fg_color; }
   &:active { background-color: $track_color; color: $fg_color; }
   &:selected { background-color: $primary_color; color: $light_alt_fg_color; }
+  &:last-child { margin-right: 0; }
 }
 
 .candidate-page-button-box {
-  height: $menuitem_size;
-  .vertical & { padding-top: 0; }
-  .horizontal & { padding-left: 0; }
+  height: 2em;
+  .vertical & { padding-top: 0.5em; }
+  .horizontal & { padding-left: 0.5em; }
 }
 
 .candidate-page-button {
-  min-width: $menuitem_size;
-  min-height: $menuitem_size;
-  padding: 0;
+  padding: 4px;
 }
 
-.candidate-page-button-previous { border-radius: $bt_radius; border-right-width: 0; }
+.candidate-page-button-previous,
 .candidate-page-button-next { border-radius: $bt_radius;  }
-.candidate-page-button-icon { icon-size: em(16px); }
+.candidate-page-button-icon { icon-size: 1em; }
diff --git a/src/sass/gtk/_applications.scss b/src/sass/gtk/_applications.scss
index e489fcc8..253a990d 100644
--- a/src/sass/gtk/_applications.scss
+++ b/src/sass/gtk/_applications.scss
@@ -2773,10 +2773,7 @@ window#whiskermenu-window {
   }
 }
 
-//
-//  * Thunar *
-//
-
+// Thunar
 window.background.csd.thunar {
   > grid.horizontal > paned.horizontal > scrolledwindow.frame.sidebar.shortcuts-pane {
     border-bottom-left-radius: $wm_radius;
@@ -2894,7 +2891,8 @@ window#GearyMainWindow.background.csd {
   }
 
   stack#conversation_viewer {
-    border-bottom-right-radius: $wm_radius;
+    background-color: $base_color;
+    border-bottom-right-radius: $wm_radius + 1px;
 
     scrolledwindow.geary-conversation-scroller {
       viewport.frame {