diff --git a/src/Files.App/App.xaml b/src/Files.App/App.xaml
index 2bab145b57a2..efb22b3543c4 100644
--- a/src/Files.App/App.xaml
+++ b/src/Files.App/App.xaml
@@ -40,6 +40,7 @@
 
 			<ResourceDictionary.MergedDictionaries>
 				<XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
+				<ResourceDictionary Source="/ResourceDictionaries/PathIcons.xaml" />
 				<ResourceDictionary>
 					<ResourceDictionary.ThemeDictionaries>
 						<ResourceDictionary x:Key="Light">
diff --git a/src/Files.App/Helpers/FilePropertiesHelpers.cs b/src/Files.App/Helpers/FilePropertiesHelpers.cs
index d8aae4459b94..31cd58979e5b 100644
--- a/src/Files.App/Helpers/FilePropertiesHelpers.cs
+++ b/src/Files.App/Helpers/FilePropertiesHelpers.cs
@@ -70,7 +70,7 @@ public static async Task OpenPropertiesWindowAsync(object item, IShellPage assoc
 					IsMaximizable = false,
 					MinWidth = 460,
 					MinHeight = 550,
-					Width = 550,
+					Width = 600,
 					Height = 550,
 					Content = frame,
 					Backdrop = new WinUIEx.MicaSystemBackdrop(),
@@ -85,7 +85,7 @@ public static async Task OpenPropertiesWindowAsync(object item, IShellPage assoc
 				appWindow.SetIcon(LogoPath);
 
 				if (frame.Content is Properties properties)
-					properties.appWindow = appWindow;
+					properties.AppWindow = appWindow;
 
 				appWindow.Show();
 
diff --git a/src/Files.App/ResourceDictionaries/NavigationViewStoreStyle.xaml b/src/Files.App/ResourceDictionaries/NavigationViewStoreStyle.xaml
new file mode 100644
index 000000000000..38622be97c7f
--- /dev/null
+++ b/src/Files.App/ResourceDictionaries/NavigationViewStoreStyle.xaml
@@ -0,0 +1,178 @@
+<ResourceDictionary
+	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	xmlns:primitives="using:Microsoft.UI.Xaml.Controls.Primitives">
+
+	<ResourceDictionary.ThemeDictionaries>
+		<ResourceDictionary x:Key="Dark">
+			<StaticResource x:Key="NavigationViewItemBackgroundPointerOver" ResourceKey="SubtleFillColorSecondaryBrush" />
+			<StaticResource x:Key="NavigationViewItemBackgroundPressed" ResourceKey="SubtleFillColorTertiaryBrush" />
+			<StaticResource x:Key="NavigationViewItemBackgroundSelected" ResourceKey="ControlFillColorDefaultBrush" />
+			<StaticResource x:Key="NavigationViewItemBackgroundSelectedPointerOver" ResourceKey="ControlFillColorDefaultBrush" />
+			<StaticResource x:Key="NavigationViewItemBackgroundSelectedPressed" ResourceKey="ControlFillColorDefaultBrush" />
+
+			<StaticResource x:Key="NavigationViewItemForeground" ResourceKey="TextFillColorSecondaryBrush" />
+			<StaticResource x:Key="NavigationViewItemForegroundPointerOver" ResourceKey="TextFillColorPrimaryBrush" />
+			<StaticResource x:Key="NavigationViewItemForegroundPressed" ResourceKey="TextFillColorPrimaryBrush" />
+			<StaticResource x:Key="NavigationViewItemForegroundSelected" ResourceKey="TextFillColorSecondaryBrush" />
+			<StaticResource x:Key="NavigationViewItemForegroundSelectedPointerOver" ResourceKey="TextFillColorSecondaryBrush" />
+			<StaticResource x:Key="NavigationViewItemForegroundSelectedPressed" ResourceKey="TextFillColorSecondaryBrush" />
+		</ResourceDictionary>
+
+		<ResourceDictionary x:Key="Light">
+			<StaticResource x:Key="NavigationViewItemBackgroundPointerOver" ResourceKey="ControlFillColorSecondaryBrush" />
+			<StaticResource x:Key="NavigationViewItemBackgroundPressed" ResourceKey="ControlFillColorTertiaryBrush" />
+			<StaticResource x:Key="NavigationViewItemBackgroundSelected" ResourceKey="ControlFillColorDefaultBrush" />
+			<StaticResource x:Key="NavigationViewItemBackgroundSelectedPointerOver" ResourceKey="ControlFillColorDefaultBrush" />
+			<StaticResource x:Key="NavigationViewItemBackgroundSelectedPressed" ResourceKey="ControlFillColorDefaultBrush" />
+
+			<StaticResource x:Key="NavigationViewItemForeground" ResourceKey="TextFillColorSecondaryBrush" />
+			<StaticResource x:Key="NavigationViewItemForegroundPointerOver" ResourceKey="TextFillColorPrimaryBrush" />
+			<StaticResource x:Key="NavigationViewItemForegroundPressed" ResourceKey="TextFillColorPrimaryBrush" />
+			<StaticResource x:Key="NavigationViewItemForegroundSelected" ResourceKey="TextFillColorSecondaryBrush" />
+			<StaticResource x:Key="NavigationViewItemForegroundSelectedPointerOver" ResourceKey="TextFillColorSecondaryBrush" />
+			<StaticResource x:Key="NavigationViewItemForegroundSelectedPressed" ResourceKey="TextFillColorSecondaryBrush" />
+		</ResourceDictionary>
+
+		<ResourceDictionary x:Key="HighContrast">
+			<StaticResource x:Key="NavigationViewItemBackgroundPointerOver" ResourceKey="SystemControlHighlightListLowBrush" />
+			<StaticResource x:Key="NavigationViewItemBackgroundPressed" ResourceKey="SystemControlHighlightListMediumBrush" />
+			<StaticResource x:Key="NavigationViewItemBackgroundSelected" ResourceKey="SystemControlHighlightListLowBrush" />
+			<StaticResource x:Key="NavigationViewItemBackgroundSelectedPointerOver" ResourceKey="SystemControlHighlightListLowBrush" />
+			<StaticResource x:Key="NavigationViewItemBackgroundSelectedPressed" ResourceKey="SystemControlHighlightListMediumBrush" />
+
+			<StaticResource x:Key="NavigationViewItemForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+			<StaticResource x:Key="NavigationViewItemForegroundPointerOver" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+			<StaticResource x:Key="NavigationViewItemForegroundPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+			<StaticResource x:Key="NavigationViewItemForegroundSelected" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+			<StaticResource x:Key="NavigationViewItemForegroundSelectedPointerOver" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+			<StaticResource x:Key="NavigationViewItemForegroundSelectedPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+		</ResourceDictionary>
+	</ResourceDictionary.ThemeDictionaries>
+
+	<x:Double x:Key="NavigationViewSelectionIndicatorWidth">4</x:Double>
+	<x:Double x:Key="NavigationViewSelectionIndicatorHeight">26</x:Double>
+	<x:Double x:Key="NavigationViewSelectionIndicatorRadius">2</x:Double>
+	<Thickness x:Key="NavigationViewItemContentPresenterMargin">0,0,0,0</Thickness>
+
+	<Style x:Key="MUX_NavigationViewItemPresenterStyleWhenOnLeftPane" TargetType="primitives:NavigationViewItemPresenter">
+		<Setter Property="Foreground" Value="{ThemeResource NavigationViewItemForeground}" />
+		<Setter Property="Background" Value="{ThemeResource NavigationViewItemBackground}" />
+		<Setter Property="BorderBrush" Value="{ThemeResource NavigationViewItemBorderBrush}" />
+		<Setter Property="BorderThickness" Value="{StaticResource NavigationViewItemBorderThickness}" />
+		<Setter Property="UseSystemFocusVisuals" Value="True" />
+		<Setter Property="HorizontalContentAlignment" Value="Stretch" />
+		<Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="primitives:NavigationViewItemPresenter">
+					<Grid
+						x:Name="LayoutRoot"
+						MinHeight="{ThemeResource NavigationViewItemOnLeftMinHeight}"
+						Margin="{ThemeResource NavigationViewItemButtonMargin}"
+						Background="{TemplateBinding Background}"
+						Control.IsTemplateFocusTarget="True"
+						CornerRadius="{ThemeResource ControlCornerRadius}">
+						<Grid.BackgroundTransition>
+							<BrushTransition Duration="0:0:0.083" />
+						</Grid.BackgroundTransition>
+
+						<!--  Selection indicator  -->
+						<Rectangle
+							x:Name="SelectionIndicator"
+							Width="{ThemeResource NavigationViewSelectionIndicatorWidth}"
+							Height="{ThemeResource NavigationViewSelectionIndicatorHeight}"
+							HorizontalAlignment="Left"
+							VerticalAlignment="Center"
+							Fill="{ThemeResource NavigationViewSelectionIndicatorForeground}"
+							Opacity="0.0"
+							RadiusX="{ThemeResource NavigationViewSelectionIndicatorRadius}"
+							RadiusY="{ThemeResource NavigationViewSelectionIndicatorRadius}" />
+
+						<!--  Content grid  -->
+						<ContentPresenter
+							x:Name="ContentPresenter"
+							Grid.Column="1"
+							MinHeight="{ThemeResource NavigationViewItemOnLeftMinHeight}"
+							Margin="{ThemeResource NavigationViewItemContentPresenterMargin}"
+							Padding="{TemplateBinding Padding}"
+							HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+							VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+							AutomationProperties.AccessibilityView="Raw"
+							Content="{TemplateBinding Content}"
+							ContentTemplate="{TemplateBinding ContentTemplate}"
+							ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
+							ContentTransitions="{TemplateBinding ContentTransitions}"
+							Foreground="{TemplateBinding Foreground}" />
+
+						<VisualStateManager.VisualStateGroups>
+							<VisualStateGroup x:Name="PointerStates">
+								<VisualState x:Name="Normal" />
+								<VisualState x:Name="PointerOver">
+									<Storyboard>
+										<ObjectAnimationUsingKeyFrames Storyboard.TargetName="LayoutRoot" Storyboard.TargetProperty="Background">
+											<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource NavigationViewItemBackgroundPointerOver}" />
+										</ObjectAnimationUsingKeyFrames>
+										<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
+											<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource NavigationViewItemForegroundPointerOver}" />
+										</ObjectAnimationUsingKeyFrames>
+									</Storyboard>
+								</VisualState>
+								<VisualState x:Name="Pressed">
+									<Storyboard>
+										<ObjectAnimationUsingKeyFrames Storyboard.TargetName="LayoutRoot" Storyboard.TargetProperty="Background">
+											<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource NavigationViewItemBackgroundPressed}" />
+										</ObjectAnimationUsingKeyFrames>
+										<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
+											<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource NavigationViewItemForegroundPressed}" />
+										</ObjectAnimationUsingKeyFrames>
+									</Storyboard>
+								</VisualState>
+								<VisualState x:Name="Selected">
+									<Storyboard>
+										<ObjectAnimationUsingKeyFrames Storyboard.TargetName="LayoutRoot" Storyboard.TargetProperty="Background">
+											<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource NavigationViewItemBackgroundSelected}" />
+										</ObjectAnimationUsingKeyFrames>
+										<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
+											<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource NavigationViewItemForegroundSelected}" />
+										</ObjectAnimationUsingKeyFrames>
+									</Storyboard>
+								</VisualState>
+								<VisualState x:Name="PointerOverSelected">
+									<Storyboard>
+										<ObjectAnimationUsingKeyFrames Storyboard.TargetName="LayoutRoot" Storyboard.TargetProperty="Background">
+											<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource NavigationViewItemBackgroundSelectedPointerOver}" />
+										</ObjectAnimationUsingKeyFrames>
+										<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
+											<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource NavigationViewItemForegroundSelectedPointerOver}" />
+										</ObjectAnimationUsingKeyFrames>
+									</Storyboard>
+								</VisualState>
+								<VisualState x:Name="PressedSelected">
+									<Storyboard>
+										<ObjectAnimationUsingKeyFrames Storyboard.TargetName="LayoutRoot" Storyboard.TargetProperty="Background">
+											<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource NavigationViewItemBackgroundSelectedPressed}" />
+										</ObjectAnimationUsingKeyFrames>
+										<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
+											<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource NavigationViewItemForegroundSelectedPressed}" />
+										</ObjectAnimationUsingKeyFrames>
+									</Storyboard>
+								</VisualState>
+							</VisualStateGroup>
+
+							<VisualStateGroup x:Name="DisabledStates">
+								<VisualState x:Name="Enabled" />
+								<VisualState x:Name="Disabled">
+									<VisualState.Setters>
+										<Setter Target="LayoutRoot.Opacity" Value="{ThemeResource ListViewItemDisabledThemeOpacity}" />
+									</VisualState.Setters>
+								</VisualState>
+							</VisualStateGroup>
+						</VisualStateManager.VisualStateGroups>
+					</Grid>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+
+</ResourceDictionary>
diff --git a/src/Files.App/ResourceDictionaries/PathIcons.xaml b/src/Files.App/ResourceDictionaries/PathIcons.xaml
index f7cae20ee943..75081cd4970b 100644
--- a/src/Files.App/ResourceDictionaries/PathIcons.xaml
+++ b/src/Files.App/ResourceDictionaries/PathIcons.xaml
@@ -107,6 +107,27 @@
 
 			<x:String x:Key="EnterCompactOverlay">F1 M 16.298828 1.25 C 16.624348 1.25 16.935221 1.316732 17.231445 1.450195 C 17.527668 1.58366 17.788086 1.762695 18.012695 1.987305 C 18.237305 2.211914 18.41634 2.472332 18.549805 2.768555 C 18.683268 3.064779 18.75 3.375652 18.75 3.701172 L 18.75 16.298828 C 18.75 16.62435 18.683268 16.935221 18.549805 17.231445 C 18.41634 17.52767 18.237305 17.788086 18.012695 18.012695 C 17.788086 18.237305 17.527668 18.416342 17.231445 18.549805 C 16.935221 18.683268 16.624348 18.75 16.298828 18.75 L 11.875 18.75 C 11.705729 18.75 11.559244 18.68815 11.435547 18.564453 C 11.311849 18.440756 11.25 18.294271 11.25 18.125 C 11.25 17.955729 11.311849 17.809244 11.435547 17.685547 C 11.559244 17.56185 11.705729 17.5 11.875 17.5 L 16.25 17.5 C 16.425781 17.5 16.588541 17.467447 16.738281 17.402344 C 16.88802 17.33724 17.019855 17.247721 17.133789 17.133789 C 17.247721 17.019857 17.337238 16.888021 17.402344 16.738281 C 17.467447 16.588543 17.5 16.425781 17.5 16.25 L 17.5 10 L 12.451172 10 C 12.11263 10 11.795247 9.931641 11.499023 9.794922 C 11.202799 9.658203 10.94401 9.475912 10.722656 9.248047 C 10.501302 9.020183 10.325521 8.754883 10.195312 8.452148 C 10.065104 8.149414 10 7.832031 10 7.5 L 10 2.5 L 3.75 2.5 C 3.574219 2.5 3.411458 2.532553 3.261719 2.597656 C 3.111979 2.662762 2.980143 2.752279 2.866211 2.866211 C 2.752279 2.980145 2.66276 3.11198 2.597656 3.261719 C 2.532552 3.411459 2.5 3.574219 2.5 3.75 L 2.5 8.125 C 2.5 8.294271 2.438151 8.440756 2.314453 8.564453 C 2.190755 8.688151 2.044271 8.75 1.875 8.75 C 1.705729 8.75 1.559245 8.688151 1.435547 8.564453 C 1.311849 8.440756 1.25 8.294271 1.25 8.125 L 1.25 3.701172 C 1.25 3.375652 1.316732 3.064779 1.450195 2.768555 C 1.583659 2.472332 1.762695 2.211914 1.987305 1.987305 C 2.211914 1.762695 2.472331 1.58366 2.768555 1.450195 C 3.064779 1.316732 3.375651 1.25 3.701172 1.25 Z M 17.5 8.75 L 17.5 3.75 C 17.5 3.58073 17.467447 3.419598 17.402344 3.266602 C 17.337238 3.113607 17.247721 2.980145 17.133789 2.866211 C 17.019855 2.752279 16.886393 2.662762 16.733398 2.597656 C 16.580402 2.532553 16.41927 2.5 16.25 2.5 L 11.25 2.5 L 11.25 7.5 C 11.25 7.675781 11.282552 7.84017 11.347656 7.993164 C 11.41276 8.146159 11.50065 8.277995 11.611328 8.388672 C 11.722005 8.49935 11.853841 8.58724 12.006836 8.652344 C 12.15983 8.717448 12.324219 8.75 12.5 8.75 Z M 8.125 11.25 C 8.294271 11.25 8.440755 11.31185 8.564453 11.435547 C 8.68815 11.559245 8.75 11.705729 8.75 11.875 L 8.75 18.125 C 8.75 18.294271 8.68815 18.440756 8.564453 18.564453 C 8.440755 18.68815 8.294271 18.75 8.125 18.75 C 7.955729 18.75 7.809245 18.68815 7.685547 18.564453 C 7.561849 18.440756 7.5 18.294271 7.5 18.125 L 7.5 13.378906 L 2.314453 18.564453 C 2.190755 18.68815 2.044271 18.75 1.875 18.75 C 1.705729 18.75 1.559245 18.68815 1.435547 18.564453 C 1.311849 18.440756 1.25 18.294271 1.25 18.125 C 1.25 17.955729 1.311849 17.809244 1.435547 17.685547 L 6.621094 12.5 L 1.875 12.5 C 1.705729 12.5 1.559245 12.438151 1.435547 12.314453 C 1.311849 12.190756 1.25 12.044271 1.25 11.875 C 1.25 11.705729 1.311849 11.559245 1.435547 11.435547 C 1.559245 11.31185 1.705729 11.25 1.875 11.25 Z</x:String>
 			<x:String x:Key="ExitCompactOverlay">F1 M 16.298828 1.25 C 16.624348 1.25 16.935221 1.316732 17.231445 1.450195 C 17.527668 1.58366 17.788086 1.762695 18.012695 1.987305 C 18.237305 2.211914 18.41634 2.472332 18.549805 2.768555 C 18.683268 3.064779 18.75 3.375652 18.75 3.701172 L 18.75 16.298828 C 18.75 16.62435 18.683268 16.935221 18.549805 17.231445 C 18.41634 17.52767 18.237305 17.788086 18.012695 18.012695 C 17.788086 18.237305 17.527668 18.416342 17.231445 18.549805 C 16.935221 18.683268 16.624348 18.75 16.298828 18.75 L 11.875 18.75 C 11.705729 18.75 11.559244 18.68815 11.435547 18.564453 C 11.311849 18.440756 11.25 18.294271 11.25 18.125 C 11.25 17.955729 11.311849 17.809244 11.435547 17.685547 C 11.559244 17.56185 11.705729 17.5 11.875 17.5 L 16.25 17.5 C 16.425781 17.5 16.588541 17.467447 16.738281 17.402344 C 16.88802 17.33724 17.019855 17.247721 17.133789 17.133789 C 17.247721 17.019857 17.337238 16.888021 17.402344 16.738281 C 17.467447 16.588543 17.5 16.425781 17.5 16.25 L 17.5 10 L 12.451172 10 C 12.11263 10 11.795247 9.931641 11.499023 9.794922 C 11.202799 9.658203 10.94401 9.475912 10.722656 9.248047 C 10.501302 9.020183 10.325521 8.754883 10.195312 8.452148 C 10.065104 8.149414 10 7.832031 10 7.5 L 10 2.5 L 3.75 2.5 C 3.574219 2.5 3.411458 2.532553 3.261719 2.597656 C 3.111979 2.662762 2.980143 2.752279 2.866211 2.866211 C 2.752279 2.980145 2.66276 3.11198 2.597656 3.261719 C 2.532552 3.411459 2.5 3.574219 2.5 3.75 L 2.5 8.125 C 2.5 8.294271 2.438151 8.440756 2.314453 8.564453 C 2.190755 8.688151 2.044271 8.75 1.875 8.75 C 1.705729 8.75 1.559245 8.688151 1.435547 8.564453 C 1.311849 8.440756 1.25 8.294271 1.25 8.125 L 1.25 3.701172 C 1.25 3.375652 1.316732 3.064779 1.450195 2.768555 C 1.583659 2.472332 1.762695 2.211914 1.987305 1.987305 C 2.211914 1.762695 2.472331 1.58366 2.768555 1.450195 C 3.064779 1.316732 3.375651 1.25 3.701172 1.25 Z M 17.5 8.75 L 17.5 3.75 C 17.5 3.58073 17.467447 3.419598 17.402344 3.266602 C 17.337238 3.113607 17.247721 2.980145 17.133789 2.866211 C 17.019855 2.752279 16.886393 2.662762 16.733398 2.597656 C 16.580402 2.532553 16.41927 2.5 16.25 2.5 L 11.25 2.5 L 11.25 7.5 C 11.25 7.675781 11.282552 7.84017 11.347656 7.993164 C 11.41276 8.146159 11.50065 8.277995 11.611328 8.388672 C 11.722005 8.49935 11.853841 8.58724 12.006836 8.652344 C 12.15983 8.717448 12.324219 8.75 12.5 8.75 Z M 8.75 18.125 C 8.75 18.294271 8.68815 18.440756 8.564453 18.564453 C 8.440755 18.68815 8.294271 18.75 8.125 18.75 L 1.875 18.75 C 1.705729 18.75 1.559245 18.68815 1.435547 18.564453 C 1.311849 18.440756 1.25 18.294271 1.25 18.125 L 1.25 11.875 C 1.25 11.705729 1.311849 11.559245 1.435547 11.435547 C 1.559245 11.31185 1.705729 11.25 1.875 11.25 C 2.044271 11.25 2.190755 11.31185 2.314453 11.435547 C 2.438151 11.559245 2.5 11.705729 2.5 11.875 L 2.5 16.621094 L 7.685547 11.435547 C 7.809245 11.31185 7.955729 11.25 8.125 11.25 C 8.294271 11.25 8.440755 11.31185 8.564453 11.435547 C 8.68815 11.559245 8.75 11.705729 8.75 11.875 C 8.75 12.044271 8.68815 12.190756 8.564453 12.314453 L 3.378906 17.5 L 8.125 17.5 C 8.294271 17.5 8.440755 17.56185 8.564453 17.685547 C 8.68815 17.809244 8.75 17.955729 8.75 18.125 Z</x:String>
