diff --git a/src/Converters/ListConverters.cs b/src/Converters/ListConverters.cs
index 81cac8b7..e0c5967e 100644
--- a/src/Converters/ListConverters.cs
+++ b/src/Converters/ListConverters.cs
@@ -8,7 +8,7 @@ namespace SourceGit.Converters
     public static class ListConverters
     {
         public static readonly FuncValueConverter<IList, string> ToCount =
-            new FuncValueConverter<IList, string>(v => v == null ? " (0)" : $" ({v.Count})");
+            new FuncValueConverter<IList, string>(v => v == null ? "(0)" : $"({v.Count})");
 
         public static readonly FuncValueConverter<IList, bool> IsNullOrEmpty =
             new FuncValueConverter<IList, bool>(v => v == null || v.Count == 0);
diff --git a/src/ViewModels/BranchTreeNode.cs b/src/ViewModels/BranchTreeNode.cs
index d0289f6a..ee78d113 100644
--- a/src/ViewModels/BranchTreeNode.cs
+++ b/src/ViewModels/BranchTreeNode.cs
@@ -102,13 +102,12 @@ namespace SourceGit.ViewModels
                     if (branch.IsLocal)
                     {
                         MakeBranchNode(branch, _locals, folders, "refs/heads", bForceExpanded);
+                        continue;
                     }
-                    else
-                    {
-                        var remote = _remotes.Find(x => x.Name == branch.Remote);
-                        if (remote != null)
-                            MakeBranchNode(branch, remote.Children, folders, $"refs/remotes/{remote.Name}", bForceExpanded);
-                    }
+
+                    var rk = $"refs/remotes/{branch.Remote}";
+                    if (folders.TryGetValue(rk, out var remote))
+                        MakeBranchNode(branch, remote.Children, folders, rk, bForceExpanded);
                 }
 
                 foreach (var path in _expanded)
diff --git a/src/Views/Repository.axaml b/src/Views/Repository.axaml
index 2896a5ff..425ed130 100644
--- a/src/Views/Repository.axaml
+++ b/src/Views/Repository.axaml
@@ -256,16 +256,18 @@
 
           <!-- Tags -->
           <ToggleButton Grid.Row="4" Classes="group_expander" IsChecked="{Binding IsTagGroupExpanded, Mode=TwoWay}">
-            <Grid ColumnDefinitions="16,Auto,*,Auto,Auto,Auto">
+            <Grid ColumnDefinitions="16,*,Auto,Auto,Auto">
               <Path Grid.Column="0" Width="11" Height="11" Margin="2,1,0,0" HorizontalAlignment="Left" Data="{StaticResource Icons.Tags}" Fill="{DynamicResource Brush.FG2}"/>
-              <TextBlock Grid.Column="1" Classes="group_header_label" Margin="0" Text="{DynamicResource Text.Repository.Tags}"/>
-              <TextBlock Grid.Column="2" Text="{Binding Tags, Converter={x:Static c:ListConverters.ToCount}}" Foreground="{DynamicResource Brush.FG2}" FontWeight="Bold"/>
-              <ToggleButton Grid.Column="3"
+              <TextBlock Grid.Column="1" Classes="group_header_label" Margin="0">
+                <Run Text="{DynamicResource Text.Repository.Tags}"/>
+                <Run Text="{Binding Tags, Converter={x:Static c:ListConverters.ToCount}}"/>
+              </TextBlock>
+              <ToggleButton Grid.Column="2"
                             Classes="tag_display_mode"
                             Width="14"
                             IsChecked="{Binding Source={x:Static vm:Preferences.Instance}, Path=ShowTagsAsTree, Mode=TwoWay}"
                             ToolTip.Tip="{DynamicResource Text.Repository.ShowTagsAsTree}"/>
-              <Button Grid.Column="4"
+              <Button Grid.Column="3"
                       Classes="icon_button"
                       Width="14"
                       Margin="8,0,0,0"
@@ -273,7 +275,7 @@
                       ToolTip.Tip="{DynamicResource Text.Repository.Tags.Sort}">
                 <Path Width="12" Height="12" Margin="0,2,0,0" Data="{StaticResource Icons.Order}"/>
               </Button>
-              <Button Grid.Column="5"
+              <Button Grid.Column="4"
                       Classes="icon_button"
                       Width="14"
                       Margin="8,0"
@@ -297,11 +299,13 @@
 
           <!-- Submodules -->
           <ToggleButton Grid.Row="6" Classes="group_expander" IsChecked="{Binding IsSubmoduleGroupExpanded, Mode=TwoWay}">
