From 3953e84bbdc8b0509289827e9753b6c357c16178 Mon Sep 17 00:00:00 2001
From: Tibor Prokai <tibor@kotem.com>
Date: Mon, 26 Oct 2026 19:08:48 +0100
Subject: [PATCH] Add convenient copy buttons for commit details and branch
 names

Place copy buttons before commit messages, SHAs, parent SHAs, author and committer identities and dates, and individual references. Show the copied value in each tooltip and make the toolbar branch icon copy the current branch name.

Allow CopyButton to use a custom icon and CommitRefsPresenter to display individual decorators.
---
 src/Resources/Locales/en_US.axaml |   1 +
 src/Views/CommitBaseInfo.axaml    | 256 +++++++++++++++++-------------
 src/Views/CommitRefsPresenter.cs  |  13 +-
 src/Views/CopyButton.cs           |  18 ++-
 src/Views/RepositoryToolbar.axaml |  15 +-
 5 files changed, 179 insertions(+), 124 deletions(-)

diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index 9abb3bdcc9..2c4a1461e9 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -313,6 +313,7 @@
   <x:String x:Key="Text.ConventionalCommit.ShortDescription" xml:space="preserve">Short Description:</x:String>
   <x:String x:Key="Text.ConventionalCommit.Type" xml:space="preserve">Type of Change:</x:String>
   <x:String x:Key="Text.Copy" xml:space="preserve">Copy</x:String>
+  <x:String x:Key="Text.CopyWithText" xml:space="preserve">Copy: {0}</x:String>
   <x:String x:Key="Text.CopyAllText" xml:space="preserve">Copy All Text</x:String>
   <x:String x:Key="Text.CopyAsPatch" xml:space="preserve">Copy as Patch</x:String>
   <x:String x:Key="Text.CopyFullPath" xml:space="preserve">Copy Full Path</x:String>
diff --git a/src/Views/CommitBaseInfo.axaml b/src/Views/CommitBaseInfo.axaml
index d6c0dba6b3..9c55acb850 100644
--- a/src/Views/CommitBaseInfo.axaml
+++ b/src/Views/CommitBaseInfo.axaml
@@ -19,18 +19,24 @@
             <v:Avatar Grid.Column="0" Width="64" Height="64" HorizontalAlignment="Right" User="{Binding Author}"/>
             <StackPanel Grid.Column="1" Margin="16,0,4,0" Orientation="Vertical">
               <TextBlock Classes="group_header_label" Text="{DynamicResource Text.CommitDetail.Info.Author}"/>
-              <Border Margin="0,10,0,8" Background="Transparent" ToolTip.Tip="{Binding Author}" Tag="{Binding Author}" ContextRequested="OnUserContextRequested">
-                <TextBlock Foreground="{DynamicResource Brush.FG2}" TextTrimming="CharacterEllipsis">
-                  <Run Text="{Binding Author.Name, Mode=OneWay}" Foreground="{DynamicResource Brush.FG1}"/>
-                  <Run Text="{Binding Author.Email, Mode=OneWay}"/>
-                </TextBlock>
-              </Border>
-              <v:DateTimePresenter Margin="2,0,0,0"
+              <Grid ColumnDefinitions="20,*" Margin="0,10,0,8">
+                <v:CopyButton Grid.Column="0" Width="20" Height="20" CopyText="{Binding Author, StringFormat='{}{0}'}" ToolTip.Tip="{Binding $self.CopyText, Converter={x:Static c:StringConverters.FormatByResourceKey}, ConverterParameter=CopyWithText}"/>
+                <Border Grid.Column="1" Margin="0" Background="Transparent" ToolTip.Tip="{Binding Author}" Tag="{Binding Author}" ContextRequested="OnUserContextRequested">
+                  <TextBlock Foreground="{DynamicResource Brush.FG2}" TextTrimming="CharacterEllipsis">
+                    <Run Text="{Binding Author.Name, Mode=OneWay}" Foreground="{DynamicResource Brush.FG1}"/>
+                    <Run Text="{Binding Author.Email, Mode=OneWay}"/>
+                  </TextBlock>
+                </Border>
+              </Grid>
+              <Grid ColumnDefinitions="20,*">
+                <v:CopyButton Grid.Column="0" Width="20" Height="20" CopyText="{Binding #AuthorDateTime.Text}" ToolTip.Tip="{Binding $self.CopyText, Converter={x:Static c:StringConverters.FormatByResourceKey}, ConverterParameter=CopyWithText}"/>
+                <v:DateTimePresenter x:Name="AuthorDateTime" Grid.Column="1" Margin="0"
                                    Timestamp="{Binding AuthorTime}"
                                    FontSize="{Binding Source={x:Static vm:Preferences.Instance}, Path=DefaultFontSize, Converter={x:Static c:DoubleConverters.Decrease}}"
                                    Foreground="{DynamicResource Brush.FG2}"
                                    Background="Transparent"
                                    ContextRequested="OnDateTimeContextMenuRequested"/>
