diff --git a/desktop/src/components/AnnounceSwitch.svelte b/desktop/src/components/AnnounceSwitch.svelte
index ab8fb9a63..7d42bcb21 100644
--- a/desktop/src/components/AnnounceSwitch.svelte
+++ b/desktop/src/components/AnnounceSwitch.svelte
@@ -40,6 +40,7 @@
 
 <div class="container">
   <Button
+    stylePadding="0 0.75rem"
     variant="ghost"
     flatRight
     active={$announce}
@@ -50,6 +51,7 @@
   </Button>
 
   <Button
+    stylePadding="0 0.75rem"
     variant="ghost"
     flatLeft
     active={!$announce}
diff --git a/desktop/src/components/BadgeCounterSwitch.svelte b/desktop/src/components/BadgeCounterSwitch.svelte
index 11f55e129..f45c62361 100644
--- a/desktop/src/components/BadgeCounterSwitch.svelte
+++ b/desktop/src/components/BadgeCounterSwitch.svelte
@@ -29,6 +29,7 @@
 
 <div class="container">
   <Button
+    stylePadding="0 0.75rem"
     variant="ghost"
     flatRight
     active={$badgeCounter}
@@ -36,6 +37,7 @@
     Show
   </Button>
   <Button
+    stylePadding="0 0.75rem"
     variant="ghost"
     flatLeft
     active={!$badgeCounter}
diff --git a/desktop/src/components/CodeFontSwitch.svelte b/desktop/src/components/CodeFontSwitch.svelte
index 7a5e2eb05..3718274c7 100644
--- a/desktop/src/components/CodeFontSwitch.svelte
+++ b/desktop/src/components/CodeFontSwitch.svelte
@@ -31,6 +31,7 @@
 
 <div class="container">
   <Button
+    stylePadding="0 0.75rem"
     variant="ghost"
     flatRight
     active={$codeFont === "jetbrains"}
@@ -39,6 +40,7 @@
   </Button>
 
   <Button
+    stylePadding="0 0.75rem"
     variant="ghost"
     flatLeft
     active={$codeFont === "system"}
diff --git a/desktop/src/components/RepoListSwitch.svelte b/desktop/src/components/RepoListSwitch.svelte
index 214059705..76784dfe0 100644
--- a/desktop/src/components/RepoListSwitch.svelte
+++ b/desktop/src/components/RepoListSwitch.svelte
@@ -13,6 +13,7 @@
 
 <div class="container">
   <Button
+    stylePadding="0 0.75rem"
     variant="ghost"
     flatRight
     active={repoListScope.value === "seeded"}
@@ -21,6 +22,7 @@
   </Button>
 
   <Button
+    stylePadding="0 0.75rem"
     variant="ghost"
     flatLeft
     active={repoListScope.value === "all"}
diff --git a/desktop/src/components/SegmentedSwitch.svelte b/desktop/src/components/SegmentedSwitch.svelte
index 496cf5c09..a5166e0f8 100644
--- a/desktop/src/components/SegmentedSwitch.svelte
+++ b/desktop/src/components/SegmentedSwitch.svelte
@@ -38,6 +38,7 @@
       active={value === option.value}
       title={option.title}
       onclick={() => onchange(option.value)}
+      stylePadding={option.label ? "0 0.75rem" : undefined}
       styleJustifyContent="center">
       {#if option.icon}
         <Icon name={option.icon} />
diff --git a/desktop/src/components/ThemeSwitch.svelte b/desktop/src/components/ThemeSwitch.svelte
index 7dc8827bf..cac164543 100644
--- a/desktop/src/components/ThemeSwitch.svelte
+++ b/desktop/src/components/ThemeSwitch.svelte
@@ -54,6 +54,7 @@
 
 <div class="container">
   <Button
+    stylePadding="0 0.75rem"
     variant="ghost"
     flatRight
     active={$followSystemTheme}
@@ -61,6 +62,7 @@
     System
   </Button>
   <Button
+    stylePadding="0 0.75rem"
     variant="ghost"
     flatLeft
     flatRight
@@ -69,6 +71,7 @@
     Light
   </Button>
   <Button
+    stylePadding="0 0.75rem"
     variant="ghost"
     flatLeft
     active={!$followSystemTheme && $theme === "dark"}
diff --git a/desktop/src/components/UpdateSwitch.svelte b/desktop/src/components/UpdateSwitch.svelte
index 60c52c5ba..bc00094bf 100644
--- a/desktop/src/components/UpdateSwitch.svelte
+++ b/desktop/src/components/UpdateSwitch.svelte
@@ -18,11 +18,21 @@
 </style>
 
 <div class="container">
-  <Button variant="ghost" flatRight active={!active} onclick={disable}>
+  <Button
+    stylePadding="0 0.75rem"
+    variant="ghost"
+    flatRight
+    active={!active}
+    onclick={disable}>
     Disable
   </Button>
 
-  <Button variant="ghost" flatLeft active={Boolean(active)} onclick={enable}>
+  <Button
+    stylePadding="0 0.75rem"
+    variant="ghost"
+    flatLeft
+    active={Boolean(active)}
+    onclick={enable}>
     Enable
   </Button>
 </div>