diff --git a/src/Resources/Styles.axaml b/src/Resources/Styles.axaml
index 9ecbb0b8..60d14196 100644
--- a/src/Resources/Styles.axaml
+++ b/src/Resources/Styles.axaml
@@ -233,7 +233,7 @@
   <Style Selector="TextBlock.group_header_label">
     <Setter Property="Foreground" Value="{DynamicResource Brush.FG2}"/>
     <Setter Property="FontWeight" Value="Bold"/>
-    <Setter Property="Margin" Value="8,0,0,0"/>
+    <Setter Property="Margin" Value="10,0,0,0"/>
   </Style>
   <Style Selector="TextBlock.info_label">
     <Setter Property="Foreground" Value="{DynamicResource Brush.FG2}"/>
@@ -985,7 +985,7 @@
   </Style>
 
   <Style Selector="ToggleButton.group_expander">
-    <Setter Property="Margin" Value="0"/>
+    <Setter Property="Margin" Value="8,0,0,0"/>
     <Setter Property="Padding" Value="0"/>
     <Setter Property="Background" Value="Transparent"/>
     <Setter Property="HorizontalAlignment" Value="Stretch"/>
@@ -995,8 +995,8 @@
         <Grid ColumnDefinitions="Auto,*">
           <Path Grid.Column="0"
                 x:Name="PART_IndicatorIcon"
-                Margin="4,0,0,0"
                 Width="10"
+                Margin="0,0,2,0"
                 Data="{StaticResource Icons.Down}"
                 Fill="{DynamicResource Brush.FG2}"
                 VerticalAlignment="Center"
diff --git a/src/Views/Repository.axaml b/src/Views/Repository.axaml
index e5ae8a79..0f0a6646 100644
--- a/src/Views/Repository.axaml
+++ b/src/Views/Repository.axaml
@@ -366,7 +366,7 @@
           <!-- Tags -->
           <ToggleButton Grid.Row="6" Classes="group_expander" IsChecked="{Binding IsTagGroupExpanded, Mode=TwoWay}">
             <Grid ColumnDefinitions="Auto,*,Auto">
-              <TextBlock Grid.Column="0" Classes="group_header_label" Margin="4,0,0,0" Text="{DynamicResource Text.Repository.Tags}"/>
+              <TextBlock Grid.Column="0" Classes="group_header_label" Margin="0" Text="{DynamicResource Text.Repository.Tags}"/>
               <TextBlock Grid.Column="1" Text="{Binding Tags, Converter={x:Static c:ListConverters.ToCount}}" Foreground="{DynamicResource Brush.FG2}" FontWeight="Bold"/>
               <Button Grid.Column="2" Classes="icon_button" Width="14" Margin="8,0" Command="{Binding CreateNewTag}" ToolTip.Tip="{DynamicResource Text.Repository.Tags.Add}">
                 <Path Width="12" Height="12" Data="{StaticResource Icons.Tag.Add}"/>
@@ -454,7 +454,7 @@
           <!-- Submodules -->
           <ToggleButton Grid.Row="8" Classes="group_expander" IsChecked="{Binding IsSubmoduleGroupExpanded, Mode=TwoWay}">
             <Grid ColumnDefinitions="Auto,*,Auto,Auto">
-              <TextBlock Grid.Column="0" Classes="group_header_label" Margin="4,0,0,0" Text="{DynamicResource Text.Repository.Submodules}"/>
+              <TextBlock Grid.Column="0" Classes="group_header_label" Margin="0" Text="{DynamicResource Text.Repository.Submodules}"/>
               <TextBlock Grid.Column="1" Text="{Binding Submodules, Converter={x:Static c:ListConverters.ToCount}}" Foreground="{DynamicResource Brush.FG2}" FontWeight="Bold"/>
               <Button Grid.Column="2"
                       Classes="icon_button"