diff --git a/src/main/gnome-shell/gdm3-dark-blue.css b/src/main/gnome-shell/gdm3-dark-blue.css
index 4e7bca8..4d976cf 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 6be5aae..5cc0735 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 d72be16..f0700bb 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 ab3fca0..2c01779 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 6a122eb..9d49711 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 6cf25ec..0184901 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 6f99de7..f2db803 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 bb5eca8..35c00f2 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 287c36d..0ef1118 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 5c925e2..dee0e89 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 7423947..2e62ccc 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 977f774..1a87b26 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 9cc441b..7195d5e 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 e62627b..d8d3f51 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 dd327a5..212cf9c 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 3eaedc9..7a862fe 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 c509ac3..e02912a 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 95cffcf..0e9f350 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 94043d2..7c40aa2 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 c7723dc..c4381b6 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 445bca8..91a2e28 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 a30828f..f9d95c1 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 91cbc6a..ff598dd 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 5270fb5..da9a93d 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 a63f996..b01b017 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 78033f6..eb18715 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 d222631..4047219 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 94043d2..7c40aa2 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 c7723dc..c4381b6 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 445bca8..91a2e28 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 a30828f..f9d95c1 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 91cbc6a..ff598dd 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 5270fb5..da9a93d 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 a63f996..b01b017 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 df8e7a7..263a54d 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 84bd298..8431f8f 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 c6480a4..48c2123 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 04900b2..d6e4462 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 63760ec..d23ec8f 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 e139499..80f373c 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 7aee02d..63f0699 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 aa8ac19..9f27e65 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 d049f9a..1900123 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 df8e7a7..263a54d 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 84bd298..8431f8f 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 c6480a4..48c2123 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 04900b2..d6e4462 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 63760ec..d23ec8f 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 e139499..80f373c 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 7aee02d..63f0699 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 aa8ac19..9f27e65 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 d049f9a..1900123 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 78033f6..eb18715 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 d222631..4047219 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 54f808e..9a28019 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 cf00b82..b4dbc0e 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 1eca8da..30ab804 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 6fdf20d..aba01e0 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 e8cb9f3..c86e1f6 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 492a335..6d97407 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 a29d54d..4eaa23a 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 8bfdb3e..0624ae1 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 5c672b0..ba92996 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 fd04916..02f8a69 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 19dd6f4..b6fb374 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 5f2892a..f7f8a4b 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 db3de93..fb4caf0 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 0504f7a..6fe644a 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 05adba5..ec4898f 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 52cfaf7..84a74b2 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 cf1a9f9..a6e57e6 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 2147682..bec8409 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 ac58ad8..a5ba4e6 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 7197bdf..afc359c 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 1c8faf2..5caa3be 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 4caa7fc..58bff9a 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 f90f5b7..27044c3 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 7197bdf..afc359c 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 7a24bfc..3dc4add 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 cf1a9f9..a6e57e6 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 2147682..bec8409 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 ac58ad8..a5ba4e6 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 7197bdf..afc359c 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 1c8faf2..5caa3be 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 4caa7fc..58bff9a 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 f90f5b7..27044c3 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 0f8c176..ea9502c 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 7a24bfc..3dc4add 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 0d323d7..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 83a5802..25a6b09 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 9068d9d..ad50bad 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 468f654..0ba8327 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 2c969a5..7611f99 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 ccce8e3..3e2583d 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 de41e1c..1ce3861 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 f010770..2db3709 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 6a17b48..f43545f 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 310d427..ebb1bab 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 0d867fa..3bff990 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 404f715..d632c6a 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 1a0153c..144b7bc 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 f887143..a98debd 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 d73f756..3a16f15 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 75e1d46..c2111e8 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 7694906..5a4ff54 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 3eee88c..9325d06 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 0fa8a7f..adef04f 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 cad4dbf..ef38812 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 4584fd9..48321af 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 65517fd..f7ca4e2 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 d7a295e..ed26ff2 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 6891d20..cad8335 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 3ee1c96..7794d7c 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 ed9f0ea..3644969 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 f7d096e..5674a0d 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 bc5fee7..bc06150 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 b98e331..17ef0b0 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 a335b0e..a168cb5 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 a913440..7428853 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 c20a422..4bbe658 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 be1f5df..e333a71 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 f637ad9..3199334 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 fdd36e6..47aa4f3 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 f92cfe3..23cba89 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 2dae4d2..e07567e 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 b928cbc..84a0d30 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 b7a26ea..4c85a89 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 d2d9691..0e31197 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 e489fcc..253a990 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 {