diff --git a/src/Resources/Icons.axaml b/src/Resources/Icons.axaml
index cc56d33d..bf664de2 100644
--- a/src/Resources/Icons.axaml
+++ b/src/Resources/Icons.axaml
@@ -71,9 +71,6 @@
   <StreamGeometry x:Key="Icons.Loading">M512 0C233 0 7 223 0 500C6 258 190 64 416 64c230 0 416 200 416 448c0 53 43 96 96 96s96-43 96-96c0-283-229-512-512-512zm0 1023c279 0 505-223 512-500c-6 242-190 436-416 436c-230 0-416-200-416-448c0-53-43-96-96-96s-96 43-96 96c0 283 229 512 512 512z</StreamGeometry>
   <StreamGeometry x:Key="Icons.Local">M976 0h-928A48 48 0 000 48v652a48 48 0 0048 48h416V928H200a48 48 0 000 96h624a48 48 0 000-96H560v-180h416a48 48 0 0048-48V48A48 48 0 00976 0zM928 652H96V96h832v556z</StreamGeometry>
   <StreamGeometry x:Key="Icons.Lock">M832 464h-68V240a128 128 0 00-128-128h-248a128 128 0 00-128 128v224H192c-18 0-32 14-32 32v384c0 18 14 32 32 32h640c18 0 32-14 32-32v-384c0-18-14-32-32-32zm-292 237v53a8 8 0 01-8 8h-40a8 8 0 01-8-8v-53a48 48 0 1156 0zm152-237H332V240a56 56 0 0156-56h248a56 56 0 0156 56v224z</StreamGeometry>
-  <StreamGeometry x:Key="Icons.MacOS.Close">M887 774 625 511l263-260c11-11 11-28 0-39l-75-75c-5-5-12-8-20-8-7 0-14 3-20 8L512 396 250 137c-5-5-12-8-20-8-7 0-14 3-20 8L136 212c-11 11-11 28 0 39l263 260L137 774c-5 5-8 12-8 20 0 7 3 14 8 20l75 75c5 5 12 8 20 8 7 0 14-3 20-8L512 626l261 262c5 5 12 8 20 8 7 0 14-3 20-8l75-75c5-5 8-12 8-20C895 786 892 779 887 774z</StreamGeometry>
-  <StreamGeometry x:Key="Icons.MacOS.Minimize">M1024 750v110c0 50-41 91-91 91h-841A92 92 0 010 859v-110C0 699 41 658 91 658h841c50 0 91 41 91 91z</StreamGeometry>
-  <StreamGeometry x:Key="Icons.MacOS.Maximize">M0 4 0 20 16 20 0 4M4 0 20 0 20 16 4 0z</StreamGeometry>
   <StreamGeometry x:Key="Icons.Menu">M192 192m-64 0a64 64 0 1 0 128 0 64 64 0 1 0-128 0ZM192 512m-64 0a64 64 0 1 0 128 0 64 64 0 1 0-128 0ZM192 832m-64 0a64 64 0 1 0 128 0 64 64 0 1 0-128 0ZM864 160H352c-17.7 0-32 14.3-32 32s14.3 32 32 32h512c17.7 0 32-14.3 32-32s-14.3-32-32-32zM864 480H352c-17.7 0-32 14.3-32 32s14.3 32 32 32h512c17.7 0 32-14.3 32-32s-14.3-32-32-32zM864 800H352c-17.7 0-32 14.3-32 32s14.3 32 32 32h512c17.7 0 32-14.3 32-32s-14.3-32-32-32z</StreamGeometry>
   <StreamGeometry x:Key="Icons.Merge">M824 645V307c0-56-46-102-102-102h-102V102l-154 154 154 154V307h102v338c-46 20-82 67-82 123 0 72 61 133 133 133 72 0 133-61 133-133 0-56-36-102-82-123zm-51 195c-41 0-72-31-72-72s31-72 72-72c41 0 72 31 72 72s-31 72-72 72zM384 256c0-72-61-133-133-133-72 0-133 61-133 133 0 56 36 102 82 123v266C154 666 118 712 118 768c0 72 61 133 133 133 72 0 133-61 133-133 0-56-36-102-82-123V379C348 358 384 312 384 256zM323 768c0 41-31 72-72 72-41 0-72-31-72-72s31-72 72-72c41 0 72 31 72 72zM251 328c-41 0-72-31-72-72s31-72 72-72c41 0 72 31 72 72s-31 72-72 72z</StreamGeometry>
   <StreamGeometry x:Key="Icons.Modified">M896 64H128C96 64 64 96 64 128v768c0 32 32 64 64 64h768c32 0 64-32 64-64V128c0-32-32-64-64-64z m-64 736c0 16-17 32-32 32H224c-18 0-32-12-32-32V224c0-16 16-32 32-32h576c15 0 32 16 32 32v576zM512 384c-71 0-128 57-128 128s57 128 128 128 128-57 128-128-57-128-128-128z</StreamGeometry>
diff --git a/src/Views/AIAssistant.axaml b/src/Views/AIAssistant.axaml
index 1c266715..528d0e5b 100644
--- a/src/Views/AIAssistant.axaml
+++ b/src/Views/AIAssistant.axaml
@@ -15,30 +15,23 @@
                     WindowStartupLocation="CenterOwner">
   <Grid RowDefinitions="Auto,Auto,Auto">
     <!-- TitleBar -->
-    <Grid Grid.Row="0" ColumnDefinitions="Auto,*,Auto" Height="30" IsVisible="{Binding !#ThisControl.UseSystemWindowFrame}">
-      <Border Grid.Column="0" Grid.ColumnSpan="3"
-              Background="{DynamicResource Brush.TitleBar}"
+    <Grid Grid.Row="0" Height="28" IsVisible="{Binding !#ThisControl.UseSystemWindowFrame}">
+      <Border Background="{DynamicResource Brush.TitleBar}"
               BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border0}"
               PointerPressed="BeginMoveWindow"/>
 
-      <Path Grid.Column="0"
-            Width="14" Height="14"
+      <Path Width="14" Height="14"
             Margin="10,0,0,0"
+            HorizontalAlignment="Left"
             Data="{StaticResource Icons.AIAssist}"
             IsVisible="{OnPlatform True, macOS=False}"/>
 
-      <v:CaptionButtonsMacOS Grid.Column="0"
-                             Margin="0,2,0,0"
-                             IsCloseButtonOnly="True"
-                             IsVisible="{OnPlatform False, macOS=True}"/>
-
-      <TextBlock Grid.Column="0" Grid.ColumnSpan="3"
-                 Classes="bold"
+      <TextBlock Classes="bold"
                  Text="{DynamicResource Text.AIAssistant}"
                  HorizontalAlignment="Center" VerticalAlignment="Center"
                  IsHitTestVisible="False"/>
 
-      <v:CaptionButtons Grid.Column="2"
+      <v:CaptionButtons HorizontalAlignment="Right"
                         IsCloseButtonOnly="True"
                         IsVisible="{OnPlatform True, macOS=False}"/>
     </Grid>
diff --git a/src/Views/AIAssistant.axaml.cs b/src/Views/AIAssistant.axaml.cs
index 331d380d..d81335eb 100644
--- a/src/Views/AIAssistant.axaml.cs
+++ b/src/Views/AIAssistant.axaml.cs
@@ -4,7 +4,6 @@ using System.Threading;
 using System.Threading.Tasks;
 
 using Avalonia.Controls;
-using Avalonia.Input;
 using Avalonia.Threading;
 
 namespace SourceGit.Views
@@ -55,11 +54,6 @@ namespace SourceGit.Views
             _cancel.Cancel();
         }
 
-        private void BeginMoveWindow(object _, PointerPressedEventArgs e)
-        {
-            BeginMoveDrag(e);
-        }
-
         private void SetDescription(string message)
         {
             Dispatcher.UIThread.Invoke(() => ProgressMessage.Text = message);
diff --git a/src/Views/About.axaml b/src/Views/About.axaml
index 159a34a9..d781ee9e 100644
--- a/src/Views/About.axaml
+++ b/src/Views/About.axaml
@@ -13,30 +13,23 @@
                     WindowStartupLocation="CenterScreen">
   <Grid RowDefinitions="Auto,*">
     <!-- TitleBar -->
-    <Grid Grid.Row="0" ColumnDefinitions="Auto,*,Auto" Height="30" IsVisible="{Binding !UseSystemWindowFrame}">
-      <Border Grid.Column="0" Grid.ColumnSpan="3"
-              Background="{DynamicResource Brush.TitleBar}"
+    <Grid Grid.Row="0" Height="28" IsVisible="{Binding !UseSystemWindowFrame}">
+      <Border Background="{DynamicResource Brush.TitleBar}"
               BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border0}"
               PointerPressed="BeginMoveWindow"/>
 
-      <Path Grid.Column="0"
-            Width="14" Height="14"
+      <Path Width="14" Height="14"
             Margin="10,0,0,0"
+            HorizontalAlignment="Left"
             Data="{StaticResource Icons.Info}"
             IsVisible="{OnPlatform True, macOS=False}"/>
-      
-      <v:CaptionButtonsMacOS Grid.Column="0"
-                             Margin="0,2,0,0"
-                             IsCloseButtonOnly="True"
-                             IsVisible="{OnPlatform False, macOS=True}"/>
 
-      <TextBlock Grid.Column="0" Grid.ColumnSpan="3"
-                 Classes="bold"
+      <TextBlock Classes="bold"
                  Text="{DynamicResource Text.About}"
                  HorizontalAlignment="Center" VerticalAlignment="Center"
                  IsHitTestVisible="False"/>
       
-      <v:CaptionButtons Grid.Column="2"
+      <v:CaptionButtons HorizontalAlignment="Right"
                         IsCloseButtonOnly="True"
                         IsVisible="{OnPlatform True, macOS=False}"/>
     </Grid>
diff --git a/src/Views/About.axaml.cs b/src/Views/About.axaml.cs
index 4f7f953f..b02cd13f 100644
--- a/src/Views/About.axaml.cs
+++ b/src/Views/About.axaml.cs
@@ -21,11 +21,6 @@ namespace SourceGit.Views
             InitializeComponent();
         }
 
