diff --git a/src/Files.App/Styles/StatusCenterInfoBadgeStyles.xaml b/src/Files.App/Styles/StatusCenterInfoBadgeStyles.xaml
new file mode 100644
index 000000000000..744569cd754f
--- /dev/null
+++ b/src/Files.App/Styles/StatusCenterInfoBadgeStyles.xaml
@@ -0,0 +1,184 @@
+<!--  Copyright (c) Files Community. Licensed under the MIT License.  -->
+<ResourceDictionary
+	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	xmlns:converters="using:Files.App.Converters"
+	xmlns:wctconverters="using:CommunityToolkit.WinUI.Converters">
+
+	<Style x:Key="DefaultInfoBadgeStyle" TargetType="InfoBadge">
+		<Setter Property="MinHeight" Value="{ThemeResource InfoBadgeMinHeight}" />
+		<Setter Property="MinWidth" Value="{ThemeResource InfoBadgeMinWidth}" />
+		<Setter Property="MaxHeight" Value="{ThemeResource InfoBadgeMaxHeight}" />
+		<Setter Property="Background" Value="{ThemeResource InfoBadgeBackground}" />
+		<Setter Property="Foreground" Value="{ThemeResource InfoBadgeForeground}" />
+		<Setter Property="Padding" Value="{ThemeResource InfoBadgePadding}" />
+		<Setter Property="IsTabStop" Value="False" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="InfoBadge">
+					<Grid
+						x:Name="RootGrid"
+						Padding="{TemplateBinding Padding}"
+						Background="{TemplateBinding Background}"
+						CornerRadius="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.InfoBadgeCornerRadius}">
+						<TextBlock
+							x:Name="ValueTextBlock"
+							HorizontalAlignment="Center"
+							VerticalAlignment="Center"
+							FontSize="{ThemeResource InfoBadgeValueFontSize}"
+							Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Value, Mode=OneWay}"
+							Visibility="Collapsed" />
+						<Viewbox
+							x:Name="IconPresenter"
+							HorizontalAlignment="Center"
+							VerticalAlignment="Stretch"
+							Visibility="Collapsed">
+							<IconSourceElement IconSource="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=IconSource, Mode=OneWay}" />
+						</Viewbox>
+						<VisualStateManager.VisualStateGroups>
+							<VisualStateGroup x:Name="DisplayKindStates">
+								<VisualState x:Name="Dot" />
+								<VisualState x:Name="Icon">
+									<VisualState.Setters>
+										<Setter Target="IconPresenter.Visibility" Value="Visible" />
+										<Setter Target="IconPresenter.Margin" Value="{ThemeResource IconInfoBadgeIconMargin}" />
+									</VisualState.Setters>
+								</VisualState>
+								<VisualState x:Name="FontIcon">
+									<VisualState.Setters>
+										<Setter Target="IconPresenter.Visibility" Value="Visible" />
+										<Setter Target="IconPresenter.Margin" Value="{ThemeResource IconInfoBadgeFontIconMargin}" />
+									</VisualState.Setters>
+								</VisualState>
+								<VisualState x:Name="Value">
+									<VisualState.Setters>
+										<Setter Target="ValueTextBlock.Visibility" Value="Visible" />
+										<Setter Target="ValueTextBlock.Margin" Value="{ThemeResource ValueInfoBadgeTextMargin}" />
+									</VisualState.Setters>
+								</VisualState>
+							</VisualStateGroup>
+						</VisualStateManager.VisualStateGroups>
+					</Grid>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+
+	<Style
+		x:Key="AttentionDotInfoBadgeStyle"
+		BasedOn="{StaticResource DefaultInfoBadgeStyle}"
+		TargetType="InfoBadge">
+		<Setter Property="Background" Value="{ThemeResource SystemFillColorAttentionBrush}" />
+	</Style>
+
+	<Style
+		x:Key="AttentionValueInfoBadgeStyle"
+		BasedOn="{StaticResource AttentionDotInfoBadgeStyle}"
+		TargetType="InfoBadge" />
+
+	<Style
+		x:Key="AttentionIconInfoBadgeStyle"
+		BasedOn="{StaticResource AttentionDotInfoBadgeStyle}"
+		TargetType="InfoBadge">
+		<Setter Property="Padding" Value="0,4,0,2" />
+		<Setter Property="IconSource">
+			<Setter.Value>
+				<FontIconSource Glyph="&#xEA38;" />
+			</Setter.Value>
+		</Setter>
+	</Style>
+
+	<Style
+		x:Key="InformationalDotInfoBadgeStyle"
+		BasedOn="{StaticResource DefaultInfoBadgeStyle}"
+		TargetType="InfoBadge">
+		<Setter Property="Background" Value="{ThemeResource SystemFillColorSolidNeutralBrush}" />
+	</Style>
+
+	<Style
+		x:Key="InformationalValueInfoBadgeStyle"
+		BasedOn="{StaticResource InformationalDotInfoBadgeStyle}"
+		TargetType="InfoBadge" />
+
+	<Style
+		x:Key="InformationalIconInfoBadgeStyle"
+		BasedOn="{StaticResource InformationalDotInfoBadgeStyle}"
+		TargetType="InfoBadge">
+		<Setter Property="Padding" Value="0,4,0,2" />
+		<Setter Property="IconSource">
+			<Setter.Value>
+				<FontIconSource Glyph="&#xF13F;" />
+			</Setter.Value>
+		</Setter>
+	</Style>
+
+	<Style
+		x:Key="SuccessDotInfoBadgeStyle"
+		BasedOn="{StaticResource DefaultInfoBadgeStyle}"
+		TargetType="InfoBadge">
+		<Setter Property="Background" Value="{ThemeResource SystemFillColorSuccessBrush}" />
+	</Style>
+
+	<Style
+		x:Key="SuccessValueInfoBadgeStyle"
+		BasedOn="{StaticResource SuccessDotInfoBadgeStyle}"
+		TargetType="InfoBadge" />
+
+	<Style
+		x:Key="SuccessIconInfoBadgeStyle"
+		BasedOn="{StaticResource SuccessDotInfoBadgeStyle}"
+		TargetType="InfoBadge">
+		<Setter Property="IconSource">
+			<Setter.Value>
+				<SymbolIconSource Symbol="Accept" />
+			</Setter.Value>
+		</Setter>
+	</Style>
+
+	<Style
+		x:Key="CautionDotInfoBadgeStyle"
+		BasedOn="{StaticResource DefaultInfoBadgeStyle}"
+		TargetType="InfoBadge">
+		<Setter Property="Background" Value="{ThemeResource SystemFillColorCautionBrush}" />
+	</Style>
+
+	<Style
+		x:Key="CautionValueInfoBadgeStyle"
+		BasedOn="{StaticResource CautionDotInfoBadgeStyle}"
+		TargetType="InfoBadge" />
+
+	<Style
+		x:Key="CautionIconInfoBadgeStyle"
+		BasedOn="{StaticResource CautionDotInfoBadgeStyle}"
+		TargetType="InfoBadge">
+		<Setter Property="IconSource">
+			<Setter.Value>
+				<SymbolIconSource Symbol="Important" />
+			</Setter.Value>
+		</Setter>
+	</Style>
+
+	<Style
+		x:Key="CriticalDotInfoBadgeStyle"
+		BasedOn="{StaticResource DefaultInfoBadgeStyle}"
+		TargetType="InfoBadge">
+		<Setter Property="Background" Value="{ThemeResource SystemFillColorCriticalBrush}" />
+	</Style>
+
+	<Style
+		x:Key="CriticalValueInfoBadgeStyle"
+		BasedOn="{StaticResource CriticalDotInfoBadgeStyle}"
+		TargetType="InfoBadge" />
+
+	<Style
+		x:Key="CriticalIconInfoBadgeStyle"
+		BasedOn="{StaticResource CriticalDotInfoBadgeStyle}"
+		TargetType="InfoBadge">
+		<Setter Property="IconSource">
+			<Setter.Value>
+				<SymbolIconSource Symbol="Cancel" />
+			</Setter.Value>
+		</Setter>
+	</Style>
+
+</ResourceDictionary>
diff --git a/src/Files.App/UserControls/NavigationToolbar.xaml b/src/Files.App/UserControls/NavigationToolbar.xaml
index a44bb56ffa46..85a9f176cbc0 100644
--- a/src/Files.App/UserControls/NavigationToolbar.xaml
+++ b/src/Files.App/UserControls/NavigationToolbar.xaml
@@ -20,8 +20,6 @@
 	xmlns:vm="using:Files.App.ViewModels.UserControls"
 	x:Name="NavToolbar"
 	Height="50"
