diff --git a/src/UI/About.xaml b/src/UI/About.xaml
index 81c4280c..020ce733 100644
--- a/src/UI/About.xaml
+++ b/src/UI/About.xaml
@@ -14,7 +14,7 @@
     </WindowChrome.WindowChrome>
 
     <!-- Window Layout -->
-    <Border BorderBrush="{StaticResource Brush.Border3}" BorderThickness="1">
+    <Border BorderBrush="{StaticResource Brush.Border0}" BorderThickness="1">
         <Grid>
             <Grid.RowDefinitions>
                 <RowDefinition Height="32"/>
diff --git a/src/UI/Blame.xaml b/src/UI/Blame.xaml
index ed3087ba..3d2b0bef 100644
--- a/src/UI/Blame.xaml
+++ b/src/UI/Blame.xaml
@@ -14,7 +14,7 @@
     </WindowChrome.WindowChrome>
 
     <!-- Window Content -->
-    <Border BorderBrush="{StaticResource Brush.Border3}">
+    <Border BorderBrush="{StaticResource Brush.Border0}">
         <!-- Fix Maximize BUG -->
         <Border.Style>
             <Style TargetType="{x:Type Border}">
diff --git a/src/UI/FileHistories.xaml b/src/UI/FileHistories.xaml
index 4985b68f..2d43b8e2 100644
--- a/src/UI/FileHistories.xaml
+++ b/src/UI/FileHistories.xaml
@@ -15,7 +15,7 @@
     </WindowChrome.WindowChrome>
 
     <!-- Layout Window -->
-    <Border Background="{StaticResource Brush.Window}" BorderBrush="{StaticResource Brush.Border3}">
+    <Border Background="{StaticResource Brush.Window}" BorderBrush="{StaticResource Brush.Border0}">
         <!-- Fix Maximize BUG -->
         <Border.Style>
             <Style TargetType="{x:Type Border}">
diff --git a/src/UI/FolderDialog.xaml b/src/UI/FolderDialog.xaml
index ee542712..f7b65041 100644
--- a/src/UI/FolderDialog.xaml
+++ b/src/UI/FolderDialog.xaml
@@ -14,7 +14,7 @@
     </WindowChrome.WindowChrome>
 
     <!-- Window Layout -->
-    <Border Background="{StaticResource Brush.Window}" BorderThickness="1" BorderBrush="{StaticResource Brush.Border3}">
+    <Border Background="{StaticResource Brush.Window}" BorderThickness="1" BorderBrush="{StaticResource Brush.Border0}">
         <Grid>
             <Grid.RowDefinitions>
                 <RowDefinition Height="32"/>
diff --git a/src/UI/Launcher.xaml b/src/UI/Launcher.xaml
index 22cfe346..2a06ba8b 100644
--- a/src/UI/Launcher.xaml
+++ b/src/UI/Launcher.xaml
@@ -21,7 +21,7 @@
     </WindowChrome.WindowChrome>
 
     <!-- Window Layout -->
-    <Border BorderBrush="{StaticResource Brush.Border3}">
+    <Border BorderBrush="{StaticResource Brush.Border0}">
 
         <!-- Fix Maximize BUG -->
         <Border.Style>
@@ -178,7 +178,7 @@
                                                     BorderThickness="0"
                                                     BorderBrush="{StaticResource Brush.Border0}"
                                                     Background="Transparent"
-                                                    CornerRadius="3,3,0,0"/>
+                                                    CornerRadius="4,4,0,0"/>
 
                                                 <ContentPresenter 
                                                     x:Name="ContentSite"
diff --git a/src/UI/SettingDialog.xaml b/src/UI/SettingDialog.xaml
index 98cd44ea..0e06451d 100644
--- a/src/UI/SettingDialog.xaml
+++ b/src/UI/SettingDialog.xaml
@@ -18,7 +18,7 @@
     </WindowChrome.WindowChrome>
 
     <!-- Window Layout -->
-    <Border BorderBrush="{StaticResource Brush.Border3}" BorderThickness="1">
+    <Border BorderBrush="{StaticResource Brush.Border0}" BorderThickness="1">
         <Grid Background="{StaticResource Brush.Window}">
             <Grid.RowDefinitions>
                 <RowDefinition Height="32"/>
diff --git a/src/UI/UpdateAvailable.xaml b/src/UI/UpdateAvailable.xaml
index 25531d82..785a6151 100644
--- a/src/UI/UpdateAvailable.xaml
+++ b/src/UI/UpdateAvailable.xaml
@@ -14,7 +14,7 @@
     </WindowChrome.WindowChrome>
 
     <!-- Window Layout -->
-    <Border BorderBrush="{StaticResource}" BorderThickness="1">
+    <Border BorderBrush="{StaticResource Brush.Border0}" BorderThickness="1">
         <Grid Background="{StaticResource Brush.Window}">
             <Grid.RowDefinitions>
                 <RowDefinition Height="32"/>