-        private void BeginMoveWindow(object _, PointerPressedEventArgs e)
-        {
-            BeginMoveDrag(e);
-        }
-
         private void OnVisitAvaloniaUI(object _, PointerPressedEventArgs e)
         {
             Native.OS.OpenBrowser("https://www.avaloniaui.net/");
diff --git a/src/Views/Askpass.axaml b/src/Views/Askpass.axaml
index e3e9a499..9a38c58f 100644
--- a/src/Views/Askpass.axaml
+++ b/src/Views/Askpass.axaml
@@ -13,30 +13,23 @@
                     WindowStartupLocation="CenterScreen">
   <Grid RowDefinitions="Auto,*">
     <!-- TitleBar -->
-    <Grid Grid.Row="0" ColumnDefinitions="Auto,*,Auto" Height="30" IsVisible="{Binding !UseSystemWindowFrame}">
-      <Border Grid.Column="0" Grid.ColumnSpan="3"
-              Background="{DynamicResource Brush.TitleBar}"
+    <Grid Grid.Row="0" Height="28" IsVisible="{Binding !UseSystemWindowFrame}">
+      <Border Background="{DynamicResource Brush.TitleBar}"
               BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border0}"
               PointerPressed="BeginMoveWindow"/>
 
-      <Path Grid.Column="0"
-            Width="14" Height="14"
+      <Path Width="14" Height="14"
             Margin="10,0,0,0"
+            HorizontalAlignment="Left"
             Data="{StaticResource Icons.Password}"
             IsVisible="{OnPlatform True, macOS=False}"/>
-      
-      <v:CaptionButtonsMacOS Grid.Column="0"
-                             Margin="0,2,0,0"
-                             IsCloseButtonOnly="True"
-                             IsVisible="{OnPlatform False, macOS=True}"/>
 
-      <TextBlock Grid.Column="0" Grid.ColumnSpan="3"
-                 Classes="bold"
+      <TextBlock Classes="bold"
                  Text="{DynamicResource Text.Askpass}"
                  HorizontalAlignment="Center" VerticalAlignment="Center"
                  IsHitTestVisible="False"/>
 
-      <v:CaptionButtons Grid.Column="2"
+      <v:CaptionButtons HorizontalAlignment="Right"
                         IsCloseButtonOnly="True"
                         IsVisible="{OnPlatform True, macOS=False}"/>
     </Grid>
diff --git a/src/Views/Askpass.axaml.cs b/src/Views/Askpass.axaml.cs
index 305e9843..673fd8ef 100644
--- a/src/Views/Askpass.axaml.cs
+++ b/src/Views/Askpass.axaml.cs
@@ -1,7 +1,6 @@
 using System;
 
 using Avalonia;
-using Avalonia.Input;
 using Avalonia.Interactivity;
 
 namespace SourceGit.Views
@@ -42,11 +41,6 @@ namespace SourceGit.Views
             InitializeComponent();
         }
 
-        private void BeginMoveWindow(object _, PointerPressedEventArgs e)
-        {
-            BeginMoveDrag(e);
-        }
-
         private void CloseWindow(object _1, RoutedEventArgs _2)
         {
             Console.Out.WriteLine("No passphrase entered.");
diff --git a/src/Views/AssumeUnchangedManager.axaml b/src/Views/AssumeUnchangedManager.axaml
index 2503d586..28e4d3bd 100644
--- a/src/Views/AssumeUnchangedManager.axaml
+++ b/src/Views/AssumeUnchangedManager.axaml
@@ -16,30 +16,23 @@
                     WindowStartupLocation="CenterOwner">
   <Grid RowDefinitions="Auto,*">    
     <!-- TitleBar -->
-    <Grid Grid.Row="0" ColumnDefinitions="Auto,*,Auto" Height="30" IsVisible="{Binding !#ThisControl.UseSystemWindowFrame}">
-      <Border Grid.Column="0" Grid.ColumnSpan="3"
-              Background="{DynamicResource Brush.TitleBar}"
+    <Grid Grid.Row="0" Height="28" IsVisible="{Binding !#ThisControl.UseSystemWindowFrame}">
+      <Border Background="{DynamicResource Brush.TitleBar}"
               BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border0}"
               PointerPressed="BeginMoveWindow"/>
       
-      <Path Grid.Column="0"
-            Width="14" Height="14"
+      <Path Width="14" Height="14"
             Margin="10,0,0,0"
+            HorizontalAlignment="Left"
             Data="{StaticResource Icons.File.Ignore}"
             IsVisible="{OnPlatform True, macOS=False}"/>
 
-      <v:CaptionButtonsMacOS Grid.Column="0"
-                             Margin="0,2,0,0"
-                             IsCloseButtonOnly="True"
-                             IsVisible="{OnPlatform False, macOS=True}"/>
-
-      <TextBlock Grid.Column="0" Grid.ColumnSpan="3"
-                 Classes="bold"
+      <TextBlock Classes="bold"
                  Text="{DynamicResource Text.AssumeUnchanged}"
                  HorizontalAlignment="Center" VerticalAlignment="Center"
                  IsHitTestVisible="False"/>
 
-      <v:CaptionButtons Grid.Column="2"
+      <v:CaptionButtons HorizontalAlignment="Right"
                         IsCloseButtonOnly="True"
                         IsVisible="{OnPlatform True, macOS=False}"/>
     </Grid>
diff --git a/src/Views/AssumeUnchangedManager.axaml.cs b/src/Views/AssumeUnchangedManager.axaml.cs
index ae9c7fe6..a0a5a352 100644
--- a/src/Views/AssumeUnchangedManager.axaml.cs
+++ b/src/Views/AssumeUnchangedManager.axaml.cs
@@ -1,5 +1,4 @@
 using Avalonia.Controls;
-using Avalonia.Input;
 using Avalonia.Interactivity;
 
 namespace SourceGit.Views
@@ -11,11 +10,6 @@ namespace SourceGit.Views
             InitializeComponent();
         }
 
-        private void BeginMoveWindow(object _, PointerPressedEventArgs e)
-        {
-            BeginMoveDrag(e);
-        }
-
         private void OnRemoveButtonClicked(object sender, RoutedEventArgs e)
         {
             if (DataContext is ViewModels.AssumeUnchangedManager vm && sender is Button button)
diff --git a/src/Views/Blame.axaml b/src/Views/Blame.axaml
index 9cf8b78a..98e1c4f2 100644
--- a/src/Views/Blame.axaml
+++ b/src/Views/Blame.axaml
@@ -19,29 +19,26 @@
     </Grid.RowDefinitions>
 
     <!-- TitleBar -->
-    <Grid Grid.Row="0" ColumnDefinitions="Auto,Auto,*,Auto" Height="30" IsVisible="{Binding !#ThisControl.UseSystemWindowFrame}">
+    <Grid Grid.Row="0" Height="28" IsVisible="{Binding !#ThisControl.UseSystemWindowFrame}">
       <!-- Bottom border -->
-      <Border Grid.Column="0" Grid.ColumnSpan="4"
-              Background="{DynamicResource Brush.TitleBar}"
+      <Border Background="{DynamicResource Brush.TitleBar}"
               BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border2}"
               DoubleTapped="MaximizeOrRestoreWindow"
               PointerPressed="BeginMoveWindow"/>
 
-      <!-- Caption Buttons (macOS) -->
-      <Border Grid.Column="0" IsVisible="{OnPlatform False, macOS=True}">
-        <v:CaptionButtonsMacOS/>
-      </Border>
-
-      <!-- Icon -->
-      <Path Grid.Column="1" Margin="8,0,0,0" Width="12" Height="12" Data="{StaticResource Icons.Blame}"/>
-
-      <!-- Title -->
-      <TextBlock Grid.Column="2" Margin="8,0,0,0" Text="{DynamicResource Text.Blame}" FontWeight="Bold" IsHitTestVisible="False" VerticalAlignment="Center"/>
+      <Path Width="12" Height="12"
+            Margin="10,0,0,0"
+            HorizontalAlignment="Left"
+            Data="{StaticResource Icons.Blame}"
+            IsVisible="{OnPlatform True, macOS=False}"/>
 
+      <TextBlock Classes="bold"
+                 Text="{DynamicResource Text.Blame}"
+                 HorizontalAlignment="Center" VerticalAlignment="Center"
+                 IsHitTestVisible="False"/>
+      
       <!-- Caption Buttons (Windows/Linux) -->
-      <Border Grid.Column="3" IsVisible="{OnPlatform True, macOS=False}">
-        <v:CaptionButtons/>
-      </Border>
+      <v:CaptionButtons HorizontalAlignment="Right" IsVisible="{OnPlatform True, macOS=False}"/>
     </Grid>
 
     <!-- File -->
diff --git a/src/Views/Blame.axaml.cs b/src/Views/Blame.axaml.cs
index f96870e0..1abd3ad1 100644
--- a/src/Views/Blame.axaml.cs
+++ b/src/Views/Blame.axaml.cs
@@ -429,30 +429,12 @@ namespace SourceGit.Views
     }
 
     public partial class Blame : ChromelessWindow