-            <Grid ColumnDefinitions="16,Auto,*,Auto,Auto">
+            <Grid ColumnDefinitions="16,*,Auto,Auto">
               <Path Grid.Column="0" Width="10" Height="10" Margin="2,0,0,0" HorizontalAlignment="Left" Data="{StaticResource Icons.Submodules}" Fill="{DynamicResource Brush.FG2}"/>
-              <TextBlock Grid.Column="1" Classes="group_header_label" Margin="0" Text="{DynamicResource Text.Repository.Submodules}"/>
-              <TextBlock Grid.Column="2" Text="{Binding Submodules, Converter={x:Static c:ListConverters.ToCount}}" Foreground="{DynamicResource Brush.FG2}" FontWeight="Bold"/>
-              <Button Grid.Column="3"
+              <TextBlock Grid.Column="1" Classes="group_header_label" Margin="0">
+                <Run Text="{DynamicResource Text.Repository.Submodules}"/>
+                <Run Text="{Binding Submodules, Converter={x:Static c:ListConverters.ToCount}}"/>
+              </TextBlock>
+              <Button Grid.Column="2"
                       Classes="icon_button"
                       Width="14"
                       Margin="8,0"
@@ -310,7 +314,7 @@
                       ToolTip.Tip="{DynamicResource Text.Repository.Submodules.Update}">
                 <Path Width="12" Height="12" Data="{StaticResource Icons.Loading}"/>
               </Button>
-              <Button Grid.Column="4"
+              <Button Grid.Column="3"
                       Classes="icon_button"
                       Width="14"
                       Margin="0,0,8,0"
@@ -353,11 +357,13 @@
 
           <!-- Worktrees -->
           <ToggleButton Grid.Row="8" Classes="group_expander" IsChecked="{Binding IsWorktreeGroupExpanded, Mode=TwoWay}">
-            <Grid ColumnDefinitions="16,Auto,*,Auto,Auto">
+            <Grid ColumnDefinitions="16,*,Auto,Auto">
               <Path Grid.Column="0" Width="11" Height="11" Margin="1,0,0,0" HorizontalAlignment="Left" Data="{StaticResource Icons.Worktrees}" Fill="{DynamicResource Brush.FG2}"/>
-              <TextBlock Grid.Column="1" Classes="group_header_label" Margin="0" Text="{DynamicResource Text.Repository.Worktrees}"/>
-              <TextBlock Grid.Column="2" Text="{Binding Worktrees, Converter={x:Static c:ListConverters.ToCount}}" Foreground="{DynamicResource Brush.FG2}" FontWeight="Bold"/>
-              <Button Grid.Column="3"
+              <TextBlock Grid.Column="1" Classes="group_header_label" Margin="0">
+                <Run Text="{DynamicResource Text.Repository.Worktrees}"/>
+                <Run Text="{Binding Worktrees, Converter={x:Static c:ListConverters.ToCount}}"/>
+              </TextBlock>
+              <Button Grid.Column="2"
                       Classes="icon_button"
                       Width="14"
                       Margin="8,0"
@@ -366,7 +372,7 @@
                       ToolTip.Tip="{DynamicResource Text.Repository.Worktrees.Prune}">
                 <Path Width="12" Height="12" Data="{StaticResource Icons.Loading}"/>
               </Button>
-              <Button Grid.Column="4"
+              <Button Grid.Column="3"
                       Classes="icon_button"
                       Width="14"
                       Margin="0,0,9,0"
diff --git a/src/Views/StashesPage.axaml b/src/Views/StashesPage.axaml
index 6b087eb8..319229c8 100644
--- a/src/Views/StashesPage.axaml
+++ b/src/Views/StashesPage.axaml
@@ -19,11 +19,13 @@
     <!-- Left -->
     <Grid Grid.Column="0" RowDefinitions="28,36,*,28,*">
       <!-- Stash Bar -->
-      <Grid Grid.Row="0" ColumnDefinitions="Auto,Auto,Auto,*,Auto">
+      <Grid Grid.Row="0" ColumnDefinitions="Auto,*,Auto">
         <Path Grid.Column="0" Margin="8,0,0,0" Width="14" Height="14" Fill="{DynamicResource Brush.FG2}" Data="{StaticResource Icons.Stashes}"/>
-        <TextBlock Grid.Column="1" Text="{DynamicResource Text.Stashes.Stashes}" Foreground="{DynamicResource Brush.FG2}" FontWeight="Bold" Margin="4,0,0,0"/>
-        <TextBlock Grid.Column="2" Text="{Binding Stashes, Converter={x:Static c:ListConverters.ToCount}}" Foreground="{DynamicResource Brush.FG2}" FontWeight="Bold"/>
-        <Button Grid.Column="4"
+        <TextBlock Grid.Column="1" Foreground="{DynamicResource Brush.FG2}" FontWeight="Bold" Margin="4,0,0,0">
+          <Run Text="{DynamicResource Text.Stashes.Stashes}"/>
+          <Run Text="{Binding Stashes, Converter={x:Static c:ListConverters.ToCount}}"/>
+        </TextBlock>
+        <Button Grid.Column="2"
                 Classes="icon_button"
                 Width="26" Height="14"
                 Padding="0"