+			
+			<x:String x:Key="PageIconRegular">F1 M 5 3.039999 C 4.493333 3.039999 4.053333 3.226665 3.68 3.6 C 3.306666 3.973333 3.12 4.413334 3.12 4.92 L 3.12 18.68 C 3.12 19.186666 3.306666 19.626667 3.68 20 C 4.053333 20.373333 4.493333 20.559999 5 20.559999 L 15 20.559999 C 15.506665 20.559999 15.946665 20.373333 16.32 20 C 16.693333 19.626667 16.879999 19.186666 16.879999 18.68 L 16.879999 8.559999 C 16.879999 8.053333 16.693333 7.613333 16.32 7.24 L 12.679999 3.6 C 12.306665 3.226665 11.866666 3.039999 11.36 3.039999 Z M 4.36 4.92 C 4.36 4.76 4.426666 4.613335 4.56 4.48 C 4.693333 4.346666 4.84 4.279999 5 4.279999 L 10.639999 4.279999 L 10.639999 7.44 C 10.639999 7.946667 10.819999 8.38 11.179999 8.74 C 11.539999 9.1 11.973332 9.280001 12.48 9.28 L 15.639999 9.28 L 15.639999 18.68 C 15.639998 18.84 15.573332 18.98 15.44 19.099998 C 15.306665 19.219999 15.159999 19.279999 15 19.279999 L 5 19.279999 C 4.84 19.279999 4.693333 19.219999 4.56 19.099998 C 4.426666 18.98 4.36 18.84 4.36 18.68 Z M 15.36 8.04 L 12.52 8.04 C 12.333332 8.040001 12.179998 7.98 12.059999 7.86 C 11.94 7.74 11.879999 7.599999 11.88 7.44 L 11.88 4.559999 Z</x:String>
+			<x:String x:Key="PageIconFilled">F1 M 10.639999 3.039999 L 10.639999 7.44 C 10.639999 7.946667 10.819999 8.38 11.179999 8.74 C 11.539999 9.1 11.973332 9.280001 12.48 9.28 L 16.879999 9.28 L 16.879999 18.68 C 16.879999 19.186666 16.693333 19.626667 16.32 20 C 15.946665 20.373333 15.506665 20.559999 15 20.559999 L 5 20.559999 C 4.493333 20.559999 4.053333 20.373333 3.68 20 C 3.306666 19.626667 3.12 19.186666 3.12 18.68 L 3.12 4.92 C 3.12 4.413334 3.306666 3.973333 3.68 3.6 C 4.053333 3.226665 4.493333 3.039999 5 3.039999 Z M 11.88 3.119999 L 11.88 7.44 C 11.879999 7.599999 11.94 7.74 12.059999 7.86 C 12.179998 7.98 12.319999 8.040001 12.48 8.04 L 16.799999 8.04 C 16.719999 7.746666 16.559999 7.48 16.32 7.24 L 12.679999 3.6 C 12.466665 3.360001 12.199999 3.200001 11.88 3.119999 Z</x:String>
+			
+			<x:String x:Key="ShieldIconRegular">F1 M 9.679999 3.32 C 9.893332 3.186666 10.106667 3.186666 10.32 3.32 C 11.013332 3.826668 11.933332 4.32 13.08 4.799999 C 14.653332 5.413334 16.066666 5.719999 17.32 5.719999 C 17.48 5.719999 17.606667 5.773333 17.699999 5.879999 C 17.793331 5.986668 17.84 6.120001 17.84 6.28 L 17.84 11.799999 C 17.84 12.813334 17.573332 13.84 17.039999 14.879999 C 16.586664 15.786666 15.946665 16.653332 15.12 17.48 C 14.346666 18.226665 13.513333 18.860001 12.62 19.379999 C 11.726666 19.9 10.879999 20.226665 10.08 20.359999 L 10 20.359999 L 9.92 20.359999 C 9.12 20.226665 8.273333 19.9 7.38 19.379999 C 6.486666 18.860001 5.653333 18.226665 4.88 17.48 C 4.053333 16.653332 3.413333 15.786666 2.96 14.879999 C 2.426666 13.84 2.16 12.813334 2.16 11.799999 L 2.16 6.28 C 2.16 6.120001 2.206666 5.986668 2.3 5.879999 C 2.393333 5.773333 2.52 5.719999 2.68 5.719999 C 3.933333 5.719999 5.346666 5.413334 6.92 4.799999 C 8.066666 4.32 8.986666 3.826668 9.679999 3.32 Z M 3.2 6.799999 L 3.2 11.799999 C 3.2 12.653333 3.426666 13.52 3.88 14.4 C 4.306666 15.2 4.893333 15.973333 5.64 16.719999 C 6.306666 17.386665 7.033333 17.946667 7.82 18.4 C 8.606667 18.853333 9.333333 19.146666 10 19.279999 C 10.666666 19.146666 11.393333 18.853333 12.179999 18.4 C 12.966665 17.946667 13.693333 17.386665 14.36 16.719999 C 15.106666 15.973333 15.693332 15.2 16.119999 14.4 C 16.573332 13.52 16.799999 12.653333 16.799999 11.799999 L 16.799999 6.799999 C 15.519999 6.72 14.146666 6.386667 12.679999 5.799999 C 11.666666 5.373333 10.773333 4.906666 10 4.4 C 9.226666 4.906666 8.333333 5.373333 7.32 5.799999 C 5.853333 6.386667 4.48 6.72 3.2 6.799999 Z</x:String>
+			<x:String x:Key="ShieldIconFilled">F1 M 9.679999 3.32 C 9.893332 3.186666 10.106667 3.186666 10.32 3.32 C 11.013332 3.826668 11.933332 4.32 13.08 4.799999 C 14.653332 5.413334 16.066666 5.719999 17.32 5.719999 C 17.48 5.719999 17.606667 5.773333 17.699999 5.879999 C 17.793331 5.986668 17.84 6.120001 17.84 6.28 L 17.84 11.799999 C 17.84 12.813334 17.573332 13.84 17.039999 14.879999 C 16.586664 15.786666 15.946665 16.653332 15.12 17.48 C 14.346666 18.226665 13.513333 18.860001 12.62 19.379999 C 11.726666 19.9 10.879999 20.226665 10.08 20.359999 L 10 20.359999 L 9.92 20.359999 C 9.12 20.226665 8.273333 19.9 7.38 19.379999 C 6.486666 18.860001 5.653333 18.226665 4.88 17.48 C 4.053333 16.653332 3.413333 15.786666 2.96 14.879999 C 2.426666 13.84 2.16 12.813334 2.16 11.799999 L 2.16 6.28 C 2.16 6.120001 2.206666 5.986668 2.3 5.879999 C 2.393333 5.773333 2.52 5.719999 2.68 5.719999 C 3.933333 5.719999 5.346666 5.413334 6.92 4.799999 C 8.066666 4.32 8.986666 3.826668 9.679999 3.32 Z</x:String>
+
+			<x:String x:Key="InfoIconRegular">F1 M 10 3.48 C 11.519999 3.48 12.913332 3.853334 14.179999 4.6 C 15.446666 5.346666 16.453333 6.353333 17.199999 7.62 C 17.946665 8.886667 18.32 10.280001 18.32 11.799999 C 18.32 13.32 17.946665 14.713333 17.199999 15.98 C 16.453333 17.246666 15.446666 18.253332 14.179999 19 C 12.913332 19.746666 11.519999 20.119999 10 20.119999 C 8.48 20.119999 7.086666 19.746666 5.82 19 C 4.553333 18.253332 3.546666 17.246666 2.8 15.98 C 2.053333 14.713333 1.68 13.32 1.68 11.799999 C 1.68 10.280001 2.053333 8.886667 2.8 7.62 C 3.546666 6.353333 4.553333 5.346666 5.82 4.6 C 7.086666 3.853334 8.48 3.48 10 3.48 Z M 10 4.719999 C 8.719999 4.693333 7.526667 5 6.42 5.639999 C 5.313333 6.280001 4.44 7.146667 3.8 8.24 C 3.16 9.333333 2.84 10.52 2.84 11.799999 C 2.84 13.08 3.16 14.266666 3.8 15.359999 C 4.44 16.453333 5.313333 17.32 6.42 17.959999 C 7.526667 18.599998 8.719999 18.913332 10 18.9 C 11.28 18.886665 12.453333 18.559999 13.52 17.92 C 14.586666 17.279999 15.433332 16.42 16.059999 15.339999 C 16.686666 14.259999 17 13.08 17 11.799999 C 17 10.52 16.686666 9.34 16.059999 8.259999 C 15.433332 7.18 14.586666 6.320001 13.52 5.68 C 12.453333 5.040001 11.28 4.719999 10 4.719999 Z M 10 10.559999 C 10.16 10.559999 10.299999 10.606667 10.42 10.7 C 10.539999 10.793333 10.599998 10.92 10.599999 11.08 L 10.639999 15.759999 C 10.639999 15.92 10.579999 16.059999 10.46 16.18 C 10.339999 16.299999 10.199999 16.366665 10.04 16.379999 C 9.88 16.393333 9.733334 16.346666 9.599999 16.24 C 9.466665 16.133333 9.4 16 9.4 15.839999 L 9.36 11.16 C 9.359999 11 9.419999 10.86 9.54 10.74 C 9.659999 10.62 9.813333 10.559999 10 10.559999 Z M 10 7.639999 C 10.32 7.613333 10.566666 7.746666 10.74 8.04 C 10.913333 8.333334 10.913333 8.62 10.74 8.9 C 10.566666 9.18 10.32 9.306667 10 9.28 C 9.786666 9.280001 9.599998 9.200001 9.44 9.04 C 9.279999 8.88 9.199999 8.686666 9.2 8.459999 C 9.199999 8.233334 9.279999 8.04 9.44 7.879999 C 9.599998 7.719999 9.786666 7.639999 10 7.639999 Z</x:String>
+			<x:String x:Key="InfoIconFilled">F1 M 10 3.48 C 11.519999 3.48 12.913332 3.853334 14.179999 4.6 C 15.446666 5.346666 16.453333 6.353333 17.199999 7.62 C 17.946665 8.886667 18.32 10.280001 18.32 11.799999 C 18.32 13.32 17.946665 14.713333 17.199999 15.98 C 16.453333 17.246666 15.446666 18.253332 14.179999 19 C 12.913332 19.746666 11.519999 20.119999 10 20.119999 C 8.48 20.119999 7.086666 19.746666 5.82 19 C 4.553333 18.253332 3.546666 17.246666 2.8 15.98 C 2.053333 14.713333 1.68 13.32 1.68 11.799999 C 1.68 10.280001 2.053333 8.886667 2.8 7.62 C 3.546666 6.353333 4.553333 5.346666 5.82 4.6 C 7.086666 3.853334 8.48 3.48 10 3.48 Z M 10 10.32 C 9.786666 10.346666 9.599998 10.426666 9.44 10.559999 C 9.279999 10.693333 9.186666 10.866667 9.16 11.08 L 9.16 15.839999 C 9.186666 16.053333 9.279999 16.233334 9.44 16.379999 C 9.599998 16.526667 9.786666 16.599998 10 16.599998 C 10.213333 16.599998 10.4 16.526667 10.559999 16.379999 C 10.719999 16.233334 10.813334 16.053333 10.84 15.839999 L 10.84 11.08 C 10.813334 10.866667 10.719999 10.693333 10.559999 10.559999 C 10.4 10.426666 10.213333 10.36 10 10.36 Z M 10 7.2 C 9.706666 7.2 9.459999 7.306666 9.26 7.52 C 9.059999 7.733333 8.959999 7.98 8.96 8.259999 C 8.959999 8.54 9.059999 8.786667 9.26 9 C 9.459999 9.213334 9.706666 9.320001 10 9.32 C 10.293333 9.320001 10.539999 9.213334 10.74 9 C 10.94 8.786667 11.04 8.54 11.04 8.259999 C 11.04 7.98 10.94 7.733333 10.74 7.52 C 10.539999 7.306666 10.293333 7.2 10 7.2 Z</x:String>
+			
+			<x:String x:Key="ColorIconRegular">F1 M 3.2 6.679999 C 4 5.613335 5.046666 4.799999 6.34 4.24 C 7.633333 3.68 8.993333 3.433334 10.42 3.5 C 11.846665 3.566668 13.146666 3.966667 14.32 4.699999 C 15.493333 5.433332 16.426666 6.366667 17.119999 7.5 C 17.813332 8.633334 18.213333 9.866667 18.32 11.2 C 18.426666 12.533333 18.239998 13.866667 17.76 15.199999 C 17.306667 16.426666 16.646667 17.406666 15.78 18.139999 C 14.913333 18.873333 13.966666 19.286667 12.94 19.379999 C 11.913333 19.473333 10.973333 19.199999 10.12 18.559999 C 9.639999 18.213333 9.286666 17.806665 9.059999 17.34 C 8.833333 16.873333 8.666666 16.266666 8.559999 15.52 L 8.44 14.359999 C 8.386666 13.959999 8.32 13.666666 8.24 13.48 C 8.16 13.293333 8.039999 13.146667 7.88 13.039999 C 7.639999 12.933332 7.426666 12.873333 7.24 12.86 C 7.053333 12.846666 6.813334 12.906666 6.52 13.039999 L 6.08 13.2 C 5.653333 13.386666 5.28 13.513332 4.96 13.579999 C 4.64 13.646666 4.306666 13.639999 3.96 13.559999 L 3.68 13.48 C 2.906667 13.24 2.36 12.766666 2.04 12.059999 C 1.72 11.353333 1.653333 10.52 1.84 9.559999 C 2.026667 8.6 2.48 7.64 3.2 6.679999 Z M 4 12.28 L 4.12 12.32 L 4.24 12.32 C 4.559999 12.4 4.96 12.333334 5.44 12.12 L 5.92 11.919999 C 6.453333 11.706667 6.906666 11.6 7.28 11.599999 C 7.653333 11.6 8.053332 11.719999 8.48 11.959999 C 8.853333 12.173333 9.126666 12.446667 9.3 12.78 C 9.473332 13.113333 9.599998 13.573334 9.679999 14.16 L 9.8 15.359999 C 9.88 15.919999 10 16.366665 10.16 16.699999 C 10.32 17.033333 10.546666 17.32 10.84 17.559999 C 11.48 18.013332 12.173333 18.199999 12.92 18.119999 C 13.666666 18.039999 14.373333 17.706665 15.04 17.119999 C 15.706665 16.533333 16.213331 15.746666 16.559999 14.759999 C 17.199999 13.026667 17.259998 11.333334 16.74 9.679999 C 16.219999 8.026667 15.199999 6.72 13.679999 5.76 C 12.666666 5.146667 11.553332 4.806667 10.34 4.74 C 9.126666 4.673332 7.966666 4.879999 6.86 5.359999 C 5.753333 5.84 4.866666 6.533334 4.2 7.44 C 3.64 8.16 3.273333 8.866667 3.1 9.559999 C 2.926666 10.253333 2.926666 10.84 3.1 11.32 C 3.273333 11.799999 3.573333 12.119999 4 12.28 Z M 13.36 10.599999 C 13.253332 10.226666 13.339999 9.893333 13.62 9.599999 C 13.9 9.306667 14.24 9.213334 14.639999 9.32 C 15.039999 9.426667 15.293332 9.68 15.4 10.08 C 15.453332 10.346666 15.406666 10.599999 15.259999 10.839999 C 15.113333 11.08 14.906666 11.24 14.639999 11.32 C 14.373333 11.4 14.113333 11.373333 13.86 11.24 C 13.606666 11.106667 13.439999 10.893332 13.36 10.599999 Z M 13.799999 13.52 C 13.719999 13.253333 13.753332 12.993334 13.9 12.74 C 14.046666 12.486667 14.253333 12.32 14.52 12.24 C 14.786666 12.16 15.046665 12.193334 15.299999 12.339999 C 15.553331 12.486667 15.719998 12.7 15.799999 12.98 C 15.879999 13.26 15.846666 13.526667 15.7 13.78 C 15.553332 14.033333 15.339998 14.193333 15.059999 14.259999 C 14.779999 14.326666 14.513332 14.293333 14.259999 14.16 C 14.006666 14.026667 13.853333 13.813334 13.799999 13.52 Z M 11.719999 8.12 C 11.639999 7.826666 11.673332 7.559999 11.82 7.32 C 11.966665 7.08 12.179999 6.92 12.46 6.839999 C 12.74 6.76 13.006666 6.793333 13.259999 6.94 C 13.513332 7.086666 13.673332 7.3 13.74 7.58 C 13.806666 7.860001 13.766666 8.120001 13.62 8.36 C 13.473332 8.6 13.266666 8.76 13 8.839999 C 12.733332 8.92 12.473331 8.886666 12.219999 8.74 C 11.966666 8.593333 11.799999 8.386667 11.719999 8.12 Z M 11.719999 15.599999 C 11.586666 15.226666 11.666666 14.893333 11.96 14.599999 C 12.253332 14.306666 12.593332 14.213333 12.98 14.32 C 13.366666 14.426666 13.613333 14.679999 13.719999 15.08 C 13.773333 15.346666 13.726665 15.6 13.58 15.839999 C 13.433332 16.08 13.226665 16.24 12.96 16.32 C 12.693333 16.4 12.439999 16.366667 12.2 16.219999 C 11.959999 16.073334 11.799999 15.866667 11.719999 15.599999 Z M 8.8 7.32 C 8.693333 6.92 8.779999 6.58 9.059999 6.299999 C 9.339999 6.02 9.673332 5.926666 10.059999 6.02 C 10.446666 6.113334 10.693333 6.360001 10.8 6.759999 C 10.88 7.053333 10.846666 7.32 10.7 7.559999 C 10.553332 7.799999 10.339999 7.959999 10.059999 8.04 C 9.779999 8.120001 9.519999 8.086667 9.28 7.94 C 9.039999 7.793333 8.879999 7.586666 8.8 7.32 Z</x:String>
+			<x:String x:Key="ColorIconFilled">F1 M 3.2 6.679999 C 4 5.613335 5.046666 4.799999 6.34 4.24 C 7.633333 3.68 8.993333 3.433334 10.42 3.5 C 11.846665 3.566668 13.146666 3.966667 14.32 4.699999 C 15.493333 5.433332 16.426666 6.366667 17.119999 7.5 C 17.813332 8.633334 18.213333 9.866667 18.32 11.2 C 18.426666 12.533333 18.239998 13.866667 17.76 15.199999 C 17.306667 16.426666 16.646667 17.406666 15.78 18.139999 C 14.913333 18.873333 13.966666 19.286667 12.94 19.379999 C 11.913333 19.473333 10.973333 19.199999 10.12 18.559999 C 9.639999 18.213333 9.286666 17.806665 9.059999 17.34 C 8.833333 16.873333 8.666666 16.266666 8.559999 15.52 L 8.44 14.359999 C 8.386666 13.959999 8.32 13.666666 8.24 13.48 C 8.16 13.293333 8.039999 13.146667 7.88 13.039999 C 7.639999 12.933332 7.426666 12.873333 7.24 12.86 C 7.053333 12.846666 6.813334 12.906666 6.52 13.039999 L 6.08 13.2 C 5.653333 13.386666 5.28 13.513332 4.96 13.579999 C 4.64 13.646666 4.306666 13.639999 3.96 13.559999 L 3.68 13.48 C 2.906667 13.24 2.36 12.766666 2.04 12.059999 C 1.72 11.353333 1.653333 10.52 1.84 9.559999 C 2.026667 8.6 2.48 7.64 3.2 6.679999 Z M 13.96 10.599999 C 14.04 10.893332 14.206667 11.113333 14.46 11.259999 C 14.713333 11.406667 14.98 11.440001 15.259999 11.36 C 15.539999 11.280001 15.746666 11.113334 15.88 10.86 C 16.013332 10.606667 16.046665 10.346666 15.98 10.08 C 15.913333 9.813334 15.753333 9.606667 15.5 9.459999 C 15.246666 9.313334 14.98 9.273334 14.7 9.339999 C 14.42 9.406667 14.213333 9.566668 14.08 9.82 C 13.946667 10.073334 13.906667 10.333333 13.96 10.599999 Z M 14.4 13.52 C 14.48 13.92 14.719999 14.173333 15.12 14.279999 C 15.519999 14.386666 15.859999 14.293333 16.139999 14 C 16.419998 13.706667 16.506666 13.373333 16.4 12.999999 C 16.319998 12.706667 16.153332 12.493334 15.9 12.36 C 15.646666 12.226667 15.386665 12.200001 15.12 12.28 C 14.853333 12.360001 14.646666 12.52 14.5 12.759999 C 14.353333 13 14.32 13.253333 14.4 13.52 Z M 12.32 8.12 C 12.399999 8.386667 12.566666 8.593333 12.82 8.74 C 13.073333 8.886666 13.333332 8.92 13.599999 8.839999 C 13.866667 8.76 14.073333 8.6 14.219999 8.36 C 14.366666 8.120001 14.406666 7.860001 14.34 7.58 C 14.273333 7.3 14.113333 7.086666 13.86 6.94 C 13.606666 6.793333 13.339999 6.76 13.059999 6.839999 C 12.779999 6.92 12.566666 7.08 12.42 7.32 C 12.273333 7.559999 12.239999 7.826666 12.32 8.12 Z M 12.32 15.599999 C 12.373332 15.893333 12.526666 16.113333 12.78 16.259998 C 13.033333 16.406666 13.299999 16.439999 13.58 16.359999 C 13.86 16.279999 14.073333 16.113333 14.219999 15.859999 C 14.366666 15.606667 14.4 15.34 14.32 15.059999 C 14.24 14.78 14.073333 14.573333 13.82 14.44 C 13.566666 14.306666 13.299999 14.273333 13.02 14.339999 C 12.739999 14.406666 12.533332 14.566666 12.4 14.82 C 12.266665 15.073333 12.239999 15.333333 12.32 15.599999 Z M 9.4 7.32 C 9.48 7.693333 9.719999 7.933332 10.12 8.04 C 10.519999 8.146667 10.859999 8.06 11.139999 7.78 C 11.419999 7.5 11.506666 7.16 11.4 6.759999 C 11.32 6.493334 11.153333 6.286667 10.9 6.139999 C 10.646666 5.993333 10.386665 5.96 10.12 6.04 C 9.853333 6.120001 9.646666 6.280001 9.5 6.52 C 9.353333 6.76 9.32 7.026667 9.4 7.32 Z</x:String>
+			
+			<x:String x:Key="LibraryIconRegular">F1 M 3.32 4.279999 L 4.16 4.279999 C 4.613333 4.306667 5 4.466667 5.32 4.76 C 5.639999 5.053333 5.813333 5.413332 5.84 5.839999 L 5.84 17.639999 C 5.84 18.066666 5.693333 18.439999 5.4 18.759998 C 5.106667 19.08 4.733333 19.253332 4.28 19.279999 L 3.32 19.279999 C 2.893333 19.279999 2.52 19.133333 2.2 18.84 C 1.88 18.546665 1.706666 18.186666 1.68 17.759998 L 1.68 5.96 C 1.68 5.533333 1.826667 5.16 2.12 4.84 C 2.413333 4.52 2.773333 4.346666 3.2 4.32 L 4.16 4.279999 Z M 8.32 4.279999 L 9.16 4.279999 C 9.613333 4.306667 10 4.466667 10.32 4.76 C 10.639999 5.053333 10.813334 5.413332 10.84 5.839999 L 10.84 17.639999 C 10.84 18.066666 10.693333 18.439999 10.4 18.759998 C 10.106667 19.08 9.733334 19.253332 9.28 19.279999 L 8.32 19.279999 C 7.893332 19.279999 7.52 19.133333 7.2 18.84 C 6.88 18.546665 6.706666 18.186666 6.68 17.759998 L 6.68 5.96 C 6.679999 5.533333 6.826666 5.16 7.12 4.84 C 7.413333 4.52 7.773333 4.346666 8.2 4.32 L 9.16 4.279999 Z M 14.16 5.96 C 14.506666 5.960001 14.826666 6.066668 15.12 6.28 C 15.413332 6.493334 15.613332 6.76 15.719999 7.08 L 18.279999 17 C 18.386665 17.426666 18.333332 17.833332 18.119999 18.219999 C 17.906666 18.606667 17.599998 18.866667 17.199999 19 L 16.279999 19.24 C 15.853332 19.346666 15.446665 19.299999 15.059999 19.099998 C 14.673332 18.9 14.413333 18.586666 14.28 18.16 L 11.719999 8.24 C 11.613333 7.84 11.666666 7.446667 11.88 7.059999 C 12.093332 6.673334 12.399999 6.413334 12.799999 6.28 L 13.719999 6 C 13.853333 5.973334 14 5.960001 14.16 5.96 Z M 4.16 5.559999 L 3.32 5.559999 C 3.24 5.559999 3.16 5.593334 3.08 5.66 C 3 5.726667 2.946666 5.800001 2.92 5.879999 L 2.92 17.639999 C 2.92 17.746666 2.953333 17.833332 3.02 17.9 C 3.086666 17.966667 3.16 18.013332 3.24 18.039999 L 4.16 18.039999 C 4.266666 18.039999 4.36 18.006666 4.44 17.939999 C 4.52 17.873333 4.559999 17.799999 4.56 17.719999 L 4.6 5.96 C 4.599999 5.853333 4.566667 5.766666 4.5 5.699999 C 4.433333 5.633335 4.346666 5.586668 4.24 5.559999 Z M 9.16 5.559999 L 8.32 5.559999 C 8.24 5.559999 8.16 5.593334 8.08 5.66 C 8 5.726667 7.946666 5.800001 7.92 5.879999 L 7.92 17.639999 C 7.919999 17.746666 7.953332 17.833332 8.02 17.9 C 8.086666 17.966667 8.16 18.013332 8.24 18.039999 L 9.16 18.039999 C 9.266666 18.039999 9.359999 18.006666 9.44 17.939999 C 9.519999 17.873333 9.559999 17.799999 9.559999 17.719999 L 9.599999 5.96 C 9.599998 5.853333 9.566666 5.766666 9.5 5.699999 C 9.433332 5.633335 9.346666 5.586668 9.24 5.559999 Z M 14.16 7.2 L 14.08 7.2 L 13.24 7.44 C 13.133333 7.466666 13.053333 7.52 13 7.599999 C 12.946667 7.679999 12.92 7.773333 12.92 7.879999 L 15.44 17.719999 C 15.493332 17.933332 15.626665 18.039999 15.839999 18.039999 L 16.76 17.84 C 16.866667 17.813334 16.946667 17.759998 17 17.68 C 17.053333 17.599998 17.08 17.506666 17.08 17.4 L 14.559999 7.52 C 14.506666 7.306666 14.373333 7.2 14.16 7.2 Z</x:String>
+			<x:String x:Key="LibraryIconFilled">F1 M 4.6 4.279999 C 4.946666 4.279999 5.24 4.406666 5.48 4.66 C 5.72 4.913334 5.84 5.213333 5.84 5.559999 L 5.84 18.039999 C 5.84 18.386665 5.72 18.68 5.48 18.92 C 5.24 19.16 4.946666 19.293333 4.6 19.32 L 2.92 19.32 C 2.573333 19.32 2.28 19.193333 2.04 18.939999 C 1.8 18.686666 1.68 18.386665 1.68 18.039999 L 1.68 5.559999 C 1.68 5.213333 1.8 4.913334 2.04 4.66 C 2.28 4.406666 2.573333 4.279999 2.92 4.279999 Z M 9.599999 4.279999 C 9.946666 4.279999 10.24 4.406666 10.48 4.66 C 10.719999 4.913334 10.84 5.213333 10.84 5.559999 L 10.84 18.039999 C 10.84 18.386665 10.719999 18.686666 10.48 18.939999 C 10.24 19.193333 9.946666 19.32 9.599999 19.32 L 7.92 19.32 C 7.573333 19.293333 7.28 19.16 7.04 18.92 C 6.8 18.68 6.679999 18.386665 6.68 18.039999 L 6.68 5.559999 C 6.679999 5.213333 6.8 4.913334 7.04 4.66 C 7.28 4.406666 7.573333 4.279999 7.92 4.279999 Z M 15.639999 6.919999 L 18.32 17.32 C 18.4 17.666666 18.353333 17.986666 18.18 18.279999 C 18.006666 18.573334 17.759998 18.76 17.440001 18.84 L 15.88 19.24 C 15.533333 19.346666 15.213332 19.306665 14.92 19.119999 C 14.626666 18.933332 14.44 18.68 14.36 18.359999 L 11.679999 7.919999 C 11.573333 7.599999 11.613333 7.286667 11.8 6.98 C 11.986666 6.673334 12.239999 6.48 12.559999 6.4 L 14.12 6 C 14.466666 5.92 14.786666 5.966666 15.08 6.139999 C 15.373332 6.313334 15.559999 6.573334 15.639999 6.919999 Z</x:String>
+			
+			<x:String x:Key="LinkIconRegular">F1 M 7.72 7.639999 C 7.88 7.639999 8.02 7.693333 8.139999 7.799999 C 8.259999 7.906666 8.326666 8.039999 8.34 8.2 C 8.353333 8.360001 8.306666 8.506666 8.2 8.639999 C 8.093333 8.773333 7.96 8.853333 7.8 8.879999 L 5.84 8.879999 C 5.039999 8.879999 4.36 9.153334 3.8 9.7 C 3.24 10.246666 2.946666 10.913333 2.92 11.7 C 2.893333 12.486667 3.146667 13.173333 3.68 13.759999 C 4.213333 14.346666 4.88 14.666666 5.68 14.719999 L 7.72 14.719999 C 7.88 14.719999 8.02 14.773333 8.139999 14.879999 C 8.259999 14.986666 8.326666 15.126666 8.34 15.299999 C 8.353333 15.473333 8.306666 15.62 8.2 15.74 C 8.093333 15.86 7.96 15.933332 7.8 15.959999 L 5.84 15.959999 C 5.093333 15.959999 4.406666 15.78 3.78 15.42 C 3.153333 15.059999 2.646667 14.566666 2.26 13.94 C 1.873333 13.313334 1.673333 12.633333 1.66 11.9 C 1.646667 11.166666 1.813333 10.48 2.16 9.839999 C 2.506666 9.2 2.986666 8.68 3.6 8.28 C 4.213333 7.879999 4.893333 7.666666 5.64 7.639999 Z M 14.16 7.639999 C 14.906666 7.639999 15.593332 7.82 16.219999 8.179999 C 16.846666 8.54 17.353333 9.033333 17.74 9.66 C 18.126665 10.286667 18.326666 10.966666 18.34 11.7 C 18.353333 12.433333 18.186665 13.12 17.84 13.759999 C 17.493332 14.4 17.013332 14.919999 16.4 15.32 C 15.786665 15.719999 15.106666 15.933332 14.36 15.959999 L 12.28 15.959999 C 12.119999 15.959999 11.98 15.906666 11.86 15.799999 C 11.74 15.693333 11.673332 15.559999 11.66 15.4 C 11.646666 15.24 11.693333 15.093333 11.8 14.959999 C 11.906666 14.826666 12.039999 14.746666 12.2 14.719999 L 14.16 14.719999 C 14.959999 14.719999 15.639998 14.446667 16.199999 13.9 C 16.759998 13.353333 17.053333 12.686666 17.08 11.9 C 17.106667 11.113333 16.853333 10.426666 16.32 9.839999 C 15.786665 9.253333 15.119999 8.933332 14.32 8.879999 L 12.28 8.879999 C 12.119999 8.879999 11.98 8.826666 11.86 8.719999 C 11.74 8.613333 11.673332 8.473333 11.66 8.299999 C 11.646666 8.126667 11.693333 7.98 11.8 7.86 C 11.906666 7.74 12.039999 7.666666 12.2 7.639999 Z M 5.84 11.16 L 14.16 11.16 C 14.32 11.16 14.459999 11.22 14.58 11.339999 C 14.699999 11.46 14.766666 11.6 14.78 11.759999 C 14.793333 11.919999 14.746666 12.066666 14.639999 12.2 C 14.533333 12.333334 14.4 12.4 14.24 12.4 L 5.84 12.44 C 5.68 12.440001 5.54 12.38 5.42 12.259999 C 5.3 12.14 5.233333 12 5.22 11.839999 C 5.206666 11.68 5.253333 11.533333 5.36 11.4 C 5.466666 11.266666 5.6 11.200001 5.76 11.2 L 14.16 11.16 Z</x:String>
+			<x:String x:Key="LinkIconFilled">F1 M 7.52 7.639999 C 7.733333 7.639999 7.919999 7.713333 8.08 7.86 C 8.24 8.006667 8.326666 8.193334 8.34 8.419999 C 8.353333 8.646667 8.286666 8.84 8.139999 9 C 7.993332 9.160001 7.813333 9.253334 7.6 9.28 L 5.84 9.28 C 5.146666 9.280001 4.559999 9.52 4.08 9.999999 C 3.6 10.48 3.353333 11.059999 3.34 11.74 C 3.326666 12.42 3.546667 13.006666 4 13.499999 C 4.453333 13.993333 5.013333 14.253333 5.68 14.279999 L 7.52 14.279999 C 7.733333 14.306666 7.919999 14.393333 8.08 14.539999 C 8.24 14.686666 8.326666 14.866666 8.34 15.08 C 8.353333 15.293333 8.286666 15.486667 8.139999 15.66 C 7.993332 15.833333 7.813333 15.933332 7.6 15.959999 L 5.84 15.959999 C 5.093333 15.959999 4.406666 15.78 3.78 15.42 C 3.153333 15.059999 2.646667 14.566666 2.26 13.94 C 1.873333 13.313334 1.673333 12.626666 1.66 11.879999 C 1.646667 11.133333 1.813333 10.44 2.16 9.799999 C 2.506666 9.16 2.986666 8.646667 3.6 8.259999 C 4.213333 7.873333 4.893333 7.666666 5.64 7.639999 Z M 14.16 7.639999 C 14.906666 7.639999 15.593332 7.82 16.219999 8.179999 C 16.846666 8.54 17.353333 9.033333 17.74 9.66 C 18.126665 10.286667 18.326666 10.973333 18.34 11.719999 C 18.353333 12.466666 18.186665 13.16 17.84 13.799999 C 17.493332 14.44 17.013332 14.953333 16.4 15.339999 C 15.786665 15.726666 15.106666 15.933332 14.36 15.959999 L 12.52 15.959999 C 12.279999 15.959999 12.079999 15.886666 11.92 15.74 C 11.759999 15.593333 11.673332 15.406667 11.66 15.179999 C 11.646666 14.953333 11.713333 14.759999 11.86 14.599999 C 12.006666 14.44 12.186666 14.346666 12.4 14.32 L 14.16 14.279999 C 14.853333 14.306666 15.439999 14.08 15.92 13.599999 C 16.4 13.12 16.646666 12.54 16.66 11.86 C 16.673332 11.179999 16.453333 10.593332 16 10.099999 C 15.546665 9.606667 14.986666 9.346667 14.32 9.32 L 12.52 9.28 C 12.279999 9.280001 12.079999 9.206667 11.92 9.059999 C 11.759999 8.913333 11.673332 8.733334 11.66 8.52 C 11.646666 8.306667 11.713333 8.113334 11.86 7.94 C 12.006666 7.766666 12.186666 7.666666 12.4 7.639999 Z M 5.84 10.959999 L 14.16 10.959999 C 14.373333 10.959999 14.559999 11.039999 14.719999 11.2 C 14.879999 11.360001 14.966665 11.546667 14.98 11.759999 C 14.993332 11.973333 14.933332 12.166667 14.799999 12.339999 C 14.666666 12.513333 14.493333 12.613333 14.28 12.639999 L 5.84 12.639999 C 5.626667 12.639999 5.44 12.559999 5.28 12.4 C 5.12 12.24 5.033333 12.053333 5.02 11.839999 C 5.006666 11.626667 5.066667 11.433333 5.2 11.259999 C 5.333333 11.086666 5.506667 10.986666 5.72 10.959999 L 14.16 10.959999 Z</x:String>
+			
+			<x:String x:Key="WindowsAppsRegular">F1 M 5.2 4.279999 C 4.453333 4.279999 3.82 4.546667 3.3 5.08 C 2.78 5.613333 2.52 6.253333 2.52 7 L 2.52 16.599998 C 2.52 17.346666 2.78 17.986666 3.3 18.519999 C 3.82 19.053333 4.453333 19.306665 5.2 19.279999 L 7.52 19.279999 L 7.52 18.039999 L 5.2 18.039999 C 4.8 18.039999 4.46 17.9 4.18 17.619999 C 3.9 17.34 3.76 17 3.76 16.599998 L 3.76 8.879999 L 16.24 8.879999 L 16.24 9.28 L 17.48 9.32 L 17.48 7 C 17.506666 6.253333 17.253332 5.613333 16.719999 5.08 C 16.186666 4.546667 15.546666 4.279999 14.799999 4.279999 Z M 16.24 7.639999 L 3.76 7.639999 L 3.76 7 C 3.76 6.6 3.9 6.26 4.18 5.98 C 4.46 5.700001 4.8 5.559999 5.2 5.559999 L 14.799999 5.559999 C 15.199999 5.559999 15.539999 5.700001 15.82 5.98 C 16.099998 6.26 16.24 6.6 16.24 7 Z M 10.2 14.719999 L 12.92 14.719999 L 12.92 11.999999 C 12.92 11.493334 13.099999 11.053333 13.46 10.679999 C 13.82 10.306666 14.266666 10.12 14.799999 10.12 L 17.279999 10.12 C 17.813332 10.12 18.259998 10.306666 18.619999 10.679999 C 18.98 11.053333 19.16 11.493334 19.16 11.999999 L 19.16 18.24 C 19.16 19.013332 18.9 19.66 18.379999 20.179998 C 17.859999 20.699999 17.213333 20.959999 16.440001 20.959999 L 10.2 20.959999 C 9.693333 20.959999 9.253332 20.779999 8.88 20.42 C 8.506666 20.059999 8.32 19.613333 8.32 19.08 L 8.32 16.599998 C 8.32 16.066666 8.506666 15.619999 8.88 15.259999 C 9.253332 14.9 9.693333 14.719999 10.2 14.719999 Z M 14.16 11.999999 L 14.16 14.719999 L 17.92 14.719999 L 17.92 11.999999 C 17.919998 11.84 17.859999 11.7 17.74 11.58 C 17.619999 11.46 17.466665 11.4 17.279999 11.4 L 14.799999 11.4 C 14.613333 11.4 14.459999 11.46 14.34 11.58 C 14.219999 11.7 14.16 11.84 14.16 11.999999 Z M 12.92 19.719999 L 12.92 15.959999 L 10.2 15.959999 C 10.04 15.959999 9.9 16.02 9.78 16.139999 C 9.659999 16.259998 9.599998 16.413334 9.599999 16.599998 L 9.599999 19.08 C 9.599998 19.266666 9.659999 19.419998 9.78 19.539999 C 9.9 19.66 10.04 19.719999 10.2 19.719999 Z M 14.16 15.959999 L 14.16 19.719999 L 16.440001 19.719999 C 16.866667 19.719999 17.219999 19.58 17.5 19.299999 C 17.779999 19.02 17.919998 18.666666 17.92 18.24 L 17.92 15.959999 Z</x:String>
+			<x:String x:Key="WindowsAppsFilled">F1 M 2.52 7 C 2.52 6.253333 2.78 5.613333 3.3 5.08 C 3.82 4.546667 4.453333 4.279999 5.2 4.279999 L 14.799999 4.279999 C 15.546666 4.279999 16.186666 4.546667 16.719999 5.08 C 17.253332 5.613333 17.52 6.253333 17.52 7 L 17.52 9.32 L 16.24 9.28 L 16.24 8.879999 L 3.76 8.879999 L 3.76 16.599998 C 3.76 17 3.9 17.34 4.18 17.619999 C 4.46 17.9 4.8 18.039999 5.2 18.039999 L 7.52 18.039999 L 7.52 19.279999 L 5.2 19.279999 C 4.453333 19.279999 3.813333 19.02 3.28 18.5 C 2.746667 17.98 2.493333 17.346666 2.52 16.599998 Z M 10.2 14.719999 L 12.92 14.719999 L 12.92 11.999999 C 12.92 11.493334 13.099999 11.053333 13.46 10.679999 C 13.82 10.306666 14.266666 10.12 14.799999 10.12 L 17.279999 10.12 C 17.813332 10.12 18.259998 10.306666 18.619999 10.679999 C 18.98 11.053333 19.16 11.493334 19.16 11.999999 L 19.16 18.24 C 19.16 19.013332 18.9 19.66 18.379999 20.179998 C 17.859999 20.699999 17.213333 20.959999 16.440001 20.959999 L 10.2 20.959999 C 9.693333 20.959999 9.253332 20.779999 8.88 20.42 C 8.506666 20.059999 8.32 19.613333 8.32 19.08 L 8.32 16.599998 C 8.32 16.066666 8.506666 15.619999 8.88 15.259999 C 9.253332 14.9 9.693333 14.719999 10.2 14.719999 Z M 14.16 11.999999 L 14.16 14.719999 L 17.92 14.719999 L 17.92 11.999999 C 17.919998 11.84 17.859999 11.7 17.74 11.58 C 17.619999 11.46 17.466665 11.4 17.279999 11.4 L 14.799999 11.4 C 14.613333 11.4 14.459999 11.46 14.34 11.58 C 14.219999 11.7 14.16 11.84 14.16 11.999999 Z M 12.92 19.719999 L 12.92 15.959999 L 10.2 15.959999 C 10.04 15.959999 9.9 16.02 9.78 16.139999 C 9.659999 16.259998 9.599998 16.413334 9.599999 16.599998 L 9.599999 19.08 C 9.599998 19.266666 9.659999 19.419998 9.78 19.539999 C 9.9 19.66 10.04 19.719999 10.2 19.719999 Z M 14.16 15.959999 L 14.16 19.719999 L 16.440001 19.719999 C 16.866667 19.719999 17.219999 19.58 17.5 19.299999 C 17.779999 19.02 17.919998 18.666666 17.92 18.24 L 17.92 15.959999 Z</x:String>
 
 			<Style x:Key="ColorIconNew" TargetType="local:OpacityIcon">
 				<Setter Property="Template">