-    {
+    {        
         public Blame()
-        {
+        {            
             InitializeComponent();
         }
 
-        private void MaximizeOrRestoreWindow(object _, TappedEventArgs e)
-        {
-            if (WindowState == WindowState.Maximized)
-                WindowState = WindowState.Normal;
-            else
-                WindowState = WindowState.Maximized;
-
-            e.Handled = true;
-        }
-
-        private void BeginMoveWindow(object _, PointerPressedEventArgs e)
-        {
-            if (e.ClickCount == 1)
-                BeginMoveDrag(e);
-
-            e.Handled = true;
-        }
-
         protected override void OnClosed(EventArgs e)
         {
             base.OnClosed(e);
diff --git a/src/Views/BranchCompare.axaml b/src/Views/BranchCompare.axaml
index a8bbc4af..b0e227c2 100644
--- a/src/Views/BranchCompare.axaml
+++ b/src/Views/BranchCompare.axaml
@@ -21,29 +21,26 @@
     </Grid.RowDefinitions>
 
     <!-- TitleBar -->
-    <Grid Grid.Row="0" ColumnDefinitions="Auto,Auto,*,Auto" Height="30" IsVisible="{Binding !#ThisControl.UseSystemWindowFrame}">
+    <Grid Grid.Row="0" Height="28" IsVisible="{Binding !#ThisControl.UseSystemWindowFrame}">
       <!-- Bottom border -->
-      <Border Grid.Column="0" Grid.ColumnSpan="4"
-              Background="{DynamicResource Brush.TitleBar}"
+      <Border Background="{DynamicResource Brush.TitleBar}"
               BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border2}"
               DoubleTapped="MaximizeOrRestoreWindow"
               PointerPressed="BeginMoveWindow"/>
 
-      <!-- Caption Buttons (macOS) -->
-      <Border Grid.Column="0" IsVisible="{OnPlatform False, macOS=True}">
-        <v:CaptionButtonsMacOS/>
-      </Border>
-
-      <!-- Icon -->
-      <Path Grid.Column="1" Margin="8,0,0,0" Width="12" Height="12" Data="{StaticResource Icons.Compare}"/>
-
-      <!-- Title -->
-      <TextBlock Grid.Column="2" Margin="8,0,0,0" Text="{DynamicResource Text.BranchCompare}" FontWeight="Bold" IsHitTestVisible="False" VerticalAlignment="Center"/>
+      <Path Width="12" Height="12"
+            Margin="10,0,0,0"
+            HorizontalAlignment="Left"
+            Data="{StaticResource Icons.Compare}"
+            IsVisible="{OnPlatform True, macOS=False}"/>
 
+      <TextBlock Classes="bold"
+                 Text="{DynamicResource Text.BranchCompare}"
+                 HorizontalAlignment="Center" VerticalAlignment="Center"
+                 IsHitTestVisible="False"/>
+      
       <!-- Caption Buttons (Windows/Linux) -->
-      <Border Grid.Column="3" IsVisible="{OnPlatform True, macOS=False}">
-        <v:CaptionButtons/>
-      </Border>
+      <v:CaptionButtons HorizontalAlignment="Right" IsVisible="{OnPlatform True, macOS=False}"/>
     </Grid>
 
     <!-- Compare Targets -->
diff --git a/src/Views/BranchCompare.axaml.cs b/src/Views/BranchCompare.axaml.cs
index 844a1b6b..b368916d 100644
--- a/src/Views/BranchCompare.axaml.cs
+++ b/src/Views/BranchCompare.axaml.cs
@@ -4,30 +4,12 @@ using Avalonia.Input;
 namespace SourceGit.Views
 {
     public partial class BranchCompare : ChromelessWindow
-    {
+    {        
         public BranchCompare()
-        {
+        {            
             InitializeComponent();
         }
 
-        private void MaximizeOrRestoreWindow(object _, TappedEventArgs e)
-        {
-            if (WindowState == WindowState.Maximized)
-                WindowState = WindowState.Normal;
-            else
-                WindowState = WindowState.Maximized;
-
-            e.Handled = true;
-        }
-
-        private void BeginMoveWindow(object _, PointerPressedEventArgs e)
-        {
-            if (e.ClickCount == 1)
-                BeginMoveDrag(e);
-
-            e.Handled = true;
-        }
-
         private void OnChangeContextRequested(object sender, ContextRequestedEventArgs e)
         {
             if (DataContext is ViewModels.BranchCompare vm && sender is ChangeCollectionView view)
diff --git a/src/Views/CaptionButtonsMacOS.axaml b/src/Views/CaptionButtonsMacOS.axaml
deleted file mode 100644
index 59c12e8d..00000000
--- a/src/Views/CaptionButtonsMacOS.axaml
+++ /dev/null
@@ -1,159 +0,0 @@
-<UserControl xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="SourceGit.Views.CaptionButtonsMacOS"
-             x:Name="ThisControl">
-  <UserControl.Resources>
-    <ResourceDictionary>
-      <ResourceDictionary.ThemeDictionaries>
-        <ResourceDictionary x:Key="Light">
-          <Color x:Key="Color.MacOS.Close">#FFED6A5E</Color>
-          <Color x:Key="Color.MacOS.CloseFG">#FF69110A</Color>
-          <Color x:Key="Color.MacOS.ClosePressed">#FFB24F46</Color>
-          <Color x:Key="Color.MacOS.ClosePressedFG">#FF2E0402</Color>
-          <Color x:Key="Color.MacOS.Minimize">#FFF4BF4F</Color>
-          <Color x:Key="Color.MacOS.MinimizeFG">#FF8F591D</Color>
-          <Color x:Key="Color.MacOS.MinimizePressed">#FFB78F3A</Color>
-          <Color x:Key="Color.MacOS.MinimizePressedFG">#FF522A0A</Color>
-          <Color x:Key="Color.MacOS.Maximize">#FF61C554</Color>
-          <Color x:Key="Color.MacOS.MaximizeFG">#FF296017</Color>
-          <Color x:Key="Color.MacOS.MaximizePressed">#FF48943F</Color>
-          <Color x:Key="Color.MacOS.MaximizePressedFG">#FF102F07</Color>
-        </ResourceDictionary>
-        <ResourceDictionary x:Key="Dark">
-          <Color x:Key="Color.MacOS.Close">#FFED6A5E</Color>
-          <Color x:Key="Color.MacOS.CloseFG">#FF8C1A10</Color>
-          <Color x:Key="Color.MacOS.ClosePressed">#FFF09389</Color>
-          <Color x:Key="Color.MacOS.ClosePressedFG">#FF69120A</Color>
-          <Color x:Key="Color.MacOS.Minimize">#FFF4BF4F</Color>
-          <Color x:Key="Color.MacOS.MinimizeFG">#FF8F591D</Color>
-          <Color x:Key="Color.MacOS.MinimizePressed">#FFFBEB74</Color>
-          <Color x:Key="Color.MacOS.MinimizePressedFG">#FF705F1B</Color>
-          <Color x:Key="Color.MacOS.Maximize">#FF61C554</Color>
-          <Color x:Key="Color.MacOS.MaximizeFG">#FF296017</Color>
-          <Color x:Key="Color.MacOS.MaximizePressed">#FF86F37F</Color>
-          <Color x:Key="Color.MacOS.MaximizePressedFG">#FF2C681A</Color>
-        </ResourceDictionary>
-      </ResourceDictionary.ThemeDictionaries>
-      
-      <SolidColorBrush x:Key="Brush.MacOS.Close" Color="{DynamicResource Color.MacOS.Close}"/>
-      <SolidColorBrush x:Key="Brush.MacOS.CloseFG" Color="{DynamicResource Color.MacOS.CloseFG}"/>
-      <SolidColorBrush x:Key="Brush.MacOS.ClosePressed" Color="{DynamicResource Color.MacOS.ClosePressed}"/>
-      <SolidColorBrush x:Key="Brush.MacOS.ClosePressedFG" Color="{DynamicResource Color.MacOS.ClosePressedFG}"/>
-      <SolidColorBrush x:Key="Brush.MacOS.Minimize" Color="{DynamicResource Color.MacOS.Minimize}"/>
-      <SolidColorBrush x:Key="Brush.MacOS.MinimizeFG" Color="{DynamicResource Color.MacOS.MinimizeFG}"/>
-      <SolidColorBrush x:Key="Brush.MacOS.MinimizePressed" Color="{DynamicResource Color.MacOS.MinimizePressed}"/>
-      <SolidColorBrush x:Key="Brush.MacOS.MinimizePressedFG" Color="{DynamicResource Color.MacOS.MinimizePressedFG}"/>
-      <SolidColorBrush x:Key="Brush.MacOS.Maximize" Color="{DynamicResource Color.MacOS.Maximize}"/>
-      <SolidColorBrush x:Key="Brush.MacOS.MaximizeFG" Color="{DynamicResource Color.MacOS.MaximizeFG}"/>
-      <SolidColorBrush x:Key="Brush.MacOS.MaximizePressed" Color="{DynamicResource Color.MacOS.MaximizePressed}"/>
-      <SolidColorBrush x:Key="Brush.MacOS.MaximizePressedFG" Color="{DynamicResource Color.MacOS.MaximizePressedFG}"/>
-    </ResourceDictionary>
-  </UserControl.Resources>
-  
-  <UserControl.Styles>
-    <Style Selector="Button">
-      <Setter Property="Width" Value="24"/>
-      <Setter Property="Height" Value="24"/>
-      <Setter Property="Background" Value="Transparent"/>
-      <Setter Property="BorderThickness" Value="0"/>
-      <Setter Property="VerticalAlignment" Value="Center"/>
-    </Style>
-    <Style Selector="Button /template/ ContentPresenter#PART_ContentPresenter">
-      <Setter Property="Background" Value="Transparent"/>
-    </Style>
-    <Style Selector="Button:pointerover /template/ ContentPresenter#PART_ContentPresenter">
-      <Setter Property="Background" Value="Transparent"/>
-    </Style>
-    
-    <Style Selector="Button>Grid>Ellipse">
-      <Setter Property="Width" Value="14"/>
-      <Setter Property="Height" Value="14"/>
-      <Setter Property="VerticalAlignment" Value="Center"/>
-      <Setter Property="StrokeThickness" Value=".5"/>
-      <Setter Property="Stroke" Value="#40000000"/>
-    </Style>
-    
-    <Style Selector="Button.close>Grid>Ellipse">
-      <Setter Property="Fill" Value="{DynamicResource Brush.MacOS.Close}"/>
-    </Style>
-    <Style Selector="Button.minimize>Grid>Ellipse">
-      <Setter Property="Fill" Value="{DynamicResource Brush.MacOS.Minimize}"/>
-    </Style>
-    <Style Selector="Button.maximize>Grid>Ellipse">
-      <Setter Property="Fill" Value="{DynamicResource Brush.MacOS.Maximize}"/>
-    </Style>
-    <Style Selector="Button.close:pressed>Grid>Ellipse">
-      <Setter Property="Fill" Value="{DynamicResource Brush.MacOS.ClosePressed}"/>
-    </Style>
-    <Style Selector="Button.minimize:pressed>Grid>Ellipse">
-      <Setter Property="Fill" Value="{DynamicResource Brush.MacOS.MinimizePressed}"/>
-    </Style>
-    <Style Selector="Button.maximize:pressed>Grid>Ellipse">
-      <Setter Property="Fill" Value="{DynamicResource Brush.MacOS.MaximizePressed}"/>
-    </Style>
-    
-    <Style Selector="Button>Grid>Path">
-      <Setter Property="Stretch" Value="Fill"/>
-      <Setter Property="Fill" Value="Black"/>
-      <Setter Property="IsVisible" Value="False"/>
-      <Setter Property="VerticalAlignment" Value="Center"/>
-    </Style>
-    <Style Selector="Button.close>Grid>Path">
-      <Setter Property="Width" Value="6"/>
-      <Setter Property="Height" Value="6"/>
-      <Setter Property="Fill" Value="{DynamicResource Brush.MacOS.CloseFG}"/>
-      <Setter Property="Data" Value="{StaticResource Icons.MacOS.Close}"/>
-    </Style>
-    <Style Selector="Button.minimize>Grid>Path">
-      <Setter Property="Width" Value="8"/>
-      <Setter Property="Height" Value="2"/>
-      <Setter Property="Fill" Value="{DynamicResource Brush.MacOS.MinimizeFG}"/>
-      <Setter Property="Data" Value="{StaticResource Icons.MacOS.Minimize}"/>
-    </Style>
-    <Style Selector="Button.maximize>Grid>Path">
-      <Setter Property="Width" Value="6"/>
-      <Setter Property="Height" Value="6"/>
-      <Setter Property="Fill" Value="{DynamicResource Brush.MacOS.MaximizeFG}"/>
-      <Setter Property="Data" Value="{StaticResource Icons.MacOS.Maximize}"/>
-    </Style>
-    <Style Selector="Button.close:pressed>Grid>Path">
-      <Setter Property="Fill" Value="{DynamicResource Brush.MacOS.ClosePressedFG}"/>
-    </Style>
-    <Style Selector="Button.minimize:pressed>Grid>Path">
-      <Setter Property="Fill" Value="{DynamicResource Brush.MacOS.MinimizePressedFG}"/>
-    </Style>
-    <Style Selector="Button.maximize:pressed>Grid>Path">
-      <Setter Property="Fill" Value="{DynamicResource Brush.MacOS.MaximizePressedFG}"/>
-    </Style>
-    
-    <Style Selector="Grid.caption_button_box:pointerover>StackPanel>Button>Grid>Path">
-      <Setter Property="IsVisible" Value="True"/>
-    </Style>
-  </UserControl.Styles>
-  
-  <Grid Classes="caption_button_box">
-    <StackPanel Orientation="Horizontal" Margin="8,0,0,0">
-      <Button Classes="close" Click="CloseWindow">
-        <Grid>
-          <Ellipse/>
-          <Path/>
-        </Grid>
-      </Button>
-      <Button Classes="minimize" Click="MinimizeWindow" IsVisible="{Binding !#ThisControl.IsCloseButtonOnly}">
-        <Grid>
-          <Ellipse/>
-          <Path/>
-        </Grid>
-      </Button>
-      <Button Classes="maximize" Click="MaximizeOrRestoreWindow" IsVisible="{Binding !#ThisControl.IsCloseButtonOnly}">
-        <Grid>
-          <Ellipse/>
-          <Path/>
-        </Grid>
-      </Button>
-    </StackPanel>
-  </Grid>
-</UserControl>
diff --git a/src/Views/CaptionButtonsMacOS.axaml.cs b/src/Views/CaptionButtonsMacOS.axaml.cs
deleted file mode 100644
index 98bbb88f..00000000
--- a/src/Views/CaptionButtonsMacOS.axaml.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Interactivity;
-using Avalonia.VisualTree;
-
-namespace SourceGit.Views
-{
-    public partial class CaptionButtonsMacOS : UserControl
-    {
-        public static readonly StyledProperty<bool> IsCloseButtonOnlyProperty =
-            AvaloniaProperty.Register<CaptionButtonsMacOS, bool>(nameof(IsCloseButtonOnly));
-
-        public bool IsCloseButtonOnly
-        {
-            get => GetValue(IsCloseButtonOnlyProperty);
-            set => SetValue(IsCloseButtonOnlyProperty, value);
-        }
-
-        public CaptionButtonsMacOS()
-        {
-            InitializeComponent();
-        }
-
-        private void MinimizeWindow(object _, RoutedEventArgs e)
-        {
-            var window = this.FindAncestorOfType<Window>();
-            if (window != null)
-                window.WindowState = WindowState.Minimized;
-
-            e.Handled = true;
-        }
-
-        private void MaximizeOrRestoreWindow(object _, RoutedEventArgs e)
-        {
-            var window = this.FindAncestorOfType<Window>();
-            if (window != null)
-                window.WindowState = window.WindowState == WindowState.Maximized ? WindowState.Normal : WindowState.Maximized;
-
-            e.Handled = true;
-        }
-
-        private void CloseWindow(object _, RoutedEventArgs e)
-        {
-            var window = this.FindAncestorOfType<Window>();
-            window?.Close();
-            e.Handled = true;
-        }
-    }
-}
diff --git a/src/Views/ChromelessWindow.cs b/src/Views/ChromelessWindow.cs
index a9b9f259..107a7ba3 100644
--- a/src/Views/ChromelessWindow.cs
+++ b/src/Views/ChromelessWindow.cs
@@ -32,14 +32,35 @@ namespace SourceGit.Views
                     Classes.Add("custom_window_frame");
                 }
             }
-            else
+            else if (OperatingSystem.IsWindows())
             {
                 ExtendClientAreaChromeHints = ExtendClientAreaChromeHints.NoChrome;
                 ExtendClientAreaToDecorationsHint = true;
-
-                if (OperatingSystem.IsWindows())
-                    Classes.Add("fix_maximized_padding");
+                Classes.Add("fix_maximized_padding");
             }
+            else
+            {
+                ExtendClientAreaChromeHints = ExtendClientAreaChromeHints.SystemChrome;
+                ExtendClientAreaToDecorationsHint = true;
+            }
+        }
+
+        public void BeginMoveWindow(object _, PointerPressedEventArgs e)
+        {
+            if (e.ClickCount == 1)
+                BeginMoveDrag(e);
+
+            e.Handled = true;
+        }
+
+        public void MaximizeOrRestoreWindow(object _, TappedEventArgs e)
+        {
+            if (WindowState == WindowState.Maximized)
+                WindowState = WindowState.Normal;
+            else
+                WindowState = WindowState.Maximized;
+
+            e.Handled = true;
         }
 
         protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
diff --git a/src/Views/ConfigureWorkspace.axaml b/src/Views/ConfigureWorkspace.axaml
index c7ed900b..9c18ad04 100644
--- a/src/Views/ConfigureWorkspace.axaml
+++ b/src/Views/ConfigureWorkspace.axaml
@@ -2,10 +2,8 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
                     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="500" d:DesignHeight="450"
                     x:Class="SourceGit.Views.ConfigureWorkspace"
                     x:DataType="vm:ConfigureWorkspace"
@@ -17,30 +15,23 @@
                     WindowStartupLocation="CenterOwner">
   <Grid RowDefinitions="Auto,Auto" MinWidth="494">
     <!-- TitleBar -->
-    <Grid Grid.Row="0" ColumnDefinitions="Auto,*,Auto" Height="30" IsVisible="{Binding !#ThisControl.UseSystemWindowFrame}">
-      <Border Grid.Column="0" Grid.ColumnSpan="3"
-              Background="{DynamicResource Brush.TitleBar}"
+    <Grid Grid.Row="0" Height="28" IsVisible="{Binding !#ThisControl.UseSystemWindowFrame}">
+      <Border Background="{DynamicResource Brush.TitleBar}"
               BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border0}"
               PointerPressed="BeginMoveWindow"/>
 
-      <Path Grid.Column="0"
-            Width="14" Height="14"
-            Data="{StaticResource Icons.Workspace}"
+      <Path Width="14" Height="14"
             Margin="10,0,0,0"
+            HorizontalAlignment="Left"
+            Data="{StaticResource Icons.Workspace}"
             IsVisible="{OnPlatform True, macOS=False}"/>
 
-      <v:CaptionButtonsMacOS Grid.Column="0"
-                             Margin="0,2,0,0"
-                             IsCloseButtonOnly="True"
-                             IsVisible="{OnPlatform False, macOS=True}"/>
-
-      <TextBlock Grid.Column="0" Grid.ColumnSpan="3"
-                 Classes="bold"
+      <TextBlock Classes="bold"
                  Text="{DynamicResource Text.ConfigureWorkspace}"
                  HorizontalAlignment="Center" VerticalAlignment="Center"
                  IsHitTestVisible="False"/>
 
-      <v:CaptionButtons Grid.Column="2"
+      <v:CaptionButtons HorizontalAlignment="Right"
                         IsCloseButtonOnly="True"
                         IsVisible="{OnPlatform True, macOS=False}"/>
     </Grid>
diff --git a/src/Views/ConfigureWorkspace.axaml.cs b/src/Views/ConfigureWorkspace.axaml.cs
index 82d8cd30..e2cc1cb2 100644
--- a/src/Views/ConfigureWorkspace.axaml.cs
+++ b/src/Views/ConfigureWorkspace.axaml.cs
@@ -1,5 +1,4 @@
 using Avalonia.Controls;
-using Avalonia.Input;
 
 namespace SourceGit.Views
 {
@@ -15,10 +14,5 @@ namespace SourceGit.Views
             ViewModels.Preference.Instance.Save();
             base.OnClosing(e);
         }
-
-        private void BeginMoveWindow(object _, PointerPressedEventArgs e)
-        {
-            BeginMoveDrag(e);
-        }
     }
 }
diff --git a/src/Views/ConfirmCommitWithoutFiles.axaml b/src/Views/ConfirmCommitWithoutFiles.axaml
index 0b457531..a056f016 100644
--- a/src/Views/ConfirmCommitWithoutFiles.axaml
+++ b/src/Views/ConfirmCommitWithoutFiles.axaml
@@ -15,30 +15,23 @@
                     WindowStartupLocation="CenterOwner">
   <Grid RowDefinitions="Auto,Auto,Auto">
     <!-- TitleBar -->
-    <Grid Grid.Row="0" ColumnDefinitions="Auto,*,Auto" Height="30" IsVisible="{Binding !#ThisControl.UseSystemWindowFrame}">
-      <Border Grid.Column="0" Grid.ColumnSpan="3"
-              Background="{DynamicResource Brush.TitleBar}"
+    <Grid Grid.Row="0" Height="28" IsVisible="{Binding !#ThisControl.UseSystemWindowFrame}">
+      <Border Background="{DynamicResource Brush.TitleBar}"
               BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border0}"
               PointerPressed="BeginMoveWindow"/>
 
-      <Path Grid.Column="0"
-            Width="14" Height="14"
-            Data="{StaticResource Icons.Error}"
+      <Path Width="14" Height="14"
             Margin="10,0,0,0"
+            HorizontalAlignment="Left"
+            Data="{StaticResource Icons.Error}"
             IsVisible="{OnPlatform True, macOS=False}"/>
 
-      <v:CaptionButtonsMacOS Grid.Column="0"
-                             Margin="0,2,0,0"
-                             IsCloseButtonOnly="True"
-                             IsVisible="{OnPlatform False, macOS=True}"/>
-
-      <TextBlock Grid.Column="0" Grid.ColumnSpan="3"
-                 Classes="bold"
+      <TextBlock Classes="bold"
                  Text="{DynamicResource Text.Warn}"
                  HorizontalAlignment="Center" VerticalAlignment="Center"
                  IsHitTestVisible="False"/>
 
-      <v:CaptionButtons Grid.Column="2"
+      <v:CaptionButtons HorizontalAlignment="Right"
                         IsCloseButtonOnly="True"
                         IsVisible="{OnPlatform True, macOS=False}"/>
     </Grid>
diff --git a/src/Views/ConfirmCommitWithoutFiles.axaml.cs b/src/Views/ConfirmCommitWithoutFiles.axaml.cs
index 0be18902..342600fc 100644
--- a/src/Views/ConfirmCommitWithoutFiles.axaml.cs
+++ b/src/Views/ConfirmCommitWithoutFiles.axaml.cs
@@ -1,4 +1,3 @@
-using Avalonia.Input;
 using Avalonia.Interactivity;
 
 namespace SourceGit.Views
@@ -10,11 +9,6 @@ namespace SourceGit.Views
             InitializeComponent();
         }
 
