diff --git a/src/Resources/Themes/Dark.xaml b/src/Resources/Themes/Dark.xaml
index 05351961..05abc731 100644
--- a/src/Resources/Themes/Dark.xaml
+++ b/src/Resources/Themes/Dark.xaml
@@ -3,8 +3,10 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <SolidColorBrush x:Key="Brush.Logo" Color="#FFF05133"/>
 
-    <SolidColorBrush x:Key="Brush.TitleBar" Color="#FF1F1F1F"/>
     <SolidColorBrush x:Key="Brush.Window" Color="#FF252525"/>
+    <SolidColorBrush x:Key="Brush.WindowBorder" Color="#FF101010"/>
+
+    <SolidColorBrush x:Key="Brush.TitleBar" Color="#FF1F1F1F"/>
     <SolidColorBrush x:Key="Brush.NewPageHover" Color="#FF404040"/>
     <SolidColorBrush x:Key="Brush.Popup" Color="#FF2B2B2B"/>
     <SolidColorBrush x:Key="Brush.Contents" Color="#FF1B1B1B"/>
diff --git a/src/Resources/Themes/Light.xaml b/src/Resources/Themes/Light.xaml
index 64ca8951..2f74d46f 100644
--- a/src/Resources/Themes/Light.xaml
+++ b/src/Resources/Themes/Light.xaml
@@ -3,8 +3,10 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <SolidColorBrush x:Key="Brush.Logo" Color="#FFF05133"/>
 
-    <SolidColorBrush x:Key="Brush.TitleBar" Color="White"/>
     <SolidColorBrush x:Key="Brush.Window" Color="#FFF8F8F8"/>
+    <SolidColorBrush x:Key="Brush.WindowBorder" Color="#FF505050"/>
+
+    <SolidColorBrush x:Key="Brush.TitleBar" Color="White"/>
     <SolidColorBrush x:Key="Brush.NewPageHover" Color="#1D000000"/>
     <SolidColorBrush x:Key="Brush.Popup" Color="#FFF8F8F8"/>
     <SolidColorBrush x:Key="Brush.Contents" Color="White"/>
diff --git a/src/Views/About.xaml b/src/Views/About.xaml
index 578c83e0..74c16136 100644
--- a/src/Views/About.xaml
+++ b/src/Views/About.xaml
@@ -18,6 +18,7 @@
         <Grid>
             <Grid.RowDefinitions>
                 <RowDefinition Height="28"/>
+                <RowDefinition Height="1"/>
                 <RowDefinition Height="*"/>
             </Grid.RowDefinitions>
             
@@ -46,9 +47,15 @@
                     HoverBackground="Red" 
                     WindowChrome.IsHitTestVisibleInChrome="True"/>
             </Grid>
-        
+
+            <Rectangle 
+                Grid.Row="1"
+                Height="1"
+                HorizontalAlignment="Stretch"
+                Fill="{StaticResource Brush.Border0}"/>
+
             <!-- Content -->
-            <StackPanel Grid.Row="1" Orientation="Vertical">
+            <StackPanel Grid.Row="2" Orientation="Vertical">
                 
                 <!-- LOGO -->
                 <Path 
diff --git a/src/Views/Blame.xaml b/src/Views/Blame.xaml
index 4a93823a..e3550aa0 100644
--- a/src/Views/Blame.xaml
+++ b/src/Views/Blame.xaml
@@ -5,10 +5,11 @@
         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}"
         TextOptions.TextFormattingMode="Display"
         TextOptions.TextRenderingMode="ClearType"
+        RenderOptions.ClearTypeHint="Enabled"
+        UseLayoutRounding="True"
         WindowStartupLocation="CenterOwner"
         Height="600" Width="800">
     <WindowChrome.WindowChrome>
@@ -19,6 +20,7 @@
         <Grid>
             <Grid.RowDefinitions>
                 <RowDefinition Height="28"/>
+                <RowDefinition Height="1"/>
                 <RowDefinition Height="24"/>
                 <RowDefinition Height="*"/>
             </Grid.RowDefinitions>