diff --git a/src/Files.App/Strings/en-US/Resources.resw b/src/Files.App/Strings/en-US/Resources.resw
index ecfe83cbdda9..cefb5b452823 100644
--- a/src/Files.App/Strings/en-US/Resources.resw
+++ b/src/Files.App/Strings/en-US/Resources.resw
@@ -2790,4 +2790,7 @@
   <data name="ApplyToAllConflictingItems" xml:space="preserve">
     <value>Apply this action to all conflicting items</value>
   </data>
+  <data name="Save" xml:space="preserve">
+    <value>Save</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Files.App/UserControls/AddressToolbar.xaml b/src/Files.App/UserControls/AddressToolbar.xaml
index 015a97ffed79..225d8d087b2f 100644
--- a/src/Files.App/UserControls/AddressToolbar.xaml
+++ b/src/Files.App/UserControls/AddressToolbar.xaml
@@ -24,8 +24,6 @@
 			<converters1:BoolNegationConverter x:Key="BoolNegationConverter" />
 
 			<ResourceDictionary.MergedDictionaries>
-				<ResourceDictionary Source="/ResourceDictionaries/PathIcons.xaml" />
-
 				<ResourceDictionary>
 					<SolidColorBrush x:Key="ButtonBorderBrushDisabled" Color="Transparent" />
 					<SolidColorBrush x:Key="ButtonBackgroundDisabled" Color="Transparent" />
diff --git a/src/Files.App/UserControls/InnerNavigationToolbar.xaml b/src/Files.App/UserControls/InnerNavigationToolbar.xaml
index 428c4527e473..2aa46cf0e050 100644
--- a/src/Files.App/UserControls/InnerNavigationToolbar.xaml
+++ b/src/Files.App/UserControls/InnerNavigationToolbar.xaml
@@ -26,7 +26,6 @@
 			<x:Boolean x:Key="False">False</x:Boolean>
 			<ResourceDictionary.MergedDictionaries>
 				<ResourceDictionary Source="/ResourceDictionaries/ToolbarButtonStyle.xaml" />
-				<ResourceDictionary Source="/ResourceDictionaries/PathIcons.xaml" />
 				<ResourceDictionary Source="/ResourceDictionaries/RightAlignedToggleSwitchStyle.xaml" />
 			</ResourceDictionary.MergedDictionaries>
 		</ResourceDictionary>
diff --git a/src/Files.App/Views/Pages/Properties.xaml b/src/Files.App/Views/Pages/Properties.xaml
index 4f0ec4bb9bdd..a29d25d6e2d2 100644
--- a/src/Files.App/Views/Pages/Properties.xaml
+++ b/src/Files.App/Views/Pages/Properties.xaml
@@ -2,174 +2,179 @@
 	x:Class="Files.App.Views.Properties"
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	xmlns:convers="using:Files.App.Converters"
 	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 	xmlns:helpers="using:Files.App.Helpers"
+	xmlns:local="using:Files.App.Views"
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-	d:DesignHeight="700"
-	d:DesignWidth="400"
+	xmlns:toolkitconvers="using:CommunityToolkit.WinUI.UI.Converters"
 	Background="{ThemeResource App.Theme.BackgroundBrush}"
 	KeyDown="Page_KeyDown"
-	Loaded="Properties_Loaded"
-	Unloaded="Properties_Unloaded"
+	Loaded="Page_Loaded"
 	mc:Ignorable="d">
 
-	<Grid VerticalAlignment="Stretch">
-		<Grid.Resources>
-			<ResourceDictionary>
-				<Thickness x:Key="NavigationViewTopPaneHeight">40</Thickness>
-				<Thickness x:Key="TopNavigationViewTopNavGridMargin">0</Thickness>
-				<SolidColorBrush x:Key="NavigationViewContentGridBorderBrush" Color="Transparent" />
+	<Page.Resources>
+		<ResourceDictionary>
+			<ResourceDictionary.MergedDictionaries>
+				<ResourceDictionary Source="ms-appx:///ResourceDictionaries/PropertiesStyles.xaml" />
+				<ResourceDictionary Source="ms-appx:///ResourceDictionaries/NavigationViewStoreStyle.xaml" />
+			</ResourceDictionary.MergedDictionaries>
 
-				<!--  Removes NavigationView background  -->
-				<SolidColorBrush x:Key="NavigationViewContentBackground" Color="Transparent" />
+			<toolkitconvers:BoolNegationConverter x:Key="BoolNegationConverter" />
+			<toolkitconvers:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
 
-				<!--  Removes NavigationView corner radius  -->
-				<CornerRadius x:Key="NavigationViewContentGridCornerRadius">0</CornerRadius>
-			</ResourceDictionary>
-		</Grid.Resources>
+			<toolkitconvers:BoolToVisibilityConverter
+				x:Key="BoolToVisibilityInverseConverter"
+				FalseValue="Visible"
+				TrueValue="Collapsed" />
+		</ResourceDictionary>
+	</Page.Resources>
+
+	<Grid>
 		<Grid.RowDefinitions>
-			<RowDefinition Height="Auto" />
+			<RowDefinition Height="36" />
 			<RowDefinition Height="*" />
-			<RowDefinition Height="Auto" />
 		</Grid.RowDefinitions>
+		<Grid.ColumnDefinitions>
+			<ColumnDefinition Width="Auto" />
+			<ColumnDefinition Width="*" />
+		</Grid.ColumnDefinitions>
 
+		<!--  Titlebar  -->
 		<Border
 			x:Name="TitlebarArea"
-			Grid.Row="0"
-			HorizontalAlignment="Stretch"
+			Grid.ColumnSpan="2"
+			Height="36"
 			Background="Transparent">
-			<NavigationView
-				x:Name="NavigationView"
-				Margin="8,8,120,8"
-				HorizontalAlignment="Left"
-				AllowDrop="False"
-				Canvas.ZIndex="100"
-				IsBackButtonVisible="Collapsed"
-				IsPaneOpen="False"
-				IsPaneToggleButtonVisible="False"
-				IsSettingsVisible="False"
-				IsTitleBarAutoPaddingEnabled="False"
-				PaneDisplayMode="Top"
-				SelectedItem="{x:Bind TabGeneral}"
-				SelectionChanged="NavigationView_SelectionChanged"
-				SelectionFollowsFocus="Disabled">
-				<NavigationView.Resources>
-					<Style TargetType="NavigationViewItem">
-						<Setter Target="SelectionIndicator" Property="Margin" Value="0,-8,0,0" />
-					</Style>
-				</NavigationView.Resources>
-				<!--  SelectionFollowsFocus disabled to fix #5387  -->
-
-				<!--  Tabs  -->
-				<NavigationView.MenuItems>
-					<NavigationViewItem
-						x:Name="TabGeneral"
-						AccessKey="G"
-						Content="{helpers:ResourceString Name=General}"
-						CornerRadius="0"
-						Tag="General">
-						<NavigationViewItem.Icon>
-							<FontIcon Glyph="&#xE7C3;" />
-						</NavigationViewItem.Icon>
-					</NavigationViewItem>
-					<NavigationViewItem
-						x:Name="TabSecurity"
-						Content="{helpers:ResourceString Name=Security}"
-						CornerRadius="0"
-						Tag="Security"
-						Visibility="Collapsed">
-						<NavigationViewItem.Icon>
-							<FontIcon Glyph="&#xE730;" />
-						</NavigationViewItem.Icon>
-					</NavigationViewItem>
-					<NavigationViewItem
-						x:Name="TabShorcut"
-						AccessKey="S"
-						Content="{helpers:ResourceString Name=Shortcut}"
-						CornerRadius="0"
-						Tag="Shortcut"
-						Visibility="Collapsed">
-						<NavigationViewItem.Icon>
-							<FontIcon FontFamily="{StaticResource CustomGlyph}" Glyph="&#xF10A;" />
-						</NavigationViewItem.Icon>
-					</NavigationViewItem>
-					<NavigationViewItem
-						x:Name="TabLibrary"
-						AccessKey="L"
-						Content="{helpers:ResourceString Name=Library}"
-						CornerRadius="0"
-						Tag="Library"
-						Visibility="Collapsed">
-						<NavigationViewItem.Icon>
-							<FontIcon Glyph="&#xE1D3;" />
-						</NavigationViewItem.Icon>
-					</NavigationViewItem>
-					<NavigationViewItem
-						x:Name="TabDetails"
-						AccessKey="D"
-						Content="{helpers:ResourceString Name=Details}"
-						CornerRadius="0"
-						Tag="Details"
-						Visibility="Collapsed">
-						<NavigationViewItem.Icon>
-							<FontIcon Glyph="&#xE946;" />
-						</NavigationViewItem.Icon>
-					</NavigationViewItem>
-					<NavigationViewItem
-						x:Name="TabCustomization"
-						Content="{helpers:ResourceString Name=Customization}"
-						CornerRadius="0"
-						Tag="Customization"
-						Visibility="Collapsed">
-						<NavigationViewItem.Icon>
-							<FontIcon Glyph="&#xE771;" />
-						</NavigationViewItem.Icon>
-					</NavigationViewItem>
+			<StackPanel
+				Padding="12,0"
+				Orientation="Horizontal"
+				Spacing="8">
+
+				<Image
+					Width="20"
+					Height="20"
+					Source="ms-appx:///Assets/AppTiles/Dev/Square44x44Logo.png" />
+
+				<TextBlock
+					VerticalAlignment="Center"
+					Style="{StaticResource CaptionTextBlockStyle}"
+					Text="{helpers:ResourceString Name=PropertiesTitle}" />
+
+			</StackPanel>
+		</Border>
+
+		<!--  Vertical NavigationView whose each items are squared  -->
+		<NavigationView
+			x:Name="MainPropertiesWindowNavigationView"
+			Grid.Row="1"
+			Width="80"
+			IsBackButtonVisible="Collapsed"
+			IsPaneToggleButtonVisible="False"
+			IsSettingsVisible="False"
+			IsTitleBarAutoPaddingEnabled="False"
+			MenuItemsSource="{x:Bind NavViewItems, Mode=TwoWay}"
+			OpenPaneLength="88"
+			PaneDisplayMode="Left"
+			SelectionChanged="MainPropertiesWindowNavigationView_SelectionChanged">
+
+			<NavigationView.MenuItemTemplate>
+				<DataTemplate x:DataType="local:SquareNavViewItem">
 					<NavigationViewItem
-						x:Name="TabCompatibility"
-						Content="{helpers:ResourceString Name=Compatibility}"
-						CornerRadius="0"
-						Tag="Compatibility"
-						Visibility="Collapsed">
-						<NavigationViewItem.Icon>
-							<FontIcon Glyph="&#xECAA;" />
-						</NavigationViewItem.Icon>
+						Height="64"
+						IsSelected="{x:Bind IsSelected, Mode=TwoWay}"
+						Tag="{x:Bind ItemType}">
+						<NavigationViewItem.Content>
+							<StackPanel Margin="-8,0,-14,0" Spacing="8">
+
+								<Grid x:Name="ItemPathIconGrid">
+									<!--  Outline Path Icon  -->
+									<Viewbox
+										Width="24"
+										Height="24"
+										Margin="0,4,4,0"
+										Visibility="{x:Bind IsSelected, Converter={StaticResource BoolToVisibilityInverseConverter}, Mode=OneWay}">
+										<PathIcon
+											x:Name="NavigationViewItemOutlinePathIcon"
+											HorizontalAlignment="Center"
+											Data="{x:Bind OutlinePathIcon}" />
+									</Viewbox>
+									<!--  Filled Path Icon  -->
+									<Viewbox
+										Width="24"
+										Height="24"
+										Margin="0,0,4,4"
+										Visibility="{x:Bind IsSelected, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}">
+										<PathIcon
+											x:Name="NavigationViewItemFilledPathIcon"
+											HorizontalAlignment="Center"
+											Data="{x:Bind FilledPathIcon}"
+											Foreground="{ThemeResource AccentFillColorDefaultBrush}" />
+									</Viewbox>
+								</Grid>
+
+								<!--  Label  -->
+								<TextBlock
+									x:Name="ItemNameLabelTextBlock"
+									Grid.Row="1"
+									HorizontalAlignment="Center"
+									x:Load="{x:Bind IsSelected, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}"
+									FontSize="10"
+									Style="{StaticResource CaptionTextBlockStyle}"
+									Text="{x:Bind Name}" />
+
+							</StackPanel>
+						</NavigationViewItem.Content>
 					</NavigationViewItem>
-				</NavigationView.MenuItems>
-			</NavigationView>
-		</Border>
+				</DataTemplate>
+			</NavigationView.MenuItemTemplate>
 
-		<ScrollViewer Grid.Row="1">
-			<Frame x:Name="contentFrame" IsNavigationStackEnabled="False" />
-		</ScrollViewer>
+		</NavigationView>
 
+		<!--  NavigationView Content, Save/Cancel buttons  -->
 		<Grid
-			Grid.Row="2"
-			Padding="12"
-			Background="{ThemeResource CardBackgroundFillColorSecondary}"
+			Grid.Row="1"
+			Grid.Column="1"
+			Background="{ThemeResource LayerFillColorDefaultBrush}"
 			BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
-			BorderThickness="0,1,0,0">
-			<Grid.ColumnDefinitions>
-				<ColumnDefinition Width="*" />
-				<ColumnDefinition Width="*" />
-				<ColumnDefinition Width="Auto" />
-			</Grid.ColumnDefinitions>
-			<Button
-				x:Name="OKButton"
-				Grid.Column="1"
-				MinWidth="100"
-				Margin="0,0,10,0"
-				HorizontalAlignment="Right"
-				Click="OKButton_Click"
-				Content="{helpers:ResourceString Name=PropertiesDialogOKButton/Content}"
-				Style="{StaticResource AccentButtonStyle}" />
-			<Button
-				x:Name="CancelButton"
-				Grid.Column="2"
-				MinWidth="100"
-				HorizontalAlignment="Right"
-				Click="CancelButton_Click"
-				Content="{helpers:ResourceString Name=Cancel}" />
+			BorderThickness="1,1,0,0"
+			CornerRadius="8,0,0,0">
+			<Grid.RowDefinitions>
+				<RowDefinition Height="*" />
+				<RowDefinition Height="Auto" />
+			</Grid.RowDefinitions>
+
+			<Frame x:Name="contentFrame" IsNavigationStackEnabled="False" />
+
+			<Grid
+				Grid.Row="2"
+				Height="58"
+				Background="{ThemeResource CardBackgroundFillColorSecondary}"
+				BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
+				BorderThickness="0,1,0,0">
+				<StackPanel
+					Margin="12,0"
+					HorizontalAlignment="Right"
+					Orientation="Horizontal"
+					Spacing="12">
+
+					<Button
+						x:Name="SaveChangesButton"
+						Width="96"
+						Click="SaveChangesButton_Click"
+						Content="{helpers:ResourceString Name=Save}"
+						Style="{StaticResource AccentButtonStyle}" />
+
+					<Button
+						x:Name="CancelChangesButton"
+						Width="96"
+						Click="CancelChangesButton_Click"
+						Content="{helpers:ResourceString Name=Cancel}" />
+
+				</StackPanel>
+			</Grid>
+
 		</Grid>
+
 	</Grid>
 </Page>
diff --git a/src/Files.App/Views/Pages/Properties.xaml.cs b/src/Files.App/Views/Pages/Properties.xaml.cs
index 53e6e0d968a3..4fd603fa0a0a 100644
--- a/src/Files.App/Views/Pages/Properties.xaml.cs
+++ b/src/Files.App/Views/Pages/Properties.xaml.cs
@@ -1,5 +1,7 @@
+using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.WinUI;
 using Files.App.DataModels.NavigationControlItems;
+using Files.App.Extensions;
 using Files.App.Filesystem;
 using Files.App.Helpers;
 using Files.App.Helpers.XamlHelpers;
@@ -13,8 +15,9 @@
 using Microsoft.UI.Xaml.Input;
 using Microsoft.UI.Xaml.Navigation;
 using System;
-using System.Linq;
+using System.Collections.ObjectModel;
 using System.Threading;
+using System.Threading.Tasks;
 using Windows.Foundation.Metadata;
 using Windows.Graphics;
 using Windows.System;
@@ -24,253 +27,316 @@ namespace Files.App.Views
 {
 	public sealed partial class Properties : Page
 	{
-		private CancellationTokenSource? tokenSource = new CancellationTokenSource();
-		private ContentDialog propertiesDialog;
+		private CancellationTokenSource? _tokenSource;
 
-		private object navParameterItem;
-		private IShellPage AppInstance;
+		private ContentDialog _propertiesDialog;
 
-		public SettingsViewModel AppSettings => App.AppSettings;
+		private object _navParamItem;
 
-		public AppWindow appWindow;
+		private IShellPage _appInstance;
+
+		private bool _usingWinUI;
+
+		public SettingsViewModel AppSettings
+			=> App.AppSettings;
+
+		public AppWindow AppWindow;
+
+		public ObservableCollection<SquareNavViewItem> NavViewItems { get; set; }
 
 		public Properties()
 		{
 			InitializeComponent();
 
-			var flowDirectionSetting = /*
-				TODO ResourceContext.GetForCurrentView and ResourceContext.GetForViewIndependentUse do not exist in Windows App SDK
-				Use your ResourceManager instance to create a ResourceContext as below. If you already have a ResourceManager instance,
-				replace the new instance created below with correct instance.
-				Read: https://docs.microsoft.com/en-us/windows/apps/windows-app-sdk/migrate-to-windows-app-sdk/guides/mrtcore
-			*/new Microsoft.Windows.ApplicationModel.Resources.ResourceManager().CreateResourceContext().QualifierValues["LayoutDirection"];
+			_tokenSource = new();
+
+			NavViewItems = new();
+
+			_usingWinUI = ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 8);
 
+			// TODO:
+			//  ResourceContext.GetForCurrentView and ResourceContext.GetForViewIndependentUse do not exist in Windows App SDK
+			//  Use your ResourceManager instance to create a ResourceContext as below. If you already have a ResourceManager instance,
+			//  replace the new instance created below with correct instance.
+			//  Read: https://docs.microsoft.com/en-us/windows/apps/windows-app-sdk/migrate-to-windows-app-sdk/guides/mrtcore
+			var flowDirectionSetting = new Microsoft.Windows.ApplicationModel.Resources.ResourceManager().CreateResourceContext().QualifierValues["LayoutDirection"];
 			if (flowDirectionSetting == "RTL")
 				FlowDirection = FlowDirection.RightToLeft;
-
-			contentFrame.Navigated += ContentFrame_Navigated;
 		}
 
 		protected override void OnNavigatedTo(NavigationEventArgs e)
 		{
 			var args = e.Parameter as PropertiesPageNavigationArguments;
-			AppInstance = args.AppInstanceArgument;
-			navParameterItem = args.Item;
-			if (args.Item is ListedItem listedItem)
-			{
-				var isShortcut = listedItem.IsShortcut;
-				var isLibrary = listedItem.IsLibrary;
-				var fileExt = listedItem.FileExtension;
-				TabShorcut.Visibility = isShortcut ? Visibility.Visible : Visibility.Collapsed;
-				TabLibrary.Visibility = isLibrary ? Visibility.Visible : Visibility.Collapsed;
-				TabDetails.Visibility = fileExt is not null && !isShortcut && !isLibrary ? Visibility.Visible : Visibility.Collapsed;
-				TabCustomization.Visibility = !isLibrary && (
-					(listedItem.PrimaryItemAttribute == Windows.Storage.StorageItemTypes.Folder && !listedItem.IsArchive) ||
-					(isShortcut && !listedItem.IsLinkItem)) ? Visibility.Visible : Visibility.Collapsed;
-				TabCompatibility.Visibility = (
-						FileExtensionHelpers.IsExecutableFile(listedItem is ShortcutItem sht ? sht.TargetPath : fileExt, true)
-					) ? Visibility.Visible : Visibility.Collapsed;
-				TabSecurity.Visibility = !isLibrary && !listedItem.IsRecycleBinItem ? Visibility.Visible : Visibility.Collapsed;
-			}
-			else if (args.Item is DriveItem)
-			{
-				TabSecurity.Visibility = Visibility.Visible;
-			}
+			_appInstance = args.AppInstanceArgument;
+			_navParamItem = args.Item;
+
+			AddNavigationViewItemsToControl(args.Item);
+
 			base.OnNavigatedTo(e);
 		}
 
-		private async void Properties_Loaded(object sender, RoutedEventArgs e)
+		private async void Page_Loaded(object sender, RoutedEventArgs e)
 		{
 			AppSettings.ThemeModeChanged += AppSettings_ThemeModeChanged;
-			if (ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 8))
+
+			if (_usingWinUI)
 			{
+				// WINUI3: Set rectangle for the Titlebar
 				TitlebarArea.SizeChanged += TitlebarArea_SizeChanged;
-				appWindow.Destroying += AppWindow_Destroying;
+				AppWindow.Destroying += AppWindow_Destroying;
+
 				await App.Window.DispatcherQueue.EnqueueAsync(() => AppSettings.UpdateThemeElements.Execute(null));
 			}
 			else
 			{
-				propertiesDialog = DependencyObjectHelpers.FindParent<ContentDialog>(this);
-				propertiesDialog.Closed += PropertiesDialog_Closed;
+				_propertiesDialog = DependencyObjectHelpers.FindParent<ContentDialog>(this);
+				_propertiesDialog.Closed += PropertiesDialog_Closed;
 			}
 		}
 
 		private void TitlebarArea_SizeChanged(object? sender, SizeChangedEventArgs? e)
 		{
-			/*
-			 We have to calculate the width of NavigationView as 'ActualWidth' is bigger than the real size occupied by the control.
-			 This code calculates the sum of all the visible tabs' widths.
-			 If a tab is visible and its width is 0, it is shown in the overflow menu. In this case we add the overflow's size to the total.
-			 */
-			int navigationViewWidth = (int)NavigationView.MenuItems.Cast<NavigationViewItem>()
-				.Where(item => item.Visibility == Visibility.Visible)
-				.GroupBy(item => item.ActualWidth != 0)
-				.Select(group => group.Key ? group.Select(item => item.ActualWidth).Sum() : group.First().CompactPaneLength)
-				.Sum();
-
 			var scaleAdjustment = XamlRoot.RasterizationScale;
-			int x = (int)(navigationViewWidth * scaleAdjustment);
-			var y = 0;
-			var width = (int)((TitlebarArea.ActualWidth - navigationViewWidth) * scaleAdjustment);
+			var width = (int)(TitlebarArea.ActualWidth * scaleAdjustment);
 			var height = (int)(TitlebarArea.ActualHeight * scaleAdjustment);
 
 			// Sets properties window drag region.
-			appWindow.TitleBar.SetDragRectangles(new RectInt32[]
-			{
-				// This area is on the right of NavigationView and stretches for all the remaining space.
-				new RectInt32(x, y, width, height)
-			});
-		}
-
-		private void ContentFrame_Navigated(object sender, NavigationEventArgs e)
-		{
-			if (contentFrame.Content is Page propertiesMenu)
-			{
-				propertiesMenu.Loaded -= PropertiesMenu_Loaded;
-				propertiesMenu.Loaded += PropertiesMenu_Loaded;
-			}
-		}
-
-		private void PropertiesMenu_Loaded(object sender, RoutedEventArgs e)
-		{
-			// Drag region is calculated each time the active tab is changed
-			TitlebarArea_SizeChanged(null, null);
-		}
-
-		private void AppWindow_Destroying(AppWindow sender, object args)
-		{
-			AppSettings.ThemeModeChanged -= AppSettings_ThemeModeChanged;
-			sender.Destroying -= AppWindow_Destroying;
-			if (tokenSource is not null && !tokenSource.IsCancellationRequested)
-			{
-				tokenSource.Cancel();
-				tokenSource = null;
-			}
-		}
-
-		private void PropertiesDialog_Closed(ContentDialog sender, ContentDialogClosedEventArgs args)
-		{
-			AppSettings.ThemeModeChanged -= AppSettings_ThemeModeChanged;
-			sender.Closed -= PropertiesDialog_Closed;
-			if (tokenSource is not null && !tokenSource.IsCancellationRequested)
-			{
-				tokenSource.Cancel();
-				tokenSource = null;
-			}
-			propertiesDialog.Hide();
-		}
-
-		private void Properties_Unloaded(object sender, RoutedEventArgs e)
-		{
-			// Why is this not called? Are we cleaning up properly?
+			AppWindow.TitleBar.SetDragRectangles(new RectInt32[] { new RectInt32(0, 0, width, height) });
 		}
 
 		private async void AppSettings_ThemeModeChanged(object? sender, EventArgs e)
 		{
-			var selectedTheme = ThemeHelper.RootTheme;
-
 			await DispatcherQueue.EnqueueAsync(() =>
 			{
-				((Frame)Parent).RequestedTheme = selectedTheme;
+				((Frame)Parent).RequestedTheme = ThemeHelper.RootTheme;
 
-				if (!ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 8))
+				if (!_usingWinUI)
 					return;
 
-				switch (selectedTheme)
+				switch (ThemeHelper.RootTheme)
 				{
 					case ElementTheme.Default:
-						appWindow.TitleBar.ButtonHoverBackgroundColor = (Color)Application.Current.Resources["SystemBaseLowColor"];
-						appWindow.TitleBar.ButtonForegroundColor = (Color)Application.Current.Resources["SystemBaseHighColor"];
+						AppWindow.TitleBar.ButtonHoverBackgroundColor = (Color)Application.Current.Resources["SystemBaseLowColor"];
+						AppWindow.TitleBar.ButtonForegroundColor = (Color)Application.Current.Resources["SystemBaseHighColor"];
 						break;
 
 					case ElementTheme.Light:
-						appWindow.TitleBar.ButtonHoverBackgroundColor = Color.FromArgb(51, 0, 0, 0);
-						appWindow.TitleBar.ButtonForegroundColor = Colors.Black;
+						AppWindow.TitleBar.ButtonHoverBackgroundColor = Color.FromArgb(51, 0, 0, 0);
+						AppWindow.TitleBar.ButtonForegroundColor = Colors.Black;
 						break;
 
 					case ElementTheme.Dark:
-						appWindow.TitleBar.ButtonHoverBackgroundColor = Color.FromArgb(51, 255, 255, 255);
-						appWindow.TitleBar.ButtonForegroundColor = Colors.White;
+						AppWindow.TitleBar.ButtonHoverBackgroundColor = Color.FromArgb(51, 255, 255, 255);
+						AppWindow.TitleBar.ButtonForegroundColor = Colors.White;
 						break;
 				}
 			});
 		}
 
