diff --git a/README.md b/README.md
index 3b2645fc..2af61cbc 100644
--- a/README.md
+++ b/README.md
@@ -26,6 +26,8 @@ Opensouce Git GUI client.
   * Revision Diffs
 * GitFlow support
 
+> **Linux** only tested on `Ubuntu 22.04` on `X11`.
+
 ## How to use
 
 **To use this tool, you need to install Git first.**
@@ -43,7 +45,6 @@ For **macOS** users:
 For **Linux** users:
 
 * `xdg-open` must be installed to support open native file manager.
-* Only tested on `Ubuntu 22.04`.
 
 ## Screen Shots
 
diff --git a/src/App.axaml.cs b/src/App.axaml.cs
index 98df9dbf..60e44d7b 100644
--- a/src/App.axaml.cs
+++ b/src/App.axaml.cs
@@ -50,7 +50,7 @@ namespace SourceGit {
                 manager.AddFontCollection(monospace);
             });
 
-            Native.OS.SetupFonts(builder);
+            Native.OS.SetupApp(builder);
             return builder;
         }
 
diff --git a/src/Converters/WindowStateConverters.cs b/src/Converters/WindowStateConverters.cs
index 67e5a3be..fc7c0bd4 100644
--- a/src/Converters/WindowStateConverters.cs
+++ b/src/Converters/WindowStateConverters.cs
@@ -2,13 +2,15 @@
 using Avalonia.Data.Converters;
 using Avalonia.Media;
 using Avalonia;
