diff --git a/src/Files.App/Dialogs/SettingsDialog.xaml b/src/Files.App/Dialogs/SettingsDialog.xaml
index 7bf003fc9a74..a76e832d8bba 100644
--- a/src/Files.App/Dialogs/SettingsDialog.xaml
+++ b/src/Files.App/Dialogs/SettingsDialog.xaml
@@ -19,6 +19,8 @@
 
 			<x:Double x:Key="ContentDialogMaxWidth">1100</x:Double>
 			<Thickness x:Key="ContentDialogPadding">0</Thickness>
+			<SolidColorBrush x:Key="NavigationViewContentGridBorderBrush" Color="Transparent" />
+			<SolidColorBrush x:Key="NavigationViewContentBackground" Color="Transparent" />
 		</ResourceDictionary>
 	</ContentDialog.Resources>
 
@@ -31,6 +33,14 @@
 			<RowDefinition Height="*" />
 		</Grid.RowDefinitions>
 
+		<!--  Smokescreen for displaying a semi transparent background  -->
+		<Border
+			Grid.RowSpan="2"
+			HorizontalAlignment="Stretch"
+			VerticalAlignment="Stretch"
+			Background="{ThemeResource App.Theme.BackgroundBrush}"
+			Opacity=".4" />
+
 		<!--  Titlebar  -->
 		<Grid Grid.Row="0" Padding="8,0">
 			<TextBlock
@@ -130,10 +140,7 @@
 
 			<!--  Content Frame  -->
 			<ScrollViewer x:Name="SettingsContentScrollViewer">
-				<Frame
-					x:Name="SettingsContentFrame"
-					Padding="12"
-					Background="{ThemeResource SolidBackgroundFillColorTertiary}" />
+				<Frame x:Name="SettingsContentFrame" Padding="4,0,24,24" />
 			</ScrollViewer>
 
 		</NavigationView>
diff --git a/src/Files.App/Strings/en-US/Resources.resw b/src/Files.App/Strings/en-US/Resources.resw
index 2275128297ac..57f06577a98e 100644
--- a/src/Files.App/Strings/en-US/Resources.resw
+++ b/src/Files.App/Strings/en-US/Resources.resw
@@ -564,9 +564,6 @@
   <data name="InvalidItemDialogTitle" xml:space="preserve">
     <value>Invalid item</value>
   </data>
-  <data name="Version" xml:space="preserve">
-    <value>Version</value>
-  </data>
   <data name="SettingsAboutVersionTitle" xml:space="preserve">
     <value>Version:</value>
   </data>
@@ -612,12 +609,6 @@
   <data name="SponsorUsOnGitHub" xml:space="preserve">
     <value>Sponsor us on GitHub</value>
   </data>
-  <data name="Personalization" xml:space="preserve">
-    <value>Personalization</value>
-  </data>
-  <data name="LayoutAndSorting" xml:space="preserve">
-    <value>Layout and sorting</value>
-  </data>
   <data name="AccessDeniedCreateDialog.Text" xml:space="preserve">
     <value>We weren't able to create this item</value>
   </data>
@@ -1983,9 +1974,6 @@
   <data name="ImportSettings" xml:space="preserve">
     <value>Import Settings</value>
   </data>
-  <data name="ManageSettings" xml:space="preserve">
-    <value>Manage settings</value>
-  </data>
   <data name="SettingsImportErrorDescription" xml:space="preserve">
     <value>Couldn't import settings. The settings file is corrupted.</value>
   </data>
diff --git a/src/Files.App/Views/LayoutModes/ColumnViewBase.xaml b/src/Files.App/Views/LayoutModes/ColumnViewBase.xaml
index 9faf7b48f324..6973d0295a0e 100644
--- a/src/Files.App/Views/LayoutModes/ColumnViewBase.xaml
+++ b/src/Files.App/Views/LayoutModes/ColumnViewBase.xaml
@@ -133,7 +133,7 @@
 			Canvas.ZIndex="0"
 			EmptyTextType="{x:Bind ParentShellPageInstance.FilesystemViewModel.EmptyTextType, Mode=OneWay}" />
 