-        private void BeginMoveWindow(object _, PointerPressedEventArgs e)
-        {
-            BeginMoveDrag(e);
-        }
-
         private void Sure(object _1, RoutedEventArgs _2)
         {
             if (DataContext is ViewModels.ConfirmCommitWithoutFiles vm)
diff --git a/src/Views/ConfirmRestart.axaml b/src/Views/ConfirmRestart.axaml
index 9aafda7e..de2ddd4f 100644
--- a/src/Views/ConfirmRestart.axaml
+++ b/src/Views/ConfirmRestart.axaml
@@ -13,30 +13,23 @@
                     WindowStartupLocation="CenterOwner">
   <Grid RowDefinitions="Auto,*">
     <!-- TitleBar -->
-    <Grid Grid.Row="0" ColumnDefinitions="Auto,*,Auto" Height="30" IsVisible="{Binding !#ThisControl.UseSystemWindowFrame}">
-      <Border Grid.Column="0" Grid.ColumnSpan="3"
-              Background="{DynamicResource Brush.TitleBar}"
+    <Grid Grid.Row="0" Height="28" IsVisible="{Binding !#ThisControl.UseSystemWindowFrame}">
+      <Border Background="{DynamicResource Brush.TitleBar}"
               BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border0}"
               PointerPressed="BeginMoveWindow"/>
 