-		private async void OKButton_Click(object sender, RoutedEventArgs e)
+		private void MainPropertiesWindowNavigationView_SelectionChanged(NavigationView sender, NavigationViewSelectionChangedEventArgs args)
 		{
-			if (contentFrame.Content is PropertiesGeneral propertiesGeneral)
+			var navParam = new PropertyNavParam()
 			{
-				await propertiesGeneral.SaveChangesAsync();
-			}
-			else
+				tokenSource = _tokenSource,
+				navParameter = _navParamItem,
+				AppInstanceArgument = _appInstance
+			};
+
+			switch ((PropertyNavigationViewItemEnums)args.SelectedItemContainer.Tag)
 			{
-				if (!await (contentFrame.Content as PropertiesTab).SaveChangesAsync())
-					return;
+				case PropertyNavigationViewItemEnums.ItemGeneral:
+					contentFrame.Navigate(typeof(PropertiesGeneral), navParam, args.RecommendedNavigationTransitionInfo);
+					break;
+				case PropertyNavigationViewItemEnums.ItemShortcut:
+					contentFrame.Navigate(typeof(PropertiesShortcut), navParam, args.RecommendedNavigationTransitionInfo);
+					break;
+				case PropertyNavigationViewItemEnums.ItemLibrary:
+					contentFrame.Navigate(typeof(PropertiesLibrary), navParam, args.RecommendedNavigationTransitionInfo);
+					break;
+				case PropertyNavigationViewItemEnums.ItemDetails:
+					contentFrame.Navigate(typeof(PropertiesDetails), navParam, args.RecommendedNavigationTransitionInfo);
+					break;
+				case PropertyNavigationViewItemEnums.ItemSecurity:
+					contentFrame.Navigate(typeof(PropertiesSecurity), navParam, args.RecommendedNavigationTransitionInfo);
+					break;
+				case PropertyNavigationViewItemEnums.ItemCustomization:
+					contentFrame.Navigate(typeof(PropertiesCustomization), navParam, args.RecommendedNavigationTransitionInfo);
+					break;
+				case PropertyNavigationViewItemEnums.ItemCompatibility:
+					contentFrame.Navigate(typeof(PropertiesCompatibility), navParam, args.RecommendedNavigationTransitionInfo);
+					break;
 			}
-
-			if (ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 8))
-				appWindow.Destroy();
-			else
-				propertiesDialog?.Hide();
 		}
 
-		private void CancelButton_Click(object sender, RoutedEventArgs e)
+		private void AddNavigationViewItemsToControl(object item)
 		{
-			if (ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 8))
-				appWindow.Destroy();
-			else
-				propertiesDialog?.Hide();
+			var generalItem = new SquareNavViewItem()
+			{
+				Name = "General".GetLocalizedResource(),
+				ItemType = PropertyNavigationViewItemEnums.ItemGeneral,
+				OutlinePathIcon = (string)Application.Current.Resources["PageIconRegular"],
+				FilledPathIcon = (string)Application.Current.Resources["PageIconFilled"],
+			};
+			var securityItem = new SquareNavViewItem()
+			{
+				Name = "Security".GetLocalizedResource(),
+				ItemType = PropertyNavigationViewItemEnums.ItemSecurity,
+				OutlinePathIcon = (string)Application.Current.Resources["ShieldIconRegular"],
+				FilledPathIcon = (string)Application.Current.Resources["ShieldIconFilled"],
+			};
+			var shortcutItem = new SquareNavViewItem()
+			{
+				Name = "Shortcut".GetLocalizedResource(),
+				ItemType = PropertyNavigationViewItemEnums.ItemShortcut,
+				OutlinePathIcon = (string)Application.Current.Resources["LinkIconRegular"],
+				FilledPathIcon = (string)Application.Current.Resources["LinkIconFilled"],
+			};
+			var libraryItem = new SquareNavViewItem()
+			{
+				Name = "Library".GetLocalizedResource(),
+				ItemType = PropertyNavigationViewItemEnums.ItemLibrary,
+				OutlinePathIcon = (string)Application.Current.Resources["LibraryIconRegular"],
+				FilledPathIcon = (string)Application.Current.Resources["LibraryIconFilled"],
+			};
+			var detailsItem = new SquareNavViewItem()
+			{
+				Name = "Details".GetLocalizedResource(),
+				ItemType = PropertyNavigationViewItemEnums.ItemDetails,
+				OutlinePathIcon = (string)Application.Current.Resources["InfoIconRegular"],
+				FilledPathIcon = (string)Application.Current.Resources["InfoIconFilled"],
+			};
+			var customizationItem = new SquareNavViewItem()
+			{
+				Name = "Customization".GetLocalizedResource(),
+				ItemType = PropertyNavigationViewItemEnums.ItemCustomization,
+				OutlinePathIcon = (string)Application.Current.Resources["ColorIconRegular"],
+				FilledPathIcon = (string)Application.Current.Resources["ColorIconFilled"],
+			};
+			var compatibilityItem = new SquareNavViewItem()
+			{
+				Name = "Compatibility".GetLocalizedResource(),
+				ItemType = PropertyNavigationViewItemEnums.ItemCompatibility,
+				OutlinePathIcon = (string)Application.Current.Resources["WindowsAppsRegular"],
+				FilledPathIcon = (string)Application.Current.Resources["WindowsAppsFilled"],
+			};
+
+			NavViewItems.Add(generalItem);
+			NavViewItems.Add(securityItem);
+			NavViewItems.Add(shortcutItem);
+			NavViewItems.Add(libraryItem);
+			NavViewItems.Add(detailsItem);
+			NavViewItems.Add(customizationItem);
+			NavViewItems.Add(compatibilityItem);
+
+			MainPropertiesWindowNavigationView.SelectedItem = generalItem;
+
+			// Unable unavailable property tabs
+			if (item is ListedItem listedItem)
+			{
+				var isShortcut = listedItem.IsShortcut;
+				var isLibrary = listedItem.IsLibrary;
+				var fileExt = listedItem.FileExtension;
+
+				var securityItemEnabled = !isLibrary && !listedItem.IsRecycleBinItem;
+				var detailsItemEnabled = fileExt is not null && !isShortcut && !isLibrary;
+				var customizationItemEnabled = !isLibrary && (
+					(listedItem.PrimaryItemAttribute == Windows.Storage.StorageItemTypes.Folder && !listedItem.IsArchive) ||
+					(isShortcut && !listedItem.IsLinkItem));
+				var compatibilityItemEnabled = FileExtensionHelpers.IsExecutableFile(listedItem is ShortcutItem sht ? sht.TargetPath : fileExt, true);
+
+				if (!securityItemEnabled)
+					NavViewItems.Remove(securityItem);
+
+				if (!isShortcut)
+					NavViewItems.Remove(shortcutItem);
+
+				if (!isLibrary)
+					NavViewItems.Remove(libraryItem);
+
+				if (!detailsItemEnabled)
+					NavViewItems.Remove(detailsItem);
+
+				if (!customizationItemEnabled)
+					NavViewItems.Remove(customizationItem);
+
+				if (!compatibilityItemEnabled)
+					NavViewItems.Remove(compatibilityItem);
+			}
+			else if (item is DriveItem)
+			{
+				NavViewItems.Remove(shortcutItem);
+				NavViewItems.Remove(libraryItem);
+				NavViewItems.Remove(detailsItem);
+				NavViewItems.Remove(customizationItem);
+				NavViewItems.Remove(compatibilityItem);
+			}
 		}
 
-		private void Page_KeyDown(object sender, KeyRoutedEventArgs e)
+		private void CancelChangesButton_Click(object sender, RoutedEventArgs e)
 		{
-			if (!e.Key.Equals(VirtualKey.Escape))
-				return;
-			if (ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 8))
-				appWindow.Destroy();
-			else
-				propertiesDialog?.Hide();
+			ClosePage();
 		}
 
-		private void NavigationView_SelectionChanged(NavigationView sender, NavigationViewSelectionChangedEventArgs args)
+		private async void SaveChangesButton_Click(object sender, RoutedEventArgs e)
 		{
-			var navParam = new PropertyNavParam()
-			{
-				tokenSource = tokenSource,
-				navParameter = navParameterItem,
-				AppInstanceArgument = AppInstance
-			};
+			await ApplyChanges();
+
+			ClosePage();
+		}
 
-			switch (args.SelectedItemContainer.Tag)
+		private async Task ApplyChanges()
+		{
+			if (contentFrame.Content is not null)
 			{
-				case "General":
-					contentFrame.Navigate(typeof(PropertiesGeneral), navParam, args.RecommendedNavigationTransitionInfo);
-					break;
+				if (contentFrame.Content is PropertiesGeneral propertiesGeneral)
+				{
+					await propertiesGeneral.SaveChangesAsync();
+				}
+				else
+				{
+					await ((PropertiesTab)contentFrame.Content).SaveChangesAsync();
+				}
+			}
+		}
 
-				case "Shortcut":
-					contentFrame.Navigate(typeof(PropertiesShortcut), navParam, args.RecommendedNavigationTransitionInfo);
-					break;
+		private void Page_KeyDown(object sender, KeyRoutedEventArgs e)
+		{
+			if (e.Key.Equals(VirtualKey.Escape))
+				ClosePage();
+		}
 
-				case "Library":
-					contentFrame.Navigate(typeof(PropertiesLibrary), navParam, args.RecommendedNavigationTransitionInfo);
-					break;
+		private void ClosePage()
+		{
+			if (_usingWinUI)
+				AppWindow.Destroy();
+			else
+				_propertiesDialog?.Hide();
+		}
 
-				case "Details":
-					contentFrame.Navigate(typeof(PropertiesDetails), navParam, args.RecommendedNavigationTransitionInfo);
-					break;
+		private void AppWindow_Destroying(AppWindow sender, object args)
+		{
+			AppSettings.ThemeModeChanged -= AppSettings_ThemeModeChanged;
+			sender.Destroying -= AppWindow_Destroying;
 
-				case "Security":
-					contentFrame.Navigate(typeof(PropertiesSecurity), navParam, args.RecommendedNavigationTransitionInfo);
-					break;
+			if (_tokenSource is not null && !_tokenSource.IsCancellationRequested)
+			{
+				_tokenSource.Cancel();
+				_tokenSource = null;
+			}
+		}
 
-				case "Customization":
-					contentFrame.Navigate(typeof(PropertiesCustomization), navParam, args.RecommendedNavigationTransitionInfo);
-					break;
+		private void PropertiesDialog_Closed(ContentDialog sender, ContentDialogClosedEventArgs args)
+		{
+			AppSettings.ThemeModeChanged -= AppSettings_ThemeModeChanged;
+			sender.Closed -= PropertiesDialog_Closed;
 
-				case "Compatibility":
-					contentFrame.Navigate(typeof(PropertiesCompatibility), navParam, args.RecommendedNavigationTransitionInfo);
-					break;
+			if (_tokenSource is not null && !_tokenSource.IsCancellationRequested)
+			{
+				_tokenSource.Cancel();
+				_tokenSource = null;
 			}
+
+			_propertiesDialog.Hide();
 		}
 
 		public class PropertiesPageNavigationArguments
@@ -286,4 +352,35 @@ public class PropertyNavParam
 			public IShellPage AppInstanceArgument { get; set; }
 		}
 	}
-}
\ No newline at end of file
+
+	public class SquareNavViewItem : ObservableObject
+	{
+		public string Name;
+
+		public PropertyNavigationViewItemEnums ItemType;
+
+		public string? OutlinePathIcon;
+
+		public string? FilledPathIcon;
+
+		public bool UseCustomGlyph;
+
+		private bool _isSelected;
+		public bool IsSelected
+		{
+			get => _isSelected;
+			set => SetProperty(ref _isSelected, value);
+		}
+	}
+
+	public enum PropertyNavigationViewItemEnums
+	{
+		ItemGeneral = 1,
+		ItemShortcut,
+		ItemLibrary,
+		ItemDetails,
+		ItemSecurity,
+		ItemCustomization,
+		ItemCompatibility,
+	}
+}
diff --git a/src/Files.App/Views/Pages/PropertiesCompatibility.xaml b/src/Files.App/Views/Pages/PropertiesCompatibility.xaml
index e2634165a744..092460c9155d 100644
--- a/src/Files.App/Views/Pages/PropertiesCompatibility.xaml
+++ b/src/Files.App/Views/Pages/PropertiesCompatibility.xaml
@@ -1,107 +1,110 @@
-<local1:PropertiesTab
+<vm:PropertiesTab
 	x:Class="Files.App.Views.PropertiesCompatibility"
 	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:d="http://schemas.microsoft.com/expression/blend/2008"
 	xmlns:helpers="using:Files.App.Helpers"
-	xmlns:local="using:Files.App.UserControls.Settings"
-	xmlns:local1="using:Files.App.ViewModels.Properties"
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-	xmlns:views="using:Files.App.Views"
-	d:Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
-	d:Height="550"
-	d:Width="400"
+	xmlns:settingsuc="using:Files.App.UserControls.Settings"
+	xmlns:vm="using:Files.App.ViewModels.Properties"
 	Loaded="Properties_Loaded"
 	mc:Ignorable="d">
 
-	<local1:PropertiesTab.Resources>
+	<vm:PropertiesTab.Resources>
 		<ResourceDictionary>
+
 			<ResourceDictionary.MergedDictionaries>
 				<ResourceDictionary Source="ms-appx:///ResourceDictionaries/PropertiesStyles.xaml" />
 				<ResourceDictionary Source="/ResourceDictionaries/RightAlignedToggleSwitchStyle.xaml" />
 			</ResourceDictionary.MergedDictionaries>
+
 			<converters:NullToTrueConverter x:Key="NullToFalseConverter" Inverse="True" />
+
 		</ResourceDictionary>
-	</local1:PropertiesTab.Resources>
+	</vm:PropertiesTab.Resources>
+
+	<ScrollViewer>
+		<StackPanel Padding="12" Spacing="4">
+
+			<settingsuc:SettingsBlockControl
+				Title="{helpers:ResourceString Name=RunCompatibilityTroubleShooter}"
+				ButtonCommand="{x:Bind CompatibilityProperties.RunTroubleshooterCommand}"
+				IsClickable="True">
+				<FontIcon
+					FontSize="14"
+					Foreground="{ThemeResource TextFillColorPrimaryBrush}"
+					Glyph="&#xE2B4;" />
+			</settingsuc:SettingsBlockControl>
 
-	<StackPanel Padding="12,0,12,12" Spacing="4">
-		<local:SettingsBlockControl
-			Title="{helpers:ResourceString Name=RunCompatibilityTroubleShooter}"
-			ButtonCommand="{x:Bind CompatibilityProperties.RunTroubleshooterCommand}"
-			IsClickable="True">
-			<FontIcon
-				FontSize="14"
-				Foreground="{ThemeResource TextFillColorPrimaryBrush}"
-				Glyph="&#xE2B4;" />
-		</local:SettingsBlockControl>
+			<settingsuc:SettingsBlockControl Title="{helpers:ResourceString Name=CompatibilityMode}" HorizontalAlignment="Stretch">
+				<ComboBox
+					AutomationProperties.Name="{helpers:ResourceString Name=CompatibilityMode}"
+					DisplayMemberPath="Name"
+					IsEnabled="{x:Bind CompatibilityProperties.CompatibilityOptions, Mode=OneWay, Converter={StaticResource NullToFalseConverter}}"
+					ItemsSource="{x:Bind CompatibilityProperties.OSCompatibilityList, Mode=OneWay}"
+					SelectedValue="{x:Bind CompatibilityProperties.OSCompatibility, Mode=TwoWay}" />
+			</settingsuc:SettingsBlockControl>
 
-		<local:SettingsBlockControl Title="{helpers:ResourceString Name=CompatibilityMode}" HorizontalAlignment="Stretch">
-			<ComboBox
-				AutomationProperties.Name="{helpers:ResourceString Name=CompatibilityMode}"
-				DisplayMemberPath="Name"
-				IsEnabled="{x:Bind CompatibilityProperties.CompatibilityOptions, Mode=OneWay, Converter={StaticResource NullToFalseConverter}}"
-				ItemsSource="{x:Bind CompatibilityProperties.OSCompatibilityList, Mode=OneWay}"
-				SelectedValue="{x:Bind CompatibilityProperties.OSCompatibility, Mode=TwoWay}" />
-		</local:SettingsBlockControl>
+			<settingsuc:SettingsBlockControl Title="{helpers:ResourceString Name=ReducedColorMode}" HorizontalAlignment="Stretch">
+				<ComboBox
+					AutomationProperties.Name="{helpers:ResourceString Name=ReducedColorMode}"
+					DisplayMemberPath="Name"
+					IsEnabled="{x:Bind CompatibilityProperties.CompatibilityOptions, Mode=OneWay, Converter={StaticResource NullToFalseConverter}}"
+					ItemsSource="{x:Bind CompatibilityProperties.ReducedColorModeList, Mode=OneWay}"
+					SelectedValue="{x:Bind CompatibilityProperties.ReducedColorMode, Mode=TwoWay}" />
+			</settingsuc:SettingsBlockControl>
 
-		<local:SettingsBlockControl Title="{helpers:ResourceString Name=ReducedColorMode}" HorizontalAlignment="Stretch">
-			<ComboBox
-				AutomationProperties.Name="{helpers:ResourceString Name=ReducedColorMode}"
-				DisplayMemberPath="Name"
-				IsEnabled="{x:Bind CompatibilityProperties.CompatibilityOptions, Mode=OneWay, Converter={StaticResource NullToFalseConverter}}"
-				ItemsSource="{x:Bind CompatibilityProperties.ReducedColorModeList, Mode=OneWay}"
-				SelectedValue="{x:Bind CompatibilityProperties.ReducedColorMode, Mode=TwoWay}" />
-		</local:SettingsBlockControl>
+			<settingsuc:SettingsBlockControl Title="{helpers:ResourceString Name=ExecuteAt640X480}" HorizontalAlignment="Stretch">
+				<ToggleSwitch
+					AutomationProperties.Name="{helpers:ResourceString Name=ExecuteAt640X480}"
+					IsEnabled="{x:Bind CompatibilityProperties.CompatibilityOptions, Mode=OneWay, Converter={StaticResource NullToFalseConverter}}"
+					IsOn="{x:Bind CompatibilityProperties.ExecuteAt640X480, Mode=TwoWay}"
+					Style="{StaticResource RightAlignedToggleSwitchStyle}" />
+			</settingsuc:SettingsBlockControl>
 
-		<local:SettingsBlockControl Title="{helpers:ResourceString Name=ExecuteAt640X480}" HorizontalAlignment="Stretch">
-			<ToggleSwitch
-				AutomationProperties.Name="{helpers:ResourceString Name=ExecuteAt640X480}"
-				IsEnabled="{x:Bind CompatibilityProperties.CompatibilityOptions, Mode=OneWay, Converter={StaticResource NullToFalseConverter}}"
-				IsOn="{x:Bind CompatibilityProperties.ExecuteAt640X480, Mode=TwoWay}"
-				Style="{StaticResource RightAlignedToggleSwitchStyle}" />
-		</local:SettingsBlockControl>
+			<settingsuc:SettingsBlockControl Title="{helpers:ResourceString Name=DisableFullscreenOptimizations}" HorizontalAlignment="Stretch">
+				<ToggleSwitch
+					AutomationProperties.Name="{helpers:ResourceString Name=DisableFullscreenOptimizations}"
+					IsEnabled="{x:Bind CompatibilityProperties.CompatibilityOptions, Mode=OneWay, Converter={StaticResource NullToFalseConverter}}"
+					IsOn="{x:Bind CompatibilityProperties.DisableMaximized, Mode=TwoWay}"
+					Style="{StaticResource RightAlignedToggleSwitchStyle}" />
+			</settingsuc:SettingsBlockControl>
 
-		<local:SettingsBlockControl Title="{helpers:ResourceString Name=DisableFullscreenOptimizations}" HorizontalAlignment="Stretch">
-			<ToggleSwitch
-				AutomationProperties.Name="{helpers:ResourceString Name=DisableFullscreenOptimizations}"
-				IsEnabled="{x:Bind CompatibilityProperties.CompatibilityOptions, Mode=OneWay, Converter={StaticResource NullToFalseConverter}}"
-				IsOn="{x:Bind CompatibilityProperties.DisableMaximized, Mode=TwoWay}"
-				Style="{StaticResource RightAlignedToggleSwitchStyle}" />
-		</local:SettingsBlockControl>
+			<settingsuc:SettingsBlockControl Title="{helpers:ResourceString Name=RunAsAdministrator}" HorizontalAlignment="Stretch">
+				<ToggleSwitch
+					AutomationProperties.Name="{helpers:ResourceString Name=DisableFullscreenOptimizations}"
+					IsEnabled="{x:Bind CompatibilityProperties.CompatibilityOptions, Mode=OneWay, Converter={StaticResource NullToFalseConverter}}"
+					IsOn="{x:Bind CompatibilityProperties.RunAsAdministrator, Mode=TwoWay}"
+					Style="{StaticResource RightAlignedToggleSwitchStyle}" />
+			</settingsuc:SettingsBlockControl>
 
-		<local:SettingsBlockControl Title="{helpers:ResourceString Name=RunAsAdministrator}" HorizontalAlignment="Stretch">
-			<ToggleSwitch
-				AutomationProperties.Name="{helpers:ResourceString Name=DisableFullscreenOptimizations}"
-				IsEnabled="{x:Bind CompatibilityProperties.CompatibilityOptions, Mode=OneWay, Converter={StaticResource NullToFalseConverter}}"
-				IsOn="{x:Bind CompatibilityProperties.RunAsAdministrator, Mode=TwoWay}"
-				Style="{StaticResource RightAlignedToggleSwitchStyle}" />
-		</local:SettingsBlockControl>
+			<settingsuc:SettingsBlockControl Title="{helpers:ResourceString Name=RegisterForRestart}" HorizontalAlignment="Stretch">
+				<ToggleSwitch
+					AutomationProperties.Name="{helpers:ResourceString Name=RegisterForRestart}"
+					IsEnabled="{x:Bind CompatibilityProperties.CompatibilityOptions, Mode=OneWay, Converter={StaticResource NullToFalseConverter}}"
+					IsOn="{x:Bind CompatibilityProperties.RegisterForRestart, Mode=TwoWay}"
+					Style="{StaticResource RightAlignedToggleSwitchStyle}" />
+			</settingsuc:SettingsBlockControl>
 
-		<local:SettingsBlockControl Title="{helpers:ResourceString Name=RegisterForRestart}" HorizontalAlignment="Stretch">
-			<ToggleSwitch
-				AutomationProperties.Name="{helpers:ResourceString Name=RegisterForRestart}"
-				IsEnabled="{x:Bind CompatibilityProperties.CompatibilityOptions, Mode=OneWay, Converter={StaticResource NullToFalseConverter}}"
-				IsOn="{x:Bind CompatibilityProperties.RegisterForRestart, Mode=TwoWay}"
-				Style="{StaticResource RightAlignedToggleSwitchStyle}" />
-		</local:SettingsBlockControl>
+			<settingsuc:SettingsBlockControl Title="{helpers:ResourceString Name=UseMainMonitorDPISettings}" HorizontalAlignment="Stretch">
+				<ComboBox
+					AutomationProperties.Name="{helpers:ResourceString Name=UseMainMonitorDPISettings}"
+					DisplayMemberPath="Name"
+					IsEnabled="{x:Bind CompatibilityProperties.CompatibilityOptions, Mode=OneWay, Converter={StaticResource NullToFalseConverter}}"
+					ItemsSource="{x:Bind CompatibilityProperties.HighDpiOptionList, Mode=OneWay}"
+					SelectedValue="{x:Bind CompatibilityProperties.HighDpiOption, Mode=TwoWay}" />
+			</settingsuc:SettingsBlockControl>
 
