diff --git a/src/Resources/Styles.axaml b/src/Resources/Styles.axaml
index 954c3569c..fd0bc15e6 100644
--- a/src/Resources/Styles.axaml
+++ b/src/Resources/Styles.axaml
@@ -445,13 +445,59 @@
     <Setter Property="StrokeThickness" Value=".5"/>
     <Setter Property="Stroke" Value="#40000000"/>
   </Style>
+  <Style Selector="Button.caption_button_macos.close Ellipse">
+    <Setter Property="Fill" Value="{DynamicResource Brush.MacOS.Close}"/>
+  </Style>
+  <Style Selector="Button.caption_button_macos.minimize Ellipse">
+    <Setter Property="Fill" Value="{DynamicResource Brush.MacOS.Minimize}"/>
+  </Style>
+  <Style Selector="Button.caption_button_macos.maximize Ellipse">
+    <Setter Property="Fill" Value="{DynamicResource Brush.MacOS.Maximize}"/>
+  </Style>
+  <Style Selector="Button.caption_button_macos.close:pressed Ellipse">
+    <Setter Property="Fill" Value="{DynamicResource Brush.MacOS.ClosePressed}"/>
+  </Style>
+  <Style Selector="Button.caption_button_macos.minimize:pressed Ellipse">
+    <Setter Property="Fill" Value="{DynamicResource Brush.MacOS.MinimizePressed}"/>
+  </Style>
+  <Style Selector="Button.caption_button_macos.maximize:pressed Ellipse">
+    <Setter Property="Fill" Value="{DynamicResource Brush.MacOS.MaximizePressed}"/>
+  </Style>
   <Style Selector="Button.caption_button_macos Path">
     <Setter Property="Width" Value="8"/>
     <Setter Property="Height" Value="8"/>
+    <Setter Property="Stretch" Value="Fill"/>
     <Setter Property="Fill" Value="Black"/>
     <Setter Property="IsVisible" Value="False"/>
     <Setter Property="VerticalAlignment" Value="Center"/>
   </Style>
+  <Style Selector="Button.caption_button_macos.close 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.caption_button_macos.minimize 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.caption_button_macos.maximize 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.caption_button_macos.close:pressed Path">
+    <Setter Property="Fill" Value="{DynamicResource Brush.MacOS.ClosePressedFG}"/>
+  </Style>
+  <Style Selector="Button.caption_button_macos.minimize:pressed Path">
+    <Setter Property="Fill" Value="{DynamicResource Brush.MacOS.MinimizePressedFG}"/>
+  </Style>
+  <Style Selector="Button.caption_button_macos.maximize:pressed Path">
+    <Setter Property="Fill" Value="{DynamicResource Brush.MacOS.MaximizePressedFG}"/>
+  </Style>
   <Style Selector="Grid.caption_button_box:pointerover Button.caption_button_macos Path">
     <Setter Property="IsVisible" Value="True"/>
   </Style>
diff --git a/src/Resources/Themes.axaml b/src/Resources/Themes.axaml
index 58f4d3251..1e75e2795 100644
--- a/src/Resources/Themes.axaml
+++ b/src/Resources/Themes.axaml
@@ -2,9 +2,18 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <ResourceDictionary.ThemeDictionaries>
     <ResourceDictionary x:Key="Light">
-      <Color x:Key="Color.MacOS.Close">#FFFF6059</Color>
-      <Color x:Key="Color.MacOS.Minimize">#FFFFBE2F</Color>
-      <Color x:Key="Color.MacOS.Maximize">#FF29c941</Color>
+      <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>
       <Color x:Key="Color.Window">#FFF0F5F9</Color>
       <Color x:Key="Color.WindowBorder">#00000000</Color>
       <Color x:Key="Color.TitleBar">#FFCFDEEA</Color>
@@ -37,9 +46,18 @@
     </ResourceDictionary>
 
     <ResourceDictionary x:Key="Dark">
-      <Color x:Key="Color.MacOS.Close">#FFFF5E56</Color>
-      <Color x:Key="Color.MacOS.Minimize">#FFFCBB2D</Color>
-      <Color x:Key="Color.MacOS.Maximize">#FF25C53C</Color>
+      <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>
       <Color x:Key="Color.Window">#FF252525</Color>
       <Color x:Key="Color.WindowBorder">#FF444444</Color>
       <Color x:Key="Color.TitleBar">#FF1F1F1F</Color>
@@ -73,8 +91,17 @@
   </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}"/>
   <SolidColorBrush x:Key="Brush.Window" Color="{DynamicResource Color.Window}"/>
   <SolidColorBrush x:Key="Brush.WindowBorder" Color="{DynamicResource Color.WindowBorder}"/>
   <SolidColorBrush x:Key="Brush.TitleBar" Color="{DynamicResource Color.TitleBar}"/>