-      <Path Grid.Column="0"
-            Width="14" Height="14"
+      <Path Width="14" Height="14"
             Margin="10,0,0,0"
+            HorizontalAlignment="Left"
             Data="{StaticResource Icons.Info}"
             IsVisible="{OnPlatform True, macOS=False}"/>
 
-      <v:CaptionButtonsMacOS Grid.Column="0"
-                             Margin="0,2,0,0"
-                             IsCloseButtonOnly="True"
-                             IsVisible="{OnPlatform False, macOS=True}"/>
-
-      <TextBlock Grid.Column="0" Grid.ColumnSpan="3"
-                 Classes="bold"
+      <TextBlock Classes="bold"
                  Text="Restart Required"
                  HorizontalAlignment="Center" VerticalAlignment="Center"
                  IsHitTestVisible="False"/>
 
-      <v:CaptionButtons Grid.Column="2"
+      <v:CaptionButtons HorizontalAlignment="Right"
                         IsCloseButtonOnly="True"
                         IsVisible="{OnPlatform True, macOS=False}"/>
     </Grid>
diff --git a/src/Views/ConfirmRestart.axaml.cs b/src/Views/ConfirmRestart.axaml.cs
index d0647731..ea49bea1 100644
--- a/src/Views/ConfirmRestart.axaml.cs
+++ b/src/Views/ConfirmRestart.axaml.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Diagnostics;
 
-using Avalonia.Controls;
-using Avalonia.Input;
 using Avalonia.Interactivity;
 
 namespace SourceGit.Views
@@ -14,11 +12,6 @@ namespace SourceGit.Views
             InitializeComponent();
         }
 
-        private void BeginMoveWindow(object _, PointerPressedEventArgs e)
-        {
-            BeginMoveDrag(e);
-        }
-
         private void CloseWindow(object _1, RoutedEventArgs _2)
         {
             Console.Out.WriteLine("No passphrase entered.");
diff --git a/src/Views/ConventionalCommitMessageBuilder.axaml b/src/Views/ConventionalCommitMessageBuilder.axaml
index ab2ae37f..4fe8b8f9 100644
--- a/src/Views/ConventionalCommitMessageBuilder.axaml
+++ b/src/Views/ConventionalCommitMessageBuilder.axaml
@@ -5,7 +5,6 @@
                     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.ConventionalCommitMessageBuilder"
                     x:DataType="vm:ConventionalCommitMessageBuilder"
@@ -18,30 +17,23 @@
                     WindowStartupLocation="CenterOwner">
   <Grid RowDefinitions="Auto,Auto,Auto">
     <!-- TitleBar -->
-    <Grid Grid.Row="0" ColumnDefinitions="Auto,*,Auto" Height="30" IsVisible="{Binding !#ThisControl.UseSystemWindowFrame}">
-      <Border Grid.Column="0" Grid.ColumnSpan="3"
-              Background="{DynamicResource Brush.TitleBar}"
+    <Grid Grid.Row="0" Height="28" IsVisible="{Binding !#ThisControl.UseSystemWindowFrame}">
+      <Border Background="{DynamicResource Brush.TitleBar}"
               BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border0}"
               PointerPressed="BeginMoveWindow"/>
 
-      <Path Grid.Column="0"
-            Width="14" Height="14"
-            Data="{StaticResource Icons.CommitMessageGenerator}"
+      <Path Width="14" Height="14"
             Margin="10,0,0,0"
+            HorizontalAlignment="Left"
+            Data="{StaticResource Icons.CommitMessageGenerator}"
             IsVisible="{OnPlatform True, macOS=False}"/>
 
-      <v:CaptionButtonsMacOS Grid.Column="0"
-                             Margin="0,2,0,0"
-                             IsCloseButtonOnly="True"
-                             IsVisible="{OnPlatform False, macOS=True}"/>
-
-      <TextBlock Grid.Column="0" Grid.ColumnSpan="3"
-                 Classes="bold"
+      <TextBlock Classes="bold"
                  Text="{DynamicResource Text.ConventionalCommit}"
                  HorizontalAlignment="Center" VerticalAlignment="Center"
                  IsHitTestVisible="False"/>
 
-      <v:CaptionButtons Grid.Column="2"
+      <v:CaptionButtons HorizontalAlignment="Right"
                         IsCloseButtonOnly="True"
                         IsVisible="{OnPlatform True, macOS=False}"/>
     </Grid>
diff --git a/src/Views/ConventionalCommitMessageBuilder.axaml.cs b/src/Views/ConventionalCommitMessageBuilder.axaml.cs
index dfe56f0d..955450ed 100644
--- a/src/Views/ConventionalCommitMessageBuilder.axaml.cs
+++ b/src/Views/ConventionalCommitMessageBuilder.axaml.cs
@@ -1,4 +1,3 @@
-using Avalonia.Input;
 using Avalonia.Interactivity;
 
 namespace SourceGit.Views
@@ -10,11 +9,6 @@ namespace SourceGit.Views
             InitializeComponent();
         }
 
-        private void BeginMoveWindow(object _, PointerPressedEventArgs e)
-        {
-            BeginMoveDrag(e);
-        }
-
         private void OnApplyClicked(object _, RoutedEventArgs e)
         {
             if (DataContext is ViewModels.ConventionalCommitMessageBuilder builder)
diff --git a/src/Views/FileHistories.axaml b/src/Views/FileHistories.axaml
index bc048706..703957b8 100644
--- a/src/Views/FileHistories.axaml
+++ b/src/Views/FileHistories.axaml
@@ -20,29 +20,26 @@
     </Grid.RowDefinitions>
 
     <!-- TitleBar -->
-    <Grid Grid.Row="0" ColumnDefinitions="Auto,Auto,*,Auto" Height="30" IsVisible="{Binding !#ThisControl.UseSystemWindowFrame}">
+    <Grid Grid.Row="0" Height="28" IsVisible="{Binding !#ThisControl.UseSystemWindowFrame}">
       <!-- Bottom border -->
-      <Border Grid.Column="0" Grid.ColumnSpan="4"
-              Background="{DynamicResource Brush.TitleBar}"
+      <Border Background="{DynamicResource Brush.TitleBar}"
               BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border0}"
               DoubleTapped="MaximizeOrRestoreWindow"
               PointerPressed="BeginMoveWindow"/>
 
-      <!-- Caption Buttons (macOS) -->
-      <Border Grid.Column="0" IsVisible="{OnPlatform False, macOS=True}">
-        <v:CaptionButtonsMacOS/>
-      </Border>
-
-      <!-- Icon -->
-      <Path Grid.Column="1" Margin="8,0,0,0" Width="12" Height="12" Stretch="Uniform" Data="{StaticResource Icons.Histories}"/>
-
-      <!-- Title -->
-      <TextBlock Grid.Column="2" Margin="4,0,0,0" Text="{DynamicResource Text.FileHistory}" FontWeight="Bold" IsHitTestVisible="False" VerticalAlignment="Center"/>
+      <Path Width="12" Height="12"
+            Margin="10,0,0,0"
+            HorizontalAlignment="Left"
+            Data="{StaticResource Icons.Histories}"
+            IsVisible="{OnPlatform True, macOS=False}"/>
 