-	d:DesignHeight="50"
-	d:DesignWidth="800"
 	Loading="NavToolbar_Loading"
 	mc:Ignorable="d">
 
@@ -32,6 +30,7 @@
 
 			<ResourceDictionary.MergedDictionaries>
 				<ResourceDictionary Source="ms-appx:///UserControls/KeyboardShortcut/KeyboardShortcut.xaml" />
+				<ResourceDictionary Source="ms-appx:///Styles/StatusCenterInfoBadgeStyles.xaml" />
 
 				<ResourceDictionary>
 					<SolidColorBrush x:Key="ButtonBorderBrushDisabled" Color="Transparent" />
@@ -50,476 +49,318 @@
 						<Setter Property="Foreground" Value="{ThemeResource App.Theme.IconBaseBrush}" />
 					</Style>
 
-					<Style x:Key="DefaultInfoBadgeStyle" TargetType="InfoBadge">
-						<Setter Property="MinHeight" Value="{ThemeResource InfoBadgeMinHeight}" />
-						<Setter Property="MinWidth" Value="{ThemeResource InfoBadgeMinWidth}" />
-						<Setter Property="MaxHeight" Value="{ThemeResource InfoBadgeMaxHeight}" />
-						<Setter Property="Background" Value="{ThemeResource InfoBadgeBackground}" />
-						<Setter Property="Foreground" Value="{ThemeResource InfoBadgeForeground}" />
-						<Setter Property="Padding" Value="{ThemeResource InfoBadgePadding}" />
-						<Setter Property="IsTabStop" Value="False" />
-						<Setter Property="Template">
-							<Setter.Value>
-								<ControlTemplate TargetType="InfoBadge">
-									<Grid
-										x:Name="RootGrid"
-										Padding="{TemplateBinding Padding}"
-										Background="{TemplateBinding Background}"
-										CornerRadius="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.InfoBadgeCornerRadius}">
-										<TextBlock
-											x:Name="ValueTextBlock"
-											HorizontalAlignment="Center"
-											VerticalAlignment="Center"
-											FontSize="{ThemeResource InfoBadgeValueFontSize}"
-											Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Value, Mode=OneWay}"
-											Visibility="Collapsed" />
-										<Viewbox
-											x:Name="IconPresenter"
-											HorizontalAlignment="Center"
-											VerticalAlignment="Stretch"
-											Visibility="Collapsed">
-											<IconSourceElement IconSource="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=IconSource, Mode=OneWay}" />
-										</Viewbox>
-										<VisualStateManager.VisualStateGroups>
-											<VisualStateGroup x:Name="DisplayKindStates">
-												<VisualState x:Name="Dot" />
-												<VisualState x:Name="Icon">
-													<VisualState.Setters>
-														<Setter Target="IconPresenter.Visibility" Value="Visible" />
-														<Setter Target="IconPresenter.Margin" Value="{ThemeResource IconInfoBadgeIconMargin}" />
-													</VisualState.Setters>
-												</VisualState>
-												<VisualState x:Name="FontIcon">
-													<VisualState.Setters>
-														<Setter Target="IconPresenter.Visibility" Value="Visible" />
-														<Setter Target="IconPresenter.Margin" Value="{ThemeResource IconInfoBadgeFontIconMargin}" />
-													</VisualState.Setters>
-												</VisualState>
-												<VisualState x:Name="Value">
-													<VisualState.Setters>
-														<Setter Target="ValueTextBlock.Visibility" Value="Visible" />
-														<Setter Target="ValueTextBlock.Margin" Value="{ThemeResource ValueInfoBadgeTextMargin}" />
-													</VisualState.Setters>
-												</VisualState>
-											</VisualStateGroup>
-										</VisualStateManager.VisualStateGroups>
-									</Grid>
-								</ControlTemplate>
-							</Setter.Value>
-						</Setter>
-					</Style>
-					<Style
-						x:Key="AttentionDotInfoBadgeStyle"
-						BasedOn="{StaticResource DefaultInfoBadgeStyle}"
-						TargetType="InfoBadge">
-						<Setter Property="Background" Value="{ThemeResource SystemFillColorAttentionBrush}" />
-					</Style>
-					<Style
-						x:Key="AttentionValueInfoBadgeStyle"
-						BasedOn="{StaticResource AttentionDotInfoBadgeStyle}"
-						TargetType="InfoBadge" />
-					<Style
-						x:Key="AttentionIconInfoBadgeStyle"
-						BasedOn="{StaticResource AttentionDotInfoBadgeStyle}"
-						TargetType="InfoBadge">
-						<Setter Property="Padding" Value="0,4,0,2" />
-						<Setter Property="IconSource">
-							<Setter.Value>
-								<FontIconSource Glyph="&#xEA38;" />
-							</Setter.Value>
-						</Setter>
-					</Style>
-					<Style
-						x:Key="InformationalDotInfoBadgeStyle"
-						BasedOn="{StaticResource DefaultInfoBadgeStyle}"
-						TargetType="InfoBadge">
-						<Setter Property="Background" Value="{ThemeResource SystemFillColorSolidNeutralBrush}" />
-					</Style>
-					<Style
-						x:Key="InformationalValueInfoBadgeStyle"
-						BasedOn="{StaticResource InformationalDotInfoBadgeStyle}"
-						TargetType="InfoBadge" />
-					<Style
-						x:Key="InformationalIconInfoBadgeStyle"
-						BasedOn="{StaticResource InformationalDotInfoBadgeStyle}"
-						TargetType="InfoBadge">
-						<Setter Property="Padding" Value="0,4,0,2" />
-						<Setter Property="IconSource">
-							<Setter.Value>
-								<FontIconSource Glyph="&#xF13F;" />
-							</Setter.Value>
-						</Setter>
-					</Style>
-					<Style
-						x:Key="SuccessDotInfoBadgeStyle"
-						BasedOn="{StaticResource DefaultInfoBadgeStyle}"
-						TargetType="InfoBadge">
-						<Setter Property="Background" Value="{ThemeResource SystemFillColorSuccessBrush}" />
-					</Style>
-					<Style
-						x:Key="SuccessValueInfoBadgeStyle"
-						BasedOn="{StaticResource SuccessDotInfoBadgeStyle}"
-						TargetType="InfoBadge" />
-					<Style
-						x:Key="SuccessIconInfoBadgeStyle"
-						BasedOn="{StaticResource SuccessDotInfoBadgeStyle}"
-						TargetType="InfoBadge">
-						<Setter Property="IconSource">
-							<Setter.Value>
-								<SymbolIconSource Symbol="Accept" />
-							</Setter.Value>
-						</Setter>
-					</Style>
-					<Style
-						x:Key="CautionDotInfoBadgeStyle"
-						BasedOn="{StaticResource DefaultInfoBadgeStyle}"
-						TargetType="InfoBadge">
-						<Setter Property="Background" Value="{ThemeResource SystemFillColorCautionBrush}" />
-					</Style>
-					<Style
-						x:Key="CautionValueInfoBadgeStyle"
-						BasedOn="{StaticResource CautionDotInfoBadgeStyle}"
-						TargetType="InfoBadge" />
-					<Style
-						x:Key="CautionIconInfoBadgeStyle"
-						BasedOn="{StaticResource CautionDotInfoBadgeStyle}"
-						TargetType="InfoBadge">
-						<Setter Property="IconSource">
-							<Setter.Value>
-								<SymbolIconSource Symbol="Important" />
-							</Setter.Value>
-						</Setter>
-					</Style>
-					<Style
-						x:Key="CriticalDotInfoBadgeStyle"
-						BasedOn="{StaticResource DefaultInfoBadgeStyle}"
-						TargetType="InfoBadge">
-						<Setter Property="Background" Value="{ThemeResource SystemFillColorCriticalBrush}" />
-					</Style>
-					<Style
-						x:Key="CriticalValueInfoBadgeStyle"
-						BasedOn="{StaticResource CriticalDotInfoBadgeStyle}"
-						TargetType="InfoBadge" />
-					<Style
-						x:Key="CriticalIconInfoBadgeStyle"
-						BasedOn="{StaticResource CriticalDotInfoBadgeStyle}"
-						TargetType="InfoBadge">
-						<Setter Property="IconSource">
-							<Setter.Value>
-								<SymbolIconSource Symbol="Cancel" />
-							</Setter.Value>
-						</Setter>
-					</Style>
 				</ResourceDictionary>
 			</ResourceDictionary.MergedDictionaries>
 		</ResourceDictionary>
 	</UserControl.Resources>
 
