diff --git a/Sources/Bedrock/Views/Settings/SegmentedPicker.swift b/Sources/Bedrock/Views/Settings/SegmentedPicker.swift
index 881a139..bc7fb75 100644
--- a/Sources/Bedrock/Views/Settings/SegmentedPicker.swift
+++ b/Sources/Bedrock/Views/Settings/SegmentedPicker.swift
@@ -72,8 +72,8 @@ public struct SegmentedPicker<T: Equatable>: View {
                 }
             }
         }
-        .padding(.vertical, Design.Spacing.medium)
-        .padding(.horizontal, Design.Spacing.medium)
+        .padding(.vertical, Design.Spacing.small)
+        .padding(.horizontal, Design.Spacing.small)
     }
 }
 
diff --git a/Sources/Bedrock/Views/Settings/SettingsNavigationRow.swift b/Sources/Bedrock/Views/Settings/SettingsNavigationRow.swift
index 9e4452c..9499227 100644
--- a/Sources/Bedrock/Views/Settings/SettingsNavigationRow.swift
+++ b/Sources/Bedrock/Views/Settings/SettingsNavigationRow.swift
@@ -76,10 +76,12 @@ public struct SettingsNavigationRow<Destination: View>: View {
                 
                 SymbolIcon.chevron(color: .secondary)
             }
-            .padding(.vertical, Design.Spacing.medium)
-            .padding(.horizontal, Design.Spacing.medium)
+            .padding(.vertical, Design.Spacing.small)
+            .padding(.horizontal, Design.Spacing.small)
             .background(backgroundColor, in: RoundedRectangle(cornerRadius: Design.CornerRadius.medium))
         }
+        .padding(.vertical, Design.Spacing.small)
+        .padding(.horizontal, Design.Spacing.small)
         .buttonStyle(.plain)
     }
 }
diff --git a/Sources/Bedrock/Views/Settings/SettingsRow.swift b/Sources/Bedrock/Views/Settings/SettingsRow.swift
index f8fed9e..54777c9 100644
--- a/Sources/Bedrock/Views/Settings/SettingsRow.swift
+++ b/Sources/Bedrock/Views/Settings/SettingsRow.swift
@@ -78,6 +78,8 @@ public struct SettingsRow<Accessory: View>: View {
             .background(Color(.secondarySystemGroupedBackground))
             .clipShape(.rect(cornerRadius: Design.CornerRadius.small))
         }
+        .padding(.vertical, Design.Spacing.small)
+        .padding(.horizontal, Design.Spacing.small)
         .buttonStyle(.plain)
     }
 }
diff --git a/Sources/Bedrock/Views/Settings/SettingsSegmentedPicker.swift b/Sources/Bedrock/Views/Settings/SettingsSegmentedPicker.swift
index 34488a7..a66ff0a 100644
--- a/Sources/Bedrock/Views/Settings/SettingsSegmentedPicker.swift
+++ b/Sources/Bedrock/Views/Settings/SettingsSegmentedPicker.swift
@@ -111,8 +111,8 @@ public struct SettingsSegmentedPicker<T: Equatable, Accessory: View>: View {
             }
             .sensoryFeedback(.selection, trigger: selection)
         }
-        .padding(.vertical, Design.Spacing.medium)
-        .padding(.horizontal, Design.Spacing.medium)
+        .padding(.vertical, Design.Spacing.small)
+        .padding(.horizontal, Design.Spacing.small)
     }
 }
 
diff --git a/Sources/Bedrock/Views/Settings/SettingsSlider.swift b/Sources/Bedrock/Views/Settings/SettingsSlider.swift
index 9c85833..c522ae5 100644
--- a/Sources/Bedrock/Views/Settings/SettingsSlider.swift
+++ b/Sources/Bedrock/Views/Settings/SettingsSlider.swift
@@ -141,8 +141,8 @@ public struct SettingsSlider<Value: BinaryFloatingPoint & Sendable>: View where
                 }
             }
         }
-        .padding(.vertical, Design.Spacing.medium)
-        .padding(.horizontal, Design.Spacing.medium)
+        .padding(.vertical, Design.Spacing.small)
+        .padding(.horizontal, Design.Spacing.small)
     }
 }
 
diff --git a/Sources/Bedrock/Views/Settings/SettingsToggle.swift b/Sources/Bedrock/Views/Settings/SettingsToggle.swift
index 4a8166a..7b69f4d 100644
--- a/Sources/Bedrock/Views/Settings/SettingsToggle.swift
+++ b/Sources/Bedrock/Views/Settings/SettingsToggle.swift
@@ -90,8 +90,8 @@ public struct SettingsToggle<Accessory: View>: View {
             }
         }
         .tint(accentColor)
-        .padding(.vertical, Design.Spacing.medium)
-        .padding(.horizontal, Design.Spacing.medium)
+        .padding(.vertical, Design.Spacing.small)
+        .padding(.horizontal, Design.Spacing.small)
         .sensoryFeedback(.impact(flexibility: .soft), trigger: isOn)
     }
 }
diff --git a/Sources/Bedrock/Views/Settings/iCloudSyncSettingsView.swift b/Sources/Bedrock/Views/Settings/iCloudSyncSettingsView.swift
index 61fca04..630ec44 100644
--- a/Sources/Bedrock/Views/Settings/iCloudSyncSettingsView.swift
+++ b/Sources/Bedrock/Views/Settings/iCloudSyncSettingsView.swift
@@ -151,7 +151,7 @@ private struct SyncStatusRow<ViewModel: CloudSyncable>: View {
                     Text(String(localized: "Sync Now")).styled(.captionEmphasis, emphasis: .custom(accentColor))
                 }
             }
-            .padding(.horizontal, Design.Spacing.medium)
+            .padding(.horizontal, Design.Spacing.small)
         }
     }