+      <TextBlock Classes="bold"
+                 Text="{DynamicResource Text.FileHistory}"
+                 HorizontalAlignment="Center" VerticalAlignment="Center"
+                 IsHitTestVisible="False"/>
+      
       <!-- Caption Buttons (Windows/Linux) -->
-      <Border Grid.Column="3" IsVisible="{OnPlatform True, macOS=False}">
-        <v:CaptionButtons/>
-      </Border>
+      <v:CaptionButtons HorizontalAlignment="Right" IsVisible="{OnPlatform True, macOS=False}"/>
     </Grid>
 
     <!-- Body -->
diff --git a/src/Views/FileHistories.axaml.cs b/src/Views/FileHistories.axaml.cs
index 6a2ee7c9..c7a01e2f 100644
--- a/src/Views/FileHistories.axaml.cs
+++ b/src/Views/FileHistories.axaml.cs
@@ -1,3 +1,6 @@
+using System;
+
+using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Interactivity;
@@ -6,27 +9,29 @@ namespace SourceGit.Views
 {
     public partial class FileHistories : ChromelessWindow
     {
+        public static readonly StyledProperty<bool> HasLeftCaptionButtonProperty =
+            AvaloniaProperty.Register<FileHistories, bool>(nameof(HasLeftCaptionButton));
+
+        public bool HasLeftCaptionButton
+        {
+            get => GetValue(HasLeftCaptionButtonProperty);
+            set => SetValue(HasLeftCaptionButtonProperty, value);
+        }
+        
         public FileHistories()
         {
+            if (OperatingSystem.IsMacOS())
+                HasLeftCaptionButton = true;
+            
             InitializeComponent();
         }
-
-        private void MaximizeOrRestoreWindow(object _, TappedEventArgs e)
+        
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
         {
-            if (WindowState == WindowState.Maximized)
-                WindowState = WindowState.Normal;
-            else
-                WindowState = WindowState.Maximized;
-
-            e.Handled = true;
-        }
-
-        private void BeginMoveWindow(object _, PointerPressedEventArgs e)
-        {
-            if (e.ClickCount == 1)
-                BeginMoveDrag(e);
-
-            e.Handled = true;
+            base.OnPropertyChanged(change);
+            
+            if (change.Property == WindowStateProperty)
+                HasLeftCaptionButton = WindowState != WindowState.FullScreen;
         }
 
         private void OnPressCommitSHA(object sender, PointerPressedEventArgs e)
diff --git a/src/Views/Hotkeys.axaml b/src/Views/Hotkeys.axaml
index 5d98238d..a28bc566 100644
--- a/src/Views/Hotkeys.axaml
+++ b/src/Views/Hotkeys.axaml
@@ -15,30 +15,23 @@
                     WindowStartupLocation="CenterOwner">
   <Grid RowDefinitions="Auto,*">
     <!-- TitleBar -->
-    <Grid Grid.Row="0" ColumnDefinitions="Auto,*,Auto" Height="30" IsVisible="{Binding !#ThisControl.UseSystemWindowFrame}">
-      <Border Grid.Column="0" Grid.ColumnSpan="3"
-              Background="{DynamicResource Brush.TitleBar}"
+    <Grid Grid.Row="0" Height="28" IsVisible="{Binding !#ThisControl.UseSystemWindowFrame}">
+      <Border Background="{DynamicResource Brush.TitleBar}"
               BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border0}"
               PointerPressed="BeginMoveWindow"/>
       
-      <Path Grid.Column="0"
-            Width="14" Height="14"
+      <Path Width="14" Height="14"
             Margin="10,0,0,0"
+            HorizontalAlignment="Left"
             Data="{StaticResource Icons.Hotkeys}"
             IsVisible="{OnPlatform True, macOS=False}"/>
 
-      <v:CaptionButtonsMacOS Grid.Column="0"
-                             Margin="0,2,0,0"
-                             IsCloseButtonOnly="True"
-                             IsVisible="{OnPlatform False, macOS=True}"/>
-
-      <TextBlock Grid.Column="0" Grid.ColumnSpan="3"
-                 Classes="bold"
+      <TextBlock Classes="bold"
                  Text="{DynamicResource Text.Hotkeys}"
                  HorizontalAlignment="Center" VerticalAlignment="Center"
                  IsHitTestVisible="False"/>
 
-      <v:CaptionButtons Grid.Column="2"
+      <v:CaptionButtons HorizontalAlignment="Right"
                         IsCloseButtonOnly="True"
                         IsVisible="{OnPlatform True, macOS=False}"/>
     </Grid>
diff --git a/src/Views/Hotkeys.axaml.cs b/src/Views/Hotkeys.axaml.cs
index 2a21fef9..d8b5e1a8 100644
--- a/src/Views/Hotkeys.axaml.cs
+++ b/src/Views/Hotkeys.axaml.cs
@@ -1,5 +1,3 @@
-using Avalonia.Input;
-
 namespace SourceGit.Views
 {
     public partial class Hotkeys : ChromelessWindow
@@ -8,10 +6,5 @@ namespace SourceGit.Views
         {
             InitializeComponent();
         }
-
-        private void BeginMoveWindow(object _, PointerPressedEventArgs e)
-        {
-            BeginMoveDrag(e);
-        }
     }
 }
diff --git a/src/Views/InteractiveRebase.axaml b/src/Views/InteractiveRebase.axaml
index e1161a2b..c008193b 100644
--- a/src/Views/InteractiveRebase.axaml
+++ b/src/Views/InteractiveRebase.axaml
@@ -16,30 +16,23 @@
                     WindowStartupLocation="CenterOwner">
   <Grid RowDefinitions="Auto,Auto,*,Auto">
     <!-- TitleBar -->
-    <Grid Grid.Row="0" ColumnDefinitions="Auto,*,Auto" Height="30" IsVisible="{Binding !#ThisControl.UseSystemWindowFrame}">
-      <Border Grid.Column="0" Grid.ColumnSpan="3"
-              Background="{DynamicResource Brush.TitleBar}"
+    <Grid Grid.Row="0" Height="28" IsVisible="{Binding !#ThisControl.UseSystemWindowFrame}">
+      <Border Background="{DynamicResource Brush.TitleBar}"
               BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border0}"
               PointerPressed="BeginMoveWindow"/>
 
-      <Path Grid.Column="0"
-            Width="14" Height="14"
+      <Path Width="14" Height="14"
             Margin="10,0,0,0"
+            HorizontalAlignment="Left"
             Data="{StaticResource Icons.InteractiveRebase}"
             IsVisible="{OnPlatform True, macOS=False}"/>
 
-      <v:CaptionButtonsMacOS Grid.Column="0"
-                             Margin="0,2,0,0"
-                             IsCloseButtonOnly="True"
-                             IsVisible="{OnPlatform False, macOS=True}"/>
-
-      <TextBlock Grid.Column="0" Grid.ColumnSpan="3"
-                 Classes="bold"
+      <TextBlock Classes="bold"
                  Text="{DynamicResource Text.InteractiveRebase}"
                  HorizontalAlignment="Center" VerticalAlignment="Center"
                  IsHitTestVisible="False"/>
 
-      <v:CaptionButtons Grid.Column="2"
+      <v:CaptionButtons HorizontalAlignment="Right"
                         IsCloseButtonOnly="True"
                         IsVisible="{OnPlatform True, macOS=False}"/>
     </Grid>
diff --git a/src/Views/InteractiveRebase.axaml.cs b/src/Views/InteractiveRebase.axaml.cs
index 8f75cc26..a31b8a23 100644
--- a/src/Views/InteractiveRebase.axaml.cs
+++ b/src/Views/InteractiveRebase.axaml.cs
@@ -81,11 +81,6 @@ namespace SourceGit.Views
             InitializeComponent();
         }
 
-        private void BeginMoveWindow(object _, PointerPressedEventArgs e)
-        {
-            BeginMoveDrag(e);
-        }
-
         private void CloseWindow(object _1, RoutedEventArgs _2)
         {
             Close();
diff --git a/src/Views/LFSLocks.axaml b/src/Views/LFSLocks.axaml
index ccbe9fe2..ac495bf1 100644
--- a/src/Views/LFSLocks.axaml
+++ b/src/Views/LFSLocks.axaml
@@ -16,30 +16,23 @@
                     WindowStartupLocation="CenterOwner">
   <Grid RowDefinitions="Auto,Auto,*">
     <!-- TitleBar -->
-    <Grid Grid.Row="0" ColumnDefinitions="Auto,*,Auto" Height="30" IsVisible="{Binding !#ThisControl.UseSystemWindowFrame}">
-      <Border Grid.Column="0" Grid.ColumnSpan="3"
-              Background="{DynamicResource Brush.TitleBar}"
+    <Grid Grid.Row="0" Height="28" IsVisible="{Binding !#ThisControl.UseSystemWindowFrame}">
+      <Border Background="{DynamicResource Brush.TitleBar}"
               BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border0}"
               PointerPressed="BeginMoveWindow"/>
 
-      <Path Grid.Column="0"
-            Width="14" Height="14"
+      <Path Width="14" Height="14"
             Margin="10,0,0,0"
+            HorizontalAlignment="Left"
             Data="{StaticResource Icons.Lock}"
             IsVisible="{OnPlatform True, macOS=False}"/>
 
-      <v:CaptionButtonsMacOS Grid.Column="0"
-                             Margin="0,2,0,0"
-                             IsCloseButtonOnly="True"
-                             IsVisible="{OnPlatform False, macOS=True}"/>
-
-      <TextBlock Grid.Column="0" Grid.ColumnSpan="3"
-                 Classes="bold"
+      <TextBlock Classes="bold"
                  Text="{DynamicResource Text.GitLFS.Locks.Title}"
                  HorizontalAlignment="Center" VerticalAlignment="Center"
                  IsHitTestVisible="False"/>
 
-      <v:CaptionButtons Grid.Column="2"
+      <v:CaptionButtons HorizontalAlignment="Right"
                         IsCloseButtonOnly="True"
                         IsVisible="{OnPlatform True, macOS=False}"/>
     </Grid>