-	<Grid x:Name="RootGrid" Background="{ThemeResource App.Theme.AddressBar.BackgroundBrush}">
-		<Grid Padding="8" ColumnSpacing="4">
+	<Grid
+		Padding="8"
+		Background="{ThemeResource App.Theme.AddressBar.BackgroundBrush}"
+		ColumnSpacing="4">
+		<Grid.ColumnDefinitions>
+			<ColumnDefinition Width="Auto" />
+			<ColumnDefinition Width="*" />
+			<ColumnDefinition Width="Auto" />
+			<ColumnDefinition Width="Auto" />
+		</Grid.ColumnDefinitions>
+
+		<!--  Listary Integration  -->
+		<Grid Width="0" Height="0">
+			<!--  Contains the current path  -->
+			<TextBox AutomationProperties.AutomationId="CurrentPathGet" Text="{x:Bind ViewModel.PathControlDisplayText, Mode=OneWay}" />
+
+			<!--  Modifies the current path  -->
+			<TextBox
+				x:Name="CurrentPathSetTextBox"
+				AutomationProperties.AutomationId="CurrentPathSet"
+				TextChanged="{x:Bind ViewModel.CurrentPathSetTextBox_TextChanged, Mode=OneWay}" />
+		</Grid>
+
+		<!--  Page Navigation Actions  -->
+		<StackPanel
+			Grid.Column="0"
+			Orientation="Horizontal"
+			Spacing="4">
+
+			<ToggleButton
+				x:Name="SidebarPaneToggleButton"
+				Width="36"
+				Height="32"
+				Padding="0"
+				x:Load="{x:Bind IsSidebarPaneOpenToggleButtonVisible, Mode=OneWay}"
+				AutomationProperties.Name="ToggleSidebarPane"
+				Background="Transparent"
+				BorderBrush="Transparent"
+				IsChecked="{x:Bind MainPageViewModel.IsSidebarPaneOpen, Mode=TwoWay}"
+				ToolTipService.ToolTip="{helpers:ResourceString Name=ToggleSidebar}">
+				<AnimatedIcon Width="14">
+					<AnimatedIcon.Source>
+						<animatedvisuals:AnimatedGlobalNavigationButtonVisualSource />
+					</AnimatedIcon.Source>
+					<AnimatedIcon.FallbackIconSource>
+						<SymbolIconSource Symbol="GlobalNavigationButton" />
+					</AnimatedIcon.FallbackIconSource>
+				</AnimatedIcon>
+			</ToggleButton>
+
+			<Button
+				x:Name="Back"
+				AccessKey="B"
+				AccessKeyInvoked="Button_AccessKeyInvoked"
+				AutomationProperties.FullDescription="{x:Bind Commands.NavigateBack.Description, Mode=OneWay}"
+				AutomationProperties.Name="{x:Bind Commands.NavigateBack.Label, Mode=OneWay}"
+				Command="{x:Bind Commands.NavigateBack, Mode=OneWay}"
+				IsEnabled="{x:Bind Commands.NavigateBack.IsExecutable, Mode=OneWay}"
+				Style="{StaticResource AddressToolbarButtonStyle}"
+				ToolTipService.ToolTip="{x:Bind Commands.NavigateBack.LabelWithHotKey, Mode=OneWay}">
+				<FontIcon FontSize="14" Glyph="{x:Bind Commands.NavigateBack.Glyph.BaseGlyph, Mode=OneTime}" />
+				<Button.ContextFlyout>
+					<MenuFlyout
+						x:Name="BackHistoryFlyout"
+						AreOpenCloseAnimationsEnabled="False"
+						Opening="BackHistoryFlyout_Opening"
+						Placement="BottomEdgeAlignedLeft"
+						ScrollViewer.VerticalScrollBarVisibility="Auto"
+						ScrollViewer.VerticalScrollMode="Auto">
+						<MenuFlyout.MenuFlyoutPresenterStyle>
+							<Style TargetType="MenuFlyoutPresenter">
+								<Setter Property="MaxHeight" Value="400" />
+								<!--  Workaround for https://github.com/files-community/Files/issues/13078  -->
+								<Setter Target="HighContrastAdjustment" Value="None" />
+							</Style>
+						</MenuFlyout.MenuFlyoutPresenterStyle>
+					</MenuFlyout>
+				</Button.ContextFlyout>
+			</Button>
+
+			<Button
+				x:Name="Forward"
+				AccessKey="F"
+				AccessKeyInvoked="Button_AccessKeyInvoked"
+				AutomationProperties.FullDescription="{x:Bind Commands.NavigateForward.Description, Mode=OneWay}"
+				AutomationProperties.Name="{x:Bind Commands.NavigateForward.Label, Mode=OneWay}"
+				Command="{x:Bind Commands.NavigateForward, Mode=OneWay}"
+				IsEnabled="{x:Bind Commands.NavigateForward.IsExecutable, Mode=OneWay}"
+				Style="{StaticResource AddressToolbarButtonStyle}"
+				ToolTipService.ToolTip="{x:Bind Commands.NavigateForward.LabelWithHotKey, Mode=OneWay}">
+				<FontIcon FontSize="14" Glyph="{x:Bind Commands.NavigateForward.Glyph.BaseGlyph, Mode=OneTime}" />
+				<Button.ContextFlyout>
+					<MenuFlyout
+						x:Name="ForwardHistoryFlyout"
+						AreOpenCloseAnimationsEnabled="False"
+						Opening="ForwardHistoryFlyout_Opening"
+						Placement="BottomEdgeAlignedLeft"
+						ScrollViewer.VerticalScrollBarVisibility="Auto"
+						ScrollViewer.VerticalScrollMode="Auto">
+						<MenuFlyout.MenuFlyoutPresenterStyle>
+							<Style TargetType="MenuFlyoutPresenter">
+								<Setter Property="MaxHeight" Value="400" />
+								<!--  Workaround for https://github.com/files-community/Files/issues/13078  -->
+								<Setter Target="HighContrastAdjustment" Value="None" />
+							</Style>
+						</MenuFlyout.MenuFlyoutPresenterStyle>
+					</MenuFlyout>
+				</Button.ContextFlyout>
+			</Button>
+
+			<Button
+				x:Name="Up"
+				AccessKey="U"
+				AccessKeyInvoked="Button_AccessKeyInvoked"
+				AutomationProperties.FullDescription="{x:Bind Commands.NavigateUp.Description, Mode=OneWay}"
+				AutomationProperties.Name="{x:Bind Commands.NavigateUp.Label, Mode=OneWay}"
+				Command="{x:Bind Commands.NavigateUp, Mode=OneWay}"
+				IsEnabled="{x:Bind Commands.NavigateUp.IsExecutable, Mode=OneWay}"
+				Style="{StaticResource AddressToolbarButtonStyle}"
+				ToolTipService.ToolTip="{x:Bind Commands.NavigateUp.LabelWithHotKey, Mode=OneWay}">
+				<FontIcon FontSize="14" Glyph="{x:Bind Commands.NavigateUp.Glyph.BaseGlyph, Mode=OneTime}" />
+			</Button>
+
+			<Button
+				x:Name="Refresh"
+				AccessKey="R"
+				AccessKeyInvoked="Button_AccessKeyInvoked"
+				AutomationProperties.Name="{x:Bind Commands.RefreshItems.Label, Mode=OneWay}"
+				Command="{x:Bind Commands.RefreshItems, Mode=OneWay}"
+				IsEnabled="{x:Bind Commands.RefreshItems.IsExecutable, Mode=OneWay}"
+				Style="{StaticResource AddressToolbarButtonStyle}"
+				ToolTipService.ToolTip="{x:Bind Commands.RefreshItems.LabelWithHotKey, Mode=OneWay}">
+				<FontIcon FontSize="14" Glyph="{x:Bind Commands.RefreshItems.Glyph.BaseGlyph, Mode=OneTime}" />
+			</Button>
+
+			<Button
+				x:Name="HomeButton"
+				x:Load="{x:Bind ViewModel.ShowHomeButton, Mode=OneWay}"
+				AccessKey="H"
+				AccessKeyInvoked="Button_AccessKeyInvoked"
+				AutomationProperties.Name="{x:Bind Commands.NavigateHome.Label, Mode=OneWay}"
+				Command="{x:Bind Commands.NavigateHome, Mode=OneWay}"
+				IsEnabled="{x:Bind Commands.NavigateHome.IsExecutable, Mode=OneWay}"
+				Style="{StaticResource AddressToolbarButtonStyle}"
+				ToolTipService.ToolTip="{x:Bind Commands.NavigateHome.LabelWithHotKey, Mode=OneWay}">
+				<FontIcon FontSize="14" Glyph="{x:Bind Commands.NavigateHome.Glyph.BaseGlyph, Mode=OneTime}" />
+			</Button>
+		</StackPanel>
+
+		<!--  Path Box  -->
+		<AutoSuggestBox
+			x:Name="VisiblePath"
+			Grid.Column="1"
+			HorizontalAlignment="Stretch"
+			VerticalAlignment="Center"
+			x:Load="{x:Bind ViewModel.ManualEntryBoxLoaded, Mode=OneWay}"
+			BorderBrush="{ThemeResource SystemBaseMediumLowColor}"
+			BorderThickness="{ThemeResource TextControlBorderThemeThickness}"
+			CornerRadius="{StaticResource ControlCornerRadius}"
+			FocusDisengaged="VisiblePath_LostFocus"
+			FontWeight="SemiBold"
+			ItemsSource="{x:Bind ViewModel.NavigationBarSuggestions, Mode=OneWay}"
+			Loaded="VisiblePath_Loaded"
+			LostFocus="VisiblePath_LostFocus"
+			PlaceholderText="{helpers:ResourceString Name=NavigationToolbarVisiblePath/PlaceholderText}"
+			PreviewKeyDown="VisiblePath_KeyDown"
+			QuerySubmitted="VisiblePath_QuerySubmitted"
+			ScrollViewer.HorizontalScrollBarVisibility="Auto"
+			ScrollViewer.VerticalScrollBarVisibility="Hidden"
+			Text="{x:Bind ViewModel.PathText, Mode=OneWay}"
+			TextChanged="{x:Bind ViewModel.VisiblePath_TextChanged, Mode=OneWay}"
+			TextMemberPath="Text"
+			Visibility="{x:Bind converters:MultiBooleanConverter.OrNotConvertToVisibility(ShowSearchBox, ViewModel.IsSearchBoxVisible), Mode=OneWay}">
+			<AutoSuggestBox.ItemTemplate>
+				<DataTemplate x:DataType="items:NavigationBarSuggestionItem">
+					<StackPanel Margin="0,4">
+						<Grid ColumnSpacing="8">
+							<Grid.ColumnDefinitions>
+								<ColumnDefinition Width="*" />
+								<ColumnDefinition Width="Auto" />
+							</Grid.ColumnDefinitions>
+
+							<!--  Primary Title  -->
+							<TextBlock
+								x:Name="PrimaryDisplayBlock"
+								Grid.Column="0"
+								Foreground="{ThemeResource TextFillColorPrimaryBrush}"
+								MaxLines="1"
+								TextTrimming="CharacterEllipsis"
+								TextWrapping="NoWrap">
+								<Run FontWeight="Normal" Text="{x:Bind PrimaryDisplayPreMatched, Mode=OneWay}" /><Run FontWeight="Bold" Text="{x:Bind PrimaryDisplayMatched, Mode=OneWay}" /><Run FontWeight="Normal" Text="{x:Bind PrimaryDisplayPostMatched, Mode=OneWay}" />
+							</TextBlock>
+
+							<!--  Keyboard Shortcuts  -->
+							<keyboard:KeyboardShortcut
+								x:Name="RightAlignedKeyboardShortcut"
+								Grid.Column="1"
+								HotKeys="{x:Bind HotKeys, Mode=OneWay}" />
+						</Grid>
+					</StackPanel>
+				</DataTemplate>
+			</AutoSuggestBox.ItemTemplate>
+		</AutoSuggestBox>
+
+		<!--  Path Breadcrumb Bar  -->
+		<Grid
+			x:Name="ClickablePath"
+			Grid.Column="1"
+			MinHeight="33"
+			HorizontalAlignment="Stretch"
+			VerticalAlignment="Center"
+			x:Load="{x:Bind ViewModel.ClickablePathLoaded, Mode=OneWay}"
+			Background="{ThemeResource TextControlBackground}"
+			BorderBrush="{ThemeResource ControlElevationBorderBrush}"
+			BorderThickness="1"
+			CornerRadius="{StaticResource ControlCornerRadius}"
+			GettingFocus="ClickablePath_GettingFocus"
+			PointerPressed="ManualPathEntryItem_Click"
+			Visibility="{x:Bind converters:MultiBooleanConverter.OrNotConvertToVisibility(ShowSearchBox, ViewModel.IsSearchBoxVisible), Mode=OneWay}">
 			<Grid.ColumnDefinitions>