diff --git a/src/Views/About.axaml b/src/Views/About.axaml
index 4ff12c807..2f3dc3f98 100644
--- a/src/Views/About.axaml
+++ b/src/Views/About.axaml
@@ -26,10 +26,10 @@
             IsVisible="{OnPlatform True, macOS=False}"/>
 
       <Grid Grid.Column="0" Classes="caption_button_box" Margin="2,4,0,0" IsVisible="{OnPlatform False, macOS=True}">
-        <Button Classes="caption_button_macos" Click="CloseWindow">
+        <Button Classes="caption_button_macos close" Click="CloseWindow">
           <Grid>
-            <Ellipse Fill="{DynamicResource Brush.MacOS.Close}"/>
-            <Path Height="6" Width="6" Stretch="Fill" Fill="#505050" Data="{StaticResource Icons.MacOS.Close}"/>
+            <Ellipse/>
+            <Path/>
           </Grid>
         </Button>
       </Grid>
diff --git a/src/Views/Askpass.axaml b/src/Views/Askpass.axaml
index d11d79774..013df27d1 100644
--- a/src/Views/Askpass.axaml
+++ b/src/Views/Askpass.axaml
@@ -26,10 +26,10 @@
             IsVisible="{OnPlatform True, macOS=False}"/>
 
       <Grid Grid.Column="0" Classes="caption_button_box" Margin="2,4,0,0" IsVisible="{OnPlatform False, macOS=True}">
-        <Button Classes="caption_button_macos" Click="CloseWindow">
+        <Button Classes="caption_button_macos close" Click="CloseWindow">
           <Grid>
-            <Ellipse Fill="{DynamicResource Brush.MacOS.Close}"/>
-            <Path Height="6" Width="6" Stretch="Fill" Fill="#505050" Data="{StaticResource Icons.MacOS.Close}"/>
+            <Ellipse/>
+            <Path/>
           </Grid>
         </Button>
       </Grid>
diff --git a/src/Views/AssumeUnchangedManager.axaml b/src/Views/AssumeUnchangedManager.axaml
index 09f640189..9caafd3f5 100644
--- a/src/Views/AssumeUnchangedManager.axaml
+++ b/src/Views/AssumeUnchangedManager.axaml
@@ -29,10 +29,10 @@
             IsVisible="{OnPlatform True, macOS=False}"/>
 
       <Grid Grid.Column="0" Classes="caption_button_box" Margin="2,4,0,0" IsVisible="{OnPlatform False, macOS=True}">
-        <Button Classes="caption_button_macos" Click="CloseWindow">
+        <Button Classes="caption_button_macos close" Click="CloseWindow">
           <Grid>
-            <Ellipse Fill="{DynamicResource Brush.MacOS.Close}"/>
-            <Path Height="6" Width="6" Stretch="Fill" Fill="#505050" Data="{StaticResource Icons.MacOS.Close}"/>
+            <Ellipse/>
+            <Path/>
           </Grid>
         </Button>
       </Grid>
diff --git a/src/Views/CaptionButtonsMacOS.axaml b/src/Views/CaptionButtonsMacOS.axaml
index c41907d06..a811a2072 100644
--- a/src/Views/CaptionButtonsMacOS.axaml
+++ b/src/Views/CaptionButtonsMacOS.axaml
@@ -6,22 +6,22 @@
              x:Class="SourceGit.Views.CaptionButtonsMacOS">
   <Grid Classes="caption_button_box">
     <StackPanel Orientation="Horizontal">
-      <Button Classes="caption_button_macos" Click="CloseWindow" Margin="10,0,0,0">
+      <Button Classes="caption_button_macos close" Click="CloseWindow" Margin="10,0,0,0">
         <Grid>
-          <Ellipse Fill="{DynamicResource Brush.MacOS.Close}"/>
-          <Path Height="6" Width="6" Stretch="Fill" Fill="#505050" Data="{StaticResource Icons.MacOS.Close}"/>
+          <Ellipse/>
+          <Path/>
         </Grid>
       </Button>
-      <Button Classes="caption_button_macos" Click="MinimizeWindow">
+      <Button Classes="caption_button_macos minimize" Click="MinimizeWindow">
         <Grid>
-          <Ellipse Fill="{DynamicResource Brush.MacOS.Minimize}"/>
-          <Path Height="2" Width="8" Stretch="Fill" Fill="#404040" Data="{StaticResource Icons.MacOS.Minimize}"/>
+          <Ellipse/>
+          <Path/>
         </Grid>
       </Button>
-      <Button Classes="caption_button_macos" Click="MaximizeOrRestoreWindow">
+      <Button Classes="caption_button_macos maximize" Click="MaximizeOrRestoreWindow">
         <Grid>