@@ -45,9 +47,16 @@
                     <controls:IconButton Click="Quit" Width="28" Padding="8" Icon="{StaticResource Icon.Close}" HoverBackground="Red" Opacity="1"/>
                 </StackPanel>
             </Grid>
-            
-            <!-- Body -->
-            <Border Grid.Row="1">
+
+            <!-- Line -->
+            <Rectangle 
+                Grid.Row="1"
+                Height="1"
+                HorizontalAlignment="Stretch"
+                Fill="{StaticResource Brush.Border0}"/>
+
+            <!-- Description -->
+            <Border Grid.Row="2">
                 <Grid Margin="4,0">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="*"/>
@@ -61,7 +70,7 @@
             
             <!-- Viewer -->
             <DataGrid
-                Grid.Row="2"
+                Grid.Row="3"
                 x:Name="blame"
                 GridLinesVisibility="Vertical"
                 VerticalGridLinesBrush="{StaticResource Brush.Border2}"
@@ -98,7 +107,7 @@
 
             <StackPanel
                 x:Name="notSupport" 
-                Grid.Row="2"
+                Grid.Row="3"
                 Orientation="Vertical" 
                 VerticalAlignment="Center" HorizontalAlignment="Center" 
                 Background="{StaticResource Brush.Window}"
@@ -108,10 +117,10 @@
             </StackPanel>
 
             <!-- Loading -->
-            <controls:Loading x:Name="loading" Grid.Row="2" Width="48" Height="48" IsAnimating="True"/>
+            <controls:Loading x:Name="loading" Grid.Row="3" Width="48" Height="48" IsAnimating="True"/>
 
             <!-- Popup to show commit info -->
-            <Popup x:Name="popup" Grid.Row="2" Placement="MousePoint" IsOpen="False" StaysOpen="False" Focusable="True">
+            <Popup x:Name="popup" Grid.Row="3" Placement="MousePoint" IsOpen="False" StaysOpen="False" Focusable="True">
                 <Border BorderBrush="{StaticResource Brush.Accent1}" BorderThickness="1" Background="{StaticResource Brush.Popup}">
                     <Grid Margin="4">
                         <Grid.RowDefinitions>
