diff --git a/GZStudio/Styles/Thickness.xaml b/GZStudio/Styles/Thickness.xaml
index 318f9a3..d3240a8 100644
--- a/GZStudio/Styles/Thickness.xaml
+++ b/GZStudio/Styles/Thickness.xaml
@@ -25,7 +25,7 @@
 
     <Thickness x:Key="NavigationViewContentGridBorderThickness">1,1,0,0</Thickness>
     <CornerRadius x:Key="NavigationViewContentGridCornerRadius">8,0,0,0</CornerRadius>
-    <Thickness x:Key="NavigationViewContentMargin">0,0,0,0</Thickness>
+    <Thickness x:Key="NavigationViewContentMargin">0,4,0,0</Thickness>
     <Thickness x:Key="NavigationViewHeaderMargin">56,34,0,0</Thickness>
     <Thickness x:Key="NavigationViewPageContentMargin">56,24,56,0</Thickness>
 
diff --git a/GZStudio/Views/ShellPage.xaml b/GZStudio/Views/ShellPage.xaml
index 32ee0b4..8a216ab 100644
--- a/GZStudio/Views/ShellPage.xaml
+++ b/GZStudio/Views/ShellPage.xaml
@@ -15,7 +15,24 @@
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
-        <TitleBar x:Name="AppTitleBar" Title="GZStudio" Subtitle="preview" IsBackButtonVisible="True" IsPaneToggleButtonVisible="True" BorderBrush="WhiteSmoke" BorderThickness="2" CornerRadius="3"></TitleBar>
+        <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+                    <TitleBar
+                x:Name="AppTitleBar"
+                Title="GZStudio"
+                Subtitle="preview"
+                IsBackButtonVisible="True"
+                IsPaneToggleButtonVisible="True"
+                BorderThickness="2"
+                BorderBrush="{ThemeResource SurfaceStrokeColorDefaultBrush}"
+                CornerRadius="{StaticResource OverlayCornerRadius}"
+            ></TitleBar>
+        
+        </Grid>
+
         <NavigationView
             Grid.Row="1"
             x:Name="NavigationViewControl"