diff --git a/src/Views/Popups/Archive.xaml b/src/Views/Popups/Archive.xaml
index 40912bb2..16b2ffe4 100644
--- a/src/Views/Popups/Archive.xaml
+++ b/src/Views/Popups/Archive.xaml
@@ -30,7 +30,10 @@
             Orientation="Horizontal"
             VerticalAlignment="Center">
             <Path x:Name="iconBased" Width="14" Height="14" Data="{StaticResource Icon.Commit}"/>
-            <TextBlock x:Name="txtBased" Margin="8,0,0,0"/>
+            <Border x:Name="badgeSHA" Background="{DynamicResource Brush.Badge}" Margin="4,0" Padding="4,2" CornerRadius="4" Visibility="Collapsed">
+                <TextBlock x:Name="txtSHA"/>
+            </Border>
+            <TextBlock x:Name="txtBased"/>
         </StackPanel>
 
         <TextBlock
diff --git a/src/Views/Popups/Archive.xaml.cs b/src/Views/Popups/Archive.xaml.cs
index a74eb007..fef229b1 100644
--- a/src/Views/Popups/Archive.xaml.cs
+++ b/src/Views/Popups/Archive.xaml.cs
@@ -35,7 +35,9 @@ namespace SourceGit.Views.Popups {
             InitializeComponent();
 
             iconBased.Data = FindResource("Icon.Commit") as Geometry;
-            txtBased.Text = $"{revision.ShortSHA}  {revision.Subject}";
+            txtSHA.Text = revision.ShortSHA;
+            badgeSHA.Visibility = Visibility.Visible;
+            txtBased.Text = revision.Subject;
         }
 
         public Archive(string repo, Models.Tag tag) {
diff --git a/src/Views/Popups/CherryPick.xaml b/src/Views/Popups/CherryPick.xaml
index 361ab8ca..c4ba0644 100644
--- a/src/Views/Popups/CherryPick.xaml
+++ b/src/Views/Popups/CherryPick.xaml
@@ -14,7 +14,7 @@
         </Grid.RowDefinitions>
 
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="150"/>
+            <ColumnDefinition Width="120"/>
             <ColumnDefinition Width="*"/>
         </Grid.ColumnDefinitions>
 
@@ -28,7 +28,10 @@
             Orientation="Horizontal"
             VerticalAlignment="Center">
             <Path Width="14" Height="14" Data="{StaticResource Icon.Commit}"/>
-            <TextBlock x:Name="txtCommit" Margin="8,0,0,0"/>
+            <Border Background="{DynamicResource Brush.Badge}" Margin="4,0" Padding="4,2" CornerRadius="4">
+                <TextBlock x:Name="txtSHA"/>
+            </Border>
+            <TextBlock x:Name="txtCommit"/>
         </StackPanel>
 
         <CheckBox 
diff --git a/src/Views/Popups/CherryPick.xaml.cs b/src/Views/Popups/CherryPick.xaml.cs
index 9524453f..8bcdf553 100644
--- a/src/Views/Popups/CherryPick.xaml.cs
+++ b/src/Views/Popups/CherryPick.xaml.cs
@@ -14,7 +14,8 @@ namespace SourceGit.Views.Popups {
 
             InitializeComponent();
 
-            txtCommit.Text = $"{commit.ShortSHA}  {commit.Subject}";
+            txtSHA.Text = commit.ShortSHA;
+            txtCommit.Text = commit.Subject;
         }
 
         public override string GetTitle() {
diff --git a/src/Views/Popups/CreateBranch.xaml b/src/Views/Popups/CreateBranch.xaml
index 2ec5b4ac..611305c2 100644
--- a/src/Views/Popups/CreateBranch.xaml
+++ b/src/Views/Popups/CreateBranch.xaml
@@ -37,7 +37,10 @@
             Orientation="Horizontal"
             VerticalAlignment="Center">
             <Path x:Name="iconBased" Width="14" Height="14" Data="{StaticResource Icon.Branch}"/>
-            <TextBlock x:Name="txtBased" Margin="8,0,0,0"/>
+            <Border x:Name="badgeSHA" Background="{DynamicResource Brush.Badge}" Margin="4,0,0,0" Padding="4,2" CornerRadius="4" Visibility="Collapsed">
+                <TextBlock x:Name="txtSHA"/>
+            </Border>
+            <TextBlock x:Name="txtBased" Margin="4,0,0,0"/>
         </StackPanel>
 
         <TextBlock
diff --git a/src/Views/Popups/CreateBranch.xaml.cs b/src/Views/Popups/CreateBranch.xaml.cs
index f95b3af1..b7d2deaa 100644
--- a/src/Views/Popups/CreateBranch.xaml.cs
+++ b/src/Views/Popups/CreateBranch.xaml.cs
@@ -1,4 +1,5 @@
 using System.Threading.Tasks;
+using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;
 
@@ -34,7 +35,9 @@ namespace SourceGit.Views.Popups {
 
             ruleBranch.Repo = repo;
             iconBased.Data = FindResource("Icon.Commit") as Geometry;
-            txtBased.Text = $"{commit.ShortSHA}  {commit.Subject}";
+            txtSHA.Text = commit.ShortSHA;
+            txtBased.Text = commit.Subject;
+            badgeSHA.Visibility = Visibility.Visible;
         }
 
         public CreateBranch(Models.Repository repo, Models.Tag tag) {
diff --git a/src/Views/Popups/CreateTag.xaml b/src/Views/Popups/CreateTag.xaml
index ddcc6390..ae55f30a 100644
--- a/src/Views/Popups/CreateTag.xaml
+++ b/src/Views/Popups/CreateTag.xaml
@@ -31,7 +31,10 @@
             Orientation="Horizontal"
             VerticalAlignment="Center">
             <Path x:Name="iconBased" Width="14" Height="14" Data="{StaticResource Icon.Branch}"/>
-            <TextBlock x:Name="txtBased" Margin="8,0,0,0"/>
+            <Border x:Name="badgeSHA" Background="{DynamicResource Brush.Badge}" Margin="4,0,0,0" Padding="4,2" CornerRadius="4" Visibility="Collapsed">
+                <TextBlock x:Name="txtSHA"/>
+            </Border>
+            <TextBlock x:Name="txtBased" Margin="4,0,0,0"/>
         </StackPanel>
 
         <TextBlock
diff --git a/src/Views/Popups/CreateTag.xaml.cs b/src/Views/Popups/CreateTag.xaml.cs
index 44b2426b..0cdbacfc 100644
--- a/src/Views/Popups/CreateTag.xaml.cs
+++ b/src/Views/Popups/CreateTag.xaml.cs
@@ -33,7 +33,9 @@ namespace SourceGit.Views.Popups {
 
             ruleTag.Tags = new Commands.Tags(repo.Path).Result();
             iconBased.Data = FindResource("Icon.Commit") as Geometry;
-            txtBased.Text = $"{commit.ShortSHA}  {commit.Subject}";
+            txtSHA.Text = commit.ShortSHA;
+            txtBased.Text = commit.Subject;
+            badgeSHA.Visibility = System.Windows.Visibility.Visible;
         }
 
         public override string GetTitle() {
diff --git a/src/Views/Popups/Rebase.xaml b/src/Views/Popups/Rebase.xaml
index 845ee4d4..7b123862 100644
--- a/src/Views/Popups/Rebase.xaml
+++ b/src/Views/Popups/Rebase.xaml
@@ -15,7 +15,7 @@
         </Grid.RowDefinitions>
 
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="150"/>
+            <ColumnDefinition Width="120"/>
             <ColumnDefinition Width="*"/>
         </Grid.ColumnDefinitions>
 
@@ -42,7 +42,10 @@
             Orientation="Horizontal"
             VerticalAlignment="Center">
             <Path x:Name="iconBased" Width="14" Height="14" Data="{StaticResource Icon.Branch}"/>
-            <TextBlock x:Name="txtOn" Margin="8,0,0,0"/>
+            <Border x:Name="badgeSHA" Background="{DynamicResource Brush.Badge}" Margin="4,0,0,0" Padding="4,2" CornerRadius="4" Visibility="Collapsed">
+                <TextBlock x:Name="txtSHA"/>
+            </Border>
+            <TextBlock x:Name="txtOn" Margin="4,0,0,0"/>
         </StackPanel>
 
         <CheckBox 
diff --git a/src/Views/Popups/Rebase.xaml.cs b/src/Views/Popups/Rebase.xaml.cs
index cbc9d67c..0e5f76db 100644
--- a/src/Views/Popups/Rebase.xaml.cs
+++ b/src/Views/Popups/Rebase.xaml.cs
@@ -27,8 +27,10 @@ namespace SourceGit.Views.Popups {
             InitializeComponent();
 
             txtCurrent.Text = current;
-            txtOn.Text = $"{commit.ShortSHA}  {commit.Subject}";
-            iconBased.Data = FindResource("Icon.Branch") as Geometry;
+            txtSHA.Text = commit.ShortSHA;
+            txtOn.Text = commit.Subject;
+            badgeSHA.Visibility = System.Windows.Visibility.Visible;
+            iconBased.Data = FindResource("Icon.Commit") as Geometry;
         }
 
         public override string GetTitle() {
diff --git a/src/Views/Popups/Reset.xaml b/src/Views/Popups/Reset.xaml
index aceb8f9d..d7d36035 100644
--- a/src/Views/Popups/Reset.xaml
+++ b/src/Views/Popups/Reset.xaml
@@ -43,7 +43,10 @@
             Orientation="Horizontal"
             VerticalAlignment="Center">
             <Path Width="14" Height="14" Data="{StaticResource Icon.Commit}"/>
-            <TextBlock x:Name="txtMoveTo" Margin="8,0,0,0"/>
+            <Border Background="{DynamicResource Brush.Badge}" Margin="4,0,0,0" Padding="4,2" CornerRadius="4">
+                <TextBlock x:Name="txtSHA"/>
+            </Border>
+            <TextBlock x:Name="txtMoveTo" Margin="4,0,0,0"/>
         </StackPanel>
 
         <TextBlock
diff --git a/src/Views/Popups/Reset.xaml.cs b/src/Views/Popups/Reset.xaml.cs
index 0b667fa7..c95f06ab 100644
--- a/src/Views/Popups/Reset.xaml.cs
+++ b/src/Views/Popups/Reset.xaml.cs
@@ -15,7 +15,8 @@ namespace SourceGit.Views.Popups {
             InitializeComponent();
 
             txtCurrent.Text = current;
-            txtMoveTo.Text = $"{to.ShortSHA}  {to.Subject}";
+            txtSHA.Text = to.ShortSHA;
+            txtMoveTo.Text = to.Subject;
         }
 
         public override string GetTitle() {
diff --git a/src/Views/Popups/Revert.xaml b/src/Views/Popups/Revert.xaml
index b7675ebd..b4401f40 100644
--- a/src/Views/Popups/Revert.xaml
+++ b/src/Views/Popups/Revert.xaml
@@ -14,7 +14,7 @@
         </Grid.RowDefinitions>
 
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="150"/>
+            <ColumnDefinition Width="120"/>
             <ColumnDefinition Width="*"/>
         </Grid.ColumnDefinitions>
 
@@ -28,7 +28,10 @@
             Orientation="Horizontal"
             VerticalAlignment="Center">
             <Path Width="14" Height="14" Data="{StaticResource Icon.Commit}"/>
-            <TextBlock x:Name="txtCommit" Margin="8,0,0,0"/>
+            <Border Background="{DynamicResource Brush.Badge}" Margin="4,0,0,0" Padding="4,2" CornerRadius="4">
+                <TextBlock x:Name="txtSHA"/>
+            </Border>
+            <TextBlock x:Name="txtCommit" Margin="4,0,0,0"/>
         </StackPanel>
 
         <CheckBox 
diff --git a/src/Views/Popups/Revert.xaml.cs b/src/Views/Popups/Revert.xaml.cs
index af9f51ef..166c6827 100644
--- a/src/Views/Popups/Revert.xaml.cs
+++ b/src/Views/Popups/Revert.xaml.cs
@@ -14,7 +14,8 @@ namespace SourceGit.Views.Popups {
 
             InitializeComponent();
 
-            txtCommit.Text = $"{commit.ShortSHA}  {commit.Subject}";
+            txtSHA.Text = commit.ShortSHA;
+            txtCommit.Text = commit.Subject;
         }
 
         public override string GetTitle() {
diff --git a/src/Views/Popups/Reword.xaml b/src/Views/Popups/Reword.xaml
index ca269d05..681140f4 100644
--- a/src/Views/Popups/Reword.xaml
+++ b/src/Views/Popups/Reword.xaml
@@ -16,7 +16,7 @@
         </Grid.RowDefinitions>
         
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="150"/>
+            <ColumnDefinition Width="100"/>
             <ColumnDefinition Width="*"/>
         </Grid.ColumnDefinitions>
 
@@ -30,7 +30,10 @@
             Orientation="Horizontal"
             VerticalAlignment="Center">
             <Path Width="14" Height="14" Data="{StaticResource Icon.Commit}"/>
-            <TextBlock x:Name="txtCurrent" Margin="8,0,0,0"/>
+            <Border Background="{DynamicResource Brush.Badge}" Margin="4,0,0,0" Padding="4,2" CornerRadius="4">
+                <TextBlock x:Name="txtSHA"/>
+            </Border>
+            <TextBlock x:Name="txtCurrent" Margin="4,0,0,0"/>
         </StackPanel>
 
         <TextBlock
diff --git a/src/Views/Popups/Reword.xaml.cs b/src/Views/Popups/Reword.xaml.cs
index 71c97057..803883d8 100644
--- a/src/Views/Popups/Reword.xaml.cs
+++ b/src/Views/Popups/Reword.xaml.cs
@@ -16,7 +16,9 @@ namespace SourceGit.Views.Popups {
             this.old = $"{commit.Subject}\n{commit.Message}".Trim();
             this.Msg = old;
             InitializeComponent();
-            txtCurrent.Text = $"{commit.ShortSHA}  {commit.Subject}";
+
+            txtSHA.Text = commit.ShortSHA;
+            txtCurrent.Text = commit.Subject;
         }
 
         public override string GetTitle() {
diff --git a/src/Views/Popups/Squash.xaml b/src/Views/Popups/Squash.xaml
index 5dffe20c..be38aa2b 100644
--- a/src/Views/Popups/Squash.xaml
+++ b/src/Views/Popups/Squash.xaml
@@ -17,7 +17,7 @@
         </Grid.RowDefinitions>
 
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="150"/>
+            <ColumnDefinition Width="100"/>
             <ColumnDefinition Width="*"/>
         </Grid.ColumnDefinitions>
 
@@ -31,7 +31,10 @@
             Orientation="Horizontal"
             VerticalAlignment="Center">
             <Path Width="14" Height="14" Data="{StaticResource Icon.Commit}"/>
-            <TextBlock x:Name="txtHead" Margin="8,0,0,0"/>
+            <Border Background="{DynamicResource Brush.Badge}" Margin="4,0,0,0" Padding="4,2" CornerRadius="4">
+                <TextBlock x:Name="txtHeadSHA"/>
+            </Border>
+            <TextBlock x:Name="txtHead" Margin="4,0,0,0"/>
         </StackPanel>
 
         <TextBlock
@@ -44,7 +47,10 @@
             Orientation="Horizontal"
             VerticalAlignment="Center">
             <Path Width="14" Height="14" Data="{StaticResource Icon.Commit}"/>
-            <TextBlock x:Name="txtParent" Margin="8,0,0,0"/>
+            <Border Background="{DynamicResource Brush.Badge}" Margin="4,0,0,0" Padding="4,2" CornerRadius="4">
+                <TextBlock x:Name="txtParentSHA"/>
+            </Border>
+            <TextBlock x:Name="txtParent" Margin="4,0,0,0"/>
         </StackPanel>
 
         <TextBlock
diff --git a/src/Views/Popups/Squash.xaml.cs b/src/Views/Popups/Squash.xaml.cs
index 03d53517..e2f8d844 100644
--- a/src/Views/Popups/Squash.xaml.cs
+++ b/src/Views/Popups/Squash.xaml.cs
@@ -16,8 +16,11 @@ namespace SourceGit.Views.Popups {
             this.to = parent.SHA;
             this.Msg = $"{parent.Subject}\n{parent.Message}".Trim();
             InitializeComponent();
-            txtHead.Text = $"{head.ShortSHA}  {head.Subject}";
-            txtParent.Text = $"{parent.ShortSHA}  {parent.Subject}";
+
+            txtHeadSHA.Text = head.ShortSHA;
+            txtHead.Text = head.Subject;
+            txtParentSHA.Text = parent.ShortSHA;
+            txtParent.Text = parent.Subject;
         }
 
         public override string GetTitle() {