diff --git a/src/Files.App/Strings/en-US/Resources.resw b/src/Files.App/Strings/en-US/Resources.resw
index 6da36f9ac06a..c11daee4acfa 100644
--- a/src/Files.App/Strings/en-US/Resources.resw
+++ b/src/Files.App/Strings/en-US/Resources.resw
@@ -1893,11 +1893,8 @@
   <data name="canceling" xml:space="preserve">
     <value>canceling</value>
   </data>
-  <data name="OngoingTasksDismissBannerButton.AutomationProperties.Name" xml:space="preserve">
-    <value>Dismiss</value>
-  </data>
-  <data name="OngoingTasksDismissBannerButton.ToolTipService.ToolTip" xml:space="preserve">
-    <value>Dismiss</value>
+  <data name="Clear" xml:space="preserve">
+    <value>Clear</value>
   </data>
   <data name="Widgets" xml:space="preserve">
     <value>Widgets</value>
diff --git a/src/Files.App/UserControls/AddressToolbar.xaml b/src/Files.App/UserControls/AddressToolbar.xaml
index d31f4523b32c..b6734e747c91 100644
--- a/src/Files.App/UserControls/AddressToolbar.xaml
+++ b/src/Files.App/UserControls/AddressToolbar.xaml
@@ -215,50 +215,46 @@
 					</Button.KeyboardAccelerators>
 				</Button>
 
-				<Grid Visibility="{x:Bind OngoingTasksViewModel.AnyBannersPresent, Mode=OneWay}">
-					<Button
-						x:Name="OngoingTasks"
-						Padding="0"
-						AccessKey="T"
-						AutomationProperties.Name="{helpers:ResourceString Name=OngoingTasks}"
-						Style="{StaticResource AddressToolbarButtonStyle}"
-						ToolTipService.ToolTip="{helpers:ResourceString Name=OngoingTasks}">
-						<Button.Content>
-							<Grid>
-								<FontIcon
-									x:Name="OngoingTasksFontIcon"
-									FontSize="16"
-									Glyph="&#xF16A;" />
-								<ProgressRing
-									x:Name="MedianOperationProgressRing"
-									Width="28"
-									Height="28"
-									HorizontalAlignment="Center"
-									VerticalAlignment="Center"
-									x:Load="{x:Bind OngoingTasksViewModel.AnyOperationsOngoing, Mode=OneWay}"
-									IsIndeterminate="False"
-									Value="{x:Bind OngoingTasksViewModel.MedianOperationProgressValue, Mode=OneWay}" />
-							</Grid>
-						</Button.Content>
-						<Button.Flyout>
-							<Flyout contract8Present:ShouldConstrainToRootBounds="False" AutomationProperties.Name="{helpers:ResourceString Name=OngoingTasks}">
-								<uc:OngoingTasksFlyout
-									x:Name="OngoingTasksControl"
-									Width="300"
-									MinHeight="300"
-									MaxHeight="400"
-									x:FieldModifier="public"
-									IsTabStop="True"
-									OngoingTasksViewModel="{x:Bind OngoingTasksViewModel}" />
-							</Flyout>
-						</Button.Flyout>
-					</Button>
-					<InfoBadge
-						x:Name="StatusInfoBadge"
-						HorizontalAlignment="Right"
-						VerticalAlignment="Top"
-						Value="{x:Bind OngoingTasksViewModel.InfoBadgeValue, Mode=OneWay}" />
-				</Grid>
+				<Button
+					x:Name="OngoingTasks"
+					Padding="0"
+					AccessKey="T"
+					AutomationProperties.Name="{helpers:ResourceString Name=OngoingTasks}"
+					Style="{StaticResource AddressToolbarButtonStyle}"
+					ToolTipService.ToolTip="{helpers:ResourceString Name=OngoingTasks}"
+					Visibility="{x:Bind OngoingTasksViewModel.AnyBannersPresent, Mode=OneWay}">
+					<Button.Content>
+						<Grid>
+							<FontIcon
+								x:Name="OngoingTasksFontIcon"
+								x:Load="{x:Bind OngoingTasksViewModel.AnyOperationsOngoing, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}"
+								FontSize="16"
+								Glyph="&#xF16A;" />
+
+							<ProgressRing
+								x:Name="MedianOperationProgressRing"
+								Width="20"
+								Height="20"
+								HorizontalAlignment="Center"
+								VerticalAlignment="Center"
+								x:Load="{x:Bind OngoingTasksViewModel.AnyOperationsOngoing, Mode=OneWay}"
+								IsIndeterminate="False"
+								Value="{x:Bind OngoingTasksViewModel.MedianOperationProgressValue, Mode=OneWay}" />
+						</Grid>
+					</Button.Content>
+					<Button.Flyout>
+						<Flyout contract8Present:ShouldConstrainToRootBounds="False" AutomationProperties.Name="{helpers:ResourceString Name=OngoingTasks}">
+							<uc:OngoingTasksFlyout
+								x:Name="OngoingTasksControl"
+								Width="400"
+								MinHeight="300"
+								MaxHeight="500"
+								x:FieldModifier="public"
+								IsTabStop="True"
+								OngoingTasksViewModel="{x:Bind OngoingTasksViewModel}" />
+						</Flyout>
+					</Button.Flyout>
+				</Button>
 
 				<!--  Install Update Notification  -->
 				<Button
diff --git a/src/Files.App/UserControls/OngoingTasksFlyout.xaml b/src/Files.App/UserControls/OngoingTasksFlyout.xaml
index 85168638d708..c712aa913be1 100644
--- a/src/Files.App/UserControls/OngoingTasksFlyout.xaml
+++ b/src/Files.App/UserControls/OngoingTasksFlyout.xaml
@@ -11,257 +11,126 @@
 	d:DesignWidth="300"
 	mc:Ignorable="d">
 	<UserControl.Resources>
