diff --git a/src/Views/About.xaml b/src/Views/About.xaml
index 2e589784..578c83e0 100644
--- a/src/Views/About.xaml
+++ b/src/Views/About.xaml
@@ -5,6 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:controls="clr-namespace:SourceGit.Views.Controls"
         mc:Ignorable="d"
+        UseLayoutRounding="True"
         WindowStartupLocation="CenterOwner"
         Title="{StaticResource Text.About}" 
         Height="280" Width="400"
@@ -16,7 +17,7 @@
     <controls:WindowBorder>
         <Grid>
             <Grid.RowDefinitions>
-                <RowDefinition Height="32"/>
+                <RowDefinition Height="28"/>
                 <RowDefinition Height="*"/>
             </Grid.RowDefinitions>
             
@@ -37,9 +38,10 @@
                 
                 <!-- Close -->
                 <controls:IconButton
-                    Grid.Column="3" 
+                    Grid.Column="3"
                     Click="Quit"
-                    Padding="9" 
+                    Width="28"
+                    Padding="8" 
                     Icon="{StaticResource Icon.Close}" 
                     HoverBackground="Red" 
                     WindowChrome.IsHitTestVisibleInChrome="True"/>
diff --git a/src/Views/Blame.xaml b/src/Views/Blame.xaml
index 20321ca6..30e6c5b6 100644
--- a/src/Views/Blame.xaml
+++ b/src/Views/Blame.xaml
@@ -5,6 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:controls="clr-namespace:SourceGit.Views.Controls"
         mc:Ignorable="d"
+        UseLayoutRounding="True"
         Title="{StaticResource Text.Blame}"
         WindowStartupLocation="CenterOwner"
         Height="600" Width="800">
@@ -15,7 +16,7 @@
     <controls:WindowBorder>
         <Grid>
             <Grid.RowDefinitions>
-                <RowDefinition Height="32"/>
+                <RowDefinition Height="28"/>
                 <RowDefinition Height="24"/>
                 <RowDefinition Height="*"/>
             </Grid.RowDefinitions>
diff --git a/src/Views/FolderBrowser.xaml b/src/Views/FolderBrowser.xaml
index b142235a..57e24a4e 100644
--- a/src/Views/FolderBrowser.xaml
+++ b/src/Views/FolderBrowser.xaml
@@ -6,6 +6,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:controls="clr-namespace:SourceGit.Views.Controls"
         mc:Ignorable="d"
+        UseLayoutRounding="True"
         Title="{StaticResource Text.FolderDialog}"
         WindowStartupLocation="CenterOwner"
         ResizeMode="NoResize"
@@ -17,7 +18,7 @@
     <controls:WindowBorder>
         <Grid>
             <Grid.RowDefinitions>
-                <RowDefinition Height="32"/>
+                <RowDefinition Height="28"/>
                 <RowDefinition Height="32"/>
                 <RowDefinition Height="*"/>
                 <RowDefinition Height="48"/>
@@ -42,8 +43,7 @@
                 <controls:IconButton
                     Grid.Column="3"
                     Click="Quit"
-                    Width="32" Height="32"
-                    Padding="9"
+                    Width="28" Padding="8"
                     WindowChrome.IsHitTestVisibleInChrome="True"
                     Icon="{StaticResource Icon.Close}"
                     HoverBackground="Red"/>
diff --git a/src/Views/Histories.xaml b/src/Views/Histories.xaml
index 43aa770e..7c87a03a 100644
--- a/src/Views/Histories.xaml
+++ b/src/Views/Histories.xaml
@@ -7,6 +7,7 @@
         xmlns:models="clr-namespace:SourceGit.Models"
         xmlns:widgets="clr-namespace:SourceGit.Views.Widgets"
         mc:Ignorable="d"
+        UseLayoutRounding="True"
         Title="{StaticResource Text.FileHistory}"
         WindowStartupLocation="CenterOwner"
         MinHeight="600" MinWidth="800">
@@ -17,7 +18,7 @@
     <controls:WindowBorder>
         <Grid>
             <Grid.RowDefinitions>
-                <RowDefinition Height="32"/>
+                <RowDefinition Height="28"/>
                 <RowDefinition Height="*"/>
             </Grid.RowDefinitions>
             
diff --git a/src/Views/Preference.xaml b/src/Views/Preference.xaml
index a0458b6f..e3fd8185 100644
--- a/src/Views/Preference.xaml
+++ b/src/Views/Preference.xaml
@@ -7,6 +7,7 @@
         xmlns:controls="clr-namespace:SourceGit.Views.Controls"
         xmlns:models="clr-namespace:SourceGit.Models"
         mc:Ignorable="d"
+        UseLayoutRounding="True"
         Title="{StaticResource Text.Preference}"
         Width="500" SizeToContent="Height"
         WindowStartupLocation="CenterOwner"
@@ -18,7 +19,7 @@
     <controls:WindowBorder>
         <Grid>
             <Grid.RowDefinitions>
-                <RowDefinition Height="32"/>
+                <RowDefinition Height="28"/>
                 <RowDefinition Height="*"/>
             </Grid.RowDefinitions>
             
@@ -41,7 +42,7 @@
                 <controls:IconButton 
                     Grid.Column="3" 
                     Click="Quit"
-                    Padding="9" 
+                    Width="28" Padding="8" 
                     Icon="{StaticResource Icon.Close}" 
                     HoverBackground="Red"
                     WindowChrome.IsHitTestVisibleInChrome="True"/>
diff --git a/src/Views/Upgrade.xaml b/src/Views/Upgrade.xaml
index 8291695b..a905e699 100644
--- a/src/Views/Upgrade.xaml
+++ b/src/Views/Upgrade.xaml
@@ -6,6 +6,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:controls="clr-namespace:SourceGit.Views.Controls"
         mc:Ignorable="d"
+        UseLayoutRounding="True"
         Title="{StaticResource Text.UpdateAvailable}"
         WindowStartupLocation="CenterOwner"
         Height="400" Width="500"
@@ -17,7 +18,7 @@
     <controls:WindowBorder>
         <Grid>
             <Grid.RowDefinitions>
-                <RowDefinition Height="32"/>
+                <RowDefinition Height="28"/>
                 <RowDefinition Height="Auto"/>
                 <RowDefinition Height="*"/>
                 <RowDefinition Height="32"/>
@@ -42,8 +43,7 @@
                 <controls:IconButton
                     Grid.Column="3"
                     Click="Quit"
-                    Width="32" Height="32"
-                    Padding="9"
+                    Width="28" Padding="8"
                     Icon="{StaticResource Icon.Close}"
                     HoverBackground="Red"
                     WindowChrome.IsHitTestVisibleInChrome="True"/>