diff --git a/src/ClaudeDo.Ui/Views/Modals/SettingsModalView.axaml b/src/ClaudeDo.Ui/Views/Modals/SettingsModalView.axaml
index 3544968..0e800a9 100644
--- a/src/ClaudeDo.Ui/Views/Modals/SettingsModalView.axaml
+++ b/src/ClaudeDo.Ui/Views/Modals/SettingsModalView.axaml
@@ -25,9 +25,8 @@
   <ctl:ModalShell Title="SETTINGS" CloseCommand="{Binding CancelCommand}">
     <ctl:ModalShell.Footer>
       <StackPanel Orientation="Horizontal" Spacing="8"
-                  HorizontalAlignment="Right" VerticalAlignment="Center"
-                  Margin="16,0">
-        <Button Content="Cancel" Command="{Binding CancelCommand}" MinWidth="90"/>
+                  HorizontalAlignment="Right" VerticalAlignment="Center">
+        <Button Classes="btn" Content="Cancel" Command="{Binding CancelCommand}" MinWidth="90"/>
         <Button Content="Save" Classes="primary"
                 Command="{Binding SaveCommand}"
                 IsEnabled="{Binding !IsBusy}" MinWidth="90"/>
@@ -44,7 +43,7 @@
                    IsVisible="{Binding StatusMessage, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"/>
       </StackPanel>
 
-      <TabControl Padding="20,12" TabStripPlacement="Top">
+      <TabControl Padding="20,16" TabStripPlacement="Top">
 
         <TabItem Header="General">
           <ScrollViewer>
@@ -105,7 +104,7 @@
               </StackPanel>
               <Border BorderBrush="{DynamicResource LineBrush}" BorderThickness="0,1,0,0" Margin="0,4,0,0"/>
               <StackPanel Spacing="8">
-                <Button Content="Cleanup finished worktrees"
+                <Button Classes="btn" Content="Cleanup finished worktrees"
                         Command="{Binding Worktrees.CleanupWorktreesCommand}"
                         HorizontalAlignment="Left"/>
                 <StackPanel>
@@ -119,7 +118,7 @@
                       <TextBlock Text="Remove ALL worktrees? Uncommitted work will be lost."
                                  Foreground="{DynamicResource TextBrush}" TextWrapping="Wrap"/>
                       <StackPanel Orientation="Horizontal" Spacing="8">
-                        <Button Content="Cancel" Command="{Binding Worktrees.CancelResetConfirmCommand}"/>
+                        <Button Classes="btn" Content="Cancel" Command="{Binding Worktrees.CancelResetConfirmCommand}"/>
                         <Button Content="Remove All" Classes="danger"
                                 Command="{Binding Worktrees.ConfirmResetAllCommand}"/>
                       </StackPanel>
@@ -135,12 +134,12 @@
 
         <TabItem Header="Files">
           <ScrollViewer>
-            <StackPanel Spacing="14" Margin="0,8,0,0">
+            <StackPanel Spacing="12" Margin="0,8,0,0">
               <StackPanel Spacing="6">
                 <TextBlock Classes="section-label" Text="AGENTS"/>
                 <TextBlock Classes="meta" Text="Restore bundled default agents. Existing files are not overwritten."
                            TextWrapping="Wrap"/>
-                <Button Content="Restore default agents"
+                <Button Classes="btn" Content="Restore default agents"
                         Command="{Binding Files.RestoreDefaultAgentsCommand}"
                         IsEnabled="{Binding !Files.IsBusy}"
                         HorizontalAlignment="Left"/>
@@ -150,15 +149,15 @@
                 <Grid RowDefinitions="Auto,Auto,Auto" ColumnDefinitions="90,*,Auto" RowSpacing="8">
                   <TextBlock Grid.Row="0" Grid.Column="0" Classes="field-label" Text="System" VerticalAlignment="Center"/>
                   <TextBlock Grid.Row="0" Grid.Column="1" Classes="path-mono" Text="{Binding Files.SystemPromptPath}" VerticalAlignment="Center"/>
-                  <Button Grid.Row="0" Grid.Column="2" Content="Open in editor"
+                  <Button Classes="btn" Grid.Row="0" Grid.Column="2" Content="Open in editor"
                           Command="{Binding Files.OpenPromptCommand}" CommandParameter="System"/>
                   <TextBlock Grid.Row="1" Grid.Column="0" Classes="field-label" Text="Planning" VerticalAlignment="Center"/>
                   <TextBlock Grid.Row="1" Grid.Column="1" Classes="path-mono" Text="{Binding Files.PlanningPromptPath}" VerticalAlignment="Center"/>
-                  <Button Grid.Row="1" Grid.Column="2" Content="Open in editor"
+                  <Button Classes="btn" Grid.Row="1" Grid.Column="2" Content="Open in editor"
                           Command="{Binding Files.OpenPromptCommand}" CommandParameter="Planning"/>
                   <TextBlock Grid.Row="2" Grid.Column="0" Classes="field-label" Text="Agent" VerticalAlignment="Center"/>
                   <TextBlock Grid.Row="2" Grid.Column="1" Classes="path-mono" Text="{Binding Files.AgentPromptPath}" VerticalAlignment="Center"/>
-                  <Button Grid.Row="2" Grid.Column="2" Content="Open in editor"
+                  <Button Classes="btn" Grid.Row="2" Grid.Column="2" Content="Open in editor"
                           Command="{Binding Files.OpenPromptCommand}" CommandParameter="Agent"/>
                 </Grid>
               </StackPanel>
@@ -194,7 +193,7 @@
                                   IsChecked="{Binding WorkdaysOnly, Mode=TwoWay}" VerticalAlignment="Center"/>
                         <TextBlock Classes="meta" Grid.Column="4" Text="{Binding LastRunLabel}" VerticalAlignment="Center"
                                    MinWidth="80"/>
-                        <Button Grid.Column="5" Content="✕"
+                        <Button Classes="icon-btn" Grid.Column="5" Content="✕"
                                 Command="{Binding $parent[ItemsControl].((vm:SettingsModalViewModel)DataContext).Prime.RemoveScheduleCommand}"
                                 CommandParameter="{Binding}"/>
                       </Grid>
@@ -202,7 +201,7 @@
                   </DataTemplate>
                 </ItemsControl.ItemTemplate>
               </ItemsControl>
-              <Button Content="+ Add schedule" Command="{Binding Prime.AddScheduleCommand}" HorizontalAlignment="Left"/>
+              <Button Classes="btn" Content="+ Add schedule" Command="{Binding Prime.AddScheduleCommand}" HorizontalAlignment="Left"/>
             </StackPanel>
           </ScrollViewer>
         </TabItem>