-				<ColumnDefinition Width="Auto" />
 				<ColumnDefinition Width="*" />
 				<ColumnDefinition Width="Auto" />
-				<ColumnDefinition Width="Auto" />
 			</Grid.ColumnDefinitions>
-
-			<!--  Listary Integration  -->
-			<Grid Width="0" Height="0">
-				<!--  Contains the current path  -->
-				<TextBox AutomationProperties.AutomationId="CurrentPathGet" Text="{x:Bind ViewModel.PathControlDisplayText, Mode=OneWay}" />
-
-				<!--  Modifies the current path  -->
-				<TextBox
-					x:Name="CurrentPathSetTextBox"
-					AutomationProperties.AutomationId="CurrentPathSet"
-					TextChanged="{x:Bind ViewModel.CurrentPathSetTextBox_TextChanged, Mode=OneWay}" />
-			</Grid>
-
-			<!--  Page Navigation Actions  -->
-			<StackPanel
+			<uc:PathBreadcrumb
 				Grid.Column="0"
-				Orientation="Horizontal"
-				Spacing="4">
-
-				<ToggleButton
-					x:Name="SidebarPaneToggleButton"
-					Width="36"
-					Height="32"
-					Padding="0"
-					x:Load="{x:Bind IsSidebarPaneOpenToggleButtonVisible, Mode=OneWay}"
-					AutomationProperties.Name="ToggleSidebarPane"
-					Background="Transparent"
-					BorderBrush="Transparent"
-					IsChecked="{x:Bind MainPageViewModel.IsSidebarPaneOpen, Mode=TwoWay}"
-					ToolTipService.ToolTip="{helpers:ResourceString Name=ToggleSidebar}">
-					<AnimatedIcon Width="14">
-						<AnimatedIcon.Source>
-							<animatedvisuals:AnimatedGlobalNavigationButtonVisualSource />
-						</AnimatedIcon.Source>
-						<AnimatedIcon.FallbackIconSource>
-							<SymbolIconSource Symbol="GlobalNavigationButton" />
-						</AnimatedIcon.FallbackIconSource>
-					</AnimatedIcon>
-				</ToggleButton>
-
-				<Button
-					x:Name="Back"
-					AccessKey="B"
-					AccessKeyInvoked="Button_AccessKeyInvoked"
-					AutomationProperties.FullDescription="{x:Bind Commands.NavigateBack.Description, Mode=OneWay}"
-					AutomationProperties.Name="{x:Bind Commands.NavigateBack.Label, Mode=OneWay}"
-					Command="{x:Bind Commands.NavigateBack, Mode=OneWay}"
-					IsEnabled="{x:Bind Commands.NavigateBack.IsExecutable, Mode=OneWay}"
-					Style="{StaticResource AddressToolbarButtonStyle}"
-					ToolTipService.ToolTip="{x:Bind Commands.NavigateBack.LabelWithHotKey, Mode=OneWay}">
-					<FontIcon FontSize="14" Glyph="{x:Bind Commands.NavigateBack.Glyph.BaseGlyph, Mode=OneTime}" />
-					<Button.ContextFlyout>
-						<MenuFlyout
-							x:Name="BackHistoryFlyout"
-							AreOpenCloseAnimationsEnabled="False"
-							Opening="BackHistoryFlyout_Opening"
-							Placement="BottomEdgeAlignedLeft"
-							ScrollViewer.VerticalScrollBarVisibility="Auto"
-							ScrollViewer.VerticalScrollMode="Auto">
-							<MenuFlyout.MenuFlyoutPresenterStyle>
-								<Style TargetType="MenuFlyoutPresenter">
-									<Setter Property="MaxHeight" Value="400" />
-									<!--  Workaround for https://github.com/files-community/Files/issues/13078  -->
-									<Setter Target="HighContrastAdjustment" Value="None" />
-								</Style>
-							</MenuFlyout.MenuFlyoutPresenterStyle>
-						</MenuFlyout>
-					</Button.ContextFlyout>
-				</Button>
-
-				<Button
-					x:Name="Forward"
-					AccessKey="F"
-					AccessKeyInvoked="Button_AccessKeyInvoked"
-					AutomationProperties.FullDescription="{x:Bind Commands.NavigateForward.Description, Mode=OneWay}"
-					AutomationProperties.Name="{x:Bind Commands.NavigateForward.Label, Mode=OneWay}"
-					Command="{x:Bind Commands.NavigateForward, Mode=OneWay}"
-					IsEnabled="{x:Bind Commands.NavigateForward.IsExecutable, Mode=OneWay}"
-					Style="{StaticResource AddressToolbarButtonStyle}"
-					ToolTipService.ToolTip="{x:Bind Commands.NavigateForward.LabelWithHotKey, Mode=OneWay}">
-					<FontIcon FontSize="14" Glyph="{x:Bind Commands.NavigateForward.Glyph.BaseGlyph, Mode=OneTime}" />
-					<Button.ContextFlyout>
-						<MenuFlyout
-							x:Name="ForwardHistoryFlyout"
-							AreOpenCloseAnimationsEnabled="False"
-							Opening="ForwardHistoryFlyout_Opening"
-							Placement="BottomEdgeAlignedLeft"
-							ScrollViewer.VerticalScrollBarVisibility="Auto"
-							ScrollViewer.VerticalScrollMode="Auto">
-							<MenuFlyout.MenuFlyoutPresenterStyle>
-								<Style TargetType="MenuFlyoutPresenter">
-									<Setter Property="MaxHeight" Value="400" />
-									<!--  Workaround for https://github.com/files-community/Files/issues/13078  -->
-									<Setter Target="HighContrastAdjustment" Value="None" />
-								</Style>
-							</MenuFlyout.MenuFlyoutPresenterStyle>
-						</MenuFlyout>
-					</Button.ContextFlyout>
-				</Button>
-
-				<Button
-					x:Name="Up"
-					AccessKey="U"
-					AccessKeyInvoked="Button_AccessKeyInvoked"
-					AutomationProperties.FullDescription="{x:Bind Commands.NavigateUp.Description, Mode=OneWay}"
-					AutomationProperties.Name="{x:Bind Commands.NavigateUp.Label, Mode=OneWay}"
-					Command="{x:Bind Commands.NavigateUp, Mode=OneWay}"
-					IsEnabled="{x:Bind Commands.NavigateUp.IsExecutable, Mode=OneWay}"
-					Style="{StaticResource AddressToolbarButtonStyle}"
-					ToolTipService.ToolTip="{x:Bind Commands.NavigateUp.LabelWithHotKey, Mode=OneWay}">
-					<FontIcon FontSize="14" Glyph="{x:Bind Commands.NavigateUp.Glyph.BaseGlyph, Mode=OneTime}" />
-				</Button>
-
-				<Button
-					x:Name="Refresh"
-					AccessKey="R"
-					AccessKeyInvoked="Button_AccessKeyInvoked"
-					AutomationProperties.Name="{x:Bind Commands.RefreshItems.Label, Mode=OneWay}"
-					Command="{x:Bind Commands.RefreshItems, Mode=OneWay}"
-					IsEnabled="{x:Bind Commands.RefreshItems.IsExecutable, Mode=OneWay}"
-					Style="{StaticResource AddressToolbarButtonStyle}"
-					ToolTipService.ToolTip="{x:Bind Commands.RefreshItems.LabelWithHotKey, Mode=OneWay}">
-					<FontIcon FontSize="14" Glyph="{x:Bind Commands.RefreshItems.Glyph.BaseGlyph, Mode=OneTime}" />
-				</Button>
-
-				<Button
-					x:Name="HomeButton"
-					x:Load="{x:Bind ViewModel.ShowHomeButton, Mode=OneWay}"
-					AccessKey="H"
-					AccessKeyInvoked="Button_AccessKeyInvoked"
-					AutomationProperties.Name="{x:Bind Commands.NavigateHome.Label, Mode=OneWay}"
-					Command="{x:Bind Commands.NavigateHome, Mode=OneWay}"
-					IsEnabled="{x:Bind Commands.NavigateHome.IsExecutable, Mode=OneWay}"
-					Style="{StaticResource AddressToolbarButtonStyle}"
-					ToolTipService.ToolTip="{x:Bind Commands.NavigateHome.LabelWithHotKey, Mode=OneWay}">
-					<FontIcon FontSize="14" Glyph="{x:Bind Commands.NavigateHome.Glyph.BaseGlyph, Mode=OneTime}" />
-				</Button>
-			</StackPanel>
-
-			<!--  Path Box  -->
-			<AutoSuggestBox
-				x:Name="VisiblePath"
-				Grid.Column="1"
-				HorizontalAlignment="Stretch"
-				VerticalAlignment="Center"
-				x:Load="{x:Bind ViewModel.ManualEntryBoxLoaded, Mode=OneWay}"
-				BorderBrush="{ThemeResource SystemBaseMediumLowColor}"
-				BorderThickness="{ThemeResource TextControlBorderThemeThickness}"
-				CornerRadius="{StaticResource ControlCornerRadius}"
-				FocusDisengaged="VisiblePath_LostFocus"
-				FontWeight="SemiBold"
-				ItemsSource="{x:Bind ViewModel.NavigationBarSuggestions, Mode=OneWay}"
-				Loaded="VisiblePath_Loaded"
-				LostFocus="VisiblePath_LostFocus"
-				PlaceholderText="{helpers:ResourceString Name=NavigationToolbarVisiblePath/PlaceholderText}"
-				PreviewKeyDown="VisiblePath_KeyDown"
-				QuerySubmitted="VisiblePath_QuerySubmitted"
-				ScrollViewer.HorizontalScrollBarVisibility="Auto"
-				ScrollViewer.VerticalScrollBarVisibility="Hidden"
-				Text="{x:Bind ViewModel.PathText, Mode=OneWay}"
-				TextChanged="{x:Bind ViewModel.VisiblePath_TextChanged, Mode=OneWay}"
-				TextMemberPath="Text"
-				Visibility="{x:Bind converters:MultiBooleanConverter.OrNotConvertToVisibility(ShowSearchBox, ViewModel.IsSearchBoxVisible), Mode=OneWay}">
-				<AutoSuggestBox.ItemTemplate>
-					<DataTemplate x:DataType="items:NavigationBarSuggestionItem">
-						<StackPanel Margin="0,4">
-							<Grid ColumnSpacing="8">
-								<Grid.ColumnDefinitions>
-									<ColumnDefinition Width="*" />
-									<ColumnDefinition Width="Auto" />
-								</Grid.ColumnDefinitions>
-
-								<!--  Primary Title  -->
-								<TextBlock
-									x:Name="PrimaryDisplayBlock"
-									Grid.Column="0"
-									Foreground="{ThemeResource TextFillColorPrimaryBrush}"
-									MaxLines="1"
-									TextTrimming="CharacterEllipsis"
-									TextWrapping="NoWrap">
-									<Run FontWeight="Normal" Text="{x:Bind PrimaryDisplayPreMatched, Mode=OneWay}" /><Run FontWeight="Bold" Text="{x:Bind PrimaryDisplayMatched, Mode=OneWay}" /><Run FontWeight="Normal" Text="{x:Bind PrimaryDisplayPostMatched, Mode=OneWay}" />
-								</TextBlock>
-
-								<!--  Keyboard Shortcuts  -->
-								<keyboard:KeyboardShortcut
-									x:Name="RightAlignedKeyboardShortcut"
-									Grid.Column="1"
-									HotKeys="{x:Bind HotKeys, Mode=OneWay}" />
-							</Grid>
-						</StackPanel>
-					</DataTemplate>
-				</AutoSuggestBox.ItemTemplate>
-			</AutoSuggestBox>
-
-			<!--  Path Breadcrumb Bar  -->
-			<Grid
-				x:Name="ClickablePath"
+				VerticalAlignment="Stretch"
+				HorizontalContentAlignment="Stretch"
+				VerticalContentAlignment="Stretch"
+				ViewModel="{x:Bind ViewModel, Mode=OneWay}" />
+			<FontIcon
 				Grid.Column="1"