-		<!--  Invalid Item Name Tip	 -->
+		<!--  Invalid Item Name Tip  -->
 		<TeachingTip
 			x:Name="FileNameTeachingTip"
 			Grid.RowSpan="2"
@@ -149,7 +149,7 @@
 			ViewChangeStarted="SemanticZoom_ViewChangeStarted"
 			Visibility="{x:Bind FolderSettings.IsLayoutModeChanging, Mode=OneWay, Converter={StaticResource NegatedBoolToVisibilityConverter}}">
 
-			<!--  Main View	 -->
+			<!--  Main View  -->
 			<SemanticZoom.ZoomedInView>
 				<ListView
 					x:Name="FileList"
@@ -199,7 +199,7 @@
 									<ColumnDefinition Width="Auto" />
 								</Grid.ColumnDefinitions>
 
-								<!--  Thumbnail	 -->
+								<!--  Thumbnail  -->
 								<Grid
 									Grid.Column="0"
 									Width="24"
@@ -274,7 +274,7 @@
 										Stretch="Uniform" />
 								</Grid>
 
-								<!--  Item Name	 -->
+								<!--  Item Name  -->
 								<TextBlock
 									x:Name="ItemName"
 									Grid.Column="1"
@@ -301,7 +301,7 @@
 								<Grid Grid.Column="2">
 									<StackPanel Orientation="Horizontal" Spacing="4">
 
-										<!--  Cloud Status	-->
+										<!--  Cloud Status  -->
 										<FontIcon
 											x:Name="CloudDriveSyncStatusGlyph"
 											HorizontalAlignment="Center"
@@ -402,7 +402,7 @@
 				</ListView>
 			</SemanticZoom.ZoomedInView>
 
-			<!--  Grouped View	-->
+			<!--  Grouped View  -->
 			<SemanticZoom.ZoomedOutView>
 				<ListView
 					HorizontalAlignment="Stretch"
@@ -438,7 +438,7 @@
 											Style="{StaticResource SubtitleTextBlockStyle}"
 											Text="{x:Bind ((helpers:IGroupedCollectionHeader)Group).Model.Text, Mode=OneWay}" />
 
-										<!--  Count	 -->
+										<!--  Count  -->
 										<TextBlock
 											Margin="4,0,0,0"
 											VerticalAlignment="Center"
@@ -447,7 +447,7 @@
 											Text="{x:Bind ((helpers:IGroupedCollectionHeader)Group).Model.CountText, Mode=OneWay}"
 											Visibility="{x:Bind ((helpers:IGroupedCollectionHeader)Group).Model.ShowCountTextBelow, Mode=OneWay, Converter={StaticResource NegatedBoolToVisibilityConverter}}" />
 
-										<!--  Subheader	 -->
+										<!--  Subheader  -->
 										<TextBlock
 											VerticalAlignment="Center"
 											FontSize="14"
@@ -474,7 +474,7 @@
 
 		</SemanticZoom>
 
-		<!--  Selector	-->
+		<!--  Selector  -->
 		<Canvas>
 			<Rectangle
 				Name="SelectionRectangle"
diff --git a/src/Files.App/Views/Properties/HashesPage.xaml b/src/Files.App/Views/Properties/HashesPage.xaml
index 749778689cf1..b1b6f2a6bbba 100644
--- a/src/Files.App/Views/Properties/HashesPage.xaml
+++ b/src/Files.App/Views/Properties/HashesPage.xaml
@@ -75,36 +75,42 @@
 							<FontIcon FontSize="14" Glyph="&#xE7B3;" />
 							<Button.Flyout>
 								<MenuFlyout x:Name="SelectAlgorithmsMenuFlyout" Closing="MenuFlyout_Closing">