-		<local:SettingsBlockControl Title="{helpers:ResourceString Name=UseMainMonitorDPISettings}" HorizontalAlignment="Stretch">
-			<ComboBox
-				AutomationProperties.Name="{helpers:ResourceString Name=UseMainMonitorDPISettings}"
-				DisplayMemberPath="Name"
-				IsEnabled="{x:Bind CompatibilityProperties.CompatibilityOptions, Mode=OneWay, Converter={StaticResource NullToFalseConverter}}"
-				ItemsSource="{x:Bind CompatibilityProperties.HighDpiOptionList, Mode=OneWay}"
-				SelectedValue="{x:Bind CompatibilityProperties.HighDpiOption, Mode=TwoWay}" />
-		</local:SettingsBlockControl>
+			<settingsuc:SettingsBlockControl Title="{helpers:ResourceString Name=OverrideDPIScalingBehaviour}" HorizontalAlignment="Stretch">
+				<ComboBox
+					AutomationProperties.Name="{helpers:ResourceString Name=OverrideDPIScalingBehaviour}"
+					DisplayMemberPath="Name"
+					IsEnabled="{x:Bind CompatibilityProperties.CompatibilityOptions, Mode=OneWay, Converter={StaticResource NullToFalseConverter}}"
+					ItemsSource="{x:Bind CompatibilityProperties.HighDpiOverrideList, Mode=OneWay}"
+					SelectedValue="{x:Bind CompatibilityProperties.HighDpiOverride, Mode=TwoWay}" />
+			</settingsuc:SettingsBlockControl>
 
-		<local:SettingsBlockControl Title="{helpers:ResourceString Name=OverrideDPIScalingBehaviour}" HorizontalAlignment="Stretch">
-			<ComboBox
-				AutomationProperties.Name="{helpers:ResourceString Name=OverrideDPIScalingBehaviour}"
-				DisplayMemberPath="Name"
-				IsEnabled="{x:Bind CompatibilityProperties.CompatibilityOptions, Mode=OneWay, Converter={StaticResource NullToFalseConverter}}"
-				ItemsSource="{x:Bind CompatibilityProperties.HighDpiOverrideList, Mode=OneWay}"
-				SelectedValue="{x:Bind CompatibilityProperties.HighDpiOverride, Mode=TwoWay}" />
-		</local:SettingsBlockControl>
-	</StackPanel>
-</local1:PropertiesTab>
+		</StackPanel>
+	</ScrollViewer>
+</vm:PropertiesTab>
diff --git a/src/Files.App/Views/Pages/PropertiesCustomization.xaml b/src/Files.App/Views/Pages/PropertiesCustomization.xaml
index 7a27924eac20..9617c344c567 100644
--- a/src/Files.App/Views/Pages/PropertiesCustomization.xaml
+++ b/src/Files.App/Views/Pages/PropertiesCustomization.xaml
@@ -24,11 +24,8 @@
 		</ResourceDictionary>
 	</vm:PropertiesTab.Resources>
 
-	<Grid Padding="12,0,12,12" RowSpacing="4">
-		<Grid.RowDefinitions>
-			<RowDefinition Height="Auto" />
-			<RowDefinition Height="*" />
-		</Grid.RowDefinitions>
+	<Grid Padding="12">
+
 		<Grid
 			Grid.Row="0"
 			Padding="12"
@@ -126,5 +123,6 @@
 				</GridView.ItemTemplate>
 			</GridView>
 		</Grid>
+
 	</Grid>
 </vm:PropertiesTab>
diff --git a/src/Files.App/Views/Pages/PropertiesCustomization.xaml.cs b/src/Files.App/Views/Pages/PropertiesCustomization.xaml.cs
index 81394b9ff7fb..68c41b394191 100644
--- a/src/Files.App/Views/Pages/PropertiesCustomization.xaml.cs
+++ b/src/Files.App/Views/Pages/PropertiesCustomization.xaml.cs
@@ -44,7 +44,7 @@ private async void PickDllButton_Click(object sender, RoutedEventArgs e)
 			picker.FileTypeFilter.Add(".ico");
 
 			// WINUI3: Create and initialize new window
-			var parentWindowId = ((Properties)((Frame)XamlRoot.Content).Content).appWindow.Id;
+			var parentWindowId = ((Properties)((Frame)XamlRoot.Content).Content).AppWindow.Id;
 			var handle = Microsoft.UI.Win32Interop.GetWindowFromWindowId(parentWindowId);
 			WinRT.Interop.InitializeWithWindow.Initialize(picker, handle);
 
diff --git a/src/Files.App/Views/Pages/PropertiesDetails.xaml b/src/Files.App/Views/Pages/PropertiesDetails.xaml
index bc5b377ce28d..ea8c84fc54f6 100644
--- a/src/Files.App/Views/Pages/PropertiesDetails.xaml
+++ b/src/Files.App/Views/Pages/PropertiesDetails.xaml
@@ -1,16 +1,14 @@
-<local:PropertiesTab
+<vm:PropertiesTab
 	x:Class="Files.App.Views.PropertiesDetails"
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 	xmlns:helpers="using:Files.App.Helpers"
-	xmlns:local="using:Files.App.ViewModels.Properties"
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-	xmlns:properties="using:Files.App.ViewModels.Properties"
-	Name="Page"
-	d:DesignHeight="3000"
+	xmlns:vm="using:Files.App.ViewModels.Properties"
 	Loaded="Properties_Loaded"
 	mc:Ignorable="d">
+
 	<Page.Resources>
 		<ResourceDictionary>
 			<ResourceDictionary.MergedDictionaries>
@@ -18,88 +16,97 @@
 			</ResourceDictionary.MergedDictionaries>
 		</ResourceDictionary>
 	</Page.Resources>
-	<Grid Padding="12,0,12,12">
-		<ListView
-			x:Name="MainList"
-			HorizontalAlignment="Stretch"
-			ItemsSource="{x:Bind ViewModel.PropertySections, Mode=OneWay}"
-			SelectionMode="None">
-			<ListView.ItemTemplate>
-				<DataTemplate x:DataType="local:FilePropertySection">
-					<Expander
-						HorizontalAlignment="Stretch"
-						HorizontalContentAlignment="Stretch"
-						Header="{x:Bind Title}"
-						IsExpanded="True">
-						<ListView
+
+	<ScrollViewer>
+		<Grid Padding="12">
+
+			<ListView
+				x:Name="MainList"
+				HorizontalAlignment="Stretch"
+				ItemsSource="{x:Bind ViewModel.PropertySections, Mode=OneWay}"
+				SelectionMode="None">
+
+				<ListView.ItemTemplate>
+					<DataTemplate x:DataType="vm:FilePropertySection">
+						<Expander
 							HorizontalAlignment="Stretch"
 							HorizontalContentAlignment="Stretch"
-							ItemsSource="{x:Bind}"
-							ScrollViewer.VerticalScrollMode="Disabled"
-							SelectionMode="None">
-							<ListView.ItemTemplate>
-								<DataTemplate x:DataType="properties:FileProperty">
-									<Grid HorizontalAlignment="Stretch" ColumnSpacing="8">
-										<Grid.ColumnDefinitions>
-											<ColumnDefinition
-												Width="Auto"
-												MinWidth="100"
-												MaxWidth="240" />
-											<ColumnDefinition Width="*" />
-										</Grid.ColumnDefinitions>
+							Header="{x:Bind Title}"
+							IsExpanded="True">
+							<ListView
+								HorizontalAlignment="Stretch"
+								HorizontalContentAlignment="Stretch"
+								ItemsSource="{x:Bind}"
+								ScrollViewer.VerticalScrollMode="Disabled"
+								SelectionMode="None">
+								<ListView.ItemTemplate>
+									<DataTemplate x:DataType="vm:FileProperty">
+										<Grid HorizontalAlignment="Stretch" ColumnSpacing="8">
+											<Grid.ColumnDefinitions>
+												<ColumnDefinition
+													Width="Auto"
+													MinWidth="100"
+													MaxWidth="240" />
+												<ColumnDefinition Width="*" />
+											</Grid.ColumnDefinitions>
 
-										<TextBlock
-											Grid.Row="0"
-											Grid.Column="0"
-											HorizontalAlignment="Stretch"
-											Style="{StaticResource PropertyName}"
-											Text="{x:Bind Name, Mode=OneWay}"
-											TextWrapping="Wrap" />
+											<TextBlock
+												Grid.Row="0"
+												Grid.Column="0"
+												HorizontalAlignment="Stretch"
+												Style="{StaticResource PropertyName}"
+												Text="{x:Bind Name, Mode=OneWay}"
+												TextWrapping="Wrap" />
+
+											<TextBox
+												x:Name="PropertyValueTemplateTextBox"
+												Grid.Row="0"
+												Grid.Column="1"
+												HorizontalAlignment="Stretch"
+												IsReadOnly="{x:Bind IsReadOnly, Mode=OneWay}"
+												Style="{StaticResource PropertyValueTextBox}"
+												Text="{x:Bind ValueText, Mode=TwoWay}" />
+										</Grid>
+									</DataTemplate>
+								</ListView.ItemTemplate>
+
+								<ListView.ItemContainerStyle>
+									<Style TargetType="ListViewItem">
+										<Setter Property="HorizontalContentAlignment" Value="Stretch" />
+										<Setter Property="Padding" Value="0" />
+									</Style>
+								</ListView.ItemContainerStyle>
+							</ListView>
+						</Expander>
+					</DataTemplate>
+				</ListView.ItemTemplate>
+
+				<ListView.ItemContainerStyle>
+					<Style TargetType="ListViewItem">
+						<Setter Property="HorizontalContentAlignment" Value="Stretch" />
+						<Setter Property="Padding" Value="0,2,0,2" />
+					</Style>
+				</ListView.ItemContainerStyle>
+
+				<ListView.Footer>
+					<Button
+						x:Name="ClearPropertiesButton"
+						Margin="0,4,0,0"
+						HorizontalAlignment="Stretch"
+						Content="{helpers:ResourceString Name=ClearPropertiesButton/Content}">
+						<Button.Flyout>
+							<Flyout x:Name="ClearPropertiesFlyout">
+								<StackPanel Orientation="Vertical" Spacing="4">
+									<TextBlock Text="{helpers:ResourceString Name=ClearPropertiesFlyoutText/Text}" />
+									<Button Click="ClearPropertiesConfirmation_Click" Content="{helpers:ResourceString Name=ClearPropertiesFlyoutConfirmation/Content}" />
+								</StackPanel>
+							</Flyout>
+						</Button.Flyout>
+					</Button>
+				</ListView.Footer>
 
-										<TextBox
-											x:Name="PropertyValueTemplateTextBox"
-											Grid.Row="0"
-											Grid.Column="1"
-											HorizontalAlignment="Stretch"
-											IsReadOnly="{x:Bind IsReadOnly, Mode=OneWay}"
-											Style="{StaticResource PropertyValueTextBox}"
-											Text="{x:Bind ValueText, Mode=TwoWay}" />
-									</Grid>
-								</DataTemplate>
-							</ListView.ItemTemplate>
+			</ListView>
 
-							<ListView.ItemContainerStyle>
-								<Style TargetType="ListViewItem">
-									<Setter Property="HorizontalContentAlignment" Value="Stretch" />
-									<Setter Property="Padding" Value="0" />
-								</Style>
-							</ListView.ItemContainerStyle>
-						</ListView>
-					</Expander>
-				</DataTemplate>
-			</ListView.ItemTemplate>
-			<ListView.ItemContainerStyle>
-				<Style TargetType="ListViewItem">
-					<Setter Property="HorizontalContentAlignment" Value="Stretch" />
-					<Setter Property="Padding" Value="0,2,0,2" />
-				</Style>
-			</ListView.ItemContainerStyle>
-			<ListView.Footer>
-				<Button
-					x:Name="ClearPropertiesButton"
-					Margin="0,4,0,0"
-					HorizontalAlignment="Stretch"
-					Content="{helpers:ResourceString Name=ClearPropertiesButton/Content}">
-					<Button.Flyout>
-						<Flyout x:Name="ClearPropertiesFlyout">
-							<StackPanel Orientation="Vertical" Spacing="4">
-								<TextBlock Text="{helpers:ResourceString Name=ClearPropertiesFlyoutText/Text}" />
-								<Button Click="ClearPropertiesConfirmation_Click" Content="{helpers:ResourceString Name=ClearPropertiesFlyoutConfirmation/Content}" />
-							</StackPanel>
-						</Flyout>
-					</Button.Flyout>
-				</Button>
-			</ListView.Footer>
-		</ListView>
-	</Grid>
-</local:PropertiesTab>
\ No newline at end of file
+		</Grid>
+	</ScrollViewer>
+</vm:PropertiesTab>
diff --git a/src/Files.App/Views/Pages/PropertiesGeneral.xaml b/src/Files.App/Views/Pages/PropertiesGeneral.xaml
index 71bb33b63b8c..bba2e17401b3 100644
--- a/src/Files.App/Views/Pages/PropertiesGeneral.xaml
+++ b/src/Files.App/Views/Pages/PropertiesGeneral.xaml
@@ -1,22 +1,23 @@
-<local:PropertiesTab
+<vm:PropertiesTab
 	x:Class="Files.App.Views.PropertiesGeneral"
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-	xmlns:converters="using:CommunityToolkit.WinUI.UI.Converters"
 	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 	xmlns:helpers="using:Files.App.Helpers"
-	xmlns:local="using:Files.App.ViewModels.Properties"
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-	xmlns:usercontrols="using:Files.App.UserControls"
+	xmlns:toolkitconverters="using:CommunityToolkit.WinUI.UI.Converters"
+	xmlns:uc="using:Files.App.UserControls"
+	xmlns:vm="using:Files.App.ViewModels.Properties"
 	Loaded="Properties_Loaded"
 	mc:Ignorable="d">
 
-	<local:PropertiesTab.Resources>
+	<vm:PropertiesTab.Resources>
 		<ResourceDictionary>
-			<converters:BoolNegationConverter x:Key="BoolNegationConverter" />
+
 			<ResourceDictionary.MergedDictionaries>
 				<ResourceDictionary Source="ms-appx:///ResourceDictionaries/PropertiesStyles.xaml" />
 			</ResourceDictionary.MergedDictionaries>
+
 			<ResourceDictionary.ThemeDictionaries>
 				<ResourceDictionary x:Key="Light">
 					<SolidColorBrush x:Key="ProgressRingBackgroundThemeBrush" Color="#c3c3c3" />
@@ -28,536 +29,544 @@
 					<SolidColorBrush x:Key="ProgressRingBackgroundThemeBrush" Color="#c3c3c3" />
 				</ResourceDictionary>
 			</ResourceDictionary.ThemeDictionaries>
+
+			<toolkitconverters:BoolNegationConverter x:Key="BoolNegationConverter" />
+
 		</ResourceDictionary>
-	</local:PropertiesTab.Resources>
+	</vm:PropertiesTab.Resources>
 
-	<StackPanel
-		Padding="12,0,12,12"
-		Spacing="4"
-		Style="{StaticResource PropertiesTab}">
-		<Grid
+	<ScrollViewer>
+		<StackPanel
 			Padding="12"
-			Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
-			BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
-			BorderThickness="1"
-			ColumnSpacing="8"
-			CornerRadius="4"
-			RowSpacing="8">
-			<Grid.ColumnDefinitions>
-				<ColumnDefinition
-					Width="Auto"
-					MinWidth="100"
-					MaxWidth="140" />
-				<ColumnDefinition Width="*" />
-			</Grid.ColumnDefinitions>
-			<Grid.RowDefinitions>
-				<RowDefinition Height="Auto" />
-				<RowDefinition Height="Auto" />
-				<RowDefinition Height="Auto" />
-			</Grid.RowDefinitions>
-			<usercontrols:FileIcon
-				x:Name="Icon"
-				Grid.Row="0"
-				Grid.Column="0"
-				Width="40"
-				Height="40"
-				Margin="{StaticResource PropertyNameMargin}"
-				HorizontalAlignment="Left"
-				VerticalAlignment="Center"
-				AutomationProperties.AccessibilityView="Raw"
-				FileIconImageData="{x:Bind ViewModel.IconData, Mode=OneWay}"
-				ItemSize="40"
-				ViewModel="{x:Bind ViewModel}" />
-
-			<StackPanel
-				Grid.Row="0"
-				Grid.Column="1"
-				HorizontalAlignment="Stretch"
-				VerticalAlignment="Center"
-				Spacing="8">
-				<TextBox
-					x:Name="ItemFileName"
-					x:Load="{x:Bind ViewModel.ItemNameVisibility, Mode=OneWay}"
-					GettingFocus="ItemFileName_GettingFocus"
-					LosingFocus="ItemFileName_LosingFocus"
-					PlaceholderText="{helpers:ResourceString Name=PropertiesItemFileName/PlaceholderText}"
-					Text="{x:Bind ViewModel.ItemName, Mode=TwoWay}" />
-				<TextBlock
-					x:Name="itemFilesAndFoldersCountValueTop"
-					x:Load="{x:Bind ViewModel.FilesAndFoldersCountVisibility, Mode=OneWay}"
-					Text="{x:Bind ViewModel.FilesAndFoldersCountString, Mode=OneWay}" />
-			</StackPanel>
-
-			<TextBlock
-				x:Name="ItemType"
-				Grid.Row="1"
-				Grid.Column="0"
-				Padding="4,0,0,0"
-				x:Load="{x:Bind ViewModel.ItemTypeVisibility, Mode=OneWay}"
-				FontWeight="SemiBold"
-				Style="{StaticResource PropertyName}"
-				Text="{helpers:ResourceString Name=Type}" />
-			<TextBlock
-				x:Name="itemTypeValue"
-				Grid.Row="1"
-				Grid.Column="1"
-				x:Load="{x:Bind ViewModel.ItemTypeVisibility, Mode=OneWay}"
-				Style="{StaticResource PropertyValueTextBlock}"
-				Text="{x:Bind ViewModel.ItemType, Mode=OneWay}" />
-
-			<TextBlock
-				x:Name="FileSystem"
-				Grid.Row="2"
-				Grid.Column="0"
-				Padding="4,0,0,0"
-				x:Load="{x:Bind ViewModel.DriveFileSystemVisibility, Mode=OneWay}"
-				FontWeight="SemiBold"
-				Style="{StaticResource PropertyName}"
-				Text="{helpers:ResourceString Name=PropertiesDriveFileSystem/Text}" />
-			<TextBlock
-				x:Name="DriveFileSystemValue"
-				Grid.Row="2"
-				Grid.Column="1"
-				x:Load="{x:Bind ViewModel.DriveFileSystemVisibility, Mode=OneWay}"
-				Style="{StaticResource PropertyValueTextBlock}"
-				Text="{x:Bind ViewModel.DriveFileSystem, Mode=OneWay}" />
-		</Grid>
-
-		<!--  Item details  -->
-		<Expander
-			x:Name="ItemDetails"
-			HorizontalAlignment="Stretch"
-			HorizontalContentAlignment="Stretch"
-			x:Load="{x:Bind ViewModel.ItemPathVisibility, Mode=OneWay}"
-			Header="{helpers:ResourceString Name=MoreDetails}"
-			IsExpanded="True">
-			<Expander.Content>
-				<Grid
+			Spacing="4"
+			Style="{StaticResource PropertiesTab}">
+
+			<!--  Item overview  -->
+			<Grid
+				Padding="12"
+				Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
+				BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
+				BorderThickness="1"
+				ColumnSpacing="8"
+				CornerRadius="4"
+				RowSpacing="8">
+				<Grid.ColumnDefinitions>
+					<ColumnDefinition
+						Width="Auto"
+						MinWidth="100"
+						MaxWidth="140" />
+					<ColumnDefinition Width="*" />
+				</Grid.ColumnDefinitions>
+				<Grid.RowDefinitions>
+					<RowDefinition Height="Auto" />
+					<RowDefinition Height="Auto" />
+					<RowDefinition Height="Auto" />
+				</Grid.RowDefinitions>
+				<uc:FileIcon
+					x:Name="Icon"
+					Grid.Row="0"
+					Grid.Column="0"
+					Width="40"
+					Height="40"
+					Margin="{StaticResource PropertyNameMargin}"
+					HorizontalAlignment="Left"
+					VerticalAlignment="Center"
+					AutomationProperties.AccessibilityView="Raw"
+					FileIconImageData="{x:Bind ViewModel.IconData, Mode=OneWay}"
+					ItemSize="40"
+					ViewModel="{x:Bind ViewModel}" />
+
+				<StackPanel
+					Grid.Row="0"
+					Grid.Column="1"
 					HorizontalAlignment="Stretch"
-					ColumnSpacing="8"
-					RowSpacing="8">
-					<Grid.ColumnDefinitions>
-						<ColumnDefinition
-							Width="Auto"
-							MinWidth="100"
-							MaxWidth="140" />
-						<ColumnDefinition Width="*" />
-					</Grid.ColumnDefinitions>
-					<Grid.RowDefinitions>
-						<RowDefinition Height="Auto" />
-						<RowDefinition Height="Auto" />
-						<RowDefinition Height="Auto" />
-						<RowDefinition Height="Auto" />
-						<RowDefinition Height="Auto" />
-						<RowDefinition Height="Auto" />
-						<RowDefinition Height="Auto" />
-					</Grid.RowDefinitions>
-					<!--  Item path  -->
-					<TextBlock
-						Grid.Row="0"
-						Grid.Column="0"
-						HorizontalAlignment="Left"
-						Style="{StaticResource PropertyName}"
-						Text="{helpers:ResourceString Name=Path}"
-						Visibility="{x:Bind ViewModel.ItemPathVisibility, Mode=OneWay}" />
-					<TextBlock
-						x:Name="itemPathValue"
-						Grid.Row="0"
-						Grid.Column="1"
-						Style="{StaticResource PropertyValueTextBlock}"
-						Text="{x:Bind ViewModel.ItemPath, Mode=OneWay}"
-						TextWrapping="Wrap"
-						Visibility="{x:Bind ViewModel.ItemPathVisibility, Mode=OneWay}" />
-
-					<!--  Item size  -->
+					VerticalAlignment="Center"
+					Spacing="8">
+					<TextBox
+						x:Name="ItemFileName"
+						x:Load="{x:Bind ViewModel.ItemNameVisibility, Mode=OneWay}"
+						GettingFocus="ItemFileName_GettingFocus"
+						LosingFocus="ItemFileName_LosingFocus"
+						PlaceholderText="{helpers:ResourceString Name=PropertiesItemFileName/PlaceholderText}"
+						Text="{x:Bind ViewModel.ItemName, Mode=TwoWay}" />
 					<TextBlock
-						Grid.Row="1"
-						Grid.Column="0"
-						HorizontalAlignment="Left"
-						Style="{StaticResource PropertyName}"
-						Text="{helpers:ResourceString Name=PropertiesItemSize/Text}"
-						Visibility="{x:Bind ViewModel.ItemSizeVisibility, Mode=OneWay}" />
+						x:Name="itemFilesAndFoldersCountValueTop"
+						x:Load="{x:Bind ViewModel.FilesAndFoldersCountVisibility, Mode=OneWay}"
+						Text="{x:Bind ViewModel.FilesAndFoldersCountString, Mode=OneWay}" />
+				</StackPanel>
+
+				<TextBlock
+					x:Name="ItemType"
+					Grid.Row="1"
+					Grid.Column="0"
+					Padding="4,0,0,0"
+					x:Load="{x:Bind ViewModel.ItemTypeVisibility, Mode=OneWay}"
+					FontWeight="SemiBold"
+					Style="{StaticResource PropertyName}"
+					Text="{helpers:ResourceString Name=Type}" />
+				<TextBlock
+					x:Name="itemTypeValue"
+					Grid.Row="1"
+					Grid.Column="1"
+					x:Load="{x:Bind ViewModel.ItemTypeVisibility, Mode=OneWay}"
+					Style="{StaticResource PropertyValueTextBlock}"
+					Text="{x:Bind ViewModel.ItemType, Mode=OneWay}" />
+
+				<TextBlock
+					x:Name="FileSystem"
+					Grid.Row="2"
+					Grid.Column="0"
+					Padding="4,0,0,0"
+					x:Load="{x:Bind ViewModel.DriveFileSystemVisibility, Mode=OneWay}"
+					FontWeight="SemiBold"
+					Style="{StaticResource PropertyName}"
+					Text="{helpers:ResourceString Name=PropertiesDriveFileSystem/Text}" />
+				<TextBlock
+					x:Name="DriveFileSystemValue"
+					Grid.Row="2"
+					Grid.Column="1"
+					x:Load="{x:Bind ViewModel.DriveFileSystemVisibility, Mode=OneWay}"
+					Style="{StaticResource PropertyValueTextBlock}"
+					Text="{x:Bind ViewModel.DriveFileSystem, Mode=OneWay}" />
+			</Grid>
+
+			<!--  Item details  -->
+			<Expander
+				x:Name="ItemDetails"
+				HorizontalAlignment="Stretch"
+				HorizontalContentAlignment="Stretch"
+				x:Load="{x:Bind ViewModel.ItemPathVisibility, Mode=OneWay}"
+				Header="{helpers:ResourceString Name=MoreDetails}"
+				IsExpanded="True">
+				<Expander.Content>
 					<Grid
-						Grid.Row="1"
-						Grid.Column="1"
-						Style="{StaticResource PropertyValueGrid}"
-						Visibility="{x:Bind ViewModel.ItemSizeVisibility, Mode=OneWay}">
+						HorizontalAlignment="Stretch"
+						ColumnSpacing="8"
+						RowSpacing="8">
 						<Grid.ColumnDefinitions>
-							<ColumnDefinition Width="Auto" MinWidth="100" />
+							<ColumnDefinition
+								Width="Auto"
+								MinWidth="100"
+								MaxWidth="140" />
 							<ColumnDefinition Width="*" />
 						</Grid.ColumnDefinitions>
+						<Grid.RowDefinitions>
+							<RowDefinition Height="Auto" />
+							<RowDefinition Height="Auto" />
+							<RowDefinition Height="Auto" />
+							<RowDefinition Height="Auto" />
+							<RowDefinition Height="Auto" />
+							<RowDefinition Height="Auto" />
+							<RowDefinition Height="Auto" />
+						</Grid.RowDefinitions>
+						<!--  Item path  -->
 						<TextBlock
-							x:Name="itemSizeValue"
+							Grid.Row="0"
 							Grid.Column="0"
-							IsTextSelectionEnabled="True"
-							Text="{x:Bind ViewModel.ItemSize, Mode=OneWay}" />
-						<ProgressBar
-							x:Name="ItemSizeProgress"
+							HorizontalAlignment="Left"
+							Style="{StaticResource PropertyName}"
+							Text="{helpers:ResourceString Name=Path}"
+							Visibility="{x:Bind ViewModel.ItemPathVisibility, Mode=OneWay}" />
+						<TextBlock
+							x:Name="itemPathValue"
+							Grid.Row="0"
+							Grid.Column="1"
+							Style="{StaticResource PropertyValueTextBlock}"
+							Text="{x:Bind ViewModel.ItemPath, Mode=OneWay}"
+							TextWrapping="Wrap"
+							Visibility="{x:Bind ViewModel.ItemPathVisibility, Mode=OneWay}" />
+
+						<!--  Item size  -->
+						<TextBlock
+							Grid.Row="1"
+							Grid.Column="0"
+							HorizontalAlignment="Left"
+							Style="{StaticResource PropertyName}"
+							Text="{helpers:ResourceString Name=PropertiesItemSize/Text}"
+							Visibility="{x:Bind ViewModel.ItemSizeVisibility, Mode=OneWay}" />
+						<Grid
+							Grid.Row="1"
 							Grid.Column="1"
-							Width="100"
+							Style="{StaticResource PropertyValueGrid}"
+							Visibility="{x:Bind ViewModel.ItemSizeVisibility, Mode=OneWay}">
+							<Grid.ColumnDefinitions>
+								<ColumnDefinition Width="Auto" MinWidth="100" />
+								<ColumnDefinition Width="*" />
+							</Grid.ColumnDefinitions>
+							<TextBlock
+								x:Name="itemSizeValue"
+								Grid.Column="0"
+								IsTextSelectionEnabled="True"
+								Text="{x:Bind ViewModel.ItemSize, Mode=OneWay}" />
+							<ProgressBar
+								x:Name="ItemSizeProgress"
+								Grid.Column="1"
+								Width="100"
+								HorizontalAlignment="Left"
+								IsIndeterminate="True"
+								Visibility="{x:Bind ViewModel.ItemSizeProgressVisibility, Mode=OneWay}" />
+						</Grid>
+
+						<!--  Uncompressed Item size  -->
+						<TextBlock
+							Grid.Row="2"
+							Grid.Column="0"
 							HorizontalAlignment="Left"