-				MinHeight="33"
-				HorizontalAlignment="Stretch"
-				VerticalAlignment="Center"
-				x:Load="{x:Bind ViewModel.ClickablePathLoaded, Mode=OneWay}"
-				Background="{ThemeResource TextControlBackground}"
-				BorderBrush="{ThemeResource ControlElevationBorderBrush}"
-				BorderThickness="1"
-				CornerRadius="{StaticResource ControlCornerRadius}"
-				GettingFocus="ClickablePath_GettingFocus"
-				PointerPressed="ManualPathEntryItem_Click"
-				Visibility="{x:Bind converters:MultiBooleanConverter.OrNotConvertToVisibility(ShowSearchBox, ViewModel.IsSearchBoxVisible), Mode=OneWay}">
-				<Grid.ColumnDefinitions>
-					<ColumnDefinition Width="*" />
-					<ColumnDefinition Width="Auto" />
-				</Grid.ColumnDefinitions>
-				<uc:PathBreadcrumb
-					Grid.Column="0"
-					VerticalAlignment="Stretch"
-					HorizontalContentAlignment="Stretch"
-					VerticalContentAlignment="Stretch"
-					ViewModel="{x:Bind ViewModel, Mode=OneWay}" />
-				<FontIcon
-					Grid.Column="1"
-					Margin="12"
-					FontSize="16"
-					Foreground="{ThemeResource App.Theme.IconBaseBrush}"
-					Glyph="&#xE70D;" />
-			</Grid>
-
-			<!--  Storage Search Box  -->
-			<uc:SearchBox
-				x:Name="SearchRegion"
-				Grid.Column="2"
-				Width="240"
-				Height="34"
-				HorizontalAlignment="Stretch"
-				VerticalAlignment="Center"
-				AccessKey="K"
-				AccessKeyInvoked="SearchRegion_AccessKeyInvoked"
-				Canvas.ZIndex="100"
-				CornerRadius="{StaticResource ControlCornerRadius}"
-				GotFocus="SearchRegion_OnGotFocus"
-				LostFocus="SearchRegion_LostFocus"
-				SearchBoxViewModel="{x:Bind ViewModel.SearchBoxViewModel, Mode=OneWay}"
-				Visibility="{x:Bind converters:MultiBooleanConverter.OrConvertToVisibility(ShowSearchBox, ViewModel.IsSearchBoxVisible), Mode=OneWay}" />
-
-			<!--  Right Side Action Buttons  -->
-			<StackPanel
-				Grid.Column="3"
-				Orientation="Horizontal"
-				Spacing="4">
-
-				<!--  Mini Search Button  -->
-				<Button
-					x:Name="ShowSearchButton"
-					AccessKey="I"
-					AccessKeyInvoked="Button_AccessKeyInvoked"
-					AutomationProperties.Name="{x:Bind Commands.Search.Label, Mode=OneWay}"
-					Command="{x:Bind Commands.Search, Mode=OneWay}"
-					IsEnabled="{x:Bind Commands.Search.IsExecutable, Mode=OneWay}"
-					Style="{StaticResource AddressToolbarButtonStyle}"
-					ToolTipService.ToolTip="{x:Bind Commands.Search.LabelWithHotKey, Mode=OneWay}"
-					Visibility="Collapsed">
-					<FontIcon FontSize="14" Glyph="{x:Bind ViewModel.SearchButtonGlyph, Mode=OneTime}" />
-				</Button>
-
-				<!--  Shelf Pane  -->
-				<ToggleButton
-					x:Name="ShelfPaneToggleButton"
-					Width="36"
-					Height="32"
-					Padding="0"
-					x:Load="{x:Bind ViewModel.ShowShelfPaneToggleButton, Mode=OneWay}"
-					AccessKeyInvoked="Button_AccessKeyInvoked"
-					AutomationProperties.Name="{x:Bind Commands.ToggleShelfPane.Label, Mode=OneWay}"
-					Background="Transparent"
-					BorderBrush="Transparent"
-					IsChecked="{x:Bind Commands.ToggleShelfPane.IsOn, Mode=TwoWay}"
-					ToolTipService.ToolTip="{x:Bind Commands.ToggleShelfPane.LabelWithHotKey, Mode=OneWay}">
-					<controls:ThemedIcon
-						Width="16"
-						Height="16"
-						Style="{StaticResource App.ThemedIcons.Shelf}" />
-				</ToggleButton>
-
-				<!--  Status Center  -->
-				<Button
-					x:Name="ShowStatusCenterButton"
-					Padding="0"
-					AccessKey="T"
-					AccessKeyInvoked="Button_AccessKeyInvoked"
-					AutomationProperties.Name="{helpers:ResourceString Name=StatusCenter}"
-					Style="{StaticResource AddressToolbarButtonStyle}"
-					ToolTipService.ToolTip="{helpers:ResourceString Name=StatusCenter}"
-					Visibility="{x:Bind OngoingTasksViewModel.HasAnyItem, Mode=OneWay}">
-
-					<Grid Margin="-16">
-
-						<!-- Enable icon again if we add option to always display on the toolbar
+				Margin="12"
+				FontSize="16"
+				Foreground="{ThemeResource App.Theme.IconBaseBrush}"
+				Glyph="&#xE70D;" />
+		</Grid>
+
+		<!--  Storage Search Box  -->
+		<uc:SearchBox
+			x:Name="SearchRegion"
+			Grid.Column="2"
+			Width="240"
+			Height="34"
+			HorizontalAlignment="Stretch"
+			VerticalAlignment="Center"
+			AccessKey="K"
+			AccessKeyInvoked="SearchRegion_AccessKeyInvoked"
+			Canvas.ZIndex="100"
+			CornerRadius="{StaticResource ControlCornerRadius}"
+			GotFocus="SearchRegion_OnGotFocus"
+			LostFocus="SearchRegion_LostFocus"
+			SearchBoxViewModel="{x:Bind ViewModel.SearchBoxViewModel, Mode=OneWay}"
+			Visibility="{x:Bind converters:MultiBooleanConverter.OrConvertToVisibility(ShowSearchBox, ViewModel.IsSearchBoxVisible), Mode=OneWay}" />
+
+		<!--  Right Side Action Buttons  -->
+		<StackPanel
+			Grid.Column="3"
+			Orientation="Horizontal"
+			Spacing="4">
+
+			<!--  Mini Search Button  -->
+			<Button
+				x:Name="ShowSearchButton"
+				AccessKey="I"
+				AccessKeyInvoked="Button_AccessKeyInvoked"
+				AutomationProperties.Name="{x:Bind Commands.Search.Label, Mode=OneWay}"
+				Command="{x:Bind Commands.Search, Mode=OneWay}"
+				IsEnabled="{x:Bind Commands.Search.IsExecutable, Mode=OneWay}"
+				Style="{StaticResource AddressToolbarButtonStyle}"
+				ToolTipService.ToolTip="{x:Bind Commands.Search.LabelWithHotKey, Mode=OneWay}"
+				Visibility="Collapsed">
+				<FontIcon FontSize="14" Glyph="{x:Bind ViewModel.SearchButtonGlyph, Mode=OneWay}" />
+			</Button>
+
+			<!--  Shelf Pane  -->
+			<ToggleButton
+				x:Name="ShelfPaneToggleButton"
+				Width="36"
+				Height="32"
+				Padding="0"
+				x:Load="{x:Bind ViewModel.ShowShelfPaneToggleButton, Mode=OneWay}"
+				AccessKeyInvoked="Button_AccessKeyInvoked"
+				AutomationProperties.Name="{x:Bind Commands.ToggleShelfPane.Label, Mode=OneWay}"
+				Background="Transparent"
+				BorderBrush="Transparent"
+				IsChecked="{x:Bind Commands.ToggleShelfPane.IsOn, Mode=TwoWay}"
+				ToolTipService.ToolTip="{x:Bind Commands.ToggleShelfPane.LabelWithHotKey, Mode=OneWay}">
+				<controls:ThemedIcon
+					Width="16"
+					Height="16"
+					Style="{StaticResource App.ThemedIcons.Shelf}" />
+			</ToggleButton>
+
+			<!--  Status Center  -->
+			<Button
+				x:Name="ShowStatusCenterButton"
+				Padding="0"
+				AccessKey="T"
+				AccessKeyInvoked="Button_AccessKeyInvoked"
+				AutomationProperties.Name="{helpers:ResourceString Name=StatusCenter}"
+				Style="{StaticResource AddressToolbarButtonStyle}"
+				ToolTipService.ToolTip="{helpers:ResourceString Name=StatusCenter}"
+				Visibility="{x:Bind OngoingTasksViewModel.HasAnyItem, Mode=OneWay}">
+
+				<Grid Margin="-16">
+
+					<!-- Enable icon again if we add option to always display on the toolbar
 						<ThemedIcon
 							x:Name="StatusCenterIcon"
 							Width="16"