-									<ToggleMenuFlyoutItem Text="CRC32"
-														  IsChecked="{x:Bind HashesViewModel.ShowHashes['CRC32']}"
-														  Click="ToggleMenuFlyoutItem_Click"
-														  Command="{x:Bind HashesViewModel.ToggleIsEnabledCommand}"
-														  CommandParameter="CRC32" />
-									<ToggleMenuFlyoutItem Text="MD5"
-														  IsChecked="{x:Bind HashesViewModel.ShowHashes['MD5']}"
-														  Click="ToggleMenuFlyoutItem_Click"
-														  Command="{x:Bind HashesViewModel.ToggleIsEnabledCommand}"
-														  CommandParameter="MD5" />
-									<ToggleMenuFlyoutItem Text="SHA1"
-														  IsChecked="{x:Bind HashesViewModel.ShowHashes['SHA1']}"
-														  Click="ToggleMenuFlyoutItem_Click"
-														  Command="{x:Bind HashesViewModel.ToggleIsEnabledCommand}"
-														  CommandParameter="SHA1" />
-									<ToggleMenuFlyoutItem Text="SHA256"
-														  IsChecked="{x:Bind HashesViewModel.ShowHashes['SHA256']}"
-														  Click="ToggleMenuFlyoutItem_Click"
-														  Command="{x:Bind HashesViewModel.ToggleIsEnabledCommand}"
-														  CommandParameter="SHA256" />
-									<ToggleMenuFlyoutItem Text="SHA384"
-														  IsChecked="{x:Bind HashesViewModel.ShowHashes['SHA384']}"
-														  Click="ToggleMenuFlyoutItem_Click"
-														  Command="{x:Bind HashesViewModel.ToggleIsEnabledCommand}"
-														  CommandParameter="SHA384" />
-									<ToggleMenuFlyoutItem Text="SHA512"
-														  IsChecked="{x:Bind HashesViewModel.ShowHashes['SHA512']}"
-														  Click="ToggleMenuFlyoutItem_Click"
-														  Command="{x:Bind HashesViewModel.ToggleIsEnabledCommand}"
-														  CommandParameter="SHA512" />
+									<ToggleMenuFlyoutItem
+										Click="ToggleMenuFlyoutItem_Click"
+										Command="{x:Bind HashesViewModel.ToggleIsEnabledCommand}"
+										CommandParameter="CRC32"
+										IsChecked="{x:Bind HashesViewModel.ShowHashes['CRC32']}"
+										Text="CRC32" />
+									<ToggleMenuFlyoutItem
+										Click="ToggleMenuFlyoutItem_Click"
+										Command="{x:Bind HashesViewModel.ToggleIsEnabledCommand}"
+										CommandParameter="MD5"
+										IsChecked="{x:Bind HashesViewModel.ShowHashes['MD5']}"
+										Text="MD5" />
+									<ToggleMenuFlyoutItem
+										Click="ToggleMenuFlyoutItem_Click"
+										Command="{x:Bind HashesViewModel.ToggleIsEnabledCommand}"
+										CommandParameter="SHA1"
+										IsChecked="{x:Bind HashesViewModel.ShowHashes['SHA1']}"
+										Text="SHA1" />
+									<ToggleMenuFlyoutItem
+										Click="ToggleMenuFlyoutItem_Click"
+										Command="{x:Bind HashesViewModel.ToggleIsEnabledCommand}"
+										CommandParameter="SHA256"
+										IsChecked="{x:Bind HashesViewModel.ShowHashes['SHA256']}"
+										Text="SHA256" />
+									<ToggleMenuFlyoutItem
+										Click="ToggleMenuFlyoutItem_Click"
+										Command="{x:Bind HashesViewModel.ToggleIsEnabledCommand}"
+										CommandParameter="SHA384"
+										IsChecked="{x:Bind HashesViewModel.ShowHashes['SHA384']}"
+										Text="SHA384" />
+									<ToggleMenuFlyoutItem
+										Click="ToggleMenuFlyoutItem_Click"
+										Command="{x:Bind HashesViewModel.ToggleIsEnabledCommand}"
+										CommandParameter="SHA512"
+										IsChecked="{x:Bind HashesViewModel.ShowHashes['SHA512']}"
+										Text="SHA512" />
 								</MenuFlyout>
 							</Button.Flyout>
 						</Button>