-          <Ellipse Fill="{DynamicResource Brush.MacOS.Maximize}"/>
-          <Path Height="6" Width="6" Stretch="Fill" Fill="#404040" Data="{StaticResource Icons.MacOS.Maximize}"/>
+          <Ellipse/>
+          <Path/>
         </Grid>
       </Button>
     </StackPanel>
diff --git a/src/Views/ConfirmRestart.axaml b/src/Views/ConfirmRestart.axaml
index 4e0ac3868..9366486d2 100644
--- a/src/Views/ConfirmRestart.axaml
+++ b/src/Views/ConfirmRestart.axaml
@@ -26,10 +26,10 @@
             IsVisible="{OnPlatform True, macOS=False}"/>
 
       <Grid Grid.Column="0" Classes="caption_button_box" Margin="2,4,0,0" IsVisible="{OnPlatform False, macOS=True}">
-        <Button Classes="caption_button_macos" Click="CloseWindow">
+        <Button Classes="caption_button_macos close" Click="CloseWindow">
           <Grid>
-            <Ellipse Fill="{DynamicResource Brush.MacOS.Close}"/>
-            <Path Height="6" Width="6" Stretch="Fill" Fill="#505050" Data="{StaticResource Icons.MacOS.Close}"/>
+            <Ellipse/>
+            <Path/>
           </Grid>
         </Button>
       </Grid>
diff --git a/src/Views/Hotkeys.axaml b/src/Views/Hotkeys.axaml
index 121b65345..57cbcc7fe 100644
--- a/src/Views/Hotkeys.axaml
+++ b/src/Views/Hotkeys.axaml
@@ -28,10 +28,10 @@
             IsVisible="{OnPlatform True, macOS=False}"/>
 
       <Grid Grid.Column="0" Classes="caption_button_box" Margin="2,4,0,0" IsVisible="{OnPlatform False, macOS=True}">
-        <Button Classes="caption_button_macos" Click="CloseWindow">
+        <Button Classes="caption_button_macos close" Click="CloseWindow">
           <Grid>
-            <Ellipse Fill="{DynamicResource Brush.MacOS.Close}"/>
-            <Path Height="6" Width="6" Stretch="Fill" Fill="#505050" Data="{StaticResource Icons.MacOS.Close}"/>
+            <Ellipse/>
+            <Path/>
           </Grid>
         </Button>
       </Grid>
diff --git a/src/Views/InteractiveRebase.axaml b/src/Views/InteractiveRebase.axaml
index cdb0bed1f..d33b29f84 100644
--- a/src/Views/InteractiveRebase.axaml
+++ b/src/Views/InteractiveRebase.axaml
@@ -29,10 +29,10 @@
             IsVisible="{OnPlatform True, macOS=False}"/>
 
       <Grid Grid.Column="0" Classes="caption_button_box" Margin="2,4,0,0" IsVisible="{OnPlatform False, macOS=True}">
-        <Button Classes="caption_button_macos" Click="CloseWindow">
+        <Button Classes="caption_button_macos close" Click="CloseWindow">
           <Grid>
-            <Ellipse Fill="{DynamicResource Brush.MacOS.Close}"/>
-            <Path Height="6" Width="6" Stretch="Fill" Fill="#505050" Data="{StaticResource Icons.MacOS.Close}"/>
+            <Ellipse/>
+            <Path/>
           </Grid>
         </Button>
       </Grid>
diff --git a/src/Views/LFSLocks.axaml b/src/Views/LFSLocks.axaml
index adc3ecf7f..ac047f7ed 100644
--- a/src/Views/LFSLocks.axaml
+++ b/src/Views/LFSLocks.axaml
@@ -28,10 +28,10 @@
             IsVisible="{OnPlatform True, macOS=False}"/>
 
       <Grid Grid.Column="0" Classes="caption_button_box" Margin="2,4,0,0" IsVisible="{OnPlatform False, macOS=True}">
-        <Button Classes="caption_button_macos" Click="CloseWindow">
+        <Button Classes="caption_button_macos close" Click="CloseWindow">
           <Grid>
-            <Ellipse Fill="{DynamicResource Brush.MacOS.Close}"/>
-            <Path Height="6" Width="6" Stretch="Fill" Fill="#505050" Data="{StaticResource Icons.MacOS.Close}"/>
+            <Ellipse/>
+            <Path/>
           </Grid>
         </Button>
       </Grid>
diff --git a/src/Views/Preference.axaml b/src/Views/Preference.axaml
index e13fd7cd1..983cce282 100644
--- a/src/Views/Preference.axaml
+++ b/src/Views/Preference.axaml
@@ -30,10 +30,10 @@
             IsVisible="{OnPlatform True, macOS=False}"/>
 
       <Grid Grid.Column="0" Classes="caption_button_box" Margin="2,4,0,0" IsVisible="{OnPlatform False, macOS=True}">
