diff --git a/MainWindow.xaml b/MainWindow.xaml
index cc31a73..ce0d36f 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -406,46 +406,46 @@
                                 </DockPanel>
                                 <TextBlock Text="Border Thickness" Foreground="#a0a0b0" FontSize="11" Margin="0,0,0,2"/>
                                 <DockPanel Margin="0,0,0,6">
+                                    <Button DockPanel.Dock="Right" Style="{StaticResource IconButton}"
+                                            IsEnabled="False" Width="22" Height="22" Margin="4,0,0,0">
+                                        <Path Data="M4,9 L8,14 L16,4" Stroke="#22c55e" StrokeThickness="2"
+                                              Width="14" Height="14" Stretch="Uniform"/>
+                                    </Button>
+                                    <Button DockPanel.Dock="Right" Style="{StaticResource IconButton}"
+                                            Width="22" Height="22" ToolTip="Revert"
+                                            Click="WebcamBorderRevert_Click" Margin="4,0,0,0">
+                                        <Path Data="M5,5 L15,15 M15,5 L5,15" Stroke="#e94560" StrokeThickness="2"
+                                              Width="14" Height="14" Stretch="Uniform"/>
+                                    </Button>
                                     <Slider DockPanel.Dock="Left" Width="120" Minimum="0" Maximum="10"
                                             Value="{Binding SelectedElement.BorderWidth, Mode=TwoWay}"
                                             VerticalAlignment="Center" TickFrequency="1" IsSnapToTickEnabled="True"/>
                                     <TextBlock Text="{Binding SelectedElement.BorderWidth}" Foreground="#a0a0b0" FontSize="11"
                                                VerticalAlignment="Center" Margin="8,0,0,0" Width="20"/>
                                 </DockPanel>
-                                <DockPanel Margin="0,4,0,0">
-                                    <Button DockPanel.Dock="Right" Style="{StaticResource IconButton}"
-                                            ToolTip="Revert" Click="WebcamBorderRevert_Click" Margin="4,0,0,0">
-                                        <Path Data="M5,5 L15,15 M15,5 L5,15" Stroke="#e94560" StrokeThickness="2"
-                                              Width="14" Height="14" Stretch="Uniform"/>
-                                    </Button>
-                                    <Button DockPanel.Dock="Right" IsEnabled="False" Margin="4,0,0,0">
-                                        <Path Data="M4,9 L8,14 L16,4" Stroke="#22c55e" StrokeThickness="2"
-                                              Width="14" Height="14" Stretch="Uniform"/>
-                                    </Button>
-                                </DockPanel>
                             </StackPanel>
 
                             <!-- Countdown config -->
                             <StackPanel Visibility="{Binding SelectedElement.Type, Converter={StaticResource SourceTypeToCountdownVis}, ConverterParameter=Countdown}" Margin="0,0,0,8">
                                 <TextBlock Text="Timer (minutes)" Foreground="#a0a0b0" FontSize="11" Margin="0,0,0,2"/>
                                 <DockPanel Margin="0,0,0,6">
+                                    <Button DockPanel.Dock="Right" Style="{StaticResource IconButton}"
+                                            Width="22" Height="22" ToolTip="Revert"
+                                            Click="CountdownRevert_Click" Margin="4,0,0,0">
+                                        <Path Data="M5,5 L15,15 M15,5 L5,15" Stroke="#e94560" StrokeThickness="2"
+                                              Width="14" Height="14" Stretch="Uniform"/>
+                                    </Button>
+                                    <Button DockPanel.Dock="Right" Style="{StaticResource IconButton}"
+                                            IsEnabled="False" Width="22" Height="22" Margin="4,0,0,0">
+                                        <Path Data="M4,9 L8,14 L16,4" Stroke="#22c55e" StrokeThickness="2"
+                                              Width="14" Height="14" Stretch="Uniform"/>
+                                    </Button>
                                     <Slider DockPanel.Dock="Left" Width="120" Minimum="1" Maximum="60"
                                             Value="{Binding SelectedElement.TimerMinutes, Mode=TwoWay}"
                                             VerticalAlignment="Center" TickFrequency="1" IsSnapToTickEnabled="True"/>
                                     <TextBlock Text="{Binding SelectedElement.TimerMinutes}" Foreground="#a0a0b0" FontSize="11"
                                                VerticalAlignment="Center" Margin="8,0,0,0" Width="20"/>
                                 </DockPanel>
-                                <DockPanel Margin="0,4,0,0">
-                                    <Button DockPanel.Dock="Right" Style="{StaticResource IconButton}"
-                                            ToolTip="Revert" Click="CountdownRevert_Click" Margin="4,0,0,0">
-                                        <Path Data="M5,5 L15,15 M15,5 L5,15" Stroke="#e94560" StrokeThickness="2"
-                                              Width="14" Height="14" Stretch="Uniform"/>
-                                    </Button>
-                                    <Button DockPanel.Dock="Right" IsEnabled="False" Margin="4,0,0,0">
-                                        <Path Data="M4,9 L8,14 L16,4" Stroke="#22c55e" StrokeThickness="2"
-                                              Width="14" Height="14" Stretch="Uniform"/>
-                                    </Button>
-                                </DockPanel>
                             </StackPanel>
 
                             <!-- Web source config -->
@@ -457,11 +457,13 @@
                                          ToolTip="https://example.com"/>
                                 <DockPanel Margin="0,4,0,0">
                                     <Button DockPanel.Dock="Right" Style="{StaticResource IconButton}"
-                                            ToolTip="Revert" Click="WebRevert_Click" Margin="4,0,0,0">
+                                            Width="22" Height="22" ToolTip="Revert"
+                                            Click="WebRevert_Click" Margin="4,0,0,0">
                                         <Path Data="M5,5 L15,15 M15,5 L5,15" Stroke="#e94560" StrokeThickness="2"
                                               Width="14" Height="14" Stretch="Uniform"/>
                                     </Button>
-                                    <Button DockPanel.Dock="Right" IsEnabled="False" Margin="4,0,0,0">
+                                    <Button DockPanel.Dock="Right" Style="{StaticResource IconButton}"
+                                            IsEnabled="False" Width="22" Height="22" Margin="4,0,0,0">
                                         <Path Data="M4,9 L8,14 L16,4" Stroke="#22c55e" StrokeThickness="2"
                                               Width="14" Height="14" Stretch="Uniform"/>
                                     </Button>