diff --git a/src/Files.App/App.xaml b/src/Files.App/App.xaml
index 8d7d0dd729ee..30fc256cd8af 100644
--- a/src/Files.App/App.xaml
+++ b/src/Files.App/App.xaml
@@ -34,8 +34,8 @@
 						<ResourceDictionary x:Key="Light">
 							<SolidColorBrush x:Key="App.Theme.BackgroundBrush" Color="Transparent" />
 							<SolidColorBrush x:Key="App.Theme.AddressBar.BackgroundBrush" Color="{StaticResource LayerOnMicaBaseAltFillColorDefault}" />
-							<SolidColorBrush x:Key="App.Theme.Sidebar.BackgroundBrush" Color="{StaticResource CardBackgroundFillColorDefault}" />
-							<SolidColorBrush x:Key="App.Theme.FileArea.BackgroundBrush" Color="{StaticResource CardBackgroundFillColorDefault}" />
+							<SolidColorBrush x:Key="App.Theme.Sidebar.BackgroundBrush" Color="{StaticResource LayerOnMicaBaseAltFillColorDefault}" />
+							<SolidColorBrush x:Key="App.Theme.FileArea.BackgroundBrush" Color="#C0FCFCFC" />
 
 							<SolidColorBrush x:Key="TabViewItemHeaderBackground" Color="{StaticResource SubtleFillColorTransparent}" />
 							<SolidColorBrush x:Key="TabViewItemHeaderBackgroundSelected" Color="{StaticResource LayerOnMicaBaseAltFillColorDefault}" />
@@ -45,8 +45,8 @@
 						<ResourceDictionary x:Key="Dark">
 							<SolidColorBrush x:Key="App.Theme.BackgroundBrush" Color="Transparent" />
 							<SolidColorBrush x:Key="App.Theme.AddressBar.BackgroundBrush" Color="{StaticResource LayerOnMicaBaseAltFillColorDefault}" />
-							<SolidColorBrush x:Key="App.Theme.Sidebar.BackgroundBrush" Color="#993A3A3A" />
-							<SolidColorBrush x:Key="App.Theme.FileArea.BackgroundBrush" Color="#993A3A3A" />
+							<SolidColorBrush x:Key="App.Theme.Sidebar.BackgroundBrush" Color="{StaticResource LayerOnMicaBaseAltFillColorDefault}" />
+							<SolidColorBrush x:Key="App.Theme.FileArea.BackgroundBrush" Color="#10f9f9f9" />
 
 							<SolidColorBrush x:Key="TabViewItemHeaderBackground" Color="{StaticResource SubtleFillColorTransparent}" />
 							<SolidColorBrush x:Key="TabViewItemHeaderBackgroundSelected" Color="{StaticResource LayerOnMicaBaseAltFillColorDefault}" />
@@ -56,11 +56,11 @@
 						<ResourceDictionary x:Key="HighContrast">
 							<SolidColorBrush x:Key="App.Theme.BackgroundBrush" Color="Transparent" />
 							<SolidColorBrush x:Key="App.Theme.AddressBar.BackgroundBrush" Color="Transparent" />
-							<SolidColorBrush x:Key="App.Theme.Sidebar.BackgroundBrush" Color="{StaticResource CardBackgroundFillColorDefault}" />
-							<SolidColorBrush x:Key="App.Theme.FileArea.BackgroundBrush" Color="{StaticResource CardBackgroundFillColorDefault}" />
+							<SolidColorBrush x:Key="App.Theme.Sidebar.BackgroundBrush" Color="Transparent" />
+							<SolidColorBrush x:Key="App.Theme.FileArea.BackgroundBrush" Color="Transparent" />
 
 							<SolidColorBrush x:Key="TabViewItemHeaderBackground" Color="{StaticResource SystemColorWindowColor}" />
-							<SolidColorBrush x:Key="TabViewItemHeaderBackgroundSelected" Color="{StaticResource LayerFillColorDefault}" />
+							<SolidColorBrush x:Key="TabViewItemHeaderBackgroundSelected" Color="{StaticResource SystemColorHighlightColor}" />
 							<SolidColorBrush x:Key="TabViewItemHeaderBackgroundPressed" Color="{StaticResource SystemColorHighlightColor}" />
 							<SolidColorBrush x:Key="TabViewItemHeaderBackgroundPointerOver" Color="{StaticResource SystemColorHighlightColor}" />
 						</ResourceDictionary>
diff --git a/src/Files.App/UserControls/SidebarControl.xaml b/src/Files.App/UserControls/SidebarControl.xaml
index 9ad5661cd689..fb9216d2e3a8 100644
--- a/src/Files.App/UserControls/SidebarControl.xaml
+++ b/src/Files.App/UserControls/SidebarControl.xaml
@@ -44,11 +44,9 @@
 			<!--  Removes NavigationView background  -->
 			<SolidColorBrush x:Key="NavigationViewContentBackground" Color="Transparent" />
 
-			<!--  Removes NavigationView corner radius  -->
-			<CornerRadius x:Key="NavigationViewContentGridCornerRadius">0</CornerRadius>
-
 			<!--  Removes NavigationView border from top, right and bottom  -->
-			<Thickness x:Key="NavigationViewContentGridBorderThickness">1,0,0,0</Thickness>
+			<Thickness x:Key="NavigationViewContentGridBorderThickness">0,0,0,0</Thickness>
+			<Thickness x:Key="NavigationViewMinimalContentGridBorderThickness">0,0,0,0</Thickness>
 
 			<mconv:BoolNegationConverter x:Key="BoolNegationConverter" />
 			<mconv:StringFormatConverter x:Key="StringFormatConverter" />
@@ -409,11 +407,18 @@
 									x:Name="ContentRoot"
 									Grid.Row="2"
 									Grid.ColumnSpan="2"
-									Background="{ThemeResource App.Theme.FileArea.BackgroundBrush}">
+									Background="{ThemeResource App.Theme.Sidebar.BackgroundBrush}">
 									<Grid.RenderTransform>
 										<CompositeTransform x:Name="ContentTransform" />
 									</Grid.RenderTransform>
-									<Border Child="{TemplateBinding Content}" />
+									<Border
+										x:Name="FileAreaBorder"
+										Background="{ThemeResource App.Theme.FileArea.BackgroundBrush}"
+										BackgroundSizing="InnerBorderEdge"
+										BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
+										BorderThickness="1,1,0,0"
+										Child="{TemplateBinding Content}"
+										CornerRadius="8,0,0,0" />
 
 									<Rectangle
 										x:Name="LightDismissLayer"
diff --git a/src/Files.App/Views/MainPage.xaml b/src/Files.App/Views/MainPage.xaml
index 0e49d805d793..7936af8ba96e 100644
--- a/src/Files.App/Views/MainPage.xaml
+++ b/src/Files.App/Views/MainPage.xaml
@@ -125,11 +125,7 @@
 
 			<!--  Head Contents  -->
 			<uc:SidebarControl.TabContent>
-				<Grid
-					x:Name="RightMarginGrid"
-					VerticalAlignment="Top"
-					BorderBrush="{ThemeResource ControlStrokeColorDefault}"
-					BorderThickness="0,0,0,1">
+				<Grid x:Name="RightMarginGrid" VerticalAlignment="Top">
 					<Grid.RowDefinitions>
 						<RowDefinition Height="Auto" />
 						<RowDefinition Height="Auto" />