@@ -142,9 +148,9 @@
 								<!--  Copy button  -->
 								<Button
 									x:Name="CopyHashButton"
-									x:Load="{x:Bind IsCalculated, Mode=OneWay}"
 									Grid.Column="3"
 									Padding="6"
+									x:Load="{x:Bind IsCalculated, Mode=OneWay}"
 									AutomationProperties.Name="{helpers:ResourceString Name=Copy}"
 									Background="Transparent"
 									BorderBrush="Transparent"
diff --git a/src/Files.App/Views/Settings/AboutPage.xaml b/src/Files.App/Views/Settings/AboutPage.xaml
index d365c0046c11..2df0481df9a5 100644
--- a/src/Files.App/Views/Settings/AboutPage.xaml
+++ b/src/Files.App/Views/Settings/AboutPage.xaml
@@ -24,12 +24,13 @@
 					<EntranceThemeTransition />
 				</TransitionCollection>
 			</StackPanel.ChildrenTransitions>
-			<!--  Version  -->
+
+			<!--  Title  -->
 			<TextBlock
-				Padding="0,0,0,4"
-				FontSize="14"
+				Padding="0,0,0,12"
+				FontSize="24"
 				FontWeight="Medium"
-				Text="{helpers:ResourceString Name=Version}" />
+				Text="{helpers:ResourceString Name=About}" />
 
 			<!--  App Info  -->
 			<local:SettingsBlockControl
@@ -67,8 +68,8 @@
 
 			<!--  Help and support  -->
 			<TextBlock
-				Padding="0,12,0,4"
-				FontSize="14"
+				Padding="0,16,0,4"
+				FontSize="16"
 				FontWeight="Medium"
 				Text="{helpers:ResourceString Name=HelpAndSupport}" />
 
@@ -141,8 +142,8 @@
 
 			<!--  Open Source  -->
 			<TextBlock
-				Padding="0,12,0,4"
-				FontSize="14"
+				Padding="0,16,0,4"
+				FontSize="16"
 				FontWeight="Medium"
 				Text="{helpers:ResourceString Name=OpenSource}" />
 
diff --git a/src/Files.App/Views/Settings/AdvancedPage.xaml b/src/Files.App/Views/Settings/AdvancedPage.xaml
index 829b692ae237..75510b6ccc6e 100644
--- a/src/Files.App/Views/Settings/AdvancedPage.xaml
+++ b/src/Files.App/Views/Settings/AdvancedPage.xaml
@@ -30,12 +30,12 @@
 				</TransitionCollection>
 			</StackPanel.ChildrenTransitions>
 
-			<!--  Manage Settings  -->
+			<!--  Title  -->
 			<TextBlock
-				Padding="0,0,0,4"
-				FontSize="14"
+				Padding="0,0,0,12"
+				FontSize="24"
 				FontWeight="Medium"
-				Text="{helpers:ResourceString Name=ManageSettings}" />
+				Text="{helpers:ResourceString Name=Advanced}" />
 
 			<!--  Export  -->
 			<local:SettingsBlockControl
@@ -82,8 +82,8 @@
 
 			<!--  Default file manager  -->
 			<TextBlock
-				Padding="0,12,0,4"
-				FontSize="14"
+				Padding="0,16,0,4"
+				FontSize="16"
 				FontWeight="Medium"
 				Text="{helpers:ResourceString Name=ExperimentalFeatureFlags}" />
 
diff --git a/src/Files.App/Views/Settings/AppearancePage.xaml b/src/Files.App/Views/Settings/AppearancePage.xaml
index d8be5d571ebe..33a16d36434a 100644
--- a/src/Files.App/Views/Settings/AppearancePage.xaml
+++ b/src/Files.App/Views/Settings/AppearancePage.xaml
@@ -95,12 +95,12 @@
 				</TransitionCollection>
 			</StackPanel.ChildrenTransitions>
 
-			<!--  Personalization  -->
+			<!--  Title  -->
 			<TextBlock
-				Padding="0,0,0,4"
-				FontSize="14"
+				Padding="0,0,0,12"
+				FontSize="24"
 				FontWeight="Medium"