+              </Grid>
             </StackPanel>
           </Grid>
 
@@ -39,18 +45,24 @@
             <v:Avatar Grid.Column="0" Width="64" Height="64" HorizontalAlignment="Right" User="{Binding Committer}"/>
             <StackPanel Grid.Column="1" Margin="16,0,4,0" Orientation="Vertical">
               <TextBlock Classes="group_header_label" Text="{DynamicResource Text.CommitDetail.Info.Committer}"/>
-              <Border Margin="0,10,0,8" Background="Transparent" ToolTip.Tip="{Binding Committer}" Tag="{Binding Committer}" ContextRequested="OnUserContextRequested">
-                <TextBlock Foreground="{DynamicResource Brush.FG2}" TextTrimming="CharacterEllipsis">
-                  <Run Text="{Binding Committer.Name, Mode=OneWay}" Foreground="{DynamicResource Brush.FG1}"/>
-                  <Run Text="{Binding Committer.Email, Mode=OneWay}"/>
-                </TextBlock>
-              </Border>
-              <v:DateTimePresenter Margin="2,0,0,0"
+              <Grid ColumnDefinitions="20,*" Margin="0,10,0,8">
+                <v:CopyButton Grid.Column="0" Width="20" Height="20" CopyText="{Binding Committer, StringFormat='{}{0}'}" ToolTip.Tip="{Binding $self.CopyText, Converter={x:Static c:StringConverters.FormatByResourceKey}, ConverterParameter=CopyWithText}"/>
+                <Border Grid.Column="1" Margin="0" Background="Transparent" ToolTip.Tip="{Binding Committer}" Tag="{Binding Committer}" ContextRequested="OnUserContextRequested">
+                  <TextBlock Foreground="{DynamicResource Brush.FG2}" TextTrimming="CharacterEllipsis">
+                    <Run Text="{Binding Committer.Name, Mode=OneWay}" Foreground="{DynamicResource Brush.FG1}"/>
+                    <Run Text="{Binding Committer.Email, Mode=OneWay}"/>
+                  </TextBlock>
+                </Border>
+              </Grid>
+              <Grid ColumnDefinitions="20,*">
+                <v:CopyButton Grid.Column="0" Width="20" Height="20" CopyText="{Binding #CommitterDateTime.Text}" ToolTip.Tip="{Binding $self.CopyText, Converter={x:Static c:StringConverters.FormatByResourceKey}, ConverterParameter=CopyWithText}"/>
+                <v:DateTimePresenter x:Name="CommitterDateTime" Grid.Column="1" Margin="0"
                                    Timestamp="{Binding CommitterTime}"
                                    FontSize="{Binding Source={x:Static vm:Preferences.Instance}, Path=DefaultFontSize, Converter={x:Static c:DoubleConverters.Decrease}}"
                                    Foreground="{DynamicResource Brush.FG2}"
                                    Background="Transparent"
                                    ContextRequested="OnDateTimeContextMenuRequested"/>
+              </Grid>
             </StackPanel>
           </Grid>
         </UniformGrid>
@@ -62,10 +74,9 @@
         <Grid RowDefinitions="24,Auto,Auto,Auto" ColumnDefinitions="96,*">
           <!-- SHA -->
           <TextBlock Grid.Row="0" Grid.Column="0" Classes="info_label" VerticalAlignment="Top" Margin="0,4,0,0" Text="{DynamicResource Text.CommitDetail.Info.SHA}" />