@@ -105,10 +107,12 @@
 
       <!-- Changes Bar -->
       <Border Grid.Row="3" BorderThickness="0,1" BorderBrush="{DynamicResource Brush.Border0}">
-        <Grid ColumnDefinitions="Auto,Auto,*">
+        <Grid ColumnDefinitions="Auto,*">
           <Path Grid.Column="0" Margin="8,0,0,0" Width="14" Height="14" Fill="{DynamicResource Brush.FG2}" Data="{StaticResource Icons.Changes}"/>
-          <TextBlock Grid.Column="1" Text="{DynamicResource Text.Stashes.Changes}" Foreground="{DynamicResource Brush.FG2}" FontWeight="Bold" Margin="4,0,0,0"/>
-          <TextBlock Grid.Column="2" Text="{Binding Changes, Converter={x:Static c:ListConverters.ToCount}}" Foreground="{DynamicResource Brush.FG2}" FontWeight="Bold"/>
+          <TextBlock Grid.Column="1" Foreground="{DynamicResource Brush.FG2}" FontWeight="Bold" Margin="4,0,0,0">
+            <Run Text="{DynamicResource Text.Stashes.Changes}"/>
+            <Run Text="{Binding Changes, Converter={x:Static c:ListConverters.ToCount}}"/>
+          </TextBlock>
         </Grid>
       </Border>
 
diff --git a/src/Views/WorkingCopy.axaml b/src/Views/WorkingCopy.axaml
index f8640ec7..cc17f388 100644
--- a/src/Views/WorkingCopy.axaml
+++ b/src/Views/WorkingCopy.axaml
@@ -61,13 +61,15 @@
       <Grid Grid.Row="1" RowDefinitions="28,*">
         <!-- Unstaged Toolbar -->
         <Border Grid.Row="0" BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border0}">
-          <Grid ColumnDefinitions="Auto,Auto,Auto,Auto,*,Auto,Auto,Auto,Auto,Auto,Auto">
+          <Grid ColumnDefinitions="Auto,Auto,Auto,*,Auto,Auto,Auto,Auto,Auto,Auto">
             <Path Grid.Column="0" Margin="8,0,0,0" Width="14" Height="14" Fill="{DynamicResource Brush.FG2}" Data="{StaticResource Icons.Changes}"/>
-            <TextBlock Grid.Column="1" Text="{DynamicResource Text.WorkingCopy.Unstaged}" Foreground="{DynamicResource Brush.FG2}" FontWeight="Bold" Margin="4,0,0,0"/>
-            <TextBlock Grid.Column="2" FontWeight="Bold" Foreground="{DynamicResource Brush.FG2}" Text="{Binding Unstaged, Converter={x:Static c:ListConverters.ToCount}}"/>
-            <v:LoadingIcon Grid.Column="3" Width="14" Height="14" Margin="8,0,0,0" IsVisible="{Binding IsStaging}"/>
+            <TextBlock Grid.Column="1" Foreground="{DynamicResource Brush.FG2}" FontWeight="Bold" Margin="4,0,0,0">
+              <Run Text="{DynamicResource Text.WorkingCopy.Unstaged}"/>
+              <Run Text="{Binding Unstaged, Converter={x:Static c:ListConverters.ToCount}}"/>
+            </TextBlock>
+            <v:LoadingIcon Grid.Column="2" Width="14" Height="14" Margin="8,0,0,0" IsVisible="{Binding IsStaging}"/>
 
-            <Button Grid.Column="5"
+            <Button Grid.Column="4"
                     Classes="icon_button"
                     Width="26" Height="14"
                     Padding="0"
@@ -75,12 +77,12 @@
                     Command="{Binding OpenAssumeUnchanged}">
               <Path Width="14" Height="14" Data="{StaticResource Icons.File.Ignore}"/>
             </Button>
-            <ToggleButton Grid.Column="6"
+            <ToggleButton Grid.Column="5"
                           Classes="toggle_untracked"
                           Width="26" Height="14"
                           ToolTip.Tip="{DynamicResource Text.WorkingCopy.IncludeUntracked}"
                           IsChecked="{Binding IncludeUntracked, Mode=TwoWay}"/>
-            <Button Grid.Column="7"
+            <Button Grid.Column="6"
                     Classes="icon_button"
                     Width="26" Height="14"
                     Padding="0"