-using System.Runtime.InteropServices;
+using System;
 
 namespace SourceGit.Converters {
     public static class WindowStateConverters {
         public static FuncValueConverter<WindowState, Thickness> ToContentMargin =
             new FuncValueConverter<WindowState, Thickness>(state => {
-                if (state == WindowState.Maximized && RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) {
+                if (OperatingSystem.IsWindows() && state == WindowState.Maximized) {
+                    return new Thickness(6);
+                } else if (OperatingSystem.IsLinux() && state != WindowState.Maximized) {
                     return new Thickness(6);
                 } else {
                     return new Thickness(0);
@@ -17,7 +19,7 @@ namespace SourceGit.Converters {
 
         public static FuncValueConverter<WindowState, GridLength> ToTitleBarHeight =
             new FuncValueConverter<WindowState, GridLength>(state => {
-                if (state == WindowState.Maximized && RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) {
+                if (state == WindowState.Maximized) {
                     return new GridLength(30);
                 } else {
                     return new GridLength(38);
diff --git a/src/Native/Linux.cs b/src/Native/Linux.cs
index 7776a98f..262a7f3c 100644
--- a/src/Native/Linux.cs
+++ b/src/Native/Linux.cs
@@ -6,7 +6,7 @@ using System.Runtime.Versioning;
 namespace SourceGit.Native {
     [SupportedOSPlatform("linux")]
     internal class Linux : OS.IBackend {
-        public void SetupFonts(AppBuilder builder) {
+        public void SetupApp(AppBuilder builder) {
         #if USE_FONT_INTER
             builder.WithInterFont();
         #endif
diff --git a/src/Native/MacOS.cs b/src/Native/MacOS.cs
index c2ccf34b..495fdc2b 100644
--- a/src/Native/MacOS.cs
+++ b/src/Native/MacOS.cs
@@ -8,7 +8,7 @@ using System.Text;
 namespace SourceGit.Native {
     [SupportedOSPlatform("macOS")]
     internal class MacOS : OS.IBackend {
-        public void SetupFonts(AppBuilder builder) {
+        public void SetupApp(AppBuilder builder) {
             builder.With(new FontManagerOptions() {
                 DefaultFamilyName = "PingFang SC",
                 FontFallbacks = [
diff --git a/src/Native/OS.cs b/src/Native/OS.cs
index 747606fc..2c9d41b7 100644
--- a/src/Native/OS.cs
+++ b/src/Native/OS.cs
@@ -5,7 +5,7 @@ using System.Diagnostics;
 namespace SourceGit.Native {
     public static class OS {
         public interface IBackend {
-            void SetupFonts(AppBuilder builder);
+            void SetupApp(AppBuilder builder);
 
             string FindGitExecutable();
             string FindVSCode();
@@ -41,8 +41,8 @@ namespace SourceGit.Native {
             }
         }
 
-        public static void SetupFonts(AppBuilder builder) {
-            _backend?.SetupFonts(builder);
+        public static void SetupApp(AppBuilder builder) {
+            _backend?.SetupApp(builder);
         }
 
         public static string FindGitExecutable() {
diff --git a/src/Native/Windows.cs b/src/Native/Windows.cs
index fa7c2b73..7bce6ede 100644
--- a/src/Native/Windows.cs
+++ b/src/Native/Windows.cs
@@ -13,7 +13,7 @@ namespace SourceGit.Native {
         [DllImport("shlwapi.dll", CharSet = CharSet.Unicode, SetLastError = false)]
         private static extern bool PathFindOnPath([In, Out] StringBuilder pszFile, [In] string[] ppszOtherDirs);
 
-        public void SetupFonts(AppBuilder builder) {
+        public void SetupApp(AppBuilder builder) {
             builder.With(new FontManagerOptions() {
                 DefaultFamilyName = "Microsoft YaHei UI",
                 FontFallbacks = [
diff --git a/src/Views/About.axaml b/src/Views/About.axaml
index 0aebc9d8..37185c8e 100644
--- a/src/Views/About.axaml
+++ b/src/Views/About.axaml
@@ -9,24 +9,32 @@
         x:DataType="v:About"
         Icon="/App.ico"
         Title="{DynamicResource Text.About}"
-        Background="{DynamicResource Brush.Window}"
+        Background="Transparent"
         SizeToContent="WidthAndHeight"
         CanResize="False"
         WindowStartupLocation="CenterScreen"
-        ExtendClientAreaToDecorationsHint="{OnPlatform True, Linux=False}"
-        ExtendClientAreaChromeHints="{OnPlatform NoChrome, Linux=Default}">
+        ExtendClientAreaToDecorationsHint="True"
+        ExtendClientAreaChromeHints="NoChrome"
+        SystemDecorations="{OnPlatform Full, Linux=None}">
   <Grid RowDefinitions="Auto,*">
-    <Grid Grid.Row="0" ColumnDefinitions="Auto,*,Auto" Height="30" IsVisible="{OnPlatform True, Linux=False}">
+    <!-- Custom window shadow for Linux -->
+    <Border Grid.Row="0" Grid.RowSpan="2"
+            Background="{DynamicResource Brush.Window}"
+            Effect="drop-shadow(0 0 6 #A0000000)"
+            IsVisible="{OnPlatform False, Linux=True}"/>
+
+    <!-- TitleBar -->
+    <Grid Grid.Row="0" ColumnDefinitions="Auto,*,Auto" Height="30">
       <Border Grid.Column="0" Grid.ColumnSpan="3"
               Background="{DynamicResource Brush.TitleBar}"
               BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border0}"
-              IsHitTestVisible="False"/>
+              PointerPressed="BeginMoveWindow"/>
       
       <Path Grid.Column="0"
             Width="14" Height="14"
             Margin="10,0,0,0"
             Data="{StaticResource Icons.Info}"
-            IsVisible="{OnPlatform False, Windows=True}"/>
+            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">
@@ -46,12 +54,12 @@
       <Button Grid.Column="2"
               Classes="caption_button"
               Click="CloseWindow"
-              IsVisible="{OnPlatform False, Windows=True}">
+              IsVisible="{OnPlatform True, macOS=False}">
         <Path Data="{StaticResource Icons.Window.Close}"/>
       </Button>
     </Grid>
 
-    <Grid Grid.Row="1" ColumnDefinitions="Auto,*">
+    <Grid Grid.Row="1" ColumnDefinitions="Auto,*" Background="{DynamicResource Brush.Window}">
       <Image Grid.Column="0"
              Width="200" Height="200"
              Margin="8,0"
diff --git a/src/Views/About.axaml.cs b/src/Views/About.axaml.cs
index b15e3842..955e2c05 100644
--- a/src/Views/About.axaml.cs
+++ b/src/Views/About.axaml.cs
@@ -17,6 +17,10 @@ namespace SourceGit.Views {
             InitializeComponent();
         }
 
+        private void BeginMoveWindow(object sender, PointerPressedEventArgs e) {
+            BeginMoveDrag(e);
+        }
+
         private void CloseWindow(object sender, RoutedEventArgs e) {
             Close();
         }
diff --git a/src/Views/AssumeUnchangedManager.axaml b/src/Views/AssumeUnchangedManager.axaml
index 3dfe06fd..323e23b8 100644
--- a/src/Views/AssumeUnchangedManager.axaml
+++ b/src/Views/AssumeUnchangedManager.axaml
@@ -10,25 +10,32 @@
         x:DataType="vm:AssumeUnchangedManager"
         Icon="/App.ico"
         Title="{DynamicResource Text.AssumeUnchanged}"
-        Background="{DynamicResource Brush.Window}"
+        Background="Transparent"
         Width="600" Height="400"
         CanResize="False"
         WindowStartupLocation="CenterOwner"
-        ExtendClientAreaToDecorationsHint="{OnPlatform True, Linux=False}"
-        ExtendClientAreaChromeHints="{OnPlatform NoChrome, Linux=Default}">
+        ExtendClientAreaToDecorationsHint="True"
+        ExtendClientAreaChromeHints="NoChrome"
+        SystemDecorations="{OnPlatform Full, Linux=None}">
   <Grid RowDefinitions="Auto,*">
+    <!-- Custom window shadow for Linux -->
+    <Border Grid.Row="0" Grid.RowSpan="2"
+            Background="{DynamicResource Brush.Window}"
+            Effect="drop-shadow(0 0 6 #A0000000)"
+            IsVisible="{OnPlatform False, Linux=True}"/>
+    
     <!-- TitleBar -->
-    <Grid Grid.Row="0" ColumnDefinitions="Auto,*,Auto" Height="30" IsVisible="{OnPlatform True, Linux=False}">
+    <Grid Grid.Row="0" ColumnDefinitions="Auto,*,Auto" Height="30">
       <Border Grid.Column="0" Grid.ColumnSpan="3"
               Background="{DynamicResource Brush.TitleBar}"
               BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border0}"
-              IsHitTestVisible="False"/>
+              PointerPressed="BeginMoveWindow"/>
       
       <Path Grid.Column="0"
             Width="14" Height="14"
             Margin="10,0,0,0"
             Data="{StaticResource Icons.File.Ignore}"
-            IsVisible="{OnPlatform False, Windows=True}"/>
+            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">
@@ -48,61 +55,61 @@
       <Button Grid.Column="2"
               Classes="caption_button"
               Click="CloseWindow"
-              IsVisible="{OnPlatform False, Windows=True}">
+              IsVisible="{OnPlatform True, macOS=False}">
         <Path Data="{StaticResource Icons.Window.Close}"/>
       </Button>
     </Grid>
     
     <!-- Unchanged Files -->
-    <DataGrid Grid.Row="1"
-              Margin="8"
-              Background="{DynamicResource Brush.Contents}"
-              ItemsSource="{Binding Files}"
-              SelectionMode="Single"
-              CanUserReorderColumns="False"
-              CanUserResizeColumns="False"
-              CanUserSortColumns="False"
-              IsReadOnly="True"
-              HeadersVisibility="None"
-              Focusable="False"
-              RowHeight="26"
-              BorderThickness="1"
-              BorderBrush="{DynamicResource Brush.Border2}"
-              HorizontalScrollBarVisibility="Disabled"
-              VerticalScrollBarVisibility="Auto">
-      <DataGrid.Columns>
-        <DataGridTemplateColumn Width="*">
-          <DataGridTemplateColumn.CellTemplate>
-            <DataTemplate>
-              <StackPanel Orientation="Horizontal">
-                <Path Width="14" Height="14" Margin="8,0,4,0" Data="{StaticResource Icons.File}"/>
-                <TextBlock Text="{Binding}" Margin="4,0"/>
-              </StackPanel>
-            </DataTemplate>
-          </DataGridTemplateColumn.CellTemplate>
-        </DataGridTemplateColumn>
+    <Grid Grid.Row="1" Background="{DynamicResource Brush.Window}">
+      <DataGrid Margin="8"
+                Background="{DynamicResource Brush.Contents}"
+                ItemsSource="{Binding Files}"
+                SelectionMode="Single"
+                CanUserReorderColumns="False"
+                CanUserResizeColumns="False"
+                CanUserSortColumns="False"
+                IsReadOnly="True"
+                HeadersVisibility="None"
+                Focusable="False"
+                RowHeight="26"
+                BorderThickness="1"
+                BorderBrush="{DynamicResource Brush.Border2}"
+                HorizontalScrollBarVisibility="Disabled"
+                VerticalScrollBarVisibility="Auto">
+        <DataGrid.Columns>
+          <DataGridTemplateColumn Width="*">
+            <DataGridTemplateColumn.CellTemplate>
+              <DataTemplate>
+                <StackPanel Orientation="Horizontal">
+                  <Path Width="14" Height="14" Margin="8,0,4,0" Data="{StaticResource Icons.File}"/>
+                  <TextBlock Text="{Binding}" Margin="4,0"/>
+                </StackPanel>
+              </DataTemplate>
+            </DataGridTemplateColumn.CellTemplate>
+          </DataGridTemplateColumn>
 
-        <DataGridTemplateColumn>
-          <DataGridTemplateColumn.CellTemplate>
-            <DataTemplate>
-              <Button Classes="icon_button"
-                      Command="{Binding $parent[v:AssumeUnchangedManager].DataContext.(vm:AssumeUnchangedManager).Remove}"
-                      CommandParameter="{Binding}">
-                <Path Width="14" Height="14" Data="{StaticResource Icons.Clear}"/>
-              </Button>
-            </DataTemplate>
-          </DataGridTemplateColumn.CellTemplate>
-        </DataGridTemplateColumn>
-      </DataGrid.Columns>
-    </DataGrid>
+          <DataGridTemplateColumn>
+            <DataGridTemplateColumn.CellTemplate>
+              <DataTemplate>
+                <Button Classes="icon_button"
+                        Command="{Binding $parent[v:AssumeUnchangedManager].DataContext.(vm:AssumeUnchangedManager).Remove}"
+                        CommandParameter="{Binding}">
+                  <Path Width="14" Height="14" Data="{StaticResource Icons.Clear}"/>
+                </Button>
+              </DataTemplate>
+            </DataGridTemplateColumn.CellTemplate>
+          </DataGridTemplateColumn>
+        </DataGrid.Columns>
+      </DataGrid>
 
-    <!-- Empty -->
-    <StackPanel Grid.Row="2"
-                Orientation="Vertical"
-                HorizontalAlignment="Center" VerticalAlignment="Center"
-                IsVisible="{Binding Files.Count, Converter={x:Static c:IntConverters.IsZero}}">
-      <Path Width="48" Height="48" Data="{StaticResource Icons.Empty}" Fill="{DynamicResource Brush.FG2}"/>
-      <TextBlock Margin="0,16,0,0" Text="{DynamicResource Text.AssumeUnchanged.Empty}" Foreground="{DynamicResource Brush.FG2}"/>
-    </StackPanel>
+      <!-- Empty -->
+      <StackPanel Orientation="Vertical"
+                  HorizontalAlignment="Center" VerticalAlignment="Center"
+                  IsVisible="{Binding Files.Count, Converter={x:Static c:IntConverters.IsZero}}">
+        <Path Width="48" Height="48" Data="{StaticResource Icons.Empty}" Fill="{DynamicResource Brush.FG2}"/>
+        <TextBlock Margin="0,16,0,0" Text="{DynamicResource Text.AssumeUnchanged.Empty}" Foreground="{DynamicResource Brush.FG2}"/>
+      </StackPanel>
+    </Grid>    
   </Grid>
 </Window>
diff --git a/src/Views/AssumeUnchangedManager.axaml.cs b/src/Views/AssumeUnchangedManager.axaml.cs
index 616db87d..32bf574e 100644
--- a/src/Views/AssumeUnchangedManager.axaml.cs
+++ b/src/Views/AssumeUnchangedManager.axaml.cs
@@ -1,4 +1,5 @@
 using Avalonia.Controls;
+using Avalonia.Input;
 using Avalonia.Interactivity;
 
 namespace SourceGit.Views {
@@ -7,6 +8,10 @@ namespace SourceGit.Views {
             InitializeComponent();
         }
 
+        private void BeginMoveWindow(object sender, PointerPressedEventArgs e) {
+            BeginMoveDrag(e);
+        }
+
         private void CloseWindow(object sender, RoutedEventArgs e) {
             Close();
         }
diff --git a/src/Views/Blame.axaml b/src/Views/Blame.axaml
index 3a88f25d..07cba81e 100644
--- a/src/Views/Blame.axaml
+++ b/src/Views/Blame.axaml
@@ -12,25 +12,32 @@
         x:DataType="vm:Blame"
         Icon="/App.ico"
         Title="{DynamicResource Text.Blame}"
+        Background="Transparent"
         WindowStartupLocation="CenterOwner"
-        BorderThickness="1"
-        BorderBrush="{DynamicResource Brush.Border0}"
-        Background="{DynamicResource Brush.Window}"
         MinWidth="1280" MinHeight="720"
-        ExtendClientAreaToDecorationsHint="{OnPlatform True, Linux=False}"
-        ExtendClientAreaChromeHints="{OnPlatform NoChrome, Linux=Default}">
+        ExtendClientAreaToDecorationsHint="True"
+        ExtendClientAreaChromeHints="NoChrome"
+        SystemDecorations="{OnPlatform Full, Linux=None}">
   <Grid Margin="{Binding #me.WindowState, Converter={x:Static c:WindowStateConverters.ToContentMargin}}">
     <Grid.RowDefinitions>
       <RowDefinition Height="30"/>
       <RowDefinition Height="*"/>
     </Grid.RowDefinitions>
 
+    <!-- Custom window shadow for Linux -->
+    <Border Grid.Row="0" Grid.RowSpan="2"
+            Background="{DynamicResource Brush.Window}"
+            Effect="drop-shadow(0 0 6 #A0000000)"
+            IsVisible="{OnPlatform False, Linux=True}"/>
+
+    <!-- TitleBar -->
     <Grid Grid.Row="0" ColumnDefinitions="Auto,Auto,Auto,*,Auto">
       <!-- Bottom border -->
       <Border Grid.Column="0" Grid.ColumnSpan="5"
               Background="{DynamicResource Brush.TitleBar}"
               BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border2}"
-              IsHitTestVisible="False"/>
+              DoubleTapped="MaximizeOrRestoreWindow"
+              PointerPressed="BeginMoveWindow"/>
 
       <!-- Caption Buttons (macOS) -->
       <Border Grid.Column="0" IsVisible="{OnPlatform False, macOS=True}">
@@ -40,19 +47,20 @@
       <!-- Icon -->
       <Path Grid.Column="1" Margin="8,0,0,0" Width="12" Height="12" Data="{StaticResource Icons.Blame}"/>
 
-      <!-- Title (Hide on Linux) -->
-      <TextBlock Grid.Column="2" Margin="8,0,0,0" Text="{DynamicResource Text.Blame}" FontWeight="Bold" IsHitTestVisible="False" VerticalAlignment="Center" IsVisible="{OnPlatform True, Linux=False}"/>
+      <!-- Title -->
+      <TextBlock Grid.Column="2" Margin="8,0,0,0" Text="{DynamicResource Text.Blame}" FontWeight="Bold" IsHitTestVisible="False" VerticalAlignment="Center"/>
 
       <!-- Blame information -->
       <TextBlock Grid.Column="3" Margin="8,0,0,0" Text="{Binding Title}" FontSize="11" FontStyle="Italic" IsHitTestVisible="False" VerticalAlignment="Center"/>
 
-      <!-- Caption Buttons (Windows) -->
-      <Border Grid.Column="4" IsVisible="{OnPlatform False, Windows=True}">
+      <!-- Caption Buttons (Windows/Linux) -->
+      <Border Grid.Column="4" IsVisible="{OnPlatform True, macOS=False}">
         <v:CaptionButtons/>
       </Border>
     </Grid>
 
-    <Grid Grid.Row="1">
+    <!-- Body -->
+    <Grid Grid.Row="1" Background="{DynamicResource Brush.Window}">
       <!-- Blame View -->
       <v:BlameTextEditor HorizontalScrollBarVisibility="Auto"
                          VerticalScrollBarVisibility="Auto" 
@@ -78,5 +86,64 @@
             Data="{StaticResource Icons.Loading}" 
             IsVisible="{Binding Data, Converter={x:Static ObjectConverters.IsNull}}"/>
     </Grid>
+
+    <!-- Custom window sizer for Linux -->
+    <Grid Grid.Row="0" Grid.RowSpan="2" IsVisible="{OnPlatform False, Linux=True}">
+      <Border Width="4" Height="4"
+              Background="Transparent"
+              HorizontalAlignment="Left" VerticalAlignment="Top"
+              Cursor="TopLeftCorner"
+              Tag="{x:Static WindowEdge.NorthWest}"
+              PointerPressed="CustomResizeWindow"/>
+
+      <Border Height="4" Margin="4,0"
+              Background="Transparent"
+              HorizontalAlignment="Stretch" VerticalAlignment="Top"
+              Cursor="TopSide"
+              Tag="{x:Static WindowEdge.North}"
+              PointerPressed="CustomResizeWindow"/>
+
+      <Border Width="4" Height="4"
+              Background="Transparent"
+              HorizontalAlignment="Right" VerticalAlignment="Top"
+              Cursor="TopRightCorner"
+              Tag="{x:Static WindowEdge.NorthEast}"
+              PointerPressed="CustomResizeWindow"/>
+
+      <Border Width="4" Margin="0,4"
+              Background="Transparent"
+              HorizontalAlignment="Left" VerticalAlignment="Stretch"
+              Cursor="LeftSide"
+              Tag="{x:Static WindowEdge.West}"
+              PointerPressed="CustomResizeWindow"/>
+
+      <Border Width="4" Margin="0,4"
+              Background="Transparent"
+              HorizontalAlignment="Right" VerticalAlignment="Stretch"
+              Cursor="RightSide"
+              Tag="{x:Static WindowEdge.East}"
+              PointerPressed="CustomResizeWindow"/>
+
+      <Border Width="4" Height="4"
+              Background="Transparent"
+              HorizontalAlignment="Left" VerticalAlignment="Bottom"
+              Cursor="BottomLeftCorner"
+              Tag="{x:Static WindowEdge.SouthWest}"
+              PointerPressed="CustomResizeWindow"/>
+
+      <Border Height="4" Margin="4,0"
+              Background="Transparent"
+              HorizontalAlignment="Stretch" VerticalAlignment="Bottom"
+              Cursor="BottomSide"
+              Tag="{x:Static WindowEdge.South}"
+              PointerPressed="CustomResizeWindow"/>
+
+      <Border Width="4" Height="4"
+              Background="Transparent"
+              HorizontalAlignment="Right" VerticalAlignment="Bottom"
+              Cursor="BottomRightCorner"
+              Tag="{x:Static WindowEdge.SouthEast}"
+              PointerPressed="CustomResizeWindow"/>
+    </Grid>
   </Grid>
 </Window>
diff --git a/src/Views/Blame.axaml.cs b/src/Views/Blame.axaml.cs
index 56c6d3ee..91693a68 100644
--- a/src/Views/Blame.axaml.cs
+++ b/src/Views/Blame.axaml.cs
@@ -308,6 +308,27 @@ namespace SourceGit.Views {
             InitializeComponent();
         }
 
+        private void MaximizeOrRestoreWindow(object sender, TappedEventArgs e) {
+            if (WindowState == WindowState.Maximized) {
+                WindowState = WindowState.Normal;
+            } else {
+                WindowState = WindowState.Maximized;
+            }
+            e.Handled = true;
+        }
+
+        private void CustomResizeWindow(object sender, PointerPressedEventArgs e) {
+            if (sender is Border border) {
+                if (border.Tag is WindowEdge edge) {
+                    BeginResizeDrag(edge, e);
+                }
+            }
+        }
+
+        private void BeginMoveWindow(object sender, PointerPressedEventArgs e) {
+            BeginMoveDrag(e);
+        }
+
         protected override void OnClosed(EventArgs e) {
             base.OnClosed(e);
             GC.Collect();
diff --git a/src/Views/FileHistories.axaml b/src/Views/FileHistories.axaml
index 84ea46cd..6dbdd692 100644
--- a/src/Views/FileHistories.axaml
+++ b/src/Views/FileHistories.axaml
@@ -12,24 +12,31 @@
         x:Name="me"
         Icon="/App.ico"
         Title="{DynamicResource Text.FileHistory}"
+        Background="Transparent"
         MinWidth="1280" MinHeight="720"
-        BorderThickness="1"
-        BorderBrush="{DynamicResource Brush.Border0}"
-        Background="{DynamicResource Brush.Window}"
-        ExtendClientAreaToDecorationsHint="{OnPlatform True, Linux=False}"
-        ExtendClientAreaChromeHints="{OnPlatform NoChrome, Linux=Default}">
+        ExtendClientAreaToDecorationsHint="True"
+        ExtendClientAreaChromeHints="NoChrome"
+        SystemDecorations="{OnPlatform Full, Linux=None}">
   <Grid Margin="{Binding #me.WindowState, Converter={x:Static c:WindowStateConverters.ToContentMargin}}">
     <Grid.RowDefinitions>
       <RowDefinition Height="30"/>
       <RowDefinition Height="*"/>
     </Grid.RowDefinitions>
 
+    <!-- Custom window shadow for Linux -->
+    <Border Grid.Row="0" Grid.RowSpan="2"
+            Background="{DynamicResource Brush.Window}"
+            Effect="drop-shadow(0 0 6 #A0000000)"
+            IsVisible="{OnPlatform False, Linux=True}"/>
+
+    <!-- TitleBar -->
     <Grid Grid.Row="0" ColumnDefinitions="Auto,Auto,Auto,*,Auto">
       <!-- Bottom border -->
       <Border Grid.Column="0" Grid.ColumnSpan="5"
               Background="{DynamicResource Brush.TitleBar}"
               BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border0}"
-              IsHitTestVisible="False"/>
+              DoubleTapped="MaximizeOrRestoreWindow"
+              PointerPressed="BeginMoveWindow"/>
 
       <!-- Caption Buttons (macOS) -->
       <Border Grid.Column="0" IsVisible="{OnPlatform False, macOS=True}">
@@ -39,19 +46,20 @@
       <!-- Icon -->
       <Path Grid.Column="1" Margin="8,0,0,0" Width="12" Height="12" Stretch="Uniform" Data="{StaticResource Icons.Histories}"/>
 
-      <!-- Title (Hide on Linux) -->
-      <TextBlock Grid.Column="2" Margin="4,0,0,0" Text="{DynamicResource Text.FileHistory}" FontWeight="Bold" IsHitTestVisible="False" VerticalAlignment="Center" IsVisible="{OnPlatform True, Linux=False}"/>
+      <!-- Title -->
+      <TextBlock Grid.Column="2" Margin="4,0,0,0" Text="{DynamicResource Text.FileHistory}" FontWeight="Bold" IsHitTestVisible="False" VerticalAlignment="Center"/>
 
       <!-- Target File -->
       <TextBlock Grid.Column="3" Margin="8,0,0,0" Text="{Binding File}" FontSize="11" FontStyle="Italic" IsHitTestVisible="False" VerticalAlignment="Center"/>
 
-      <!-- Caption Buttons (Windows) -->
-      <Border Grid.Column="4" IsVisible="{OnPlatform False, Windows=true}">
+      <!-- Caption Buttons (Windows/Linux) -->
+      <Border Grid.Column="4" IsVisible="{OnPlatform True, macOS=False}">
         <v:CaptionButtons/>
       </Border>
     </Grid>
 
-    <Grid Grid.Row="1">
+    <!-- Body -->
+    <Grid Grid.Row="1" Background="{DynamicResource Brush.Window}">
       <Grid.ColumnDefinitions>
         <ColumnDefinition Width="300" MinWidth="300" MaxWidth="600"/>
         <ColumnDefinition Width="1"/>
@@ -109,5 +117,64 @@
         </ContentControl>
       </Grid>
     </Grid>
+
+    <!-- Custom window sizer for Linux -->
+    <Grid Grid.Row="0" Grid.RowSpan="2" IsVisible="{OnPlatform False, Linux=True}">
+      <Border Width="4" Height="4"
+              Background="Transparent"
+              HorizontalAlignment="Left" VerticalAlignment="Top"
+              Cursor="TopLeftCorner"
+              Tag="{x:Static WindowEdge.NorthWest}"
+              PointerPressed="CustomResizeWindow"/>
+
+      <Border Height="4" Margin="4,0"
+              Background="Transparent"
+              HorizontalAlignment="Stretch" VerticalAlignment="Top"
+              Cursor="TopSide"
+              Tag="{x:Static WindowEdge.North}"
+              PointerPressed="CustomResizeWindow"/>
+
+      <Border Width="4" Height="4"
+              Background="Transparent"
+              HorizontalAlignment="Right" VerticalAlignment="Top"
+              Cursor="TopRightCorner"
+              Tag="{x:Static WindowEdge.NorthEast}"
+              PointerPressed="CustomResizeWindow"/>
+
+      <Border Width="4" Margin="0,4"
+              Background="Transparent"
+              HorizontalAlignment="Left" VerticalAlignment="Stretch"
+              Cursor="LeftSide"
+              Tag="{x:Static WindowEdge.West}"
+              PointerPressed="CustomResizeWindow"/>
+
+      <Border Width="4" Margin="0,4"
+              Background="Transparent"
+              HorizontalAlignment="Right" VerticalAlignment="Stretch"
+              Cursor="RightSide"
+              Tag="{x:Static WindowEdge.East}"
+              PointerPressed="CustomResizeWindow"/>
+
+      <Border Width="4" Height="4"
+              Background="Transparent"
+              HorizontalAlignment="Left" VerticalAlignment="Bottom"
+              Cursor="BottomLeftCorner"
+              Tag="{x:Static WindowEdge.SouthWest}"
+              PointerPressed="CustomResizeWindow"/>
+
+      <Border Height="4" Margin="4,0"
+              Background="Transparent"
+              HorizontalAlignment="Stretch" VerticalAlignment="Bottom"
+              Cursor="BottomSide"
+              Tag="{x:Static WindowEdge.South}"
+              PointerPressed="CustomResizeWindow"/>
+
+      <Border Width="4" Height="4"
+              Background="Transparent"
+              HorizontalAlignment="Right" VerticalAlignment="Bottom"
+              Cursor="BottomRightCorner"
+              Tag="{x:Static WindowEdge.SouthEast}"
+              PointerPressed="CustomResizeWindow"/>
+    </Grid>
   </Grid>
 </Window>
diff --git a/src/Views/FileHistories.axaml.cs b/src/Views/FileHistories.axaml.cs
index e88f8408..25250584 100644
--- a/src/Views/FileHistories.axaml.cs
+++ b/src/Views/FileHistories.axaml.cs
@@ -7,6 +7,27 @@ namespace SourceGit.Views {
             InitializeComponent();
         }
 
+        private void MaximizeOrRestoreWindow(object sender, TappedEventArgs e) {
+            if (WindowState == WindowState.Maximized) {
+                WindowState = WindowState.Normal;
+            } else {
+                WindowState = WindowState.Maximized;
+            }
+            e.Handled = true;
+        }
+
+        private void CustomResizeWindow(object sender, PointerPressedEventArgs e) {
+            if (sender is Border border) {
+                if (border.Tag is WindowEdge edge) {
+                    BeginResizeDrag(edge, e);
+                }
+            }
+        }
+
+        private void BeginMoveWindow(object sender, PointerPressedEventArgs e) {
+            BeginMoveDrag(e);
+        }
+
         private void OnPressedSHA(object sender, PointerPressedEventArgs e) {
             if (sender is TextBlock block) {
                 var histories = DataContext as ViewModels.FileHistories;
diff --git a/src/Views/Hotkeys.axaml b/src/Views/Hotkeys.axaml
index 549d8cc8..b3b52352 100644
--- a/src/Views/Hotkeys.axaml
+++ b/src/Views/Hotkeys.axaml
@@ -7,24 +7,32 @@
         x:Class="SourceGit.Views.Hotkeys"
         Icon="/App.ico"
         Title="{DynamicResource Text.Hotkeys}"
-        Background="{DynamicResource Brush.Window}"
+        Background="Transparent"
         SizeToContent="WidthAndHeight"
         CanResize="False"
         WindowStartupLocation="CenterOwner"
-        ExtendClientAreaToDecorationsHint="{OnPlatform True, Linux=False}"
-        ExtendClientAreaChromeHints="{OnPlatform NoChrome, Linux=Default}">
+        ExtendClientAreaToDecorationsHint="True"
+        ExtendClientAreaChromeHints="NoChrome"
+        SystemDecorations="{OnPlatform Full, Linux=None}">
   <Grid RowDefinitions="Auto,*">
-    <Grid Grid.Row="0" ColumnDefinitions="Auto,*,Auto" Height="30" IsVisible="{OnPlatform True, Linux=False}">
+    <!-- Custom window shadow for Linux -->
+    <Border Grid.Row="0" Grid.RowSpan="2"
+            Background="{DynamicResource Brush.Window}"
+            Effect="drop-shadow(0 0 6 #A0000000)"
+            IsVisible="{OnPlatform False, Linux=True}"/>
+
+    <!-- TitleBar -->
+    <Grid Grid.Row="0" ColumnDefinitions="Auto,*,Auto" Height="30">
       <Border Grid.Column="0" Grid.ColumnSpan="3"
               Background="{DynamicResource Brush.TitleBar}"
               BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border0}"
-              IsHitTestVisible="False"/>
+              PointerPressed="BeginMoveWindow"/>
       
       <Path Grid.Column="0"
             Width="14" Height="14"
             Margin="10,0,0,0"
             Data="{StaticResource Icons.Hotkeys}"
-            IsVisible="{OnPlatform False, Windows=True}"/>
+            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">
@@ -44,74 +52,77 @@
       <Button Grid.Column="2"
               Classes="caption_button"
               Click="CloseWindow"
-              IsVisible="{OnPlatform False, Windows=True}">
+              IsVisible="{OnPlatform True, macOS=False}">
         <Path Data="{StaticResource Icons.Window.Close}"/>
       </Button>
     </Grid>
 
-    <StackPanel Grid.Row="1" Orientation="Vertical" Margin="16,8,16,16">
-      <TextBlock Text="{DynamicResource Text.Hotkeys.Global}"
-                 Foreground="{DynamicResource Brush.FG2}"
-                 FontWeight="Bold"
-                 FontSize="13"
-                 Margin="0,0,0,8"/>
+    <!-- Body -->
+    <Border Grid.Row="1" Background="{DynamicResource Brush.Window}">
+      <StackPanel Orientation="Vertical" Margin="16,8,16,16">
+        <TextBlock Text="{DynamicResource Text.Hotkeys.Global}"
+                   Foreground="{DynamicResource Brush.FG2}"
+                   FontWeight="Bold"
+                   FontSize="13"
+                   Margin="0,0,0,8"/>
 
-      <Grid RowDefinitions="20,20,20,20" ColumnDefinitions="Auto,*">
-        <TextBlock Grid.Row="0" Grid.Column="0" Classes="monospace bold" Text="Ctrl+T"/>
-        <TextBlock Grid.Row="0" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Global.NewTab}" />
-        
-        <TextBlock Grid.Row="1" Grid.Column="0" Classes="monospace bold" Text="Ctrl+W" />
-        <TextBlock Grid.Row="1" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Global.CloseTab}" />
+        <Grid RowDefinitions="20,20,20,20" ColumnDefinitions="Auto,*">
+          <TextBlock Grid.Row="0" Grid.Column="0" Classes="monospace bold" Text="Ctrl+T"/>
+          <TextBlock Grid.Row="0" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Global.NewTab}" />
 
-        <TextBlock Grid.Row="2" Grid.Column="0" Classes="monospace bold" Text="Ctrl+Tab"/>
-        <TextBlock Grid.Row="2" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Global.GotoNextTab}" />
+          <TextBlock Grid.Row="1" Grid.Column="0" Classes="monospace bold" Text="Ctrl+W" />
+          <TextBlock Grid.Row="1" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Global.CloseTab}" />
 
-        <TextBlock Grid.Row="3" Grid.Column="0" Classes="monospace bold" Text="ESC"/>
-        <TextBlock Grid.Row="3" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Global.CancelPopup}" />
-      </Grid>
+          <TextBlock Grid.Row="2" Grid.Column="0" Classes="monospace bold" Text="Ctrl+Tab"/>
+          <TextBlock Grid.Row="2" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Global.GotoNextTab}" />
 
-      <TextBlock Text="{DynamicResource Text.Hotkeys.Repo}"
-                 Foreground="{DynamicResource Brush.FG2}"
-                 FontWeight="Bold"
-                 FontSize="13"
-                 Margin="0,8"/>
+          <TextBlock Grid.Row="3" Grid.Column="0" Classes="monospace bold" Text="ESC"/>
+          <TextBlock Grid.Row="3" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Global.CancelPopup}" />
+        </Grid>
 
-      <Grid RowDefinitions="20,20,20,20,20" ColumnDefinitions="Auto,*">
-        <TextBlock Grid.Row="0" Grid.Column="0" Classes="monospace bold" Text="Ctrl+F"/>
-        <TextBlock Grid.Row="0" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Repo.ToggleSearch}" />
+        <TextBlock Text="{DynamicResource Text.Hotkeys.Repo}"
+                   Foreground="{DynamicResource Brush.FG2}"
+                   FontWeight="Bold"
+                   FontSize="13"
+                   Margin="0,8"/>
 
-        <TextBlock Grid.Row="1" Grid.Column="0" Classes="monospace bold" Text="Ctrl+1"/>
-        <TextBlock Grid.Row="1" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Repo.ViewHistories}" />
+        <Grid RowDefinitions="20,20,20,20,20" ColumnDefinitions="Auto,*">
+          <TextBlock Grid.Row="0" Grid.Column="0" Classes="monospace bold" Text="Ctrl+F"/>
+          <TextBlock Grid.Row="0" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Repo.ToggleSearch}" />
 
-        <TextBlock Grid.Row="2" Grid.Column="0" Classes="monospace bold" Text="Ctrl+2"/>
-        <TextBlock Grid.Row="2" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Repo.ViewChanges}" />
+          <TextBlock Grid.Row="1" Grid.Column="0" Classes="monospace bold" Text="Ctrl+1"/>
+          <TextBlock Grid.Row="1" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Repo.ViewHistories}" />
 
-        <TextBlock Grid.Row="3" Grid.Column="0" Classes="monospace bold" Text="Ctrl+3"/>
-        <TextBlock Grid.Row="3" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Repo.ViewStashes}" />
+          <TextBlock Grid.Row="2" Grid.Column="0" Classes="monospace bold" Text="Ctrl+2"/>
+          <TextBlock Grid.Row="2" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Repo.ViewChanges}" />
 
-        <TextBlock Grid.Row="4" Grid.Column="0" Classes="monospace bold" Text="SPACE"/>
-        <TextBlock Grid.Row="4" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Repo.StageOrUnstageSelected}" />
-      </Grid>
+          <TextBlock Grid.Row="3" Grid.Column="0" Classes="monospace bold" Text="Ctrl+3"/>
+          <TextBlock Grid.Row="3" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Repo.ViewStashes}" />
 
-      <TextBlock Text="{DynamicResource Text.Hotkeys.TextEditor}"
-                 Foreground="{DynamicResource Brush.FG2}"
-                 FontWeight="Bold"
-                 FontSize="13"
-                 Margin="0,8"/>
+          <TextBlock Grid.Row="4" Grid.Column="0" Classes="monospace bold" Text="SPACE"/>
+          <TextBlock Grid.Row="4" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Repo.StageOrUnstageSelected}" />
+        </Grid>
 
-      <Grid RowDefinitions="20,20,20,20" ColumnDefinitions="Auto,*">
-        <TextBlock Grid.Row="0" Grid.Column="0" Classes="monospace bold" Text="Ctrl+F"/>
-        <TextBlock Grid.Row="0" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.TextEditor.Search}" />
+        <TextBlock Text="{DynamicResource Text.Hotkeys.TextEditor}"
+                   Foreground="{DynamicResource Brush.FG2}"
+                   FontWeight="Bold"
+                   FontSize="13"
+                   Margin="0,8"/>
 
-        <TextBlock Grid.Row="1" Grid.Column="0" Classes="monospace bold" Text="Shift+F3"/>
-        <TextBlock Grid.Row="1" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.TextEditor.GotoPrevMatch}" />
+        <Grid RowDefinitions="20,20,20,20" ColumnDefinitions="Auto,*">
+          <TextBlock Grid.Row="0" Grid.Column="0" Classes="monospace bold" Text="Ctrl+F"/>
+          <TextBlock Grid.Row="0" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.TextEditor.Search}" />
 
-        <TextBlock Grid.Row="2" Grid.Column="0" Classes="monospace bold" Text="F3"/>
-        <TextBlock Grid.Row="2" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.TextEditor.GotoNextMatch}" />
+          <TextBlock Grid.Row="1" Grid.Column="0" Classes="monospace bold" Text="Shift+F3"/>
+          <TextBlock Grid.Row="1" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.TextEditor.GotoPrevMatch}" />
 
-        <TextBlock Grid.Row="3" Grid.Column="0" Classes="monospace bold" Text="ESC"/>
-        <TextBlock Grid.Row="3" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.TextEditor.CloseSearch}" />
-      </Grid>
-    </StackPanel>
+          <TextBlock Grid.Row="2" Grid.Column="0" Classes="monospace bold" Text="F3"/>
+          <TextBlock Grid.Row="2" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.TextEditor.GotoNextMatch}" />
+
+          <TextBlock Grid.Row="3" Grid.Column="0" Classes="monospace bold" Text="ESC"/>
+          <TextBlock Grid.Row="3" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.TextEditor.CloseSearch}" />
+        </Grid>
+      </StackPanel>
+    </Border>    
   </Grid>
 </Window>
diff --git a/src/Views/Hotkeys.axaml.cs b/src/Views/Hotkeys.axaml.cs
index 5a68b6c2..f56f2d5f 100644
--- a/src/Views/Hotkeys.axaml.cs
+++ b/src/Views/Hotkeys.axaml.cs
@@ -1,4 +1,5 @@
 using Avalonia.Controls;
+using Avalonia.Input;
 using Avalonia.Interactivity;
 
 namespace SourceGit.Views {
@@ -7,6 +8,10 @@ namespace SourceGit.Views {
             InitializeComponent();
         }
 
+        private void BeginMoveWindow(object sender, PointerPressedEventArgs e) {
+            BeginMoveDrag(e);
+        }
+
         private void CloseWindow(object sender, RoutedEventArgs e) {
             Close();
         }
diff --git a/src/Views/Launcher.axaml b/src/Views/Launcher.axaml
index 4b9460e6..aa5a725f 100644
--- a/src/Views/Launcher.axaml
+++ b/src/Views/Launcher.axaml
@@ -12,13 +12,12 @@
         x:Name="me"
         Icon="/App.ico"
         Title="SourceGit"
-        BorderThickness="1"
-        BorderBrush="{DynamicResource Brush.Border0}"
-        Background="{DynamicResource Brush.Window}"
+        Background="Transparent"
         MinWidth="1280" MinHeight="720"
         WindowStartupLocation="CenterScreen"
-        ExtendClientAreaToDecorationsHint="{OnPlatform True, Linux=False}"
-        ExtendClientAreaChromeHints="{OnPlatform NoChrome, Linux=Default}">
+        ExtendClientAreaToDecorationsHint="True"
+        ExtendClientAreaChromeHints="NoChrome"
+        SystemDecorations="{OnPlatform Full, Linux=None}">
   <Window.Resources>
     <SolidColorBrush x:Key="SystemControlErrorTextForegroundBrush" Color="Red"/>
   </Window.Resources>
@@ -29,12 +28,20 @@
       <RowDefinition Height="*"/>
     </Grid.RowDefinitions>
 
+    <!-- Custom window shadow for Linux -->
+    <Border Grid.Row="0" Grid.RowSpan="2"
+            Background="{DynamicResource Brush.Window}"
+            Effect="drop-shadow(0 0 6 #A0000000)"
+            IsVisible="{OnPlatform False, Linux=True}"/>
+
+    <!-- Custom TitleBar -->
     <Grid Grid.Row="0" ColumnDefinitions="Auto,*,Auto">
       <!-- Bottom border -->
       <Border Grid.Column="0" Grid.ColumnSpan="3"
               Background="{DynamicResource Brush.TitleBar}"
               BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border0}"
-              IsHitTestVisible="False"/>
+              DoubleTapped="MaximizeOrRestoreWindow"
+              PointerPressed="BeginMoveWindow"/>
 
       <!-- Caption Buttons (macOS) -->
       <Border Grid.Column="0" VerticalAlignment="Stretch" Margin="2,0,8,3" IsVisible="{OnPlatform False, macOS=True}">
@@ -233,8 +240,8 @@
         </Button>
       </StackPanel>
 
-      <!-- Caption Buttons (Windows)-->
-      <Border Grid.Column="2" Margin="32,0,0,0" IsVisible="{OnPlatform False, Windows=True}">
+      <!-- Caption Buttons (Windows/Linux)-->
+      <Border Grid.Column="2" Margin="32,0,0,0" IsVisible="{OnPlatform True, macOS=False}">
         <v:CaptionButtons Height="30" VerticalAlignment="Top"/>
       </Border>
     </Grid>
@@ -364,5 +371,64 @@
         </ItemsControl>
       </ScrollViewer>
     </Grid>
+
+    <!-- Custom window sizer for Linux -->
+    <Grid Grid.Row="0" Grid.RowSpan="2" IsVisible="{OnPlatform False, Linux=True}">
+      <Border Width="4" Height="4"
+              Background="Transparent"
+              HorizontalAlignment="Left" VerticalAlignment="Top"
+              Cursor="TopLeftCorner"
+              Tag="{x:Static WindowEdge.NorthWest}"
+              PointerPressed="CustomResizeWindow"/>
+
+      <Border Height="4" Margin="4,0"
+              Background="Transparent"
+              HorizontalAlignment="Stretch" VerticalAlignment="Top"
+              Cursor="TopSide"
+              Tag="{x:Static WindowEdge.North}"
+              PointerPressed="CustomResizeWindow"/>
+
+      <Border Width="4" Height="4"
+              Background="Transparent"
+              HorizontalAlignment="Right" VerticalAlignment="Top"
+              Cursor="TopRightCorner"
+              Tag="{x:Static WindowEdge.NorthEast}"
+              PointerPressed="CustomResizeWindow"/>
+
+      <Border Width="4" Margin="0,4"
+              Background="Transparent"
+              HorizontalAlignment="Left" VerticalAlignment="Stretch"
+              Cursor="LeftSide"
+              Tag="{x:Static WindowEdge.West}"
+              PointerPressed="CustomResizeWindow"/>
+
+      <Border Width="4" Margin="0,4"
+              Background="Transparent"
+              HorizontalAlignment="Right" VerticalAlignment="Stretch"
+              Cursor="RightSide"
+              Tag="{x:Static WindowEdge.East}"
+              PointerPressed="CustomResizeWindow"/>
+
+      <Border Width="4" Height="4"
+              Background="Transparent"
+              HorizontalAlignment="Left" VerticalAlignment="Bottom"
+              Cursor="BottomLeftCorner"
+              Tag="{x:Static WindowEdge.SouthWest}"
+              PointerPressed="CustomResizeWindow"/>
+
+      <Border Height="4" Margin="4,0"
+              Background="Transparent"
+              HorizontalAlignment="Stretch" VerticalAlignment="Bottom"
+              Cursor="BottomSide"
+              Tag="{x:Static WindowEdge.South}"
+              PointerPressed="CustomResizeWindow"/>
+
+      <Border Width="4" Height="4"
+              Background="Transparent"
+              HorizontalAlignment="Right" VerticalAlignment="Bottom"
+              Cursor="BottomRightCorner"
+              Tag="{x:Static WindowEdge.SouthEast}"
+              PointerPressed="CustomResizeWindow"/>
+    </Grid>
   </Grid>
 </Window>
diff --git a/src/Views/Launcher.axaml.cs b/src/Views/Launcher.axaml.cs
index 491434ad..1456e5d0 100644
--- a/src/Views/Launcher.axaml.cs
+++ b/src/Views/Launcher.axaml.cs
@@ -126,6 +126,14 @@ namespace SourceGit.Views {
             e.Handled = true;
         }
 
+        private void CustomResizeWindow(object sender, PointerPressedEventArgs e) {
+            if (sender is Border border) {
+                if (border.Tag is WindowEdge edge) {
+                    BeginResizeDrag(edge, e);
+                }
+            }
+        }
+
         private void BeginMoveWindow(object sender, PointerPressedEventArgs e) {
             BeginMoveDrag(e);
         }
diff --git a/src/Views/Preference.axaml b/src/Views/Preference.axaml
index 19e4d65b..25f5f51c 100644
--- a/src/Views/Preference.axaml
+++ b/src/Views/Preference.axaml
@@ -13,24 +13,32 @@
         x:Name="me"
         Icon="/App.ico"
         Title="{DynamicResource Text.Preference}"
-        Background="{DynamicResource Brush.Window}"
+        Background="Transparent"
         Width="600" SizeToContent="Height"
         CanResize="False"
         WindowStartupLocation="CenterScreen"
-        ExtendClientAreaToDecorationsHint="{OnPlatform True, Linux=False}"
-        ExtendClientAreaChromeHints="{OnPlatform NoChrome, Linux=Default}">
+        ExtendClientAreaToDecorationsHint="True"
+        ExtendClientAreaChromeHints="NoChrome"
+        SystemDecorations="{OnPlatform Full, Linux=None}">
   <Grid RowDefinitions="Auto,Auto">
-    <Grid Grid.Row="0" ColumnDefinitions="Auto,*,Auto" Height="30" IsVisible="{OnPlatform True, Linux=False}">
+    <!-- Custom window shadow for Linux -->
+    <Border Grid.Row="0" Grid.RowSpan="2"
+            Background="{DynamicResource Brush.Window}"
+            Effect="drop-shadow(0 0 6 #A0000000)"
+            IsVisible="{OnPlatform False, Linux=True}"/>
+
+    <!-- TitleBar -->
+    <Grid Grid.Row="0" ColumnDefinitions="Auto,*,Auto" Height="30">
       <Border Grid.Column="0" Grid.ColumnSpan="3"
               Background="{DynamicResource Brush.TitleBar}"
               BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border0}"
-              IsHitTestVisible="False"/>
+              PointerPressed="BeginMoveWindow"/>
 
       <Path Grid.Column="0"
             Width="14" Height="14"
             Data="{StaticResource Icons.Settings2}"
             Margin="10,0,0,0"
-            IsVisible="{OnPlatform False, Windows=True}"/>
+            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">
@@ -47,286 +55,289 @@
                  HorizontalAlignment="Center" VerticalAlignment="Center"
                  IsHitTestVisible="False"/>
 
-      <Button Grid.Column="2" Classes="caption_button" Click="CloseWindow" IsVisible="{OnPlatform False, Windows=True}">
+      <Button Grid.Column="2" Classes="caption_button" Click="CloseWindow" IsVisible="{OnPlatform True, macOS=False}">
         <Path Data="{StaticResource Icons.Window.Close}"/>
       </Button>
     </Grid>
 
-    <TabControl Grid.Row="1">
-      <TabItem>
-        <TabItem.Header>
-          <TextBlock Classes="tab_header" Text="{DynamicResource Text.Preference.General}"/>
-        </TabItem.Header>
-        <Grid Margin="8" RowDefinitions="32,32,32,32,32,32" ColumnDefinitions="Auto,*">
-          <TextBlock Grid.Row="0" Grid.Column="0"
-                     Text="{DynamicResource Text.Preference.General.Locale}"
-                     HorizontalAlignment="Right"
-                     Margin="0,0,16,0"/>
-          <ComboBox Grid.Row="0" Grid.Column="1"
-                    MinHeight="28"
-                    Padding="8,0"
-                    HorizontalAlignment="Stretch"
-                    ItemsSource="{Binding Source={x:Static m:Locale.Supported}}"
-                    DisplayMemberBinding="{Binding Name, x:DataType=m:Locale}"
-                    SelectedItem="{Binding Locale, Mode=TwoWay, Converter={x:Static c:StringConverters.ToLocale}}"/>
+    <!-- Body -->
+    <Border Grid.Row="1" Background="{DynamicResource Brush.Window}">
+      <TabControl>
+        <TabItem>
+          <TabItem.Header>
+            <TextBlock Classes="tab_header" Text="{DynamicResource Text.Preference.General}"/>
+          </TabItem.Header>
+          <Grid Margin="8" RowDefinitions="32,32,32,32,32,32" ColumnDefinitions="Auto,*">
+            <TextBlock Grid.Row="0" Grid.Column="0"
+                       Text="{DynamicResource Text.Preference.General.Locale}"
+                       HorizontalAlignment="Right"
+                       Margin="0,0,16,0"/>
+            <ComboBox Grid.Row="0" Grid.Column="1"
+                      MinHeight="28"
+                      Padding="8,0"
+                      HorizontalAlignment="Stretch"
+                      ItemsSource="{Binding Source={x:Static m:Locale.Supported}}"
+                      DisplayMemberBinding="{Binding Name, x:DataType=m:Locale}"
+                      SelectedItem="{Binding Locale, Mode=TwoWay, Converter={x:Static c:StringConverters.ToLocale}}"/>
 
-          <TextBlock Grid.Row="1" Grid.Column="0"
-                     Text="{DynamicResource Text.Preference.General.AvatarServer}"
-                     HorizontalAlignment="Right"
-                     Margin="0,0,16,0"/>
-          <ComboBox Grid.Row="1" Grid.Column="1"
-                    MinHeight="28"
-                    Padding="8,0"
-                    HorizontalAlignment="Stretch"
-                    SelectedItem="{Binding AvatarServer, Mode=TwoWay}">
-            <ComboBox.Items>
-              <sys:String>https://www.gravatar.com/avatar/</sys:String>
-              <sys:String>https://cravatar.cn/avatar/</sys:String>
-            </ComboBox.Items>
-          </ComboBox>
+            <TextBlock Grid.Row="1" Grid.Column="0"
+                       Text="{DynamicResource Text.Preference.General.AvatarServer}"
+                       HorizontalAlignment="Right"
+                       Margin="0,0,16,0"/>
+            <ComboBox Grid.Row="1" Grid.Column="1"
+                      MinHeight="28"
+                      Padding="8,0"
+                      HorizontalAlignment="Stretch"
+                      SelectedItem="{Binding AvatarServer, Mode=TwoWay}">
+              <ComboBox.Items>
+                <sys:String>https://www.gravatar.com/avatar/</sys:String>
+                <sys:String>https://cravatar.cn/avatar/</sys:String>
+              </ComboBox.Items>
+            </ComboBox>
 
-          <TextBlock Grid.Row="2" Grid.Column="0"
-                     Text="{DynamicResource Text.Preference.General.Theme}"
-                     HorizontalAlignment="Right"
-                     Margin="0,0,16,0"/>
-          <ComboBox Grid.Row="2" Grid.Column="1"
-                    MinHeight="28"
-                    Padding="8,0"
-                    HorizontalAlignment="Stretch"
-                    DisplayMemberBinding="{Binding Key, x:DataType=ThemeVariant}"
-                    SelectedItem="{Binding Theme, Mode=TwoWay, Converter={x:Static c:StringConverters.ToTheme}}">
-            <ComboBox.Items>
-              <ThemeVariant>Default</ThemeVariant>
-              <ThemeVariant>Dark</ThemeVariant>
-              <ThemeVariant>Light</ThemeVariant>
-            </ComboBox.Items>
-          </ComboBox>
+            <TextBlock Grid.Row="2" Grid.Column="0"
+                       Text="{DynamicResource Text.Preference.General.Theme}"
+                       HorizontalAlignment="Right"
+                       Margin="0,0,16,0"/>
+            <ComboBox Grid.Row="2" Grid.Column="1"
+                      MinHeight="28"
+                      Padding="8,0"
+                      HorizontalAlignment="Stretch"
+                      DisplayMemberBinding="{Binding Key, x:DataType=ThemeVariant}"
+                      SelectedItem="{Binding Theme, Mode=TwoWay, Converter={x:Static c:StringConverters.ToTheme}}">
+              <ComboBox.Items>
+                <ThemeVariant>Default</ThemeVariant>
+                <ThemeVariant>Dark</ThemeVariant>
+                <ThemeVariant>Light</ThemeVariant>
+              </ComboBox.Items>
+            </ComboBox>
 
-          <TextBlock Grid.Row="3" Grid.Column="0"
-                     Text="{DynamicResource Text.Preference.General.MaxHistoryCommits}"
-                     HorizontalAlignment="Right"
-                     Margin="0,0,16,0"/>
-          <Grid Grid.Row="3" Grid.Column="1" ColumnDefinitions="*,64">
-            <Slider Grid.Column="0"
-                    Minimum="20000" Maximum="100000"
-                    TickPlacement="BottomRight" TickFrequency="5000"
-                    IsSnapToTickEnabled="True"
-                    VerticalAlignment="Center"
-                    Foreground="{DynamicResource Brush.Border1}"
-                    Value="{Binding MaxHistoryCommits, Mode=TwoWay}">
-              <Slider.Resources>
-                <Thickness x:Key="SliderTopHeaderMargin">0,0,0,4</Thickness>
-                <GridLength x:Key="SliderPreContentMargin">0</GridLength>
-                <GridLength x:Key="SliderPostContentMargin">0</GridLength>
-                <CornerRadius x:Key="SliderThumbCornerRadius">8</CornerRadius>
-                <x:Double x:Key="SliderHorizontalThumbWidth">16</x:Double>
-                <x:Double x:Key="SliderHorizontalThumbHeight">16</x:Double>
-              </Slider.Resources>
-            </Slider>
+            <TextBlock Grid.Row="3" Grid.Column="0"
+                       Text="{DynamicResource Text.Preference.General.MaxHistoryCommits}"
+                       HorizontalAlignment="Right"
+                       Margin="0,0,16,0"/>
+            <Grid Grid.Row="3" Grid.Column="1" ColumnDefinitions="*,64">
+              <Slider Grid.Column="0"
+                      Minimum="20000" Maximum="100000"
+                      TickPlacement="BottomRight" TickFrequency="5000"
+                      IsSnapToTickEnabled="True"
+                      VerticalAlignment="Center"
+                      Foreground="{DynamicResource Brush.Border1}"
+                      Value="{Binding MaxHistoryCommits, Mode=TwoWay}">
+                <Slider.Resources>
+                  <Thickness x:Key="SliderTopHeaderMargin">0,0,0,4</Thickness>
+                  <GridLength x:Key="SliderPreContentMargin">0</GridLength>
+                  <GridLength x:Key="SliderPostContentMargin">0</GridLength>
+                  <CornerRadius x:Key="SliderThumbCornerRadius">8</CornerRadius>
+                  <x:Double x:Key="SliderHorizontalThumbWidth">16</x:Double>
+                  <x:Double x:Key="SliderHorizontalThumbHeight">16</x:Double>
+                </Slider.Resources>
+              </Slider>
 
-            <TextBlock Grid.Column="1"
-                       HorizontalAlignment="Right" VerticalAlignment="Center"
-                       Foreground="{DynamicResource Brush.FG1}"
-                       Text="{Binding MaxHistoryCommits}"/>
+              <TextBlock Grid.Column="1"
+                         HorizontalAlignment="Right" VerticalAlignment="Center"
+                         Foreground="{DynamicResource Brush.FG1}"
+                         Text="{Binding MaxHistoryCommits}"/>
+            </Grid>
+
+            <CheckBox Grid.Row="4" Grid.Column="1"
+                      Content="{DynamicResource Text.Preference.General.RestoreTabs}"
+                      IsChecked="{Binding RestoreTabs, Mode=TwoWay}"/>
+
+            <CheckBox Grid.Row="5" Grid.Column="1"
+                      Height="32"
+                      Content="{DynamicResource Text.Preference.General.UseFixedTabWidth}"
+                      IsChecked="{Binding Source={x:Static vm:Preference.Instance}, Path=UseFixedTabWidth, Mode=TwoWay}"/>
           </Grid>
+        </TabItem>
 
-          <CheckBox Grid.Row="4" Grid.Column="1"
-                    Content="{DynamicResource Text.Preference.General.RestoreTabs}"
-                    IsChecked="{Binding RestoreTabs, Mode=TwoWay}"/>
+        <TabItem>
+          <TabItem.Header>
+            <TextBlock Classes="tab_header" Text="{DynamicResource Text.Preference.Git}"/>
+          </TabItem.Header>
 
-          <CheckBox Grid.Row="5" Grid.Column="1"
-                    Height="32"
-                    Content="{DynamicResource Text.Preference.General.UseFixedTabWidth}"
-                    IsChecked="{Binding Source={x:Static vm:Preference.Instance}, Path=UseFixedTabWidth, Mode=TwoWay}"/>
-        </Grid>
-      </TabItem>
+          <Grid Margin="8" RowDefinitions="32,32,32,32,32,32,32" ColumnDefinitions="Auto,*">
+            <TextBlock Grid.Row="0" Grid.Column="0"
+                       Text="{DynamicResource Text.Preference.Git.Path}"
+                       HorizontalAlignment="Right"
+                       Margin="0,0,16,0"/>
+            <TextBox Grid.Row="0" Grid.Column="1"
+                     Height="28"
+                     CornerRadius="3"
+                     Text="{Binding GitInstallPath, Mode=TwoWay}">
+              <TextBox.InnerRightContent>
+                <Button Classes="icon_button" Width="30" Height="30" Click="SelectGitExecutable">
+                  <Path Data="{StaticResource Icons.Folder.Open}" Fill="{DynamicResource Brush.FG1}"/>
+                </Button>
+              </TextBox.InnerRightContent>
+            </TextBox>
 
-      <TabItem>
-        <TabItem.Header>
-          <TextBlock Classes="tab_header" Text="{DynamicResource Text.Preference.Git}"/>
-        </TabItem.Header>
+            <TextBlock Grid.Row="1" Grid.Column="0"
+                       Text="{DynamicResource Text.Preference.Git.Version}"
+                       HorizontalAlignment="Right"
+                       Margin="0,0,16,0"/>
+            <TextBlock Grid.Row="1" Grid.Column="1"
+                       x:Name="txtVersion"/>
 
-        <Grid Margin="8" RowDefinitions="32,32,32,32,32,32,32" ColumnDefinitions="Auto,*">
-          <TextBlock Grid.Row="0" Grid.Column="0"
-                     Text="{DynamicResource Text.Preference.Git.Path}"
-                     HorizontalAlignment="Right"
-                     Margin="0,0,16,0"/>
-          <TextBox Grid.Row="0" Grid.Column="1"
-                   Height="28"
-                   CornerRadius="3"
-                   Text="{Binding GitInstallPath, Mode=TwoWay}">
-            <TextBox.InnerRightContent>
-              <Button Classes="icon_button" Width="30" Height="30" Click="SelectGitExecutable">
-                <Path Data="{StaticResource Icons.Folder.Open}" Fill="{DynamicResource Brush.FG1}"/>
-              </Button>
-            </TextBox.InnerRightContent>
-          </TextBox>
+            <TextBlock Grid.Row="2" Grid.Column="0"
+                       Text="{DynamicResource Text.Preference.Git.DefaultCloneDir}"
+                       HorizontalAlignment="Right"
+                       Margin="0,0,16,0"/>
+            <TextBox Grid.Row="2" Grid.Column="1"
+                     Height="28"
+                     CornerRadius="3"
+                     Text="{Binding GitDefaultCloneDir, Mode=TwoWay}">
+              <TextBox.InnerRightContent>
+                <Button Classes="icon_button" Width="30" Height="30" Click="SelectDefaultCloneDir">
+                  <Path Data="{StaticResource Icons.Folder.Open}" Fill="{DynamicResource Brush.FG1}"/>
+                </Button>
+              </TextBox.InnerRightContent>
+            </TextBox>
 
-          <TextBlock Grid.Row="1" Grid.Column="0"
-                     Text="{DynamicResource Text.Preference.Git.Version}"
-                     HorizontalAlignment="Right"
-                     Margin="0,0,16,0"/>
-          <TextBlock Grid.Row="1" Grid.Column="1"
-                     x:Name="txtVersion"/>
+            <TextBlock Grid.Row="3" Grid.Column="0"
+                       Text="{DynamicResource Text.Preference.Git.User}"
+                       HorizontalAlignment="Right"
+                       Margin="0,0,16,0"/>
+            <TextBox Grid.Row="3" Grid.Column="1"
+                     Height="28"
+                     CornerRadius="3"
+                     Text="{Binding #me.DefaultUser, Mode=TwoWay}"
+                     Watermark="{DynamicResource Text.Preference.Git.User.Placeholder}"/>
 
-          <TextBlock Grid.Row="2" Grid.Column="0"
-                     Text="{DynamicResource Text.Preference.Git.DefaultCloneDir}"
-                     HorizontalAlignment="Right"
-                     Margin="0,0,16,0"/>
-          <TextBox Grid.Row="2" Grid.Column="1"
-                   Height="28"
-                   CornerRadius="3"
-                   Text="{Binding GitDefaultCloneDir, Mode=TwoWay}">
-            <TextBox.InnerRightContent>
-              <Button Classes="icon_button" Width="30" Height="30" Click="SelectDefaultCloneDir">
-                <Path Data="{StaticResource Icons.Folder.Open}" Fill="{DynamicResource Brush.FG1}"/>
-              </Button>
-            </TextBox.InnerRightContent>
-          </TextBox>
+            <TextBlock Grid.Row="4" Grid.Column="0"
+                       Text="{DynamicResource Text.Preference.Git.Email}"
+                       HorizontalAlignment="Right"
+                       Margin="0,0,16,0"/>
+            <TextBox Grid.Row="4" Grid.Column="1"
+                     Height="28"
+                     CornerRadius="3"
+                     Text="{Binding #me.DefaultEmail, Mode=TwoWay}"
+                     Watermark="{DynamicResource Text.Preference.Git.Email.Placeholder}"/>
 
-          <TextBlock Grid.Row="3" Grid.Column="0"
-                     Text="{DynamicResource Text.Preference.Git.User}"
-                     HorizontalAlignment="Right"
-                     Margin="0,0,16,0"/>
-          <TextBox Grid.Row="3" Grid.Column="1"
-                   Height="28"
-                   CornerRadius="3"
-                   Text="{Binding #me.DefaultUser, Mode=TwoWay}"
-                   Watermark="{DynamicResource Text.Preference.Git.User.Placeholder}"/>
+            <TextBlock Grid.Row="5" Grid.Column="0"
+                       Text="{DynamicResource Text.Preference.Git.CRLF}"
+                       HorizontalAlignment="Right"
+                       Margin="0,0,16,0"/>
+            <ComboBox Grid.Row="5" Grid.Column="1"
+                      MinHeight="28"
+                      Padding="8,0"
+                      HorizontalAlignment="Stretch"
+                      ItemsSource="{Binding Source={x:Static m:CRLFMode.Supported}}"
+                      SelectedItem="{Binding #me.CRLFMode, Mode=TwoWay}">
+              <ComboBox.ItemTemplate>
+                <DataTemplate x:DataType="{x:Type m:CRLFMode}">
+                  <Grid ColumnDefinitions="64,*">
+                    <TextBlock Grid.Column="0" Text="{Binding Name}"/>
+                    <TextBlock Grid.Column="1" Text="{Binding Desc}" Foreground="{DynamicResource Brush.FG2}" HorizontalAlignment="Right"/>
+                  </Grid>
+                </DataTemplate>
+              </ComboBox.ItemTemplate>
+            </ComboBox>
 
-          <TextBlock Grid.Row="4" Grid.Column="0"
-                     Text="{DynamicResource Text.Preference.Git.Email}"
-                     HorizontalAlignment="Right"
-                     Margin="0,0,16,0"/>
-          <TextBox Grid.Row="4" Grid.Column="1"
-                   Height="28"
-                   CornerRadius="3"
-                   Text="{Binding #me.DefaultEmail, Mode=TwoWay}"
-                   Watermark="{DynamicResource Text.Preference.Git.Email.Placeholder}"/>
+            <CheckBox Grid.Row="6" Grid.Column="1"
+                      Content="{DynamicResource Text.Preference.Git.AutoFetch}"
+                      IsChecked="{Binding GitAutoFetch, Mode=TwoWay}"/>
+          </Grid>
+        </TabItem>
 
-          <TextBlock Grid.Row="5" Grid.Column="0"
-                     Text="{DynamicResource Text.Preference.Git.CRLF}"
-                     HorizontalAlignment="Right"
-                     Margin="0,0,16,0"/>
-          <ComboBox Grid.Row="5" Grid.Column="1"
-                    MinHeight="28"
-                    Padding="8,0"
-                    HorizontalAlignment="Stretch"
-                    ItemsSource="{Binding Source={x:Static m:CRLFMode.Supported}}"
-                    SelectedItem="{Binding #me.CRLFMode, Mode=TwoWay}">
-            <ComboBox.ItemTemplate>
-              <DataTemplate x:DataType="{x:Type m:CRLFMode}">
-                <Grid ColumnDefinitions="64,*">
-                  <TextBlock Grid.Column="0" Text="{Binding Name}"/>
-                  <TextBlock Grid.Column="1" Text="{Binding Desc}" Foreground="{DynamicResource Brush.FG2}" HorizontalAlignment="Right"/>
-                </Grid>
-              </DataTemplate>
-            </ComboBox.ItemTemplate>
-          </ComboBox>
+        <TabItem>
+          <TabItem.Header>
+            <TextBlock Classes="tab_header" Text="{DynamicResource Text.Preference.GPG}"/>
+          </TabItem.Header>
 
-          <CheckBox Grid.Row="6" Grid.Column="1"
-                    Content="{DynamicResource Text.Preference.Git.AutoFetch}"
-                    IsChecked="{Binding GitAutoFetch, Mode=TwoWay}"/>
-        </Grid>
-      </TabItem>
+          <Grid Margin="8" RowDefinitions="32,32,32" ColumnDefinitions="Auto,*">
+            <TextBlock Grid.Row="0" Grid.Column="0"
+                       Text="{DynamicResource Text.Preference.GPG.Enabled}"
+                       HorizontalAlignment="Right"
+                       Margin="0,0,16,0"/>
+            <CheckBox Grid.Row="0" Grid.Column="1"
+                      IsChecked="{Binding #me.EnableGPGSigning, Mode=TwoWay}"/>
 
-      <TabItem>
-        <TabItem.Header>
-          <TextBlock Classes="tab_header" Text="{DynamicResource Text.Preference.GPG}"/>
-        </TabItem.Header>
+            <TextBlock Grid.Row="1" Grid.Column="0"
+                       Text="{DynamicResource Text.Preference.GPG.Path}"
+                       HorizontalAlignment="Right"
+                       Margin="0,0,16,0"/>
+            <TextBox Grid.Row="1" Grid.Column="1"
+                     x:Name="txtGPGExecutable"
+                     Height="28"
+                     CornerRadius="3"
+                     Text="{Binding #me.GPGExecutableFile, Mode=TwoWay}">
+              <TextBox.InnerRightContent>
+                <Button Classes="icon_button" Width="30" Height="30" Click="SelectGPGExecutable">
+                  <Path Data="{StaticResource Icons.Folder.Open}" Fill="{DynamicResource Brush.FG1}"/>
+                </Button>
+              </TextBox.InnerRightContent>
+            </TextBox>
 
-        <Grid Margin="8" RowDefinitions="32,32,32" ColumnDefinitions="Auto,*">
-          <TextBlock Grid.Row="0" Grid.Column="0"
-                     Text="{DynamicResource Text.Preference.GPG.Enabled}"
-                     HorizontalAlignment="Right"
-                     Margin="0,0,16,0"/>
-          <CheckBox Grid.Row="0" Grid.Column="1"
-                    IsChecked="{Binding #me.EnableGPGSigning, Mode=TwoWay}"/>
+            <TextBlock Grid.Row="2" Grid.Column="0"
+                       Text="{DynamicResource Text.Preference.GPG.UserKey}"
+                       HorizontalAlignment="Right"
+                       Margin="0,0,16,0"/>
+            <TextBox Grid.Row="2" Grid.Column="1"
+                     Height="28"
+                     CornerRadius="3"
+                     Text="{Binding #me.GPGUserKey, Mode=TwoWay}"
+                     Watermark="{DynamicResource Text.Preference.GPG.UserKey.Placeholder}"/>
+          </Grid>
+        </TabItem>
 
-          <TextBlock Grid.Row="1" Grid.Column="0"
-                     Text="{DynamicResource Text.Preference.GPG.Path}"
-                     HorizontalAlignment="Right"
-                     Margin="0,0,16,0"/>
-          <TextBox Grid.Row="1" Grid.Column="1"
-                   x:Name="txtGPGExecutable"
-                   Height="28"
-                   CornerRadius="3"
-                   Text="{Binding #me.GPGExecutableFile, Mode=TwoWay}">
-            <TextBox.InnerRightContent>
-              <Button Classes="icon_button" Width="30" Height="30" Click="SelectGPGExecutable">
-                <Path Data="{StaticResource Icons.Folder.Open}" Fill="{DynamicResource Brush.FG1}"/>
-              </Button>
-            </TextBox.InnerRightContent>
-          </TextBox>
+        <TabItem>
+          <TabItem.Header>
+            <TextBlock Classes="tab_header" Text="{DynamicResource Text.Preference.Merger}"/>
+          </TabItem.Header>
 
-          <TextBlock Grid.Row="2" Grid.Column="0"
-                     Text="{DynamicResource Text.Preference.GPG.UserKey}"
-                     HorizontalAlignment="Right"
-                     Margin="0,0,16,0"/>
-          <TextBox Grid.Row="2" Grid.Column="1"
-                   Height="28"
-                   CornerRadius="3"
-                   Text="{Binding #me.GPGUserKey, Mode=TwoWay}"
-                   Watermark="{DynamicResource Text.Preference.GPG.UserKey.Placeholder}"/>
-        </Grid>
-      </TabItem>
+          <Grid Margin="8" RowDefinitions="32,32,Auto,Auto" ColumnDefinitions="Auto,*">
+            <TextBlock Grid.Row="0" Grid.Column="0"
+                       Text="{DynamicResource Text.Preference.Merger.Type}"
+                       HorizontalAlignment="Right"
+                       Margin="0,0,16,0"/>
+            <ComboBox Grid.Row="0" Grid.Column="1"
+                      MinHeight="28"
+                      Padding="8,0"
+                      HorizontalAlignment="Stretch"
+                      ItemsSource="{Binding Source={x:Static m:ExternalMergeTools.Supported}}"
+                      DisplayMemberBinding="{Binding Name, x:DataType=m:ExternalMergeTools}"
+                      SelectedIndex="{Binding ExternalMergeToolType, Mode=TwoWay}"/>
 
-      <TabItem>
-        <TabItem.Header>
-          <TextBlock Classes="tab_header" Text="{DynamicResource Text.Preference.Merger}"/>
-        </TabItem.Header>
+            <TextBlock Grid.Row="1" Grid.Column="0"
+                       Text="{DynamicResource Text.Preference.Merger.Path}"
+                       HorizontalAlignment="Right"
+                       Margin="0,0,16,0"/>
+            <TextBox Grid.Row="1" Grid.Column="1"
+                     Height="28"
+                     CornerRadius="3"
+                     Text="{Binding ExternalMergeToolPath, Mode=TwoWay}">
+              <TextBox.InnerRightContent>
+                <Button Classes="icon_button" Width="30" Height="30" Click="SelectExternalMergeTool">
+                  <Path Data="{StaticResource Icons.Folder.Open}" Fill="{DynamicResource Brush.FG1}"/>
+                </Button>
+              </TextBox.InnerRightContent>
+            </TextBox>
 
-        <Grid Margin="8" RowDefinitions="32,32,Auto,Auto" ColumnDefinitions="Auto,*">
-          <TextBlock Grid.Row="0" Grid.Column="0"
-                     Text="{DynamicResource Text.Preference.Merger.Type}"
-                     HorizontalAlignment="Right"
-                     Margin="0,0,16,0"/>
-          <ComboBox Grid.Row="0" Grid.Column="1"
-                    MinHeight="28"
-                    Padding="8,0"
-                    HorizontalAlignment="Stretch"
-                    ItemsSource="{Binding Source={x:Static m:ExternalMergeTools.Supported}}"
-                    DisplayMemberBinding="{Binding Name, x:DataType=m:ExternalMergeTools}"
-                    SelectedIndex="{Binding ExternalMergeToolType, Mode=TwoWay}"/>
-
-          <TextBlock Grid.Row="1" Grid.Column="0"
-                     Text="{DynamicResource Text.Preference.Merger.Path}"
-                     HorizontalAlignment="Right"
-                     Margin="0,0,16,0"/>
-          <TextBox Grid.Row="1" Grid.Column="1"
-                   Height="28"
-                   CornerRadius="3"
-                   Text="{Binding ExternalMergeToolPath, Mode=TwoWay}">
-            <TextBox.InnerRightContent>
-              <Button Classes="icon_button" Width="30" Height="30" Click="SelectExternalMergeTool">
-                <Path Data="{StaticResource Icons.Folder.Open}" Fill="{DynamicResource Brush.FG1}"/>
-              </Button>
-            </TextBox.InnerRightContent>
-          </TextBox>
-
-          <TextBlock Grid.Row="2" Grid.Column="0"
-                     Text="{DynamicResource Text.Preference.Merger.CustomMergeCmd}"
-                     HorizontalAlignment="Right" VerticalAlignment="Center"
-                     Margin="0,0,16,0"
+            <TextBlock Grid.Row="2" Grid.Column="0"
+                       Text="{DynamicResource Text.Preference.Merger.CustomMergeCmd}"
+                       HorizontalAlignment="Right" VerticalAlignment="Center"
+                       Margin="0,0,16,0"
+                       IsVisible="{Binding ExternalMergeToolType, Converter={x:Static c:IntConverters.IsZero}}"/>
+            <TextBox Grid.Row="2" Grid.Column="1"
+                     Height="28" Margin="0,2"
+                     CornerRadius="3"
+                     Text="{Binding ExternalMergeToolCmd, Mode=TwoWay}"
                      IsVisible="{Binding ExternalMergeToolType, Converter={x:Static c:IntConverters.IsZero}}"/>
-          <TextBox Grid.Row="2" Grid.Column="1"
-                   Height="28" Margin="0,2"
-                   CornerRadius="3"
-                   Text="{Binding ExternalMergeToolCmd, Mode=TwoWay}"
-                   IsVisible="{Binding ExternalMergeToolType, Converter={x:Static c:IntConverters.IsZero}}"/>
 
-          <TextBlock Grid.Row="3" Grid.Column="0"
-                     Text="{DynamicResource Text.Preference.Merger.CustomDiffCmd}"
-                     HorizontalAlignment="Right" VerticalAlignment="Center"
-                     Margin="0,0,16,0"
+            <TextBlock Grid.Row="3" Grid.Column="0"
+                       Text="{DynamicResource Text.Preference.Merger.CustomDiffCmd}"
+                       HorizontalAlignment="Right" VerticalAlignment="Center"
+                       Margin="0,0,16,0"
+                       IsVisible="{Binding ExternalMergeToolType, Converter={x:Static c:IntConverters.IsZero}}"/>
+            <TextBox Grid.Row="3" Grid.Column="1"
+                     Height="28" Margin="0,2"
+                     CornerRadius="3"
+                     Text="{Binding ExternalMergeToolDiffCmd, Mode=TwoWay}"
                      IsVisible="{Binding ExternalMergeToolType, Converter={x:Static c:IntConverters.IsZero}}"/>
-          <TextBox Grid.Row="3" Grid.Column="1"
-                   Height="28" Margin="0,2"
-                   CornerRadius="3"
-                   Text="{Binding ExternalMergeToolDiffCmd, Mode=TwoWay}"
-                   IsVisible="{Binding ExternalMergeToolType, Converter={x:Static c:IntConverters.IsZero}}"/>
-        </Grid>
-      </TabItem>
-    </TabControl>
+          </Grid>
+        </TabItem>
+      </TabControl>
+    </Border>    
   </Grid>
 </Window>
diff --git a/src/Views/Preference.axaml.cs b/src/Views/Preference.axaml.cs
index 38f27a5b..f0eb830b 100644
--- a/src/Views/Preference.axaml.cs
+++ b/src/Views/Preference.axaml.cs
@@ -1,4 +1,5 @@
 using Avalonia.Controls;
+using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.Platform.Storage;
 using System;
@@ -58,6 +59,10 @@ namespace SourceGit.Views {
             txtVersion.Text = ver;
         }
 
+        private void BeginMoveWindow(object sender, PointerPressedEventArgs e) {
+            BeginMoveDrag(e);
+        }
+
         private void CloseWindow(object sender, RoutedEventArgs e) {
             var cmd = new Commands.Config(null);
 
diff --git a/src/Views/Statistics.axaml b/src/Views/Statistics.axaml
index 5bb06c25..2528a5b1 100644
--- a/src/Views/Statistics.axaml
+++ b/src/Views/Statistics.axaml
@@ -9,15 +9,27 @@
         x:Class="SourceGit.Views.Statistics"
         x:DataType="vm:Statistics"
         Title="{DynamicResource Text.Statistics}"
-        Background="{DynamicResource Brush.Window}"
+        Background="Transparent"
         Width="800" Height="450"
         WindowStartupLocation="CenterOwner"
         CanResize="False"
-        ExtendClientAreaToDecorationsHint="{OnPlatform True, Linux=False}"
-        ExtendClientAreaChromeHints="{OnPlatform NoChrome, Linux=Default}">
+        ExtendClientAreaToDecorationsHint="True"
+        ExtendClientAreaChromeHints="NoChrome"
+        SystemDecorations="{OnPlatform Full, Linux=None}">
   <Grid RowDefinitions="Auto,Auto,*">
+    <!-- Custom window shadow for Linux -->
+    <Border Grid.Row="0" Grid.RowSpan="3"
+            Background="{DynamicResource Brush.Window}"
+            Effect="drop-shadow(0 0 6 #A0000000)"
+            IsVisible="{OnPlatform False, Linux=True}"/>
+
+    <!-- Window BG -->
+    <Border Grid.Row="1" Grid.RowSpan="2"
+            Background="{DynamicResource Brush.Window}"
+            IsVisible="{OnPlatform True, Linux=False}"/>
+    
     <!-- Title bar -->
-    <Grid Grid.Row="0" ColumnDefinitions="Auto,*,Auto" Height="30" IsVisible="{OnPlatform True, Linux=False}">
+    <Grid Grid.Row="0" ColumnDefinitions="Auto,*,Auto" Height="30">
       <Border Grid.Column="0" Grid.ColumnSpan="3"
               Background="{DynamicResource Brush.TitleBar}"
               BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border0}"
@@ -27,7 +39,7 @@
             Width="14" Height="14"
             Margin="10,0,0,0"
             Data="{StaticResource Icons.Statistics}"
-            IsVisible="{OnPlatform False, Windows=True}"/>
+            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">
@@ -47,7 +59,7 @@
       <Button Grid.Column="2"
               Classes="caption_button"
               Click="CloseWindow"
-              IsVisible="{OnPlatform False, Windows=True}">
+              IsVisible="{OnPlatform True, macOS=False}">
         <Path Data="{StaticResource Icons.Window.Close}"/>
       </Button>
     </Grid>
@@ -82,7 +94,7 @@
         <Style Selector="ListBoxItem:selected Border.switcher_bg">
           <Setter Property="Background" Value="{DynamicResource Brush.Contents}"/>
         </Style>
-        
+
         <Style Selector="TextBlock.view_mode_switcher">
           <Setter Property="FontWeight" Value="Bold"/>
           <Setter Property="Foreground" Value="{DynamicResource Brush.FG2}"/>
diff --git a/src/Views/Statistics.axaml.cs b/src/Views/Statistics.axaml.cs
index dcc00959..cc069b26 100644
--- a/src/Views/Statistics.axaml.cs
+++ b/src/Views/Statistics.axaml.cs
@@ -191,6 +191,10 @@ namespace SourceGit.Views {
             InitializeComponent();
         }
 
+        private void BeginMoveWindow(object sender, PointerPressedEventArgs e) {
+            BeginMoveDrag(e);
+        }
+
         private void CloseWindow(object sender, RoutedEventArgs e) {
             Close();
         }