-		<Style x:Key="ListViewItemStyleFixed" TargetType="ListViewItem">
-			<Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
-			<Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}" />
-			<Setter Property="Background" Value="{ThemeResource ListViewItemBackground}" />
-			<Setter Property="Foreground" Value="{ThemeResource ListViewItemForeground}" />
-			<Setter Property="TabNavigation" Value="Local" />
-			<Setter Property="IsHoldingEnabled" Value="True" />
-			<Setter Property="Padding" Value="0" />
-			<Setter Property="Margin" Value="0,2" />
-			<Setter Property="MinHeight" Value="55" />
-			<Setter Property="MaxHeight" Value="70" />
-			<Setter Property="HorizontalContentAlignment" Value="Stretch" />
-			<Setter Property="VerticalContentAlignment" Value="Stretch" />
-			<Setter Property="AllowDrop" Value="False" />
-			<Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
-			<Setter Property="FocusVisualMargin" Value="0" />
-			<Setter Property="Template">
-				<Setter.Value>
-					<ControlTemplate TargetType="ListViewItem">
-						<ListViewItemPresenter
-							x:Name="Root"
-							HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-							VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-							CheckBoxBrush="{ThemeResource ListViewItemCheckBoxBrush}"
-							CheckBrush="{ThemeResource ListViewItemCheckBrush}"
-							CheckMode="{ThemeResource ListViewItemCheckMode}"
-							ContentMargin="{TemplateBinding Padding}"
-							ContentTransitions="{TemplateBinding ContentTransitions}"
-							Control.IsTemplateFocusTarget="True"
-							DisabledOpacity="{ThemeResource ListViewItemDisabledThemeOpacity}"
-							DragBackground="{ThemeResource ListViewItemDragBackground}"
-							DragForeground="{ThemeResource ListViewItemDragForeground}"
-							DragOpacity="{ThemeResource ListViewItemDragThemeOpacity}"
-							FocusBorderBrush="{ThemeResource ListViewItemFocusBorderBrush}"
-							FocusSecondaryBorderBrush="{ThemeResource ListViewItemFocusSecondaryBorderBrush}"
-							FocusVisualMargin="{TemplateBinding FocusVisualMargin}"
-							PlaceholderBackground="{ThemeResource ListViewItemPlaceholderBackground}"
-							PointerOverBackground="{ThemeResource ListViewItemBackgroundPointerOver}"
-							PointerOverForeground="{ThemeResource ListViewItemForegroundPointerOver}"
-							PressedBackground="{ThemeResource ListViewItemBackgroundPressed}"
-							ReorderHintOffset="{ThemeResource ListViewItemReorderHintThemeOffset}"
-							RevealBackground="{ThemeResource ListViewItemRevealBackground}"
-							RevealBorderBrush="{ThemeResource ListViewItemRevealBorderBrush}"
-							RevealBorderThickness="{ThemeResource ListViewItemRevealBorderThemeThickness}"
-							SelectedBackground="{ThemeResource ListViewItemBackgroundSelected}"
-							SelectedForeground="{ThemeResource ListViewItemForegroundSelected}"
-							SelectedPointerOverBackground="{ThemeResource ListViewItemBackgroundSelectedPointerOver}"
-							SelectedPressedBackground="{ThemeResource ListViewItemBackgroundSelectedPressed}"
-							SelectionCheckMarkVisualEnabled="{ThemeResource ListViewItemSelectionCheckMarkVisualEnabled}">
-							<VisualStateManager.VisualStateGroups>
-								<VisualStateGroup x:Name="CommonStates">
-									<VisualState x:Name="Normal" />
-									<VisualState x:Name="Selected" />
-									<VisualState x:Name="PointerOver">
-										<VisualState.Setters>
-											<Setter Target="Root.(RevealBrush.State)" Value="PointerOver" />
-											<Setter Target="Root.RevealBorderBrush" Value="{ThemeResource ListViewItemRevealBorderBrushPointerOver}" />
-										</VisualState.Setters>
-									</VisualState>
-									<VisualState x:Name="PointerOverSelected">
-										<VisualState.Setters>
-											<Setter Target="Root.(RevealBrush.State)" Value="PointerOver" />
-											<Setter Target="Root.RevealBorderBrush" Value="{ThemeResource ListViewItemRevealBorderBrushPointerOver}" />
-										</VisualState.Setters>
-									</VisualState>
-									<VisualState x:Name="PointerOverPressed">
-										<VisualState.Setters>
-											<Setter Target="Root.(RevealBrush.State)" Value="Pressed" />
-											<Setter Target="Root.RevealBorderBrush" Value="{ThemeResource ListViewItemRevealBorderBrushPressed}" />
-										</VisualState.Setters>
-									</VisualState>
-									<VisualState x:Name="Pressed">
-										<VisualState.Setters>
-											<Setter Target="Root.(RevealBrush.State)" Value="Pressed" />
-											<Setter Target="Root.RevealBorderBrush" Value="{ThemeResource ListViewItemRevealBorderBrushPressed}" />
-										</VisualState.Setters>
-									</VisualState>
-									<VisualState x:Name="PressedSelected">
-										<VisualState.Setters>
-											<Setter Target="Root.(RevealBrush.State)" Value="Pressed" />
-											<Setter Target="Root.RevealBorderBrush" Value="{ThemeResource ListViewItemRevealBorderBrushPressed}" />
-										</VisualState.Setters>
-									</VisualState>
-								</VisualStateGroup>
-								<VisualStateGroup x:Name="DisabledStates">
-									<VisualState x:Name="Enabled" />
-									<VisualState x:Name="Disabled">
-										<VisualState.Setters>
-											<Setter Target="Root.RevealBorderThickness" Value="0" />
-										</VisualState.Setters>
-									</VisualState>
-								</VisualStateGroup>
-							</VisualStateManager.VisualStateGroups>
-						</ListViewItemPresenter>
-					</ControlTemplate>
-				</Setter.Value>
-			</Setter>
-		</Style>
-
 		<converters1:BoolNegationConverter x:Key="BoolNegationConverter" />
 	</UserControl.Resources>
 
-	<Grid Margin="-12">
+	<Grid Margin="-16">
 		<Grid.RowDefinitions>
 			<RowDefinition Height="Auto" />
 			<RowDefinition Height="*" />
 		</Grid.RowDefinitions>
 
-		<Grid BorderBrush="{ThemeResource AppBarSeparatorForegroundThemeBrush}" BorderThickness="0,0,0,0.5">
+		<Grid Padding="12">
 			<TextBlock
-				Margin="10,8"
+				VerticalAlignment="Center"
 				FontSize="14"
-				FontWeight="SemiBold"
 				Text="{helpers:ResourceString Name=OngoingTasks}" />
 
 			<Button
 				x:Name="DismissAllBannersButton"
-				Height="32"
+				Height="24"
+				Padding="8,0"
 				HorizontalAlignment="Right"
-				Background="Transparent"
-				BorderBrush="Transparent"
 				Click="DismissAllBannersButton_Click"
 				Content="{helpers:ResourceString Name=ClearAll}"
+				FontSize="12"
 				ToolTipService.ToolTip="{helpers:ResourceString Name=ClearAll}" />
 		</Grid>
 
 		<ListView
 			x:Name="BannerList"
 			Grid.Row="1"
+			Padding="4,0"
 			VerticalAlignment="Stretch"
-			ItemContainerStyle="{StaticResource ListViewItemStyleFixed}"
 			ItemsSource="{x:Bind OngoingTasksViewModel.StatusBannersSource, Mode=OneWay}"
 			SelectionMode="None">
+			<ListView.ItemContainerStyle>
+				<Style BasedOn="{StaticResource DefaultListViewItemStyle}" TargetType="ListViewItem">
+					<Setter Property="Padding" Value="0,2" />
+					<Setter Property="MinHeight" Value="55" />
+				</Style>
+			</ListView.ItemContainerStyle>
+
 			<ListView.ItemTemplate>
 				<DataTemplate x:DataType="models:StatusBanner">
-					<Grid
-						Padding="4"
-						HorizontalAlignment="Stretch"
-						AutomationProperties.Name="{x:Bind FullTitle, Mode=OneWay}"
-						Background="{ThemeResource ControlFillColorDefault}"
-						BorderBrush="{x:Bind StrokeColor}"
-						BorderThickness="4,0,0,0"
-						CornerRadius="{StaticResource ControlCornerRadius}">
-						<Grid ColumnSpacing="8">
-							<Grid.ColumnDefinitions>
-								<ColumnDefinition Width="Auto" />
-								<ColumnDefinition Width="*" />
-								<ColumnDefinition Width="Auto" />
-							</Grid.ColumnDefinitions>
-							<Grid.RowDefinitions>
-								<RowDefinition Height="Auto" />
-								<RowDefinition Height="Auto" />
-							</Grid.RowDefinitions>
-							<Grid
-								Width="32"
-								Padding="4,4,0,0"
-								HorizontalAlignment="Center"
-								VerticalAlignment="Center">
-								<ProgressRing
-									x:Name="ProgressSpinner"
-									Width="28"
-									Height="28"
-									x:Load="{x:Bind IsProgressing, Mode=OneWay}"
-									IsActive="True"
-									IsIndeterminate="{x:Bind IsCancelled, Mode=OneWay}"
-									Value="{x:Bind Progress, Mode=OneWay}" />
-								<FontIcon
-									FontFamily="{x:Bind ((FontIconSource)GlyphSource).FontFamily}"
-									FontSize="14"
-									Glyph="{x:Bind ((FontIconSource)GlyphSource).Glyph}" />
-							</Grid>
-							<StackPanel
-								Grid.Column="1"
-								Height="58"
-								Padding="0,4,0,0"
-								HorizontalAlignment="Stretch"
-								VerticalAlignment="Center"
-								Orientation="Vertical"
-								Spacing="4">
-								<TextBlock
-									HorizontalAlignment="Left"
-									FontSize="12"
-									FontWeight="Medium"
-									Text="{x:Bind FullTitle, Mode=OneWay}" />
-								<TextBlock
-									FontSize="11"
-									MaxLines="2"
-									Text="{x:Bind Message}"
-									TextTrimming="CharacterEllipsis"
-									TextWrapping="WrapWholeWords"
-									ToolTipService.ToolTip="{x:Bind Message}" />
-							</StackPanel>
+					<Grid HorizontalAlignment="Stretch" AutomationProperties.Name="{x:Bind FullTitle, Mode=OneWay}">
+						<InfoBar
+							Title="{x:Bind FullTitle, Mode=OneWay}"
+							Background="{ThemeResource ControlFillColorDefault}"
+							IsClosable="False"
+							IsIconVisible="False"
+							IsOpen="True"
+							Message="{x:Bind Message, Mode=OneWay}"
+							Severity="{x:Bind InfoBarSeverity}">
+
+							<ProgressBar
+								x:Name="ProgressBar"
+								Margin="0,0,12,12"
+								IsIndeterminate="{x:Bind IsCancelled, Mode=OneWay}"
+								Visibility="{x:Bind IsProgressing, Mode=OneWay}"
+								Value="{x:Bind Progress, Mode=OneWay}" />
+						</InfoBar>
+
+						<Button
+							x:Name="DismissBannerButton"
+							Height="24"
+							Margin="8"
+							Padding="8,0"
+							HorizontalAlignment="Right"
+							VerticalAlignment="Top"
+							x:Load="{x:Bind CancelButtonVisible, Converter={StaticResource BoolNegationConverter}}"
+							AutomationProperties.Name="{helpers:ResourceString Name=Clear}"
+							Background="Transparent"
+							BorderBrush="Transparent"
+							Click="DismissBanner"
+							DataContext="{x:Bind}"
+							ToolTipService.ToolTip="{helpers:ResourceString Name=Clear}">
+							<Button.Content>
+								<FontIcon FontSize="11" Glyph="&#xE711;" />
+							</Button.Content>
+						</Button>
+
+						<Button
+							x:Name="CancelBannerButton"
+							Height="24"
+							Margin="8"
+							Padding="8,0"
+							HorizontalAlignment="Right"
+							VerticalAlignment="Top"
+							x:Load="{x:Bind CancelButtonVisible}"
+							AutomationProperties.Name="{helpers:ResourceString Name=Cancel}"
+							Background="Transparent"
+							BorderBrush="Transparent"
+							Command="{x:Bind CancelCommand}"
+							DataContext="{x:Bind}"
+							IsEnabled="{x:Bind IsCancelled, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}"
+							ToolTipService.ToolTip="{helpers:ResourceString Name=Cancel}">
+							<Button.Content>
+								<FontIcon FontSize="11" Glyph="&#xE711;" />
+							</Button.Content>
+						</Button>
+
+						<StackPanel
+							x:Name="solutionButtons"
+							Grid.Row="0"
+							Padding="0,4,0,0"
+							HorizontalAlignment="Right"
+							x:Load="{x:Bind SolutionButtonsVisible}"
+							Orientation="Horizontal"
+							Spacing="8">
 							<Button