diff --git a/src/Views/LFSLocks.axaml.cs b/src/Views/LFSLocks.axaml.cs
index ee4b6ff1..695341f4 100644
--- a/src/Views/LFSLocks.axaml.cs
+++ b/src/Views/LFSLocks.axaml.cs
@@ -1,5 +1,4 @@
 using Avalonia.Controls;
-using Avalonia.Input;
 using Avalonia.Interactivity;
 
 namespace SourceGit.Views
@@ -11,11 +10,6 @@ namespace SourceGit.Views
             InitializeComponent();
         }
 
-        private void BeginMoveWindow(object _, PointerPressedEventArgs e)
-        {
-            BeginMoveDrag(e);
-        }
-
         private void OnUnlockButtonClicked(object sender, RoutedEventArgs e)
         {
             if (DataContext is ViewModels.LFSLocks vm && sender is Button button)
diff --git a/src/Views/Launcher.axaml b/src/Views/Launcher.axaml
index 285ea72c..ad5a7f34 100644
--- a/src/Views/Launcher.axaml
+++ b/src/Views/Launcher.axaml
@@ -25,13 +25,11 @@
       <Border Grid.Column="0" Grid.ColumnSpan="4"
               Background="{DynamicResource Brush.TitleBar}"
               BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border0}"
-              DoubleTapped="OnTitleBarDoubleTapped"
+              DoubleTapped="MaximizeOrRestoreWindow"
               PointerPressed="BeginMoveWindow"/>
 
       <!-- Caption Buttons (macOS) -->
-      <Border Grid.Column="0" VerticalAlignment="Stretch" Margin="2,0,8,3" IsVisible="{OnPlatform False, macOS=True}">
-        <v:CaptionButtonsMacOS VerticalAlignment="Bottom"/>
-      </Border>
+      <Border Grid.Column="0" Width="72" IsVisible="{Binding #ThisControl.HasLeftCaptionButton}"/>
 
       <!-- Menu (Windows/Linux) -->
       <Button Grid.Column="0" Classes="icon_button" VerticalAlignment="Bottom" Margin="6,0,2,3" IsVisible="{OnPlatform True, macOS=False}">
diff --git a/src/Views/Launcher.axaml.cs b/src/Views/Launcher.axaml.cs
index 359a80fa..951e71f5 100644
--- a/src/Views/Launcher.axaml.cs
+++ b/src/Views/Launcher.axaml.cs
@@ -4,6 +4,7 @@ using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Interactivity;
+using Avalonia.Platform;
 using Avalonia.VisualTree;
 
 namespace SourceGit.Views
@@ -18,6 +19,15 @@ namespace SourceGit.Views
             get => GetValue(CaptionHeightProperty);
             set => SetValue(CaptionHeightProperty, value);
         }
+        
+        public static readonly StyledProperty<bool> HasLeftCaptionButtonProperty =
+            AvaloniaProperty.Register<Launcher, bool>(nameof(HasLeftCaptionButton));
+
+        public bool HasLeftCaptionButton
+        {
+            get => GetValue(HasLeftCaptionButtonProperty);
+            set => SetValue(HasLeftCaptionButtonProperty, value);
+        }
 
         public bool IsRightCaptionButtonsVisible
         {
@@ -38,10 +48,21 @@ namespace SourceGit.Views
                 Height = layout.LauncherHeight;
             }
 
-            if (UseSystemWindowFrame)
+            if (OperatingSystem.IsMacOS())
+            {
+                HasLeftCaptionButton = true;
+                CaptionHeight = new GridLength(34);
+                ExtendClientAreaChromeHints = ExtendClientAreaChromeHints.SystemChrome |
+                                              ExtendClientAreaChromeHints.OSXThickTitleBar;
+            }
+            else if (UseSystemWindowFrame)
+            {
                 CaptionHeight = new GridLength(30);
+            }
             else
+            {
                 CaptionHeight = new GridLength(38);
+            }
 
             InitializeComponent();
         }
@@ -55,9 +76,9 @@ namespace SourceGit.Views
         {
             base.OnOpened(e);
 
-            var layout = ViewModels.Preference.Instance.Layout;
-            if (layout.LauncherWindowState == WindowState.Maximized)
-                WindowState = WindowState.Maximized;
+            var state = ViewModels.Preference.Instance.Layout.LauncherWindowState;
+            if (state == WindowState.Maximized || state == WindowState.FullScreen)
+                WindowState = state;
         }
 
         protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
@@ -67,12 +88,11 @@ namespace SourceGit.Views
             if (change.Property == WindowStateProperty)
             {
                 var state = (WindowState)change.NewValue!;
-                if (OperatingSystem.IsLinux() && UseSystemWindowFrame)
-                    CaptionHeight = new GridLength(30);
-                else if (state == WindowState.Maximized)
-                    CaptionHeight = new GridLength(OperatingSystem.IsMacOS() ? 34 : 30);
-                else
-                    CaptionHeight = new GridLength(38);
+                if (!OperatingSystem.IsMacOS() && !UseSystemWindowFrame)
+                    CaptionHeight = new GridLength(state == WindowState.Maximized ? 30 : 38);
+
+                if (OperatingSystem.IsMacOS())
+                    HasLeftCaptionButton = state != WindowState.FullScreen;
 
                 ViewModels.Preference.Instance.Layout.LauncherWindowState = state;
             }
@@ -225,24 +245,6 @@ namespace SourceGit.Views
             base.OnClosing(e);
         }
 
-        private void OnTitleBarDoubleTapped(object _, TappedEventArgs e)
-        {
-            if (WindowState == WindowState.Maximized)
-                WindowState = WindowState.Normal;
-            else
-                WindowState = WindowState.Maximized;
-
-            e.Handled = true;
-        }
-
-        private void BeginMoveWindow(object _, PointerPressedEventArgs e)
-        {
-            if (e.ClickCount == 1)
-                BeginMoveDrag(e);
-
-            e.Handled = true;
-        }
-
         private void OnOpenWorkspaceMenu(object sender, RoutedEventArgs e)
         {
             if (sender is Button btn && DataContext is ViewModels.Launcher launcher)
diff --git a/src/Views/Preference.axaml b/src/Views/Preference.axaml
index 63d5ff68..9cf47f9c 100644
--- a/src/Views/Preference.axaml
+++ b/src/Views/Preference.axaml
@@ -17,30 +17,23 @@
                     WindowStartupLocation="CenterScreen">
   <Grid RowDefinitions="Auto,Auto" MinWidth="600">
     <!-- TitleBar -->
-    <Grid Grid.Row="0" ColumnDefinitions="Auto,*,Auto" Height="30" IsVisible="{Binding !#ThisControl.UseSystemWindowFrame}">
-      <Border Grid.Column="0" Grid.ColumnSpan="3"
-              Background="{DynamicResource Brush.TitleBar}"
+    <Grid Grid.Row="0" Height="28" IsVisible="{Binding !#ThisControl.UseSystemWindowFrame}">
+      <Border Background="{DynamicResource Brush.TitleBar}"
               BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border0}"
               PointerPressed="BeginMoveWindow"/>
 
-      <Path Grid.Column="0"
-            Width="14" Height="14"
-            Data="{StaticResource Icons.Settings}"
+      <Path Width="14" Height="14"
             Margin="10,0,0,0"
+            HorizontalAlignment="Left"
+            Data="{StaticResource Icons.Settings}"
             IsVisible="{OnPlatform True, macOS=False}"/>
 
-      <v:CaptionButtonsMacOS Grid.Column="0"
-                             Margin="0,2,0,0"
-                             IsCloseButtonOnly="True"
-                             IsVisible="{OnPlatform False, macOS=True}"/>
-
-      <TextBlock Grid.Column="0" Grid.ColumnSpan="3"
-                 Classes="bold"
+      <TextBlock Classes="bold"
                  Text="{DynamicResource Text.Preference}"
                  HorizontalAlignment="Center" VerticalAlignment="Center"
                  IsHitTestVisible="False"/>
 
-      <v:CaptionButtons Grid.Column="2"
+      <v:CaptionButtons HorizontalAlignment="Right"
                         IsCloseButtonOnly="True"
                         IsVisible="{OnPlatform True, macOS=False}"/>
     </Grid>
diff --git a/src/Views/Preference.axaml.cs b/src/Views/Preference.axaml.cs
index f7cabec1..e54d4c25 100644
--- a/src/Views/Preference.axaml.cs
+++ b/src/Views/Preference.axaml.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
 
 using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.Platform.Storage;
 
@@ -166,11 +165,6 @@ namespace SourceGit.Views
             base.OnClosing(e);
         }
 
-        private void BeginMoveWindow(object _, PointerPressedEventArgs e)
-        {
-            BeginMoveDrag(e);
-        }
-
         private async void SelectThemeOverrideFile(object _, RoutedEventArgs e)
         {
             var options = new FilePickerOpenOptions()
diff --git a/src/Views/RepositoryConfigure.axaml b/src/Views/RepositoryConfigure.axaml
index 535a016c..58dbebab 100644
--- a/src/Views/RepositoryConfigure.axaml
+++ b/src/Views/RepositoryConfigure.axaml
@@ -16,30 +16,23 @@
                     WindowStartupLocation="CenterOwner">
   <Grid RowDefinitions="Auto,Auto">
     <!-- TitleBar -->
-    <Grid Grid.Row="0" ColumnDefinitions="Auto,*,Auto" Height="30" IsVisible="{Binding !#ThisControl.UseSystemWindowFrame}">
-      <Border Grid.Column="0" Grid.ColumnSpan="3"
-              Background="{DynamicResource Brush.TitleBar}"
+    <Grid Grid.Row="0" Height="28" IsVisible="{Binding !#ThisControl.UseSystemWindowFrame}">
+      <Border Background="{DynamicResource Brush.TitleBar}"
               BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border0}"
               PointerPressed="BeginMoveWindow"/>
 
-      <Path Grid.Column="0"
-            Width="14" Height="14"
-            Data="{StaticResource Icons.Settings}"
+      <Path Width="14" Height="14"
             Margin="10,0,0,0"
+            HorizontalAlignment="Left"
+            Data="{StaticResource Icons.Settings}"
             IsVisible="{OnPlatform True, macOS=False}"/>