-        <Button Classes="caption_button_macos" Click="CloseWindow">
+        <Button Classes="caption_button_macos close" Click="CloseWindow">
           <Grid>
-            <Ellipse Fill="{DynamicResource Brush.MacOS.Close}"/>
-            <Path Height="6" Width="6" Stretch="Fill" Fill="#505050" Data="{StaticResource Icons.MacOS.Close}"/>
+            <Ellipse/>
+            <Path/>
           </Grid>
         </Button>
       </Grid>
diff --git a/src/Views/RepositoryConfigure.axaml b/src/Views/RepositoryConfigure.axaml
index f5d16fd4c..a6a8e5c58 100644
--- a/src/Views/RepositoryConfigure.axaml
+++ b/src/Views/RepositoryConfigure.axaml
@@ -29,10 +29,10 @@
             IsVisible="{OnPlatform True, macOS=False}"/>
 
       <Grid Grid.Column="0" Classes="caption_button_box" Margin="2,4,0,0" IsVisible="{OnPlatform False, macOS=True}">
-        <Button Classes="caption_button_macos" Click="CloseWindow">
+        <Button Classes="caption_button_macos close" Click="CloseWindow">
           <Grid>
-            <Ellipse Fill="{DynamicResource Brush.MacOS.Close}"/>
-            <Path Height="6" Width="6" Stretch="Fill" Fill="#505050" Data="{StaticResource Icons.MacOS.Close}"/>
+            <Ellipse/>
+            <Path/>
           </Grid>
         </Button>
       </Grid>
diff --git a/src/Views/SelfUpdate.axaml b/src/Views/SelfUpdate.axaml
index c768a891f..fc4dcedf7 100644
--- a/src/Views/SelfUpdate.axaml
+++ b/src/Views/SelfUpdate.axaml
@@ -30,10 +30,10 @@
             IsVisible="{OnPlatform True, macOS=False}"/>
 
       <Grid Grid.Column="0" Classes="caption_button_box" Margin="2,4,0,0" IsVisible="{OnPlatform False, macOS=True}">
-        <Button Classes="caption_button_macos" Click="CloseWindow">
+        <Button Classes="caption_button_macos close" Click="CloseWindow">
           <Grid>
-            <Ellipse Fill="{DynamicResource Brush.MacOS.Close}"/>
-            <Path Height="6" Width="6" Stretch="Fill" Fill="#505050" Data="{StaticResource Icons.MacOS.Close}"/>
+            <Ellipse/>
+            <Path/>
           </Grid>
         </Button>
       </Grid>
diff --git a/src/Views/StandaloneCommitMessageEditor.axaml b/src/Views/StandaloneCommitMessageEditor.axaml
index d6b961d59..319f107f8 100644
--- a/src/Views/StandaloneCommitMessageEditor.axaml
+++ b/src/Views/StandaloneCommitMessageEditor.axaml
@@ -27,10 +27,10 @@
             IsVisible="{OnPlatform True, macOS=False}"/>
 
       <Grid Grid.Column="0" Classes="caption_button_box" Margin="2,4,0,0" IsVisible="{OnPlatform False, macOS=True}">
-        <Button Classes="caption_button_macos" Click="CloseWindow">
+        <Button Classes="caption_button_macos close" Click="CloseWindow">
           <Grid>
-            <Ellipse Fill="{DynamicResource Brush.MacOS.Close}"/>
-            <Path Height="6" Width="6" Stretch="Fill" Fill="#505050" Data="{StaticResource Icons.MacOS.Close}"/>
+            <Ellipse/>
+            <Path/>
           </Grid>
         </Button>
       </Grid>
diff --git a/src/Views/Statistics.axaml b/src/Views/Statistics.axaml
index 61b1151e3..050243726 100644
--- a/src/Views/Statistics.axaml
+++ b/src/Views/Statistics.axaml
@@ -28,10 +28,10 @@
             IsVisible="{OnPlatform True, macOS=False}"/>
 
       <Grid Grid.Column="0" Classes="caption_button_box" Margin="2,4,0,0" IsVisible="{OnPlatform False, macOS=True}">
-        <Button Classes="caption_button_macos" Click="CloseWindow">
+        <Button Classes="caption_button_macos close" Click="CloseWindow">
           <Grid>
-            <Ellipse Fill="{DynamicResource Brush.MacOS.Close}"/>
-            <Path Height="6" Width="6" Stretch="Fill" Fill="#505050" Data="{StaticResource Icons.MacOS.Close}"/>
+            <Ellipse/>
+            <Path/>
           </Grid>
         </Button>
       </Grid>