@@ -527,108 +368,107 @@
 							x:Load="{x:Bind OngoingTasksViewModel.HasAnyItemInProgress, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}"
 							Style="{StaticResource App.ThemedIcons.StatusCenter}" />-->
 
-						<ProgressRing
-							x:Name="MedianOperationProgressRing"
-							HorizontalAlignment="Center"
-							VerticalAlignment="Center"
-							x:Load="{x:Bind OngoingTasksViewModel.HasAnyItemInProgress, Mode=OneWay}"
-							Background="{ThemeResource SubtleFillColorSecondaryBrush}"
-							IsIndeterminate="False"
-							Value="{x:Bind OngoingTasksViewModel.AverageOperationProgressValue, Mode=OneWay}" />
-
-						<InfoBadge
-							x:Name="StatusInfoBadge"
-							HorizontalAlignment="Center"
-							VerticalAlignment="Center"
-							Value="{x:Bind OngoingTasksViewModel.InfoBadgeValue, Mode=OneWay}" />
-
-					</Grid>
-
-					<Button.Flyout>
-						<Flyout
-							contract8Present:ShouldConstrainToRootBounds="False"
-							AutomationProperties.Name="{helpers:ResourceString Name=StatusCenter}"
-							Placement="BottomEdgeAlignedRight">
-							<Flyout.FlyoutPresenterStyle>
-								<Style TargetType="FlyoutPresenter">
-									<Setter Property="Padding" Value="0" />
-									<Setter Property="CornerRadius" Value="{StaticResource OverlayCornerRadius}" />
-								</Style>
-							</Flyout.FlyoutPresenterStyle>
-
-							<ucs:StatusCenter
-								x:Name="OngoingTasksControl"
-								Width="400"
-								MinHeight="300"
-								MaxHeight="500"
-								x:FieldModifier="public"
-								IsTabStop="True" />
-						</Flyout>
-					</Button.Flyout>
-
-				</Button>
-
-				<!--  Update The Files App Button When An Update Available  -->
-				<Button
-					x:Name="UpdateAppButton"
-					HorizontalContentAlignment="Stretch"
-					VerticalContentAlignment="Stretch"
-					x:Load="{x:Bind ViewModel.IsUpdateAvailable, Mode=OneWay}"
-					AccessKey="1"
-					AccessKeyInvoked="Button_AccessKeyInvoked"
-					AutomationProperties.Name="{helpers:ResourceString Name=UpdateFiles}"
-					Command="{x:Bind ViewModel.UpdateCommand, Mode=OneWay}"
-					IsEnabled="{x:Bind ViewModel.IsUpdating, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}"
-					Style="{StaticResource AddressToolbarButtonStyle}"
-					ToolTipService.ToolTip="{helpers:ResourceString Name=UpdateFiles}">
-					<Grid>
-						<!--  Icon  -->
-						<controls:ThemedIcon
-							x:Name="UpdateIcon"
-							Width="16"
-							Height="16"
-							x:Load="{x:Bind ViewModel.IsUpdating, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}"
-							IsFilled="True"
-							Style="{StaticResource App.ThemedIcons.AppUpdateAvailable}" />
-
-						<!--  Progress  -->
-						<ProgressRing
-							x:Name="UpdateProgressRing"
-							Width="20"
-							Height="20"
-							x:Load="{x:Bind ViewModel.IsUpdating, Mode=OneWay}"
-							IsIndeterminate="True" />
-					</Grid>
-				</Button>
-
-				<!--  Open the Release Notes dialog  -->
-				<Button
-					x:Name="OpenReleaseNotesButton"
-					HorizontalContentAlignment="Stretch"
-					VerticalContentAlignment="Stretch"
-					x:Load="{x:Bind ViewModel.IsAppUpdated, Mode=OneWay}"
-					AccessKey="2"
-					AccessKeyInvoked="Button_AccessKeyInvoked"
-					AutomationProperties.Name="{x:Bind Commands.OpenReleaseNotes.Label, Mode=OneWay}"
-					Command="{x:Bind Commands.OpenReleaseNotes, Mode=OneWay}"
-					Style="{StaticResource AddressToolbarButtonStyle}"
-					ToolTipService.ToolTip="{x:Bind Commands.OpenReleaseNotes.LabelWithHotKey, Mode=OneWay}"
-					Visibility="{x:Bind Commands.OpenReleaseNotes.IsExecutable, Mode=OneWay}">
+					<ProgressRing
+						x:Name="MedianOperationProgressRing"
+						HorizontalAlignment="Center"
+						VerticalAlignment="Center"
+						x:Load="{x:Bind OngoingTasksViewModel.HasAnyItemInProgress, Mode=OneWay}"
+						Background="{ThemeResource SubtleFillColorSecondaryBrush}"
+						IsIndeterminate="False"
+						Value="{x:Bind OngoingTasksViewModel.AverageOperationProgressValue, Mode=OneWay}" />
+
+					<InfoBadge
+						x:Name="StatusInfoBadge"
+						HorizontalAlignment="Center"
+						VerticalAlignment="Center"
+						Value="{x:Bind OngoingTasksViewModel.InfoBadgeValue, Mode=OneWay}" />
+
+				</Grid>
+
+				<Button.Flyout>
+					<Flyout
+						contract8Present:ShouldConstrainToRootBounds="False"
+						AutomationProperties.Name="{helpers:ResourceString Name=StatusCenter}"
+						Placement="BottomEdgeAlignedRight">
+						<Flyout.FlyoutPresenterStyle>
+							<Style TargetType="FlyoutPresenter">
+								<Setter Property="Padding" Value="0" />
+								<Setter Property="CornerRadius" Value="{StaticResource OverlayCornerRadius}" />
+							</Style>
+						</Flyout.FlyoutPresenterStyle>
+
+						<ucs:StatusCenter
+							x:Name="OngoingTasksControl"
+							Width="400"
+							MinHeight="300"
+							MaxHeight="500"
+							x:FieldModifier="public"
+							IsTabStop="True" />
+					</Flyout>
+				</Button.Flyout>
+
+			</Button>
+
+			<!--  Update The Files App Button When An Update Available  -->
+			<Button
+				x:Name="UpdateAppButton"
+				HorizontalContentAlignment="Stretch"
+				VerticalContentAlignment="Stretch"
+				x:Load="{x:Bind ViewModel.IsUpdateAvailable, Mode=OneWay}"
+				AccessKey="1"
+				AccessKeyInvoked="Button_AccessKeyInvoked"
+				AutomationProperties.Name="{helpers:ResourceString Name=UpdateFiles}"
+				Command="{x:Bind ViewModel.UpdateCommand, Mode=OneWay}"
+				IsEnabled="{x:Bind ViewModel.IsUpdating, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}"
+				Style="{StaticResource AddressToolbarButtonStyle}"
+				ToolTipService.ToolTip="{helpers:ResourceString Name=UpdateFiles}">
+				<Grid>
+					<!--  Icon  -->
 					<controls:ThemedIcon