-          <StackPanel Grid.Row="0" Grid.Column="1" Orientation="Horizontal" Height="24">
-            <TextBlock Text="{Binding SHA}" Margin="12,0,4,0" FontFamily="{DynamicResource Fonts.Monospace}" VerticalAlignment="Center"/>
-
-            <v:CopyButton Width="24" Cursor="Hand" CopyText="{Binding SHA}" ToolTip.Tip="{DynamicResource Text.Copy}"/>
+          <StackPanel Grid.Row="0" Grid.Column="1" Orientation="Horizontal" Height="24" Margin="12,0,0,0">
+            <v:CopyButton Width="20" Cursor="Hand" CopyText="{Binding SHA}" ToolTip.Tip="{Binding $self.CopyText, Converter={x:Static c:StringConverters.FormatByResourceKey}, ConverterParameter=CopyWithText}"/>
+            <TextBlock Text="{Binding SHA}" Margin="0,0,4,0" FontFamily="{DynamicResource Fonts.Monospace}" VerticalAlignment="Center"/>
 
             <Button Classes="icon_button" Width="24" Cursor="Hand" Click="OnOpenContainsIn" IsVisible="{Binding #ThisControl.SupportsContainsIn}" ToolTip.Tip="{DynamicResource Text.CommitDetail.Info.ContainsIn}">
               <Path Width="14" Height="14" Margin="0,1,0,0" Data="{StaticResource Icons.Milestone}"/>
@@ -108,108 +119,131 @@
 
             <ItemsControl.ItemTemplate>
               <DataTemplate>