-      
-      <v:CaptionButtonsMacOS Grid.Column="0"
-                             Margin="0,2,0,0"
-                             IsCloseButtonOnly="True"
-                             IsVisible="{OnPlatform False, macOS=True}"/>
 
-      <TextBlock Grid.Column="0" Grid.ColumnSpan="3"
-                 Classes="bold"
+      <TextBlock Classes="bold"
                  Text="{DynamicResource Text.Configure}"
                  HorizontalAlignment="Center" VerticalAlignment="Center"
                  IsHitTestVisible="False"/>
 
-      <v:CaptionButtons Grid.Column="2"
+      <v:CaptionButtons HorizontalAlignment="Right"
                         IsCloseButtonOnly="True"
                         IsVisible="{OnPlatform True, macOS=False}"/>
     </Grid>
diff --git a/src/Views/RepositoryConfigure.axaml.cs b/src/Views/RepositoryConfigure.axaml.cs
index 7e559cc2..21f6ad23 100644
--- a/src/Views/RepositoryConfigure.axaml.cs
+++ b/src/Views/RepositoryConfigure.axaml.cs
@@ -1,5 +1,4 @@
 using Avalonia.Controls;
-using Avalonia.Input;
 
 namespace SourceGit.Views
 {
@@ -15,10 +14,5 @@ namespace SourceGit.Views
             (DataContext as ViewModels.RepositoryConfigure)?.Save();
             base.OnClosing(e);
         }
-
-        private void BeginMoveWindow(object _, PointerPressedEventArgs e)
-        {
-            BeginMoveDrag(e);
-        }
     }
 }
diff --git a/src/Views/SelfUpdate.axaml b/src/Views/SelfUpdate.axaml
index a8eb152c..6fd2c415 100644
--- a/src/Views/SelfUpdate.axaml
+++ b/src/Views/SelfUpdate.axaml
@@ -17,30 +17,23 @@
                     WindowStartupLocation="CenterOwner">
   <Grid RowDefinitions="Auto,*">
     <!-- TitleBar -->
-    <Grid Grid.Row="0" ColumnDefinitions="Auto,*,Auto" Height="30" IsVisible="{Binding !#ThisControl.UseSystemWindowFrame}">
-      <Border Grid.Column="0" Grid.ColumnSpan="3"
-              Background="{DynamicResource Brush.TitleBar}"
+    <Grid Grid.Row="0" Height="28" IsVisible="{Binding !#ThisControl.UseSystemWindowFrame}">
+      <Border Background="{DynamicResource Brush.TitleBar}"
               BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border0}"
               PointerPressed="BeginMoveWindow"/>
 
-      <Path Grid.Column="0"
-            Width="14" Height="14"
+      <Path Width="14" Height="14"
             Margin="10,0,0,0"
+            HorizontalAlignment="Left"
             Data="{StaticResource Icons.SoftwareUpdate}"
             IsVisible="{OnPlatform True, macOS=False}"/>
 
-      <v:CaptionButtonsMacOS Grid.Column="0"
-                             Margin="0,2,0,0"
-                             IsCloseButtonOnly="True"
-                             IsVisible="{OnPlatform False, macOS=True}"/>
-
-      <TextBlock Grid.Column="0" Grid.ColumnSpan="3"
-                 Classes="bold"
+      <TextBlock Classes="bold"
                  Text="{DynamicResource Text.SelfUpdate.Title}"
                  HorizontalAlignment="Center" VerticalAlignment="Center"
                  IsHitTestVisible="False"/>
 
-      <v:CaptionButtons Grid.Column="2"
+      <v:CaptionButtons HorizontalAlignment="Right"
                         IsCloseButtonOnly="True"
                         IsVisible="{OnPlatform True, macOS=False}"/>
     </Grid>
diff --git a/src/Views/SelfUpdate.axaml.cs b/src/Views/SelfUpdate.axaml.cs
index 800d9295..cdaac940 100644
--- a/src/Views/SelfUpdate.axaml.cs
+++ b/src/Views/SelfUpdate.axaml.cs
@@ -1,5 +1,4 @@
 using Avalonia.Controls;
-using Avalonia.Input;
 using Avalonia.Interactivity;
 
 namespace SourceGit.Views
@@ -11,11 +10,6 @@ namespace SourceGit.Views
             InitializeComponent();
         }
 
-        private void BeginMoveWindow(object _, PointerPressedEventArgs e)
-        {
-            BeginMoveDrag(e);
-        }
-
         private void CloseWindow(object _1, RoutedEventArgs _2)
         {
             Close();
diff --git a/src/Views/StandaloneCommitMessageEditor.axaml b/src/Views/StandaloneCommitMessageEditor.axaml
index f59d3e84..8a0dc91a 100644
--- a/src/Views/StandaloneCommitMessageEditor.axaml
+++ b/src/Views/StandaloneCommitMessageEditor.axaml
@@ -14,30 +14,23 @@
                     WindowStartupLocation="CenterScreen">
   <Grid RowDefinitions="Auto,*">
     <!-- TitleBar -->
-    <Grid Grid.Row="0" ColumnDefinitions="Auto,*,Auto" Height="30" IsVisible="{Binding !#ThisControl.UseSystemWindowFrame}">
-      <Border Grid.Column="0" Grid.ColumnSpan="3"
-              Background="{DynamicResource Brush.TitleBar}"
+    <Grid Grid.Row="0" Height="28" IsVisible="{Binding !#ThisControl.UseSystemWindowFrame}">
+      <Border Background="{DynamicResource Brush.TitleBar}"
               BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border0}"
               PointerPressed="BeginMoveWindow"/>
 
-      <Path Grid.Column="0"
-            Width="14" Height="14"
+      <Path Width="14" Height="14"
             Margin="10,0,0,0"
+            HorizontalAlignment="Left"
             Data="{StaticResource Icons.Edit}"
             IsVisible="{OnPlatform True, macOS=False}"/>
 
-      <v:CaptionButtonsMacOS Grid.Column="0"
-                             Margin="0,2,0,0"
-                             IsCloseButtonOnly="True"
-                             IsVisible="{OnPlatform False, macOS=True}"/>
-
-      <TextBlock Grid.Column="0" Grid.ColumnSpan="3"
-                 Classes="bold"
+      <TextBlock Classes="bold"
                  Text="{DynamicResource Text.CodeEditor}"
                  HorizontalAlignment="Center" VerticalAlignment="Center"
                  IsHitTestVisible="False"/>
 
-      <v:CaptionButtons Grid.Column="2"
+      <v:CaptionButtons HorizontalAlignment="Right"
                         IsCloseButtonOnly="True"
                         IsVisible="{OnPlatform True, macOS=False}"/>
     </Grid>
diff --git a/src/Views/StandaloneCommitMessageEditor.axaml.cs b/src/Views/StandaloneCommitMessageEditor.axaml.cs
index 08b0d6f4..6833fb33 100644
--- a/src/Views/StandaloneCommitMessageEditor.axaml.cs
+++ b/src/Views/StandaloneCommitMessageEditor.axaml.cs
@@ -1,7 +1,6 @@
 using System;
 using System.IO;
 
-using Avalonia.Input;
 using Avalonia.Interactivity;
 
 namespace SourceGit.Views
@@ -40,11 +39,6 @@ namespace SourceGit.Views
             App.Quit(_exitCode);
         }
 
-        private void BeginMoveWindow(object _, PointerPressedEventArgs e)
-        {
-            BeginMoveDrag(e);
-        }
-
         private void SaveAndClose(object _1, RoutedEventArgs _2)
         {
             File.WriteAllText(_file, Editor.Text);
diff --git a/src/Views/Statistics.axaml b/src/Views/Statistics.axaml
index 6e2a00dd..0c002407 100644
--- a/src/Views/Statistics.axaml
+++ b/src/Views/Statistics.axaml
@@ -16,30 +16,23 @@
                     CanResize="False">
   <Grid RowDefinitions="Auto,Auto,*">
     <!-- Title bar -->
-    <Grid Grid.Row="0" ColumnDefinitions="Auto,*,Auto" Height="30" IsVisible="{Binding !#ThisControl.UseSystemWindowFrame}">
-      <Border Grid.Column="0" Grid.ColumnSpan="3"
-              Background="{DynamicResource Brush.TitleBar}"
+    <Grid Grid.Row="0" Height="28" IsVisible="{Binding !#ThisControl.UseSystemWindowFrame}">
+      <Border Background="{DynamicResource Brush.TitleBar}"
               BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border0}"
               PointerPressed="BeginMoveWindow"/>
 
-      <Path Grid.Column="0"
-            Width="14" Height="14"
+      <Path Width="14" Height="14"
             Margin="10,0,0,0"
+            HorizontalAlignment="Left"
             Data="{StaticResource Icons.Statistics}"
             IsVisible="{OnPlatform True, macOS=False}"/>
 
-      <v:CaptionButtonsMacOS Grid.Column="0"
-                             Margin="0,2,0,0"
-                             IsCloseButtonOnly="True"
-                             IsVisible="{OnPlatform False, macOS=True}"/>
-
-      <TextBlock Grid.Column="0" Grid.ColumnSpan="3"
-                 Classes="bold"
+      <TextBlock Classes="bold"
                  Text="{DynamicResource Text.Statistics}"
                  HorizontalAlignment="Center" VerticalAlignment="Center"
                  IsHitTestVisible="False"/>
 
-      <v:CaptionButtons Grid.Column="2"
+      <v:CaptionButtons HorizontalAlignment="Right"
                         IsCloseButtonOnly="True"
                         IsVisible="{OnPlatform True, macOS=False}"/>
     </Grid>
diff --git a/src/Views/Statistics.axaml.cs b/src/Views/Statistics.axaml.cs
index 3c5e70b6..4ebf9016 100644
--- a/src/Views/Statistics.axaml.cs
+++ b/src/Views/Statistics.axaml.cs
@@ -1,5 +1,3 @@
-using Avalonia.Input;
-
 namespace SourceGit.Views
 {
     public partial class Statistics : ChromelessWindow
@@ -8,10 +6,5 @@ namespace SourceGit.Views
         {
             InitializeComponent();
         }
-
-        private void BeginMoveWindow(object _, PointerPressedEventArgs e)
-        {
-            BeginMoveDrag(e);
-        }
     }
 }