-								x:Name="DismissBannerButton"
-								Grid.Column="2"
-								Height="32"
-								HorizontalAlignment="Stretch"
-								VerticalAlignment="Top"
-								x:Load="{x:Bind CancelButtonVisible, Converter={StaticResource BoolNegationConverter}}"
-								AutomationProperties.Name="{helpers:ResourceString Name=OngoingTasksDismissBannerButton/ToolTipService/ToolTip}"
-								Background="Transparent"
-								BorderBrush="Transparent"
-								Click="DismissBanner"
+								Height="28"
+								Click="Button_Click_1"
+								Content="{x:Bind PrimaryButtonText}"
 								DataContext="{x:Bind}"
-								ToolTipService.ToolTip="{helpers:ResourceString Name=OngoingTasksDismissBannerButton/ToolTipService/ToolTip}">
-								<Button.Content>
-									<FontIcon FontSize="11" Glyph="&#xE711;" />
-								</Button.Content>
-							</Button>
-
+								FontSize="10" />
 							<Button
-								x:Name="CancelBannerButton"
-								Grid.Column="2"
-								Height="32"
-								HorizontalAlignment="Stretch"
-								VerticalAlignment="Top"
-								x:Load="{x:Bind CancelButtonVisible}"
-								AutomationProperties.Name="{helpers:ResourceString Name=Cancel}"
-								Background="Transparent"
-								BorderBrush="Transparent"
-								Command="{x:Bind CancelCommand}"
+								Height="28"
+								Click="DismissBanner"
+								Content="{x:Bind SecondaryButtonText}"
 								DataContext="{x:Bind}"
-								IsEnabled="{x:Bind IsCancelled, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}"
-								ToolTipService.ToolTip="{helpers:ResourceString Name=Cancel}">
-								<Button.Content>
-									<FontIcon FontSize="11" Glyph="&#xE711;" />
-								</Button.Content>
-							</Button>
-							<StackPanel
-								x:Name="solutionButtons"
-								Grid.Row="1"
-								Grid.ColumnSpan="3"
-								Padding="0,4,0,0"
-								HorizontalAlignment="Right"
-								x:Load="{x:Bind SolutionButtonsVisible}"
-								Orientation="Horizontal"
-								Spacing="8">
-								<Button
-									Height="28"
-									Click="Button_Click_1"
-									Content="{x:Bind PrimaryButtonText}"
-									DataContext="{x:Bind}"
-									FontSize="10" />
-								<Button
-									Height="28"
-									Click="DismissBanner"
-									Content="{x:Bind SecondaryButtonText}"
-									DataContext="{x:Bind}"
-									FontSize="10" />
-							</StackPanel>
-						</Grid>
+								FontSize="10" />
+						</StackPanel>
 					</Grid>
 				</DataTemplate>
 			</ListView.ItemTemplate>
diff --git a/src/Files.App/UserControls/Widgets/DrivesWidget.xaml b/src/Files.App/UserControls/Widgets/DrivesWidget.xaml
index 2d3ee26ccbf9..eafed80d7ae7 100644
--- a/src/Files.App/UserControls/Widgets/DrivesWidget.xaml
+++ b/src/Files.App/UserControls/Widgets/DrivesWidget.xaml
@@ -6,208 +6,205 @@
 	xmlns:helpers="using:Files.App.Helpers"
 	xmlns:local="using:Files.App.UserControls.Widgets"
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-	Background="{ThemeResource SolidBackgroundFillColorBaseBrush}"
 	mc:Ignorable="d">
