diff --git a/src/Views/Launcher.axaml b/src/Views/Launcher.axaml
index 066ee207..3aee0759 100644
--- a/src/Views/Launcher.axaml
+++ b/src/Views/Launcher.axaml
@@ -37,7 +37,7 @@
       <!-- Menu (Windows) -->
       <Button Grid.Column="0"
               Classes="icon_button"
-              Margin="8,0,2,3"
+              Margin="4,0,2,3"
               VerticalAlignment="Bottom"
               IsVisible="{Binding Source={x:Static vm:Preference.Instance}, Path=UseMacOSStyle, Converter={x:Static BoolConverters.Not}}">
         <Button.Flyout>
diff --git a/src/Views/Repository.axaml b/src/Views/Repository.axaml
index 18fcaa69..8060aa15 100644
--- a/src/Views/Repository.axaml
+++ b/src/Views/Repository.axaml
@@ -13,7 +13,7 @@
     <!-- Toolbar -->
     <Border Grid.Row="0" BorderBrush="{DynamicResource Brush.Border0}" BorderThickness="0,0,0,1" Background="{DynamicResource Brush.ToolBar}">
       <Grid ColumnDefinitions="*,Auto,*">
-        <StackPanel Grid.Column="0" Orientation="Horizontal" Margin="10,0,0,0">
+        <StackPanel Grid.Column="0" Orientation="Horizontal" Margin="4,0,0,0">
           <Button Classes="icon_button" Width="32" Command="{Binding OpenInFileManager}" ToolTip.Tip="{DynamicResource Text.Repository.Explore}">
             <Path Width="15" Height="13" Data="{StaticResource Icons.Folder.Open}"/>
           </Button>
@@ -69,7 +69,7 @@
           </Button>
         </StackPanel>
 
-        <StackPanel Grid.Column="2" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,0,10,0">
+        <StackPanel Grid.Column="2" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,0,4,0">
           <ToggleButton Classes="layout_direction" 
                         Width="32" Height="26"
                         Padding="9,6"
diff --git a/src/Views/Welcome.axaml b/src/Views/Welcome.axaml
index f066d211..461b38b2 100644
--- a/src/Views/Welcome.axaml
+++ b/src/Views/Welcome.axaml
@@ -10,7 +10,7 @@
              x:DataType="vm:Welcome">
   <Grid RowDefinitions="36,*,36" Background="{DynamicResource Brush.Window}">
     <Border Grid.Row="0" BorderBrush="{DynamicResource Brush.Border0}" BorderThickness="0,0,0,1" Background="{DynamicResource Brush.ToolBar}">
-      <StackPanel Orientation="Horizontal" Margin="10,0,0,0">
+      <StackPanel Orientation="Horizontal" Margin="4,0,0,0">
         <Button Classes="icon_button" Width="32" Click="OpenLocalRepository" ToolTip.Tip="{DynamicResource Text.Welcome.OpenOrInit}">
           <Path Width="15" Height="13" Data="{StaticResource Icons.Folder.Open}"/>
         </Button>