@@ -89,7 +91,7 @@
                     Command="{Binding OpenExternalMergeToolAllConflicts}">
               <Path Width="14" Height="14" Data="{StaticResource Icons.Conflict}"/>
             </Button>
-            <Button Grid.Column="8"
+            <Button Grid.Column="7"
                     Classes="icon_button"
                     Width="26" Height="14"
                     Padding="0"
@@ -102,7 +104,7 @@
               </ToolTip.Tip>
               <Path Width="14" Height="14" Margin="0,6,0,0" Data="{StaticResource Icons.Down}"/>
             </Button>
-            <Button Grid.Column="9"
+            <Button Grid.Column="8"
                     Classes="icon_button"
                     Width="26" Height="14"
                     Padding="0"
@@ -110,7 +112,7 @@
                     Command="{Binding StageAll}">
               <Path Width="14" Height="14" Data="{StaticResource Icons.DoubleDown}"/>
             </Button>
-            <v:ChangeViewModeSwitcher Grid.Column="10"
+            <v:ChangeViewModeSwitcher Grid.Column="9"
                                       Width="26" Height="14"
                                       Margin="0,1,0,0"
                                       ViewMode="{Binding Source={x:Static vm:Preferences.Instance}, Path=UnstagedChangeViewMode, Mode=TwoWay}"/>
@@ -142,12 +144,14 @@
       <Grid Grid.Row="3" RowDefinitions="28,*">
         <!-- Staged Toolbar -->
         <Border Grid.Row="0" BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border0}">
-          <Grid ColumnDefinitions="Auto,Auto,Auto,Auto,*,Auto,Auto,Auto">
+          <Grid ColumnDefinitions="Auto,Auto,Auto,*,Auto,Auto,Auto">
             <Path Grid.Column="0" Margin="8,0,0,0" Width="14" Height="14" Fill="{DynamicResource Brush.FG2}" Data="{StaticResource Icons.Changes}"/>
-            <TextBlock Grid.Column="1" Text="{DynamicResource Text.WorkingCopy.Staged}" Foreground="{DynamicResource Brush.FG2}" FontWeight="Bold" Margin="4,0,0,0"/>
-            <TextBlock Grid.Column="2" FontWeight="Bold" Foreground="{DynamicResource Brush.FG2}" Text="{Binding Staged, Converter={x:Static c:ListConverters.ToCount}}"/>
-            <v:LoadingIcon Grid.Column="3" Width="14" Height="14" Margin="8,0,0,0" IsVisible="{Binding IsUnstaging}"/>
-            <Button Grid.Column="5" Classes="icon_button" Width="26" Height="14" Padding="0" Click="OnUnstageSelectedButtonClicked">
+            <TextBlock Grid.Column="1" Foreground="{DynamicResource Brush.FG2}" FontWeight="Bold" Margin="4,0,0,0">
+              <Run Text="{DynamicResource Text.WorkingCopy.Staged}"/>
+              <Run Text="{Binding Staged, Converter={x:Static c:ListConverters.ToCount}}"/>
+            </TextBlock>
+            <v:LoadingIcon Grid.Column="2" Width="14" Height="14" Margin="8,0,0,0" IsVisible="{Binding IsUnstaging}"/>
+            <Button Grid.Column="4" Classes="icon_button" Width="26" Height="14" Padding="0" Click="OnUnstageSelectedButtonClicked">
               <ToolTip.Tip>
                 <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
                   <TextBlock Text="{DynamicResource Text.WorkingCopy.Staged.Unstage}" VerticalAlignment="Center"/>
@@ -156,10 +160,10 @@
               </ToolTip.Tip>
               <Path Width="14" Height="14" Margin="0,6,0,0" Data="{StaticResource Icons.Up}"/>
             </Button>
-            <Button Grid.Column="6" Classes="icon_button" Width="26" Height="14" Padding="0" ToolTip.Tip="{DynamicResource Text.WorkingCopy.Staged.UnstageAll}" Command="{Binding UnstageAll}">
+            <Button Grid.Column="5" Classes="icon_button" Width="26" Height="14" Padding="0" ToolTip.Tip="{DynamicResource Text.WorkingCopy.Staged.UnstageAll}" Command="{Binding UnstageAll}">
               <Path Width="14" Height="14" Data="{StaticResource Icons.DoubleUp}"/>
             </Button>
-            <v:ChangeViewModeSwitcher Grid.Column="7"
+            <v:ChangeViewModeSwitcher Grid.Column="6"
                                       Width="26" Height="14"
                                       Margin="0,1,0,0"
                                       ViewMode="{Binding Source={x:Static vm:Preferences.Instance}, Path=StagedChangeViewMode, Mode=TwoWay}"/>