+						x:Name="UpdateIcon"
 						Width="16"
 						Height="16"
-						Style="{StaticResource App.ThemedIcons.AppUpdatedBox}" />
-				</Button>
-			</StackPanel>
-
-			<!--  Status Center TeachingTip  -->
-			<TeachingTip
-				x:Name="StatusCenterTeachingTip"
-				Title="{helpers:ResourceString Name=OngoingTasksTeachingTip/Title}"
-				IsOpen="False"
-				Subtitle="{helpers:ResourceString Name=OngoingTasksTeachingTip/Subtitle}"
-				Target="{x:Bind ShowStatusCenterButton}" />
-		</Grid>
+						x:Load="{x:Bind ViewModel.IsUpdating, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}"
+						IsFilled="True"
+						Style="{StaticResource App.ThemedIcons.AppUpdateAvailable}" />
+
+					<!--  Progress  -->
+					<ProgressRing
+						x:Name="UpdateProgressRing"
+						Width="20"
+						Height="20"
+						x:Load="{x:Bind ViewModel.IsUpdating, Mode=OneWay}"
+						IsIndeterminate="True" />
+				</Grid>
+			</Button>
+
+			<!--  Open the Release Notes dialog  -->
+			<Button
+				x:Name="OpenReleaseNotesButton"
+				HorizontalContentAlignment="Stretch"
+				VerticalContentAlignment="Stretch"
+				x:Load="{x:Bind ViewModel.IsAppUpdated, Mode=OneWay}"
+				AccessKey="2"
+				AccessKeyInvoked="Button_AccessKeyInvoked"
+				AutomationProperties.Name="{x:Bind Commands.OpenReleaseNotes.Label, Mode=OneWay}"
+				Command="{x:Bind Commands.OpenReleaseNotes, Mode=OneWay}"
+				Style="{StaticResource AddressToolbarButtonStyle}"
+				ToolTipService.ToolTip="{x:Bind Commands.OpenReleaseNotes.LabelWithHotKey, Mode=OneWay}"
+				Visibility="{x:Bind Commands.OpenReleaseNotes.IsExecutable, Mode=OneWay}">
+				<controls:ThemedIcon
+					Width="16"
+					Height="16"
+					Style="{StaticResource App.ThemedIcons.AppUpdatedBox}" />
+			</Button>
+		</StackPanel>
+
+		<!--  Status Center TeachingTip  -->
+		<TeachingTip
+			x:Name="StatusCenterTeachingTip"
+			Title="{helpers:ResourceString Name=OngoingTasksTeachingTip/Title}"
+			IsOpen="False"
+			Subtitle="{helpers:ResourceString Name=OngoingTasksTeachingTip/Subtitle}"
+			Target="{x:Bind ShowStatusCenterButton}" />
 
 		<VisualStateManager.VisualStateGroups>
 			<VisualStateGroup>