-							IsIndeterminate="True"
-							Visibility="{x:Bind ViewModel.ItemSizeProgressVisibility, Mode=OneWay}" />
+							Style="{StaticResource PropertyName}"
+							Text="{helpers:ResourceString Name=UncompressedSize}"
+							Visibility="{x:Bind ViewModel.IsUncompressedItemSizeVisibile, Mode=OneWay}" />
+						<TextBlock
+							x:Name="UncompresseditemSizeValue"
+							Grid.Row="2"
+							Grid.Column="1"
+							IsTextSelectionEnabled="True"
+							Style="{StaticResource PropertyValueTextBlock}"
+							Text="{x:Bind ViewModel.UncompressedItemSize, Mode=OneWay}"
+							Visibility="{x:Bind ViewModel.IsUncompressedItemSizeVisibile, Mode=OneWay}" />
+
+						<MenuFlyoutSeparator
+							Grid.Row="3"
+							Grid.Column="0"
+							Grid.ColumnSpan="2"
+							Margin="-12,0"
+							Background="{ThemeResource CardStrokeColorDefaultBrush}" />
+
+						<!--  Date created  -->
+						<TextBlock
+							Grid.Row="4"
+							Grid.Column="0"
+							Style="{StaticResource PropertyName}"
+							Text="{helpers:ResourceString Name=PropertiesCreated/Text}"
+							Visibility="{x:Bind ViewModel.ItemCreatedTimestampVisibility, Mode=OneWay}" />
+						<TextBlock
+							x:Name="itemCreatedTimestampValue"
+							Grid.Row="4"
+							Grid.Column="1"
+							Style="{StaticResource PropertyValueTextBlock}"
+							Text="{x:Bind ViewModel.ItemCreatedTimestamp, Mode=OneWay}"
+							Visibility="{x:Bind ViewModel.ItemCreatedTimestampVisibility, Mode=OneWay}" />
+
+						<!--  Date modified  -->
+						<TextBlock
+							Grid.Row="5"
+							Grid.Column="0"
+							Style="{StaticResource PropertyName}"
+							Text="{helpers:ResourceString Name=PropertiesModified/Text}"
+							Visibility="{x:Bind ViewModel.ItemModifiedTimestampVisibility, Mode=OneWay}" />
+						<TextBlock
+							x:Name="itemModifiedTimestampValue"
+							Grid.Row="5"
+							Grid.Column="1"
+							Style="{StaticResource PropertyValueTextBlock}"
+							Text="{x:Bind ViewModel.ItemModifiedTimestamp, Mode=OneWay}"
+							Visibility="{x:Bind ViewModel.ItemModifiedTimestampVisibility, Mode=OneWay}" />
+
+						<!--  Date accessed  -->
+						<TextBlock
+							Grid.Row="6"
+							Grid.Column="0"
+							Style="{StaticResource PropertyName}"
+							Text="{helpers:ResourceString Name=Accessed}"
+							Visibility="{x:Bind ViewModel.ItemAccessedTimestampVisibility, Mode=OneWay}" />
+						<TextBlock
+							x:Name="itemAccessedTimestampValue"
+							Grid.Row="6"
+							Grid.Column="1"
+							Style="{StaticResource PropertyValueTextBlock}"
+							Text="{x:Bind ViewModel.ItemAccessedTimestamp, Mode=OneWay}"
+							Visibility="{x:Bind ViewModel.ItemAccessedTimestampVisibility, Mode=OneWay}" />
 					</Grid>
+				</Expander.Content>
+			</Expander>
 
-					<!--  Uncompressed Item size  -->
-					<TextBlock
-						Grid.Row="2"
-						Grid.Column="0"
-						HorizontalAlignment="Left"
-						Style="{StaticResource PropertyName}"
-						Text="{helpers:ResourceString Name=UncompressedSize}"
-						Visibility="{x:Bind ViewModel.IsUncompressedItemSizeVisibile, Mode=OneWay}" />
-					<TextBlock
-						x:Name="UncompresseditemSizeValue"
-						Grid.Row="2"
-						Grid.Column="1"
-						IsTextSelectionEnabled="True"
-						Style="{StaticResource PropertyValueTextBlock}"
-						Text="{x:Bind ViewModel.UncompressedItemSize, Mode=OneWay}"
-						Visibility="{x:Bind ViewModel.IsUncompressedItemSizeVisibile, Mode=OneWay}" />
-
-					<MenuFlyoutSeparator
-						Grid.Row="3"
-						Grid.Column="0"
-						Grid.ColumnSpan="2"
-						Margin="-12,0"
-						Background="{ThemeResource CardStrokeColorDefaultBrush}" />
-
-					<!--  Date created  -->
-					<TextBlock
-						Grid.Row="4"
-						Grid.Column="0"
-						Style="{StaticResource PropertyName}"
-						Text="{helpers:ResourceString Name=PropertiesCreated/Text}"
-						Visibility="{x:Bind ViewModel.ItemCreatedTimestampVisibility, Mode=OneWay}" />
-					<TextBlock
-						x:Name="itemCreatedTimestampValue"
-						Grid.Row="4"
-						Grid.Column="1"
-						Style="{StaticResource PropertyValueTextBlock}"
-						Text="{x:Bind ViewModel.ItemCreatedTimestamp, Mode=OneWay}"
-						Visibility="{x:Bind ViewModel.ItemCreatedTimestampVisibility, Mode=OneWay}" />
-
-					<!--  Date modified  -->
-					<TextBlock
-						Grid.Row="5"
-						Grid.Column="0"
-						Style="{StaticResource PropertyName}"
-						Text="{helpers:ResourceString Name=PropertiesModified/Text}"
-						Visibility="{x:Bind ViewModel.ItemModifiedTimestampVisibility, Mode=OneWay}" />
-					<TextBlock
-						x:Name="itemModifiedTimestampValue"
-						Grid.Row="5"
-						Grid.Column="1"
-						Style="{StaticResource PropertyValueTextBlock}"
-						Text="{x:Bind ViewModel.ItemModifiedTimestamp, Mode=OneWay}"
-						Visibility="{x:Bind ViewModel.ItemModifiedTimestampVisibility, Mode=OneWay}" />
-
-					<!--  Date accessed  -->
+			<!--  Disk details  -->
+			<Grid
+				x:Name="DiskDetailsGrid"
+				Padding="12"
+				HorizontalAlignment="Stretch"
+				x:Load="{x:Bind ViewModel.DriveCapacityVisibility, Mode=OneWay}"
+				Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
+				BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
+				BorderThickness="1"
+				ColumnSpacing="8"
+				CornerRadius="4"
+				RowSpacing="8">
+				<Grid.ColumnDefinitions>
+					<ColumnDefinition Width="72" />
+					<ColumnDefinition
+						Width="Auto"
+						MinWidth="100"
+						MaxWidth="140" />
+					<ColumnDefinition Width="*" />
+					<ColumnDefinition Width="Auto" />
+				</Grid.ColumnDefinitions>
+				<Grid.RowDefinitions>
+					<RowDefinition Height="Auto" />
+					<RowDefinition Height="Auto" />
+					<RowDefinition Height="Auto" />
+					<RowDefinition Height="Auto" />
+					<RowDefinition Height="Auto" />
+				</Grid.RowDefinitions>
+
+				<!--  Space used progress  -->
+				<ProgressRing
+					x:Name="SpaceUserProgressRing"
+					Grid.Row="0"
+					Grid.RowSpan="3"
+					Grid.Column="0"
+					Width="60"
+					Height="60"
+					HorizontalAlignment="Left"
+					x:Load="{x:Bind ViewModel.DriveCapacityVisibility, Mode=OneWay}"
+					Background="{ThemeResource ProgressRingBackgroundThemeBrush}"
+					IsIndeterminate="False"
+					Value="{x:Bind ViewModel.DrivePercentageValue, Mode=OneWay}">
+
+					<ProgressRing.Template>
+						<ControlTemplate TargetType="ProgressRing">
+							<Grid x:Name="LayoutRoot" Background="Transparent">
+								<Grid.Resources>
+									<toolkitconverters:StringFormatConverter x:Key="StringFormatConverter" />
+								</Grid.Resources>
+								<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
+									<TextBlock
+										Margin="0"
+										FontWeight="SemiBold"
+										Text="{Binding Value, RelativeSource={RelativeSource Mode=TemplatedParent}, Converter={StaticResource StringFormatConverter}, ConverterParameter='{}{0:0}%', Mode=OneWay}"
+										TextAlignment="Center" />
+								</StackPanel>
+
+								<!--  AnimatedVisualPlayer for Lottie  -->
+								<AnimatedVisualPlayer
+									x:Name="LottiePlayer"
+									AutoPlay="false"
+									Opacity="1"
+									Stretch="fill" />
+
+								<VisualStateManager.VisualStateGroups>
+									<VisualStateGroup x:Name="CommonStates">
+										<VisualState x:Name="Inactive">
+											<VisualState.Setters>
+												<Setter Target="LayoutRoot.Opacity" Value="0" />
+											</VisualState.Setters>
+										</VisualState>
+										<VisualState x:Name="DeterminateActive" />
+										<VisualState x:Name="Active" />
+									</VisualStateGroup>
+								</VisualStateManager.VisualStateGroups>
+							</Grid>
+						</ControlTemplate>
+					</ProgressRing.Template>
+				</ProgressRing>
+
+				<!--  Disk used space  -->
+				<StackPanel
+					x:Name="DriveUsedSpaceStackPanel"
+					Grid.Row="0"
+					Grid.Column="1"
+					x:Load="{x:Bind ViewModel.DriveUsedSpaceVisibility, Mode=OneWay}"
+					Orientation="Horizontal">
+					<Rectangle
+						Width="16"
+						Height="16"
+						Margin="0,0,12,0"
+						Fill="{Binding Foreground, ElementName=SpaceUserProgressRing}"
+						RadiusX="2"
+						RadiusY="2"
+						Stroke="{ThemeResource TextControlElevationBorderBrush}" />
 					<TextBlock
-						Grid.Row="6"
-						Grid.Column="0"
-						Style="{StaticResource PropertyName}"
-						Text="{helpers:ResourceString Name=Accessed}"
-						Visibility="{x:Bind ViewModel.ItemAccessedTimestampVisibility, Mode=OneWay}" />
+						VerticalAlignment="Center"
+						FontWeight="SemiBold"
+						Text="{helpers:ResourceString Name=PropertiesDriveUsedSpace/Text}" />
+				</StackPanel>
+				<TextBlock
+					x:Name="driveUsedSpaceValue"
+					Grid.Row="0"
+					Grid.Column="2"
+					x:Load="{x:Bind ViewModel.DriveUsedSpaceVisibility, Mode=OneWay}"
+					Style="{StaticResource PropertyValueTextBlock}"
+					Text="{x:Bind ViewModel.DriveUsedSpace, Mode=OneWay}" />
+				<Button
+					Grid.Row="0"
+					Grid.Column="3"
+					Padding="8,6"
+					AutomationProperties.Name="{helpers:ResourceString Name=Bytes}"
+					Background="Transparent"
+					BorderBrush="Transparent"
+					ToolTipService.ToolTip="{helpers:ResourceString Name=Bytes}">
+					<FontIcon FontSize="16" Glyph="&#xE946;" />
+					<Button.Flyout>
+						<Flyout>
+							<TextBlock IsTextSelectionEnabled="True" Text="{x:Bind ViewModel.DriveUsedSpaceLongSize, Mode=OneWay}" />
+						</Flyout>
+					</Button.Flyout>
+				</Button>
+
+				<!--  Disk free space  -->
+				<StackPanel
+					x:Name="DiskSpaceStackPanel"
+					Grid.Row="1"
+					Grid.Column="1"
+					x:Load="{x:Bind ViewModel.DriveFreeSpaceVisibility, Mode=OneWay}"
+					Orientation="Horizontal">
+					<Rectangle
+						Width="16"
+						Height="16"
+						Margin="0,0,12,0"
+						Fill="{ThemeResource ProgressRingBackgroundThemeBrush}"
+						RadiusX="2"
+						RadiusY="2"
+						Stroke="{ThemeResource TextControlElevationBorderBrush}" />
 					<TextBlock
-						x:Name="itemAccessedTimestampValue"
-						Grid.Row="6"
-						Grid.Column="1"
-						Style="{StaticResource PropertyValueTextBlock}"
-						Text="{x:Bind ViewModel.ItemAccessedTimestamp, Mode=OneWay}"
-						Visibility="{x:Bind ViewModel.ItemAccessedTimestampVisibility, Mode=OneWay}" />
-				</Grid>
-			</Expander.Content>
-		</Expander>
-
-		<!--  Disk details  -->
-		<Grid
-			x:Name="DiskDetailsGrid"
-			Padding="12"
-			HorizontalAlignment="Stretch"
-			x:Load="{x:Bind ViewModel.DriveCapacityVisibility, Mode=OneWay}"
-			Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
-			BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
-			BorderThickness="1"
-			ColumnSpacing="8"
-			CornerRadius="4"
-			RowSpacing="8">
-			<Grid.ColumnDefinitions>
-				<ColumnDefinition Width="72" />
-				<ColumnDefinition
-					Width="Auto"
-					MinWidth="100"
-					MaxWidth="140" />
-				<ColumnDefinition Width="*" />
-				<ColumnDefinition Width="Auto" />
-			</Grid.ColumnDefinitions>
-			<Grid.RowDefinitions>
-				<RowDefinition Height="Auto" />
-				<RowDefinition Height="Auto" />
-				<RowDefinition Height="Auto" />
-				<RowDefinition Height="Auto" />
-				<RowDefinition Height="Auto" />
-			</Grid.RowDefinitions>
-
-			<!--  Space used progress  -->
-			<ProgressRing
-				x:Name="SpaceUserProgressRing"
-				Grid.Row="0"
-				Grid.RowSpan="3"
-				Grid.Column="0"
-				Width="60"
-				Height="60"
-				HorizontalAlignment="Left"
-				x:Load="{x:Bind ViewModel.DriveCapacityVisibility, Mode=OneWay}"
-				Background="{ThemeResource ProgressRingBackgroundThemeBrush}"
-				IsIndeterminate="False"
-				Value="{x:Bind ViewModel.DrivePercentageValue, Mode=OneWay}">
-
-				<ProgressRing.Template>
-					<ControlTemplate TargetType="ProgressRing">
-						<Grid x:Name="LayoutRoot" Background="Transparent">
-							<Grid.Resources>
-								<converters:StringFormatConverter x:Key="StringFormatConverter" />
-							</Grid.Resources>
-							<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
-								<TextBlock
-									Margin="0"
-									FontWeight="SemiBold"
-									Text="{Binding Value, RelativeSource={RelativeSource Mode=TemplatedParent}, Converter={StaticResource StringFormatConverter}, ConverterParameter='{}{0:0}%', Mode=OneWay}"
-									TextAlignment="Center" />
-							</StackPanel>
-
-							<!--  AnimatedVisualPlayer for Lottie  -->
-							<AnimatedVisualPlayer
-								x:Name="LottiePlayer"
-								AutoPlay="false"
-								Opacity="1"
-								Stretch="fill" />
-
-							<VisualStateManager.VisualStateGroups>
-								<VisualStateGroup x:Name="CommonStates">
-									<VisualState x:Name="Inactive">
-										<VisualState.Setters>
-											<Setter Target="LayoutRoot.Opacity" Value="0" />
-										</VisualState.Setters>
-									</VisualState>
-									<VisualState x:Name="DeterminateActive" />
-									<VisualState x:Name="Active" />
-								</VisualStateGroup>
-							</VisualStateManager.VisualStateGroups>
-						</Grid>
-					</ControlTemplate>
-				</ProgressRing.Template>
-			</ProgressRing>
-
-			<!--  Disk used space  -->
-			<StackPanel
-				x:Name="DriveUsedSpaceStackPanel"
-				Grid.Row="0"
-				Grid.Column="1"
-				x:Load="{x:Bind ViewModel.DriveUsedSpaceVisibility, Mode=OneWay}"
-				Orientation="Horizontal">
-				<Rectangle
-					Width="16"
-					Height="16"
-					Margin="0,0,12,0"
-					Fill="{Binding Foreground, ElementName=SpaceUserProgressRing}"
-					RadiusX="2"
-					RadiusY="2"
-					Stroke="{ThemeResource TextControlElevationBorderBrush}" />
+						VerticalAlignment="Center"
+						FontWeight="SemiBold"
+						Text="{helpers:ResourceString Name=PropertiesDriveFreeSpace/Text}" />
+				</StackPanel>
 				<TextBlock
-					VerticalAlignment="Center"
-					FontWeight="SemiBold"
-					Text="{helpers:ResourceString Name=PropertiesDriveUsedSpace/Text}" />
-			</StackPanel>
-			<TextBlock
-				x:Name="driveUsedSpaceValue"
-				Grid.Row="0"
-				Grid.Column="2"
-				x:Load="{x:Bind ViewModel.DriveUsedSpaceVisibility, Mode=OneWay}"
-				Style="{StaticResource PropertyValueTextBlock}"
-				Text="{x:Bind ViewModel.DriveUsedSpace, Mode=OneWay}" />
-			<Button
-				Grid.Row="0"
-				Grid.Column="3"
-				Padding="8,6"
-				AutomationProperties.Name="{helpers:ResourceString Name=Bytes}"
-				Background="Transparent"
-				BorderBrush="Transparent"
-				ToolTipService.ToolTip="{helpers:ResourceString Name=Bytes}">
-				<FontIcon FontSize="16" Glyph="&#xE946;" />
-				<Button.Flyout>
-					<Flyout>
-						<TextBlock IsTextSelectionEnabled="True" Text="{x:Bind ViewModel.DriveUsedSpaceLongSize, Mode=OneWay}" />
-					</Flyout>
-				</Button.Flyout>
-			</Button>
-
-			<!--  Disk free space  -->
-			<StackPanel
-				x:Name="DiskSpaceStackPanel"
-				Grid.Row="1"
-				Grid.Column="1"
-				x:Load="{x:Bind ViewModel.DriveFreeSpaceVisibility, Mode=OneWay}"
-				Orientation="Horizontal">
-				<Rectangle
-					Width="16"
-					Height="16"
-					Margin="0,0,12,0"
-					Fill="{ThemeResource ProgressRingBackgroundThemeBrush}"
-					RadiusX="2"
-					RadiusY="2"
-					Stroke="{ThemeResource TextControlElevationBorderBrush}" />
+					x:Name="driveFreeSpaceValue"
+					Grid.Row="1"
+					Grid.Column="2"
+					x:Load="{x:Bind ViewModel.DriveFreeSpaceVisibility, Mode=OneWay}"
+					Style="{StaticResource PropertyValueTextBlock}"
+					Text="{x:Bind ViewModel.DriveFreeSpace, Mode=OneWay}" />
+				<Button
+					Grid.Row="1"
+					Grid.Column="3"
+					Padding="8,6"
+					AutomationProperties.Name="{helpers:ResourceString Name=Bytes}"
+					Background="Transparent"
+					BorderBrush="Transparent"
+					ToolTipService.ToolTip="{helpers:ResourceString Name=Bytes}">
+					<FontIcon FontSize="16" Glyph="&#xE946;" />
+					<Button.Flyout>
+						<Flyout>
+							<TextBlock IsTextSelectionEnabled="True" Text="{x:Bind ViewModel.DriveFreeSpaceLongSize, Mode=OneWay}" />
+						</Flyout>
+					</Button.Flyout>
+				</Button>
+
+				<!--  Drive capacity  -->
 				<TextBlock
+					x:Name="PropertiesDriveCapacity"
+					Grid.Row="2"
+					Grid.Column="1"
+					Padding="28,0,0,0"
 					VerticalAlignment="Center"
+					x:Load="{x:Bind ViewModel.DriveCapacityVisibility, Mode=OneWay}"
 					FontWeight="SemiBold"
-					Text="{helpers:ResourceString Name=PropertiesDriveFreeSpace/Text}" />
-			</StackPanel>
-			<TextBlock
-				x:Name="driveFreeSpaceValue"
-				Grid.Row="1"
-				Grid.Column="2"
-				x:Load="{x:Bind ViewModel.DriveFreeSpaceVisibility, Mode=OneWay}"
-				Style="{StaticResource PropertyValueTextBlock}"
-				Text="{x:Bind ViewModel.DriveFreeSpace, Mode=OneWay}" />
-			<Button
-				Grid.Row="1"
-				Grid.Column="3"
-				Padding="8,6"
-				AutomationProperties.Name="{helpers:ResourceString Name=Bytes}"
-				Background="Transparent"
-				BorderBrush="Transparent"
-				ToolTipService.ToolTip="{helpers:ResourceString Name=Bytes}">
-				<FontIcon FontSize="16" Glyph="&#xE946;" />
-				<Button.Flyout>
-					<Flyout>
-						<TextBlock IsTextSelectionEnabled="True" Text="{x:Bind ViewModel.DriveFreeSpaceLongSize, Mode=OneWay}" />
-					</Flyout>
-				</Button.Flyout>
-			</Button>
-
-			<!--  Drive capacity  -->
-			<TextBlock
-				x:Name="PropertiesDriveCapacity"
-				Grid.Row="2"
-				Grid.Column="1"
-				Padding="28,0,0,0"
-				VerticalAlignment="Center"
-				x:Load="{x:Bind ViewModel.DriveCapacityVisibility, Mode=OneWay}"
-				FontWeight="SemiBold"
-				Text="{helpers:ResourceString Name=PropertiesDriveCapacity/Text}" />
-			<TextBlock
-				x:Name="DriveCapacityValue"
-				Grid.Row="2"
-				Grid.Column="2"
-				x:Load="{x:Bind ViewModel.DriveCapacityVisibility, Mode=OneWay}"
-				Style="{StaticResource PropertyValueTextBlock}"
-				Text="{x:Bind ViewModel.DriveCapacity, Mode=OneWay}" />
-			<Button
-				Grid.Row="2"
-				Grid.Column="3"
-				Padding="8,6"
-				AutomationProperties.Name="{helpers:ResourceString Name=Bytes}"
-				Background="Transparent"
-				BorderBrush="Transparent"
-				ToolTipService.ToolTip="{helpers:ResourceString Name=Bytes}">
-				<FontIcon FontSize="16" Glyph="&#xE946;" />
-				<Button.Flyout>
-					<Flyout>
-						<TextBlock IsTextSelectionEnabled="True" Text="{x:Bind ViewModel.DriveCapacityLongSize, Mode=OneWay}" />
-					</Flyout>
-				</Button.Flyout>
-			</Button>
-
-			<MenuFlyoutSeparator
-				Grid.Row="3"
-				Grid.Column="0"
-				Grid.ColumnSpan="4"
-				Margin="-12,0"
-				Background="{ThemeResource CardStrokeColorDefaultBrush}" />
-
-			<!--  Disk cleanup  -->
-			<TextBlock
-				Grid.Row="4"
-				Grid.Column="0"
-				Grid.ColumnSpan="2"
-				Style="{StaticResource PropertyValueTextBlock}"
-				Text="{helpers:ResourceString Name=CleanupDrive}" />
-			<Button
-				x:Name="DiskCleanupButton"
-				Grid.Row="4"
-				Grid.Column="2"
-				Grid.ColumnSpan="2"
-				HorizontalAlignment="Right"
-				Click="DiskCleanupButton_Click"
-				Content="{helpers:ResourceString Name=DiskCleanup}" />
-		</Grid>
-
-		<!--  Item attributes  -->
-		<Expander
-			x:Name="ItemAttributes"
-			HorizontalAlignment="Stretch"
-			HorizontalContentAlignment="Stretch"
-			x:Load="{x:Bind ViewModel.ItemAttributesVisibility, Mode=OneWay}"
-			Header="{helpers:ResourceString Name=Attributes}"
-			IsExpanded="False">
-			<Expander.Content>
-				<Grid
-					HorizontalAlignment="Stretch"
-					ColumnSpacing="8"
-					RowSpacing="8">
-					<Grid.ColumnDefinitions>
-						<ColumnDefinition Width="Auto" />
-						<ColumnDefinition Width="*" />
-						<ColumnDefinition Width="Auto" />
-					</Grid.ColumnDefinitions>
-					<Grid.RowDefinitions>
-						<RowDefinition Height="Auto" />
-						<RowDefinition Height="Auto" />
-						<RowDefinition Height="Auto" />
-					</Grid.RowDefinitions>
+					Text="{helpers:ResourceString Name=PropertiesDriveCapacity/Text}" />
+				<TextBlock
+					x:Name="DriveCapacityValue"
+					Grid.Row="2"
+					Grid.Column="2"
+					x:Load="{x:Bind ViewModel.DriveCapacityVisibility, Mode=OneWay}"
+					Style="{StaticResource PropertyValueTextBlock}"
+					Text="{x:Bind ViewModel.DriveCapacity, Mode=OneWay}" />
+				<Button
+					Grid.Row="2"
+					Grid.Column="3"
+					Padding="8,6"
+					AutomationProperties.Name="{helpers:ResourceString Name=Bytes}"
+					Background="Transparent"
+					BorderBrush="Transparent"
+					ToolTipService.ToolTip="{helpers:ResourceString Name=Bytes}">
+					<FontIcon FontSize="16" Glyph="&#xE946;" />
+					<Button.Flyout>
+						<Flyout>
+							<TextBlock IsTextSelectionEnabled="True" Text="{x:Bind ViewModel.DriveCapacityLongSize, Mode=OneWay}" />
+						</Flyout>
+					</Button.Flyout>
+				</Button>
 
-					<TextBlock
-						Grid.Row="0"
-						Grid.Column="0"
-						VerticalAlignment="Center"
-						Text="{helpers:ResourceString Name=PropertiesDialogReadOnly/Text}"
-						TextWrapping="WrapWholeWords" />
-					<CheckBox
-						Grid.Row="0"
-						Grid.Column="2"
-						MinWidth="0"
-						HorizontalAlignment="Right"
-						VerticalAlignment="Center"
-						AutomationProperties.Name="{helpers:ResourceString Name=ReadOnly}"
-						IsChecked="{x:Bind ViewModel.IsReadOnly, Mode=TwoWay}"
-						IsEnabled="{x:Bind ViewModel.IsReadOnlyEnabled, Mode=OneWay}" />
+				<MenuFlyoutSeparator
+					Grid.Row="3"
+					Grid.Column="0"
+					Grid.ColumnSpan="4"
+					Margin="-12,0"
+					Background="{ThemeResource CardStrokeColorDefaultBrush}" />
 
-					<MenuFlyoutSeparator
-						Grid.Row="1"
-						Grid.Column="0"
-						Grid.ColumnSpan="3"
-						Margin="-12,0"
-						Background="{ThemeResource CardStrokeColorDefaultBrush}" />
+				<!--  Disk cleanup  -->
+				<TextBlock
+					Grid.Row="4"
+					Grid.Column="0"
+					Grid.ColumnSpan="2"
+					Style="{StaticResource PropertyValueTextBlock}"
+					Text="{helpers:ResourceString Name=CleanupDrive}" />
+				<Button
+					x:Name="DiskCleanupButton"
+					Grid.Row="4"
+					Grid.Column="2"
+					Grid.ColumnSpan="2"
+					HorizontalAlignment="Right"
+					Click="DiskCleanupButton_Click"
+					Content="{helpers:ResourceString Name=DiskCleanup}" />
+			</Grid>
 
-					<TextBlock
-						Grid.Row="2"
-						Grid.Column="0"
-						VerticalAlignment="Center"
-						Text="{helpers:ResourceString Name=PropertiesDialogHidden/Text}"
-						TextWrapping="WrapWholeWords" />
-					<CheckBox
-						Grid.Row="2"
-						Grid.Column="2"
-						MinWidth="0"
-						HorizontalAlignment="Right"
-						VerticalAlignment="Center"
-						AutomationProperties.Name="{helpers:ResourceString Name=Hidden}"
-						IsChecked="{x:Bind ViewModel.IsHidden, Mode=TwoWay}" />
-				</Grid>
-			</Expander.Content>
-		</Expander>
-	</StackPanel>
-</local:PropertiesTab>
\ No newline at end of file
+			<!--  Item attributes  -->
+			<Expander
+				x:Name="ItemAttributes"
+				HorizontalAlignment="Stretch"
+				HorizontalContentAlignment="Stretch"
+				x:Load="{x:Bind ViewModel.ItemAttributesVisibility, Mode=OneWay}"
+				Header="{helpers:ResourceString Name=Attributes}"
+				IsExpanded="False">
+				<Expander.Content>
+					<Grid
+						HorizontalAlignment="Stretch"
+						ColumnSpacing="8"
+						RowSpacing="8">
+						<Grid.ColumnDefinitions>
+							<ColumnDefinition Width="Auto" />
+							<ColumnDefinition Width="*" />
+							<ColumnDefinition Width="Auto" />
+						</Grid.ColumnDefinitions>
+						<Grid.RowDefinitions>
+							<RowDefinition Height="Auto" />
+							<RowDefinition Height="Auto" />
+							<RowDefinition Height="Auto" />
+						</Grid.RowDefinitions>
+
+						<TextBlock
+							Grid.Row="0"
+							Grid.Column="0"
+							VerticalAlignment="Center"
+							Text="{helpers:ResourceString Name=PropertiesDialogReadOnly/Text}"
+							TextWrapping="WrapWholeWords" />
+						<CheckBox
+							Grid.Row="0"
+							Grid.Column="2"
+							MinWidth="0"
+							HorizontalAlignment="Right"
+							VerticalAlignment="Center"
+							AutomationProperties.Name="{helpers:ResourceString Name=ReadOnly}"
+							IsChecked="{x:Bind ViewModel.IsReadOnly, Mode=TwoWay}"
+							IsEnabled="{x:Bind ViewModel.IsReadOnlyEnabled, Mode=OneWay}" />
+
+						<MenuFlyoutSeparator
+							Grid.Row="1"
+							Grid.Column="0"
+							Grid.ColumnSpan="3"
+							Margin="-12,0"
+							Background="{ThemeResource CardStrokeColorDefaultBrush}" />
+
+						<TextBlock
+							Grid.Row="2"
+							Grid.Column="0"
+							VerticalAlignment="Center"
+							Text="{helpers:ResourceString Name=PropertiesDialogHidden/Text}"
+							TextWrapping="WrapWholeWords" />
+						<CheckBox
+							Grid.Row="2"
+							Grid.Column="2"
+							MinWidth="0"
+							HorizontalAlignment="Right"
+							VerticalAlignment="Center"
+							AutomationProperties.Name="{helpers:ResourceString Name=Hidden}"
+							IsChecked="{x:Bind ViewModel.IsHidden, Mode=TwoWay}" />
+					</Grid>
+				</Expander.Content>
+			</Expander>
+
+		</StackPanel>
+	</ScrollViewer>
+</vm:PropertiesTab>
diff --git a/src/Files.App/Views/Pages/PropertiesLibrary.xaml b/src/Files.App/Views/Pages/PropertiesLibrary.xaml
index cf5e8c2777d0..71c989619a8a 100644
--- a/src/Files.App/Views/Pages/PropertiesLibrary.xaml
+++ b/src/Files.App/Views/Pages/PropertiesLibrary.xaml
@@ -1,128 +1,137 @@
-<local:PropertiesTab
+<vm:PropertiesTab
 	x:Class="Files.App.Views.PropertiesLibrary"
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 	xmlns:helpers="using:Files.App.Helpers"
-	xmlns:local="using:Files.App.ViewModels.Properties"
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-	xmlns:mconv="using:CommunityToolkit.WinUI.UI.Converters"
-	Name="Page"
-	d:DesignHeight="3000"
+	xmlns:toolkitconverters="using:CommunityToolkit.WinUI.UI.Converters"
+	xmlns:vm="using:Files.App.ViewModels.Properties"
 	Loaded="Properties_Loaded"
 	mc:Ignorable="d">
 
 	<Page.Resources>
 		<ResourceDictionary>
