diff --git a/src/Files.App/Dialogs/SettingsDialog.xaml b/src/Files.App/Dialogs/SettingsDialog.xaml
index c89899768fa1..1c7919093933 100644
--- a/src/Files.App/Dialogs/SettingsDialog.xaml
+++ b/src/Files.App/Dialogs/SettingsDialog.xaml
@@ -16,112 +16,114 @@
 		</ResourceDictionary>
 	</ContentDialog.Resources>
 
-	<Grid
-		x:Name="ContainerGrid"
-		MaxHeight="790"
-		HorizontalAlignment="Stretch"
-		VerticalAlignment="Stretch"
-		Background="{ThemeResource SolidBackgroundFillColorBase}">
-		<Grid.RowDefinitions>
-			<RowDefinition Height="44" />
-			<RowDefinition Height="*" />
-		</Grid.RowDefinitions>
-
+	<Border Background="{ThemeResource App.Theme.BackgroundBrush}">
 		<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}" />
+			x:Name="ContainerGrid"
+			MaxHeight="790"
+			HorizontalAlignment="Stretch"
+			VerticalAlignment="Stretch"
+			Background="{ThemeResource CardBackgroundFillColorSecondary}">
+			<Grid.RowDefinitions>
+				<RowDefinition Height="44" />
+				<RowDefinition Height="*" />
+			</Grid.RowDefinitions>
 
-			<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>
+			<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}" />
 
-		<NavigationView
-			x:Name="SettingsPane"
-			Grid.Row="1"
-			IsBackButtonVisible="Collapsed"
-			IsBackEnabled="False"
-			IsPaneToggleButtonVisible="False"
-			IsSettingsVisible="False"
-			IsTitleBarAutoPaddingEnabled="False"
-			OpenPaneLength="260"
-			PaneDisplayMode="Left"
-			SelectionChanged="SettingsPane_SelectionChanged">
+				<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.MenuItems>
-				<NavigationViewItem
-					AccessKey="A"
-					AutomationProperties.AutomationId="SettingsItemAppearance"
-					Content="{helpers:ResourceString Name=Appearance}"
-					IsSelected="True"
-					Tag="0">
-					<NavigationViewItem.Icon>
-						<FontIcon HorizontalAlignment="Left" Glyph="&#xE790;" />
-					</NavigationViewItem.Icon>
-				</NavigationViewItem>
-				<NavigationViewItem
-					AccessKey="P"
-					AutomationProperties.AutomationId="SettingsItemPreferences"
-					Content="{helpers:ResourceString Name=SettingsNavPreferences/Content}"
-					Tag="1">
-					<NavigationViewItem.Icon>
-						<FontIcon FontFamily="{StaticResource CustomGlyph}" Glyph="&#xF116;" />
-					</NavigationViewItem.Icon>
-				</NavigationViewItem>
-				<NavigationViewItem
-					AccessKey="F"
-					AutomationProperties.AutomationId="SettingsItemFolders"
-					Content="{helpers:ResourceString Name=Folders}"
-					Tag="2">
-					<NavigationViewItem.Icon>
-						<FontIcon Glyph="&#xE8B7;" />
-					</NavigationViewItem.Icon>
-				</NavigationViewItem>
-				<NavigationViewItem
-					AccessKey="E"
-					AutomationProperties.AutomationId="SettingsItemAdvanced"
-					Content="{helpers:ResourceString Name=Advanced}"
-					CornerRadius="0"
-					Tag="3">
-					<NavigationViewItem.Icon>
-						<FontIcon Glyph="&#xF1AD;" />
-					</NavigationViewItem.Icon>
-				</NavigationViewItem>
-				<NavigationViewItem
-					AccessKey="B"
-					AutomationProperties.AutomationId="SettingsItemAbout"
-					Content="{helpers:ResourceString Name=About}"
-					Tag="4">
-					<NavigationViewItem.Icon>
-						<FontIcon FontSize="16" Glyph="&#xE946;" />
-					</NavigationViewItem.Icon>
-				</NavigationViewItem>
-			</NavigationView.MenuItems>
+			<NavigationView
+				x:Name="SettingsPane"
+				Grid.Row="1"
+				IsBackButtonVisible="Collapsed"
+				IsBackEnabled="False"
+				IsPaneToggleButtonVisible="False"
+				IsSettingsVisible="False"
+				IsTitleBarAutoPaddingEnabled="False"
+				OpenPaneLength="260"
+				PaneDisplayMode="Left"
+				SelectionChanged="SettingsPane_SelectionChanged">
 
-			<ScrollViewer
-				x:Name="SettingsScrollViewer"
-				VerticalAlignment="Stretch"
-				VerticalScrollBarVisibility="Visible"
-				VerticalScrollMode="Enabled">
-				<Frame x:Name="SettingsContentFrame" Padding="12" />
-			</ScrollViewer>
-		</NavigationView>
-	</Grid>
+				<NavigationView.MenuItems>
+					<NavigationViewItem
+						AccessKey="A"
+						AutomationProperties.AutomationId="SettingsItemAppearance"
+						Content="{helpers:ResourceString Name=Appearance}"
+						IsSelected="True"
+						Tag="0">
+						<NavigationViewItem.Icon>
+							<FontIcon HorizontalAlignment="Left" Glyph="&#xE790;" />
+						</NavigationViewItem.Icon>
+					</NavigationViewItem>
+					<NavigationViewItem
+						AccessKey="P"
+						AutomationProperties.AutomationId="SettingsItemPreferences"
+						Content="{helpers:ResourceString Name=SettingsNavPreferences/Content}"
+						Tag="1">
+						<NavigationViewItem.Icon>
+							<FontIcon FontFamily="{StaticResource CustomGlyph}" Glyph="&#xF116;" />
+						</NavigationViewItem.Icon>
+					</NavigationViewItem>
+					<NavigationViewItem
+						AccessKey="F"
+						AutomationProperties.AutomationId="SettingsItemFolders"
+						Content="{helpers:ResourceString Name=Folders}"
+						Tag="2">
+						<NavigationViewItem.Icon>
+							<FontIcon Glyph="&#xE8B7;" />
+						</NavigationViewItem.Icon>
+					</NavigationViewItem>
+					<NavigationViewItem
+						AccessKey="E"
+						AutomationProperties.AutomationId="SettingsItemAdvanced"
+						Content="{helpers:ResourceString Name=Advanced}"
+						CornerRadius="0"
+						Tag="3">
+						<NavigationViewItem.Icon>
+							<FontIcon Glyph="&#xF1AD;" />
+						</NavigationViewItem.Icon>
+					</NavigationViewItem>
+					<NavigationViewItem
+						AccessKey="B"
+						AutomationProperties.AutomationId="SettingsItemAbout"
+						Content="{helpers:ResourceString Name=About}"
+						Tag="4">
+						<NavigationViewItem.Icon>
+							<FontIcon FontSize="16" Glyph="&#xE946;" />
+						</NavigationViewItem.Icon>
+					</NavigationViewItem>
+				</NavigationView.MenuItems>
+
+				<ScrollViewer
+					x:Name="SettingsScrollViewer"
+					VerticalAlignment="Stretch"
+					VerticalScrollBarVisibility="Visible"
+					VerticalScrollMode="Enabled">
+					<Frame x:Name="SettingsContentFrame" Padding="12" />
+				</ScrollViewer>
+			</NavigationView>
+		</Grid>
+	</Border>
 </ContentDialog>