-	<Grid>
-		<ItemsRepeater
-			x:Name="CardsList"
-			HorizontalAlignment="Stretch"
-			VerticalAlignment="Top"
-			ItemsSource="{x:Bind local:DrivesWidget.ItemsAdded, Mode=OneWay}">
-			<ItemsRepeater.Layout>
-				<UniformGridLayout
-					ItemsStretch="None"
-					MinColumnSpacing="8"
-					MinItemHeight="72"
-					MinItemWidth="240"
-					MinRowSpacing="8"
-					Orientation="Horizontal" />
-			</ItemsRepeater.Layout>
-			<ItemsRepeater.ItemTemplate>
-				<DataTemplate x:DataType="local:DriveCardItem">
-					<Button
-						Padding="0"
+	<ItemsRepeater
+		x:Name="CardsList"
+		HorizontalAlignment="Stretch"
+		VerticalAlignment="Top"
+		ItemsSource="{x:Bind local:DrivesWidget.ItemsAdded, Mode=OneWay}">
+		<ItemsRepeater.Layout>
+			<UniformGridLayout
+				ItemsStretch="None"
+				MinColumnSpacing="8"
+				MinItemHeight="72"
+				MinItemWidth="240"
+				MinRowSpacing="8"
+				Orientation="Horizontal" />
+		</ItemsRepeater.Layout>
+		<ItemsRepeater.ItemTemplate>
+			<DataTemplate x:DataType="local:DriveCardItem">
+				<Button
+					Padding="0"
+					HorizontalAlignment="Stretch"
+					VerticalAlignment="Stretch"
+					HorizontalContentAlignment="Stretch"
+					VerticalContentAlignment="Stretch"
+					AutomationProperties.Name="{x:Bind Item.Text, Mode=OneWay}"
+					Click="Button_Click"
+					CornerRadius="{StaticResource ControlCornerRadius}"
+					PointerPressed="Button_PointerPressed"
+					Tag="{x:Bind Item.Path}"
+					ToolTipService.ToolTip="{x:Bind Item.Text, Mode=OneWay}">
+					<Button.ContextFlyout>
+						<MenuFlyout Opening="MenuFlyout_Opening">
+							<MenuFlyout.Items>
+								<MenuFlyoutItem
+									x:Name="OpenInNewPane"
+									Click="OpenInNewPane_Click"
+									DataContext="{x:Bind Item}"
+									Text="{helpers:ResourceString Name=SideBarOpenInNewPane/Text}"
+									Visibility="Collapsed">
+									<MenuFlyoutItem.Icon>
+										<FontIcon FontFamily="{StaticResource CustomGlyph}" Glyph="&#xF117;" />
+									</MenuFlyoutItem.Icon>
+								</MenuFlyoutItem>
+								<MenuFlyoutItem
+									x:Name="OpenInNewTab"
+									Click="OpenInNewTab_Click"
+									DataContext="{x:Bind Item}"
+									Text="{helpers:ResourceString Name=SideBarOpenInNewTab/Text}">
+									<MenuFlyoutItem.Icon>
+										<FontIcon FontFamily="{StaticResource CustomGlyph}" Glyph="&#xF113;" />
+									</MenuFlyoutItem.Icon>
+								</MenuFlyoutItem>
+								<MenuFlyoutItem
+									x:Name="OpenInNewWindow"
+									Click="OpenInNewWindow_Click"
+									DataContext="{x:Bind Item}"
+									Text="{helpers:ResourceString Name=SideBarOpenInNewWindow/Text}">
+									<MenuFlyoutItem.Icon>
+										<FontIcon Glyph="&#xE737;" />
+									</MenuFlyoutItem.Icon>
+								</MenuFlyoutItem>
+								<MenuFlyoutItem
+									x:Name="PinToFavorites"
+									Click="PinToFavorites_Click"
+									DataContext="{x:Bind Item}"
+									Text="{helpers:ResourceString Name=BaseLayoutItemContextFlyoutPinToFavorites/Text}"
+									Visibility="Collapsed">
+									<MenuFlyoutItem.Icon>
+										<FontIcon Glyph="&#xE840;" />
+									</MenuFlyoutItem.Icon>
+								</MenuFlyoutItem>
+								<MenuFlyoutItem
+									x:Name="UnpinFromFavorites"
+									Click="UnpinFromFavorites_Click"
+									DataContext="{x:Bind Item}"
+									Text="{helpers:ResourceString Name=BaseLayoutContextFlyoutUnpinFromFavorites/Text}"
+									Visibility="Collapsed">
+									<MenuFlyoutItem.Icon>
+										<FontIcon Glyph="&#xE77A;" />
+									</MenuFlyoutItem.Icon>
+								</MenuFlyoutItem>
+								<MenuFlyoutItem
+									x:Name="PropertiesItem"
+									Click="OpenDriveProperties_Click"
+									DataContext="{x:Bind Item}"
+									Text="{helpers:ResourceString Name=DrivesWidgetContextFlyoutPropertiesMenuItem/Text}">
+									<MenuFlyoutItem.Icon>
+										<FontIcon Glyph="&#xE946;" />
+									</MenuFlyoutItem.Icon>
+								</MenuFlyoutItem>
+								<MenuFlyoutItem
+									x:Name="EjectDevice"
+									x:Load="{x:Bind Item.IsRemovable, Mode=OneWay}"
+									Click="EjectDevice_Click"
+									DataContext="{x:Bind Item}"
+									Text="{helpers:ResourceString Name=SideBarEjectDevice/Text}">
+									<MenuFlyoutItem.Icon>
+										<FontIcon Glyph="&#xF847;" />
+									</MenuFlyoutItem.Icon>
+								</MenuFlyoutItem>
+								<MenuFlyoutItem
+									x:Name="DisconnectNetworkDrive"
+									x:Load="{x:Bind Item.IsNetwork, Mode=OneWay}"
+									Click="DisconnectNetworkDrive_Click"
+									DataContext="{x:Bind Item}"
+									Text="{helpers:ResourceString Name=SideBarDisconnectNetworkDrive/Text}">
+									<MenuFlyoutItem.Icon>
+										<FontIcon Glyph="&#xE8CD;" />
+									</MenuFlyoutItem.Icon>
+								</MenuFlyoutItem>
+							</MenuFlyout.Items>
+						</MenuFlyout>
+					</Button.ContextFlyout>
+					<Grid
+						Margin="8"
 						HorizontalAlignment="Stretch"
 						VerticalAlignment="Stretch"
-						HorizontalContentAlignment="Stretch"
-						VerticalContentAlignment="Stretch"
-						AutomationProperties.Name="{x:Bind Item.Text, Mode=OneWay}"
-						Click="Button_Click"
-						CornerRadius="{StaticResource ControlCornerRadius}"
-						PointerPressed="Button_PointerPressed"
-						Tag="{x:Bind Item.Path}"
-						ToolTipService.ToolTip="{x:Bind Item.Text, Mode=OneWay}">
-						<Button.ContextFlyout>
-							<MenuFlyout Opening="MenuFlyout_Opening">
-								<MenuFlyout.Items>
-									<MenuFlyoutItem
-										x:Name="OpenInNewPane"
-										Click="OpenInNewPane_Click"
-										DataContext="{x:Bind Item}"
-										Text="{helpers:ResourceString Name=SideBarOpenInNewPane/Text}"
-										Visibility="Collapsed">
-										<MenuFlyoutItem.Icon>
-											<FontIcon FontFamily="{StaticResource CustomGlyph}" Glyph="&#xF117;" />
-										</MenuFlyoutItem.Icon>
-									</MenuFlyoutItem>
-									<MenuFlyoutItem
-										x:Name="OpenInNewTab"
-										Click="OpenInNewTab_Click"
-										DataContext="{x:Bind Item}"
-										Text="{helpers:ResourceString Name=SideBarOpenInNewTab/Text}">
-										<MenuFlyoutItem.Icon>
-											<FontIcon FontFamily="{StaticResource CustomGlyph}" Glyph="&#xF113;" />
-										</MenuFlyoutItem.Icon>
-									</MenuFlyoutItem>
-									<MenuFlyoutItem
-										x:Name="OpenInNewWindow"
-										Click="OpenInNewWindow_Click"
-										DataContext="{x:Bind Item}"
-										Text="{helpers:ResourceString Name=SideBarOpenInNewWindow/Text}">
-										<MenuFlyoutItem.Icon>
-											<FontIcon Glyph="&#xE737;" />
-										</MenuFlyoutItem.Icon>
-									</MenuFlyoutItem>
-									<MenuFlyoutItem
-										x:Name="PinToFavorites"
-										Click="PinToFavorites_Click"
-										DataContext="{x:Bind Item}"
-										Text="{helpers:ResourceString Name=BaseLayoutItemContextFlyoutPinToFavorites/Text}"
-										Visibility="Collapsed">
-										<MenuFlyoutItem.Icon>
-											<FontIcon Glyph="&#xE840;" />
-										</MenuFlyoutItem.Icon>
-									</MenuFlyoutItem>
-									<MenuFlyoutItem
-										x:Name="UnpinFromFavorites"
-										Click="UnpinFromFavorites_Click"
-										DataContext="{x:Bind Item}"
-										Text="{helpers:ResourceString Name=BaseLayoutContextFlyoutUnpinFromFavorites/Text}"
-										Visibility="Collapsed">
-										<MenuFlyoutItem.Icon>
-											<FontIcon Glyph="&#xE77A;" />
-										</MenuFlyoutItem.Icon>
-									</MenuFlyoutItem>
-									<MenuFlyoutItem
-										x:Name="PropertiesItem"
-										Click="OpenDriveProperties_Click"
-										DataContext="{x:Bind Item}"
-										Text="{helpers:ResourceString Name=DrivesWidgetContextFlyoutPropertiesMenuItem/Text}">
-										<MenuFlyoutItem.Icon>
-											<FontIcon Glyph="&#xE946;" />
-										</MenuFlyoutItem.Icon>
-									</MenuFlyoutItem>
-									<MenuFlyoutItem
-										x:Name="EjectDevice"
-										x:Load="{x:Bind Item.IsRemovable, Mode=OneWay}"
-										Click="EjectDevice_Click"
-										DataContext="{x:Bind Item}"
-										Text="{helpers:ResourceString Name=SideBarEjectDevice/Text}">
-										<MenuFlyoutItem.Icon>
-											<FontIcon Glyph="&#xF847;" />
-										</MenuFlyoutItem.Icon>
-									</MenuFlyoutItem>
-									<MenuFlyoutItem
-										x:Name="DisconnectNetworkDrive"
-										x:Load="{x:Bind Item.IsNetwork, Mode=OneWay}"
-										Click="DisconnectNetworkDrive_Click"
-										DataContext="{x:Bind Item}"
-										Text="{helpers:ResourceString Name=SideBarDisconnectNetworkDrive/Text}">
-										<MenuFlyoutItem.Icon>
-											<FontIcon Glyph="&#xE8CD;" />
-										</MenuFlyoutItem.Icon>
-									</MenuFlyoutItem>
-								</MenuFlyout.Items>
-							</MenuFlyout>
-						</Button.ContextFlyout>
-						<Grid
-							Margin="8"
+						ColumnSpacing="8">
+						<Grid.ColumnDefinitions>
+							<ColumnDefinition Width="32" />
+							<ColumnDefinition Width="*" />
+							<ColumnDefinition Width="Auto" />
+						</Grid.ColumnDefinitions>
+						<Grid.RowDefinitions>
+							<RowDefinition Height="*" />
+							<RowDefinition Height="*" />
+							<RowDefinition Height="*" />
+						</Grid.RowDefinitions>
+						<Image
+							Grid.RowSpan="3"
+							Grid.Column="0"
+							HorizontalAlignment="Center"
+							VerticalAlignment="Center"
+							x:Phase="1"
+							Source="{x:Bind Thumbnail, Mode=OneWay}"
+							Stretch="Uniform" />
+
+						<TextBlock
+							x:Name="ItemLocationName"
+							Grid.Row="0"
+							Grid.Column="1"
 							HorizontalAlignment="Stretch"