+
 			<ResourceDictionary.MergedDictionaries>
 				<ResourceDictionary Source="ms-appx:///ResourceDictionaries/PropertiesStyles.xaml" />
 			</ResourceDictionary.MergedDictionaries>
-			<mconv:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
+
+			<toolkitconverters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
+
 		</ResourceDictionary>
 	</Page.Resources>
-	<StackPanel Style="{StaticResource PropertiesTab}">
-		<Grid
-			Padding="12,4,12,12"
-			Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
-			BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
-			BorderThickness="1"
-			CornerRadius="4"
-			RowSpacing="4">
-			<Grid.ColumnDefinitions>
-				<ColumnDefinition Width="Auto" />
-				<ColumnDefinition Width="*" />
-			</Grid.ColumnDefinitions>
-			<Grid.RowDefinitions>
-				<RowDefinition Height="Auto" />
-				<RowDefinition Height="Auto" />
-				<RowDefinition Height="Auto" />
-				<RowDefinition />
-			</Grid.RowDefinitions>
-
-			<TextBlock
-				Grid.Row="0"
-				Grid.Column="0"
-				Padding="8,0,0,0"
-				HorizontalAlignment="Left"
-				VerticalAlignment="Center"
-				Text="{helpers:ResourceString Name=LibraryLocations/Text}"
-				TextTrimming="CharacterEllipsis" />
-			<CommandBar
-				Grid.Row="0"
-				Grid.Column="1"
-				VerticalAlignment="Center"
-				Background="Transparent"
-				DefaultLabelPosition="Right"
-				IsOpen="False">
-				<AppBarButton
-					Command="{x:Bind AddLocationCommand}"
-					Icon="Add"
-					Label="{helpers:ResourceString Name=Add}" />
-				<AppBarButton
-					Command="{x:Bind SetDefaultLocationCommand}"
-					Icon="Accept"
-					IsEnabled="{x:Bind IsNotDefaultFolderSelected, Mode=OneWay}"
-					Label="{helpers:ResourceString Name=Default}"
-					ToolTipService.ToolTip="{helpers:ResourceString Name=SetAsDefaultSavePath}" />
-				<AppBarButton
-					Command="{x:Bind RemoveLocationCommand}"
-					Icon="Delete"
-					IsEnabled="{x:Bind IsNotDefaultFolderSelected, Mode=OneWay}"
-					Label="{helpers:ResourceString Name=LibraryLocationsButtonRemove/Label}" />
-			</CommandBar>
-
-			<MenuFlyoutSeparator
-				Grid.Row="1"
-				Grid.Column="0"
-				Grid.ColumnSpan="2"
-				Margin="-8,0"
-				Background="{ThemeResource CardStrokeColorDefaultBrush}" />
-
-			<ListView
-				x:Name="PathsList"
-				Grid.Row="2"
-				Grid.Column="0"
-				Grid.ColumnSpan="2"
-				Margin="-8,0,-8,0"
-				CanReorderItems="False"
-				ItemsSource="{x:Bind Folders, Mode=OneWay}"
-				SelectedIndex="{x:Bind SelectedFolderIndex, Mode=TwoWay}"
-				SelectionMode="Single">
-				<ListView.ItemTemplate>
-					<DataTemplate xmlns:vm="using:Files.App.Views" x:DataType="vm:LibraryFolder">
-						<Grid>
-							<Grid.ColumnDefinitions>
-								<ColumnDefinition Width="36" />
-								<ColumnDefinition />
-							</Grid.ColumnDefinitions>
-							<FontIcon Glyph="&#xE008;" Visibility="{x:Bind IsDefault, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}" />
-							<TextBlock
-								Grid.Column="2"
-								Margin="0,0,0,2"
-								VerticalAlignment="Center"
-								Text="{x:Bind Path}"
-								TextTrimming="CharacterEllipsis"
-								ToolTipService.ToolTip="{x:Bind Path}" />
-						</Grid>
-					</DataTemplate>
-				</ListView.ItemTemplate>
-				<ListView.Footer>
-					<TextBlock
-						Text="{helpers:ResourceString Name=LibraryNoLocations/Text}"
-						TextWrapping="WrapWholeWords"
-						Visibility="{x:Bind IsLibraryEmpty, Mode=OneWay}" />
-				</ListView.Footer>
-			</ListView>
-
-			<!--
-            <MenuFlyoutSeparator
-                Grid.ColumnSpan="2"
-                Grid.Row="3"
-                Margin="-12,12"
-                HorizontalAlignment="Stretch" />
-			-->
-
-			<!--  TODO: add more controls?  -->
-		</Grid>
-	</StackPanel>
-</local:PropertiesTab>
\ No newline at end of file
+
+	<ScrollViewer>
+		<StackPanel Padding="12">
+
+			<Grid
+				Padding="12,4,12,12"
+				Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
+				BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
+				BorderThickness="1"
+				CornerRadius="4"
+				RowSpacing="4">
+				<Grid.ColumnDefinitions>
+					<ColumnDefinition Width="Auto" />
+					<ColumnDefinition Width="*" />
+				</Grid.ColumnDefinitions>
+				<Grid.RowDefinitions>
+					<RowDefinition Height="Auto" />
+					<RowDefinition Height="Auto" />
+					<RowDefinition Height="Auto" />
+					<RowDefinition />
+				</Grid.RowDefinitions>
+
+				<TextBlock
+					Grid.Row="0"
+					Grid.Column="0"
+					Padding="8,0,0,0"
+					HorizontalAlignment="Left"
+					VerticalAlignment="Center"
+					Text="{helpers:ResourceString Name=LibraryLocations/Text}"
+					TextTrimming="CharacterEllipsis" />
+
+				<CommandBar
+					Grid.Row="0"
+					Grid.Column="1"
+					VerticalAlignment="Center"
+					Background="Transparent"
+					DefaultLabelPosition="Right"
+					IsOpen="False">
+					<AppBarButton
+						Command="{x:Bind AddLocationCommand}"
+						Icon="Add"
+						Label="{helpers:ResourceString Name=Add}" />
+					<AppBarButton
+						Command="{x:Bind SetDefaultLocationCommand}"
+						Icon="Accept"
+						IsEnabled="{x:Bind IsNotDefaultFolderSelected, Mode=OneWay}"
+						Label="{helpers:ResourceString Name=Default}"
+						ToolTipService.ToolTip="{helpers:ResourceString Name=SetAsDefaultSavePath}" />
+					<AppBarButton
+						Command="{x:Bind RemoveLocationCommand}"
+						Icon="Delete"
+						IsEnabled="{x:Bind IsNotDefaultFolderSelected, Mode=OneWay}"
+						Label="{helpers:ResourceString Name=LibraryLocationsButtonRemove/Label}" />
+				</CommandBar>
+
+				<MenuFlyoutSeparator
+					Grid.Row="1"
+					Grid.Column="0"
+					Grid.ColumnSpan="2"
+					Margin="-8,0"
+					Background="{ThemeResource CardStrokeColorDefaultBrush}" />
+
+				<ListView
+					x:Name="PathsList"
+					Grid.Row="2"
+					Grid.Column="0"
+					Grid.ColumnSpan="2"
+					Margin="-8,0,-8,0"
+					CanReorderItems="False"
+					ItemsSource="{x:Bind Folders, Mode=OneWay}"
+					SelectedIndex="{x:Bind SelectedFolderIndex, Mode=TwoWay}"
+					SelectionMode="Single">
+
+					<ListView.ItemTemplate>
+						<DataTemplate xmlns:vm="using:Files.App.Views" x:DataType="vm:LibraryFolder">
+							<Grid>
+								<Grid.ColumnDefinitions>
+									<ColumnDefinition Width="36" />
+									<ColumnDefinition />
+								</Grid.ColumnDefinitions>
+								<FontIcon Glyph="&#xE008;" Visibility="{x:Bind IsDefault, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}" />
+								<TextBlock
+									Grid.Column="2"
+									Margin="0,0,0,2"
+									VerticalAlignment="Center"
+									Text="{x:Bind Path}"
+									TextTrimming="CharacterEllipsis"
+									ToolTipService.ToolTip="{x:Bind Path}" />
+							</Grid>
+						</DataTemplate>
+					</ListView.ItemTemplate>
+
+					<ListView.Footer>
+						<TextBlock
+							Text="{helpers:ResourceString Name=LibraryNoLocations/Text}"
+							TextWrapping="WrapWholeWords"
+							Visibility="{x:Bind IsLibraryEmpty, Mode=OneWay}" />
+					</ListView.Footer>
+
+				</ListView>
+
+				<!--<MenuFlyoutSeparator
+						Grid.ColumnSpan="2"
+						Grid.Row="3"
+						Margin="-12,12"
+						HorizontalAlignment="Stretch" />-->
+
+				<!--  TODO: add more controls?  -->
+
+			</Grid>
+
+		</StackPanel>
+	</ScrollViewer>
+</vm:PropertiesTab>
diff --git a/src/Files.App/Views/Pages/PropertiesSecurity.xaml b/src/Files.App/Views/Pages/PropertiesSecurity.xaml
index 80316092ebc6..c55bc082a3bc 100644
--- a/src/Files.App/Views/Pages/PropertiesSecurity.xaml
+++ b/src/Files.App/Views/Pages/PropertiesSecurity.xaml
@@ -1,392 +1,397 @@
-<local:PropertiesTab
+<vm:PropertiesTab
 	x:Class="Files.App.Views.PropertiesSecurity"
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-	xmlns:converters="using:CommunityToolkit.WinUI.UI.Converters"
 	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 	xmlns:helpers="using:Files.App.Helpers"
-	xmlns:local="using:Files.App.ViewModels.Properties"
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 	xmlns:perm="using:Files.App.Filesystem.Permissions"
-	d:Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
+	xmlns:toolkitconverters="using:CommunityToolkit.WinUI.UI.Converters"
+	xmlns:vm="using:Files.App.ViewModels.Properties"
 	Loaded="Properties_Loaded"
 	mc:Ignorable="d">
 
 	<Page.Resources>
 		<ResourceDictionary>
+
 			<ResourceDictionary.MergedDictionaries>
 				<ResourceDictionary Source="ms-appx:///ResourceDictionaries/PropertiesStyles.xaml" />
 			</ResourceDictionary.MergedDictionaries>
-			<converters:BoolNegationConverter x:Key="BoolNegationConverter" />
-		</ResourceDictionary>
-	</Page.Resources>
-
-	<Grid Padding="12,0,12,12" RowSpacing="4">
-		<Grid.RowDefinitions>
-			<RowDefinition Height="Auto" />
-			<RowDefinition Height="Auto" />
-		</Grid.RowDefinitions>
-
-		<!--  Usernames  -->
-		<Grid
-			x:Name="Usernames"
-			Grid.Row="0"
-			Padding="8"
-			x:Load="{x:Bind SecurityProperties.FilePermissions.CanReadFilePermissions, Mode=OneWay}"
-			Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
-			BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
-			BorderThickness="1"
-			CornerRadius="4"
-			RowSpacing="4">
-			<Grid.ColumnDefinitions>
-				<ColumnDefinition Width="*" />
-				<ColumnDefinition Width="Auto" />
-			</Grid.ColumnDefinitions>
-			<Grid.RowDefinitions>
-				<RowDefinition Height="Auto" />
-				<RowDefinition Height="Auto" />
-				<RowDefinition Height="Auto" />
-			</Grid.RowDefinitions>
-			<TextBlock
-				Grid.Row="0"
-				Grid.Column="0"
-				Padding="8"
-				VerticalAlignment="Center"
-				Text="{helpers:ResourceString Name=SecurityUsersGroupLabel/Text}" />
 
-			<StackPanel
-				Grid.Row="0"
-				Grid.Column="1"
-				Orientation="Horizontal"
-				Spacing="4">
-				<Button
-					Padding="8,6"
-					Background="Transparent"
-					BorderBrush="Transparent"
-					Command="{x:Bind SecurityProperties.AddRulesForUserCommand}">
-					<FontIcon FontSize="16" Glyph="&#xE109;" />
-				</Button>
-				<Button
-					Padding="8,6"
-					Background="Transparent"
-					BorderBrush="Transparent"
-					Command="{x:Bind SecurityProperties.RemoveRulesForUserCommand}">
-					<FontIcon FontSize="16" Glyph="&#xE108;" />
-				</Button>
-			</StackPanel>
+			<toolkitconverters:BoolNegationConverter x:Key="BoolNegationConverter" />
 
-			<MenuFlyoutSeparator
-				Grid.Row="1"
-				Grid.Column="0"
-				Grid.ColumnSpan="2"
-				Margin="-12,0"
-				Background="{ThemeResource CardStrokeColorDefaultBrush}" />
-
-			<ListView
-				x:Name="ListView"
-				Grid.Row="2"
-				Grid.Column="0"
-				Grid.ColumnSpan="2"
-				MaxHeight="160"
-				Margin="-4,0,-4,0"
-				HorizontalAlignment="Stretch"
-				x:Load="{x:Bind SecurityProperties.FilePermissions.CanReadFilePermissions, Mode=OneWay}"
-				ItemsSource="{x:Bind SecurityProperties.FilePermissions.RulesForUsers, Mode=OneWay}"
-				SelectedIndex="0"
-				SelectedItem="{x:Bind SecurityProperties.SelectedRuleForUser, Mode=TwoWay}"
-				SelectionMode="Single">
-				<ListView.ItemContainerStyle>
-					<Style BasedOn="{StaticResource DefaultListViewItemStyle}" TargetType="ListViewItem">
-						<Setter Property="MinHeight" Value="1" />
-						<Setter Property="Height" Value="{ThemeResource ListItemHeight}" />
-					</Style>
-				</ListView.ItemContainerStyle>
-				<ListView.ItemTemplate>
-					<DataTemplate x:DataType="perm:RulesForUser">
-						<Grid>
-							<Grid.ColumnDefinitions>
-								<ColumnDefinition Width="32" />
-								<ColumnDefinition />
-							</Grid.ColumnDefinitions>
-
-							<FontIcon
-								x:Name="FontIcon"
-								HorizontalAlignment="Left"
-								FontFamily="{StaticResource SymbolThemeFontFamily}"
-								FontSize="16"
-								Glyph="{x:Bind UserGroup.Glyph}" />
-
-							<StackPanel Grid.Column="1" Orientation="Horizontal">
-								<TextBlock Text="{x:Bind UserGroup.DisplayName}" />
-								<TextBlock
-									Padding="4,0,0,0"
-									FontWeight="Light"
-									Text="&#160;(" />
-								<TextBlock FontWeight="Light" Text="{x:Bind UserGroup.FullNameOrSid}" />
-								<TextBlock FontWeight="Light" Text=")" />
-							</StackPanel>
-						</Grid>
-					</DataTemplate>
-				</ListView.ItemTemplate>
-			</ListView>
-		</Grid>
+		</ResourceDictionary>
+	</Page.Resources>
 
-		<!--  Permissions  -->
-		<Grid
-			Grid.Row="1"
-			Padding="8"
-			Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
-			BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
-			BorderThickness="1"
-			CornerRadius="4"
-			RowSpacing="4">
+	<ScrollViewer>
+		<Grid Padding="12" RowSpacing="4">
 			<Grid.RowDefinitions>
 				<RowDefinition Height="Auto" />
 				<RowDefinition Height="Auto" />
-				<RowDefinition Height="Auto" />
 			</Grid.RowDefinitions>
 
-			<TextBlock
-				Grid.Row="0"
-				Padding="8"
-				VerticalAlignment="Center"
-				TextTrimming="CharacterEllipsis">
-				<Run Text="{helpers:ResourceString Name=SecurityPermissionsLabel/Text}" />
-				<Run Text="{x:Bind SecurityProperties.SelectedRuleForUser.UserGroup.DisplayName, Mode=OneWay}" />
-			</TextBlock>
-
-			<Button
-				Grid.Row="0"
-				Padding="8,6"
-				HorizontalAlignment="Right"
-				VerticalAlignment="Center"
-				AutomationProperties.Name="{helpers:ResourceString Name=AdvancedPermissions}"
-				Background="Transparent"
-				BorderBrush="Transparent"
-				Command="{x:Bind OpenAdvancedPropertiesCommand}"
-				ToolTipService.ToolTip="{helpers:ResourceString Name=AdvancedPermissions}">
-				<FontIcon FontSize="16" Glyph="&#xE00F;" />
-			</Button>
-
-			<MenuFlyoutSeparator
-				Grid.Row="1"
-				Margin="-12,0"
-				Background="{ThemeResource CardStrokeColorDefaultBrush}" />
-
+			<!--  Usernames  -->
 			<Grid
-				x:Name="CheckBoxGrid"
-				Grid.Row="2"
+				x:Name="Usernames"
+				Grid.Row="0"
 				Padding="8"
-				HorizontalAlignment="Stretch"
 				x:Load="{x:Bind SecurityProperties.FilePermissions.CanReadFilePermissions, Mode=OneWay}"
-				ColumnSpacing="8">
+				Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
+				BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
+				BorderThickness="1"
+				CornerRadius="4"
+				RowSpacing="4">
 				<Grid.ColumnDefinitions>
 					<ColumnDefinition Width="*" />
 					<ColumnDefinition Width="Auto" />
-					<ColumnDefinition Width="12" />
-					<ColumnDefinition Width="Auto" />
 				</Grid.ColumnDefinitions>
 				<Grid.RowDefinitions>
 					<RowDefinition Height="Auto" />
 					<RowDefinition Height="Auto" />
 					<RowDefinition Height="Auto" />
-					<RowDefinition Height="Auto" />
-					<RowDefinition Height="Auto" />
-					<RowDefinition Height="Auto" />
-					<RowDefinition Height="Auto" />
-					<RowDefinition Height="Auto" />
 				</Grid.RowDefinitions>
-
 				<TextBlock
 					Grid.Row="0"
-					Grid.Column="1"
-					Margin="0,0,0,4"
-					HorizontalAlignment="Center"
-					VerticalAlignment="Center"
-					Text="{helpers:ResourceString Name=Allow}" />
-
-				<TextBlock
-					Grid.Row="0"
-					Grid.Column="3"
-					Margin="0,0,0,4"
-					HorizontalAlignment="Center"
-					VerticalAlignment="Center"
-					Text="{helpers:ResourceString Name=SecurityDenyLabel/Text}" />
-
-				<TextBlock
-					Grid.Row="1"
 					Grid.Column="0"
-					HorizontalAlignment="Left"
+					Padding="8"
 					VerticalAlignment="Center"
-					Text="{helpers:ResourceString Name=SecurityFullControlLabel/Text}" />
+					Text="{helpers:ResourceString Name=SecurityUsersGroupLabel/Text}" />
 
-				<CheckBox
-					Grid.Row="1"
+				<StackPanel
+					Grid.Row="0"
 					Grid.Column="1"
-					MinWidth="0"
-					Padding="0"
-					HorizontalAlignment="Center"
-					VerticalAlignment="Center"
-					IsChecked="{x:Bind SecurityProperties.SelectedRuleForUser.GrantsFullControl, Mode=TwoWay}"
-					IsEnabled="{x:Bind SecurityProperties.SelectedRuleForUser.GrantsInheritedFullControl, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}" />
-
-				<CheckBox
+					Orientation="Horizontal"
+					Spacing="4">
+					<Button
+						Padding="8,6"
+						Background="Transparent"
+						BorderBrush="Transparent"
+						Command="{x:Bind SecurityProperties.AddRulesForUserCommand}">
+						<FontIcon FontSize="16" Glyph="&#xE109;" />
+					</Button>
+					<Button
+						Padding="8,6"
+						Background="Transparent"
+						BorderBrush="Transparent"
+						Command="{x:Bind SecurityProperties.RemoveRulesForUserCommand}">
+						<FontIcon FontSize="16" Glyph="&#xE108;" />
+					</Button>
+				</StackPanel>
+
+				<MenuFlyoutSeparator
 					Grid.Row="1"
-					Grid.Column="3"
-					MinWidth="0"
-					Padding="0"
-					HorizontalAlignment="Center"
-					VerticalAlignment="Center"
-					IsChecked="{x:Bind SecurityProperties.SelectedRuleForUser.DeniesFullControl, Mode=TwoWay}"
-					IsEnabled="{x:Bind SecurityProperties.SelectedRuleForUser.DeniesInheritedFullControl, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}" />
-
-				<TextBlock
-					Grid.Row="2"
 					Grid.Column="0"
-					HorizontalAlignment="Left"
-					VerticalAlignment="Center"
-					Text="{helpers:ResourceString Name=SecurityModifyLabel/Text}" />
-
-				<CheckBox
-					Grid.Row="2"
-					Grid.Column="1"
-					MinWidth="0"
-					Padding="0"
-					HorizontalAlignment="Center"
-					VerticalAlignment="Center"
-					IsChecked="{x:Bind SecurityProperties.SelectedRuleForUser.GrantsModify, Mode=TwoWay}"
-					IsEnabled="{x:Bind SecurityProperties.SelectedRuleForUser.GrantsInheritedModify, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}" />
+					Grid.ColumnSpan="2"
+					Margin="-12,0"
+					Background="{ThemeResource CardStrokeColorDefaultBrush}" />
 
-				<CheckBox
+				<ListView
+					x:Name="ListView"
 					Grid.Row="2"
-					Grid.Column="3"
-					MinWidth="0"
-					Padding="0"
-					HorizontalAlignment="Center"
-					VerticalAlignment="Center"
-					IsChecked="{x:Bind SecurityProperties.SelectedRuleForUser.DeniesModify, Mode=TwoWay}"
-					IsEnabled="{x:Bind SecurityProperties.SelectedRuleForUser.DeniesInheritedModify, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}" />
-
-				<TextBlock
-					Grid.Row="3"
 					Grid.Column="0"
-					HorizontalAlignment="Left"
-					VerticalAlignment="Center"
-					Text="{helpers:ResourceString Name=SecurityReadAndExecuteLabel/Text}" />
+					Grid.ColumnSpan="2"
+					MaxHeight="160"
+					Margin="-4,0,-4,0"
+					HorizontalAlignment="Stretch"
+					x:Load="{x:Bind SecurityProperties.FilePermissions.CanReadFilePermissions, Mode=OneWay}"
+					ItemsSource="{x:Bind SecurityProperties.FilePermissions.RulesForUsers, Mode=OneWay}"
+					SelectedIndex="0"
+					SelectedItem="{x:Bind SecurityProperties.SelectedRuleForUser, Mode=TwoWay}"
+					SelectionMode="Single">
+					<ListView.ItemContainerStyle>
+						<Style BasedOn="{StaticResource DefaultListViewItemStyle}" TargetType="ListViewItem">
+							<Setter Property="MinHeight" Value="1" />
+							<Setter Property="Height" Value="{ThemeResource ListItemHeight}" />
+						</Style>
+					</ListView.ItemContainerStyle>
+					<ListView.ItemTemplate>
+						<DataTemplate x:DataType="perm:RulesForUser">
+							<Grid>
+								<Grid.ColumnDefinitions>
+									<ColumnDefinition Width="32" />
+									<ColumnDefinition />
+								</Grid.ColumnDefinitions>
+
+								<FontIcon
+									x:Name="FontIcon"
+									HorizontalAlignment="Left"
+									FontFamily="{StaticResource SymbolThemeFontFamily}"
+									FontSize="16"
+									Glyph="{x:Bind UserGroup.Glyph}" />
+
+								<StackPanel Grid.Column="1" Orientation="Horizontal">
+									<TextBlock Text="{x:Bind UserGroup.DisplayName}" />
+									<TextBlock
+										Padding="4,0,0,0"
+										FontWeight="Light"
+										Text="&#160;(" />
+									<TextBlock FontWeight="Light" Text="{x:Bind UserGroup.FullNameOrSid}" />
+									<TextBlock FontWeight="Light" Text=")" />
+								</StackPanel>
+							</Grid>
+						</DataTemplate>
+					</ListView.ItemTemplate>
+				</ListView>
+			</Grid>
 
-				<CheckBox
-					Grid.Row="3"
-					Grid.Column="1"
-					MinWidth="0"
-					Padding="0"
-					HorizontalAlignment="Center"
-					VerticalAlignment="Center"
-					IsChecked="{x:Bind SecurityProperties.SelectedRuleForUser.GrantsReadAndExecute, Mode=TwoWay}"
-					IsEnabled="{x:Bind SecurityProperties.SelectedRuleForUser.GrantsInheritedReadAndExecute, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}" />
-
-				<CheckBox
-					Grid.Row="3"
-					Grid.Column="3"
-					MinWidth="0"
-					Padding="0"
-					HorizontalAlignment="Center"
-					VerticalAlignment="Center"
-					IsChecked="{x:Bind SecurityProperties.SelectedRuleForUser.DeniesReadAndExecute, Mode=TwoWay}"
-					IsEnabled="{x:Bind SecurityProperties.SelectedRuleForUser.DeniesInheritedReadAndExecute, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}" />
+			<!--  Permissions  -->
+			<Grid
+				Grid.Row="1"
+				Padding="8"
+				Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
+				BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
+				BorderThickness="1"
+				CornerRadius="4"
+				RowSpacing="4">
+				<Grid.RowDefinitions>
+					<RowDefinition Height="Auto" />
+					<RowDefinition Height="Auto" />
+					<RowDefinition Height="Auto" />
+				</Grid.RowDefinitions>
 
 				<TextBlock
-					Grid.Row="4"
-					Grid.Column="0"
-					HorizontalAlignment="Left"
+					Grid.Row="0"
+					Padding="8"
 					VerticalAlignment="Center"
-					Text="{helpers:ResourceString Name=SecurityListDirectoryLabel/Text}"
-					Visibility="{x:Bind SecurityProperties.IsFolder, Mode=OneWay}" />
+					TextTrimming="CharacterEllipsis">
+					<Run Text="{helpers:ResourceString Name=SecurityPermissionsLabel/Text}" />
+					<Run Text="{x:Bind SecurityProperties.SelectedRuleForUser.UserGroup.DisplayName, Mode=OneWay}" />
+				</TextBlock>
 
-				<CheckBox
-					Grid.Row="4"
-					Grid.Column="1"
-					MinWidth="0"
-					Padding="0"
-					HorizontalAlignment="Center"
-					VerticalAlignment="Center"
-					IsChecked="{x:Bind SecurityProperties.SelectedRuleForUser.GrantsListDirectory, Mode=TwoWay}"
-					IsEnabled="{x:Bind SecurityProperties.SelectedRuleForUser.GrantsInheritedListDirectory, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}"
-					Visibility="{x:Bind SecurityProperties.IsFolder, Mode=OneWay}" />
-
-				<CheckBox
-					Grid.Row="4"
-					Grid.Column="3"
-					MinWidth="0"
-					Padding="0"
-					HorizontalAlignment="Center"
+				<Button
+					Grid.Row="0"
+					Padding="8,6"
+					HorizontalAlignment="Right"
 					VerticalAlignment="Center"