-                <TextBlock Text="{Binding Converter={x:Static c:StringConverters.ToShortSHA}}"
-                           FontFamily="{DynamicResource Fonts.Monospace}"
-                           Foreground="DarkOrange"
-                           TextDecorations="Underline"
-                           Cursor="Hand"
-                           Margin="0,0,16,0"
-                           PointerEntered="OnSHAPointerEntered"
-                           PointerPressed="OnSHAPressed"
-                           ContextRequested="OnSHAContextRequested"
-                           ToolTip.ShowDelay="0">
-                  <ToolTip.IsOpen>
-                    <MultiBinding Converter="{x:Static BoolConverters.And}">
-                      <Binding Path="$self.IsPointerOver"/>
-                      <Binding Path="$self.(ToolTip.Tip)" Converter="{x:Static ObjectConverters.IsNotNull}"/>
-                    </MultiBinding>
-                  </ToolTip.IsOpen>
-
-                  <TextBlock.DataTemplates>
-                    <DataTemplate DataType="m:Commit">
-                      <StackPanel MinWidth="400" Orientation="Vertical">
-                        <Grid ColumnDefinitions="Auto,*,Auto">
-                          <v:Avatar Grid.Column="0" Width="16" Height="16" VerticalAlignment="Center" IsHitTestVisible="False" User="{Binding Author}"/>
-                          <TextBlock Grid.Column="1" Text="{Binding Author.Name}" Margin="8,0,0,0"/>
-                          <v:DateTimePresenter Grid.Column="2"
-                                               Margin="8,0,0,0"
-                                               Timestamp="{Binding CommitterTime}"
-                                               Foreground="{DynamicResource Brush.FG2}"/>
-                        </Grid>
-
-                        <TextBlock Margin="0,8,0,0" Text="{Binding Subject}" TextWrapping="Wrap"/>
-                      </StackPanel>
-                    </DataTemplate>
-                  </TextBlock.DataTemplates>
-                </TextBlock>
+                <Grid ColumnDefinitions="20,*" Margin="0,0,12,0">
+                  <v:CopyButton Grid.Column="0" Width="20" Height="24" CopyText="{Binding}" ToolTip.Tip="{Binding $self.CopyText, Converter={x:Static c:StringConverters.FormatByResourceKey}, ConverterParameter=CopyWithText}"/>
+                  <TextBlock Grid.Column="1" VerticalAlignment="Center" Text="{Binding Converter={x:Static c:StringConverters.ToShortSHA}}"
+                             FontFamily="{DynamicResource Fonts.Monospace}"
+                             Foreground="DarkOrange"
+                             TextDecorations="Underline"
+                             Cursor="Hand"
+                             Margin="0"
+                             PointerEntered="OnSHAPointerEntered"
+                             PointerPressed="OnSHAPressed"
+                             ContextRequested="OnSHAContextRequested"
+                             ToolTip.ShowDelay="0">
+                    <ToolTip.IsOpen>
+                      <MultiBinding Converter="{x:Static BoolConverters.And}">
+                        <Binding Path="$self.IsPointerOver"/>
+                        <Binding Path="$self.(ToolTip.Tip)" Converter="{x:Static ObjectConverters.IsNotNull}"/>
+                      </MultiBinding>
+                    </ToolTip.IsOpen>
+
+                    <TextBlock.DataTemplates>
+                      <DataTemplate DataType="m:Commit">
+                        <StackPanel MinWidth="400" Orientation="Vertical">
+                          <Grid ColumnDefinitions="Auto,*,Auto">
+                            <v:Avatar Grid.Column="0" Width="16" Height="16" VerticalAlignment="Center" IsHitTestVisible="False" User="{Binding Author}"/>
+                            <TextBlock Grid.Column="1" Text="{Binding Author.Name}" Margin="8,0,0,0"/>
+                            <v:DateTimePresenter Grid.Column="2"
+                                                 Margin="8,0,0,0"
+                                                 Timestamp="{Binding CommitterTime}"
+                                                 Foreground="{DynamicResource Brush.FG2}"/>
+                          </Grid>
+
+                          <TextBlock Margin="0,8,0,0" Text="{Binding Subject}" TextWrapping="Wrap"/>
+                        </StackPanel>
+                      </DataTemplate>
+                    </TextBlock.DataTemplates>
+                  </TextBlock>
+                </Grid>
               </DataTemplate>
             </ItemsControl.ItemTemplate>
           </ItemsControl>
 
           <!-- REFS -->
           <TextBlock Grid.Row="2" Grid.Column="0" Classes="info_label" VerticalAlignment="Top" Margin="0,4,0,0" Text="{DynamicResource Text.CommitDetail.Info.Refs}" IsVisible="{Binding HasDecorators}"/>
-          <Border Grid.Row="2" Grid.Column="1" Margin="12,0,0,0" MinHeight="24" IsVisible="{Binding HasDecorators}">
-            <v:CommitRefsPresenter Foreground="{DynamicResource Brush.FG1}"
-                                   FontSize="12"
-                                   AllowWrap="True"
-                                   Margin="0,4,0,0"
-                                   UseGraphColor="False"
-                                   PointerReleased="OnCommitRefsPresenterPointerReleased"/>
-          </Border>
+          <ItemsControl Grid.Row="2" Grid.Column="1" Margin="12,0,0,0" MinHeight="24" ItemsSource="{Binding Decorators}" IsVisible="{Binding HasDecorators}">
+            <ItemsControl.ItemsPanel>
+              <ItemsPanelTemplate>
+                <WrapPanel Orientation="Horizontal"/>
+              </ItemsPanelTemplate>
+            </ItemsControl.ItemsPanel>
+            <ItemsControl.ItemTemplate>
+              <DataTemplate DataType="m:Decorator">
+                <StackPanel Orientation="Horizontal" Height="24" Margin="0,0,8,0">
+                  <v:CopyButton Width="20" Height="24" CopyText="{Binding Name}" ToolTip.Tip="{Binding $self.CopyText, Converter={x:Static c:StringConverters.FormatByResourceKey}, ConverterParameter=CopyWithText}"/>
+                  <v:CommitRefsPresenter Foreground="{DynamicResource Brush.FG1}"
+                                         FontSize="12"
+                                         VerticalAlignment="Center"
+                                         Margin="0"
+                                         UseGraphColor="False"
+                                         PointerReleased="OnCommitRefsPresenterPointerReleased"/>
+                </StackPanel>
+              </DataTemplate>
+            </ItemsControl.ItemTemplate>
+          </ItemsControl>
 
           <!-- Messages -->
           <TextBlock Grid.Row="3" Grid.Column="0" Classes="info_label" VerticalAlignment="Top" Margin="0,4,0,0" Text="{DynamicResource Text.CommitDetail.Info.Message}" />