+							VerticalAlignment="Center"
+							FontSize="14"
+							FontWeight="Medium"
+							Text="{x:Bind Item.Text, Mode=OneWay}"
+							TextTrimming="CharacterEllipsis"
+							TextWrapping="NoWrap" />
+
+						<ProgressBar
+							x:Name="DriveSpaceProgressBar"
+							Grid.Row="1"
+							Grid.Column="1"
 							VerticalAlignment="Stretch"
-							ColumnSpacing="8">
-							<Grid.ColumnDefinitions>
-								<ColumnDefinition Width="32" />
-								<ColumnDefinition Width="*" />
-								<ColumnDefinition Width="Auto" />
-							</Grid.ColumnDefinitions>
-							<Grid.RowDefinitions>
-								<RowDefinition Height="*" />
-								<RowDefinition Height="*" />
-								<RowDefinition Height="*" />
-							</Grid.RowDefinitions>
-							<Image
-								Grid.RowSpan="3"
-								Grid.Column="0"
-								HorizontalAlignment="Center"
-								VerticalAlignment="Center"
-								x:Phase="1"
-								Source="{x:Bind Thumbnail, Mode=OneWay}"
-								Stretch="Uniform" />
+							VerticalContentAlignment="Stretch"
+							x:Load="{x:Bind Item.ShowDriveDetails, Mode=OneWay}"
+							AutomationProperties.AccessibilityView="Raw"
+							Maximum="{x:Bind Item.MaxSpace.GigaBytes, Mode=OneWay}"
+							Value="{x:Bind Item.SpaceUsed.GigaBytes, Mode=OneWay}" />
 
-							<TextBlock
-								x:Name="ItemLocationName"
-								Grid.Row="0"
-								Grid.Column="1"
-								HorizontalAlignment="Stretch"
+						<Button
+							x:Name="GoToStorageSense"
+							Grid.RowSpan="3"
+							Grid.Column="2"
+							Width="28"
+							Height="28"
+							Margin="4,0,0,0"
+							Padding="0"
+							HorizontalContentAlignment="Center"
+							VerticalContentAlignment="Center"
+							x:Load="{x:Bind Item.ShowStorageSense, Mode=OneWay}"
+							AutomationProperties.Name="{helpers:ResourceString Name=DrivesWidgetOpenStorageSenseButton/AutomationProperties/Name}"
+							Background="Transparent"
+							BorderBrush="Transparent"
+							Click="GoToStorageSense_Click"
+							Tag="{x:Bind Item.Path}"
+							ToolTipService.ToolTip="{helpers:ResourceString Name=DrivesWidgetOpenStorageSenseButton/ToolTipService/ToolTip}">
+							<FontIcon
+								HorizontalAlignment="Center"
 								VerticalAlignment="Center"
 								FontSize="14"
-								FontWeight="Medium"
-								Text="{x:Bind Item.Text, Mode=OneWay}"
-								TextTrimming="CharacterEllipsis"
-								TextWrapping="NoWrap" />
+								Glyph="&#xE946;" />
+						</Button>
 
-							<ProgressBar
-								x:Name="DriveSpaceProgressBar"
-								Grid.Row="1"
-								Grid.Column="1"
-								VerticalAlignment="Stretch"
-								VerticalContentAlignment="Stretch"
-								x:Load="{x:Bind Item.ShowDriveDetails, Mode=OneWay}"
-								AutomationProperties.AccessibilityView="Raw"
-								Maximum="{x:Bind Item.MaxSpace.GigaBytes, Mode=OneWay}"
-								Value="{x:Bind Item.SpaceUsed.GigaBytes, Mode=OneWay}" />
-
-							<Button
-								x:Name="GoToStorageSense"
-								Grid.RowSpan="3"
-								Grid.Column="2"
-								Width="28"
-								Height="28"
-								Margin="4,0,0,0"
-								Padding="0"
-								HorizontalContentAlignment="Center"
-								VerticalContentAlignment="Center"
-								x:Load="{x:Bind Item.ShowStorageSense, Mode=OneWay}"
-								AutomationProperties.Name="{helpers:ResourceString Name=DrivesWidgetOpenStorageSenseButton/AutomationProperties/Name}"
-								Background="Transparent"
-								BorderBrush="Transparent"
-								Click="GoToStorageSense_Click"
-								Tag="{x:Bind Item.Path}"
-								ToolTipService.ToolTip="{helpers:ResourceString Name=DrivesWidgetOpenStorageSenseButton/ToolTipService/ToolTip}">
-								<FontIcon
-									HorizontalAlignment="Center"
-									VerticalAlignment="Center"
-									FontSize="14"
-									Glyph="&#xE946;" />
-							</Button>
-
-							<TextBlock
-								x:Name="DriveSpaceTextBlock"
-								Grid.Row="2"
-								Grid.Column="1"
-								HorizontalAlignment="Stretch"
-								VerticalAlignment="Center"
-								x:Load="{x:Bind Item.ShowDriveDetails, Mode=OneWay}"
-								x:Phase="1"
-								FontSize="12"
-								Text="{x:Bind Item.SpaceText, Mode=OneWay}"
-								TextTrimming="CharacterEllipsis"
-								TextWrapping="NoWrap"
-								ToolTipService.ToolTip="{x:Bind Item.SpaceText, Mode=OneWay}" />
-						</Grid>
-					</Button>
-				</DataTemplate>
-			</ItemsRepeater.ItemTemplate>
-		</ItemsRepeater>
-	</Grid>
+						<TextBlock
+							x:Name="DriveSpaceTextBlock"
+							Grid.Row="2"
+							Grid.Column="1"
+							HorizontalAlignment="Stretch"
+							VerticalAlignment="Center"
+							x:Load="{x:Bind Item.ShowDriveDetails, Mode=OneWay}"
+							x:Phase="1"
+							FontSize="12"
+							Text="{x:Bind Item.SpaceText, Mode=OneWay}"
+							TextTrimming="CharacterEllipsis"
+							TextWrapping="NoWrap"
+							ToolTipService.ToolTip="{x:Bind Item.SpaceText, Mode=OneWay}" />
+					</Grid>
+				</Button>
+			</DataTemplate>
+		</ItemsRepeater.ItemTemplate>
+	</ItemsRepeater>
 </UserControl>