-					IsChecked="{x:Bind SecurityProperties.SelectedRuleForUser.DeniesListDirectory, Mode=TwoWay}"
-					IsEnabled="{x:Bind SecurityProperties.SelectedRuleForUser.DeniesInheritedListDirectory, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}"
-					Visibility="{x:Bind SecurityProperties.IsFolder, Mode=OneWay}" />
+					AutomationProperties.Name="{helpers:ResourceString Name=AdvancedPermissions}"
+					Background="Transparent"
+					BorderBrush="Transparent"
+					Command="{x:Bind OpenAdvancedPropertiesCommand}"
+					ToolTipService.ToolTip="{helpers:ResourceString Name=AdvancedPermissions}">
+					<FontIcon FontSize="16" Glyph="&#xE00F;" />
+				</Button>
 
-				<TextBlock
-					Grid.Row="5"
-					Grid.Column="0"
-					HorizontalAlignment="Left"
-					VerticalAlignment="Center"
-					Text="{helpers:ResourceString Name=SecurityReadLabel/Text}" />
+				<MenuFlyoutSeparator
+					Grid.Row="1"
+					Margin="-12,0"
+					Background="{ThemeResource CardStrokeColorDefaultBrush}" />
 
-				<CheckBox
-					Grid.Row="5"
-					Grid.Column="1"
-					MinWidth="0"
-					Padding="0"
-					HorizontalAlignment="Center"
-					VerticalAlignment="Center"
-					IsChecked="{x:Bind SecurityProperties.SelectedRuleForUser.GrantsRead, Mode=TwoWay}"
-					IsEnabled="{x:Bind SecurityProperties.SelectedRuleForUser.GrantsInheritedRead, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}" />
-
-				<CheckBox
-					Grid.Row="5"
-					Grid.Column="3"
-					MinWidth="0"
-					Padding="0"
-					HorizontalAlignment="Center"
-					VerticalAlignment="Center"
-					IsChecked="{x:Bind SecurityProperties.SelectedRuleForUser.DeniesRead, Mode=TwoWay}"
-					IsEnabled="{x:Bind SecurityProperties.SelectedRuleForUser.DeniesInheritedRead, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}" />
+				<Grid
+					x:Name="CheckBoxGrid"
+					Grid.Row="2"
+					Padding="8"
+					HorizontalAlignment="Stretch"
+					x:Load="{x:Bind SecurityProperties.FilePermissions.CanReadFilePermissions, Mode=OneWay}"
+					ColumnSpacing="8">
+					<Grid.ColumnDefinitions>
+						<ColumnDefinition Width="*" />
+						<ColumnDefinition Width="Auto" />
+						<ColumnDefinition Width="12" />
+						<ColumnDefinition Width="Auto" />
+					</Grid.ColumnDefinitions>
+					<Grid.RowDefinitions>
+						<RowDefinition Height="Auto" />
+						<RowDefinition Height="Auto" />
+						<RowDefinition Height="Auto" />
+						<RowDefinition Height="Auto" />
+						<RowDefinition Height="Auto" />
+						<RowDefinition Height="Auto" />
+						<RowDefinition Height="Auto" />
+						<RowDefinition Height="Auto" />
+					</Grid.RowDefinitions>
+
+					<TextBlock
+						Grid.Row="0"
+						Grid.Column="1"
+						Margin="0,0,0,4"
+						HorizontalAlignment="Center"
+						VerticalAlignment="Center"
+						Text="{helpers:ResourceString Name=Allow}" />
+
+					<TextBlock
+						Grid.Row="0"
+						Grid.Column="3"
+						Margin="0,0,0,4"
+						HorizontalAlignment="Center"
+						VerticalAlignment="Center"
+						Text="{helpers:ResourceString Name=SecurityDenyLabel/Text}" />
+
+					<TextBlock
+						Grid.Row="1"
+						Grid.Column="0"
+						HorizontalAlignment="Left"
+						VerticalAlignment="Center"
+						Text="{helpers:ResourceString Name=SecurityFullControlLabel/Text}" />
+
+					<CheckBox
+						Grid.Row="1"
+						Grid.Column="1"
+						MinWidth="0"
+						Padding="0"
+						HorizontalAlignment="Center"
+						VerticalAlignment="Center"
+						IsChecked="{x:Bind SecurityProperties.SelectedRuleForUser.GrantsFullControl, Mode=TwoWay}"
+						IsEnabled="{x:Bind SecurityProperties.SelectedRuleForUser.GrantsInheritedFullControl, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}" />
+
+					<CheckBox
+						Grid.Row="1"
+						Grid.Column="3"
+						MinWidth="0"
+						Padding="0"
+						HorizontalAlignment="Center"
+						VerticalAlignment="Center"
+						IsChecked="{x:Bind SecurityProperties.SelectedRuleForUser.DeniesFullControl, Mode=TwoWay}"
+						IsEnabled="{x:Bind SecurityProperties.SelectedRuleForUser.DeniesInheritedFullControl, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}" />
+
+					<TextBlock
+						Grid.Row="2"
+						Grid.Column="0"
+						HorizontalAlignment="Left"
+						VerticalAlignment="Center"
+						Text="{helpers:ResourceString Name=SecurityModifyLabel/Text}" />
+
+					<CheckBox
+						Grid.Row="2"
+						Grid.Column="1"
+						MinWidth="0"
+						Padding="0"
+						HorizontalAlignment="Center"
+						VerticalAlignment="Center"
+						IsChecked="{x:Bind SecurityProperties.SelectedRuleForUser.GrantsModify, Mode=TwoWay}"
+						IsEnabled="{x:Bind SecurityProperties.SelectedRuleForUser.GrantsInheritedModify, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}" />
+
+					<CheckBox
+						Grid.Row="2"
+						Grid.Column="3"
+						MinWidth="0"
+						Padding="0"
+						HorizontalAlignment="Center"
+						VerticalAlignment="Center"
+						IsChecked="{x:Bind SecurityProperties.SelectedRuleForUser.DeniesModify, Mode=TwoWay}"
+						IsEnabled="{x:Bind SecurityProperties.SelectedRuleForUser.DeniesInheritedModify, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}" />
+
+					<TextBlock
+						Grid.Row="3"
+						Grid.Column="0"
+						HorizontalAlignment="Left"
+						VerticalAlignment="Center"
+						Text="{helpers:ResourceString Name=SecurityReadAndExecuteLabel/Text}" />
+
+					<CheckBox
+						Grid.Row="3"
+						Grid.Column="1"
+						MinWidth="0"
+						Padding="0"
+						HorizontalAlignment="Center"
+						VerticalAlignment="Center"
+						IsChecked="{x:Bind SecurityProperties.SelectedRuleForUser.GrantsReadAndExecute, Mode=TwoWay}"
+						IsEnabled="{x:Bind SecurityProperties.SelectedRuleForUser.GrantsInheritedReadAndExecute, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}" />
+
+					<CheckBox
+						Grid.Row="3"
+						Grid.Column="3"
+						MinWidth="0"
+						Padding="0"
+						HorizontalAlignment="Center"
+						VerticalAlignment="Center"
+						IsChecked="{x:Bind SecurityProperties.SelectedRuleForUser.DeniesReadAndExecute, Mode=TwoWay}"
+						IsEnabled="{x:Bind SecurityProperties.SelectedRuleForUser.DeniesInheritedReadAndExecute, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}" />
+
+					<TextBlock
+						Grid.Row="4"
+						Grid.Column="0"
+						HorizontalAlignment="Left"
+						VerticalAlignment="Center"
+						Text="{helpers:ResourceString Name=SecurityListDirectoryLabel/Text}"
+						Visibility="{x:Bind SecurityProperties.IsFolder, Mode=OneWay}" />
+
+					<CheckBox
+						Grid.Row="4"
+						Grid.Column="1"
+						MinWidth="0"
+						Padding="0"
+						HorizontalAlignment="Center"
+						VerticalAlignment="Center"
+						IsChecked="{x:Bind SecurityProperties.SelectedRuleForUser.GrantsListDirectory, Mode=TwoWay}"
+						IsEnabled="{x:Bind SecurityProperties.SelectedRuleForUser.GrantsInheritedListDirectory, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}"
+						Visibility="{x:Bind SecurityProperties.IsFolder, Mode=OneWay}" />
+
+					<CheckBox
+						Grid.Row="4"
+						Grid.Column="3"
+						MinWidth="0"
+						Padding="0"
+						HorizontalAlignment="Center"
+						VerticalAlignment="Center"
+						IsChecked="{x:Bind SecurityProperties.SelectedRuleForUser.DeniesListDirectory, Mode=TwoWay}"
+						IsEnabled="{x:Bind SecurityProperties.SelectedRuleForUser.DeniesInheritedListDirectory, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}"
+						Visibility="{x:Bind SecurityProperties.IsFolder, Mode=OneWay}" />
+
+					<TextBlock
+						Grid.Row="5"
+						Grid.Column="0"
+						HorizontalAlignment="Left"
+						VerticalAlignment="Center"
+						Text="{helpers:ResourceString Name=SecurityReadLabel/Text}" />
+
+					<CheckBox
+						Grid.Row="5"
+						Grid.Column="1"
+						MinWidth="0"
+						Padding="0"
+						HorizontalAlignment="Center"
+						VerticalAlignment="Center"
+						IsChecked="{x:Bind SecurityProperties.SelectedRuleForUser.GrantsRead, Mode=TwoWay}"
+						IsEnabled="{x:Bind SecurityProperties.SelectedRuleForUser.GrantsInheritedRead, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}" />
+
+					<CheckBox
+						Grid.Row="5"
+						Grid.Column="3"
+						MinWidth="0"
+						Padding="0"
+						HorizontalAlignment="Center"
+						VerticalAlignment="Center"
+						IsChecked="{x:Bind SecurityProperties.SelectedRuleForUser.DeniesRead, Mode=TwoWay}"
+						IsEnabled="{x:Bind SecurityProperties.SelectedRuleForUser.DeniesInheritedRead, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}" />
+
+					<TextBlock
+						Grid.Row="6"
+						Grid.Column="0"
+						HorizontalAlignment="Left"
+						VerticalAlignment="Center"
+						Text="{helpers:ResourceString Name=Write}" />
+
+					<CheckBox
+						Grid.Row="6"
+						Grid.Column="1"
+						MinWidth="0"
+						Padding="0"
+						HorizontalAlignment="Center"
+						VerticalAlignment="Center"
+						IsChecked="{x:Bind SecurityProperties.SelectedRuleForUser.GrantsWrite, Mode=TwoWay}"
+						IsEnabled="{x:Bind SecurityProperties.SelectedRuleForUser.GrantsInheritedWrite, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}" />
+
+					<CheckBox
+						Grid.Row="6"
+						Grid.Column="3"
+						MinWidth="0"
+						Padding="0"
+						HorizontalAlignment="Center"
+						VerticalAlignment="Center"
+						IsChecked="{x:Bind SecurityProperties.SelectedRuleForUser.DeniesWrite, Mode=TwoWay}"
+						IsEnabled="{x:Bind SecurityProperties.SelectedRuleForUser.DeniesInheritedWrite, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}" />
+				</Grid>
 
 				<TextBlock
-					Grid.Row="6"
-					Grid.Column="0"
+					x:Name="CannotReadPropsText"
+					Grid.Row="2"
+					Padding="8"
 					HorizontalAlignment="Left"
-					VerticalAlignment="Center"
-					Text="{helpers:ResourceString Name=Write}" />
-
-				<CheckBox
-					Grid.Row="6"
-					Grid.Column="1"
-					MinWidth="0"
-					Padding="0"
-					HorizontalAlignment="Center"
-					VerticalAlignment="Center"
-					IsChecked="{x:Bind SecurityProperties.SelectedRuleForUser.GrantsWrite, Mode=TwoWay}"
-					IsEnabled="{x:Bind SecurityProperties.SelectedRuleForUser.GrantsInheritedWrite, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}" />
-
-				<CheckBox
-					Grid.Row="6"
-					Grid.Column="3"
-					MinWidth="0"
-					Padding="0"
-					HorizontalAlignment="Center"
-					VerticalAlignment="Center"
-					IsChecked="{x:Bind SecurityProperties.SelectedRuleForUser.DeniesWrite, Mode=TwoWay}"
-					IsEnabled="{x:Bind SecurityProperties.SelectedRuleForUser.DeniesInheritedWrite, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}" />
+					x:Load="{x:Bind SecurityProperties.FilePermissions.CanReadFilePermissions, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}"
+					Text="{helpers:ResourceString Name=SecurityCannotReadProperties/Text}"
+					TextWrapping="WrapWholeWords" />
 			</Grid>
 
-			<TextBlock
-				x:Name="CannotReadPropsText"
-				Grid.Row="2"
-				Padding="8"
-				HorizontalAlignment="Left"
-				x:Load="{x:Bind SecurityProperties.FilePermissions.CanReadFilePermissions, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}"
-				Text="{helpers:ResourceString Name=SecurityCannotReadProperties/Text}"
-				TextWrapping="WrapWholeWords" />
 		</Grid>
-	</Grid>
-</local:PropertiesTab>
\ No newline at end of file
+	</ScrollViewer>
+</vm:PropertiesTab>
diff --git a/src/Files.App/Views/Pages/PropertiesSecurityAdvanced.xaml b/src/Files.App/Views/Pages/PropertiesSecurityAdvanced.xaml
index 17e1ee16fb26..aac81ded5931 100644
--- a/src/Files.App/Views/Pages/PropertiesSecurityAdvanced.xaml
+++ b/src/Files.App/Views/Pages/PropertiesSecurityAdvanced.xaml
@@ -3,15 +3,12 @@
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 	xmlns:behaviors="using:CommunityToolkit.WinUI.UI.Behaviors"
-	xmlns:converters="using:CommunityToolkit.WinUI.UI.Converters"
 	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 	xmlns:helpers="using:Files.App.Helpers"
 	xmlns:i="using:Microsoft.Xaml.Interactivity"
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 	xmlns:perm="using:Files.App.Filesystem.Permissions"
-	d:Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
-	d:Height="550"
-	d:Width="850"
+	xmlns:toolkitconverters="using:CommunityToolkit.WinUI.UI.Converters"
 	Background="{ThemeResource App.Theme.BackgroundBrush}"
 	KeyDown="Page_KeyDown"
 	Loaded="Properties_Loaded"
@@ -20,18 +17,23 @@
 
 	<Page.Resources>
 		<ResourceDictionary>
+
 			<ResourceDictionary.MergedDictionaries>
 				<ResourceDictionary Source="ms-appx:///ResourceDictionaries/PropertiesStyles.xaml" />
 			</ResourceDictionary.MergedDictionaries>
-			<converters:BoolNegationConverter x:Key="BoolNegationConverter" />
-			<converters:BoolToObjectConverter
+
+			<toolkitconverters:BoolNegationConverter x:Key="BoolNegationConverter" />
+
+			<toolkitconverters:BoolToObjectConverter
 				x:Key="BoolToMinWidthConverter"
 				FalseValue="0"
 				TrueValue="200" />
-			<converters:BoolToObjectConverter
+
+			<toolkitconverters:BoolToObjectConverter
 				x:Key="BoolToWidthConverter"
 				FalseValue="0"
 				TrueValue="*" />
+
 		</ResourceDictionary>
 	</Page.Resources>
 
@@ -501,5 +503,6 @@
 				Click="CancelButton_Click"
 				Content="{helpers:ResourceString Name=Cancel}" />
 		</Grid>
+
 	</Grid>
-</Page>
\ No newline at end of file
+</Page>
diff --git a/src/Files.App/Views/Pages/PropertiesShortcut.xaml b/src/Files.App/Views/Pages/PropertiesShortcut.xaml
index 086aef17c8b7..a0a1fc20748b 100644
--- a/src/Files.App/Views/Pages/PropertiesShortcut.xaml
+++ b/src/Files.App/Views/Pages/PropertiesShortcut.xaml
@@ -1,156 +1,165 @@
-<local:PropertiesTab
+<vm:PropertiesTab
 	x:Class="Files.App.Views.PropertiesShortcut"
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 	xmlns:helpers="using:Files.App.Helpers"
-	xmlns:local="using:Files.App.ViewModels.Properties"
-	xmlns:local1="using:Files.App.UserControls.Settings"
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+	xmlns:settingsuc="using:Files.App.UserControls.Settings"
+	xmlns:vm="using:Files.App.ViewModels.Properties"
 	Loaded="Properties_Loaded"
 	mc:Ignorable="d">
 
-	<local:PropertiesTab.Resources>
+	<vm:PropertiesTab.Resources>
 		<ResourceDictionary>
 			<ResourceDictionary.MergedDictionaries>
 				<ResourceDictionary Source="ms-appx:///ResourceDictionaries/PropertiesStyles.xaml" />
 				<ResourceDictionary Source="ms-appx:///ResourceDictionaries/RightAlignedToggleSwitchStyle.xaml" />
 			</ResourceDictionary.MergedDictionaries>
 		</ResourceDictionary>
-	</local:PropertiesTab.Resources>
+	</vm:PropertiesTab.Resources>
 
-	<StackPanel Padding="12,0,12,12" Spacing="4">
-		<Grid
-			Padding="12"
-			HorizontalAlignment="Stretch"
-			Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
-			BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
-			BorderThickness="1"
-			ColumnSpacing="8"
-			CornerRadius="4"
-			RowSpacing="8">
-			<Grid.ColumnDefinitions>
-				<ColumnDefinition
-					Width="Auto"
-					MinWidth="140"
-					MaxWidth="240" />
-				<ColumnDefinition Width="*" />
-			</Grid.ColumnDefinitions>
-			<Grid.RowDefinitions>
-				<RowDefinition Height="Auto" />
-				<RowDefinition Height="Auto" />
-			</Grid.RowDefinitions>
+	<ScrollViewer>
+		<StackPanel Padding="12" Spacing="4">
 
-			<TextBlock
-				Grid.Row="0"
-				Grid.Column="0"
-				VerticalAlignment="Center"
-				Style="{StaticResource PropertyName}"
-				Text="{helpers:ResourceString Name=PropertiesShortcutItemType/Text}"
-				Visibility="Visible" />
-			<TextBlock
-				x:Name="shortcutItemTypeValue"
-				Grid.Row="0"
-				Grid.Column="1"
-				VerticalAlignment="Center"
-				Text="{x:Bind ViewModel.ShortcutItemType, Mode=OneWay}"
-				Visibility="Visible" />
+			<Grid
+				Padding="12"
+				HorizontalAlignment="Stretch"
+				Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
+				BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
+				BorderThickness="1"
+				ColumnSpacing="8"
+				CornerRadius="4"
+				RowSpacing="8">
+				<Grid.ColumnDefinitions>
+					<ColumnDefinition
+						Width="Auto"
+						MinWidth="140"
+						MaxWidth="240" />
+					<ColumnDefinition Width="*" />
+				</Grid.ColumnDefinitions>
+				<Grid.RowDefinitions>
+					<RowDefinition Height="Auto" />
+					<RowDefinition Height="Auto" />
+				</Grid.RowDefinitions>
 
-			<TextBlock
-				Grid.Row="1"
-				Grid.Column="0"
-				VerticalAlignment="Center"
-				Style="{StaticResource PropertyName}"
-				Text="{helpers:ResourceString Name=PropertiesShortcutItemPath/Text}"
-				Visibility="Visible" />
-			<TextBox
-				x:Name="shortcutItemPathValue"
-				Grid.Row="1"
-				Grid.Column="1"
-				VerticalAlignment="Center"
-				IsReadOnly="{x:Bind ViewModel.IsShortcutItemPathReadOnly, Mode=OneWay}"
-				Text="{x:Bind ViewModel.ShortcutItemPath, Mode=TwoWay}"
-				Visibility="Visible" />
-		</Grid>
+				<TextBlock
+					Grid.Row="0"
+					Grid.Column="0"
+					VerticalAlignment="Center"
+					Style="{StaticResource PropertyName}"
+					Text="{helpers:ResourceString Name=PropertiesShortcutItemType/Text}"
+					Visibility="Visible" />
 
-		<Grid
-			x:Name="Shortcut"
-			Padding="12"
-			HorizontalAlignment="Stretch"
-			x:Load="{x:Bind ViewModel.IsSelectedItemShortcut, Mode=OneWay}"
-			Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
-			BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
-			BorderThickness="1"
-			ColumnSpacing="8"
-			CornerRadius="4"
-			RowSpacing="8">
-			<Grid.ColumnDefinitions>
-				<ColumnDefinition
-					Width="Auto"
-					MinWidth="140"
-					MaxWidth="240" />
-				<ColumnDefinition Width="*" />
-			</Grid.ColumnDefinitions>
-			<Grid.RowDefinitions>
-				<RowDefinition Height="Auto" />
-				<RowDefinition Height="Auto" />
-			</Grid.RowDefinitions>
-			<TextBlock
-				x:Name="PropertiesShortcutItemArgs"
-				Grid.Row="0"
-				Grid.Column="0"
-				VerticalAlignment="Center"
-				x:Load="{x:Bind ViewModel.ShortcutItemArgumentsVisibility, Mode=OneWay}"
-				Style="{StaticResource PropertyName}"
-				Text="{helpers:ResourceString Name=PropertiesShortcutItemArgs/Text}" />
-			<TextBox
-				x:Name="shortcutItemArgsValue"
-				Grid.Row="0"
-				Grid.Column="1"
-				VerticalAlignment="Center"
-				x:Load="{x:Bind ViewModel.ShortcutItemArgumentsVisibility, Mode=OneWay}"
-				Text="{x:Bind ViewModel.ShortcutItemArguments, Mode=TwoWay}" />
+				<TextBlock
+					x:Name="shortcutItemTypeValue"
+					Grid.Row="0"
+					Grid.Column="1"
+					VerticalAlignment="Center"
+					Text="{x:Bind ViewModel.ShortcutItemType, Mode=OneWay}"
+					Visibility="Visible" />
 
-			<TextBlock
-				x:Name="PropertiesShortcutItemWorkingDir"
-				Grid.Row="1"
-				Grid.Column="0"
-				VerticalAlignment="Center"
-				x:Load="{x:Bind ViewModel.ShortcutItemWorkingDirVisibility, Mode=OneWay}"
-				Style="{StaticResource PropertyName}"
-				Text="{helpers:ResourceString Name=AddDPropertiesShortcutItemWorkingDirialog/Text}" />
-			<TextBox
-				x:Name="shortcutItemWorkingDirValue"
-				Grid.Row="1"
-				Grid.Column="1"
-				VerticalAlignment="Center"
-				x:Load="{x:Bind ViewModel.ShortcutItemWorkingDirVisibility, Mode=OneWay}"
-				Text="{x:Bind ViewModel.ShortcutItemWorkingDir, Mode=TwoWay}" />
-		</Grid>
+				<TextBlock
+					Grid.Row="1"
+					Grid.Column="0"
+					VerticalAlignment="Center"
+					Style="{StaticResource PropertyName}"
+					Text="{helpers:ResourceString Name=PropertiesShortcutItemPath/Text}"
+					Visibility="Visible" />
+
+				<TextBox
+					x:Name="shortcutItemPathValue"
+					Grid.Row="1"
+					Grid.Column="1"
+					VerticalAlignment="Center"
+					IsReadOnly="{x:Bind ViewModel.IsShortcutItemPathReadOnly, Mode=OneWay}"
+					Text="{x:Bind ViewModel.ShortcutItemPath, Mode=TwoWay}"
+					Visibility="Visible" />
+			</Grid>
+
+			<Grid
+				x:Name="Shortcut"
+				Padding="12"
+				HorizontalAlignment="Stretch"
+				x:Load="{x:Bind ViewModel.IsSelectedItemShortcut, Mode=OneWay}"
+				Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
+				BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
+				BorderThickness="1"
+				ColumnSpacing="8"
+				CornerRadius="4"
+				RowSpacing="8">
+				<Grid.ColumnDefinitions>
+					<ColumnDefinition
+						Width="Auto"
+						MinWidth="140"
+						MaxWidth="240" />
+					<ColumnDefinition Width="*" />
+				</Grid.ColumnDefinitions>
+				<Grid.RowDefinitions>
+					<RowDefinition Height="Auto" />
+					<RowDefinition Height="Auto" />
+				</Grid.RowDefinitions>
 
-		<local1:SettingsBlockControl
-			x:Name="RunAsAdminCheckbox"
-			Title="{helpers:ResourceString Name=RunAsAdministrator}"
-			HorizontalAlignment="Stretch"
-			x:Load="{x:Bind ViewModel.RunAsAdminEnabled, Mode=OneWay}">
-			<ToggleSwitch
-				AutomationProperties.Name="{helpers:ResourceString Name=RunAsAdministrator}"
-				IsOn="{x:Bind ViewModel.RunAsAdmin, Mode=TwoWay}"
-				Style="{StaticResource RightAlignedToggleSwitchStyle}" />
-		</local1:SettingsBlockControl>
+				<TextBlock
+					x:Name="PropertiesShortcutItemArgs"
+					Grid.Row="0"
+					Grid.Column="0"
+					VerticalAlignment="Center"
+					x:Load="{x:Bind ViewModel.ShortcutItemArgumentsVisibility, Mode=OneWay}"
+					Style="{StaticResource PropertyName}"
+					Text="{helpers:ResourceString Name=PropertiesShortcutItemArgs/Text}" />
+
+				<TextBox
+					x:Name="shortcutItemArgsValue"
+					Grid.Row="0"
+					Grid.Column="1"
+					VerticalAlignment="Center"
+					x:Load="{x:Bind ViewModel.ShortcutItemArgumentsVisibility, Mode=OneWay}"
+					Text="{x:Bind ViewModel.ShortcutItemArguments, Mode=TwoWay}" />
+
+				<TextBlock
+					x:Name="PropertiesShortcutItemWorkingDir"
+					Grid.Row="1"
+					Grid.Column="0"
+					VerticalAlignment="Center"
+					x:Load="{x:Bind ViewModel.ShortcutItemWorkingDirVisibility, Mode=OneWay}"
+					Style="{StaticResource PropertyName}"
+					Text="{helpers:ResourceString Name=AddDPropertiesShortcutItemWorkingDirialog/Text}" />
+
+				<TextBox
+					x:Name="shortcutItemWorkingDirValue"
+					Grid.Row="1"
+					Grid.Column="1"
+					VerticalAlignment="Center"
+					x:Load="{x:Bind ViewModel.ShortcutItemWorkingDirVisibility, Mode=OneWay}"
+					Text="{x:Bind ViewModel.ShortcutItemWorkingDir, Mode=TwoWay}" />
+			</Grid>
+
+			<settingsuc:SettingsBlockControl
+				x:Name="RunAsAdminCheckbox"
+				Title="{helpers:ResourceString Name=RunAsAdministrator}"
+				HorizontalAlignment="Stretch"
+				x:Load="{x:Bind ViewModel.RunAsAdminEnabled, Mode=OneWay}">
+				<ToggleSwitch
+					AutomationProperties.Name="{helpers:ResourceString Name=RunAsAdministrator}"
+					IsOn="{x:Bind ViewModel.RunAsAdmin, Mode=TwoWay}"
+					Style="{StaticResource RightAlignedToggleSwitchStyle}" />
+			</settingsuc:SettingsBlockControl>
+
+			<settingsuc:SettingsBlockControl
+				x:Name="OpenFileLocation"
+				Title="{helpers:ResourceString Name=OpenFileLocation}"
+				Grid.Row="2"
+				Grid.Column="0"
+				x:Load="{x:Bind ViewModel.IsSelectedItemShortcut, Mode=OneWay}"
+				ButtonCommand="{x:Bind ViewModel.ShortcutItemOpenLinkCommand, Mode=OneWay}"
+				IsClickable="True">
+				<FontIcon
+					FontSize="14"
+					Foreground="{ThemeResource TextFillColorPrimaryBrush}"
+					Glyph="&#xE2B4;" />
+			</settingsuc:SettingsBlockControl>
 
-		<local1:SettingsBlockControl
-			x:Name="OpenFileLocation"
-			Title="{helpers:ResourceString Name=OpenFileLocation}"
-			Grid.Row="2"
-			Grid.Column="0"
-			x:Load="{x:Bind ViewModel.IsSelectedItemShortcut, Mode=OneWay}"
-			ButtonCommand="{x:Bind ViewModel.ShortcutItemOpenLinkCommand, Mode=OneWay}"
-			IsClickable="True">
-			<FontIcon
-				FontSize="14"
-				Foreground="{ThemeResource TextFillColorPrimaryBrush}"
-				Glyph="&#xE2B4;" />
-		</local1:SettingsBlockControl>
-	</StackPanel>
-</local:PropertiesTab>
\ No newline at end of file
+		</StackPanel>
+	</ScrollViewer>
+</vm:PropertiesTab>