diff --git a/src/Files.App/App.xaml b/src/Files.App/App.xaml
index 4b0b75c45b82..13aacfd6a958 100644
--- a/src/Files.App/App.xaml
+++ b/src/Files.App/App.xaml
@@ -19,12 +19,6 @@
 			<SolidColorBrush x:Key="WindowCaptionBackground" Color="Transparent" />
 			<SolidColorBrush x:Key="WindowCaptionBackgroundDisabled" Color="Transparent" />
 
-			<!--  Removes NavigationView background  -->
-			<SolidColorBrush x:Key="NavigationViewContentBackground" Color="Transparent" />
-			
-			<!--  Removes NavigationView corner radius  -->
-			<CornerRadius x:Key="NavigationViewContentGridCornerRadius">0</CornerRadius>
-
 			<!--  Workaround for https://github.com/microsoft/microsoft-ui-xaml/issues/5441  -->
 			<x:Double x:Key="MediaTransportControlsMinWidth">50</x:Double>
 
diff --git a/src/Files.App/Dialogs/SettingsDialog.xaml b/src/Files.App/Dialogs/SettingsDialog.xaml
index adb96e98cb49..c89899768fa1 100644
--- a/src/Files.App/Dialogs/SettingsDialog.xaml
+++ b/src/Files.App/Dialogs/SettingsDialog.xaml
@@ -11,28 +11,58 @@
 	mc:Ignorable="d">
 	<ContentDialog.Resources>
 		<ResourceDictionary>
-			<x:Double x:Key="ContentDialogMaxWidth">800</x:Double>
+			<x:Double x:Key="ContentDialogMaxWidth">1100</x:Double>
 			<Thickness x:Key="ContentDialogPadding">0</Thickness>
-			<Thickness x:Key="TopNavigationViewTopNavGridMargin">4</Thickness>
-			<SolidColorBrush x:Key="ContentDialogTopOverlay" Color="Transparent" />
-			<SolidColorBrush x:Key="NavigationViewContentGridBorderBrush" Color="Transparent" />
 		</ResourceDictionary>
 	</ContentDialog.Resources>
 
 	<Grid
 		x:Name="ContainerGrid"
-		MaxHeight="690"
+		MaxHeight="790"
 		HorizontalAlignment="Stretch"
 		VerticalAlignment="Stretch"
 		Background="{ThemeResource SolidBackgroundFillColorBase}">
+		<Grid.RowDefinitions>
+			<RowDefinition Height="44" />
+			<RowDefinition Height="*" />
+		</Grid.RowDefinitions>
+
+		<Grid
+			Grid.Row="0"
+			Padding="8,0"
+			HorizontalAlignment="Stretch">
+			<TextBlock
+				Padding="8,0,0,0"
+				HorizontalAlignment="Left"
+				VerticalAlignment="Center"
+				FontWeight="SemiBold"
+				Text="{helpers:ResourceString Name=Settings}" />
+
+			<Button
+				x:Name="ButtonClose"
+				Width="36"
+				Height="36"
+				HorizontalAlignment="Right"
+				VerticalAlignment="Center"
+				AutomationProperties.Name="{helpers:ResourceString Name=Close}"
+				Background="Transparent"
+				BorderBrush="Transparent"
+				Click="ButtonClose_Click"
+				ToolTipService.ToolTip="{helpers:ResourceString Name=Close}">
+				<FontIcon FontSize="12" Glyph="&#xE8BB;" />
+			</Button>
+		</Grid>
+
 		<NavigationView
 			x:Name="SettingsPane"
+			Grid.Row="1"
 			IsBackButtonVisible="Collapsed"
 			IsBackEnabled="False"
 			IsPaneToggleButtonVisible="False"
 			IsSettingsVisible="False"
 			IsTitleBarAutoPaddingEnabled="False"
-			PaneDisplayMode="Top"
+			OpenPaneLength="260"
+			PaneDisplayMode="Left"
 			SelectionChanged="SettingsPane_SelectionChanged">
 
 			<NavigationView.MenuItems>
@@ -40,7 +70,6 @@
 					AccessKey="A"
 					AutomationProperties.AutomationId="SettingsItemAppearance"
 					Content="{helpers:ResourceString Name=Appearance}"
-					CornerRadius="4,0,0,4"
 					IsSelected="True"
 					Tag="0">
 					<NavigationViewItem.Icon>
@@ -51,7 +80,6 @@
 					AccessKey="P"
 					AutomationProperties.AutomationId="SettingsItemPreferences"
 					Content="{helpers:ResourceString Name=SettingsNavPreferences/Content}"
-					CornerRadius="0"
 					Tag="1">
 					<NavigationViewItem.Icon>
 						<FontIcon FontFamily="{StaticResource CustomGlyph}" Glyph="&#xF116;" />