-          <v:CommitMessagePresenter Grid.Row="3" Grid.Column="1"
-                                    Margin="12,4,0,0"
-                                    FontSize="{Binding Source={x:Static vm:Preferences.Instance}, Path=DefaultFontSize}"
-                                    Foreground="{DynamicResource Brush.FG1}"
-                                    FullMessage="{Binding #ThisControl.FullMessage}"
-                                    HorizontalAlignment="Stretch"
-                                    TextWrapping="Wrap">
-            <ToolTip.IsOpen>
-              <MultiBinding Converter="{x:Static BoolConverters.And}">
-                <Binding Path="$self.IsPointerOver"/>
-                <Binding Path="$self.(ToolTip.Tip)" Converter="{x:Static ObjectConverters.IsNotNull}"/>
-              </MultiBinding>
-            </ToolTip.IsOpen>
-
-            <v:CommitMessagePresenter.ContextFlyout>
-              <MenuFlyout Placement="Bottom">
-                <MenuItem Header="{DynamicResource Text.Copy}"
-                          Command="{Binding $parent[SelectableTextBlock].Copy}"
-                          IsEnabled="{Binding $parent[SelectableTextBlock].CanCopy}"
-                          InputGesture="{x:Static TextBox.CopyGesture}">
-                  <MenuItem.Icon>
-                    <Path Width="11" Height="11" Data="{StaticResource Icons.Copy}" VerticalAlignment="Center"/>
-                  </MenuItem.Icon>
-                </MenuItem>
-
-                <MenuItem Header="{DynamicResource Text.CopyAllText}"
-                          Click="OnCopyAllCommitMessage">
-                  <MenuItem.Icon>
-                    <Path Width="11" Height="11" Data="{StaticResource Icons.Copy}" VerticalAlignment="Center"/>
-                  </MenuItem.Icon>
-                </MenuItem>
-              </MenuFlyout>
-            </v:CommitMessagePresenter.ContextFlyout>
-
-            <v:CommitMessagePresenter.DataTemplates>
-              <DataTemplate DataType="m:Commit">
-                <StackPanel MinWidth="400" Orientation="Vertical">
-                  <Grid ColumnDefinitions="Auto,*,Auto">
-                    <v:Avatar Grid.Column="0" Width="16" Height="16" VerticalAlignment="Center" IsHitTestVisible="False" User="{Binding Author}"/>
-                    <TextBlock Grid.Column="1" Text="{Binding Author.Name}" Margin="8,0,0,0"/>
-                    <v:DateTimePresenter Grid.Column="2"
-                                         Margin="8,0,0,0"
-                                         Timestamp="{Binding CommitterTime}"
-                                         Foreground="{DynamicResource Brush.FG2}"/>
-                  </Grid>
-
-                  <TextBlock Margin="0,8,0,0" Text="{Binding Subject}" TextWrapping="Wrap"/>
-                </StackPanel>
-              </DataTemplate>
-            </v:CommitMessagePresenter.DataTemplates>
-          </v:CommitMessagePresenter>
+          <Grid Grid.Row="3" Grid.Column="1" ColumnDefinitions="Auto,*" Margin="12,0,0,0">
+            <v:CopyButton Grid.Column="0"
+                          Width="20" Height="24"
+                          VerticalAlignment="Top"
+                          Cursor="Hand"
+                          CopyText="{Binding #ThisControl.FullMessage.Message}"
+                          ToolTip.Tip="{Binding $self.CopyText, Converter={x:Static c:StringConverters.FormatByResourceKey}, ConverterParameter=CopyWithText}"/>
+            <v:CommitMessagePresenter Grid.Column="1"
+                                      Margin="0,4,0,0"
+                                      FontSize="{Binding Source={x:Static vm:Preferences.Instance}, Path=DefaultFontSize}"
+                                      Foreground="{DynamicResource Brush.FG1}"
+                                      FullMessage="{Binding #ThisControl.FullMessage}"
+                                      HorizontalAlignment="Stretch"
+                                      TextWrapping="Wrap">
+              <ToolTip.IsOpen>
+                <MultiBinding Converter="{x:Static BoolConverters.And}">
+                  <Binding Path="$self.IsPointerOver"/>
+                  <Binding Path="$self.(ToolTip.Tip)" Converter="{x:Static ObjectConverters.IsNotNull}"/>
+                </MultiBinding>
+              </ToolTip.IsOpen>
+
+              <v:CommitMessagePresenter.ContextFlyout>
+                <MenuFlyout Placement="Bottom">
+                  <MenuItem Header="{DynamicResource Text.Copy}"
+                            Command="{Binding $parent[SelectableTextBlock].Copy}"
+                            IsEnabled="{Binding $parent[SelectableTextBlock].CanCopy}"
+                            InputGesture="{x:Static TextBox.CopyGesture}">
+                    <MenuItem.Icon>
+                      <Path Width="11" Height="11" Data="{StaticResource Icons.Copy}" VerticalAlignment="Center"/>
+                    </MenuItem.Icon>
+                  </MenuItem>
+
+                  <MenuItem Header="{DynamicResource Text.CopyAllText}"
+                            Click="OnCopyAllCommitMessage">
+                    <MenuItem.Icon>
+                      <Path Width="11" Height="11" Data="{StaticResource Icons.Copy}" VerticalAlignment="Center"/>
+                    </MenuItem.Icon>
+                  </MenuItem>
+                </MenuFlyout>
+              </v:CommitMessagePresenter.ContextFlyout>
+
+              <v:CommitMessagePresenter.DataTemplates>
+                <DataTemplate DataType="m:Commit">
+                  <StackPanel MinWidth="400" Orientation="Vertical">
+                    <Grid ColumnDefinitions="Auto,*,Auto">
+                      <v:Avatar Grid.Column="0" Width="16" Height="16" VerticalAlignment="Center" IsHitTestVisible="False" User="{Binding Author}"/>
+                      <TextBlock Grid.Column="1" Text="{Binding Author.Name}" Margin="8,0,0,0"/>
+                      <v:DateTimePresenter Grid.Column="2"
+                                           Margin="8,0,0,0"
+                                           Timestamp="{Binding CommitterTime}"
+                                           Foreground="{DynamicResource Brush.FG2}"/>
+                    </Grid>
+
+                    <TextBlock Margin="0,8,0,0" Text="{Binding Subject}" TextWrapping="Wrap"/>
+                  </StackPanel>
+                </DataTemplate>
+              </v:CommitMessagePresenter.DataTemplates>
+            </v:CommitMessagePresenter>
+          </Grid>
         </Grid>
       </StackPanel>
     </DataTemplate>