diff --git a/src/Files.App/UserControls/Widgets/QuickAccessWidget.xaml b/src/Files.App/UserControls/Widgets/QuickAccessWidget.xaml
index 7faeb5718242..fa7c734c42db 100644
--- a/src/Files.App/UserControls/Widgets/QuickAccessWidget.xaml
+++ b/src/Files.App/UserControls/Widgets/QuickAccessWidget.xaml
@@ -6,141 +6,134 @@
 	xmlns:helpers="using:Files.App.Helpers"
 	xmlns:local="using:Files.App.UserControls.Widgets"
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-	Background="{ThemeResource SolidBackgroundFillColorBaseBrush}"
 	mc:Ignorable="d">
-	<Grid>
-		<ItemsRepeater
-			x:Name="CardsList"
-			Grid.Row="0"
-			HorizontalAlignment="Stretch"
-			ItemsSource="{x:Bind ItemsAdded, Mode=OneWay}">
-			<ItemsRepeater.Layout>
-				<UniformGridLayout
-					ItemsStretch="Fill"
-					MaximumRowsOrColumns="6"
-					MinColumnSpacing="8"
-					MinItemHeight="72"
-					MinItemWidth="100"
-					MinRowSpacing="8"
-					Orientation="Horizontal" />
-			</ItemsRepeater.Layout>
-			<ItemsRepeater.ItemTemplate>
-				<DataTemplate x:DataType="local:FolderCardItem">
-					<Button
-						Padding="8"
-						HorizontalAlignment="Stretch"
-						VerticalAlignment="Stretch"
-						HorizontalContentAlignment="Stretch"
-						VerticalContentAlignment="Stretch"
-						AutomationProperties.Name="{x:Bind AutomationProperties}"
-						Command="{x:Bind SelectCommand}"
-						CommandParameter="{x:Bind}"
-						CornerRadius="{StaticResource ControlCornerRadius}"
-						PointerPressed="Button_PointerPressed"
-						Tag="{x:Bind Path}">
-						<Button.ContextFlyout>
-							<MenuFlyout Opening="MenuFlyout_Opening">
-								<MenuFlyout.Items>
-									<MenuFlyoutItem
-										x:Name="OpenInNewPane"
-										x:Load="{x:Bind HasPath}"
-										Click="OpenInNewPane_Click"
-										DataContext="{x:Bind}"
-										Text="{helpers:ResourceString Name=SideBarOpenInNewPane/Text}"
-										Visibility="Collapsed">
-										<MenuFlyoutItem.Icon>
-											<FontIcon FontFamily="{StaticResource CustomGlyph}" Glyph="&#xF117;" />
-										</MenuFlyoutItem.Icon>
-									</MenuFlyoutItem>
-									<MenuFlyoutItem
-										x:Name="OpenInNewTab"
-										x:Load="{x:Bind HasPath}"
-										Click="OpenInNewTab_Click"
-										DataContext="{x:Bind}"
-										Text="{helpers:ResourceString Name=SideBarOpenInNewTab/Text}">
-										<MenuFlyoutItem.Icon>
-											<FontIcon FontFamily="{StaticResource CustomGlyph}" Glyph="&#xF113;" />
-										</MenuFlyoutItem.Icon>
-									</MenuFlyoutItem>
-									<MenuFlyoutItem
-										x:Name="OpenInNewWindow"
-										x:Load="{x:Bind HasPath}"
-										Click="OpenInNewWindow_Click"
-										DataContext="{x:Bind}"
-										Text="{helpers:ResourceString Name=SideBarOpenInNewWindow/Text}">
-										<MenuFlyoutItem.Icon>
-											<FontIcon Glyph="&#xE737;" />
-										</MenuFlyoutItem.Icon>
-									</MenuFlyoutItem>
-									<MenuFlyoutItem
-										x:Name="PinToFavorites"
-										Click="PinToFavorites_Click"
-										DataContext="{x:Bind}"
-										Text="{helpers:ResourceString Name=BaseLayoutItemContextFlyoutPinToFavorites/Text}"
-										Visibility="Collapsed">
-										<MenuFlyoutItem.Icon>
-											<FontIcon Glyph="&#xE840;" />
-										</MenuFlyoutItem.Icon>
-									</MenuFlyoutItem>
-									<MenuFlyoutItem
-										x:Name="UnpinFromFavorites"
-										Click="UnpinFromFavorites_Click"
-										DataContext="{x:Bind}"
-										Text="{helpers:ResourceString Name=BaseLayoutContextFlyoutUnpinFromFavorites/Text}"
-										Visibility="Collapsed">
-										<MenuFlyoutItem.Icon>
-											<FontIcon Glyph="&#xE77A;" />
-										</MenuFlyoutItem.Icon>
-									</MenuFlyoutItem>
-									<MenuFlyoutItem
-										x:Name="Properties"
-										Click="OpenProperties_Click"
-										DataContext="{x:Bind}"
-										Text="{helpers:ResourceString Name=BaseLayoutContextFlyoutPropertiesFolder/Text}">
-										<MenuFlyoutItem.Icon>
-											<FontIcon Glyph="&#xE946;" />
-										</MenuFlyoutItem.Icon>
-									</MenuFlyoutItem>
-								</MenuFlyout.Items>
-							</MenuFlyout>
-						</Button.ContextFlyout>
-						<Grid
-							HorizontalAlignment="Stretch"
-							VerticalAlignment="Stretch"
-							RowSpacing="0">
-							<Grid.RowDefinitions>
-								<RowDefinition Height="*" />
-								<RowDefinition Height="Auto" />
-							</Grid.RowDefinitions>
-							<FontIcon
-								x:Name="PinIcon"
-								HorizontalAlignment="Right"
-								VerticalAlignment="Top"
-								FontSize="12"
-								Glyph="&#xE840;"
-								x:Load="{x:Bind IsPinned, Mode=OneWay}" />
-							<Image
-								Grid.Row="0"
-								Width="32"
-								Height="32"
-								HorizontalAlignment="Center"
-								VerticalAlignment="Center"
-								Source="{x:Bind Thumbnail, Mode=OneWay}"
-								Stretch="Uniform" />
-							<TextBlock
-								x:Name="ItemLocationName"
-								Grid.Row="1"
-								HorizontalAlignment="Center"
-								VerticalAlignment="Center"
-								FontSize="14"
-								HorizontalTextAlignment="Center"
-								Text="{x:Bind Text}"
-								TextTrimming="WordEllipsis"
-								TextWrapping="NoWrap" />
-						</Grid>
-					</Button>
-				</DataTemplate>
-			</ItemsRepeater.ItemTemplate>
-		</ItemsRepeater>
-	</Grid>
+	<ItemsRepeater
+		x:Name="CardsList"
+		HorizontalAlignment="Stretch"
+		ItemsSource="{x:Bind ItemsAdded, Mode=OneWay}">
+		<ItemsRepeater.Layout>
+			<UniformGridLayout
+				ItemsStretch="Fill"
+				MaximumRowsOrColumns="6"
+				MinColumnSpacing="8"
+				MinItemHeight="72"
+				MinItemWidth="100"
+				MinRowSpacing="8"
+				Orientation="Horizontal" />
+		</ItemsRepeater.Layout>
+		<ItemsRepeater.ItemTemplate>
+			<DataTemplate x:DataType="local:FolderCardItem">
+				<Button
+					Padding="8"
+					HorizontalAlignment="Stretch"
+					VerticalAlignment="Stretch"
+					HorizontalContentAlignment="Stretch"
+					VerticalContentAlignment="Stretch"
+					AutomationProperties.Name="{x:Bind AutomationProperties}"
+					Command="{x:Bind SelectCommand}"
+					CommandParameter="{x:Bind}"
+					CornerRadius="{StaticResource ControlCornerRadius}"
+					PointerPressed="Button_PointerPressed"
+					Tag="{x:Bind Path}">
+					<Button.ContextFlyout>
+						<MenuFlyout Opening="MenuFlyout_Opening">
+							<MenuFlyout.Items>
+								<MenuFlyoutItem
+									x:Name="OpenInNewPane"
+									x:Load="{x:Bind HasPath}"
+									Click="OpenInNewPane_Click"
+									DataContext="{x:Bind}"
+									Text="{helpers:ResourceString Name=SideBarOpenInNewPane/Text}"
+									Visibility="Collapsed">
+									<MenuFlyoutItem.Icon>
+										<FontIcon FontFamily="{StaticResource CustomGlyph}" Glyph="&#xF117;" />
+									</MenuFlyoutItem.Icon>
+								</MenuFlyoutItem>
+								<MenuFlyoutItem
+									x:Name="OpenInNewTab"
+									x:Load="{x:Bind HasPath}"
+									Click="OpenInNewTab_Click"
+									DataContext="{x:Bind}"
+									Text="{helpers:ResourceString Name=SideBarOpenInNewTab/Text}">
+									<MenuFlyoutItem.Icon>
+										<FontIcon FontFamily="{StaticResource CustomGlyph}" Glyph="&#xF113;" />
+									</MenuFlyoutItem.Icon>
+								</MenuFlyoutItem>
+								<MenuFlyoutItem
+									x:Name="OpenInNewWindow"
+									x:Load="{x:Bind HasPath}"
+									Click="OpenInNewWindow_Click"
+									DataContext="{x:Bind}"
+									Text="{helpers:ResourceString Name=SideBarOpenInNewWindow/Text}">
+									<MenuFlyoutItem.Icon>
+										<FontIcon Glyph="&#xE737;" />
+									</MenuFlyoutItem.Icon>
+								</MenuFlyoutItem>
+								<MenuFlyoutItem
+									x:Name="PinToFavorites"
+									Click="PinToFavorites_Click"
+									DataContext="{x:Bind}"
+									Text="{helpers:ResourceString Name=BaseLayoutItemContextFlyoutPinToFavorites/Text}"
+									Visibility="Collapsed">
+									<MenuFlyoutItem.Icon>
+										<FontIcon Glyph="&#xE840;" />
+									</MenuFlyoutItem.Icon>
+								</MenuFlyoutItem>
+								<MenuFlyoutItem
+									x:Name="UnpinFromFavorites"
+									Click="UnpinFromFavorites_Click"
+									DataContext="{x:Bind}"
+									Text="{helpers:ResourceString Name=BaseLayoutContextFlyoutUnpinFromFavorites/Text}"
+									Visibility="Collapsed">
+									<MenuFlyoutItem.Icon>
+										<FontIcon Glyph="&#xE77A;" />
+									</MenuFlyoutItem.Icon>
+								</MenuFlyoutItem>
+								<MenuFlyoutItem
+									x:Name="Properties"
+									Click="OpenProperties_Click"
+									DataContext="{x:Bind}"
+									Text="{helpers:ResourceString Name=BaseLayoutContextFlyoutPropertiesFolder/Text}">
+									<MenuFlyoutItem.Icon>
+										<FontIcon Glyph="&#xE946;" />
+									</MenuFlyoutItem.Icon>
+								</MenuFlyoutItem>
+							</MenuFlyout.Items>
+						</MenuFlyout>
+					</Button.ContextFlyout>
+					<Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+						<Grid.RowDefinitions>
+							<RowDefinition Height="*" />
+							<RowDefinition Height="Auto" />
+						</Grid.RowDefinitions>
+						<FontIcon
+							x:Name="PinIcon"
+							HorizontalAlignment="Right"
+							VerticalAlignment="Top"
+							x:Load="{x:Bind IsPinned, Mode=OneWay}"
+							FontSize="12"
+							Glyph="&#xE840;" />
+						<Image
+							Grid.Row="0"
+							Width="32"
+							Height="32"
+							HorizontalAlignment="Center"
+							VerticalAlignment="Center"
+							Source="{x:Bind Thumbnail, Mode=OneWay}"
+							Stretch="Uniform" />
+						<TextBlock
+							x:Name="ItemLocationName"
+							Grid.Row="1"
+							HorizontalAlignment="Center"
+							VerticalAlignment="Center"
+							FontSize="14"
+							HorizontalTextAlignment="Center"
+							Text="{x:Bind Text}"
+							TextTrimming="WordEllipsis"
+							TextWrapping="NoWrap" />
+					</Grid>
+				</Button>
+			</DataTemplate>
+		</ItemsRepeater.ItemTemplate>
+	</ItemsRepeater>
 </UserControl>