@@ -61,7 +89,6 @@
 					AccessKey="F"
 					AutomationProperties.AutomationId="SettingsItemFolders"
 					Content="{helpers:ResourceString Name=Folders}"
-					CornerRadius="0"
 					Tag="2">
 					<NavigationViewItem.Icon>
 						<FontIcon Glyph="&#xE8B7;" />
@@ -81,7 +108,6 @@
 					AccessKey="B"
 					AutomationProperties.AutomationId="SettingsItemAbout"
 					Content="{helpers:ResourceString Name=About}"
-					CornerRadius="0,4,4,0"
 					Tag="4">
 					<NavigationViewItem.Icon>
 						<FontIcon FontSize="16" Glyph="&#xE946;" />
@@ -94,23 +120,8 @@
 				VerticalAlignment="Stretch"
 				VerticalScrollBarVisibility="Visible"
 				VerticalScrollMode="Enabled">
-				<Frame x:Name="SettingsContentFrame" Padding="12,0,12,12" />
+				<Frame x:Name="SettingsContentFrame" Padding="12" />
 			</ScrollViewer>
 		</NavigationView>
-
-		<Button
-			x:Name="ButtonClose"
-			Width="36"
-			Height="36"
-			Margin="8,12,12,8"
-			HorizontalAlignment="Right"
-			VerticalAlignment="Top"
-			AutomationProperties.Name="{helpers:ResourceString Name=Close}"
-			Background="Transparent"
-			BorderBrush="Transparent"
-			Click="ButtonClose_Click"
-			ToolTipService.ToolTip="{helpers:ResourceString Name=Close}">
-			<FontIcon FontSize="12" Glyph="&#xE8BB;" />
-		</Button>
 	</Grid>
-</ContentDialog>
\ No newline at end of file
+</ContentDialog>
diff --git a/src/Files.App/Dialogs/SettingsDialog.xaml.cs b/src/Files.App/Dialogs/SettingsDialog.xaml.cs
index e5c2db55b885..81fac7e591d1 100644
--- a/src/Files.App/Dialogs/SettingsDialog.xaml.cs
+++ b/src/Files.App/Dialogs/SettingsDialog.xaml.cs
@@ -37,7 +37,8 @@ private void Current_SizeChanged(object sender, WindowSizeChangedEventArgs e)
 		private void UpdateDialogLayout()
 		{
 			ContainerGrid.Height = App.Window.Bounds.Height <= 760 ? App.Window.Bounds.Height - 70 : 690;
-			ContainerGrid.Width = App.Window.Bounds.Width <= 800 ? App.Window.Bounds.Width : 800;
+			ContainerGrid.Width = App.Window.Bounds.Width <= 1100 ? App.Window.Bounds.Width : 1100;
+			SettingsPane.PaneDisplayMode = App.Window.Bounds.Width < 700 ? NavigationViewPaneDisplayMode.LeftCompact : NavigationViewPaneDisplayMode.Left;
 		}
 
 		private void SettingsPane_SelectionChanged(NavigationView sender, NavigationViewSelectionChangedEventArgs args)
diff --git a/src/Files.App/Strings/en-US/Resources.resw b/src/Files.App/Strings/en-US/Resources.resw
index 140fd62becef..7c733e89e00a 100644
--- a/src/Files.App/Strings/en-US/Resources.resw
+++ b/src/Files.App/Strings/en-US/Resources.resw
@@ -2877,4 +2877,7 @@
   <data name="ReleaseNotes" xml:space="preserve">
     <value>Release Notes</value>
   </data>
+  <data name="Settings" xml:space="preserve">
+    <value>Settings</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Files.App/UserControls/SidebarControl.xaml b/src/Files.App/UserControls/SidebarControl.xaml
index 474d6e95a6f6..0db936f8384d 100644
--- a/src/Files.App/UserControls/SidebarControl.xaml
+++ b/src/Files.App/UserControls/SidebarControl.xaml
@@ -40,6 +40,15 @@
 	</FlyoutBase.AttachedFlyout>
 	<NavigationView.Resources>
 		<ResourceDictionary>
+			<!--  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>
+			
 			<mconv:BoolNegationConverter x:Key="BoolNegationConverter" />
 			<mconv:StringFormatConverter x:Key="StringFormatConverter" />
 			<vc:ColorModelToColorConverter x:Key="ColorModelToColorConverter" />
diff --git a/src/Files.App/Views/MainPage.xaml b/src/Files.App/Views/MainPage.xaml
index 0b82292b3563..f475c3949be4 100644
--- a/src/Files.App/Views/MainPage.xaml
+++ b/src/Files.App/Views/MainPage.xaml
@@ -34,9 +34,6 @@
 			<x:Boolean x:Key="False">False</x:Boolean>
 
 			<converters:BoolNegationConverter x:Key="BoolNegationConverter" />