diff --git a/src/Views/CommitRefsPresenter.cs b/src/Views/CommitRefsPresenter.cs
index 85e33962a1..4646f8a658 100644
--- a/src/Views/CommitRefsPresenter.cs
+++ b/src/Views/CommitRefsPresenter.cs
@@ -277,10 +277,13 @@ protected override Size MeasureOverride(Size availableSize)
         {
             _items.Clear();
 
-            if (DataContext is not Models.Commit commit)
-                return new Size(0, 0);
-
-            var refs = commit.Decorators;
+            var commit = DataContext as Models.Commit;
+            List<Models.Decorator> refs = DataContext switch
+            {
+                Models.Commit c => c.Decorators,
+                Models.Decorator decorator => [decorator],
+                _ => [],
+            };
             var count = refs.Count;
             if (count == 0)
             {
@@ -294,7 +297,7 @@ protected override Size MeasureOverride(Size availableSize)
             var typefaceHead = new Typeface(FontFamily, FontStyle.Normal, FontWeight.Bold);
             var typefaceRemote = new Typeface(FontFamily, FontStyle.Italic, FontWeight.Bold);
             var fg = Foreground;
-            var normalBG = UseGraphColor ? Models.CommitGraph.Pens[commit.Color].Brush : Brushes.Gray;
+            var normalBG = UseGraphColor && commit != null ? Models.CommitGraph.Pens[commit.Color].Brush : Brushes.Gray;
             var labelSize = FontSize;
             var requiredHeight = 16.0;
             var x = 0.0;
diff --git a/src/Views/CopyButton.cs b/src/Views/CopyButton.cs
index 0ce7908491..2532d8483a 100644
--- a/src/Views/CopyButton.cs
+++ b/src/Views/CopyButton.cs
@@ -13,6 +13,15 @@ public class CopyButton : Button
     {
         protected override Type StyleKeyOverride => typeof(Button);
 
+        public static readonly StyledProperty<Geometry> IconProperty =
+            AvaloniaProperty.Register<CopyButton, Geometry>(nameof(Icon));
+
+        public Geometry Icon
+        {
+            get => GetValue(IconProperty);
+            set => SetValue(IconProperty, value);
+        }
+
         public static readonly DirectProperty<CopyButton, string> CopyTextProperty =
             AvaloniaProperty.RegisterDirect<CopyButton, string>(
                 nameof(CopyText),
@@ -60,8 +69,7 @@ protected override void OnLoaded(RoutedEventArgs e)
         {
             base.OnLoaded(e);
 
-            if (this.FindResource("Icons.Copy") is Geometry copyGeo)
-                _copyIcon.Data = copyGeo;
+            _copyIcon.Data = Icon ?? this.FindResource("Icons.Copy") as Geometry;
             if (this.FindResource("Icons.Check") is Geometry checkGeo)
                 _checkIcon.Data = checkGeo;
 
@@ -90,7 +98,11 @@ protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs chang
         {
             base.OnPropertyChanged(change);
 
-            if (change.Property == IsCopiedProperty)
+            if (change.Property == IconProperty)
+            {
+                _copyIcon.Data = Icon ?? this.FindResource("Icons.Copy") as Geometry;
+            }
+            else if (change.Property == IsCopiedProperty)
             {
                 _copyIcon.IsVisible = !_isCopied;
                 _checkIcon.IsVisible = _isCopied;
diff --git a/src/Views/RepositoryToolbar.axaml b/src/Views/RepositoryToolbar.axaml
index 08ed8e83c5..9e02b98422 100644
--- a/src/Views/RepositoryToolbar.axaml
+++ b/src/Views/RepositoryToolbar.axaml
@@ -4,6 +4,7 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:m="using:SourceGit.Models"
              xmlns:vm="using:SourceGit.ViewModels"
+             xmlns:v="using:SourceGit.Views"
              xmlns:c="using:SourceGit.Converters"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="SourceGit.Views.RepositoryToolbar"
@@ -128,13 +129,17 @@
     </StackPanel>
 
     <Grid Grid.Column="3" HorizontalAlignment="Right" ColumnDefinitions="Auto,*,32">
-      <Path Grid.Column="0"
-            Width="13" Height="13"
-            Margin="18,0,0,0"
-            Data="{StaticResource Icons.Branch}"/>
+      <v:CopyButton Grid.Column="0"
+                    Width="20" Height="24"
+                    Margin="14,0,0,0"
+                    VerticalAlignment="Center"
+                    Icon="{StaticResource Icons.Branch}"
+                    CopyText="{Binding CurrentBranch?.Name, TargetNullValue='', Mode=OneWay}"
+                    IsEnabled="{Binding CurrentBranch?.Name, Converter={x:Static c:StringConverters.IsNotNullOrWhitespace}}"
+                    ToolTip.Tip="{Binding $self.CopyText, Converter={x:Static c:StringConverters.FormatByResourceKey}, ConverterParameter=CopyWithText}"/>
 
       <Border Grid.Column="1"
-              Margin="6,0,0,0"
+              Margin="0"
               Background="Transparent"
               ToolTip.Tip="{Binding CurrentBranch?.Name, TargetNullValue='--', Mode=OneWay}">
         <TextBlock Text="{Binding CurrentBranch?.Name, TargetNullValue='--', Mode=OneWay}"