\ No newline at end of file
diff --git a/src/Files.App/UserControls/Widgets/RecentFilesWidget.xaml b/src/Files.App/UserControls/Widgets/RecentFilesWidget.xaml
index 41492c90a3dc..c621d15b392f 100644
--- a/src/Files.App/UserControls/Widgets/RecentFilesWidget.xaml
+++ b/src/Files.App/UserControls/Widgets/RecentFilesWidget.xaml
@@ -10,26 +10,28 @@
 	Background="{ThemeResource SolidBackgroundFillColorBaseBrush}"
 	mc:Ignorable="d">
 
-	<StackPanel
-		x:Name="RecentsListGrid"
-		MinHeight="200"
-		Orientation="Vertical"
-		Spacing="4">
+	<StackPanel x:Name="RecentsListGrid" Orientation="Vertical">
+		<!--  Message when recent files are disabled in File Explorer  -->
 		<muxc:InfoBar
+			x:Name="RecentFilesDisabledOnWindowsWarning"
+			x:Load="{x:Bind IsRecentFilesDisabledInWindows, Mode=OneWay}"
 			IsClosable="False"
 			IsIconVisible="True"
 			IsOpen="True"
 			Message="{helpers:ResourceString Name=RecentFilesDisabledOnWindowsWarning}"
-			Severity="Warning"
-			Visibility="{x:Bind IsRecentFilesDisabledInWindows, Mode=OneWay}" />
+			Severity="Warning" />
+
+		<!--  Message when there are no recent files to display  -->
 		<TextBlock
 			x:Name="RecentItemDescription"
 			HorizontalAlignment="Stretch"
+			x:Load="{x:Bind IsEmptyRecentsTextVisible, Mode=OneWay}"
 			FontSize="14"
 			Text="{helpers:ResourceString Name=RecentItemDescription/Text}"
 			TextAlignment="Center"
-			TextWrapping="WrapWholeWords"
-			Visibility="{x:Bind EmptyRecentsTextVisibility, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+			TextWrapping="WrapWholeWords" />
+
+		<!--  List of recent files  -->
 		<ListView
 			x:Name="RecentsView"
 			HorizontalAlignment="Stretch"
@@ -53,7 +55,6 @@
 						HorizontalAlignment="Stretch"
 						VerticalAlignment="Stretch"
 						AutomationProperties.Name="{x:Bind Name}"
-						Background="Transparent"
 						ColumnSpacing="14"
 						ToolTipService.ToolTip="{x:Bind RecentPath}">
 						<Grid.ContextFlyout>
diff --git a/src/Files.App/UserControls/Widgets/RecentFilesWidget.xaml.cs b/src/Files.App/UserControls/Widgets/RecentFilesWidget.xaml.cs
index a161f6215bc2..9338f1284c1b 100644
--- a/src/Files.App/UserControls/Widgets/RecentFilesWidget.xaml.cs
+++ b/src/Files.App/UserControls/Widgets/RecentFilesWidget.xaml.cs
@@ -50,16 +50,16 @@ public sealed partial class RecentFilesWidget : UserControl, IWidgetItemModel, I
 
 		public MenuFlyoutItem? MenuFlyoutItem => null;
 
-		private Visibility emptyRecentsTextVisibility = Visibility.Collapsed;
-		public Visibility EmptyRecentsTextVisibility
+		private bool isEmptyRecentsTextVisible = false;
+		public bool IsEmptyRecentsTextVisible
 		{
-			get => emptyRecentsTextVisibility;
+			get => isEmptyRecentsTextVisible;
 			internal set
 			{
-				if (emptyRecentsTextVisibility != value)
+				if (isEmptyRecentsTextVisible != value)
 				{
-					emptyRecentsTextVisibility = value;
-					NotifyPropertyChanged(nameof(EmptyRecentsTextVisibility));
+					isEmptyRecentsTextVisible = value;
+					NotifyPropertyChanged(nameof(IsEmptyRecentsTextVisible));
 				}
 			}
 		}
@@ -138,7 +138,7 @@ private async Task UpdateRecentsList(NotifyCollectionChangedEventArgs e)
 				refreshRecentsCTS.Cancel();
 				refreshRecentsCTS = new CancellationTokenSource();
 
