diff --git a/assets/themes/cave-dark.json b/assets/themes/cave-dark.json
index 74a556a3663fb39e2238d21c8b81268f08145467..6957e6d15d987eff2b35556e4ecdf7a94b9f88ee 100644
--- a/assets/themes/cave-dark.json
+++ b/assets/themes/cave-dark.json
@@ -549,7 +549,7 @@
           "right": 6,
           "top": 2
         },
-        "background": "#26232a"
+        "background": "#26232a52"
       },
       "margin": {
         "left": -14
@@ -567,7 +567,7 @@
           "right": 6,
           "top": 2
         },
-        "background": "#26232a"
+        "background": "#26232a7a"
       }
     },
     "diagnostic_header": {
@@ -1334,26 +1334,25 @@
       "color": "#8b8792",
       "size": 14,
       "background": "#26232a",
-      "corner_radius": 4,
+      "corner_radius": 6,
       "border": {
         "color": "#26232a",
         "width": 1
       },
       "margin": {
-        "left": 2,
-        "right": 2
+        "right": 4
       },
       "padding": {
-        "bottom": 3,
-        "left": 8,
-        "right": 8,
-        "top": 3
+        "bottom": 2,
+        "left": 10,
+        "right": 10,
+        "top": 2
       },
       "active": {
         "family": "Zed Mono",
         "color": "#efecf4",
         "size": 14,
-        "background": "#655f6d",
+        "background": "#585260a3",
         "border": {
           "color": "#655f6d",
           "width": 1
@@ -1363,7 +1362,7 @@
         "family": "Zed Mono",
         "color": "#efecf4",
         "size": 14,
-        "background": "#655f6d",
+        "background": "#58526052",
         "border": {
           "color": "#655f6d",
           "width": 1
@@ -1394,7 +1393,7 @@
         "width": 1
       },
       "margin": {
-        "right": 6
+        "right": 12
       },
       "padding": {
         "top": 3,
@@ -1427,7 +1426,7 @@
         "width": 1
       },
       "margin": {
-        "right": 6
+        "right": 12
       },
       "padding": {
         "top": 3,
@@ -1444,8 +1443,8 @@
     },
     "option_button_group": {
       "padding": {
-        "left": 4,
-        "right": 4
+        "left": 12,
+        "right": 12
       }
     },
     "results_status": {
diff --git a/assets/themes/cave-light.json b/assets/themes/cave-light.json
index 1065bdfdec2e0fdc15bb12a3b22f68b1f91c1492..bac7d1e71fad0912b5c827c9f97da80cde5d3d76 100644
--- a/assets/themes/cave-light.json
+++ b/assets/themes/cave-light.json
@@ -549,7 +549,7 @@
           "right": 6,
           "top": 2
         },
-        "background": "#e2dfe7"
+        "background": "#e2dfe71f"
       },
       "margin": {
         "left": -14
@@ -567,7 +567,7 @@
           "right": 6,
           "top": 2
         },
-        "background": "#e2dfe7"
+        "background": "#e2dfe72e"
       }
     },
     "diagnostic_header": {
@@ -1334,26 +1334,25 @@
       "color": "#585260",
       "size": 14,
       "background": "#e2dfe7",
-      "corner_radius": 4,
+      "corner_radius": 6,
       "border": {
         "color": "#e2dfe7",
         "width": 1
       },
       "margin": {
-        "left": 2,
-        "right": 2
+        "right": 4
       },
       "padding": {
-        "bottom": 3,
-        "left": 8,
-        "right": 8,
-        "top": 3
+        "bottom": 2,
+        "left": 10,
+        "right": 10,
+        "top": 2
       },
       "active": {
         "family": "Zed Mono",
         "color": "#19171c",
         "size": 14,
-        "background": "#7e7887",
+        "background": "#8b87923d",
         "border": {
           "color": "#7e7887",
           "width": 1
@@ -1363,7 +1362,7 @@
         "family": "Zed Mono",
         "color": "#19171c",
         "size": 14,
-        "background": "#7e7887",
+        "background": "#8b87921f",
         "border": {
           "color": "#7e7887",
           "width": 1
@@ -1394,7 +1393,7 @@
         "width": 1
       },
       "margin": {
-        "right": 6
+        "right": 12
       },
       "padding": {
         "top": 3,
@@ -1427,7 +1426,7 @@
         "width": 1
       },
       "margin": {
-        "right": 6
+        "right": 12
       },
       "padding": {
         "top": 3,
@@ -1444,8 +1443,8 @@
     },
     "option_button_group": {
       "padding": {
-        "left": 4,
-        "right": 4
+        "left": 12,
+        "right": 12
       }
     },
     "results_status": {
diff --git a/assets/themes/dark.json b/assets/themes/dark.json
index 2012020b16b0d4d93a118b109aac36c29a6874c1..dfe95a666c499c37bf5cc75bc48b39028d8451f5 100644
--- a/assets/themes/dark.json
+++ b/assets/themes/dark.json
@@ -1334,20 +1334,19 @@
       "color": "#9c9c9c",
       "size": 14,
       "background": "#0e0e0e",
-      "corner_radius": 4,
+      "corner_radius": 6,
       "border": {
         "color": "#232323",
         "width": 1
       },
       "margin": {
-        "left": 2,
-        "right": 2
+        "right": 4
       },
       "padding": {
-        "bottom": 3,
-        "left": 8,
-        "right": 8,
-        "top": 3
+        "bottom": 2,
+        "left": 10,
+        "right": 10,
+        "top": 2
       },
       "active": {
         "family": "Zed Mono",
@@ -1394,7 +1393,7 @@
         "width": 1
       },
       "margin": {
-        "right": 6
+        "right": 12
       },
       "padding": {
         "top": 3,
@@ -1427,7 +1426,7 @@
         "width": 1
       },
       "margin": {
-        "right": 6
+        "right": 12
       },
       "padding": {
         "top": 3,
@@ -1444,8 +1443,8 @@
     },
     "option_button_group": {
       "padding": {
-        "left": 4,
-        "right": 4
+        "left": 12,
+        "right": 12
       }
     },
     "results_status": {
diff --git a/assets/themes/light.json b/assets/themes/light.json
index 987a021da945b5589f64135491cc5ff649bd5e2f..8cb17fadb2ab5b49cb9396e29ae8fba09793fcbc 100644
--- a/assets/themes/light.json
+++ b/assets/themes/light.json
@@ -1334,20 +1334,19 @@
       "color": "#474747",
       "size": 14,
       "background": "#f1f1f1",
-      "corner_radius": 4,
+      "corner_radius": 6,
       "border": {
         "color": "#d5d5d5",
         "width": 1
       },
       "margin": {
-        "left": 2,
-        "right": 2
+        "right": 4
       },
       "padding": {
-        "bottom": 3,
-        "left": 8,
-        "right": 8,
-        "top": 3
+        "bottom": 2,
+        "left": 10,
+        "right": 10,
+        "top": 2
       },
       "active": {
         "family": "Zed Mono",
@@ -1394,7 +1393,7 @@
         "width": 1
       },
       "margin": {
-        "right": 6
+        "right": 12
       },
       "padding": {
         "top": 3,
@@ -1427,7 +1426,7 @@
         "width": 1
       },
       "margin": {
-        "right": 6
+        "right": 12
       },
       "padding": {
         "top": 3,
@@ -1444,8 +1443,8 @@
     },
     "option_button_group": {
       "padding": {
-        "left": 4,
-        "right": 4
+        "left": 12,
+        "right": 12
       }
     },
     "results_status": {
diff --git a/assets/themes/solarized-dark.json b/assets/themes/solarized-dark.json
index 469643f64cefb388beeb597cf0b378555f5ac76b..cd1a30035431454520ad32dcb91b282b15463599 100644
--- a/assets/themes/solarized-dark.json
+++ b/assets/themes/solarized-dark.json
@@ -549,7 +549,7 @@
           "right": 6,
           "top": 2
         },
-        "background": "#073642"
+        "background": "#07364252"
       },
       "margin": {
         "left": -14
@@ -567,7 +567,7 @@
           "right": 6,
           "top": 2
         },
-        "background": "#073642"
+        "background": "#0736427a"
       }
     },
     "diagnostic_header": {
@@ -1334,26 +1334,25 @@
       "color": "#93a1a1",
       "size": 14,
       "background": "#073642",
-      "corner_radius": 4,
+      "corner_radius": 6,
       "border": {
         "color": "#073642",
         "width": 1
       },
       "margin": {
-        "left": 2,
-        "right": 2
+        "right": 4
       },
       "padding": {
-        "bottom": 3,
-        "left": 8,
-        "right": 8,
-        "top": 3
+        "bottom": 2,
+        "left": 10,
+        "right": 10,
+        "top": 2
       },
       "active": {
         "family": "Zed Mono",
         "color": "#fdf6e3",
         "size": 14,
-        "background": "#657b83",
+        "background": "#586e75a3",
         "border": {
           "color": "#657b83",
           "width": 1
@@ -1363,7 +1362,7 @@
         "family": "Zed Mono",
         "color": "#fdf6e3",
         "size": 14,
-        "background": "#657b83",
+        "background": "#586e7552",
         "border": {
           "color": "#657b83",
           "width": 1
@@ -1394,7 +1393,7 @@
         "width": 1
       },
       "margin": {
-        "right": 6
+        "right": 12
       },
       "padding": {
         "top": 3,
@@ -1427,7 +1426,7 @@
         "width": 1
       },
       "margin": {
-        "right": 6
+        "right": 12
       },
       "padding": {
         "top": 3,
@@ -1444,8 +1443,8 @@
     },
     "option_button_group": {
       "padding": {
-        "left": 4,
-        "right": 4
+        "left": 12,
+        "right": 12
       }
     },
     "results_status": {
diff --git a/assets/themes/solarized-light.json b/assets/themes/solarized-light.json
index 2c6e834ca94dc6d27db1dfa2e87a7aaf0351b2ee..b282a8ce83aad98a7a1a313f4d37ea04415772f3 100644
--- a/assets/themes/solarized-light.json
+++ b/assets/themes/solarized-light.json
@@ -549,7 +549,7 @@
           "right": 6,
           "top": 2
         },
-        "background": "#eee8d5"
+        "background": "#eee8d51f"
       },
       "margin": {
         "left": -14
@@ -567,7 +567,7 @@
           "right": 6,
           "top": 2
         },
-        "background": "#eee8d5"
+        "background": "#eee8d52e"
       }
     },
     "diagnostic_header": {
@@ -1334,26 +1334,25 @@
       "color": "#586e75",
       "size": 14,
       "background": "#eee8d5",
-      "corner_radius": 4,
+      "corner_radius": 6,
       "border": {
         "color": "#eee8d5",
         "width": 1
       },
       "margin": {
-        "left": 2,
-        "right": 2
+        "right": 4
       },
       "padding": {
-        "bottom": 3,
-        "left": 8,
-        "right": 8,
-        "top": 3
+        "bottom": 2,
+        "left": 10,
+        "right": 10,
+        "top": 2
       },
       "active": {
         "family": "Zed Mono",
         "color": "#002b36",
         "size": 14,
-        "background": "#839496",
+        "background": "#93a1a13d",
         "border": {
           "color": "#839496",
           "width": 1
@@ -1363,7 +1362,7 @@
         "family": "Zed Mono",
         "color": "#002b36",
         "size": 14,
-        "background": "#839496",
+        "background": "#93a1a11f",
         "border": {
           "color": "#839496",
           "width": 1
@@ -1394,7 +1393,7 @@
         "width": 1
       },
       "margin": {
-        "right": 6
+        "right": 12
       },
       "padding": {
         "top": 3,
@@ -1427,7 +1426,7 @@
         "width": 1
       },
       "margin": {
-        "right": 6
+        "right": 12
       },
       "padding": {
         "top": 3,
@@ -1444,8 +1443,8 @@
     },
     "option_button_group": {
       "padding": {
-        "left": 4,
-        "right": 4
+        "left": 12,
+        "right": 12
       }
     },
     "results_status": {
diff --git a/assets/themes/sulphurpool-dark.json b/assets/themes/sulphurpool-dark.json
index 8a8a2b740f17a518e1c892120aec434df4939f99..54af143394998d46d72b2ada07427287ef08a8e5 100644
--- a/assets/themes/sulphurpool-dark.json
+++ b/assets/themes/sulphurpool-dark.json
@@ -549,7 +549,7 @@
           "right": 6,
           "top": 2
         },
-        "background": "#293256"
+        "background": "#29325652"
       },
       "margin": {
         "left": -14
@@ -567,7 +567,7 @@
           "right": 6,
           "top": 2
         },
-        "background": "#293256"
+        "background": "#2932567a"
       }
     },
     "diagnostic_header": {
@@ -1334,26 +1334,25 @@
       "color": "#979db4",
       "size": 14,
       "background": "#293256",
-      "corner_radius": 4,
+      "corner_radius": 6,
       "border": {
         "color": "#293256",
         "width": 1
       },
       "margin": {
-        "left": 2,
-        "right": 2
+        "right": 4
       },
       "padding": {
-        "bottom": 3,
-        "left": 8,
-        "right": 8,
-        "top": 3
+        "bottom": 2,
+        "left": 10,
+        "right": 10,
+        "top": 2
       },
       "active": {
         "family": "Zed Mono",
         "color": "#f5f7ff",
         "size": 14,
-        "background": "#6b7394",
+        "background": "#5e6687a3",
         "border": {
           "color": "#6b7394",
           "width": 1
@@ -1363,7 +1362,7 @@
         "family": "Zed Mono",
         "color": "#f5f7ff",
         "size": 14,
-        "background": "#6b7394",
+        "background": "#5e668752",
         "border": {
           "color": "#6b7394",
           "width": 1
@@ -1394,7 +1393,7 @@
         "width": 1
       },
       "margin": {
-        "right": 6
+        "right": 12
       },
       "padding": {
         "top": 3,
@@ -1427,7 +1426,7 @@
         "width": 1
       },
       "margin": {
-        "right": 6
+        "right": 12
       },
       "padding": {
         "top": 3,
@@ -1444,8 +1443,8 @@
     },
     "option_button_group": {
       "padding": {
-        "left": 4,
-        "right": 4
+        "left": 12,
+        "right": 12
       }
     },
     "results_status": {
diff --git a/assets/themes/sulphurpool-light.json b/assets/themes/sulphurpool-light.json
index 4538428fbf09cfd62830d41ad06b1f6400c5d9d8..6147c2b632f77e054d89c8f6057e71da484dd99f 100644
--- a/assets/themes/sulphurpool-light.json
+++ b/assets/themes/sulphurpool-light.json
@@ -549,7 +549,7 @@
           "right": 6,
           "top": 2
         },
-        "background": "#dfe2f1"
+        "background": "#dfe2f11f"
       },
       "margin": {
         "left": -14
@@ -567,7 +567,7 @@
           "right": 6,
           "top": 2
         },
-        "background": "#dfe2f1"
+        "background": "#dfe2f12e"
       }
     },
     "diagnostic_header": {
@@ -1334,26 +1334,25 @@
       "color": "#5e6687",
       "size": 14,
       "background": "#dfe2f1",
-      "corner_radius": 4,
+      "corner_radius": 6,
       "border": {
         "color": "#dfe2f1",
         "width": 1
       },
       "margin": {
-        "left": 2,
-        "right": 2
+        "right": 4
       },
       "padding": {
-        "bottom": 3,
-        "left": 8,
-        "right": 8,
-        "top": 3
+        "bottom": 2,
+        "left": 10,
+        "right": 10,
+        "top": 2
       },
       "active": {
         "family": "Zed Mono",
         "color": "#202746",
         "size": 14,
-        "background": "#898ea4",
+        "background": "#979db43d",
         "border": {
           "color": "#898ea4",
           "width": 1
@@ -1363,7 +1362,7 @@
         "family": "Zed Mono",
         "color": "#202746",
         "size": 14,
-        "background": "#898ea4",
+        "background": "#979db41f",
         "border": {
           "color": "#898ea4",
           "width": 1
@@ -1394,7 +1393,7 @@
         "width": 1
       },
       "margin": {
-        "right": 6
+        "right": 12
       },
       "padding": {
         "top": 3,
@@ -1427,7 +1426,7 @@
         "width": 1
       },
       "margin": {
-        "right": 6
+        "right": 12
       },
       "padding": {
         "top": 3,
@@ -1444,8 +1443,8 @@
     },
     "option_button_group": {
       "padding": {
-        "left": 4,
-        "right": 4
+        "left": 12,
+        "right": 12
       }
     },
     "results_status": {
diff --git a/styles/src/styleTree/search.ts b/styles/src/styleTree/search.ts
index e0c4a2003ceff00a3524000ac26a27d4766a3afb..b48dccc156149c2269ae45640cf66426cd760625 100644
--- a/styles/src/styleTree/search.ts
+++ b/styles/src/styleTree/search.ts
@@ -2,6 +2,8 @@ import Theme from "../themes/theme";
 import { backgroundColor, border, player, text } from "./components";
 
 export default function search(theme: Theme) {
+
+  // Search input
   const editor = {
     background: backgroundColor(theme, 500),
     cornerRadius: 8,
@@ -12,7 +14,7 @@ export default function search(theme: Theme) {
     text: text(theme, "mono", "active"),
     border: border(theme, "secondary"),
     margin: {
-      right: 6,
+      right: 12,
     },
     padding: {
       top: 3,
@@ -29,17 +31,16 @@ export default function search(theme: Theme) {
     optionButton: {
       ...text(theme, "mono", "secondary"),
       background: backgroundColor(theme, "on500"),
-      cornerRadius: 4,
+      cornerRadius: 6,
       border: border(theme, "secondary"),
       margin: {
-        left: 2,
-        right: 2,
+        right: 4,
       },
       padding: {
-        bottom: 3,
-        left: 8,
-        right: 8,
-        top: 3,
+        bottom: 2,
+        left: 10,
+        right: 10,
+        top: 2,
       },
       active: {
         ...text(theme, "mono", "active"),
@@ -63,8 +64,8 @@ export default function search(theme: Theme) {
     },
     optionButtonGroup: {
       padding: {
-        left: 4,
-        right: 4,
+        left: 12,
+        right: 12,
       },
     },
     resultsStatus: {