diff --git a/src/Files.App/UserControls/NavigationToolbar.xaml.cs b/src/Files.App/UserControls/NavigationToolbar.xaml.cs
index 46d44be05f85..bb9730dd290b 100644
--- a/src/Files.App/UserControls/NavigationToolbar.xaml.cs
+++ b/src/Files.App/UserControls/NavigationToolbar.xaml.cs
@@ -21,8 +21,8 @@ public sealed partial class NavigationToolbar : UserControl
 
 		private readonly IUserSettingsService userSettingsService = Ioc.Default.GetRequiredService<IUserSettingsService>();
 		private readonly MainPageViewModel MainPageViewModel = Ioc.Default.GetRequiredService<MainPageViewModel>();
-		public ICommandManager Commands = Ioc.Default.GetRequiredService<ICommandManager>();
-		public StatusCenterViewModel? OngoingTasksViewModel { get; set; }
+		private readonly ICommandManager Commands = Ioc.Default.GetRequiredService<ICommandManager>();
+		private readonly StatusCenterViewModel OngoingTasksViewModel = Ioc.Default.GetRequiredService<StatusCenterViewModel>();
 
 		// Properties
 
@@ -108,8 +108,7 @@ private void VisiblePath_LostFocus(object _, RoutedEventArgs e)
 			if (element is FlyoutBase or AppBarButton or Popup)
 				return;
 
-			var control = element as Control;
-			if (control is null)
+			if (element is not Control control)
 			{
 				if (ViewModel.IsEditModeEnabled)
 					ViewModel.IsEditModeEnabled = false;
diff --git a/src/Files.App/Views/MainPage.xaml b/src/Files.App/Views/MainPage.xaml
index d13211e23e3b..806d3b434327 100644
--- a/src/Files.App/Views/MainPage.xaml
+++ b/src/Files.App/Views/MainPage.xaml
@@ -150,7 +150,6 @@
 			HorizontalContentAlignment="Stretch"
 			x:Load="False"
 			Loaded="NavToolbar_Loaded"
-			OngoingTasksViewModel="{x:Bind OngoingTasksViewModel}"
 			ShowOngoingTasks="True"
 			ShowSearchBox="True"
 			TabIndex="1" />
diff --git a/src/Files.App/Views/MainPage.xaml.cs b/src/Files.App/Views/MainPage.xaml.cs
index e30370e03f3d..558dc8fd3efd 100644
--- a/src/Files.App/Views/MainPage.xaml.cs
+++ b/src/Files.App/Views/MainPage.xaml.cs
@@ -31,7 +31,6 @@ public sealed partial class MainPage : Page
 		public ICommandManager Commands { get; }
 		public SidebarViewModel SidebarAdaptiveViewModel { get; }
 		public MainPageViewModel ViewModel { get; }
-		public StatusCenterViewModel OngoingTasksViewModel { get; }
 
 		private bool keyReleased = true;
 
@@ -47,7 +46,6 @@ public MainPage()
 			SidebarAdaptiveViewModel = Ioc.Default.GetRequiredService<SidebarViewModel>();
 			SidebarAdaptiveViewModel.PaneFlyout = (MenuFlyout)Resources["SidebarContextMenu"];
 			ViewModel = Ioc.Default.GetRequiredService<MainPageViewModel>();
-			OngoingTasksViewModel = Ioc.Default.GetRequiredService<StatusCenterViewModel>();
 
 			if (FilePropertiesHelpers.FlowDirectionSettingIsRightToLeft)
 				FlowDirection = FlowDirection.RightToLeft;