-				EmptyRecentsTextVisibility = Visibility.Collapsed;
+				IsEmptyRecentsTextVisible = false;
 
 				switch (e.Action)
 				{
@@ -184,7 +184,7 @@ private async Task UpdateRecentsList(NotifyCollectionChangedEventArgs e)
 				// update chevron if there aren't any items
 				if (recentItemsCollection.Count == 0 && !IsRecentFilesDisabledInWindows)
 				{
-					EmptyRecentsTextVisibility = Visibility.Visible;
+					IsEmptyRecentsTextVisible = true;
 				}
 			}
 			catch (Exception ex)
@@ -253,7 +253,7 @@ private async void ClearRecentItems_Click(object sender, RoutedEventArgs e)
 
 				if (success)
 				{
-					EmptyRecentsTextVisibility = Visibility.Visible;
+					IsEmptyRecentsTextVisible = true;
 				}
 			}
 			finally
diff --git a/src/Files.App/ViewModels/StatusCenterViewModel.cs b/src/Files.App/ViewModels/StatusCenterViewModel.cs
index 9c6c87d89d95..f112e9c6b48d 100644
--- a/src/Files.App/ViewModels/StatusCenterViewModel.cs
+++ b/src/Files.App/ViewModels/StatusCenterViewModel.cs
@@ -335,9 +335,7 @@ public ReturnResult Status
 
 		public string Message { get; private set; }
 
-		public SolidColorBrush StrokeColor { get; private set; } = new SolidColorBrush(Colors.DeepSkyBlue);
-
-		public IconSource GlyphSource { get; private set; }
+		public InfoBarSeverity InfoBarSeverity { get; private set; } = InfoBarSeverity.Informational;
 
 		public string PrimaryButtonText { get; set; }
 
@@ -388,52 +386,26 @@ public StatusBanner(string message, string title, float progress, ReturnResult s
 						{
 							case FileOperationType.Extract:
 								Title = "ExtractInProgress/Title".GetLocalizedResource();
-								GlyphSource = new FontIconSource()
-								{
-									FontFamily = Application.Current.Resources["CustomGlyph"] as FontFamily,
-									Glyph = "\xF11A"    // Extract glyph
-								};
 								break;
 
 							case FileOperationType.Copy:
 								Title = "CopyInProgress/Title".GetLocalizedResource();
-								GlyphSource = new FontIconSource()
-								{
-									Glyph = "\xE8C8"    // Copy glyph
-								};
 								break;
 
 							case FileOperationType.Move:
 								Title = "MoveInProgress".GetLocalizedResource();
-								GlyphSource = new FontIconSource()
-								{
-									Glyph = "\xE77F"    // Move glyph
-								};
 								break;
 
 							case FileOperationType.Delete:
 								Title = "DeleteInProgress/Title".GetLocalizedResource();
-								GlyphSource = new FontIconSource()
-								{
-									Glyph = "\xE74D"    // Delete glyph
-								};
 								break;
 
 							case FileOperationType.Recycle:
 								Title = "RecycleInProgress/Title".GetLocalizedResource();
-								GlyphSource = new FontIconSource()
-								{
-									FontFamily = Application.Current.Resources["RecycleBinIcons"] as FontFamily,
-									Glyph = "\xEF87"    // RecycleBin Custom Glyph
-								};
 								break;
 
 							case FileOperationType.Prepare:
 								Title = "PrepareInProgress".GetLocalizedResource();
-								GlyphSource = new FontIconSource()
-								{
-									Glyph = "\xE89A"
-								};
 								break;
 						}
 					}
@@ -449,11 +421,7 @@ public StatusBanner(string message, string title, float progress, ReturnResult s
 					else
 					{
 						FullTitle = Title;
-						StrokeColor = new SolidColorBrush(Colors.Green);
-						GlyphSource = new FontIconSource()
-						{
-							Glyph = "\xE73E"    // CheckMark glyph
-						};
+						InfoBarSeverity = InfoBarSeverity.Success;
 					}
 					break;
 
@@ -468,11 +436,7 @@ public StatusBanner(string message, string title, float progress, ReturnResult s
 					{
 						// Expanded banner
 						FullTitle = Title;
-						StrokeColor = new SolidColorBrush(Colors.Red);
-						GlyphSource = new FontIconSource()
-						{
-							Glyph = "\xE783"    // Error glyph
-						};
+						InfoBarSeverity = InfoBarSeverity.Error;
 					}
 					break;
 			}
@@ -509,11 +473,7 @@ public StatusBanner(string message, string title, string primaryButtonText, stri
 
 				// Expanded banner
 				FullTitle = Title;
-				StrokeColor = new SolidColorBrush(Colors.Red);
-				GlyphSource = new FontIconSource()
-				{
-					Glyph = "\xE783" // Error glyph
-				};
+				InfoBarSeverity = InfoBarSeverity.Error;
 			}
 		}
 
diff --git a/src/Files.App/Views/SettingsPages/About.xaml b/src/Files.App/Views/SettingsPages/About.xaml
index adf0b3473c7e..b0e8ae022aeb 100644
--- a/src/Files.App/Views/SettingsPages/About.xaml
+++ b/src/Files.App/Views/SettingsPages/About.xaml
@@ -37,13 +37,11 @@
 				<local:SettingsBlockControl.Icon>
 					<FontIcon Glyph="&#xE946;" />
 				</local:SettingsBlockControl.Icon>
-				<Button
-					x:Name="CopyVersionInfo"
-					Content="{helpers:ResourceString Name=Copy}">
+				<Button x:Name="CopyVersionInfo" Content="{helpers:ResourceString Name=Copy}">
 					<Button.Flyout>
 						<MenuFlyout>
-							<MenuFlyoutItem Text="{helpers:ResourceString Name=AppVersion}" Command="{x:Bind ViewModel.CopyAppVersionCommand}"/>
-							<MenuFlyoutItem Text="{helpers:ResourceString Name=WindowsVersion}" Command="{x:Bind ViewModel.CopyWindowsVersionCommand}"/>
+							<MenuFlyoutItem Command="{x:Bind ViewModel.CopyAppVersionCommand}" Text="{helpers:ResourceString Name=AppVersion}" />
+							<MenuFlyoutItem Command="{x:Bind ViewModel.CopyWindowsVersionCommand}" Text="{helpers:ResourceString Name=WindowsVersion}" />
 						</MenuFlyout>
 					</Button.Flyout>
 				</Button>
diff --git a/src/Files.App/Views/SettingsPages/Appearance.xaml b/src/Files.App/Views/SettingsPages/Appearance.xaml
index cc8b9c5159a1..8b59065fdc1a 100644
--- a/src/Files.App/Views/SettingsPages/Appearance.xaml
+++ b/src/Files.App/Views/SettingsPages/Appearance.xaml
@@ -185,7 +185,7 @@
 					IsOn="{x:Bind ViewModel.DisplayEditTagsMenu, Mode=TwoWay}"
 					Style="{StaticResource RightAlignedToggleSwitchStyle}" />
 			</local:SettingsBlockControl>
-			
+
 			<!--  Overflow Options  -->
 			<local:SettingsBlockControl Title="{helpers:ResourceString Name=SettingsContextMenuOverflow}" HorizontalAlignment="Stretch">
 				<local:SettingsBlockControl.Icon>
diff --git a/src/Files.App/Views/SettingsPages/Preferences.xaml b/src/Files.App/Views/SettingsPages/Preferences.xaml
index d0c9c1b7d9ef..600627677071 100644
--- a/src/Files.App/Views/SettingsPages/Preferences.xaml
+++ b/src/Files.App/Views/SettingsPages/Preferences.xaml
@@ -245,7 +245,7 @@
 								IsOn="{x:Bind ViewModel.ShowBundlesWidget, Mode=TwoWay}"
 								Style="{StaticResource RightAlignedToggleSwitchStyle}" />
 						</local:SettingsBlockControl>
-						
+
 						<local:SettingsBlockControl Title="{helpers:ResourceString Name=FileTags}" HorizontalAlignment="Stretch">
 							<ToggleSwitch
 								AutomationProperties.Name="{helpers:ResourceString Name=FileTags}"