diff --git a/src/Views/Controls/WindowBorder.cs b/src/Views/Controls/WindowBorder.cs
index 85eec0b2..9b594a81 100644
--- a/src/Views/Controls/WindowBorder.cs
+++ b/src/Views/Controls/WindowBorder.cs
@@ -11,7 +11,7 @@ namespace SourceGit.Views.Controls {
 
         public WindowBorder() {
             Background = FindResource("Brush.Window") as Brush;
-            BorderBrush = FindResource("Brush.Border0") as Brush;
+            BorderBrush = FindResource("Brush.WindowBorder") as Brush;
             BorderThickness = new Thickness(1);
             Margin = new Thickness(0);
 
diff --git a/src/Views/Histories.xaml b/src/Views/Histories.xaml
index 5b2831be..5182906b 100644
--- a/src/Views/Histories.xaml
+++ b/src/Views/Histories.xaml
@@ -7,8 +7,11 @@
         xmlns:models="clr-namespace:SourceGit.Models"
         xmlns:widgets="clr-namespace:SourceGit.Views.Widgets"
         mc:Ignorable="d"
-        UseLayoutRounding="True"
         Title="{StaticResource Text.FileHistory}"
+        TextOptions.TextFormattingMode="Display"
+        TextOptions.TextRenderingMode="ClearType"
+        RenderOptions.ClearTypeHint="Enabled"
+        UseLayoutRounding="True"
         WindowStartupLocation="CenterOwner"
         MinHeight="600" MinWidth="800">
     <WindowChrome.WindowChrome>
@@ -19,6 +22,7 @@
         <Grid>
             <Grid.RowDefinitions>
                 <RowDefinition Height="28"/>
+                <RowDefinition Height="1"/>
                 <RowDefinition Height="*"/>
             </Grid.RowDefinitions>
             
@@ -44,9 +48,15 @@
                     <controls:IconButton Click="Quit" Width="28" Padding="8" Icon="{StaticResource Icon.Close}" HoverBackground="Red" Opacity="1"/>
                 </StackPanel>
             </Grid>
-            
+
+            <Rectangle 
+                Grid.Row="1"
+                Height="1"
+                HorizontalAlignment="Stretch"
+                Fill="{StaticResource Brush.Border0}"/>
+
             <!-- Body -->
-            <Grid Grid.Row="1">
+            <Grid Grid.Row="2">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="300" MinWidth="300" MaxWidth="600"/>
                     <ColumnDefinition Width="1"/>
@@ -58,6 +68,8 @@
                     x:Name="commitList"
                     Grid.Column="0"
                     Background="{StaticResource Brush.Contents}"
+                    BorderBrush="{StaticResource Brush.Border0}"
+                    BorderThickness="0,0,1,0"
                     SelectionMode="Single"
                     SelectionUnit="FullRow"
                     SelectedCellsChanged="OnCommitSelectedChanged">
@@ -128,7 +140,7 @@
                 <GridSplitter Grid.Column="1" Width="1" HorizontalAlignment="Center" VerticalAlignment="Stretch" Background="Transparent"/>
 
                 <!-- Diff Viewer -->
-                <widgets:DiffViewer Grid.Column="2" x:Name="diffViewer"/>
+                <widgets:DiffViewer Grid.Column="2" x:Name="diffViewer" Padding="4"/>
             </Grid>
         </Grid>
     </controls:WindowBorder>
diff --git a/src/Views/Launcher.xaml b/src/Views/Launcher.xaml
index 92ac7c49..14e336b4 100644
--- a/src/Views/Launcher.xaml
+++ b/src/Views/Launcher.xaml
@@ -8,10 +8,11 @@
         xmlns:widgets="clr-namespace:SourceGit.Views.Widgets"
         xmlns:models="clr-namespace:SourceGit.Models"
         mc:Ignorable="d"
-        UseLayoutRounding="True"
-        WindowStartupLocation="CenterScreen"
         TextOptions.TextFormattingMode="Display"
         TextOptions.TextRenderingMode="ClearType"
+        RenderOptions.ClearTypeHint="Enabled"
+        UseLayoutRounding="True"
+        WindowStartupLocation="CenterScreen"
         MinWidth="1280" MinHeight="720"
         Title="{StaticResource Text.About.Title}"
         Width="{Binding Source={x:Static models:Preference.Instance}, Path=Window.Width, Mode=TwoWay}"
diff --git a/src/Views/Preference.xaml b/src/Views/Preference.xaml
index e3fd8185..148cc368 100644
--- a/src/Views/Preference.xaml
+++ b/src/Views/Preference.xaml
@@ -7,11 +7,11 @@
         xmlns:controls="clr-namespace:SourceGit.Views.Controls"
         xmlns:models="clr-namespace:SourceGit.Models"
         mc:Ignorable="d"
+        WindowStartupLocation="CenterOwner"
+        ResizeMode="NoResize"
         UseLayoutRounding="True"
         Title="{StaticResource Text.Preference}"
-        Width="500" SizeToContent="Height"
-        WindowStartupLocation="CenterOwner"
-        ResizeMode="NoResize">
+        Width="500" SizeToContent="Height">
     <WindowChrome.WindowChrome>
         <WindowChrome UseAeroCaptionButtons="False" CornerRadius="0" CaptionHeight="28" ResizeBorderThickness="1"/>
     </WindowChrome.WindowChrome>
@@ -20,6 +20,7 @@
         <Grid>
             <Grid.RowDefinitions>
                 <RowDefinition Height="28"/>
+                <RowDefinition Height="1"/>
                 <RowDefinition Height="*"/>
             </Grid.RowDefinitions>
             
@@ -47,9 +48,14 @@
                     HoverBackground="Red"
                     WindowChrome.IsHitTestVisibleInChrome="True"/>
             </Grid>
-            
+
+            <Rectangle 
+                Grid.Row="1"
+                HorizontalAlignment="Stretch"
+                Fill="{StaticResource Brush.Border0}"/>
+
             <!-- Body -->
-            <Grid Grid.Row="1" Margin="16,8">
+            <Grid Grid.Row="2" Margin="16,8">
                 <Grid.RowDefinitions>
                     <RowDefinition Height="36"/>
                     <RowDefinition Height="28"/>