-
-			<SolidColorBrush x:Key="NavigationViewContentGridBorderBrush" Color="{ThemeResource ControlStrokeColorDefault}" />
-			<Thickness x:Key="NavigationViewContentGridBorderThickness">1,0,0,0</Thickness>
 		</ResourceDictionary>
 	</Page.Resources>
 
diff --git a/src/Files.App/Views/Pages/Properties.xaml b/src/Files.App/Views/Pages/Properties.xaml
index 34f3111c7cc8..4d6006451603 100644
--- a/src/Files.App/Views/Pages/Properties.xaml
+++ b/src/Files.App/Views/Pages/Properties.xaml
@@ -19,6 +19,12 @@
 				<Thickness x:Key="NavigationViewTopPaneHeight">40</Thickness>
 				<Thickness x:Key="TopNavigationViewTopNavGridMargin">0</Thickness>
 				<SolidColorBrush x:Key="NavigationViewContentGridBorderBrush" Color="Transparent" />
+				
+				<!--  Removes NavigationView background  -->
+				<SolidColorBrush x:Key="NavigationViewContentBackground" Color="Transparent" />
+				
+				<!--  Removes NavigationView corner radius  -->
+				<CornerRadius x:Key="NavigationViewContentGridCornerRadius">0</CornerRadius>
 			</ResourceDictionary>
 		</Grid.Resources>
 		<Grid.RowDefinitions>
diff --git a/src/Files.App/Views/SettingsPages/About.xaml b/src/Files.App/Views/SettingsPages/About.xaml
index 0d281e767a94..c732f0bd9b03 100644
--- a/src/Files.App/Views/SettingsPages/About.xaml
+++ b/src/Files.App/Views/SettingsPages/About.xaml
@@ -24,7 +24,7 @@
 
 			<!--  Version  -->
 			<TextBlock
-				Padding="0,12,0,4"
+				Padding="0,0,0,4"
 				FontSize="14"
 				FontWeight="Medium"
 				Text="{helpers:ResourceString Name=Version}" />
diff --git a/src/Files.App/Views/SettingsPages/Advanced.xaml b/src/Files.App/Views/SettingsPages/Advanced.xaml
index 541c126e0219..cae4f2ec3f86 100644
--- a/src/Files.App/Views/SettingsPages/Advanced.xaml
+++ b/src/Files.App/Views/SettingsPages/Advanced.xaml
@@ -30,7 +30,7 @@
 
 			<!--  Manage Settings  -->
 			<TextBlock
-				Padding="0,12,0,4"
+				Padding="0,0,0,4"
 				FontSize="14"
 				FontWeight="Medium"
 				Text="{helpers:ResourceString Name=ManageSettings}" />
diff --git a/src/Files.App/Views/SettingsPages/Appearance.xaml b/src/Files.App/Views/SettingsPages/Appearance.xaml
index 3683264f4646..19753762a20b 100644
--- a/src/Files.App/Views/SettingsPages/Appearance.xaml
+++ b/src/Files.App/Views/SettingsPages/Appearance.xaml
@@ -8,8 +8,6 @@
 	xmlns:converters1="using:Files.App.ValueConverters"
 	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 	xmlns:helpers="using:Files.App.Helpers"
-	xmlns:i="using:Microsoft.Xaml.Interactivity"
-	xmlns:icore="using:Microsoft.Xaml.Interactions.Core"
 	xmlns:local="using:Files.App.UserControls.Settings"
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 	xmlns:settingsviewmodels="using:Files.App.ViewModels.SettingsViewModels"
@@ -101,7 +99,7 @@
 
 			<!--  Personalization  -->
 			<TextBlock
-				Padding="0,12,0,4"
+				Padding="0,0,0,4"
 				FontSize="14"
 				FontWeight="Medium"
 				Text="{helpers:ResourceString Name=Personalization}" />
diff --git a/src/Files.App/Views/SettingsPages/Folders.xaml b/src/Files.App/Views/SettingsPages/Folders.xaml
index 70f860541d6c..966588abc171 100644
--- a/src/Files.App/Views/SettingsPages/Folders.xaml
+++ b/src/Files.App/Views/SettingsPages/Folders.xaml
@@ -35,7 +35,7 @@
 
 			<!--  Layout And Sorting  -->
 			<TextBlock
-				Padding="0,12,0,4"
+				Padding="0,0,0,4"
 				FontSize="14"
 				FontWeight="Medium"
 				Text="{helpers:ResourceString Name=LayoutAndSorting}" />