-				Text="{helpers:ResourceString Name=Personalization}" />
+				Text="{helpers:ResourceString Name=Appearance}" />
 
 			<!--  Theme  -->
 			<local:SettingsBlockControl Title="{helpers:ResourceString Name=SettingsAppearanceTheme}" HorizontalAlignment="Stretch">
diff --git a/src/Files.App/Views/Settings/FoldersPage.xaml b/src/Files.App/Views/Settings/FoldersPage.xaml
index d4b05c05d240..f232df4f2d5a 100644
--- a/src/Files.App/Views/Settings/FoldersPage.xaml
+++ b/src/Files.App/Views/Settings/FoldersPage.xaml
@@ -28,12 +28,12 @@
 				</TransitionCollection>
 			</StackPanel.ChildrenTransitions>
 
-			<!--  Layout And Sorting  -->
+			<!--  Title  -->
 			<TextBlock
-				Padding="0,0,0,4"
-				FontSize="14"
+				Padding="0,0,0,12"
+				FontSize="24"
 				FontWeight="Medium"
-				Text="{helpers:ResourceString Name=LayoutAndSorting}" />
+				Text="{helpers:ResourceString Name=Folders}" />
 
 			<!--  Folder Overrides  -->
 			<local:SettingsBlockControl
@@ -169,8 +169,8 @@
 
 			<!--  Display  -->
 			<TextBlock
-				Padding="0,12,0,4"
-				FontSize="14"
+				Padding="0,16,0,4"
+				FontSize="16"
 				FontWeight="Medium"
 				Text="{helpers:ResourceString Name=Display}" />
 
@@ -251,8 +251,8 @@
 
 			<!--  Behaviors  -->
 			<TextBlock
-				Padding="0,12,0,4"
-				FontSize="14"
+				Padding="0,16,0,4"
+				FontSize="16"
 				FontWeight="Medium"
 				Text="{helpers:ResourceString Name=Behaviors}" />
 
diff --git a/src/Files.App/Views/Settings/GeneralPage.xaml b/src/Files.App/Views/Settings/GeneralPage.xaml
index b861310526e3..df433bfe5404 100644
--- a/src/Files.App/Views/Settings/GeneralPage.xaml
+++ b/src/Files.App/Views/Settings/GeneralPage.xaml
@@ -31,6 +31,13 @@
 				</TransitionCollection>
 			</StackPanel.ChildrenTransitions>
 
+			<!--  Title  -->
+			<TextBlock
+				Padding="0,0,0,12"
+				FontSize="24"
+				FontWeight="Medium"
+				Text="{helpers:ResourceString Name=General}" />
+
 			<!--  Language settings  -->
 			<local:SettingsBlockControl Title="{helpers:ResourceString Name=Language}" HorizontalAlignment="Stretch">
 				<local:SettingsBlockControl.Icon>
@@ -254,8 +261,8 @@
 
 			<!--  Right Click Menu  -->
 			<TextBlock
-				Padding="0,12,0,4"
-				FontSize="14"
+				Padding="0,16,0,4"
+				FontSize="16"
 				FontWeight="Medium"
 				Text="{helpers:ResourceString Name=SettingsContextMenu/Text}" />
 
diff --git a/src/Files.App/Views/Settings/TagsPage.xaml b/src/Files.App/Views/Settings/TagsPage.xaml
index 18e7dd015f0f..8a716794b5f0 100644
--- a/src/Files.App/Views/Settings/TagsPage.xaml
+++ b/src/Files.App/Views/Settings/TagsPage.xaml
@@ -42,6 +42,13 @@
 				</TransitionCollection>
 			</StackPanel.ChildrenTransitions>
 
+			<!--  Title  -->
+			<TextBlock
+				Padding="0,0,0,12"
+				FontSize="24"
+				FontWeight="Medium"
+				Text="{helpers:ResourceString Name=FileTags}" />
+
 			<!--  Edit Tags  -->
 			<local:SettingsBlockControl
 				Title="{helpers:ResourceString Name=FileTags}"