From 57a01bc7fbc45b4c29a08b6fffae22614059c0ea Mon Sep 17 00:00:00 2001
From: Martin Anderson <mdta@live.co.uk>
Date: Mon, 17 Aug 2026 17:03:36 +0100
Subject: [PATCH 01/36] Initial work on modernised Propertied Dialog design

Created a new branch and put an initial bit of xaml together as a starting point
---
 .../Dialogs/Properties/PropertiesDialog.xaml  | 97 +++++++++++++++++++
 .../Properties/PropertiesDialog.xaml.cs       | 54 +++++++++++
 .../Views/PropertiesGeneralPage.xaml          | 16 +++
 .../Views/PropertiesGeneralPage.xaml.cs       | 31 ++++++
 .../Files.App.UITests.csproj                  | 20 ++++
 tests/Files.App.UITests/MainWindow.xaml       |  1 +
 tests/Files.App.UITests/MainWindow.xaml.cs    |  1 +
 .../Views/DialogWindowsPage.xaml              | 19 ++++
 .../Views/DialogWindowsPage.xaml.cs           | 47 +++++++++
 9 files changed, 286 insertions(+)
 create mode 100644 tests/Files.App.UITests/Dialogs/Properties/PropertiesDialog.xaml
 create mode 100644 tests/Files.App.UITests/Dialogs/Properties/PropertiesDialog.xaml.cs
 create mode 100644 tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml
 create mode 100644 tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml.cs
 create mode 100644 tests/Files.App.UITests/Views/DialogWindowsPage.xaml
 create mode 100644 tests/Files.App.UITests/Views/DialogWindowsPage.xaml.cs

diff --git a/tests/Files.App.UITests/Dialogs/Properties/PropertiesDialog.xaml b/tests/Files.App.UITests/Dialogs/Properties/PropertiesDialog.xaml
new file mode 100644
index 000000000000..7aedfb2a82ff
--- /dev/null
+++ b/tests/Files.App.UITests/Dialogs/Properties/PropertiesDialog.xaml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Window
+	x:Class="Files.App.UITests.Dialogs.PropertiesDialog"
+	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:local="using:Files.App.UITests.Dialogs"
+	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+	Title="Properties title for window"
+	mc:Ignorable="d">
+
+
+	<Grid Background="{ThemeResource SolidBackgroundFillColorBaseBrush}">
+
+		<Grid.RowDefinitions>
+			<RowDefinition Height="*" />
+			<RowDefinition Height="auto" />
+		</Grid.RowDefinitions>
+
+
+		<Border
+			x:Name="DialogFillRegion"
+			Grid.Row="0"
+			Padding="0,24,0,0"
+			HorizontalAlignment="Stretch"
+			VerticalAlignment="Stretch"
+			Background="{ThemeResource LayerFillColorAltBrush}"
+			BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
+			BorderThickness="0,0,1,0">
+
+			<Grid HorizontalAlignment="Stretch">
+				<Grid.RowDefinitions>
+					<RowDefinition Height="auto" />
+					<RowDefinition Height="auto" />
+					<RowDefinition Height="*" />
+				</Grid.RowDefinitions>
+
+
+				<TextBlock
+					Grid.Row="0"
+					Margin="24,0"
+					Style="{ThemeResource SubtitleTextBlockStyle}"
+					Text="Properties title" />
+
+				<SelectorBar Grid.Row="1" Margin="12,4">
+					<SelectorBarItem IsSelected="True" Text="General" />
+					<SelectorBarItem Text="Signatures" />
+					<SelectorBarItem Text="Security" />
+					<SelectorBarItem Text="Details" />
+					<SelectorBarItem Text="Hashes" />
+					<SelectorBarItem Text="Compatibility" />
+				</SelectorBar>
+
+				<Border
+					Grid.Row="2"
+					HorizontalAlignment="Stretch"
+					VerticalAlignment="Stretch"
+					BorderBrush="{ThemeResource DividerStrokeColorDefaultBrush}"
+					BorderThickness="0,1,0,0">
+
+
+					<Frame
+						x:Name="propertiesFrame"
+						HorizontalAlignment="Stretch"
+						VerticalAlignment="Stretch"
+						IsNavigationStackEnabled="False" />
+
+				</Border>
+			</Grid>
+
+		</Border>
+
+
+		<Grid x:Name="DialogBtmButtons" Grid.Row="1">
+			<Grid.ColumnDefinitions>
+				<ColumnDefinition Width="*" />
+				<ColumnDefinition Width="*" />
+			</Grid.ColumnDefinitions>
+
+			<Button
+				Grid.Column="0"
+				Margin="24,24,4,24"
+				HorizontalAlignment="Stretch"
+				Content="Apply"
+				Style="{ThemeResource AccentButtonStyle}" />
+
+			<Button
+				Grid.Column="1"
+				Margin="4,24,24,24"
+				HorizontalAlignment="Stretch"
+				Content="Cancel" />
+
+		</Grid>
+
+	</Grid>
+
+</Window>
diff --git a/tests/Files.App.UITests/Dialogs/Properties/PropertiesDialog.xaml.cs b/tests/Files.App.UITests/Dialogs/Properties/PropertiesDialog.xaml.cs
new file mode 100644
index 000000000000..39f8cc7fc2b9
--- /dev/null
+++ b/tests/Files.App.UITests/Dialogs/Properties/PropertiesDialog.xaml.cs
@@ -0,0 +1,54 @@
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
+using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Xaml.Navigation;
+using Microsoft.UI.Windowing;
+using Files.App.UITests.Dialogs;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+using Files.App.UITests.Dialogs.Properties.Views;
+
+// To learn more about WinUI, the WinUI project structure,
+// and more about our project templates, see: http://aka.ms/winui-project-info.
+
+namespace Files.App.UITests.Dialogs
+{
+	/// <summary>
+	/// An empty window that can be used on its own or navigated to within a Frame.
+	/// </summary>
+	public sealed partial class PropertiesDialog : Window
+	{
+		public PropertiesDialog()
+		{
+			InitializeComponent();
+
+			OverlappedPresenter presenter = OverlappedPresenter.Create();
+
+			this.ExtendsContentIntoTitleBar = true;
+			AppWindow.Resize( new Windows.Graphics.SizeInt32( 640 , 480 ) );
+			presenter.IsMaximizable = false;
+			AppWindow.SetPresenter( presenter );
+			AppWindow.TitleBar.PreferredTheme = TitleBarTheme.UseDefaultAppMode;
+			presenter.PreferredMinimumHeight = 600;
+			presenter.PreferredMinimumWidth = 800;
+
+			if ( propertiesFrame != null )
+			{
+				Page generalPage = new PropertiesGeneralPage();
+
+				if ( generalPage != null )
+				{
+					propertiesFrame.Navigate( typeof( PropertiesGeneralPage ) );
+				}
+			}
+		}
+	}
+}
diff --git a/tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml b/tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml
new file mode 100644
index 000000000000..740daf40f939
--- /dev/null
+++ b/tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Page
+	x:Class="Files.App.UITests.Dialogs.Properties.Views.PropertiesGeneralPage"
+	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:local="using:Files.App.UITests.Dialogs.Properties.Views"
+	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+	mc:Ignorable="d">
+
+	<Grid Background="Blue">
+
+		<TextBlock Style="{ThemeResource BodyLargeTextBlockStyle}" Text="General page" />
+
+	</Grid>
+</Page>
diff --git a/tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml.cs b/tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml.cs
new file mode 100644
index 000000000000..324b1dca4399
--- /dev/null
+++ b/tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml.cs
@@ -0,0 +1,31 @@
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
+using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Xaml.Navigation;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+
+// To learn more about WinUI, the WinUI project structure,
+// and more about our project templates, see: http://aka.ms/winui-project-info.
+
+namespace Files.App.UITests.Dialogs.Properties.Views
+{
+	/// <summary>
+	/// An empty page that can be used on its own or navigated to within a Frame.
+	/// </summary>
+	public sealed partial class PropertiesGeneralPage : Page
+	{
+		public PropertiesGeneralPage()
+		{
+			InitializeComponent();
+		}
+	}
+}
diff --git a/tests/Files.App.UITests/Files.App.UITests.csproj b/tests/Files.App.UITests/Files.App.UITests.csproj
index dbdc7bc326db..47dcebf8bd98 100644
--- a/tests/Files.App.UITests/Files.App.UITests.csproj
+++ b/tests/Files.App.UITests/Files.App.UITests.csproj
@@ -22,6 +22,11 @@
     <Content Include="Data\**\*.png" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Remove="Dialogs\Properties\Views\PropertiesGeneralPage.xaml" />
+    <None Remove="Views\DialogWindowsPage.xaml" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\src\Files.App.Controls\Files.App.Controls.csproj" />
     <PackageReference Include="Microsoft.Windows.SDK.BuildTools" />
@@ -32,6 +37,21 @@
   <ItemGroup Condition="'$(DisableMsixProjectCapabilityAddedByProject)'!='true' and '$(EnableMsixTooling)'=='true'">
     <ProjectCapability Include="Msix" />
   </ItemGroup>
+  <ItemGroup>
+    <Page Update="Views\DialogWindowsPage.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+  <ItemGroup>
+    <Page Update="Dialogs\Properties\Views\PropertiesGeneralPage.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+  <ItemGroup>
+    <Page Update="Dialogs\Properties\PropertiesDialog.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
   <!--  Allows the Solution Explorer "Package and Publish" context menu entry to be enabled for this project even if the Windows App SDK Nuget package has not yet been restored.  -->
   <PropertyGroup Condition="'$(DisableHasPackageAndPublishMenuAddedByProject)'!='true' and '$(EnableMsixTooling)'=='true'">
     <HasPackageAndPublishMenu>true</HasPackageAndPublishMenu>
diff --git a/tests/Files.App.UITests/MainWindow.xaml b/tests/Files.App.UITests/MainWindow.xaml
index 0d4f9d61d21e..09912f0d5853 100644
--- a/tests/Files.App.UITests/MainWindow.xaml
+++ b/tests/Files.App.UITests/MainWindow.xaml
@@ -94,6 +94,7 @@
 						<NavigationViewItem Content="StorageRing/StorageBar" Tag="StorageControlsPage" />
 						<NavigationViewItem Content="Omnibar" Tag="OmnibarPage" />
 						<NavigationViewItem Content="BreadcrumbBar" Tag="BreadcrumbBarPage" />
+						<NavigationViewItem Content="DialogWindows" Tag="DialogWindowsPage" />
 					</NavigationViewItem.MenuItems>
 				</NavigationViewItem>
 			</NavigationView.MenuItems>
diff --git a/tests/Files.App.UITests/MainWindow.xaml.cs b/tests/Files.App.UITests/MainWindow.xaml.cs
index 1201a0915d61..8f6deff331ae 100644
--- a/tests/Files.App.UITests/MainWindow.xaml.cs
+++ b/tests/Files.App.UITests/MainWindow.xaml.cs
@@ -55,6 +55,7 @@ private void NavigationView_SelectionChanged(NavigationView sender, NavigationVi
 					nameof(SidebarViewPage) => typeof(SidebarViewPage),
 					nameof(OmnibarPage) => typeof(OmnibarPage),
 					nameof(BreadcrumbBarPage) => typeof(BreadcrumbBarPage),
+					nameof( DialogWindowsPage ) => typeof( DialogWindowsPage ),
 					_ => throw new InvalidOperationException("There's no applicable page associated with the given key."),
 				});
 
diff --git a/tests/Files.App.UITests/Views/DialogWindowsPage.xaml b/tests/Files.App.UITests/Views/DialogWindowsPage.xaml
new file mode 100644
index 000000000000..4b12bbbf7d12
--- /dev/null
+++ b/tests/Files.App.UITests/Views/DialogWindowsPage.xaml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Page
+	x:Class="Files.App.UITests.Views.DialogWindowsPage"
+	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:local="using:Files.App.UITests.Views"
+	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+	mc:Ignorable="d">
+
+	<Grid>
+
+		<Button
+			x:Name="BtnProperties"
+			Click="BtnProperties_Click"
+			Content="Properties dialog" />
+
+	</Grid>
+</Page>
diff --git a/tests/Files.App.UITests/Views/DialogWindowsPage.xaml.cs b/tests/Files.App.UITests/Views/DialogWindowsPage.xaml.cs
new file mode 100644
index 000000000000..f91b652abd3b
--- /dev/null
+++ b/tests/Files.App.UITests/Views/DialogWindowsPage.xaml.cs
@@ -0,0 +1,47 @@
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Files.App.UITests.Dialogs;
+using Microsoft.UI.Xaml.Controls.Primitives;
+using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Xaml.Navigation;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+using Microsoft.UI.Windowing;
+
+// To learn more about WinUI, the WinUI project structure,
+// and more about our project templates, see: http://aka.ms/winui-project-info.
+
+namespace Files.App.UITests.Views
+{
+
+    /// <summary>
+    /// An empty page that can be used on its own or navigated to within a Frame.
+    /// </summary>
+    public sealed partial class DialogWindowsPage : Page
+    {
+
+
+        public DialogWindowsPage()
+        {
+            InitializeComponent();
+        }
+
+        private void BtnProperties_Click(object sender , RoutedEventArgs e)
+        {
+            PropertiesDialog propWindow = new PropertiesDialog();
+;
+            if ( propWindow != null )
+            {
+                propWindow.Title = "Properties";
+                propWindow.Activate();
+            }
+        }
+    }
+}

From 0d66b268e513fa74fb2006ad2ad00921533dc243 Mon Sep 17 00:00:00 2001
From: Martin Anderson <mdta@live.co.uk>
Date: Tue, 18 Aug 2026 18:59:16 +0100
Subject: [PATCH 02/36] Begun work on Re-styling Expander and its components

Starting with the Toggle Button style that is used for the Expander control's header
---
 .../Dialogs/DialogResources.xaml              | 208 ++++++++++++++++++
 .../Files.App.Controls.csproj                 |   6 +
 src/Files.App.Controls/Themes/Generic.xaml    |   4 +
 .../Views/PropertiesGeneralPage.xaml          |  28 ++-
 4 files changed, 244 insertions(+), 2 deletions(-)
 create mode 100644 src/Files.App.Controls/Dialogs/DialogResources.xaml

diff --git a/src/Files.App.Controls/Dialogs/DialogResources.xaml b/src/Files.App.Controls/Dialogs/DialogResources.xaml
new file mode 100644
index 000000000000..0c16cf5c48ce
--- /dev/null
+++ b/src/Files.App.Controls/Dialogs/DialogResources.xaml
@@ -0,0 +1,208 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ResourceDictionary
+	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	xmlns:animatedvisuals="using:Microsoft.UI.Xaml.Controls.AnimatedVisuals"
+	xmlns:controls="using:Microsoft.UI.Xaml.Controls">
+
+
+	<!--  THEME RESOURCE DICTIONARY  -->
+	<ResourceDictionary.ThemeDictionaries>
+		<ResourceDictionary x:Key="Default">
+			<StaticResource x:Key="PropertiesExpanderHeaderBackground" ResourceKey="SubtleFillColorTransparentBrush" />
+		</ResourceDictionary>
+		<ResourceDictionary x:Key="HighContrast">
+			<StaticResource x:Key="PropertiesExpanderHeaderBackground" ResourceKey="SubtleFillColorTransparentBrush" />
+		</ResourceDictionary>
+		<ResourceDictionary x:Key="Light">
+			<StaticResource x:Key="PropertiesExpanderHeaderBackground" ResourceKey="SubtleFillColorTransparentBrush" />
+		</ResourceDictionary>
+	</ResourceDictionary.ThemeDictionaries>
+
+
+	<!--  RESOURCES  -->
+	<Thickness x:Key="PropertiesExpanderHeaderPadding">8</Thickness>
+	<Thickness x:Key="PropertiesExpanderHeaderInnerPadding">12,0</Thickness>
+	<Thickness x:Key="PropertiesExpanderChevronMargin">0,0,8,0</Thickness>
+	<x:Double x:Key="PropertiesExpanderChevronSpaceWidth">24</x:Double>
+	<x:Double x:Key="PropertiesExpanderChevronSpaceHeight">32</x:Double>
+	<x:Double x:Key="PropertiesExpanderChevronGlyphSize">12</x:Double>
+	<Thickness x:Key="PropertiesExpanderContentPadding">16</Thickness>
+
+
+	<!--  EXPANDER  -->
+
+
+	<!--  EXPANDER DOWN BUTTON  -->
+	<Style x:Key="PropertiesExpanderHeaderDownStyle" TargetType="ToggleButton">
+		<Setter Property="Padding" Value="{StaticResource PropertiesExpanderHeaderPadding}" />
+		<Setter Property="Background" Value="{ThemeResource PropertiesExpanderHeaderBackground}" />
+		<Setter Property="BorderThickness" Value="0" />
+		<Setter Property="HorizontalContentAlignment" Value="Left" />
+		<Setter Property="BackgroundSizing" Value="InnerBorderEdge" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="ToggleButton">
+					<Border
+						x:Name="ToggleButtonBase"
+						Width="{TemplateBinding Width}"
+						MinWidth="{TemplateBinding MinWidth}"
+						MinHeight="{TemplateBinding MinHeight}"
+						MaxWidth="{TemplateBinding MaxWidth}"
+						Padding="{TemplateBinding Padding}"
+						HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+						Background="{TemplateBinding Background}"
+						BackgroundSizing="{TemplateBinding BackgroundSizing}"
+						BorderBrush="{ThemeResource ExpanderHeaderBorderBrush}"
+						BorderThickness="{TemplateBinding BorderThickness}"
+						CornerRadius="{TemplateBinding CornerRadius}">
+						<Grid
+							x:Name="ToggleButtonGrid"
+							Padding="{StaticResource PropertiesExpanderHeaderInnerPadding}"
+							HorizontalAlignment="Stretch"
+							Background="{ThemeResource ExpanderChevronBackground}"
+							BorderBrush="{ThemeResource ExpanderChevronBorderBrush}"
+							BorderThickness="{ThemeResource ExpanderChevronBorderThickness}"
+							CornerRadius="{ThemeResource ControlCornerRadius}">
+							<Grid.ColumnDefinitions>
+								<ColumnDefinition Width="Auto" />
+								<ColumnDefinition Width="*" />
+							</Grid.ColumnDefinitions>
+							<ContentPresenter
+								x:Name="ContentPresenter"
+								Grid.Column="1"
+								Padding="0,0,12,0"
+								HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+								VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+								Content="{TemplateBinding Content}"
+								ContentTemplate="{TemplateBinding ContentTemplate}"
+								ContentTransitions="{TemplateBinding ContentTransitions}"
+								Foreground="{TemplateBinding Foreground}" />
+							<Border
+								x:Name="ExpandCollapseChevronBorder"
+								Grid.Column="0"
+								Width="{ThemeResource PropertiesExpanderChevronSpaceWidth}"
+								Height="{ThemeResource PropertiesExpanderChevronSpaceHeight}"
+								Margin="{ThemeResource PropertiesExpanderChevronMargin}">
+								<controls:AnimatedIcon
+									xmlns:local="using:Microsoft.UI.Xaml.Controls"
+									x:Name="ExpandCollapseChevron"
+									Width="{StaticResource ExpanderChevronGlyphSize}"
+									Height="{StaticResource ExpanderChevronGlyphSize}"
+									HorizontalAlignment="Center"
+									VerticalAlignment="Center"
+									local:AnimatedIcon.State="NormalOff"
+									AutomationProperties.AccessibilityView="Raw"
+									Foreground="{ThemeResource ExpanderChevronForeground}"
+									RenderTransformOrigin="0.5, 0.5">
+									<animatedvisuals:AnimatedChevronUpDownSmallVisualSource />
+									<controls:AnimatedIcon.FallbackIconSource>
+										<controls:FontIconSource
+											FontFamily="{StaticResource SymbolThemeFontFamily}"
+											FontSize="12"
+											Glyph="{StaticResource ExpanderChevronDownGlyph}"
+											IsTextScaleFactorEnabled="False" />
+									</controls:AnimatedIcon.FallbackIconSource>
+									<controls:AnimatedIcon.RenderTransform />
+								</controls:AnimatedIcon>
+							</Border>
+
+						</Grid>
+						<VisualStateManager.VisualStateGroups>
+							<VisualStateGroup x:Name="CommonStates">
+								<VisualState x:Name="Normal">
+									<VisualState.Setters>
+										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource ExpanderHeaderForeground}" />
+										<Setter Target="ToggleButtonGrid.BorderBrush" Value="{ThemeResource ExpanderHeaderBorderBrush}" />
+										<Setter Target="ExpandCollapseChevron.Foreground" Value="{ThemeResource ExpanderChevronForeground}" />
+										<Setter Target="ExpandCollapseChevronBorder.BorderBrush" Value="{ThemeResource ExpanderChevronBorderBrush}" />
+										<Setter Target="ToggleButtonGrid.Background" Value="{ThemeResource ExpanderChevronBackground}" />
+									</VisualState.Setters>
+								</VisualState>
+								<VisualState x:Name="PointerOver">
+									<VisualState.Setters>
+										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource ExpanderHeaderForegroundPointerOver}" />
+										<Setter Target="ToggleButtonGrid.BorderBrush" Value="{ThemeResource ExpanderHeaderBorderPointerOverBrush}" />
+										<Setter Target="ExpandCollapseChevron.Foreground" Value="{ThemeResource ExpanderChevronPointerOverForeground}" />
+										<Setter Target="ExpandCollapseChevronBorder.BorderBrush" Value="{ThemeResource ExpanderChevronBorderPointerOverBrush}" />
+										<Setter Target="ToggleButtonGrid.Background" Value="{ThemeResource ExpanderChevronPointerOverBackground}" />
+										<Setter Target="ExpandCollapseChevron.(controls:AnimatedIcon.State)" Value="PointerOverOff" />
+									</VisualState.Setters>
+								</VisualState>
+								<VisualState x:Name="Pressed">
+									<VisualState.Setters>
+										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource ExpanderHeaderForegroundPressed}" />
+										<Setter Target="ToggleButtonGrid.BorderBrush" Value="{ThemeResource ExpanderHeaderBorderPressedBrush}" />
+										<Setter Target="ExpandCollapseChevron.Foreground" Value="{ThemeResource ExpanderChevronPressedForeground}" />
+										<Setter Target="ExpandCollapseChevronBorder.BorderBrush" Value="{ThemeResource ExpanderChevronBorderPressedBrush}" />
+										<Setter Target="ToggleButtonGrid.Background" Value="{ThemeResource ExpanderChevronPressedBackground}" />
+										<Setter Target="ExpandCollapseChevron.(controls:AnimatedIcon.State)" Value="PressedOff" />
+									</VisualState.Setters>
+								</VisualState>
+								<VisualState x:Name="Disabled">
+									<VisualState.Setters>
+										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource ExpanderHeaderDisabledForeground}" />
+										<Setter Target="ToggleButtonGrid.BorderBrush" Value="{ThemeResource ExpanderHeaderDisabledBorderBrush}" />
+										<Setter Target="ExpandCollapseChevron.Foreground" Value="{ThemeResource ExpanderHeaderDisabledForeground}" />
+										<Setter Target="ExpandCollapseChevronBorder.BorderBrush" Value="{ThemeResource ExpanderHeaderDisabledBorderBrush}" />
+										<Setter Target="ToggleButtonGrid.Background" Value="{ThemeResource ExpanderChevronBackground}" />
+									</VisualState.Setters>
+								</VisualState>
+								<VisualState x:Name="Checked">
+									<VisualState.Setters>
+										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource ExpanderHeaderForeground}" />
+										<Setter Target="ToggleButtonGrid.BorderBrush" Value="{ThemeResource ExpanderHeaderBorderBrush}" />
+										<Setter Target="ExpandCollapseChevron.Foreground" Value="{ThemeResource ExpanderChevronForeground}" />
+										<Setter Target="ExpandCollapseChevronBorder.BorderBrush" Value="{ThemeResource ExpanderChevronBorderBrush}" />
+										<Setter Target="ToggleButtonGrid.Background" Value="{ThemeResource ExpanderChevronBackground}" />
+										<Setter Target="ExpandCollapseChevron.(controls:AnimatedIcon.State)" Value="NormalOn" />
+									</VisualState.Setters>
+								</VisualState>
+								<VisualState x:Name="CheckedPointerOver">
+									<VisualState.Setters>
+										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource ExpanderHeaderForegroundPointerOver}" />
+										<Setter Target="ToggleButtonGrid.BorderBrush" Value="{ThemeResource ExpanderHeaderBorderPointerOverBrush}" />
+										<Setter Target="ExpandCollapseChevron.Foreground" Value="{ThemeResource ExpanderChevronPointerOverForeground}" />
+										<Setter Target="ExpandCollapseChevronBorder.BorderBrush" Value="{ThemeResource ExpanderChevronBorderPointerOverBrush}" />
+										<Setter Target="ToggleButtonGrid.Background" Value="{ThemeResource ExpanderChevronPointerOverBackground}" />
+										<Setter Target="ExpandCollapseChevron.(controls:AnimatedIcon.State)" Value="PointerOverOn" />
+									</VisualState.Setters>
+								</VisualState>
+								<VisualState x:Name="CheckedPressed">
+									<VisualState.Setters>
+										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource ExpanderHeaderForegroundPressed}" />
+										<Setter Target="ToggleButtonGrid.BorderBrush" Value="{ThemeResource ExpanderHeaderBorderPressedBrush}" />
+										<Setter Target="ExpandCollapseChevron.Foreground" Value="{ThemeResource ExpanderChevronPressedForeground}" />
+										<Setter Target="ExpandCollapseChevronBorder.BorderBrush" Value="{ThemeResource ExpanderChevronBorderPressedBrush}" />
+										<Setter Target="ToggleButtonGrid.Background" Value="{ThemeResource ExpanderChevronPressedBackground}" />
+										<Setter Target="ExpandCollapseChevron.(controls:AnimatedIcon.State)" Value="PressedOn" />
+									</VisualState.Setters>
+								</VisualState>
+								<VisualState x:Name="CheckedDisabled">
+									<VisualState.Setters>
+										<Setter Target="ToggleButtonGrid.BorderBrush" Value="{ThemeResource ExpanderHeaderDisabledBorderBrush}" />
+										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource ExpanderHeaderDisabledForeground}" />
+										<Setter Target="ExpandCollapseChevron.Foreground" Value="{ThemeResource ExpanderHeaderDisabledForeground}" />
+										<Setter Target="ExpandCollapseChevronBorder.BorderBrush" Value="{ThemeResource ExpanderHeaderDisabledBorderBrush}" />
+										<Setter Target="ToggleButtonGrid.Background" Value="{ThemeResource ExpanderChevronBackground}" />
+										<Setter Target="ExpandCollapseChevron.(controls:AnimatedIcon.State)" Value="NormalOn" />
+									</VisualState.Setters>
+								</VisualState>
+								<VisualState x:Name="Indeterminate" />
+								<VisualState x:Name="IndeterminatePointerOver" />
+								<VisualState x:Name="IndeterminatePressed" />
+								<VisualState x:Name="IndeterminateDisabled" />
+							</VisualStateGroup>
+						</VisualStateManager.VisualStateGroups>
+					</Border>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+
+
+	<!--  EXPANDER UP BUTTON  -->
+
+
+
+</ResourceDictionary>
diff --git a/src/Files.App.Controls/Files.App.Controls.csproj b/src/Files.App.Controls/Files.App.Controls.csproj
index 893bd4013f89..e3163abbae46 100644
--- a/src/Files.App.Controls/Files.App.Controls.csproj
+++ b/src/Files.App.Controls/Files.App.Controls.csproj
@@ -32,4 +32,10 @@
         <ProjectReference Include="..\Files.Core.SourceGenerator\Files.Core.SourceGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
     </ItemGroup>
 
+    <ItemGroup>
+      <Page Update="Dialogs\DialogResources.xaml">
+        <SubType>Designer</SubType>
+      </Page>
+    </ItemGroup>
+
 </Project>
diff --git a/src/Files.App.Controls/Themes/Generic.xaml b/src/Files.App.Controls/Themes/Generic.xaml
index 177165b48448..af057943850f 100644
--- a/src/Files.App.Controls/Themes/Generic.xaml
+++ b/src/Files.App.Controls/Themes/Generic.xaml
@@ -75,6 +75,10 @@
 		<ResourceDictionary Source="ms-appx:///Files.App.Controls/BreadcrumbBar/BreadcrumbBar.xaml" />
 		<!--#endregion-->
 
+		<!--#region Dialog Resources-->
+		<ResourceDictionary Source="ms-appx:///Files.App.Controls/Dialogs/DialogResources.xaml" />
+		<!--#endregion-->
+
 	</ResourceDictionary.MergedDictionaries>
 
 </ResourceDictionary>
diff --git a/tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml b/tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml
index 740daf40f939..a3c4ea29405c 100644
--- a/tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml
+++ b/tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml
@@ -3,14 +3,38 @@
 	x:Class="Files.App.UITests.Dialogs.Properties.Views.PropertiesGeneralPage"
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	xmlns:animatedvisuals="using:Microsoft.UI.Xaml.Controls.AnimatedVisuals"
+	xmlns:controls="using:Microsoft.UI.Xaml.Controls"
 	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+	xmlns:fcontrols="using:Files.App.Controls"
 	xmlns:local="using:Files.App.UITests.Dialogs.Properties.Views"
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 	mc:Ignorable="d">
 
-	<Grid Background="Blue">
+	<Page.Resources>
+		<ResourceDictionary Source="ms-appx:///Files.App.Controls/Dialogs/DialogResources.xaml" />
+	</Page.Resources>
 
-		<TextBlock Style="{ThemeResource BodyLargeTextBlockStyle}" Text="General page" />
+	<Grid>
+
+		<StackPanel Padding="0,0,0,0" Orientation="Vertical">
+
+			<Expander Margin="24,0,24,24" Header="Expander title">
+				Customised expander content
+			</Expander>
+
+			<Rectangle Height="4" Fill="Red" />
+
+			<ToggleButton HorizontalAlignment="Stretch" Style="{StaticResource PropertiesExpanderHeaderDownStyle}">
+				<StackPanel Orientation="Horizontal" Spacing="8">
+					<SymbolIcon Symbol="Calendar" />
+					<TextBlock Text="Expander heading text" />
+				</StackPanel>
+			</ToggleButton>
+
+			<Rectangle Height="4" Fill="Red" />
+
+		</StackPanel>
 
 	</Grid>
 </Page>

From a6bfcecd786c9a3239377addf6d81b7400992dc4 Mon Sep 17 00:00:00 2001
From: Martin Anderson <mdta@live.co.uk>
Date: Tue, 18 Aug 2026 21:54:29 +0100
Subject: [PATCH 03/36] Finished styles for the PropertiesExpander Header
 ToggleButtons

Finished making the custom styles for the Up and Down versions of the PropertiesExpander Header ToggleButtons

Up is based on Down, but only the On and Off glyphs are swapped.

Tested with enabled and disabled, as well as High Contrast brushes
---
 .../Dialogs/DialogResources.xaml              | 328 +++++++++++++++---
 .../Properties/PropertiesDialog.xaml.cs       |   2 +-
 .../Views/PropertiesGeneralPage.xaml          |  29 +-
 .../Views/PropertiesGeneralPage.xaml.cs       |   2 +-
 4 files changed, 304 insertions(+), 57 deletions(-)

diff --git a/src/Files.App.Controls/Dialogs/DialogResources.xaml b/src/Files.App.Controls/Dialogs/DialogResources.xaml
index 0c16cf5c48ce..7fc067b0abb6 100644
--- a/src/Files.App.Controls/Dialogs/DialogResources.xaml
+++ b/src/Files.App.Controls/Dialogs/DialogResources.xaml
@@ -8,20 +8,85 @@
 
 	<!--  THEME RESOURCE DICTIONARY  -->
 	<ResourceDictionary.ThemeDictionaries>
+
 		<ResourceDictionary x:Key="Default">
+			<Thickness x:Key="PropertiesExpanderHeaderPadding">8</Thickness>
+			<Thickness x:Key="PropertiesExpanderHeaderBorderThickness">0</Thickness>
+
 			<StaticResource x:Key="PropertiesExpanderHeaderBackground" ResourceKey="SubtleFillColorTransparentBrush" />
+			<StaticResource x:Key="PropertiesExpanderHeaderPointerOverBackground" ResourceKey="SubtleFillColorSecondaryBrush" />
+			<StaticResource x:Key="PropertiesExpanderHeaderPressedBackground" ResourceKey="SubtleFillColorTertiaryBrush" />
+
+			<StaticResource x:Key="PropertiesExpanderHeaderForeground" ResourceKey="TextFillColorPrimaryBrush" />
+			<StaticResource x:Key="PropertiesExpanderHeaderPointerOverForeground" ResourceKey="TextFillColorPrimaryBrush" />
+			<StaticResource x:Key="PropertiesExpanderHeaderPressedForeground" ResourceKey="TextFillColorSecondaryBrush" />
+
+			<StaticResource x:Key="PropertiesExpanderHeaderBorderBrush" ResourceKey="SubtleFillColorTransparentBrush" />
+			<StaticResource x:Key="PropertiesExpanderHeaderPointerOverBorderBrush" ResourceKey="SubtleFillColorTransparentBrush" />
+			<StaticResource x:Key="PropertiesExpanderHeaderPressedBorderBrush" ResourceKey="SubtleFillColorTransparentBrush" />
+
+			<StaticResource x:Key="PropertiesExpanderChevronForeground" ResourceKey="TextFillColorPrimaryBrush" />
+			<StaticResource x:Key="PropertiesExpanderChevronPointerOverForeground" ResourceKey="TextFillColorPrimaryBrush" />
+			<StaticResource x:Key="PropertiesExpanderChevronPressedForeground" ResourceKey="TextFillColorSecondaryBrush" />
+
+			<StaticResource x:Key="PropertiesExpanderHeaderDisabledForeground" ResourceKey="TextFillColorDisabledBrush" />
+			<StaticResource x:Key="PropertiesExpanderHeaderDisabledBorderBrush" ResourceKey="CardStrokeColorDefaultBrush" />
 		</ResourceDictionary>
-		<ResourceDictionary x:Key="HighContrast">
-			<StaticResource x:Key="PropertiesExpanderHeaderBackground" ResourceKey="SubtleFillColorTransparentBrush" />
-		</ResourceDictionary>
+
 		<ResourceDictionary x:Key="Light">
+			<Thickness x:Key="PropertiesExpanderHeaderPadding">8</Thickness>
+			<Thickness x:Key="PropertiesExpanderHeaderBorderThickness">0</Thickness>
+
 			<StaticResource x:Key="PropertiesExpanderHeaderBackground" ResourceKey="SubtleFillColorTransparentBrush" />
+			<StaticResource x:Key="PropertiesExpanderHeaderPointerOverBackground" ResourceKey="SubtleFillColorSecondaryBrush" />
+			<StaticResource x:Key="PropertiesExpanderHeaderPressedBackground" ResourceKey="SubtleFillColorTertiaryBrush" />
+
+			<StaticResource x:Key="PropertiesExpanderHeaderForeground" ResourceKey="TextFillColorPrimaryBrush" />
+			<StaticResource x:Key="PropertiesExpanderHeaderPointerOverForeground" ResourceKey="TextFillColorPrimaryBrush" />
+			<StaticResource x:Key="PropertiesExpanderHeaderPressedForeground" ResourceKey="TextFillColorSecondaryBrush" />
+
+			<StaticResource x:Key="PropertiesExpanderHeaderBorderBrush" ResourceKey="SubtleFillColorTransparentBrush" />
+			<StaticResource x:Key="PropertiesExpanderHeaderPointerOverBorderBrush" ResourceKey="SubtleFillColorTransparentBrush" />
+			<StaticResource x:Key="PropertiesExpanderHeaderPressedBorderBrush" ResourceKey="SubtleFillColorTransparentBrush" />
+
+			<StaticResource x:Key="PropertiesExpanderChevronForeground" ResourceKey="TextFillColorPrimaryBrush" />
+			<StaticResource x:Key="PropertiesExpanderChevronPointerOverForeground" ResourceKey="TextFillColorPrimaryBrush" />
+			<StaticResource x:Key="PropertiesExpanderChevronPressedForeground" ResourceKey="TextFillColorSecondaryBrush" />
+
+			<StaticResource x:Key="PropertiesExpanderHeaderDisabledForeground" ResourceKey="TextFillColorDisabledBrush" />
+			<StaticResource x:Key="PropertiesExpanderHeaderDisabledBorderBrush" ResourceKey="CardStrokeColorDefaultBrush" />
+		</ResourceDictionary>
+
+		<ResourceDictionary x:Key="HighContrast">
+			<Thickness x:Key="PropertiesExpanderHeaderPadding">6</Thickness>
+			<Thickness x:Key="PropertiesExpanderHeaderBorderThickness">2</Thickness>
+
+			<StaticResource x:Key="PropertiesExpanderHeaderBackground" ResourceKey="SystemColorButtonFaceColorBrush" />
+			<StaticResource x:Key="PropertiesExpanderHeaderPointerOverBackground" ResourceKey="SystemControlTransparentBrush" />
+			<StaticResource x:Key="PropertiesExpanderHeaderPressedBackground" ResourceKey="SystemControlTransparentBrush" />
+
+			<StaticResource x:Key="PropertiesExpanderHeaderForeground" ResourceKey="SystemColorButtonTextColorBrush" />
+			<StaticResource x:Key="PropertiesExpanderHeaderPointerOverForeground" ResourceKey="SystemColorHighlightColorBrush" />
+			<StaticResource x:Key="PropertiesExpanderHeaderPressedForeground" ResourceKey="SystemColorHighlightColorBrush" />
+
+			<StaticResource x:Key="PropertiesExpanderHeaderBorderBrush" ResourceKey="SystemColorButtonTextColorBrush" />
+			<StaticResource x:Key="PropertiesExpanderHeaderPointerOverBorderBrush" ResourceKey="SystemColorHighlightColorBrush" />
+			<StaticResource x:Key="PropertiesExpanderHeaderPressedBorderBrush" ResourceKey="SystemColorHighlightColorBrush" />
+
+			<StaticResource x:Key="PropertiesExpanderChevronForeground" ResourceKey="SystemColorButtonTextColorBrush" />
+			<StaticResource x:Key="PropertiesExpanderChevronPointerOverForeground" ResourceKey="SystemColorHighlightColorBrush" />
+			<StaticResource x:Key="PropertiesExpanderChevronPressedForeground" ResourceKey="SystemColorHighlightColorBrush" />
+
+			<StaticResource x:Key="PropertiesExpanderHeaderDisabledForeground" ResourceKey="TextFillColorDisabledBrush" />
+			<StaticResource x:Key="PropertiesExpanderHeaderDisabledBorderBrush" ResourceKey="TextFillColorDisabledBrush" />
 		</ResourceDictionary>
+
 	</ResourceDictionary.ThemeDictionaries>
 
 
+
+
 	<!--  RESOURCES  -->
-	<Thickness x:Key="PropertiesExpanderHeaderPadding">8</Thickness>
 	<Thickness x:Key="PropertiesExpanderHeaderInnerPadding">12,0</Thickness>
 	<Thickness x:Key="PropertiesExpanderChevronMargin">0,0,8,0</Thickness>
 	<x:Double x:Key="PropertiesExpanderChevronSpaceWidth">24</x:Double>
@@ -29,13 +94,20 @@
 	<x:Double x:Key="PropertiesExpanderChevronGlyphSize">12</x:Double>
 	<Thickness x:Key="PropertiesExpanderContentPadding">16</Thickness>
 
+	<x:String x:Key="PropertiesExpanderChevronUpGlyph">&#xE70E;</x:String>
+	<x:String x:Key="PropertiesExpanderChevronDownGlyph">&#xE70D;</x:String>
+
+
+
 
 	<!--  EXPANDER  -->
 
 
+
+
 	<!--  EXPANDER DOWN BUTTON  -->
 	<Style x:Key="PropertiesExpanderHeaderDownStyle" TargetType="ToggleButton">
-		<Setter Property="Padding" Value="{StaticResource PropertiesExpanderHeaderPadding}" />
+		<Setter Property="Padding" Value="{ThemeResource PropertiesExpanderHeaderPadding}" />
 		<Setter Property="Background" Value="{ThemeResource PropertiesExpanderHeaderBackground}" />
 		<Setter Property="BorderThickness" Value="0" />
 		<Setter Property="HorizontalContentAlignment" Value="Left" />
@@ -53,16 +125,16 @@
 						HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
 						Background="{TemplateBinding Background}"
 						BackgroundSizing="{TemplateBinding BackgroundSizing}"
-						BorderBrush="{ThemeResource ExpanderHeaderBorderBrush}"
+						BorderBrush="{TemplateBinding BorderBrush}"
 						BorderThickness="{TemplateBinding BorderThickness}"
 						CornerRadius="{TemplateBinding CornerRadius}">
 						<Grid
 							x:Name="ToggleButtonGrid"
 							Padding="{StaticResource PropertiesExpanderHeaderInnerPadding}"
 							HorizontalAlignment="Stretch"
-							Background="{ThemeResource ExpanderChevronBackground}"
-							BorderBrush="{ThemeResource ExpanderChevronBorderBrush}"
-							BorderThickness="{ThemeResource ExpanderChevronBorderThickness}"
+							Background="{ThemeResource PropertiesExpanderHeaderBackground}"
+							BorderBrush="{ThemeResource PropertiesExpanderHeaderBorderBrush}"
+							BorderThickness="{ThemeResource PropertiesExpanderHeaderBorderThickness}"
 							CornerRadius="{ThemeResource ControlCornerRadius}">
 							<Grid.ColumnDefinitions>
 								<ColumnDefinition Width="Auto" />
@@ -87,20 +159,20 @@
 								<controls:AnimatedIcon
 									xmlns:local="using:Microsoft.UI.Xaml.Controls"
 									x:Name="ExpandCollapseChevron"
-									Width="{StaticResource ExpanderChevronGlyphSize}"
-									Height="{StaticResource ExpanderChevronGlyphSize}"
+									Width="{StaticResource PropertiesExpanderChevronGlyphSize}"
+									Height="{StaticResource PropertiesExpanderChevronGlyphSize}"
 									HorizontalAlignment="Center"
 									VerticalAlignment="Center"
 									local:AnimatedIcon.State="NormalOff"
 									AutomationProperties.AccessibilityView="Raw"
-									Foreground="{ThemeResource ExpanderChevronForeground}"
+									Foreground="{ThemeResource PropertiesExpanderChevronForeground}"
 									RenderTransformOrigin="0.5, 0.5">
 									<animatedvisuals:AnimatedChevronUpDownSmallVisualSource />
 									<controls:AnimatedIcon.FallbackIconSource>
 										<controls:FontIconSource
 											FontFamily="{StaticResource SymbolThemeFontFamily}"
 											FontSize="12"
-											Glyph="{StaticResource ExpanderChevronDownGlyph}"
+											Glyph="{StaticResource PropertiesExpanderChevronDownGlyph}"
 											IsTextScaleFactorEnabled="False" />
 									</controls:AnimatedIcon.FallbackIconSource>
 									<controls:AnimatedIcon.RenderTransform />
@@ -112,79 +184,70 @@
 							<VisualStateGroup x:Name="CommonStates">
 								<VisualState x:Name="Normal">
 									<VisualState.Setters>
-										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource ExpanderHeaderForeground}" />
-										<Setter Target="ToggleButtonGrid.BorderBrush" Value="{ThemeResource ExpanderHeaderBorderBrush}" />
-										<Setter Target="ExpandCollapseChevron.Foreground" Value="{ThemeResource ExpanderChevronForeground}" />
-										<Setter Target="ExpandCollapseChevronBorder.BorderBrush" Value="{ThemeResource ExpanderChevronBorderBrush}" />
-										<Setter Target="ToggleButtonGrid.Background" Value="{ThemeResource ExpanderChevronBackground}" />
+										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource PropertiesExpanderHeaderForeground}" />
+										<Setter Target="ToggleButtonGrid.BorderBrush" Value="{ThemeResource PropertiesExpanderHeaderBorderBrush}" />
+										<Setter Target="ExpandCollapseChevron.Foreground" Value="{ThemeResource PropertiesExpanderChevronForeground}" />
+										<Setter Target="ToggleButtonGrid.Background" Value="{ThemeResource PropertiesExpanderHeaderBackground}" />
 									</VisualState.Setters>
 								</VisualState>
 								<VisualState x:Name="PointerOver">
 									<VisualState.Setters>
-										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource ExpanderHeaderForegroundPointerOver}" />
-										<Setter Target="ToggleButtonGrid.BorderBrush" Value="{ThemeResource ExpanderHeaderBorderPointerOverBrush}" />
-										<Setter Target="ExpandCollapseChevron.Foreground" Value="{ThemeResource ExpanderChevronPointerOverForeground}" />
-										<Setter Target="ExpandCollapseChevronBorder.BorderBrush" Value="{ThemeResource ExpanderChevronBorderPointerOverBrush}" />
-										<Setter Target="ToggleButtonGrid.Background" Value="{ThemeResource ExpanderChevronPointerOverBackground}" />
+										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource PropertiesExpanderHeaderPointerOverForeground}" />
+										<Setter Target="ToggleButtonGrid.BorderBrush" Value="{ThemeResource PropertiesExpanderHeaderPointerOverBorderBrush}" />
+										<Setter Target="ToggleButtonGrid.Background" Value="{ThemeResource PropertiesExpanderHeaderPointerOverBackground}" />
 										<Setter Target="ExpandCollapseChevron.(controls:AnimatedIcon.State)" Value="PointerOverOff" />
 									</VisualState.Setters>
 								</VisualState>
 								<VisualState x:Name="Pressed">
 									<VisualState.Setters>
-										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource ExpanderHeaderForegroundPressed}" />
-										<Setter Target="ToggleButtonGrid.BorderBrush" Value="{ThemeResource ExpanderHeaderBorderPressedBrush}" />
-										<Setter Target="ExpandCollapseChevron.Foreground" Value="{ThemeResource ExpanderChevronPressedForeground}" />
-										<Setter Target="ExpandCollapseChevronBorder.BorderBrush" Value="{ThemeResource ExpanderChevronBorderPressedBrush}" />
-										<Setter Target="ToggleButtonGrid.Background" Value="{ThemeResource ExpanderChevronPressedBackground}" />
+										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource PropertiesExpanderHeaderPressedForeground}" />
+										<Setter Target="ToggleButtonGrid.BorderBrush" Value="{ThemeResource PropertiesExpanderHeaderPressedBorderBrush}" />
+										<Setter Target="ExpandCollapseChevron.Foreground" Value="{ThemeResource PropertiesExpanderChevronPressedForeground}" />
+										<Setter Target="ToggleButtonGrid.Background" Value="{ThemeResource PropertiesExpanderHeaderPressedBackground}" />
 										<Setter Target="ExpandCollapseChevron.(controls:AnimatedIcon.State)" Value="PressedOff" />
 									</VisualState.Setters>
 								</VisualState>
 								<VisualState x:Name="Disabled">
 									<VisualState.Setters>
-										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource ExpanderHeaderDisabledForeground}" />
-										<Setter Target="ToggleButtonGrid.BorderBrush" Value="{ThemeResource ExpanderHeaderDisabledBorderBrush}" />
-										<Setter Target="ExpandCollapseChevron.Foreground" Value="{ThemeResource ExpanderHeaderDisabledForeground}" />
-										<Setter Target="ExpandCollapseChevronBorder.BorderBrush" Value="{ThemeResource ExpanderHeaderDisabledBorderBrush}" />
-										<Setter Target="ToggleButtonGrid.Background" Value="{ThemeResource ExpanderChevronBackground}" />
+										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource PropertiesExpanderHeaderDisabledForeground}" />
+										<Setter Target="ToggleButtonGrid.BorderBrush" Value="{ThemeResource PropertiesExpanderHeaderDisabledBorderBrush}" />
+										<Setter Target="ExpandCollapseChevron.Foreground" Value="{ThemeResource PropertiesExpanderHeaderDisabledForeground}" />
+										<Setter Target="ToggleButtonGrid.Background" Value="{ThemeResource PropertiesExpanderHeaderBackground}" />
 									</VisualState.Setters>
 								</VisualState>
 								<VisualState x:Name="Checked">
 									<VisualState.Setters>
-										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource ExpanderHeaderForeground}" />
-										<Setter Target="ToggleButtonGrid.BorderBrush" Value="{ThemeResource ExpanderHeaderBorderBrush}" />
-										<Setter Target="ExpandCollapseChevron.Foreground" Value="{ThemeResource ExpanderChevronForeground}" />
-										<Setter Target="ExpandCollapseChevronBorder.BorderBrush" Value="{ThemeResource ExpanderChevronBorderBrush}" />
-										<Setter Target="ToggleButtonGrid.Background" Value="{ThemeResource ExpanderChevronBackground}" />
+										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource PropertiesExpanderHeaderForeground}" />
+										<Setter Target="ToggleButtonGrid.BorderBrush" Value="{ThemeResource PropertiesExpanderHeaderBorderBrush}" />
+										<Setter Target="ExpandCollapseChevron.Foreground" Value="{ThemeResource PropertiesExpanderChevronForeground}" />
+										<Setter Target="ToggleButtonGrid.Background" Value="{ThemeResource PropertiesExpanderHeaderBackground}" />
 										<Setter Target="ExpandCollapseChevron.(controls:AnimatedIcon.State)" Value="NormalOn" />
 									</VisualState.Setters>
 								</VisualState>
 								<VisualState x:Name="CheckedPointerOver">
 									<VisualState.Setters>
-										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource ExpanderHeaderForegroundPointerOver}" />
-										<Setter Target="ToggleButtonGrid.BorderBrush" Value="{ThemeResource ExpanderHeaderBorderPointerOverBrush}" />
-										<Setter Target="ExpandCollapseChevron.Foreground" Value="{ThemeResource ExpanderChevronPointerOverForeground}" />
-										<Setter Target="ExpandCollapseChevronBorder.BorderBrush" Value="{ThemeResource ExpanderChevronBorderPointerOverBrush}" />
-										<Setter Target="ToggleButtonGrid.Background" Value="{ThemeResource ExpanderChevronPointerOverBackground}" />
+										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource PropertiesExpanderHeaderPointerOverForeground}" />
+										<Setter Target="ToggleButtonGrid.BorderBrush" Value="{ThemeResource PropertiesExpanderHeaderPointerOverBorderBrush}" />
+										<Setter Target="ExpandCollapseChevron.Foreground" Value="{ThemeResource PropertiesExpanderChevronPointerOverForeground}" />
+										<Setter Target="ToggleButtonGrid.Background" Value="{ThemeResource PropertiesExpanderHeaderPointerOverBackground}" />
 										<Setter Target="ExpandCollapseChevron.(controls:AnimatedIcon.State)" Value="PointerOverOn" />
 									</VisualState.Setters>
 								</VisualState>
 								<VisualState x:Name="CheckedPressed">
 									<VisualState.Setters>
-										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource ExpanderHeaderForegroundPressed}" />
-										<Setter Target="ToggleButtonGrid.BorderBrush" Value="{ThemeResource ExpanderHeaderBorderPressedBrush}" />
-										<Setter Target="ExpandCollapseChevron.Foreground" Value="{ThemeResource ExpanderChevronPressedForeground}" />
-										<Setter Target="ExpandCollapseChevronBorder.BorderBrush" Value="{ThemeResource ExpanderChevronBorderPressedBrush}" />
-										<Setter Target="ToggleButtonGrid.Background" Value="{ThemeResource ExpanderChevronPressedBackground}" />
+										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource PropertiesExpanderHeaderPressedForeground}" />
+										<Setter Target="ToggleButtonGrid.BorderBrush" Value="{ThemeResource PropertiesExpanderHeaderPressedBorderBrush}" />
+										<Setter Target="ExpandCollapseChevron.Foreground" Value="{ThemeResource PropertiesExpanderChevronPressedForeground}" />
+										<Setter Target="ToggleButtonGrid.Background" Value="{ThemeResource PropertiesExpanderHeaderPressedBackground}" />
 										<Setter Target="ExpandCollapseChevron.(controls:AnimatedIcon.State)" Value="PressedOn" />
 									</VisualState.Setters>
 								</VisualState>
 								<VisualState x:Name="CheckedDisabled">
 									<VisualState.Setters>
-										<Setter Target="ToggleButtonGrid.BorderBrush" Value="{ThemeResource ExpanderHeaderDisabledBorderBrush}" />
-										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource ExpanderHeaderDisabledForeground}" />
-										<Setter Target="ExpandCollapseChevron.Foreground" Value="{ThemeResource ExpanderHeaderDisabledForeground}" />
-										<Setter Target="ExpandCollapseChevronBorder.BorderBrush" Value="{ThemeResource ExpanderHeaderDisabledBorderBrush}" />
-										<Setter Target="ToggleButtonGrid.Background" Value="{ThemeResource ExpanderChevronBackground}" />
+										<Setter Target="ToggleButtonGrid.BorderBrush" Value="{ThemeResource PropertiesExpanderHeaderDisabledBorderBrush}" />
+										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource PropertiesExpanderHeaderDisabledForeground}" />
+										<Setter Target="ExpandCollapseChevron.Foreground" Value="{ThemeResource PropertiesExpanderHeaderDisabledForeground}" />
+										<Setter Target="ToggleButtonGrid.Background" Value="{ThemeResource PropertiesExpanderHeaderBackground}" />
 										<Setter Target="ExpandCollapseChevron.(controls:AnimatedIcon.State)" Value="NormalOn" />
 									</VisualState.Setters>
 								</VisualState>
@@ -202,6 +265,165 @@
 
 
 	<!--  EXPANDER UP BUTTON  -->
+	<Style
+		x:Key="PropertiesExpanderHeaderUpStyle"
+		BasedOn="{StaticResource PropertiesExpanderHeaderDownStyle}"
+		TargetType="ToggleButton">
+		<Setter Property="Padding" Value="{ThemeResource PropertiesExpanderHeaderPadding}" />
+		<Setter Property="Background" Value="{ThemeResource PropertiesExpanderHeaderBackground}" />
+		<Setter Property="BorderThickness" Value="0" />
+		<Setter Property="HorizontalContentAlignment" Value="Left" />
+		<Setter Property="BackgroundSizing" Value="InnerBorderEdge" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="ToggleButton">
+					<Border
+						x:Name="ToggleButtonBase"
+						Width="{TemplateBinding Width}"
+						MinWidth="{TemplateBinding MinWidth}"
+						MinHeight="{TemplateBinding MinHeight}"
+						MaxWidth="{TemplateBinding MaxWidth}"
+						Padding="{TemplateBinding Padding}"
+						HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+						Background="{TemplateBinding Background}"
+						BackgroundSizing="{TemplateBinding BackgroundSizing}"
+						BorderBrush="{TemplateBinding BorderBrush}"
+						BorderThickness="{TemplateBinding BorderThickness}"
+						CornerRadius="{TemplateBinding CornerRadius}">
+						<Grid
+							x:Name="ToggleButtonGrid"
+							Padding="{StaticResource PropertiesExpanderHeaderInnerPadding}"
+							HorizontalAlignment="Stretch"
+							Background="{ThemeResource PropertiesExpanderHeaderBackground}"
+							BorderBrush="{ThemeResource PropertiesExpanderHeaderBorderBrush}"
+							BorderThickness="{ThemeResource PropertiesExpanderHeaderBorderThickness}"
+							CornerRadius="{ThemeResource ControlCornerRadius}">
+							<Grid.ColumnDefinitions>
+								<ColumnDefinition Width="Auto" />
+								<ColumnDefinition Width="*" />
+							</Grid.ColumnDefinitions>
+							<ContentPresenter
+								x:Name="ContentPresenter"
+								Grid.Column="1"
+								Padding="0,0,12,0"
+								HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+								VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+								Content="{TemplateBinding Content}"
+								ContentTemplate="{TemplateBinding ContentTemplate}"
+								ContentTransitions="{TemplateBinding ContentTransitions}"
+								Foreground="{TemplateBinding Foreground}" />
+							<Border
+								x:Name="ExpandCollapseChevronBorder"
+								Grid.Column="0"
+								Width="{ThemeResource PropertiesExpanderChevronSpaceWidth}"
+								Height="{ThemeResource PropertiesExpanderChevronSpaceHeight}"
+								Margin="{ThemeResource PropertiesExpanderChevronMargin}">
+								<controls:AnimatedIcon
+									xmlns:local="using:Microsoft.UI.Xaml.Controls"
+									x:Name="ExpandCollapseChevron"
+									Width="{StaticResource PropertiesExpanderChevronGlyphSize}"
+									Height="{StaticResource PropertiesExpanderChevronGlyphSize}"
+									HorizontalAlignment="Center"
+									VerticalAlignment="Center"
+									local:AnimatedIcon.State="NormalOn"
+									AutomationProperties.AccessibilityView="Raw"
+									Foreground="{ThemeResource PropertiesExpanderChevronForeground}"
+									RenderTransformOrigin="0.5, 0.5">
+									<animatedvisuals:AnimatedChevronUpDownSmallVisualSource />
+									<controls:AnimatedIcon.FallbackIconSource>
+										<controls:FontIconSource
+											FontFamily="{StaticResource SymbolThemeFontFamily}"
+											FontSize="12"
+											Glyph="{StaticResource PropertiesExpanderChevronUpGlyph}"
+											IsTextScaleFactorEnabled="False" />
+									</controls:AnimatedIcon.FallbackIconSource>
+									<controls:AnimatedIcon.RenderTransform />
+								</controls:AnimatedIcon>
+							</Border>
+
+						</Grid>
+						<VisualStateManager.VisualStateGroups>
+							<VisualStateGroup x:Name="CommonStates">
+								<VisualState x:Name="Normal">
+									<VisualState.Setters>
+										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource PropertiesExpanderHeaderForeground}" />
+										<Setter Target="ToggleButtonGrid.BorderBrush" Value="{ThemeResource PropertiesExpanderHeaderBorderBrush}" />
+										<Setter Target="ExpandCollapseChevron.Foreground" Value="{ThemeResource PropertiesExpanderChevronForeground}" />
+										<Setter Target="ToggleButtonGrid.Background" Value="{ThemeResource PropertiesExpanderHeaderBackground}" />
+									</VisualState.Setters>
+								</VisualState>
+								<VisualState x:Name="PointerOver">
+									<VisualState.Setters>
+										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource PropertiesExpanderHeaderPointerOverForeground}" />
+										<Setter Target="ToggleButtonGrid.BorderBrush" Value="{ThemeResource PropertiesExpanderHeaderPointerOverBorderBrush}" />
+										<Setter Target="ToggleButtonGrid.Background" Value="{ThemeResource PropertiesExpanderHeaderPointerOverBackground}" />
+										<Setter Target="ExpandCollapseChevron.(controls:AnimatedIcon.State)" Value="PointerOverOn" />
+									</VisualState.Setters>
+								</VisualState>
+								<VisualState x:Name="Pressed">
+									<VisualState.Setters>
+										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource PropertiesExpanderHeaderPressedForeground}" />
+										<Setter Target="ToggleButtonGrid.BorderBrush" Value="{ThemeResource PropertiesExpanderHeaderPressedBorderBrush}" />
+										<Setter Target="ExpandCollapseChevron.Foreground" Value="{ThemeResource PropertiesExpanderChevronPressedForeground}" />
+										<Setter Target="ToggleButtonGrid.Background" Value="{ThemeResource PropertiesExpanderHeaderPressedBackground}" />
+										<Setter Target="ExpandCollapseChevron.(controls:AnimatedIcon.State)" Value="PressedOn" />
+									</VisualState.Setters>
+								</VisualState>
+								<VisualState x:Name="Disabled">
+									<VisualState.Setters>
+										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource PropertiesExpanderHeaderDisabledForeground}" />
+										<Setter Target="ToggleButtonGrid.BorderBrush" Value="{ThemeResource PropertiesExpanderHeaderDisabledBorderBrush}" />
+										<Setter Target="ExpandCollapseChevron.Foreground" Value="{ThemeResource PropertiesExpanderHeaderDisabledForeground}" />
+										<Setter Target="ToggleButtonGrid.Background" Value="{ThemeResource PropertiesExpanderHeaderBackground}" />
+									</VisualState.Setters>
+								</VisualState>
+								<VisualState x:Name="Checked">
+									<VisualState.Setters>
+										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource PropertiesExpanderHeaderForeground}" />
+										<Setter Target="ToggleButtonGrid.BorderBrush" Value="{ThemeResource PropertiesExpanderHeaderBorderBrush}" />
+										<Setter Target="ExpandCollapseChevron.Foreground" Value="{ThemeResource PropertiesExpanderChevronForeground}" />
+										<Setter Target="ToggleButtonGrid.Background" Value="{ThemeResource PropertiesExpanderHeaderBackground}" />
+										<Setter Target="ExpandCollapseChevron.(controls:AnimatedIcon.State)" Value="NormalOff" />
+									</VisualState.Setters>
+								</VisualState>
+								<VisualState x:Name="CheckedPointerOver">
+									<VisualState.Setters>
+										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource PropertiesExpanderHeaderPointerOverForeground}" />
+										<Setter Target="ToggleButtonGrid.BorderBrush" Value="{ThemeResource PropertiesExpanderHeaderPointerOverBorderBrush}" />
+										<Setter Target="ExpandCollapseChevron.Foreground" Value="{ThemeResource PropertiesExpanderChevronPointerOverForeground}" />
+										<Setter Target="ToggleButtonGrid.Background" Value="{ThemeResource PropertiesExpanderHeaderPointerOverBackground}" />
+										<Setter Target="ExpandCollapseChevron.(controls:AnimatedIcon.State)" Value="PointerOverOff" />
+									</VisualState.Setters>
+								</VisualState>
+								<VisualState x:Name="CheckedPressed">
+									<VisualState.Setters>
+										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource PropertiesExpanderHeaderPressedForeground}" />
+										<Setter Target="ToggleButtonGrid.BorderBrush" Value="{ThemeResource PropertiesExpanderHeaderPressedBorderBrush}" />
+										<Setter Target="ExpandCollapseChevron.Foreground" Value="{ThemeResource PropertiesExpanderChevronPressedForeground}" />
+										<Setter Target="ToggleButtonGrid.Background" Value="{ThemeResource PropertiesExpanderHeaderPressedBackground}" />
+										<Setter Target="ExpandCollapseChevron.(controls:AnimatedIcon.State)" Value="PressedOff" />
+									</VisualState.Setters>
+								</VisualState>
+								<VisualState x:Name="CheckedDisabled">
+									<VisualState.Setters>
+										<Setter Target="ToggleButtonGrid.BorderBrush" Value="{ThemeResource PropertiesExpanderHeaderDisabledBorderBrush}" />
+										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource PropertiesExpanderHeaderDisabledForeground}" />
+										<Setter Target="ExpandCollapseChevron.Foreground" Value="{ThemeResource PropertiesExpanderHeaderDisabledForeground}" />
+										<Setter Target="ToggleButtonGrid.Background" Value="{ThemeResource PropertiesExpanderHeaderBackground}" />
+										<Setter Target="ExpandCollapseChevron.(controls:AnimatedIcon.State)" Value="NormalOff" />
+									</VisualState.Setters>
+								</VisualState>
+								<VisualState x:Name="Indeterminate" />
+								<VisualState x:Name="IndeterminatePointerOver" />
+								<VisualState x:Name="IndeterminatePressed" />
+								<VisualState x:Name="IndeterminateDisabled" />
+							</VisualStateGroup>
+						</VisualStateManager.VisualStateGroups>
+					</Border>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
 
 
 
diff --git a/tests/Files.App.UITests/Dialogs/Properties/PropertiesDialog.xaml.cs b/tests/Files.App.UITests/Dialogs/Properties/PropertiesDialog.xaml.cs
index 39f8cc7fc2b9..9cd09c5dba29 100644
--- a/tests/Files.App.UITests/Dialogs/Properties/PropertiesDialog.xaml.cs
+++ b/tests/Files.App.UITests/Dialogs/Properties/PropertiesDialog.xaml.cs
@@ -37,7 +37,7 @@ public PropertiesDialog()
 			presenter.IsMaximizable = false;
 			AppWindow.SetPresenter( presenter );
 			AppWindow.TitleBar.PreferredTheme = TitleBarTheme.UseDefaultAppMode;
-			presenter.PreferredMinimumHeight = 600;
+			presenter.PreferredMinimumHeight = 800;
 			presenter.PreferredMinimumWidth = 800;
 
 			if ( propertiesFrame != null )
diff --git a/tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml b/tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml
index a3c4ea29405c..962f3574f936 100644
--- a/tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml
+++ b/tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml
@@ -19,13 +19,19 @@
 
 		<StackPanel Padding="0,0,0,0" Orientation="Vertical">
 
-			<Expander Margin="24,0,24,24" Header="Expander title">
+			<Expander
+				Margin="24,0,24,24"
+				Header="Expander title"
+				IsEnabled="{x:Bind EnableToggle.IsOn, Mode=TwoWay}">
 				Customised expander content
 			</Expander>
 
 			<Rectangle Height="4" Fill="Red" />
 
-			<ToggleButton HorizontalAlignment="Stretch" Style="{StaticResource PropertiesExpanderHeaderDownStyle}">
+			<ToggleButton
+				HorizontalAlignment="Stretch"
+				IsEnabled="{x:Bind EnableToggle.IsOn, Mode=TwoWay}"
+				Style="{StaticResource PropertiesExpanderHeaderDownStyle}">
 				<StackPanel Orientation="Horizontal" Spacing="8">
 					<SymbolIcon Symbol="Calendar" />
 					<TextBlock Text="Expander heading text" />
@@ -34,6 +40,25 @@
 
 			<Rectangle Height="4" Fill="Red" />
 
+			<ToggleButton
+				HorizontalAlignment="Stretch"
+				IsEnabled="{x:Bind EnableToggle.IsOn, Mode=TwoWay}"
+				Style="{StaticResource PropertiesExpanderHeaderUpStyle}">
+				<StackPanel Orientation="Horizontal" Spacing="8">
+					<SymbolIcon Symbol="Calendar" />
+					<TextBlock Text="Expander heading text" />
+				</StackPanel>
+			</ToggleButton>
+
+			<Rectangle Height="4" Fill="Red" />
+
+			<ToggleSwitch
+				x:Name="EnableToggle"
+				Header="Enable ToggleButton"
+				IsOn="True"
+				OffContent="Disabled"
+				OnContent="Enabled" />
+
 		</StackPanel>
 
 	</Grid>
diff --git a/tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml.cs b/tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml.cs
index 324b1dca4399..20005de90ba0 100644
--- a/tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml.cs
+++ b/tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml.cs
@@ -27,5 +27,5 @@ public PropertiesGeneralPage()
 		{
 			InitializeComponent();
 		}
-	}
+    }
 }

From 47954fed0c7cf6750046c0df17e27e168d1c84a0 Mon Sep 17 00:00:00 2001
From: Martin Anderson <mdta@live.co.uk>
Date: Wed, 19 Aug 2026 02:27:29 +0100
Subject: [PATCH 04/36] Initial work on the Expander control using the Headers

I have started exploring integrating the ToggleButton styles for the Header buttons into the Expander control, and trying to figure out how to handle overrides of things like BorderThickness and Border/Background colours.
---
 .../Dialogs/DialogResources.xaml              | 180 ++++++++++++-
 .../Views/PropertiesGeneralPage.xaml          | 254 ++++++++++++++----
 .../Views/DialogWindowsPage.xaml              |  29 +-
 3 files changed, 407 insertions(+), 56 deletions(-)

diff --git a/src/Files.App.Controls/Dialogs/DialogResources.xaml b/src/Files.App.Controls/Dialogs/DialogResources.xaml
index 7fc067b0abb6..961c9fdf893d 100644
--- a/src/Files.App.Controls/Dialogs/DialogResources.xaml
+++ b/src/Files.App.Controls/Dialogs/DialogResources.xaml
@@ -87,7 +87,8 @@
 
 
 	<!--  RESOURCES  -->
-	<Thickness x:Key="PropertiesExpanderHeaderInnerPadding">12,0</Thickness>
+	<Thickness x:Key="PropertiesExpanderHeaderBorderThickness">0</Thickness>
+	<Thickness x:Key="PropertiesExpanderHeaderInnerPadding">12,0,24,0</Thickness>
 	<Thickness x:Key="PropertiesExpanderChevronMargin">0,0,8,0</Thickness>
 	<x:Double x:Key="PropertiesExpanderChevronSpaceWidth">24</x:Double>
 	<x:Double x:Key="PropertiesExpanderChevronSpaceHeight">32</x:Double>
@@ -101,6 +102,172 @@
 
 
 	<!--  EXPANDER  -->
+	<Style x:Key="PropertiesExpanderStyle" TargetType="controls:Expander">
+		<!--
+			We won't make this control tab stoppable, since the tab focus should go
+			to the toggle button. For this logic, several things were made:
+			1. Expander::OnApplyTemplate - We set the toggle button's events source to the expander's. This will announce expander properties
+			(expand/collapse) changes to narrator. Without this, narrator would announce the toggle button's "on/off" logic
+			instead of the "expand/collapse" logic.
+			2. ExpanderAutomationPeer::GetChildrenCore - Because of 1., we need to override GetChildrenCore to NOT include the toggle button.
+			If we don't do this, we create a weird dependency cycle between the toggle button and the expander.
+			3. ExpanderAutomationPeer::GetPeerFromPointCore Finally, when using narrator with a touch screen, this was overriden as well, to
+			focus the toggle button programmatically to sync the narrator focus with the keyboard focus.
+			Without this override, the narrator user that focuses the expander on a touch screen will see that pressing "Tab"
+			doesn't work how they would expect.
+		-->
+		<Setter Property="IsTabStop" Value="False" />
+		<Setter Property="Background" Value="{ThemeResource ExpanderContentBackground}" />
+		<Setter Property="BackgroundSizing" Value="InnerBorderEdge" />
+		<Setter Property="MinWidth" Value="{ThemeResource FlyoutThemeMinWidth}" />
+		<Setter Property="MinHeight" Value="{StaticResource ExpanderMinHeight}" />
+		<Setter Property="BorderThickness" Value="{ThemeResource ExpanderContentDownBorderThickness}" />
+		<Setter Property="BorderBrush" Value="{ThemeResource ExpanderContentBorderBrush}" />
+		<Setter Property="Padding" Value="{StaticResource ExpanderContentPadding}" />
+		<Setter Property="HorizontalAlignment" Value="Left" />
+		<Setter Property="VerticalAlignment" Value="Center" />
+		<Setter Property="CornerRadius" Value="0" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="controls:Expander">
+					<Grid MinWidth="{TemplateBinding MinWidth}" MaxWidth="{TemplateBinding MaxWidth}">
+						<Grid.RowDefinitions>
+							<RowDefinition x:Name="Row0" Height="Auto" />
+							<RowDefinition x:Name="Row1" Height="*" />
+						</Grid.RowDefinitions>
+						<ToggleButton
+							x:Name="ExpanderHeader"
+							MinHeight="{TemplateBinding MinHeight}"
+							Padding="{StaticResource PropertiesExpanderHeaderPadding}"
+							HorizontalAlignment="Stretch"
+							HorizontalContentAlignment="{StaticResource ExpanderHeaderHorizontalContentAlignment}"
+							VerticalContentAlignment="{StaticResource ExpanderHeaderVerticalContentAlignment}"
+							AutomationProperties.AutomationId="ExpanderToggleButton"
+							Background="{ThemeResource PropertiesExpanderHeaderBackground}"
+							BackgroundSizing="{TemplateBinding BackgroundSizing}"
+							BorderBrush="{ThemeResource PropertiesExpanderHeaderBorderBrush}"
+							BorderThickness="{ThemeResource PropertiesExpanderHeaderBorderThickness}"
+							Content="{TemplateBinding Header}"
+							ContentTemplate="{TemplateBinding HeaderTemplate}"
+							ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}"
+							CornerRadius="{TemplateBinding CornerRadius}"
+							IsChecked="{Binding Path=IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
+							IsEnabled="{TemplateBinding IsEnabled}"
+							Style="{StaticResource PropertiesExpanderHeaderDownStyle}" />
+						<!--  The clip is a composition clip applied in code  -->
+						<Border x:Name="ExpanderContentClip" Grid.Row="1">
+							<Border
+								x:Name="ExpanderContent"
+								MinHeight="{TemplateBinding MinHeight}"
+								Padding="{TemplateBinding Padding}"
+								HorizontalAlignment="Stretch"
+								VerticalAlignment="Stretch"
+								Background="{TemplateBinding Background}"
+								BackgroundSizing="{TemplateBinding BackgroundSizing}"
+								BorderBrush="{TemplateBinding BorderBrush}"
+								BorderThickness="{StaticResource ExpanderContentDownBorderThickness}"
+								CornerRadius="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomCornerRadiusFilterConverter}}"
+								Visibility="Collapsed">
+								<ContentPresenter
+									HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+									VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+									Content="{TemplateBinding Content}"
+									ContentTemplate="{TemplateBinding ContentTemplate}"
+									ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
+								<Border.RenderTransform>
+									<CompositeTransform />
+								</Border.RenderTransform>
+							</Border>
+						</Border>
+						<VisualStateManager.VisualStateGroups>
+							<VisualStateGroup x:Name="ExpandStates">
+								<VisualState x:Name="ExpandUp">
+									<VisualState.Setters>
+										<Setter Target="ExpanderHeader.CornerRadius" Value="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomCornerRadiusFilterConverter}}" />
+										<Setter Target="ExpanderContent.Visibility" Value="Visible" />
+									</VisualState.Setters>
+									<VisualState.Storyboard>
+										<Storyboard>
+											<DoubleAnimationUsingKeyFrames Storyboard.TargetName="ExpanderContent" Storyboard.TargetProperty="(UIElement.RenderTransform).(CompositeTransform.TranslateY)">
+												<DiscreteDoubleKeyFrame KeyTime="0" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ContentHeight}" />
+												<SplineDoubleKeyFrame
+													KeySpline="0.0, 0.0, 0.0, 1.0"
+													KeyTime="0:0:0.333"
+													Value="0" />
+											</DoubleAnimationUsingKeyFrames>
+										</Storyboard>
+									</VisualState.Storyboard>
+								</VisualState>
+								<VisualState x:Name="CollapseDown">
+									<VisualState.Storyboard>
+										<Storyboard>
+											<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ExpanderContent" Storyboard.TargetProperty="Visibility">
+												<DiscreteObjectKeyFrame KeyTime="0:0:0.2" Value="Collapsed" />
+											</ObjectAnimationUsingKeyFrames>
+											<DoubleAnimationUsingKeyFrames Storyboard.TargetName="ExpanderContent" Storyboard.TargetProperty="(UIElement.RenderTransform).(CompositeTransform.TranslateY)">
+												<DiscreteDoubleKeyFrame KeyTime="0" Value="0" />
+												<SplineDoubleKeyFrame
+													KeySpline="1.0, 1.0, 0.0, 1.0"
+													KeyTime="0:0:0.167"
+													Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ContentHeight}" />
+											</DoubleAnimationUsingKeyFrames>
+										</Storyboard>
+									</VisualState.Storyboard>
+								</VisualState>
+								<VisualState x:Name="ExpandDown">
+									<VisualState.Setters>
+										<Setter Target="ExpanderHeader.CornerRadius" Value="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TopCornerRadiusFilterConverter}}" />
+										<Setter Target="ExpanderContent.Visibility" Value="Visible" />
+									</VisualState.Setters>
+									<VisualState.Storyboard>
+										<Storyboard>
+											<DoubleAnimationUsingKeyFrames Storyboard.TargetName="ExpanderContent" Storyboard.TargetProperty="(UIElement.RenderTransform).(CompositeTransform.TranslateY)">
+												<DiscreteDoubleKeyFrame KeyTime="0" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.NegativeContentHeight}" />
+												<SplineDoubleKeyFrame
+													KeySpline="0.0, 0.0, 0.0, 1.0"
+													KeyTime="0:0:0.333"
+													Value="0" />
+											</DoubleAnimationUsingKeyFrames>
+										</Storyboard>
+									</VisualState.Storyboard>
+								</VisualState>
+								<VisualState x:Name="CollapseUp">
+									<VisualState.Storyboard>
+										<Storyboard>
+											<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ExpanderContent" Storyboard.TargetProperty="Visibility">
+												<DiscreteObjectKeyFrame KeyTime="0:0:0.167" Value="Collapsed" />
+											</ObjectAnimationUsingKeyFrames>
+											<DoubleAnimationUsingKeyFrames Storyboard.TargetName="ExpanderContent" Storyboard.TargetProperty="(UIElement.RenderTransform).(CompositeTransform.TranslateY)">
+												<DiscreteDoubleKeyFrame KeyTime="0" Value="0" />
+												<SplineDoubleKeyFrame
+													KeySpline="1.0, 1.0, 0.0, 1.0"
+													KeyTime="0:0:0.167"
+													Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.NegativeContentHeight}" />
+											</DoubleAnimationUsingKeyFrames>
+										</Storyboard>
+									</VisualState.Storyboard>
+								</VisualState>
+							</VisualStateGroup>
+							<VisualStateGroup x:Name="ExpandDirectionStates">
+								<VisualState x:Name="Down" />
+								<VisualState x:Name="Up">
+									<VisualState.Setters>
+										<Setter Target="ExpanderHeader.Style" Value="{StaticResource PropertiesExpanderHeaderUpStyle}" />
+										<Setter Target="ExpanderContent.BorderThickness" Value="{StaticResource ExpanderContentUpBorderThickness}" />
+										<Setter Target="ExpanderContent.CornerRadius" Value="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TopCornerRadiusFilterConverter}}" />
+										<Setter Target="ExpanderHeader.(Grid.Row)" Value="1" />
+										<Setter Target="ExpanderContentClip.(Grid.Row)" Value="0" />
+										<Setter Target="Row0.Height" Value="*" />
+										<Setter Target="Row1.Height" Value="Auto" />
+									</VisualState.Setters>
+								</VisualState>
+							</VisualStateGroup>
+						</VisualStateManager.VisualStateGroups>
+					</Grid>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
 
 
 
@@ -109,9 +276,10 @@
 	<Style x:Key="PropertiesExpanderHeaderDownStyle" TargetType="ToggleButton">
 		<Setter Property="Padding" Value="{ThemeResource PropertiesExpanderHeaderPadding}" />
 		<Setter Property="Background" Value="{ThemeResource PropertiesExpanderHeaderBackground}" />
-		<Setter Property="BorderThickness" Value="0" />
+		<Setter Property="BorderThickness" Value="{StaticResource PropertiesExpanderHeaderBorderThickness}" />
 		<Setter Property="HorizontalContentAlignment" Value="Left" />
 		<Setter Property="BackgroundSizing" Value="InnerBorderEdge" />
+		<Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="ToggleButton">
@@ -131,7 +299,6 @@
 						<Grid
 							x:Name="ToggleButtonGrid"
 							Padding="{StaticResource PropertiesExpanderHeaderInnerPadding}"
-							HorizontalAlignment="Stretch"
 							Background="{ThemeResource PropertiesExpanderHeaderBackground}"
 							BorderBrush="{ThemeResource PropertiesExpanderHeaderBorderBrush}"
 							BorderThickness="{ThemeResource PropertiesExpanderHeaderBorderThickness}"
@@ -143,13 +310,13 @@
 							<ContentPresenter
 								x:Name="ContentPresenter"
 								Grid.Column="1"
-								Padding="0,0,12,0"
 								HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
 								VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
 								Content="{TemplateBinding Content}"
 								ContentTemplate="{TemplateBinding ContentTemplate}"
 								ContentTransitions="{TemplateBinding ContentTransitions}"
 								Foreground="{TemplateBinding Foreground}" />
+
 							<Border
 								x:Name="ExpandCollapseChevronBorder"
 								Grid.Column="0"
@@ -271,9 +438,10 @@
 		TargetType="ToggleButton">
 		<Setter Property="Padding" Value="{ThemeResource PropertiesExpanderHeaderPadding}" />
 		<Setter Property="Background" Value="{ThemeResource PropertiesExpanderHeaderBackground}" />
-		<Setter Property="BorderThickness" Value="0" />
 		<Setter Property="HorizontalContentAlignment" Value="Left" />
 		<Setter Property="BackgroundSizing" Value="InnerBorderEdge" />
+		<Setter Property="BorderBrush" Value="{StaticResource PropertiesExpanderHeaderBorderThickness}" />
+		<Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="ToggleButton">
@@ -293,7 +461,6 @@
 						<Grid
 							x:Name="ToggleButtonGrid"
 							Padding="{StaticResource PropertiesExpanderHeaderInnerPadding}"
-							HorizontalAlignment="Stretch"
 							Background="{ThemeResource PropertiesExpanderHeaderBackground}"
 							BorderBrush="{ThemeResource PropertiesExpanderHeaderBorderBrush}"
 							BorderThickness="{ThemeResource PropertiesExpanderHeaderBorderThickness}"
@@ -305,7 +472,6 @@
 							<ContentPresenter
 								x:Name="ContentPresenter"
 								Grid.Column="1"
-								Padding="0,0,12,0"
 								HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
 								VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
 								Content="{TemplateBinding Content}"
diff --git a/tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml b/tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml
index 962f3574f936..e6a89d592239 100644
--- a/tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml
+++ b/tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml
@@ -15,51 +15,211 @@
 		<ResourceDictionary Source="ms-appx:///Files.App.Controls/Dialogs/DialogResources.xaml" />
 	</Page.Resources>
 
-	<Grid>
-
-		<StackPanel Padding="0,0,0,0" Orientation="Vertical">
-
-			<Expander
-				Margin="24,0,24,24"
-				Header="Expander title"
-				IsEnabled="{x:Bind EnableToggle.IsOn, Mode=TwoWay}">
-				Customised expander content
-			</Expander>
-
-			<Rectangle Height="4" Fill="Red" />
-
-			<ToggleButton
-				HorizontalAlignment="Stretch"
-				IsEnabled="{x:Bind EnableToggle.IsOn, Mode=TwoWay}"
-				Style="{StaticResource PropertiesExpanderHeaderDownStyle}">
-				<StackPanel Orientation="Horizontal" Spacing="8">
-					<SymbolIcon Symbol="Calendar" />
-					<TextBlock Text="Expander heading text" />
-				</StackPanel>
-			</ToggleButton>
-
-			<Rectangle Height="4" Fill="Red" />
-
-			<ToggleButton
-				HorizontalAlignment="Stretch"
-				IsEnabled="{x:Bind EnableToggle.IsOn, Mode=TwoWay}"
-				Style="{StaticResource PropertiesExpanderHeaderUpStyle}">
-				<StackPanel Orientation="Horizontal" Spacing="8">
-					<SymbolIcon Symbol="Calendar" />
-					<TextBlock Text="Expander heading text" />
-				</StackPanel>
-			</ToggleButton>
-
-			<Rectangle Height="4" Fill="Red" />
-
-			<ToggleSwitch
-				x:Name="EnableToggle"
-				Header="Enable ToggleButton"
-				IsOn="True"
-				OffContent="Disabled"
-				OnContent="Enabled" />
-
-		</StackPanel>
-
-	</Grid>
+
+
+
+	<ScrollViewer>
+
+		<Grid Margin="0,0,0,24">
+
+			<StackPanel Padding="0,0,0,0" Orientation="Vertical">
+
+				<Expander
+					Margin="24,0,24,24"
+					Header="Expander title"
+					IsEnabled="{x:Bind EnableToggle.IsOn, Mode=TwoWay}">
+					Expander content goes here.
+				</Expander>
+
+				<Rectangle Height="4" Fill="Red" />
+
+				<Expander
+					Margin="24,0,24,24"
+					Background="DarkGoldenrod"
+					BorderBrush="Green"
+					BorderThickness="10"
+					IsEnabled="{x:Bind EnableToggle.IsOn, Mode=TwoWay}">
+
+					<Expander.Header>
+						<TextBlock Text="Expander title, made extra long to test how it may wrap when there is not enough space to display it on a single line." TextWrapping="WrapWholeWords" />
+					</Expander.Header>
+					<Expander.Content>
+						<TextBlock Text="Expander content goes here." />
+					</Expander.Content>
+				</Expander>
+
+				<Rectangle Height="4" Fill="Red" />
+
+				<ToggleButton IsEnabled="{x:Bind EnableToggle.IsOn, Mode=TwoWay}" Style="{StaticResource PropertiesExpanderHeaderDownStyle}">
+					<StackPanel Orientation="Horizontal" Spacing="8">
+						<SymbolIcon Symbol="Calendar" />
+						<TextBlock Text="Expander heading text" />
+					</StackPanel>
+				</ToggleButton>
+
+				<Border
+					x:Name="PropertiesSeparator"
+					Height="4"
+					Margin="0,0,0,0"
+					HorizontalAlignment="Stretch">
+					<Rectangle
+						Height="1"
+						HorizontalAlignment="Stretch"
+						VerticalAlignment="Center"
+						Fill="{ThemeResource DividerStrokeColorDefaultBrush}" />
+				</Border>
+
+				<ToggleButton IsEnabled="{x:Bind EnableToggle.IsOn, Mode=TwoWay}" Style="{StaticResource PropertiesExpanderHeaderUpStyle}">
+					<StackPanel Orientation="Horizontal" Spacing="8">
+						<SymbolIcon Symbol="Calendar" />
+						<TextBlock Text="Expander heading text" />
+					</StackPanel>
+				</ToggleButton>
+
+				<Rectangle Height="4" Fill="Red" />
+
+				<ToggleButton
+					Background="DarkOrange"
+					BorderBrush="DarkSeaGreen"
+					BorderThickness="4"
+					IsEnabled="{x:Bind EnableToggle.IsOn, Mode=TwoWay}"
+					Style="{StaticResource PropertiesExpanderHeaderDownStyle}">
+					<StackPanel Orientation="Horizontal" Spacing="8">
+						<SymbolIcon Symbol="Calendar" />
+						<TextBlock Text="Expander heading text" />
+					</StackPanel>
+				</ToggleButton>
+
+				<Border
+					Height="4"
+					Margin="0,0,0,0"
+					HorizontalAlignment="Stretch">
+					<Rectangle
+						Height="1"
+						HorizontalAlignment="Stretch"
+						VerticalAlignment="Center"
+						Fill="{ThemeResource DividerStrokeColorDefaultBrush}" />
+				</Border>
+
+				<ToggleButton
+					Background="DarkOliveGreen"
+					BorderBrush="DarkMagenta"
+					BorderThickness="4"
+					IsEnabled="{x:Bind EnableToggle.IsOn, Mode=TwoWay}"
+					Style="{StaticResource PropertiesExpanderHeaderUpStyle}">
+					<StackPanel Orientation="Horizontal" Spacing="8">
+						<SymbolIcon Symbol="Calendar" />
+						<TextBlock Text="Expander heading text" />
+					</StackPanel>
+				</ToggleButton>
+
+				<Rectangle Height="4" Fill="Red" />
+
+				<ToggleSwitch
+					x:Name="EnableToggle"
+					Header="Enable ToggleButton"
+					IsOn="True"
+					OffContent="Disabled"
+					OnContent="Enabled" />
+
+				<Rectangle Height="4" Fill="Red" />
+
+				<Expander
+					HorizontalAlignment="Stretch"
+					HorizontalContentAlignment="Stretch"
+					Background="#213243"
+					BorderBrush="HotPink"
+					BorderThickness="1"
+					IsEnabled="{x:Bind EnableToggle.IsOn, Mode=TwoWay}"
+					Style="{StaticResource PropertiesExpanderStyle}">
+					<Expander.Content>
+						<StackPanel
+							HorizontalAlignment="Stretch"
+							Background="DarkBlue"
+							Orientation="Vertical">
+							<TextBlock Text="Customised expander content." />
+						</StackPanel>
+					</Expander.Content>
+					<Expander.Header>
+						<Grid>
+							<Grid.ColumnDefinitions>
+								<ColumnDefinition Width="Auto" />
+								<ColumnDefinition Width="*" />
+							</Grid.ColumnDefinitions>
+							<SymbolIcon
+								Grid.Column="0"
+								Margin="0,0,12,0"
+								Symbol="Calendar" />
+							<TextBlock
+								Grid.Column="1"
+								Margin="0,4"
+								HorizontalAlignment="Left"
+								Text="Custom expander heading text, made extra long to test how it may wrap when there is not enough space to display it on a single line."
+								TextWrapping="WrapWholeWords" />
+						</Grid>
+					</Expander.Header>
+				</Expander>
+
+
+
+				<Border
+					Height="4"
+					Margin="0,0,0,0"
+					HorizontalAlignment="Stretch">
+					<Rectangle
+						Height="1"
+						HorizontalAlignment="Stretch"
+						VerticalAlignment="Center"
+						Fill="{ThemeResource DividerStrokeColorDefaultBrush}" />
+				</Border>
+
+				<Expander
+					HorizontalAlignment="Stretch"
+					HorizontalContentAlignment="Stretch"
+					IsEnabled="{x:Bind EnableToggle.IsOn, Mode=TwoWay}"
+					Style="{StaticResource PropertiesExpanderStyle}">
+					<Expander.Content>
+						<StackPanel HorizontalAlignment="Stretch" Orientation="Vertical">
+							<TextBlock Text="Customised expander content." />
+						</StackPanel>
+					</Expander.Content>
+					<Expander.Header>
+						<Grid>
+							<Grid.ColumnDefinitions>
+								<ColumnDefinition Width="Auto" />
+								<ColumnDefinition Width="*" />
+							</Grid.ColumnDefinitions>
+							<SymbolIcon
+								Grid.Column="0"
+								Margin="0,0,12,0"
+								Symbol="Calendar" />
+							<TextBlock
+								Grid.Column="1"
+								Margin="0,4"
+								HorizontalAlignment="Left"
+								Text="Custom expander heading text."
+								TextWrapping="WrapWholeWords" />
+						</Grid>
+					</Expander.Header>
+				</Expander>
+
+
+
+				<Border
+					Height="4"
+					Margin="0,0,0,0"
+					HorizontalAlignment="Stretch">
+					<Rectangle
+						Height="1"
+						HorizontalAlignment="Stretch"
+						VerticalAlignment="Center"
+						Fill="{ThemeResource DividerStrokeColorDefaultBrush}" />
+				</Border>
+
+			</StackPanel>
+
+		</Grid>
+
+	</ScrollViewer>
+
 </Page>
diff --git a/tests/Files.App.UITests/Views/DialogWindowsPage.xaml b/tests/Files.App.UITests/Views/DialogWindowsPage.xaml
index 4b12bbbf7d12..5d4bdf751380 100644
--- a/tests/Files.App.UITests/Views/DialogWindowsPage.xaml
+++ b/tests/Files.App.UITests/Views/DialogWindowsPage.xaml
@@ -8,12 +8,37 @@
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 	mc:Ignorable="d">
 
-	<Grid>
+	<StackPanel Margin="0,24,0,24" Orientation="Vertical">
 
 		<Button
 			x:Name="BtnProperties"
 			Click="BtnProperties_Click"
 			Content="Properties dialog" />
 
-	</Grid>
+		<Border
+			Margin="0,24,0,24"
+			BorderBrush="Red"
+			BorderThickness="1">
+			<StackPanel Padding="24" Orientation="Vertical">
+				<MenuFlyoutItem Text="Menu item text" />
+				<MenuFlyoutItem Text="Menu item text" />
+				<MenuFlyoutSeparator />
+				<MenuFlyoutItem Text="Menu item text" />
+				<MenuFlyoutItem Text="Menu item text" />
+			</StackPanel>
+		</Border>
+
+		<Border
+			Width="64"
+			Height="64"
+			Background="Blue" />
+
+		<Border
+			Width="64"
+			Height="64"
+			Background="Blue"
+			BorderBrush="Yellow"
+			BorderThickness="5" />
+
+	</StackPanel>
 </Page>

From 508819f561802d1707c7bafe44325e45d1cf976c Mon Sep 17 00:00:00 2001
From: Martin Anderson <mdta@live.co.uk>
Date: Wed, 19 Aug 2026 14:25:22 +0100
Subject: [PATCH 05/36] Finished work on the Expander Control

I have the new Header style and design in place and working, I would like @tera to give it a look over, to see if I have overlooked anything of course
---
 .../Dialogs/DialogResources.xaml              |  78 ++++--
 .../Views/PropertiesGeneralPage.xaml          | 239 ++++--------------
 .../Views/DialogWindowsPage.xaml              |  25 --
 3 files changed, 110 insertions(+), 232 deletions(-)

diff --git a/src/Files.App.Controls/Dialogs/DialogResources.xaml b/src/Files.App.Controls/Dialogs/DialogResources.xaml
index 961c9fdf893d..2c2fc27faf6c 100644
--- a/src/Files.App.Controls/Dialogs/DialogResources.xaml
+++ b/src/Files.App.Controls/Dialogs/DialogResources.xaml
@@ -10,7 +10,7 @@
 	<ResourceDictionary.ThemeDictionaries>
 
 		<ResourceDictionary x:Key="Default">
-			<Thickness x:Key="PropertiesExpanderHeaderPadding">8</Thickness>
+			<Thickness x:Key="PropertiesExpanderHeaderPadding">8,8,8,7</Thickness>
 			<Thickness x:Key="PropertiesExpanderHeaderBorderThickness">0</Thickness>
 
 			<StaticResource x:Key="PropertiesExpanderHeaderBackground" ResourceKey="SubtleFillColorTransparentBrush" />
@@ -31,10 +31,15 @@
 
 			<StaticResource x:Key="PropertiesExpanderHeaderDisabledForeground" ResourceKey="TextFillColorDisabledBrush" />
 			<StaticResource x:Key="PropertiesExpanderHeaderDisabledBorderBrush" ResourceKey="CardStrokeColorDefaultBrush" />
+
+			<StaticResource x:Key="PropertiesExpanderContentBackground" ResourceKey="SubtleFillColorTransparentBrush" />
+			<StaticResource x:Key="PropertiesExpanderContentBorderBrush" ResourceKey="DividerStrokeColorDefaultBrush" />
+
+			<StaticResource x:Key="PropertiesExpanderSeparatorFillColor" ResourceKey="DividerStrokeColorDefaultBrush" />
 		</ResourceDictionary>
 
 		<ResourceDictionary x:Key="Light">
-			<Thickness x:Key="PropertiesExpanderHeaderPadding">8</Thickness>
+			<Thickness x:Key="PropertiesExpanderHeaderPadding">8,8,8,7</Thickness>
 			<Thickness x:Key="PropertiesExpanderHeaderBorderThickness">0</Thickness>
 
 			<StaticResource x:Key="PropertiesExpanderHeaderBackground" ResourceKey="SubtleFillColorTransparentBrush" />
@@ -55,10 +60,15 @@
 
 			<StaticResource x:Key="PropertiesExpanderHeaderDisabledForeground" ResourceKey="TextFillColorDisabledBrush" />
 			<StaticResource x:Key="PropertiesExpanderHeaderDisabledBorderBrush" ResourceKey="CardStrokeColorDefaultBrush" />
+
+			<StaticResource x:Key="PropertiesExpanderContentBackground" ResourceKey="SubtleFillColorTransparentBrush" />
+			<StaticResource x:Key="PropertiesExpanderContentBorderBrush" ResourceKey="DividerStrokeColorDefaultBrush" />
+
+			<StaticResource x:Key="PropertiesExpanderSeparatorFillColor" ResourceKey="DividerStrokeColorDefaultBrush" />
 		</ResourceDictionary>
 
 		<ResourceDictionary x:Key="HighContrast">
-			<Thickness x:Key="PropertiesExpanderHeaderPadding">6</Thickness>
+			<Thickness x:Key="PropertiesExpanderHeaderPadding">6,6,6,5</Thickness>
 			<Thickness x:Key="PropertiesExpanderHeaderBorderThickness">2</Thickness>
 
 			<StaticResource x:Key="PropertiesExpanderHeaderBackground" ResourceKey="SystemColorButtonFaceColorBrush" />
@@ -79,6 +89,11 @@
 
 			<StaticResource x:Key="PropertiesExpanderHeaderDisabledForeground" ResourceKey="TextFillColorDisabledBrush" />
 			<StaticResource x:Key="PropertiesExpanderHeaderDisabledBorderBrush" ResourceKey="TextFillColorDisabledBrush" />
+
+			<StaticResource x:Key="PropertiesExpanderContentBackground" ResourceKey="SystemColorWindowColorBrush" />
+			<StaticResource x:Key="PropertiesExpanderContentBorderBrush" ResourceKey="SystemColorWindowTextColorBrush" />
+
+			<StaticResource x:Key="PropertiesExpanderSeparatorFillColor" ResourceKey="SystemColorWindowTextColorBrush" />
 		</ResourceDictionary>
 
 	</ResourceDictionary.ThemeDictionaries>
@@ -87,17 +102,26 @@
 
 
 	<!--  RESOURCES  -->
-	<Thickness x:Key="PropertiesExpanderHeaderBorderThickness">0</Thickness>
+	<x:Double x:Key="PropertiesExpanderMinHeight">48</x:Double>
+
 	<Thickness x:Key="PropertiesExpanderHeaderInnerPadding">12,0,24,0</Thickness>
 	<Thickness x:Key="PropertiesExpanderChevronMargin">0,0,8,0</Thickness>
 	<x:Double x:Key="PropertiesExpanderChevronSpaceWidth">24</x:Double>
 	<x:Double x:Key="PropertiesExpanderChevronSpaceHeight">32</x:Double>
 	<x:Double x:Key="PropertiesExpanderChevronGlyphSize">12</x:Double>
-	<Thickness x:Key="PropertiesExpanderContentPadding">16</Thickness>
 
 	<x:String x:Key="PropertiesExpanderChevronUpGlyph">&#xE70E;</x:String>
 	<x:String x:Key="PropertiesExpanderChevronDownGlyph">&#xE70D;</x:String>
 
+	<HorizontalAlignment x:Key="PropertiesExpanderHeaderHorizontalContentAlignment">Stretch</HorizontalAlignment>
+	<VerticalAlignment x:Key="PropertiesExpanderHeaderVerticalContentAlignment">Center</VerticalAlignment>
+
+	<Thickness x:Key="PropertiesExpanderContentPadding">24, 0</Thickness>
+	<Thickness x:Key="PropertiesExpanderContentDownBorderThickness">0</Thickness>
+	<Thickness x:Key="PropertiesExpanderContentUpBorderThickness">0</Thickness>
+
+	<x:Double x:Key="PropertiesExpanderSeparatorHeight">1</x:Double>
+
 
 
 
@@ -117,15 +141,17 @@
 			doesn't work how they would expect.
 		-->
 		<Setter Property="IsTabStop" Value="False" />
-		<Setter Property="Background" Value="{ThemeResource ExpanderContentBackground}" />
+		<Setter Property="Background" Value="{ThemeResource PropertiesExpanderContentBackground}" />
 		<Setter Property="BackgroundSizing" Value="InnerBorderEdge" />
 		<Setter Property="MinWidth" Value="{ThemeResource FlyoutThemeMinWidth}" />
-		<Setter Property="MinHeight" Value="{StaticResource ExpanderMinHeight}" />
-		<Setter Property="BorderThickness" Value="{ThemeResource ExpanderContentDownBorderThickness}" />
-		<Setter Property="BorderBrush" Value="{ThemeResource ExpanderContentBorderBrush}" />
-		<Setter Property="Padding" Value="{StaticResource ExpanderContentPadding}" />
-		<Setter Property="HorizontalAlignment" Value="Left" />
+		<Setter Property="MinHeight" Value="{StaticResource PropertiesExpanderMinHeight}" />
+		<Setter Property="BorderThickness" Value="{ThemeResource PropertiesExpanderContentDownBorderThickness}" />
+		<Setter Property="BorderBrush" Value="{ThemeResource PropertiesExpanderContentBorderBrush}" />
+		<Setter Property="Padding" Value="{StaticResource PropertiesExpanderContentPadding}" />
+		<Setter Property="HorizontalAlignment" Value="Stretch" />
 		<Setter Property="VerticalAlignment" Value="Center" />
+		<Setter Property="HorizontalContentAlignment" Value="Stretch" />
+		<Setter Property="VerticalContentAlignment" Value="Top" />
 		<Setter Property="CornerRadius" Value="0" />
 		<Setter Property="Template">
 			<Setter.Value>
@@ -134,19 +160,20 @@
 						<Grid.RowDefinitions>
 							<RowDefinition x:Name="Row0" Height="Auto" />
 							<RowDefinition x:Name="Row1" Height="*" />
+							<RowDefinition x:Name="Row2" Height="Auto" />
 						</Grid.RowDefinitions>
 						<ToggleButton
 							x:Name="ExpanderHeader"
 							MinHeight="{TemplateBinding MinHeight}"
 							Padding="{StaticResource PropertiesExpanderHeaderPadding}"
 							HorizontalAlignment="Stretch"
-							HorizontalContentAlignment="{StaticResource ExpanderHeaderHorizontalContentAlignment}"
-							VerticalContentAlignment="{StaticResource ExpanderHeaderVerticalContentAlignment}"
+							HorizontalContentAlignment="{StaticResource PropertiesExpanderHeaderHorizontalContentAlignment}"
+							VerticalContentAlignment="{StaticResource PropertiesExpanderHeaderVerticalContentAlignment}"
 							AutomationProperties.AutomationId="ExpanderToggleButton"
 							Background="{ThemeResource PropertiesExpanderHeaderBackground}"
 							BackgroundSizing="{TemplateBinding BackgroundSizing}"
 							BorderBrush="{ThemeResource PropertiesExpanderHeaderBorderBrush}"
-							BorderThickness="{ThemeResource PropertiesExpanderHeaderBorderThickness}"
+							BorderThickness="0"
 							Content="{TemplateBinding Header}"
 							ContentTemplate="{TemplateBinding HeaderTemplate}"
 							ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}"
@@ -165,7 +192,7 @@
 								Background="{TemplateBinding Background}"
 								BackgroundSizing="{TemplateBinding BackgroundSizing}"
 								BorderBrush="{TemplateBinding BorderBrush}"
-								BorderThickness="{StaticResource ExpanderContentDownBorderThickness}"
+								BorderThickness="{StaticResource PropertiesExpanderContentDownBorderThickness}"
 								CornerRadius="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomCornerRadiusFilterConverter}}"
 								Visibility="Collapsed">
 								<ContentPresenter
@@ -179,6 +206,11 @@
 								</Border.RenderTransform>
 							</Border>
 						</Border>
+						<Rectangle
+							x:Name="ExpanderSeparator"
+							Grid.Row="2"
+							Height="{StaticResource PropertiesExpanderSeparatorHeight}"
+							Fill="{ThemeResource PropertiesExpanderSeparatorFillColor}" />
 						<VisualStateManager.VisualStateGroups>
 							<VisualStateGroup x:Name="ExpandStates">
 								<VisualState x:Name="ExpandUp">
@@ -253,12 +285,14 @@
 								<VisualState x:Name="Up">
 									<VisualState.Setters>
 										<Setter Target="ExpanderHeader.Style" Value="{StaticResource PropertiesExpanderHeaderUpStyle}" />
-										<Setter Target="ExpanderContent.BorderThickness" Value="{StaticResource ExpanderContentUpBorderThickness}" />
+										<Setter Target="ExpanderContent.BorderThickness" Value="{StaticResource PropertiesExpanderContentUpBorderThickness}" />
 										<Setter Target="ExpanderContent.CornerRadius" Value="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TopCornerRadiusFilterConverter}}" />
-										<Setter Target="ExpanderHeader.(Grid.Row)" Value="1" />
-										<Setter Target="ExpanderContentClip.(Grid.Row)" Value="0" />
-										<Setter Target="Row0.Height" Value="*" />
-										<Setter Target="Row1.Height" Value="Auto" />
+										<Setter Target="ExpanderHeader.(Grid.Row)" Value="2" />
+										<Setter Target="ExpanderContentClip.(Grid.Row)" Value="1" />
+										<Setter Target="ExpanderSeparator.(Grid.Row)" Value="0" />
+										<Setter Target="Row0.Height" Value="Auto" />
+										<Setter Target="Row1.Height" Value="*" />
+										<Setter Target="Row2.Height" Value="Auto" />
 									</VisualState.Setters>
 								</VisualState>
 							</VisualStateGroup>
@@ -276,7 +310,7 @@
 	<Style x:Key="PropertiesExpanderHeaderDownStyle" TargetType="ToggleButton">
 		<Setter Property="Padding" Value="{ThemeResource PropertiesExpanderHeaderPadding}" />
 		<Setter Property="Background" Value="{ThemeResource PropertiesExpanderHeaderBackground}" />
-		<Setter Property="BorderThickness" Value="{StaticResource PropertiesExpanderHeaderBorderThickness}" />
+		<Setter Property="BorderThickness" Value="0" />
 		<Setter Property="HorizontalContentAlignment" Value="Left" />
 		<Setter Property="BackgroundSizing" Value="InnerBorderEdge" />
 		<Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
@@ -438,9 +472,9 @@
 		TargetType="ToggleButton">
 		<Setter Property="Padding" Value="{ThemeResource PropertiesExpanderHeaderPadding}" />
 		<Setter Property="Background" Value="{ThemeResource PropertiesExpanderHeaderBackground}" />
+		<Setter Property="BorderThickness" Value="0" />
 		<Setter Property="HorizontalContentAlignment" Value="Left" />
 		<Setter Property="BackgroundSizing" Value="InnerBorderEdge" />
-		<Setter Property="BorderBrush" Value="{StaticResource PropertiesExpanderHeaderBorderThickness}" />
 		<Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
 		<Setter Property="Template">
 			<Setter.Value>
diff --git a/tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml b/tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml
index e6a89d592239..d5ab8151f2ad 100644
--- a/tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml
+++ b/tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml
@@ -17,209 +17,78 @@
 
 
 
-
-	<ScrollViewer>
-
-		<Grid Margin="0,0,0,24">
-
-			<StackPanel Padding="0,0,0,0" Orientation="Vertical">
-
-				<Expander
-					Margin="24,0,24,24"
-					Header="Expander title"
-					IsEnabled="{x:Bind EnableToggle.IsOn, Mode=TwoWay}">
-					Expander content goes here.
-				</Expander>
-
-				<Rectangle Height="4" Fill="Red" />
-
-				<Expander
-					Margin="24,0,24,24"
-					Background="DarkGoldenrod"
-					BorderBrush="Green"
-					BorderThickness="10"
-					IsEnabled="{x:Bind EnableToggle.IsOn, Mode=TwoWay}">
-
+	<Grid
+		x:Name="RootGrid"
+		HorizontalAlignment="Stretch"
+		VerticalAlignment="Stretch">
+		<Grid.RowDefinitions>
+			<RowDefinition Height="128" />
+			<RowDefinition Height="*" />
+		</Grid.RowDefinitions>
+
+		<Border
+			x:Name="GeneralHeader"
+			Grid.Row="0"
+			Padding="24,16"
+			VerticalAlignment="Stretch"
+			BorderBrush="{ThemeResource DividerStrokeColorDefaultBrush}"
+			BorderThickness="0,0,0,1">
+
+			<TextBlock Text="Sticky header area with scrolling below" />
+
+		</Border>
+
+
+		<ScrollViewer
+			Grid.Row="1"
+			HorizontalAlignment="Stretch"
+			VerticalAlignment="Stretch">
+
+			<StackPanel
+				Margin="0,0,0,32"
+				HorizontalAlignment="Stretch"
+				Orientation="Vertical">
+				<Expander Style="{StaticResource PropertiesExpanderStyle}">
 					<Expander.Header>
-						<TextBlock Text="Expander title, made extra long to test how it may wrap when there is not enough space to display it on a single line." TextWrapping="WrapWholeWords" />
+						<TextBlock Text="Header goes here" />
 					</Expander.Header>
-					<Expander.Content>
-						<TextBlock Text="Expander content goes here." />
-					</Expander.Content>
-				</Expander>
 
-				<Rectangle Height="4" Fill="Red" />
-
-				<ToggleButton IsEnabled="{x:Bind EnableToggle.IsOn, Mode=TwoWay}" Style="{StaticResource PropertiesExpanderHeaderDownStyle}">
-					<StackPanel Orientation="Horizontal" Spacing="8">
-						<SymbolIcon Symbol="Calendar" />
-						<TextBlock Text="Expander heading text" />
-					</StackPanel>
-				</ToggleButton>
-
-				<Border
-					x:Name="PropertiesSeparator"
-					Height="4"
-					Margin="0,0,0,0"
-					HorizontalAlignment="Stretch">
-					<Rectangle
-						Height="1"
-						HorizontalAlignment="Stretch"
-						VerticalAlignment="Center"
-						Fill="{ThemeResource DividerStrokeColorDefaultBrush}" />
-				</Border>
-
-				<ToggleButton IsEnabled="{x:Bind EnableToggle.IsOn, Mode=TwoWay}" Style="{StaticResource PropertiesExpanderHeaderUpStyle}">
-					<StackPanel Orientation="Horizontal" Spacing="8">
-						<SymbolIcon Symbol="Calendar" />
-						<TextBlock Text="Expander heading text" />
-					</StackPanel>
-				</ToggleButton>
-
-				<Rectangle Height="4" Fill="Red" />
-
-				<ToggleButton
-					Background="DarkOrange"
-					BorderBrush="DarkSeaGreen"
-					BorderThickness="4"
-					IsEnabled="{x:Bind EnableToggle.IsOn, Mode=TwoWay}"
-					Style="{StaticResource PropertiesExpanderHeaderDownStyle}">
-					<StackPanel Orientation="Horizontal" Spacing="8">
-						<SymbolIcon Symbol="Calendar" />
-						<TextBlock Text="Expander heading text" />
-					</StackPanel>
-				</ToggleButton>
-
-				<Border
-					Height="4"
-					Margin="0,0,0,0"
-					HorizontalAlignment="Stretch">
-					<Rectangle
-						Height="1"
-						HorizontalAlignment="Stretch"
-						VerticalAlignment="Center"
-						Fill="{ThemeResource DividerStrokeColorDefaultBrush}" />
-				</Border>
-
-				<ToggleButton
-					Background="DarkOliveGreen"
-					BorderBrush="DarkMagenta"
-					BorderThickness="4"
-					IsEnabled="{x:Bind EnableToggle.IsOn, Mode=TwoWay}"
-					Style="{StaticResource PropertiesExpanderHeaderUpStyle}">
-					<StackPanel Orientation="Horizontal" Spacing="8">
-						<SymbolIcon Symbol="Calendar" />
-						<TextBlock Text="Expander heading text" />
-					</StackPanel>
-				</ToggleButton>
-
-				<Rectangle Height="4" Fill="Red" />
-
-				<ToggleSwitch
-					x:Name="EnableToggle"
-					Header="Enable ToggleButton"
-					IsOn="True"
-					OffContent="Disabled"
-					OnContent="Enabled" />
-
-				<Rectangle Height="4" Fill="Red" />
-
-				<Expander
-					HorizontalAlignment="Stretch"
-					HorizontalContentAlignment="Stretch"
-					Background="#213243"
-					BorderBrush="HotPink"
-					BorderThickness="1"
-					IsEnabled="{x:Bind EnableToggle.IsOn, Mode=TwoWay}"
-					Style="{StaticResource PropertiesExpanderStyle}">
 					<Expander.Content>
 						<StackPanel
 							HorizontalAlignment="Stretch"
-							Background="DarkBlue"
+							Background="#11FF0000"
 							Orientation="Vertical">
-							<TextBlock Text="Customised expander content." />
+							<TextBlock Height="48" Text="Item 1 in the stack" />
+							<MenuFlyoutSeparator />
+							<TextBlock Height="48" Text="Item 2 in the stack" />
+							<MenuFlyoutSeparator />
+							<TextBlock Height="48" Text="Item 3 in the stack" />
 						</StackPanel>
 					</Expander.Content>
-					<Expander.Header>
-						<Grid>
-							<Grid.ColumnDefinitions>
-								<ColumnDefinition Width="Auto" />
-								<ColumnDefinition Width="*" />
-							</Grid.ColumnDefinitions>
-							<SymbolIcon
-								Grid.Column="0"
-								Margin="0,0,12,0"
-								Symbol="Calendar" />
-							<TextBlock
-								Grid.Column="1"
-								Margin="0,4"
-								HorizontalAlignment="Left"
-								Text="Custom expander heading text, made extra long to test how it may wrap when there is not enough space to display it on a single line."
-								TextWrapping="WrapWholeWords" />
-						</Grid>
-					</Expander.Header>
 				</Expander>
 
 
+				<Expander Style="{StaticResource PropertiesExpanderStyle}">
+					<Expander.Header>
+						<TextBlock Text="Again header goes here" />
+					</Expander.Header>
 
-				<Border
-					Height="4"
-					Margin="0,0,0,0"
-					HorizontalAlignment="Stretch">
-					<Rectangle
-						Height="1"
-						HorizontalAlignment="Stretch"
-						VerticalAlignment="Center"
-						Fill="{ThemeResource DividerStrokeColorDefaultBrush}" />
-				</Border>
-
-				<Expander
-					HorizontalAlignment="Stretch"
-					HorizontalContentAlignment="Stretch"
-					IsEnabled="{x:Bind EnableToggle.IsOn, Mode=TwoWay}"
-					Style="{StaticResource PropertiesExpanderStyle}">
 					<Expander.Content>
-						<StackPanel HorizontalAlignment="Stretch" Orientation="Vertical">
-							<TextBlock Text="Customised expander content." />
+						<StackPanel
+							HorizontalAlignment="Stretch"
+							Background="#1100FF00"
+							Orientation="Vertical">
+							<TextBlock Height="48" Text="Item 1 in the stack" />
+							<MenuFlyoutSeparator />
+							<TextBlock Height="48" Text="Item 2 in the stack" />
+							<MenuFlyoutSeparator />
+							<TextBlock Height="48" Text="Item 3 in the stack" />
 						</StackPanel>
 					</Expander.Content>
-					<Expander.Header>
-						<Grid>
-							<Grid.ColumnDefinitions>
-								<ColumnDefinition Width="Auto" />
-								<ColumnDefinition Width="*" />
-							</Grid.ColumnDefinitions>
-							<SymbolIcon
-								Grid.Column="0"
-								Margin="0,0,12,0"
-								Symbol="Calendar" />
-							<TextBlock
-								Grid.Column="1"
-								Margin="0,4"
-								HorizontalAlignment="Left"
-								Text="Custom expander heading text."
-								TextWrapping="WrapWholeWords" />
-						</Grid>
-					</Expander.Header>
 				</Expander>
-
-
-
-				<Border
-					Height="4"
-					Margin="0,0,0,0"
-					HorizontalAlignment="Stretch">
-					<Rectangle
-						Height="1"
-						HorizontalAlignment="Stretch"
-						VerticalAlignment="Center"
-						Fill="{ThemeResource DividerStrokeColorDefaultBrush}" />
-				</Border>
-
 			</StackPanel>
+		</ScrollViewer>
 
-		</Grid>
-
-	</ScrollViewer>
+	</Grid>
 
 </Page>
diff --git a/tests/Files.App.UITests/Views/DialogWindowsPage.xaml b/tests/Files.App.UITests/Views/DialogWindowsPage.xaml
index 5d4bdf751380..98134e2cf6bd 100644
--- a/tests/Files.App.UITests/Views/DialogWindowsPage.xaml
+++ b/tests/Files.App.UITests/Views/DialogWindowsPage.xaml
@@ -15,30 +15,5 @@
 			Click="BtnProperties_Click"
 			Content="Properties dialog" />
 
-		<Border
-			Margin="0,24,0,24"
-			BorderBrush="Red"
-			BorderThickness="1">
-			<StackPanel Padding="24" Orientation="Vertical">
-				<MenuFlyoutItem Text="Menu item text" />
-				<MenuFlyoutItem Text="Menu item text" />
-				<MenuFlyoutSeparator />
-				<MenuFlyoutItem Text="Menu item text" />
-				<MenuFlyoutItem Text="Menu item text" />
-			</StackPanel>
-		</Border>
-
-		<Border
-			Width="64"
-			Height="64"
-			Background="Blue" />
-
-		<Border
-			Width="64"
-			Height="64"
-			Background="Blue"
-			BorderBrush="Yellow"
-			BorderThickness="5" />
-
 	</StackPanel>
 </Page>

From bb686bf564e3f80058ca95b8f8b77642b7bef823 Mon Sep 17 00:00:00 2001
From: Martin Anderson <mdta@live.co.uk>
Date: Wed, 19 Aug 2026 15:22:34 +0100
Subject: [PATCH 06/36] Added PropertiesHeader small UserControl

To be used in the Expander Header to give correct alignment of IconElement and Text to enable wrapping and correct alignment for long headers
---
 .../PropertiesHeader/PropertiesHeader.xaml    | 33 +++++++++++
 .../PropertiesHeader/PropertiesHeader.xaml.cs | 59 +++++++++++++++++++
 .../Files.App.Controls.csproj                 | 10 ++++
 .../Views/PropertiesGeneralPage.xaml          | 42 ++++++++++++-
 4 files changed, 141 insertions(+), 3 deletions(-)
 create mode 100644 src/Files.App.Controls/Dialogs/PropertiesHeader/PropertiesHeader.xaml
 create mode 100644 src/Files.App.Controls/Dialogs/PropertiesHeader/PropertiesHeader.xaml.cs

diff --git a/src/Files.App.Controls/Dialogs/PropertiesHeader/PropertiesHeader.xaml b/src/Files.App.Controls/Dialogs/PropertiesHeader/PropertiesHeader.xaml
new file mode 100644
index 000000000000..cf235ee5f079
--- /dev/null
+++ b/src/Files.App.Controls/Dialogs/PropertiesHeader/PropertiesHeader.xaml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<UserControl
+	x:Class="Files.App.Controls.Dialogs.PropertiesHeader"
+	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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+	mc:Ignorable="d">
+
+
+	<Grid>
+		<Grid.ColumnDefinitions>
+			<ColumnDefinition Width="Auto" />
+			<ColumnDefinition Width="*" />
+		</Grid.ColumnDefinitions>
+		<Viewbox
+			x:Name="IconViewbox"
+			Height="16"
+			Margin="0,0,12,0"
+			HorizontalAlignment="Stretch"
+			AutomationProperties.AccessibilityView="Raw">
+			<ContentPresenter x:Name="Content" Content="{x:Bind Icon}" />
+		</Viewbox>
+		<TextBlock
+			Grid.Column="1"
+			Margin="0,4"
+			HorizontalAlignment="Left"
+			Text="{x:Bind Text}"
+			TextWrapping="WrapWholeWords" />
+	</Grid>
+
+
+</UserControl>
diff --git a/src/Files.App.Controls/Dialogs/PropertiesHeader/PropertiesHeader.xaml.cs b/src/Files.App.Controls/Dialogs/PropertiesHeader/PropertiesHeader.xaml.cs
new file mode 100644
index 000000000000..6bcd469afec2
--- /dev/null
+++ b/src/Files.App.Controls/Dialogs/PropertiesHeader/PropertiesHeader.xaml.cs
@@ -0,0 +1,59 @@
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
+using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Xaml.Navigation;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+
+// To learn more about WinUI, the WinUI project structure,
+// and more about our project templates, see: http://aka.ms/winui-project-info.
+
+namespace Files.App.Controls.Dialogs
+{
+	public sealed partial class PropertiesHeader : UserControl
+	{
+		public IconElement Icon
+		{
+			get { return (IconElement)GetValue( IconProperty ); }
+			set { SetValue( IconProperty , value ); }
+		}
+
+		public static readonly DependencyProperty IconProperty =
+			DependencyProperty.Register(
+				"Icon",
+				typeof(IconElement),
+				typeof(PropertiesHeader),
+				new PropertyMetadata( null ) );
+
+
+
+
+		public string Text
+		{
+			get { return (string)GetValue( TextProperty ); }
+			set { SetValue( TextProperty , value ); }
+		}
+
+		public static readonly DependencyProperty TextProperty =
+			DependencyProperty.Register(
+				"Text",
+				typeof(string),
+				typeof(PropertiesHeader),
+				new PropertyMetadata( null ) );
+
+
+
+		public PropertiesHeader()
+		{
+			this.InitializeComponent();
+		}
+	}
+}
diff --git a/src/Files.App.Controls/Files.App.Controls.csproj b/src/Files.App.Controls/Files.App.Controls.csproj
index e3163abbae46..e3835af5e003 100644
--- a/src/Files.App.Controls/Files.App.Controls.csproj
+++ b/src/Files.App.Controls/Files.App.Controls.csproj
@@ -14,6 +14,10 @@
         <IsAotCompatible>true</IsAotCompatible>
     </PropertyGroup>
 
+    <ItemGroup>
+      <None Remove="Dialogs\PropertiesHeader\PropertiesHeader.xaml" />
+    </ItemGroup>
+
     <ItemGroup>
         <PackageReference Include="CommunityToolkit.WinUI.Extensions" />
         <PackageReference Include="CommunityToolkit.Labs.WinUI.DependencyPropertyGenerator" />
@@ -38,4 +42,10 @@
       </Page>
     </ItemGroup>
 
+    <ItemGroup>
+      <Page Update="Dialogs\PropertiesHeader\PropertiesHeader.xaml">
+        <Generator>MSBuild:Compile</Generator>
+      </Page>
+    </ItemGroup>
+
 </Project>
diff --git a/tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml b/tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml
index d5ab8151f2ad..8110feffadd7 100644
--- a/tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml
+++ b/tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8" ?>
 <Page
 	x:Class="Files.App.UITests.Dialogs.Properties.Views.PropertiesGeneralPage"
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
@@ -6,6 +5,8 @@
 	xmlns:animatedvisuals="using:Microsoft.UI.Xaml.Controls.AnimatedVisuals"
 	xmlns:controls="using:Microsoft.UI.Xaml.Controls"
 	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+	xmlns:dcontrols="using:Files.App.Controls.Dialogs"
+	xmlns:dialogs="using:Files.App.UITests.Dialogs"
 	xmlns:fcontrols="using:Files.App.Controls"
 	xmlns:local="using:Files.App.UITests.Dialogs.Properties.Views"
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -50,7 +51,11 @@
 				Orientation="Vertical">
 				<Expander Style="{StaticResource PropertiesExpanderStyle}">
 					<Expander.Header>
-						<TextBlock Text="Header goes here" />
+						<dcontrols:PropertiesHeader Text="Header text goes here">
+							<dcontrols:PropertiesHeader.Icon>
+								<SymbolIcon Symbol="AddFriend" />
+							</dcontrols:PropertiesHeader.Icon>
+						</dcontrols:PropertiesHeader>
 					</Expander.Header>
 
 					<Expander.Content>
@@ -70,7 +75,11 @@
 
 				<Expander Style="{StaticResource PropertiesExpanderStyle}">
 					<Expander.Header>
-						<TextBlock Text="Again header goes here" />
+						<dcontrols:PropertiesHeader Text="Header text goes here, made extra long to ensure wrapping and arranging within the header works as expected">
+							<dcontrols:PropertiesHeader.Icon>
+								<SymbolIcon Symbol="Comment" />
+							</dcontrols:PropertiesHeader.Icon>
+						</dcontrols:PropertiesHeader>
 					</Expander.Header>
 
 					<Expander.Content>
@@ -86,6 +95,33 @@
 						</StackPanel>
 					</Expander.Content>
 				</Expander>
+
+
+
+
+
+				<Expander Style="{StaticResource PropertiesExpanderStyle}">
+					<Expander.Header>
+						<dcontrols:PropertiesHeader Text="Header text goes here">
+							<dcontrols:PropertiesHeader.Icon>
+								<SymbolIcon Symbol="SlideShow" />
+							</dcontrols:PropertiesHeader.Icon>
+						</dcontrols:PropertiesHeader>
+					</Expander.Header>
+
+					<Expander.Content>
+						<StackPanel
+							HorizontalAlignment="Stretch"
+							Background="#110000FF"
+							Orientation="Vertical">
+							<TextBlock Height="48" Text="Item 1 in the stack" />
+							<MenuFlyoutSeparator />
+							<TextBlock Height="48" Text="Item 2 in the stack" />
+							<MenuFlyoutSeparator />
+							<TextBlock Height="48" Text="Item 3 in the stack" />
+						</StackPanel>
+					</Expander.Content>
+				</Expander>
 			</StackPanel>
 		</ScrollViewer>
 

From 1fd8cf089fbbc8c394783fbbca5737038ad9b4b5 Mon Sep 17 00:00:00 2001
From: Martin Anderson <mdta@live.co.uk>
Date: Wed, 19 Aug 2026 19:13:27 +0100
Subject: [PATCH 07/36] Working on examples of Information display - before
 making them User Controls

---
 .../Views/PropertiesGeneralPage.xaml          | 119 +++++++++++++++++-
 1 file changed, 115 insertions(+), 4 deletions(-)

diff --git a/tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml b/tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml
index 8110feffadd7..e90bdcf8b2e7 100644
--- a/tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml
+++ b/tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml
@@ -13,7 +13,16 @@
 	mc:Ignorable="d">
 
 	<Page.Resources>
-		<ResourceDictionary Source="ms-appx:///Files.App.Controls/Dialogs/DialogResources.xaml" />
+		<ResourceDictionary>
+			<ResourceDictionary.MergedDictionaries>
+
+				<ResourceDictionary Source="ms-appx:///Files.App.Controls/Dialogs/DialogResources.xaml" />
+
+			</ResourceDictionary.MergedDictionaries>
+
+			<GridLength x:Key="LabelWidth">120</GridLength>
+
+		</ResourceDictionary>
 	</Page.Resources>
 
 
@@ -23,19 +32,51 @@
 		HorizontalAlignment="Stretch"
 		VerticalAlignment="Stretch">
 		<Grid.RowDefinitions>
-			<RowDefinition Height="128" />
+			<RowDefinition Height="Auto" />
 			<RowDefinition Height="*" />
 		</Grid.RowDefinitions>
 
 		<Border
 			x:Name="GeneralHeader"
 			Grid.Row="0"
-			Padding="24,16"
+			Padding="24,20"
 			VerticalAlignment="Stretch"
 			BorderBrush="{ThemeResource DividerStrokeColorDefaultBrush}"
 			BorderThickness="0,0,0,1">
 
-			<TextBlock Text="Sticky header area with scrolling below" />
+			<Grid>
+				<Grid.ColumnDefinitions>
+					<ColumnDefinition Width="{StaticResource LabelWidth}" />
+					<ColumnDefinition Width="*" />
+				</Grid.ColumnDefinitions>
+
+				<Border
+					Width="72"
+					Height="72"
+					HorizontalAlignment="Left"
+					VerticalAlignment="Center"
+					Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
+					BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
+					BorderThickness="1"
+					CornerRadius="{ThemeResource OverlayCornerRadius}">
+					<Rectangle
+						Width="48"
+						Height="48"
+						HorizontalAlignment="Center"
+						VerticalAlignment="Center"
+						Fill="Red" />
+				</Border>
+
+				<StackPanel
+					Grid.Column="1"
+					VerticalAlignment="Center"
+					Orientation="Vertical"
+					Spacing="8">
+					<TextBox Text="Filename here" Margin="-12,0,0,0" />
+					<TextBlock Text="Sticky header area with scrolling below" />
+				</StackPanel>
+
+			</Grid>
 
 		</Border>
 
@@ -122,6 +163,76 @@
 						</StackPanel>
 					</Expander.Content>
 				</Expander>
+
+				<Grid
+					Padding="24,6"
+					HorizontalAlignment="Stretch"
+					VerticalAlignment="Center">
+					<Grid.ColumnDefinitions>
+						<ColumnDefinition Width="{StaticResource LabelWidth}" />
+						<ColumnDefinition Width="*" />
+					</Grid.ColumnDefinitions>
+					<Grid.RowDefinitions>
+						<RowDefinition Height="Auto" />
+						<RowDefinition Height="Auto" />
+					</Grid.RowDefinitions>
+					<TextBlock
+						x:Name="Label"
+						Grid.RowSpan="2"
+						Grid.Column="0"
+						Margin="0,2,12,2"
+						VerticalAlignment="Center"
+						Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+						Style="{ThemeResource CaptionTextBlockStyle}"
+						Text="Label Text" />
+					<TextBlock
+						x:Name="Value"
+						Grid.RowSpan="2"
+						Grid.Column="1"
+						Margin="0,2,12,2"
+						VerticalAlignment="Bottom"
+						Text="This is the value text  that is very very long so it wraps at the width set"
+						TextWrapping="WrapWholeWords" />
+				</Grid>
+
+
+				<MenuFlyoutSeparator Margin="24,0" />
+
+				<Grid
+					Padding="24,6"
+					HorizontalAlignment="Stretch"
+					VerticalAlignment="Center">
+					<Grid.ColumnDefinitions>
+						<ColumnDefinition Width="{StaticResource LabelWidth}" />
+						<ColumnDefinition Width="*" />
+					</Grid.ColumnDefinitions>
+					<Grid.RowDefinitions>
+						<RowDefinition Height="Auto" />
+						<RowDefinition Height="Auto" />
+					</Grid.RowDefinitions>
+					<TextBlock
+						x:Name="Label2"
+						Grid.Row="0"
+						Grid.RowSpan="1"
+						Grid.Column="0"
+						Grid.ColumnSpan="2"
+						Margin="0,2,12,2"
+						VerticalAlignment="Center"
+						Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+						Style="{ThemeResource CaptionTextBlockStyle}"
+						Text="Label Text" />
+					<TextBlock
+						x:Name="Value2"
+						Grid.Row="1"
+						Grid.RowSpan="1"
+						Grid.Column="0"
+						Grid.ColumnSpan="2"
+						Margin="0,2,12,2"
+						VerticalAlignment="Bottom"
+						Text="This is the value text  that is very very long so it wraps at the width set"
+						TextWrapping="WrapWholeWords" />
+				</Grid>
+
 			</StackPanel>
 		</ScrollViewer>
 

From e6b8bbfe10c7e8fa2f0476244e514f009bb6c99e Mon Sep 17 00:00:00 2001
From: Martin Anderson <mdta@live.co.uk>
Date: Thu, 20 Aug 2026 02:09:39 +0100
Subject: [PATCH 08/36] Added the first of our PropertiesItem controls, for
 Text

There is an Orientation property
Label and Text string properties
and a LabelWidth GridLength property to ensure alignments can match

There is also a CanEdit bool which swaps out a TextBlock for a TextBox control
---
 .../PropertiesHeader/PropertiesHeader.xaml    |   3 +-
 .../PropertiesHeader/PropertiesHeader.xaml.cs |   2 +-
 .../PropertiesItemText.xaml                   | 117 +++++++++++++
 .../PropertiesItemText.xaml.cs                | 162 ++++++++++++++++++
 .../Files.App.Controls.csproj                 |   7 +
 .../Views/PropertiesGeneralPage.xaml          | 118 ++++---------
 .../Views/PropertiesGeneralPage.xaml.cs       |  18 +-
 7 files changed, 336 insertions(+), 91 deletions(-)
 create mode 100644 src/Files.App.Controls/Dialogs/PropertiesItemText/PropertiesItemText.xaml
 create mode 100644 src/Files.App.Controls/Dialogs/PropertiesItemText/PropertiesItemText.xaml.cs

diff --git a/src/Files.App.Controls/Dialogs/PropertiesHeader/PropertiesHeader.xaml b/src/Files.App.Controls/Dialogs/PropertiesHeader/PropertiesHeader.xaml
index cf235ee5f079..98024255cb0c 100644
--- a/src/Files.App.Controls/Dialogs/PropertiesHeader/PropertiesHeader.xaml
+++ b/src/Files.App.Controls/Dialogs/PropertiesHeader/PropertiesHeader.xaml
@@ -19,9 +19,10 @@
 			Margin="0,0,12,0"
 			HorizontalAlignment="Stretch"
 			AutomationProperties.AccessibilityView="Raw">
-			<ContentPresenter x:Name="Content" Content="{x:Bind Icon}" />
+			<ContentPresenter x:Name="Content_PART" Content="{x:Bind Icon}" />
 		</Viewbox>
 		<TextBlock
+			x:Name="Text_PART"
 			Grid.Column="1"
 			Margin="0,4"
 			HorizontalAlignment="Left"
diff --git a/src/Files.App.Controls/Dialogs/PropertiesHeader/PropertiesHeader.xaml.cs b/src/Files.App.Controls/Dialogs/PropertiesHeader/PropertiesHeader.xaml.cs
index 6bcd469afec2..592ad1727527 100644
--- a/src/Files.App.Controls/Dialogs/PropertiesHeader/PropertiesHeader.xaml.cs
+++ b/src/Files.App.Controls/Dialogs/PropertiesHeader/PropertiesHeader.xaml.cs
@@ -47,7 +47,7 @@ public string Text
 				"Text",
 				typeof(string),
 				typeof(PropertiesHeader),
-				new PropertyMetadata( null ) );
+				new PropertyMetadata( string.Empty ) );
 
 
 
diff --git a/src/Files.App.Controls/Dialogs/PropertiesItemText/PropertiesItemText.xaml b/src/Files.App.Controls/Dialogs/PropertiesItemText/PropertiesItemText.xaml
new file mode 100644
index 000000000000..772f62dcfad2
--- /dev/null
+++ b/src/Files.App.Controls/Dialogs/PropertiesItemText/PropertiesItemText.xaml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<UserControl
+	x:Class="Files.App.Controls.Dialogs.PropertiesItemText"
+	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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+	mc:Ignorable="d">
+	<Grid
+		Padding="12,6"
+		HorizontalAlignment="Stretch"
+		VerticalAlignment="Stretch">
+		<Grid.ColumnDefinitions>
+			<ColumnDefinition Width="{x:Bind LabelWidth}" />
+			<ColumnDefinition Width="*" />
+		</Grid.ColumnDefinitions>
+		<Grid.RowDefinitions>
+			<RowDefinition Height="Auto" />
+			<RowDefinition Height="Auto" />
+		</Grid.RowDefinitions>
+
+		<TextBlock
+			x:Name="Label_PART"
+			Grid.Row="0"
+			Grid.RowSpan="2"
+			Grid.Column="0"
+			Grid.ColumnSpan="1"
+			Margin="0,2,12,2"
+			VerticalAlignment="Center"
+			Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+			Style="{ThemeResource CaptionTextBlockStyle}"
+			Text="{x:Bind Label}" />
+
+		<TextBlock
+			x:Name="Text_PART"
+			Grid.Row="0"
+			Grid.RowSpan="2"
+			Grid.Column="1"
+			Grid.ColumnSpan="1"
+			Margin="0,2,12,2"
+			VerticalAlignment="Center"
+			Text="{x:Bind Text, Mode=TwoWay}"
+			TextWrapping="WrapWholeWords"
+			Visibility="Visible" />
+
+		<TextBox
+			x:Name="TextEdit_PART"
+			Grid.Row="0"
+			Grid.RowSpan="2"
+			Grid.Column="1"
+			Grid.ColumnSpan="1"
+			Margin="-12,2,0,2"
+			VerticalAlignment="Center"
+			Text="{x:Bind Text, Mode=TwoWay}"
+			Visibility="Collapsed" />
+
+
+
+
+		<VisualStateManager.VisualStateGroups>
+			<VisualStateGroup x:Name="EditableStates">
+				<VisualState x:Name="NotEditableState">
+					<VisualState.Setters>
+						<Setter Target="TextEdit_PART.Visibility" Value="Collapsed" />
+						<Setter Target="Text_PART.Visibility" Value="Visible" />
+					</VisualState.Setters>
+				</VisualState>
+				<VisualState x:Name="EditableState">
+					<VisualState.Setters>
+						<Setter Target="TextEdit_PART.Visibility" Value="Visible" />
+						<Setter Target="Text_PART.Visibility" Value="Collapsed" />
+					</VisualState.Setters>
+				</VisualState>
+			</VisualStateGroup>
+			<VisualStateGroup x:Name="OrientationStates">
+				<VisualState x:Name="HorizontalState">
+					<VisualState.Setters>
+						<Setter Target="Label_PART.(Grid.Row)" Value="0" />
+						<Setter Target="Label_PART.(Grid.RowSpan)" Value="2" />
+						<Setter Target="Label_PART.(Grid.Column)" Value="0" />
+						<Setter Target="Label_PART.(Grid.ColumnSpan)" Value="1" />
+
+						<Setter Target="TextEdit_PART.(Grid.Row)" Value="0" />
+						<Setter Target="TextEdit_PART.(Grid.RowSpan)" Value="2" />
+						<Setter Target="TextEdit_PART.(Grid.Column)" Value="1" />
+						<Setter Target="TextEdit_PART.(Grid.ColumnSpan)" Value="1" />
+
+						<Setter Target="Text_PART.(Grid.Row)" Value="0" />
+						<Setter Target="Text_PART.(Grid.RowSpan)" Value="2" />
+						<Setter Target="Text_PART.(Grid.Column)" Value="1" />
+						<Setter Target="Text_PART.(Grid.ColumnSpan)" Value="1" />
+					</VisualState.Setters>
+				</VisualState>
+
+				<VisualState x:Name="VerticalState">
+					<VisualState.Setters>
+						<Setter Target="Label_PART.(Grid.Row)" Value="0" />
+						<Setter Target="Label_PART.(Grid.RowSpan)" Value="1" />
+						<Setter Target="Label_PART.(Grid.Column)" Value="0" />
+						<Setter Target="Label_PART.(Grid.ColumnSpan)" Value="2" />
+
+						<Setter Target="TextEdit_PART.(Grid.Row)" Value="1" />
+						<Setter Target="TextEdit_PART.(Grid.RowSpan)" Value="1" />
+						<Setter Target="TextEdit_PART.(Grid.Column)" Value="0" />
+						<Setter Target="TextEdit_PART.(Grid.ColumnSpan)" Value="2" />
+
+						<Setter Target="Text_PART.(Grid.Row)" Value="1" />
+						<Setter Target="Text_PART.(Grid.RowSpan)" Value="1" />
+						<Setter Target="Text_PART.(Grid.Column)" Value="0" />
+						<Setter Target="Text_PART.(Grid.ColumnSpan)" Value="2" />
+					</VisualState.Setters>
+				</VisualState>
+			</VisualStateGroup>
+		</VisualStateManager.VisualStateGroups>
+	</Grid>
+
+</UserControl>
diff --git a/src/Files.App.Controls/Dialogs/PropertiesItemText/PropertiesItemText.xaml.cs b/src/Files.App.Controls/Dialogs/PropertiesItemText/PropertiesItemText.xaml.cs
new file mode 100644
index 000000000000..9b5c61c4f750
--- /dev/null
+++ b/src/Files.App.Controls/Dialogs/PropertiesItemText/PropertiesItemText.xaml.cs
@@ -0,0 +1,162 @@
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
+using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Xaml.Navigation;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Reflection.Metadata.Ecma335;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+
+// To learn more about WinUI, the WinUI project structure,
+// and more about our project templates, see: http://aka.ms/winui-project-info.
+
+namespace Files.App.Controls.Dialogs
+{
+	public sealed partial class PropertiesItemText : UserControl
+	{
+		public string Label
+		{
+			get { return (string)GetValue( LabelProperty ); }
+			set { SetValue( LabelProperty , value ); }
+		}
+
+		public static readonly DependencyProperty LabelProperty =
+			DependencyProperty.Register(
+				"Label",
+				typeof(string),
+				typeof(PropertiesItemText),
+				new PropertyMetadata( string.Empty ) );
+
+
+
+
+		public string Text
+		{
+			get { return (string)GetValue( TextProperty ); }
+			set { SetValue( TextProperty , value ); }
+		}
+
+		public static readonly DependencyProperty TextProperty =
+			DependencyProperty.Register(
+				"Text",
+				typeof(string),
+				typeof(PropertiesItemText),
+				new PropertyMetadata( string.Empty ) );
+
+
+
+
+		public GridLength LabelWidth
+		{
+			get { return (GridLength)GetValue( LabelWidthProperty ); }
+			set { SetValue( LabelWidthProperty , value ); }
+		}
+
+		public static readonly DependencyProperty LabelWidthProperty =
+			DependencyProperty.Register(
+				"LabelWidth",
+				typeof(GridLength),
+				typeof(PropertiesItemText),
+				new PropertyMetadata(new GridLength(80, GridUnitType.Pixel)));
+
+
+
+
+		public bool CanEdit
+		{
+			get { return (bool)GetValue( CanEditProperty ); }
+			set { SetValue( CanEditProperty , value ); }
+		}
+
+		public static readonly DependencyProperty CanEditProperty =
+			DependencyProperty.Register(
+				"CanEdit",
+				typeof(bool),
+				typeof(PropertiesItemText),
+				new PropertyMetadata( false, OnCanEditPropertyChanged ) );
+
+
+
+
+		public Orientation Orientation
+		{
+			get => (Orientation)GetValue( OrientationProperty );
+			set => SetValue( OrientationProperty , value );
+		}
+
+		public static readonly DependencyProperty OrientationProperty =
+			DependencyProperty.Register(
+				"Orientation",
+				typeof(Orientation),
+				typeof(PropertiesItemText),
+				new PropertyMetadata(Orientation.Horizontal, OnOrientationChanged));
+
+
+
+
+		private bool _isLoaded;
+
+		public PropertiesItemText()
+		{
+			InitializeComponent();
+
+			this.Loaded += (s , e) =>
+			{
+				_isLoaded = true;
+				UpdateOrientationState( Orientation );
+				UpdateCanEditState( CanEdit );
+			};
+		}
+
+
+
+
+		private static void OnOrientationChanged(DependencyObject d , DependencyPropertyChangedEventArgs e)
+		{
+			var control = (PropertiesItemText)d;
+			control.UpdateOrientationState( (Orientation)e.NewValue );
+		}
+
+
+		private void UpdateOrientationState(Orientation orientation)
+		{
+			if ( orientation == Orientation.Horizontal )
+			{
+				VisualStateManager.GoToState( this , "HorizontalState" , false );
+			}
+			else
+			{
+				VisualStateManager.GoToState( this , "VerticalState" , false );
+			}
+		}
+
+
+
+
+		private static void OnCanEditPropertyChanged(DependencyObject d , DependencyPropertyChangedEventArgs e)
+		{
+			var control = (PropertiesItemText)d;
+			control.UpdateCanEditState( (bool)e.NewValue );
+		}
+
+
+		private void UpdateCanEditState(bool canEdit)
+		{
+			if ( canEdit == true)
+			{
+				VisualStateManager.GoToState( this , "EditableState" , false );
+			}
+			else
+			{
+				VisualStateManager.GoToState( this , "NonEditableState" , false );
+			}
+		}
+	}
+}
diff --git a/src/Files.App.Controls/Files.App.Controls.csproj b/src/Files.App.Controls/Files.App.Controls.csproj
index e3835af5e003..588f7a739d0c 100644
--- a/src/Files.App.Controls/Files.App.Controls.csproj
+++ b/src/Files.App.Controls/Files.App.Controls.csproj
@@ -16,6 +16,7 @@
 
     <ItemGroup>
       <None Remove="Dialogs\PropertiesHeader\PropertiesHeader.xaml" />
+      <None Remove="Dialogs\PropertiesItemText\PropertiesItemText.xaml" />
     </ItemGroup>
 
     <ItemGroup>
@@ -48,4 +49,10 @@
       </Page>
     </ItemGroup>
 
+    <ItemGroup>
+      <Page Update="Dialogs\PropertiesItemText\PropertiesItemText.xaml">
+        <Generator>MSBuild:Compile</Generator>
+      </Page>
+    </ItemGroup>
+
 </Project>
diff --git a/tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml b/tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml
index e90bdcf8b2e7..54bfc1f5c176 100644
--- a/tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml
+++ b/tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml
@@ -72,7 +72,7 @@
 					VerticalAlignment="Center"
 					Orientation="Vertical"
 					Spacing="8">
-					<TextBox Text="Filename here" Margin="-12,0,0,0" />
+					<TextBox Margin="-12,0,0,0" Text="Filename here" />
 					<TextBlock Text="Sticky header area with scrolling below" />
 				</StackPanel>
 
@@ -90,7 +90,7 @@
 				Margin="0,0,0,32"
 				HorizontalAlignment="Stretch"
 				Orientation="Vertical">
-				<Expander Style="{StaticResource PropertiesExpanderStyle}">
+				<Expander IsExpanded="True" Style="{StaticResource PropertiesExpanderStyle}">
 					<Expander.Header>
 						<dcontrols:PropertiesHeader Text="Header text goes here">
 							<dcontrols:PropertiesHeader.Icon>
@@ -100,15 +100,29 @@
 					</Expander.Header>
 
 					<Expander.Content>
+
 						<StackPanel
+							Padding="0,0,0,8"
 							HorizontalAlignment="Stretch"
-							Background="#11FF0000"
 							Orientation="Vertical">
-							<TextBlock Height="48" Text="Item 1 in the stack" />
+							<dcontrols:PropertiesItemText
+								CanEdit="True"
+								LabelWidth="{StaticResource LabelWidth}"
+								Label="Item label 1"
+								Orientation="Horizontal"
+								Text="Item value 1 text here" />
 							<MenuFlyoutSeparator />
-							<TextBlock Height="48" Text="Item 2 in the stack" />
+							<dcontrols:PropertiesItemText
+								Label="Item label t00"
+								LabelWidth="{StaticResource LabelWidth}"
+								Orientation="Horizontal"
+								Text="Item value t00 text here" />
 							<MenuFlyoutSeparator />
-							<TextBlock Height="48" Text="Item 3 in the stack" />
+							<dcontrols:PropertiesItemText
+								Label="Item label three"
+								LabelWidth="{StaticResource LabelWidth}"
+								Orientation="Horizontal"
+								Text="Item value three text here" />
 						</StackPanel>
 					</Expander.Content>
 				</Expander>
@@ -125,14 +139,26 @@
 
 					<Expander.Content>
 						<StackPanel
+							Padding="0,0,0,8"
 							HorizontalAlignment="Stretch"
-							Background="#1100FF00"
 							Orientation="Vertical">
-							<TextBlock Height="48" Text="Item 1 in the stack" />
-							<MenuFlyoutSeparator />
-							<TextBlock Height="48" Text="Item 2 in the stack" />
-							<MenuFlyoutSeparator />
-							<TextBlock Height="48" Text="Item 3 in the stack" />
+							<dcontrols:PropertiesItemText
+								LabelWidth="{StaticResource LabelWidth}"
+								Label="Item label 1"
+								Orientation="Vertical"
+								Text="Item value 1 text here" />
+							<MenuFlyoutSeparator Margin="16,0" />
+							<dcontrols:PropertiesItemText
+								Label="Item label t00"
+								Orientation="Vertical"
+								Text="Item value t00 text here" />
+							<MenuFlyoutSeparator Margin="16,0" />
+							<dcontrols:PropertiesItemText
+								LabelWidth="{StaticResource LabelWidth}"
+								CanEdit="True"
+								Label="Item label three"
+								Orientation="Vertical"
+								Text="Item value three text here" />
 						</StackPanel>
 					</Expander.Content>
 				</Expander>
@@ -164,74 +190,6 @@
 					</Expander.Content>
 				</Expander>
 
-				<Grid
-					Padding="24,6"
-					HorizontalAlignment="Stretch"
-					VerticalAlignment="Center">
-					<Grid.ColumnDefinitions>
-						<ColumnDefinition Width="{StaticResource LabelWidth}" />
-						<ColumnDefinition Width="*" />
-					</Grid.ColumnDefinitions>
-					<Grid.RowDefinitions>
-						<RowDefinition Height="Auto" />
-						<RowDefinition Height="Auto" />
-					</Grid.RowDefinitions>
-					<TextBlock
-						x:Name="Label"
-						Grid.RowSpan="2"
-						Grid.Column="0"
-						Margin="0,2,12,2"
-						VerticalAlignment="Center"
-						Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-						Style="{ThemeResource CaptionTextBlockStyle}"
-						Text="Label Text" />
-					<TextBlock
-						x:Name="Value"
-						Grid.RowSpan="2"
-						Grid.Column="1"
-						Margin="0,2,12,2"
-						VerticalAlignment="Bottom"
-						Text="This is the value text  that is very very long so it wraps at the width set"
-						TextWrapping="WrapWholeWords" />
-				</Grid>
-
-
-				<MenuFlyoutSeparator Margin="24,0" />
-
-				<Grid
-					Padding="24,6"
-					HorizontalAlignment="Stretch"
-					VerticalAlignment="Center">
-					<Grid.ColumnDefinitions>
-						<ColumnDefinition Width="{StaticResource LabelWidth}" />
-						<ColumnDefinition Width="*" />
-					</Grid.ColumnDefinitions>
-					<Grid.RowDefinitions>
-						<RowDefinition Height="Auto" />
-						<RowDefinition Height="Auto" />
-					</Grid.RowDefinitions>
-					<TextBlock
-						x:Name="Label2"
-						Grid.Row="0"
-						Grid.RowSpan="1"
-						Grid.Column="0"
-						Grid.ColumnSpan="2"
-						Margin="0,2,12,2"
-						VerticalAlignment="Center"
-						Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-						Style="{ThemeResource CaptionTextBlockStyle}"
-						Text="Label Text" />
-					<TextBlock
-						x:Name="Value2"
-						Grid.Row="1"
-						Grid.RowSpan="1"
-						Grid.Column="0"
-						Grid.ColumnSpan="2"
-						Margin="0,2,12,2"
-						VerticalAlignment="Bottom"
-						Text="This is the value text  that is very very long so it wraps at the width set"
-						TextWrapping="WrapWholeWords" />
-				</Grid>
 
 			</StackPanel>
 		</ScrollViewer>
diff --git a/tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml.cs b/tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml.cs
index 20005de90ba0..e4a2fb7bf2ea 100644
--- a/tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml.cs
+++ b/tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml.cs
@@ -18,14 +18,14 @@
 
 namespace Files.App.UITests.Dialogs.Properties.Views
 {
-	/// <summary>
-	/// An empty page that can be used on its own or navigated to within a Frame.
-	/// </summary>
-	public sealed partial class PropertiesGeneralPage : Page
-	{
-		public PropertiesGeneralPage()
-		{
-			InitializeComponent();
-		}
+    /// <summary>
+    /// An empty page that can be used on its own or navigated to within a Frame.
+    /// </summary>
+    public sealed partial class PropertiesGeneralPage : Page
+    {
+        public PropertiesGeneralPage()
+        {
+            InitializeComponent();
+        }
     }
 }

From 18a51bf2cfdf55083ba0400a71ee79963fb6bdf6 Mon Sep 17 00:00:00 2001
From: 0x5BFA <62196528+0x5bfa@users.noreply.github.com>
Date: Thu, 20 Aug 2026 21:10:50 +0900
Subject: [PATCH 09/36] Update the folder

---
 .../Files.App.Controls.csproj                 | 23 -------------------
 .../PropertiesHeader.xaml                     |  2 +-
 .../PropertiesHeader.xaml.cs                  |  0
 .../PropertiesItemText.xaml                   |  2 +-
 .../PropertiesItemText.xaml.cs                |  0
 .../PropertiesView.ThemeResources.xaml}       |  2 +-
 .../Sidebar/SidebarStyles.xaml                |  4 +---
 src/Files.App.Controls/Themes/Generic.xaml    |  2 +-
 .../Dialogs/Properties/PropertiesDialog.xaml  |  2 +-
 .../Views/PropertiesGeneralPage.xaml          |  9 ++++----
 10 files changed, 11 insertions(+), 35 deletions(-)
 rename src/Files.App.Controls/{Dialogs/PropertiesHeader => PropertiesView}/PropertiesHeader.xaml (92%)
 rename src/Files.App.Controls/{Dialogs/PropertiesHeader => PropertiesView}/PropertiesHeader.xaml.cs (100%)
 rename src/Files.App.Controls/{Dialogs/PropertiesItemText => PropertiesView}/PropertiesItemText.xaml (98%)
 rename src/Files.App.Controls/{Dialogs/PropertiesItemText => PropertiesView}/PropertiesItemText.xaml.cs (100%)
 rename src/Files.App.Controls/{Dialogs/DialogResources.xaml => PropertiesView/PropertiesView.ThemeResources.xaml} (99%)

diff --git a/src/Files.App.Controls/Files.App.Controls.csproj b/src/Files.App.Controls/Files.App.Controls.csproj
index 588f7a739d0c..893bd4013f89 100644
--- a/src/Files.App.Controls/Files.App.Controls.csproj
+++ b/src/Files.App.Controls/Files.App.Controls.csproj
@@ -14,11 +14,6 @@
         <IsAotCompatible>true</IsAotCompatible>
     </PropertyGroup>
 
-    <ItemGroup>
-      <None Remove="Dialogs\PropertiesHeader\PropertiesHeader.xaml" />
-      <None Remove="Dialogs\PropertiesItemText\PropertiesItemText.xaml" />
-    </ItemGroup>
-
     <ItemGroup>
         <PackageReference Include="CommunityToolkit.WinUI.Extensions" />
         <PackageReference Include="CommunityToolkit.Labs.WinUI.DependencyPropertyGenerator" />
@@ -37,22 +32,4 @@
         <ProjectReference Include="..\Files.Core.SourceGenerator\Files.Core.SourceGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
     </ItemGroup>
 
-    <ItemGroup>
-      <Page Update="Dialogs\DialogResources.xaml">
-        <SubType>Designer</SubType>
-      </Page>
-    </ItemGroup>
-
-    <ItemGroup>
-      <Page Update="Dialogs\PropertiesHeader\PropertiesHeader.xaml">
-        <Generator>MSBuild:Compile</Generator>
-      </Page>
-    </ItemGroup>
-
-    <ItemGroup>
-      <Page Update="Dialogs\PropertiesItemText\PropertiesItemText.xaml">
-        <Generator>MSBuild:Compile</Generator>
-      </Page>
-    </ItemGroup>
-
 </Project>
diff --git a/src/Files.App.Controls/Dialogs/PropertiesHeader/PropertiesHeader.xaml b/src/Files.App.Controls/PropertiesView/PropertiesHeader.xaml
similarity index 92%
rename from src/Files.App.Controls/Dialogs/PropertiesHeader/PropertiesHeader.xaml
rename to src/Files.App.Controls/PropertiesView/PropertiesHeader.xaml
index 98024255cb0c..e32de875938b 100644
--- a/src/Files.App.Controls/Dialogs/PropertiesHeader/PropertiesHeader.xaml
+++ b/src/Files.App.Controls/PropertiesView/PropertiesHeader.xaml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<!--  Copyright (c) Files Community. SPDX-License-Identifier: MPL-2.0  -->
 <UserControl
 	x:Class="Files.App.Controls.Dialogs.PropertiesHeader"
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
diff --git a/src/Files.App.Controls/Dialogs/PropertiesHeader/PropertiesHeader.xaml.cs b/src/Files.App.Controls/PropertiesView/PropertiesHeader.xaml.cs
similarity index 100%
rename from src/Files.App.Controls/Dialogs/PropertiesHeader/PropertiesHeader.xaml.cs
rename to src/Files.App.Controls/PropertiesView/PropertiesHeader.xaml.cs
diff --git a/src/Files.App.Controls/Dialogs/PropertiesItemText/PropertiesItemText.xaml b/src/Files.App.Controls/PropertiesView/PropertiesItemText.xaml
similarity index 98%
rename from src/Files.App.Controls/Dialogs/PropertiesItemText/PropertiesItemText.xaml
rename to src/Files.App.Controls/PropertiesView/PropertiesItemText.xaml
index 772f62dcfad2..012a3c280f21 100644
--- a/src/Files.App.Controls/Dialogs/PropertiesItemText/PropertiesItemText.xaml
+++ b/src/Files.App.Controls/PropertiesView/PropertiesItemText.xaml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<!--  Copyright (c) Files Community. SPDX-License-Identifier: MPL-2.0  -->
 <UserControl
 	x:Class="Files.App.Controls.Dialogs.PropertiesItemText"
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
diff --git a/src/Files.App.Controls/Dialogs/PropertiesItemText/PropertiesItemText.xaml.cs b/src/Files.App.Controls/PropertiesView/PropertiesItemText.xaml.cs
similarity index 100%
rename from src/Files.App.Controls/Dialogs/PropertiesItemText/PropertiesItemText.xaml.cs
rename to src/Files.App.Controls/PropertiesView/PropertiesItemText.xaml.cs
diff --git a/src/Files.App.Controls/Dialogs/DialogResources.xaml b/src/Files.App.Controls/PropertiesView/PropertiesView.ThemeResources.xaml
similarity index 99%
rename from src/Files.App.Controls/Dialogs/DialogResources.xaml
rename to src/Files.App.Controls/PropertiesView/PropertiesView.ThemeResources.xaml
index 2c2fc27faf6c..d9746067bbb5 100644
--- a/src/Files.App.Controls/Dialogs/DialogResources.xaml
+++ b/src/Files.App.Controls/PropertiesView/PropertiesView.ThemeResources.xaml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<!--  Copyright (c) Files Community. SPDX-License-Identifier: MPL-2.0  -->
 <ResourceDictionary
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/src/Files.App.Controls/Sidebar/SidebarStyles.xaml b/src/Files.App.Controls/Sidebar/SidebarStyles.xaml
index b3ab9b44b1e8..35f34632f88c 100644
--- a/src/Files.App.Controls/Sidebar/SidebarStyles.xaml
+++ b/src/Files.App.Controls/Sidebar/SidebarStyles.xaml
@@ -109,9 +109,7 @@
 									RadiusY="2" />
 
 								<!--  Depth indent spacer (width = NestingLevel * 16)  -->
-								<Border
-									Grid.Column="1"
-									Width="{TemplateBinding IndentWidth}" />
+								<Border Grid.Column="1" Width="{TemplateBinding IndentWidth}" />
 
 								<!--  Own pointer surface so chevron clicks only toggle expansion (no row invoke / selection).  -->
 								<Border
diff --git a/src/Files.App.Controls/Themes/Generic.xaml b/src/Files.App.Controls/Themes/Generic.xaml
index af057943850f..055321ef0911 100644
--- a/src/Files.App.Controls/Themes/Generic.xaml
+++ b/src/Files.App.Controls/Themes/Generic.xaml
@@ -76,7 +76,7 @@
 		<!--#endregion-->
 
 		<!--#region Dialog Resources-->
-		<ResourceDictionary Source="ms-appx:///Files.App.Controls/Dialogs/DialogResources.xaml" />
+		<ResourceDictionary Source="ms-appx:///Files.App.Controls/PropertiesView/PropertiesView.ThemeResources.xaml" />
 		<!--#endregion-->
 
 	</ResourceDictionary.MergedDictionaries>
diff --git a/tests/Files.App.UITests/Dialogs/Properties/PropertiesDialog.xaml b/tests/Files.App.UITests/Dialogs/Properties/PropertiesDialog.xaml
index 7aedfb2a82ff..800accdc5b25 100644
--- a/tests/Files.App.UITests/Dialogs/Properties/PropertiesDialog.xaml
+++ b/tests/Files.App.UITests/Dialogs/Properties/PropertiesDialog.xaml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<!--  Copyright (c) Files Community. SPDX-License-Identifier: MPL-2.0  -->
 <Window
 	x:Class="Files.App.UITests.Dialogs.PropertiesDialog"
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
diff --git a/tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml b/tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml
index 54bfc1f5c176..cea5fc772600 100644
--- a/tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml
+++ b/tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml
@@ -1,3 +1,4 @@
+<!--  Copyright (c) Files Community. SPDX-License-Identifier: MPL-2.0  -->
 <Page
 	x:Class="Files.App.UITests.Dialogs.Properties.Views.PropertiesGeneralPage"
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
@@ -16,7 +17,7 @@
 		<ResourceDictionary>
 			<ResourceDictionary.MergedDictionaries>
 
-				<ResourceDictionary Source="ms-appx:///Files.App.Controls/Dialogs/DialogResources.xaml" />
+				<!--<ResourceDictionary Source="ms-appx:///Files.App.Controls/Dialogs/DialogResources.xaml" />-->
 
 			</ResourceDictionary.MergedDictionaries>
 
@@ -107,8 +108,8 @@
 							Orientation="Vertical">
 							<dcontrols:PropertiesItemText
 								CanEdit="True"
-								LabelWidth="{StaticResource LabelWidth}"
 								Label="Item label 1"
+								LabelWidth="{StaticResource LabelWidth}"
 								Orientation="Horizontal"
 								Text="Item value 1 text here" />
 							<MenuFlyoutSeparator />
@@ -143,8 +144,8 @@
 							HorizontalAlignment="Stretch"
 							Orientation="Vertical">
 							<dcontrols:PropertiesItemText
-								LabelWidth="{StaticResource LabelWidth}"
 								Label="Item label 1"
+								LabelWidth="{StaticResource LabelWidth}"
 								Orientation="Vertical"
 								Text="Item value 1 text here" />
 							<MenuFlyoutSeparator Margin="16,0" />
@@ -154,9 +155,9 @@
 								Text="Item value t00 text here" />
 							<MenuFlyoutSeparator Margin="16,0" />
 							<dcontrols:PropertiesItemText
-								LabelWidth="{StaticResource LabelWidth}"
 								CanEdit="True"
 								Label="Item label three"
+								LabelWidth="{StaticResource LabelWidth}"
 								Orientation="Vertical"
 								Text="Item value three text here" />
 						</StackPanel>

From 2430978812f92cedcca514a578013e5365b06f57 Mon Sep 17 00:00:00 2001
From: Martin Anderson <mdta@live.co.uk>
Date: Thu, 20 Aug 2026 14:03:26 +0100
Subject: [PATCH 10/36] Corrected Namespaces following changes made by @0x5bfa

---
 .../PropertiesView/PropertiesHeader.xaml      |  2 +-
 .../PropertiesView/PropertiesHeader.xaml.cs   |  2 +-
 .../PropertiesView/PropertiesItemText.xaml    |  2 +-
 .../PropertiesView/PropertiesItemText.xaml.cs |  2 +-
 .../Views/PropertiesGeneralPage.xaml          | 38 +++++++++----------
 5 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/src/Files.App.Controls/PropertiesView/PropertiesHeader.xaml b/src/Files.App.Controls/PropertiesView/PropertiesHeader.xaml
index e32de875938b..7856a3d94831 100644
--- a/src/Files.App.Controls/PropertiesView/PropertiesHeader.xaml
+++ b/src/Files.App.Controls/PropertiesView/PropertiesHeader.xaml
@@ -1,6 +1,6 @@
 <!--  Copyright (c) Files Community. SPDX-License-Identifier: MPL-2.0  -->
 <UserControl
-	x:Class="Files.App.Controls.Dialogs.PropertiesHeader"
+	x:Class="Files.App.Controls.PropertiesHeader"
 	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"
diff --git a/src/Files.App.Controls/PropertiesView/PropertiesHeader.xaml.cs b/src/Files.App.Controls/PropertiesView/PropertiesHeader.xaml.cs
index 592ad1727527..eea323eb71ba 100644
--- a/src/Files.App.Controls/PropertiesView/PropertiesHeader.xaml.cs
+++ b/src/Files.App.Controls/PropertiesView/PropertiesHeader.xaml.cs
@@ -16,7 +16,7 @@
 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.
 
-namespace Files.App.Controls.Dialogs
+namespace Files.App.Controls
 {
 	public sealed partial class PropertiesHeader : UserControl
 	{
diff --git a/src/Files.App.Controls/PropertiesView/PropertiesItemText.xaml b/src/Files.App.Controls/PropertiesView/PropertiesItemText.xaml
index 012a3c280f21..1b68e7718e05 100644
--- a/src/Files.App.Controls/PropertiesView/PropertiesItemText.xaml
+++ b/src/Files.App.Controls/PropertiesView/PropertiesItemText.xaml
@@ -1,6 +1,6 @@
 <!--  Copyright (c) Files Community. SPDX-License-Identifier: MPL-2.0  -->
 <UserControl
-	x:Class="Files.App.Controls.Dialogs.PropertiesItemText"
+	x:Class="Files.App.Controls.PropertiesItemText"
 	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"
diff --git a/src/Files.App.Controls/PropertiesView/PropertiesItemText.xaml.cs b/src/Files.App.Controls/PropertiesView/PropertiesItemText.xaml.cs
index 9b5c61c4f750..babf43ccce64 100644
--- a/src/Files.App.Controls/PropertiesView/PropertiesItemText.xaml.cs
+++ b/src/Files.App.Controls/PropertiesView/PropertiesItemText.xaml.cs
@@ -17,7 +17,7 @@
 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.
 
-namespace Files.App.Controls.Dialogs
+namespace Files.App.Controls
 {
 	public sealed partial class PropertiesItemText : UserControl
 	{
diff --git a/tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml b/tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml
index cea5fc772600..b8b6139ebb52 100644
--- a/tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml
+++ b/tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml
@@ -6,8 +6,6 @@
 	xmlns:animatedvisuals="using:Microsoft.UI.Xaml.Controls.AnimatedVisuals"
 	xmlns:controls="using:Microsoft.UI.Xaml.Controls"
 	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-	xmlns:dcontrols="using:Files.App.Controls.Dialogs"
-	xmlns:dialogs="using:Files.App.UITests.Dialogs"
 	xmlns:fcontrols="using:Files.App.Controls"
 	xmlns:local="using:Files.App.UITests.Dialogs.Properties.Views"
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -93,11 +91,11 @@
 				Orientation="Vertical">
 				<Expander IsExpanded="True" Style="{StaticResource PropertiesExpanderStyle}">
 					<Expander.Header>
-						<dcontrols:PropertiesHeader Text="Header text goes here">
-							<dcontrols:PropertiesHeader.Icon>
+						<fcontrols:PropertiesHeader Text="Header text goes here">
+							<fcontrols:PropertiesHeader.Icon>
 								<SymbolIcon Symbol="AddFriend" />
-							</dcontrols:PropertiesHeader.Icon>
-						</dcontrols:PropertiesHeader>
+							</fcontrols:PropertiesHeader.Icon>
+						</fcontrols:PropertiesHeader>
 					</Expander.Header>
 
 					<Expander.Content>
@@ -106,20 +104,20 @@
 							Padding="0,0,0,8"
 							HorizontalAlignment="Stretch"
 							Orientation="Vertical">
-							<dcontrols:PropertiesItemText
+							<fcontrols:PropertiesItemText
 								CanEdit="True"
 								Label="Item label 1"
 								LabelWidth="{StaticResource LabelWidth}"
 								Orientation="Horizontal"
 								Text="Item value 1 text here" />
 							<MenuFlyoutSeparator />
-							<dcontrols:PropertiesItemText
+							<fcontrols:PropertiesItemText
 								Label="Item label t00"
 								LabelWidth="{StaticResource LabelWidth}"
 								Orientation="Horizontal"
 								Text="Item value t00 text here" />
 							<MenuFlyoutSeparator />
-							<dcontrols:PropertiesItemText
+							<fcontrols:PropertiesItemText
 								Label="Item label three"
 								LabelWidth="{StaticResource LabelWidth}"
 								Orientation="Horizontal"
@@ -131,11 +129,11 @@
 
 				<Expander Style="{StaticResource PropertiesExpanderStyle}">
 					<Expander.Header>
-						<dcontrols:PropertiesHeader Text="Header text goes here, made extra long to ensure wrapping and arranging within the header works as expected">
-							<dcontrols:PropertiesHeader.Icon>
+						<fcontrols:PropertiesHeader Text="Header text goes here, made extra long to ensure wrapping and arranging within the header works as expected">
+							<fcontrols:PropertiesHeader.Icon>
 								<SymbolIcon Symbol="Comment" />
-							</dcontrols:PropertiesHeader.Icon>
-						</dcontrols:PropertiesHeader>
+							</fcontrols:PropertiesHeader.Icon>
+						</fcontrols:PropertiesHeader>
 					</Expander.Header>
 
 					<Expander.Content>
@@ -143,18 +141,18 @@
 							Padding="0,0,0,8"
 							HorizontalAlignment="Stretch"
 							Orientation="Vertical">
-							<dcontrols:PropertiesItemText
+							<fcontrols:PropertiesItemText
 								Label="Item label 1"
 								LabelWidth="{StaticResource LabelWidth}"
 								Orientation="Vertical"
 								Text="Item value 1 text here" />
 							<MenuFlyoutSeparator Margin="16,0" />
-							<dcontrols:PropertiesItemText
+							<fcontrols:PropertiesItemText
 								Label="Item label t00"
 								Orientation="Vertical"
 								Text="Item value t00 text here" />
 							<MenuFlyoutSeparator Margin="16,0" />
-							<dcontrols:PropertiesItemText
+							<fcontrols:PropertiesItemText
 								CanEdit="True"
 								Label="Item label three"
 								LabelWidth="{StaticResource LabelWidth}"
@@ -170,11 +168,11 @@
 
 				<Expander Style="{StaticResource PropertiesExpanderStyle}">
 					<Expander.Header>
-						<dcontrols:PropertiesHeader Text="Header text goes here">
-							<dcontrols:PropertiesHeader.Icon>
+						<fcontrols:PropertiesHeader Text="Header text goes here">
+							<fcontrols:PropertiesHeader.Icon>
 								<SymbolIcon Symbol="SlideShow" />
-							</dcontrols:PropertiesHeader.Icon>
-						</dcontrols:PropertiesHeader>
+							</fcontrols:PropertiesHeader.Icon>
+						</fcontrols:PropertiesHeader>
 					</Expander.Header>
 
 					<Expander.Content>

From 288f3ca2adb51ad077796f1b318bfa06e34ad392 Mon Sep 17 00:00:00 2001
From: Martin Anderson <mdta@live.co.uk>
Date: Thu, 20 Aug 2026 17:46:05 +0100
Subject: [PATCH 11/36] Refactored PropertiesItem UserControl into a Templated
 Control

With a new PropertiesViewItem as a control, with other controls derived from it, we can share code and avoid duplicating Dependency Properties.

Started work on a Ratings variation of the control
---
 .../PropertiesView/PropertiesItemText.xaml    | 117 -------------
 .../PropertiesView/PropertiesItemText.xaml.cs | 162 ------------------
 .../PropertiesView.ThemeResources.xaml        | 147 +++++++++++++++-
 .../PropertiesViewItem - Constants.cs         |  31 ++++
 .../PropertiesViewItem.Properties.cs          |  75 ++++++++
 .../PropertiesView/PropertiesViewItem.cs      |  69 ++++++++
 .../PropertiesViewItemRating.cs               | 121 +++++++++++++
 .../PropertiesView/PropertiesViewItemText.cs  |  45 +++++
 src/Files.App.Controls/Themes/Generic.xaml    |   1 -
 .../Views/PropertiesGeneralPage.xaml          |  18 +-
 .../Files.App.UITests.csproj                  |   6 -
 11 files changed, 491 insertions(+), 301 deletions(-)
 delete mode 100644 src/Files.App.Controls/PropertiesView/PropertiesItemText.xaml
 delete mode 100644 src/Files.App.Controls/PropertiesView/PropertiesItemText.xaml.cs
 create mode 100644 src/Files.App.Controls/PropertiesView/PropertiesViewItem - Constants.cs
 create mode 100644 src/Files.App.Controls/PropertiesView/PropertiesViewItem.Properties.cs
 create mode 100644 src/Files.App.Controls/PropertiesView/PropertiesViewItem.cs
 create mode 100644 src/Files.App.Controls/PropertiesView/PropertiesViewItemRating.cs
 create mode 100644 src/Files.App.Controls/PropertiesView/PropertiesViewItemText.cs

diff --git a/src/Files.App.Controls/PropertiesView/PropertiesItemText.xaml b/src/Files.App.Controls/PropertiesView/PropertiesItemText.xaml
deleted file mode 100644
index 1b68e7718e05..000000000000
--- a/src/Files.App.Controls/PropertiesView/PropertiesItemText.xaml
+++ /dev/null
@@ -1,117 +0,0 @@
-<!--  Copyright (c) Files Community. SPDX-License-Identifier: MPL-2.0  -->
-<UserControl
-	x:Class="Files.App.Controls.PropertiesItemText"
-	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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-	mc:Ignorable="d">
-	<Grid
-		Padding="12,6"
-		HorizontalAlignment="Stretch"
-		VerticalAlignment="Stretch">
-		<Grid.ColumnDefinitions>
-			<ColumnDefinition Width="{x:Bind LabelWidth}" />
-			<ColumnDefinition Width="*" />
-		</Grid.ColumnDefinitions>
-		<Grid.RowDefinitions>
-			<RowDefinition Height="Auto" />
-			<RowDefinition Height="Auto" />
-		</Grid.RowDefinitions>
-
-		<TextBlock
-			x:Name="Label_PART"
-			Grid.Row="0"
-			Grid.RowSpan="2"
-			Grid.Column="0"
-			Grid.ColumnSpan="1"
-			Margin="0,2,12,2"
-			VerticalAlignment="Center"
-			Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-			Style="{ThemeResource CaptionTextBlockStyle}"
-			Text="{x:Bind Label}" />
-
-		<TextBlock
-			x:Name="Text_PART"
-			Grid.Row="0"
-			Grid.RowSpan="2"
-			Grid.Column="1"
-			Grid.ColumnSpan="1"
-			Margin="0,2,12,2"
-			VerticalAlignment="Center"
-			Text="{x:Bind Text, Mode=TwoWay}"
-			TextWrapping="WrapWholeWords"
-			Visibility="Visible" />
-
-		<TextBox
-			x:Name="TextEdit_PART"
-			Grid.Row="0"
-			Grid.RowSpan="2"
-			Grid.Column="1"
-			Grid.ColumnSpan="1"
-			Margin="-12,2,0,2"
-			VerticalAlignment="Center"
-			Text="{x:Bind Text, Mode=TwoWay}"
-			Visibility="Collapsed" />
-
-
-
-
-		<VisualStateManager.VisualStateGroups>
-			<VisualStateGroup x:Name="EditableStates">
-				<VisualState x:Name="NotEditableState">
-					<VisualState.Setters>
-						<Setter Target="TextEdit_PART.Visibility" Value="Collapsed" />
-						<Setter Target="Text_PART.Visibility" Value="Visible" />
-					</VisualState.Setters>
-				</VisualState>
-				<VisualState x:Name="EditableState">
-					<VisualState.Setters>
-						<Setter Target="TextEdit_PART.Visibility" Value="Visible" />
-						<Setter Target="Text_PART.Visibility" Value="Collapsed" />
-					</VisualState.Setters>
-				</VisualState>
-			</VisualStateGroup>
-			<VisualStateGroup x:Name="OrientationStates">
-				<VisualState x:Name="HorizontalState">
-					<VisualState.Setters>
-						<Setter Target="Label_PART.(Grid.Row)" Value="0" />
-						<Setter Target="Label_PART.(Grid.RowSpan)" Value="2" />
-						<Setter Target="Label_PART.(Grid.Column)" Value="0" />
-						<Setter Target="Label_PART.(Grid.ColumnSpan)" Value="1" />
-
-						<Setter Target="TextEdit_PART.(Grid.Row)" Value="0" />
-						<Setter Target="TextEdit_PART.(Grid.RowSpan)" Value="2" />
-						<Setter Target="TextEdit_PART.(Grid.Column)" Value="1" />
-						<Setter Target="TextEdit_PART.(Grid.ColumnSpan)" Value="1" />
-
-						<Setter Target="Text_PART.(Grid.Row)" Value="0" />
-						<Setter Target="Text_PART.(Grid.RowSpan)" Value="2" />
-						<Setter Target="Text_PART.(Grid.Column)" Value="1" />
-						<Setter Target="Text_PART.(Grid.ColumnSpan)" Value="1" />
-					</VisualState.Setters>
-				</VisualState>
-
-				<VisualState x:Name="VerticalState">
-					<VisualState.Setters>
-						<Setter Target="Label_PART.(Grid.Row)" Value="0" />
-						<Setter Target="Label_PART.(Grid.RowSpan)" Value="1" />
-						<Setter Target="Label_PART.(Grid.Column)" Value="0" />
-						<Setter Target="Label_PART.(Grid.ColumnSpan)" Value="2" />
-
-						<Setter Target="TextEdit_PART.(Grid.Row)" Value="1" />
-						<Setter Target="TextEdit_PART.(Grid.RowSpan)" Value="1" />
-						<Setter Target="TextEdit_PART.(Grid.Column)" Value="0" />
-						<Setter Target="TextEdit_PART.(Grid.ColumnSpan)" Value="2" />
-
-						<Setter Target="Text_PART.(Grid.Row)" Value="1" />
-						<Setter Target="Text_PART.(Grid.RowSpan)" Value="1" />
-						<Setter Target="Text_PART.(Grid.Column)" Value="0" />
-						<Setter Target="Text_PART.(Grid.ColumnSpan)" Value="2" />
-					</VisualState.Setters>
-				</VisualState>
-			</VisualStateGroup>
-		</VisualStateManager.VisualStateGroups>
-	</Grid>
-
-</UserControl>
diff --git a/src/Files.App.Controls/PropertiesView/PropertiesItemText.xaml.cs b/src/Files.App.Controls/PropertiesView/PropertiesItemText.xaml.cs
deleted file mode 100644
index babf43ccce64..000000000000
--- a/src/Files.App.Controls/PropertiesView/PropertiesItemText.xaml.cs
+++ /dev/null
@@ -1,162 +0,0 @@
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Controls.Primitives;
-using Microsoft.UI.Xaml.Data;
-using Microsoft.UI.Xaml.Input;
-using Microsoft.UI.Xaml.Media;
-using Microsoft.UI.Xaml.Navigation;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Reflection.Metadata.Ecma335;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
-
-// To learn more about WinUI, the WinUI project structure,
-// and more about our project templates, see: http://aka.ms/winui-project-info.
-
-namespace Files.App.Controls
-{
-	public sealed partial class PropertiesItemText : UserControl
-	{
-		public string Label
-		{
-			get { return (string)GetValue( LabelProperty ); }
-			set { SetValue( LabelProperty , value ); }
-		}
-
-		public static readonly DependencyProperty LabelProperty =
-			DependencyProperty.Register(
-				"Label",
-				typeof(string),
-				typeof(PropertiesItemText),
-				new PropertyMetadata( string.Empty ) );
-
-
-
-
-		public string Text
-		{
-			get { return (string)GetValue( TextProperty ); }
-			set { SetValue( TextProperty , value ); }
-		}
-
-		public static readonly DependencyProperty TextProperty =
-			DependencyProperty.Register(
-				"Text",
-				typeof(string),
-				typeof(PropertiesItemText),
-				new PropertyMetadata( string.Empty ) );
-
-
-
-
-		public GridLength LabelWidth
-		{
-			get { return (GridLength)GetValue( LabelWidthProperty ); }
-			set { SetValue( LabelWidthProperty , value ); }
-		}
-
-		public static readonly DependencyProperty LabelWidthProperty =
-			DependencyProperty.Register(
-				"LabelWidth",
-				typeof(GridLength),
-				typeof(PropertiesItemText),
-				new PropertyMetadata(new GridLength(80, GridUnitType.Pixel)));
-
-
-
-
-		public bool CanEdit
-		{
-			get { return (bool)GetValue( CanEditProperty ); }
-			set { SetValue( CanEditProperty , value ); }
-		}
-
-		public static readonly DependencyProperty CanEditProperty =
-			DependencyProperty.Register(
-				"CanEdit",
-				typeof(bool),
-				typeof(PropertiesItemText),
-				new PropertyMetadata( false, OnCanEditPropertyChanged ) );
-
-
-
-
-		public Orientation Orientation
-		{
-			get => (Orientation)GetValue( OrientationProperty );
-			set => SetValue( OrientationProperty , value );
-		}
-
-		public static readonly DependencyProperty OrientationProperty =
-			DependencyProperty.Register(
-				"Orientation",
-				typeof(Orientation),
-				typeof(PropertiesItemText),
-				new PropertyMetadata(Orientation.Horizontal, OnOrientationChanged));
-
-
-
-
-		private bool _isLoaded;
-
-		public PropertiesItemText()
-		{
-			InitializeComponent();
-
-			this.Loaded += (s , e) =>
-			{
-				_isLoaded = true;
-				UpdateOrientationState( Orientation );
-				UpdateCanEditState( CanEdit );
-			};
-		}
-
-
-
-
-		private static void OnOrientationChanged(DependencyObject d , DependencyPropertyChangedEventArgs e)
-		{
-			var control = (PropertiesItemText)d;
-			control.UpdateOrientationState( (Orientation)e.NewValue );
-		}
-
-
-		private void UpdateOrientationState(Orientation orientation)
-		{
-			if ( orientation == Orientation.Horizontal )
-			{
-				VisualStateManager.GoToState( this , "HorizontalState" , false );
-			}
-			else
-			{
-				VisualStateManager.GoToState( this , "VerticalState" , false );
-			}
-		}
-
-
-
-
-		private static void OnCanEditPropertyChanged(DependencyObject d , DependencyPropertyChangedEventArgs e)
-		{
-			var control = (PropertiesItemText)d;
-			control.UpdateCanEditState( (bool)e.NewValue );
-		}
-
-
-		private void UpdateCanEditState(bool canEdit)
-		{
-			if ( canEdit == true)
-			{
-				VisualStateManager.GoToState( this , "EditableState" , false );
-			}
-			else
-			{
-				VisualStateManager.GoToState( this , "NonEditableState" , false );
-			}
-		}
-	}
-}
diff --git a/src/Files.App.Controls/PropertiesView/PropertiesView.ThemeResources.xaml b/src/Files.App.Controls/PropertiesView/PropertiesView.ThemeResources.xaml
index d9746067bbb5..9efa97e97bb5 100644
--- a/src/Files.App.Controls/PropertiesView/PropertiesView.ThemeResources.xaml
+++ b/src/Files.App.Controls/PropertiesView/PropertiesView.ThemeResources.xaml
@@ -3,7 +3,8 @@
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 	xmlns:animatedvisuals="using:Microsoft.UI.Xaml.Controls.AnimatedVisuals"
-	xmlns:controls="using:Microsoft.UI.Xaml.Controls">
+	xmlns:controls="using:Microsoft.UI.Xaml.Controls"
+	xmlns:fcontrols="using:Files.App.Controls">
 
 
 	<!--  THEME RESOURCE DICTIONARY  -->
@@ -125,7 +126,7 @@
 
 
 
-	<!--  EXPANDER  -->
+	<!--  PROPERTIES EXPANDER  -->
 	<Style x:Key="PropertiesExpanderStyle" TargetType="controls:Expander">
 		<!--
 			We won't make this control tab stoppable, since the tab focus should go
@@ -306,7 +307,7 @@
 
 
 
-	<!--  EXPANDER DOWN BUTTON  -->
+	<!--  vEXPANDER DOWN BUTTON  -->
 	<Style x:Key="PropertiesExpanderHeaderDownStyle" TargetType="ToggleButton">
 		<Setter Property="Padding" Value="{ThemeResource PropertiesExpanderHeaderPadding}" />
 		<Setter Property="Background" Value="{ThemeResource PropertiesExpanderHeaderBackground}" />
@@ -465,7 +466,7 @@
 	</Style>
 
 
-	<!--  EXPANDER UP BUTTON  -->
+	<!--  PROPERTIES EXPANDER UP BUTTON  -->
 	<Style
 		x:Key="PropertiesExpanderHeaderUpStyle"
 		BasedOn="{StaticResource PropertiesExpanderHeaderDownStyle}"
@@ -627,4 +628,142 @@
 
 
 
+
+	<!--  PROPERTIES VIEW ITEM - TEXT  -->
+	<Style BasedOn="{StaticResource DefaultPropertiesViewItem_Text}" TargetType="fcontrols:PropertiesViewItemText" />
+
+	<Style x:Key="DefaultPropertiesViewItem_Text" TargetType="fcontrols:PropertiesViewItemText">
+
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="fcontrols:PropertiesViewItemText">
+					<Grid
+						Padding="12,6"
+						HorizontalAlignment="Stretch"
+						VerticalAlignment="Stretch">
+						<Grid.ColumnDefinitions>
+							<ColumnDefinition Width="{TemplateBinding LabelWidth}" />
+							<ColumnDefinition Width="*" />
+						</Grid.ColumnDefinitions>
+						<Grid.RowDefinitions>
+							<RowDefinition Height="Auto" />
+							<RowDefinition Height="Auto" />
+						</Grid.RowDefinitions>
+
+						<TextBlock
+							x:Name="PART_Label"
+							Grid.Row="0"
+							Grid.RowSpan="2"
+							Grid.Column="0"
+							Grid.ColumnSpan="1"
+							Margin="0,2,12,2"
+							VerticalAlignment="Center"
+							Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+							Style="{ThemeResource CaptionTextBlockStyle}"
+							Text="{TemplateBinding Label}" />
+
+						<TextBlock
+							x:Name="PART_Text"
+							Grid.Row="0"
+							Grid.RowSpan="2"
+							Grid.Column="1"
+							Grid.ColumnSpan="1"
+							Margin="0,2,12,2"
+							VerticalAlignment="Center"
+							Text="{TemplateBinding Text}"
+							TextWrapping="WrapWholeWords"
+							Visibility="Visible" />
+
+						<TextBox
+							x:Name="PART_TextEdit"
+							Grid.Row="0"
+							Grid.RowSpan="2"
+							Grid.Column="1"
+							Grid.ColumnSpan="1"
+							Margin="-12,2,0,2"
+							VerticalAlignment="Center"
+							Text="{TemplateBinding Text}"
+							Visibility="Collapsed" />
+
+
+
+
+						<VisualStateManager.VisualStateGroups>
+							<VisualStateGroup x:Name="EditableStateGroup">
+								<VisualState x:Name="NotEditableState">
+									<VisualState.Setters>
+										<Setter Target="TextEdit_PART.Visibility" Value="Collapsed" />
+										<Setter Target="Text_PART.Visibility" Value="Visible" />
+									</VisualState.Setters>
+								</VisualState>
+								<VisualState x:Name="EditableState">
+									<VisualState.Setters>
+										<Setter Target="TextEdit_PART.Visibility" Value="Visible" />
+										<Setter Target="Text_PART.Visibility" Value="Collapsed" />
+									</VisualState.Setters>
+								</VisualState>
+							</VisualStateGroup>
+							<VisualStateGroup x:Name="OrientationStateGroup">
+								<VisualState x:Name="HorizontalState">
+									<VisualState.Setters>
+										<Setter Target="PART_Label.(Grid.Row)" Value="0" />
+										<Setter Target="PART_Label.(Grid.RowSpan)" Value="2" />
+										<Setter Target="PART_Label.(Grid.Column)" Value="0" />
+										<Setter Target="PART_Label.(Grid.ColumnSpan)" Value="1" />
+
+										<Setter Target="PART_TextEdit.(Grid.Row)" Value="0" />
+										<Setter Target="PART_TextEdit.(Grid.RowSpan)" Value="2" />
+										<Setter Target="PART_TextEdit.(Grid.Column)" Value="1" />
+										<Setter Target="PART_TextEdit.(Grid.ColumnSpan)" Value="1" />
+
+										<Setter Target="PART_Text.(Grid.Row)" Value="0" />
+										<Setter Target="PART_Text.(Grid.RowSpan)" Value="2" />
+										<Setter Target="PART_Text.(Grid.Column)" Value="1" />
+										<Setter Target="PART_Text.(Grid.ColumnSpan)" Value="1" />
+									</VisualState.Setters>
+								</VisualState>
+
+								<VisualState x:Name="VerticalState">
+									<VisualState.Setters>
+										<Setter Target="PART_Label.(Grid.Row)" Value="0" />
+										<Setter Target="PART_Label.(Grid.RowSpan)" Value="1" />
+										<Setter Target="PART_Label.(Grid.Column)" Value="0" />
+										<Setter Target="PART_Label.(Grid.ColumnSpan)" Value="2" />
+
+										<Setter Target="PART_TextEdit.(Grid.Row)" Value="1" />
+										<Setter Target="PART_TextEdit.(Grid.RowSpan)" Value="1" />
+										<Setter Target="PART_TextEdit.(Grid.Column)" Value="0" />
+										<Setter Target="PART_TextEdit.(Grid.ColumnSpan)" Value="2" />
+
+										<Setter Target="PART_Text.(Grid.Row)" Value="1" />
+										<Setter Target="PART_Text.(Grid.RowSpan)" Value="1" />
+										<Setter Target="PART_Text.(Grid.Column)" Value="0" />
+										<Setter Target="PART_Text.(Grid.ColumnSpan)" Value="2" />
+									</VisualState.Setters>
+								</VisualState>
+							</VisualStateGroup>
+						</VisualStateManager.VisualStateGroups>
+					</Grid>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+
+
+
+
+	<!--  PROPERTIES VIEW ITEM - RATING  -->
+	<Style BasedOn="{StaticResource DefaultPropertiesViewItem_Rating}" TargetType="fcontrols:PropertiesViewItemRating" />
+
+	<Style x:Key="DefaultPropertiesViewItem_Rating" TargetType="fcontrols:PropertiesViewItemRating">
+
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="fcontrols:PropertiesViewItemRating" />
+			</Setter.Value>
+		</Setter>
+	</Style>
+
+
+
 </ResourceDictionary>
diff --git a/src/Files.App.Controls/PropertiesView/PropertiesViewItem - Constants.cs b/src/Files.App.Controls/PropertiesView/PropertiesViewItem - Constants.cs
new file mode 100644
index 000000000000..c59a8df36d91
--- /dev/null
+++ b/src/Files.App.Controls/PropertiesView/PropertiesViewItem - Constants.cs	
@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+
+
+
+namespace Files.App.Controls.Primitives
+{
+	[TemplateVisualState( Name = HorizontalStateName , GroupName = OrientationStateGroupName )]
+	[TemplateVisualState( Name = VerticalStateName , GroupName = OrientationStateGroupName )]
+
+	[TemplateVisualState( Name = NotEditableStateName , GroupName = EditableStateGroupName )]
+	[TemplateVisualState( Name = EditableStateName , GroupName = EditableStateGroupName )]
+
+
+
+
+	public partial class PropertiesViewItem : Control
+	{
+		internal const string OrientationStateGroupName = "OrientationStateGroup";
+		internal const string EditableStateGroupName = "EditableStateGroup";
+
+		internal const string HorizontalStateName = "HorizontalState";
+		internal const string VerticalStateName = "VerticalState";
+
+		internal const string NotEditableStateName = "NotEditableState";
+		internal const string EditableStateName = "EditableState";
+
+	}
+}
diff --git a/src/Files.App.Controls/PropertiesView/PropertiesViewItem.Properties.cs b/src/Files.App.Controls/PropertiesView/PropertiesViewItem.Properties.cs
new file mode 100644
index 000000000000..01ab55caa485
--- /dev/null
+++ b/src/Files.App.Controls/PropertiesView/PropertiesViewItem.Properties.cs
@@ -0,0 +1,75 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+
+
+
+namespace Files.App.Controls.Primitives
+{
+	public partial class PropertiesViewItem : Control
+	{
+		public string Label
+		{
+			get { return (string)GetValue( LabelProperty ); }
+			set { SetValue( LabelProperty , value ); }
+		}
+
+		public static readonly DependencyProperty LabelProperty =
+			DependencyProperty.Register(
+				"Label",
+				typeof(string),
+				typeof(PropertiesViewItem),
+				new PropertyMetadata( string.Empty ) );
+
+
+
+
+	public GridLength LabelWidth
+		{
+			get { return (GridLength)GetValue( LabelWidthProperty ); }
+			set { SetValue( LabelWidthProperty , value ); }
+		}
+
+		public static readonly DependencyProperty LabelWidthProperty =
+			DependencyProperty.Register(
+				"LabelWidth",
+				typeof(GridLength),
+				typeof(PropertiesViewItem),
+				new PropertyMetadata(new GridLength(80, GridUnitType.Pixel)));
+
+
+
+
+		public bool CanEdit
+		{
+			get { return (bool)GetValue( CanEditProperty ); }
+			set { SetValue( CanEditProperty , value ); }
+		}
+
+		public static readonly DependencyProperty CanEditProperty =
+			DependencyProperty.Register(
+				"CanEdit",
+				typeof(bool),
+				typeof(PropertiesViewItem),
+				new PropertyMetadata( false, OnCanEditPropertyChanged ) );
+
+
+
+
+		public Orientation Orientation
+		{
+			get => (Orientation)GetValue( OrientationProperty );
+			set => SetValue( OrientationProperty , value );
+		}
+
+		public static readonly DependencyProperty OrientationProperty =
+			DependencyProperty.Register(
+				"Orientation",
+				typeof(Orientation),
+				typeof(PropertiesViewItem),
+				new PropertyMetadata(Orientation.Horizontal, OnOrientationChanged));
+
+
+	}
+}
diff --git a/src/Files.App.Controls/PropertiesView/PropertiesViewItem.cs b/src/Files.App.Controls/PropertiesView/PropertiesViewItem.cs
new file mode 100644
index 000000000000..ee61fc0b77fd
--- /dev/null
+++ b/src/Files.App.Controls/PropertiesView/PropertiesViewItem.cs
@@ -0,0 +1,69 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+
+
+
+namespace Files.App.Controls.Primitives
+{
+	public partial class PropertiesViewItem : Control
+	{
+		private bool _isLoaded;
+
+		public PropertiesViewItem()
+		{
+
+			this.Loaded += (s , e) =>
+			{
+				_isLoaded = true;
+				UpdateOrientationState( Orientation );
+				UpdateCanEditState( CanEdit );
+			};
+		}
+
+
+		#region Property Changed
+		private static void OnOrientationChanged(DependencyObject d , DependencyPropertyChangedEventArgs e)
+		{
+			var control = (PropertiesViewItem)d;
+			control.UpdateOrientationState( (Orientation)e.NewValue );
+		}
+
+		private void UpdateOrientationState(Orientation orientation)
+		{
+			if ( orientation == Orientation.Horizontal )
+			{
+				VisualStateManager.GoToState( this , "HorizontalState" , false );
+			}
+			else
+			{
+				VisualStateManager.GoToState( this , "VerticalState" , false );
+			}
+		}
+
+
+
+
+		private static void OnCanEditPropertyChanged(DependencyObject d , DependencyPropertyChangedEventArgs e)
+		{
+			var control = (PropertiesViewItem)d;
+			control.UpdateCanEditState( (bool)e.NewValue );
+		}
+
+		private void UpdateCanEditState(bool canEdit)
+		{
+			if ( canEdit == true )
+			{
+				VisualStateManager.GoToState( this , "EditableState" , false );
+			}
+			else
+			{
+				VisualStateManager.GoToState( this , "NonEditableState" , false );
+			}
+		}
+
+		#endregion
+
+	}
+}
diff --git a/src/Files.App.Controls/PropertiesView/PropertiesViewItemRating.cs b/src/Files.App.Controls/PropertiesView/PropertiesViewItemRating.cs
new file mode 100644
index 000000000000..c74ed7027d92
--- /dev/null
+++ b/src/Files.App.Controls/PropertiesView/PropertiesViewItemRating.cs
@@ -0,0 +1,121 @@
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Documents;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Files.App.Controls.Primitives;
+
+// To learn more about WinUI, the WinUI project structure,
+// and more about our project templates, see: http://aka.ms/winui-project-info.
+
+namespace Files.App.Controls
+{
+	#region Template Parts
+
+	[TemplatePart( Name = RatingControlPartName , Type = typeof( RatingControl ) )]
+
+	#endregion
+
+
+
+	public sealed partial class PropertiesViewItemRating : PropertiesViewItem
+	{
+		#region Constants
+		internal const string RatingControlPartName = "PART_RatingControl";
+
+		#endregion
+
+
+
+
+		#region Properties
+
+		public int Rating
+		{
+			get { return (int)GetValue( RatingProperty ); }
+			set { SetValue( RatingProperty , value ); }
+		}
+
+		public static readonly DependencyProperty RatingProperty =
+			DependencyProperty.Register(
+				"Rating",
+				typeof(int),
+				typeof(PropertiesViewItemRating),
+				new PropertyMetadata( 3 , OnRatingPropertyChanged ) );
+
+		#endregion
+
+
+
+
+		#region Property Changed
+
+		private static void OnRatingPropertyChanged(DependencyObject d , DependencyPropertyChangedEventArgs e)
+		{
+			var control = (PropertiesViewItemRating)d;
+			control.UpdateRatingProperty( (int)e.NewValue , (int)e.OldValue );
+		}
+
+		private void UpdateRatingProperty(int newRating, int oldRating)
+		{
+			// The system gives us ratings as an int value btween 1-99
+			// we then have to convert this into 1-5 stars
+			//  1-12 - 1 Star
+			// 13-37 - 2 Stars
+			// 38-62 - 3 Stars
+			// 63-87 - 4 Stars
+			// 88-99 - 5 Stars
+
+			// When setting this value using a Rating controls
+			// we assign values as listed below
+			// 1 Star  - 1
+			// 2 Stars - 25
+			// 3 Stars - 50
+			// 4 Stars - 75
+			// 5 Stars - 99
+
+			// If the rating has changed, take action
+			if ( newRating != oldRating )
+			{
+				if ( newRating <= 0 )
+				{ }
+
+				if ( newRating >= 100 )
+				{ }
+
+				// If the rating should be 1 Star
+				if ( newRating >= 1 && newRating <= 12 )
+				{ }
+
+				// If the rating should be 2 Stars
+				if ( newRating >= 13 && newRating <= 37 )
+				{ }
+
+				// If the rating should be 3 Stars
+				if ( newRating >= 38 && newRating <= 62 )
+				{ }
+
+				// If the rating should be 4 Stars
+				if ( newRating >= 63 && newRating <= 87 )
+				{ }
+
+				// If the rating should be 5 Stars
+				if ( newRating >= 88 && newRating <= 99 )
+				{ }
+			}
+		}
+
+		#endregion
+
+
+		public PropertiesViewItemRating()
+		{
+			DefaultStyleKey = typeof( PropertiesViewItemText );
+		}
+	}
+}
diff --git a/src/Files.App.Controls/PropertiesView/PropertiesViewItemText.cs b/src/Files.App.Controls/PropertiesView/PropertiesViewItemText.cs
new file mode 100644
index 000000000000..81e53ccdc8f2
--- /dev/null
+++ b/src/Files.App.Controls/PropertiesView/PropertiesViewItemText.cs
@@ -0,0 +1,45 @@
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Documents;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Files.App.Controls.Primitives;
+
+// To learn more about WinUI, the WinUI project structure,
+// and more about our project templates, see: http://aka.ms/winui-project-info.
+
+namespace Files.App.Controls
+{
+	public sealed partial class PropertiesViewItemText : PropertiesViewItem
+	{
+
+
+		#region Properties
+
+		public string Text
+		{
+			get { return (string)GetValue( TextProperty ); }
+			set { SetValue( TextProperty , value ); }
+		}
+
+		public static readonly DependencyProperty TextProperty =
+			DependencyProperty.Register(
+				"Text",
+				typeof(string),
+				typeof(PropertiesViewItemText),
+				new PropertyMetadata( string.Empty ) );
+
+		#endregion
+
+
+		public PropertiesViewItemText()
+		{
+			DefaultStyleKey = typeof( PropertiesViewItemText );
+		}
+	}
+}
diff --git a/src/Files.App.Controls/Themes/Generic.xaml b/src/Files.App.Controls/Themes/Generic.xaml
index 055321ef0911..c32611dc440b 100644
--- a/src/Files.App.Controls/Themes/Generic.xaml
+++ b/src/Files.App.Controls/Themes/Generic.xaml
@@ -80,5 +80,4 @@
 		<!--#endregion-->
 
 	</ResourceDictionary.MergedDictionaries>
-
 </ResourceDictionary>
diff --git a/tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml b/tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml
index b8b6139ebb52..8b5db283dcd5 100644
--- a/tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml
+++ b/tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml
@@ -13,11 +13,7 @@
 
 	<Page.Resources>
 		<ResourceDictionary>
-			<ResourceDictionary.MergedDictionaries>
-
-				<!--<ResourceDictionary Source="ms-appx:///Files.App.Controls/Dialogs/DialogResources.xaml" />-->
-
-			</ResourceDictionary.MergedDictionaries>
+			<ResourceDictionary.MergedDictionaries />
 
 			<GridLength x:Key="LabelWidth">120</GridLength>
 
@@ -104,20 +100,20 @@
 							Padding="0,0,0,8"
 							HorizontalAlignment="Stretch"
 							Orientation="Vertical">
-							<fcontrols:PropertiesItemText
+							<fcontrols:PropertiesViewItemText
 								CanEdit="True"
 								Label="Item label 1"
 								LabelWidth="{StaticResource LabelWidth}"
 								Orientation="Horizontal"
 								Text="Item value 1 text here" />
 							<MenuFlyoutSeparator />
-							<fcontrols:PropertiesItemText
+							<fcontrols:PropertiesViewItemText
 								Label="Item label t00"
 								LabelWidth="{StaticResource LabelWidth}"
 								Orientation="Horizontal"
 								Text="Item value t00 text here" />
 							<MenuFlyoutSeparator />
-							<fcontrols:PropertiesItemText
+							<fcontrols:PropertiesViewItemText
 								Label="Item label three"
 								LabelWidth="{StaticResource LabelWidth}"
 								Orientation="Horizontal"
@@ -141,18 +137,18 @@
 							Padding="0,0,0,8"
 							HorizontalAlignment="Stretch"
 							Orientation="Vertical">
-							<fcontrols:PropertiesItemText
+							<fcontrols:PropertiesViewItemText
 								Label="Item label 1"
 								LabelWidth="{StaticResource LabelWidth}"
 								Orientation="Vertical"
 								Text="Item value 1 text here" />
 							<MenuFlyoutSeparator Margin="16,0" />
-							<fcontrols:PropertiesItemText
+							<fcontrols:PropertiesViewItemText
 								Label="Item label t00"
 								Orientation="Vertical"
 								Text="Item value t00 text here" />
 							<MenuFlyoutSeparator Margin="16,0" />
-							<fcontrols:PropertiesItemText
+							<fcontrols:PropertiesViewItemText
 								CanEdit="True"
 								Label="Item label three"
 								LabelWidth="{StaticResource LabelWidth}"
diff --git a/tests/Files.App.UITests/Files.App.UITests.csproj b/tests/Files.App.UITests/Files.App.UITests.csproj
index 47dcebf8bd98..179b4d33fc5f 100644
--- a/tests/Files.App.UITests/Files.App.UITests.csproj
+++ b/tests/Files.App.UITests/Files.App.UITests.csproj
@@ -23,7 +23,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Remove="Dialogs\Properties\Views\PropertiesGeneralPage.xaml" />
     <None Remove="Views\DialogWindowsPage.xaml" />
   </ItemGroup>
 
@@ -42,11 +41,6 @@
       <Generator>MSBuild:Compile</Generator>
     </Page>
   </ItemGroup>
-  <ItemGroup>
-    <Page Update="Dialogs\Properties\Views\PropertiesGeneralPage.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-  </ItemGroup>
   <ItemGroup>
     <Page Update="Dialogs\Properties\PropertiesDialog.xaml">
       <Generator>MSBuild:Compile</Generator>

From 829bda8f63e665746d6196802568b070700bd675 Mon Sep 17 00:00:00 2001
From: Martin Anderson <mdta@live.co.uk>
Date: Thu, 20 Aug 2026 20:48:24 +0100
Subject: [PATCH 12/36] Finished Ratings variant of the PropertiesViewItem
 control

Also tweaked font weights for headers, and indentation for items within the expanders
---
 .../PropertiesView/PropertiesHeader.xaml      |   3 +-
 .../PropertiesView.ThemeResources.xaml        | 101 +++++++++-
 .../PropertiesView/PropertiesViewItem.cs      |   8 +-
 .../PropertiesViewItemRating.cs               | 188 +++++++++++++++---
 .../Views/PropertiesGeneralPage.xaml          |  64 ++++--
 5 files changed, 305 insertions(+), 59 deletions(-)

diff --git a/src/Files.App.Controls/PropertiesView/PropertiesHeader.xaml b/src/Files.App.Controls/PropertiesView/PropertiesHeader.xaml
index 7856a3d94831..ef5d1ea8339c 100644
--- a/src/Files.App.Controls/PropertiesView/PropertiesHeader.xaml
+++ b/src/Files.App.Controls/PropertiesView/PropertiesHeader.xaml
@@ -24,9 +24,10 @@
 		<TextBlock
 			x:Name="Text_PART"
 			Grid.Column="1"
-			Margin="0,4"
+			Margin="0,4,0,8"
 			HorizontalAlignment="Left"
 			Text="{x:Bind Text}"
+			FontWeight="SemiBold"
 			TextWrapping="WrapWholeWords" />
 	</Grid>
 
diff --git a/src/Files.App.Controls/PropertiesView/PropertiesView.ThemeResources.xaml b/src/Files.App.Controls/PropertiesView/PropertiesView.ThemeResources.xaml
index 9efa97e97bb5..e63532b4e013 100644
--- a/src/Files.App.Controls/PropertiesView/PropertiesView.ThemeResources.xaml
+++ b/src/Files.App.Controls/PropertiesView/PropertiesView.ThemeResources.xaml
@@ -638,7 +638,8 @@
 			<Setter.Value>
 				<ControlTemplate TargetType="fcontrols:PropertiesViewItemText">
 					<Grid
-						Padding="12,6"
+						MinHeight="48"
+						Padding="0,6"
 						HorizontalAlignment="Stretch"
 						VerticalAlignment="Stretch">
 						<Grid.ColumnDefinitions>
@@ -656,7 +657,7 @@
 							Grid.RowSpan="2"
 							Grid.Column="0"
 							Grid.ColumnSpan="1"
-							Margin="0,2,12,2"
+							Margin="0,4,24,4"
 							VerticalAlignment="Center"
 							Foreground="{ThemeResource TextFillColorSecondaryBrush}"
 							Style="{ThemeResource CaptionTextBlockStyle}"
@@ -692,14 +693,14 @@
 							<VisualStateGroup x:Name="EditableStateGroup">
 								<VisualState x:Name="NotEditableState">
 									<VisualState.Setters>
-										<Setter Target="TextEdit_PART.Visibility" Value="Collapsed" />
-										<Setter Target="Text_PART.Visibility" Value="Visible" />
+										<Setter Target="PART_TextEdit.Visibility" Value="Collapsed" />
+										<Setter Target="PART_Text.Visibility" Value="Visible" />
 									</VisualState.Setters>
 								</VisualState>
 								<VisualState x:Name="EditableState">
 									<VisualState.Setters>
-										<Setter Target="TextEdit_PART.Visibility" Value="Visible" />
-										<Setter Target="Text_PART.Visibility" Value="Collapsed" />
+										<Setter Target="PART_TextEdit.Visibility" Value="Visible" />
+										<Setter Target="PART_Text.Visibility" Value="Collapsed" />
 									</VisualState.Setters>
 								</VisualState>
 							</VisualStateGroup>
@@ -759,7 +760,93 @@
 
 		<Setter Property="Template">
 			<Setter.Value>
-				<ControlTemplate TargetType="fcontrols:PropertiesViewItemRating" />
+				<ControlTemplate TargetType="fcontrols:PropertiesViewItemRating">
+					<Grid
+						Padding="0,6"
+						HorizontalAlignment="Stretch"
+						VerticalAlignment="Stretch">
+						<Grid.ColumnDefinitions>
+							<ColumnDefinition Width="{TemplateBinding LabelWidth}" />
+							<ColumnDefinition Width="*" />
+						</Grid.ColumnDefinitions>
+						<Grid.RowDefinitions>
+							<RowDefinition Height="Auto" />
+							<RowDefinition Height="Auto" />
+						</Grid.RowDefinitions>
+
+						<TextBlock
+							x:Name="PART_Label"
+							Grid.Row="0"
+							Grid.RowSpan="2"
+							Grid.Column="0"
+							Grid.ColumnSpan="1"
+							Margin="0,4,24,4"
+							HorizontalAlignment="Stretch"
+							VerticalAlignment="Center"
+							Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+							Style="{ThemeResource CaptionTextBlockStyle}"
+							Text="{TemplateBinding Label}" />
+
+						<RatingControl
+							x:Name="PART_RatingControl"
+							Grid.Row="0"
+							Grid.RowSpan="2"
+							Grid.Column="1"
+							Grid.ColumnSpan="1"
+							HorizontalAlignment="Left"
+							VerticalAlignment="Center"
+							IsClearEnabled="True"
+							MaxRating="5"
+							PlaceholderValue="-1" />
+
+
+
+
+						<VisualStateManager.VisualStateGroups>
+							<VisualStateGroup x:Name="EditableStateGroup">
+								<VisualState x:Name="NotEditableState">
+									<VisualState.Setters>
+										<Setter Target="PART_RatingControl.IsReadOnly" Value="True" />
+									</VisualState.Setters>
+								</VisualState>
+								<VisualState x:Name="EditableState">
+									<VisualState.Setters>
+										<Setter Target="PART_RatingControl.IsReadOnly" Value="False" />
+									</VisualState.Setters>
+								</VisualState>
+							</VisualStateGroup>
+							<VisualStateGroup x:Name="OrientationStateGroup">
+								<VisualState x:Name="HorizontalState">
+									<VisualState.Setters>
+										<Setter Target="PART_Label.(Grid.Row)" Value="0" />
+										<Setter Target="PART_Label.(Grid.RowSpan)" Value="2" />
+										<Setter Target="PART_Label.(Grid.Column)" Value="0" />
+										<Setter Target="PART_Label.(Grid.ColumnSpan)" Value="1" />
+
+										<Setter Target="PART_RatingControl.(Grid.Row)" Value="0" />
+										<Setter Target="PART_RatingControl.(Grid.RowSpan)" Value="2" />
+										<Setter Target="PART_RatingControl.(Grid.Column)" Value="1" />
+										<Setter Target="PART_RatingControl.(Grid.ColumnSpan)" Value="1" />
+									</VisualState.Setters>
+								</VisualState>
+
+								<VisualState x:Name="VerticalState">
+									<VisualState.Setters>
+										<Setter Target="PART_Label.(Grid.Row)" Value="0" />
+										<Setter Target="PART_Label.(Grid.RowSpan)" Value="1" />
+										<Setter Target="PART_Label.(Grid.Column)" Value="0" />
+										<Setter Target="PART_Label.(Grid.ColumnSpan)" Value="2" />
+
+										<Setter Target="PART_RatingControl.(Grid.Row)" Value="1" />
+										<Setter Target="PART_RatingControl.(Grid.RowSpan)" Value="1" />
+										<Setter Target="PART_RatingControl.(Grid.Column)" Value="0" />
+										<Setter Target="PART_RatingControl.(Grid.ColumnSpan)" Value="2" />
+									</VisualState.Setters>
+								</VisualState>
+							</VisualStateGroup>
+						</VisualStateManager.VisualStateGroups>
+					</Grid>
+				</ControlTemplate>
 			</Setter.Value>
 		</Setter>
 	</Style>
diff --git a/src/Files.App.Controls/PropertiesView/PropertiesViewItem.cs b/src/Files.App.Controls/PropertiesView/PropertiesViewItem.cs
index ee61fc0b77fd..bbea52d9c742 100644
--- a/src/Files.App.Controls/PropertiesView/PropertiesViewItem.cs
+++ b/src/Files.App.Controls/PropertiesView/PropertiesViewItem.cs
@@ -34,11 +34,11 @@ private void UpdateOrientationState(Orientation orientation)
 		{
 			if ( orientation == Orientation.Horizontal )
 			{
-				VisualStateManager.GoToState( this , "HorizontalState" , false );
+				VisualStateManager.GoToState( this , HorizontalStateName , false );
 			}
 			else
 			{
-				VisualStateManager.GoToState( this , "VerticalState" , false );
+				VisualStateManager.GoToState( this , VerticalStateName , false );
 			}
 		}
 
@@ -55,11 +55,11 @@ private void UpdateCanEditState(bool canEdit)
 		{
 			if ( canEdit == true )
 			{
-				VisualStateManager.GoToState( this , "EditableState" , false );
+				VisualStateManager.GoToState( this , EditableStateName , false );
 			}
 			else
 			{
-				VisualStateManager.GoToState( this , "NonEditableState" , false );
+				VisualStateManager.GoToState( this , NotEditableStateName , false );
 			}
 		}
 
diff --git a/src/Files.App.Controls/PropertiesView/PropertiesViewItemRating.cs b/src/Files.App.Controls/PropertiesView/PropertiesViewItemRating.cs
index c74ed7027d92..35b311c5fe80 100644
--- a/src/Files.App.Controls/PropertiesView/PropertiesViewItemRating.cs
+++ b/src/Files.App.Controls/PropertiesView/PropertiesViewItemRating.cs
@@ -58,10 +58,86 @@ public int Rating
 		private static void OnRatingPropertyChanged(DependencyObject d , DependencyPropertyChangedEventArgs e)
 		{
 			var control = (PropertiesViewItemRating)d;
-			control.UpdateRatingProperty( (int)e.NewValue , (int)e.OldValue );
+			if ( e.NewValue != e.OldValue )
+			{ 
+				control.UpdateRatingProperty( (int)e.NewValue );
+			}
+		}
+
+		private void UpdateRatingProperty(int newRating)
+		{
+			double _convertedStars;
+
+			_convertedStars = ConvertToStars( newRating );
+
+			ApplyRatingPropertyToRatingControl( newRating );
+		}
+
+		#endregion
+
+
+		private bool _isLoaded;
+		public PropertiesViewItemRating()
+		{
+			DefaultStyleKey = typeof( PropertiesViewItemRating );
+
+			this.Loaded += (s , e) =>
+			{
+				_isLoaded = true;
+				UpdateRatingProperty( (int)Rating );
+			};
+		}
+
+
+
+
+		private RatingControl? _ratingControl;
+
+		protected override void OnApplyTemplate()
+		{
+			base.OnApplyTemplate();
+
+
+			// Remove ValueChanged event hook if RatingControl Part is not found or loaded
+			if ( _ratingControl != null )
+			{
+				_ratingControl.ValueChanged -= OnRatingValueChanged;
+			}
+
+
+			// Get Template Part
+			_ratingControl = GetTemplateChild( RatingControlPartName ) as RatingControl;
+
+
+			// Create ValueChanged event hook if RatingControl Part is found
+			if ( _ratingControl != null )
+			{
+				_ratingControl.ValueChanged += OnRatingValueChanged;
+			}
+		}
+
+
+
+
+		private void OnRatingValueChanged(RatingControl sender , object args)
+		{
+			if ( sender == null )
+			{
+				return;
+			}
+
+			int convertedRating;
+
+			// Handle the value sent from the RatingControl
+			convertedRating = ConvertToInt( (double)sender.Value );
+
+			this.Rating = convertedRating;
 		}
 
-		private void UpdateRatingProperty(int newRating, int oldRating)
+
+
+
+		private double ConvertToStars(int value)
 		{
 			// The system gives us ratings as an int value btween 1-99
 			// we then have to convert this into 1-5 stars
@@ -71,6 +147,44 @@ private void UpdateRatingProperty(int newRating, int oldRating)
 			// 63-87 - 4 Stars
 			// 88-99 - 5 Stars
 
+			if ( value <= 0 )
+				return 0.0;
+
+			if ( value >= 100 )
+				return 6.0;
+
+			// If the rating should be 1 Star
+			if ( value >= 1 && value <= 12 )
+				return 1.0;
+
+			// If the rating should be 2 Stars
+			if ( value >= 13 && value <= 37 )
+				return 2.0;
+
+			// If the rating should be 3 Stars
+			if ( value >= 38 && value <= 62 )
+				return 3.0;
+
+			// If the rating should be 4 Stars
+			if ( value >= 63 && value <= 87 )
+				return 4.0;
+
+			// If the rating should be 5 Stars
+			if ( value >= 88 && value <= 99 )
+				return 5.0;
+
+			else
+			{
+				return 0.0;
+			}
+
+		}
+
+
+
+
+		private int ConvertToInt(double stars)
+		{
 			// When setting this value using a Rating controls
 			// we assign values as listed below
 			// 1 Star  - 1
@@ -79,43 +193,63 @@ private void UpdateRatingProperty(int newRating, int oldRating)
 			// 4 Stars - 75
 			// 5 Stars - 99
 
-			// If the rating has changed, take action
-			if ( newRating != oldRating )
-			{
-				if ( newRating <= 0 )
-				{ }
+			if ( stars <= 0.0 )
+				return 0;
+
+			if ( stars > 5.0 )
+				return 99;
 
-				if ( newRating >= 100 )
-				{ }
+			// If the rating should be 1 Star
+			if ( stars == 1.0 )
+				return 1;
 
-				// If the rating should be 1 Star
-				if ( newRating >= 1 && newRating <= 12 )
-				{ }
+			// If the rating should be 2 Stars
+			if ( stars == 2.0 )
+				return 25;
 
-				// If the rating should be 2 Stars
-				if ( newRating >= 13 && newRating <= 37 )
-				{ }
+			// If the rating should be 3 Stars
+			if ( stars == 3.0 )
+				return 50;
 
-				// If the rating should be 3 Stars
-				if ( newRating >= 38 && newRating <= 62 )
-				{ }
+			// If the rating should be 4 Stars
+			if ( stars == 4.0 )
+				return 75;
 
-				// If the rating should be 4 Stars
-				if ( newRating >= 63 && newRating <= 87 )
-				{ }
+			// If the rating should be 5 Stars
+			if ( stars == 5.0 )
+				return 99;
 
-				// If the rating should be 5 Stars
-				if ( newRating >= 88 && newRating <= 99 )
-				{ }
+			else 
+			{
+				return 0;
 			}
+
 		}
 
-		#endregion
 
 
-		public PropertiesViewItemRating()
+
+		private void ApplyRatingPropertyToRatingControl(int newRating)
 		{
-			DefaultStyleKey = typeof( PropertiesViewItemText );
+			if ( _ratingControl == null )
+				return;
+
+			double stars = ConvertToStars(newRating);
+
+			if ( stars <= 0 )
+			{
+				_ratingControl.Value = 0.0;
+				_ratingControl.ClearValue( RatingControl.ValueProperty );
+			}
+			else if ( stars >= 6 )
+			{
+				_ratingControl.Value = 5;
+			}
+			else
+			{
+				_ratingControl.Value = stars;
+			}
 		}
+
 	}
 }
diff --git a/tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml b/tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml
index 8b5db283dcd5..978ce6528a99 100644
--- a/tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml
+++ b/tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml
@@ -108,7 +108,7 @@
 								Text="Item value 1 text here" />
 							<MenuFlyoutSeparator />
 							<fcontrols:PropertiesViewItemText
-								Label="Item label t00"
+								Label="Item label t00 extra long to demonstrate the wrapping for Labels"
 								LabelWidth="{StaticResource LabelWidth}"
 								Orientation="Horizontal"
 								Text="Item value t00 text here" />
@@ -117,7 +117,7 @@
 								Label="Item label three"
 								LabelWidth="{StaticResource LabelWidth}"
 								Orientation="Horizontal"
-								Text="Item value three text here" />
+								Text="Item value three text here, extra long to show how text values will wrap onto mnany lines." />
 						</StackPanel>
 					</Expander.Content>
 				</Expander>
@@ -137,23 +137,29 @@
 							Padding="0,0,0,8"
 							HorizontalAlignment="Stretch"
 							Orientation="Vertical">
-							<fcontrols:PropertiesViewItemText
-								Label="Item label 1"
+							<fcontrols:PropertiesViewItemRating
+								Label="Item label 1 readonly"
 								LabelWidth="{StaticResource LabelWidth}"
-								Orientation="Vertical"
-								Text="Item value 1 text here" />
+								Orientation="Horizontal"
+								Rating="9345" />
 							<MenuFlyoutSeparator Margin="16,0" />
-							<fcontrols:PropertiesViewItemText
-								Label="Item label t00"
-								Orientation="Vertical"
-								Text="Item value t00 text here" />
+							<fcontrols:PropertiesViewItemRating
+								CanEdit="True"
+								Label="Item label t00 editable"
+								Orientation="Horizontal"
+								Rating="-23" />
 							<MenuFlyoutSeparator Margin="16,0" />
-							<fcontrols:PropertiesViewItemText
+							<fcontrols:PropertiesViewItemRating
+								CanEdit="False"
+								Label="Item label three readonly"
+								Orientation="Horizontal"
+								Rating="32" />
+							<MenuFlyoutSeparator Margin="16,0" />
+							<fcontrols:PropertiesViewItemRating
 								CanEdit="True"
-								Label="Item label three"
-								LabelWidth="{StaticResource LabelWidth}"
-								Orientation="Vertical"
-								Text="Item value three text here" />
+								Label="Item label 4ore editable"
+								Orientation="Horizontal"
+								Rating="72" />
 						</StackPanel>
 					</Expander.Content>
 				</Expander>
@@ -164,7 +170,7 @@
 
 				<Expander Style="{StaticResource PropertiesExpanderStyle}">
 					<Expander.Header>
-						<fcontrols:PropertiesHeader Text="Header text goes here">
+						<fcontrols:PropertiesHeader Text="Vertical examples">
 							<fcontrols:PropertiesHeader.Icon>
 								<SymbolIcon Symbol="SlideShow" />
 							</fcontrols:PropertiesHeader.Icon>
@@ -174,13 +180,31 @@
 					<Expander.Content>
 						<StackPanel
 							HorizontalAlignment="Stretch"
-							Background="#110000FF"
 							Orientation="Vertical">
-							<TextBlock Height="48" Text="Item 1 in the stack" />
+
+							<fcontrols:PropertiesViewItemText
+								CanEdit="True"
+								Label="Item label 1"
+								LabelWidth="{StaticResource LabelWidth}"
+								Orientation="Vertical"
+								Text="Item value 1 text here" />
+
 							<MenuFlyoutSeparator />
-							<TextBlock Height="48" Text="Item 2 in the stack" />
+
+							<fcontrols:PropertiesViewItemRating
+								CanEdit="True"
+								Label="Really long label wrapping when using a vertical layout example here for your viewing pleasure."
+								Orientation="Vertical"
+								Rating="54" />
+
 							<MenuFlyoutSeparator />
-							<TextBlock Height="48" Text="Item 3 in the stack" />
+
+							<fcontrols:PropertiesViewItemText
+								CanEdit="False"
+								Label="Item label three"
+								LabelWidth="{StaticResource LabelWidth}"
+								Orientation="Vertical"
+								Text="Item value 1 text here, made long so we can see how wrapping will work for this vertical exanple of the control layout. " />
 						</StackPanel>
 					</Expander.Content>
 				</Expander>

From e291674db92e1d37bf02a61dcb7058a24d9e157a Mon Sep 17 00:00:00 2001
From: Martin Anderson <mdta@live.co.uk>
Date: Fri, 21 Aug 2026 00:05:13 +0100
Subject: [PATCH 13/36] Added an Info variant of the PropertiesViewItem - for
 text items with more info

Am happy to change the icon or styling of the Info icon, or to also discuss ways to maybe make the tooltip element more flexible.  Content rather than InfoText string as a property perhaps?
---
 .../PropertiesView.ThemeResources.xaml        | 185 ++++++++++++++++++
 .../PropertiesView/PropertiesViewItemInfo.cs  | 115 +++++++++++
 .../Views/PropertiesGeneralPage.xaml          |  42 +++-
 3 files changed, 338 insertions(+), 4 deletions(-)
 create mode 100644 src/Files.App.Controls/PropertiesView/PropertiesViewItemInfo.cs

diff --git a/src/Files.App.Controls/PropertiesView/PropertiesView.ThemeResources.xaml b/src/Files.App.Controls/PropertiesView/PropertiesView.ThemeResources.xaml
index e63532b4e013..209a64eed021 100644
--- a/src/Files.App.Controls/PropertiesView/PropertiesView.ThemeResources.xaml
+++ b/src/Files.App.Controls/PropertiesView/PropertiesView.ThemeResources.xaml
@@ -853,4 +853,189 @@
 
 
 
+
+	<!--  PROPERTIES VIEW ITEM - TEXT  -->
+	<Style BasedOn="{StaticResource DefaultPropertiesViewItem_Info}" TargetType="fcontrols:PropertiesViewItemInfo" />
+
+	<Style x:Key="DefaultPropertiesViewItem_Info" TargetType="fcontrols:PropertiesViewItemInfo">
+
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="fcontrols:PropertiesViewItemInfo">
+					<Grid
+						MinHeight="48"
+						Padding="0,6"
+						HorizontalAlignment="Stretch"
+						VerticalAlignment="Stretch">
+						<Grid.ColumnDefinitions>
+							<ColumnDefinition Width="{TemplateBinding LabelWidth}" />
+							<ColumnDefinition Width="*" />
+						</Grid.ColumnDefinitions>
+						<Grid.RowDefinitions>
+							<RowDefinition Height="Auto" />
+							<RowDefinition Height="Auto" />
+						</Grid.RowDefinitions>
+
+						<TextBlock
+							x:Name="PART_Label"
+							Grid.Row="0"
+							Grid.RowSpan="2"
+							Grid.Column="0"
+							Grid.ColumnSpan="1"
+							Margin="0,4,24,4"
+							VerticalAlignment="Center"
+							Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+							Style="{ThemeResource CaptionTextBlockStyle}"
+							Text="{TemplateBinding Label}" />
+
+						<Grid
+							x:Name="TextGrid"
+							Grid.Row="0"
+							Grid.RowSpan="2"
+							Grid.Column="1"
+							Grid.ColumnSpan="1"
+							HorizontalAlignment="Stretch"
+							VerticalAlignment="Center">
+
+							<Grid.ColumnDefinitions>
+								<ColumnDefinition x:Name="Col01" Width="Auto" />
+								<ColumnDefinition x:Name="Col02" Width="*" />
+							</Grid.ColumnDefinitions>
+
+							<TextBlock
+								x:Name="PART_Text"
+								Grid.Column="0"
+								Margin="0,2,12,2"
+								VerticalAlignment="Center"
+								Text="{TemplateBinding Text}"
+								TextWrapping="WrapWholeWords"
+								Visibility="Visible" />
+
+							<TextBox
+								x:Name="PART_TextEdit"
+								Grid.Column="0"
+								Grid.ColumnSpan="2"
+								Margin="-12,2,0,2"
+								VerticalAlignment="Center"
+								Text="{TemplateBinding Text}"
+								Visibility="Collapsed" />
+
+							<Border
+								x:Name="PART_InfoCard"
+								Grid.Column="1"
+								Width="32"
+								Height="32"
+								Margin="0,2,0,2"
+								HorizontalAlignment="Left"
+								VerticalAlignment="Center"
+								Background="{ThemeResource SubtleFillColorTransparentBrush}"
+								BorderBrush="{ThemeResource SubtleFillColorTransparentBrush}"
+								BorderThickness="1"
+								CornerRadius="16">
+
+								<ToolTipService.ToolTip>
+									<ToolTip Content="{TemplateBinding InfoText}" Placement="Top" />
+								</ToolTipService.ToolTip>
+
+								<FontIcon
+									x:Name="PART_InfoIcon"
+									HorizontalAlignment="Center"
+									VerticalAlignment="Center"
+									FontSize="16"
+									Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+									Glyph="&#xEA80;" />
+
+							</Border>
+						</Grid>
+
+
+
+
+						<VisualStateManager.VisualStateGroups>
+
+							<VisualStateGroup x:Name="EditableStateGroup">
+
+								<VisualState x:Name="NotEditableState">
+									<VisualState.Setters>
+										<Setter Target="PART_TextEdit.Visibility" Value="Collapsed" />
+										<Setter Target="PART_Text.Visibility" Value="Visible" />
+										<Setter Target="PART_InfoCard.Visibility" Value="Visible" />
+									</VisualState.Setters>
+								</VisualState>
+								<VisualState x:Name="EditableState">
+									<VisualState.Setters>
+										<Setter Target="PART_TextEdit.Visibility" Value="Visible" />
+										<Setter Target="PART_Text.Visibility" Value="Collapsed" />
+										<Setter Target="PART_InfoCard.Visibility" Value="Collapsed" />
+									</VisualState.Setters>
+								</VisualState>
+
+							</VisualStateGroup>
+
+
+							<VisualStateGroup x:Name="InfoStateGroup">
+
+								<VisualState x:Name="InfoRest">
+									<VisualState.Setters>
+										<Setter Target="PART_InfoCard.Background" Value="{ThemeResource SubtleFillColorTransparentBrush}" />
+										<Setter Target="PART_InfoCard.BorderBrush" Value="{ThemeResource SubtleFillColorTransparentBrush}" />
+										<Setter Target="PART_InfoIcon.Foreground" Value="{ThemeResource TextFillColorSecondaryBrush}" />
+									</VisualState.Setters>
+								</VisualState>
+								<VisualState x:Name="InfoPointerOver">
+									<VisualState.Setters>
+										<Setter Target="PART_InfoCard.Background" Value="{ThemeResource CardBackgroundFillColorDefaultBrush}" />
+										<Setter Target="PART_InfoCard.BorderBrush" Value="{ThemeResource SurfaceStrokeColorDefaultBrush}" />
+										<Setter Target="PART_InfoIcon.Foreground" Value="{ThemeResource TextFillColorPrimaryBrush}" />
+									</VisualState.Setters>
+								</VisualState>
+
+							</VisualStateGroup>
+
+
+							<VisualStateGroup x:Name="OrientationStateGroup">
+
+								<VisualState x:Name="HorizontalState">
+									<VisualState.Setters>
+										<Setter Target="PART_Label.(Grid.Row)" Value="0" />
+										<Setter Target="PART_Label.(Grid.RowSpan)" Value="2" />
+										<Setter Target="PART_Label.(Grid.Column)" Value="0" />
+										<Setter Target="PART_Label.(Grid.ColumnSpan)" Value="1" />
+
+										<Setter Target="TextStack.(Grid.Row)" Value="0" />
+										<Setter Target="TextStack.(Grid.RowSpan)" Value="2" />
+										<Setter Target="TextStack.(Grid.Column)" Value="1" />
+										<Setter Target="TextStack.(Grid.ColumnSpan)" Value="1" />
+										<Setter Target="Col01.Width" Value="Auto" />
+										<Setter Target="Col02.Width" Value="*" />
+									</VisualState.Setters>
+								</VisualState>
+
+								<VisualState x:Name="VerticalState">
+									<VisualState.Setters>
+										<Setter Target="PART_Label.(Grid.Row)" Value="0" />
+										<Setter Target="PART_Label.(Grid.RowSpan)" Value="1" />
+										<Setter Target="PART_Label.(Grid.Column)" Value="0" />
+										<Setter Target="PART_Label.(Grid.ColumnSpan)" Value="2" />
+
+										<Setter Target="TextStack.(Grid.Row)" Value="1" />
+										<Setter Target="TextStack.(Grid.RowSpan)" Value="1" />
+										<Setter Target="TextStack.(Grid.Column)" Value="0" />
+										<Setter Target="TextStack.(Grid.ColumnSpan)" Value="2" />
+
+										<Setter Target="Col01.Width" Value="*" />
+										<Setter Target="Col02.Width" Value="Auto" />
+									</VisualState.Setters>
+								</VisualState>
+							</VisualStateGroup>
+
+						</VisualStateManager.VisualStateGroups>
+					</Grid>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+
+
+
 </ResourceDictionary>
diff --git a/src/Files.App.Controls/PropertiesView/PropertiesViewItemInfo.cs b/src/Files.App.Controls/PropertiesView/PropertiesViewItemInfo.cs
new file mode 100644
index 000000000000..7495cea0074a
--- /dev/null
+++ b/src/Files.App.Controls/PropertiesView/PropertiesViewItemInfo.cs
@@ -0,0 +1,115 @@
+using Files.App.Controls.Primitives;
+using Microsoft.UI;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Documents;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+
+// To learn more about WinUI, the WinUI project structure,
+// and more about our project templates, see: http://aka.ms/winui-project-info.
+
+namespace Files.App.Controls
+{
+
+	#region Template Parts
+
+	[TemplatePart( Name = InfoCardPartName , Type = typeof( Border ) )]
+
+
+	[TemplateVisualState( Name = InfoRestStateName , GroupName = InfoStateGroupName )]
+	[TemplateVisualState( Name = InfoPointerOverStateName , GroupName = InfoStateGroupName )]
+
+	#endregion
+
+	public sealed partial class PropertiesViewItemInfo : PropertiesViewItem
+	{
+		#region Constants
+		internal const string InfoCardPartName = "PART_InfoCard";
+
+		internal const string InfoStateGroupName = "InfoStateGroup";
+
+		internal const string InfoRestStateName = "InfoRest";
+		internal const string InfoPointerOverStateName = "InfoPointerOver";
+
+		#endregion
+
+
+
+
+		#region Properties
+
+		public string Text
+		{
+			get { return (string)GetValue( TextProperty ); }
+			set { SetValue( TextProperty , value ); }
+		}
+
+		public static readonly DependencyProperty TextProperty =
+			DependencyProperty.Register(
+				"Text",
+				typeof(string),
+				typeof(PropertiesViewItemInfo),
+				new PropertyMetadata( string.Empty ) );
+
+
+
+
+		public string InfoText
+		{
+			get { return (string)GetValue( InfoTextProperty ); }
+			set { SetValue( InfoTextProperty , value ); }
+		}
+
+		public static readonly DependencyProperty InfoTextProperty =
+			DependencyProperty.Register(
+				"InfoText",
+				typeof(string),
+				typeof(PropertiesViewItemInfo),
+				new PropertyMetadata( string.Empty ) );
+
+		#endregion
+
+
+		public PropertiesViewItemInfo()
+		{
+			DefaultStyleKey = typeof( PropertiesViewItemInfo );
+		}
+
+
+
+
+		private Border? _hoverBorder;
+
+		protected override void OnApplyTemplate()
+		{
+			base.OnApplyTemplate();
+
+			_hoverBorder = GetTemplateChild( InfoCardPartName ) as Border;
+
+			if ( _hoverBorder != null )
+			{
+				_hoverBorder.PointerEntered += OnHoverBorderPointerEntered;
+				_hoverBorder.PointerExited += OnHoverBorderPointerExited;
+			}
+		}
+
+
+
+
+		private void OnHoverBorderPointerEntered(object sender , PointerRoutedEventArgs e)
+		{
+			VisualStateManager.GoToState( this , InfoPointerOverStateName , true );
+		}
+
+		private void OnHoverBorderPointerExited(object sender , PointerRoutedEventArgs e)
+		{
+			VisualStateManager.GoToState( this , InfoRestStateName , true );
+		}
+	}
+}
diff --git a/tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml b/tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml
index 978ce6528a99..048c78d27acf 100644
--- a/tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml
+++ b/tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml
@@ -15,7 +15,7 @@
 		<ResourceDictionary>
 			<ResourceDictionary.MergedDictionaries />
 
-			<GridLength x:Key="LabelWidth">120</GridLength>
+			<GridLength x:Key="LabelWidth">80</GridLength>
 
 		</ResourceDictionary>
 	</Page.Resources>
@@ -107,6 +107,22 @@
 								Orientation="Horizontal"
 								Text="Item value 1 text here" />
 							<MenuFlyoutSeparator />
+							<fcontrols:PropertiesViewItemInfo
+								CanEdit="False"
+								InfoText="Detailed text to display with the button press."
+								Label="Item info label 1"
+								LabelWidth="{StaticResource LabelWidth}"
+								Orientation="Horizontal"
+								Text="Info item value 1 text" />
+							<MenuFlyoutSeparator />
+							<fcontrols:PropertiesViewItemInfo
+								CanEdit="True"
+								InfoText="Detailed text to display with the button press."
+								Label="Item info label 1"
+								LabelWidth="{StaticResource LabelWidth}"
+								Orientation="Horizontal"
+								Text="Info item value 1 text" />
+							<MenuFlyoutSeparator />
 							<fcontrols:PropertiesViewItemText
 								Label="Item label t00 extra long to demonstrate the wrapping for Labels"
 								LabelWidth="{StaticResource LabelWidth}"
@@ -178,9 +194,7 @@
 					</Expander.Header>
 
 					<Expander.Content>
-						<StackPanel
-							HorizontalAlignment="Stretch"
-							Orientation="Vertical">
+						<StackPanel HorizontalAlignment="Stretch" Orientation="Vertical">
 
 							<fcontrols:PropertiesViewItemText
 								CanEdit="True"
@@ -191,6 +205,26 @@
 
 							<MenuFlyoutSeparator />
 
+							<fcontrols:PropertiesViewItemInfo
+								CanEdit="False"
+								InfoText="Detailed text to display with the button press."
+								Label="Item info label 1"
+								LabelWidth="{StaticResource LabelWidth}"
+								Orientation="Vertical"
+								Text="Info item value 1 text" />
+
+							<MenuFlyoutSeparator />
+
+							<fcontrols:PropertiesViewItemInfo
+								CanEdit="True"
+								InfoText="Detailed text to display with the button press."
+								Label="Item info label 1"
+								LabelWidth="{StaticResource LabelWidth}"
+								Orientation="Vertical"
+								Text="Info item value 1 text" />
+
+							<MenuFlyoutSeparator />
+
 							<fcontrols:PropertiesViewItemRating
 								CanEdit="True"
 								Label="Really long label wrapping when using a vertical layout example here for your viewing pleasure."

From 5f51cc0aadcaecb24cb37d8cb79f009a11d61302 Mon Sep 17 00:00:00 2001
From: Martin Anderson <mdta@live.co.uk>
Date: Fri, 21 Aug 2026 01:36:45 +0100
Subject: [PATCH 14/36] Added Disabled states to the controls

---
 .../PropertiesView.ThemeResources.xaml        | 65 ++++++++++++-
 .../PropertiesViewItem - Constants.cs         |  8 ++
 .../PropertiesView/PropertiesViewItem.cs      | 25 +++++
 .../PropertiesView/PropertiesViewItemInfo.cs  |  6 +-
 .../PropertiesViewItemToggle.cs               | 93 +++++++++++++++++++
 .../Views/PropertiesGeneralPage.xaml          | 43 ++++++++-
 6 files changed, 232 insertions(+), 8 deletions(-)
 create mode 100644 src/Files.App.Controls/PropertiesView/PropertiesViewItemToggle.cs

diff --git a/src/Files.App.Controls/PropertiesView/PropertiesView.ThemeResources.xaml b/src/Files.App.Controls/PropertiesView/PropertiesView.ThemeResources.xaml
index 209a64eed021..4012eb82c2d8 100644
--- a/src/Files.App.Controls/PropertiesView/PropertiesView.ThemeResources.xaml
+++ b/src/Files.App.Controls/PropertiesView/PropertiesView.ThemeResources.xaml
@@ -657,9 +657,10 @@
 							Grid.RowSpan="2"
 							Grid.Column="0"
 							Grid.ColumnSpan="1"
-							Margin="0,4,24,4"
+							Margin="0,4,20,4"
 							VerticalAlignment="Center"
 							Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+							LineHeight="20"
 							Style="{ThemeResource CaptionTextBlockStyle}"
 							Text="{TemplateBinding Label}" />
 
@@ -704,6 +705,8 @@
 									</VisualState.Setters>
 								</VisualState>
 							</VisualStateGroup>
+
+
 							<VisualStateGroup x:Name="OrientationStateGroup">
 								<VisualState x:Name="HorizontalState">
 									<VisualState.Setters>
@@ -743,6 +746,22 @@
 									</VisualState.Setters>
 								</VisualState>
 							</VisualStateGroup>
+
+
+							<VisualStateGroup x:Name="EnabledStateGroup">
+								<VisualState x:Name="Enabledtate">
+									<VisualState.Setters>
+										<Setter Target="PART_TextEdit.IsEnabled" Value="True" />
+										<Setter Target="PART_Text.Foreground" Value="{ThemeResource TextFillColorPrimaryBrush}" />
+									</VisualState.Setters>
+								</VisualState>
+								<VisualState x:Name="DisabledState">
+									<VisualState.Setters>
+										<Setter Target="PART_TextEdit.IsEnabled" Value="False" />
+										<Setter Target="PART_Text.Foreground" Value="{ThemeResource TextFillColorDisabledBrush}" />
+									</VisualState.Setters>
+								</VisualState>
+							</VisualStateGroup>
 						</VisualStateManager.VisualStateGroups>
 					</Grid>
 				</ControlTemplate>
@@ -762,6 +781,7 @@
 			<Setter.Value>
 				<ControlTemplate TargetType="fcontrols:PropertiesViewItemRating">
 					<Grid
+						MinHeight="48"
 						Padding="0,6"
 						HorizontalAlignment="Stretch"
 						VerticalAlignment="Stretch">
@@ -784,6 +804,7 @@
 							HorizontalAlignment="Stretch"
 							VerticalAlignment="Center"
 							Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+							LineHeight="20"
 							Style="{ThemeResource CaptionTextBlockStyle}"
 							Text="{TemplateBinding Label}" />
 
@@ -800,8 +821,6 @@
 							PlaceholderValue="-1" />
 
 
-
-
 						<VisualStateManager.VisualStateGroups>
 							<VisualStateGroup x:Name="EditableStateGroup">
 								<VisualState x:Name="NotEditableState">
@@ -815,6 +834,8 @@
 									</VisualState.Setters>
 								</VisualState>
 							</VisualStateGroup>
+
+
 							<VisualStateGroup x:Name="OrientationStateGroup">
 								<VisualState x:Name="HorizontalState">
 									<VisualState.Setters>
@@ -844,6 +865,20 @@
 									</VisualState.Setters>
 								</VisualState>
 							</VisualStateGroup>
+
+
+							<VisualStateGroup x:Name="EnabledStateGroup">
+								<VisualState x:Name="Enabledtate">
+									<VisualState.Setters>
+										<Setter Target="PART_RatingControl.IsEnabled" Value="True" />
+									</VisualState.Setters>
+								</VisualState>
+								<VisualState x:Name="DisabledState">
+									<VisualState.Setters>
+										<Setter Target="PART_RatingControl.IsEnabled" Value="False" />
+									</VisualState.Setters>
+								</VisualState>
+							</VisualStateGroup>
 						</VisualStateManager.VisualStateGroups>
 					</Grid>
 				</ControlTemplate>
@@ -885,6 +920,7 @@
 							Margin="0,4,24,4"
 							VerticalAlignment="Center"
 							Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+							LineHeight="20"
 							Style="{ThemeResource CaptionTextBlockStyle}"
 							Text="{TemplateBinding Label}" />
 
@@ -1029,6 +1065,29 @@
 								</VisualState>
 							</VisualStateGroup>
 
+
+							<VisualStateGroup x:Name="EnabledStateGroup">
+								<VisualState x:Name="Enabledtate">
+									<VisualState.Setters>
+										<Setter Target="PART_InfoCard.Opacity" Value="1.0" />
+										<Setter Target="PART_TextEdit.IsEnabled" Value="True" />
+										<Setter Target="PART_Text.Foreground" Value="{ThemeResource TextFillColorPrimaryBrush}" />
+
+									</VisualState.Setters>
+								</VisualState>
+								<VisualState x:Name="DisabledState">
+									<VisualState.Setters>
+										<Setter Target="PART_InfoCard.Opacity" Value="0.4" />
+										<Setter Target="PART_TextEdit.IsEnabled" Value="False" />
+										<Setter Target="PART_Text.Foreground" Value="{ThemeResource TextFillColorDisabledBrush}" />
+
+										<Setter Target="PART_InfoCard.Background" Value="{ThemeResource SubtleFillColorTransparentBrush}" />
+										<Setter Target="PART_InfoCard.BorderBrush" Value="{ThemeResource SubtleFillColorTransparentBrush}" />
+										<Setter Target="PART_InfoIcon.Foreground" Value="{ThemeResource TextFillColorDisabledBrush}" />
+									</VisualState.Setters>
+								</VisualState>
+							</VisualStateGroup>
+
 						</VisualStateManager.VisualStateGroups>
 					</Grid>
 				</ControlTemplate>
diff --git a/src/Files.App.Controls/PropertiesView/PropertiesViewItem - Constants.cs b/src/Files.App.Controls/PropertiesView/PropertiesViewItem - Constants.cs
index c59a8df36d91..662f186591aa 100644
--- a/src/Files.App.Controls/PropertiesView/PropertiesViewItem - Constants.cs	
+++ b/src/Files.App.Controls/PropertiesView/PropertiesViewItem - Constants.cs	
@@ -13,6 +13,9 @@ namespace Files.App.Controls.Primitives
 	[TemplateVisualState( Name = NotEditableStateName , GroupName = EditableStateGroupName )]
 	[TemplateVisualState( Name = EditableStateName , GroupName = EditableStateGroupName )]
 
+	[TemplateVisualState( Name = EnabledStateName , GroupName = EnabledStateGroupName )]
+	[TemplateVisualState( Name = DisabledStateName , GroupName = EnabledStateGroupName )]
+
 
 
 
@@ -20,6 +23,8 @@ public partial class PropertiesViewItem : Control
 	{
 		internal const string OrientationStateGroupName = "OrientationStateGroup";
 		internal const string EditableStateGroupName = "EditableStateGroup";
+		internal const string EnabledStateGroupName = "EnabledStateGroup";
+
 
 		internal const string HorizontalStateName = "HorizontalState";
 		internal const string VerticalStateName = "VerticalState";
@@ -27,5 +32,8 @@ public partial class PropertiesViewItem : Control
 		internal const string NotEditableStateName = "NotEditableState";
 		internal const string EditableStateName = "EditableState";
 
+		internal const string EnabledStateName = "Enabledtate";
+		internal const string DisabledStateName = "DisabledState";
+
 	}
 }
diff --git a/src/Files.App.Controls/PropertiesView/PropertiesViewItem.cs b/src/Files.App.Controls/PropertiesView/PropertiesViewItem.cs
index bbea52d9c742..1a9720465a37 100644
--- a/src/Files.App.Controls/PropertiesView/PropertiesViewItem.cs
+++ b/src/Files.App.Controls/PropertiesView/PropertiesViewItem.cs
@@ -19,10 +19,18 @@ public PropertiesViewItem()
 				_isLoaded = true;
 				UpdateOrientationState( Orientation );
 				UpdateCanEditState( CanEdit );
+
+				// Apply initial state
+				UpdateEnabledState( IsEnabled );
+
+				// React to future changes
+				RegisterPropertyChangedCallback( Control.IsEnabledProperty , OnIsEnabledChanged );
 			};
 		}
 
 
+
+
 		#region Property Changed
 		private static void OnOrientationChanged(DependencyObject d , DependencyPropertyChangedEventArgs e)
 		{
@@ -63,6 +71,23 @@ private void UpdateCanEditState(bool canEdit)
 			}
 		}
 
+
+
+
+		private void OnIsEnabledChanged(DependencyObject sender , DependencyProperty dp)
+		{
+			UpdateEnabledState( IsEnabled );
+		}
+
+
+		private void UpdateEnabledState(bool isEnabled)
+		{
+			if ( isEnabled )
+				VisualStateManager.GoToState( this , EnabledStateName , true );
+			else
+				VisualStateManager.GoToState( this , DisabledStateName , true );
+		}
+
 		#endregion
 
 	}
diff --git a/src/Files.App.Controls/PropertiesView/PropertiesViewItemInfo.cs b/src/Files.App.Controls/PropertiesView/PropertiesViewItemInfo.cs
index 7495cea0074a..d1163929b74a 100644
--- a/src/Files.App.Controls/PropertiesView/PropertiesViewItemInfo.cs
+++ b/src/Files.App.Controls/PropertiesView/PropertiesViewItemInfo.cs
@@ -104,12 +104,14 @@ protected override void OnApplyTemplate()
 
 		private void OnHoverBorderPointerEntered(object sender , PointerRoutedEventArgs e)
 		{
-			VisualStateManager.GoToState( this , InfoPointerOverStateName , true );
+			if (IsEnabled)
+				VisualStateManager.GoToState( this , InfoPointerOverStateName , true );
 		}
 
 		private void OnHoverBorderPointerExited(object sender , PointerRoutedEventArgs e)
 		{
-			VisualStateManager.GoToState( this , InfoRestStateName , true );
+			if ( IsEnabled )
+				VisualStateManager.GoToState( this , InfoRestStateName , true );
 		}
 	}
 }
diff --git a/src/Files.App.Controls/PropertiesView/PropertiesViewItemToggle.cs b/src/Files.App.Controls/PropertiesView/PropertiesViewItemToggle.cs
new file mode 100644
index 000000000000..1d905b5ec772
--- /dev/null
+++ b/src/Files.App.Controls/PropertiesView/PropertiesViewItemToggle.cs
@@ -0,0 +1,93 @@
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Documents;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Files.App.Controls.Primitives;
+
+// To learn more about WinUI, the WinUI project structure,
+// and more about our project templates, see: http://aka.ms/winui-project-info.
+
+namespace Files.App.Controls
+{
+	#region Template Parts
+
+	[TemplatePart( Name = ToggleSwitchPartName , Type = typeof( ToggleSwitch ) )]
+
+	#endregion
+
+
+
+	public sealed partial class PropertiesViewItemToggle : PropertiesViewItem
+	{
+		#region Constants
+		internal const string ToggleSwitchPartName = "PART_ToggleSwitch";
+
+		#endregion
+
+
+
+
+		#region Properties
+
+		public bool IsToggled
+		{
+			get { return (bool)GetValue( IsToggledProperty ); }
+			set { SetValue( IsToggledProperty , value ); }
+		}
+
+		public static readonly DependencyProperty IsToggledProperty =
+			DependencyProperty.Register(
+				"IsToggled",
+				typeof(bool),
+				typeof(PropertiesViewItemToggle),
+				new PropertyMetadata( false , OnIsToggledPropertyChanged ) );
+
+		#endregion
+
+
+
+
+		#region Property Changed
+
+		private static void OnIsToggledPropertyChanged(DependencyObject d , DependencyPropertyChangedEventArgs e)
+		{
+			var control = (PropertiesViewItemToggle)d;
+			control.UpdateIsToggledProperty( (bool)e.NewValue );
+		}
+
+		private void UpdateIsToggledProperty(bool isToggled)
+		{
+			
+		}
+
+		#endregion
+
+
+		private bool _isLoaded;
+		public PropertiesViewItemToggle()
+		{
+			DefaultStyleKey = typeof( PropertiesViewItemToggle );
+
+			this.Loaded += (s , e) =>
+			{
+				_isLoaded = true;
+				UpdateIsToggledProperty( (bool)IsToggled );
+			};
+		}
+
+
+
+
+		protected override void OnApplyTemplate()
+		{
+			base.OnApplyTemplate();
+		}
+
+	}
+}
diff --git a/tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml b/tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml
index 048c78d27acf..4aef3425caa4 100644
--- a/tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml
+++ b/tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml
@@ -15,7 +15,7 @@
 		<ResourceDictionary>
 			<ResourceDictionary.MergedDictionaries />
 
-			<GridLength x:Key="LabelWidth">80</GridLength>
+			<GridLength x:Key="LabelWidth">160</GridLength>
 
 		</ResourceDictionary>
 	</Page.Resources>
@@ -109,7 +109,7 @@
 							<MenuFlyoutSeparator />
 							<fcontrols:PropertiesViewItemInfo
 								CanEdit="False"
-								InfoText="Detailed text to display with the button press."
+								InfoText="Detailed text to display with hover."
 								Label="Item info label 1"
 								LabelWidth="{StaticResource LabelWidth}"
 								Orientation="Horizontal"
@@ -117,18 +117,41 @@
 							<MenuFlyoutSeparator />
 							<fcontrols:PropertiesViewItemInfo
 								CanEdit="True"
-								InfoText="Detailed text to display with the button press."
+								InfoText="Detailed text to display with hover."
 								Label="Item info label 1"
 								LabelWidth="{StaticResource LabelWidth}"
 								Orientation="Horizontal"
 								Text="Info item value 1 text" />
 							<MenuFlyoutSeparator />
+							<fcontrols:PropertiesViewItemInfo
+								InfoText="Detailed text to display with hover."
+								IsEnabled="False"
+								Label="Disabled info label 1"
+								LabelWidth="{StaticResource LabelWidth}"
+								Orientation="Horizontal"
+								Text="Info item value 1 text" />
+							<MenuFlyoutSeparator />
 							<fcontrols:PropertiesViewItemText
 								Label="Item label t00 extra long to demonstrate the wrapping for Labels"
 								LabelWidth="{StaticResource LabelWidth}"
 								Orientation="Horizontal"
 								Text="Item value t00 text here" />
 							<MenuFlyoutSeparator />
+							<fcontrols:PropertiesViewItemText
+								IsEnabled="False"
+								Label="Disabled - CanEdit set to False"
+								LabelWidth="{StaticResource LabelWidth}"
+								Orientation="Horizontal"
+								Text="Item value t00 text here" />
+							<MenuFlyoutSeparator />
+							<fcontrols:PropertiesViewItemText
+								CanEdit="True"
+								IsEnabled="False"
+								Label="Disabled - CanEdit set to True"
+								LabelWidth="{StaticResource LabelWidth}"
+								Orientation="Horizontal"
+								Text="Item value t00 text here" />
+							<MenuFlyoutSeparator />
 							<fcontrols:PropertiesViewItemText
 								Label="Item label three"
 								LabelWidth="{StaticResource LabelWidth}"
@@ -171,6 +194,20 @@
 								Orientation="Horizontal"
 								Rating="32" />
 							<MenuFlyoutSeparator Margin="16,0" />
+							<fcontrols:PropertiesViewItemRating
+								CanEdit="False"
+								IsEnabled="False"
+								Label="Disabled item label"
+								Orientation="Horizontal"
+								Rating="50" />
+							<MenuFlyoutSeparator Margin="16,0" />
+							<fcontrols:PropertiesViewItemRating
+								CanEdit="True"
+								IsEnabled="False"
+								Label="Disabled, editable label"
+								Orientation="Horizontal"
+								Rating="50" />
+							<MenuFlyoutSeparator Margin="16,0" />
 							<fcontrols:PropertiesViewItemRating
 								CanEdit="True"
 								Label="Item label 4ore editable"

From ccc9cfd57f0f77eafccad097dd9a7c64984d0086 Mon Sep 17 00:00:00 2001
From: 0x5BFA <62196528+0x5bfa@users.noreply.github.com>
Date: Fri, 21 Aug 2026 09:58:09 +0900
Subject: [PATCH 15/36] Update PropertiesView.ThemeResources.xaml

---
 .../PropertiesView.ThemeResources.xaml           | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Files.App.Controls/PropertiesView/PropertiesView.ThemeResources.xaml b/src/Files.App.Controls/PropertiesView/PropertiesView.ThemeResources.xaml
index 4012eb82c2d8..66a6d8ab9a0d 100644
--- a/src/Files.App.Controls/PropertiesView/PropertiesView.ThemeResources.xaml
+++ b/src/Files.App.Controls/PropertiesView/PropertiesView.ThemeResources.xaml
@@ -1038,10 +1038,10 @@
 										<Setter Target="PART_Label.(Grid.Column)" Value="0" />
 										<Setter Target="PART_Label.(Grid.ColumnSpan)" Value="1" />
 
-										<Setter Target="TextStack.(Grid.Row)" Value="0" />
-										<Setter Target="TextStack.(Grid.RowSpan)" Value="2" />
-										<Setter Target="TextStack.(Grid.Column)" Value="1" />
-										<Setter Target="TextStack.(Grid.ColumnSpan)" Value="1" />
+										<Setter Target="TextGrid.(Grid.Row)" Value="0" />
+										<Setter Target="TextGrid.(Grid.RowSpan)" Value="2" />
+										<Setter Target="TextGrid.(Grid.Column)" Value="1" />
+										<Setter Target="TextGrid.(Grid.ColumnSpan)" Value="1" />
 										<Setter Target="Col01.Width" Value="Auto" />
 										<Setter Target="Col02.Width" Value="*" />
 									</VisualState.Setters>
@@ -1054,10 +1054,10 @@
 										<Setter Target="PART_Label.(Grid.Column)" Value="0" />
 										<Setter Target="PART_Label.(Grid.ColumnSpan)" Value="2" />
 
-										<Setter Target="TextStack.(Grid.Row)" Value="1" />
-										<Setter Target="TextStack.(Grid.RowSpan)" Value="1" />
-										<Setter Target="TextStack.(Grid.Column)" Value="0" />
-										<Setter Target="TextStack.(Grid.ColumnSpan)" Value="2" />
+										<Setter Target="TextGrid.(Grid.Row)" Value="1" />
+										<Setter Target="TextGrid.(Grid.RowSpan)" Value="1" />
+										<Setter Target="TextGrid.(Grid.Column)" Value="0" />
+										<Setter Target="TextGrid.(Grid.ColumnSpan)" Value="2" />
 
 										<Setter Target="Col01.Width" Value="*" />
 										<Setter Target="Col02.Width" Value="Auto" />

From f3d2eb0dff659ae70cfce7b7835ab444867ab7b8 Mon Sep 17 00:00:00 2001
From: 0x5BFA <62196528+0x5bfa@users.noreply.github.com>
Date: Fri, 21 Aug 2026 11:06:25 +0900
Subject: [PATCH 16/36] Implement PropertiesView

---
 .../PropertiesView/PropertiesView.cs          |  24 ++++
 ...hemeResources.xaml => PropertiesView.xaml} |  79 ++++++++++--
 src/Files.App.Controls/Themes/Generic.xaml    |   2 +-
 .../Dialogs/Properties/PropertiesDialog.xaml  | 112 ++++++------------
 .../Properties/PropertiesDialog.xaml.cs       |  40 ++-----
 5 files changed, 136 insertions(+), 121 deletions(-)
 create mode 100644 src/Files.App.Controls/PropertiesView/PropertiesView.cs
 rename src/Files.App.Controls/PropertiesView/{PropertiesView.ThemeResources.xaml => PropertiesView.xaml} (95%)

diff --git a/src/Files.App.Controls/PropertiesView/PropertiesView.cs b/src/Files.App.Controls/PropertiesView/PropertiesView.cs
new file mode 100644
index 000000000000..9413baf2095c
--- /dev/null
+++ b/src/Files.App.Controls/PropertiesView/PropertiesView.cs
@@ -0,0 +1,24 @@
+// Copyright (c) Files Community
+// SPDX-License-Identifier: MPL-2.0
+
+using CommunityToolkit.WinUI;
+
+namespace Files.App.Controls
+{
+	public partial class PropertiesView : ContentControl
+	{
+		[GeneratedDependencyProperty]
+		public partial string? Title { get; set; }
+
+		[GeneratedDependencyProperty]
+		public partial FrameworkElement? Header { get; set; }
+
+		[GeneratedDependencyProperty]
+		public partial FrameworkElement? Footer { get; set; }
+
+		public PropertiesView()
+		{
+			DefaultStyleKey = typeof(PropertiesView);
+		}
+	}
+}
diff --git a/src/Files.App.Controls/PropertiesView/PropertiesView.ThemeResources.xaml b/src/Files.App.Controls/PropertiesView/PropertiesView.xaml
similarity index 95%
rename from src/Files.App.Controls/PropertiesView/PropertiesView.ThemeResources.xaml
rename to src/Files.App.Controls/PropertiesView/PropertiesView.xaml
index 66a6d8ab9a0d..0d4d408d75ac 100644
--- a/src/Files.App.Controls/PropertiesView/PropertiesView.ThemeResources.xaml
+++ b/src/Files.App.Controls/PropertiesView/PropertiesView.xaml
@@ -6,11 +6,9 @@
 	xmlns:controls="using:Microsoft.UI.Xaml.Controls"
 	xmlns:fcontrols="using:Files.App.Controls">
 
-
-	<!--  THEME RESOURCE DICTIONARY  -->
 	<ResourceDictionary.ThemeDictionaries>
 
-		<ResourceDictionary x:Key="Default">
+		<ResourceDictionary x:Key="Light">
 			<Thickness x:Key="PropertiesExpanderHeaderPadding">8,8,8,7</Thickness>
 			<Thickness x:Key="PropertiesExpanderHeaderBorderThickness">0</Thickness>
 
@@ -39,7 +37,7 @@
 			<StaticResource x:Key="PropertiesExpanderSeparatorFillColor" ResourceKey="DividerStrokeColorDefaultBrush" />
 		</ResourceDictionary>
 
-		<ResourceDictionary x:Key="Light">
+		<ResourceDictionary x:Key="Dark">
 			<Thickness x:Key="PropertiesExpanderHeaderPadding">8,8,8,7</Thickness>
 			<Thickness x:Key="PropertiesExpanderHeaderBorderThickness">0</Thickness>
 
@@ -99,10 +97,6 @@
 
 	</ResourceDictionary.ThemeDictionaries>
 
-
-
-
-	<!--  RESOURCES  -->
 	<x:Double x:Key="PropertiesExpanderMinHeight">48</x:Double>
 
 	<Thickness x:Key="PropertiesExpanderHeaderInnerPadding">12,0,24,0</Thickness>
@@ -123,6 +117,75 @@
 
 	<x:Double x:Key="PropertiesExpanderSeparatorHeight">1</x:Double>
 
+	<Style BasedOn="{StaticResource DefaultPropertiesViewStyle}" TargetType="fcontrols:PropertiesView" />
+
+	<Style x:Key="DefaultPropertiesViewStyle" TargetType="fcontrols:PropertiesView">
+		<Setter Property="VerticalAlignment" Value="Stretch" />
+		<Setter Property="HorizontalAlignment" Value="Stretch" />
+		<Setter Property="VerticalContentAlignment" Value="Stretch" />
+		<Setter Property="HorizontalContentAlignment" Value="Stretch" />
+		<Setter Property="Background" Value="{ThemeResource SolidBackgroundFillColorBaseBrush}" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="fcontrols:PropertiesView">
+					<Grid Background="{TemplateBinding Background}">
+						<Grid.RowDefinitions>
+							<RowDefinition Height="*" />
+							<RowDefinition Height="Auto" />
+						</Grid.RowDefinitions>
+
+						<Border
+							Grid.Row="0"
+							Padding="0,24,0,0"
+							Background="{ThemeResource LayerFillColorAltBrush}"
+							BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
+							BorderThickness="0,0,0,1">
+
+							<Grid HorizontalAlignment="Stretch">
+								<Grid.RowDefinitions>
+									<RowDefinition Height="Auto" />
+									<RowDefinition Height="Auto" />
+									<RowDefinition Height="*" />
+								</Grid.RowDefinitions>
+
+								<TextBlock
+									Grid.Row="0"
+									Margin="24,0"
+									Style="{ThemeResource SubtitleTextBlockStyle}"
+									Text="{TemplateBinding Title}" />
+
+								<ContentPresenter
+									Grid.Row="1"
+									HorizontalContentAlignment="Stretch"
+									VerticalContentAlignment="Stretch"
+									Content="{TemplateBinding Header}" />
+
+								<ContentPresenter
+									Grid.Row="2"
+									HorizontalContentAlignment="Stretch"
+									VerticalContentAlignment="Stretch"
+									BorderBrush="{ThemeResource DividerStrokeColorDefaultBrush}"
+									BorderThickness="0,1,0,0"
+									Content="{TemplateBinding Content}" />
+
+							</Grid>
+
+						</Border>
+
+						<ContentPresenter
+							Grid.Row="1"
+							Padding="24,24,24,24"
+							HorizontalAlignment="Stretch"
+							VerticalAlignment="Stretch"
+							HorizontalContentAlignment="Stretch"
+							VerticalContentAlignment="Stretch"
+							Content="{TemplateBinding Footer}" />
+
+					</Grid>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
 
 
 
diff --git a/src/Files.App.Controls/Themes/Generic.xaml b/src/Files.App.Controls/Themes/Generic.xaml
index c32611dc440b..cee7414f6fef 100644
--- a/src/Files.App.Controls/Themes/Generic.xaml
+++ b/src/Files.App.Controls/Themes/Generic.xaml
@@ -76,7 +76,7 @@
 		<!--#endregion-->
 
 		<!--#region Dialog Resources-->
-		<ResourceDictionary Source="ms-appx:///Files.App.Controls/PropertiesView/PropertiesView.ThemeResources.xaml" />
+		<ResourceDictionary Source="ms-appx:///Files.App.Controls/PropertiesView/PropertiesView.xaml" />
 		<!--#endregion-->
 
 	</ResourceDictionary.MergedDictionaries>
diff --git a/tests/Files.App.UITests/Dialogs/Properties/PropertiesDialog.xaml b/tests/Files.App.UITests/Dialogs/Properties/PropertiesDialog.xaml
index 800accdc5b25..dd92d211e715 100644
--- a/tests/Files.App.UITests/Dialogs/Properties/PropertiesDialog.xaml
+++ b/tests/Files.App.UITests/Dialogs/Properties/PropertiesDialog.xaml
@@ -3,95 +3,49 @@
 	x:Class="Files.App.UITests.Dialogs.PropertiesDialog"
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	xmlns:controls="using:Files.App.Controls"
 	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 	xmlns:local="using:Files.App.UITests.Dialogs"
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 	Title="Properties title for window"
 	mc:Ignorable="d">
 
-
-	<Grid Background="{ThemeResource SolidBackgroundFillColorBaseBrush}">
-
-		<Grid.RowDefinitions>
-			<RowDefinition Height="*" />
-			<RowDefinition Height="auto" />
-		</Grid.RowDefinitions>
-
-
-		<Border
-			x:Name="DialogFillRegion"
-			Grid.Row="0"
-			Padding="0,24,0,0"
-			HorizontalAlignment="Stretch"
-			VerticalAlignment="Stretch"
-			Background="{ThemeResource LayerFillColorAltBrush}"
-			BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
-			BorderThickness="0,0,1,0">
-
-			<Grid HorizontalAlignment="Stretch">
-				<Grid.RowDefinitions>
-					<RowDefinition Height="auto" />
-					<RowDefinition Height="auto" />
-					<RowDefinition Height="*" />
-				</Grid.RowDefinitions>
-
-
-				<TextBlock
-					Grid.Row="0"
-					Margin="24,0"
-					Style="{ThemeResource SubtitleTextBlockStyle}"
-					Text="Properties title" />
-
-				<SelectorBar Grid.Row="1" Margin="12,4">
-					<SelectorBarItem IsSelected="True" Text="General" />
-					<SelectorBarItem Text="Signatures" />
-					<SelectorBarItem Text="Security" />
-					<SelectorBarItem Text="Details" />
-					<SelectorBarItem Text="Hashes" />
-					<SelectorBarItem Text="Compatibility" />
-				</SelectorBar>
-
-				<Border
-					Grid.Row="2"
+	<controls:PropertiesView Title="Properties title">
+
+		<controls:PropertiesView.Header>
+			<SelectorBar Grid.Row="1" Padding="12,4">
+				<SelectorBarItem IsSelected="True" Text="General" />
+				<SelectorBarItem Text="Signatures" />
+				<SelectorBarItem Text="Security" />
+				<SelectorBarItem Text="Details" />
+				<SelectorBarItem Text="Hashes" />
+				<SelectorBarItem Text="Compatibility" />
+			</SelectorBar>
+		</controls:PropertiesView.Header>
+
+		<Frame x:Name="MainContentFrame" IsNavigationStackEnabled="False" />
+
+		<controls:PropertiesView.Footer>
+			<Grid ColumnSpacing="8">
+				<Grid.ColumnDefinitions>
+					<ColumnDefinition Width="*" />
+					<ColumnDefinition Width="*" />
+				</Grid.ColumnDefinitions>
+
+				<Button
+					Grid.Column="0"
 					HorizontalAlignment="Stretch"
-					VerticalAlignment="Stretch"
-					BorderBrush="{ThemeResource DividerStrokeColorDefaultBrush}"
-					BorderThickness="0,1,0,0">
+					Content="Apply"
+					Style="{ThemeResource AccentButtonStyle}" />
 
+				<Button
+					Grid.Column="1"
+					HorizontalAlignment="Stretch"
+					Content="Cancel" />
 
-					<Frame
-						x:Name="propertiesFrame"
-						HorizontalAlignment="Stretch"
-						VerticalAlignment="Stretch"
-						IsNavigationStackEnabled="False" />
-
-				</Border>
 			</Grid>
+		</controls:PropertiesView.Footer>
 
-		</Border>
-
-
-		<Grid x:Name="DialogBtmButtons" Grid.Row="1">
-			<Grid.ColumnDefinitions>
-				<ColumnDefinition Width="*" />
-				<ColumnDefinition Width="*" />
-			</Grid.ColumnDefinitions>
-
-			<Button
-				Grid.Column="0"
-				Margin="24,24,4,24"
-				HorizontalAlignment="Stretch"
-				Content="Apply"
-				Style="{ThemeResource AccentButtonStyle}" />
-
-			<Button
-				Grid.Column="1"
-				Margin="4,24,24,24"
-				HorizontalAlignment="Stretch"
-				Content="Cancel" />
-
-		</Grid>
-
-	</Grid>
+	</controls:PropertiesView>
 
 </Window>
diff --git a/tests/Files.App.UITests/Dialogs/Properties/PropertiesDialog.xaml.cs b/tests/Files.App.UITests/Dialogs/Properties/PropertiesDialog.xaml.cs
index 9cd09c5dba29..ab37f225042d 100644
--- a/tests/Files.App.UITests/Dialogs/Properties/PropertiesDialog.xaml.cs
+++ b/tests/Files.App.UITests/Dialogs/Properties/PropertiesDialog.xaml.cs
@@ -1,29 +1,12 @@
+// Copyright (c) Files Community
+// SPDX-License-Identifier: MPL-2.0
+
 using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Controls.Primitives;
-using Microsoft.UI.Xaml.Data;
-using Microsoft.UI.Xaml.Input;
-using Microsoft.UI.Xaml.Media;
-using Microsoft.UI.Xaml.Navigation;
 using Microsoft.UI.Windowing;
-using Files.App.UITests.Dialogs;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
 using Files.App.UITests.Dialogs.Properties.Views;
 
-// To learn more about WinUI, the WinUI project structure,
-// and more about our project templates, see: http://aka.ms/winui-project-info.
-
 namespace Files.App.UITests.Dialogs
 {
-	/// <summary>
-	/// An empty window that can be used on its own or navigated to within a Frame.
-	/// </summary>
 	public sealed partial class PropertiesDialog : Window
 	{
 		public PropertiesDialog()
@@ -31,24 +14,15 @@ public PropertiesDialog()
 			InitializeComponent();
 
 			OverlappedPresenter presenter = OverlappedPresenter.Create();
-
-			this.ExtendsContentIntoTitleBar = true;
-			AppWindow.Resize( new Windows.Graphics.SizeInt32( 640 , 480 ) );
+			ExtendsContentIntoTitleBar = true;
+			AppWindow.Resize(new Windows.Graphics.SizeInt32(640, 480));
 			presenter.IsMaximizable = false;
-			AppWindow.SetPresenter( presenter );
+			AppWindow.SetPresenter(presenter);
 			AppWindow.TitleBar.PreferredTheme = TitleBarTheme.UseDefaultAppMode;
 			presenter.PreferredMinimumHeight = 800;
 			presenter.PreferredMinimumWidth = 800;
 
-			if ( propertiesFrame != null )
-			{
-				Page generalPage = new PropertiesGeneralPage();
-
-				if ( generalPage != null )
-				{
-					propertiesFrame.Navigate( typeof( PropertiesGeneralPage ) );
-				}
-			}
+			MainContentFrame?.Navigate(typeof(PropertiesGeneralPage));
 		}
 	}
 }

From b5ed3ca4e628b11d28268d60e7ff80624dc332fc Mon Sep 17 00:00:00 2001
From: 0x5BFA <62196528+0x5bfa@users.noreply.github.com>
Date: Fri, 21 Aug 2026 11:46:08 +0900
Subject: [PATCH 17/36] update

---
 .../PropertiesView.ThemeResources.xaml        | 120 ++++++++++++++++++
 .../PropertiesView/PropertiesView.xaml        | 111 ----------------
 src/Files.App.Controls/Themes/Generic.xaml    |   1 +
 .../Views/PropertiesGeneralPage.xaml          |  76 +++++------
 .../Properties/launchSettings.json            |   5 +-
 5 files changed, 155 insertions(+), 158 deletions(-)
 create mode 100644 src/Files.App.Controls/PropertiesView/PropertiesView.ThemeResources.xaml

diff --git a/src/Files.App.Controls/PropertiesView/PropertiesView.ThemeResources.xaml b/src/Files.App.Controls/PropertiesView/PropertiesView.ThemeResources.xaml
new file mode 100644
index 000000000000..706462606942
--- /dev/null
+++ b/src/Files.App.Controls/PropertiesView/PropertiesView.ThemeResources.xaml
@@ -0,0 +1,120 @@
+<!--  Copyright (c) Files Community. SPDX-License-Identifier: MPL-2.0  -->
+<ResourceDictionary
+	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	xmlns:animatedvisuals="using:Microsoft.UI.Xaml.Controls.AnimatedVisuals"
+	xmlns:controls="using:Microsoft.UI.Xaml.Controls"
+	xmlns:fcontrols="using:Files.App.Controls">
+
+	<ResourceDictionary.ThemeDictionaries>
+
+		<ResourceDictionary x:Key="Light">
+			<Thickness x:Key="PropertiesExpanderHeaderPadding">8,8,8,7</Thickness>
+			<Thickness x:Key="PropertiesExpanderHeaderBorderThickness">0</Thickness>
+
+			<StaticResource x:Key="PropertiesExpanderHeaderBackground" ResourceKey="SubtleFillColorTransparentBrush" />
+			<StaticResource x:Key="PropertiesExpanderHeaderPointerOverBackground" ResourceKey="SubtleFillColorSecondaryBrush" />
+			<StaticResource x:Key="PropertiesExpanderHeaderPressedBackground" ResourceKey="SubtleFillColorTertiaryBrush" />
+
+			<StaticResource x:Key="PropertiesExpanderHeaderForeground" ResourceKey="TextFillColorPrimaryBrush" />
+			<StaticResource x:Key="PropertiesExpanderHeaderPointerOverForeground" ResourceKey="TextFillColorPrimaryBrush" />
+			<StaticResource x:Key="PropertiesExpanderHeaderPressedForeground" ResourceKey="TextFillColorSecondaryBrush" />
+
+			<StaticResource x:Key="PropertiesExpanderHeaderBorderBrush" ResourceKey="SubtleFillColorTransparentBrush" />
+			<StaticResource x:Key="PropertiesExpanderHeaderPointerOverBorderBrush" ResourceKey="SubtleFillColorTransparentBrush" />
+			<StaticResource x:Key="PropertiesExpanderHeaderPressedBorderBrush" ResourceKey="SubtleFillColorTransparentBrush" />
+
+			<StaticResource x:Key="PropertiesExpanderChevronForeground" ResourceKey="TextFillColorPrimaryBrush" />
+			<StaticResource x:Key="PropertiesExpanderChevronPointerOverForeground" ResourceKey="TextFillColorPrimaryBrush" />
+			<StaticResource x:Key="PropertiesExpanderChevronPressedForeground" ResourceKey="TextFillColorSecondaryBrush" />
+
+			<StaticResource x:Key="PropertiesExpanderHeaderDisabledForeground" ResourceKey="TextFillColorDisabledBrush" />
+			<StaticResource x:Key="PropertiesExpanderHeaderDisabledBorderBrush" ResourceKey="CardStrokeColorDefaultBrush" />
+
+			<StaticResource x:Key="PropertiesExpanderContentBackground" ResourceKey="SubtleFillColorTransparentBrush" />
+			<StaticResource x:Key="PropertiesExpanderContentBorderBrush" ResourceKey="DividerStrokeColorDefaultBrush" />
+
+			<StaticResource x:Key="PropertiesExpanderSeparatorFillColor" ResourceKey="DividerStrokeColorDefaultBrush" />
+		</ResourceDictionary>
+
+		<ResourceDictionary x:Key="Dark">
+			<Thickness x:Key="PropertiesExpanderHeaderPadding">8,8,8,7</Thickness>
+			<Thickness x:Key="PropertiesExpanderHeaderBorderThickness">0</Thickness>
+
+			<StaticResource x:Key="PropertiesExpanderHeaderBackground" ResourceKey="SubtleFillColorTransparentBrush" />
+			<StaticResource x:Key="PropertiesExpanderHeaderPointerOverBackground" ResourceKey="SubtleFillColorSecondaryBrush" />
+			<StaticResource x:Key="PropertiesExpanderHeaderPressedBackground" ResourceKey="SubtleFillColorTertiaryBrush" />
+
+			<StaticResource x:Key="PropertiesExpanderHeaderForeground" ResourceKey="TextFillColorPrimaryBrush" />
+			<StaticResource x:Key="PropertiesExpanderHeaderPointerOverForeground" ResourceKey="TextFillColorPrimaryBrush" />
+			<StaticResource x:Key="PropertiesExpanderHeaderPressedForeground" ResourceKey="TextFillColorSecondaryBrush" />
+
+			<StaticResource x:Key="PropertiesExpanderHeaderBorderBrush" ResourceKey="SubtleFillColorTransparentBrush" />
+			<StaticResource x:Key="PropertiesExpanderHeaderPointerOverBorderBrush" ResourceKey="SubtleFillColorTransparentBrush" />
+			<StaticResource x:Key="PropertiesExpanderHeaderPressedBorderBrush" ResourceKey="SubtleFillColorTransparentBrush" />
+
+			<StaticResource x:Key="PropertiesExpanderChevronForeground" ResourceKey="TextFillColorPrimaryBrush" />
+			<StaticResource x:Key="PropertiesExpanderChevronPointerOverForeground" ResourceKey="TextFillColorPrimaryBrush" />
+			<StaticResource x:Key="PropertiesExpanderChevronPressedForeground" ResourceKey="TextFillColorSecondaryBrush" />
+
+			<StaticResource x:Key="PropertiesExpanderHeaderDisabledForeground" ResourceKey="TextFillColorDisabledBrush" />
+			<StaticResource x:Key="PropertiesExpanderHeaderDisabledBorderBrush" ResourceKey="CardStrokeColorDefaultBrush" />
+
+			<StaticResource x:Key="PropertiesExpanderContentBackground" ResourceKey="SubtleFillColorTransparentBrush" />
+			<StaticResource x:Key="PropertiesExpanderContentBorderBrush" ResourceKey="DividerStrokeColorDefaultBrush" />
+
+			<StaticResource x:Key="PropertiesExpanderSeparatorFillColor" ResourceKey="DividerStrokeColorDefaultBrush" />
+		</ResourceDictionary>
+
+		<ResourceDictionary x:Key="HighContrast">
+			<Thickness x:Key="PropertiesExpanderHeaderPadding">6,6,6,5</Thickness>
+			<Thickness x:Key="PropertiesExpanderHeaderBorderThickness">2</Thickness>
+
+			<StaticResource x:Key="PropertiesExpanderHeaderBackground" ResourceKey="SystemColorButtonFaceColorBrush" />
+			<StaticResource x:Key="PropertiesExpanderHeaderPointerOverBackground" ResourceKey="SystemControlTransparentBrush" />
+			<StaticResource x:Key="PropertiesExpanderHeaderPressedBackground" ResourceKey="SystemControlTransparentBrush" />
+
+			<StaticResource x:Key="PropertiesExpanderHeaderForeground" ResourceKey="SystemColorButtonTextColorBrush" />
+			<StaticResource x:Key="PropertiesExpanderHeaderPointerOverForeground" ResourceKey="SystemColorHighlightColorBrush" />
+			<StaticResource x:Key="PropertiesExpanderHeaderPressedForeground" ResourceKey="SystemColorHighlightColorBrush" />
+
+			<StaticResource x:Key="PropertiesExpanderHeaderBorderBrush" ResourceKey="SystemColorButtonTextColorBrush" />
+			<StaticResource x:Key="PropertiesExpanderHeaderPointerOverBorderBrush" ResourceKey="SystemColorHighlightColorBrush" />
+			<StaticResource x:Key="PropertiesExpanderHeaderPressedBorderBrush" ResourceKey="SystemColorHighlightColorBrush" />
+
+			<StaticResource x:Key="PropertiesExpanderChevronForeground" ResourceKey="SystemColorButtonTextColorBrush" />
+			<StaticResource x:Key="PropertiesExpanderChevronPointerOverForeground" ResourceKey="SystemColorHighlightColorBrush" />
+			<StaticResource x:Key="PropertiesExpanderChevronPressedForeground" ResourceKey="SystemColorHighlightColorBrush" />
+
+			<StaticResource x:Key="PropertiesExpanderHeaderDisabledForeground" ResourceKey="TextFillColorDisabledBrush" />
+			<StaticResource x:Key="PropertiesExpanderHeaderDisabledBorderBrush" ResourceKey="TextFillColorDisabledBrush" />
+
+			<StaticResource x:Key="PropertiesExpanderContentBackground" ResourceKey="SystemColorWindowColorBrush" />
+			<StaticResource x:Key="PropertiesExpanderContentBorderBrush" ResourceKey="SystemColorWindowTextColorBrush" />
+
+			<StaticResource x:Key="PropertiesExpanderSeparatorFillColor" ResourceKey="SystemColorWindowTextColorBrush" />
+		</ResourceDictionary>
+
+	</ResourceDictionary.ThemeDictionaries>
+
+	<x:Double x:Key="PropertiesExpanderMinHeight">48</x:Double>
+
+	<Thickness x:Key="PropertiesExpanderHeaderInnerPadding">12,0,24,0</Thickness>
+	<Thickness x:Key="PropertiesExpanderChevronMargin">0,0,8,0</Thickness>
+	<x:Double x:Key="PropertiesExpanderChevronSpaceWidth">24</x:Double>
+	<x:Double x:Key="PropertiesExpanderChevronSpaceHeight">32</x:Double>
+	<x:Double x:Key="PropertiesExpanderChevronGlyphSize">12</x:Double>
+
+	<x:String x:Key="PropertiesExpanderChevronUpGlyph">&#xE70E;</x:String>
+	<x:String x:Key="PropertiesExpanderChevronDownGlyph">&#xE70D;</x:String>
+
+	<HorizontalAlignment x:Key="PropertiesExpanderHeaderHorizontalContentAlignment">Stretch</HorizontalAlignment>
+	<VerticalAlignment x:Key="PropertiesExpanderHeaderVerticalContentAlignment">Center</VerticalAlignment>
+
+	<Thickness x:Key="PropertiesExpanderContentPadding">24, 0</Thickness>
+	<Thickness x:Key="PropertiesExpanderContentDownBorderThickness">0</Thickness>
+	<Thickness x:Key="PropertiesExpanderContentUpBorderThickness">0</Thickness>
+
+	<x:Double x:Key="PropertiesExpanderSeparatorHeight">1</x:Double>
+
+</ResourceDictionary>
diff --git a/src/Files.App.Controls/PropertiesView/PropertiesView.xaml b/src/Files.App.Controls/PropertiesView/PropertiesView.xaml
index 0d4d408d75ac..26360c1d08e9 100644
--- a/src/Files.App.Controls/PropertiesView/PropertiesView.xaml
+++ b/src/Files.App.Controls/PropertiesView/PropertiesView.xaml
@@ -6,117 +6,6 @@
 	xmlns:controls="using:Microsoft.UI.Xaml.Controls"
 	xmlns:fcontrols="using:Files.App.Controls">
 
-	<ResourceDictionary.ThemeDictionaries>
-
-		<ResourceDictionary x:Key="Light">
-			<Thickness x:Key="PropertiesExpanderHeaderPadding">8,8,8,7</Thickness>
-			<Thickness x:Key="PropertiesExpanderHeaderBorderThickness">0</Thickness>
-
-			<StaticResource x:Key="PropertiesExpanderHeaderBackground" ResourceKey="SubtleFillColorTransparentBrush" />
-			<StaticResource x:Key="PropertiesExpanderHeaderPointerOverBackground" ResourceKey="SubtleFillColorSecondaryBrush" />
-			<StaticResource x:Key="PropertiesExpanderHeaderPressedBackground" ResourceKey="SubtleFillColorTertiaryBrush" />
-
-			<StaticResource x:Key="PropertiesExpanderHeaderForeground" ResourceKey="TextFillColorPrimaryBrush" />
-			<StaticResource x:Key="PropertiesExpanderHeaderPointerOverForeground" ResourceKey="TextFillColorPrimaryBrush" />
-			<StaticResource x:Key="PropertiesExpanderHeaderPressedForeground" ResourceKey="TextFillColorSecondaryBrush" />
-
-			<StaticResource x:Key="PropertiesExpanderHeaderBorderBrush" ResourceKey="SubtleFillColorTransparentBrush" />
-			<StaticResource x:Key="PropertiesExpanderHeaderPointerOverBorderBrush" ResourceKey="SubtleFillColorTransparentBrush" />
-			<StaticResource x:Key="PropertiesExpanderHeaderPressedBorderBrush" ResourceKey="SubtleFillColorTransparentBrush" />
-
-			<StaticResource x:Key="PropertiesExpanderChevronForeground" ResourceKey="TextFillColorPrimaryBrush" />
-			<StaticResource x:Key="PropertiesExpanderChevronPointerOverForeground" ResourceKey="TextFillColorPrimaryBrush" />
-			<StaticResource x:Key="PropertiesExpanderChevronPressedForeground" ResourceKey="TextFillColorSecondaryBrush" />
-
-			<StaticResource x:Key="PropertiesExpanderHeaderDisabledForeground" ResourceKey="TextFillColorDisabledBrush" />
-			<StaticResource x:Key="PropertiesExpanderHeaderDisabledBorderBrush" ResourceKey="CardStrokeColorDefaultBrush" />
-
-			<StaticResource x:Key="PropertiesExpanderContentBackground" ResourceKey="SubtleFillColorTransparentBrush" />
-			<StaticResource x:Key="PropertiesExpanderContentBorderBrush" ResourceKey="DividerStrokeColorDefaultBrush" />
-
-			<StaticResource x:Key="PropertiesExpanderSeparatorFillColor" ResourceKey="DividerStrokeColorDefaultBrush" />
-		</ResourceDictionary>
-
-		<ResourceDictionary x:Key="Dark">
-			<Thickness x:Key="PropertiesExpanderHeaderPadding">8,8,8,7</Thickness>
-			<Thickness x:Key="PropertiesExpanderHeaderBorderThickness">0</Thickness>
-
-			<StaticResource x:Key="PropertiesExpanderHeaderBackground" ResourceKey="SubtleFillColorTransparentBrush" />
-			<StaticResource x:Key="PropertiesExpanderHeaderPointerOverBackground" ResourceKey="SubtleFillColorSecondaryBrush" />
-			<StaticResource x:Key="PropertiesExpanderHeaderPressedBackground" ResourceKey="SubtleFillColorTertiaryBrush" />
-
-			<StaticResource x:Key="PropertiesExpanderHeaderForeground" ResourceKey="TextFillColorPrimaryBrush" />
-			<StaticResource x:Key="PropertiesExpanderHeaderPointerOverForeground" ResourceKey="TextFillColorPrimaryBrush" />
-			<StaticResource x:Key="PropertiesExpanderHeaderPressedForeground" ResourceKey="TextFillColorSecondaryBrush" />
-
-			<StaticResource x:Key="PropertiesExpanderHeaderBorderBrush" ResourceKey="SubtleFillColorTransparentBrush" />
-			<StaticResource x:Key="PropertiesExpanderHeaderPointerOverBorderBrush" ResourceKey="SubtleFillColorTransparentBrush" />
-			<StaticResource x:Key="PropertiesExpanderHeaderPressedBorderBrush" ResourceKey="SubtleFillColorTransparentBrush" />
-
-			<StaticResource x:Key="PropertiesExpanderChevronForeground" ResourceKey="TextFillColorPrimaryBrush" />
-			<StaticResource x:Key="PropertiesExpanderChevronPointerOverForeground" ResourceKey="TextFillColorPrimaryBrush" />
-			<StaticResource x:Key="PropertiesExpanderChevronPressedForeground" ResourceKey="TextFillColorSecondaryBrush" />
-
-			<StaticResource x:Key="PropertiesExpanderHeaderDisabledForeground" ResourceKey="TextFillColorDisabledBrush" />
-			<StaticResource x:Key="PropertiesExpanderHeaderDisabledBorderBrush" ResourceKey="CardStrokeColorDefaultBrush" />
-
-			<StaticResource x:Key="PropertiesExpanderContentBackground" ResourceKey="SubtleFillColorTransparentBrush" />
-			<StaticResource x:Key="PropertiesExpanderContentBorderBrush" ResourceKey="DividerStrokeColorDefaultBrush" />
-
-			<StaticResource x:Key="PropertiesExpanderSeparatorFillColor" ResourceKey="DividerStrokeColorDefaultBrush" />
-		</ResourceDictionary>
-
-		<ResourceDictionary x:Key="HighContrast">
-			<Thickness x:Key="PropertiesExpanderHeaderPadding">6,6,6,5</Thickness>
-			<Thickness x:Key="PropertiesExpanderHeaderBorderThickness">2</Thickness>
-
-			<StaticResource x:Key="PropertiesExpanderHeaderBackground" ResourceKey="SystemColorButtonFaceColorBrush" />
-			<StaticResource x:Key="PropertiesExpanderHeaderPointerOverBackground" ResourceKey="SystemControlTransparentBrush" />
-			<StaticResource x:Key="PropertiesExpanderHeaderPressedBackground" ResourceKey="SystemControlTransparentBrush" />
-
-			<StaticResource x:Key="PropertiesExpanderHeaderForeground" ResourceKey="SystemColorButtonTextColorBrush" />
-			<StaticResource x:Key="PropertiesExpanderHeaderPointerOverForeground" ResourceKey="SystemColorHighlightColorBrush" />
-			<StaticResource x:Key="PropertiesExpanderHeaderPressedForeground" ResourceKey="SystemColorHighlightColorBrush" />
-
-			<StaticResource x:Key="PropertiesExpanderHeaderBorderBrush" ResourceKey="SystemColorButtonTextColorBrush" />
-			<StaticResource x:Key="PropertiesExpanderHeaderPointerOverBorderBrush" ResourceKey="SystemColorHighlightColorBrush" />
-			<StaticResource x:Key="PropertiesExpanderHeaderPressedBorderBrush" ResourceKey="SystemColorHighlightColorBrush" />
-
-			<StaticResource x:Key="PropertiesExpanderChevronForeground" ResourceKey="SystemColorButtonTextColorBrush" />
-			<StaticResource x:Key="PropertiesExpanderChevronPointerOverForeground" ResourceKey="SystemColorHighlightColorBrush" />
-			<StaticResource x:Key="PropertiesExpanderChevronPressedForeground" ResourceKey="SystemColorHighlightColorBrush" />
-
-			<StaticResource x:Key="PropertiesExpanderHeaderDisabledForeground" ResourceKey="TextFillColorDisabledBrush" />
-			<StaticResource x:Key="PropertiesExpanderHeaderDisabledBorderBrush" ResourceKey="TextFillColorDisabledBrush" />
-
-			<StaticResource x:Key="PropertiesExpanderContentBackground" ResourceKey="SystemColorWindowColorBrush" />
-			<StaticResource x:Key="PropertiesExpanderContentBorderBrush" ResourceKey="SystemColorWindowTextColorBrush" />
-
-			<StaticResource x:Key="PropertiesExpanderSeparatorFillColor" ResourceKey="SystemColorWindowTextColorBrush" />
-		</ResourceDictionary>
-
-	</ResourceDictionary.ThemeDictionaries>
-
-	<x:Double x:Key="PropertiesExpanderMinHeight">48</x:Double>
-
-	<Thickness x:Key="PropertiesExpanderHeaderInnerPadding">12,0,24,0</Thickness>
-	<Thickness x:Key="PropertiesExpanderChevronMargin">0,0,8,0</Thickness>
-	<x:Double x:Key="PropertiesExpanderChevronSpaceWidth">24</x:Double>
-	<x:Double x:Key="PropertiesExpanderChevronSpaceHeight">32</x:Double>
-	<x:Double x:Key="PropertiesExpanderChevronGlyphSize">12</x:Double>
-
-	<x:String x:Key="PropertiesExpanderChevronUpGlyph">&#xE70E;</x:String>
-	<x:String x:Key="PropertiesExpanderChevronDownGlyph">&#xE70D;</x:String>
-
-	<HorizontalAlignment x:Key="PropertiesExpanderHeaderHorizontalContentAlignment">Stretch</HorizontalAlignment>
-	<VerticalAlignment x:Key="PropertiesExpanderHeaderVerticalContentAlignment">Center</VerticalAlignment>
-
-	<Thickness x:Key="PropertiesExpanderContentPadding">24, 0</Thickness>
-	<Thickness x:Key="PropertiesExpanderContentDownBorderThickness">0</Thickness>
-	<Thickness x:Key="PropertiesExpanderContentUpBorderThickness">0</Thickness>
-
-	<x:Double x:Key="PropertiesExpanderSeparatorHeight">1</x:Double>
-
 	<Style BasedOn="{StaticResource DefaultPropertiesViewStyle}" TargetType="fcontrols:PropertiesView" />
 
 	<Style x:Key="DefaultPropertiesViewStyle" TargetType="fcontrols:PropertiesView">
diff --git a/src/Files.App.Controls/Themes/Generic.xaml b/src/Files.App.Controls/Themes/Generic.xaml
index cee7414f6fef..0952b8084262 100644
--- a/src/Files.App.Controls/Themes/Generic.xaml
+++ b/src/Files.App.Controls/Themes/Generic.xaml
@@ -77,6 +77,7 @@
 
 		<!--#region Dialog Resources-->
 		<ResourceDictionary Source="ms-appx:///Files.App.Controls/PropertiesView/PropertiesView.xaml" />
+		<ResourceDictionary Source="ms-appx:///Files.App.Controls/PropertiesView/PropertiesView.ThemeResources.xaml" />
 		<!--#endregion-->
 
 	</ResourceDictionary.MergedDictionaries>
diff --git a/tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml b/tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml
index 4aef3425caa4..e96b118e9259 100644
--- a/tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml
+++ b/tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml
@@ -4,24 +4,20 @@
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 	xmlns:animatedvisuals="using:Microsoft.UI.Xaml.Controls.AnimatedVisuals"
-	xmlns:controls="using:Microsoft.UI.Xaml.Controls"
+	xmlns:controls="using:Files.App.Controls"
 	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-	xmlns:fcontrols="using:Files.App.Controls"
 	xmlns:local="using:Files.App.UITests.Dialogs.Properties.Views"
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 	mc:Ignorable="d">
 
 	<Page.Resources>
 		<ResourceDictionary>
-			<ResourceDictionary.MergedDictionaries />
 
 			<GridLength x:Key="LabelWidth">160</GridLength>
 
 		</ResourceDictionary>
 	</Page.Resources>
 
-
-
 	<Grid
 		x:Name="RootGrid"
 		HorizontalAlignment="Stretch"
@@ -75,7 +71,6 @@
 
 		</Border>
 
-
 		<ScrollViewer
 			Grid.Row="1"
 			HorizontalAlignment="Stretch"
@@ -85,13 +80,14 @@
 				Margin="0,0,0,32"
 				HorizontalAlignment="Stretch"
 				Orientation="Vertical">
+
 				<Expander IsExpanded="True" Style="{StaticResource PropertiesExpanderStyle}">
 					<Expander.Header>
-						<fcontrols:PropertiesHeader Text="Header text goes here">
-							<fcontrols:PropertiesHeader.Icon>
+						<controls:PropertiesHeader Text="Header text goes here">
+							<controls:PropertiesHeader.Icon>
 								<SymbolIcon Symbol="AddFriend" />
-							</fcontrols:PropertiesHeader.Icon>
-						</fcontrols:PropertiesHeader>
+							</controls:PropertiesHeader.Icon>
+						</controls:PropertiesHeader>
 					</Expander.Header>
 
 					<Expander.Content>
@@ -100,14 +96,14 @@
 							Padding="0,0,0,8"
 							HorizontalAlignment="Stretch"
 							Orientation="Vertical">
-							<fcontrols:PropertiesViewItemText
+							<controls:PropertiesViewItemText
 								CanEdit="True"
 								Label="Item label 1"
 								LabelWidth="{StaticResource LabelWidth}"
 								Orientation="Horizontal"
 								Text="Item value 1 text here" />
 							<MenuFlyoutSeparator />
-							<fcontrols:PropertiesViewItemInfo
+							<controls:PropertiesViewItemInfo
 								CanEdit="False"
 								InfoText="Detailed text to display with hover."
 								Label="Item info label 1"
@@ -115,7 +111,7 @@
 								Orientation="Horizontal"
 								Text="Info item value 1 text" />
 							<MenuFlyoutSeparator />
-							<fcontrols:PropertiesViewItemInfo
+							<controls:PropertiesViewItemInfo
 								CanEdit="True"
 								InfoText="Detailed text to display with hover."
 								Label="Item info label 1"
@@ -123,7 +119,7 @@
 								Orientation="Horizontal"
 								Text="Info item value 1 text" />
 							<MenuFlyoutSeparator />
-							<fcontrols:PropertiesViewItemInfo
+							<controls:PropertiesViewItemInfo
 								InfoText="Detailed text to display with hover."
 								IsEnabled="False"
 								Label="Disabled info label 1"
@@ -131,20 +127,20 @@
 								Orientation="Horizontal"
 								Text="Info item value 1 text" />
 							<MenuFlyoutSeparator />
-							<fcontrols:PropertiesViewItemText
+							<controls:PropertiesViewItemText
 								Label="Item label t00 extra long to demonstrate the wrapping for Labels"
 								LabelWidth="{StaticResource LabelWidth}"
 								Orientation="Horizontal"
 								Text="Item value t00 text here" />
 							<MenuFlyoutSeparator />
-							<fcontrols:PropertiesViewItemText
+							<controls:PropertiesViewItemText
 								IsEnabled="False"
 								Label="Disabled - CanEdit set to False"
 								LabelWidth="{StaticResource LabelWidth}"
 								Orientation="Horizontal"
 								Text="Item value t00 text here" />
 							<MenuFlyoutSeparator />
-							<fcontrols:PropertiesViewItemText
+							<controls:PropertiesViewItemText
 								CanEdit="True"
 								IsEnabled="False"
 								Label="Disabled - CanEdit set to True"
@@ -152,7 +148,7 @@
 								Orientation="Horizontal"
 								Text="Item value t00 text here" />
 							<MenuFlyoutSeparator />
-							<fcontrols:PropertiesViewItemText
+							<controls:PropertiesViewItemText
 								Label="Item label three"
 								LabelWidth="{StaticResource LabelWidth}"
 								Orientation="Horizontal"
@@ -161,14 +157,13 @@
 					</Expander.Content>
 				</Expander>
 
-
 				<Expander Style="{StaticResource PropertiesExpanderStyle}">
 					<Expander.Header>
-						<fcontrols:PropertiesHeader Text="Header text goes here, made extra long to ensure wrapping and arranging within the header works as expected">
-							<fcontrols:PropertiesHeader.Icon>
+						<controls:PropertiesHeader Text="Header text goes here, made extra long to ensure wrapping and arranging within the header works as expected">
+							<controls:PropertiesHeader.Icon>
 								<SymbolIcon Symbol="Comment" />
-							</fcontrols:PropertiesHeader.Icon>
-						</fcontrols:PropertiesHeader>
+							</controls:PropertiesHeader.Icon>
+						</controls:PropertiesHeader>
 					</Expander.Header>
 
 					<Expander.Content>
@@ -176,39 +171,39 @@
 							Padding="0,0,0,8"
 							HorizontalAlignment="Stretch"
 							Orientation="Vertical">
-							<fcontrols:PropertiesViewItemRating
+							<controls:PropertiesViewItemRating
 								Label="Item label 1 readonly"
 								LabelWidth="{StaticResource LabelWidth}"
 								Orientation="Horizontal"
 								Rating="9345" />
 							<MenuFlyoutSeparator Margin="16,0" />
-							<fcontrols:PropertiesViewItemRating
+							<controls:PropertiesViewItemRating
 								CanEdit="True"
 								Label="Item label t00 editable"
 								Orientation="Horizontal"
 								Rating="-23" />
 							<MenuFlyoutSeparator Margin="16,0" />
-							<fcontrols:PropertiesViewItemRating
+							<controls:PropertiesViewItemRating
 								CanEdit="False"
 								Label="Item label three readonly"
 								Orientation="Horizontal"
 								Rating="32" />
 							<MenuFlyoutSeparator Margin="16,0" />
-							<fcontrols:PropertiesViewItemRating
+							<controls:PropertiesViewItemRating
 								CanEdit="False"
 								IsEnabled="False"
 								Label="Disabled item label"
 								Orientation="Horizontal"
 								Rating="50" />
 							<MenuFlyoutSeparator Margin="16,0" />
-							<fcontrols:PropertiesViewItemRating
+							<controls:PropertiesViewItemRating
 								CanEdit="True"
 								IsEnabled="False"
 								Label="Disabled, editable label"
 								Orientation="Horizontal"
 								Rating="50" />
 							<MenuFlyoutSeparator Margin="16,0" />
-							<fcontrols:PropertiesViewItemRating
+							<controls:PropertiesViewItemRating
 								CanEdit="True"
 								Label="Item label 4ore editable"
 								Orientation="Horizontal"
@@ -217,23 +212,19 @@
 					</Expander.Content>
 				</Expander>
 
-
-
-
-
 				<Expander Style="{StaticResource PropertiesExpanderStyle}">
 					<Expander.Header>
-						<fcontrols:PropertiesHeader Text="Vertical examples">
-							<fcontrols:PropertiesHeader.Icon>
+						<controls:PropertiesHeader Text="Vertical examples">
+							<controls:PropertiesHeader.Icon>
 								<SymbolIcon Symbol="SlideShow" />
-							</fcontrols:PropertiesHeader.Icon>
-						</fcontrols:PropertiesHeader>
+							</controls:PropertiesHeader.Icon>
+						</controls:PropertiesHeader>
 					</Expander.Header>
 
 					<Expander.Content>
 						<StackPanel HorizontalAlignment="Stretch" Orientation="Vertical">
 
-							<fcontrols:PropertiesViewItemText
+							<controls:PropertiesViewItemText
 								CanEdit="True"
 								Label="Item label 1"
 								LabelWidth="{StaticResource LabelWidth}"
@@ -242,7 +233,7 @@
 
 							<MenuFlyoutSeparator />
 
-							<fcontrols:PropertiesViewItemInfo
+							<controls:PropertiesViewItemInfo
 								CanEdit="False"
 								InfoText="Detailed text to display with the button press."
 								Label="Item info label 1"
@@ -252,7 +243,7 @@
 
 							<MenuFlyoutSeparator />
 
-							<fcontrols:PropertiesViewItemInfo
+							<controls:PropertiesViewItemInfo
 								CanEdit="True"
 								InfoText="Detailed text to display with the button press."
 								Label="Item info label 1"
@@ -262,7 +253,7 @@
 
 							<MenuFlyoutSeparator />
 
-							<fcontrols:PropertiesViewItemRating
+							<controls:PropertiesViewItemRating
 								CanEdit="True"
 								Label="Really long label wrapping when using a vertical layout example here for your viewing pleasure."
 								Orientation="Vertical"
@@ -270,7 +261,7 @@
 
 							<MenuFlyoutSeparator />
 
-							<fcontrols:PropertiesViewItemText
+							<controls:PropertiesViewItemText
 								CanEdit="False"
 								Label="Item label three"
 								LabelWidth="{StaticResource LabelWidth}"
@@ -280,7 +271,6 @@
 					</Expander.Content>
 				</Expander>
 
-
 			</StackPanel>
 		</ScrollViewer>
 
diff --git a/tests/Files.App.UITests/Properties/launchSettings.json b/tests/Files.App.UITests/Properties/launchSettings.json
index 339d01721d10..a2d307b6bcea 100644
--- a/tests/Files.App.UITests/Properties/launchSettings.json
+++ b/tests/Files.App.UITests/Properties/launchSettings.json
@@ -1,10 +1,7 @@
 {
   "profiles": {
-    "Files.App.UITests (Package)": {
+    "Run": {
       "commandName": "MsixPackage"
-    },
-    "Files.App.UITests (Unpackaged)": {
-      "commandName": "Project"
     }
   }
 }
\ No newline at end of file

From ec5259938089f083f7b34b91eac269512e16f074 Mon Sep 17 00:00:00 2001
From: 0x5BFA <62196528+0x5bfa@users.noreply.github.com>
Date: Fri, 21 Aug 2026 12:13:05 +0900
Subject: [PATCH 18/36] Implement PropertiesViewForm

---
 .../PropertiesView/PropertiesHeader.xaml      |   2 +-
 .../PropertiesView/PropertiesView.xaml        |  78 ++--
 .../PropertiesView/PropertiesViewForm.cs      |  13 +
 .../Views/PropertiesGeneralPage.xaml          | 366 +++++++++---------
 .../Views/PropertiesGeneralPage.xaml.cs       |  36 +-
 5 files changed, 252 insertions(+), 243 deletions(-)
 create mode 100644 src/Files.App.Controls/PropertiesView/PropertiesViewForm.cs

diff --git a/src/Files.App.Controls/PropertiesView/PropertiesHeader.xaml b/src/Files.App.Controls/PropertiesView/PropertiesHeader.xaml
index ef5d1ea8339c..ab2f594d6281 100644
--- a/src/Files.App.Controls/PropertiesView/PropertiesHeader.xaml
+++ b/src/Files.App.Controls/PropertiesView/PropertiesHeader.xaml
@@ -26,8 +26,8 @@
 			Grid.Column="1"
 			Margin="0,4,0,8"
 			HorizontalAlignment="Left"
-			Text="{x:Bind Text}"
 			FontWeight="SemiBold"
+			Text="{x:Bind Text}"
 			TextWrapping="WrapWholeWords" />
 	</Grid>
 
diff --git a/src/Files.App.Controls/PropertiesView/PropertiesView.xaml b/src/Files.App.Controls/PropertiesView/PropertiesView.xaml
index 26360c1d08e9..bf01a3fec8ff 100644
--- a/src/Files.App.Controls/PropertiesView/PropertiesView.xaml
+++ b/src/Files.App.Controls/PropertiesView/PropertiesView.xaml
@@ -3,10 +3,10 @@
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 	xmlns:animatedvisuals="using:Microsoft.UI.Xaml.Controls.AnimatedVisuals"
-	xmlns:controls="using:Microsoft.UI.Xaml.Controls"
 	xmlns:fcontrols="using:Files.App.Controls">
 
 	<Style BasedOn="{StaticResource DefaultPropertiesViewStyle}" TargetType="fcontrols:PropertiesView" />
+	<Style BasedOn="{StaticResource DefaultPropertiesViewFormStyle}" TargetType="fcontrols:PropertiesViewForm" />
 
 	<Style x:Key="DefaultPropertiesViewStyle" TargetType="fcontrols:PropertiesView">
 		<Setter Property="VerticalAlignment" Value="Stretch" />
@@ -76,10 +76,34 @@
 		</Setter>
 	</Style>
 
+	<Style x:Key="DefaultPropertiesViewFormStyle" TargetType="fcontrols:PropertiesViewForm">
+		<Setter Property="VerticalAlignment" Value="Stretch" />
+		<Setter Property="HorizontalAlignment" Value="Stretch" />
+		<Setter Property="ItemsPanel">
+			<Setter.Value>
+				<ItemsPanelTemplate>
+					<StackPanel HorizontalAlignment="Stretch" Orientation="Vertical" />
+				</ItemsPanelTemplate>
+			</Setter.Value>
+		</Setter>
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="fcontrols:PropertiesViewForm">
+					<ScrollViewer
+						HorizontalScrollBarVisibility="Disabled"
+						HorizontalScrollMode="Disabled"
+						VerticalScrollBarVisibility="Auto"
+						VerticalScrollMode="Auto">
+						<ItemsPresenter Margin="0,0,0,32" />
+					</ScrollViewer>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
 
 
 	<!--  PROPERTIES EXPANDER  -->
-	<Style x:Key="PropertiesExpanderStyle" TargetType="controls:Expander">
+	<Style x:Key="PropertiesExpanderStyle" TargetType="Expander">
 		<!--
 			We won't make this control tab stoppable, since the tab focus should go
 			to the toggle button. For this logic, several things were made:
@@ -108,7 +132,7 @@
 		<Setter Property="CornerRadius" Value="0" />
 		<Setter Property="Template">
 			<Setter.Value>
-				<ControlTemplate TargetType="controls:Expander">
+				<ControlTemplate TargetType="Expander">
 					<Grid MinWidth="{TemplateBinding MinWidth}" MaxWidth="{TemplateBinding MaxWidth}">
 						<Grid.RowDefinitions>
 							<RowDefinition x:Name="Row0" Height="Auto" />
@@ -310,7 +334,7 @@
 								Width="{ThemeResource PropertiesExpanderChevronSpaceWidth}"
 								Height="{ThemeResource PropertiesExpanderChevronSpaceHeight}"
 								Margin="{ThemeResource PropertiesExpanderChevronMargin}">
-								<controls:AnimatedIcon
+								<AnimatedIcon
 									xmlns:local="using:Microsoft.UI.Xaml.Controls"
 									x:Name="ExpandCollapseChevron"
 									Width="{StaticResource PropertiesExpanderChevronGlyphSize}"
@@ -322,15 +346,15 @@
 									Foreground="{ThemeResource PropertiesExpanderChevronForeground}"
 									RenderTransformOrigin="0.5, 0.5">
 									<animatedvisuals:AnimatedChevronUpDownSmallVisualSource />
-									<controls:AnimatedIcon.FallbackIconSource>
-										<controls:FontIconSource
+									<AnimatedIcon.FallbackIconSource>
+										<FontIconSource
 											FontFamily="{StaticResource SymbolThemeFontFamily}"
 											FontSize="12"
 											Glyph="{StaticResource PropertiesExpanderChevronDownGlyph}"
 											IsTextScaleFactorEnabled="False" />
-									</controls:AnimatedIcon.FallbackIconSource>
-									<controls:AnimatedIcon.RenderTransform />
-								</controls:AnimatedIcon>
+									</AnimatedIcon.FallbackIconSource>
+									<AnimatedIcon.RenderTransform />
+								</AnimatedIcon>
 							</Border>
 
 						</Grid>
@@ -349,7 +373,7 @@
 										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource PropertiesExpanderHeaderPointerOverForeground}" />
 										<Setter Target="ToggleButtonGrid.BorderBrush" Value="{ThemeResource PropertiesExpanderHeaderPointerOverBorderBrush}" />
 										<Setter Target="ToggleButtonGrid.Background" Value="{ThemeResource PropertiesExpanderHeaderPointerOverBackground}" />
-										<Setter Target="ExpandCollapseChevron.(controls:AnimatedIcon.State)" Value="PointerOverOff" />
+										<Setter Target="ExpandCollapseChevron.(AnimatedIcon.State)" Value="PointerOverOff" />
 									</VisualState.Setters>
 								</VisualState>
 								<VisualState x:Name="Pressed">
@@ -358,7 +382,7 @@
 										<Setter Target="ToggleButtonGrid.BorderBrush" Value="{ThemeResource PropertiesExpanderHeaderPressedBorderBrush}" />
 										<Setter Target="ExpandCollapseChevron.Foreground" Value="{ThemeResource PropertiesExpanderChevronPressedForeground}" />
 										<Setter Target="ToggleButtonGrid.Background" Value="{ThemeResource PropertiesExpanderHeaderPressedBackground}" />
-										<Setter Target="ExpandCollapseChevron.(controls:AnimatedIcon.State)" Value="PressedOff" />
+										<Setter Target="ExpandCollapseChevron.(AnimatedIcon.State)" Value="PressedOff" />
 									</VisualState.Setters>
 								</VisualState>
 								<VisualState x:Name="Disabled">
@@ -375,7 +399,7 @@
 										<Setter Target="ToggleButtonGrid.BorderBrush" Value="{ThemeResource PropertiesExpanderHeaderBorderBrush}" />
 										<Setter Target="ExpandCollapseChevron.Foreground" Value="{ThemeResource PropertiesExpanderChevronForeground}" />
 										<Setter Target="ToggleButtonGrid.Background" Value="{ThemeResource PropertiesExpanderHeaderBackground}" />
-										<Setter Target="ExpandCollapseChevron.(controls:AnimatedIcon.State)" Value="NormalOn" />
+										<Setter Target="ExpandCollapseChevron.(AnimatedIcon.State)" Value="NormalOn" />
 									</VisualState.Setters>
 								</VisualState>
 								<VisualState x:Name="CheckedPointerOver">
@@ -384,7 +408,7 @@
 										<Setter Target="ToggleButtonGrid.BorderBrush" Value="{ThemeResource PropertiesExpanderHeaderPointerOverBorderBrush}" />
 										<Setter Target="ExpandCollapseChevron.Foreground" Value="{ThemeResource PropertiesExpanderChevronPointerOverForeground}" />
 										<Setter Target="ToggleButtonGrid.Background" Value="{ThemeResource PropertiesExpanderHeaderPointerOverBackground}" />
-										<Setter Target="ExpandCollapseChevron.(controls:AnimatedIcon.State)" Value="PointerOverOn" />
+										<Setter Target="ExpandCollapseChevron.(AnimatedIcon.State)" Value="PointerOverOn" />
 									</VisualState.Setters>
 								</VisualState>
 								<VisualState x:Name="CheckedPressed">
@@ -393,7 +417,7 @@
 										<Setter Target="ToggleButtonGrid.BorderBrush" Value="{ThemeResource PropertiesExpanderHeaderPressedBorderBrush}" />
 										<Setter Target="ExpandCollapseChevron.Foreground" Value="{ThemeResource PropertiesExpanderChevronPressedForeground}" />
 										<Setter Target="ToggleButtonGrid.Background" Value="{ThemeResource PropertiesExpanderHeaderPressedBackground}" />
-										<Setter Target="ExpandCollapseChevron.(controls:AnimatedIcon.State)" Value="PressedOn" />
+										<Setter Target="ExpandCollapseChevron.(AnimatedIcon.State)" Value="PressedOn" />
 									</VisualState.Setters>
 								</VisualState>
 								<VisualState x:Name="CheckedDisabled">
@@ -402,7 +426,7 @@
 										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource PropertiesExpanderHeaderDisabledForeground}" />
 										<Setter Target="ExpandCollapseChevron.Foreground" Value="{ThemeResource PropertiesExpanderHeaderDisabledForeground}" />
 										<Setter Target="ToggleButtonGrid.Background" Value="{ThemeResource PropertiesExpanderHeaderBackground}" />
-										<Setter Target="ExpandCollapseChevron.(controls:AnimatedIcon.State)" Value="NormalOn" />
+										<Setter Target="ExpandCollapseChevron.(AnimatedIcon.State)" Value="NormalOn" />
 									</VisualState.Setters>
 								</VisualState>
 								<VisualState x:Name="Indeterminate" />
@@ -471,7 +495,7 @@
 								Width="{ThemeResource PropertiesExpanderChevronSpaceWidth}"
 								Height="{ThemeResource PropertiesExpanderChevronSpaceHeight}"
 								Margin="{ThemeResource PropertiesExpanderChevronMargin}">
-								<controls:AnimatedIcon
+								<AnimatedIcon
 									xmlns:local="using:Microsoft.UI.Xaml.Controls"
 									x:Name="ExpandCollapseChevron"
 									Width="{StaticResource PropertiesExpanderChevronGlyphSize}"
@@ -483,15 +507,15 @@
 									Foreground="{ThemeResource PropertiesExpanderChevronForeground}"
 									RenderTransformOrigin="0.5, 0.5">
 									<animatedvisuals:AnimatedChevronUpDownSmallVisualSource />
-									<controls:AnimatedIcon.FallbackIconSource>
-										<controls:FontIconSource
+									<AnimatedIcon.FallbackIconSource>
+										<FontIconSource
 											FontFamily="{StaticResource SymbolThemeFontFamily}"
 											FontSize="12"
 											Glyph="{StaticResource PropertiesExpanderChevronUpGlyph}"
 											IsTextScaleFactorEnabled="False" />
-									</controls:AnimatedIcon.FallbackIconSource>
-									<controls:AnimatedIcon.RenderTransform />
-								</controls:AnimatedIcon>
+									</AnimatedIcon.FallbackIconSource>
+									<AnimatedIcon.RenderTransform />
+								</AnimatedIcon>
 							</Border>
 
 						</Grid>
@@ -510,7 +534,7 @@
 										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource PropertiesExpanderHeaderPointerOverForeground}" />
 										<Setter Target="ToggleButtonGrid.BorderBrush" Value="{ThemeResource PropertiesExpanderHeaderPointerOverBorderBrush}" />
 										<Setter Target="ToggleButtonGrid.Background" Value="{ThemeResource PropertiesExpanderHeaderPointerOverBackground}" />
-										<Setter Target="ExpandCollapseChevron.(controls:AnimatedIcon.State)" Value="PointerOverOn" />
+										<Setter Target="ExpandCollapseChevron.(AnimatedIcon.State)" Value="PointerOverOn" />
 									</VisualState.Setters>
 								</VisualState>
 								<VisualState x:Name="Pressed">
@@ -519,7 +543,7 @@
 										<Setter Target="ToggleButtonGrid.BorderBrush" Value="{ThemeResource PropertiesExpanderHeaderPressedBorderBrush}" />
 										<Setter Target="ExpandCollapseChevron.Foreground" Value="{ThemeResource PropertiesExpanderChevronPressedForeground}" />
 										<Setter Target="ToggleButtonGrid.Background" Value="{ThemeResource PropertiesExpanderHeaderPressedBackground}" />
-										<Setter Target="ExpandCollapseChevron.(controls:AnimatedIcon.State)" Value="PressedOn" />
+										<Setter Target="ExpandCollapseChevron.(AnimatedIcon.State)" Value="PressedOn" />
 									</VisualState.Setters>
 								</VisualState>
 								<VisualState x:Name="Disabled">
@@ -536,7 +560,7 @@
 										<Setter Target="ToggleButtonGrid.BorderBrush" Value="{ThemeResource PropertiesExpanderHeaderBorderBrush}" />
 										<Setter Target="ExpandCollapseChevron.Foreground" Value="{ThemeResource PropertiesExpanderChevronForeground}" />
 										<Setter Target="ToggleButtonGrid.Background" Value="{ThemeResource PropertiesExpanderHeaderBackground}" />
-										<Setter Target="ExpandCollapseChevron.(controls:AnimatedIcon.State)" Value="NormalOff" />
+										<Setter Target="ExpandCollapseChevron.(AnimatedIcon.State)" Value="NormalOff" />
 									</VisualState.Setters>
 								</VisualState>
 								<VisualState x:Name="CheckedPointerOver">
@@ -545,7 +569,7 @@
 										<Setter Target="ToggleButtonGrid.BorderBrush" Value="{ThemeResource PropertiesExpanderHeaderPointerOverBorderBrush}" />
 										<Setter Target="ExpandCollapseChevron.Foreground" Value="{ThemeResource PropertiesExpanderChevronPointerOverForeground}" />
 										<Setter Target="ToggleButtonGrid.Background" Value="{ThemeResource PropertiesExpanderHeaderPointerOverBackground}" />
-										<Setter Target="ExpandCollapseChevron.(controls:AnimatedIcon.State)" Value="PointerOverOff" />
+										<Setter Target="ExpandCollapseChevron.(AnimatedIcon.State)" Value="PointerOverOff" />
 									</VisualState.Setters>
 								</VisualState>
 								<VisualState x:Name="CheckedPressed">
@@ -554,7 +578,7 @@
 										<Setter Target="ToggleButtonGrid.BorderBrush" Value="{ThemeResource PropertiesExpanderHeaderPressedBorderBrush}" />
 										<Setter Target="ExpandCollapseChevron.Foreground" Value="{ThemeResource PropertiesExpanderChevronPressedForeground}" />
 										<Setter Target="ToggleButtonGrid.Background" Value="{ThemeResource PropertiesExpanderHeaderPressedBackground}" />
-										<Setter Target="ExpandCollapseChevron.(controls:AnimatedIcon.State)" Value="PressedOff" />
+										<Setter Target="ExpandCollapseChevron.(AnimatedIcon.State)" Value="PressedOff" />
 									</VisualState.Setters>
 								</VisualState>
 								<VisualState x:Name="CheckedDisabled">
@@ -563,7 +587,7 @@
 										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource PropertiesExpanderHeaderDisabledForeground}" />
 										<Setter Target="ExpandCollapseChevron.Foreground" Value="{ThemeResource PropertiesExpanderHeaderDisabledForeground}" />
 										<Setter Target="ToggleButtonGrid.Background" Value="{ThemeResource PropertiesExpanderHeaderBackground}" />
-										<Setter Target="ExpandCollapseChevron.(controls:AnimatedIcon.State)" Value="NormalOff" />
+										<Setter Target="ExpandCollapseChevron.(AnimatedIcon.State)" Value="NormalOff" />
 									</VisualState.Setters>
 								</VisualState>
 								<VisualState x:Name="Indeterminate" />
diff --git a/src/Files.App.Controls/PropertiesView/PropertiesViewForm.cs b/src/Files.App.Controls/PropertiesView/PropertiesViewForm.cs
new file mode 100644
index 000000000000..eb956c329b87
--- /dev/null
+++ b/src/Files.App.Controls/PropertiesView/PropertiesViewForm.cs
@@ -0,0 +1,13 @@
+// Copyright (c) Files Community
+// SPDX-License-Identifier: MPL-2.0
+
+namespace Files.App.Controls
+{
+	public partial class PropertiesViewForm : ItemsControl
+	{
+		public PropertiesViewForm()
+		{
+			DefaultStyleKey = typeof(PropertiesViewForm);
+		}
+	}
+}
diff --git a/tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml b/tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml
index e96b118e9259..eb826541c527 100644
--- a/tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml
+++ b/tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml
@@ -18,10 +18,7 @@
 		</ResourceDictionary>
 	</Page.Resources>
 
-	<Grid
-		x:Name="RootGrid"
-		HorizontalAlignment="Stretch"
-		VerticalAlignment="Stretch">
+	<Grid x:Name="RootGrid">
 		<Grid.RowDefinitions>
 			<RowDefinition Height="Auto" />
 			<RowDefinition Height="*" />
@@ -71,208 +68,199 @@
 
 		</Border>
 
-		<ScrollViewer
-			Grid.Row="1"
-			HorizontalAlignment="Stretch"
-			VerticalAlignment="Stretch">
+		<controls:PropertiesViewForm Grid.Row="1">
 
-			<StackPanel
-				Margin="0,0,0,32"
-				HorizontalAlignment="Stretch"
-				Orientation="Vertical">
+			<Expander IsExpanded="True" Style="{StaticResource PropertiesExpanderStyle}">
+				<Expander.Header>
+					<controls:PropertiesHeader Text="Header text goes here">
+						<controls:PropertiesHeader.Icon>
+							<SymbolIcon Symbol="AddFriend" />
+						</controls:PropertiesHeader.Icon>
+					</controls:PropertiesHeader>
+				</Expander.Header>
 
-				<Expander IsExpanded="True" Style="{StaticResource PropertiesExpanderStyle}">
-					<Expander.Header>
-						<controls:PropertiesHeader Text="Header text goes here">
-							<controls:PropertiesHeader.Icon>
-								<SymbolIcon Symbol="AddFriend" />
-							</controls:PropertiesHeader.Icon>
-						</controls:PropertiesHeader>
-					</Expander.Header>
+				<Expander.Content>
 
-					<Expander.Content>
+					<StackPanel
+						Padding="0,0,0,8"
+						HorizontalAlignment="Stretch"
+						Orientation="Vertical">
+						<controls:PropertiesViewItemText
+							CanEdit="True"
+							Label="Item label 1"
+							LabelWidth="{StaticResource LabelWidth}"
+							Orientation="Horizontal"
+							Text="Item value 1 text here" />
+						<MenuFlyoutSeparator />
+						<controls:PropertiesViewItemInfo
+							CanEdit="False"
+							InfoText="Detailed text to display with hover."
+							Label="Item info label 1"
+							LabelWidth="{StaticResource LabelWidth}"
+							Orientation="Horizontal"
+							Text="Info item value 1 text" />
+						<MenuFlyoutSeparator />
+						<controls:PropertiesViewItemInfo
+							CanEdit="True"
+							InfoText="Detailed text to display with hover."
+							Label="Item info label 1"
+							LabelWidth="{StaticResource LabelWidth}"
+							Orientation="Horizontal"
+							Text="Info item value 1 text" />
+						<MenuFlyoutSeparator />
+						<controls:PropertiesViewItemInfo
+							InfoText="Detailed text to display with hover."
+							IsEnabled="False"
+							Label="Disabled info label 1"
+							LabelWidth="{StaticResource LabelWidth}"
+							Orientation="Horizontal"
+							Text="Info item value 1 text" />
+						<MenuFlyoutSeparator />
+						<controls:PropertiesViewItemText
+							Label="Item label t00 extra long to demonstrate the wrapping for Labels"
+							LabelWidth="{StaticResource LabelWidth}"
+							Orientation="Horizontal"
+							Text="Item value t00 text here" />
+						<MenuFlyoutSeparator />
+						<controls:PropertiesViewItemText
+							IsEnabled="False"
+							Label="Disabled - CanEdit set to False"
+							LabelWidth="{StaticResource LabelWidth}"
+							Orientation="Horizontal"
+							Text="Item value t00 text here" />
+						<MenuFlyoutSeparator />
+						<controls:PropertiesViewItemText
+							CanEdit="True"
+							IsEnabled="False"
+							Label="Disabled - CanEdit set to True"
+							LabelWidth="{StaticResource LabelWidth}"
+							Orientation="Horizontal"
+							Text="Item value t00 text here" />
+						<MenuFlyoutSeparator />
+						<controls:PropertiesViewItemText
+							Label="Item label three"
+							LabelWidth="{StaticResource LabelWidth}"
+							Orientation="Horizontal"
+							Text="Item value three text here, extra long to show how text values will wrap onto mnany lines." />
+					</StackPanel>
+				</Expander.Content>
+			</Expander>
 
-						<StackPanel
-							Padding="0,0,0,8"
-							HorizontalAlignment="Stretch"
-							Orientation="Vertical">
-							<controls:PropertiesViewItemText
-								CanEdit="True"
-								Label="Item label 1"
-								LabelWidth="{StaticResource LabelWidth}"
-								Orientation="Horizontal"
-								Text="Item value 1 text here" />
-							<MenuFlyoutSeparator />
-							<controls:PropertiesViewItemInfo
-								CanEdit="False"
-								InfoText="Detailed text to display with hover."
-								Label="Item info label 1"
-								LabelWidth="{StaticResource LabelWidth}"
-								Orientation="Horizontal"
-								Text="Info item value 1 text" />
-							<MenuFlyoutSeparator />
-							<controls:PropertiesViewItemInfo
-								CanEdit="True"
-								InfoText="Detailed text to display with hover."
-								Label="Item info label 1"
-								LabelWidth="{StaticResource LabelWidth}"
-								Orientation="Horizontal"
-								Text="Info item value 1 text" />
-							<MenuFlyoutSeparator />
-							<controls:PropertiesViewItemInfo
-								InfoText="Detailed text to display with hover."
-								IsEnabled="False"
-								Label="Disabled info label 1"
-								LabelWidth="{StaticResource LabelWidth}"
-								Orientation="Horizontal"
-								Text="Info item value 1 text" />
-							<MenuFlyoutSeparator />
-							<controls:PropertiesViewItemText
-								Label="Item label t00 extra long to demonstrate the wrapping for Labels"
-								LabelWidth="{StaticResource LabelWidth}"
-								Orientation="Horizontal"
-								Text="Item value t00 text here" />
-							<MenuFlyoutSeparator />
-							<controls:PropertiesViewItemText
-								IsEnabled="False"
-								Label="Disabled - CanEdit set to False"
-								LabelWidth="{StaticResource LabelWidth}"
-								Orientation="Horizontal"
-								Text="Item value t00 text here" />
-							<MenuFlyoutSeparator />
-							<controls:PropertiesViewItemText
-								CanEdit="True"
-								IsEnabled="False"
-								Label="Disabled - CanEdit set to True"
-								LabelWidth="{StaticResource LabelWidth}"
-								Orientation="Horizontal"
-								Text="Item value t00 text here" />
-							<MenuFlyoutSeparator />
-							<controls:PropertiesViewItemText
-								Label="Item label three"
-								LabelWidth="{StaticResource LabelWidth}"
-								Orientation="Horizontal"
-								Text="Item value three text here, extra long to show how text values will wrap onto mnany lines." />
-						</StackPanel>
-					</Expander.Content>
-				</Expander>
+			<Expander Style="{StaticResource PropertiesExpanderStyle}">
+				<Expander.Header>
+					<controls:PropertiesHeader Text="Header text goes here, made extra long to ensure wrapping and arranging within the header works as expected">
+						<controls:PropertiesHeader.Icon>
+							<SymbolIcon Symbol="Comment" />
+						</controls:PropertiesHeader.Icon>
+					</controls:PropertiesHeader>
+				</Expander.Header>
 
-				<Expander Style="{StaticResource PropertiesExpanderStyle}">
-					<Expander.Header>
-						<controls:PropertiesHeader Text="Header text goes here, made extra long to ensure wrapping and arranging within the header works as expected">
-							<controls:PropertiesHeader.Icon>
-								<SymbolIcon Symbol="Comment" />
-							</controls:PropertiesHeader.Icon>
-						</controls:PropertiesHeader>
-					</Expander.Header>
+				<Expander.Content>
+					<StackPanel
+						Padding="0,0,0,8"
+						HorizontalAlignment="Stretch"
+						Orientation="Vertical">
+						<controls:PropertiesViewItemRating
+							Label="Item label 1 readonly"
+							LabelWidth="{StaticResource LabelWidth}"
+							Orientation="Horizontal"
+							Rating="9345" />
+						<MenuFlyoutSeparator Margin="16,0" />
+						<controls:PropertiesViewItemRating
+							CanEdit="True"
+							Label="Item label t00 editable"
+							Orientation="Horizontal"
+							Rating="-23" />
+						<MenuFlyoutSeparator Margin="16,0" />
+						<controls:PropertiesViewItemRating
+							CanEdit="False"
+							Label="Item label three readonly"
+							Orientation="Horizontal"
+							Rating="32" />
+						<MenuFlyoutSeparator Margin="16,0" />
+						<controls:PropertiesViewItemRating
+							CanEdit="False"
+							IsEnabled="False"
+							Label="Disabled item label"
+							Orientation="Horizontal"
+							Rating="50" />
+						<MenuFlyoutSeparator Margin="16,0" />
+						<controls:PropertiesViewItemRating
+							CanEdit="True"
+							IsEnabled="False"
+							Label="Disabled, editable label"
+							Orientation="Horizontal"
+							Rating="50" />
+						<MenuFlyoutSeparator Margin="16,0" />
+						<controls:PropertiesViewItemRating
+							CanEdit="True"
+							Label="Item label 4ore editable"
+							Orientation="Horizontal"
+							Rating="72" />
+					</StackPanel>
+				</Expander.Content>
+			</Expander>
 
-					<Expander.Content>
-						<StackPanel
-							Padding="0,0,0,8"
-							HorizontalAlignment="Stretch"
-							Orientation="Vertical">
-							<controls:PropertiesViewItemRating
-								Label="Item label 1 readonly"
-								LabelWidth="{StaticResource LabelWidth}"
-								Orientation="Horizontal"
-								Rating="9345" />
-							<MenuFlyoutSeparator Margin="16,0" />
-							<controls:PropertiesViewItemRating
-								CanEdit="True"
-								Label="Item label t00 editable"
-								Orientation="Horizontal"
-								Rating="-23" />
-							<MenuFlyoutSeparator Margin="16,0" />
-							<controls:PropertiesViewItemRating
-								CanEdit="False"
-								Label="Item label three readonly"
-								Orientation="Horizontal"
-								Rating="32" />
-							<MenuFlyoutSeparator Margin="16,0" />
-							<controls:PropertiesViewItemRating
-								CanEdit="False"
-								IsEnabled="False"
-								Label="Disabled item label"
-								Orientation="Horizontal"
-								Rating="50" />
-							<MenuFlyoutSeparator Margin="16,0" />
-							<controls:PropertiesViewItemRating
-								CanEdit="True"
-								IsEnabled="False"
-								Label="Disabled, editable label"
-								Orientation="Horizontal"
-								Rating="50" />
-							<MenuFlyoutSeparator Margin="16,0" />
-							<controls:PropertiesViewItemRating
-								CanEdit="True"
-								Label="Item label 4ore editable"
-								Orientation="Horizontal"
-								Rating="72" />
-						</StackPanel>
-					</Expander.Content>
-				</Expander>
+			<Expander Style="{StaticResource PropertiesExpanderStyle}">
+				<Expander.Header>
+					<controls:PropertiesHeader Text="Vertical examples">
+						<controls:PropertiesHeader.Icon>
+							<SymbolIcon Symbol="SlideShow" />
+						</controls:PropertiesHeader.Icon>
+					</controls:PropertiesHeader>
+				</Expander.Header>
 
-				<Expander Style="{StaticResource PropertiesExpanderStyle}">
-					<Expander.Header>
-						<controls:PropertiesHeader Text="Vertical examples">
-							<controls:PropertiesHeader.Icon>
-								<SymbolIcon Symbol="SlideShow" />
-							</controls:PropertiesHeader.Icon>
-						</controls:PropertiesHeader>
-					</Expander.Header>
+				<Expander.Content>
+					<StackPanel HorizontalAlignment="Stretch" Orientation="Vertical">
 
-					<Expander.Content>
-						<StackPanel HorizontalAlignment="Stretch" Orientation="Vertical">
+						<controls:PropertiesViewItemText
+							CanEdit="True"
+							Label="Item label 1"
+							LabelWidth="{StaticResource LabelWidth}"
+							Orientation="Vertical"
+							Text="Item value 1 text here" />
 
-							<controls:PropertiesViewItemText
-								CanEdit="True"
-								Label="Item label 1"
-								LabelWidth="{StaticResource LabelWidth}"
-								Orientation="Vertical"
-								Text="Item value 1 text here" />
+						<MenuFlyoutSeparator />
 
-							<MenuFlyoutSeparator />
+						<controls:PropertiesViewItemInfo
+							CanEdit="False"
+							InfoText="Detailed text to display with the button press."
+							Label="Item info label 1"
+							LabelWidth="{StaticResource LabelWidth}"
+							Orientation="Vertical"
+							Text="Info item value 1 text" />
 
-							<controls:PropertiesViewItemInfo
-								CanEdit="False"
-								InfoText="Detailed text to display with the button press."
-								Label="Item info label 1"
-								LabelWidth="{StaticResource LabelWidth}"
-								Orientation="Vertical"
-								Text="Info item value 1 text" />
+						<MenuFlyoutSeparator />
 
-							<MenuFlyoutSeparator />
+						<controls:PropertiesViewItemInfo
+							CanEdit="True"
+							InfoText="Detailed text to display with the button press."
+							Label="Item info label 1"
+							LabelWidth="{StaticResource LabelWidth}"
+							Orientation="Vertical"
+							Text="Info item value 1 text" />
 
-							<controls:PropertiesViewItemInfo
-								CanEdit="True"
-								InfoText="Detailed text to display with the button press."
-								Label="Item info label 1"
-								LabelWidth="{StaticResource LabelWidth}"
-								Orientation="Vertical"
-								Text="Info item value 1 text" />
+						<MenuFlyoutSeparator />
 
-							<MenuFlyoutSeparator />
+						<controls:PropertiesViewItemRating
+							CanEdit="True"
+							Label="Really long label wrapping when using a vertical layout example here for your viewing pleasure."
+							Orientation="Vertical"
+							Rating="54" />
 
-							<controls:PropertiesViewItemRating
-								CanEdit="True"
-								Label="Really long label wrapping when using a vertical layout example here for your viewing pleasure."
-								Orientation="Vertical"
-								Rating="54" />
+						<MenuFlyoutSeparator />
 
-							<MenuFlyoutSeparator />
+						<controls:PropertiesViewItemText
+							CanEdit="False"
+							Label="Item label three"
+							LabelWidth="{StaticResource LabelWidth}"
+							Orientation="Vertical"
+							Text="Item value 1 text here, made long so we can see how wrapping will work for this vertical exanple of the control layout. " />
+					</StackPanel>
+				</Expander.Content>
+			</Expander>
 
-							<controls:PropertiesViewItemText
-								CanEdit="False"
-								Label="Item label three"
-								LabelWidth="{StaticResource LabelWidth}"
-								Orientation="Vertical"
-								Text="Item value 1 text here, made long so we can see how wrapping will work for this vertical exanple of the control layout. " />
-						</StackPanel>
-					</Expander.Content>
-				</Expander>
-
-			</StackPanel>
-		</ScrollViewer>
+		</controls:PropertiesViewForm>
 
 	</Grid>
 
diff --git a/tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml.cs b/tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml.cs
index e4a2fb7bf2ea..44df40f9c38c 100644
--- a/tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml.cs
+++ b/tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml.cs
@@ -1,31 +1,15 @@
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Controls.Primitives;
-using Microsoft.UI.Xaml.Data;
-using Microsoft.UI.Xaml.Input;
-using Microsoft.UI.Xaml.Media;
-using Microsoft.UI.Xaml.Navigation;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
+// Copyright (c) Files Community
+// SPDX-License-Identifier: MPL-2.0
 
-// To learn more about WinUI, the WinUI project structure,
-// and more about our project templates, see: http://aka.ms/winui-project-info.
+using Microsoft.UI.Xaml.Controls;
 
 namespace Files.App.UITests.Dialogs.Properties.Views
 {
-    /// <summary>
-    /// An empty page that can be used on its own or navigated to within a Frame.
-    /// </summary>
-    public sealed partial class PropertiesGeneralPage : Page
-    {
-        public PropertiesGeneralPage()
-        {
-            InitializeComponent();
-        }
-    }
+	public sealed partial class PropertiesGeneralPage : Page
+	{
+		public PropertiesGeneralPage()
+		{
+			InitializeComponent();
+		}
+	}
 }

From 455055030b1805642c610ae69b9a4a57003906b9 Mon Sep 17 00:00:00 2001
From: 0x5BFA <62196528+0x5bfa@users.noreply.github.com>
Date: Fri, 21 Aug 2026 12:46:53 +0900
Subject: [PATCH 19/36] Update sample page names

---
 .../PropertiesView/PropertiesView.xaml        | 512 ------------------
 .../PropertiesViewItem - Constants.cs         |  12 +-
 .../PropertiesViewItem.Properties.cs          |   8 +-
 .../PropertiesView/PropertiesViewItem.cs      |   8 +-
 .../PropertiesView/PropertiesViewItemInfo.cs  |   6 +-
 .../PropertiesViewItemRating.cs               |   6 +-
 .../PropertiesView/PropertiesViewItemText.cs  |   6 +-
 .../PropertiesViewItemToggle.cs               |   6 +-
 .../PropertiesView/PropertiesViewSection.xaml | 487 +++++++++++++++++
 src/Files.App.Controls/Themes/Generic.xaml    |   1 +
 .../{Properties => }/PropertiesDialog.xaml    |   0
 .../{Properties => }/PropertiesDialog.xaml.cs |   1 -
 .../Views => }/PropertiesGeneralPage.xaml     |   4 +-
 .../Views => }/PropertiesGeneralPage.xaml.cs  |   2 +-
 .../Files.App.UITests.csproj                  |  14 -
 tests/Files.App.UITests/MainWindow.xaml       |   2 +-
 tests/Files.App.UITests/MainWindow.xaml.cs    |   2 +-
 .../Views/DialogWindowsPage.xaml.cs           |  47 --
 ...ndowsPage.xaml => PropertiesViewPage.xaml} |  13 +-
 .../Views/PropertiesViewPage.xaml.cs          |  23 +
 20 files changed, 545 insertions(+), 615 deletions(-)
 create mode 100644 src/Files.App.Controls/PropertiesView/PropertiesViewSection.xaml
 rename tests/Files.App.UITests/Dialogs/{Properties => }/PropertiesDialog.xaml (100%)
 rename tests/Files.App.UITests/Dialogs/{Properties => }/PropertiesDialog.xaml.cs (93%)
 rename tests/Files.App.UITests/Dialogs/{Properties/Views => }/PropertiesGeneralPage.xaml (98%)
 rename tests/Files.App.UITests/Dialogs/{Properties/Views => }/PropertiesGeneralPage.xaml.cs (81%)
 delete mode 100644 tests/Files.App.UITests/Views/DialogWindowsPage.xaml.cs
 rename tests/Files.App.UITests/Views/{DialogWindowsPage.xaml => PropertiesViewPage.xaml} (54%)
 create mode 100644 tests/Files.App.UITests/Views/PropertiesViewPage.xaml.cs

diff --git a/src/Files.App.Controls/PropertiesView/PropertiesView.xaml b/src/Files.App.Controls/PropertiesView/PropertiesView.xaml
index bf01a3fec8ff..2cd1ae81f630 100644
--- a/src/Files.App.Controls/PropertiesView/PropertiesView.xaml
+++ b/src/Files.App.Controls/PropertiesView/PropertiesView.xaml
@@ -101,510 +101,6 @@
 		</Setter>
 	</Style>
 
-
-	<!--  PROPERTIES EXPANDER  -->
-	<Style x:Key="PropertiesExpanderStyle" TargetType="Expander">
-		<!--
-			We won't make this control tab stoppable, since the tab focus should go
-			to the toggle button. For this logic, several things were made:
-			1. Expander::OnApplyTemplate - We set the toggle button's events source to the expander's. This will announce expander properties
-			(expand/collapse) changes to narrator. Without this, narrator would announce the toggle button's "on/off" logic
-			instead of the "expand/collapse" logic.
-			2. ExpanderAutomationPeer::GetChildrenCore - Because of 1., we need to override GetChildrenCore to NOT include the toggle button.
-			If we don't do this, we create a weird dependency cycle between the toggle button and the expander.
-			3. ExpanderAutomationPeer::GetPeerFromPointCore Finally, when using narrator with a touch screen, this was overriden as well, to
-			focus the toggle button programmatically to sync the narrator focus with the keyboard focus.
-			Without this override, the narrator user that focuses the expander on a touch screen will see that pressing "Tab"
-			doesn't work how they would expect.
-		-->
-		<Setter Property="IsTabStop" Value="False" />
-		<Setter Property="Background" Value="{ThemeResource PropertiesExpanderContentBackground}" />
-		<Setter Property="BackgroundSizing" Value="InnerBorderEdge" />
-		<Setter Property="MinWidth" Value="{ThemeResource FlyoutThemeMinWidth}" />
-		<Setter Property="MinHeight" Value="{StaticResource PropertiesExpanderMinHeight}" />
-		<Setter Property="BorderThickness" Value="{ThemeResource PropertiesExpanderContentDownBorderThickness}" />
-		<Setter Property="BorderBrush" Value="{ThemeResource PropertiesExpanderContentBorderBrush}" />
-		<Setter Property="Padding" Value="{StaticResource PropertiesExpanderContentPadding}" />
-		<Setter Property="HorizontalAlignment" Value="Stretch" />
-		<Setter Property="VerticalAlignment" Value="Center" />
-		<Setter Property="HorizontalContentAlignment" Value="Stretch" />
-		<Setter Property="VerticalContentAlignment" Value="Top" />
-		<Setter Property="CornerRadius" Value="0" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="Expander">
-					<Grid MinWidth="{TemplateBinding MinWidth}" MaxWidth="{TemplateBinding MaxWidth}">
-						<Grid.RowDefinitions>
-							<RowDefinition x:Name="Row0" Height="Auto" />
-							<RowDefinition x:Name="Row1" Height="*" />
-							<RowDefinition x:Name="Row2" Height="Auto" />
-						</Grid.RowDefinitions>
-						<ToggleButton
-							x:Name="ExpanderHeader"
-							MinHeight="{TemplateBinding MinHeight}"
-							Padding="{StaticResource PropertiesExpanderHeaderPadding}"
-							HorizontalAlignment="Stretch"
-							HorizontalContentAlignment="{StaticResource PropertiesExpanderHeaderHorizontalContentAlignment}"
-							VerticalContentAlignment="{StaticResource PropertiesExpanderHeaderVerticalContentAlignment}"
-							AutomationProperties.AutomationId="ExpanderToggleButton"
-							Background="{ThemeResource PropertiesExpanderHeaderBackground}"
-							BackgroundSizing="{TemplateBinding BackgroundSizing}"
-							BorderBrush="{ThemeResource PropertiesExpanderHeaderBorderBrush}"
-							BorderThickness="0"
-							Content="{TemplateBinding Header}"
-							ContentTemplate="{TemplateBinding HeaderTemplate}"
-							ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}"
-							CornerRadius="{TemplateBinding CornerRadius}"
-							IsChecked="{Binding Path=IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
-							IsEnabled="{TemplateBinding IsEnabled}"
-							Style="{StaticResource PropertiesExpanderHeaderDownStyle}" />
-						<!--  The clip is a composition clip applied in code  -->
-						<Border x:Name="ExpanderContentClip" Grid.Row="1">
-							<Border
-								x:Name="ExpanderContent"
-								MinHeight="{TemplateBinding MinHeight}"
-								Padding="{TemplateBinding Padding}"
-								HorizontalAlignment="Stretch"
-								VerticalAlignment="Stretch"
-								Background="{TemplateBinding Background}"
-								BackgroundSizing="{TemplateBinding BackgroundSizing}"
-								BorderBrush="{TemplateBinding BorderBrush}"
-								BorderThickness="{StaticResource PropertiesExpanderContentDownBorderThickness}"
-								CornerRadius="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomCornerRadiusFilterConverter}}"
-								Visibility="Collapsed">
-								<ContentPresenter
-									HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-									VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-									Content="{TemplateBinding Content}"
-									ContentTemplate="{TemplateBinding ContentTemplate}"
-									ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
-								<Border.RenderTransform>
-									<CompositeTransform />
-								</Border.RenderTransform>
-							</Border>
-						</Border>
-						<Rectangle
-							x:Name="ExpanderSeparator"
-							Grid.Row="2"
-							Height="{StaticResource PropertiesExpanderSeparatorHeight}"
-							Fill="{ThemeResource PropertiesExpanderSeparatorFillColor}" />
-						<VisualStateManager.VisualStateGroups>
-							<VisualStateGroup x:Name="ExpandStates">
-								<VisualState x:Name="ExpandUp">
-									<VisualState.Setters>
-										<Setter Target="ExpanderHeader.CornerRadius" Value="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomCornerRadiusFilterConverter}}" />
-										<Setter Target="ExpanderContent.Visibility" Value="Visible" />
-									</VisualState.Setters>
-									<VisualState.Storyboard>
-										<Storyboard>
-											<DoubleAnimationUsingKeyFrames Storyboard.TargetName="ExpanderContent" Storyboard.TargetProperty="(UIElement.RenderTransform).(CompositeTransform.TranslateY)">
-												<DiscreteDoubleKeyFrame KeyTime="0" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ContentHeight}" />
-												<SplineDoubleKeyFrame
-													KeySpline="0.0, 0.0, 0.0, 1.0"
-													KeyTime="0:0:0.333"
-													Value="0" />
-											</DoubleAnimationUsingKeyFrames>
-										</Storyboard>
-									</VisualState.Storyboard>
-								</VisualState>
-								<VisualState x:Name="CollapseDown">
-									<VisualState.Storyboard>
-										<Storyboard>
-											<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ExpanderContent" Storyboard.TargetProperty="Visibility">
-												<DiscreteObjectKeyFrame KeyTime="0:0:0.2" Value="Collapsed" />
-											</ObjectAnimationUsingKeyFrames>
-											<DoubleAnimationUsingKeyFrames Storyboard.TargetName="ExpanderContent" Storyboard.TargetProperty="(UIElement.RenderTransform).(CompositeTransform.TranslateY)">
-												<DiscreteDoubleKeyFrame KeyTime="0" Value="0" />
-												<SplineDoubleKeyFrame
-													KeySpline="1.0, 1.0, 0.0, 1.0"
-													KeyTime="0:0:0.167"
-													Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ContentHeight}" />
-											</DoubleAnimationUsingKeyFrames>
-										</Storyboard>
-									</VisualState.Storyboard>
-								</VisualState>
-								<VisualState x:Name="ExpandDown">
-									<VisualState.Setters>
-										<Setter Target="ExpanderHeader.CornerRadius" Value="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TopCornerRadiusFilterConverter}}" />
-										<Setter Target="ExpanderContent.Visibility" Value="Visible" />
-									</VisualState.Setters>
-									<VisualState.Storyboard>
-										<Storyboard>
-											<DoubleAnimationUsingKeyFrames Storyboard.TargetName="ExpanderContent" Storyboard.TargetProperty="(UIElement.RenderTransform).(CompositeTransform.TranslateY)">
-												<DiscreteDoubleKeyFrame KeyTime="0" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.NegativeContentHeight}" />
-												<SplineDoubleKeyFrame
-													KeySpline="0.0, 0.0, 0.0, 1.0"
-													KeyTime="0:0:0.333"
-													Value="0" />
-											</DoubleAnimationUsingKeyFrames>
-										</Storyboard>
-									</VisualState.Storyboard>
-								</VisualState>
-								<VisualState x:Name="CollapseUp">
-									<VisualState.Storyboard>
-										<Storyboard>
-											<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ExpanderContent" Storyboard.TargetProperty="Visibility">
-												<DiscreteObjectKeyFrame KeyTime="0:0:0.167" Value="Collapsed" />
-											</ObjectAnimationUsingKeyFrames>
-											<DoubleAnimationUsingKeyFrames Storyboard.TargetName="ExpanderContent" Storyboard.TargetProperty="(UIElement.RenderTransform).(CompositeTransform.TranslateY)">
-												<DiscreteDoubleKeyFrame KeyTime="0" Value="0" />
-												<SplineDoubleKeyFrame
-													KeySpline="1.0, 1.0, 0.0, 1.0"
-													KeyTime="0:0:0.167"
-													Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.NegativeContentHeight}" />
-											</DoubleAnimationUsingKeyFrames>
-										</Storyboard>
-									</VisualState.Storyboard>
-								</VisualState>
-							</VisualStateGroup>
-							<VisualStateGroup x:Name="ExpandDirectionStates">
-								<VisualState x:Name="Down" />
-								<VisualState x:Name="Up">
-									<VisualState.Setters>
-										<Setter Target="ExpanderHeader.Style" Value="{StaticResource PropertiesExpanderHeaderUpStyle}" />
-										<Setter Target="ExpanderContent.BorderThickness" Value="{StaticResource PropertiesExpanderContentUpBorderThickness}" />
-										<Setter Target="ExpanderContent.CornerRadius" Value="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TopCornerRadiusFilterConverter}}" />
-										<Setter Target="ExpanderHeader.(Grid.Row)" Value="2" />
-										<Setter Target="ExpanderContentClip.(Grid.Row)" Value="1" />
-										<Setter Target="ExpanderSeparator.(Grid.Row)" Value="0" />
-										<Setter Target="Row0.Height" Value="Auto" />
-										<Setter Target="Row1.Height" Value="*" />
-										<Setter Target="Row2.Height" Value="Auto" />
-									</VisualState.Setters>
-								</VisualState>
-							</VisualStateGroup>
-						</VisualStateManager.VisualStateGroups>
-					</Grid>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-
-
-
-
-	<!--  vEXPANDER DOWN BUTTON  -->
-	<Style x:Key="PropertiesExpanderHeaderDownStyle" TargetType="ToggleButton">
-		<Setter Property="Padding" Value="{ThemeResource PropertiesExpanderHeaderPadding}" />
-		<Setter Property="Background" Value="{ThemeResource PropertiesExpanderHeaderBackground}" />
-		<Setter Property="BorderThickness" Value="0" />
-		<Setter Property="HorizontalContentAlignment" Value="Left" />
-		<Setter Property="BackgroundSizing" Value="InnerBorderEdge" />
-		<Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="ToggleButton">
-					<Border
-						x:Name="ToggleButtonBase"
-						Width="{TemplateBinding Width}"
-						MinWidth="{TemplateBinding MinWidth}"
-						MinHeight="{TemplateBinding MinHeight}"
-						MaxWidth="{TemplateBinding MaxWidth}"
-						Padding="{TemplateBinding Padding}"
-						HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
-						Background="{TemplateBinding Background}"
-						BackgroundSizing="{TemplateBinding BackgroundSizing}"
-						BorderBrush="{TemplateBinding BorderBrush}"
-						BorderThickness="{TemplateBinding BorderThickness}"
-						CornerRadius="{TemplateBinding CornerRadius}">
-						<Grid
-							x:Name="ToggleButtonGrid"
-							Padding="{StaticResource PropertiesExpanderHeaderInnerPadding}"
-							Background="{ThemeResource PropertiesExpanderHeaderBackground}"
-							BorderBrush="{ThemeResource PropertiesExpanderHeaderBorderBrush}"
-							BorderThickness="{ThemeResource PropertiesExpanderHeaderBorderThickness}"
-							CornerRadius="{ThemeResource ControlCornerRadius}">
-							<Grid.ColumnDefinitions>
-								<ColumnDefinition Width="Auto" />
-								<ColumnDefinition Width="*" />
-							</Grid.ColumnDefinitions>
-							<ContentPresenter
-								x:Name="ContentPresenter"
-								Grid.Column="1"
-								HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-								VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-								Content="{TemplateBinding Content}"
-								ContentTemplate="{TemplateBinding ContentTemplate}"
-								ContentTransitions="{TemplateBinding ContentTransitions}"
-								Foreground="{TemplateBinding Foreground}" />
-
-							<Border
-								x:Name="ExpandCollapseChevronBorder"
-								Grid.Column="0"
-								Width="{ThemeResource PropertiesExpanderChevronSpaceWidth}"
-								Height="{ThemeResource PropertiesExpanderChevronSpaceHeight}"
-								Margin="{ThemeResource PropertiesExpanderChevronMargin}">
-								<AnimatedIcon
-									xmlns:local="using:Microsoft.UI.Xaml.Controls"
-									x:Name="ExpandCollapseChevron"
-									Width="{StaticResource PropertiesExpanderChevronGlyphSize}"
-									Height="{StaticResource PropertiesExpanderChevronGlyphSize}"
-									HorizontalAlignment="Center"
-									VerticalAlignment="Center"
-									local:AnimatedIcon.State="NormalOff"
-									AutomationProperties.AccessibilityView="Raw"
-									Foreground="{ThemeResource PropertiesExpanderChevronForeground}"
-									RenderTransformOrigin="0.5, 0.5">
-									<animatedvisuals:AnimatedChevronUpDownSmallVisualSource />
-									<AnimatedIcon.FallbackIconSource>
-										<FontIconSource
-											FontFamily="{StaticResource SymbolThemeFontFamily}"
-											FontSize="12"
-											Glyph="{StaticResource PropertiesExpanderChevronDownGlyph}"
-											IsTextScaleFactorEnabled="False" />
-									</AnimatedIcon.FallbackIconSource>
-									<AnimatedIcon.RenderTransform />
-								</AnimatedIcon>
-							</Border>
-
-						</Grid>
-						<VisualStateManager.VisualStateGroups>
-							<VisualStateGroup x:Name="CommonStates">
-								<VisualState x:Name="Normal">
-									<VisualState.Setters>
-										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource PropertiesExpanderHeaderForeground}" />
-										<Setter Target="ToggleButtonGrid.BorderBrush" Value="{ThemeResource PropertiesExpanderHeaderBorderBrush}" />
-										<Setter Target="ExpandCollapseChevron.Foreground" Value="{ThemeResource PropertiesExpanderChevronForeground}" />
-										<Setter Target="ToggleButtonGrid.Background" Value="{ThemeResource PropertiesExpanderHeaderBackground}" />
-									</VisualState.Setters>
-								</VisualState>
-								<VisualState x:Name="PointerOver">
-									<VisualState.Setters>
-										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource PropertiesExpanderHeaderPointerOverForeground}" />
-										<Setter Target="ToggleButtonGrid.BorderBrush" Value="{ThemeResource PropertiesExpanderHeaderPointerOverBorderBrush}" />
-										<Setter Target="ToggleButtonGrid.Background" Value="{ThemeResource PropertiesExpanderHeaderPointerOverBackground}" />
-										<Setter Target="ExpandCollapseChevron.(AnimatedIcon.State)" Value="PointerOverOff" />
-									</VisualState.Setters>
-								</VisualState>
-								<VisualState x:Name="Pressed">
-									<VisualState.Setters>
-										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource PropertiesExpanderHeaderPressedForeground}" />
-										<Setter Target="ToggleButtonGrid.BorderBrush" Value="{ThemeResource PropertiesExpanderHeaderPressedBorderBrush}" />
-										<Setter Target="ExpandCollapseChevron.Foreground" Value="{ThemeResource PropertiesExpanderChevronPressedForeground}" />
-										<Setter Target="ToggleButtonGrid.Background" Value="{ThemeResource PropertiesExpanderHeaderPressedBackground}" />
-										<Setter Target="ExpandCollapseChevron.(AnimatedIcon.State)" Value="PressedOff" />
-									</VisualState.Setters>
-								</VisualState>
-								<VisualState x:Name="Disabled">
-									<VisualState.Setters>
-										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource PropertiesExpanderHeaderDisabledForeground}" />
-										<Setter Target="ToggleButtonGrid.BorderBrush" Value="{ThemeResource PropertiesExpanderHeaderDisabledBorderBrush}" />
-										<Setter Target="ExpandCollapseChevron.Foreground" Value="{ThemeResource PropertiesExpanderHeaderDisabledForeground}" />
-										<Setter Target="ToggleButtonGrid.Background" Value="{ThemeResource PropertiesExpanderHeaderBackground}" />
-									</VisualState.Setters>
-								</VisualState>
-								<VisualState x:Name="Checked">
-									<VisualState.Setters>
-										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource PropertiesExpanderHeaderForeground}" />
-										<Setter Target="ToggleButtonGrid.BorderBrush" Value="{ThemeResource PropertiesExpanderHeaderBorderBrush}" />
-										<Setter Target="ExpandCollapseChevron.Foreground" Value="{ThemeResource PropertiesExpanderChevronForeground}" />
-										<Setter Target="ToggleButtonGrid.Background" Value="{ThemeResource PropertiesExpanderHeaderBackground}" />
-										<Setter Target="ExpandCollapseChevron.(AnimatedIcon.State)" Value="NormalOn" />
-									</VisualState.Setters>
-								</VisualState>
-								<VisualState x:Name="CheckedPointerOver">
-									<VisualState.Setters>
-										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource PropertiesExpanderHeaderPointerOverForeground}" />
-										<Setter Target="ToggleButtonGrid.BorderBrush" Value="{ThemeResource PropertiesExpanderHeaderPointerOverBorderBrush}" />
-										<Setter Target="ExpandCollapseChevron.Foreground" Value="{ThemeResource PropertiesExpanderChevronPointerOverForeground}" />
-										<Setter Target="ToggleButtonGrid.Background" Value="{ThemeResource PropertiesExpanderHeaderPointerOverBackground}" />
-										<Setter Target="ExpandCollapseChevron.(AnimatedIcon.State)" Value="PointerOverOn" />
-									</VisualState.Setters>
-								</VisualState>
-								<VisualState x:Name="CheckedPressed">
-									<VisualState.Setters>
-										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource PropertiesExpanderHeaderPressedForeground}" />
-										<Setter Target="ToggleButtonGrid.BorderBrush" Value="{ThemeResource PropertiesExpanderHeaderPressedBorderBrush}" />
-										<Setter Target="ExpandCollapseChevron.Foreground" Value="{ThemeResource PropertiesExpanderChevronPressedForeground}" />
-										<Setter Target="ToggleButtonGrid.Background" Value="{ThemeResource PropertiesExpanderHeaderPressedBackground}" />
-										<Setter Target="ExpandCollapseChevron.(AnimatedIcon.State)" Value="PressedOn" />
-									</VisualState.Setters>
-								</VisualState>
-								<VisualState x:Name="CheckedDisabled">
-									<VisualState.Setters>
-										<Setter Target="ToggleButtonGrid.BorderBrush" Value="{ThemeResource PropertiesExpanderHeaderDisabledBorderBrush}" />
-										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource PropertiesExpanderHeaderDisabledForeground}" />
-										<Setter Target="ExpandCollapseChevron.Foreground" Value="{ThemeResource PropertiesExpanderHeaderDisabledForeground}" />
-										<Setter Target="ToggleButtonGrid.Background" Value="{ThemeResource PropertiesExpanderHeaderBackground}" />
-										<Setter Target="ExpandCollapseChevron.(AnimatedIcon.State)" Value="NormalOn" />
-									</VisualState.Setters>
-								</VisualState>
-								<VisualState x:Name="Indeterminate" />
-								<VisualState x:Name="IndeterminatePointerOver" />
-								<VisualState x:Name="IndeterminatePressed" />
-								<VisualState x:Name="IndeterminateDisabled" />
-							</VisualStateGroup>
-						</VisualStateManager.VisualStateGroups>
-					</Border>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-
-
-	<!--  PROPERTIES EXPANDER UP BUTTON  -->
-	<Style
-		x:Key="PropertiesExpanderHeaderUpStyle"
-		BasedOn="{StaticResource PropertiesExpanderHeaderDownStyle}"
-		TargetType="ToggleButton">
-		<Setter Property="Padding" Value="{ThemeResource PropertiesExpanderHeaderPadding}" />
-		<Setter Property="Background" Value="{ThemeResource PropertiesExpanderHeaderBackground}" />
-		<Setter Property="BorderThickness" Value="0" />
-		<Setter Property="HorizontalContentAlignment" Value="Left" />
-		<Setter Property="BackgroundSizing" Value="InnerBorderEdge" />
-		<Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="ToggleButton">
-					<Border
-						x:Name="ToggleButtonBase"
-						Width="{TemplateBinding Width}"
-						MinWidth="{TemplateBinding MinWidth}"
-						MinHeight="{TemplateBinding MinHeight}"
-						MaxWidth="{TemplateBinding MaxWidth}"
-						Padding="{TemplateBinding Padding}"
-						HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
-						Background="{TemplateBinding Background}"
-						BackgroundSizing="{TemplateBinding BackgroundSizing}"
-						BorderBrush="{TemplateBinding BorderBrush}"
-						BorderThickness="{TemplateBinding BorderThickness}"
-						CornerRadius="{TemplateBinding CornerRadius}">
-						<Grid
-							x:Name="ToggleButtonGrid"
-							Padding="{StaticResource PropertiesExpanderHeaderInnerPadding}"
-							Background="{ThemeResource PropertiesExpanderHeaderBackground}"
-							BorderBrush="{ThemeResource PropertiesExpanderHeaderBorderBrush}"
-							BorderThickness="{ThemeResource PropertiesExpanderHeaderBorderThickness}"
-							CornerRadius="{ThemeResource ControlCornerRadius}">
-							<Grid.ColumnDefinitions>
-								<ColumnDefinition Width="Auto" />
-								<ColumnDefinition Width="*" />
-							</Grid.ColumnDefinitions>
-							<ContentPresenter
-								x:Name="ContentPresenter"
-								Grid.Column="1"
-								HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-								VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-								Content="{TemplateBinding Content}"
-								ContentTemplate="{TemplateBinding ContentTemplate}"
-								ContentTransitions="{TemplateBinding ContentTransitions}"
-								Foreground="{TemplateBinding Foreground}" />
-							<Border
-								x:Name="ExpandCollapseChevronBorder"
-								Grid.Column="0"
-								Width="{ThemeResource PropertiesExpanderChevronSpaceWidth}"
-								Height="{ThemeResource PropertiesExpanderChevronSpaceHeight}"
-								Margin="{ThemeResource PropertiesExpanderChevronMargin}">
-								<AnimatedIcon
-									xmlns:local="using:Microsoft.UI.Xaml.Controls"
-									x:Name="ExpandCollapseChevron"
-									Width="{StaticResource PropertiesExpanderChevronGlyphSize}"
-									Height="{StaticResource PropertiesExpanderChevronGlyphSize}"
-									HorizontalAlignment="Center"
-									VerticalAlignment="Center"
-									local:AnimatedIcon.State="NormalOn"
-									AutomationProperties.AccessibilityView="Raw"
-									Foreground="{ThemeResource PropertiesExpanderChevronForeground}"
-									RenderTransformOrigin="0.5, 0.5">
-									<animatedvisuals:AnimatedChevronUpDownSmallVisualSource />
-									<AnimatedIcon.FallbackIconSource>
-										<FontIconSource
-											FontFamily="{StaticResource SymbolThemeFontFamily}"
-											FontSize="12"
-											Glyph="{StaticResource PropertiesExpanderChevronUpGlyph}"
-											IsTextScaleFactorEnabled="False" />
-									</AnimatedIcon.FallbackIconSource>
-									<AnimatedIcon.RenderTransform />
-								</AnimatedIcon>
-							</Border>
-
-						</Grid>
-						<VisualStateManager.VisualStateGroups>
-							<VisualStateGroup x:Name="CommonStates">
-								<VisualState x:Name="Normal">
-									<VisualState.Setters>
-										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource PropertiesExpanderHeaderForeground}" />
-										<Setter Target="ToggleButtonGrid.BorderBrush" Value="{ThemeResource PropertiesExpanderHeaderBorderBrush}" />
-										<Setter Target="ExpandCollapseChevron.Foreground" Value="{ThemeResource PropertiesExpanderChevronForeground}" />
-										<Setter Target="ToggleButtonGrid.Background" Value="{ThemeResource PropertiesExpanderHeaderBackground}" />
-									</VisualState.Setters>
-								</VisualState>
-								<VisualState x:Name="PointerOver">
-									<VisualState.Setters>
-										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource PropertiesExpanderHeaderPointerOverForeground}" />
-										<Setter Target="ToggleButtonGrid.BorderBrush" Value="{ThemeResource PropertiesExpanderHeaderPointerOverBorderBrush}" />
-										<Setter Target="ToggleButtonGrid.Background" Value="{ThemeResource PropertiesExpanderHeaderPointerOverBackground}" />
-										<Setter Target="ExpandCollapseChevron.(AnimatedIcon.State)" Value="PointerOverOn" />
-									</VisualState.Setters>
-								</VisualState>
-								<VisualState x:Name="Pressed">
-									<VisualState.Setters>
-										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource PropertiesExpanderHeaderPressedForeground}" />
-										<Setter Target="ToggleButtonGrid.BorderBrush" Value="{ThemeResource PropertiesExpanderHeaderPressedBorderBrush}" />
-										<Setter Target="ExpandCollapseChevron.Foreground" Value="{ThemeResource PropertiesExpanderChevronPressedForeground}" />
-										<Setter Target="ToggleButtonGrid.Background" Value="{ThemeResource PropertiesExpanderHeaderPressedBackground}" />
-										<Setter Target="ExpandCollapseChevron.(AnimatedIcon.State)" Value="PressedOn" />
-									</VisualState.Setters>
-								</VisualState>
-								<VisualState x:Name="Disabled">
-									<VisualState.Setters>
-										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource PropertiesExpanderHeaderDisabledForeground}" />
-										<Setter Target="ToggleButtonGrid.BorderBrush" Value="{ThemeResource PropertiesExpanderHeaderDisabledBorderBrush}" />
-										<Setter Target="ExpandCollapseChevron.Foreground" Value="{ThemeResource PropertiesExpanderHeaderDisabledForeground}" />
-										<Setter Target="ToggleButtonGrid.Background" Value="{ThemeResource PropertiesExpanderHeaderBackground}" />
-									</VisualState.Setters>
-								</VisualState>
-								<VisualState x:Name="Checked">
-									<VisualState.Setters>
-										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource PropertiesExpanderHeaderForeground}" />
-										<Setter Target="ToggleButtonGrid.BorderBrush" Value="{ThemeResource PropertiesExpanderHeaderBorderBrush}" />
-										<Setter Target="ExpandCollapseChevron.Foreground" Value="{ThemeResource PropertiesExpanderChevronForeground}" />
-										<Setter Target="ToggleButtonGrid.Background" Value="{ThemeResource PropertiesExpanderHeaderBackground}" />
-										<Setter Target="ExpandCollapseChevron.(AnimatedIcon.State)" Value="NormalOff" />
-									</VisualState.Setters>
-								</VisualState>
-								<VisualState x:Name="CheckedPointerOver">
-									<VisualState.Setters>
-										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource PropertiesExpanderHeaderPointerOverForeground}" />
-										<Setter Target="ToggleButtonGrid.BorderBrush" Value="{ThemeResource PropertiesExpanderHeaderPointerOverBorderBrush}" />
-										<Setter Target="ExpandCollapseChevron.Foreground" Value="{ThemeResource PropertiesExpanderChevronPointerOverForeground}" />
-										<Setter Target="ToggleButtonGrid.Background" Value="{ThemeResource PropertiesExpanderHeaderPointerOverBackground}" />
-										<Setter Target="ExpandCollapseChevron.(AnimatedIcon.State)" Value="PointerOverOff" />
-									</VisualState.Setters>
-								</VisualState>
-								<VisualState x:Name="CheckedPressed">
-									<VisualState.Setters>
-										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource PropertiesExpanderHeaderPressedForeground}" />
-										<Setter Target="ToggleButtonGrid.BorderBrush" Value="{ThemeResource PropertiesExpanderHeaderPressedBorderBrush}" />
-										<Setter Target="ExpandCollapseChevron.Foreground" Value="{ThemeResource PropertiesExpanderChevronPressedForeground}" />
-										<Setter Target="ToggleButtonGrid.Background" Value="{ThemeResource PropertiesExpanderHeaderPressedBackground}" />
-										<Setter Target="ExpandCollapseChevron.(AnimatedIcon.State)" Value="PressedOff" />
-									</VisualState.Setters>
-								</VisualState>
-								<VisualState x:Name="CheckedDisabled">
-									<VisualState.Setters>
-										<Setter Target="ToggleButtonGrid.BorderBrush" Value="{ThemeResource PropertiesExpanderHeaderDisabledBorderBrush}" />
-										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource PropertiesExpanderHeaderDisabledForeground}" />
-										<Setter Target="ExpandCollapseChevron.Foreground" Value="{ThemeResource PropertiesExpanderHeaderDisabledForeground}" />
-										<Setter Target="ToggleButtonGrid.Background" Value="{ThemeResource PropertiesExpanderHeaderBackground}" />
-										<Setter Target="ExpandCollapseChevron.(AnimatedIcon.State)" Value="NormalOff" />
-									</VisualState.Setters>
-								</VisualState>
-								<VisualState x:Name="Indeterminate" />
-								<VisualState x:Name="IndeterminatePointerOver" />
-								<VisualState x:Name="IndeterminatePressed" />
-								<VisualState x:Name="IndeterminateDisabled" />
-							</VisualStateGroup>
-						</VisualStateManager.VisualStateGroups>
-					</Border>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-
-
-
-
 	<!--  PROPERTIES VIEW ITEM - TEXT  -->
 	<Style BasedOn="{StaticResource DefaultPropertiesViewItem_Text}" TargetType="fcontrols:PropertiesViewItemText" />
 
@@ -745,9 +241,6 @@
 		</Setter>
 	</Style>
 
-
-
-
 	<!--  PROPERTIES VIEW ITEM - RATING  -->
 	<Style BasedOn="{StaticResource DefaultPropertiesViewItem_Rating}" TargetType="fcontrols:PropertiesViewItemRating" />
 
@@ -862,9 +355,6 @@
 		</Setter>
 	</Style>
 
-
-
-
 	<!--  PROPERTIES VIEW ITEM - TEXT  -->
 	<Style BasedOn="{StaticResource DefaultPropertiesViewItem_Info}" TargetType="fcontrols:PropertiesViewItemInfo" />
 
@@ -1071,6 +561,4 @@
 		</Setter>
 	</Style>
 
-
-
 </ResourceDictionary>
diff --git a/src/Files.App.Controls/PropertiesView/PropertiesViewItem - Constants.cs b/src/Files.App.Controls/PropertiesView/PropertiesViewItem - Constants.cs
index 662f186591aa..c41c8109af5e 100644
--- a/src/Files.App.Controls/PropertiesView/PropertiesViewItem - Constants.cs	
+++ b/src/Files.App.Controls/PropertiesView/PropertiesViewItem - Constants.cs	
@@ -1,9 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-
-
+// Copyright (c) Files Community
+// SPDX-License-Identifier: MPL-2.0
 
 namespace Files.App.Controls.Primitives
 {
@@ -15,10 +11,6 @@ namespace Files.App.Controls.Primitives
 
 	[TemplateVisualState( Name = EnabledStateName , GroupName = EnabledStateGroupName )]
 	[TemplateVisualState( Name = DisabledStateName , GroupName = EnabledStateGroupName )]
-
-
-
-
 	public partial class PropertiesViewItem : Control
 	{
 		internal const string OrientationStateGroupName = "OrientationStateGroup";
diff --git a/src/Files.App.Controls/PropertiesView/PropertiesViewItem.Properties.cs b/src/Files.App.Controls/PropertiesView/PropertiesViewItem.Properties.cs
index 01ab55caa485..a5bd49a79b03 100644
--- a/src/Files.App.Controls/PropertiesView/PropertiesViewItem.Properties.cs
+++ b/src/Files.App.Controls/PropertiesView/PropertiesViewItem.Properties.cs
@@ -1,10 +1,10 @@
-using System;
+// Copyright (c) Files Community
+// SPDX-License-Identifier: MPL-2.0
+
+using System;
 using System.Collections.Generic;
 using System.Text;
 
-
-
-
 namespace Files.App.Controls.Primitives
 {
 	public partial class PropertiesViewItem : Control
diff --git a/src/Files.App.Controls/PropertiesView/PropertiesViewItem.cs b/src/Files.App.Controls/PropertiesView/PropertiesViewItem.cs
index 1a9720465a37..7a6bbe6659d3 100644
--- a/src/Files.App.Controls/PropertiesView/PropertiesViewItem.cs
+++ b/src/Files.App.Controls/PropertiesView/PropertiesViewItem.cs
@@ -1,10 +1,10 @@
-using System;
+// Copyright (c) Files Community
+// SPDX-License-Identifier: MPL-2.0
+
+using System;
 using System.Collections.Generic;
 using System.Text;
 
-
-
-
 namespace Files.App.Controls.Primitives
 {
 	public partial class PropertiesViewItem : Control
diff --git a/src/Files.App.Controls/PropertiesView/PropertiesViewItemInfo.cs b/src/Files.App.Controls/PropertiesView/PropertiesViewItemInfo.cs
index d1163929b74a..7516e437dc4e 100644
--- a/src/Files.App.Controls/PropertiesView/PropertiesViewItemInfo.cs
+++ b/src/Files.App.Controls/PropertiesView/PropertiesViewItemInfo.cs
@@ -1,3 +1,6 @@
+// Copyright (c) Files Community
+// SPDX-License-Identifier: MPL-2.0
+
 using Files.App.Controls.Primitives;
 using Microsoft.UI;
 using Microsoft.UI.Xaml;
@@ -11,9 +14,6 @@
 using System.Linq;
 using System.Runtime.InteropServices.WindowsRuntime;
 
-// To learn more about WinUI, the WinUI project structure,
-// and more about our project templates, see: http://aka.ms/winui-project-info.
-
 namespace Files.App.Controls
 {
 
diff --git a/src/Files.App.Controls/PropertiesView/PropertiesViewItemRating.cs b/src/Files.App.Controls/PropertiesView/PropertiesViewItemRating.cs
index 35b311c5fe80..d4fd48b48423 100644
--- a/src/Files.App.Controls/PropertiesView/PropertiesViewItemRating.cs
+++ b/src/Files.App.Controls/PropertiesView/PropertiesViewItemRating.cs
@@ -1,3 +1,6 @@
+// Copyright (c) Files Community
+// SPDX-License-Identifier: MPL-2.0
+
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Data;
@@ -10,9 +13,6 @@
 using System.Runtime.InteropServices.WindowsRuntime;
 using Files.App.Controls.Primitives;
 
-// To learn more about WinUI, the WinUI project structure,
-// and more about our project templates, see: http://aka.ms/winui-project-info.
-
 namespace Files.App.Controls
 {
 	#region Template Parts
diff --git a/src/Files.App.Controls/PropertiesView/PropertiesViewItemText.cs b/src/Files.App.Controls/PropertiesView/PropertiesViewItemText.cs
index 81e53ccdc8f2..706630b606c8 100644
--- a/src/Files.App.Controls/PropertiesView/PropertiesViewItemText.cs
+++ b/src/Files.App.Controls/PropertiesView/PropertiesViewItemText.cs
@@ -1,3 +1,6 @@
+// Copyright (c) Files Community
+// SPDX-License-Identifier: MPL-2.0
+
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Data;
@@ -10,9 +13,6 @@
 using System.Runtime.InteropServices.WindowsRuntime;
 using Files.App.Controls.Primitives;
 
-// To learn more about WinUI, the WinUI project structure,
-// and more about our project templates, see: http://aka.ms/winui-project-info.
-
 namespace Files.App.Controls
 {
 	public sealed partial class PropertiesViewItemText : PropertiesViewItem
diff --git a/src/Files.App.Controls/PropertiesView/PropertiesViewItemToggle.cs b/src/Files.App.Controls/PropertiesView/PropertiesViewItemToggle.cs
index 1d905b5ec772..68ea981c0559 100644
--- a/src/Files.App.Controls/PropertiesView/PropertiesViewItemToggle.cs
+++ b/src/Files.App.Controls/PropertiesView/PropertiesViewItemToggle.cs
@@ -1,3 +1,6 @@
+// Copyright (c) Files Community
+// SPDX-License-Identifier: MPL-2.0
+
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Data;
@@ -10,9 +13,6 @@
 using System.Runtime.InteropServices.WindowsRuntime;
 using Files.App.Controls.Primitives;
 
-// To learn more about WinUI, the WinUI project structure,
-// and more about our project templates, see: http://aka.ms/winui-project-info.
-
 namespace Files.App.Controls
 {
 	#region Template Parts
diff --git a/src/Files.App.Controls/PropertiesView/PropertiesViewSection.xaml b/src/Files.App.Controls/PropertiesView/PropertiesViewSection.xaml
new file mode 100644
index 000000000000..c8b1c64599f0
--- /dev/null
+++ b/src/Files.App.Controls/PropertiesView/PropertiesViewSection.xaml
@@ -0,0 +1,487 @@
+<ResourceDictionary
+	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	xmlns:animatedvisuals="using:Microsoft.UI.Xaml.Controls.AnimatedVisuals"
+	xmlns:local="using:Files.App.Controls">
+
+	<Style x:Key="PropertiesExpanderStyle" TargetType="Expander">
+		<Setter Property="IsTabStop" Value="False" />
+		<Setter Property="Background" Value="{ThemeResource PropertiesExpanderContentBackground}" />
+		<Setter Property="BackgroundSizing" Value="InnerBorderEdge" />
+		<Setter Property="MinWidth" Value="{ThemeResource FlyoutThemeMinWidth}" />
+		<Setter Property="MinHeight" Value="{StaticResource PropertiesExpanderMinHeight}" />
+		<Setter Property="BorderThickness" Value="{ThemeResource PropertiesExpanderContentDownBorderThickness}" />
+		<Setter Property="BorderBrush" Value="{ThemeResource PropertiesExpanderContentBorderBrush}" />
+		<Setter Property="Padding" Value="{StaticResource PropertiesExpanderContentPadding}" />
+		<Setter Property="HorizontalAlignment" Value="Stretch" />
+		<Setter Property="VerticalAlignment" Value="Center" />
+		<Setter Property="HorizontalContentAlignment" Value="Stretch" />
+		<Setter Property="VerticalContentAlignment" Value="Top" />
+		<Setter Property="CornerRadius" Value="0" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="Expander">
+					<Grid MinWidth="{TemplateBinding MinWidth}" MaxWidth="{TemplateBinding MaxWidth}">
+						<Grid.RowDefinitions>
+							<RowDefinition x:Name="Row0" Height="Auto" />
+							<RowDefinition x:Name="Row1" Height="*" />
+							<RowDefinition x:Name="Row2" Height="Auto" />
+						</Grid.RowDefinitions>
+						<ToggleButton
+							x:Name="ExpanderHeader"
+							MinHeight="{TemplateBinding MinHeight}"
+							Padding="{StaticResource PropertiesExpanderHeaderPadding}"
+							HorizontalAlignment="Stretch"
+							HorizontalContentAlignment="{StaticResource PropertiesExpanderHeaderHorizontalContentAlignment}"
+							VerticalContentAlignment="{StaticResource PropertiesExpanderHeaderVerticalContentAlignment}"
+							AutomationProperties.AutomationId="ExpanderToggleButton"
+							Background="{ThemeResource PropertiesExpanderHeaderBackground}"
+							BackgroundSizing="{TemplateBinding BackgroundSizing}"
+							BorderBrush="{ThemeResource PropertiesExpanderHeaderBorderBrush}"
+							BorderThickness="0"
+							Content="{TemplateBinding Header}"
+							ContentTemplate="{TemplateBinding HeaderTemplate}"
+							ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}"
+							CornerRadius="{TemplateBinding CornerRadius}"
+							IsChecked="{Binding Path=IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
+							IsEnabled="{TemplateBinding IsEnabled}"
+							Style="{StaticResource PropertiesExpanderHeaderDownStyle}" />
+						<!--  The clip is a composition clip applied in code  -->
+						<Border x:Name="ExpanderContentClip" Grid.Row="1">
+							<Border
+								x:Name="ExpanderContent"
+								MinHeight="{TemplateBinding MinHeight}"
+								Padding="{TemplateBinding Padding}"
+								HorizontalAlignment="Stretch"
+								VerticalAlignment="Stretch"
+								Background="{TemplateBinding Background}"
+								BackgroundSizing="{TemplateBinding BackgroundSizing}"
+								BorderBrush="{TemplateBinding BorderBrush}"
+								BorderThickness="{StaticResource PropertiesExpanderContentDownBorderThickness}"
+								CornerRadius="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomCornerRadiusFilterConverter}}"
+								Visibility="Collapsed">
+								<ContentPresenter
+									HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+									VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+									Content="{TemplateBinding Content}"
+									ContentTemplate="{TemplateBinding ContentTemplate}"
+									ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
+								<Border.RenderTransform>
+									<CompositeTransform />
+								</Border.RenderTransform>
+							</Border>
+						</Border>
+						<Rectangle
+							x:Name="ExpanderSeparator"
+							Grid.Row="2"
+							Height="{StaticResource PropertiesExpanderSeparatorHeight}"
+							Fill="{ThemeResource PropertiesExpanderSeparatorFillColor}" />
+						<VisualStateManager.VisualStateGroups>
+							<VisualStateGroup x:Name="ExpandStates">
+								<VisualState x:Name="ExpandUp">
+									<VisualState.Setters>
+										<Setter Target="ExpanderHeader.CornerRadius" Value="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomCornerRadiusFilterConverter}}" />
+										<Setter Target="ExpanderContent.Visibility" Value="Visible" />
+									</VisualState.Setters>
+									<VisualState.Storyboard>
+										<Storyboard>
+											<DoubleAnimationUsingKeyFrames Storyboard.TargetName="ExpanderContent" Storyboard.TargetProperty="(UIElement.RenderTransform).(CompositeTransform.TranslateY)">
+												<DiscreteDoubleKeyFrame KeyTime="0" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ContentHeight}" />
+												<SplineDoubleKeyFrame
+													KeySpline="0.0, 0.0, 0.0, 1.0"
+													KeyTime="0:0:0.333"
+													Value="0" />
+											</DoubleAnimationUsingKeyFrames>
+										</Storyboard>
+									</VisualState.Storyboard>
+								</VisualState>
+								<VisualState x:Name="CollapseDown">
+									<VisualState.Storyboard>
+										<Storyboard>
+											<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ExpanderContent" Storyboard.TargetProperty="Visibility">
+												<DiscreteObjectKeyFrame KeyTime="0:0:0.2" Value="Collapsed" />
+											</ObjectAnimationUsingKeyFrames>
+											<DoubleAnimationUsingKeyFrames Storyboard.TargetName="ExpanderContent" Storyboard.TargetProperty="(UIElement.RenderTransform).(CompositeTransform.TranslateY)">
+												<DiscreteDoubleKeyFrame KeyTime="0" Value="0" />
+												<SplineDoubleKeyFrame
+													KeySpline="1.0, 1.0, 0.0, 1.0"
+													KeyTime="0:0:0.167"
+													Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ContentHeight}" />
+											</DoubleAnimationUsingKeyFrames>
+										</Storyboard>
+									</VisualState.Storyboard>
+								</VisualState>
+								<VisualState x:Name="ExpandDown">
+									<VisualState.Setters>
+										<Setter Target="ExpanderHeader.CornerRadius" Value="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TopCornerRadiusFilterConverter}}" />
+										<Setter Target="ExpanderContent.Visibility" Value="Visible" />
+									</VisualState.Setters>
+									<VisualState.Storyboard>
+										<Storyboard>
+											<DoubleAnimationUsingKeyFrames Storyboard.TargetName="ExpanderContent" Storyboard.TargetProperty="(UIElement.RenderTransform).(CompositeTransform.TranslateY)">
+												<DiscreteDoubleKeyFrame KeyTime="0" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.NegativeContentHeight}" />
+												<SplineDoubleKeyFrame
+													KeySpline="0.0, 0.0, 0.0, 1.0"
+													KeyTime="0:0:0.333"
+													Value="0" />
+											</DoubleAnimationUsingKeyFrames>
+										</Storyboard>
+									</VisualState.Storyboard>
+								</VisualState>
+								<VisualState x:Name="CollapseUp">
+									<VisualState.Storyboard>
+										<Storyboard>
+											<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ExpanderContent" Storyboard.TargetProperty="Visibility">
+												<DiscreteObjectKeyFrame KeyTime="0:0:0.167" Value="Collapsed" />
+											</ObjectAnimationUsingKeyFrames>
+											<DoubleAnimationUsingKeyFrames Storyboard.TargetName="ExpanderContent" Storyboard.TargetProperty="(UIElement.RenderTransform).(CompositeTransform.TranslateY)">
+												<DiscreteDoubleKeyFrame KeyTime="0" Value="0" />
+												<SplineDoubleKeyFrame
+													KeySpline="1.0, 1.0, 0.0, 1.0"
+													KeyTime="0:0:0.167"
+													Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.NegativeContentHeight}" />
+											</DoubleAnimationUsingKeyFrames>
+										</Storyboard>
+									</VisualState.Storyboard>
+								</VisualState>
+							</VisualStateGroup>
+							<VisualStateGroup x:Name="ExpandDirectionStates">
+								<VisualState x:Name="Down" />
+								<VisualState x:Name="Up">
+									<VisualState.Setters>
+										<Setter Target="ExpanderHeader.Style" Value="{StaticResource PropertiesExpanderHeaderUpStyle}" />
+										<Setter Target="ExpanderContent.BorderThickness" Value="{StaticResource PropertiesExpanderContentUpBorderThickness}" />
+										<Setter Target="ExpanderContent.CornerRadius" Value="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TopCornerRadiusFilterConverter}}" />
+										<Setter Target="ExpanderHeader.(Grid.Row)" Value="2" />
+										<Setter Target="ExpanderContentClip.(Grid.Row)" Value="1" />
+										<Setter Target="ExpanderSeparator.(Grid.Row)" Value="0" />
+										<Setter Target="Row0.Height" Value="Auto" />
+										<Setter Target="Row1.Height" Value="*" />
+										<Setter Target="Row2.Height" Value="Auto" />
+									</VisualState.Setters>
+								</VisualState>
+							</VisualStateGroup>
+						</VisualStateManager.VisualStateGroups>
+					</Grid>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+
+	<Style x:Key="PropertiesExpanderHeaderDownStyle" TargetType="ToggleButton">
+		<Setter Property="Padding" Value="{ThemeResource PropertiesExpanderHeaderPadding}" />
+		<Setter Property="Background" Value="{ThemeResource PropertiesExpanderHeaderBackground}" />
+		<Setter Property="BorderThickness" Value="0" />
+		<Setter Property="HorizontalContentAlignment" Value="Left" />
+		<Setter Property="BackgroundSizing" Value="InnerBorderEdge" />
+		<Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="ToggleButton">
+					<Border
+						x:Name="ToggleButtonBase"
+						Width="{TemplateBinding Width}"
+						MinWidth="{TemplateBinding MinWidth}"
+						MinHeight="{TemplateBinding MinHeight}"
+						MaxWidth="{TemplateBinding MaxWidth}"
+						Padding="{TemplateBinding Padding}"
+						HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+						Background="{TemplateBinding Background}"
+						BackgroundSizing="{TemplateBinding BackgroundSizing}"
+						BorderBrush="{TemplateBinding BorderBrush}"
+						BorderThickness="{TemplateBinding BorderThickness}"
+						CornerRadius="{TemplateBinding CornerRadius}">
+						<Grid
+							x:Name="ToggleButtonGrid"
+							Padding="{StaticResource PropertiesExpanderHeaderInnerPadding}"
+							Background="{ThemeResource PropertiesExpanderHeaderBackground}"
+							BorderBrush="{ThemeResource PropertiesExpanderHeaderBorderBrush}"
+							BorderThickness="{ThemeResource PropertiesExpanderHeaderBorderThickness}"
+							CornerRadius="{ThemeResource ControlCornerRadius}">
+							<Grid.ColumnDefinitions>
+								<ColumnDefinition Width="Auto" />
+								<ColumnDefinition Width="*" />
+							</Grid.ColumnDefinitions>
+							<ContentPresenter
+								x:Name="ContentPresenter"
+								Grid.Column="1"
+								HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+								VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+								Content="{TemplateBinding Content}"
+								ContentTemplate="{TemplateBinding ContentTemplate}"
+								ContentTransitions="{TemplateBinding ContentTransitions}"
+								Foreground="{TemplateBinding Foreground}" />
+
+							<Border
+								x:Name="ExpandCollapseChevronBorder"
+								Grid.Column="0"
+								Width="{ThemeResource PropertiesExpanderChevronSpaceWidth}"
+								Height="{ThemeResource PropertiesExpanderChevronSpaceHeight}"
+								Margin="{ThemeResource PropertiesExpanderChevronMargin}">
+								<AnimatedIcon
+									xmlns:local="using:Microsoft.UI.Xaml.Controls"
+									x:Name="ExpandCollapseChevron"
+									Width="{StaticResource PropertiesExpanderChevronGlyphSize}"
+									Height="{StaticResource PropertiesExpanderChevronGlyphSize}"
+									HorizontalAlignment="Center"
+									VerticalAlignment="Center"
+									local:AnimatedIcon.State="NormalOff"
+									AutomationProperties.AccessibilityView="Raw"
+									Foreground="{ThemeResource PropertiesExpanderChevronForeground}"
+									RenderTransformOrigin="0.5, 0.5">
+									<animatedvisuals:AnimatedChevronUpDownSmallVisualSource />
+									<AnimatedIcon.FallbackIconSource>
+										<FontIconSource
+											FontFamily="{StaticResource SymbolThemeFontFamily}"
+											FontSize="12"
+											Glyph="{StaticResource PropertiesExpanderChevronDownGlyph}"
+											IsTextScaleFactorEnabled="False" />
+									</AnimatedIcon.FallbackIconSource>
+									<AnimatedIcon.RenderTransform />
+								</AnimatedIcon>
+							</Border>
+
+						</Grid>
+						<VisualStateManager.VisualStateGroups>
+							<VisualStateGroup x:Name="CommonStates">
+								<VisualState x:Name="Normal">
+									<VisualState.Setters>
+										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource PropertiesExpanderHeaderForeground}" />
+										<Setter Target="ToggleButtonGrid.BorderBrush" Value="{ThemeResource PropertiesExpanderHeaderBorderBrush}" />
+										<Setter Target="ExpandCollapseChevron.Foreground" Value="{ThemeResource PropertiesExpanderChevronForeground}" />
+										<Setter Target="ToggleButtonGrid.Background" Value="{ThemeResource PropertiesExpanderHeaderBackground}" />
+									</VisualState.Setters>
+								</VisualState>
+								<VisualState x:Name="PointerOver">
+									<VisualState.Setters>
+										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource PropertiesExpanderHeaderPointerOverForeground}" />
+										<Setter Target="ToggleButtonGrid.BorderBrush" Value="{ThemeResource PropertiesExpanderHeaderPointerOverBorderBrush}" />
+										<Setter Target="ToggleButtonGrid.Background" Value="{ThemeResource PropertiesExpanderHeaderPointerOverBackground}" />
+										<Setter Target="ExpandCollapseChevron.(AnimatedIcon.State)" Value="PointerOverOff" />
+									</VisualState.Setters>
+								</VisualState>
+								<VisualState x:Name="Pressed">
+									<VisualState.Setters>
+										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource PropertiesExpanderHeaderPressedForeground}" />
+										<Setter Target="ToggleButtonGrid.BorderBrush" Value="{ThemeResource PropertiesExpanderHeaderPressedBorderBrush}" />
+										<Setter Target="ExpandCollapseChevron.Foreground" Value="{ThemeResource PropertiesExpanderChevronPressedForeground}" />
+										<Setter Target="ToggleButtonGrid.Background" Value="{ThemeResource PropertiesExpanderHeaderPressedBackground}" />
+										<Setter Target="ExpandCollapseChevron.(AnimatedIcon.State)" Value="PressedOff" />
+									</VisualState.Setters>
+								</VisualState>
+								<VisualState x:Name="Disabled">
+									<VisualState.Setters>
+										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource PropertiesExpanderHeaderDisabledForeground}" />
+										<Setter Target="ToggleButtonGrid.BorderBrush" Value="{ThemeResource PropertiesExpanderHeaderDisabledBorderBrush}" />
+										<Setter Target="ExpandCollapseChevron.Foreground" Value="{ThemeResource PropertiesExpanderHeaderDisabledForeground}" />
+										<Setter Target="ToggleButtonGrid.Background" Value="{ThemeResource PropertiesExpanderHeaderBackground}" />
+									</VisualState.Setters>
+								</VisualState>
+								<VisualState x:Name="Checked">
+									<VisualState.Setters>
+										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource PropertiesExpanderHeaderForeground}" />
+										<Setter Target="ToggleButtonGrid.BorderBrush" Value="{ThemeResource PropertiesExpanderHeaderBorderBrush}" />
+										<Setter Target="ExpandCollapseChevron.Foreground" Value="{ThemeResource PropertiesExpanderChevronForeground}" />
+										<Setter Target="ToggleButtonGrid.Background" Value="{ThemeResource PropertiesExpanderHeaderBackground}" />
+										<Setter Target="ExpandCollapseChevron.(AnimatedIcon.State)" Value="NormalOn" />
+									</VisualState.Setters>
+								</VisualState>
+								<VisualState x:Name="CheckedPointerOver">
+									<VisualState.Setters>
+										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource PropertiesExpanderHeaderPointerOverForeground}" />
+										<Setter Target="ToggleButtonGrid.BorderBrush" Value="{ThemeResource PropertiesExpanderHeaderPointerOverBorderBrush}" />
+										<Setter Target="ExpandCollapseChevron.Foreground" Value="{ThemeResource PropertiesExpanderChevronPointerOverForeground}" />
+										<Setter Target="ToggleButtonGrid.Background" Value="{ThemeResource PropertiesExpanderHeaderPointerOverBackground}" />
+										<Setter Target="ExpandCollapseChevron.(AnimatedIcon.State)" Value="PointerOverOn" />
+									</VisualState.Setters>
+								</VisualState>
+								<VisualState x:Name="CheckedPressed">
+									<VisualState.Setters>
+										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource PropertiesExpanderHeaderPressedForeground}" />
+										<Setter Target="ToggleButtonGrid.BorderBrush" Value="{ThemeResource PropertiesExpanderHeaderPressedBorderBrush}" />
+										<Setter Target="ExpandCollapseChevron.Foreground" Value="{ThemeResource PropertiesExpanderChevronPressedForeground}" />
+										<Setter Target="ToggleButtonGrid.Background" Value="{ThemeResource PropertiesExpanderHeaderPressedBackground}" />
+										<Setter Target="ExpandCollapseChevron.(AnimatedIcon.State)" Value="PressedOn" />
+									</VisualState.Setters>
+								</VisualState>
+								<VisualState x:Name="CheckedDisabled">
+									<VisualState.Setters>
+										<Setter Target="ToggleButtonGrid.BorderBrush" Value="{ThemeResource PropertiesExpanderHeaderDisabledBorderBrush}" />
+										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource PropertiesExpanderHeaderDisabledForeground}" />
+										<Setter Target="ExpandCollapseChevron.Foreground" Value="{ThemeResource PropertiesExpanderHeaderDisabledForeground}" />
+										<Setter Target="ToggleButtonGrid.Background" Value="{ThemeResource PropertiesExpanderHeaderBackground}" />
+										<Setter Target="ExpandCollapseChevron.(AnimatedIcon.State)" Value="NormalOn" />
+									</VisualState.Setters>
+								</VisualState>
+								<VisualState x:Name="Indeterminate" />
+								<VisualState x:Name="IndeterminatePointerOver" />
+								<VisualState x:Name="IndeterminatePressed" />
+								<VisualState x:Name="IndeterminateDisabled" />
+							</VisualStateGroup>
+						</VisualStateManager.VisualStateGroups>
+					</Border>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+
+	<Style
+		x:Key="PropertiesExpanderHeaderUpStyle"
+		BasedOn="{StaticResource PropertiesExpanderHeaderDownStyle}"
+		TargetType="ToggleButton">
+		<Setter Property="Padding" Value="{ThemeResource PropertiesExpanderHeaderPadding}" />
+		<Setter Property="Background" Value="{ThemeResource PropertiesExpanderHeaderBackground}" />
+		<Setter Property="BorderThickness" Value="0" />
+		<Setter Property="HorizontalContentAlignment" Value="Left" />
+		<Setter Property="BackgroundSizing" Value="InnerBorderEdge" />
+		<Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="ToggleButton">
+					<Border
+						x:Name="ToggleButtonBase"
+						Width="{TemplateBinding Width}"
+						MinWidth="{TemplateBinding MinWidth}"
+						MinHeight="{TemplateBinding MinHeight}"
+						MaxWidth="{TemplateBinding MaxWidth}"
+						Padding="{TemplateBinding Padding}"
+						HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+						Background="{TemplateBinding Background}"
+						BackgroundSizing="{TemplateBinding BackgroundSizing}"
+						BorderBrush="{TemplateBinding BorderBrush}"
+						BorderThickness="{TemplateBinding BorderThickness}"
+						CornerRadius="{TemplateBinding CornerRadius}">
+						<Grid
+							x:Name="ToggleButtonGrid"
+							Padding="{StaticResource PropertiesExpanderHeaderInnerPadding}"
+							Background="{ThemeResource PropertiesExpanderHeaderBackground}"
+							BorderBrush="{ThemeResource PropertiesExpanderHeaderBorderBrush}"
+							BorderThickness="{ThemeResource PropertiesExpanderHeaderBorderThickness}"
+							CornerRadius="{ThemeResource ControlCornerRadius}">
+							<Grid.ColumnDefinitions>
+								<ColumnDefinition Width="Auto" />
+								<ColumnDefinition Width="*" />
+							</Grid.ColumnDefinitions>
+							<ContentPresenter
+								x:Name="ContentPresenter"
+								Grid.Column="1"
+								HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+								VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+								Content="{TemplateBinding Content}"
+								ContentTemplate="{TemplateBinding ContentTemplate}"
+								ContentTransitions="{TemplateBinding ContentTransitions}"
+								Foreground="{TemplateBinding Foreground}" />
+							<Border
+								x:Name="ExpandCollapseChevronBorder"
+								Grid.Column="0"
+								Width="{ThemeResource PropertiesExpanderChevronSpaceWidth}"
+								Height="{ThemeResource PropertiesExpanderChevronSpaceHeight}"
+								Margin="{ThemeResource PropertiesExpanderChevronMargin}">
+								<AnimatedIcon
+									xmlns:local="using:Microsoft.UI.Xaml.Controls"
+									x:Name="ExpandCollapseChevron"
+									Width="{StaticResource PropertiesExpanderChevronGlyphSize}"
+									Height="{StaticResource PropertiesExpanderChevronGlyphSize}"
+									HorizontalAlignment="Center"
+									VerticalAlignment="Center"
+									local:AnimatedIcon.State="NormalOn"
+									AutomationProperties.AccessibilityView="Raw"
+									Foreground="{ThemeResource PropertiesExpanderChevronForeground}"
+									RenderTransformOrigin="0.5, 0.5">
+									<animatedvisuals:AnimatedChevronUpDownSmallVisualSource />
+									<AnimatedIcon.FallbackIconSource>
+										<FontIconSource
+											FontFamily="{StaticResource SymbolThemeFontFamily}"
+											FontSize="12"
+											Glyph="{StaticResource PropertiesExpanderChevronUpGlyph}"
+											IsTextScaleFactorEnabled="False" />
+									</AnimatedIcon.FallbackIconSource>
+									<AnimatedIcon.RenderTransform />
+								</AnimatedIcon>
+							</Border>
+
+						</Grid>
+						<VisualStateManager.VisualStateGroups>
+							<VisualStateGroup x:Name="CommonStates">
+								<VisualState x:Name="Normal">
+									<VisualState.Setters>
+										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource PropertiesExpanderHeaderForeground}" />
+										<Setter Target="ToggleButtonGrid.BorderBrush" Value="{ThemeResource PropertiesExpanderHeaderBorderBrush}" />
+										<Setter Target="ExpandCollapseChevron.Foreground" Value="{ThemeResource PropertiesExpanderChevronForeground}" />
+										<Setter Target="ToggleButtonGrid.Background" Value="{ThemeResource PropertiesExpanderHeaderBackground}" />
+									</VisualState.Setters>
+								</VisualState>
+								<VisualState x:Name="PointerOver">
+									<VisualState.Setters>
+										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource PropertiesExpanderHeaderPointerOverForeground}" />
+										<Setter Target="ToggleButtonGrid.BorderBrush" Value="{ThemeResource PropertiesExpanderHeaderPointerOverBorderBrush}" />
+										<Setter Target="ToggleButtonGrid.Background" Value="{ThemeResource PropertiesExpanderHeaderPointerOverBackground}" />
+										<Setter Target="ExpandCollapseChevron.(AnimatedIcon.State)" Value="PointerOverOn" />
+									</VisualState.Setters>
+								</VisualState>
+								<VisualState x:Name="Pressed">
+									<VisualState.Setters>
+										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource PropertiesExpanderHeaderPressedForeground}" />
+										<Setter Target="ToggleButtonGrid.BorderBrush" Value="{ThemeResource PropertiesExpanderHeaderPressedBorderBrush}" />
+										<Setter Target="ExpandCollapseChevron.Foreground" Value="{ThemeResource PropertiesExpanderChevronPressedForeground}" />
+										<Setter Target="ToggleButtonGrid.Background" Value="{ThemeResource PropertiesExpanderHeaderPressedBackground}" />
+										<Setter Target="ExpandCollapseChevron.(AnimatedIcon.State)" Value="PressedOn" />
+									</VisualState.Setters>
+								</VisualState>
+								<VisualState x:Name="Disabled">
+									<VisualState.Setters>
+										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource PropertiesExpanderHeaderDisabledForeground}" />
+										<Setter Target="ToggleButtonGrid.BorderBrush" Value="{ThemeResource PropertiesExpanderHeaderDisabledBorderBrush}" />
+										<Setter Target="ExpandCollapseChevron.Foreground" Value="{ThemeResource PropertiesExpanderHeaderDisabledForeground}" />
+										<Setter Target="ToggleButtonGrid.Background" Value="{ThemeResource PropertiesExpanderHeaderBackground}" />
+									</VisualState.Setters>
+								</VisualState>
+								<VisualState x:Name="Checked">
+									<VisualState.Setters>
+										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource PropertiesExpanderHeaderForeground}" />
+										<Setter Target="ToggleButtonGrid.BorderBrush" Value="{ThemeResource PropertiesExpanderHeaderBorderBrush}" />
+										<Setter Target="ExpandCollapseChevron.Foreground" Value="{ThemeResource PropertiesExpanderChevronForeground}" />
+										<Setter Target="ToggleButtonGrid.Background" Value="{ThemeResource PropertiesExpanderHeaderBackground}" />
+										<Setter Target="ExpandCollapseChevron.(AnimatedIcon.State)" Value="NormalOff" />
+									</VisualState.Setters>
+								</VisualState>
+								<VisualState x:Name="CheckedPointerOver">
+									<VisualState.Setters>
+										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource PropertiesExpanderHeaderPointerOverForeground}" />
+										<Setter Target="ToggleButtonGrid.BorderBrush" Value="{ThemeResource PropertiesExpanderHeaderPointerOverBorderBrush}" />
+										<Setter Target="ExpandCollapseChevron.Foreground" Value="{ThemeResource PropertiesExpanderChevronPointerOverForeground}" />
+										<Setter Target="ToggleButtonGrid.Background" Value="{ThemeResource PropertiesExpanderHeaderPointerOverBackground}" />
+										<Setter Target="ExpandCollapseChevron.(AnimatedIcon.State)" Value="PointerOverOff" />
+									</VisualState.Setters>
+								</VisualState>
+								<VisualState x:Name="CheckedPressed">
+									<VisualState.Setters>
+										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource PropertiesExpanderHeaderPressedForeground}" />
+										<Setter Target="ToggleButtonGrid.BorderBrush" Value="{ThemeResource PropertiesExpanderHeaderPressedBorderBrush}" />
+										<Setter Target="ExpandCollapseChevron.Foreground" Value="{ThemeResource PropertiesExpanderChevronPressedForeground}" />
+										<Setter Target="ToggleButtonGrid.Background" Value="{ThemeResource PropertiesExpanderHeaderPressedBackground}" />
+										<Setter Target="ExpandCollapseChevron.(AnimatedIcon.State)" Value="PressedOff" />
+									</VisualState.Setters>
+								</VisualState>
+								<VisualState x:Name="CheckedDisabled">
+									<VisualState.Setters>
+										<Setter Target="ToggleButtonGrid.BorderBrush" Value="{ThemeResource PropertiesExpanderHeaderDisabledBorderBrush}" />
+										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource PropertiesExpanderHeaderDisabledForeground}" />
+										<Setter Target="ExpandCollapseChevron.Foreground" Value="{ThemeResource PropertiesExpanderHeaderDisabledForeground}" />
+										<Setter Target="ToggleButtonGrid.Background" Value="{ThemeResource PropertiesExpanderHeaderBackground}" />
+										<Setter Target="ExpandCollapseChevron.(AnimatedIcon.State)" Value="NormalOff" />
+									</VisualState.Setters>
+								</VisualState>
+								<VisualState x:Name="Indeterminate" />
+								<VisualState x:Name="IndeterminatePointerOver" />
+								<VisualState x:Name="IndeterminatePressed" />
+								<VisualState x:Name="IndeterminateDisabled" />
+							</VisualStateGroup>
+						</VisualStateManager.VisualStateGroups>
+					</Border>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+
+</ResourceDictionary>
diff --git a/src/Files.App.Controls/Themes/Generic.xaml b/src/Files.App.Controls/Themes/Generic.xaml
index 0952b8084262..3004cf59b115 100644
--- a/src/Files.App.Controls/Themes/Generic.xaml
+++ b/src/Files.App.Controls/Themes/Generic.xaml
@@ -78,6 +78,7 @@
 		<!--#region Dialog Resources-->
 		<ResourceDictionary Source="ms-appx:///Files.App.Controls/PropertiesView/PropertiesView.xaml" />
 		<ResourceDictionary Source="ms-appx:///Files.App.Controls/PropertiesView/PropertiesView.ThemeResources.xaml" />
+		<ResourceDictionary Source="ms-appx:///Files.App.Controls/PropertiesView/PropertiesViewSection.xaml" />
 		<!--#endregion-->
 
 	</ResourceDictionary.MergedDictionaries>
diff --git a/tests/Files.App.UITests/Dialogs/Properties/PropertiesDialog.xaml b/tests/Files.App.UITests/Dialogs/PropertiesDialog.xaml
similarity index 100%
rename from tests/Files.App.UITests/Dialogs/Properties/PropertiesDialog.xaml
rename to tests/Files.App.UITests/Dialogs/PropertiesDialog.xaml
diff --git a/tests/Files.App.UITests/Dialogs/Properties/PropertiesDialog.xaml.cs b/tests/Files.App.UITests/Dialogs/PropertiesDialog.xaml.cs
similarity index 93%
rename from tests/Files.App.UITests/Dialogs/Properties/PropertiesDialog.xaml.cs
rename to tests/Files.App.UITests/Dialogs/PropertiesDialog.xaml.cs
index ab37f225042d..39f418e42224 100644
--- a/tests/Files.App.UITests/Dialogs/Properties/PropertiesDialog.xaml.cs
+++ b/tests/Files.App.UITests/Dialogs/PropertiesDialog.xaml.cs
@@ -3,7 +3,6 @@
 
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Windowing;
-using Files.App.UITests.Dialogs.Properties.Views;
 
 namespace Files.App.UITests.Dialogs
 {
diff --git a/tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml b/tests/Files.App.UITests/Dialogs/PropertiesGeneralPage.xaml
similarity index 98%
rename from tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml
rename to tests/Files.App.UITests/Dialogs/PropertiesGeneralPage.xaml
index eb826541c527..6f94931b6d4c 100644
--- a/tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml
+++ b/tests/Files.App.UITests/Dialogs/PropertiesGeneralPage.xaml
@@ -1,12 +1,12 @@
 <!--  Copyright (c) Files Community. SPDX-License-Identifier: MPL-2.0  -->
 <Page
-	x:Class="Files.App.UITests.Dialogs.Properties.Views.PropertiesGeneralPage"
+	x:Class="Files.App.UITests.Dialogs.PropertiesGeneralPage"
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 	xmlns:animatedvisuals="using:Microsoft.UI.Xaml.Controls.AnimatedVisuals"
 	xmlns:controls="using:Files.App.Controls"
 	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-	xmlns:local="using:Files.App.UITests.Dialogs.Properties.Views"
+	xmlns:local="using:Files.App.UITests.Dialogs"
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 	mc:Ignorable="d">
 
diff --git a/tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml.cs b/tests/Files.App.UITests/Dialogs/PropertiesGeneralPage.xaml.cs
similarity index 81%
rename from tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml.cs
rename to tests/Files.App.UITests/Dialogs/PropertiesGeneralPage.xaml.cs
index 44df40f9c38c..a1cb5b1d296b 100644
--- a/tests/Files.App.UITests/Dialogs/Properties/Views/PropertiesGeneralPage.xaml.cs
+++ b/tests/Files.App.UITests/Dialogs/PropertiesGeneralPage.xaml.cs
@@ -3,7 +3,7 @@
 
 using Microsoft.UI.Xaml.Controls;
 
-namespace Files.App.UITests.Dialogs.Properties.Views
+namespace Files.App.UITests.Dialogs
 {
 	public sealed partial class PropertiesGeneralPage : Page
 	{
diff --git a/tests/Files.App.UITests/Files.App.UITests.csproj b/tests/Files.App.UITests/Files.App.UITests.csproj
index 179b4d33fc5f..dbdc7bc326db 100644
--- a/tests/Files.App.UITests/Files.App.UITests.csproj
+++ b/tests/Files.App.UITests/Files.App.UITests.csproj
@@ -22,10 +22,6 @@
     <Content Include="Data\**\*.png" />
   </ItemGroup>
 
-  <ItemGroup>
-    <None Remove="Views\DialogWindowsPage.xaml" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\..\src\Files.App.Controls\Files.App.Controls.csproj" />
     <PackageReference Include="Microsoft.Windows.SDK.BuildTools" />
@@ -36,16 +32,6 @@
   <ItemGroup Condition="'$(DisableMsixProjectCapabilityAddedByProject)'!='true' and '$(EnableMsixTooling)'=='true'">
     <ProjectCapability Include="Msix" />
   </ItemGroup>
-  <ItemGroup>
-    <Page Update="Views\DialogWindowsPage.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-  </ItemGroup>
-  <ItemGroup>
-    <Page Update="Dialogs\Properties\PropertiesDialog.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-  </ItemGroup>
   <!--  Allows the Solution Explorer "Package and Publish" context menu entry to be enabled for this project even if the Windows App SDK Nuget package has not yet been restored.  -->
   <PropertyGroup Condition="'$(DisableHasPackageAndPublishMenuAddedByProject)'!='true' and '$(EnableMsixTooling)'=='true'">
     <HasPackageAndPublishMenu>true</HasPackageAndPublishMenu>
diff --git a/tests/Files.App.UITests/MainWindow.xaml b/tests/Files.App.UITests/MainWindow.xaml
index 09912f0d5853..67824c3ced67 100644
--- a/tests/Files.App.UITests/MainWindow.xaml
+++ b/tests/Files.App.UITests/MainWindow.xaml
@@ -94,7 +94,7 @@
 						<NavigationViewItem Content="StorageRing/StorageBar" Tag="StorageControlsPage" />
 						<NavigationViewItem Content="Omnibar" Tag="OmnibarPage" />
 						<NavigationViewItem Content="BreadcrumbBar" Tag="BreadcrumbBarPage" />
-						<NavigationViewItem Content="DialogWindows" Tag="DialogWindowsPage" />
+						<NavigationViewItem Content="PropertiesView" Tag="PropertiesViewPage" />
 					</NavigationViewItem.MenuItems>
 				</NavigationViewItem>
 			</NavigationView.MenuItems>
diff --git a/tests/Files.App.UITests/MainWindow.xaml.cs b/tests/Files.App.UITests/MainWindow.xaml.cs
index 8f6deff331ae..3065289ce7d4 100644
--- a/tests/Files.App.UITests/MainWindow.xaml.cs
+++ b/tests/Files.App.UITests/MainWindow.xaml.cs
@@ -55,7 +55,7 @@ private void NavigationView_SelectionChanged(NavigationView sender, NavigationVi
 					nameof(SidebarViewPage) => typeof(SidebarViewPage),
 					nameof(OmnibarPage) => typeof(OmnibarPage),
 					nameof(BreadcrumbBarPage) => typeof(BreadcrumbBarPage),
-					nameof( DialogWindowsPage ) => typeof( DialogWindowsPage ),
+					nameof(PropertiesViewPage) => typeof(PropertiesViewPage),
 					_ => throw new InvalidOperationException("There's no applicable page associated with the given key."),
 				});
 
diff --git a/tests/Files.App.UITests/Views/DialogWindowsPage.xaml.cs b/tests/Files.App.UITests/Views/DialogWindowsPage.xaml.cs
deleted file mode 100644
index f91b652abd3b..000000000000
--- a/tests/Files.App.UITests/Views/DialogWindowsPage.xaml.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
-using Files.App.UITests.Dialogs;
-using Microsoft.UI.Xaml.Controls.Primitives;
-using Microsoft.UI.Xaml.Data;
-using Microsoft.UI.Xaml.Input;
-using Microsoft.UI.Xaml.Media;
-using Microsoft.UI.Xaml.Navigation;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
-using Microsoft.UI.Windowing;
-
-// To learn more about WinUI, the WinUI project structure,
-// and more about our project templates, see: http://aka.ms/winui-project-info.
-
-namespace Files.App.UITests.Views
-{
-
-    /// <summary>
-    /// An empty page that can be used on its own or navigated to within a Frame.
-    /// </summary>
-    public sealed partial class DialogWindowsPage : Page
-    {
-
-
-        public DialogWindowsPage()
-        {
-            InitializeComponent();
-        }
-
-        private void BtnProperties_Click(object sender , RoutedEventArgs e)
-        {
-            PropertiesDialog propWindow = new PropertiesDialog();
-;
-            if ( propWindow != null )
-            {
-                propWindow.Title = "Properties";
-                propWindow.Activate();
-            }
-        }
-    }
-}
diff --git a/tests/Files.App.UITests/Views/DialogWindowsPage.xaml b/tests/Files.App.UITests/Views/PropertiesViewPage.xaml
similarity index 54%
rename from tests/Files.App.UITests/Views/DialogWindowsPage.xaml
rename to tests/Files.App.UITests/Views/PropertiesViewPage.xaml
index 98134e2cf6bd..1ed47eb7a95e 100644
--- a/tests/Files.App.UITests/Views/DialogWindowsPage.xaml
+++ b/tests/Files.App.UITests/Views/PropertiesViewPage.xaml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<!--  Copyright (c) Files Community. SPDX-License-Identifier: MPL-2.0  -->
 <Page
-	x:Class="Files.App.UITests.Views.DialogWindowsPage"
+	x:Class="Files.App.UITests.Views.PropertiesViewPage"
 	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"
@@ -8,12 +8,13 @@
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 	mc:Ignorable="d">
 
-	<StackPanel Margin="0,24,0,24" Orientation="Vertical">
+	<StackPanel Orientation="Vertical">
 
 		<Button
-			x:Name="BtnProperties"
-			Click="BtnProperties_Click"
-			Content="Properties dialog" />
+			x:Name="OpenPropertiesDialogWindowButton"
+			Click="OpenPropertiesDialogWindowButton_Click"
+			Content="Open properties dialog window" />
 
 	</StackPanel>
+
 </Page>
diff --git a/tests/Files.App.UITests/Views/PropertiesViewPage.xaml.cs b/tests/Files.App.UITests/Views/PropertiesViewPage.xaml.cs
new file mode 100644
index 000000000000..67a273228fc7
--- /dev/null
+++ b/tests/Files.App.UITests/Views/PropertiesViewPage.xaml.cs
@@ -0,0 +1,23 @@
+// Copyright (c) Files Community
+// SPDX-License-Identifier: MPL-2.0
+
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Files.App.UITests.Dialogs;
+
+namespace Files.App.UITests.Views
+{
+	public sealed partial class PropertiesViewPage : Page
+	{
+		public PropertiesViewPage()
+		{
+			InitializeComponent();
+		}
+
+		private void OpenPropertiesDialogWindowButton_Click(object sender , RoutedEventArgs e)
+		{
+			var window = new PropertiesDialog() { Title = "Properties" };
+			window.Activate();
+		}
+	}
+}

From 870de2c28bba4579008562506c986a05b5ab3ad4 Mon Sep 17 00:00:00 2001
From: Martin Anderson <mdta@live.co.uk>
Date: Fri, 21 Aug 2026 05:16:17 +0100
Subject: [PATCH 20/36] Toggle variant of the PropertiesViewItem control done

Awaiting verification of functionality from @tera
---
 .../PropertiesView/PropertiesView.xaml        | 679 ++++++++++++++++++
 .../PropertiesViewItemToggle.cs               |  72 +-
 .../Dialogs/PropertiesGeneralPage.xaml        |  83 +++
 3 files changed, 831 insertions(+), 3 deletions(-)

diff --git a/src/Files.App.Controls/PropertiesView/PropertiesView.xaml b/src/Files.App.Controls/PropertiesView/PropertiesView.xaml
index 2cd1ae81f630..d504ed11dca3 100644
--- a/src/Files.App.Controls/PropertiesView/PropertiesView.xaml
+++ b/src/Files.App.Controls/PropertiesView/PropertiesView.xaml
@@ -561,4 +561,683 @@
 		</Setter>
 	</Style>
 
+	<!--  PROPERTIES VIEW ITEM - TOGGLE  -->
+	<Style BasedOn="{StaticResource DefaultPropertiesViewItem_Toggle}" TargetType="fcontrols:PropertiesViewItemToggle" />
+
+	<Style x:Key="DefaultPropertiesViewItem_Toggle" TargetType="fcontrols:PropertiesViewItemToggle">
+
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="fcontrols:PropertiesViewItemToggle">
+					<Grid
+						MinHeight="48"
+						Padding="0,6"
+						HorizontalAlignment="Stretch"
+						VerticalAlignment="Stretch">
+						<Grid.ColumnDefinitions>
+							<ColumnDefinition Width="{TemplateBinding LabelWidth}" />
+							<ColumnDefinition Width="*" />
+						</Grid.ColumnDefinitions>
+						<Grid.RowDefinitions>
+							<RowDefinition Height="Auto" />
+							<RowDefinition Height="Auto" />
+						</Grid.RowDefinitions>
+
+						<TextBlock
+							x:Name="PART_Label"
+							Grid.Row="0"
+							Grid.RowSpan="2"
+							Grid.Column="0"
+							Grid.ColumnSpan="1"
+							Margin="0,4,24,4"
+							HorizontalAlignment="Stretch"
+							VerticalAlignment="Center"
+							Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+							LineHeight="20"
+							Style="{ThemeResource CaptionTextBlockStyle}"
+							Text="{TemplateBinding Label}" />
+
+						<ToggleSwitch
+							x:Name="PART_ToggleSwitch"
+							Grid.Row="0"
+							Grid.RowSpan="2"
+							Grid.Column="1"
+							Grid.ColumnSpan="1"
+							HorizontalAlignment="Right"
+							VerticalAlignment="Center"
+							OffContent="{TemplateBinding OffText}"
+							OnContent="{TemplateBinding OnText}"
+							Style="{StaticResource RightAlignedCompactToggleSwitchStyle}" />
+
+
+						<VisualStateManager.VisualStateGroups>
+							<VisualStateGroup x:Name="EditableStateGroup">
+								<VisualState x:Name="NotEditableState">
+									<VisualState.Setters />
+								</VisualState>
+								<VisualState x:Name="EditableState">
+									<VisualState.Setters />
+								</VisualState>
+							</VisualStateGroup>
+
+
+							<VisualStateGroup x:Name="OrientationStateGroup">
+								<VisualState x:Name="HorizontalState">
+									<VisualState.Setters>
+										<Setter Target="PART_Label.(Grid.Row)" Value="0" />
+										<Setter Target="PART_Label.(Grid.RowSpan)" Value="2" />
+										<Setter Target="PART_Label.(Grid.Column)" Value="0" />
+										<Setter Target="PART_Label.(Grid.ColumnSpan)" Value="1" />
+
+										<Setter Target="PART_ToggleSwitch.(Grid.Row)" Value="0" />
+										<Setter Target="PART_ToggleSwitch.(Grid.RowSpan)" Value="2" />
+										<Setter Target="PART_ToggleSwitch.(Grid.Column)" Value="1" />
+										<Setter Target="PART_ToggleSwitch.(Grid.ColumnSpan)" Value="1" />
+
+										<Setter Target="PART_ToggleSwitch.Style" Value="{StaticResource RightAlignedCompactToggleSwitchStyle}" />
+										<Setter Target="PART_ToggleSwitch.HorizontalAlignment" Value="Right" />
+									</VisualState.Setters>
+								</VisualState>
+
+								<VisualState x:Name="VerticalState">
+									<VisualState.Setters>
+										<Setter Target="PART_Label.(Grid.Row)" Value="0" />
+										<Setter Target="PART_Label.(Grid.RowSpan)" Value="1" />
+										<Setter Target="PART_Label.(Grid.Column)" Value="0" />
+										<Setter Target="PART_Label.(Grid.ColumnSpan)" Value="2" />
+
+										<Setter Target="PART_ToggleSwitch.(Grid.Row)" Value="1" />
+										<Setter Target="PART_ToggleSwitch.(Grid.RowSpan)" Value="1" />
+										<Setter Target="PART_ToggleSwitch.(Grid.Column)" Value="0" />
+										<Setter Target="PART_ToggleSwitch.(Grid.ColumnSpan)" Value="2" />
+
+										<Setter Target="PART_ToggleSwitch.Style" Value="{StaticResource DefaultToggleSwitchStyle}" />
+										<Setter Target="PART_ToggleSwitch.HorizontalAlignment" Value="Left" />
+									</VisualState.Setters>
+								</VisualState>
+							</VisualStateGroup>
+
+
+							<VisualStateGroup x:Name="EnabledStateGroup">
+								<VisualState x:Name="Enabledtate">
+									<VisualState.Setters>
+										<Setter Target="PART_ToggleSwitch.IsEnabled" Value="True" />
+									</VisualState.Setters>
+								</VisualState>
+								<VisualState x:Name="DisabledState">
+									<VisualState.Setters>
+										<Setter Target="PART_ToggleSwitch.IsEnabled" Value="False" />
+									</VisualState.Setters>
+								</VisualState>
+							</VisualStateGroup>
+						</VisualStateManager.VisualStateGroups>
+					</Grid>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+
+	<!--  RIGHT ALIGNED TOGGLE SWITCH TAKEN FROM COMMUNITY TOOLKIT  -->
+	<Style
+		x:Key="RightAlignedCompactToggleSwitchStyle"
+		BasedOn="{StaticResource DefaultToggleSwitchStyle}"
+		TargetType="ToggleSwitch">
+		<Style.Setters>
+			<Setter Property="MinWidth" Value="0" />
+			<Setter Property="Height" Value="36" />
+			<Setter Property="HorizontalContentAlignment" Value="Right" />
+			<Setter Property="Template">
+				<Setter.Value>
+					<ControlTemplate TargetType="ToggleSwitch">
+						<Grid
+							VerticalAlignment="Stretch"
+							Background="{TemplateBinding Background}"
+							BorderBrush="{TemplateBinding BorderBrush}"
+							BorderThickness="{TemplateBinding BorderThickness}"
+							Control.IsTemplateFocusTarget="True"
+							CornerRadius="{TemplateBinding CornerRadius}">
+							<ContentPresenter
+								x:Name="HeaderContentPresenter"
+								Grid.Row="0"
+								Margin="{ThemeResource ToggleSwitchTopHeaderMargin}"
+								VerticalAlignment="Top"
+								x:DeferLoadStrategy="Lazy"
+								AutomationProperties.AccessibilityView="Raw"
+								Content="{TemplateBinding Header}"
+								ContentTemplate="{TemplateBinding HeaderTemplate}"
+								Foreground="{ThemeResource ToggleSwitchHeaderForeground}"
+								IsHitTestVisible="False"
+								TextWrapping="Wrap"
+								Visibility="Collapsed" />
+							<Grid
+								Grid.Row="1"
+								HorizontalAlignment="Right"
+								VerticalAlignment="Center">
+								<Grid.ColumnDefinitions>
+									<ColumnDefinition Width="Auto" />
+									<ColumnDefinition Width="12" MaxWidth="12" />
+									<ColumnDefinition Width="Auto" />
+								</Grid.ColumnDefinitions>
+								<Grid
+									x:Name="SwitchAreaGrid"
+									Grid.RowSpan="3"
+									Grid.ColumnSpan="3"
+									Margin="0,5"
+									Background="{ThemeResource ToggleSwitchContainerBackground}"
+									CornerRadius="{TemplateBinding CornerRadius}" />
+								<ContentPresenter
+									x:Name="OffContentPresenter"
+									Grid.RowSpan="3"
+									HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+									VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+									AutomationProperties.AccessibilityView="Raw"
+									Content="{TemplateBinding OffContent}"
+									ContentTemplate="{TemplateBinding OffContentTemplate}"
+									Foreground="{TemplateBinding Foreground}"
+									IsHitTestVisible="False"
+									Opacity="0" />
+								<ContentPresenter
+									x:Name="OnContentPresenter"
+									Grid.RowSpan="3"
+									HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+									VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+									AutomationProperties.AccessibilityView="Raw"
+									Content="{TemplateBinding OnContent}"
+									ContentTemplate="{TemplateBinding OnContentTemplate}"
+									Foreground="{TemplateBinding Foreground}"
+									IsHitTestVisible="False"
+									Opacity="0" />
+								<Rectangle
+									x:Name="OuterBorder"
+									Grid.Row="1"
+									Grid.Column="2"
+									Width="40"
+									Height="20"
+									Fill="{ThemeResource ToggleSwitchFillOff}"
+									RadiusX="10"
+									RadiusY="10"
+									Stroke="{ThemeResource ToggleSwitchStrokeOff}"
+									StrokeThickness="{ThemeResource ToggleSwitchOuterBorderStrokeThickness}" />
+								<Rectangle
+									x:Name="SwitchKnobBounds"
+									Grid.Row="1"
+									Grid.Column="2"
+									Width="40"
+									Height="20"
+									Fill="{ThemeResource ToggleSwitchFillOn}"
+									Opacity="0"
+									RadiusX="10"
+									RadiusY="10"
+									Stroke="{ThemeResource ToggleSwitchStrokeOn}"
+									StrokeThickness="{ThemeResource ToggleSwitchOnStrokeThickness}" />
+								<Grid
+									x:Name="SwitchKnob"
+									Grid.Row="1"
+									Grid.Column="2"
+									Width="20"
+									Height="20"
+									HorizontalAlignment="Left">
+									<Border
+										x:Name="SwitchKnobOn"
+										Width="12"
+										Height="12"
+										Margin="0,0,3,0"
+										HorizontalAlignment="Right"
+										Background="{ThemeResource ToggleSwitchKnobFillOn}"
+										BackgroundSizing="OuterBorderEdge"
+										BorderBrush="{ThemeResource ToggleSwitchKnobStrokeOn}"
+										CornerRadius="7"
+										Opacity="0"
+										RenderTransformOrigin="0.5, 0.5">
+										<Border.RenderTransform>
+											<CompositeTransform />
+										</Border.RenderTransform>
+									</Border>
+									<Rectangle
+										x:Name="SwitchKnobOff"
+										Width="12"
+										Height="12"
+										Margin="3,0,0,0"
+										HorizontalAlignment="Left"
+										Fill="{ThemeResource ToggleSwitchKnobFillOff}"
+										RadiusX="7"
+										RadiusY="7"
+										RenderTransformOrigin="0.5, 0.5">
+										<Rectangle.RenderTransform>
+											<CompositeTransform />
+										</Rectangle.RenderTransform>
+									</Rectangle>
+									<Grid.RenderTransform>
+										<TranslateTransform x:Name="KnobTranslateTransform" />
+									</Grid.RenderTransform>
+								</Grid>
+								<Thumb
+									x:Name="SwitchThumb"
+									Grid.RowSpan="3"
+									Grid.ColumnSpan="3"
+									AutomationProperties.AccessibilityView="Raw">
+									<Thumb.Template>
+										<ControlTemplate TargetType="Thumb">
+											<Rectangle Fill="Transparent" />
+										</ControlTemplate>
+									</Thumb.Template>
+								</Thumb>
+							</Grid>
+							<VisualStateManager.VisualStateGroups>
+								<VisualStateGroup x:Name="CommonStates">
+									<VisualState x:Name="Normal">
+										<Storyboard>
+											<ObjectAnimationUsingKeyFrames Storyboard.TargetName="OuterBorder" Storyboard.TargetProperty="Stroke">
+												<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchStrokeOff}" />
+											</ObjectAnimationUsingKeyFrames>
+											<ObjectAnimationUsingKeyFrames Storyboard.TargetName="OuterBorder" Storyboard.TargetProperty="Fill">
+												<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchFillOff}" />
+											</ObjectAnimationUsingKeyFrames>
+											<ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOff" Storyboard.TargetProperty="Fill">
+												<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchKnobFillOff}" />
+											</ObjectAnimationUsingKeyFrames>
+											<ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOn" Storyboard.TargetProperty="Background">
+												<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchKnobFillOn}" />
+											</ObjectAnimationUsingKeyFrames>
+											<ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobBounds" Storyboard.TargetProperty="Fill">
+												<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchFillOn}" />
+											</ObjectAnimationUsingKeyFrames>
+											<ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobBounds" Storyboard.TargetProperty="Stroke">
+												<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchStrokeOn}" />
+											</ObjectAnimationUsingKeyFrames>
+											<ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchAreaGrid" Storyboard.TargetProperty="Background">
+												<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchContainerBackground}" />
+											</ObjectAnimationUsingKeyFrames>
+											<DoubleAnimationUsingKeyFrames
+												EnableDependentAnimation="True"
+												Storyboard.TargetName="SwitchKnobOn"
+												Storyboard.TargetProperty="Width">
+												<SplineDoubleKeyFrame
+													KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+													KeyTime="{StaticResource ControlFasterAnimationDuration}"
+													Value="12" />
+											</DoubleAnimationUsingKeyFrames>
+											<DoubleAnimationUsingKeyFrames
+												EnableDependentAnimation="True"
+												Storyboard.TargetName="SwitchKnobOn"
+												Storyboard.TargetProperty="Height">
+												<SplineDoubleKeyFrame
+													KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+													KeyTime="{StaticResource ControlFasterAnimationDuration}"
+													Value="12" />
+											</DoubleAnimationUsingKeyFrames>
+											<DoubleAnimationUsingKeyFrames
+												EnableDependentAnimation="True"
+												Storyboard.TargetName="SwitchKnobOff"
+												Storyboard.TargetProperty="Width">
+												<SplineDoubleKeyFrame
+													KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+													KeyTime="{StaticResource ControlFasterAnimationDuration}"
+													Value="12" />
+											</DoubleAnimationUsingKeyFrames>
+											<DoubleAnimationUsingKeyFrames
+												EnableDependentAnimation="True"
+												Storyboard.TargetName="SwitchKnobOff"
+												Storyboard.TargetProperty="Height">
+												<SplineDoubleKeyFrame
+													KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+													KeyTime="{StaticResource ControlFasterAnimationDuration}"
+													Value="12" />
+											</DoubleAnimationUsingKeyFrames>
+										</Storyboard>
+									</VisualState>
+									<VisualState x:Name="PointerOver">
+										<Storyboard>
+											<ColorAnimationUsingKeyFrames Storyboard.TargetName="OuterBorder" Storyboard.TargetProperty="(Shape.Stroke).(SolidColorBrush.Color)">
+												<LinearColorKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="{ThemeResource ToggleSwitchStrokeOffPointerOver}" />
+											</ColorAnimationUsingKeyFrames>
+											<ColorAnimationUsingKeyFrames Storyboard.TargetName="OuterBorder" Storyboard.TargetProperty="(Shape.Fill).(SolidColorBrush.Color)">
+												<LinearColorKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="{ThemeResource ToggleSwitchFillOffPointerOver}" />
+											</ColorAnimationUsingKeyFrames>
+											<ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOff" Storyboard.TargetProperty="Fill">
+												<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchKnobFillOffPointerOver}" />
+											</ObjectAnimationUsingKeyFrames>
+											<ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOn" Storyboard.TargetProperty="Background">
+												<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchKnobFillOnPointerOver}" />
+											</ObjectAnimationUsingKeyFrames>
+											<ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobBounds" Storyboard.TargetProperty="Fill">
+												<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchFillOnPointerOver}" />
+											</ObjectAnimationUsingKeyFrames>
+											<ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobBounds" Storyboard.TargetProperty="Stroke">
+												<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchStrokeOnPointerOver}" />
+											</ObjectAnimationUsingKeyFrames>
+											<ColorAnimationUsingKeyFrames Storyboard.TargetName="SwitchAreaGrid" Storyboard.TargetProperty="(Panel.Background).(SolidColorBrush.Color)">
+												<LinearColorKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="{ThemeResource ToggleSwitchContainerBackgroundPointerOver}" />
+											</ColorAnimationUsingKeyFrames>
+											<DoubleAnimationUsingKeyFrames
+												EnableDependentAnimation="True"
+												Storyboard.TargetName="SwitchKnobOn"
+												Storyboard.TargetProperty="Width">
+												<SplineDoubleKeyFrame
+													KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+													KeyTime="{StaticResource ControlFasterAnimationDuration}"
+													Value="14" />
+											</DoubleAnimationUsingKeyFrames>
+											<DoubleAnimationUsingKeyFrames
+												EnableDependentAnimation="True"
+												Storyboard.TargetName="SwitchKnobOn"
+												Storyboard.TargetProperty="Height">
+												<SplineDoubleKeyFrame
+													KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+													KeyTime="{StaticResource ControlFasterAnimationDuration}"
+													Value="14" />
+											</DoubleAnimationUsingKeyFrames>
+											<DoubleAnimationUsingKeyFrames
+												EnableDependentAnimation="True"
+												Storyboard.TargetName="SwitchKnobOff"
+												Storyboard.TargetProperty="Width">
+												<SplineDoubleKeyFrame
+													KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+													KeyTime="{StaticResource ControlFasterAnimationDuration}"
+													Value="14" />
+											</DoubleAnimationUsingKeyFrames>
+											<DoubleAnimationUsingKeyFrames
+												EnableDependentAnimation="True"
+												Storyboard.TargetName="SwitchKnobOff"
+												Storyboard.TargetProperty="Height">
+												<SplineDoubleKeyFrame
+													KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+													KeyTime="{StaticResource ControlFasterAnimationDuration}"
+													Value="14" />
+											</DoubleAnimationUsingKeyFrames>
+										</Storyboard>
+									</VisualState>
+									<VisualState x:Name="Pressed">
+										<VisualState.Setters>
+											<Setter Target="SwitchKnobOn.HorizontalAlignment" Value="Right" />
+											<Setter Target="SwitchKnobOn.Margin" Value="0,0,3,0" />
+											<Setter Target="SwitchKnobOff.HorizontalAlignment" Value="Left" />
+											<Setter Target="SwitchKnobOff.Margin" Value="3,0,0,0" />
+										</VisualState.Setters>
+										<Storyboard>
+											<ColorAnimationUsingKeyFrames Storyboard.TargetName="OuterBorder" Storyboard.TargetProperty="(Shape.Stroke).(SolidColorBrush.Color)">
+												<LinearColorKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="{ThemeResource ToggleSwitchStrokeOffPressed}" />
+											</ColorAnimationUsingKeyFrames>
+											<ColorAnimationUsingKeyFrames Storyboard.TargetName="OuterBorder" Storyboard.TargetProperty="(Shape.Fill).(SolidColorBrush.Color)">
+												<LinearColorKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="{ThemeResource ToggleSwitchFillOffPressed}" />
+											</ColorAnimationUsingKeyFrames>
+											<ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobBounds" Storyboard.TargetProperty="Fill">
+												<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchFillOnPressed}" />
+											</ObjectAnimationUsingKeyFrames>
+											<ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobBounds" Storyboard.TargetProperty="Stroke">
+												<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchStrokeOnPressed}" />
+											</ObjectAnimationUsingKeyFrames>
+											<ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOff" Storyboard.TargetProperty="Fill">
+												<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchKnobFillOffPressed}" />
+											</ObjectAnimationUsingKeyFrames>
+											<ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOn" Storyboard.TargetProperty="Background">
+												<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchKnobFillOnPressed}" />
+											</ObjectAnimationUsingKeyFrames>
+											<ColorAnimationUsingKeyFrames Storyboard.TargetName="SwitchAreaGrid" Storyboard.TargetProperty="(Panel.Background).(SolidColorBrush.Color)">
+												<LinearColorKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="{ThemeResource ToggleSwitchContainerBackgroundPressed}" />
+											</ColorAnimationUsingKeyFrames>
+											<DoubleAnimationUsingKeyFrames
+												EnableDependentAnimation="True"
+												Storyboard.TargetName="SwitchKnobOn"
+												Storyboard.TargetProperty="Width">
+												<SplineDoubleKeyFrame
+													KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+													KeyTime="{StaticResource ControlFasterAnimationDuration}"
+													Value="17" />
+											</DoubleAnimationUsingKeyFrames>
+											<DoubleAnimationUsingKeyFrames
+												EnableDependentAnimation="True"
+												Storyboard.TargetName="SwitchKnobOn"
+												Storyboard.TargetProperty="Height">
+												<SplineDoubleKeyFrame
+													KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+													KeyTime="{StaticResource ControlFasterAnimationDuration}"
+													Value="14" />
+											</DoubleAnimationUsingKeyFrames>
+											<DoubleAnimationUsingKeyFrames
+												EnableDependentAnimation="True"
+												Storyboard.TargetName="SwitchKnobOff"
+												Storyboard.TargetProperty="Width">
+												<SplineDoubleKeyFrame
+													KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+													KeyTime="{StaticResource ControlFasterAnimationDuration}"
+													Value="17" />
+											</DoubleAnimationUsingKeyFrames>
+											<DoubleAnimationUsingKeyFrames
+												EnableDependentAnimation="True"
+												Storyboard.TargetName="SwitchKnobOff"
+												Storyboard.TargetProperty="Height">
+												<SplineDoubleKeyFrame
+													KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+													KeyTime="{StaticResource ControlFasterAnimationDuration}"
+													Value="14" />
+											</DoubleAnimationUsingKeyFrames>
+										</Storyboard>
+									</VisualState>
+									<VisualState x:Name="Disabled">
+										<Storyboard>
+											<ObjectAnimationUsingKeyFrames Storyboard.TargetName="HeaderContentPresenter" Storyboard.TargetProperty="Foreground">
+												<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchHeaderForegroundDisabled}" />
+											</ObjectAnimationUsingKeyFrames>
+											<ObjectAnimationUsingKeyFrames Storyboard.TargetName="OffContentPresenter" Storyboard.TargetProperty="Foreground">
+												<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchContentForegroundDisabled}" />
+											</ObjectAnimationUsingKeyFrames>
+											<ObjectAnimationUsingKeyFrames Storyboard.TargetName="OnContentPresenter" Storyboard.TargetProperty="Foreground">
+												<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchContentForegroundDisabled}" />
+											</ObjectAnimationUsingKeyFrames>
+											<ColorAnimationUsingKeyFrames Storyboard.TargetName="OuterBorder" Storyboard.TargetProperty="(Shape.Stroke).(SolidColorBrush.Color)">
+												<LinearColorKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="{ThemeResource ToggleSwitchStrokeOffDisabled}" />
+											</ColorAnimationUsingKeyFrames>
+											<ColorAnimationUsingKeyFrames Storyboard.TargetName="OuterBorder" Storyboard.TargetProperty="(Shape.Fill).(SolidColorBrush.Color)">
+												<LinearColorKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="{ThemeResource ToggleSwitchFillOffDisabled}" />
+											</ColorAnimationUsingKeyFrames>
+											<ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobBounds" Storyboard.TargetProperty="Fill">
+												<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchFillOnDisabled}" />
+											</ObjectAnimationUsingKeyFrames>
+											<ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobBounds" Storyboard.TargetProperty="Stroke">
+												<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchStrokeOnDisabled}" />
+											</ObjectAnimationUsingKeyFrames>
+											<ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOff" Storyboard.TargetProperty="Fill">
+												<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchKnobFillOffDisabled}" />
+											</ObjectAnimationUsingKeyFrames>
+											<ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOn" Storyboard.TargetProperty="Background">
+												<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchKnobFillOnDisabled}" />
+											</ObjectAnimationUsingKeyFrames>
+											<ColorAnimationUsingKeyFrames Storyboard.TargetName="SwitchAreaGrid" Storyboard.TargetProperty="(Panel.Background).(SolidColorBrush.Color)">
+												<LinearColorKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="{ThemeResource ToggleSwitchContainerBackgroundDisabled}" />
+											</ColorAnimationUsingKeyFrames>
+											<DoubleAnimationUsingKeyFrames
+												EnableDependentAnimation="True"
+												Storyboard.TargetName="SwitchKnobOn"
+												Storyboard.TargetProperty="Width">
+												<SplineDoubleKeyFrame
+													KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+													KeyTime="{StaticResource ControlNormalAnimationDuration}"
+													Value="12" />
+											</DoubleAnimationUsingKeyFrames>
+											<DoubleAnimationUsingKeyFrames
+												EnableDependentAnimation="True"
+												Storyboard.TargetName="SwitchKnobOn"
+												Storyboard.TargetProperty="Height">
+												<SplineDoubleKeyFrame
+													KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+													KeyTime="{StaticResource ControlNormalAnimationDuration}"
+													Value="12" />
+											</DoubleAnimationUsingKeyFrames>
+											<DoubleAnimationUsingKeyFrames
+												EnableDependentAnimation="True"
+												Storyboard.TargetName="SwitchKnobOff"
+												Storyboard.TargetProperty="Width">
+												<SplineDoubleKeyFrame
+													KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+													KeyTime="{StaticResource ControlNormalAnimationDuration}"
+													Value="12" />
+											</DoubleAnimationUsingKeyFrames>
+											<DoubleAnimationUsingKeyFrames
+												EnableDependentAnimation="True"
+												Storyboard.TargetName="SwitchKnobOff"
+												Storyboard.TargetProperty="Height">
+												<SplineDoubleKeyFrame
+													KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+													KeyTime="{StaticResource ControlNormalAnimationDuration}"
+													Value="12" />
+											</DoubleAnimationUsingKeyFrames>
+										</Storyboard>
+									</VisualState>
+								</VisualStateGroup>
+								<VisualStateGroup x:Name="ToggleStates">
+									<VisualStateGroup.Transitions>
+										<VisualTransition
+											x:Name="DraggingToOnTransition"
+											GeneratedDuration="0"
+											From="Dragging"
+											To="On">
+											<Storyboard>
+												<RepositionThemeAnimation FromHorizontalOffset="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.KnobCurrentToOnOffset}" TargetName="SwitchKnob" />
+												<DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobBounds" Storyboard.TargetProperty="Opacity">
+													<LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="1" />
+												</DoubleAnimationUsingKeyFrames>
+												<DoubleAnimationUsingKeyFrames Storyboard.TargetName="OuterBorder" Storyboard.TargetProperty="Opacity">
+													<LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="0" />
+												</DoubleAnimationUsingKeyFrames>
+												<DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOn" Storyboard.TargetProperty="Opacity">
+													<LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="1" />
+												</DoubleAnimationUsingKeyFrames>
+												<DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOff" Storyboard.TargetProperty="Opacity">
+													<LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="0" />
+												</DoubleAnimationUsingKeyFrames>
+											</Storyboard>
+										</VisualTransition>
+										<VisualTransition
+											x:Name="OnToDraggingTransition"
+											GeneratedDuration="0"
+											From="On"
+											To="Dragging">
+											<Storyboard>
+												<DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobBounds" Storyboard.TargetProperty="Opacity">
+													<LinearDoubleKeyFrame KeyTime="0" Value="1" />
+												</DoubleAnimationUsingKeyFrames>
+												<DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOn" Storyboard.TargetProperty="Opacity">
+													<LinearDoubleKeyFrame KeyTime="0" Value="1" />
+												</DoubleAnimationUsingKeyFrames>
+												<DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOff" Storyboard.TargetProperty="Opacity">
+													<LinearDoubleKeyFrame KeyTime="0" Value="0" />
+												</DoubleAnimationUsingKeyFrames>
+											</Storyboard>
+										</VisualTransition>
+										<VisualTransition
+											x:Name="DraggingToOffTransition"
+											GeneratedDuration="0"
+											From="Dragging"
+											To="Off">
+											<Storyboard>
+												<RepositionThemeAnimation FromHorizontalOffset="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.KnobCurrentToOffOffset}" TargetName="SwitchKnob" />
+												<DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobBounds" Storyboard.TargetProperty="Opacity">
+													<LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="0" />
+												</DoubleAnimationUsingKeyFrames>
+												<DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOn" Storyboard.TargetProperty="Opacity">
+													<LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="0" />
+												</DoubleAnimationUsingKeyFrames>
+												<DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOff" Storyboard.TargetProperty="Opacity">
+													<LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="1" />
+												</DoubleAnimationUsingKeyFrames>
+											</Storyboard>
+										</VisualTransition>
+										<VisualTransition
+											x:Name="OnToOffTransition"
+											GeneratedDuration="0"
+											From="On"
+											To="Off">
+											<Storyboard>
+												<RepositionThemeAnimation FromHorizontalOffset="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.KnobOnToOffOffset}" TargetName="SwitchKnob" />
+											</Storyboard>
+										</VisualTransition>
+										<VisualTransition
+											x:Name="OffToOnTransition"
+											GeneratedDuration="0"
+											From="Off"
+											To="On">
+											<Storyboard>
+												<RepositionThemeAnimation FromHorizontalOffset="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.KnobOffToOnOffset}" TargetName="SwitchKnob" />
+												<DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobBounds" Storyboard.TargetProperty="Opacity">
+													<LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="1" />
+												</DoubleAnimationUsingKeyFrames>
+												<DoubleAnimationUsingKeyFrames Storyboard.TargetName="OuterBorder" Storyboard.TargetProperty="Opacity">
+													<LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="0" />
+												</DoubleAnimationUsingKeyFrames>
+												<DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOn" Storyboard.TargetProperty="Opacity">
+													<LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="1" />
+												</DoubleAnimationUsingKeyFrames>
+												<DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOff" Storyboard.TargetProperty="Opacity">
+													<LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="0" />
+												</DoubleAnimationUsingKeyFrames>
+											</Storyboard>
+										</VisualTransition>
+									</VisualStateGroup.Transitions>
+									<VisualState x:Name="Dragging" />
+									<VisualState x:Name="Off" />
+									<VisualState x:Name="On">
+										<Storyboard>
+											<DoubleAnimation
+												Storyboard.TargetName="KnobTranslateTransform"
+												Storyboard.TargetProperty="X"
+												To="20"
+												Duration="0" />
+											<DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobBounds" Storyboard.TargetProperty="Opacity">
+												<LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="1" />
+											</DoubleAnimationUsingKeyFrames>
+											<DoubleAnimationUsingKeyFrames Storyboard.TargetName="OuterBorder" Storyboard.TargetProperty="Opacity">
+												<LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="0" />
+											</DoubleAnimationUsingKeyFrames>
+											<DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOn" Storyboard.TargetProperty="Opacity">
+												<LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="1" />
+											</DoubleAnimationUsingKeyFrames>
+											<DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOff" Storyboard.TargetProperty="Opacity">
+												<LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="0" />
+											</DoubleAnimationUsingKeyFrames>
+										</Storyboard>
+									</VisualState>
+								</VisualStateGroup>
+								<VisualStateGroup x:Name="ContentStates">
+									<VisualState x:Name="OffContent">
+										<Storyboard>
+											<DoubleAnimation
+												Storyboard.TargetName="OffContentPresenter"
+												Storyboard.TargetProperty="Opacity"
+												To="1"
+												Duration="0" />
+											<ObjectAnimationUsingKeyFrames Storyboard.TargetName="OffContentPresenter" Storyboard.TargetProperty="IsHitTestVisible">
+												<DiscreteObjectKeyFrame KeyTime="0">
+													<DiscreteObjectKeyFrame.Value>
+														<x:Boolean>True</x:Boolean>
+													</DiscreteObjectKeyFrame.Value>
+												</DiscreteObjectKeyFrame>
+											</ObjectAnimationUsingKeyFrames>
+										</Storyboard>
+									</VisualState>
+									<VisualState x:Name="OnContent">
+										<Storyboard>
+											<DoubleAnimation
+												Storyboard.TargetName="OnContentPresenter"
+												Storyboard.TargetProperty="Opacity"
+												To="1"
+												Duration="0" />
+											<ObjectAnimationUsingKeyFrames Storyboard.TargetName="OnContentPresenter" Storyboard.TargetProperty="IsHitTestVisible">
+												<DiscreteObjectKeyFrame KeyTime="0">
+													<DiscreteObjectKeyFrame.Value>
+														<x:Boolean>True</x:Boolean>
+													</DiscreteObjectKeyFrame.Value>
+												</DiscreteObjectKeyFrame>
+											</ObjectAnimationUsingKeyFrames>
+										</Storyboard>
+									</VisualState>
+								</VisualStateGroup>
+							</VisualStateManager.VisualStateGroups>
+						</Grid>
+					</ControlTemplate>
+				</Setter.Value>
+			</Setter>
+		</Style.Setters>
+	</Style>
+
 </ResourceDictionary>
diff --git a/src/Files.App.Controls/PropertiesView/PropertiesViewItemToggle.cs b/src/Files.App.Controls/PropertiesView/PropertiesViewItemToggle.cs
index 68ea981c0559..a4da776bd9b2 100644
--- a/src/Files.App.Controls/PropertiesView/PropertiesViewItemToggle.cs
+++ b/src/Files.App.Controls/PropertiesView/PropertiesViewItemToggle.cs
@@ -12,6 +12,7 @@
 using System.Linq;
 using System.Runtime.InteropServices.WindowsRuntime;
 using Files.App.Controls.Primitives;
+using WinRT;
 
 namespace Files.App.Controls
 {
@@ -48,10 +49,41 @@ public bool IsToggled
 				typeof(PropertiesViewItemToggle),
 				new PropertyMetadata( false , OnIsToggledPropertyChanged ) );
 
+
+
+		public string OnText
+		{
+			get { return (string)GetValue( OnTextProperty ); }
+			set { SetValue( OnTextProperty , value ); }
+		}
+
+		public static readonly DependencyProperty OnTextProperty =
+			DependencyProperty.Register(
+				"OnText",
+				typeof(string),
+				typeof(PropertiesViewItemToggle),
+				new PropertyMetadata( "On" ) );
+
+
+
+		public string OffText
+		{
+			get { return (string)GetValue( OffTextProperty ); }
+			set { SetValue( OffTextProperty , value ); }
+		}
+
+		public static readonly DependencyProperty OffTextProperty =
+			DependencyProperty.Register(
+				"OffText",
+				typeof(string),
+				typeof(PropertiesViewItemToggle),
+				new PropertyMetadata( "Off") );
+
 		#endregion
 
 
 
+		private ToggleSwitch? _toggleSwitch;
 
 		#region Property Changed
 
@@ -59,11 +91,19 @@ private static void OnIsToggledPropertyChanged(DependencyObject d , DependencyPr
 		{
 			var control = (PropertiesViewItemToggle)d;
 			control.UpdateIsToggledProperty( (bool)e.NewValue );
+
+			if ( e.NewValue != e.OldValue )
+			{ 
+				control.UpdateIsToggledProperty( (bool) e.NewValue );
+			}
 		}
 
 		private void UpdateIsToggledProperty(bool isToggled)
 		{
-			
+			if ( _toggleSwitch == null )
+				return;
+
+			_toggleSwitch.IsOn = isToggled;
 		}
 
 		#endregion
@@ -81,12 +121,38 @@ public PropertiesViewItemToggle()
 			};
 		}
 
+		[DynamicWindowsRuntimeCast( typeof( ToggleSwitch ) )]
+		protected override void OnApplyTemplate()
+		{
+			base.OnApplyTemplate();
 
+			// Renive IsOn event hook if ToggleSwitch Part is not found or loaded
+			if ( _toggleSwitch != null )
+			{
+				_toggleSwitch.Toggled -= OnToggleSwitchToggled;
+			}
 
+			// Get the template part
+			_toggleSwitch = GetTemplateChild( ToggleSwitchPartName ) as ToggleSwitch;
 
-		protected override void OnApplyTemplate()
+			// Hook the event
+			if ( _toggleSwitch != null )
+			{
+				_toggleSwitch.Toggled += OnToggleSwitchToggled;
+			}
+		}
+
+
+
+
+		private void OnToggleSwitchToggled(object sender , RoutedEventArgs e)
 		{
-			base.OnApplyTemplate();
+			if ( _toggleSwitch == null )
+				return;
+
+			bool isOn = _toggleSwitch.IsOn;
+
+			this.IsToggled = isOn;
 		}
 
 	}
diff --git a/tests/Files.App.UITests/Dialogs/PropertiesGeneralPage.xaml b/tests/Files.App.UITests/Dialogs/PropertiesGeneralPage.xaml
index 6f94931b6d4c..54567934a882 100644
--- a/tests/Files.App.UITests/Dialogs/PropertiesGeneralPage.xaml
+++ b/tests/Files.App.UITests/Dialogs/PropertiesGeneralPage.xaml
@@ -260,6 +260,89 @@
 				</Expander.Content>
 			</Expander>
 
+			<Expander IsExpanded="True" Style="{StaticResource PropertiesExpanderStyle}">
+				<Expander.Header>
+					<controls:PropertiesHeader Text="Toggle Items">
+						<controls:PropertiesHeader.Icon>
+							<SymbolIcon Symbol="XboxOneConsole" />
+						</controls:PropertiesHeader.Icon>
+					</controls:PropertiesHeader>
+				</Expander.Header>
+				<Expander.Content>
+					<StackPanel HorizontalAlignment="Stretch" Orientation="Vertical">
+						<controls:PropertiesViewItemToggle
+							IsEnabled="True"
+							IsToggled="True"
+							Label="Enabled and On"
+							LabelWidth="{StaticResource LabelWidth}"
+							Orientation="Horizontal" />
+
+						<MenuFlyoutSeparator />
+
+						<controls:PropertiesViewItemToggle
+							IsEnabled="True"
+							IsToggled="False"
+							Label="Enabled and Off"
+							LabelWidth="{StaticResource LabelWidth}"
+							Orientation="Horizontal" />
+
+						<MenuFlyoutSeparator />
+
+						<controls:PropertiesViewItemToggle
+							IsEnabled="False"
+							IsToggled="True"
+							Label="Disabled and On"
+							LabelWidth="{StaticResource LabelWidth}"
+							Orientation="Horizontal" />
+
+						<MenuFlyoutSeparator />
+
+						<controls:PropertiesViewItemToggle
+							IsEnabled="False"
+							IsToggled="False"
+							Label="Disabled and Off"
+							LabelWidth="{StaticResource LabelWidth}"
+							Orientation="Horizontal" />
+
+						<MenuFlyoutSeparator />
+
+						<controls:PropertiesViewItemToggle
+							IsEnabled="True"
+							IsToggled="True"
+							Label="Enabled and On"
+							LabelWidth="{StaticResource LabelWidth}"
+							Orientation="Vertical" />
+
+						<MenuFlyoutSeparator />
+
+						<controls:PropertiesViewItemToggle
+							IsEnabled="True"
+							IsToggled="False"
+							Label="Enabled and Off"
+							LabelWidth="{StaticResource LabelWidth}"
+							Orientation="Vertical" />
+
+						<MenuFlyoutSeparator />
+
+						<controls:PropertiesViewItemToggle
+							IsEnabled="False"
+							IsToggled="True"
+							Label="Disabled and On"
+							LabelWidth="{StaticResource LabelWidth}"
+							Orientation="Vertical" />
+
+						<MenuFlyoutSeparator />
+
+						<controls:PropertiesViewItemToggle
+							IsEnabled="False"
+							IsToggled="False"
+							Label="Disabled and Off"
+							LabelWidth="{StaticResource LabelWidth}"
+							Orientation="Vertical" />
+					</StackPanel>
+				</Expander.Content>
+			</Expander>
+
 		</controls:PropertiesViewForm>
 
 	</Grid>

From 0a6b19da70053bb6a12fa3a2750b1b70e7b1bed6 Mon Sep 17 00:00:00 2001
From: 0x5BFA <62196528+0x5bfa@users.noreply.github.com>
Date: Fri, 21 Aug 2026 19:53:51 +0900
Subject: [PATCH 21/36] Add WindowedDialog

---
 .../PropertiesView/PropertiesView.cs          |  24 -
 .../PropertiesView/PropertiesView.xaml        |  97 +--
 .../PropertiesView/PropertiesViewForm.cs      |   8 +
 src/Files.App.Controls/Themes/Generic.xaml    |   4 +
 .../WindowedDialog/WindowedDialog.cs          |  33 +
 .../WindowedDialog/WindowedDialogRoot.cs      |  23 +
 .../WindowedDialog/WindowedDialogRoot.xaml    |  77 +++
 .../Dialogs/PropertiesDetailsPage.xaml        |  11 +
 .../Dialogs/PropertiesDetailsPage.xaml.cs     |  15 +
 .../Dialogs/PropertiesDialog.xaml             |  81 +--
 .../Dialogs/PropertiesDialog.xaml.cs          |  19 +-
 .../Dialogs/PropertiesGeneralPage.xaml        | 574 +++++++++---------
 .../Files.App.UITests.csproj                  |   9 +
 13 files changed, 542 insertions(+), 433 deletions(-)
 delete mode 100644 src/Files.App.Controls/PropertiesView/PropertiesView.cs
 create mode 100644 src/Files.App.Controls/WindowedDialog/WindowedDialog.cs
 create mode 100644 src/Files.App.Controls/WindowedDialog/WindowedDialogRoot.cs
 create mode 100644 src/Files.App.Controls/WindowedDialog/WindowedDialogRoot.xaml
 create mode 100644 tests/Files.App.UITests/Dialogs/PropertiesDetailsPage.xaml
 create mode 100644 tests/Files.App.UITests/Dialogs/PropertiesDetailsPage.xaml.cs

diff --git a/src/Files.App.Controls/PropertiesView/PropertiesView.cs b/src/Files.App.Controls/PropertiesView/PropertiesView.cs
deleted file mode 100644
index 9413baf2095c..000000000000
--- a/src/Files.App.Controls/PropertiesView/PropertiesView.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright (c) Files Community
-// SPDX-License-Identifier: MPL-2.0
-
-using CommunityToolkit.WinUI;
-
-namespace Files.App.Controls
-{
-	public partial class PropertiesView : ContentControl
-	{
-		[GeneratedDependencyProperty]
-		public partial string? Title { get; set; }
-
-		[GeneratedDependencyProperty]
-		public partial FrameworkElement? Header { get; set; }
-
-		[GeneratedDependencyProperty]
-		public partial FrameworkElement? Footer { get; set; }
-
-		public PropertiesView()
-		{
-			DefaultStyleKey = typeof(PropertiesView);
-		}
-	}
-}
diff --git a/src/Files.App.Controls/PropertiesView/PropertiesView.xaml b/src/Files.App.Controls/PropertiesView/PropertiesView.xaml
index d504ed11dca3..589b80f54b16 100644
--- a/src/Files.App.Controls/PropertiesView/PropertiesView.xaml
+++ b/src/Files.App.Controls/PropertiesView/PropertiesView.xaml
@@ -5,67 +5,47 @@
 	xmlns:animatedvisuals="using:Microsoft.UI.Xaml.Controls.AnimatedVisuals"
 	xmlns:fcontrols="using:Files.App.Controls">
 
-	<Style BasedOn="{StaticResource DefaultPropertiesViewStyle}" TargetType="fcontrols:PropertiesView" />
 	<Style BasedOn="{StaticResource DefaultPropertiesViewFormStyle}" TargetType="fcontrols:PropertiesViewForm" />
 
-	<Style x:Key="DefaultPropertiesViewStyle" TargetType="fcontrols:PropertiesView">
+	<Style x:Key="DefaultPropertiesViewFormStyle" TargetType="fcontrols:PropertiesViewForm">
 		<Setter Property="VerticalAlignment" Value="Stretch" />
 		<Setter Property="HorizontalAlignment" Value="Stretch" />
-		<Setter Property="VerticalContentAlignment" Value="Stretch" />
-		<Setter Property="HorizontalContentAlignment" Value="Stretch" />
-		<Setter Property="Background" Value="{ThemeResource SolidBackgroundFillColorBaseBrush}" />
+		<Setter Property="ItemsPanel">
+			<Setter.Value>
+				<ItemsPanelTemplate>
+					<StackPanel HorizontalAlignment="Stretch" Orientation="Vertical" />
+				</ItemsPanelTemplate>
+			</Setter.Value>
+		</Setter>
 		<Setter Property="Template">
 			<Setter.Value>
-				<ControlTemplate TargetType="fcontrols:PropertiesView">
-					<Grid Background="{TemplateBinding Background}">
+				<ControlTemplate TargetType="fcontrols:PropertiesViewForm">
+					<Grid>
 						<Grid.RowDefinitions>
+							<RowDefinition Height="Auto" />
 							<RowDefinition Height="*" />
 							<RowDefinition Height="Auto" />
 						</Grid.RowDefinitions>
 
-						<Border
+						<ContentPresenter
 							Grid.Row="0"
-							Padding="0,24,0,0"
-							Background="{ThemeResource LayerFillColorAltBrush}"
-							BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
-							BorderThickness="0,0,0,1">
-
-							<Grid HorizontalAlignment="Stretch">
-								<Grid.RowDefinitions>
-									<RowDefinition Height="Auto" />
-									<RowDefinition Height="Auto" />
-									<RowDefinition Height="*" />
-								</Grid.RowDefinitions>
-
-								<TextBlock
-									Grid.Row="0"
-									Margin="24,0"
-									Style="{ThemeResource SubtitleTextBlockStyle}"
-									Text="{TemplateBinding Title}" />
-
-								<ContentPresenter
-									Grid.Row="1"
-									HorizontalContentAlignment="Stretch"
-									VerticalContentAlignment="Stretch"
-									Content="{TemplateBinding Header}" />
-
-								<ContentPresenter
-									Grid.Row="2"
-									HorizontalContentAlignment="Stretch"
-									VerticalContentAlignment="Stretch"
-									BorderBrush="{ThemeResource DividerStrokeColorDefaultBrush}"
-									BorderThickness="0,1,0,0"
-									Content="{TemplateBinding Content}" />
-
-							</Grid>
+							HorizontalContentAlignment="Stretch"
+							VerticalContentAlignment="Stretch"
+							BorderBrush="{ThemeResource DividerStrokeColorDefaultBrush}"
+							BorderThickness="0,0,0,1"
+							Content="{TemplateBinding Header}" />
 
-						</Border>
+						<ScrollViewer
+							Grid.Row="1"
+							HorizontalScrollBarVisibility="Disabled"
+							HorizontalScrollMode="Disabled"
+							VerticalScrollBarVisibility="Auto"
+							VerticalScrollMode="Auto">
+							<ItemsPresenter Margin="0,0,0,32" />
+						</ScrollViewer>
 
 						<ContentPresenter
-							Grid.Row="1"
-							Padding="24,24,24,24"
-							HorizontalAlignment="Stretch"
-							VerticalAlignment="Stretch"
+							Grid.Row="2"
 							HorizontalContentAlignment="Stretch"
 							VerticalContentAlignment="Stretch"
 							Content="{TemplateBinding Footer}" />
@@ -76,31 +56,6 @@
 		</Setter>
 	</Style>
 
-	<Style x:Key="DefaultPropertiesViewFormStyle" TargetType="fcontrols:PropertiesViewForm">
-		<Setter Property="VerticalAlignment" Value="Stretch" />
-		<Setter Property="HorizontalAlignment" Value="Stretch" />
-		<Setter Property="ItemsPanel">
-			<Setter.Value>
-				<ItemsPanelTemplate>
-					<StackPanel HorizontalAlignment="Stretch" Orientation="Vertical" />
-				</ItemsPanelTemplate>
-			</Setter.Value>
-		</Setter>
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="fcontrols:PropertiesViewForm">
-					<ScrollViewer
-						HorizontalScrollBarVisibility="Disabled"
-						HorizontalScrollMode="Disabled"
-						VerticalScrollBarVisibility="Auto"
-						VerticalScrollMode="Auto">
-						<ItemsPresenter Margin="0,0,0,32" />
-					</ScrollViewer>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-
 	<!--  PROPERTIES VIEW ITEM - TEXT  -->
 	<Style BasedOn="{StaticResource DefaultPropertiesViewItem_Text}" TargetType="fcontrols:PropertiesViewItemText" />
 
diff --git a/src/Files.App.Controls/PropertiesView/PropertiesViewForm.cs b/src/Files.App.Controls/PropertiesView/PropertiesViewForm.cs
index eb956c329b87..66e25aff7108 100644
--- a/src/Files.App.Controls/PropertiesView/PropertiesViewForm.cs
+++ b/src/Files.App.Controls/PropertiesView/PropertiesViewForm.cs
@@ -1,10 +1,18 @@
 // Copyright (c) Files Community
 // SPDX-License-Identifier: MPL-2.0
 
+using CommunityToolkit.WinUI;
+
 namespace Files.App.Controls
 {
 	public partial class PropertiesViewForm : ItemsControl
 	{
+		[GeneratedDependencyProperty]
+		public partial FrameworkElement? Header { get; set; }
+
+		[GeneratedDependencyProperty]
+		public partial FrameworkElement? Footer { get; set; }
+
 		public PropertiesViewForm()
 		{
 			DefaultStyleKey = typeof(PropertiesViewForm);
diff --git a/src/Files.App.Controls/Themes/Generic.xaml b/src/Files.App.Controls/Themes/Generic.xaml
index 3004cf59b115..5e22ad5c7cb9 100644
--- a/src/Files.App.Controls/Themes/Generic.xaml
+++ b/src/Files.App.Controls/Themes/Generic.xaml
@@ -81,5 +81,9 @@
 		<ResourceDictionary Source="ms-appx:///Files.App.Controls/PropertiesView/PropertiesViewSection.xaml" />
 		<!--#endregion-->
 
+		<!--#region WindowedDialog-->
+		<ResourceDictionary Source="ms-appx:///Files.App.Controls/WindowedDialog/WindowedDialogRoot.xaml" />
+		<!--#endregion-->
+
 	</ResourceDictionary.MergedDictionaries>
 </ResourceDictionary>
diff --git a/src/Files.App.Controls/WindowedDialog/WindowedDialog.cs b/src/Files.App.Controls/WindowedDialog/WindowedDialog.cs
new file mode 100644
index 000000000000..b9f3273a5af8
--- /dev/null
+++ b/src/Files.App.Controls/WindowedDialog/WindowedDialog.cs
@@ -0,0 +1,33 @@
+// Copyright (c) Files Community
+// SPDX-License-Identifier: MPL-2.0
+
+namespace Files.App.Controls;
+
+public class WindowedDialog : Window
+{
+	private readonly WindowedDialogRoot _root;
+
+	public WindowedDialog()
+	{
+		_root = new();
+		Content = _root;
+	}
+
+	public FrameworkElement? Header
+	{
+		get => _root.Header;
+		set => _root.Header = value;
+	}
+
+	public object RootContent
+	{
+		get => _root.Content;
+		set => _root.Content = value;
+	}
+
+	public FrameworkElement? Footer
+	{
+		get => _root.Footer;
+		set => _root.Footer = value;
+	}
+}
diff --git a/src/Files.App.Controls/WindowedDialog/WindowedDialogRoot.cs b/src/Files.App.Controls/WindowedDialog/WindowedDialogRoot.cs
new file mode 100644
index 000000000000..d95b78fe66d2
--- /dev/null
+++ b/src/Files.App.Controls/WindowedDialog/WindowedDialogRoot.cs
@@ -0,0 +1,23 @@
+// Copyright (c) Files Community
+// SPDX-License-Identifier: MPL-2.0
+
+using CommunityToolkit.WinUI;
+
+namespace Files.App.Controls;
+
+internal partial class WindowedDialogRoot : ContentControl
+{
+	[GeneratedDependencyProperty]
+	internal partial string? Title { get; set; }
+
+	[GeneratedDependencyProperty]
+	internal partial FrameworkElement? Header { get; set; }
+
+	[GeneratedDependencyProperty]
+	internal partial FrameworkElement? Footer { get; set; }
+
+	internal WindowedDialogRoot()
+	{
+		DefaultStyleKey = typeof(WindowedDialogRoot);
+	}
+}
diff --git a/src/Files.App.Controls/WindowedDialog/WindowedDialogRoot.xaml b/src/Files.App.Controls/WindowedDialog/WindowedDialogRoot.xaml
new file mode 100644
index 000000000000..1579f8616a0f
--- /dev/null
+++ b/src/Files.App.Controls/WindowedDialog/WindowedDialogRoot.xaml
@@ -0,0 +1,77 @@
+<!--  Copyright (c) Files Community. SPDX-License-Identifier: MPL-2.0  -->
+<ResourceDictionary
+	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	xmlns:local="using:Files.App.Controls">
+
+	<Style BasedOn="{StaticResource DefaultWindowedDialogRootStyle}" TargetType="local:WindowedDialogRoot" />
+
+	<Style x:Key="DefaultWindowedDialogRootStyle" TargetType="local:WindowedDialogRoot">
+		<Setter Property="VerticalAlignment" Value="Stretch" />
+		<Setter Property="HorizontalAlignment" Value="Stretch" />
+		<Setter Property="VerticalContentAlignment" Value="Stretch" />
+		<Setter Property="HorizontalContentAlignment" Value="Stretch" />
+		<Setter Property="Background" Value="{ThemeResource SolidBackgroundFillColorBaseBrush}" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="local:WindowedDialogRoot">
+					<Grid Background="{TemplateBinding Background}">
+						<Grid.RowDefinitions>
+							<RowDefinition Height="*" />
+							<RowDefinition Height="Auto" />
+						</Grid.RowDefinitions>
+
+						<Border
+							Grid.Row="0"
+							Padding="0,24,0,0"
+							Background="{ThemeResource LayerFillColorAltBrush}"
+							BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
+							BorderThickness="0,0,0,1">
+
+							<Grid HorizontalAlignment="Stretch">
+								<Grid.RowDefinitions>
+									<RowDefinition Height="Auto" />
+									<RowDefinition Height="Auto" />
+									<RowDefinition Height="*" />
+								</Grid.RowDefinitions>
+
+								<TextBlock
+									Grid.Row="0"
+									Margin="24,0"
+									Style="{ThemeResource SubtitleTextBlockStyle}"
+									Text="{TemplateBinding Title}" />
+
+								<ContentPresenter
+									Grid.Row="1"
+									HorizontalContentAlignment="Stretch"
+									VerticalContentAlignment="Stretch"
+									Content="{TemplateBinding Header}" />
+
+								<ContentPresenter
+									Grid.Row="2"
+									HorizontalContentAlignment="Stretch"
+									VerticalContentAlignment="Stretch"
+									BorderBrush="{ThemeResource DividerStrokeColorDefaultBrush}"
+									BorderThickness="0,1,0,0"
+									Content="{TemplateBinding Content}" />
+
+							</Grid>
+
+						</Border>
+
+						<ContentPresenter
+							Grid.Row="1"
+							Padding="24,24,24,24"
+							HorizontalAlignment="Stretch"
+							VerticalAlignment="Stretch"
+							HorizontalContentAlignment="Stretch"
+							VerticalContentAlignment="Stretch"
+							Content="{TemplateBinding Footer}" />
+
+					</Grid>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+
+</ResourceDictionary>
diff --git a/tests/Files.App.UITests/Dialogs/PropertiesDetailsPage.xaml b/tests/Files.App.UITests/Dialogs/PropertiesDetailsPage.xaml
new file mode 100644
index 000000000000..92be25b97310
--- /dev/null
+++ b/tests/Files.App.UITests/Dialogs/PropertiesDetailsPage.xaml
@@ -0,0 +1,11 @@
+<Page
+	x:Class="Files.App.UITests.Dialogs.PropertiesDetailsPage"
+	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:local="using:Files.App.UITests.Dialogs"
+	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+	mc:Ignorable="d">
+
+	<Grid />
+</Page>
diff --git a/tests/Files.App.UITests/Dialogs/PropertiesDetailsPage.xaml.cs b/tests/Files.App.UITests/Dialogs/PropertiesDetailsPage.xaml.cs
new file mode 100644
index 000000000000..181303b35e9e
--- /dev/null
+++ b/tests/Files.App.UITests/Dialogs/PropertiesDetailsPage.xaml.cs
@@ -0,0 +1,15 @@
+// Copyright (c) Files Community
+// SPDX-License-Identifier: MPL-2.0
+
+using Microsoft.UI.Xaml.Controls;
+
+namespace Files.App.UITests.Dialogs
+{
+	public sealed partial class PropertiesDetailsPage : Page
+	{
+		public PropertiesDetailsPage()
+		{
+			InitializeComponent();
+		}
+	}
+}
diff --git a/tests/Files.App.UITests/Dialogs/PropertiesDialog.xaml b/tests/Files.App.UITests/Dialogs/PropertiesDialog.xaml
index dd92d211e715..4db7c7c008f4 100644
--- a/tests/Files.App.UITests/Dialogs/PropertiesDialog.xaml
+++ b/tests/Files.App.UITests/Dialogs/PropertiesDialog.xaml
@@ -1,5 +1,5 @@
 <!--  Copyright (c) Files Community. SPDX-License-Identifier: MPL-2.0  -->
-<Window
+<controls:WindowedDialog
 	x:Class="Files.App.UITests.Dialogs.PropertiesDialog"
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -7,45 +7,46 @@
 	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 	xmlns:local="using:Files.App.UITests.Dialogs"
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-	Title="Properties title for window"
+	Title="Properties title"
 	mc:Ignorable="d">
 
-	<controls:PropertiesView Title="Properties title">
-
-		<controls:PropertiesView.Header>
-			<SelectorBar Grid.Row="1" Padding="12,4">
-				<SelectorBarItem IsSelected="True" Text="General" />
-				<SelectorBarItem Text="Signatures" />
-				<SelectorBarItem Text="Security" />
-				<SelectorBarItem Text="Details" />
-				<SelectorBarItem Text="Hashes" />
-				<SelectorBarItem Text="Compatibility" />
-			</SelectorBar>
-		</controls:PropertiesView.Header>
-
+	<controls:WindowedDialog.Header>
+		<SelectorBar Padding="12,4" SelectionChanged="SelectorBar_SelectionChanged">
+			<SelectorBarItem
+				IsSelected="True"
+				Tag="PropertiesGeneralPage"
+				Text="General" />
+			<SelectorBarItem Tag="PropertiesSignaturesPage" Text="Signatures" />
+			<SelectorBarItem Tag="PropertiesSecurityPage" Text="Security" />
+			<SelectorBarItem Tag="PropertiesDetailsPage" Text="Details" />
+			<SelectorBarItem Tag="PropertiesHashesPage" Text="Hashes" />
+			<SelectorBarItem Tag="PropertiesCompatibilityPage" Text="Compatibility" />
+		</SelectorBar>
+	</controls:WindowedDialog.Header>
+
+	<controls:WindowedDialog.RootContent>
 		<Frame x:Name="MainContentFrame" IsNavigationStackEnabled="False" />
-
-		<controls:PropertiesView.Footer>
-			<Grid ColumnSpacing="8">
-				<Grid.ColumnDefinitions>
-					<ColumnDefinition Width="*" />
-					<ColumnDefinition Width="*" />
-				</Grid.ColumnDefinitions>
-
-				<Button
-					Grid.Column="0"
-					HorizontalAlignment="Stretch"
-					Content="Apply"
-					Style="{ThemeResource AccentButtonStyle}" />
-
-				<Button
-					Grid.Column="1"
-					HorizontalAlignment="Stretch"
-					Content="Cancel" />
-
-			</Grid>
-		</controls:PropertiesView.Footer>
-
-	</controls:PropertiesView>
-
-</Window>
+	</controls:WindowedDialog.RootContent>
+
+	<controls:WindowedDialog.Footer>
+		<Grid ColumnSpacing="8">
+			<Grid.ColumnDefinitions>
+				<ColumnDefinition Width="*" />
+				<ColumnDefinition Width="*" />
+			</Grid.ColumnDefinitions>
+
+			<Button
+				Grid.Column="0"
+				HorizontalAlignment="Stretch"
+				Content="Apply"
+				Style="{ThemeResource AccentButtonStyle}" />
+
+			<Button
+				Grid.Column="1"
+				HorizontalAlignment="Stretch"
+				Content="Cancel" />
+
+		</Grid>
+	</controls:WindowedDialog.Footer>
+
+</controls:WindowedDialog>
diff --git a/tests/Files.App.UITests/Dialogs/PropertiesDialog.xaml.cs b/tests/Files.App.UITests/Dialogs/PropertiesDialog.xaml.cs
index 39f418e42224..084d2b202e21 100644
--- a/tests/Files.App.UITests/Dialogs/PropertiesDialog.xaml.cs
+++ b/tests/Files.App.UITests/Dialogs/PropertiesDialog.xaml.cs
@@ -1,12 +1,14 @@
 // Copyright (c) Files Community
 // SPDX-License-Identifier: MPL-2.0
 
-using Microsoft.UI.Xaml;
+using Files.App.Controls;
 using Microsoft.UI.Windowing;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
 
 namespace Files.App.UITests.Dialogs
 {
-	public sealed partial class PropertiesDialog : Window
+	public sealed partial class PropertiesDialog : WindowedDialog
 	{
 		public PropertiesDialog()
 		{
@@ -20,8 +22,19 @@ public PropertiesDialog()
 			AppWindow.TitleBar.PreferredTheme = TitleBarTheme.UseDefaultAppMode;
 			presenter.PreferredMinimumHeight = 800;
 			presenter.PreferredMinimumWidth = 800;
+		}
 
-			MainContentFrame?.Navigate(typeof(PropertiesGeneralPage));
+		private void SelectorBar_SelectionChanged(SelectorBar sender, SelectorBarSelectionChangedEventArgs args)
+		{
+			switch (sender.SelectedItem.Tag)
+			{
+				case nameof(PropertiesGeneralPage):
+					MainContentFrame?.Navigate(typeof(PropertiesGeneralPage));
+					break;
+				case nameof(PropertiesDetailsPage):
+					MainContentFrame?.Navigate(typeof(PropertiesDetailsPage));
+					break;
+			}
 		}
 	}
 }
diff --git a/tests/Files.App.UITests/Dialogs/PropertiesGeneralPage.xaml b/tests/Files.App.UITests/Dialogs/PropertiesGeneralPage.xaml
index 54567934a882..c6492fab6b85 100644
--- a/tests/Files.App.UITests/Dialogs/PropertiesGeneralPage.xaml
+++ b/tests/Files.App.UITests/Dialogs/PropertiesGeneralPage.xaml
@@ -18,21 +18,10 @@
 		</ResourceDictionary>
 	</Page.Resources>
 
-	<Grid x:Name="RootGrid">
-		<Grid.RowDefinitions>
-			<RowDefinition Height="Auto" />
-			<RowDefinition Height="*" />
-		</Grid.RowDefinitions>
-
-		<Border
-			x:Name="GeneralHeader"
-			Grid.Row="0"
-			Padding="24,20"
-			VerticalAlignment="Stretch"
-			BorderBrush="{ThemeResource DividerStrokeColorDefaultBrush}"
-			BorderThickness="0,0,0,1">
-
-			<Grid>
+	<controls:PropertiesViewForm>
+
+		<controls:PropertiesViewForm.Header>
+			<Grid Padding="24,20">
 				<Grid.ColumnDefinitions>
 					<ColumnDefinition Width="{StaticResource LabelWidth}" />
 					<ColumnDefinition Width="*" />
@@ -65,286 +54,281 @@
 				</StackPanel>
 
 			</Grid>
+		</controls:PropertiesViewForm.Header>
+
+		<Expander IsExpanded="True" Style="{StaticResource PropertiesExpanderStyle}">
+			<Expander.Header>
+				<controls:PropertiesHeader Text="Header text goes here">
+					<controls:PropertiesHeader.Icon>
+						<SymbolIcon Symbol="AddFriend" />
+					</controls:PropertiesHeader.Icon>
+				</controls:PropertiesHeader>
+			</Expander.Header>
+
+			<Expander.Content>
+
+				<StackPanel
+					Padding="0,0,0,8"
+					HorizontalAlignment="Stretch"
+					Orientation="Vertical">
+					<controls:PropertiesViewItemText
+						CanEdit="True"
+						Label="Item label 1"
+						LabelWidth="{StaticResource LabelWidth}"
+						Orientation="Horizontal"
+						Text="Item value 1 text here" />
+					<MenuFlyoutSeparator />
+					<controls:PropertiesViewItemInfo
+						CanEdit="False"
+						InfoText="Detailed text to display with hover."
+						Label="Item info label 1"
+						LabelWidth="{StaticResource LabelWidth}"
+						Orientation="Horizontal"
+						Text="Info item value 1 text" />
+					<MenuFlyoutSeparator />
+					<controls:PropertiesViewItemInfo
+						CanEdit="True"
+						InfoText="Detailed text to display with hover."
+						Label="Item info label 1"
+						LabelWidth="{StaticResource LabelWidth}"
+						Orientation="Horizontal"
+						Text="Info item value 1 text" />
+					<MenuFlyoutSeparator />
+					<controls:PropertiesViewItemInfo
+						InfoText="Detailed text to display with hover."
+						IsEnabled="False"
+						Label="Disabled info label 1"
+						LabelWidth="{StaticResource LabelWidth}"
+						Orientation="Horizontal"
+						Text="Info item value 1 text" />
+					<MenuFlyoutSeparator />
+					<controls:PropertiesViewItemText
+						Label="Item label t00 extra long to demonstrate the wrapping for Labels"
+						LabelWidth="{StaticResource LabelWidth}"
+						Orientation="Horizontal"
+						Text="Item value t00 text here" />
+					<MenuFlyoutSeparator />
+					<controls:PropertiesViewItemText
+						IsEnabled="False"
+						Label="Disabled - CanEdit set to False"
+						LabelWidth="{StaticResource LabelWidth}"
+						Orientation="Horizontal"
+						Text="Item value t00 text here" />
+					<MenuFlyoutSeparator />
+					<controls:PropertiesViewItemText
+						CanEdit="True"
+						IsEnabled="False"
+						Label="Disabled - CanEdit set to True"
+						LabelWidth="{StaticResource LabelWidth}"
+						Orientation="Horizontal"
+						Text="Item value t00 text here" />
+					<MenuFlyoutSeparator />
+					<controls:PropertiesViewItemText
+						Label="Item label three"
+						LabelWidth="{StaticResource LabelWidth}"
+						Orientation="Horizontal"
+						Text="Item value three text here, extra long to show how text values will wrap onto mnany lines." />
+				</StackPanel>
+			</Expander.Content>
+		</Expander>
+
+		<Expander Style="{StaticResource PropertiesExpanderStyle}">
+			<Expander.Header>
+				<controls:PropertiesHeader Text="Header text goes here, made extra long to ensure wrapping and arranging within the header works as expected">
+					<controls:PropertiesHeader.Icon>
+						<SymbolIcon Symbol="Comment" />
+					</controls:PropertiesHeader.Icon>
+				</controls:PropertiesHeader>
+			</Expander.Header>
+
+			<Expander.Content>
+				<StackPanel
+					Padding="0,0,0,8"
+					HorizontalAlignment="Stretch"
+					Orientation="Vertical">
+					<controls:PropertiesViewItemRating
+						Label="Item label 1 readonly"
+						LabelWidth="{StaticResource LabelWidth}"
+						Orientation="Horizontal"
+						Rating="9345" />
+					<MenuFlyoutSeparator Margin="16,0" />
+					<controls:PropertiesViewItemRating
+						CanEdit="True"
+						Label="Item label t00 editable"
+						Orientation="Horizontal"
+						Rating="-23" />
+					<MenuFlyoutSeparator Margin="16,0" />
+					<controls:PropertiesViewItemRating
+						CanEdit="False"
+						Label="Item label three readonly"
+						Orientation="Horizontal"
+						Rating="32" />
+					<MenuFlyoutSeparator Margin="16,0" />
+					<controls:PropertiesViewItemRating
+						CanEdit="False"
+						IsEnabled="False"
+						Label="Disabled item label"
+						Orientation="Horizontal"
+						Rating="50" />
+					<MenuFlyoutSeparator Margin="16,0" />
+					<controls:PropertiesViewItemRating
+						CanEdit="True"
+						IsEnabled="False"
+						Label="Disabled, editable label"
+						Orientation="Horizontal"
+						Rating="50" />
+					<MenuFlyoutSeparator Margin="16,0" />
+					<controls:PropertiesViewItemRating
+						CanEdit="True"
+						Label="Item label 4ore editable"
+						Orientation="Horizontal"
+						Rating="72" />
+				</StackPanel>
+			</Expander.Content>
+		</Expander>
+
+		<Expander Style="{StaticResource PropertiesExpanderStyle}">
+			<Expander.Header>
+				<controls:PropertiesHeader Text="Vertical examples">
+					<controls:PropertiesHeader.Icon>
+						<SymbolIcon Symbol="SlideShow" />
+					</controls:PropertiesHeader.Icon>
+				</controls:PropertiesHeader>
+			</Expander.Header>
+
+			<Expander.Content>
+				<StackPanel HorizontalAlignment="Stretch" Orientation="Vertical">
+
+					<controls:PropertiesViewItemText
+						CanEdit="True"
+						Label="Item label 1"
+						LabelWidth="{StaticResource LabelWidth}"
+						Orientation="Vertical"
+						Text="Item value 1 text here" />
+
+					<MenuFlyoutSeparator />
+
+					<controls:PropertiesViewItemInfo
+						CanEdit="False"
+						InfoText="Detailed text to display with the button press."
+						Label="Item info label 1"
+						LabelWidth="{StaticResource LabelWidth}"
+						Orientation="Vertical"
+						Text="Info item value 1 text" />
+
+					<MenuFlyoutSeparator />
+
+					<controls:PropertiesViewItemInfo
+						CanEdit="True"
+						InfoText="Detailed text to display with the button press."
+						Label="Item info label 1"
+						LabelWidth="{StaticResource LabelWidth}"
+						Orientation="Vertical"
+						Text="Info item value 1 text" />
+
+					<MenuFlyoutSeparator />
+
+					<controls:PropertiesViewItemRating
+						CanEdit="True"
+						Label="Really long label wrapping when using a vertical layout example here for your viewing pleasure."
+						Orientation="Vertical"
+						Rating="54" />
+
+					<MenuFlyoutSeparator />
+
+					<controls:PropertiesViewItemText
+						CanEdit="False"
+						Label="Item label three"
+						LabelWidth="{StaticResource LabelWidth}"
+						Orientation="Vertical"
+						Text="Item value 1 text here, made long so we can see how wrapping will work for this vertical exanple of the control layout. " />
+				</StackPanel>
+			</Expander.Content>
+		</Expander>
+
+		<Expander IsExpanded="True" Style="{StaticResource PropertiesExpanderStyle}">
+			<Expander.Header>
+				<controls:PropertiesHeader Text="Toggle Items">
+					<controls:PropertiesHeader.Icon>
+						<SymbolIcon Symbol="XboxOneConsole" />
+					</controls:PropertiesHeader.Icon>
+				</controls:PropertiesHeader>
+			</Expander.Header>
+			<Expander.Content>
+				<StackPanel HorizontalAlignment="Stretch" Orientation="Vertical">
+					<controls:PropertiesViewItemToggle
+						IsEnabled="True"
+						IsToggled="True"
+						Label="Enabled and On"
+						LabelWidth="{StaticResource LabelWidth}"
+						Orientation="Horizontal" />
+
+					<MenuFlyoutSeparator />
+
+					<controls:PropertiesViewItemToggle
+						IsEnabled="True"
+						IsToggled="False"
+						Label="Enabled and Off"
+						LabelWidth="{StaticResource LabelWidth}"
+						Orientation="Horizontal" />
+
+					<MenuFlyoutSeparator />
+
+					<controls:PropertiesViewItemToggle
+						IsEnabled="False"
+						IsToggled="True"
+						Label="Disabled and On"
+						LabelWidth="{StaticResource LabelWidth}"
+						Orientation="Horizontal" />
+
+					<MenuFlyoutSeparator />
+
+					<controls:PropertiesViewItemToggle
+						IsEnabled="False"
+						IsToggled="False"
+						Label="Disabled and Off"
+						LabelWidth="{StaticResource LabelWidth}"
+						Orientation="Horizontal" />
+
+					<MenuFlyoutSeparator />
+
+					<controls:PropertiesViewItemToggle
+						IsEnabled="True"
+						IsToggled="True"
+						Label="Enabled and On"
+						LabelWidth="{StaticResource LabelWidth}"
+						Orientation="Vertical" />
+
+					<MenuFlyoutSeparator />
+
+					<controls:PropertiesViewItemToggle
+						IsEnabled="True"
+						IsToggled="False"
+						Label="Enabled and Off"
+						LabelWidth="{StaticResource LabelWidth}"
+						Orientation="Vertical" />
+
+					<MenuFlyoutSeparator />
+
+					<controls:PropertiesViewItemToggle
+						IsEnabled="False"
+						IsToggled="True"
+						Label="Disabled and On"
+						LabelWidth="{StaticResource LabelWidth}"
+						Orientation="Vertical" />
+
+					<MenuFlyoutSeparator />
+
+					<controls:PropertiesViewItemToggle
+						IsEnabled="False"
+						IsToggled="False"
+						Label="Disabled and Off"
+						LabelWidth="{StaticResource LabelWidth}"
+						Orientation="Vertical" />
+				</StackPanel>
+			</Expander.Content>
+		</Expander>
 
-		</Border>
-
-		<controls:PropertiesViewForm Grid.Row="1">
-
-			<Expander IsExpanded="True" Style="{StaticResource PropertiesExpanderStyle}">
-				<Expander.Header>
-					<controls:PropertiesHeader Text="Header text goes here">
-						<controls:PropertiesHeader.Icon>
-							<SymbolIcon Symbol="AddFriend" />
-						</controls:PropertiesHeader.Icon>
-					</controls:PropertiesHeader>
-				</Expander.Header>
-
-				<Expander.Content>
-
-					<StackPanel
-						Padding="0,0,0,8"
-						HorizontalAlignment="Stretch"
-						Orientation="Vertical">
-						<controls:PropertiesViewItemText
-							CanEdit="True"
-							Label="Item label 1"
-							LabelWidth="{StaticResource LabelWidth}"
-							Orientation="Horizontal"
-							Text="Item value 1 text here" />
-						<MenuFlyoutSeparator />
-						<controls:PropertiesViewItemInfo
-							CanEdit="False"
-							InfoText="Detailed text to display with hover."
-							Label="Item info label 1"
-							LabelWidth="{StaticResource LabelWidth}"
-							Orientation="Horizontal"
-							Text="Info item value 1 text" />
-						<MenuFlyoutSeparator />
-						<controls:PropertiesViewItemInfo
-							CanEdit="True"
-							InfoText="Detailed text to display with hover."
-							Label="Item info label 1"
-							LabelWidth="{StaticResource LabelWidth}"
-							Orientation="Horizontal"
-							Text="Info item value 1 text" />
-						<MenuFlyoutSeparator />
-						<controls:PropertiesViewItemInfo
-							InfoText="Detailed text to display with hover."
-							IsEnabled="False"
-							Label="Disabled info label 1"
-							LabelWidth="{StaticResource LabelWidth}"
-							Orientation="Horizontal"
-							Text="Info item value 1 text" />
-						<MenuFlyoutSeparator />
-						<controls:PropertiesViewItemText
-							Label="Item label t00 extra long to demonstrate the wrapping for Labels"
-							LabelWidth="{StaticResource LabelWidth}"
-							Orientation="Horizontal"
-							Text="Item value t00 text here" />
-						<MenuFlyoutSeparator />
-						<controls:PropertiesViewItemText
-							IsEnabled="False"
-							Label="Disabled - CanEdit set to False"
-							LabelWidth="{StaticResource LabelWidth}"
-							Orientation="Horizontal"
-							Text="Item value t00 text here" />
-						<MenuFlyoutSeparator />
-						<controls:PropertiesViewItemText
-							CanEdit="True"
-							IsEnabled="False"
-							Label="Disabled - CanEdit set to True"
-							LabelWidth="{StaticResource LabelWidth}"
-							Orientation="Horizontal"
-							Text="Item value t00 text here" />
-						<MenuFlyoutSeparator />
-						<controls:PropertiesViewItemText
-							Label="Item label three"
-							LabelWidth="{StaticResource LabelWidth}"
-							Orientation="Horizontal"
-							Text="Item value three text here, extra long to show how text values will wrap onto mnany lines." />
-					</StackPanel>
-				</Expander.Content>
-			</Expander>
-
-			<Expander Style="{StaticResource PropertiesExpanderStyle}">
-				<Expander.Header>
-					<controls:PropertiesHeader Text="Header text goes here, made extra long to ensure wrapping and arranging within the header works as expected">
-						<controls:PropertiesHeader.Icon>
-							<SymbolIcon Symbol="Comment" />
-						</controls:PropertiesHeader.Icon>
-					</controls:PropertiesHeader>
-				</Expander.Header>
-
-				<Expander.Content>
-					<StackPanel
-						Padding="0,0,0,8"
-						HorizontalAlignment="Stretch"
-						Orientation="Vertical">
-						<controls:PropertiesViewItemRating
-							Label="Item label 1 readonly"
-							LabelWidth="{StaticResource LabelWidth}"
-							Orientation="Horizontal"
-							Rating="9345" />
-						<MenuFlyoutSeparator Margin="16,0" />
-						<controls:PropertiesViewItemRating
-							CanEdit="True"
-							Label="Item label t00 editable"
-							Orientation="Horizontal"
-							Rating="-23" />
-						<MenuFlyoutSeparator Margin="16,0" />
-						<controls:PropertiesViewItemRating
-							CanEdit="False"
-							Label="Item label three readonly"
-							Orientation="Horizontal"
-							Rating="32" />
-						<MenuFlyoutSeparator Margin="16,0" />
-						<controls:PropertiesViewItemRating
-							CanEdit="False"
-							IsEnabled="False"
-							Label="Disabled item label"
-							Orientation="Horizontal"
-							Rating="50" />
-						<MenuFlyoutSeparator Margin="16,0" />
-						<controls:PropertiesViewItemRating
-							CanEdit="True"
-							IsEnabled="False"
-							Label="Disabled, editable label"
-							Orientation="Horizontal"
-							Rating="50" />
-						<MenuFlyoutSeparator Margin="16,0" />
-						<controls:PropertiesViewItemRating
-							CanEdit="True"
-							Label="Item label 4ore editable"
-							Orientation="Horizontal"
-							Rating="72" />
-					</StackPanel>
-				</Expander.Content>
-			</Expander>
-
-			<Expander Style="{StaticResource PropertiesExpanderStyle}">
-				<Expander.Header>
-					<controls:PropertiesHeader Text="Vertical examples">
-						<controls:PropertiesHeader.Icon>
-							<SymbolIcon Symbol="SlideShow" />
-						</controls:PropertiesHeader.Icon>
-					</controls:PropertiesHeader>
-				</Expander.Header>
-
-				<Expander.Content>
-					<StackPanel HorizontalAlignment="Stretch" Orientation="Vertical">
-
-						<controls:PropertiesViewItemText
-							CanEdit="True"
-							Label="Item label 1"
-							LabelWidth="{StaticResource LabelWidth}"
-							Orientation="Vertical"
-							Text="Item value 1 text here" />
-
-						<MenuFlyoutSeparator />
-
-						<controls:PropertiesViewItemInfo
-							CanEdit="False"
-							InfoText="Detailed text to display with the button press."
-							Label="Item info label 1"
-							LabelWidth="{StaticResource LabelWidth}"
-							Orientation="Vertical"
-							Text="Info item value 1 text" />
-
-						<MenuFlyoutSeparator />
-
-						<controls:PropertiesViewItemInfo
-							CanEdit="True"
-							InfoText="Detailed text to display with the button press."
-							Label="Item info label 1"
-							LabelWidth="{StaticResource LabelWidth}"
-							Orientation="Vertical"
-							Text="Info item value 1 text" />
-
-						<MenuFlyoutSeparator />
-
-						<controls:PropertiesViewItemRating
-							CanEdit="True"
-							Label="Really long label wrapping when using a vertical layout example here for your viewing pleasure."
-							Orientation="Vertical"
-							Rating="54" />
-
-						<MenuFlyoutSeparator />
-
-						<controls:PropertiesViewItemText
-							CanEdit="False"
-							Label="Item label three"
-							LabelWidth="{StaticResource LabelWidth}"
-							Orientation="Vertical"
-							Text="Item value 1 text here, made long so we can see how wrapping will work for this vertical exanple of the control layout. " />
-					</StackPanel>
-				</Expander.Content>
-			</Expander>
-
-			<Expander IsExpanded="True" Style="{StaticResource PropertiesExpanderStyle}">
-				<Expander.Header>
-					<controls:PropertiesHeader Text="Toggle Items">
-						<controls:PropertiesHeader.Icon>
-							<SymbolIcon Symbol="XboxOneConsole" />
-						</controls:PropertiesHeader.Icon>
-					</controls:PropertiesHeader>
-				</Expander.Header>
-				<Expander.Content>
-					<StackPanel HorizontalAlignment="Stretch" Orientation="Vertical">
-						<controls:PropertiesViewItemToggle
-							IsEnabled="True"
-							IsToggled="True"
-							Label="Enabled and On"
-							LabelWidth="{StaticResource LabelWidth}"
-							Orientation="Horizontal" />
-
-						<MenuFlyoutSeparator />
-
-						<controls:PropertiesViewItemToggle
-							IsEnabled="True"
-							IsToggled="False"
-							Label="Enabled and Off"
-							LabelWidth="{StaticResource LabelWidth}"
-							Orientation="Horizontal" />
-
-						<MenuFlyoutSeparator />
-
-						<controls:PropertiesViewItemToggle
-							IsEnabled="False"
-							IsToggled="True"
-							Label="Disabled and On"
-							LabelWidth="{StaticResource LabelWidth}"
-							Orientation="Horizontal" />
-
-						<MenuFlyoutSeparator />
-
-						<controls:PropertiesViewItemToggle
-							IsEnabled="False"
-							IsToggled="False"
-							Label="Disabled and Off"
-							LabelWidth="{StaticResource LabelWidth}"
-							Orientation="Horizontal" />
-
-						<MenuFlyoutSeparator />
-
-						<controls:PropertiesViewItemToggle
-							IsEnabled="True"
-							IsToggled="True"
-							Label="Enabled and On"
-							LabelWidth="{StaticResource LabelWidth}"
-							Orientation="Vertical" />
-
-						<MenuFlyoutSeparator />
-
-						<controls:PropertiesViewItemToggle
-							IsEnabled="True"
-							IsToggled="False"
-							Label="Enabled and Off"
-							LabelWidth="{StaticResource LabelWidth}"
-							Orientation="Vertical" />
-
-						<MenuFlyoutSeparator />
-
-						<controls:PropertiesViewItemToggle
-							IsEnabled="False"
-							IsToggled="True"
-							Label="Disabled and On"
-							LabelWidth="{StaticResource LabelWidth}"
-							Orientation="Vertical" />
-
-						<MenuFlyoutSeparator />
-
-						<controls:PropertiesViewItemToggle
-							IsEnabled="False"
-							IsToggled="False"
-							Label="Disabled and Off"
-							LabelWidth="{StaticResource LabelWidth}"
-							Orientation="Vertical" />
-					</StackPanel>
-				</Expander.Content>
-			</Expander>
-
-		</controls:PropertiesViewForm>
-
-	</Grid>
+	</controls:PropertiesViewForm>
 
 </Page>
diff --git a/tests/Files.App.UITests/Files.App.UITests.csproj b/tests/Files.App.UITests/Files.App.UITests.csproj
index dbdc7bc326db..11983ddedba6 100644
--- a/tests/Files.App.UITests/Files.App.UITests.csproj
+++ b/tests/Files.App.UITests/Files.App.UITests.csproj
@@ -22,6 +22,10 @@
     <Content Include="Data\**\*.png" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Remove="Dialogs\PropertiesDetailsPage.xaml" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\src\Files.App.Controls\Files.App.Controls.csproj" />
     <PackageReference Include="Microsoft.Windows.SDK.BuildTools" />
@@ -32,6 +36,11 @@
   <ItemGroup Condition="'$(DisableMsixProjectCapabilityAddedByProject)'!='true' and '$(EnableMsixTooling)'=='true'">
     <ProjectCapability Include="Msix" />
   </ItemGroup>
+  <ItemGroup>
+    <Page Update="Dialogs\PropertiesDetailsPage.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
   <!--  Allows the Solution Explorer "Package and Publish" context menu entry to be enabled for this project even if the Windows App SDK Nuget package has not yet been restored.  -->
   <PropertyGroup Condition="'$(DisableHasPackageAndPublishMenuAddedByProject)'!='true' and '$(EnableMsixTooling)'=='true'">
     <HasPackageAndPublishMenu>true</HasPackageAndPublishMenu>

From 9c01313f5f1574952fa2d667dd1dd3900c08d8e2 Mon Sep 17 00:00:00 2001
From: 0x5BFA <62196528+0x5bfa@users.noreply.github.com>
Date: Fri, 21 Aug 2026 19:56:27 +0900
Subject: [PATCH 22/36] Rename PropertiesViewForm to PropertiesView

---
 .../{PropertiesViewForm.cs => PropertiesView.cs}          | 6 +++---
 src/Files.App.Controls/PropertiesView/PropertiesView.xaml | 6 +++---
 src/Files.App.Controls/Sidebar/SidebarView.xaml           | 6 ++----
 .../Files.App.UITests/Dialogs/PropertiesGeneralPage.xaml  | 8 ++++----
 4 files changed, 12 insertions(+), 14 deletions(-)
 rename src/Files.App.Controls/PropertiesView/{PropertiesViewForm.cs => PropertiesView.cs} (70%)

diff --git a/src/Files.App.Controls/PropertiesView/PropertiesViewForm.cs b/src/Files.App.Controls/PropertiesView/PropertiesView.cs
similarity index 70%
rename from src/Files.App.Controls/PropertiesView/PropertiesViewForm.cs
rename to src/Files.App.Controls/PropertiesView/PropertiesView.cs
index 66e25aff7108..fe97f67c8f48 100644
--- a/src/Files.App.Controls/PropertiesView/PropertiesViewForm.cs
+++ b/src/Files.App.Controls/PropertiesView/PropertiesView.cs
@@ -5,7 +5,7 @@
 
 namespace Files.App.Controls
 {
-	public partial class PropertiesViewForm : ItemsControl
+	public partial class PropertiesView : ItemsControl
 	{
 		[GeneratedDependencyProperty]
 		public partial FrameworkElement? Header { get; set; }
@@ -13,9 +13,9 @@ public partial class PropertiesViewForm : ItemsControl
 		[GeneratedDependencyProperty]
 		public partial FrameworkElement? Footer { get; set; }
 
-		public PropertiesViewForm()
+		public PropertiesView()
 		{
-			DefaultStyleKey = typeof(PropertiesViewForm);
+			DefaultStyleKey = typeof(PropertiesView);
 		}
 	}
 }
diff --git a/src/Files.App.Controls/PropertiesView/PropertiesView.xaml b/src/Files.App.Controls/PropertiesView/PropertiesView.xaml
index 589b80f54b16..ad081d78243b 100644
--- a/src/Files.App.Controls/PropertiesView/PropertiesView.xaml
+++ b/src/Files.App.Controls/PropertiesView/PropertiesView.xaml
@@ -5,9 +5,9 @@
 	xmlns:animatedvisuals="using:Microsoft.UI.Xaml.Controls.AnimatedVisuals"
 	xmlns:fcontrols="using:Files.App.Controls">
 
-	<Style BasedOn="{StaticResource DefaultPropertiesViewFormStyle}" TargetType="fcontrols:PropertiesViewForm" />
+	<Style BasedOn="{StaticResource DefaultPropertiesViewStyle}" TargetType="fcontrols:PropertiesView" />
 
-	<Style x:Key="DefaultPropertiesViewFormStyle" TargetType="fcontrols:PropertiesViewForm">
+	<Style x:Key="DefaultPropertiesViewStyle" TargetType="fcontrols:PropertiesView">
 		<Setter Property="VerticalAlignment" Value="Stretch" />
 		<Setter Property="HorizontalAlignment" Value="Stretch" />
 		<Setter Property="ItemsPanel">
@@ -19,7 +19,7 @@
 		</Setter>
 		<Setter Property="Template">
 			<Setter.Value>
-				<ControlTemplate TargetType="fcontrols:PropertiesViewForm">
+				<ControlTemplate TargetType="fcontrols:PropertiesView">
 					<Grid>
 						<Grid.RowDefinitions>
 							<RowDefinition Height="Auto" />
diff --git a/src/Files.App.Controls/Sidebar/SidebarView.xaml b/src/Files.App.Controls/Sidebar/SidebarView.xaml
index 987f677b1567..ad1e4af7b0fe 100644
--- a/src/Files.App.Controls/Sidebar/SidebarView.xaml
+++ b/src/Files.App.Controls/Sidebar/SidebarView.xaml
@@ -12,14 +12,12 @@
 	mc:Ignorable="d">
 
 	<UserControl.Resources>
-		<DataTemplate
-			x:Key="DefaultSidebarItemTemplate"
-			x:DataType="local:FlatSidebarItem">
+		<DataTemplate x:Key="DefaultSidebarItemTemplate" x:DataType="local:FlatSidebarItem">
 			<local:SidebarItem
+				Margin="{x:Bind SectionGapMargin, Mode=OneWay}"
 				ContentOpacity="{x:Bind RowOpacity}"
 				DataContext="{x:Bind}"
 				Item="{x:Bind Item}"
-				Margin="{x:Bind SectionGapMargin, Mode=OneWay}"
 				NestingLevel="{x:Bind Depth}"
 				UseItemPresentation="True" />
 		</DataTemplate>
diff --git a/tests/Files.App.UITests/Dialogs/PropertiesGeneralPage.xaml b/tests/Files.App.UITests/Dialogs/PropertiesGeneralPage.xaml
index c6492fab6b85..52be3ab53d7d 100644
--- a/tests/Files.App.UITests/Dialogs/PropertiesGeneralPage.xaml
+++ b/tests/Files.App.UITests/Dialogs/PropertiesGeneralPage.xaml
@@ -18,9 +18,9 @@
 		</ResourceDictionary>
 	</Page.Resources>
 
-	<controls:PropertiesViewForm>
+	<controls:PropertiesView>
 
-		<controls:PropertiesViewForm.Header>
+		<controls:PropertiesView.Header>
 			<Grid Padding="24,20">
 				<Grid.ColumnDefinitions>
 					<ColumnDefinition Width="{StaticResource LabelWidth}" />
@@ -54,7 +54,7 @@
 				</StackPanel>
 
 			</Grid>
-		</controls:PropertiesViewForm.Header>
+		</controls:PropertiesView.Header>
 
 		<Expander IsExpanded="True" Style="{StaticResource PropertiesExpanderStyle}">
 			<Expander.Header>
@@ -329,6 +329,6 @@
 			</Expander.Content>
 		</Expander>
 
-	</controls:PropertiesViewForm>
+	</controls:PropertiesView>
 
 </Page>

From 56e501bd6244f81b1148c26e4087296e32110a92 Mon Sep 17 00:00:00 2001
From: Martin Anderson <mdta@live.co.uk>
Date: Fri, 21 Aug 2026 16:16:42 +0100
Subject: [PATCH 23/36] Added PropertiesViewItemSeparator

It is a simple control that can be Horizontal or Vertical - making it flexible to use across the Properties View pages.

I may be able to simplify by switching to a single border, and manually changing the properties to change it's shape - but for now its a simple Visible and Collapse visual state
---
 .../PropertiesView.ThemeResources.xaml        | 23 ++++++
 .../PropertiesView/PropertiesView.xaml        | 57 ++++++++++++++
 .../PropertiesViewItemRating.cs               |  2 +
 .../PropertiesViewItemSeparator.cs            | 77 +++++++++++++++++++
 .../Dialogs/PropertiesGeneralPage.xaml        | 65 ++++++++++------
 5 files changed, 201 insertions(+), 23 deletions(-)
 create mode 100644 src/Files.App.Controls/PropertiesView/PropertiesViewItemSeparator.cs

diff --git a/src/Files.App.Controls/PropertiesView/PropertiesView.ThemeResources.xaml b/src/Files.App.Controls/PropertiesView/PropertiesView.ThemeResources.xaml
index 706462606942..e7d933cfdad9 100644
--- a/src/Files.App.Controls/PropertiesView/PropertiesView.ThemeResources.xaml
+++ b/src/Files.App.Controls/PropertiesView/PropertiesView.ThemeResources.xaml
@@ -9,6 +9,7 @@
 	<ResourceDictionary.ThemeDictionaries>
 
 		<ResourceDictionary x:Key="Light">
+			<!--#region Light PropertiesExpander-->
 			<Thickness x:Key="PropertiesExpanderHeaderPadding">8,8,8,7</Thickness>
 			<Thickness x:Key="PropertiesExpanderHeaderBorderThickness">0</Thickness>
 
@@ -35,9 +36,13 @@
 			<StaticResource x:Key="PropertiesExpanderContentBorderBrush" ResourceKey="DividerStrokeColorDefaultBrush" />
 
 			<StaticResource x:Key="PropertiesExpanderSeparatorFillColor" ResourceKey="DividerStrokeColorDefaultBrush" />
+			<!--#endregion-->
+
+			<StaticResource x:Key="PropertiesItemSeparatorForeground" ResourceKey="DividerStrokeColorDefaultBrush" />
 		</ResourceDictionary>
 
 		<ResourceDictionary x:Key="Dark">
+			<!--#region Dark PropertiesExpander-->
 			<Thickness x:Key="PropertiesExpanderHeaderPadding">8,8,8,7</Thickness>
 			<Thickness x:Key="PropertiesExpanderHeaderBorderThickness">0</Thickness>
 
@@ -64,9 +69,13 @@
 			<StaticResource x:Key="PropertiesExpanderContentBorderBrush" ResourceKey="DividerStrokeColorDefaultBrush" />
 
 			<StaticResource x:Key="PropertiesExpanderSeparatorFillColor" ResourceKey="DividerStrokeColorDefaultBrush" />
+			<!--#endregion-->
+
+			<StaticResource x:Key="PropertiesItemSeparatorForeground" ResourceKey="DividerStrokeColorDefaultBrush" />
 		</ResourceDictionary>
 
 		<ResourceDictionary x:Key="HighContrast">
+			<!--#region HighContrastPropertiesExpander-->
 			<Thickness x:Key="PropertiesExpanderHeaderPadding">6,6,6,5</Thickness>
 			<Thickness x:Key="PropertiesExpanderHeaderBorderThickness">2</Thickness>
 
@@ -93,10 +102,14 @@
 			<StaticResource x:Key="PropertiesExpanderContentBorderBrush" ResourceKey="SystemColorWindowTextColorBrush" />
 
 			<StaticResource x:Key="PropertiesExpanderSeparatorFillColor" ResourceKey="SystemColorWindowTextColorBrush" />
+			<!--#endregion-->
+
+			<StaticResource x:Key="PropertiesItemSeparatorForeground" ResourceKey="SystemColorWindowTextColorBrush" />
 		</ResourceDictionary>
 
 	</ResourceDictionary.ThemeDictionaries>
 
+	<!--#region PropertiesExpander-->
 	<x:Double x:Key="PropertiesExpanderMinHeight">48</x:Double>
 
 	<Thickness x:Key="PropertiesExpanderHeaderInnerPadding">12,0,24,0</Thickness>
@@ -116,5 +129,15 @@
 	<Thickness x:Key="PropertiesExpanderContentUpBorderThickness">0</Thickness>
 
 	<x:Double x:Key="PropertiesExpanderSeparatorHeight">1</x:Double>
+	<!--#endregion-->
+
+
+	<!--#region PropertiesViewItem-->
+	<Thickness x:Key="PropertiesItemSeparatorHorizontalMargin">0,-4,0,-4</Thickness>
+	<Thickness x:Key="PropertiesItemSeparatorVerticalMargin">-4,0,-4,0</Thickness>
+
+	<x:Double x:Key="PropertiesItemSeparatorStrokeThickness">1</x:Double>
+	<CornerRadius x:Key="PropertiessItemSeparatorCornerRadius">1</CornerRadius>
+	<!--#endregion-->
 
 </ResourceDictionary>
diff --git a/src/Files.App.Controls/PropertiesView/PropertiesView.xaml b/src/Files.App.Controls/PropertiesView/PropertiesView.xaml
index ad081d78243b..7d32b8de0614 100644
--- a/src/Files.App.Controls/PropertiesView/PropertiesView.xaml
+++ b/src/Files.App.Controls/PropertiesView/PropertiesView.xaml
@@ -5,6 +5,7 @@
 	xmlns:animatedvisuals="using:Microsoft.UI.Xaml.Controls.AnimatedVisuals"
 	xmlns:fcontrols="using:Files.App.Controls">
 
+	<!--  PROPERTIES VIEW  -->
 	<Style BasedOn="{StaticResource DefaultPropertiesViewStyle}" TargetType="fcontrols:PropertiesView" />
 
 	<Style x:Key="DefaultPropertiesViewStyle" TargetType="fcontrols:PropertiesView">
@@ -56,6 +57,62 @@
 		</Setter>
 	</Style>
 
+	<!--  PROPERTIES VIEW ITEM SEPARATOR  -->
+	<Style TargetType="fcontrols:PropertiesViewItemSeparator">
+		<Setter Property="Background" Value="Transparent" />
+		<Setter Property="Foreground" Value="{ThemeResource PropertiesItemSeparatorForeground}" />
+		<Setter Property="CornerRadius" Value="{StaticResource PropertiessItemSeparatorCornerRadius}" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="fcontrols:PropertiesViewItemSeparator">
+					<Grid
+						x:Name="RootGrid"
+						Padding="{TemplateBinding Padding}"
+						HorizontalAlignment="Stretch"
+						VerticalAlignment="Stretch">
+						<Border
+							x:Name="SeparatorHorizontalBorder"
+							Height="{StaticResource PropertiesItemSeparatorStrokeThickness}"
+							Margin="{StaticResource PropertiesItemSeparatorHorizontalMargin}"
+							HorizontalAlignment="Stretch"
+							VerticalAlignment="Center"
+							Background="{TemplateBinding Foreground}"
+							CornerRadius="{TemplateBinding CornerRadius}"
+							Visibility="Visible" />
+
+						<Border
+							x:Name="SeparatorVerticalBorder"
+							Width="{StaticResource PropertiesItemSeparatorStrokeThickness}"
+							Margin="{StaticResource PropertiesItemSeparatorVerticalMargin}"
+							HorizontalAlignment="Center"
+							VerticalAlignment="Stretch"
+							Background="{TemplateBinding Foreground}"
+							CornerRadius="{TemplateBinding CornerRadius}"
+							Visibility="Collapsed" />
+
+						<VisualStateManager.VisualStateGroups>
+							<VisualStateGroup x:Name="OrientationStateGroup">
+								<VisualState x:Name="HorizontalState">
+									<VisualState.Setters>
+										<Setter Target="SeparatorVerticalBorder.Visibility" Value="Collapsed" />
+										<Setter Target="SeparatorHorizontalBorder.Visibility" Value="Visible" />
+									</VisualState.Setters>
+								</VisualState>
+
+								<VisualState x:Name="VerticalState">
+									<VisualState.Setters>
+										<Setter Target="SeparatorVerticalBorder.Visibility" Value="Visible" />
+										<Setter Target="SeparatorHorizontalBorder.Visibility" Value="Collapsed" />
+									</VisualState.Setters>
+								</VisualState>
+							</VisualStateGroup>
+						</VisualStateManager.VisualStateGroups>
+					</Grid>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+
 	<!--  PROPERTIES VIEW ITEM - TEXT  -->
 	<Style BasedOn="{StaticResource DefaultPropertiesViewItem_Text}" TargetType="fcontrols:PropertiesViewItemText" />
 
diff --git a/src/Files.App.Controls/PropertiesView/PropertiesViewItemRating.cs b/src/Files.App.Controls/PropertiesView/PropertiesViewItemRating.cs
index d4fd48b48423..a5b64abf986b 100644
--- a/src/Files.App.Controls/PropertiesView/PropertiesViewItemRating.cs
+++ b/src/Files.App.Controls/PropertiesView/PropertiesViewItemRating.cs
@@ -76,6 +76,8 @@ private void UpdateRatingProperty(int newRating)
 		#endregion
 
 
+
+
 		private bool _isLoaded;
 		public PropertiesViewItemRating()
 		{
diff --git a/src/Files.App.Controls/PropertiesView/PropertiesViewItemSeparator.cs b/src/Files.App.Controls/PropertiesView/PropertiesViewItemSeparator.cs
new file mode 100644
index 000000000000..33139fdd7d07
--- /dev/null
+++ b/src/Files.App.Controls/PropertiesView/PropertiesViewItemSeparator.cs
@@ -0,0 +1,77 @@
+// Copyright (c) Files Community
+// SPDX-License-Identifier: MPL-2.0
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Files.App.Controls
+{
+
+	#region Template
+	[TemplateVisualState( Name = HorizontalStateName , GroupName = OrientationStateGroupName )]
+	[TemplateVisualState( Name = VerticalStateName , GroupName = OrientationStateGroupName )]
+	#endregion
+
+	public sealed partial class PropertiesViewItemSeparator : Control
+	{
+		#region Constants
+		internal const string OrientationStateGroupName = "OrientationStateGroup";
+
+		internal const string HorizontalStateName = "HorizontalState";
+		internal const string VerticalStateName = "VerticalState";
+		#endregion
+
+
+		#region Properties
+
+		public Orientation Orientation
+		{
+			get => (Orientation)GetValue( OrientationProperty );
+			set => SetValue( OrientationProperty , value );
+		}
+
+		public static readonly DependencyProperty OrientationProperty =
+			DependencyProperty.Register(
+				"Orientation",
+				typeof(Orientation),
+				typeof(PropertiesViewItemSeparator),
+				new PropertyMetadata(Orientation.Horizontal, OnOrientationChanged));
+
+		#endregion
+
+
+		#region Property Changed
+		private static void OnOrientationChanged(DependencyObject d , DependencyPropertyChangedEventArgs e)
+		{
+			var control = (PropertiesViewItemSeparator)d;
+			control.UpdateOrientationState( (Orientation)e.NewValue );
+		}
+
+		private void UpdateOrientationState(Orientation orientation)
+		{
+			if ( orientation == Orientation.Horizontal )
+			{
+				VisualStateManager.GoToState( this , HorizontalStateName , false );
+			}
+			else
+			{
+				VisualStateManager.GoToState( this , VerticalStateName , false );
+			}
+		}
+		#endregion
+
+
+		private bool _isLoaded;
+		public PropertiesViewItemSeparator()
+		{ 
+			DefaultStyleKey = typeof( PropertiesViewItemSeparator );
+		}
+
+		protected override void OnApplyTemplate()
+		{
+			base.OnApplyTemplate();
+			UpdateOrientationState( Orientation );
+		}
+	}
+}
diff --git a/tests/Files.App.UITests/Dialogs/PropertiesGeneralPage.xaml b/tests/Files.App.UITests/Dialogs/PropertiesGeneralPage.xaml
index 52be3ab53d7d..1f9381b4a7c1 100644
--- a/tests/Files.App.UITests/Dialogs/PropertiesGeneralPage.xaml
+++ b/tests/Files.App.UITests/Dialogs/PropertiesGeneralPage.xaml
@@ -77,7 +77,7 @@
 						LabelWidth="{StaticResource LabelWidth}"
 						Orientation="Horizontal"
 						Text="Item value 1 text here" />
-					<MenuFlyoutSeparator />
+					<controls:PropertiesViewItemSeparator />
 					<controls:PropertiesViewItemInfo
 						CanEdit="False"
 						InfoText="Detailed text to display with hover."
@@ -85,7 +85,7 @@
 						LabelWidth="{StaticResource LabelWidth}"
 						Orientation="Horizontal"
 						Text="Info item value 1 text" />
-					<MenuFlyoutSeparator />
+					<controls:PropertiesViewItemSeparator />
 					<controls:PropertiesViewItemInfo
 						CanEdit="True"
 						InfoText="Detailed text to display with hover."
@@ -93,7 +93,7 @@
 						LabelWidth="{StaticResource LabelWidth}"
 						Orientation="Horizontal"
 						Text="Info item value 1 text" />
-					<MenuFlyoutSeparator />
+					<controls:PropertiesViewItemSeparator />
 					<controls:PropertiesViewItemInfo
 						InfoText="Detailed text to display with hover."
 						IsEnabled="False"
@@ -101,20 +101,20 @@
 						LabelWidth="{StaticResource LabelWidth}"
 						Orientation="Horizontal"
 						Text="Info item value 1 text" />
-					<MenuFlyoutSeparator />
+					<controls:PropertiesViewItemSeparator />
 					<controls:PropertiesViewItemText
 						Label="Item label t00 extra long to demonstrate the wrapping for Labels"
 						LabelWidth="{StaticResource LabelWidth}"
 						Orientation="Horizontal"
 						Text="Item value t00 text here" />
-					<MenuFlyoutSeparator />
+					<controls:PropertiesViewItemSeparator />
 					<controls:PropertiesViewItemText
 						IsEnabled="False"
 						Label="Disabled - CanEdit set to False"
 						LabelWidth="{StaticResource LabelWidth}"
 						Orientation="Horizontal"
 						Text="Item value t00 text here" />
-					<MenuFlyoutSeparator />
+					<controls:PropertiesViewItemSeparator />
 					<controls:PropertiesViewItemText
 						CanEdit="True"
 						IsEnabled="False"
@@ -122,7 +122,7 @@
 						LabelWidth="{StaticResource LabelWidth}"
 						Orientation="Horizontal"
 						Text="Item value t00 text here" />
-					<MenuFlyoutSeparator />
+					<controls:PropertiesViewItemSeparator />
 					<controls:PropertiesViewItemText
 						Label="Item label three"
 						LabelWidth="{StaticResource LabelWidth}"
@@ -151,33 +151,33 @@
 						LabelWidth="{StaticResource LabelWidth}"
 						Orientation="Horizontal"
 						Rating="9345" />
-					<MenuFlyoutSeparator Margin="16,0" />
+					<controls:PropertiesViewItemSeparator />
 					<controls:PropertiesViewItemRating
 						CanEdit="True"
 						Label="Item label t00 editable"
 						Orientation="Horizontal"
 						Rating="-23" />
-					<MenuFlyoutSeparator Margin="16,0" />
+					<controls:PropertiesViewItemSeparator />
 					<controls:PropertiesViewItemRating
 						CanEdit="False"
 						Label="Item label three readonly"
 						Orientation="Horizontal"
 						Rating="32" />
-					<MenuFlyoutSeparator Margin="16,0" />
+					<controls:PropertiesViewItemSeparator />
 					<controls:PropertiesViewItemRating
 						CanEdit="False"
 						IsEnabled="False"
 						Label="Disabled item label"
 						Orientation="Horizontal"
 						Rating="50" />
-					<MenuFlyoutSeparator Margin="16,0" />
+					<controls:PropertiesViewItemSeparator />
 					<controls:PropertiesViewItemRating
 						CanEdit="True"
 						IsEnabled="False"
 						Label="Disabled, editable label"
 						Orientation="Horizontal"
 						Rating="50" />
-					<MenuFlyoutSeparator Margin="16,0" />
+					<controls:PropertiesViewItemSeparator />
 					<controls:PropertiesViewItemRating
 						CanEdit="True"
 						Label="Item label 4ore editable"
@@ -206,7 +206,7 @@
 						Orientation="Vertical"
 						Text="Item value 1 text here" />
 
-					<MenuFlyoutSeparator />
+					<controls:PropertiesViewItemSeparator />
 
 					<controls:PropertiesViewItemInfo
 						CanEdit="False"
@@ -216,7 +216,7 @@
 						Orientation="Vertical"
 						Text="Info item value 1 text" />
 
-					<MenuFlyoutSeparator />
+					<controls:PropertiesViewItemSeparator />
 
 					<controls:PropertiesViewItemInfo
 						CanEdit="True"
@@ -226,7 +226,7 @@
 						Orientation="Vertical"
 						Text="Info item value 1 text" />
 
-					<MenuFlyoutSeparator />
+					<controls:PropertiesViewItemSeparator />
 
 					<controls:PropertiesViewItemRating
 						CanEdit="True"
@@ -234,7 +234,7 @@
 						Orientation="Vertical"
 						Rating="54" />
 
-					<MenuFlyoutSeparator />
+					<controls:PropertiesViewItemSeparator />
 
 					<controls:PropertiesViewItemText
 						CanEdit="False"
@@ -263,7 +263,7 @@
 						LabelWidth="{StaticResource LabelWidth}"
 						Orientation="Horizontal" />
 
-					<MenuFlyoutSeparator />
+					<controls:PropertiesViewItemSeparator />
 
 					<controls:PropertiesViewItemToggle
 						IsEnabled="True"
@@ -272,7 +272,7 @@
 						LabelWidth="{StaticResource LabelWidth}"
 						Orientation="Horizontal" />
 
-					<MenuFlyoutSeparator />
+					<controls:PropertiesViewItemSeparator />
 
 					<controls:PropertiesViewItemToggle
 						IsEnabled="False"
@@ -281,7 +281,7 @@
 						LabelWidth="{StaticResource LabelWidth}"
 						Orientation="Horizontal" />
 
-					<MenuFlyoutSeparator />
+					<controls:PropertiesViewItemSeparator />
 
 					<controls:PropertiesViewItemToggle
 						IsEnabled="False"
@@ -290,7 +290,7 @@
 						LabelWidth="{StaticResource LabelWidth}"
 						Orientation="Horizontal" />
 
-					<MenuFlyoutSeparator />
+					<controls:PropertiesViewItemSeparator />
 
 					<controls:PropertiesViewItemToggle
 						IsEnabled="True"
@@ -299,7 +299,7 @@
 						LabelWidth="{StaticResource LabelWidth}"
 						Orientation="Vertical" />
 
-					<MenuFlyoutSeparator />
+					<controls:PropertiesViewItemSeparator />
 
 					<controls:PropertiesViewItemToggle
 						IsEnabled="True"
@@ -308,7 +308,7 @@
 						LabelWidth="{StaticResource LabelWidth}"
 						Orientation="Vertical" />
 
-					<MenuFlyoutSeparator />
+					<controls:PropertiesViewItemSeparator />
 
 					<controls:PropertiesViewItemToggle
 						IsEnabled="False"
@@ -317,7 +317,7 @@
 						LabelWidth="{StaticResource LabelWidth}"
 						Orientation="Vertical" />
 
-					<MenuFlyoutSeparator />
+					<controls:PropertiesViewItemSeparator />
 
 					<controls:PropertiesViewItemToggle
 						IsEnabled="False"
@@ -329,6 +329,25 @@
 			</Expander.Content>
 		</Expander>
 
+		<StackPanel
+			Padding="24,8"
+			Orientation="Horizontal"
+			Spacing="16">
+			<CheckBox Content="Text for a Checkbox" />
+
+			<controls:PropertiesViewItemSeparator Orientation="Vertical" />
+
+			<CheckBox Content="Checkbox t00" />
+
+			<controls:PropertiesViewItemSeparator Orientation="Vertical" />
+
+			<CheckBox Content="Text for a Checkbox three" />
+
+			<controls:PropertiesViewItemSeparator Orientation="Vertical" />
+
+			<CheckBox Content="Text for a Checkbox 4ore" />
+		</StackPanel>
+
 	</controls:PropertiesView>
 
 </Page>

From acebf73f52e146fff8b2a58e75765463515b523e Mon Sep 17 00:00:00 2001
From: 0x5BFA <62196528+0x5bfa@users.noreply.github.com>
Date: Sat, 22 Aug 2026 02:37:26 +0900
Subject: [PATCH 24/36] Fix titlebar

---
 .../WindowedDialog/WindowedDialog.cs          | 25 ++++++++++++++-----
 .../Dialogs/PropertiesDetailsPage.xaml        | 16 +++++++++++-
 .../Dialogs/PropertiesDialog.xaml             | 10 +++++---
 .../Views/PropertiesViewPage.xaml.cs          |  2 +-
 4 files changed, 41 insertions(+), 12 deletions(-)

diff --git a/src/Files.App.Controls/WindowedDialog/WindowedDialog.cs b/src/Files.App.Controls/WindowedDialog/WindowedDialog.cs
index b9f3273a5af8..46e2cea01aec 100644
--- a/src/Files.App.Controls/WindowedDialog/WindowedDialog.cs
+++ b/src/Files.App.Controls/WindowedDialog/WindowedDialog.cs
@@ -1,6 +1,8 @@
 // Copyright (c) Files Community
 // SPDX-License-Identifier: MPL-2.0
 
+using WinRT;
+
 namespace Files.App.Controls;
 
 public class WindowedDialog : Window
@@ -10,21 +12,32 @@ public class WindowedDialog : Window
 	public WindowedDialog()
 	{
 		_root = new();
-		Content = _root;
+		base.Content = _root;
 	}
 
-	public FrameworkElement? Header
+	public new string Title
 	{
-		get => _root.Header;
-		set => _root.Header = value;
+		get => base.Title;
+		set
+		{
+			base.Title = value;
+			_root.Title = value;
+		}
 	}
 
-	public object RootContent
+	public new UIElement? Content
 	{
-		get => _root.Content;
+		[DynamicWindowsRuntimeCast(typeof(UIElement))]
+		get => _root.Content as UIElement;
 		set => _root.Content = value;
 	}
 
+	public FrameworkElement? Header
+	{
+		get => _root.Header;
+		set => _root.Header = value;
+	}
+
 	public FrameworkElement? Footer
 	{
 		get => _root.Footer;
diff --git a/tests/Files.App.UITests/Dialogs/PropertiesDetailsPage.xaml b/tests/Files.App.UITests/Dialogs/PropertiesDetailsPage.xaml
index 92be25b97310..b6c539b8cce1 100644
--- a/tests/Files.App.UITests/Dialogs/PropertiesDetailsPage.xaml
+++ b/tests/Files.App.UITests/Dialogs/PropertiesDetailsPage.xaml
@@ -2,10 +2,24 @@
 	x:Class="Files.App.UITests.Dialogs.PropertiesDetailsPage"
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	xmlns:controls="using:Files.App.Controls"
 	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 	xmlns:local="using:Files.App.UITests.Dialogs"
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 	mc:Ignorable="d">
 
-	<Grid />
+	<controls:PropertiesView>
+
+		<Expander IsExpanded="True" Style="{StaticResource PropertiesExpanderStyle}">
+			<Expander.Header>
+				<controls:PropertiesHeader Text="Description">
+					<controls:PropertiesHeader.Icon>
+						<FontIcon Glyph="&#xF0E3;" />
+					</controls:PropertiesHeader.Icon>
+				</controls:PropertiesHeader>
+			</Expander.Header>
+
+		</Expander>
+
+	</controls:PropertiesView>
 </Page>
diff --git a/tests/Files.App.UITests/Dialogs/PropertiesDialog.xaml b/tests/Files.App.UITests/Dialogs/PropertiesDialog.xaml
index 4db7c7c008f4..34a8f064df04 100644
--- a/tests/Files.App.UITests/Dialogs/PropertiesDialog.xaml
+++ b/tests/Files.App.UITests/Dialogs/PropertiesDialog.xaml
@@ -7,9 +7,13 @@
 	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 	xmlns:local="using:Files.App.UITests.Dialogs"
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-	Title="Properties title"
+	Title="Properties"
 	mc:Ignorable="d">
 
+	<controls:WindowedDialog.SystemBackdrop>
+		<MicaBackdrop />
+	</controls:WindowedDialog.SystemBackdrop>
+
 	<controls:WindowedDialog.Header>
 		<SelectorBar Padding="12,4" SelectionChanged="SelectorBar_SelectionChanged">
 			<SelectorBarItem
@@ -24,9 +28,7 @@
 		</SelectorBar>
 	</controls:WindowedDialog.Header>
 
-	<controls:WindowedDialog.RootContent>
-		<Frame x:Name="MainContentFrame" IsNavigationStackEnabled="False" />
-	</controls:WindowedDialog.RootContent>
+	<Frame x:Name="MainContentFrame" IsNavigationStackEnabled="False" />
 
 	<controls:WindowedDialog.Footer>
 		<Grid ColumnSpacing="8">
diff --git a/tests/Files.App.UITests/Views/PropertiesViewPage.xaml.cs b/tests/Files.App.UITests/Views/PropertiesViewPage.xaml.cs
index 67a273228fc7..2237c6f27174 100644
--- a/tests/Files.App.UITests/Views/PropertiesViewPage.xaml.cs
+++ b/tests/Files.App.UITests/Views/PropertiesViewPage.xaml.cs
@@ -16,7 +16,7 @@ public PropertiesViewPage()
 
 		private void OpenPropertiesDialogWindowButton_Click(object sender , RoutedEventArgs e)
 		{
-			var window = new PropertiesDialog() { Title = "Properties" };
+			var window = new PropertiesDialog();
 			window.Activate();
 		}
 	}

From ae6e0d702d3281776c26bdbbf4c39fb8ef93d6d4 Mon Sep 17 00:00:00 2001
From: Martin Anderson <mdta@live.co.uk>
Date: Fri, 21 Aug 2026 19:08:22 +0100
Subject: [PATCH 25/36] Created the PropertiesViewItemCheck control

Derived from CheckBox and reusing most of the default template, enables the whole item to be clickable, not just the check box - with an added Orientation property to  enable stacked layout
---
 .../PropertiesView.ThemeResources.xaml        |   5 +
 .../PropertiesView/PropertiesView.xaml        | 268 +++++++++++++++++-
 .../PropertiesView/PropertiesViewItem.cs      |   3 +
 .../PropertiesView/PropertiesViewItemCheck.cs | 106 +++++++
 .../PropertiesViewItemSeparator.cs            |   4 +
 .../PropertiesViewItemToggle.cs               |   6 +-
 .../Dialogs/PropertiesGeneralPage.xaml        |  35 ++-
 7 files changed, 418 insertions(+), 9 deletions(-)
 create mode 100644 src/Files.App.Controls/PropertiesView/PropertiesViewItemCheck.cs

diff --git a/src/Files.App.Controls/PropertiesView/PropertiesView.ThemeResources.xaml b/src/Files.App.Controls/PropertiesView/PropertiesView.ThemeResources.xaml
index e7d933cfdad9..2b57301e1772 100644
--- a/src/Files.App.Controls/PropertiesView/PropertiesView.ThemeResources.xaml
+++ b/src/Files.App.Controls/PropertiesView/PropertiesView.ThemeResources.xaml
@@ -138,6 +138,11 @@
 
 	<x:Double x:Key="PropertiesItemSeparatorStrokeThickness">1</x:Double>
 	<CornerRadius x:Key="PropertiessItemSeparatorCornerRadius">1</CornerRadius>
+
+	<Thickness x:Key="PropertiesItemCheckBoxVerticalMargin">8</Thickness>
+	<Thickness x:Key="PropertiesItemCheckBoxHorizontalMargin">0,0,12,0</Thickness>
+
+	<Thickness x:Key="PropertiesViewItemCheckPadding">0</Thickness>
 	<!--#endregion-->
 
 </ResourceDictionary>
diff --git a/src/Files.App.Controls/PropertiesView/PropertiesView.xaml b/src/Files.App.Controls/PropertiesView/PropertiesView.xaml
index 7d32b8de0614..76fb92870838 100644
--- a/src/Files.App.Controls/PropertiesView/PropertiesView.xaml
+++ b/src/Files.App.Controls/PropertiesView/PropertiesView.xaml
@@ -5,6 +5,7 @@
 	xmlns:animatedvisuals="using:Microsoft.UI.Xaml.Controls.AnimatedVisuals"
 	xmlns:fcontrols="using:Files.App.Controls">
 
+
 	<!--  PROPERTIES VIEW  -->
 	<Style BasedOn="{StaticResource DefaultPropertiesViewStyle}" TargetType="fcontrols:PropertiesView" />
 
@@ -57,6 +58,7 @@
 		</Setter>
 	</Style>
 
+
 	<!--  PROPERTIES VIEW ITEM SEPARATOR  -->
 	<Style TargetType="fcontrols:PropertiesViewItemSeparator">
 		<Setter Property="Background" Value="Transparent" />
@@ -113,6 +115,7 @@
 		</Setter>
 	</Style>
 
+
 	<!--  PROPERTIES VIEW ITEM - TEXT  -->
 	<Style BasedOn="{StaticResource DefaultPropertiesViewItem_Text}" TargetType="fcontrols:PropertiesViewItemText" />
 
@@ -253,6 +256,7 @@
 		</Setter>
 	</Style>
 
+
 	<!--  PROPERTIES VIEW ITEM - RATING  -->
 	<Style BasedOn="{StaticResource DefaultPropertiesViewItem_Rating}" TargetType="fcontrols:PropertiesViewItemRating" />
 
@@ -367,6 +371,7 @@
 		</Setter>
 	</Style>
 
+
 	<!--  PROPERTIES VIEW ITEM - TEXT  -->
 	<Style BasedOn="{StaticResource DefaultPropertiesViewItem_Info}" TargetType="fcontrols:PropertiesViewItemInfo" />
 
@@ -573,6 +578,7 @@
 		</Setter>
 	</Style>
 
+
 	<!--  PROPERTIES VIEW ITEM - TOGGLE  -->
 	<Style BasedOn="{StaticResource DefaultPropertiesViewItem_Toggle}" TargetType="fcontrols:PropertiesViewItemToggle" />
 
@@ -689,7 +695,6 @@
 		</Setter>
 	</Style>
 
-	<!--  RIGHT ALIGNED TOGGLE SWITCH TAKEN FROM COMMUNITY TOOLKIT  -->
 	<Style
 		x:Key="RightAlignedCompactToggleSwitchStyle"
 		BasedOn="{StaticResource DefaultToggleSwitchStyle}"
@@ -1252,4 +1257,265 @@
 		</Style.Setters>
 	</Style>
 
+
+	<!--  PROPERTIES VIEW ITEM - CHECK  -->
+	<Style BasedOn="{StaticResource DefaultPropertiesViewItem_Check}" TargetType="fcontrols:PropertiesViewItemCheck" />
+
+	<Style x:Key="DefaultPropertiesViewItem_Check" TargetType="fcontrols:PropertiesViewItemCheck">
+		<Setter Property="Background" Value="{ThemeResource CheckBoxBackgroundUnchecked}" />
+		<Setter Property="Foreground" Value="{ThemeResource CheckBoxForegroundUnchecked}" />
+		<Setter Property="BorderBrush" Value="{ThemeResource CheckBoxBorderBrushUnchecked}" />
+		<Setter Property="Padding" Value="{StaticResource PropertiesViewItemCheckPadding}" />
+		<Setter Property="HorizontalAlignment" Value="Stretch" />
+		<Setter Property="VerticalAlignment" Value="Center" />
+		<Setter Property="HorizontalContentAlignment" Value="Stretch" />
+		<Setter Property="VerticalContentAlignment" Value="Center" />
+		<Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
+		<Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}" />
+		<Setter Property="MinWidth" Value="{StaticResource CheckBoxHeight}" />
+		<Setter Property="MinHeight" Value="{StaticResource CheckBoxHeight}" />
+		<Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
+		<Setter Property="FocusVisualMargin" Value="{StaticResource CheckBoxFocusVisualMargin}" />
+		<Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="fcontrols:PropertiesViewItemCheck">
+					<Grid
+						x:Name="RootGrid"
+						Padding="{TemplateBinding Padding}"
+						Background="{TemplateBinding Background}"
+						BorderBrush="{TemplateBinding BorderBrush}"
+						BorderThickness="{TemplateBinding BorderThickness}"
+						CornerRadius="{TemplateBinding CornerRadius}">
+						<Grid.RowDefinitions>
+							<RowDefinition Height="Auto" />
+							<RowDefinition Height="*" />
+						</Grid.RowDefinitions>
+						<Grid.ColumnDefinitions>
+							<ColumnDefinition Width="Auto" />
+							<ColumnDefinition Width="*" />
+						</Grid.ColumnDefinitions>
+						<Grid
+							x:Name="CheckBoxGrid"
+							Grid.Row="0"
+							Grid.RowSpan="2"
+							Grid.Column="0"
+							Grid.ColumnSpan="1"
+							Width="{StaticResource CheckBoxSize}"
+							Height="{StaticResource CheckBoxSize}"
+							Margin="{StaticResource PropertiesItemCheckBoxHorizontalMargin}"
+							VerticalAlignment="Center">
+							<Rectangle
+								x:Name="NormalRectangle"
+								Width="{StaticResource CheckBoxSize}"
+								Height="{StaticResource CheckBoxSize}"
+								Fill="{ThemeResource CheckBoxCheckBackgroundFillUnchecked}"
+								RadiusX="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}"
+								RadiusY="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}"
+								Stroke="{ThemeResource CheckBoxCheckBackgroundStrokeUnchecked}"
+								StrokeThickness="{StaticResource CheckBoxBorderThickness}"
+								UseLayoutRounding="False" />
+							<AnimatedIcon
+								x:Name="CheckGlyph"
+								Margin="0,1,0,-1"
+								AnimatedIcon.State="NormalOff"
+								Foreground="{ThemeResource CheckBoxCheckGlyphForegroundUnchecked}">
+								<animatedvisuals:AnimatedAcceptVisualSource />
+								<AnimatedIcon.FallbackIconSource>
+									<FontIconSource
+										x:Name="DownLevelCheckGlyph"
+										FontFamily="{ThemeResource SymbolThemeFontFamily}"
+										FontSize="{StaticResource CheckBoxGlyphSize}"
+										Glyph="{StaticResource CheckBoxCheckedGlyph}" />
+								</AnimatedIcon.FallbackIconSource>
+							</AnimatedIcon>
+						</Grid>
+						<ContentPresenter
+							x:Name="ContentPresenter"
+							Grid.Row="0"
+							Grid.RowSpan="2"
+							Grid.Column="1"
+							Grid.ColumnSpan="1"
+							Margin="{TemplateBinding Padding}"
+							HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+							VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+							AutomationProperties.AccessibilityView="Raw"
+							Content="{TemplateBinding Content}"
+							ContentTemplate="{TemplateBinding ContentTemplate}"
+							ContentTransitions="{TemplateBinding ContentTransitions}"
+							Foreground="{TemplateBinding Foreground}"
+							TextWrapping="Wrap" />
+						<VisualStateManager.VisualStateGroups>
+							<VisualStateGroup x:Name="OrientationStateGroup">
+								<VisualState x:Name="HorizontalState">
+									<VisualState.Setters>
+										<Setter Target="CheckBoxGrid.(Grid.Row)" Value="0" />
+										<Setter Target="CheckBoxGrid.(Grid.RowSpan)" Value="2" />
+										<Setter Target="CheckBoxGrid.(Grid.Column)" Value="0" />
+										<Setter Target="CheckBoxGrid.(Grid.ColumnSpan)" Value="1" />
+										<Setter Target="CheckBoxGrid.Margin" Value="{StaticResource PropertiesItemCheckBoxHorizontalMargin}" />
+
+										<Setter Target="ContentPresenter.(Grid.Row)" Value="0" />
+										<Setter Target="ContentPresenter.(Grid.RowSpan)" Value="2" />
+										<Setter Target="ContentPresenter.(Grid.Column)" Value="1" />
+										<Setter Target="ContentPresenter.(Grid.ColumnSpan)" Value="1" />
+									</VisualState.Setters>
+								</VisualState>
+								<VisualState x:Name="VerticalState">
+									<VisualState.Setters>
+										<Setter Target="CheckBoxGrid.(Grid.Row)" Value="0" />
+										<Setter Target="CheckBoxGrid.(Grid.RowSpan)" Value="1" />
+										<Setter Target="CheckBoxGrid.(Grid.Column)" Value="0" />
+										<Setter Target="CheckBoxGrid.(Grid.ColumnSpan)" Value="2" />
+										<Setter Target="CheckBoxGrid.Margin" Value="{StaticResource PropertiesItemCheckBoxVerticalMargin}" />
+
+										<Setter Target="ContentPresenter.(Grid.Row)" Value="1" />
+										<Setter Target="ContentPresenter.(Grid.RowSpan)" Value="1" />
+										<Setter Target="ContentPresenter.(Grid.Column)" Value="0" />
+										<Setter Target="ContentPresenter.(Grid.ColumnSpan)" Value="2" />
+									</VisualState.Setters>
+								</VisualState>
+							</VisualStateGroup>
+							<VisualStateGroup x:Name="CombinedStates">
+								<VisualState x:Name="UncheckedNormal" />
+								<VisualState x:Name="UncheckedPointerOver">
+									<VisualState.Setters>
+										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource CheckBoxForegroundUncheckedPointerOver}" />
+										<Setter Target="RootGrid.Background" Value="{ThemeResource CheckBoxBackgroundUncheckedPointerOver}" />
+										<Setter Target="RootGrid.BorderBrush" Value="{ThemeResource CheckBoxBorderBrushUncheckedPointerOver}" />
+										<Setter Target="NormalRectangle.Stroke" Value="{ThemeResource CheckBoxCheckBackgroundStrokeUncheckedPointerOver}" />
+										<Setter Target="NormalRectangle.Fill" Value="{ThemeResource CheckBoxCheckBackgroundFillUncheckedPointerOver}" />
+										<Setter Target="CheckGlyph.Foreground" Value="{ThemeResource CheckBoxCheckGlyphForegroundUncheckedPointerOver}" />
+										<Setter Target="CheckGlyph.(AnimatedIcon.State)" Value="PointerOverOff" />
+									</VisualState.Setters>
+								</VisualState>
+								<VisualState x:Name="UncheckedPressed">
+									<VisualState.Setters>
+										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource CheckBoxForegroundUncheckedPressed}" />
+										<Setter Target="RootGrid.Background" Value="{ThemeResource CheckBoxBackgroundUncheckedPressed}" />
+										<Setter Target="RootGrid.BorderBrush" Value="{ThemeResource CheckBoxBorderBrushUncheckedPressed}" />
+										<Setter Target="NormalRectangle.Stroke" Value="{ThemeResource CheckBoxCheckBackgroundStrokeUncheckedPressed}" />
+										<Setter Target="NormalRectangle.Fill" Value="{ThemeResource CheckBoxCheckBackgroundFillUncheckedPressed}" />
+										<Setter Target="CheckGlyph.Foreground" Value="{ThemeResource CheckBoxCheckGlyphForegroundUncheckedPressed}" />
+										<Setter Target="CheckGlyph.(AnimatedIcon.State)" Value="PressedOff" />
+									</VisualState.Setters>
+								</VisualState>
+								<VisualState x:Name="UncheckedDisabled">
+									<VisualState.Setters>
+										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource CheckBoxForegroundUncheckedDisabled}" />
+										<Setter Target="RootGrid.Background" Value="{ThemeResource CheckBoxBackgroundUncheckedDisabled}" />
+										<Setter Target="RootGrid.BorderBrush" Value="{ThemeResource CheckBoxBorderBrushUncheckedDisabled}" />
+										<Setter Target="NormalRectangle.Stroke" Value="{ThemeResource CheckBoxCheckBackgroundStrokeUncheckedDisabled}" />
+										<Setter Target="NormalRectangle.Fill" Value="{ThemeResource CheckBoxCheckBackgroundFillUncheckedDisabled}" />
+										<Setter Target="CheckGlyph.Foreground" Value="{ThemeResource CheckBoxCheckGlyphForegroundUncheckedDisabled}" />
+										<!--  DisabledVisual Should be handled by the control, not the animated icon.  -->
+										<Setter Target="CheckGlyph.(AnimatedIcon.State)" Value="NormalOff" />
+									</VisualState.Setters>
+								</VisualState>
+								<VisualState x:Name="CheckedNormal">
+									<VisualState.Setters>
+										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource CheckBoxForegroundChecked}" />
+										<Setter Target="RootGrid.Background" Value="{ThemeResource CheckBoxBackgroundChecked}" />
+										<Setter Target="RootGrid.BorderBrush" Value="{ThemeResource CheckBoxBorderBrushChecked}" />
+										<Setter Target="NormalRectangle.Stroke" Value="{ThemeResource CheckBoxCheckBackgroundStrokeChecked}" />
+										<Setter Target="NormalRectangle.Fill" Value="{ThemeResource CheckBoxCheckBackgroundFillChecked}" />
+										<Setter Target="CheckGlyph.Foreground" Value="{ThemeResource CheckBoxCheckGlyphForegroundChecked}" />
+										<Setter Target="CheckGlyph.(AnimatedIcon.State)" Value="NormalOn" />
+									</VisualState.Setters>
+								</VisualState>
+								<VisualState x:Name="CheckedPointerOver">
+									<VisualState.Setters>
+										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource CheckBoxForegroundCheckedPointerOver}" />
+										<Setter Target="RootGrid.Background" Value="{ThemeResource CheckBoxBackgroundCheckedPointerOver}" />
+										<Setter Target="RootGrid.BorderBrush" Value="{ThemeResource CheckBoxBorderBrushCheckedPointerOver}" />
+										<Setter Target="NormalRectangle.Stroke" Value="{ThemeResource CheckBoxCheckBackgroundStrokeCheckedPointerOver}" />
+										<Setter Target="NormalRectangle.Fill" Value="{ThemeResource CheckBoxCheckBackgroundFillCheckedPointerOver}" />
+										<Setter Target="CheckGlyph.Foreground" Value="{ThemeResource CheckBoxCheckGlyphForegroundCheckedPointerOver}" />
+										<Setter Target="CheckGlyph.(AnimatedIcon.State)" Value="PointerOverOn" />
+									</VisualState.Setters>
+								</VisualState>
+								<VisualState x:Name="CheckedPressed">
+									<VisualState.Setters>
+										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource CheckBoxForegroundCheckedPressed}" />
+										<Setter Target="RootGrid.Background" Value="{ThemeResource CheckBoxBackgroundCheckedPressed}" />
+										<Setter Target="RootGrid.BorderBrush" Value="{ThemeResource CheckBoxBorderBrushCheckedPressed}" />
+										<Setter Target="NormalRectangle.Stroke" Value="{ThemeResource CheckBoxCheckBackgroundStrokeCheckedPressed}" />
+										<Setter Target="NormalRectangle.Fill" Value="{ThemeResource CheckBoxCheckBackgroundFillCheckedPressed}" />
+										<Setter Target="CheckGlyph.Foreground" Value="{ThemeResource CheckBoxCheckGlyphForegroundCheckedPressed}" />
+										<Setter Target="CheckGlyph.(AnimatedIcon.State)" Value="PressedOn" />
+									</VisualState.Setters>
+								</VisualState>
+								<VisualState x:Name="CheckedDisabled">
+									<VisualState.Setters>
+										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource CheckBoxForegroundCheckedDisabled}" />
+										<Setter Target="RootGrid.Background" Value="{ThemeResource CheckBoxBackgroundCheckedDisabled}" />
+										<Setter Target="RootGrid.BorderBrush" Value="{ThemeResource CheckBoxBorderBrushCheckedDisabled}" />
+										<Setter Target="NormalRectangle.Stroke" Value="{ThemeResource CheckBoxCheckBackgroundStrokeCheckedDisabled}" />
+										<Setter Target="NormalRectangle.Fill" Value="{ThemeResource CheckBoxCheckBackgroundFillCheckedDisabled}" />
+										<Setter Target="CheckGlyph.Foreground" Value="{ThemeResource CheckBoxCheckGlyphForegroundCheckedDisabled}" />
+										<!--  DisabledVisual Should be handled by the control, not the animated icon.  -->
+										<Setter Target="CheckGlyph.(AnimatedIcon.State)" Value="NormalOn" />
+									</VisualState.Setters>
+								</VisualState>
+								<VisualState x:Name="IndeterminateNormal">
+									<VisualState.Setters>
+										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource CheckBoxForegroundIndeterminate}" />
+										<Setter Target="RootGrid.Background" Value="{ThemeResource CheckBoxBackgroundIndeterminate}" />
+										<Setter Target="RootGrid.BorderBrush" Value="{ThemeResource CheckBoxBorderBrushIndeterminate}" />
+										<Setter Target="NormalRectangle.Stroke" Value="{ThemeResource CheckBoxCheckBackgroundStrokeIndeterminate}" />
+										<Setter Target="NormalRectangle.Fill" Value="{ThemeResource CheckBoxCheckBackgroundFillIndeterminate}" />
+										<Setter Target="DownLevelCheckGlyph.Glyph" Value="{StaticResource CheckBoxIndeterminateGlyph}" />
+										<Setter Target="CheckGlyph.Foreground" Value="{ThemeResource CheckBoxCheckGlyphForegroundIndeterminate}" />
+										<Setter Target="CheckGlyph.(AnimatedIcon.State)" Value="NormalIndeterminate" />
+										<Setter Target="CheckGlyph.Margin" Value="0" />
+									</VisualState.Setters>
+								</VisualState>
+								<VisualState x:Name="IndeterminatePointerOver">
+									<VisualState.Setters>
+										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource CheckBoxForegroundIndeterminatePointerOver}" />
+										<Setter Target="RootGrid.Background" Value="{ThemeResource CheckBoxBackgroundIndeterminatePointerOver}" />
+										<Setter Target="RootGrid.BorderBrush" Value="{ThemeResource CheckBoxBorderBrushIndeterminatePointerOver}" />
+										<Setter Target="NormalRectangle.Stroke" Value="{ThemeResource CheckBoxCheckBackgroundStrokeIndeterminatePointerOver}" />
+										<Setter Target="NormalRectangle.Fill" Value="{ThemeResource CheckBoxCheckBackgroundFillIndeterminatePointerOver}" />
+										<Setter Target="DownLevelCheckGlyph.Glyph" Value="{StaticResource CheckBoxIndeterminateGlyph}" />
+										<Setter Target="CheckGlyph.Foreground" Value="{ThemeResource CheckBoxCheckGlyphForegroundIndeterminatePointerOver}" />
+										<Setter Target="CheckGlyph.(AnimatedIcon.State)" Value="PointerOverIndeterminate" />
+										<Setter Target="CheckGlyph.Margin" Value="0" />
+									</VisualState.Setters>
+								</VisualState>
+								<VisualState x:Name="IndeterminatePressed">
+									<VisualState.Setters>
+										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource CheckBoxForegroundIndeterminatePressed}" />
+										<Setter Target="RootGrid.Background" Value="{ThemeResource CheckBoxBackgroundIndeterminatePressed}" />
+										<Setter Target="RootGrid.BorderBrush" Value="{ThemeResource CheckBoxBorderBrushIndeterminatePressed}" />
+										<Setter Target="NormalRectangle.Stroke" Value="{ThemeResource CheckBoxCheckBackgroundStrokeIndeterminatePressed}" />
+										<Setter Target="NormalRectangle.Fill" Value="{ThemeResource CheckBoxCheckBackgroundFillIndeterminatePressed}" />
+										<Setter Target="DownLevelCheckGlyph.Glyph" Value="{StaticResource CheckBoxIndeterminateGlyph}" />
+										<Setter Target="CheckGlyph.Foreground" Value="{ThemeResource CheckBoxCheckGlyphForegroundIndeterminatePressed}" />
+										<Setter Target="CheckGlyph.(AnimatedIcon.State)" Value="PressedIndeterminate" />
+										<Setter Target="CheckGlyph.Margin" Value="0" />
+									</VisualState.Setters>
+								</VisualState>
+								<VisualState x:Name="IndeterminateDisabled">
+									<VisualState.Setters>
+										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource CheckBoxForegroundIndeterminateDisabled}" />
+										<Setter Target="RootGrid.Background" Value="{ThemeResource CheckBoxBackgroundIndeterminateDisabled}" />
+										<Setter Target="RootGrid.BorderBrush" Value="{ThemeResource CheckBoxBorderBrushIndeterminateDisabled}" />
+										<Setter Target="NormalRectangle.Stroke" Value="{ThemeResource CheckBoxCheckBackgroundStrokeIndeterminateDisabled}" />
+										<Setter Target="NormalRectangle.Fill" Value="{ThemeResource CheckBoxCheckBackgroundFillIndeterminateDisabled}" />
+										<Setter Target="DownLevelCheckGlyph.Glyph" Value="{StaticResource CheckBoxIndeterminateGlyph}" />
+										<Setter Target="CheckGlyph.Foreground" Value="{ThemeResource CheckBoxCheckGlyphForegroundIndeterminateDisabled}" />
+										<!--  DisabledVisual Should be handled by the control, not the animated icon.  -->
+										<Setter Target="CheckGlyph.(AnimatedIcon.State)" Value="NormalIndeterminate" />
+										<Setter Target="CheckGlyph.Margin" Value="0" />
+									</VisualState.Setters>
+								</VisualState>
+							</VisualStateGroup>
+						</VisualStateManager.VisualStateGroups>
+					</Grid>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+
 </ResourceDictionary>
diff --git a/src/Files.App.Controls/PropertiesView/PropertiesViewItem.cs b/src/Files.App.Controls/PropertiesView/PropertiesViewItem.cs
index 7a6bbe6659d3..761b8bb8e8b9 100644
--- a/src/Files.App.Controls/PropertiesView/PropertiesViewItem.cs
+++ b/src/Files.App.Controls/PropertiesView/PropertiesViewItem.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using WinRT;
 
 namespace Files.App.Controls.Primitives
 {
@@ -32,6 +33,8 @@ public PropertiesViewItem()
 
 
 		#region Property Changed
+
+		[DynamicWindowsRuntimeCast( typeof( Orientation ) )]
 		private static void OnOrientationChanged(DependencyObject d , DependencyPropertyChangedEventArgs e)
 		{
 			var control = (PropertiesViewItem)d;
diff --git a/src/Files.App.Controls/PropertiesView/PropertiesViewItemCheck.cs b/src/Files.App.Controls/PropertiesView/PropertiesViewItemCheck.cs
new file mode 100644
index 000000000000..e1a7e1051c32
--- /dev/null
+++ b/src/Files.App.Controls/PropertiesView/PropertiesViewItemCheck.cs
@@ -0,0 +1,106 @@
+// Copyright (c) Files Community
+// SPDX-License-Identifier: MPL-2.0
+
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Documents;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Files.App.Controls.Primitives;
+using WinRT;
+
+namespace Files.App.Controls
+{
+	#region Template
+
+	[TemplateVisualState( Name = HorizontalStateName , GroupName = OrientationStateGroupName )]
+	[TemplateVisualState( Name = VerticalStateName , GroupName = OrientationStateGroupName )]
+
+	#endregion
+
+
+
+
+	public sealed partial class PropertiesViewItemCheck : CheckBox
+	{
+
+		#region Constants
+		internal const string OrientationStateGroupName = "OrientationStateGroup";
+
+		internal const string HorizontalStateName = "HorizontalState";
+		internal const string VerticalStateName = "VerticalState";
+
+		#endregion
+
+
+
+
+		#region Properties
+		
+		public Orientation Orientation
+		{
+			[DynamicWindowsRuntimeCast( typeof( Orientation ) )]
+
+			get => (Orientation)GetValue( OrientationProperty );
+			set => SetValue( OrientationProperty , value );
+		}
+
+		public static readonly DependencyProperty OrientationProperty =
+			DependencyProperty.Register(
+				"Orientation",
+				typeof(Orientation),
+				typeof(PropertiesViewItemCheck),
+				new PropertyMetadata(Orientation.Horizontal, OnOrientationChanged));
+
+		#endregion
+
+
+
+
+		#region Property Changed
+
+		[DynamicWindowsRuntimeCast( typeof( Orientation ) )]
+		private static void OnOrientationChanged(DependencyObject d , DependencyPropertyChangedEventArgs e)
+		{
+			var control = (PropertiesViewItemCheck)d;
+			control.UpdateOrientationState( (Orientation)e.NewValue );
+		}
+
+		private void UpdateOrientationState(Orientation orientation)
+		{
+			if ( orientation == Orientation.Horizontal )
+			{
+				VisualStateManager.GoToState( this , HorizontalStateName , false );
+			}
+			else
+			{
+				VisualStateManager.GoToState( this , VerticalStateName , false );
+			}
+		}
+
+		#endregion
+
+
+
+
+		private bool _isLoaded;
+		public PropertiesViewItemCheck()
+		{
+			DefaultStyleKey = typeof( PropertiesViewItemCheck );
+		}
+
+
+
+
+		protected override void OnApplyTemplate()
+		{
+			base.OnApplyTemplate();
+			UpdateOrientationState( Orientation );
+		}
+	}
+}
diff --git a/src/Files.App.Controls/PropertiesView/PropertiesViewItemSeparator.cs b/src/Files.App.Controls/PropertiesView/PropertiesViewItemSeparator.cs
index 33139fdd7d07..e3fe311c90ff 100644
--- a/src/Files.App.Controls/PropertiesView/PropertiesViewItemSeparator.cs
+++ b/src/Files.App.Controls/PropertiesView/PropertiesViewItemSeparator.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using WinRT;
 
 namespace Files.App.Controls
 {
@@ -27,6 +28,8 @@ public sealed partial class PropertiesViewItemSeparator : Control
 
 		public Orientation Orientation
 		{
+			[DynamicWindowsRuntimeCast( typeof( Orientation ) )]
+
 			get => (Orientation)GetValue( OrientationProperty );
 			set => SetValue( OrientationProperty , value );
 		}
@@ -59,6 +62,7 @@ private void UpdateOrientationState(Orientation orientation)
 				VisualStateManager.GoToState( this , VerticalStateName , false );
 			}
 		}
+
 		#endregion
 
 
diff --git a/src/Files.App.Controls/PropertiesView/PropertiesViewItemToggle.cs b/src/Files.App.Controls/PropertiesView/PropertiesViewItemToggle.cs
index a4da776bd9b2..3769432036f4 100644
--- a/src/Files.App.Controls/PropertiesView/PropertiesViewItemToggle.cs
+++ b/src/Files.App.Controls/PropertiesView/PropertiesViewItemToggle.cs
@@ -133,12 +133,12 @@ protected override void OnApplyTemplate()
 			}
 
 			// Get the template part
-			_toggleSwitch = GetTemplateChild( ToggleSwitchPartName ) as ToggleSwitch;
+			var _ts = GetTemplateChild( ToggleSwitchPartName ) as ToggleSwitch;
 
 			// Hook the event
-			if ( _toggleSwitch != null )
+			if ( _ts != null )
 			{
-				_toggleSwitch.Toggled += OnToggleSwitchToggled;
+				_ts.Toggled += OnToggleSwitchToggled;
 			}
 		}
 
diff --git a/tests/Files.App.UITests/Dialogs/PropertiesGeneralPage.xaml b/tests/Files.App.UITests/Dialogs/PropertiesGeneralPage.xaml
index 1f9381b4a7c1..5b90c23d4124 100644
--- a/tests/Files.App.UITests/Dialogs/PropertiesGeneralPage.xaml
+++ b/tests/Files.App.UITests/Dialogs/PropertiesGeneralPage.xaml
@@ -333,19 +333,44 @@
 			Padding="24,8"
 			Orientation="Horizontal"
 			Spacing="16">
-			<CheckBox Content="Text for a Checkbox" />
+			<controls:PropertiesViewItemCheck
+				Content="Text for a Checkbox"
+				IsChecked="False"
+				Orientation="Vertical" />
 
 			<controls:PropertiesViewItemSeparator Orientation="Vertical" />
 
-			<CheckBox Content="Checkbox t00" />
+			<controls:PropertiesViewItemCheck
+				Content="Checkbox t00"
+				IsChecked="True"
+				Orientation="Vertical" />
 
 			<controls:PropertiesViewItemSeparator Orientation="Vertical" />
 
-			<CheckBox Content="Text for a Checkbox three" />
+			<controls:PropertiesViewItemCheck
+				Content="Text for a Checkbox three"
+				IsChecked="{x:Null}"
+				Orientation="Vertical" />
+		</StackPanel>
 
-			<controls:PropertiesViewItemSeparator Orientation="Vertical" />
+		<Rectangle
+			Height="1"
+			HorizontalAlignment="Stretch"
+			Fill="Red" />
+
+		<StackPanel
+			Padding="24,8"
+			Orientation="Vertical"
+			Spacing="16">
+			<controls:PropertiesViewItemCheck Content="Text for a Checkbox" IsChecked="False" />
+
+			<controls:PropertiesViewItemSeparator />
+
+			<controls:PropertiesViewItemCheck Content="Checkbox t00" IsChecked="True" />
+
+			<controls:PropertiesViewItemSeparator />
 
-			<CheckBox Content="Text for a Checkbox 4ore" />
+			<controls:PropertiesViewItemCheck Content="Text for a Checkbox three" IsChecked="{x:Null}" />
 		</StackPanel>
 
 	</controls:PropertiesView>

From 64d0cc4c1a11af7e469402e6bf65a0803b87bf10 Mon Sep 17 00:00:00 2001
From: 0x5BFA <62196528+0x5bfa@users.noreply.github.com>
Date: Sat, 22 Aug 2026 03:21:51 +0900
Subject: [PATCH 26/36] Add PropertiesViewExpander

---
 .../PropertiesView/PropertiesViewExpander.cs  |  8 ++++
 ...ction.xaml => PropertiesViewExpander.xaml} |  6 ++-
 src/Files.App.Controls/Themes/Generic.xaml    |  2 +-
 .../Dialogs/PropertiesDetailsPage.xaml        |  8 ++--
 .../Dialogs/PropertiesGeneralPage.xaml        | 48 +++++++++----------
 5 files changed, 41 insertions(+), 31 deletions(-)
 create mode 100644 src/Files.App.Controls/PropertiesView/PropertiesViewExpander.cs
 rename src/Files.App.Controls/PropertiesView/{PropertiesViewSection.xaml => PropertiesViewExpander.xaml} (99%)

diff --git a/src/Files.App.Controls/PropertiesView/PropertiesViewExpander.cs b/src/Files.App.Controls/PropertiesView/PropertiesViewExpander.cs
new file mode 100644
index 000000000000..a1b7732243a2
--- /dev/null
+++ b/src/Files.App.Controls/PropertiesView/PropertiesViewExpander.cs
@@ -0,0 +1,8 @@
+// Copyright (c) Files Community
+// SPDX-License-Identifier: MPL-2.0
+
+namespace Files.App.Controls;
+
+public partial class PropertiesViewExpander : Expander
+{
+}
diff --git a/src/Files.App.Controls/PropertiesView/PropertiesViewSection.xaml b/src/Files.App.Controls/PropertiesView/PropertiesViewExpander.xaml
similarity index 99%
rename from src/Files.App.Controls/PropertiesView/PropertiesViewSection.xaml
rename to src/Files.App.Controls/PropertiesView/PropertiesViewExpander.xaml
index c8b1c64599f0..a0678ba425dc 100644
--- a/src/Files.App.Controls/PropertiesView/PropertiesViewSection.xaml
+++ b/src/Files.App.Controls/PropertiesView/PropertiesViewExpander.xaml
@@ -4,7 +4,9 @@
 	xmlns:animatedvisuals="using:Microsoft.UI.Xaml.Controls.AnimatedVisuals"
 	xmlns:local="using:Files.App.Controls">
 
-	<Style x:Key="PropertiesExpanderStyle" TargetType="Expander">
+	<Style BasedOn="{StaticResource DefaultPropertiesViewExpanderStyle}" TargetType="local:PropertiesViewExpander" />
+
+	<Style x:Key="DefaultPropertiesViewExpanderStyle" TargetType="local:PropertiesViewExpander">
 		<Setter Property="IsTabStop" Value="False" />
 		<Setter Property="Background" Value="{ThemeResource PropertiesExpanderContentBackground}" />
 		<Setter Property="BackgroundSizing" Value="InnerBorderEdge" />
@@ -20,7 +22,7 @@
 		<Setter Property="CornerRadius" Value="0" />
 		<Setter Property="Template">
 			<Setter.Value>
-				<ControlTemplate TargetType="Expander">
+				<ControlTemplate TargetType="local:PropertiesViewExpander">
 					<Grid MinWidth="{TemplateBinding MinWidth}" MaxWidth="{TemplateBinding MaxWidth}">
 						<Grid.RowDefinitions>
 							<RowDefinition x:Name="Row0" Height="Auto" />
diff --git a/src/Files.App.Controls/Themes/Generic.xaml b/src/Files.App.Controls/Themes/Generic.xaml
index 5e22ad5c7cb9..8c7ab8b11394 100644
--- a/src/Files.App.Controls/Themes/Generic.xaml
+++ b/src/Files.App.Controls/Themes/Generic.xaml
@@ -78,7 +78,7 @@
 		<!--#region Dialog Resources-->
 		<ResourceDictionary Source="ms-appx:///Files.App.Controls/PropertiesView/PropertiesView.xaml" />
 		<ResourceDictionary Source="ms-appx:///Files.App.Controls/PropertiesView/PropertiesView.ThemeResources.xaml" />
-		<ResourceDictionary Source="ms-appx:///Files.App.Controls/PropertiesView/PropertiesViewSection.xaml" />
+		<ResourceDictionary Source="ms-appx:///Files.App.Controls/PropertiesView/PropertiesViewExpander.xaml" />
 		<!--#endregion-->
 
 		<!--#region WindowedDialog-->
diff --git a/tests/Files.App.UITests/Dialogs/PropertiesDetailsPage.xaml b/tests/Files.App.UITests/Dialogs/PropertiesDetailsPage.xaml
index b6c539b8cce1..df90951b3222 100644
--- a/tests/Files.App.UITests/Dialogs/PropertiesDetailsPage.xaml
+++ b/tests/Files.App.UITests/Dialogs/PropertiesDetailsPage.xaml
@@ -10,16 +10,16 @@
 
 	<controls:PropertiesView>
 
-		<Expander IsExpanded="True" Style="{StaticResource PropertiesExpanderStyle}">
-			<Expander.Header>
+		<controls:PropertiesViewExpander IsExpanded="True" Style="{StaticResource PropertiesExpanderStyle}">
+			<controls:PropertiesViewExpander.Header>
 				<controls:PropertiesHeader Text="Description">
 					<controls:PropertiesHeader.Icon>
 						<FontIcon Glyph="&#xF0E3;" />
 					</controls:PropertiesHeader.Icon>
 				</controls:PropertiesHeader>
-			</Expander.Header>
+			</controls:PropertiesViewExpander.Header>
 
-		</Expander>
+		</controls:PropertiesViewExpander>
 
 	</controls:PropertiesView>
 </Page>
diff --git a/tests/Files.App.UITests/Dialogs/PropertiesGeneralPage.xaml b/tests/Files.App.UITests/Dialogs/PropertiesGeneralPage.xaml
index 5b90c23d4124..16c98d9ff75b 100644
--- a/tests/Files.App.UITests/Dialogs/PropertiesGeneralPage.xaml
+++ b/tests/Files.App.UITests/Dialogs/PropertiesGeneralPage.xaml
@@ -56,16 +56,16 @@
 			</Grid>
 		</controls:PropertiesView.Header>
 
-		<Expander IsExpanded="True" Style="{StaticResource PropertiesExpanderStyle}">
-			<Expander.Header>
+		<controls:PropertiesViewExpander IsExpanded="True">
+			<controls:PropertiesViewExpander.Header>
 				<controls:PropertiesHeader Text="Header text goes here">
 					<controls:PropertiesHeader.Icon>
 						<SymbolIcon Symbol="AddFriend" />
 					</controls:PropertiesHeader.Icon>
 				</controls:PropertiesHeader>
-			</Expander.Header>
+			</controls:PropertiesViewExpander.Header>
 
-			<Expander.Content>
+			<controls:PropertiesViewExpander.Content>
 
 				<StackPanel
 					Padding="0,0,0,8"
@@ -129,19 +129,19 @@
 						Orientation="Horizontal"
 						Text="Item value three text here, extra long to show how text values will wrap onto mnany lines." />
 				</StackPanel>
-			</Expander.Content>
-		</Expander>
+			</controls:PropertiesViewExpander.Content>
+		</controls:PropertiesViewExpander>
 
-		<Expander Style="{StaticResource PropertiesExpanderStyle}">
-			<Expander.Header>
+		<controls:PropertiesViewExpander>
+			<controls:PropertiesViewExpander.Header>
 				<controls:PropertiesHeader Text="Header text goes here, made extra long to ensure wrapping and arranging within the header works as expected">
 					<controls:PropertiesHeader.Icon>
 						<SymbolIcon Symbol="Comment" />
 					</controls:PropertiesHeader.Icon>
 				</controls:PropertiesHeader>
-			</Expander.Header>
+			</controls:PropertiesViewExpander.Header>
 
-			<Expander.Content>
+			<controls:PropertiesViewExpander.Content>
 				<StackPanel
 					Padding="0,0,0,8"
 					HorizontalAlignment="Stretch"
@@ -184,19 +184,19 @@
 						Orientation="Horizontal"
 						Rating="72" />
 				</StackPanel>
-			</Expander.Content>
-		</Expander>
+			</controls:PropertiesViewExpander.Content>
+		</controls:PropertiesViewExpander>
 
-		<Expander Style="{StaticResource PropertiesExpanderStyle}">
-			<Expander.Header>
+		<controls:PropertiesViewExpander>
+			<controls:PropertiesViewExpander.Header>
 				<controls:PropertiesHeader Text="Vertical examples">
 					<controls:PropertiesHeader.Icon>
 						<SymbolIcon Symbol="SlideShow" />
 					</controls:PropertiesHeader.Icon>
 				</controls:PropertiesHeader>
-			</Expander.Header>
+			</controls:PropertiesViewExpander.Header>
 
-			<Expander.Content>
+			<controls:PropertiesViewExpander.Content>
 				<StackPanel HorizontalAlignment="Stretch" Orientation="Vertical">
 
 					<controls:PropertiesViewItemText
@@ -243,18 +243,18 @@
 						Orientation="Vertical"
 						Text="Item value 1 text here, made long so we can see how wrapping will work for this vertical exanple of the control layout. " />
 				</StackPanel>
-			</Expander.Content>
-		</Expander>
+			</controls:PropertiesViewExpander.Content>
+		</controls:PropertiesViewExpander>
 
-		<Expander IsExpanded="True" Style="{StaticResource PropertiesExpanderStyle}">
-			<Expander.Header>
+		<controls:PropertiesViewExpander IsExpanded="True">
+			<controls:PropertiesViewExpander.Header>
 				<controls:PropertiesHeader Text="Toggle Items">
 					<controls:PropertiesHeader.Icon>
 						<SymbolIcon Symbol="XboxOneConsole" />
 					</controls:PropertiesHeader.Icon>
 				</controls:PropertiesHeader>
-			</Expander.Header>
-			<Expander.Content>
+			</controls:PropertiesViewExpander.Header>
+			<controls:PropertiesViewExpander.Content>
 				<StackPanel HorizontalAlignment="Stretch" Orientation="Vertical">
 					<controls:PropertiesViewItemToggle
 						IsEnabled="True"
@@ -326,8 +326,8 @@
 						LabelWidth="{StaticResource LabelWidth}"
 						Orientation="Vertical" />
 				</StackPanel>
-			</Expander.Content>
-		</Expander>
+			</controls:PropertiesViewExpander.Content>
+		</controls:PropertiesViewExpander>
 
 		<StackPanel
 			Padding="24,8"

From a72bfd60092f6e213ccb350c32464bce50557281 Mon Sep 17 00:00:00 2001
From: 0x5BFA <62196528+0x5bfa@users.noreply.github.com>
Date: Sat, 22 Aug 2026 05:26:14 +0900
Subject: [PATCH 27/36] Add PropertiesViewCard

---
 .../PropertiesView/PropertiesViewCard.cs      | 18 ++++++
 .../PropertiesView/PropertiesViewCard.xaml    | 63 +++++++++++++++++++
 .../PropertiesViewExpander.xaml               |  1 +
 src/Files.App.Controls/Themes/Generic.xaml    |  1 +
 .../Dialogs/PropertiesGeneralPage.xaml        |  6 ++
 5 files changed, 89 insertions(+)
 create mode 100644 src/Files.App.Controls/PropertiesView/PropertiesViewCard.cs
 create mode 100644 src/Files.App.Controls/PropertiesView/PropertiesViewCard.xaml

diff --git a/src/Files.App.Controls/PropertiesView/PropertiesViewCard.cs b/src/Files.App.Controls/PropertiesView/PropertiesViewCard.cs
new file mode 100644
index 000000000000..fb64ab19d400
--- /dev/null
+++ b/src/Files.App.Controls/PropertiesView/PropertiesViewCard.cs
@@ -0,0 +1,18 @@
+// Copyright (c) Files Community
+// SPDX-License-Identifier: MPL-2.0
+
+using CommunityToolkit.WinUI;
+
+namespace Files.App.Controls;
+
+public partial class PropertiesViewCard : ButtonBase
+{
+	[GeneratedDependencyProperty]
+	public partial object? Header { get; set; }
+
+	[GeneratedDependencyProperty]
+	public partial FrameworkElement? HeaderIcon { get; set; }
+
+	[GeneratedDependencyProperty]
+	public partial FrameworkElement? IsClickEnabled { get; set; }
+}
diff --git a/src/Files.App.Controls/PropertiesView/PropertiesViewCard.xaml b/src/Files.App.Controls/PropertiesView/PropertiesViewCard.xaml
new file mode 100644
index 000000000000..87e266c27408
--- /dev/null
+++ b/src/Files.App.Controls/PropertiesView/PropertiesViewCard.xaml
@@ -0,0 +1,63 @@
+<!--  Copyright (c) Files Community. SPDX-License-Identifier: MPL-2.0  -->
+<ResourceDictionary
+	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	xmlns:local="using:Files.App.Controls">
+
+	<Style BasedOn="{StaticResource DefaultPropertiesViewCardStyle}" TargetType="local:PropertiesViewCard" />
+
+	<Style x:Key="DefaultPropertiesViewCardStyle" TargetType="local:PropertiesViewCard">
+		<!--<Setter Property="Background" Value="{ThemeResource LayerFillColorAltBrush}" />
+		<Setter Property="BorderBrush" Value="{ThemeResource CardStrokeColorDefaultBrush}" />
+		<Setter Property="BorderThickness" Value="1" />
+		<Setter Property="Padding" Value="12,8" />-->
+		<Setter Property="MinHeight" Value="48" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="local:PropertiesViewCard">
+					<Grid>
+						<Grid.BackgroundTransition>
+							<BrushTransition Duration="0:0:0.083" />
+						</Grid.BackgroundTransition>
+						<Grid.ColumnDefinitions>
+							<ColumnDefinition Width="Auto" />
+							<ColumnDefinition Width="*" />
+							<ColumnDefinition Width="Auto" />
+						</Grid.ColumnDefinitions>
+
+						<Viewbox Grid.Column="0" VerticalAlignment="Center">
+							<ContentPresenter Content="{TemplateBinding HeaderIcon}" />
+						</Viewbox>
+
+						<ContentPresenter
+							Grid.Column="1"
+							VerticalAlignment="Center"
+							Content="{TemplateBinding Header}"
+							FontSize="12"
+							FontWeight="Normal"
+							Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+							LineHeight="20" />
+
+						<ContentPresenter
+							Grid.Column="2"
+							VerticalAlignment="Center"
+							Content="{TemplateBinding Content}" />
+
+						<VisualStateManager.VisualStateGroups>
+							<VisualStateGroup x:Name="CommonStates" />
+
+							<VisualStateGroup x:Name="ContentAlignmentStates">
+								<VisualState x:Name="ContentAlignedRight" />
+
+								<VisualState x:Name="ContentAlignedRightWrapped" />
+
+								<VisualState x:Name="ContentAlignedLeft" />
+							</VisualStateGroup>
+						</VisualStateManager.VisualStateGroups>
+					</Grid>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+
+</ResourceDictionary>
diff --git a/src/Files.App.Controls/PropertiesView/PropertiesViewExpander.xaml b/src/Files.App.Controls/PropertiesView/PropertiesViewExpander.xaml
index a0678ba425dc..cdea6ac0b2f1 100644
--- a/src/Files.App.Controls/PropertiesView/PropertiesViewExpander.xaml
+++ b/src/Files.App.Controls/PropertiesView/PropertiesViewExpander.xaml
@@ -1,3 +1,4 @@
+<!--  Copyright (c) Files Community. SPDX-License-Identifier: MPL-2.0  -->
 <ResourceDictionary
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/src/Files.App.Controls/Themes/Generic.xaml b/src/Files.App.Controls/Themes/Generic.xaml
index 8c7ab8b11394..3d23ac4b22d1 100644
--- a/src/Files.App.Controls/Themes/Generic.xaml
+++ b/src/Files.App.Controls/Themes/Generic.xaml
@@ -78,6 +78,7 @@
 		<!--#region Dialog Resources-->
 		<ResourceDictionary Source="ms-appx:///Files.App.Controls/PropertiesView/PropertiesView.xaml" />
 		<ResourceDictionary Source="ms-appx:///Files.App.Controls/PropertiesView/PropertiesView.ThemeResources.xaml" />
+		<ResourceDictionary Source="ms-appx:///Files.App.Controls/PropertiesView/PropertiesViewCard.xaml" />
 		<ResourceDictionary Source="ms-appx:///Files.App.Controls/PropertiesView/PropertiesViewExpander.xaml" />
 		<!--#endregion-->
 
diff --git a/tests/Files.App.UITests/Dialogs/PropertiesGeneralPage.xaml b/tests/Files.App.UITests/Dialogs/PropertiesGeneralPage.xaml
index 16c98d9ff75b..53536c1e136e 100644
--- a/tests/Files.App.UITests/Dialogs/PropertiesGeneralPage.xaml
+++ b/tests/Files.App.UITests/Dialogs/PropertiesGeneralPage.xaml
@@ -71,6 +71,12 @@
 					Padding="0,0,0,8"
 					HorizontalAlignment="Stretch"
 					Orientation="Vertical">
+
+
+					<controls:PropertiesViewCard Header="Card header text" />
+
+					<controls:PropertiesViewItemSeparator />
+
 					<controls:PropertiesViewItemText
 						CanEdit="True"
 						Label="Item label 1"

From c00d6d4b6d44cc26248fc3653c69136916c676a6 Mon Sep 17 00:00:00 2001
From: 0x5BFA <62196528+0x5bfa@users.noreply.github.com>
Date: Sat, 22 Aug 2026 06:40:53 +0900
Subject: [PATCH 28/36] Replace properties view items with cards

---
 .../Files.App.Controls.csproj                 |    8 +-
 .../PropertiesView/PropertiesHeader.xaml      |   35 -
 .../PropertiesView/PropertiesHeader.xaml.cs   |   59 -
 .../PropertiesView/PropertiesView.xaml        | 1474 +----------------
 .../PropertiesViewCard.Properties.cs          |   53 +
 .../PropertiesView/PropertiesViewCard.cs      |  325 +++-
 .../PropertiesView/PropertiesViewCard.xaml    |  288 +++-
 .../PropertiesViewCardAutomationPeer.cs       |   53 +
 .../PropertiesView/PropertiesViewExpander.cs  |   11 +-
 .../PropertiesViewExpander.xaml               |   44 +-
 .../PropertiesViewItem - Constants.cs         |   31 -
 .../PropertiesViewItem.Properties.cs          |   75 -
 .../PropertiesView/PropertiesViewItem.cs      |   97 --
 .../PropertiesView/PropertiesViewItemCheck.cs |  106 --
 .../PropertiesView/PropertiesViewItemInfo.cs  |  117 --
 .../PropertiesViewItemRating.cs               |  257 ---
 .../PropertiesViewItemSeparator.cs            |   81 -
 .../PropertiesView/PropertiesViewItemText.cs  |   45 -
 .../PropertiesViewItemToggle.cs               |  159 --
 .../Dialogs/PropertiesDetailsPage.xaml        |   32 +-
 .../Dialogs/PropertiesDialog.xaml.cs          |    6 +-
 .../Dialogs/PropertiesGeneralPage.xaml        |  448 ++---
 .../Dialogs/PropertiesGeneralPage.xaml.cs     |    5 +
 23 files changed, 888 insertions(+), 2921 deletions(-)
 delete mode 100644 src/Files.App.Controls/PropertiesView/PropertiesHeader.xaml
 delete mode 100644 src/Files.App.Controls/PropertiesView/PropertiesHeader.xaml.cs
 create mode 100644 src/Files.App.Controls/PropertiesView/PropertiesViewCard.Properties.cs
 create mode 100644 src/Files.App.Controls/PropertiesView/PropertiesViewCardAutomationPeer.cs
 delete mode 100644 src/Files.App.Controls/PropertiesView/PropertiesViewItem - Constants.cs
 delete mode 100644 src/Files.App.Controls/PropertiesView/PropertiesViewItem.Properties.cs
 delete mode 100644 src/Files.App.Controls/PropertiesView/PropertiesViewItem.cs
 delete mode 100644 src/Files.App.Controls/PropertiesView/PropertiesViewItemCheck.cs
 delete mode 100644 src/Files.App.Controls/PropertiesView/PropertiesViewItemInfo.cs
 delete mode 100644 src/Files.App.Controls/PropertiesView/PropertiesViewItemRating.cs
 delete mode 100644 src/Files.App.Controls/PropertiesView/PropertiesViewItemSeparator.cs
 delete mode 100644 src/Files.App.Controls/PropertiesView/PropertiesViewItemText.cs
 delete mode 100644 src/Files.App.Controls/PropertiesView/PropertiesViewItemToggle.cs

diff --git a/src/Files.App.Controls/Files.App.Controls.csproj b/src/Files.App.Controls/Files.App.Controls.csproj
index 893bd4013f89..03a9c9059a2a 100644
--- a/src/Files.App.Controls/Files.App.Controls.csproj
+++ b/src/Files.App.Controls/Files.App.Controls.csproj
@@ -1,4 +1,4 @@
-<!--  Copyright (c) Files Community. Licensed under the MIT License.  -->
+<!--  Copyright (c) Files Community. Licensed under the MIT License.  -->
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
@@ -16,6 +16,7 @@
 
     <ItemGroup>
         <PackageReference Include="CommunityToolkit.WinUI.Extensions" />
+        <PackageReference Include="CommunityToolkit.WinUI.Triggers" />
         <PackageReference Include="CommunityToolkit.Labs.WinUI.DependencyPropertyGenerator" />
         <PackageReference Include="Microsoft.WindowsAppSDK" />
         <PackageReference Include="Microsoft.Windows.SDK.BuildTools" />
@@ -32,4 +33,9 @@
         <ProjectReference Include="..\Files.Core.SourceGenerator\Files.Core.SourceGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
     </ItemGroup>
 
+    <ItemGroup>
+        <Compile Remove="PropertiesView\old\**\*.cs" />
+        <Page Remove="PropertiesView\old\**\*.xaml" />
+    </ItemGroup>
+
 </Project>
diff --git a/src/Files.App.Controls/PropertiesView/PropertiesHeader.xaml b/src/Files.App.Controls/PropertiesView/PropertiesHeader.xaml
deleted file mode 100644
index ab2f594d6281..000000000000
--- a/src/Files.App.Controls/PropertiesView/PropertiesHeader.xaml
+++ /dev/null
@@ -1,35 +0,0 @@
-<!--  Copyright (c) Files Community. SPDX-License-Identifier: MPL-2.0  -->
-<UserControl
-	x:Class="Files.App.Controls.PropertiesHeader"
-	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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-	mc:Ignorable="d">
-
-
-	<Grid>
-		<Grid.ColumnDefinitions>
-			<ColumnDefinition Width="Auto" />
-			<ColumnDefinition Width="*" />
-		</Grid.ColumnDefinitions>
-		<Viewbox
-			x:Name="IconViewbox"
-			Height="16"
-			Margin="0,0,12,0"
-			HorizontalAlignment="Stretch"
-			AutomationProperties.AccessibilityView="Raw">
-			<ContentPresenter x:Name="Content_PART" Content="{x:Bind Icon}" />
-		</Viewbox>
-		<TextBlock
-			x:Name="Text_PART"
-			Grid.Column="1"
-			Margin="0,4,0,8"
-			HorizontalAlignment="Left"
-			FontWeight="SemiBold"
-			Text="{x:Bind Text}"
-			TextWrapping="WrapWholeWords" />
-	</Grid>
-
-
-</UserControl>
diff --git a/src/Files.App.Controls/PropertiesView/PropertiesHeader.xaml.cs b/src/Files.App.Controls/PropertiesView/PropertiesHeader.xaml.cs
deleted file mode 100644
index eea323eb71ba..000000000000
--- a/src/Files.App.Controls/PropertiesView/PropertiesHeader.xaml.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Controls.Primitives;
-using Microsoft.UI.Xaml.Data;
-using Microsoft.UI.Xaml.Input;
-using Microsoft.UI.Xaml.Media;
-using Microsoft.UI.Xaml.Navigation;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
-
-// To learn more about WinUI, the WinUI project structure,
-// and more about our project templates, see: http://aka.ms/winui-project-info.
-
-namespace Files.App.Controls
-{
-	public sealed partial class PropertiesHeader : UserControl
-	{
-		public IconElement Icon
-		{
-			get { return (IconElement)GetValue( IconProperty ); }
-			set { SetValue( IconProperty , value ); }
-		}
-
-		public static readonly DependencyProperty IconProperty =
-			DependencyProperty.Register(
-				"Icon",
-				typeof(IconElement),
-				typeof(PropertiesHeader),
-				new PropertyMetadata( null ) );
-
-
-
-
-		public string Text
-		{
-			get { return (string)GetValue( TextProperty ); }
-			set { SetValue( TextProperty , value ); }
-		}
-
-		public static readonly DependencyProperty TextProperty =
-			DependencyProperty.Register(
-				"Text",
-				typeof(string),
-				typeof(PropertiesHeader),
-				new PropertyMetadata( string.Empty ) );
-
-
-
-		public PropertiesHeader()
-		{
-			this.InitializeComponent();
-		}
-	}
-}
diff --git a/src/Files.App.Controls/PropertiesView/PropertiesView.xaml b/src/Files.App.Controls/PropertiesView/PropertiesView.xaml
index 76fb92870838..a317287c14cd 100644
--- a/src/Files.App.Controls/PropertiesView/PropertiesView.xaml
+++ b/src/Files.App.Controls/PropertiesView/PropertiesView.xaml
@@ -2,16 +2,13 @@
 <ResourceDictionary
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-	xmlns:animatedvisuals="using:Microsoft.UI.Xaml.Controls.AnimatedVisuals"
-	xmlns:fcontrols="using:Files.App.Controls">
+	xmlns:local="using:Files.App.Controls">
 
+	<Style BasedOn="{StaticResource DefaultPropertiesViewStyle}" TargetType="local:PropertiesView" />
 
-	<!--  PROPERTIES VIEW  -->
-	<Style BasedOn="{StaticResource DefaultPropertiesViewStyle}" TargetType="fcontrols:PropertiesView" />
-
-	<Style x:Key="DefaultPropertiesViewStyle" TargetType="fcontrols:PropertiesView">
-		<Setter Property="VerticalAlignment" Value="Stretch" />
+	<Style x:Key="DefaultPropertiesViewStyle" TargetType="local:PropertiesView">
 		<Setter Property="HorizontalAlignment" Value="Stretch" />
+		<Setter Property="VerticalAlignment" Value="Stretch" />
 		<Setter Property="ItemsPanel">
 			<Setter.Value>
 				<ItemsPanelTemplate>
@@ -21,7 +18,7 @@
 		</Setter>
 		<Setter Property="Template">
 			<Setter.Value>
-				<ControlTemplate TargetType="fcontrols:PropertiesView">
+				<ControlTemplate TargetType="local:PropertiesView">
 					<Grid>
 						<Grid.RowDefinitions>
 							<RowDefinition Height="Auto" />
@@ -51,1467 +48,6 @@
 							HorizontalContentAlignment="Stretch"
 							VerticalContentAlignment="Stretch"
 							Content="{TemplateBinding Footer}" />
-
-					</Grid>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-
-
-	<!--  PROPERTIES VIEW ITEM SEPARATOR  -->
-	<Style TargetType="fcontrols:PropertiesViewItemSeparator">
-		<Setter Property="Background" Value="Transparent" />
-		<Setter Property="Foreground" Value="{ThemeResource PropertiesItemSeparatorForeground}" />
-		<Setter Property="CornerRadius" Value="{StaticResource PropertiessItemSeparatorCornerRadius}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="fcontrols:PropertiesViewItemSeparator">
-					<Grid
-						x:Name="RootGrid"
-						Padding="{TemplateBinding Padding}"
-						HorizontalAlignment="Stretch"
-						VerticalAlignment="Stretch">
-						<Border
-							x:Name="SeparatorHorizontalBorder"
-							Height="{StaticResource PropertiesItemSeparatorStrokeThickness}"
-							Margin="{StaticResource PropertiesItemSeparatorHorizontalMargin}"
-							HorizontalAlignment="Stretch"
-							VerticalAlignment="Center"
-							Background="{TemplateBinding Foreground}"
-							CornerRadius="{TemplateBinding CornerRadius}"
-							Visibility="Visible" />
-
-						<Border
-							x:Name="SeparatorVerticalBorder"
-							Width="{StaticResource PropertiesItemSeparatorStrokeThickness}"
-							Margin="{StaticResource PropertiesItemSeparatorVerticalMargin}"
-							HorizontalAlignment="Center"
-							VerticalAlignment="Stretch"
-							Background="{TemplateBinding Foreground}"
-							CornerRadius="{TemplateBinding CornerRadius}"
-							Visibility="Collapsed" />
-
-						<VisualStateManager.VisualStateGroups>
-							<VisualStateGroup x:Name="OrientationStateGroup">
-								<VisualState x:Name="HorizontalState">
-									<VisualState.Setters>
-										<Setter Target="SeparatorVerticalBorder.Visibility" Value="Collapsed" />
-										<Setter Target="SeparatorHorizontalBorder.Visibility" Value="Visible" />
-									</VisualState.Setters>
-								</VisualState>
-
-								<VisualState x:Name="VerticalState">
-									<VisualState.Setters>
-										<Setter Target="SeparatorVerticalBorder.Visibility" Value="Visible" />
-										<Setter Target="SeparatorHorizontalBorder.Visibility" Value="Collapsed" />
-									</VisualState.Setters>
-								</VisualState>
-							</VisualStateGroup>
-						</VisualStateManager.VisualStateGroups>
-					</Grid>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-
-
-	<!--  PROPERTIES VIEW ITEM - TEXT  -->
-	<Style BasedOn="{StaticResource DefaultPropertiesViewItem_Text}" TargetType="fcontrols:PropertiesViewItemText" />
-
-	<Style x:Key="DefaultPropertiesViewItem_Text" TargetType="fcontrols:PropertiesViewItemText">
-
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="fcontrols:PropertiesViewItemText">
-					<Grid
-						MinHeight="48"
-						Padding="0,6"
-						HorizontalAlignment="Stretch"
-						VerticalAlignment="Stretch">
-						<Grid.ColumnDefinitions>
-							<ColumnDefinition Width="{TemplateBinding LabelWidth}" />
-							<ColumnDefinition Width="*" />
-						</Grid.ColumnDefinitions>
-						<Grid.RowDefinitions>
-							<RowDefinition Height="Auto" />
-							<RowDefinition Height="Auto" />
-						</Grid.RowDefinitions>
-
-						<TextBlock
-							x:Name="PART_Label"
-							Grid.Row="0"
-							Grid.RowSpan="2"
-							Grid.Column="0"
-							Grid.ColumnSpan="1"
-							Margin="0,4,20,4"
-							VerticalAlignment="Center"
-							Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-							LineHeight="20"
-							Style="{ThemeResource CaptionTextBlockStyle}"
-							Text="{TemplateBinding Label}" />
-
-						<TextBlock
-							x:Name="PART_Text"
-							Grid.Row="0"
-							Grid.RowSpan="2"
-							Grid.Column="1"
-							Grid.ColumnSpan="1"
-							Margin="0,2,12,2"
-							VerticalAlignment="Center"
-							Text="{TemplateBinding Text}"
-							TextWrapping="WrapWholeWords"
-							Visibility="Visible" />
-
-						<TextBox
-							x:Name="PART_TextEdit"
-							Grid.Row="0"
-							Grid.RowSpan="2"
-							Grid.Column="1"
-							Grid.ColumnSpan="1"
-							Margin="-12,2,0,2"
-							VerticalAlignment="Center"
-							Text="{TemplateBinding Text}"
-							Visibility="Collapsed" />
-
-
-
-
-						<VisualStateManager.VisualStateGroups>
-							<VisualStateGroup x:Name="EditableStateGroup">
-								<VisualState x:Name="NotEditableState">
-									<VisualState.Setters>
-										<Setter Target="PART_TextEdit.Visibility" Value="Collapsed" />
-										<Setter Target="PART_Text.Visibility" Value="Visible" />
-									</VisualState.Setters>
-								</VisualState>
-								<VisualState x:Name="EditableState">
-									<VisualState.Setters>
-										<Setter Target="PART_TextEdit.Visibility" Value="Visible" />
-										<Setter Target="PART_Text.Visibility" Value="Collapsed" />
-									</VisualState.Setters>
-								</VisualState>
-							</VisualStateGroup>
-
-
-							<VisualStateGroup x:Name="OrientationStateGroup">
-								<VisualState x:Name="HorizontalState">
-									<VisualState.Setters>
-										<Setter Target="PART_Label.(Grid.Row)" Value="0" />
-										<Setter Target="PART_Label.(Grid.RowSpan)" Value="2" />
-										<Setter Target="PART_Label.(Grid.Column)" Value="0" />
-										<Setter Target="PART_Label.(Grid.ColumnSpan)" Value="1" />
-
-										<Setter Target="PART_TextEdit.(Grid.Row)" Value="0" />
-										<Setter Target="PART_TextEdit.(Grid.RowSpan)" Value="2" />
-										<Setter Target="PART_TextEdit.(Grid.Column)" Value="1" />
-										<Setter Target="PART_TextEdit.(Grid.ColumnSpan)" Value="1" />
-
-										<Setter Target="PART_Text.(Grid.Row)" Value="0" />
-										<Setter Target="PART_Text.(Grid.RowSpan)" Value="2" />
-										<Setter Target="PART_Text.(Grid.Column)" Value="1" />
-										<Setter Target="PART_Text.(Grid.ColumnSpan)" Value="1" />
-									</VisualState.Setters>
-								</VisualState>
-
-								<VisualState x:Name="VerticalState">
-									<VisualState.Setters>
-										<Setter Target="PART_Label.(Grid.Row)" Value="0" />
-										<Setter Target="PART_Label.(Grid.RowSpan)" Value="1" />
-										<Setter Target="PART_Label.(Grid.Column)" Value="0" />
-										<Setter Target="PART_Label.(Grid.ColumnSpan)" Value="2" />
-
-										<Setter Target="PART_TextEdit.(Grid.Row)" Value="1" />
-										<Setter Target="PART_TextEdit.(Grid.RowSpan)" Value="1" />
-										<Setter Target="PART_TextEdit.(Grid.Column)" Value="0" />
-										<Setter Target="PART_TextEdit.(Grid.ColumnSpan)" Value="2" />
-
-										<Setter Target="PART_Text.(Grid.Row)" Value="1" />
-										<Setter Target="PART_Text.(Grid.RowSpan)" Value="1" />
-										<Setter Target="PART_Text.(Grid.Column)" Value="0" />
-										<Setter Target="PART_Text.(Grid.ColumnSpan)" Value="2" />
-									</VisualState.Setters>
-								</VisualState>
-							</VisualStateGroup>
-
-
-							<VisualStateGroup x:Name="EnabledStateGroup">
-								<VisualState x:Name="Enabledtate">
-									<VisualState.Setters>
-										<Setter Target="PART_TextEdit.IsEnabled" Value="True" />
-										<Setter Target="PART_Text.Foreground" Value="{ThemeResource TextFillColorPrimaryBrush}" />
-									</VisualState.Setters>
-								</VisualState>
-								<VisualState x:Name="DisabledState">
-									<VisualState.Setters>
-										<Setter Target="PART_TextEdit.IsEnabled" Value="False" />
-										<Setter Target="PART_Text.Foreground" Value="{ThemeResource TextFillColorDisabledBrush}" />
-									</VisualState.Setters>
-								</VisualState>
-							</VisualStateGroup>
-						</VisualStateManager.VisualStateGroups>
-					</Grid>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-
-
-	<!--  PROPERTIES VIEW ITEM - RATING  -->
-	<Style BasedOn="{StaticResource DefaultPropertiesViewItem_Rating}" TargetType="fcontrols:PropertiesViewItemRating" />
-
-	<Style x:Key="DefaultPropertiesViewItem_Rating" TargetType="fcontrols:PropertiesViewItemRating">
-
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="fcontrols:PropertiesViewItemRating">
-					<Grid
-						MinHeight="48"
-						Padding="0,6"
-						HorizontalAlignment="Stretch"
-						VerticalAlignment="Stretch">
-						<Grid.ColumnDefinitions>
-							<ColumnDefinition Width="{TemplateBinding LabelWidth}" />
-							<ColumnDefinition Width="*" />
-						</Grid.ColumnDefinitions>
-						<Grid.RowDefinitions>
-							<RowDefinition Height="Auto" />
-							<RowDefinition Height="Auto" />
-						</Grid.RowDefinitions>
-
-						<TextBlock
-							x:Name="PART_Label"
-							Grid.Row="0"
-							Grid.RowSpan="2"
-							Grid.Column="0"
-							Grid.ColumnSpan="1"
-							Margin="0,4,24,4"
-							HorizontalAlignment="Stretch"
-							VerticalAlignment="Center"
-							Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-							LineHeight="20"
-							Style="{ThemeResource CaptionTextBlockStyle}"
-							Text="{TemplateBinding Label}" />
-
-						<RatingControl
-							x:Name="PART_RatingControl"
-							Grid.Row="0"
-							Grid.RowSpan="2"
-							Grid.Column="1"
-							Grid.ColumnSpan="1"
-							HorizontalAlignment="Left"
-							VerticalAlignment="Center"
-							IsClearEnabled="True"
-							MaxRating="5"
-							PlaceholderValue="-1" />
-
-
-						<VisualStateManager.VisualStateGroups>
-							<VisualStateGroup x:Name="EditableStateGroup">
-								<VisualState x:Name="NotEditableState">
-									<VisualState.Setters>
-										<Setter Target="PART_RatingControl.IsReadOnly" Value="True" />
-									</VisualState.Setters>
-								</VisualState>
-								<VisualState x:Name="EditableState">
-									<VisualState.Setters>
-										<Setter Target="PART_RatingControl.IsReadOnly" Value="False" />
-									</VisualState.Setters>
-								</VisualState>
-							</VisualStateGroup>
-
-
-							<VisualStateGroup x:Name="OrientationStateGroup">
-								<VisualState x:Name="HorizontalState">
-									<VisualState.Setters>
-										<Setter Target="PART_Label.(Grid.Row)" Value="0" />
-										<Setter Target="PART_Label.(Grid.RowSpan)" Value="2" />
-										<Setter Target="PART_Label.(Grid.Column)" Value="0" />
-										<Setter Target="PART_Label.(Grid.ColumnSpan)" Value="1" />
-
-										<Setter Target="PART_RatingControl.(Grid.Row)" Value="0" />
-										<Setter Target="PART_RatingControl.(Grid.RowSpan)" Value="2" />
-										<Setter Target="PART_RatingControl.(Grid.Column)" Value="1" />
-										<Setter Target="PART_RatingControl.(Grid.ColumnSpan)" Value="1" />
-									</VisualState.Setters>
-								</VisualState>
-
-								<VisualState x:Name="VerticalState">
-									<VisualState.Setters>
-										<Setter Target="PART_Label.(Grid.Row)" Value="0" />
-										<Setter Target="PART_Label.(Grid.RowSpan)" Value="1" />
-										<Setter Target="PART_Label.(Grid.Column)" Value="0" />
-										<Setter Target="PART_Label.(Grid.ColumnSpan)" Value="2" />
-
-										<Setter Target="PART_RatingControl.(Grid.Row)" Value="1" />
-										<Setter Target="PART_RatingControl.(Grid.RowSpan)" Value="1" />
-										<Setter Target="PART_RatingControl.(Grid.Column)" Value="0" />
-										<Setter Target="PART_RatingControl.(Grid.ColumnSpan)" Value="2" />
-									</VisualState.Setters>
-								</VisualState>
-							</VisualStateGroup>
-
-
-							<VisualStateGroup x:Name="EnabledStateGroup">
-								<VisualState x:Name="Enabledtate">
-									<VisualState.Setters>
-										<Setter Target="PART_RatingControl.IsEnabled" Value="True" />
-									</VisualState.Setters>
-								</VisualState>
-								<VisualState x:Name="DisabledState">
-									<VisualState.Setters>
-										<Setter Target="PART_RatingControl.IsEnabled" Value="False" />
-									</VisualState.Setters>
-								</VisualState>
-							</VisualStateGroup>
-						</VisualStateManager.VisualStateGroups>
-					</Grid>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-
-
-	<!--  PROPERTIES VIEW ITEM - TEXT  -->
-	<Style BasedOn="{StaticResource DefaultPropertiesViewItem_Info}" TargetType="fcontrols:PropertiesViewItemInfo" />
-
-	<Style x:Key="DefaultPropertiesViewItem_Info" TargetType="fcontrols:PropertiesViewItemInfo">
-
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="fcontrols:PropertiesViewItemInfo">
-					<Grid
-						MinHeight="48"
-						Padding="0,6"
-						HorizontalAlignment="Stretch"
-						VerticalAlignment="Stretch">
-						<Grid.ColumnDefinitions>
-							<ColumnDefinition Width="{TemplateBinding LabelWidth}" />
-							<ColumnDefinition Width="*" />
-						</Grid.ColumnDefinitions>
-						<Grid.RowDefinitions>
-							<RowDefinition Height="Auto" />
-							<RowDefinition Height="Auto" />
-						</Grid.RowDefinitions>
-
-						<TextBlock
-							x:Name="PART_Label"
-							Grid.Row="0"
-							Grid.RowSpan="2"
-							Grid.Column="0"
-							Grid.ColumnSpan="1"
-							Margin="0,4,24,4"
-							VerticalAlignment="Center"
-							Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-							LineHeight="20"
-							Style="{ThemeResource CaptionTextBlockStyle}"
-							Text="{TemplateBinding Label}" />
-
-						<Grid
-							x:Name="TextGrid"
-							Grid.Row="0"
-							Grid.RowSpan="2"
-							Grid.Column="1"
-							Grid.ColumnSpan="1"
-							HorizontalAlignment="Stretch"
-							VerticalAlignment="Center">
-
-							<Grid.ColumnDefinitions>
-								<ColumnDefinition x:Name="Col01" Width="Auto" />
-								<ColumnDefinition x:Name="Col02" Width="*" />
-							</Grid.ColumnDefinitions>
-
-							<TextBlock
-								x:Name="PART_Text"
-								Grid.Column="0"
-								Margin="0,2,12,2"
-								VerticalAlignment="Center"
-								Text="{TemplateBinding Text}"
-								TextWrapping="WrapWholeWords"
-								Visibility="Visible" />
-
-							<TextBox
-								x:Name="PART_TextEdit"
-								Grid.Column="0"
-								Grid.ColumnSpan="2"
-								Margin="-12,2,0,2"
-								VerticalAlignment="Center"
-								Text="{TemplateBinding Text}"
-								Visibility="Collapsed" />
-
-							<Border
-								x:Name="PART_InfoCard"
-								Grid.Column="1"
-								Width="32"
-								Height="32"
-								Margin="0,2,0,2"
-								HorizontalAlignment="Left"
-								VerticalAlignment="Center"
-								Background="{ThemeResource SubtleFillColorTransparentBrush}"
-								BorderBrush="{ThemeResource SubtleFillColorTransparentBrush}"
-								BorderThickness="1"
-								CornerRadius="16">
-
-								<ToolTipService.ToolTip>
-									<ToolTip Content="{TemplateBinding InfoText}" Placement="Top" />
-								</ToolTipService.ToolTip>
-
-								<FontIcon
-									x:Name="PART_InfoIcon"
-									HorizontalAlignment="Center"
-									VerticalAlignment="Center"
-									FontSize="16"
-									Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-									Glyph="&#xEA80;" />
-
-							</Border>
-						</Grid>
-
-
-
-
-						<VisualStateManager.VisualStateGroups>
-
-							<VisualStateGroup x:Name="EditableStateGroup">
-
-								<VisualState x:Name="NotEditableState">
-									<VisualState.Setters>
-										<Setter Target="PART_TextEdit.Visibility" Value="Collapsed" />
-										<Setter Target="PART_Text.Visibility" Value="Visible" />
-										<Setter Target="PART_InfoCard.Visibility" Value="Visible" />
-									</VisualState.Setters>
-								</VisualState>
-								<VisualState x:Name="EditableState">
-									<VisualState.Setters>
-										<Setter Target="PART_TextEdit.Visibility" Value="Visible" />
-										<Setter Target="PART_Text.Visibility" Value="Collapsed" />
-										<Setter Target="PART_InfoCard.Visibility" Value="Collapsed" />
-									</VisualState.Setters>
-								</VisualState>
-
-							</VisualStateGroup>
-
-
-							<VisualStateGroup x:Name="InfoStateGroup">
-
-								<VisualState x:Name="InfoRest">
-									<VisualState.Setters>
-										<Setter Target="PART_InfoCard.Background" Value="{ThemeResource SubtleFillColorTransparentBrush}" />
-										<Setter Target="PART_InfoCard.BorderBrush" Value="{ThemeResource SubtleFillColorTransparentBrush}" />
-										<Setter Target="PART_InfoIcon.Foreground" Value="{ThemeResource TextFillColorSecondaryBrush}" />
-									</VisualState.Setters>
-								</VisualState>
-								<VisualState x:Name="InfoPointerOver">
-									<VisualState.Setters>
-										<Setter Target="PART_InfoCard.Background" Value="{ThemeResource CardBackgroundFillColorDefaultBrush}" />
-										<Setter Target="PART_InfoCard.BorderBrush" Value="{ThemeResource SurfaceStrokeColorDefaultBrush}" />
-										<Setter Target="PART_InfoIcon.Foreground" Value="{ThemeResource TextFillColorPrimaryBrush}" />
-									</VisualState.Setters>
-								</VisualState>
-
-							</VisualStateGroup>
-
-
-							<VisualStateGroup x:Name="OrientationStateGroup">
-
-								<VisualState x:Name="HorizontalState">
-									<VisualState.Setters>
-										<Setter Target="PART_Label.(Grid.Row)" Value="0" />
-										<Setter Target="PART_Label.(Grid.RowSpan)" Value="2" />
-										<Setter Target="PART_Label.(Grid.Column)" Value="0" />
-										<Setter Target="PART_Label.(Grid.ColumnSpan)" Value="1" />
-
-										<Setter Target="TextGrid.(Grid.Row)" Value="0" />
-										<Setter Target="TextGrid.(Grid.RowSpan)" Value="2" />
-										<Setter Target="TextGrid.(Grid.Column)" Value="1" />
-										<Setter Target="TextGrid.(Grid.ColumnSpan)" Value="1" />
-										<Setter Target="Col01.Width" Value="Auto" />
-										<Setter Target="Col02.Width" Value="*" />
-									</VisualState.Setters>
-								</VisualState>
-
-								<VisualState x:Name="VerticalState">
-									<VisualState.Setters>
-										<Setter Target="PART_Label.(Grid.Row)" Value="0" />
-										<Setter Target="PART_Label.(Grid.RowSpan)" Value="1" />
-										<Setter Target="PART_Label.(Grid.Column)" Value="0" />
-										<Setter Target="PART_Label.(Grid.ColumnSpan)" Value="2" />
-
-										<Setter Target="TextGrid.(Grid.Row)" Value="1" />
-										<Setter Target="TextGrid.(Grid.RowSpan)" Value="1" />
-										<Setter Target="TextGrid.(Grid.Column)" Value="0" />
-										<Setter Target="TextGrid.(Grid.ColumnSpan)" Value="2" />
-
-										<Setter Target="Col01.Width" Value="*" />
-										<Setter Target="Col02.Width" Value="Auto" />
-									</VisualState.Setters>
-								</VisualState>
-							</VisualStateGroup>
-
-
-							<VisualStateGroup x:Name="EnabledStateGroup">
-								<VisualState x:Name="Enabledtate">
-									<VisualState.Setters>
-										<Setter Target="PART_InfoCard.Opacity" Value="1.0" />
-										<Setter Target="PART_TextEdit.IsEnabled" Value="True" />
-										<Setter Target="PART_Text.Foreground" Value="{ThemeResource TextFillColorPrimaryBrush}" />
-
-									</VisualState.Setters>
-								</VisualState>
-								<VisualState x:Name="DisabledState">
-									<VisualState.Setters>
-										<Setter Target="PART_InfoCard.Opacity" Value="0.4" />
-										<Setter Target="PART_TextEdit.IsEnabled" Value="False" />
-										<Setter Target="PART_Text.Foreground" Value="{ThemeResource TextFillColorDisabledBrush}" />
-
-										<Setter Target="PART_InfoCard.Background" Value="{ThemeResource SubtleFillColorTransparentBrush}" />
-										<Setter Target="PART_InfoCard.BorderBrush" Value="{ThemeResource SubtleFillColorTransparentBrush}" />
-										<Setter Target="PART_InfoIcon.Foreground" Value="{ThemeResource TextFillColorDisabledBrush}" />
-									</VisualState.Setters>
-								</VisualState>
-							</VisualStateGroup>
-
-						</VisualStateManager.VisualStateGroups>
-					</Grid>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-
-
-	<!--  PROPERTIES VIEW ITEM - TOGGLE  -->
-	<Style BasedOn="{StaticResource DefaultPropertiesViewItem_Toggle}" TargetType="fcontrols:PropertiesViewItemToggle" />
-
-	<Style x:Key="DefaultPropertiesViewItem_Toggle" TargetType="fcontrols:PropertiesViewItemToggle">
-
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="fcontrols:PropertiesViewItemToggle">
-					<Grid
-						MinHeight="48"
-						Padding="0,6"
-						HorizontalAlignment="Stretch"
-						VerticalAlignment="Stretch">
-						<Grid.ColumnDefinitions>
-							<ColumnDefinition Width="{TemplateBinding LabelWidth}" />
-							<ColumnDefinition Width="*" />
-						</Grid.ColumnDefinitions>
-						<Grid.RowDefinitions>
-							<RowDefinition Height="Auto" />
-							<RowDefinition Height="Auto" />
-						</Grid.RowDefinitions>
-
-						<TextBlock
-							x:Name="PART_Label"
-							Grid.Row="0"
-							Grid.RowSpan="2"
-							Grid.Column="0"
-							Grid.ColumnSpan="1"
-							Margin="0,4,24,4"
-							HorizontalAlignment="Stretch"
-							VerticalAlignment="Center"
-							Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-							LineHeight="20"
-							Style="{ThemeResource CaptionTextBlockStyle}"
-							Text="{TemplateBinding Label}" />
-
-						<ToggleSwitch
-							x:Name="PART_ToggleSwitch"
-							Grid.Row="0"
-							Grid.RowSpan="2"
-							Grid.Column="1"
-							Grid.ColumnSpan="1"
-							HorizontalAlignment="Right"
-							VerticalAlignment="Center"
-							OffContent="{TemplateBinding OffText}"
-							OnContent="{TemplateBinding OnText}"
-							Style="{StaticResource RightAlignedCompactToggleSwitchStyle}" />
-
-
-						<VisualStateManager.VisualStateGroups>
-							<VisualStateGroup x:Name="EditableStateGroup">
-								<VisualState x:Name="NotEditableState">
-									<VisualState.Setters />
-								</VisualState>
-								<VisualState x:Name="EditableState">
-									<VisualState.Setters />
-								</VisualState>
-							</VisualStateGroup>
-
-
-							<VisualStateGroup x:Name="OrientationStateGroup">
-								<VisualState x:Name="HorizontalState">
-									<VisualState.Setters>
-										<Setter Target="PART_Label.(Grid.Row)" Value="0" />
-										<Setter Target="PART_Label.(Grid.RowSpan)" Value="2" />
-										<Setter Target="PART_Label.(Grid.Column)" Value="0" />
-										<Setter Target="PART_Label.(Grid.ColumnSpan)" Value="1" />
-
-										<Setter Target="PART_ToggleSwitch.(Grid.Row)" Value="0" />
-										<Setter Target="PART_ToggleSwitch.(Grid.RowSpan)" Value="2" />
-										<Setter Target="PART_ToggleSwitch.(Grid.Column)" Value="1" />
-										<Setter Target="PART_ToggleSwitch.(Grid.ColumnSpan)" Value="1" />
-
-										<Setter Target="PART_ToggleSwitch.Style" Value="{StaticResource RightAlignedCompactToggleSwitchStyle}" />
-										<Setter Target="PART_ToggleSwitch.HorizontalAlignment" Value="Right" />
-									</VisualState.Setters>
-								</VisualState>
-
-								<VisualState x:Name="VerticalState">
-									<VisualState.Setters>
-										<Setter Target="PART_Label.(Grid.Row)" Value="0" />
-										<Setter Target="PART_Label.(Grid.RowSpan)" Value="1" />
-										<Setter Target="PART_Label.(Grid.Column)" Value="0" />
-										<Setter Target="PART_Label.(Grid.ColumnSpan)" Value="2" />
-
-										<Setter Target="PART_ToggleSwitch.(Grid.Row)" Value="1" />
-										<Setter Target="PART_ToggleSwitch.(Grid.RowSpan)" Value="1" />
-										<Setter Target="PART_ToggleSwitch.(Grid.Column)" Value="0" />
-										<Setter Target="PART_ToggleSwitch.(Grid.ColumnSpan)" Value="2" />
-
-										<Setter Target="PART_ToggleSwitch.Style" Value="{StaticResource DefaultToggleSwitchStyle}" />
-										<Setter Target="PART_ToggleSwitch.HorizontalAlignment" Value="Left" />
-									</VisualState.Setters>
-								</VisualState>
-							</VisualStateGroup>
-
-
-							<VisualStateGroup x:Name="EnabledStateGroup">
-								<VisualState x:Name="Enabledtate">
-									<VisualState.Setters>
-										<Setter Target="PART_ToggleSwitch.IsEnabled" Value="True" />
-									</VisualState.Setters>
-								</VisualState>
-								<VisualState x:Name="DisabledState">
-									<VisualState.Setters>
-										<Setter Target="PART_ToggleSwitch.IsEnabled" Value="False" />
-									</VisualState.Setters>
-								</VisualState>
-							</VisualStateGroup>
-						</VisualStateManager.VisualStateGroups>
-					</Grid>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-
-	<Style
-		x:Key="RightAlignedCompactToggleSwitchStyle"
-		BasedOn="{StaticResource DefaultToggleSwitchStyle}"
-		TargetType="ToggleSwitch">
-		<Style.Setters>
-			<Setter Property="MinWidth" Value="0" />
-			<Setter Property="Height" Value="36" />
-			<Setter Property="HorizontalContentAlignment" Value="Right" />
-			<Setter Property="Template">
-				<Setter.Value>
-					<ControlTemplate TargetType="ToggleSwitch">
-						<Grid
-							VerticalAlignment="Stretch"
-							Background="{TemplateBinding Background}"
-							BorderBrush="{TemplateBinding BorderBrush}"
-							BorderThickness="{TemplateBinding BorderThickness}"
-							Control.IsTemplateFocusTarget="True"
-							CornerRadius="{TemplateBinding CornerRadius}">
-							<ContentPresenter
-								x:Name="HeaderContentPresenter"
-								Grid.Row="0"
-								Margin="{ThemeResource ToggleSwitchTopHeaderMargin}"
-								VerticalAlignment="Top"
-								x:DeferLoadStrategy="Lazy"
-								AutomationProperties.AccessibilityView="Raw"
-								Content="{TemplateBinding Header}"
-								ContentTemplate="{TemplateBinding HeaderTemplate}"
-								Foreground="{ThemeResource ToggleSwitchHeaderForeground}"
-								IsHitTestVisible="False"
-								TextWrapping="Wrap"
-								Visibility="Collapsed" />
-							<Grid
-								Grid.Row="1"
-								HorizontalAlignment="Right"
-								VerticalAlignment="Center">
-								<Grid.ColumnDefinitions>
-									<ColumnDefinition Width="Auto" />
-									<ColumnDefinition Width="12" MaxWidth="12" />
-									<ColumnDefinition Width="Auto" />
-								</Grid.ColumnDefinitions>
-								<Grid
-									x:Name="SwitchAreaGrid"
-									Grid.RowSpan="3"
-									Grid.ColumnSpan="3"
-									Margin="0,5"
-									Background="{ThemeResource ToggleSwitchContainerBackground}"
-									CornerRadius="{TemplateBinding CornerRadius}" />
-								<ContentPresenter
-									x:Name="OffContentPresenter"
-									Grid.RowSpan="3"
-									HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-									VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-									AutomationProperties.AccessibilityView="Raw"
-									Content="{TemplateBinding OffContent}"
-									ContentTemplate="{TemplateBinding OffContentTemplate}"
-									Foreground="{TemplateBinding Foreground}"
-									IsHitTestVisible="False"
-									Opacity="0" />
-								<ContentPresenter
-									x:Name="OnContentPresenter"
-									Grid.RowSpan="3"
-									HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-									VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-									AutomationProperties.AccessibilityView="Raw"
-									Content="{TemplateBinding OnContent}"
-									ContentTemplate="{TemplateBinding OnContentTemplate}"
-									Foreground="{TemplateBinding Foreground}"
-									IsHitTestVisible="False"
-									Opacity="0" />
-								<Rectangle
-									x:Name="OuterBorder"
-									Grid.Row="1"
-									Grid.Column="2"
-									Width="40"
-									Height="20"
-									Fill="{ThemeResource ToggleSwitchFillOff}"
-									RadiusX="10"
-									RadiusY="10"
-									Stroke="{ThemeResource ToggleSwitchStrokeOff}"
-									StrokeThickness="{ThemeResource ToggleSwitchOuterBorderStrokeThickness}" />
-								<Rectangle
-									x:Name="SwitchKnobBounds"
-									Grid.Row="1"
-									Grid.Column="2"
-									Width="40"
-									Height="20"
-									Fill="{ThemeResource ToggleSwitchFillOn}"
-									Opacity="0"
-									RadiusX="10"
-									RadiusY="10"
-									Stroke="{ThemeResource ToggleSwitchStrokeOn}"
-									StrokeThickness="{ThemeResource ToggleSwitchOnStrokeThickness}" />
-								<Grid
-									x:Name="SwitchKnob"
-									Grid.Row="1"
-									Grid.Column="2"
-									Width="20"
-									Height="20"
-									HorizontalAlignment="Left">
-									<Border
-										x:Name="SwitchKnobOn"
-										Width="12"
-										Height="12"
-										Margin="0,0,3,0"
-										HorizontalAlignment="Right"
-										Background="{ThemeResource ToggleSwitchKnobFillOn}"
-										BackgroundSizing="OuterBorderEdge"
-										BorderBrush="{ThemeResource ToggleSwitchKnobStrokeOn}"
-										CornerRadius="7"
-										Opacity="0"
-										RenderTransformOrigin="0.5, 0.5">
-										<Border.RenderTransform>
-											<CompositeTransform />
-										</Border.RenderTransform>
-									</Border>
-									<Rectangle
-										x:Name="SwitchKnobOff"
-										Width="12"
-										Height="12"
-										Margin="3,0,0,0"
-										HorizontalAlignment="Left"
-										Fill="{ThemeResource ToggleSwitchKnobFillOff}"
-										RadiusX="7"
-										RadiusY="7"
-										RenderTransformOrigin="0.5, 0.5">
-										<Rectangle.RenderTransform>
-											<CompositeTransform />
-										</Rectangle.RenderTransform>
-									</Rectangle>
-									<Grid.RenderTransform>
-										<TranslateTransform x:Name="KnobTranslateTransform" />
-									</Grid.RenderTransform>
-								</Grid>
-								<Thumb
-									x:Name="SwitchThumb"
-									Grid.RowSpan="3"
-									Grid.ColumnSpan="3"
-									AutomationProperties.AccessibilityView="Raw">
-									<Thumb.Template>
-										<ControlTemplate TargetType="Thumb">
-											<Rectangle Fill="Transparent" />
-										</ControlTemplate>
-									</Thumb.Template>
-								</Thumb>
-							</Grid>
-							<VisualStateManager.VisualStateGroups>
-								<VisualStateGroup x:Name="CommonStates">
-									<VisualState x:Name="Normal">
-										<Storyboard>
-											<ObjectAnimationUsingKeyFrames Storyboard.TargetName="OuterBorder" Storyboard.TargetProperty="Stroke">
-												<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchStrokeOff}" />
-											</ObjectAnimationUsingKeyFrames>
-											<ObjectAnimationUsingKeyFrames Storyboard.TargetName="OuterBorder" Storyboard.TargetProperty="Fill">
-												<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchFillOff}" />
-											</ObjectAnimationUsingKeyFrames>
-											<ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOff" Storyboard.TargetProperty="Fill">
-												<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchKnobFillOff}" />
-											</ObjectAnimationUsingKeyFrames>
-											<ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOn" Storyboard.TargetProperty="Background">
-												<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchKnobFillOn}" />
-											</ObjectAnimationUsingKeyFrames>
-											<ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobBounds" Storyboard.TargetProperty="Fill">
-												<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchFillOn}" />
-											</ObjectAnimationUsingKeyFrames>
-											<ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobBounds" Storyboard.TargetProperty="Stroke">
-												<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchStrokeOn}" />
-											</ObjectAnimationUsingKeyFrames>
-											<ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchAreaGrid" Storyboard.TargetProperty="Background">
-												<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchContainerBackground}" />
-											</ObjectAnimationUsingKeyFrames>
-											<DoubleAnimationUsingKeyFrames
-												EnableDependentAnimation="True"
-												Storyboard.TargetName="SwitchKnobOn"
-												Storyboard.TargetProperty="Width">
-												<SplineDoubleKeyFrame
-													KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
-													KeyTime="{StaticResource ControlFasterAnimationDuration}"
-													Value="12" />
-											</DoubleAnimationUsingKeyFrames>
-											<DoubleAnimationUsingKeyFrames
-												EnableDependentAnimation="True"
-												Storyboard.TargetName="SwitchKnobOn"
-												Storyboard.TargetProperty="Height">
-												<SplineDoubleKeyFrame
-													KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
-													KeyTime="{StaticResource ControlFasterAnimationDuration}"
-													Value="12" />
-											</DoubleAnimationUsingKeyFrames>
-											<DoubleAnimationUsingKeyFrames
-												EnableDependentAnimation="True"
-												Storyboard.TargetName="SwitchKnobOff"
-												Storyboard.TargetProperty="Width">
-												<SplineDoubleKeyFrame
-													KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
-													KeyTime="{StaticResource ControlFasterAnimationDuration}"
-													Value="12" />
-											</DoubleAnimationUsingKeyFrames>
-											<DoubleAnimationUsingKeyFrames
-												EnableDependentAnimation="True"
-												Storyboard.TargetName="SwitchKnobOff"
-												Storyboard.TargetProperty="Height">
-												<SplineDoubleKeyFrame
-													KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
-													KeyTime="{StaticResource ControlFasterAnimationDuration}"
-													Value="12" />
-											</DoubleAnimationUsingKeyFrames>
-										</Storyboard>
-									</VisualState>
-									<VisualState x:Name="PointerOver">
-										<Storyboard>
-											<ColorAnimationUsingKeyFrames Storyboard.TargetName="OuterBorder" Storyboard.TargetProperty="(Shape.Stroke).(SolidColorBrush.Color)">
-												<LinearColorKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="{ThemeResource ToggleSwitchStrokeOffPointerOver}" />
-											</ColorAnimationUsingKeyFrames>
-											<ColorAnimationUsingKeyFrames Storyboard.TargetName="OuterBorder" Storyboard.TargetProperty="(Shape.Fill).(SolidColorBrush.Color)">
-												<LinearColorKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="{ThemeResource ToggleSwitchFillOffPointerOver}" />
-											</ColorAnimationUsingKeyFrames>
-											<ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOff" Storyboard.TargetProperty="Fill">
-												<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchKnobFillOffPointerOver}" />
-											</ObjectAnimationUsingKeyFrames>
-											<ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOn" Storyboard.TargetProperty="Background">
-												<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchKnobFillOnPointerOver}" />
-											</ObjectAnimationUsingKeyFrames>
-											<ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobBounds" Storyboard.TargetProperty="Fill">
-												<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchFillOnPointerOver}" />
-											</ObjectAnimationUsingKeyFrames>
-											<ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobBounds" Storyboard.TargetProperty="Stroke">
-												<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchStrokeOnPointerOver}" />
-											</ObjectAnimationUsingKeyFrames>
-											<ColorAnimationUsingKeyFrames Storyboard.TargetName="SwitchAreaGrid" Storyboard.TargetProperty="(Panel.Background).(SolidColorBrush.Color)">
-												<LinearColorKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="{ThemeResource ToggleSwitchContainerBackgroundPointerOver}" />
-											</ColorAnimationUsingKeyFrames>
-											<DoubleAnimationUsingKeyFrames
-												EnableDependentAnimation="True"
-												Storyboard.TargetName="SwitchKnobOn"
-												Storyboard.TargetProperty="Width">
-												<SplineDoubleKeyFrame
-													KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
-													KeyTime="{StaticResource ControlFasterAnimationDuration}"
-													Value="14" />
-											</DoubleAnimationUsingKeyFrames>
-											<DoubleAnimationUsingKeyFrames
-												EnableDependentAnimation="True"
-												Storyboard.TargetName="SwitchKnobOn"
-												Storyboard.TargetProperty="Height">
-												<SplineDoubleKeyFrame
-													KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
-													KeyTime="{StaticResource ControlFasterAnimationDuration}"
-													Value="14" />
-											</DoubleAnimationUsingKeyFrames>
-											<DoubleAnimationUsingKeyFrames
-												EnableDependentAnimation="True"
-												Storyboard.TargetName="SwitchKnobOff"
-												Storyboard.TargetProperty="Width">
-												<SplineDoubleKeyFrame
-													KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
-													KeyTime="{StaticResource ControlFasterAnimationDuration}"
-													Value="14" />
-											</DoubleAnimationUsingKeyFrames>
-											<DoubleAnimationUsingKeyFrames
-												EnableDependentAnimation="True"
-												Storyboard.TargetName="SwitchKnobOff"
-												Storyboard.TargetProperty="Height">
-												<SplineDoubleKeyFrame
-													KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
-													KeyTime="{StaticResource ControlFasterAnimationDuration}"
-													Value="14" />
-											</DoubleAnimationUsingKeyFrames>
-										</Storyboard>
-									</VisualState>
-									<VisualState x:Name="Pressed">
-										<VisualState.Setters>
-											<Setter Target="SwitchKnobOn.HorizontalAlignment" Value="Right" />
-											<Setter Target="SwitchKnobOn.Margin" Value="0,0,3,0" />
-											<Setter Target="SwitchKnobOff.HorizontalAlignment" Value="Left" />
-											<Setter Target="SwitchKnobOff.Margin" Value="3,0,0,0" />
-										</VisualState.Setters>
-										<Storyboard>
-											<ColorAnimationUsingKeyFrames Storyboard.TargetName="OuterBorder" Storyboard.TargetProperty="(Shape.Stroke).(SolidColorBrush.Color)">
-												<LinearColorKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="{ThemeResource ToggleSwitchStrokeOffPressed}" />
-											</ColorAnimationUsingKeyFrames>
-											<ColorAnimationUsingKeyFrames Storyboard.TargetName="OuterBorder" Storyboard.TargetProperty="(Shape.Fill).(SolidColorBrush.Color)">
-												<LinearColorKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="{ThemeResource ToggleSwitchFillOffPressed}" />
-											</ColorAnimationUsingKeyFrames>
-											<ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobBounds" Storyboard.TargetProperty="Fill">
-												<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchFillOnPressed}" />
-											</ObjectAnimationUsingKeyFrames>
-											<ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobBounds" Storyboard.TargetProperty="Stroke">
-												<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchStrokeOnPressed}" />
-											</ObjectAnimationUsingKeyFrames>
-											<ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOff" Storyboard.TargetProperty="Fill">
-												<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchKnobFillOffPressed}" />
-											</ObjectAnimationUsingKeyFrames>
-											<ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOn" Storyboard.TargetProperty="Background">
-												<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchKnobFillOnPressed}" />
-											</ObjectAnimationUsingKeyFrames>
-											<ColorAnimationUsingKeyFrames Storyboard.TargetName="SwitchAreaGrid" Storyboard.TargetProperty="(Panel.Background).(SolidColorBrush.Color)">
-												<LinearColorKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="{ThemeResource ToggleSwitchContainerBackgroundPressed}" />
-											</ColorAnimationUsingKeyFrames>
-											<DoubleAnimationUsingKeyFrames
-												EnableDependentAnimation="True"
-												Storyboard.TargetName="SwitchKnobOn"
-												Storyboard.TargetProperty="Width">
-												<SplineDoubleKeyFrame
-													KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
-													KeyTime="{StaticResource ControlFasterAnimationDuration}"
-													Value="17" />
-											</DoubleAnimationUsingKeyFrames>
-											<DoubleAnimationUsingKeyFrames
-												EnableDependentAnimation="True"
-												Storyboard.TargetName="SwitchKnobOn"
-												Storyboard.TargetProperty="Height">
-												<SplineDoubleKeyFrame
-													KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
-													KeyTime="{StaticResource ControlFasterAnimationDuration}"
-													Value="14" />
-											</DoubleAnimationUsingKeyFrames>
-											<DoubleAnimationUsingKeyFrames
-												EnableDependentAnimation="True"
-												Storyboard.TargetName="SwitchKnobOff"
-												Storyboard.TargetProperty="Width">
-												<SplineDoubleKeyFrame
-													KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
-													KeyTime="{StaticResource ControlFasterAnimationDuration}"
-													Value="17" />
-											</DoubleAnimationUsingKeyFrames>
-											<DoubleAnimationUsingKeyFrames
-												EnableDependentAnimation="True"
-												Storyboard.TargetName="SwitchKnobOff"
-												Storyboard.TargetProperty="Height">
-												<SplineDoubleKeyFrame
-													KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
-													KeyTime="{StaticResource ControlFasterAnimationDuration}"
-													Value="14" />
-											</DoubleAnimationUsingKeyFrames>
-										</Storyboard>
-									</VisualState>
-									<VisualState x:Name="Disabled">
-										<Storyboard>
-											<ObjectAnimationUsingKeyFrames Storyboard.TargetName="HeaderContentPresenter" Storyboard.TargetProperty="Foreground">
-												<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchHeaderForegroundDisabled}" />
-											</ObjectAnimationUsingKeyFrames>
-											<ObjectAnimationUsingKeyFrames Storyboard.TargetName="OffContentPresenter" Storyboard.TargetProperty="Foreground">
-												<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchContentForegroundDisabled}" />
-											</ObjectAnimationUsingKeyFrames>
-											<ObjectAnimationUsingKeyFrames Storyboard.TargetName="OnContentPresenter" Storyboard.TargetProperty="Foreground">
-												<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchContentForegroundDisabled}" />
-											</ObjectAnimationUsingKeyFrames>
-											<ColorAnimationUsingKeyFrames Storyboard.TargetName="OuterBorder" Storyboard.TargetProperty="(Shape.Stroke).(SolidColorBrush.Color)">
-												<LinearColorKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="{ThemeResource ToggleSwitchStrokeOffDisabled}" />
-											</ColorAnimationUsingKeyFrames>
-											<ColorAnimationUsingKeyFrames Storyboard.TargetName="OuterBorder" Storyboard.TargetProperty="(Shape.Fill).(SolidColorBrush.Color)">
-												<LinearColorKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="{ThemeResource ToggleSwitchFillOffDisabled}" />
-											</ColorAnimationUsingKeyFrames>
-											<ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobBounds" Storyboard.TargetProperty="Fill">
-												<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchFillOnDisabled}" />
-											</ObjectAnimationUsingKeyFrames>
-											<ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobBounds" Storyboard.TargetProperty="Stroke">
-												<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchStrokeOnDisabled}" />
-											</ObjectAnimationUsingKeyFrames>
-											<ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOff" Storyboard.TargetProperty="Fill">
-												<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchKnobFillOffDisabled}" />
-											</ObjectAnimationUsingKeyFrames>
-											<ObjectAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOn" Storyboard.TargetProperty="Background">
-												<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ToggleSwitchKnobFillOnDisabled}" />
-											</ObjectAnimationUsingKeyFrames>
-											<ColorAnimationUsingKeyFrames Storyboard.TargetName="SwitchAreaGrid" Storyboard.TargetProperty="(Panel.Background).(SolidColorBrush.Color)">
-												<LinearColorKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="{ThemeResource ToggleSwitchContainerBackgroundDisabled}" />
-											</ColorAnimationUsingKeyFrames>
-											<DoubleAnimationUsingKeyFrames
-												EnableDependentAnimation="True"
-												Storyboard.TargetName="SwitchKnobOn"
-												Storyboard.TargetProperty="Width">
-												<SplineDoubleKeyFrame
-													KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
-													KeyTime="{StaticResource ControlNormalAnimationDuration}"
-													Value="12" />
-											</DoubleAnimationUsingKeyFrames>
-											<DoubleAnimationUsingKeyFrames
-												EnableDependentAnimation="True"
-												Storyboard.TargetName="SwitchKnobOn"
-												Storyboard.TargetProperty="Height">
-												<SplineDoubleKeyFrame
-													KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
-													KeyTime="{StaticResource ControlNormalAnimationDuration}"
-													Value="12" />
-											</DoubleAnimationUsingKeyFrames>
-											<DoubleAnimationUsingKeyFrames
-												EnableDependentAnimation="True"
-												Storyboard.TargetName="SwitchKnobOff"
-												Storyboard.TargetProperty="Width">
-												<SplineDoubleKeyFrame
-													KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
-													KeyTime="{StaticResource ControlNormalAnimationDuration}"
-													Value="12" />
-											</DoubleAnimationUsingKeyFrames>
-											<DoubleAnimationUsingKeyFrames
-												EnableDependentAnimation="True"
-												Storyboard.TargetName="SwitchKnobOff"
-												Storyboard.TargetProperty="Height">
-												<SplineDoubleKeyFrame
-													KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
-													KeyTime="{StaticResource ControlNormalAnimationDuration}"
-													Value="12" />
-											</DoubleAnimationUsingKeyFrames>
-										</Storyboard>
-									</VisualState>
-								</VisualStateGroup>
-								<VisualStateGroup x:Name="ToggleStates">
-									<VisualStateGroup.Transitions>
-										<VisualTransition
-											x:Name="DraggingToOnTransition"
-											GeneratedDuration="0"
-											From="Dragging"
-											To="On">
-											<Storyboard>
-												<RepositionThemeAnimation FromHorizontalOffset="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.KnobCurrentToOnOffset}" TargetName="SwitchKnob" />
-												<DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobBounds" Storyboard.TargetProperty="Opacity">
-													<LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="1" />
-												</DoubleAnimationUsingKeyFrames>
-												<DoubleAnimationUsingKeyFrames Storyboard.TargetName="OuterBorder" Storyboard.TargetProperty="Opacity">
-													<LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="0" />
-												</DoubleAnimationUsingKeyFrames>
-												<DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOn" Storyboard.TargetProperty="Opacity">
-													<LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="1" />
-												</DoubleAnimationUsingKeyFrames>
-												<DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOff" Storyboard.TargetProperty="Opacity">
-													<LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="0" />
-												</DoubleAnimationUsingKeyFrames>
-											</Storyboard>
-										</VisualTransition>
-										<VisualTransition
-											x:Name="OnToDraggingTransition"
-											GeneratedDuration="0"
-											From="On"
-											To="Dragging">
-											<Storyboard>
-												<DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobBounds" Storyboard.TargetProperty="Opacity">
-													<LinearDoubleKeyFrame KeyTime="0" Value="1" />
-												</DoubleAnimationUsingKeyFrames>
-												<DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOn" Storyboard.TargetProperty="Opacity">
-													<LinearDoubleKeyFrame KeyTime="0" Value="1" />
-												</DoubleAnimationUsingKeyFrames>
-												<DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOff" Storyboard.TargetProperty="Opacity">
-													<LinearDoubleKeyFrame KeyTime="0" Value="0" />
-												</DoubleAnimationUsingKeyFrames>
-											</Storyboard>
-										</VisualTransition>
-										<VisualTransition
-											x:Name="DraggingToOffTransition"
-											GeneratedDuration="0"
-											From="Dragging"
-											To="Off">
-											<Storyboard>
-												<RepositionThemeAnimation FromHorizontalOffset="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.KnobCurrentToOffOffset}" TargetName="SwitchKnob" />
-												<DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobBounds" Storyboard.TargetProperty="Opacity">
-													<LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="0" />
-												</DoubleAnimationUsingKeyFrames>
-												<DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOn" Storyboard.TargetProperty="Opacity">
-													<LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="0" />
-												</DoubleAnimationUsingKeyFrames>
-												<DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOff" Storyboard.TargetProperty="Opacity">
-													<LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="1" />
-												</DoubleAnimationUsingKeyFrames>
-											</Storyboard>
-										</VisualTransition>
-										<VisualTransition
-											x:Name="OnToOffTransition"
-											GeneratedDuration="0"
-											From="On"
-											To="Off">
-											<Storyboard>
-												<RepositionThemeAnimation FromHorizontalOffset="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.KnobOnToOffOffset}" TargetName="SwitchKnob" />
-											</Storyboard>
-										</VisualTransition>
-										<VisualTransition
-											x:Name="OffToOnTransition"
-											GeneratedDuration="0"
-											From="Off"
-											To="On">
-											<Storyboard>
-												<RepositionThemeAnimation FromHorizontalOffset="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.KnobOffToOnOffset}" TargetName="SwitchKnob" />
-												<DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobBounds" Storyboard.TargetProperty="Opacity">
-													<LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="1" />
-												</DoubleAnimationUsingKeyFrames>
-												<DoubleAnimationUsingKeyFrames Storyboard.TargetName="OuterBorder" Storyboard.TargetProperty="Opacity">
-													<LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="0" />
-												</DoubleAnimationUsingKeyFrames>
-												<DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOn" Storyboard.TargetProperty="Opacity">
-													<LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="1" />
-												</DoubleAnimationUsingKeyFrames>
-												<DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOff" Storyboard.TargetProperty="Opacity">
-													<LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="0" />
-												</DoubleAnimationUsingKeyFrames>
-											</Storyboard>
-										</VisualTransition>
-									</VisualStateGroup.Transitions>
-									<VisualState x:Name="Dragging" />
-									<VisualState x:Name="Off" />
-									<VisualState x:Name="On">
-										<Storyboard>
-											<DoubleAnimation
-												Storyboard.TargetName="KnobTranslateTransform"
-												Storyboard.TargetProperty="X"
-												To="20"
-												Duration="0" />
-											<DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobBounds" Storyboard.TargetProperty="Opacity">
-												<LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="1" />
-											</DoubleAnimationUsingKeyFrames>
-											<DoubleAnimationUsingKeyFrames Storyboard.TargetName="OuterBorder" Storyboard.TargetProperty="Opacity">
-												<LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="0" />
-											</DoubleAnimationUsingKeyFrames>
-											<DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOn" Storyboard.TargetProperty="Opacity">
-												<LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="1" />
-											</DoubleAnimationUsingKeyFrames>
-											<DoubleAnimationUsingKeyFrames Storyboard.TargetName="SwitchKnobOff" Storyboard.TargetProperty="Opacity">
-												<LinearDoubleKeyFrame KeyTime="{StaticResource ControlFasterAnimationDuration}" Value="0" />
-											</DoubleAnimationUsingKeyFrames>
-										</Storyboard>
-									</VisualState>
-								</VisualStateGroup>
-								<VisualStateGroup x:Name="ContentStates">
-									<VisualState x:Name="OffContent">
-										<Storyboard>
-											<DoubleAnimation
-												Storyboard.TargetName="OffContentPresenter"
-												Storyboard.TargetProperty="Opacity"
-												To="1"
-												Duration="0" />
-											<ObjectAnimationUsingKeyFrames Storyboard.TargetName="OffContentPresenter" Storyboard.TargetProperty="IsHitTestVisible">
-												<DiscreteObjectKeyFrame KeyTime="0">
-													<DiscreteObjectKeyFrame.Value>
-														<x:Boolean>True</x:Boolean>
-													</DiscreteObjectKeyFrame.Value>
-												</DiscreteObjectKeyFrame>
-											</ObjectAnimationUsingKeyFrames>
-										</Storyboard>
-									</VisualState>
-									<VisualState x:Name="OnContent">
-										<Storyboard>
-											<DoubleAnimation
-												Storyboard.TargetName="OnContentPresenter"
-												Storyboard.TargetProperty="Opacity"
-												To="1"
-												Duration="0" />
-											<ObjectAnimationUsingKeyFrames Storyboard.TargetName="OnContentPresenter" Storyboard.TargetProperty="IsHitTestVisible">
-												<DiscreteObjectKeyFrame KeyTime="0">
-													<DiscreteObjectKeyFrame.Value>
-														<x:Boolean>True</x:Boolean>
-													</DiscreteObjectKeyFrame.Value>
-												</DiscreteObjectKeyFrame>
-											</ObjectAnimationUsingKeyFrames>
-										</Storyboard>
-									</VisualState>
-								</VisualStateGroup>
-							</VisualStateManager.VisualStateGroups>
-						</Grid>
-					</ControlTemplate>
-				</Setter.Value>
-			</Setter>
-		</Style.Setters>
-	</Style>
-
-
-	<!--  PROPERTIES VIEW ITEM - CHECK  -->
-	<Style BasedOn="{StaticResource DefaultPropertiesViewItem_Check}" TargetType="fcontrols:PropertiesViewItemCheck" />
-
-	<Style x:Key="DefaultPropertiesViewItem_Check" TargetType="fcontrols:PropertiesViewItemCheck">
-		<Setter Property="Background" Value="{ThemeResource CheckBoxBackgroundUnchecked}" />
-		<Setter Property="Foreground" Value="{ThemeResource CheckBoxForegroundUnchecked}" />
-		<Setter Property="BorderBrush" Value="{ThemeResource CheckBoxBorderBrushUnchecked}" />
-		<Setter Property="Padding" Value="{StaticResource PropertiesViewItemCheckPadding}" />
-		<Setter Property="HorizontalAlignment" Value="Stretch" />
-		<Setter Property="VerticalAlignment" Value="Center" />
-		<Setter Property="HorizontalContentAlignment" Value="Stretch" />
-		<Setter Property="VerticalContentAlignment" Value="Center" />
-		<Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
-		<Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}" />
-		<Setter Property="MinWidth" Value="{StaticResource CheckBoxHeight}" />
-		<Setter Property="MinHeight" Value="{StaticResource CheckBoxHeight}" />
-		<Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
-		<Setter Property="FocusVisualMargin" Value="{StaticResource CheckBoxFocusVisualMargin}" />
-		<Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="fcontrols:PropertiesViewItemCheck">
-					<Grid
-						x:Name="RootGrid"
-						Padding="{TemplateBinding Padding}"
-						Background="{TemplateBinding Background}"
-						BorderBrush="{TemplateBinding BorderBrush}"
-						BorderThickness="{TemplateBinding BorderThickness}"
-						CornerRadius="{TemplateBinding CornerRadius}">
-						<Grid.RowDefinitions>
-							<RowDefinition Height="Auto" />
-							<RowDefinition Height="*" />
-						</Grid.RowDefinitions>
-						<Grid.ColumnDefinitions>
-							<ColumnDefinition Width="Auto" />
-							<ColumnDefinition Width="*" />
-						</Grid.ColumnDefinitions>
-						<Grid
-							x:Name="CheckBoxGrid"
-							Grid.Row="0"
-							Grid.RowSpan="2"
-							Grid.Column="0"
-							Grid.ColumnSpan="1"
-							Width="{StaticResource CheckBoxSize}"
-							Height="{StaticResource CheckBoxSize}"
-							Margin="{StaticResource PropertiesItemCheckBoxHorizontalMargin}"
-							VerticalAlignment="Center">
-							<Rectangle
-								x:Name="NormalRectangle"
-								Width="{StaticResource CheckBoxSize}"
-								Height="{StaticResource CheckBoxSize}"
-								Fill="{ThemeResource CheckBoxCheckBackgroundFillUnchecked}"
-								RadiusX="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}"
-								RadiusY="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}"
-								Stroke="{ThemeResource CheckBoxCheckBackgroundStrokeUnchecked}"
-								StrokeThickness="{StaticResource CheckBoxBorderThickness}"
-								UseLayoutRounding="False" />
-							<AnimatedIcon
-								x:Name="CheckGlyph"
-								Margin="0,1,0,-1"
-								AnimatedIcon.State="NormalOff"
-								Foreground="{ThemeResource CheckBoxCheckGlyphForegroundUnchecked}">
-								<animatedvisuals:AnimatedAcceptVisualSource />
-								<AnimatedIcon.FallbackIconSource>
-									<FontIconSource
-										x:Name="DownLevelCheckGlyph"
-										FontFamily="{ThemeResource SymbolThemeFontFamily}"
-										FontSize="{StaticResource CheckBoxGlyphSize}"
-										Glyph="{StaticResource CheckBoxCheckedGlyph}" />
-								</AnimatedIcon.FallbackIconSource>
-							</AnimatedIcon>
-						</Grid>
-						<ContentPresenter
-							x:Name="ContentPresenter"
-							Grid.Row="0"
-							Grid.RowSpan="2"
-							Grid.Column="1"
-							Grid.ColumnSpan="1"
-							Margin="{TemplateBinding Padding}"
-							HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-							VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-							AutomationProperties.AccessibilityView="Raw"
-							Content="{TemplateBinding Content}"
-							ContentTemplate="{TemplateBinding ContentTemplate}"
-							ContentTransitions="{TemplateBinding ContentTransitions}"
-							Foreground="{TemplateBinding Foreground}"
-							TextWrapping="Wrap" />
-						<VisualStateManager.VisualStateGroups>
-							<VisualStateGroup x:Name="OrientationStateGroup">
-								<VisualState x:Name="HorizontalState">
-									<VisualState.Setters>
-										<Setter Target="CheckBoxGrid.(Grid.Row)" Value="0" />
-										<Setter Target="CheckBoxGrid.(Grid.RowSpan)" Value="2" />
-										<Setter Target="CheckBoxGrid.(Grid.Column)" Value="0" />
-										<Setter Target="CheckBoxGrid.(Grid.ColumnSpan)" Value="1" />
-										<Setter Target="CheckBoxGrid.Margin" Value="{StaticResource PropertiesItemCheckBoxHorizontalMargin}" />
-
-										<Setter Target="ContentPresenter.(Grid.Row)" Value="0" />
-										<Setter Target="ContentPresenter.(Grid.RowSpan)" Value="2" />
-										<Setter Target="ContentPresenter.(Grid.Column)" Value="1" />
-										<Setter Target="ContentPresenter.(Grid.ColumnSpan)" Value="1" />
-									</VisualState.Setters>
-								</VisualState>
-								<VisualState x:Name="VerticalState">
-									<VisualState.Setters>
-										<Setter Target="CheckBoxGrid.(Grid.Row)" Value="0" />
-										<Setter Target="CheckBoxGrid.(Grid.RowSpan)" Value="1" />
-										<Setter Target="CheckBoxGrid.(Grid.Column)" Value="0" />
-										<Setter Target="CheckBoxGrid.(Grid.ColumnSpan)" Value="2" />
-										<Setter Target="CheckBoxGrid.Margin" Value="{StaticResource PropertiesItemCheckBoxVerticalMargin}" />
-
-										<Setter Target="ContentPresenter.(Grid.Row)" Value="1" />
-										<Setter Target="ContentPresenter.(Grid.RowSpan)" Value="1" />
-										<Setter Target="ContentPresenter.(Grid.Column)" Value="0" />
-										<Setter Target="ContentPresenter.(Grid.ColumnSpan)" Value="2" />
-									</VisualState.Setters>
-								</VisualState>
-							</VisualStateGroup>
-							<VisualStateGroup x:Name="CombinedStates">
-								<VisualState x:Name="UncheckedNormal" />
-								<VisualState x:Name="UncheckedPointerOver">
-									<VisualState.Setters>
-										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource CheckBoxForegroundUncheckedPointerOver}" />
-										<Setter Target="RootGrid.Background" Value="{ThemeResource CheckBoxBackgroundUncheckedPointerOver}" />
-										<Setter Target="RootGrid.BorderBrush" Value="{ThemeResource CheckBoxBorderBrushUncheckedPointerOver}" />
-										<Setter Target="NormalRectangle.Stroke" Value="{ThemeResource CheckBoxCheckBackgroundStrokeUncheckedPointerOver}" />
-										<Setter Target="NormalRectangle.Fill" Value="{ThemeResource CheckBoxCheckBackgroundFillUncheckedPointerOver}" />
-										<Setter Target="CheckGlyph.Foreground" Value="{ThemeResource CheckBoxCheckGlyphForegroundUncheckedPointerOver}" />
-										<Setter Target="CheckGlyph.(AnimatedIcon.State)" Value="PointerOverOff" />
-									</VisualState.Setters>
-								</VisualState>
-								<VisualState x:Name="UncheckedPressed">
-									<VisualState.Setters>
-										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource CheckBoxForegroundUncheckedPressed}" />
-										<Setter Target="RootGrid.Background" Value="{ThemeResource CheckBoxBackgroundUncheckedPressed}" />
-										<Setter Target="RootGrid.BorderBrush" Value="{ThemeResource CheckBoxBorderBrushUncheckedPressed}" />
-										<Setter Target="NormalRectangle.Stroke" Value="{ThemeResource CheckBoxCheckBackgroundStrokeUncheckedPressed}" />
-										<Setter Target="NormalRectangle.Fill" Value="{ThemeResource CheckBoxCheckBackgroundFillUncheckedPressed}" />
-										<Setter Target="CheckGlyph.Foreground" Value="{ThemeResource CheckBoxCheckGlyphForegroundUncheckedPressed}" />
-										<Setter Target="CheckGlyph.(AnimatedIcon.State)" Value="PressedOff" />
-									</VisualState.Setters>
-								</VisualState>
-								<VisualState x:Name="UncheckedDisabled">
-									<VisualState.Setters>
-										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource CheckBoxForegroundUncheckedDisabled}" />
-										<Setter Target="RootGrid.Background" Value="{ThemeResource CheckBoxBackgroundUncheckedDisabled}" />
-										<Setter Target="RootGrid.BorderBrush" Value="{ThemeResource CheckBoxBorderBrushUncheckedDisabled}" />
-										<Setter Target="NormalRectangle.Stroke" Value="{ThemeResource CheckBoxCheckBackgroundStrokeUncheckedDisabled}" />
-										<Setter Target="NormalRectangle.Fill" Value="{ThemeResource CheckBoxCheckBackgroundFillUncheckedDisabled}" />
-										<Setter Target="CheckGlyph.Foreground" Value="{ThemeResource CheckBoxCheckGlyphForegroundUncheckedDisabled}" />
-										<!--  DisabledVisual Should be handled by the control, not the animated icon.  -->
-										<Setter Target="CheckGlyph.(AnimatedIcon.State)" Value="NormalOff" />
-									</VisualState.Setters>
-								</VisualState>
-								<VisualState x:Name="CheckedNormal">
-									<VisualState.Setters>
-										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource CheckBoxForegroundChecked}" />
-										<Setter Target="RootGrid.Background" Value="{ThemeResource CheckBoxBackgroundChecked}" />
-										<Setter Target="RootGrid.BorderBrush" Value="{ThemeResource CheckBoxBorderBrushChecked}" />
-										<Setter Target="NormalRectangle.Stroke" Value="{ThemeResource CheckBoxCheckBackgroundStrokeChecked}" />
-										<Setter Target="NormalRectangle.Fill" Value="{ThemeResource CheckBoxCheckBackgroundFillChecked}" />
-										<Setter Target="CheckGlyph.Foreground" Value="{ThemeResource CheckBoxCheckGlyphForegroundChecked}" />
-										<Setter Target="CheckGlyph.(AnimatedIcon.State)" Value="NormalOn" />
-									</VisualState.Setters>
-								</VisualState>
-								<VisualState x:Name="CheckedPointerOver">
-									<VisualState.Setters>
-										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource CheckBoxForegroundCheckedPointerOver}" />
-										<Setter Target="RootGrid.Background" Value="{ThemeResource CheckBoxBackgroundCheckedPointerOver}" />
-										<Setter Target="RootGrid.BorderBrush" Value="{ThemeResource CheckBoxBorderBrushCheckedPointerOver}" />
-										<Setter Target="NormalRectangle.Stroke" Value="{ThemeResource CheckBoxCheckBackgroundStrokeCheckedPointerOver}" />
-										<Setter Target="NormalRectangle.Fill" Value="{ThemeResource CheckBoxCheckBackgroundFillCheckedPointerOver}" />
-										<Setter Target="CheckGlyph.Foreground" Value="{ThemeResource CheckBoxCheckGlyphForegroundCheckedPointerOver}" />
-										<Setter Target="CheckGlyph.(AnimatedIcon.State)" Value="PointerOverOn" />
-									</VisualState.Setters>
-								</VisualState>
-								<VisualState x:Name="CheckedPressed">
-									<VisualState.Setters>
-										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource CheckBoxForegroundCheckedPressed}" />
-										<Setter Target="RootGrid.Background" Value="{ThemeResource CheckBoxBackgroundCheckedPressed}" />
-										<Setter Target="RootGrid.BorderBrush" Value="{ThemeResource CheckBoxBorderBrushCheckedPressed}" />
-										<Setter Target="NormalRectangle.Stroke" Value="{ThemeResource CheckBoxCheckBackgroundStrokeCheckedPressed}" />
-										<Setter Target="NormalRectangle.Fill" Value="{ThemeResource CheckBoxCheckBackgroundFillCheckedPressed}" />
-										<Setter Target="CheckGlyph.Foreground" Value="{ThemeResource CheckBoxCheckGlyphForegroundCheckedPressed}" />
-										<Setter Target="CheckGlyph.(AnimatedIcon.State)" Value="PressedOn" />
-									</VisualState.Setters>
-								</VisualState>
-								<VisualState x:Name="CheckedDisabled">
-									<VisualState.Setters>
-										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource CheckBoxForegroundCheckedDisabled}" />
-										<Setter Target="RootGrid.Background" Value="{ThemeResource CheckBoxBackgroundCheckedDisabled}" />
-										<Setter Target="RootGrid.BorderBrush" Value="{ThemeResource CheckBoxBorderBrushCheckedDisabled}" />
-										<Setter Target="NormalRectangle.Stroke" Value="{ThemeResource CheckBoxCheckBackgroundStrokeCheckedDisabled}" />
-										<Setter Target="NormalRectangle.Fill" Value="{ThemeResource CheckBoxCheckBackgroundFillCheckedDisabled}" />
-										<Setter Target="CheckGlyph.Foreground" Value="{ThemeResource CheckBoxCheckGlyphForegroundCheckedDisabled}" />
-										<!--  DisabledVisual Should be handled by the control, not the animated icon.  -->
-										<Setter Target="CheckGlyph.(AnimatedIcon.State)" Value="NormalOn" />
-									</VisualState.Setters>
-								</VisualState>
-								<VisualState x:Name="IndeterminateNormal">
-									<VisualState.Setters>
-										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource CheckBoxForegroundIndeterminate}" />
-										<Setter Target="RootGrid.Background" Value="{ThemeResource CheckBoxBackgroundIndeterminate}" />
-										<Setter Target="RootGrid.BorderBrush" Value="{ThemeResource CheckBoxBorderBrushIndeterminate}" />
-										<Setter Target="NormalRectangle.Stroke" Value="{ThemeResource CheckBoxCheckBackgroundStrokeIndeterminate}" />
-										<Setter Target="NormalRectangle.Fill" Value="{ThemeResource CheckBoxCheckBackgroundFillIndeterminate}" />
-										<Setter Target="DownLevelCheckGlyph.Glyph" Value="{StaticResource CheckBoxIndeterminateGlyph}" />
-										<Setter Target="CheckGlyph.Foreground" Value="{ThemeResource CheckBoxCheckGlyphForegroundIndeterminate}" />
-										<Setter Target="CheckGlyph.(AnimatedIcon.State)" Value="NormalIndeterminate" />
-										<Setter Target="CheckGlyph.Margin" Value="0" />
-									</VisualState.Setters>
-								</VisualState>
-								<VisualState x:Name="IndeterminatePointerOver">
-									<VisualState.Setters>
-										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource CheckBoxForegroundIndeterminatePointerOver}" />
-										<Setter Target="RootGrid.Background" Value="{ThemeResource CheckBoxBackgroundIndeterminatePointerOver}" />
-										<Setter Target="RootGrid.BorderBrush" Value="{ThemeResource CheckBoxBorderBrushIndeterminatePointerOver}" />
-										<Setter Target="NormalRectangle.Stroke" Value="{ThemeResource CheckBoxCheckBackgroundStrokeIndeterminatePointerOver}" />
-										<Setter Target="NormalRectangle.Fill" Value="{ThemeResource CheckBoxCheckBackgroundFillIndeterminatePointerOver}" />
-										<Setter Target="DownLevelCheckGlyph.Glyph" Value="{StaticResource CheckBoxIndeterminateGlyph}" />
-										<Setter Target="CheckGlyph.Foreground" Value="{ThemeResource CheckBoxCheckGlyphForegroundIndeterminatePointerOver}" />
-										<Setter Target="CheckGlyph.(AnimatedIcon.State)" Value="PointerOverIndeterminate" />
-										<Setter Target="CheckGlyph.Margin" Value="0" />
-									</VisualState.Setters>
-								</VisualState>
-								<VisualState x:Name="IndeterminatePressed">
-									<VisualState.Setters>
-										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource CheckBoxForegroundIndeterminatePressed}" />
-										<Setter Target="RootGrid.Background" Value="{ThemeResource CheckBoxBackgroundIndeterminatePressed}" />
-										<Setter Target="RootGrid.BorderBrush" Value="{ThemeResource CheckBoxBorderBrushIndeterminatePressed}" />
-										<Setter Target="NormalRectangle.Stroke" Value="{ThemeResource CheckBoxCheckBackgroundStrokeIndeterminatePressed}" />
-										<Setter Target="NormalRectangle.Fill" Value="{ThemeResource CheckBoxCheckBackgroundFillIndeterminatePressed}" />
-										<Setter Target="DownLevelCheckGlyph.Glyph" Value="{StaticResource CheckBoxIndeterminateGlyph}" />
-										<Setter Target="CheckGlyph.Foreground" Value="{ThemeResource CheckBoxCheckGlyphForegroundIndeterminatePressed}" />
-										<Setter Target="CheckGlyph.(AnimatedIcon.State)" Value="PressedIndeterminate" />
-										<Setter Target="CheckGlyph.Margin" Value="0" />
-									</VisualState.Setters>
-								</VisualState>
-								<VisualState x:Name="IndeterminateDisabled">
-									<VisualState.Setters>
-										<Setter Target="ContentPresenter.Foreground" Value="{ThemeResource CheckBoxForegroundIndeterminateDisabled}" />
-										<Setter Target="RootGrid.Background" Value="{ThemeResource CheckBoxBackgroundIndeterminateDisabled}" />
-										<Setter Target="RootGrid.BorderBrush" Value="{ThemeResource CheckBoxBorderBrushIndeterminateDisabled}" />
-										<Setter Target="NormalRectangle.Stroke" Value="{ThemeResource CheckBoxCheckBackgroundStrokeIndeterminateDisabled}" />
-										<Setter Target="NormalRectangle.Fill" Value="{ThemeResource CheckBoxCheckBackgroundFillIndeterminateDisabled}" />
-										<Setter Target="DownLevelCheckGlyph.Glyph" Value="{StaticResource CheckBoxIndeterminateGlyph}" />
-										<Setter Target="CheckGlyph.Foreground" Value="{ThemeResource CheckBoxCheckGlyphForegroundIndeterminateDisabled}" />
-										<!--  DisabledVisual Should be handled by the control, not the animated icon.  -->
-										<Setter Target="CheckGlyph.(AnimatedIcon.State)" Value="NormalIndeterminate" />
-										<Setter Target="CheckGlyph.Margin" Value="0" />
-									</VisualState.Setters>
-								</VisualState>
-							</VisualStateGroup>
-						</VisualStateManager.VisualStateGroups>
 					</Grid>
 				</ControlTemplate>
 			</Setter.Value>
diff --git a/src/Files.App.Controls/PropertiesView/PropertiesViewCard.Properties.cs b/src/Files.App.Controls/PropertiesView/PropertiesViewCard.Properties.cs
new file mode 100644
index 000000000000..71ee619e58ce
--- /dev/null
+++ b/src/Files.App.Controls/PropertiesView/PropertiesViewCard.Properties.cs
@@ -0,0 +1,53 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using CommunityToolkit.WinUI;
+
+namespace Files.App.Controls;
+
+public partial class PropertiesViewCard
+{
+	[GeneratedDependencyProperty]
+	public partial object? Header { get; set; }
+
+	[GeneratedDependencyProperty]
+	public partial object? Description { get; set; }
+
+	[GeneratedDependencyProperty]
+	public partial IconElement? HeaderIcon { get; set; }
+
+	[GeneratedDependencyProperty]
+	public partial IconElement? ActionIcon { get; set; }
+
+	[GeneratedDependencyProperty]
+	public partial string? ActionIconToolTip { get; set; }
+
+	[GeneratedDependencyProperty(DefaultValue = false)]
+	public partial bool IsClickEnabled { get; set; }
+
+	[GeneratedDependencyProperty(DefaultValue = true)]
+	public partial bool IsActionIconVisible { get; set; }
+
+	public GridLength LabelWidth
+	{
+		get => (GridLength)GetValue(LabelWidthProperty);
+		set => SetValue(LabelWidthProperty, value);
+	}
+
+	public static readonly DependencyProperty LabelWidthProperty =
+		DependencyProperty.Register(
+			nameof(LabelWidth),
+			typeof(GridLength),
+			typeof(PropertiesViewCard),
+			new PropertyMetadata(new GridLength(160)));
+
+	[GeneratedDependencyProperty(DefaultValue = PropertiesViewCardContentAlignment.Right)]
+	public partial PropertiesViewCardContentAlignment ContentAlignment { get; set; }
+}
+
+public enum PropertiesViewCardContentAlignment
+{
+	Right,
+	Left,
+	Vertical,
+}
diff --git a/src/Files.App.Controls/PropertiesView/PropertiesViewCard.cs b/src/Files.App.Controls/PropertiesView/PropertiesViewCard.cs
index fb64ab19d400..7147f78f4aeb 100644
--- a/src/Files.App.Controls/PropertiesView/PropertiesViewCard.cs
+++ b/src/Files.App.Controls/PropertiesView/PropertiesViewCard.cs
@@ -1,18 +1,323 @@
-// Copyright (c) Files Community
-// SPDX-License-Identifier: MPL-2.0
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
 
-using CommunityToolkit.WinUI;
+using Microsoft.UI.Xaml.Automation;
+using Microsoft.UI.Xaml.Automation.Peers;
+using Microsoft.UI.Xaml.Input;
+using Windows.System;
 
 namespace Files.App.Controls;
 
-public partial class PropertiesViewCard : ButtonBase
+[TemplatePart(Name = ActionIconPresenterHolderName, Type = typeof(Viewbox))]
+[TemplatePart(Name = DescriptionPresenterName, Type = typeof(ContentPresenter))]
+[TemplatePart(Name = HeaderIconPresenterHolderName, Type = typeof(Viewbox))]
+[TemplatePart(Name = HeaderPresenterName, Type = typeof(ContentPresenter))]
+[TemplateVisualState(Name = NormalStateName, GroupName = CommonStatesName)]
+[TemplateVisualState(Name = PointerOverStateName, GroupName = CommonStatesName)]
+[TemplateVisualState(Name = PressedStateName, GroupName = CommonStatesName)]
+[TemplateVisualState(Name = DisabledStateName, GroupName = CommonStatesName)]
+[TemplateVisualState(Name = RightStateName, GroupName = ContentAlignmentStatesName)]
+[TemplateVisualState(Name = RightWrappedStateName, GroupName = ContentAlignmentStatesName)]
+[TemplateVisualState(Name = LeftStateName, GroupName = ContentAlignmentStatesName)]
+[TemplateVisualState(Name = VerticalStateName, GroupName = ContentAlignmentStatesName)]
+public partial class PropertiesViewCard : Button
 {
-	[GeneratedDependencyProperty]
-	public partial object? Header { get; set; }
+	private const string CommonStatesName = "CommonStates";
+	private const string NormalStateName = "Normal";
+	private const string PointerOverStateName = "PointerOver";
+	private const string PressedStateName = "Pressed";
+	private const string DisabledStateName = "Disabled";
+	private const string ContentAlignmentStatesName = "ContentAlignmentStates";
+	private const string RightStateName = "Right";
+	private const string RightWrappedStateName = "RightWrapped";
+	private const string LeftStateName = "Left";
+	private const string VerticalStateName = "Vertical";
+	private const string ContentSpacingStateName = "ContentSpacing";
+	private const string NoContentSpacingStateName = "NoContentSpacing";
+	private const string BitmapHeaderIconEnabledStateName = "BitmapHeaderIconEnabled";
+	private const string BitmapHeaderIconDisabledStateName = "BitmapHeaderIconDisabled";
+	private const string ActionIconPresenterHolderName = "PART_ActionIconPresenterHolder";
+	private const string DescriptionPresenterName = "PART_DescriptionPresenter";
+	private const string HeaderIconPresenterHolderName = "PART_HeaderIconPresenterHolder";
+	private const string HeaderPresenterName = "PART_HeaderPresenter";
 
-	[GeneratedDependencyProperty]
-	public partial FrameworkElement? HeaderIcon { get; set; }
+	private VisualStateGroup? contentAlignmentStates;
+	private long? contentPropertyChangedToken;
 
-	[GeneratedDependencyProperty]
-	public partial FrameworkElement? IsClickEnabled { get; set; }
+	public PropertiesViewCard()
+	{
+		DefaultStyleKey = typeof(PropertiesViewCard);
+		ActionIcon = new FontIcon { Glyph = "\uE974", MirroredWhenRightToLeft = true };
+	}
+
+	protected override void OnApplyTemplate()
+	{
+		DisableButtonInteraction();
+		IsEnabledChanged -= OnIsEnabledChanged;
+
+		if (contentAlignmentStates is not null)
+			contentAlignmentStates.CurrentStateChanged -= ContentAlignmentStates_CurrentStateChanged;
+
+		if (contentPropertyChangedToken is long token)
+			UnregisterPropertyChangedCallback(ContentProperty, token);
+
+		base.OnApplyTemplate();
+
+		UpdateActionIcon();
+		UpdateDescription();
+		UpdateHeader();
+		UpdateHeaderIcon();
+		UpdateClickInteraction();
+		UpdateCommonState(false);
+		UpdateBitmapHeaderIconState(false);
+		SetAccessibleContentName();
+
+		contentPropertyChangedToken = RegisterPropertyChangedCallback(ContentProperty, OnContentChanged);
+		IsEnabledChanged += OnIsEnabledChanged;
+
+		contentAlignmentStates = GetTemplateChild(ContentAlignmentStatesName) as VisualStateGroup;
+		if (contentAlignmentStates is not null)
+		{
+			UpdateContentSpacingState(contentAlignmentStates.CurrentState, false);
+			contentAlignmentStates.CurrentStateChanged += ContentAlignmentStates_CurrentStateChanged;
+		}
+	}
+
+	protected override AutomationPeer OnCreateAutomationPeer()
+	{
+		return new PropertiesViewCardAutomationPeer(this);
+	}
+
+	protected override void OnPointerPressed(PointerRoutedEventArgs e)
+	{
+		if (!IsClickEnabled)
+			return;
+
+		base.OnPointerPressed(e);
+		VisualStateManager.GoToState(this, PressedStateName, true);
+	}
+
+	protected override void OnPointerReleased(PointerRoutedEventArgs e)
+	{
+		if (!IsClickEnabled)
+			return;
+
+		base.OnPointerReleased(e);
+		VisualStateManager.GoToState(this, NormalStateName, true);
+	}
+
+	protected override void OnPointerEntered(PointerRoutedEventArgs e)
+	{
+		if (!IsClickEnabled)
+			return;
+
+		base.OnPointerEntered(e);
+		VisualStateManager.GoToState(this, PointerOverStateName, true);
+	}
+
+	protected override void OnPointerExited(PointerRoutedEventArgs e)
+	{
+		if (!IsClickEnabled)
+			return;
+
+		base.OnPointerExited(e);
+		VisualStateManager.GoToState(this, NormalStateName, true);
+	}
+
+	protected override void OnPointerCaptureLost(PointerRoutedEventArgs e)
+	{
+		if (!IsClickEnabled)
+			return;
+
+		base.OnPointerCaptureLost(e);
+		VisualStateManager.GoToState(this, NormalStateName, true);
+	}
+
+	protected override void OnPointerCanceled(PointerRoutedEventArgs e)
+	{
+		if (!IsClickEnabled)
+			return;
+
+		base.OnPointerCanceled(e);
+		VisualStateManager.GoToState(this, NormalStateName, true);
+	}
+
+	protected override void OnKeyDown(KeyRoutedEventArgs e)
+	{
+		if (IsClickEnabled)
+			base.OnKeyDown(e);
+	}
+
+	protected override void OnKeyUp(KeyRoutedEventArgs e)
+	{
+		if (IsClickEnabled)
+			base.OnKeyUp(e);
+	}
+
+	partial void OnActionIconChanged(IconElement? newValue)
+	{
+		UpdateActionIcon();
+	}
+
+	partial void OnContentAlignmentChanged(PropertiesViewCardContentAlignment newValue)
+	{
+		UpdateContentSpacingState(contentAlignmentStates?.CurrentState, true);
+	}
+
+	partial void OnDescriptionChanged(object? newValue)
+	{
+		UpdateDescription();
+		SetAccessibleContentName();
+	}
+
+	partial void OnHeaderChanged(object? newValue)
+	{
+		UpdateHeader();
+		SetAccessibleContentName();
+	}
+
+	partial void OnHeaderIconChanged(IconElement? newValue)
+	{
+		UpdateHeaderIcon();
+		UpdateBitmapHeaderIconState(true);
+	}
+
+	partial void OnIsActionIconVisibleChanged(bool newValue)
+	{
+		UpdateActionIcon();
+	}
+
+	partial void OnIsClickEnabledChanged(bool newValue)
+	{
+		UpdateClickInteraction();
+		UpdateActionIcon();
+	}
+
+	private void UpdateClickInteraction()
+	{
+		if (IsClickEnabled)
+			EnableButtonInteraction();
+		else
+			DisableButtonInteraction();
+	}
+
+	private void EnableButtonInteraction()
+	{
+		DisableButtonInteraction();
+		IsTabStop = true;
+		PreviewKeyDown += Control_PreviewKeyDown;
+		PreviewKeyUp += Control_PreviewKeyUp;
+	}
+
+	private void DisableButtonInteraction()
+	{
+		IsTabStop = false;
+		PreviewKeyDown -= Control_PreviewKeyDown;
+		PreviewKeyUp -= Control_PreviewKeyUp;
+
+		if (IsEnabled)
+			VisualStateManager.GoToState(this, NormalStateName, false);
+	}
+
+	private void Control_PreviewKeyDown(object sender, KeyRoutedEventArgs e)
+	{
+		if (e.Key is VirtualKey.Enter or VirtualKey.Space or VirtualKey.GamepadA &&
+			XamlRoot is not null &&
+			ReferenceEquals(FocusManager.GetFocusedElement(XamlRoot), this))
+		{
+			VisualStateManager.GoToState(this, PressedStateName, true);
+		}
+	}
+
+	private void Control_PreviewKeyUp(object sender, KeyRoutedEventArgs e)
+	{
+		if (e.Key is VirtualKey.Enter or VirtualKey.Space or VirtualKey.GamepadA)
+			VisualStateManager.GoToState(this, NormalStateName, true);
+	}
+
+	private void OnContentChanged(DependencyObject sender, DependencyProperty property)
+	{
+		SetAccessibleContentName();
+		UpdateContentSpacingState(contentAlignmentStates?.CurrentState, false);
+	}
+
+	private void OnIsEnabledChanged(object sender, DependencyPropertyChangedEventArgs e)
+	{
+		UpdateCommonState(true);
+		UpdateBitmapHeaderIconState(true);
+	}
+
+	private void UpdateCommonState(bool useTransitions)
+	{
+		VisualStateManager.GoToState(this, IsEnabled ? NormalStateName : DisabledStateName, useTransitions);
+	}
+
+	private void UpdateActionIcon()
+	{
+		if (GetTemplateChild(ActionIconPresenterHolderName) is FrameworkElement presenter)
+			presenter.Visibility = IsClickEnabled && IsActionIconVisible && ActionIcon is not null
+				? Visibility.Visible
+				: Visibility.Collapsed;
+	}
+
+	private void UpdateDescription()
+	{
+		if (GetTemplateChild(DescriptionPresenterName) is FrameworkElement presenter)
+			presenter.Visibility = IsNullOrEmptyString(Description) ? Visibility.Collapsed : Visibility.Visible;
+	}
+
+	private void UpdateHeader()
+	{
+		if (GetTemplateChild(HeaderPresenterName) is FrameworkElement presenter)
+			presenter.Visibility = IsNullOrEmptyString(Header) ? Visibility.Collapsed : Visibility.Visible;
+	}
+
+	private void UpdateHeaderIcon()
+	{
+		if (GetTemplateChild(HeaderIconPresenterHolderName) is FrameworkElement presenter)
+			presenter.Visibility = HeaderIcon is null ? Visibility.Collapsed : Visibility.Visible;
+	}
+
+	private void UpdateBitmapHeaderIconState(bool useTransitions)
+	{
+		VisualStateManager.GoToState(
+			this,
+			HeaderIcon is BitmapIcon && !IsEnabled
+				? BitmapHeaderIconDisabledStateName
+				: BitmapHeaderIconEnabledStateName,
+			useTransitions);
+	}
+
+	private void ContentAlignmentStates_CurrentStateChanged(object sender, VisualStateChangedEventArgs e)
+	{
+		UpdateContentSpacingState(e.NewState, true);
+	}
+
+	private void UpdateContentSpacingState(VisualState? state, bool useTransitions)
+	{
+		bool isVertical = state?.Name is RightWrappedStateName or VerticalStateName;
+		bool hasHeader = !IsNullOrEmptyString(Header) || !IsNullOrEmptyString(Description);
+		VisualStateManager.GoToState(
+			this,
+			isVertical && Content is not null && hasHeader ? ContentSpacingStateName : NoContentSpacingStateName,
+			useTransitions);
+	}
+
+	private void SetAccessibleContentName()
+	{
+		if (Header is not string { Length: > 0 } header ||
+			Content is not UIElement element ||
+			element is ButtonBase or TextBlock ||
+			!string.IsNullOrEmpty(AutomationProperties.GetName(element)))
+		{
+			return;
+		}
+
+		AutomationProperties.SetName(element, header);
+	}
+
+	private static bool IsNullOrEmptyString(object? value)
+	{
+		return value is null or "";
+	}
 }
diff --git a/src/Files.App.Controls/PropertiesView/PropertiesViewCard.xaml b/src/Files.App.Controls/PropertiesView/PropertiesViewCard.xaml
index 87e266c27408..76801588b417 100644
--- a/src/Files.App.Controls/PropertiesView/PropertiesViewCard.xaml
+++ b/src/Files.App.Controls/PropertiesView/PropertiesViewCard.xaml
@@ -1,59 +1,277 @@
-<!--  Copyright (c) Files Community. SPDX-License-Identifier: MPL-2.0  -->
+<!--  Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license.  -->
 <ResourceDictionary
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-	xmlns:local="using:Files.App.Controls">
+	xmlns:local="using:Files.App.Controls"
+	xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
+	xmlns:toolkit="using:CommunityToolkit.WinUI">
+
+	<ResourceDictionary.ThemeDictionaries>
+		<ResourceDictionary x:Key="Default">
+			<StaticResource x:Key="PropertiesViewCardForeground" ResourceKey="TextFillColorPrimaryBrush" />
+			<StaticResource x:Key="PropertiesViewCardForegroundPointerOver" ResourceKey="TextFillColorPrimaryBrush" />
+			<StaticResource x:Key="PropertiesViewCardForegroundPressed" ResourceKey="TextFillColorSecondaryBrush" />
+			<StaticResource x:Key="PropertiesViewCardForegroundDisabled" ResourceKey="TextFillColorDisabledBrush" />
+		</ResourceDictionary>
+		<ResourceDictionary x:Key="Light">
+			<StaticResource x:Key="PropertiesViewCardForeground" ResourceKey="TextFillColorPrimaryBrush" />
+			<StaticResource x:Key="PropertiesViewCardForegroundPointerOver" ResourceKey="TextFillColorPrimaryBrush" />
+			<StaticResource x:Key="PropertiesViewCardForegroundPressed" ResourceKey="TextFillColorSecondaryBrush" />
+			<StaticResource x:Key="PropertiesViewCardForegroundDisabled" ResourceKey="TextFillColorDisabledBrush" />
+		</ResourceDictionary>
+		<ResourceDictionary x:Key="HighContrast">
+			<StaticResource x:Key="PropertiesViewCardForeground" ResourceKey="SystemColorButtonTextColorBrush" />
+			<StaticResource x:Key="PropertiesViewCardForegroundPointerOver" ResourceKey="SystemColorHighlightColorBrush" />
+			<StaticResource x:Key="PropertiesViewCardForegroundPressed" ResourceKey="SystemColorHighlightColorBrush" />
+			<StaticResource x:Key="PropertiesViewCardForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+		</ResourceDictionary>
+	</ResourceDictionary.ThemeDictionaries>
+
+	<Thickness x:Key="PropertiesViewCardBorderThickness">0,0,0,1</Thickness>
+	<Thickness x:Key="PropertiesViewCardPadding">0,6</Thickness>
+	<GridLength x:Key="PropertiesViewCardDefaultLabelWidth">160</GridLength>
+	<x:Double x:Key="PropertiesViewCardMinWidth">148</x:Double>
+	<x:Double x:Key="PropertiesViewCardMinHeight">48</x:Double>
+	<x:Double x:Key="PropertiesViewCardDescriptionFontSize">12</x:Double>
+	<x:Double x:Key="PropertiesViewCardHeaderIconMaxSize">20</x:Double>
+	<x:Double x:Key="PropertiesViewCardActionIconMaxSize">13</x:Double>
+	<x:Double x:Key="PropertiesViewCardVerticalHeaderContentSpacing">8</x:Double>
+	<x:Double x:Key="PropertiesViewCardWrapThreshold">476</x:Double>
+	<x:Double x:Key="PropertiesViewCardBitmapIconDisabledOpacity">0.4</x:Double>
+	<Thickness x:Key="PropertiesViewCardHeaderIconMargin">0,0,12,0</Thickness>
+	<Thickness x:Key="PropertiesViewCardHeaderMargin">0,0,24,0</Thickness>
+	<Thickness x:Key="PropertiesViewCardActionIconMargin">14,0,0,0</Thickness>
 
 	<Style BasedOn="{StaticResource DefaultPropertiesViewCardStyle}" TargetType="local:PropertiesViewCard" />
 
 	<Style x:Key="DefaultPropertiesViewCardStyle" TargetType="local:PropertiesViewCard">
-		<!--<Setter Property="Background" Value="{ThemeResource LayerFillColorAltBrush}" />
-		<Setter Property="BorderBrush" Value="{ThemeResource CardStrokeColorDefaultBrush}" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="Padding" Value="12,8" />-->
-		<Setter Property="MinHeight" Value="48" />
+		<Setter Property="Background" Value="Transparent" />
+		<Setter Property="Foreground" Value="{ThemeResource PropertiesViewCardForeground}" />
+		<Setter Property="BorderBrush" Value="{ThemeResource DividerStrokeColorDefaultBrush}" />
+		<Setter Property="BorderThickness" Value="{ThemeResource PropertiesViewCardBorderThickness}" />
+		<Setter Property="CornerRadius" Value="0" />
+		<Setter Property="LabelWidth" Value="{StaticResource PropertiesViewCardDefaultLabelWidth}" />
+		<Setter Property="MinWidth" Value="{ThemeResource PropertiesViewCardMinWidth}" />
+		<Setter Property="MinHeight" Value="{ThemeResource PropertiesViewCardMinHeight}" />
+		<Setter Property="Padding" Value="{ThemeResource PropertiesViewCardPadding}" />
+		<Setter Property="HorizontalAlignment" Value="Stretch" />
+		<Setter Property="HorizontalContentAlignment" Value="Stretch" />
+		<Setter Property="VerticalAlignment" Value="Center" />
+		<Setter Property="VerticalContentAlignment" Value="Center" />
+		<Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
+		<Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}" />
+		<Setter Property="FontWeight" Value="Normal" />
+		<Setter Property="IsTabStop" Value="False" />
+		<Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
+		<Setter Property="FocusVisualMargin" Value="-3" />
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="local:PropertiesViewCard">
-					<Grid>
-						<Grid.BackgroundTransition>
-							<BrushTransition Duration="0:0:0.083" />
-						</Grid.BackgroundTransition>
+					<Grid
+						x:Name="PART_RootGrid"
+						MinWidth="{TemplateBinding MinWidth}"
+						MinHeight="{TemplateBinding MinHeight}"
+						MaxWidth="{TemplateBinding MaxWidth}"
+						Padding="{TemplateBinding Padding}"
+						HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+						VerticalAlignment="{TemplateBinding VerticalAlignment}"
+						Background="{TemplateBinding Background}"
+						BorderBrush="{TemplateBinding BorderBrush}"
+						BorderThickness="{TemplateBinding BorderThickness}"
+						CornerRadius="{TemplateBinding CornerRadius}"
+						muxc:AnimatedIcon.State="Normal">
+						<Grid.RowDefinitions>
+							<RowDefinition Height="Auto" />
+							<RowDefinition Height="Auto" />
+						</Grid.RowDefinitions>
 						<Grid.ColumnDefinitions>
-							<ColumnDefinition Width="Auto" />
-							<ColumnDefinition Width="*" />
+							<ColumnDefinition x:Name="PART_LabelColumn" Width="{Binding LabelWidth, RelativeSource={RelativeSource TemplatedParent}}" />
+							<ColumnDefinition x:Name="PART_ContentColumn" Width="*" />
 							<ColumnDefinition Width="Auto" />
 						</Grid.ColumnDefinitions>
 
-						<Viewbox Grid.Column="0" VerticalAlignment="Center">
-							<ContentPresenter Content="{TemplateBinding HeaderIcon}" />
-						</Viewbox>
-
-						<ContentPresenter
-							Grid.Column="1"
-							VerticalAlignment="Center"
-							Content="{TemplateBinding Header}"
-							FontSize="12"
-							FontWeight="Normal"
-							Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-							LineHeight="20" />
-
-						<ContentPresenter
-							Grid.Column="2"
-							VerticalAlignment="Center"
-							Content="{TemplateBinding Content}" />
-
 						<VisualStateManager.VisualStateGroups>
-							<VisualStateGroup x:Name="CommonStates" />
+							<VisualStateGroup x:Name="CommonStates">
+								<VisualState x:Name="Normal" />
+								<VisualState x:Name="PointerOver">
+									<VisualState.Setters>
+										<Setter Target="PART_HeaderPresenter.Foreground" Value="{ThemeResource PropertiesViewCardForegroundPointerOver}" />
+										<Setter Target="PART_HeaderIconPresenter.Foreground" Value="{ThemeResource PropertiesViewCardForegroundPointerOver}" />
+										<Setter Target="PART_RootGrid.(muxc:AnimatedIcon.State)" Value="PointerOver" />
+									</VisualState.Setters>
+								</VisualState>
+								<VisualState x:Name="Pressed">
+									<VisualState.Setters>
+										<Setter Target="PART_HeaderPresenter.Foreground" Value="{ThemeResource PropertiesViewCardForegroundPressed}" />
+										<Setter Target="PART_DescriptionPresenter.Foreground" Value="{ThemeResource PropertiesViewCardForegroundPressed}" />
+										<Setter Target="PART_HeaderIconPresenter.Foreground" Value="{ThemeResource PropertiesViewCardForegroundPressed}" />
+										<Setter Target="PART_ActionIconPresenter.Foreground" Value="{ThemeResource PropertiesViewCardForegroundPressed}" />
+										<Setter Target="PART_RootGrid.(muxc:AnimatedIcon.State)" Value="Pressed" />
+									</VisualState.Setters>
+								</VisualState>
+								<VisualState x:Name="Disabled">
+									<VisualState.Setters>
+										<Setter Target="PART_HeaderPresenter.Foreground" Value="{ThemeResource PropertiesViewCardForegroundDisabled}" />
+										<Setter Target="PART_DescriptionPresenter.Foreground" Value="{ThemeResource PropertiesViewCardForegroundDisabled}" />
+										<Setter Target="PART_HeaderIconPresenter.Foreground" Value="{ThemeResource PropertiesViewCardForegroundDisabled}" />
+										<Setter Target="PART_ActionIconPresenter.Foreground" Value="{ThemeResource PropertiesViewCardForegroundDisabled}" />
+										<Setter Target="PART_ContentPresenter.Foreground" Value="{ThemeResource PropertiesViewCardForegroundDisabled}" />
+										<Setter Target="PART_RootGrid.(muxc:AnimatedIcon.State)" Value="Normal" />
+									</VisualState.Setters>
+								</VisualState>
+							</VisualStateGroup>
+
+							<VisualStateGroup x:Name="BitmapHeaderIconStates">
+								<VisualState x:Name="BitmapHeaderIconEnabled" />
+								<VisualState x:Name="BitmapHeaderIconDisabled">
+									<VisualState.Setters>
+										<Setter Target="PART_HeaderIconPresenterHolder.Opacity" Value="{StaticResource PropertiesViewCardBitmapIconDisabledOpacity}" />
+									</VisualState.Setters>
+								</VisualState>
+							</VisualStateGroup>
 
 							<VisualStateGroup x:Name="ContentAlignmentStates">
-								<VisualState x:Name="ContentAlignedRight" />
+								<VisualState x:Name="Right" />
+								<VisualState x:Name="RightWrapped">
+									<VisualState.StateTriggers>
+										<toolkit:ControlSizeTrigger
+											MaxWidth="{ThemeResource PropertiesViewCardWrapThreshold}"
+											TargetElement="{Binding ElementName=PART_RootGrid}" />
+									</VisualState.StateTriggers>
+									<VisualState.Setters>
+										<Setter Target="PART_ContentPresenter.(Grid.Row)" Value="1" />
+										<Setter Target="PART_ContentPresenter.(Grid.Column)" Value="0" />
+										<Setter Target="PART_ContentPresenter.(Grid.ColumnSpan)" Value="2" />
+										<Setter Target="PART_ContentPresenter.HorizontalAlignment" Value="Stretch" />
+										<Setter Target="PART_ContentPresenter.HorizontalContentAlignment" Value="Stretch" />
+										<Setter Target="PART_HeaderPanel.Margin" Value="0" />
+									</VisualState.Setters>
+								</VisualState>
+								<VisualState x:Name="Left">
+									<VisualState.StateTriggers>
+										<toolkit:IsEqualStateTrigger
+											Value="{Binding ContentAlignment, RelativeSource={RelativeSource TemplatedParent}}"
+											To="Left" />
+									</VisualState.StateTriggers>
+									<VisualState.Setters>
+										<Setter Target="PART_HeaderPanel.Visibility" Value="Collapsed" />
+										<Setter Target="PART_ContentPresenter.(Grid.Column)" Value="0" />
+										<Setter Target="PART_ContentPresenter.(Grid.ColumnSpan)" Value="2" />
+										<Setter Target="PART_ContentPresenter.HorizontalAlignment" Value="Left" />
+									</VisualState.Setters>
+								</VisualState>
+								<VisualState x:Name="Vertical">
+									<VisualState.StateTriggers>
+										<toolkit:IsEqualStateTrigger
+											Value="{Binding ContentAlignment, RelativeSource={RelativeSource TemplatedParent}}"
+											To="Vertical" />
+									</VisualState.StateTriggers>
+									<VisualState.Setters>
+										<Setter Target="PART_ContentPresenter.(Grid.Row)" Value="1" />
+										<Setter Target="PART_ContentPresenter.(Grid.Column)" Value="0" />
+										<Setter Target="PART_ContentPresenter.(Grid.ColumnSpan)" Value="2" />
+										<Setter Target="PART_ContentPresenter.HorizontalAlignment" Value="Stretch" />
+										<Setter Target="PART_ContentPresenter.HorizontalContentAlignment" Value="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource TemplatedParent}}" />
+										<Setter Target="PART_HeaderPanel.Margin" Value="0" />
+									</VisualState.Setters>
+								</VisualState>
+							</VisualStateGroup>
 
-								<VisualState x:Name="ContentAlignedRightWrapped" />
+							<VisualStateGroup x:Name="ContentVisibilityStates">
+								<VisualState x:Name="Visible" />
+								<VisualState x:Name="Collapsed">
+									<VisualState.StateTriggers>
+										<toolkit:IsNullOrEmptyStateTrigger Value="{Binding Content, RelativeSource={RelativeSource TemplatedParent}}" />
+									</VisualState.StateTriggers>
+									<VisualState.Setters>
+										<Setter Target="PART_ContentPresenter.Visibility" Value="Collapsed" />
+									</VisualState.Setters>
+								</VisualState>
+							</VisualStateGroup>
 
-								<VisualState x:Name="ContentAlignedLeft" />
+							<VisualStateGroup x:Name="ContentSpacingStates">
+								<VisualState x:Name="NoContentSpacing" />
+								<VisualState x:Name="ContentSpacing">
+									<VisualState.Setters>
+										<Setter Target="PART_RootGrid.RowSpacing" Value="{ThemeResource PropertiesViewCardVerticalHeaderContentSpacing}" />
+									</VisualState.Setters>
+								</VisualState>
 							</VisualStateGroup>
 						</VisualStateManager.VisualStateGroups>
+
+						<Grid
+							x:Name="PART_HeaderPanel"
+							Margin="{ThemeResource PropertiesViewCardHeaderMargin}"
+							VerticalAlignment="Center">
+							<Grid.ColumnDefinitions>
+								<ColumnDefinition Width="Auto" />
+								<ColumnDefinition Width="*" />
+							</Grid.ColumnDefinitions>
+							<Viewbox
+								x:Name="PART_HeaderIconPresenterHolder"
+								MaxWidth="{ThemeResource PropertiesViewCardHeaderIconMaxSize}"
+								MaxHeight="{ThemeResource PropertiesViewCardHeaderIconMaxSize}"
+								Margin="{ThemeResource PropertiesViewCardHeaderIconMargin}">
+								<ContentPresenter
+									x:Name="PART_HeaderIconPresenter"
+									AutomationProperties.AccessibilityView="Raw"
+									Content="{TemplateBinding HeaderIcon}"
+									Foreground="{TemplateBinding Foreground}"
+									HighContrastAdjustment="None" />
+							</Viewbox>
+							<StackPanel
+								Grid.Column="1"
+								VerticalAlignment="Center"
+								Orientation="Vertical">
+								<ContentPresenter
+									x:Name="PART_HeaderPresenter"
+									HorizontalAlignment="Left"
+									Content="{TemplateBinding Header}"
+									Foreground="{TemplateBinding Foreground}"
+									HighContrastAdjustment="None"
+									TextWrapping="WrapWholeWords" />
+								<ContentPresenter
+									x:Name="PART_DescriptionPresenter"
+									Content="{TemplateBinding Description}"
+									FontSize="{ThemeResource PropertiesViewCardDescriptionFontSize}"
+									Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+									TextWrapping="WrapWholeWords" />
+							</StackPanel>
+						</Grid>
+
+						<ContentPresenter
+							x:Name="PART_ContentPresenter"
+							Grid.Column="1"
+							HorizontalAlignment="Stretch"
+							VerticalAlignment="Center"
+							HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+							VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+							Content="{TemplateBinding Content}"
+							ContentTemplate="{TemplateBinding ContentTemplate}"
+							ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
+							ContentTransitions="{TemplateBinding ContentTransitions}"
+							Foreground="{TemplateBinding Foreground}" />
+
+						<Viewbox
+							x:Name="PART_ActionIconPresenterHolder"
+							Grid.RowSpan="2"
+							Grid.Column="2"
+							MaxWidth="{ThemeResource PropertiesViewCardActionIconMaxSize}"
+							MaxHeight="{ThemeResource PropertiesViewCardActionIconMaxSize}"
+							Margin="{ThemeResource PropertiesViewCardActionIconMargin}"
+							HorizontalAlignment="Center"
+							VerticalAlignment="Center"
+							HighContrastAdjustment="None"
+							Visibility="Collapsed">
+							<ContentPresenter
+								x:Name="PART_ActionIconPresenter"
+								AutomationProperties.AccessibilityView="Raw"
+								Content="{TemplateBinding ActionIcon}"
+								FontFamily="{ThemeResource SymbolThemeFontFamily}"
+								Foreground="{TemplateBinding Foreground}"
+								HighContrastAdjustment="None"
+								ToolTipService.ToolTip="{TemplateBinding ActionIconToolTip}" />
+						</Viewbox>
 					</Grid>
 				</ControlTemplate>
 			</Setter.Value>
diff --git a/src/Files.App.Controls/PropertiesView/PropertiesViewCardAutomationPeer.cs b/src/Files.App.Controls/PropertiesView/PropertiesViewCardAutomationPeer.cs
new file mode 100644
index 000000000000..e61ae2089531
--- /dev/null
+++ b/src/Files.App.Controls/PropertiesView/PropertiesViewCardAutomationPeer.cs
@@ -0,0 +1,53 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.UI.Xaml.Automation;
+using Microsoft.UI.Xaml.Automation.Peers;
+
+namespace Files.App.Controls;
+
+public sealed partial class PropertiesViewCardAutomationPeer : ButtonAutomationPeer
+{
+	public PropertiesViewCardAutomationPeer(PropertiesViewCard owner)
+		: base(owner)
+	{
+	}
+
+	protected override AutomationControlType GetAutomationControlTypeCore()
+	{
+		return Owner is PropertiesViewCard { IsClickEnabled: true }
+			? AutomationControlType.Button
+			: AutomationControlType.Group;
+	}
+
+	protected override string GetClassNameCore()
+	{
+		return Owner.GetType().Name;
+	}
+
+	protected override string GetNameCore()
+	{
+		if (Owner is PropertiesViewCard { IsClickEnabled: true } card)
+		{
+			string name = AutomationProperties.GetName(card);
+			if (!string.IsNullOrEmpty(name))
+				return name;
+
+			if (card.Header is string { Length: > 0 } header)
+				return header;
+		}
+
+		return base.GetNameCore();
+	}
+
+	protected override object? GetPatternCore(PatternInterface patternInterface)
+	{
+		if (patternInterface is PatternInterface.Invoke &&
+			Owner is PropertiesViewCard { IsClickEnabled: false })
+		{
+			return null;
+		}
+
+		return base.GetPatternCore(patternInterface);
+	}
+}
diff --git a/src/Files.App.Controls/PropertiesView/PropertiesViewExpander.cs b/src/Files.App.Controls/PropertiesView/PropertiesViewExpander.cs
index a1b7732243a2..ecdf721f5191 100644
--- a/src/Files.App.Controls/PropertiesView/PropertiesViewExpander.cs
+++ b/src/Files.App.Controls/PropertiesView/PropertiesViewExpander.cs
@@ -1,8 +1,17 @@
-// Copyright (c) Files Community
+// Copyright (c) Files Community
 // SPDX-License-Identifier: MPL-2.0
 
+using CommunityToolkit.WinUI;
+
 namespace Files.App.Controls;
 
 public partial class PropertiesViewExpander : Expander
 {
+	[GeneratedDependencyProperty]
+	public partial IconElement? HeaderIcon { get; set; }
+
+	public PropertiesViewExpander()
+	{
+		DefaultStyleKey = typeof(PropertiesViewExpander);
+	}
 }
diff --git a/src/Files.App.Controls/PropertiesView/PropertiesViewExpander.xaml b/src/Files.App.Controls/PropertiesView/PropertiesViewExpander.xaml
index cdea6ac0b2f1..1d88c10b2b20 100644
--- a/src/Files.App.Controls/PropertiesView/PropertiesViewExpander.xaml
+++ b/src/Files.App.Controls/PropertiesView/PropertiesViewExpander.xaml
@@ -3,7 +3,8 @@
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 	xmlns:animatedvisuals="using:Microsoft.UI.Xaml.Controls.AnimatedVisuals"
-	xmlns:local="using:Files.App.Controls">
+	xmlns:local="using:Files.App.Controls"
+	xmlns:toolkit="using:CommunityToolkit.WinUI">
 
 	<Style BasedOn="{StaticResource DefaultPropertiesViewExpanderStyle}" TargetType="local:PropertiesViewExpander" />
 
@@ -42,13 +43,35 @@
 							BackgroundSizing="{TemplateBinding BackgroundSizing}"
 							BorderBrush="{ThemeResource PropertiesExpanderHeaderBorderBrush}"
 							BorderThickness="0"
-							Content="{TemplateBinding Header}"
-							ContentTemplate="{TemplateBinding HeaderTemplate}"
-							ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}"
 							CornerRadius="{TemplateBinding CornerRadius}"
 							IsChecked="{Binding Path=IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
 							IsEnabled="{TemplateBinding IsEnabled}"
-							Style="{StaticResource PropertiesExpanderHeaderDownStyle}" />
+							Style="{StaticResource PropertiesExpanderHeaderDownStyle}">
+							<Grid>
+								<Grid.ColumnDefinitions>
+									<ColumnDefinition Width="Auto" />
+									<ColumnDefinition Width="*" />
+								</Grid.ColumnDefinitions>
+								<Viewbox
+									x:Name="ExpanderHeaderIcon"
+									Width="16"
+									Height="16"
+									Margin="0,0,12,0"
+									AutomationProperties.AccessibilityView="Raw">
+									<ContentPresenter Content="{TemplateBinding HeaderIcon}" />
+								</Viewbox>
+								<ContentPresenter
+									x:Name="ExpanderHeaderContent"
+									Grid.Column="1"
+									HorizontalAlignment="Stretch"
+									VerticalAlignment="Center"
+									Content="{TemplateBinding Header}"
+									ContentTemplate="{TemplateBinding HeaderTemplate}"
+									ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}"
+									FontWeight="SemiBold"
+									TextWrapping="WrapWholeWords" />
+							</Grid>
+						</ToggleButton>
 						<!--  The clip is a composition clip applied in code  -->
 						<Border x:Name="ExpanderContentClip" Grid.Row="1">
 							<Border
@@ -164,6 +187,17 @@
 									</VisualState.Setters>
 								</VisualState>
 							</VisualStateGroup>
+							<VisualStateGroup x:Name="HeaderIconStates">
+								<VisualState x:Name="HeaderIconVisible" />
+								<VisualState x:Name="HeaderIconCollapsed">
+									<VisualState.StateTriggers>
+										<toolkit:IsNullOrEmptyStateTrigger Value="{Binding HeaderIcon, RelativeSource={RelativeSource TemplatedParent}}" />
+									</VisualState.StateTriggers>
+									<VisualState.Setters>
+										<Setter Target="ExpanderHeaderIcon.Visibility" Value="Collapsed" />
+									</VisualState.Setters>
+								</VisualState>
+							</VisualStateGroup>
 						</VisualStateManager.VisualStateGroups>
 					</Grid>
 				</ControlTemplate>
diff --git a/src/Files.App.Controls/PropertiesView/PropertiesViewItem - Constants.cs b/src/Files.App.Controls/PropertiesView/PropertiesViewItem - Constants.cs
deleted file mode 100644
index c41c8109af5e..000000000000
--- a/src/Files.App.Controls/PropertiesView/PropertiesViewItem - Constants.cs	
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (c) Files Community
-// SPDX-License-Identifier: MPL-2.0
-
-namespace Files.App.Controls.Primitives
-{
-	[TemplateVisualState( Name = HorizontalStateName , GroupName = OrientationStateGroupName )]
-	[TemplateVisualState( Name = VerticalStateName , GroupName = OrientationStateGroupName )]
-
-	[TemplateVisualState( Name = NotEditableStateName , GroupName = EditableStateGroupName )]
-	[TemplateVisualState( Name = EditableStateName , GroupName = EditableStateGroupName )]
-
-	[TemplateVisualState( Name = EnabledStateName , GroupName = EnabledStateGroupName )]
-	[TemplateVisualState( Name = DisabledStateName , GroupName = EnabledStateGroupName )]
-	public partial class PropertiesViewItem : Control
-	{
-		internal const string OrientationStateGroupName = "OrientationStateGroup";
-		internal const string EditableStateGroupName = "EditableStateGroup";
-		internal const string EnabledStateGroupName = "EnabledStateGroup";
-
-
-		internal const string HorizontalStateName = "HorizontalState";
-		internal const string VerticalStateName = "VerticalState";
-
-		internal const string NotEditableStateName = "NotEditableState";
-		internal const string EditableStateName = "EditableState";
-
-		internal const string EnabledStateName = "Enabledtate";
-		internal const string DisabledStateName = "DisabledState";
-
-	}
-}
diff --git a/src/Files.App.Controls/PropertiesView/PropertiesViewItem.Properties.cs b/src/Files.App.Controls/PropertiesView/PropertiesViewItem.Properties.cs
deleted file mode 100644
index a5bd49a79b03..000000000000
--- a/src/Files.App.Controls/PropertiesView/PropertiesViewItem.Properties.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright (c) Files Community
-// SPDX-License-Identifier: MPL-2.0
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Files.App.Controls.Primitives
-{
-	public partial class PropertiesViewItem : Control
-	{
-		public string Label
-		{
-			get { return (string)GetValue( LabelProperty ); }
-			set { SetValue( LabelProperty , value ); }
-		}
-
-		public static readonly DependencyProperty LabelProperty =
-			DependencyProperty.Register(
-				"Label",
-				typeof(string),
-				typeof(PropertiesViewItem),
-				new PropertyMetadata( string.Empty ) );
-
-
-
-
-	public GridLength LabelWidth
-		{
-			get { return (GridLength)GetValue( LabelWidthProperty ); }
-			set { SetValue( LabelWidthProperty , value ); }
-		}
-
-		public static readonly DependencyProperty LabelWidthProperty =
-			DependencyProperty.Register(
-				"LabelWidth",
-				typeof(GridLength),
-				typeof(PropertiesViewItem),
-				new PropertyMetadata(new GridLength(80, GridUnitType.Pixel)));
-
-
-
-
-		public bool CanEdit
-		{
-			get { return (bool)GetValue( CanEditProperty ); }
-			set { SetValue( CanEditProperty , value ); }
-		}
-
-		public static readonly DependencyProperty CanEditProperty =
-			DependencyProperty.Register(
-				"CanEdit",
-				typeof(bool),
-				typeof(PropertiesViewItem),
-				new PropertyMetadata( false, OnCanEditPropertyChanged ) );
-
-
-
-
-		public Orientation Orientation
-		{
-			get => (Orientation)GetValue( OrientationProperty );
-			set => SetValue( OrientationProperty , value );
-		}
-
-		public static readonly DependencyProperty OrientationProperty =
-			DependencyProperty.Register(
-				"Orientation",
-				typeof(Orientation),
-				typeof(PropertiesViewItem),
-				new PropertyMetadata(Orientation.Horizontal, OnOrientationChanged));
-
-
-	}
-}
diff --git a/src/Files.App.Controls/PropertiesView/PropertiesViewItem.cs b/src/Files.App.Controls/PropertiesView/PropertiesViewItem.cs
deleted file mode 100644
index 761b8bb8e8b9..000000000000
--- a/src/Files.App.Controls/PropertiesView/PropertiesViewItem.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-// Copyright (c) Files Community
-// SPDX-License-Identifier: MPL-2.0
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using WinRT;
-
-namespace Files.App.Controls.Primitives
-{
-	public partial class PropertiesViewItem : Control
-	{
-		private bool _isLoaded;
-
-		public PropertiesViewItem()
-		{
-
-			this.Loaded += (s , e) =>
-			{
-				_isLoaded = true;
-				UpdateOrientationState( Orientation );
-				UpdateCanEditState( CanEdit );
-
-				// Apply initial state
-				UpdateEnabledState( IsEnabled );
-
-				// React to future changes
-				RegisterPropertyChangedCallback( Control.IsEnabledProperty , OnIsEnabledChanged );
-			};
-		}
-
-
-
-
-		#region Property Changed
-
-		[DynamicWindowsRuntimeCast( typeof( Orientation ) )]
-		private static void OnOrientationChanged(DependencyObject d , DependencyPropertyChangedEventArgs e)
-		{
-			var control = (PropertiesViewItem)d;
-			control.UpdateOrientationState( (Orientation)e.NewValue );
-		}
-
-		private void UpdateOrientationState(Orientation orientation)
-		{
-			if ( orientation == Orientation.Horizontal )
-			{
-				VisualStateManager.GoToState( this , HorizontalStateName , false );
-			}
-			else
-			{
-				VisualStateManager.GoToState( this , VerticalStateName , false );
-			}
-		}
-
-
-
-
-		private static void OnCanEditPropertyChanged(DependencyObject d , DependencyPropertyChangedEventArgs e)
-		{
-			var control = (PropertiesViewItem)d;
-			control.UpdateCanEditState( (bool)e.NewValue );
-		}
-
-		private void UpdateCanEditState(bool canEdit)
-		{
-			if ( canEdit == true )
-			{
-				VisualStateManager.GoToState( this , EditableStateName , false );
-			}
-			else
-			{
-				VisualStateManager.GoToState( this , NotEditableStateName , false );
-			}
-		}
-
-
-
-
-		private void OnIsEnabledChanged(DependencyObject sender , DependencyProperty dp)
-		{
-			UpdateEnabledState( IsEnabled );
-		}
-
-
-		private void UpdateEnabledState(bool isEnabled)
-		{
-			if ( isEnabled )
-				VisualStateManager.GoToState( this , EnabledStateName , true );
-			else
-				VisualStateManager.GoToState( this , DisabledStateName , true );
-		}
-
-		#endregion
-
-	}
-}
diff --git a/src/Files.App.Controls/PropertiesView/PropertiesViewItemCheck.cs b/src/Files.App.Controls/PropertiesView/PropertiesViewItemCheck.cs
deleted file mode 100644
index e1a7e1051c32..000000000000
--- a/src/Files.App.Controls/PropertiesView/PropertiesViewItemCheck.cs
+++ /dev/null
@@ -1,106 +0,0 @@
-// Copyright (c) Files Community
-// SPDX-License-Identifier: MPL-2.0
-
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Data;
-using Microsoft.UI.Xaml.Documents;
-using Microsoft.UI.Xaml.Input;
-using Microsoft.UI.Xaml.Media;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Files.App.Controls.Primitives;
-using WinRT;
-
-namespace Files.App.Controls
-{
-	#region Template
-
-	[TemplateVisualState( Name = HorizontalStateName , GroupName = OrientationStateGroupName )]
-	[TemplateVisualState( Name = VerticalStateName , GroupName = OrientationStateGroupName )]
-
-	#endregion
-
-
-
-
-	public sealed partial class PropertiesViewItemCheck : CheckBox
-	{
-
-		#region Constants
-		internal const string OrientationStateGroupName = "OrientationStateGroup";
-
-		internal const string HorizontalStateName = "HorizontalState";
-		internal const string VerticalStateName = "VerticalState";
-
-		#endregion
-
-
-
-
-		#region Properties
-		
-		public Orientation Orientation
-		{
-			[DynamicWindowsRuntimeCast( typeof( Orientation ) )]
-
-			get => (Orientation)GetValue( OrientationProperty );
-			set => SetValue( OrientationProperty , value );
-		}
-
-		public static readonly DependencyProperty OrientationProperty =
-			DependencyProperty.Register(
-				"Orientation",
-				typeof(Orientation),
-				typeof(PropertiesViewItemCheck),
-				new PropertyMetadata(Orientation.Horizontal, OnOrientationChanged));
-
-		#endregion
-
-
-
-
-		#region Property Changed
-
-		[DynamicWindowsRuntimeCast( typeof( Orientation ) )]
-		private static void OnOrientationChanged(DependencyObject d , DependencyPropertyChangedEventArgs e)
-		{
-			var control = (PropertiesViewItemCheck)d;
-			control.UpdateOrientationState( (Orientation)e.NewValue );
-		}
-
-		private void UpdateOrientationState(Orientation orientation)
-		{
-			if ( orientation == Orientation.Horizontal )
-			{
-				VisualStateManager.GoToState( this , HorizontalStateName , false );
-			}
-			else
-			{
-				VisualStateManager.GoToState( this , VerticalStateName , false );
-			}
-		}
-
-		#endregion
-
-
-
-
-		private bool _isLoaded;
-		public PropertiesViewItemCheck()
-		{
-			DefaultStyleKey = typeof( PropertiesViewItemCheck );
-		}
-
-
-
-
-		protected override void OnApplyTemplate()
-		{
-			base.OnApplyTemplate();
-			UpdateOrientationState( Orientation );
-		}
-	}
-}
diff --git a/src/Files.App.Controls/PropertiesView/PropertiesViewItemInfo.cs b/src/Files.App.Controls/PropertiesView/PropertiesViewItemInfo.cs
deleted file mode 100644
index 7516e437dc4e..000000000000
--- a/src/Files.App.Controls/PropertiesView/PropertiesViewItemInfo.cs
+++ /dev/null
@@ -1,117 +0,0 @@
-// Copyright (c) Files Community
-// SPDX-License-Identifier: MPL-2.0
-
-using Files.App.Controls.Primitives;
-using Microsoft.UI;
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Data;
-using Microsoft.UI.Xaml.Documents;
-using Microsoft.UI.Xaml.Input;
-using Microsoft.UI.Xaml.Media;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-
-namespace Files.App.Controls
-{
-
-	#region Template Parts
-
-	[TemplatePart( Name = InfoCardPartName , Type = typeof( Border ) )]
-
-
-	[TemplateVisualState( Name = InfoRestStateName , GroupName = InfoStateGroupName )]
-	[TemplateVisualState( Name = InfoPointerOverStateName , GroupName = InfoStateGroupName )]
-
-	#endregion
-
-	public sealed partial class PropertiesViewItemInfo : PropertiesViewItem
-	{
-		#region Constants
-		internal const string InfoCardPartName = "PART_InfoCard";
-
-		internal const string InfoStateGroupName = "InfoStateGroup";
-
-		internal const string InfoRestStateName = "InfoRest";
-		internal const string InfoPointerOverStateName = "InfoPointerOver";
-
-		#endregion
-
-
-
-
-		#region Properties
-
-		public string Text
-		{
-			get { return (string)GetValue( TextProperty ); }
-			set { SetValue( TextProperty , value ); }
-		}
-
-		public static readonly DependencyProperty TextProperty =
-			DependencyProperty.Register(
-				"Text",
-				typeof(string),
-				typeof(PropertiesViewItemInfo),
-				new PropertyMetadata( string.Empty ) );
-
-
-
-
-		public string InfoText
-		{
-			get { return (string)GetValue( InfoTextProperty ); }
-			set { SetValue( InfoTextProperty , value ); }
-		}
-
-		public static readonly DependencyProperty InfoTextProperty =
-			DependencyProperty.Register(
-				"InfoText",
-				typeof(string),
-				typeof(PropertiesViewItemInfo),
-				new PropertyMetadata( string.Empty ) );
-
-		#endregion
-
-
-		public PropertiesViewItemInfo()
-		{
-			DefaultStyleKey = typeof( PropertiesViewItemInfo );
-		}
-
-
-
-
-		private Border? _hoverBorder;
-
-		protected override void OnApplyTemplate()
-		{
-			base.OnApplyTemplate();
-
-			_hoverBorder = GetTemplateChild( InfoCardPartName ) as Border;
-
-			if ( _hoverBorder != null )
-			{
-				_hoverBorder.PointerEntered += OnHoverBorderPointerEntered;
-				_hoverBorder.PointerExited += OnHoverBorderPointerExited;
-			}
-		}
-
-
-
-
-		private void OnHoverBorderPointerEntered(object sender , PointerRoutedEventArgs e)
-		{
-			if (IsEnabled)
-				VisualStateManager.GoToState( this , InfoPointerOverStateName , true );
-		}
-
-		private void OnHoverBorderPointerExited(object sender , PointerRoutedEventArgs e)
-		{
-			if ( IsEnabled )
-				VisualStateManager.GoToState( this , InfoRestStateName , true );
-		}
-	}
-}
diff --git a/src/Files.App.Controls/PropertiesView/PropertiesViewItemRating.cs b/src/Files.App.Controls/PropertiesView/PropertiesViewItemRating.cs
deleted file mode 100644
index a5b64abf986b..000000000000
--- a/src/Files.App.Controls/PropertiesView/PropertiesViewItemRating.cs
+++ /dev/null
@@ -1,257 +0,0 @@
-// Copyright (c) Files Community
-// SPDX-License-Identifier: MPL-2.0
-
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Data;
-using Microsoft.UI.Xaml.Documents;
-using Microsoft.UI.Xaml.Input;
-using Microsoft.UI.Xaml.Media;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Files.App.Controls.Primitives;
-
-namespace Files.App.Controls
-{
-	#region Template Parts
-
-	[TemplatePart( Name = RatingControlPartName , Type = typeof( RatingControl ) )]
-
-	#endregion
-
-
-
-	public sealed partial class PropertiesViewItemRating : PropertiesViewItem
-	{
-		#region Constants
-		internal const string RatingControlPartName = "PART_RatingControl";
-
-		#endregion
-
-
-
-
-		#region Properties
-
-		public int Rating
-		{
-			get { return (int)GetValue( RatingProperty ); }
-			set { SetValue( RatingProperty , value ); }
-		}
-
-		public static readonly DependencyProperty RatingProperty =
-			DependencyProperty.Register(
-				"Rating",
-				typeof(int),
-				typeof(PropertiesViewItemRating),
-				new PropertyMetadata( 3 , OnRatingPropertyChanged ) );
-
-		#endregion
-
-
-
-
-		#region Property Changed
-
-		private static void OnRatingPropertyChanged(DependencyObject d , DependencyPropertyChangedEventArgs e)
-		{
-			var control = (PropertiesViewItemRating)d;
-			if ( e.NewValue != e.OldValue )
-			{ 
-				control.UpdateRatingProperty( (int)e.NewValue );
-			}
-		}
-
-		private void UpdateRatingProperty(int newRating)
-		{
-			double _convertedStars;
-
-			_convertedStars = ConvertToStars( newRating );
-
-			ApplyRatingPropertyToRatingControl( newRating );
-		}
-
-		#endregion
-
-
-
-
-		private bool _isLoaded;
-		public PropertiesViewItemRating()
-		{
-			DefaultStyleKey = typeof( PropertiesViewItemRating );
-
-			this.Loaded += (s , e) =>
-			{
-				_isLoaded = true;
-				UpdateRatingProperty( (int)Rating );
-			};
-		}
-
-
-
-
-		private RatingControl? _ratingControl;
-
-		protected override void OnApplyTemplate()
-		{
-			base.OnApplyTemplate();
-
-
-			// Remove ValueChanged event hook if RatingControl Part is not found or loaded
-			if ( _ratingControl != null )
-			{
-				_ratingControl.ValueChanged -= OnRatingValueChanged;
-			}
-
-
-			// Get Template Part
-			_ratingControl = GetTemplateChild( RatingControlPartName ) as RatingControl;
-
-
-			// Create ValueChanged event hook if RatingControl Part is found
-			if ( _ratingControl != null )
-			{
-				_ratingControl.ValueChanged += OnRatingValueChanged;
-			}
-		}
-
-
-
-
-		private void OnRatingValueChanged(RatingControl sender , object args)
-		{
-			if ( sender == null )
-			{
-				return;
-			}
-
-			int convertedRating;
-
-			// Handle the value sent from the RatingControl
-			convertedRating = ConvertToInt( (double)sender.Value );
-
-			this.Rating = convertedRating;
-		}
-
-
-
-
-		private double ConvertToStars(int value)
-		{
-			// The system gives us ratings as an int value btween 1-99
-			// we then have to convert this into 1-5 stars
-			//  1-12 - 1 Star
-			// 13-37 - 2 Stars
-			// 38-62 - 3 Stars
-			// 63-87 - 4 Stars
-			// 88-99 - 5 Stars
-
-			if ( value <= 0 )
-				return 0.0;
-
-			if ( value >= 100 )
-				return 6.0;
-
-			// If the rating should be 1 Star
-			if ( value >= 1 && value <= 12 )
-				return 1.0;
-
-			// If the rating should be 2 Stars
-			if ( value >= 13 && value <= 37 )
-				return 2.0;
-
-			// If the rating should be 3 Stars
-			if ( value >= 38 && value <= 62 )
-				return 3.0;
-
-			// If the rating should be 4 Stars
-			if ( value >= 63 && value <= 87 )
-				return 4.0;
-
-			// If the rating should be 5 Stars
-			if ( value >= 88 && value <= 99 )
-				return 5.0;
-
-			else
-			{
-				return 0.0;
-			}
-
-		}
-
-
-
-
-		private int ConvertToInt(double stars)
-		{
-			// When setting this value using a Rating controls
-			// we assign values as listed below
-			// 1 Star  - 1
-			// 2 Stars - 25
-			// 3 Stars - 50
-			// 4 Stars - 75
-			// 5 Stars - 99
-
-			if ( stars <= 0.0 )
-				return 0;
-
-			if ( stars > 5.0 )
-				return 99;
-
-			// If the rating should be 1 Star
-			if ( stars == 1.0 )
-				return 1;
-
-			// If the rating should be 2 Stars
-			if ( stars == 2.0 )
-				return 25;
-
-			// If the rating should be 3 Stars
-			if ( stars == 3.0 )
-				return 50;
-
-			// If the rating should be 4 Stars
-			if ( stars == 4.0 )
-				return 75;
-
-			// If the rating should be 5 Stars
-			if ( stars == 5.0 )
-				return 99;
-
-			else 
-			{
-				return 0;
-			}
-
-		}
-
-
-
-
-		private void ApplyRatingPropertyToRatingControl(int newRating)
-		{
-			if ( _ratingControl == null )
-				return;
-
-			double stars = ConvertToStars(newRating);
-
-			if ( stars <= 0 )
-			{
-				_ratingControl.Value = 0.0;
-				_ratingControl.ClearValue( RatingControl.ValueProperty );
-			}
-			else if ( stars >= 6 )
-			{
-				_ratingControl.Value = 5;
-			}
-			else
-			{
-				_ratingControl.Value = stars;
-			}
-		}
-
-	}
-}
diff --git a/src/Files.App.Controls/PropertiesView/PropertiesViewItemSeparator.cs b/src/Files.App.Controls/PropertiesView/PropertiesViewItemSeparator.cs
deleted file mode 100644
index e3fe311c90ff..000000000000
--- a/src/Files.App.Controls/PropertiesView/PropertiesViewItemSeparator.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-// Copyright (c) Files Community
-// SPDX-License-Identifier: MPL-2.0
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using WinRT;
-
-namespace Files.App.Controls
-{
-
-	#region Template
-	[TemplateVisualState( Name = HorizontalStateName , GroupName = OrientationStateGroupName )]
-	[TemplateVisualState( Name = VerticalStateName , GroupName = OrientationStateGroupName )]
-	#endregion
-
-	public sealed partial class PropertiesViewItemSeparator : Control
-	{
-		#region Constants
-		internal const string OrientationStateGroupName = "OrientationStateGroup";
-
-		internal const string HorizontalStateName = "HorizontalState";
-		internal const string VerticalStateName = "VerticalState";
-		#endregion
-
-
-		#region Properties
-
-		public Orientation Orientation
-		{
-			[DynamicWindowsRuntimeCast( typeof( Orientation ) )]
-
-			get => (Orientation)GetValue( OrientationProperty );
-			set => SetValue( OrientationProperty , value );
-		}
-
-		public static readonly DependencyProperty OrientationProperty =
-			DependencyProperty.Register(
-				"Orientation",
-				typeof(Orientation),
-				typeof(PropertiesViewItemSeparator),
-				new PropertyMetadata(Orientation.Horizontal, OnOrientationChanged));
-
-		#endregion
-
-
-		#region Property Changed
-		private static void OnOrientationChanged(DependencyObject d , DependencyPropertyChangedEventArgs e)
-		{
-			var control = (PropertiesViewItemSeparator)d;
-			control.UpdateOrientationState( (Orientation)e.NewValue );
-		}
-
-		private void UpdateOrientationState(Orientation orientation)
-		{
-			if ( orientation == Orientation.Horizontal )
-			{
-				VisualStateManager.GoToState( this , HorizontalStateName , false );
-			}
-			else
-			{
-				VisualStateManager.GoToState( this , VerticalStateName , false );
-			}
-		}
-
-		#endregion
-
-
-		private bool _isLoaded;
-		public PropertiesViewItemSeparator()
-		{ 
-			DefaultStyleKey = typeof( PropertiesViewItemSeparator );
-		}
-
-		protected override void OnApplyTemplate()
-		{
-			base.OnApplyTemplate();
-			UpdateOrientationState( Orientation );
-		}
-	}
-}
diff --git a/src/Files.App.Controls/PropertiesView/PropertiesViewItemText.cs b/src/Files.App.Controls/PropertiesView/PropertiesViewItemText.cs
deleted file mode 100644
index 706630b606c8..000000000000
--- a/src/Files.App.Controls/PropertiesView/PropertiesViewItemText.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright (c) Files Community
-// SPDX-License-Identifier: MPL-2.0
-
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Data;
-using Microsoft.UI.Xaml.Documents;
-using Microsoft.UI.Xaml.Input;
-using Microsoft.UI.Xaml.Media;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Files.App.Controls.Primitives;
-
-namespace Files.App.Controls
-{
-	public sealed partial class PropertiesViewItemText : PropertiesViewItem
-	{
-
-
-		#region Properties
-
-		public string Text
-		{
-			get { return (string)GetValue( TextProperty ); }
-			set { SetValue( TextProperty , value ); }
-		}
-
-		public static readonly DependencyProperty TextProperty =
-			DependencyProperty.Register(
-				"Text",
-				typeof(string),
-				typeof(PropertiesViewItemText),
-				new PropertyMetadata( string.Empty ) );
-
-		#endregion
-
-
-		public PropertiesViewItemText()
-		{
-			DefaultStyleKey = typeof( PropertiesViewItemText );
-		}
-	}
-}
diff --git a/src/Files.App.Controls/PropertiesView/PropertiesViewItemToggle.cs b/src/Files.App.Controls/PropertiesView/PropertiesViewItemToggle.cs
deleted file mode 100644
index 3769432036f4..000000000000
--- a/src/Files.App.Controls/PropertiesView/PropertiesViewItemToggle.cs
+++ /dev/null
@@ -1,159 +0,0 @@
-// Copyright (c) Files Community
-// SPDX-License-Identifier: MPL-2.0
-
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Data;
-using Microsoft.UI.Xaml.Documents;
-using Microsoft.UI.Xaml.Input;
-using Microsoft.UI.Xaml.Media;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Files.App.Controls.Primitives;
-using WinRT;
-
-namespace Files.App.Controls
-{
-	#region Template Parts
-
-	[TemplatePart( Name = ToggleSwitchPartName , Type = typeof( ToggleSwitch ) )]
-
-	#endregion
-
-
-
-	public sealed partial class PropertiesViewItemToggle : PropertiesViewItem
-	{
-		#region Constants
-		internal const string ToggleSwitchPartName = "PART_ToggleSwitch";
-
-		#endregion
-
-
-
-
-		#region Properties
-
-		public bool IsToggled
-		{
-			get { return (bool)GetValue( IsToggledProperty ); }
-			set { SetValue( IsToggledProperty , value ); }
-		}
-
-		public static readonly DependencyProperty IsToggledProperty =
-			DependencyProperty.Register(
-				"IsToggled",
-				typeof(bool),
-				typeof(PropertiesViewItemToggle),
-				new PropertyMetadata( false , OnIsToggledPropertyChanged ) );
-
-
-
-		public string OnText
-		{
-			get { return (string)GetValue( OnTextProperty ); }
-			set { SetValue( OnTextProperty , value ); }
-		}
-
-		public static readonly DependencyProperty OnTextProperty =
-			DependencyProperty.Register(
-				"OnText",
-				typeof(string),
-				typeof(PropertiesViewItemToggle),
-				new PropertyMetadata( "On" ) );
-
-
-
-		public string OffText
-		{
-			get { return (string)GetValue( OffTextProperty ); }
-			set { SetValue( OffTextProperty , value ); }
-		}
-
-		public static readonly DependencyProperty OffTextProperty =
-			DependencyProperty.Register(
-				"OffText",
-				typeof(string),
-				typeof(PropertiesViewItemToggle),
-				new PropertyMetadata( "Off") );
-
-		#endregion
-
-
-
-		private ToggleSwitch? _toggleSwitch;
-
-		#region Property Changed
-
-		private static void OnIsToggledPropertyChanged(DependencyObject d , DependencyPropertyChangedEventArgs e)
-		{
-			var control = (PropertiesViewItemToggle)d;
-			control.UpdateIsToggledProperty( (bool)e.NewValue );
-
-			if ( e.NewValue != e.OldValue )
-			{ 
-				control.UpdateIsToggledProperty( (bool) e.NewValue );
-			}
-		}
-
-		private void UpdateIsToggledProperty(bool isToggled)
-		{
-			if ( _toggleSwitch == null )
-				return;
-
-			_toggleSwitch.IsOn = isToggled;
-		}
-
-		#endregion
-
-
-		private bool _isLoaded;
-		public PropertiesViewItemToggle()
-		{
-			DefaultStyleKey = typeof( PropertiesViewItemToggle );
-
-			this.Loaded += (s , e) =>
-			{
-				_isLoaded = true;
-				UpdateIsToggledProperty( (bool)IsToggled );
-			};
-		}
-
-		[DynamicWindowsRuntimeCast( typeof( ToggleSwitch ) )]
-		protected override void OnApplyTemplate()
-		{
-			base.OnApplyTemplate();
-
-			// Renive IsOn event hook if ToggleSwitch Part is not found or loaded
-			if ( _toggleSwitch != null )
-			{
-				_toggleSwitch.Toggled -= OnToggleSwitchToggled;
-			}
-
-			// Get the template part
-			var _ts = GetTemplateChild( ToggleSwitchPartName ) as ToggleSwitch;
-
-			// Hook the event
-			if ( _ts != null )
-			{
-				_ts.Toggled += OnToggleSwitchToggled;
-			}
-		}
-
-
-
-
-		private void OnToggleSwitchToggled(object sender , RoutedEventArgs e)
-		{
-			if ( _toggleSwitch == null )
-				return;
-
-			bool isOn = _toggleSwitch.IsOn;
-
-			this.IsToggled = isOn;
-		}
-
-	}
-}
diff --git a/tests/Files.App.UITests/Dialogs/PropertiesDetailsPage.xaml b/tests/Files.App.UITests/Dialogs/PropertiesDetailsPage.xaml
index df90951b3222..9bf427431f45 100644
--- a/tests/Files.App.UITests/Dialogs/PropertiesDetailsPage.xaml
+++ b/tests/Files.App.UITests/Dialogs/PropertiesDetailsPage.xaml
@@ -7,18 +7,32 @@
 	xmlns:local="using:Files.App.UITests.Dialogs"
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 	mc:Ignorable="d">
+	<Page.Resources>
+		<ResourceDictionary>
+			<GridLength x:Key="PropertiesDetailsLabelWidth">200</GridLength>
+			<Thickness x:Key="PropertiesValueTextBoxMargin">-12,0,0,0</Thickness>
+			<Style BasedOn="{StaticResource DefaultPropertiesViewCardStyle}" TargetType="controls:PropertiesViewCard">
+				<Setter Property="LabelWidth" Value="{StaticResource PropertiesDetailsLabelWidth}" />
+			</Style>
+		</ResourceDictionary>
+	</Page.Resources>
 
 	<controls:PropertiesView>
 
-		<controls:PropertiesViewExpander IsExpanded="True" Style="{StaticResource PropertiesExpanderStyle}">
-			<controls:PropertiesViewExpander.Header>
-				<controls:PropertiesHeader Text="Description">
-					<controls:PropertiesHeader.Icon>
-						<FontIcon Glyph="&#xF0E3;" />
-					</controls:PropertiesHeader.Icon>
-				</controls:PropertiesHeader>
-			</controls:PropertiesViewExpander.Header>
-
+		<controls:PropertiesViewExpander Header="Description" IsExpanded="True">
+			<controls:PropertiesViewExpander.HeaderIcon>
+				<FontIcon Glyph="&#xF0E3;" />
+			</controls:PropertiesViewExpander.HeaderIcon>
+			<StackPanel Padding="0,0,0,8">
+				<controls:PropertiesViewCard ContentAlignment="Vertical" Header="Description">
+					<TextBox
+						MinHeight="96"
+						Margin="{StaticResource PropertiesValueTextBoxMargin}"
+						AcceptsReturn="True"
+						Text="Add a description for this file."
+						TextWrapping="Wrap" />
+				</controls:PropertiesViewCard>
+			</StackPanel>
 		</controls:PropertiesViewExpander>
 
 	</controls:PropertiesView>
diff --git a/tests/Files.App.UITests/Dialogs/PropertiesDialog.xaml.cs b/tests/Files.App.UITests/Dialogs/PropertiesDialog.xaml.cs
index 084d2b202e21..df8274384a80 100644
--- a/tests/Files.App.UITests/Dialogs/PropertiesDialog.xaml.cs
+++ b/tests/Files.App.UITests/Dialogs/PropertiesDialog.xaml.cs
@@ -16,12 +16,12 @@ public PropertiesDialog()
 
 			OverlappedPresenter presenter = OverlappedPresenter.Create();
 			ExtendsContentIntoTitleBar = true;
-			AppWindow.Resize(new Windows.Graphics.SizeInt32(640, 480));
+			AppWindow.Resize(new Windows.Graphics.SizeInt32(480, 720));
 			presenter.IsMaximizable = false;
 			AppWindow.SetPresenter(presenter);
 			AppWindow.TitleBar.PreferredTheme = TitleBarTheme.UseDefaultAppMode;
-			presenter.PreferredMinimumHeight = 800;
-			presenter.PreferredMinimumWidth = 800;
+			presenter.PreferredMinimumHeight = 480;
+			presenter.PreferredMinimumWidth = 360;
 		}
 
 		private void SelectorBar_SelectionChanged(SelectorBar sender, SelectorBarSelectionChangedEventArgs args)
diff --git a/tests/Files.App.UITests/Dialogs/PropertiesGeneralPage.xaml b/tests/Files.App.UITests/Dialogs/PropertiesGeneralPage.xaml
index 53536c1e136e..fa93f3f26d0b 100644
--- a/tests/Files.App.UITests/Dialogs/PropertiesGeneralPage.xaml
+++ b/tests/Files.App.UITests/Dialogs/PropertiesGeneralPage.xaml
@@ -3,27 +3,26 @@
 	x:Class="Files.App.UITests.Dialogs.PropertiesGeneralPage"
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-	xmlns:animatedvisuals="using:Microsoft.UI.Xaml.Controls.AnimatedVisuals"
 	xmlns:controls="using:Files.App.Controls"
 	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 	xmlns:local="using:Files.App.UITests.Dialogs"
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 	mc:Ignorable="d">
-
 	<Page.Resources>
 		<ResourceDictionary>
-
-			<GridLength x:Key="LabelWidth">160</GridLength>
-
+			<GridLength x:Key="PropertiesGeneralLabelWidth">148</GridLength>
+			<Thickness x:Key="PropertiesValueTextBoxMargin">-12,0,0,0</Thickness>
+			<Style BasedOn="{StaticResource DefaultPropertiesViewCardStyle}" TargetType="controls:PropertiesViewCard">
+				<Setter Property="LabelWidth" Value="{StaticResource PropertiesGeneralLabelWidth}" />
+			</Style>
 		</ResourceDictionary>
 	</Page.Resources>
 
 	<controls:PropertiesView>
-
 		<controls:PropertiesView.Header>
-			<Grid Padding="24,20">
+			<Grid Padding="24,20" ColumnSpacing="20">
 				<Grid.ColumnDefinitions>
-					<ColumnDefinition Width="{StaticResource LabelWidth}" />
+					<ColumnDefinition Width="Auto" />
 					<ColumnDefinition Width="*" />
 				</Grid.ColumnDefinitions>
 
@@ -47,338 +46,135 @@
 				<StackPanel
 					Grid.Column="1"
 					VerticalAlignment="Center"
-					Orientation="Vertical"
 					Spacing="8">
-					<TextBox Margin="-12,0,0,0" Text="Filename here" />
+					<TextBox Text="Filename here" />
 					<TextBlock Text="Sticky header area with scrolling below" />
 				</StackPanel>
-
 			</Grid>
 		</controls:PropertiesView.Header>
 
-		<controls:PropertiesViewExpander IsExpanded="True">
-			<controls:PropertiesViewExpander.Header>
-				<controls:PropertiesHeader Text="Header text goes here">
-					<controls:PropertiesHeader.Icon>
-						<SymbolIcon Symbol="AddFriend" />
-					</controls:PropertiesHeader.Icon>
-				</controls:PropertiesHeader>
-			</controls:PropertiesViewExpander.Header>
-
-			<controls:PropertiesViewExpander.Content>
-
-				<StackPanel
-					Padding="0,0,0,8"
-					HorizontalAlignment="Stretch"
-					Orientation="Vertical">
-
-
-					<controls:PropertiesViewCard Header="Card header text" />
-
-					<controls:PropertiesViewItemSeparator />
-
-					<controls:PropertiesViewItemText
-						CanEdit="True"
-						Label="Item label 1"
-						LabelWidth="{StaticResource LabelWidth}"
-						Orientation="Horizontal"
-						Text="Item value 1 text here" />
-					<controls:PropertiesViewItemSeparator />
-					<controls:PropertiesViewItemInfo
-						CanEdit="False"
-						InfoText="Detailed text to display with hover."
-						Label="Item info label 1"
-						LabelWidth="{StaticResource LabelWidth}"
-						Orientation="Horizontal"
-						Text="Info item value 1 text" />
-					<controls:PropertiesViewItemSeparator />
-					<controls:PropertiesViewItemInfo
-						CanEdit="True"
-						InfoText="Detailed text to display with hover."
-						Label="Item info label 1"
-						LabelWidth="{StaticResource LabelWidth}"
-						Orientation="Horizontal"
-						Text="Info item value 1 text" />
-					<controls:PropertiesViewItemSeparator />
-					<controls:PropertiesViewItemInfo
-						InfoText="Detailed text to display with hover."
-						IsEnabled="False"
-						Label="Disabled info label 1"
-						LabelWidth="{StaticResource LabelWidth}"
-						Orientation="Horizontal"
-						Text="Info item value 1 text" />
-					<controls:PropertiesViewItemSeparator />
-					<controls:PropertiesViewItemText
-						Label="Item label t00 extra long to demonstrate the wrapping for Labels"
-						LabelWidth="{StaticResource LabelWidth}"
-						Orientation="Horizontal"
-						Text="Item value t00 text here" />
-					<controls:PropertiesViewItemSeparator />
-					<controls:PropertiesViewItemText
-						IsEnabled="False"
-						Label="Disabled - CanEdit set to False"
-						LabelWidth="{StaticResource LabelWidth}"
-						Orientation="Horizontal"
-						Text="Item value t00 text here" />
-					<controls:PropertiesViewItemSeparator />
-					<controls:PropertiesViewItemText
-						CanEdit="True"
-						IsEnabled="False"
-						Label="Disabled - CanEdit set to True"
-						LabelWidth="{StaticResource LabelWidth}"
-						Orientation="Horizontal"
-						Text="Item value t00 text here" />
-					<controls:PropertiesViewItemSeparator />
-					<controls:PropertiesViewItemText
-						Label="Item label three"
-						LabelWidth="{StaticResource LabelWidth}"
-						Orientation="Horizontal"
-						Text="Item value three text here, extra long to show how text values will wrap onto mnany lines." />
-				</StackPanel>
-			</controls:PropertiesViewExpander.Content>
+		<controls:PropertiesViewExpander Header="General" IsExpanded="True">
+			<controls:PropertiesViewExpander.HeaderIcon>
+				<SymbolIcon Symbol="Document" />
+			</controls:PropertiesViewExpander.HeaderIcon>
+			<StackPanel Padding="0,0,0,8">
+				<controls:PropertiesViewCard Header="Name">
+					<TextBox
+						Margin="{StaticResource PropertiesValueTextBoxMargin}"
+						HorizontalAlignment="Stretch"
+						Text="Filename here" />
+				</controls:PropertiesViewCard>
+
+				<controls:PropertiesViewCard Header="Type" Description="A read-only text value">
+					<TextBlock Text="Text Document (.txt)" TextWrapping="Wrap" />
+				</controls:PropertiesViewCard>
+
+				<controls:PropertiesViewCard Header="Additional information">
+					<Grid ColumnSpacing="8">
+						<Grid.ColumnDefinitions>
+							<ColumnDefinition Width="Auto" />
+							<ColumnDefinition Width="Auto" />
+						</Grid.ColumnDefinitions>
+						<TextBlock VerticalAlignment="Center" Text="Information value" />
+						<Button
+							Grid.Column="1"
+							AutomationProperties.Name="Show additional information"
+							ToolTipService.ToolTip="Detailed text displayed on hover">
+							<FontIcon Glyph="&#xE946;" />
+						</Button>
+					</Grid>
+				</controls:PropertiesViewCard>
+
+				<controls:PropertiesViewCard
+					x:Name="ClickableCard"
+					AutomationProperties.AutomationId="ClickablePropertiesViewCard"
+					Click="ClickableCard_Click"
+					Description="Exercises pointer, keyboard, action icon, and automation states"
+					Header="Clickable card"
+					IsClickEnabled="True">
+					<TextBlock x:Name="ClickResultText" Text="Not clicked" />
+				</controls:PropertiesViewCard>
+
+				<controls:PropertiesViewCard
+					Header="Disabled card"
+					IsEnabled="False">
+					<TextBlock Text="Disabled value" />
+				</controls:PropertiesViewCard>
+			</StackPanel>
 		</controls:PropertiesViewExpander>
 
-		<controls:PropertiesViewExpander>
-			<controls:PropertiesViewExpander.Header>
-				<controls:PropertiesHeader Text="Header text goes here, made extra long to ensure wrapping and arranging within the header works as expected">
-					<controls:PropertiesHeader.Icon>
-						<SymbolIcon Symbol="Comment" />
-					</controls:PropertiesHeader.Icon>
-				</controls:PropertiesHeader>
-			</controls:PropertiesViewExpander.Header>
-
-			<controls:PropertiesViewExpander.Content>
-				<StackPanel
-					Padding="0,0,0,8"
-					HorizontalAlignment="Stretch"
-					Orientation="Vertical">
-					<controls:PropertiesViewItemRating
-						Label="Item label 1 readonly"
-						LabelWidth="{StaticResource LabelWidth}"
-						Orientation="Horizontal"
-						Rating="9345" />
-					<controls:PropertiesViewItemSeparator />
-					<controls:PropertiesViewItemRating
-						CanEdit="True"
-						Label="Item label t00 editable"
-						Orientation="Horizontal"
-						Rating="-23" />
-					<controls:PropertiesViewItemSeparator />
-					<controls:PropertiesViewItemRating
-						CanEdit="False"
-						Label="Item label three readonly"
-						Orientation="Horizontal"
-						Rating="32" />
-					<controls:PropertiesViewItemSeparator />
-					<controls:PropertiesViewItemRating
-						CanEdit="False"
-						IsEnabled="False"
-						Label="Disabled item label"
-						Orientation="Horizontal"
-						Rating="50" />
-					<controls:PropertiesViewItemSeparator />
-					<controls:PropertiesViewItemRating
-						CanEdit="True"
-						IsEnabled="False"
-						Label="Disabled, editable label"
-						Orientation="Horizontal"
-						Rating="50" />
-					<controls:PropertiesViewItemSeparator />
-					<controls:PropertiesViewItemRating
-						CanEdit="True"
-						Label="Item label 4ore editable"
-						Orientation="Horizontal"
-						Rating="72" />
-				</StackPanel>
-			</controls:PropertiesViewExpander.Content>
+		<controls:PropertiesViewExpander Header="Ratings">
+			<controls:PropertiesViewExpander.HeaderIcon>
+				<SymbolIcon Symbol="Favorite" />
+			</controls:PropertiesViewExpander.HeaderIcon>
+			<StackPanel Padding="0,0,0,8">
+				<controls:PropertiesViewCard Header="Read-only rating">
+					<RatingControl IsReadOnly="True" Value="4" />
+				</controls:PropertiesViewCard>
+				<controls:PropertiesViewCard Header="Editable rating">
+					<RatingControl Value="3" />
+				</controls:PropertiesViewCard>
+				<controls:PropertiesViewCard Header="Disabled rating" IsEnabled="False">
+					<RatingControl Value="2" />
+				</controls:PropertiesViewCard>
+			</StackPanel>
 		</controls:PropertiesViewExpander>
 
-		<controls:PropertiesViewExpander>
-			<controls:PropertiesViewExpander.Header>
-				<controls:PropertiesHeader Text="Vertical examples">
-					<controls:PropertiesHeader.Icon>
-						<SymbolIcon Symbol="SlideShow" />
-					</controls:PropertiesHeader.Icon>
-				</controls:PropertiesHeader>
-			</controls:PropertiesViewExpander.Header>
-
-			<controls:PropertiesViewExpander.Content>
-				<StackPanel HorizontalAlignment="Stretch" Orientation="Vertical">
-
-					<controls:PropertiesViewItemText
-						CanEdit="True"
-						Label="Item label 1"
-						LabelWidth="{StaticResource LabelWidth}"
-						Orientation="Vertical"
-						Text="Item value 1 text here" />
-
-					<controls:PropertiesViewItemSeparator />
-
-					<controls:PropertiesViewItemInfo
-						CanEdit="False"
-						InfoText="Detailed text to display with the button press."
-						Label="Item info label 1"
-						LabelWidth="{StaticResource LabelWidth}"
-						Orientation="Vertical"
-						Text="Info item value 1 text" />
-
-					<controls:PropertiesViewItemSeparator />
-
-					<controls:PropertiesViewItemInfo
-						CanEdit="True"
-						InfoText="Detailed text to display with the button press."
-						Label="Item info label 1"
-						LabelWidth="{StaticResource LabelWidth}"
-						Orientation="Vertical"
-						Text="Info item value 1 text" />
-
-					<controls:PropertiesViewItemSeparator />
-
-					<controls:PropertiesViewItemRating
-						CanEdit="True"
-						Label="Really long label wrapping when using a vertical layout example here for your viewing pleasure."
-						Orientation="Vertical"
-						Rating="54" />
-
-					<controls:PropertiesViewItemSeparator />
-
-					<controls:PropertiesViewItemText
-						CanEdit="False"
-						Label="Item label three"
-						LabelWidth="{StaticResource LabelWidth}"
-						Orientation="Vertical"
-						Text="Item value 1 text here, made long so we can see how wrapping will work for this vertical exanple of the control layout. " />
-				</StackPanel>
-			</controls:PropertiesViewExpander.Content>
+		<controls:PropertiesViewExpander Header="Vertical and wrapping examples">
+			<controls:PropertiesViewExpander.HeaderIcon>
+				<SymbolIcon Symbol="SlideShow" />
+			</controls:PropertiesViewExpander.HeaderIcon>
+			<StackPanel Padding="0,0,0,8">
+				<controls:PropertiesViewCard
+					ContentAlignment="Vertical"
+					Description="Content is always placed below the header"
+					Header="Editable vertical value">
+					<TextBox
+						Margin="{StaticResource PropertiesValueTextBoxMargin}"
+						HorizontalAlignment="Stretch"
+						Text="Item value text" />
+				</controls:PropertiesViewCard>
+				<controls:PropertiesViewCard
+					ContentAlignment="Vertical"
+					Header="A long header that demonstrates wrapping when the available width becomes constrained">
+					<TextBlock Text="A long value that also wraps across multiple lines when the properties window becomes narrow." TextWrapping="Wrap" />
+				</controls:PropertiesViewCard>
+			</StackPanel>
 		</controls:PropertiesViewExpander>
 
-		<controls:PropertiesViewExpander IsExpanded="True">
-			<controls:PropertiesViewExpander.Header>
-				<controls:PropertiesHeader Text="Toggle Items">
-					<controls:PropertiesHeader.Icon>
-						<SymbolIcon Symbol="XboxOneConsole" />
-					</controls:PropertiesHeader.Icon>
-				</controls:PropertiesHeader>
-			</controls:PropertiesViewExpander.Header>
-			<controls:PropertiesViewExpander.Content>
-				<StackPanel HorizontalAlignment="Stretch" Orientation="Vertical">
-					<controls:PropertiesViewItemToggle
-						IsEnabled="True"
-						IsToggled="True"
-						Label="Enabled and On"
-						LabelWidth="{StaticResource LabelWidth}"
-						Orientation="Horizontal" />
-
-					<controls:PropertiesViewItemSeparator />
-
-					<controls:PropertiesViewItemToggle
-						IsEnabled="True"
-						IsToggled="False"
-						Label="Enabled and Off"
-						LabelWidth="{StaticResource LabelWidth}"
-						Orientation="Horizontal" />
-
-					<controls:PropertiesViewItemSeparator />
-
-					<controls:PropertiesViewItemToggle
-						IsEnabled="False"
-						IsToggled="True"
-						Label="Disabled and On"
-						LabelWidth="{StaticResource LabelWidth}"
-						Orientation="Horizontal" />
-
-					<controls:PropertiesViewItemSeparator />
-
-					<controls:PropertiesViewItemToggle
-						IsEnabled="False"
-						IsToggled="False"
-						Label="Disabled and Off"
-						LabelWidth="{StaticResource LabelWidth}"
-						Orientation="Horizontal" />
-
-					<controls:PropertiesViewItemSeparator />
-
-					<controls:PropertiesViewItemToggle
-						IsEnabled="True"
-						IsToggled="True"
-						Label="Enabled and On"
-						LabelWidth="{StaticResource LabelWidth}"
-						Orientation="Vertical" />
-
-					<controls:PropertiesViewItemSeparator />
-
-					<controls:PropertiesViewItemToggle
-						IsEnabled="True"
-						IsToggled="False"
-						Label="Enabled and Off"
-						LabelWidth="{StaticResource LabelWidth}"
-						Orientation="Vertical" />
-
-					<controls:PropertiesViewItemSeparator />
-
-					<controls:PropertiesViewItemToggle
-						IsEnabled="False"
-						IsToggled="True"
-						Label="Disabled and On"
-						LabelWidth="{StaticResource LabelWidth}"
-						Orientation="Vertical" />
-
-					<controls:PropertiesViewItemSeparator />
-
-					<controls:PropertiesViewItemToggle
-						IsEnabled="False"
-						IsToggled="False"
-						Label="Disabled and Off"
-						LabelWidth="{StaticResource LabelWidth}"
-						Orientation="Vertical" />
-				</StackPanel>
-			</controls:PropertiesViewExpander.Content>
+		<controls:PropertiesViewExpander Header="Toggle items" IsExpanded="True">
+			<controls:PropertiesViewExpander.HeaderIcon>
+				<SymbolIcon Symbol="XboxOneConsole" />
+			</controls:PropertiesViewExpander.HeaderIcon>
+			<StackPanel Padding="0,0,0,8">
+				<controls:PropertiesViewCard Header="Enabled and on">
+					<ToggleSwitch IsOn="True" />
+				</controls:PropertiesViewCard>
+				<controls:PropertiesViewCard Header="Enabled and off">
+					<ToggleSwitch IsOn="False" />
+				</controls:PropertiesViewCard>
+				<controls:PropertiesViewCard Header="Disabled and on" IsEnabled="False">
+					<ToggleSwitch IsOn="True" />
+				</controls:PropertiesViewCard>
+			</StackPanel>
 		</controls:PropertiesViewExpander>
 
-		<StackPanel
-			Padding="24,8"
-			Orientation="Horizontal"
-			Spacing="16">
-			<controls:PropertiesViewItemCheck
-				Content="Text for a Checkbox"
-				IsChecked="False"
-				Orientation="Vertical" />
-
-			<controls:PropertiesViewItemSeparator Orientation="Vertical" />
-
-			<controls:PropertiesViewItemCheck
-				Content="Checkbox t00"
-				IsChecked="True"
-				Orientation="Vertical" />
-
-			<controls:PropertiesViewItemSeparator Orientation="Vertical" />
-
-			<controls:PropertiesViewItemCheck
-				Content="Text for a Checkbox three"
-				IsChecked="{x:Null}"
-				Orientation="Vertical" />
-		</StackPanel>
-
-		<Rectangle
-			Height="1"
-			HorizontalAlignment="Stretch"
-			Fill="Red" />
-
-		<StackPanel
-			Padding="24,8"
-			Orientation="Vertical"
-			Spacing="16">
-			<controls:PropertiesViewItemCheck Content="Text for a Checkbox" IsChecked="False" />
-
-			<controls:PropertiesViewItemSeparator />
-
-			<controls:PropertiesViewItemCheck Content="Checkbox t00" IsChecked="True" />
-
-			<controls:PropertiesViewItemSeparator />
-
-			<controls:PropertiesViewItemCheck Content="Text for a Checkbox three" IsChecked="{x:Null}" />
-		</StackPanel>
-
+		<controls:PropertiesViewExpander Header="Check box items" IsExpanded="True">
+			<controls:PropertiesViewExpander.HeaderIcon>
+				<SymbolIcon Symbol="Accept" />
+			</controls:PropertiesViewExpander.HeaderIcon>
+			<StackPanel Padding="0,0,0,8">
+				<controls:PropertiesViewCard ContentAlignment="Left">
+					<CheckBox Content="Unchecked option" IsChecked="False" />
+				</controls:PropertiesViewCard>
+				<controls:PropertiesViewCard ContentAlignment="Left">
+					<CheckBox Content="Checked option" IsChecked="True" />
+				</controls:PropertiesViewCard>
+				<controls:PropertiesViewCard ContentAlignment="Left">
+					<CheckBox Content="Indeterminate option" IsChecked="{x:Null}" IsThreeState="True" />
+				</controls:PropertiesViewCard>
+			</StackPanel>
+		</controls:PropertiesViewExpander>
 	</controls:PropertiesView>
 
 </Page>
diff --git a/tests/Files.App.UITests/Dialogs/PropertiesGeneralPage.xaml.cs b/tests/Files.App.UITests/Dialogs/PropertiesGeneralPage.xaml.cs
index a1cb5b1d296b..56c657f36c34 100644
--- a/tests/Files.App.UITests/Dialogs/PropertiesGeneralPage.xaml.cs
+++ b/tests/Files.App.UITests/Dialogs/PropertiesGeneralPage.xaml.cs
@@ -11,5 +11,10 @@ public PropertiesGeneralPage()
 		{
 			InitializeComponent();
 		}
+
+		private void ClickableCard_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
+		{
+			ClickResultText.Text = "Clicked";
+		}
 	}
 }

From fb9be4b6ca5f4c05c42674aeda55f34d5f26256a Mon Sep 17 00:00:00 2001
From: 0x5BFA <62196528+0x5bfa@users.noreply.github.com>
Date: Sat, 22 Aug 2026 07:00:38 +0900
Subject: [PATCH 29/36] Restore properties view separators

---
 .../PropertiesView/PropertiesView.xaml        | 45 ++++++++++++++++
 .../PropertiesViewCard.Properties.cs          |  3 --
 .../PropertiesView/PropertiesViewCard.cs      | 17 +-----
 .../PropertiesView/PropertiesViewCard.xaml    | 36 +++++--------
 .../PropertiesViewItemSeparator.cs            | 54 +++++++++++++++++++
 .../Dialogs/PropertiesGeneralPage.xaml        | 15 ++++--
 6 files changed, 124 insertions(+), 46 deletions(-)
 create mode 100644 src/Files.App.Controls/PropertiesView/PropertiesViewItemSeparator.cs

diff --git a/src/Files.App.Controls/PropertiesView/PropertiesView.xaml b/src/Files.App.Controls/PropertiesView/PropertiesView.xaml
index a317287c14cd..0fb29c3bbd80 100644
--- a/src/Files.App.Controls/PropertiesView/PropertiesView.xaml
+++ b/src/Files.App.Controls/PropertiesView/PropertiesView.xaml
@@ -6,6 +6,51 @@
 
 	<Style BasedOn="{StaticResource DefaultPropertiesViewStyle}" TargetType="local:PropertiesView" />
 
+	<Style TargetType="local:PropertiesViewItemSeparator">
+		<Setter Property="Background" Value="Transparent" />
+		<Setter Property="Foreground" Value="{ThemeResource PropertiesItemSeparatorForeground}" />
+		<Setter Property="CornerRadius" Value="{StaticResource PropertiessItemSeparatorCornerRadius}" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="local:PropertiesViewItemSeparator">
+					<Grid
+						Padding="{TemplateBinding Padding}"
+						HorizontalAlignment="Stretch"
+						VerticalAlignment="Stretch">
+						<Border
+							x:Name="SeparatorHorizontalBorder"
+							Height="{StaticResource PropertiesItemSeparatorStrokeThickness}"
+							Margin="{StaticResource PropertiesItemSeparatorHorizontalMargin}"
+							HorizontalAlignment="Stretch"
+							VerticalAlignment="Center"
+							Background="{TemplateBinding Foreground}"
+							CornerRadius="{TemplateBinding CornerRadius}" />
+						<Border
+							x:Name="SeparatorVerticalBorder"
+							Width="{StaticResource PropertiesItemSeparatorStrokeThickness}"
+							Margin="{StaticResource PropertiesItemSeparatorVerticalMargin}"
+							HorizontalAlignment="Center"
+							VerticalAlignment="Stretch"
+							Background="{TemplateBinding Foreground}"
+							CornerRadius="{TemplateBinding CornerRadius}"
+							Visibility="Collapsed" />
+						<VisualStateManager.VisualStateGroups>
+							<VisualStateGroup x:Name="OrientationStateGroup">
+								<VisualState x:Name="HorizontalState" />
+								<VisualState x:Name="VerticalState">
+									<VisualState.Setters>
+										<Setter Target="SeparatorHorizontalBorder.Visibility" Value="Collapsed" />
+										<Setter Target="SeparatorVerticalBorder.Visibility" Value="Visible" />
+									</VisualState.Setters>
+								</VisualState>
+							</VisualStateGroup>
+						</VisualStateManager.VisualStateGroups>
+					</Grid>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+
 	<Style x:Key="DefaultPropertiesViewStyle" TargetType="local:PropertiesView">
 		<Setter Property="HorizontalAlignment" Value="Stretch" />
 		<Setter Property="VerticalAlignment" Value="Stretch" />
diff --git a/src/Files.App.Controls/PropertiesView/PropertiesViewCard.Properties.cs b/src/Files.App.Controls/PropertiesView/PropertiesViewCard.Properties.cs
index 71ee619e58ce..c4b0ce001ad6 100644
--- a/src/Files.App.Controls/PropertiesView/PropertiesViewCard.Properties.cs
+++ b/src/Files.App.Controls/PropertiesView/PropertiesViewCard.Properties.cs
@@ -10,9 +10,6 @@ public partial class PropertiesViewCard
 	[GeneratedDependencyProperty]
 	public partial object? Header { get; set; }
 
-	[GeneratedDependencyProperty]
-	public partial object? Description { get; set; }
-
 	[GeneratedDependencyProperty]
 	public partial IconElement? HeaderIcon { get; set; }
 
diff --git a/src/Files.App.Controls/PropertiesView/PropertiesViewCard.cs b/src/Files.App.Controls/PropertiesView/PropertiesViewCard.cs
index 7147f78f4aeb..6acb1bd54979 100644
--- a/src/Files.App.Controls/PropertiesView/PropertiesViewCard.cs
+++ b/src/Files.App.Controls/PropertiesView/PropertiesViewCard.cs
@@ -9,7 +9,6 @@
 namespace Files.App.Controls;
 
 [TemplatePart(Name = ActionIconPresenterHolderName, Type = typeof(Viewbox))]
-[TemplatePart(Name = DescriptionPresenterName, Type = typeof(ContentPresenter))]
 [TemplatePart(Name = HeaderIconPresenterHolderName, Type = typeof(Viewbox))]
 [TemplatePart(Name = HeaderPresenterName, Type = typeof(ContentPresenter))]
 [TemplateVisualState(Name = NormalStateName, GroupName = CommonStatesName)]
@@ -37,7 +36,6 @@ public partial class PropertiesViewCard : Button
 	private const string BitmapHeaderIconEnabledStateName = "BitmapHeaderIconEnabled";
 	private const string BitmapHeaderIconDisabledStateName = "BitmapHeaderIconDisabled";
 	private const string ActionIconPresenterHolderName = "PART_ActionIconPresenterHolder";
-	private const string DescriptionPresenterName = "PART_DescriptionPresenter";
 	private const string HeaderIconPresenterHolderName = "PART_HeaderIconPresenterHolder";
 	private const string HeaderPresenterName = "PART_HeaderPresenter";
 
@@ -64,7 +62,6 @@ protected override void OnApplyTemplate()
 		base.OnApplyTemplate();
 
 		UpdateActionIcon();
-		UpdateDescription();
 		UpdateHeader();
 		UpdateHeaderIcon();
 		UpdateClickInteraction();
@@ -164,12 +161,6 @@ partial void OnContentAlignmentChanged(PropertiesViewCardContentAlignment newVal
 		UpdateContentSpacingState(contentAlignmentStates?.CurrentState, true);
 	}
 
-	partial void OnDescriptionChanged(object? newValue)
-	{
-		UpdateDescription();
-		SetAccessibleContentName();
-	}
-
 	partial void OnHeaderChanged(object? newValue)
 	{
 		UpdateHeader();
@@ -260,12 +251,6 @@ private void UpdateActionIcon()
 				: Visibility.Collapsed;
 	}
 
-	private void UpdateDescription()
-	{
-		if (GetTemplateChild(DescriptionPresenterName) is FrameworkElement presenter)
-			presenter.Visibility = IsNullOrEmptyString(Description) ? Visibility.Collapsed : Visibility.Visible;
-	}
-
 	private void UpdateHeader()
 	{
 		if (GetTemplateChild(HeaderPresenterName) is FrameworkElement presenter)
@@ -296,7 +281,7 @@ private void ContentAlignmentStates_CurrentStateChanged(object sender, VisualSta
 	private void UpdateContentSpacingState(VisualState? state, bool useTransitions)
 	{
 		bool isVertical = state?.Name is RightWrappedStateName or VerticalStateName;
-		bool hasHeader = !IsNullOrEmptyString(Header) || !IsNullOrEmptyString(Description);
+		bool hasHeader = !IsNullOrEmptyString(Header);
 		VisualStateManager.GoToState(
 			this,
 			isVertical && Content is not null && hasHeader ? ContentSpacingStateName : NoContentSpacingStateName,
diff --git a/src/Files.App.Controls/PropertiesView/PropertiesViewCard.xaml b/src/Files.App.Controls/PropertiesView/PropertiesViewCard.xaml
index 76801588b417..4185c72c926c 100644
--- a/src/Files.App.Controls/PropertiesView/PropertiesViewCard.xaml
+++ b/src/Files.App.Controls/PropertiesView/PropertiesViewCard.xaml
@@ -27,12 +27,10 @@
 		</ResourceDictionary>
 	</ResourceDictionary.ThemeDictionaries>
 
-	<Thickness x:Key="PropertiesViewCardBorderThickness">0,0,0,1</Thickness>
 	<Thickness x:Key="PropertiesViewCardPadding">0,6</Thickness>
 	<GridLength x:Key="PropertiesViewCardDefaultLabelWidth">160</GridLength>
 	<x:Double x:Key="PropertiesViewCardMinWidth">148</x:Double>
 	<x:Double x:Key="PropertiesViewCardMinHeight">48</x:Double>
-	<x:Double x:Key="PropertiesViewCardDescriptionFontSize">12</x:Double>
 	<x:Double x:Key="PropertiesViewCardHeaderIconMaxSize">20</x:Double>
 	<x:Double x:Key="PropertiesViewCardActionIconMaxSize">13</x:Double>
 	<x:Double x:Key="PropertiesViewCardVerticalHeaderContentSpacing">8</x:Double>
@@ -47,8 +45,8 @@
 	<Style x:Key="DefaultPropertiesViewCardStyle" TargetType="local:PropertiesViewCard">
 		<Setter Property="Background" Value="Transparent" />
 		<Setter Property="Foreground" Value="{ThemeResource PropertiesViewCardForeground}" />
-		<Setter Property="BorderBrush" Value="{ThemeResource DividerStrokeColorDefaultBrush}" />
-		<Setter Property="BorderThickness" Value="{ThemeResource PropertiesViewCardBorderThickness}" />
+		<Setter Property="BorderBrush" Value="Transparent" />
+		<Setter Property="BorderThickness" Value="0" />
 		<Setter Property="CornerRadius" Value="0" />
 		<Setter Property="LabelWidth" Value="{StaticResource PropertiesViewCardDefaultLabelWidth}" />
 		<Setter Property="MinWidth" Value="{ThemeResource PropertiesViewCardMinWidth}" />
@@ -95,15 +93,12 @@
 								<VisualState x:Name="Normal" />
 								<VisualState x:Name="PointerOver">
 									<VisualState.Setters>
-										<Setter Target="PART_HeaderPresenter.Foreground" Value="{ThemeResource PropertiesViewCardForegroundPointerOver}" />
 										<Setter Target="PART_HeaderIconPresenter.Foreground" Value="{ThemeResource PropertiesViewCardForegroundPointerOver}" />
 										<Setter Target="PART_RootGrid.(muxc:AnimatedIcon.State)" Value="PointerOver" />
 									</VisualState.Setters>
 								</VisualState>
 								<VisualState x:Name="Pressed">
 									<VisualState.Setters>
-										<Setter Target="PART_HeaderPresenter.Foreground" Value="{ThemeResource PropertiesViewCardForegroundPressed}" />
-										<Setter Target="PART_DescriptionPresenter.Foreground" Value="{ThemeResource PropertiesViewCardForegroundPressed}" />
 										<Setter Target="PART_HeaderIconPresenter.Foreground" Value="{ThemeResource PropertiesViewCardForegroundPressed}" />
 										<Setter Target="PART_ActionIconPresenter.Foreground" Value="{ThemeResource PropertiesViewCardForegroundPressed}" />
 										<Setter Target="PART_RootGrid.(muxc:AnimatedIcon.State)" Value="Pressed" />
@@ -112,7 +107,6 @@
 								<VisualState x:Name="Disabled">
 									<VisualState.Setters>
 										<Setter Target="PART_HeaderPresenter.Foreground" Value="{ThemeResource PropertiesViewCardForegroundDisabled}" />
-										<Setter Target="PART_DescriptionPresenter.Foreground" Value="{ThemeResource PropertiesViewCardForegroundDisabled}" />
 										<Setter Target="PART_HeaderIconPresenter.Foreground" Value="{ThemeResource PropertiesViewCardForegroundDisabled}" />
 										<Setter Target="PART_ActionIconPresenter.Foreground" Value="{ThemeResource PropertiesViewCardForegroundDisabled}" />
 										<Setter Target="PART_ContentPresenter.Foreground" Value="{ThemeResource PropertiesViewCardForegroundDisabled}" />
@@ -219,24 +213,18 @@
 									Foreground="{TemplateBinding Foreground}"
 									HighContrastAdjustment="None" />
 							</Viewbox>
-							<StackPanel
+							<ContentPresenter
+								x:Name="PART_HeaderPresenter"
 								Grid.Column="1"
+								Margin="0,4,0,4"
+								HorizontalAlignment="Stretch"
 								VerticalAlignment="Center"
-								Orientation="Vertical">
-								<ContentPresenter
-									x:Name="PART_HeaderPresenter"
-									HorizontalAlignment="Left"
-									Content="{TemplateBinding Header}"
-									Foreground="{TemplateBinding Foreground}"
-									HighContrastAdjustment="None"
-									TextWrapping="WrapWholeWords" />
-								<ContentPresenter
-									x:Name="PART_DescriptionPresenter"
-									Content="{TemplateBinding Description}"
-									FontSize="{ThemeResource PropertiesViewCardDescriptionFontSize}"
-									Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-									TextWrapping="WrapWholeWords" />
-							</StackPanel>
+								Content="{TemplateBinding Header}"
+								FontSize="{StaticResource CaptionTextBlockFontSize}"
+								Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+								HighContrastAdjustment="None"
+								LineHeight="20"
+								TextWrapping="WrapWholeWords" />
 						</Grid>
 
 						<ContentPresenter
diff --git a/src/Files.App.Controls/PropertiesView/PropertiesViewItemSeparator.cs b/src/Files.App.Controls/PropertiesView/PropertiesViewItemSeparator.cs
new file mode 100644
index 000000000000..44ecadc6cb81
--- /dev/null
+++ b/src/Files.App.Controls/PropertiesView/PropertiesViewItemSeparator.cs
@@ -0,0 +1,54 @@
+// Copyright (c) Files Community
+// SPDX-License-Identifier: MPL-2.0
+
+using WinRT;
+
+namespace Files.App.Controls;
+
+[TemplateVisualState(Name = HorizontalStateName, GroupName = OrientationStateGroupName)]
+[TemplateVisualState(Name = VerticalStateName, GroupName = OrientationStateGroupName)]
+public sealed partial class PropertiesViewItemSeparator : Control
+{
+	private const string OrientationStateGroupName = "OrientationStateGroup";
+	private const string HorizontalStateName = "HorizontalState";
+	private const string VerticalStateName = "VerticalState";
+
+	public PropertiesViewItemSeparator()
+	{
+		DefaultStyleKey = typeof(PropertiesViewItemSeparator);
+	}
+
+	public Orientation Orientation
+	{
+		[DynamicWindowsRuntimeCast(typeof(Orientation))]
+		get => (Orientation)GetValue(OrientationProperty);
+		set => SetValue(OrientationProperty, value);
+	}
+
+	public static readonly DependencyProperty OrientationProperty =
+		DependencyProperty.Register(
+			nameof(Orientation),
+			typeof(Orientation),
+			typeof(PropertiesViewItemSeparator),
+			new PropertyMetadata(Orientation.Horizontal, OnOrientationChanged));
+
+	protected override void OnApplyTemplate()
+	{
+		base.OnApplyTemplate();
+		UpdateOrientationState(Orientation);
+	}
+
+	private static void OnOrientationChanged(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs eventArgs)
+	{
+		var separator = (PropertiesViewItemSeparator)dependencyObject;
+		separator.UpdateOrientationState((Orientation)eventArgs.NewValue);
+	}
+
+	private void UpdateOrientationState(Orientation orientation)
+	{
+		VisualStateManager.GoToState(
+			this,
+			orientation is Orientation.Horizontal ? HorizontalStateName : VerticalStateName,
+			false);
+	}
+}
diff --git a/tests/Files.App.UITests/Dialogs/PropertiesGeneralPage.xaml b/tests/Files.App.UITests/Dialogs/PropertiesGeneralPage.xaml
index fa93f3f26d0b..9ebafbbf6ca9 100644
--- a/tests/Files.App.UITests/Dialogs/PropertiesGeneralPage.xaml
+++ b/tests/Files.App.UITests/Dialogs/PropertiesGeneralPage.xaml
@@ -64,10 +64,12 @@
 						HorizontalAlignment="Stretch"
 						Text="Filename here" />
 				</controls:PropertiesViewCard>
+				<controls:PropertiesViewItemSeparator />
 
-				<controls:PropertiesViewCard Header="Type" Description="A read-only text value">
+				<controls:PropertiesViewCard Header="Type">
 					<TextBlock Text="Text Document (.txt)" TextWrapping="Wrap" />
 				</controls:PropertiesViewCard>
+				<controls:PropertiesViewItemSeparator />
 
 				<controls:PropertiesViewCard Header="Additional information">
 					<Grid ColumnSpacing="8">
@@ -84,16 +86,17 @@
 						</Button>
 					</Grid>
 				</controls:PropertiesViewCard>
+				<controls:PropertiesViewItemSeparator />
 
 				<controls:PropertiesViewCard
 					x:Name="ClickableCard"
 					AutomationProperties.AutomationId="ClickablePropertiesViewCard"
 					Click="ClickableCard_Click"
-					Description="Exercises pointer, keyboard, action icon, and automation states"
 					Header="Clickable card"
 					IsClickEnabled="True">
 					<TextBlock x:Name="ClickResultText" Text="Not clicked" />
 				</controls:PropertiesViewCard>
+				<controls:PropertiesViewItemSeparator />
 
 				<controls:PropertiesViewCard
 					Header="Disabled card"
@@ -111,9 +114,11 @@
 				<controls:PropertiesViewCard Header="Read-only rating">
 					<RatingControl IsReadOnly="True" Value="4" />
 				</controls:PropertiesViewCard>
+				<controls:PropertiesViewItemSeparator />
 				<controls:PropertiesViewCard Header="Editable rating">
 					<RatingControl Value="3" />
 				</controls:PropertiesViewCard>
+				<controls:PropertiesViewItemSeparator />
 				<controls:PropertiesViewCard Header="Disabled rating" IsEnabled="False">
 					<RatingControl Value="2" />
 				</controls:PropertiesViewCard>
@@ -127,13 +132,13 @@
 			<StackPanel Padding="0,0,0,8">
 				<controls:PropertiesViewCard
 					ContentAlignment="Vertical"
-					Description="Content is always placed below the header"
 					Header="Editable vertical value">
 					<TextBox
 						Margin="{StaticResource PropertiesValueTextBoxMargin}"
 						HorizontalAlignment="Stretch"
 						Text="Item value text" />
 				</controls:PropertiesViewCard>
+				<controls:PropertiesViewItemSeparator />
 				<controls:PropertiesViewCard
 					ContentAlignment="Vertical"
 					Header="A long header that demonstrates wrapping when the available width becomes constrained">
@@ -150,9 +155,11 @@
 				<controls:PropertiesViewCard Header="Enabled and on">
 					<ToggleSwitch IsOn="True" />
 				</controls:PropertiesViewCard>
+				<controls:PropertiesViewItemSeparator />
 				<controls:PropertiesViewCard Header="Enabled and off">
 					<ToggleSwitch IsOn="False" />
 				</controls:PropertiesViewCard>
+				<controls:PropertiesViewItemSeparator />
 				<controls:PropertiesViewCard Header="Disabled and on" IsEnabled="False">
 					<ToggleSwitch IsOn="True" />
 				</controls:PropertiesViewCard>
@@ -167,9 +174,11 @@
 				<controls:PropertiesViewCard ContentAlignment="Left">
 					<CheckBox Content="Unchecked option" IsChecked="False" />
 				</controls:PropertiesViewCard>
+				<controls:PropertiesViewItemSeparator />
 				<controls:PropertiesViewCard ContentAlignment="Left">
 					<CheckBox Content="Checked option" IsChecked="True" />
 				</controls:PropertiesViewCard>
+				<controls:PropertiesViewItemSeparator />
 				<controls:PropertiesViewCard ContentAlignment="Left">
 					<CheckBox Content="Indeterminate option" IsChecked="{x:Null}" IsThreeState="True" />
 				</controls:PropertiesViewCard>

From b0cbd828bb9edb4f142f44f9c6d5595593bccccc Mon Sep 17 00:00:00 2001
From: Martin Anderson <mdta@live.co.uk>
Date: Sat, 22 Aug 2026 03:01:13 +0100
Subject: [PATCH 30/36] I have attempted to reduce the PropertiesViewCard XAML
 a bit, but I can't make the template align how I want.

---
 .../PropertiesViewCard.Properties.cs          |   4 +-
 .../PropertiesView/PropertiesViewCard.cs      |  56 ++---
 .../PropertiesView/PropertiesViewCard.xaml    | 203 ++++++++++--------
 .../Dialogs/PropertiesDialog.xaml             |   3 -
 .../Dialogs/PropertiesGeneralPage.xaml        |  28 ++-
 5 files changed, 162 insertions(+), 132 deletions(-)

diff --git a/src/Files.App.Controls/PropertiesView/PropertiesViewCard.Properties.cs b/src/Files.App.Controls/PropertiesView/PropertiesViewCard.Properties.cs
index c4b0ce001ad6..3b95d8ae0507 100644
--- a/src/Files.App.Controls/PropertiesView/PropertiesViewCard.Properties.cs
+++ b/src/Files.App.Controls/PropertiesView/PropertiesViewCard.Properties.cs
@@ -10,8 +10,8 @@ public partial class PropertiesViewCard
 	[GeneratedDependencyProperty]
 	public partial object? Header { get; set; }
 
-	[GeneratedDependencyProperty]
-	public partial IconElement? HeaderIcon { get; set; }
+	//[GeneratedDependencyProperty]
+	//public partial IconElement? HeaderIcon { get; set; }
 
 	[GeneratedDependencyProperty]
 	public partial IconElement? ActionIcon { get; set; }
diff --git a/src/Files.App.Controls/PropertiesView/PropertiesViewCard.cs b/src/Files.App.Controls/PropertiesView/PropertiesViewCard.cs
index 6acb1bd54979..9e325678fe2a 100644
--- a/src/Files.App.Controls/PropertiesView/PropertiesViewCard.cs
+++ b/src/Files.App.Controls/PropertiesView/PropertiesViewCard.cs
@@ -9,12 +9,14 @@
 namespace Files.App.Controls;
 
 [TemplatePart(Name = ActionIconPresenterHolderName, Type = typeof(Viewbox))]
-[TemplatePart(Name = HeaderIconPresenterHolderName, Type = typeof(Viewbox))]
+//[TemplatePart(Name = HeaderIconPresenterHolderName, Type = typeof(Viewbox))]
 [TemplatePart(Name = HeaderPresenterName, Type = typeof(ContentPresenter))]
+
 [TemplateVisualState(Name = NormalStateName, GroupName = CommonStatesName)]
 [TemplateVisualState(Name = PointerOverStateName, GroupName = CommonStatesName)]
 [TemplateVisualState(Name = PressedStateName, GroupName = CommonStatesName)]
 [TemplateVisualState(Name = DisabledStateName, GroupName = CommonStatesName)]
+
 [TemplateVisualState(Name = RightStateName, GroupName = ContentAlignmentStatesName)]
 [TemplateVisualState(Name = RightWrappedStateName, GroupName = ContentAlignmentStatesName)]
 [TemplateVisualState(Name = LeftStateName, GroupName = ContentAlignmentStatesName)]
@@ -33,10 +35,10 @@ public partial class PropertiesViewCard : Button
 	private const string VerticalStateName = "Vertical";
 	private const string ContentSpacingStateName = "ContentSpacing";
 	private const string NoContentSpacingStateName = "NoContentSpacing";
-	private const string BitmapHeaderIconEnabledStateName = "BitmapHeaderIconEnabled";
-	private const string BitmapHeaderIconDisabledStateName = "BitmapHeaderIconDisabled";
+	//private const string BitmapHeaderIconEnabledStateName = "BitmapHeaderIconEnabled";
+	//private const string BitmapHeaderIconDisabledStateName = "BitmapHeaderIconDisabled";
 	private const string ActionIconPresenterHolderName = "PART_ActionIconPresenterHolder";
-	private const string HeaderIconPresenterHolderName = "PART_HeaderIconPresenterHolder";
+	//private const string HeaderIconPresenterHolderName = "PART_HeaderIconPresenterHolder";
 	private const string HeaderPresenterName = "PART_HeaderPresenter";
 
 	private VisualStateGroup? contentAlignmentStates;
@@ -63,10 +65,10 @@ protected override void OnApplyTemplate()
 
 		UpdateActionIcon();
 		UpdateHeader();
-		UpdateHeaderIcon();
+		//UpdateHeaderIcon();
 		UpdateClickInteraction();
 		UpdateCommonState(false);
-		UpdateBitmapHeaderIconState(false);
+		//UpdateBitmapHeaderIconState(false);
 		SetAccessibleContentName();
 
 		contentPropertyChangedToken = RegisterPropertyChangedCallback(ContentProperty, OnContentChanged);
@@ -167,11 +169,11 @@ partial void OnHeaderChanged(object? newValue)
 		SetAccessibleContentName();
 	}
 
-	partial void OnHeaderIconChanged(IconElement? newValue)
-	{
-		UpdateHeaderIcon();
-		UpdateBitmapHeaderIconState(true);
-	}
+	//partial void OnHeaderIconChanged(IconElement? newValue)
+	//{
+	//	UpdateHeaderIcon();
+	//	UpdateBitmapHeaderIconState(true);
+	//}
 
 	partial void OnIsActionIconVisibleChanged(bool newValue)
 	{
@@ -235,7 +237,7 @@ private void OnContentChanged(DependencyObject sender, DependencyProperty proper
 	private void OnIsEnabledChanged(object sender, DependencyPropertyChangedEventArgs e)
 	{
 		UpdateCommonState(true);
-		UpdateBitmapHeaderIconState(true);
+		//UpdateBitmapHeaderIconState(true);
 	}
 
 	private void UpdateCommonState(bool useTransitions)
@@ -257,21 +259,21 @@ private void UpdateHeader()
 			presenter.Visibility = IsNullOrEmptyString(Header) ? Visibility.Collapsed : Visibility.Visible;
 	}
 
-	private void UpdateHeaderIcon()
-	{
-		if (GetTemplateChild(HeaderIconPresenterHolderName) is FrameworkElement presenter)
-			presenter.Visibility = HeaderIcon is null ? Visibility.Collapsed : Visibility.Visible;
-	}
-
-	private void UpdateBitmapHeaderIconState(bool useTransitions)
-	{
-		VisualStateManager.GoToState(
-			this,
-			HeaderIcon is BitmapIcon && !IsEnabled
-				? BitmapHeaderIconDisabledStateName
-				: BitmapHeaderIconEnabledStateName,
-			useTransitions);
-	}
+	//private void UpdateHeaderIcon()
+	//{
+	//	if (GetTemplateChild(HeaderIconPresenterHolderName) is FrameworkElement presenter)
+	//		presenter.Visibility = HeaderIcon is null ? Visibility.Collapsed : Visibility.Visible;
+	//}
+
+	//private void UpdateBitmapHeaderIconState(bool useTransitions)
+	//{
+	//	VisualStateManager.GoToState(
+	//		this,
+	//		HeaderIcon is BitmapIcon && !IsEnabled
+	//			? BitmapHeaderIconDisabledStateName
+	//			: BitmapHeaderIconEnabledStateName,
+	//		useTransitions);
+	//}
 
 	private void ContentAlignmentStates_CurrentStateChanged(object sender, VisualStateChangedEventArgs e)
 	{
diff --git a/src/Files.App.Controls/PropertiesView/PropertiesViewCard.xaml b/src/Files.App.Controls/PropertiesView/PropertiesViewCard.xaml
index 4185c72c926c..36351bf14583 100644
--- a/src/Files.App.Controls/PropertiesView/PropertiesViewCard.xaml
+++ b/src/Files.App.Controls/PropertiesView/PropertiesViewCard.xaml
@@ -54,7 +54,7 @@
 		<Setter Property="Padding" Value="{ThemeResource PropertiesViewCardPadding}" />
 		<Setter Property="HorizontalAlignment" Value="Stretch" />
 		<Setter Property="HorizontalContentAlignment" Value="Stretch" />
-		<Setter Property="VerticalAlignment" Value="Center" />
+		<Setter Property="VerticalAlignment" Value="Stretch" />
 		<Setter Property="VerticalContentAlignment" Value="Center" />
 		<Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
 		<Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}" />
@@ -73,14 +73,14 @@
 						Padding="{TemplateBinding Padding}"
 						HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
 						VerticalAlignment="{TemplateBinding VerticalAlignment}"
+						muxc:AnimatedIcon.State="Normal"
 						Background="{TemplateBinding Background}"
 						BorderBrush="{TemplateBinding BorderBrush}"
 						BorderThickness="{TemplateBinding BorderThickness}"
-						CornerRadius="{TemplateBinding CornerRadius}"
-						muxc:AnimatedIcon.State="Normal">
+						CornerRadius="{TemplateBinding CornerRadius}">
 						<Grid.RowDefinitions>
-							<RowDefinition Height="Auto" />
-							<RowDefinition Height="Auto" />
+							<RowDefinition x:Name="PART_LabelRow" Height="Auto" />
+							<RowDefinition x:Name="PART_ContentRow" Height="Auto" />
 						</Grid.RowDefinitions>
 						<Grid.ColumnDefinitions>
 							<ColumnDefinition x:Name="PART_LabelColumn" Width="{Binding LabelWidth, RelativeSource={RelativeSource TemplatedParent}}" />
@@ -88,18 +88,113 @@
 							<ColumnDefinition Width="Auto" />
 						</Grid.ColumnDefinitions>
 
+						<!--
+						<Grid
+							x:Name="PART_HeaderPanel"
+							Grid.Column="0"
+							Grid.ColumnSpan="1"
+							Margin="{ThemeResource PropertiesViewCardHeaderMargin}"
+							HorizontalAlignment="Stretch"
+							VerticalAlignment="Stretch">
+							<Viewbox
+								x:Name="PART_HeaderIconPresenterHolder"
+								MaxWidth="{ThemeResource PropertiesViewCardHeaderIconMaxSize}"
+								MaxHeight="{ThemeResource PropertiesViewCardHeaderIconMaxSize}"
+								Margin="{ThemeResource PropertiesViewCardHeaderIconMargin}">
+								<ContentPresenter
+									x:Name="PART_HeaderIconPresenter"
+									AutomationProperties.AccessibilityView="Raw"
+									Content="{TemplateBinding HeaderIcon}"
+									Foreground="{TemplateBinding Foreground}"
+									HighContrastAdjustment="None" />
+							</Viewbox>
+						
+						<ContentPresenter
+							x:Name="PART_HeaderPresenter"
+							HorizontalAlignment="Stretch"
+							VerticalAlignment="Stretch"
+							HorizontalContentAlignment="Stretch"
+							VerticalContentAlignment="Center"
+							Content="{TemplateBinding Header}"
+							FontSize="{StaticResource CaptionTextBlockFontSize}"
+							Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+							HighContrastAdjustment="None"
+							TextWrapping="WrapWholeWords" />
+						</Grid>
+						-->
+
+
+						<ContentPresenter
+							x:Name="PART_HeaderPresenter"
+							Grid.Row="0"
+							Grid.RowSpan="2"
+							Grid.Column="0"
+							Grid.ColumnSpan="1"
+							Margin="{ThemeResource PropertiesViewCardHeaderMargin}"
+							HorizontalAlignment="Stretch"
+							VerticalAlignment="Stretch"
+							HorizontalContentAlignment="Stretch"
+							VerticalContentAlignment="Center"
+							Content="{TemplateBinding Header}"
+							FontSize="{StaticResource CaptionTextBlockFontSize}"
+							Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+							HighContrastAdjustment="None"
+							TextWrapping="WrapWholeWords" />
+
+						<ContentPresenter
+							x:Name="PART_ContentPresenter"
+							Grid.Row="0"
+							Grid.RowSpan="2"
+							Grid.Column="1"
+							Grid.ColumnSpan="1"
+							HorizontalAlignment="Stretch"
+							VerticalAlignment="Stretch"
+							HorizontalContentAlignment="Stretch"
+							VerticalContentAlignment="Center"
+							Content="{TemplateBinding Content}"
+							ContentTemplate="{TemplateBinding ContentTemplate}"
+							ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
+							ContentTransitions="{TemplateBinding ContentTransitions}"
+							Foreground="{TemplateBinding Foreground}"
+							TextWrapping="WrapWholeWords" />
+
+						<Viewbox
+							x:Name="PART_ActionIconPresenterHolder"
+							Grid.RowSpan="2"
+							Grid.Column="2"
+							MaxWidth="{ThemeResource PropertiesViewCardActionIconMaxSize}"
+							MaxHeight="{ThemeResource PropertiesViewCardActionIconMaxSize}"
+							Margin="{ThemeResource PropertiesViewCardActionIconMargin}"
+							HorizontalAlignment="Center"
+							VerticalAlignment="Center"
+							HighContrastAdjustment="None"
+							Visibility="Collapsed">
+							<ContentPresenter
+								x:Name="PART_ActionIconPresenter"
+								AutomationProperties.AccessibilityView="Raw"
+								Content="{TemplateBinding ActionIcon}"
+								FontFamily="{ThemeResource SymbolThemeFontFamily}"
+								Foreground="{TemplateBinding Foreground}"
+								HighContrastAdjustment="None"
+								ToolTipService.ToolTip="{TemplateBinding ActionIconToolTip}" />
+						</Viewbox>
+
 						<VisualStateManager.VisualStateGroups>
 							<VisualStateGroup x:Name="CommonStates">
 								<VisualState x:Name="Normal" />
 								<VisualState x:Name="PointerOver">
 									<VisualState.Setters>
+										<!--
 										<Setter Target="PART_HeaderIconPresenter.Foreground" Value="{ThemeResource PropertiesViewCardForegroundPointerOver}" />
+										-->
 										<Setter Target="PART_RootGrid.(muxc:AnimatedIcon.State)" Value="PointerOver" />
 									</VisualState.Setters>
 								</VisualState>
 								<VisualState x:Name="Pressed">
 									<VisualState.Setters>
+										<!--
 										<Setter Target="PART_HeaderIconPresenter.Foreground" Value="{ThemeResource PropertiesViewCardForegroundPressed}" />
+										-->
 										<Setter Target="PART_ActionIconPresenter.Foreground" Value="{ThemeResource PropertiesViewCardForegroundPressed}" />
 										<Setter Target="PART_RootGrid.(muxc:AnimatedIcon.State)" Value="Pressed" />
 									</VisualState.Setters>
@@ -107,7 +202,9 @@
 								<VisualState x:Name="Disabled">
 									<VisualState.Setters>
 										<Setter Target="PART_HeaderPresenter.Foreground" Value="{ThemeResource PropertiesViewCardForegroundDisabled}" />
+										<!--
 										<Setter Target="PART_HeaderIconPresenter.Foreground" Value="{ThemeResource PropertiesViewCardForegroundDisabled}" />
+										-->
 										<Setter Target="PART_ActionIconPresenter.Foreground" Value="{ThemeResource PropertiesViewCardForegroundDisabled}" />
 										<Setter Target="PART_ContentPresenter.Foreground" Value="{ThemeResource PropertiesViewCardForegroundDisabled}" />
 										<Setter Target="PART_RootGrid.(muxc:AnimatedIcon.State)" Value="Normal" />
@@ -115,6 +212,7 @@
 								</VisualState>
 							</VisualStateGroup>
 
+							<!--
 							<VisualStateGroup x:Name="BitmapHeaderIconStates">
 								<VisualState x:Name="BitmapHeaderIconEnabled" />
 								<VisualState x:Name="BitmapHeaderIconDisabled">
@@ -123,50 +221,53 @@
 									</VisualState.Setters>
 								</VisualState>
 							</VisualStateGroup>
+							-->
 
 							<VisualStateGroup x:Name="ContentAlignmentStates">
 								<VisualState x:Name="Right" />
 								<VisualState x:Name="RightWrapped">
 									<VisualState.StateTriggers>
-										<toolkit:ControlSizeTrigger
-											MaxWidth="{ThemeResource PropertiesViewCardWrapThreshold}"
-											TargetElement="{Binding ElementName=PART_RootGrid}" />
+										<toolkit:ControlSizeTrigger MaxWidth="{ThemeResource PropertiesViewCardWrapThreshold}" TargetElement="{Binding ElementName=PART_RootGrid}" />
 									</VisualState.StateTriggers>
 									<VisualState.Setters>
 										<Setter Target="PART_ContentPresenter.(Grid.Row)" Value="1" />
+										<Setter Target="PART_ContentPresenter.(Grid.RowSpan)" Value="1" />
 										<Setter Target="PART_ContentPresenter.(Grid.Column)" Value="0" />
 										<Setter Target="PART_ContentPresenter.(Grid.ColumnSpan)" Value="2" />
 										<Setter Target="PART_ContentPresenter.HorizontalAlignment" Value="Stretch" />
 										<Setter Target="PART_ContentPresenter.HorizontalContentAlignment" Value="Stretch" />
-										<Setter Target="PART_HeaderPanel.Margin" Value="0" />
+										<Setter Target="PART_HeaderPresenter.Margin" Value="0" />
+										<Setter Target="PART_HeaderPresenter.ColumnSpan" Value="2" />
+										<Setter Target="PART_HeaderPresenter.(Grid.RowSpan)" Value="1" />
 									</VisualState.Setters>
 								</VisualState>
 								<VisualState x:Name="Left">
 									<VisualState.StateTriggers>
-										<toolkit:IsEqualStateTrigger
-											Value="{Binding ContentAlignment, RelativeSource={RelativeSource TemplatedParent}}"
-											To="Left" />
+										<toolkit:IsEqualStateTrigger Value="{Binding ContentAlignment, RelativeSource={RelativeSource TemplatedParent}}" To="Left" />
 									</VisualState.StateTriggers>
 									<VisualState.Setters>
-										<Setter Target="PART_HeaderPanel.Visibility" Value="Collapsed" />
+										<Setter Target="PART_HeaderPresenter.Visibility" Value="Collapsed" />
+										<Setter Target="PART_ContentPresenter.(Grid.RowSpan)" Value="1" />
 										<Setter Target="PART_ContentPresenter.(Grid.Column)" Value="0" />
 										<Setter Target="PART_ContentPresenter.(Grid.ColumnSpan)" Value="2" />
 										<Setter Target="PART_ContentPresenter.HorizontalAlignment" Value="Left" />
+										<Setter Target="PART_HeaderPresenter.(Grid.RowSpan)" Value="1" />
 									</VisualState.Setters>
 								</VisualState>
 								<VisualState x:Name="Vertical">
 									<VisualState.StateTriggers>
-										<toolkit:IsEqualStateTrigger
-											Value="{Binding ContentAlignment, RelativeSource={RelativeSource TemplatedParent}}"
-											To="Vertical" />
+										<toolkit:IsEqualStateTrigger Value="{Binding ContentAlignment, RelativeSource={RelativeSource TemplatedParent}}" To="Vertical" />
 									</VisualState.StateTriggers>
 									<VisualState.Setters>
 										<Setter Target="PART_ContentPresenter.(Grid.Row)" Value="1" />
+										<Setter Target="PART_ContentPresenter.(Grid.RowSpan)" Value="1" />
 										<Setter Target="PART_ContentPresenter.(Grid.Column)" Value="0" />
 										<Setter Target="PART_ContentPresenter.(Grid.ColumnSpan)" Value="2" />
 										<Setter Target="PART_ContentPresenter.HorizontalAlignment" Value="Stretch" />
 										<Setter Target="PART_ContentPresenter.HorizontalContentAlignment" Value="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource TemplatedParent}}" />
-										<Setter Target="PART_HeaderPanel.Margin" Value="0" />
+										<Setter Target="PART_HeaderPresenter.Margin" Value="0" />
+										<Setter Target="PART_HeaderPresenter.ColumnSpan" Value="2" />
+										<Setter Target="PART_HeaderPresenter.(Grid.RowSpan)" Value="1" />
 									</VisualState.Setters>
 								</VisualState>
 							</VisualStateGroup>
@@ -192,74 +293,6 @@
 								</VisualState>
 							</VisualStateGroup>
 						</VisualStateManager.VisualStateGroups>
-
-						<Grid
-							x:Name="PART_HeaderPanel"
-							Margin="{ThemeResource PropertiesViewCardHeaderMargin}"
-							VerticalAlignment="Center">
-							<Grid.ColumnDefinitions>
-								<ColumnDefinition Width="Auto" />
-								<ColumnDefinition Width="*" />
-							</Grid.ColumnDefinitions>
-							<Viewbox
-								x:Name="PART_HeaderIconPresenterHolder"
-								MaxWidth="{ThemeResource PropertiesViewCardHeaderIconMaxSize}"
-								MaxHeight="{ThemeResource PropertiesViewCardHeaderIconMaxSize}"
-								Margin="{ThemeResource PropertiesViewCardHeaderIconMargin}">
-								<ContentPresenter
-									x:Name="PART_HeaderIconPresenter"
-									AutomationProperties.AccessibilityView="Raw"
-									Content="{TemplateBinding HeaderIcon}"
-									Foreground="{TemplateBinding Foreground}"
-									HighContrastAdjustment="None" />
-							</Viewbox>
-							<ContentPresenter
-								x:Name="PART_HeaderPresenter"
-								Grid.Column="1"
-								Margin="0,4,0,4"
-								HorizontalAlignment="Stretch"
-								VerticalAlignment="Center"
-								Content="{TemplateBinding Header}"
-								FontSize="{StaticResource CaptionTextBlockFontSize}"
-								Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-								HighContrastAdjustment="None"
-								LineHeight="20"
-								TextWrapping="WrapWholeWords" />
-						</Grid>
-
-						<ContentPresenter
-							x:Name="PART_ContentPresenter"
-							Grid.Column="1"
-							HorizontalAlignment="Stretch"
-							VerticalAlignment="Center"
-							HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-							VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-							Content="{TemplateBinding Content}"
-							ContentTemplate="{TemplateBinding ContentTemplate}"
-							ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-							ContentTransitions="{TemplateBinding ContentTransitions}"
-							Foreground="{TemplateBinding Foreground}" />
-
-						<Viewbox
-							x:Name="PART_ActionIconPresenterHolder"
-							Grid.RowSpan="2"
-							Grid.Column="2"
-							MaxWidth="{ThemeResource PropertiesViewCardActionIconMaxSize}"
-							MaxHeight="{ThemeResource PropertiesViewCardActionIconMaxSize}"
-							Margin="{ThemeResource PropertiesViewCardActionIconMargin}"
-							HorizontalAlignment="Center"
-							VerticalAlignment="Center"
-							HighContrastAdjustment="None"
-							Visibility="Collapsed">
-							<ContentPresenter
-								x:Name="PART_ActionIconPresenter"
-								AutomationProperties.AccessibilityView="Raw"
-								Content="{TemplateBinding ActionIcon}"
-								FontFamily="{ThemeResource SymbolThemeFontFamily}"
-								Foreground="{TemplateBinding Foreground}"
-								HighContrastAdjustment="None"
-								ToolTipService.ToolTip="{TemplateBinding ActionIconToolTip}" />
-						</Viewbox>
 					</Grid>
 				</ControlTemplate>
 			</Setter.Value>
diff --git a/tests/Files.App.UITests/Dialogs/PropertiesDialog.xaml b/tests/Files.App.UITests/Dialogs/PropertiesDialog.xaml
index 34a8f064df04..41883763e2f0 100644
--- a/tests/Files.App.UITests/Dialogs/PropertiesDialog.xaml
+++ b/tests/Files.App.UITests/Dialogs/PropertiesDialog.xaml
@@ -10,9 +10,6 @@
 	Title="Properties"
 	mc:Ignorable="d">
 
-	<controls:WindowedDialog.SystemBackdrop>
-		<MicaBackdrop />
-	</controls:WindowedDialog.SystemBackdrop>
 
 	<controls:WindowedDialog.Header>
 		<SelectorBar Padding="12,4" SelectionChanged="SelectorBar_SelectionChanged">
diff --git a/tests/Files.App.UITests/Dialogs/PropertiesGeneralPage.xaml b/tests/Files.App.UITests/Dialogs/PropertiesGeneralPage.xaml
index 9ebafbbf6ca9..cba417559a0f 100644
--- a/tests/Files.App.UITests/Dialogs/PropertiesGeneralPage.xaml
+++ b/tests/Files.App.UITests/Dialogs/PropertiesGeneralPage.xaml
@@ -14,15 +14,16 @@
 			<Thickness x:Key="PropertiesValueTextBoxMargin">-12,0,0,0</Thickness>
 			<Style BasedOn="{StaticResource DefaultPropertiesViewCardStyle}" TargetType="controls:PropertiesViewCard">
 				<Setter Property="LabelWidth" Value="{StaticResource PropertiesGeneralLabelWidth}" />
+				<Setter Property="VerticalAlignment" Value="Center" />
 			</Style>
 		</ResourceDictionary>
 	</Page.Resources>
 
 	<controls:PropertiesView>
 		<controls:PropertiesView.Header>
-			<Grid Padding="24,20" ColumnSpacing="20">
+			<Grid Padding="24,20">
 				<Grid.ColumnDefinitions>
-					<ColumnDefinition Width="Auto" />
+					<ColumnDefinition Width="{StaticResource PropertiesGeneralLabelWidth}" />
 					<ColumnDefinition Width="*" />
 				</Grid.ColumnDefinitions>
 
@@ -47,7 +48,7 @@
 					Grid.Column="1"
 					VerticalAlignment="Center"
 					Spacing="8">
-					<TextBox Text="Filename here" />
+					<TextBox Text="Filename here" Margin="-12,0,0,0" />
 					<TextBlock Text="Sticky header area with scrolling below" />
 				</StackPanel>
 			</Grid>
@@ -67,7 +68,7 @@
 				<controls:PropertiesViewItemSeparator />
 
 				<controls:PropertiesViewCard Header="Type">
-					<TextBlock Text="Text Document (.txt)" TextWrapping="Wrap" />
+					<TextBlock Text="Text Document (.txt)" TextWrapping="WrapWholeWords" VerticalAlignment="Center" />
 				</controls:PropertiesViewCard>
 				<controls:PropertiesViewItemSeparator />
 
@@ -94,13 +95,11 @@
 					Click="ClickableCard_Click"
 					Header="Clickable card"
 					IsClickEnabled="True">
-					<TextBlock x:Name="ClickResultText" Text="Not clicked" />
+					<TextBlock x:Name="ClickResultText" Text="Not clicked" VerticalAlignment="Center"  />
 				</controls:PropertiesViewCard>
 				<controls:PropertiesViewItemSeparator />
 
-				<controls:PropertiesViewCard
-					Header="Disabled card"
-					IsEnabled="False">
+				<controls:PropertiesViewCard Header="Disabled card" IsEnabled="False">
 					<TextBlock Text="Disabled value" />
 				</controls:PropertiesViewCard>
 			</StackPanel>
@@ -130,18 +129,14 @@
 				<SymbolIcon Symbol="SlideShow" />
 			</controls:PropertiesViewExpander.HeaderIcon>
 			<StackPanel Padding="0,0,0,8">
-				<controls:PropertiesViewCard
-					ContentAlignment="Vertical"
-					Header="Editable vertical value">
+				<controls:PropertiesViewCard ContentAlignment="Vertical" Header="Editable vertical value">
 					<TextBox
 						Margin="{StaticResource PropertiesValueTextBoxMargin}"
 						HorizontalAlignment="Stretch"
 						Text="Item value text" />
 				</controls:PropertiesViewCard>
 				<controls:PropertiesViewItemSeparator />
-				<controls:PropertiesViewCard
-					ContentAlignment="Vertical"
-					Header="A long header that demonstrates wrapping when the available width becomes constrained">
+				<controls:PropertiesViewCard ContentAlignment="Vertical" Header="A long header that demonstrates wrapping when the available width becomes constrained">
 					<TextBlock Text="A long value that also wraps across multiple lines when the properties window becomes narrow." TextWrapping="Wrap" />
 				</controls:PropertiesViewCard>
 			</StackPanel>
@@ -180,7 +175,10 @@
 				</controls:PropertiesViewCard>
 				<controls:PropertiesViewItemSeparator />
 				<controls:PropertiesViewCard ContentAlignment="Left">
-					<CheckBox Content="Indeterminate option" IsChecked="{x:Null}" IsThreeState="True" />
+					<CheckBox
+						Content="Indeterminate option"
+						IsChecked="{x:Null}"
+						IsThreeState="True" />
 				</controls:PropertiesViewCard>
 			</StackPanel>
 		</controls:PropertiesViewExpander>

From 69cba615cc630d146ed8faf6ba61aa414902d783 Mon Sep 17 00:00:00 2001
From: Martin Anderson <mdta@live.co.uk>
Date: Sat, 22 Aug 2026 21:14:23 +0100
Subject: [PATCH 31/36] Breakpoint visual states are now working, so next I can
 actually apply the styling

Lots of trial and error work, pushing so the working state will be preserved to git history
---
 .../PropertiesViewCard.Properties.cs          |  15 +-
 .../PropertiesView/PropertiesViewCard.cs      |  57 ++--
 .../PropertiesView/PropertiesViewCard.xaml    | 292 +++++++-----------
 .../Dialogs/PropertiesDetailsPage.xaml        |   2 +-
 .../Dialogs/PropertiesGeneralPage.xaml        |  50 ++-
 5 files changed, 198 insertions(+), 218 deletions(-)

diff --git a/src/Files.App.Controls/PropertiesView/PropertiesViewCard.Properties.cs b/src/Files.App.Controls/PropertiesView/PropertiesViewCard.Properties.cs
index 3b95d8ae0507..5e4a0c9f7e1c 100644
--- a/src/Files.App.Controls/PropertiesView/PropertiesViewCard.Properties.cs
+++ b/src/Files.App.Controls/PropertiesView/PropertiesViewCard.Properties.cs
@@ -36,15 +36,18 @@ public GridLength LabelWidth
 			nameof(LabelWidth),
 			typeof(GridLength),
 			typeof(PropertiesViewCard),
-			new PropertyMetadata(new GridLength(160)));
+			new PropertyMetadata(new GridLength(80)));
 
-	[GeneratedDependencyProperty(DefaultValue = PropertiesViewCardContentAlignment.Right)]
-	public partial PropertiesViewCardContentAlignment ContentAlignment { get; set; }
+	//[GeneratedDependencyProperty(DefaultValue = PropertiesViewCardContentAlignment.Horizontal)]
+	//public partial PropertiesViewCardContentAlignment ContentAlignment { get; set; }
+
+
+	[GeneratedDependencyProperty(DefaultValue = Orientation.Horizontal)]
+	public partial Orientation Orientation { get; set; }
 }
 
 public enum PropertiesViewCardContentAlignment
 {
-	Right,
-	Left,
-	Vertical,
+	Horizontal,
+	Vertical
 }
diff --git a/src/Files.App.Controls/PropertiesView/PropertiesViewCard.cs b/src/Files.App.Controls/PropertiesView/PropertiesViewCard.cs
index 9e325678fe2a..dc32eacd2018 100644
--- a/src/Files.App.Controls/PropertiesView/PropertiesViewCard.cs
+++ b/src/Files.App.Controls/PropertiesView/PropertiesViewCard.cs
@@ -18,9 +18,11 @@ namespace Files.App.Controls;
 [TemplateVisualState(Name = DisabledStateName, GroupName = CommonStatesName)]
 
 [TemplateVisualState(Name = RightStateName, GroupName = ContentAlignmentStatesName)]
-[TemplateVisualState(Name = RightWrappedStateName, GroupName = ContentAlignmentStatesName)]
+[TemplateVisualState(Name = WrappedStateName, GroupName = ContentAlignmentStatesName)]
 [TemplateVisualState(Name = LeftStateName, GroupName = ContentAlignmentStatesName)]
-[TemplateVisualState(Name = VerticalStateName, GroupName = ContentAlignmentStatesName)]
+
+[TemplateVisualState( Name = HorizontalStateName , GroupName = OrientationStatesName )]
+[TemplateVisualState(Name = VerticalStateName, GroupName = OrientationStatesName )]
 public partial class PropertiesViewCard : Button
 {
 	private const string CommonStatesName = "CommonStates";
@@ -29,9 +31,11 @@ public partial class PropertiesViewCard : Button
 	private const string PressedStateName = "Pressed";
 	private const string DisabledStateName = "Disabled";
 	private const string ContentAlignmentStatesName = "ContentAlignmentStates";
+	private const string OrientationStatesName = "OrientationStates";
 	private const string RightStateName = "Right";
-	private const string RightWrappedStateName = "RightWrapped";
+	private const string WrappedStateName = "Wrapped";
 	private const string LeftStateName = "Left";
+	private const string HorizontalStateName = "Horizontal";
 	private const string VerticalStateName = "Vertical";
 	private const string ContentSpacingStateName = "ContentSpacing";
 	private const string NoContentSpacingStateName = "NoContentSpacing";
@@ -41,7 +45,7 @@ public partial class PropertiesViewCard : Button
 	//private const string HeaderIconPresenterHolderName = "PART_HeaderIconPresenterHolder";
 	private const string HeaderPresenterName = "PART_HeaderPresenter";
 
-	private VisualStateGroup? contentAlignmentStates;
+	//private VisualStateGroup? contentAlignmentStates;
 	private long? contentPropertyChangedToken;
 
 	public PropertiesViewCard()
@@ -55,9 +59,6 @@ protected override void OnApplyTemplate()
 		DisableButtonInteraction();
 		IsEnabledChanged -= OnIsEnabledChanged;
 
-		if (contentAlignmentStates is not null)
-			contentAlignmentStates.CurrentStateChanged -= ContentAlignmentStates_CurrentStateChanged;
-
 		if (contentPropertyChangedToken is long token)
 			UnregisterPropertyChangedCallback(ContentProperty, token);
 
@@ -70,16 +71,11 @@ protected override void OnApplyTemplate()
 		UpdateCommonState(false);
 		//UpdateBitmapHeaderIconState(false);
 		SetAccessibleContentName();
+		UpdateOrientationState( Orientation );
 
 		contentPropertyChangedToken = RegisterPropertyChangedCallback(ContentProperty, OnContentChanged);
 		IsEnabledChanged += OnIsEnabledChanged;
 
-		contentAlignmentStates = GetTemplateChild(ContentAlignmentStatesName) as VisualStateGroup;
-		if (contentAlignmentStates is not null)
-		{
-			UpdateContentSpacingState(contentAlignmentStates.CurrentState, false);
-			contentAlignmentStates.CurrentStateChanged += ContentAlignmentStates_CurrentStateChanged;
-		}
 	}
 
 	protected override AutomationPeer OnCreateAutomationPeer()
@@ -158,9 +154,15 @@ partial void OnActionIconChanged(IconElement? newValue)
 		UpdateActionIcon();
 	}
 
-	partial void OnContentAlignmentChanged(PropertiesViewCardContentAlignment newValue)
+	//partial void OnContentAlignmentChanged(PropertiesViewCardContentAlignment newValue)
+	//{
+	//	UpdateContentSpacingState(orientationStates?.CurrentState, true);
+	//}
+
+	partial void OnOrientationChanged(Orientation newValue)
 	{
-		UpdateContentSpacingState(contentAlignmentStates?.CurrentState, true);
+		//UpdateContentSpacingState( newValue , true );
+		UpdateOrientationState( newValue );
 	}
 
 	partial void OnHeaderChanged(object? newValue)
@@ -231,7 +233,8 @@ private void Control_PreviewKeyUp(object sender, KeyRoutedEventArgs e)
 	private void OnContentChanged(DependencyObject sender, DependencyProperty property)
 	{
 		SetAccessibleContentName();
-		UpdateContentSpacingState(contentAlignmentStates?.CurrentState, false);
+		//
+		//UpdateContentSpacingState(this.Orientation, false);
 	}
 
 	private void OnIsEnabledChanged(object sender, DependencyPropertyChangedEventArgs e)
@@ -277,12 +280,28 @@ private void UpdateHeader()
 
 	private void ContentAlignmentStates_CurrentStateChanged(object sender, VisualStateChangedEventArgs e)
 	{
-		UpdateContentSpacingState(e.NewState, true);
+		//UpdateContentSpacingState(e.NewState, true);
+	}
+
+	private void UpdateOrientationState(Orientation newOrientation)
+	{
+		if ( newOrientation == Orientation.Vertical )
+		{
+			VisualStateManager.GoToState( this , VerticalStateName , true );
+		}
+		else
+		{ 
+			VisualStateManager.GoToState ( this , HorizontalStateName , true );
+		}
 	}
 
-	private void UpdateContentSpacingState(VisualState? state, bool useTransitions)
+	private void UpdateContentSpacingState(Orientation orientation, bool useTransitions)
 	{
-		bool isVertical = state?.Name is RightWrappedStateName or VerticalStateName;
+		bool isVertical = false;
+
+		if ( orientation == Orientation.Vertical )
+			isVertical = true;
+
 		bool hasHeader = !IsNullOrEmptyString(Header);
 		VisualStateManager.GoToState(
 			this,
diff --git a/src/Files.App.Controls/PropertiesView/PropertiesViewCard.xaml b/src/Files.App.Controls/PropertiesView/PropertiesViewCard.xaml
index 36351bf14583..6cc873d631b5 100644
--- a/src/Files.App.Controls/PropertiesView/PropertiesViewCard.xaml
+++ b/src/Files.App.Controls/PropertiesView/PropertiesViewCard.xaml
@@ -34,240 +34,178 @@
 	<x:Double x:Key="PropertiesViewCardHeaderIconMaxSize">20</x:Double>
 	<x:Double x:Key="PropertiesViewCardActionIconMaxSize">13</x:Double>
 	<x:Double x:Key="PropertiesViewCardVerticalHeaderContentSpacing">8</x:Double>
-	<x:Double x:Key="PropertiesViewCardWrapThreshold">476</x:Double>
+
+	<x:Double x:Key="PropertiesViewCardWrapThreshold">300</x:Double>
+	<x:Double x:Key="PropertiesViewCardRightThreshold">400</x:Double>
+	<x:Double x:Key="PropertiesViewCardLeftThreshold">500</x:Double>
+
 	<x:Double x:Key="PropertiesViewCardBitmapIconDisabledOpacity">0.4</x:Double>
 	<Thickness x:Key="PropertiesViewCardHeaderIconMargin">0,0,12,0</Thickness>
 	<Thickness x:Key="PropertiesViewCardHeaderMargin">0,0,24,0</Thickness>
 	<Thickness x:Key="PropertiesViewCardActionIconMargin">14,0,0,0</Thickness>
 
-	<Style BasedOn="{StaticResource DefaultPropertiesViewCardStyle}" TargetType="local:PropertiesViewCard" />
-
-	<Style x:Key="DefaultPropertiesViewCardStyle" TargetType="local:PropertiesViewCard">
-		<Setter Property="Background" Value="Transparent" />
-		<Setter Property="Foreground" Value="{ThemeResource PropertiesViewCardForeground}" />
-		<Setter Property="BorderBrush" Value="Transparent" />
-		<Setter Property="BorderThickness" Value="0" />
-		<Setter Property="CornerRadius" Value="0" />
-		<Setter Property="LabelWidth" Value="{StaticResource PropertiesViewCardDefaultLabelWidth}" />
-		<Setter Property="MinWidth" Value="{ThemeResource PropertiesViewCardMinWidth}" />
-		<Setter Property="MinHeight" Value="{ThemeResource PropertiesViewCardMinHeight}" />
-		<Setter Property="Padding" Value="{ThemeResource PropertiesViewCardPadding}" />
+	<Style BasedOn="{StaticResource TestPropertiesViewCardStyle}" TargetType="local:PropertiesViewCard" />
+
+	<Style x:Key="TestPropertiesViewCardStyle" TargetType="local:PropertiesViewCard">
 		<Setter Property="HorizontalAlignment" Value="Stretch" />
-		<Setter Property="HorizontalContentAlignment" Value="Stretch" />
-		<Setter Property="VerticalAlignment" Value="Stretch" />
-		<Setter Property="VerticalContentAlignment" Value="Center" />
-		<Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
-		<Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}" />
-		<Setter Property="FontWeight" Value="Normal" />
-		<Setter Property="IsTabStop" Value="False" />
-		<Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
-		<Setter Property="FocusVisualMargin" Value="-3" />
+
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="local:PropertiesViewCard">
+
 					<Grid
 						x:Name="PART_RootGrid"
-						MinWidth="{TemplateBinding MinWidth}"
-						MinHeight="{TemplateBinding MinHeight}"
-						MaxWidth="{TemplateBinding MaxWidth}"
-						Padding="{TemplateBinding Padding}"
-						HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
-						VerticalAlignment="{TemplateBinding VerticalAlignment}"
-						muxc:AnimatedIcon.State="Normal"
-						Background="{TemplateBinding Background}"
-						BorderBrush="{TemplateBinding BorderBrush}"
-						BorderThickness="{TemplateBinding BorderThickness}"
-						CornerRadius="{TemplateBinding CornerRadius}">
+						Height="72"
+						HorizontalAlignment="Stretch">
 						<Grid.RowDefinitions>
-							<RowDefinition x:Name="PART_LabelRow" Height="Auto" />
-							<RowDefinition x:Name="PART_ContentRow" Height="Auto" />
+							<RowDefinition x:Name="Row_Label" Height="Auto" />
+							<RowDefinition x:Name="Row_Content" Height="*" />
 						</Grid.RowDefinitions>
 						<Grid.ColumnDefinitions>
-							<ColumnDefinition x:Name="PART_LabelColumn" Width="{Binding LabelWidth, RelativeSource={RelativeSource TemplatedParent}}" />
-							<ColumnDefinition x:Name="PART_ContentColumn" Width="*" />
-							<ColumnDefinition Width="Auto" />
+							<ColumnDefinition x:Name="Col_Label" Width="{StaticResource PropertiesViewCardDefaultLabelWidth}" />
+							<ColumnDefinition x:Name="Col_Content" Width="*" />
 						</Grid.ColumnDefinitions>
 
-						<!--
-						<Grid
-							x:Name="PART_HeaderPanel"
-							Grid.Column="0"
-							Grid.ColumnSpan="1"
-							Margin="{ThemeResource PropertiesViewCardHeaderMargin}"
-							HorizontalAlignment="Stretch"
-							VerticalAlignment="Stretch">
-							<Viewbox
-								x:Name="PART_HeaderIconPresenterHolder"
-								MaxWidth="{ThemeResource PropertiesViewCardHeaderIconMaxSize}"
-								MaxHeight="{ThemeResource PropertiesViewCardHeaderIconMaxSize}"
-								Margin="{ThemeResource PropertiesViewCardHeaderIconMargin}">
-								<ContentPresenter
-									x:Name="PART_HeaderIconPresenter"
-									AutomationProperties.AccessibilityView="Raw"
-									Content="{TemplateBinding HeaderIcon}"
-									Foreground="{TemplateBinding Foreground}"
-									HighContrastAdjustment="None" />
-							</Viewbox>
-						
-						<ContentPresenter
-							x:Name="PART_HeaderPresenter"
-							HorizontalAlignment="Stretch"
-							VerticalAlignment="Stretch"
-							HorizontalContentAlignment="Stretch"
-							VerticalContentAlignment="Center"
-							Content="{TemplateBinding Header}"
-							FontSize="{StaticResource CaptionTextBlockFontSize}"
-							Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-							HighContrastAdjustment="None"
-							TextWrapping="WrapWholeWords" />
-						</Grid>
-						-->
-
-
 						<ContentPresenter
 							x:Name="PART_HeaderPresenter"
 							Grid.Row="0"
 							Grid.RowSpan="2"
 							Grid.Column="0"
-							Grid.ColumnSpan="1"
-							Margin="{ThemeResource PropertiesViewCardHeaderMargin}"
-							HorizontalAlignment="Stretch"
-							VerticalAlignment="Stretch"
+							Margin="0,0,24,0"
+							HorizontalAlignment="Left"
+							VerticalAlignment="Center"
 							HorizontalContentAlignment="Stretch"
 							VerticalContentAlignment="Center"
 							Content="{TemplateBinding Header}"
-							FontSize="{StaticResource CaptionTextBlockFontSize}"
-							Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-							HighContrastAdjustment="None"
-							TextWrapping="WrapWholeWords" />
+							Foreground="HotPink" />
 
 						<ContentPresenter
 							x:Name="PART_ContentPresenter"
 							Grid.Row="0"
 							Grid.RowSpan="2"
 							Grid.Column="1"
-							Grid.ColumnSpan="1"
-							HorizontalAlignment="Stretch"
-							VerticalAlignment="Stretch"
 							HorizontalContentAlignment="Stretch"
 							VerticalContentAlignment="Center"
 							Content="{TemplateBinding Content}"
-							ContentTemplate="{TemplateBinding ContentTemplate}"
-							ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-							ContentTransitions="{TemplateBinding ContentTransitions}"
-							Foreground="{TemplateBinding Foreground}"
-							TextWrapping="WrapWholeWords" />
-
-						<Viewbox
-							x:Name="PART_ActionIconPresenterHolder"
-							Grid.RowSpan="2"
-							Grid.Column="2"
-							MaxWidth="{ThemeResource PropertiesViewCardActionIconMaxSize}"
-							MaxHeight="{ThemeResource PropertiesViewCardActionIconMaxSize}"
-							Margin="{ThemeResource PropertiesViewCardActionIconMargin}"
+							Foreground="Green" />
+
+						<TextBlock
+							x:Name="testText"
+							Grid.Row="0"
+							Grid.Column="1"
+							Grid.ColumnSpan="2"
 							HorizontalAlignment="Center"
 							VerticalAlignment="Center"
-							HighContrastAdjustment="None"
-							Visibility="Collapsed">
-							<ContentPresenter
-								x:Name="PART_ActionIconPresenter"
-								AutomationProperties.AccessibilityView="Raw"
-								Content="{TemplateBinding ActionIcon}"
-								FontFamily="{ThemeResource SymbolThemeFontFamily}"
-								Foreground="{TemplateBinding Foreground}"
-								HighContrastAdjustment="None"
-								ToolTipService.ToolTip="{TemplateBinding ActionIconToolTip}" />
+							Foreground="Yellow"
+							Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=ActualWidth, Mode=OneWay}" />
+
+
+						<Viewbox x:Name="PART_ActionIconPresenterHolder" Visibility="Collapsed">
+							<ContentPresenter x:Name="PART_ActionIconPresenter" Content="{TemplateBinding ActionIcon}" />
 						</Viewbox>
 
+
+
 						<VisualStateManager.VisualStateGroups>
 							<VisualStateGroup x:Name="CommonStates">
 								<VisualState x:Name="Normal" />
 								<VisualState x:Name="PointerOver">
-									<VisualState.Setters>
-										<!--
-										<Setter Target="PART_HeaderIconPresenter.Foreground" Value="{ThemeResource PropertiesViewCardForegroundPointerOver}" />
-										-->
-										<Setter Target="PART_RootGrid.(muxc:AnimatedIcon.State)" Value="PointerOver" />
-									</VisualState.Setters>
+									<VisualState.Setters />
 								</VisualState>
 								<VisualState x:Name="Pressed">
-									<VisualState.Setters>
-										<!--
-										<Setter Target="PART_HeaderIconPresenter.Foreground" Value="{ThemeResource PropertiesViewCardForegroundPressed}" />
-										-->
-										<Setter Target="PART_ActionIconPresenter.Foreground" Value="{ThemeResource PropertiesViewCardForegroundPressed}" />
-										<Setter Target="PART_RootGrid.(muxc:AnimatedIcon.State)" Value="Pressed" />
-									</VisualState.Setters>
+									<VisualState.Setters />
 								</VisualState>
 								<VisualState x:Name="Disabled">
-									<VisualState.Setters>
-										<Setter Target="PART_HeaderPresenter.Foreground" Value="{ThemeResource PropertiesViewCardForegroundDisabled}" />
-										<!--
-										<Setter Target="PART_HeaderIconPresenter.Foreground" Value="{ThemeResource PropertiesViewCardForegroundDisabled}" />
-										-->
-										<Setter Target="PART_ActionIconPresenter.Foreground" Value="{ThemeResource PropertiesViewCardForegroundDisabled}" />
-										<Setter Target="PART_ContentPresenter.Foreground" Value="{ThemeResource PropertiesViewCardForegroundDisabled}" />
-										<Setter Target="PART_RootGrid.(muxc:AnimatedIcon.State)" Value="Normal" />
-									</VisualState.Setters>
+									<VisualState.Setters />
 								</VisualState>
 							</VisualStateGroup>
 
-							<!--
-							<VisualStateGroup x:Name="BitmapHeaderIconStates">
-								<VisualState x:Name="BitmapHeaderIconEnabled" />
-								<VisualState x:Name="BitmapHeaderIconDisabled">
+							<VisualStateGroup x:Name="ContentAlignmentStates">
+								<!--	This took a lot of working to get right, because of quirks with how 
+										The Visual State Triggers failover during evaluation.
+								
+										Wrapped HAS to be first, with the EqualStateTrigger to catch the
+										non default Vertical orientation, so we force that one to always
+										use the Wrapped control layout.
+								
+										[ header ]	 
+										========================================================
+										[ content ]   [ action icon ]
+								
+								
+										Then if the first trigger fails, it moves to the next so we are now
+										working with the Horizontal orientation, and we use the ControlSizeTrigger
+										to handle how we lay out the elements based on breakpoints
+								
+										Left is the default state so we do that after Wrapped
+													|											|
+										[ header ]	|	[ content ]  [ action icon ]			|
+													|											|
+								
+								
+										Right is the middle ground between narrow and wide
+													|											|
+										[ header ]	|				[ content ] [ action icon ]	|
+													|											|
+								-->
+
+								<VisualState x:Name="Wrapped">
+									<VisualState.StateTriggers>
+
+										<!--  Vertical ALWAYS Wrapped  -->
+										<toolkit:IsEqualStateTrigger Value="{Binding Orientation, RelativeSource={RelativeSource TemplatedParent}}" To="Vertical" />
+
+										<!--  Horizontal small width  -->
+										<toolkit:ControlSizeTrigger
+											MinWidth="0"
+											MaxWidth="{StaticResource PropertiesViewCardWrapThreshold}"
+											TargetElement="{Binding RelativeSource={RelativeSource TemplatedParent}}" />
+									</VisualState.StateTriggers>
 									<VisualState.Setters>
-										<Setter Target="PART_HeaderIconPresenterHolder.Opacity" Value="{StaticResource PropertiesViewCardBitmapIconDisabledOpacity}" />
+										<Setter Target="PART_RootGrid.Background" Value="#110000FF" />
 									</VisualState.Setters>
+
 								</VisualState>
-							</VisualStateGroup>
-							-->
 
-							<VisualStateGroup x:Name="ContentAlignmentStates">
-								<VisualState x:Name="Right" />
-								<VisualState x:Name="RightWrapped">
+								<VisualState x:Name="Left">
 									<VisualState.StateTriggers>
-										<toolkit:ControlSizeTrigger MaxWidth="{ThemeResource PropertiesViewCardWrapThreshold}" TargetElement="{Binding ElementName=PART_RootGrid}" />
+
+										<!--  Horizontal large width  -->
+										<toolkit:ControlSizeTrigger
+											MinWidth="{StaticResource PropertiesViewCardWrapThreshold}"
+											MaxWidth="{StaticResource PropertiesViewCardRightThreshold}"
+											TargetElement="{Binding RelativeSource={RelativeSource TemplatedParent}}" />
 									</VisualState.StateTriggers>
 									<VisualState.Setters>
-										<Setter Target="PART_ContentPresenter.(Grid.Row)" Value="1" />
-										<Setter Target="PART_ContentPresenter.(Grid.RowSpan)" Value="1" />
-										<Setter Target="PART_ContentPresenter.(Grid.Column)" Value="0" />
-										<Setter Target="PART_ContentPresenter.(Grid.ColumnSpan)" Value="2" />
-										<Setter Target="PART_ContentPresenter.HorizontalAlignment" Value="Stretch" />
-										<Setter Target="PART_ContentPresenter.HorizontalContentAlignment" Value="Stretch" />
-										<Setter Target="PART_HeaderPresenter.Margin" Value="0" />
-										<Setter Target="PART_HeaderPresenter.ColumnSpan" Value="2" />
-										<Setter Target="PART_HeaderPresenter.(Grid.RowSpan)" Value="1" />
+										<Setter Target="PART_RootGrid.Background" Value="#11FF0000" />
 									</VisualState.Setters>
+
 								</VisualState>
-								<VisualState x:Name="Left">
+
+								<VisualState x:Name="Right">
 									<VisualState.StateTriggers>
-										<toolkit:IsEqualStateTrigger Value="{Binding ContentAlignment, RelativeSource={RelativeSource TemplatedParent}}" To="Left" />
+
+										<!--  Horizontal medium width  -->
+										<toolkit:ControlSizeTrigger MinWidth="{StaticResource PropertiesViewCardRightThreshold}" TargetElement="{Binding RelativeSource={RelativeSource TemplatedParent}}" />
 									</VisualState.StateTriggers>
 									<VisualState.Setters>
-										<Setter Target="PART_HeaderPresenter.Visibility" Value="Collapsed" />
-										<Setter Target="PART_ContentPresenter.(Grid.RowSpan)" Value="1" />
-										<Setter Target="PART_ContentPresenter.(Grid.Column)" Value="0" />
-										<Setter Target="PART_ContentPresenter.(Grid.ColumnSpan)" Value="2" />
-										<Setter Target="PART_ContentPresenter.HorizontalAlignment" Value="Left" />
-										<Setter Target="PART_HeaderPresenter.(Grid.RowSpan)" Value="1" />
+										<Setter Target="PART_RootGrid.Background" Value="#1100FF00" />
+									</VisualState.Setters>
+
+								</VisualState>
+
+							</VisualStateGroup>
+
+
+							<VisualStateGroup x:Name="OrientationStates">
+								<VisualState x:Name="Horizontal">
+									<VisualState.Setters>
+										<Setter Target="testText.Foreground" Value="#FF0000" />
 									</VisualState.Setters>
 								</VisualState>
 								<VisualState x:Name="Vertical">
-									<VisualState.StateTriggers>
-										<toolkit:IsEqualStateTrigger Value="{Binding ContentAlignment, RelativeSource={RelativeSource TemplatedParent}}" To="Vertical" />
-									</VisualState.StateTriggers>
 									<VisualState.Setters>
-										<Setter Target="PART_ContentPresenter.(Grid.Row)" Value="1" />
-										<Setter Target="PART_ContentPresenter.(Grid.RowSpan)" Value="1" />
-										<Setter Target="PART_ContentPresenter.(Grid.Column)" Value="0" />
-										<Setter Target="PART_ContentPresenter.(Grid.ColumnSpan)" Value="2" />
-										<Setter Target="PART_ContentPresenter.HorizontalAlignment" Value="Stretch" />
-										<Setter Target="PART_ContentPresenter.HorizontalContentAlignment" Value="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource TemplatedParent}}" />
-										<Setter Target="PART_HeaderPresenter.Margin" Value="0" />
-										<Setter Target="PART_HeaderPresenter.ColumnSpan" Value="2" />
-										<Setter Target="PART_HeaderPresenter.(Grid.RowSpan)" Value="1" />
+										<Setter Target="testText.Foreground" Value="#00FF00" />
 									</VisualState.Setters>
 								</VisualState>
 							</VisualStateGroup>
@@ -275,28 +213,24 @@
 							<VisualStateGroup x:Name="ContentVisibilityStates">
 								<VisualState x:Name="Visible" />
 								<VisualState x:Name="Collapsed">
-									<VisualState.StateTriggers>
-										<toolkit:IsNullOrEmptyStateTrigger Value="{Binding Content, RelativeSource={RelativeSource TemplatedParent}}" />
-									</VisualState.StateTriggers>
-									<VisualState.Setters>
-										<Setter Target="PART_ContentPresenter.Visibility" Value="Collapsed" />
-									</VisualState.Setters>
+									<VisualState.Setters />
 								</VisualState>
 							</VisualStateGroup>
 
 							<VisualStateGroup x:Name="ContentSpacingStates">
 								<VisualState x:Name="NoContentSpacing" />
 								<VisualState x:Name="ContentSpacing">
-									<VisualState.Setters>
-										<Setter Target="PART_RootGrid.RowSpacing" Value="{ThemeResource PropertiesViewCardVerticalHeaderContentSpacing}" />
-									</VisualState.Setters>
+									<VisualState.Setters />
 								</VisualState>
 							</VisualStateGroup>
 						</VisualStateManager.VisualStateGroups>
 					</Grid>
+
 				</ControlTemplate>
 			</Setter.Value>
 		</Setter>
 	</Style>
 
+
+
 </ResourceDictionary>
diff --git a/tests/Files.App.UITests/Dialogs/PropertiesDetailsPage.xaml b/tests/Files.App.UITests/Dialogs/PropertiesDetailsPage.xaml
index 9bf427431f45..fe0978e0b09a 100644
--- a/tests/Files.App.UITests/Dialogs/PropertiesDetailsPage.xaml
+++ b/tests/Files.App.UITests/Dialogs/PropertiesDetailsPage.xaml
@@ -24,7 +24,7 @@
 				<FontIcon Glyph="&#xF0E3;" />
 			</controls:PropertiesViewExpander.HeaderIcon>
 			<StackPanel Padding="0,0,0,8">
-				<controls:PropertiesViewCard ContentAlignment="Vertical" Header="Description">
+				<controls:PropertiesViewCard Header="Description" Orientation="Vertical">
 					<TextBox
 						MinHeight="96"
 						Margin="{StaticResource PropertiesValueTextBoxMargin}"
diff --git a/tests/Files.App.UITests/Dialogs/PropertiesGeneralPage.xaml b/tests/Files.App.UITests/Dialogs/PropertiesGeneralPage.xaml
index cba417559a0f..972e96742591 100644
--- a/tests/Files.App.UITests/Dialogs/PropertiesGeneralPage.xaml
+++ b/tests/Files.App.UITests/Dialogs/PropertiesGeneralPage.xaml
@@ -12,7 +12,7 @@
 		<ResourceDictionary>
 			<GridLength x:Key="PropertiesGeneralLabelWidth">148</GridLength>
 			<Thickness x:Key="PropertiesValueTextBoxMargin">-12,0,0,0</Thickness>
-			<Style BasedOn="{StaticResource DefaultPropertiesViewCardStyle}" TargetType="controls:PropertiesViewCard">
+			<Style BasedOn="{StaticResource TestPropertiesViewCardStyle}" TargetType="controls:PropertiesViewCard">
 				<Setter Property="LabelWidth" Value="{StaticResource PropertiesGeneralLabelWidth}" />
 				<Setter Property="VerticalAlignment" Value="Center" />
 			</Style>
@@ -48,7 +48,7 @@
 					Grid.Column="1"
 					VerticalAlignment="Center"
 					Spacing="8">
-					<TextBox Text="Filename here" Margin="-12,0,0,0" />
+					<TextBox Margin="-12,0,0,0" Text="Filename here" />
 					<TextBlock Text="Sticky header area with scrolling below" />
 				</StackPanel>
 			</Grid>
@@ -58,7 +58,7 @@
 			<controls:PropertiesViewExpander.HeaderIcon>
 				<SymbolIcon Symbol="Document" />
 			</controls:PropertiesViewExpander.HeaderIcon>
-			<StackPanel Padding="0,0,0,8">
+			<StackPanel Padding="0,0,0,8" HorizontalAlignment="Stretch">
 				<controls:PropertiesViewCard Header="Name">
 					<TextBox
 						Margin="{StaticResource PropertiesValueTextBoxMargin}"
@@ -68,7 +68,10 @@
 				<controls:PropertiesViewItemSeparator />
 
 				<controls:PropertiesViewCard Header="Type">
-					<TextBlock Text="Text Document (.txt)" TextWrapping="WrapWholeWords" VerticalAlignment="Center" />
+					<TextBlock
+						VerticalAlignment="Center"
+						Text="Text Document (.txt)"
+						TextWrapping="WrapWholeWords" />
 				</controls:PropertiesViewCard>
 				<controls:PropertiesViewItemSeparator />
 
@@ -95,7 +98,10 @@
 					Click="ClickableCard_Click"
 					Header="Clickable card"
 					IsClickEnabled="True">
-					<TextBlock x:Name="ClickResultText" Text="Not clicked" VerticalAlignment="Center"  />
+					<TextBlock
+						x:Name="ClickResultText"
+						VerticalAlignment="Center"
+						Text="Not clicked" />
 				</controls:PropertiesViewCard>
 				<controls:PropertiesViewItemSeparator />
 
@@ -109,7 +115,7 @@
 			<controls:PropertiesViewExpander.HeaderIcon>
 				<SymbolIcon Symbol="Favorite" />
 			</controls:PropertiesViewExpander.HeaderIcon>
-			<StackPanel Padding="0,0,0,8">
+			<StackPanel Padding="0,0,0,8" HorizontalAlignment="Stretch">
 				<controls:PropertiesViewCard Header="Read-only rating">
 					<RatingControl IsReadOnly="True" Value="4" />
 				</controls:PropertiesViewCard>
@@ -125,18 +131,36 @@
 		</controls:PropertiesViewExpander>
 
 		<controls:PropertiesViewExpander Header="Vertical and wrapping examples">
+			<controls:PropertiesViewExpander.HeaderIcon>
+				<SymbolIcon Symbol="SlideShow" />
+			</controls:PropertiesViewExpander.HeaderIcon>
+			<StackPanel Padding="0,0,0,8" HorizontalAlignment="Stretch">
+				<controls:PropertiesViewCard Header="Editable vertical value" Orientation="Vertical">
+					<TextBox
+						Margin="{StaticResource PropertiesValueTextBoxMargin}"
+						HorizontalAlignment="Stretch"
+						Text="Item value text" />
+				</controls:PropertiesViewCard>
+				<controls:PropertiesViewItemSeparator />
+				<controls:PropertiesViewCard Header="A long header that demonstrates wrapping when the available width becomes constrained" Orientation="Vertical">
+					<TextBlock Text="A long value that also wraps across multiple lines when the properties window becomes narrow." TextWrapping="Wrap" />
+				</controls:PropertiesViewCard>
+			</StackPanel>
+		</controls:PropertiesViewExpander>
+
+		<controls:PropertiesViewExpander Header="Right and wrapping examples">
 			<controls:PropertiesViewExpander.HeaderIcon>
 				<SymbolIcon Symbol="SlideShow" />
 			</controls:PropertiesViewExpander.HeaderIcon>
 			<StackPanel Padding="0,0,0,8">
-				<controls:PropertiesViewCard ContentAlignment="Vertical" Header="Editable vertical value">
+				<controls:PropertiesViewCard Header="Editable right value">
 					<TextBox
 						Margin="{StaticResource PropertiesValueTextBoxMargin}"
 						HorizontalAlignment="Stretch"
 						Text="Item value text" />
 				</controls:PropertiesViewCard>
 				<controls:PropertiesViewItemSeparator />
-				<controls:PropertiesViewCard ContentAlignment="Vertical" Header="A long header that demonstrates wrapping when the available width becomes constrained">
+				<controls:PropertiesViewCard Header="A long header that demonstrates wrapping when the available width becomes constrained">
 					<TextBlock Text="A long value that also wraps across multiple lines when the properties window becomes narrow." TextWrapping="Wrap" />
 				</controls:PropertiesViewCard>
 			</StackPanel>
@@ -146,7 +170,7 @@
 			<controls:PropertiesViewExpander.HeaderIcon>
 				<SymbolIcon Symbol="XboxOneConsole" />
 			</controls:PropertiesViewExpander.HeaderIcon>
-			<StackPanel Padding="0,0,0,8">
+			<StackPanel Padding="0,0,0,8" HorizontalAlignment="Stretch">
 				<controls:PropertiesViewCard Header="Enabled and on">
 					<ToggleSwitch IsOn="True" />
 				</controls:PropertiesViewCard>
@@ -165,16 +189,16 @@
 			<controls:PropertiesViewExpander.HeaderIcon>
 				<SymbolIcon Symbol="Accept" />
 			</controls:PropertiesViewExpander.HeaderIcon>
-			<StackPanel Padding="0,0,0,8">
-				<controls:PropertiesViewCard ContentAlignment="Left">
+			<StackPanel Padding="0,0,0,8" HorizontalAlignment="Stretch">
+				<controls:PropertiesViewCard>
 					<CheckBox Content="Unchecked option" IsChecked="False" />
 				</controls:PropertiesViewCard>
 				<controls:PropertiesViewItemSeparator />
-				<controls:PropertiesViewCard ContentAlignment="Left">
+				<controls:PropertiesViewCard>
 					<CheckBox Content="Checked option" IsChecked="True" />
 				</controls:PropertiesViewCard>
 				<controls:PropertiesViewItemSeparator />
-				<controls:PropertiesViewCard ContentAlignment="Left">
+				<controls:PropertiesViewCard>
 					<CheckBox
 						Content="Indeterminate option"
 						IsChecked="{x:Null}"

From 4104f6e63e72bb7e2bb7fd5bda1e745d6259de47 Mon Sep 17 00:00:00 2001
From: Martin Anderson <mdta@live.co.uk>
Date: Sun, 23 Aug 2026 01:39:02 +0100
Subject: [PATCH 32/36] Making some progress on Styling - Still more to do

Pushing my work so far, as I think I have made some good progress - still more to do and tidy up, and there are some issues like the control not having awareness of missing headers, and how to re-flow in those circumstances.
---
 .../PropertiesView/PropertiesView.xaml        |  69 ++++
 .../PropertiesView/PropertiesViewCard.cs      |   2 +-
 .../PropertiesView/PropertiesViewCard.xaml    | 378 ++++++++++++------
 .../PropertiesView/PropertiesViewInfo.cs      | 138 +++++++
 .../Dialogs/PropertiesGeneralPage.xaml        |  80 ++--
 .../Dialogs/PropertiesGeneralPage.xaml.cs     |   5 -
 6 files changed, 517 insertions(+), 155 deletions(-)
 create mode 100644 src/Files.App.Controls/PropertiesView/PropertiesViewInfo.cs

diff --git a/src/Files.App.Controls/PropertiesView/PropertiesView.xaml b/src/Files.App.Controls/PropertiesView/PropertiesView.xaml
index 0fb29c3bbd80..af17478e52f8 100644
--- a/src/Files.App.Controls/PropertiesView/PropertiesView.xaml
+++ b/src/Files.App.Controls/PropertiesView/PropertiesView.xaml
@@ -4,6 +4,75 @@
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 	xmlns:local="using:Files.App.Controls">
 
+	<!--  PROPERTIES VIEW INFO  -->
+	<Style BasedOn="{StaticResource DefaultPropertiesViewInfoStyle}" TargetType="local:PropertiesViewInfo" />
+
+	<Style x:Key="DefaultPropertiesViewInfoStyle" TargetType="local:PropertiesViewInfo">
+		<Setter Property="CornerRadius" Value="16" />
+		<Setter Property="Height" Value="32" />
+		<Setter Property="Width" Value="32" />
+		<Setter Property="BorderThickness" Value="1" />
+		<Setter Property="Background" Value="#55000000" />
+		<Setter Property="BorderBrush" Value="#55FFFFFF" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="local:PropertiesViewInfo">
+					<Grid
+						x:Name="RootGrid"
+						Margin="{TemplateBinding Margin}"
+						Padding="{TemplateBinding Padding}">
+						<Border
+							x:Name="HoverVisual"
+							Width="{TemplateBinding Width}"
+							Height="{TemplateBinding Height}"
+							MaxWidth="{TemplateBinding MaxWidth}"
+							MaxHeight="{TemplateBinding MaxHeight}"
+							Background="{TemplateBinding Background}"
+							BorderBrush="{TemplateBinding BorderBrush}"
+							BorderThickness="{TemplateBinding BorderThickness}"
+							CornerRadius="{TemplateBinding CornerRadius}">
+							<Viewbox
+								x:Name="PART_InfoIconPresenterHolder"
+								MaxWidth="16"
+								MaxHeight="16"
+								Margin="0"
+								HorizontalAlignment="Center"
+								VerticalAlignment="Center">
+								<ContentPresenter
+									x:Name="PART_InfoIconPresenter"
+									HorizontalContentAlignment="Center"
+									VerticalContentAlignment="Center"
+									Content="{TemplateBinding InfoIcon}"
+									Foreground="Cyan" />
+							</Viewbox>
+						</Border>
+
+						<VisualStateManager.VisualStateGroups>
+							<VisualStateGroup x:Name="CommonStates">
+								<VisualState x:Name="Normal">
+									<VisualState.Setters />
+								</VisualState>
+								<VisualState x:Name="PointerOver">
+									<VisualState.Setters />
+								</VisualState>
+								<VisualState x:Name="Pressed">
+									<VisualState.Setters />
+								</VisualState>
+								<VisualState x:Name="Disabled">
+									<VisualState.Setters />
+								</VisualState>
+							</VisualStateGroup>
+						</VisualStateManager.VisualStateGroups>
+					</Grid>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+
+
+
+
+	<!--  PROPERTIES VIEW ITEM SEPARATOR  -->
 	<Style BasedOn="{StaticResource DefaultPropertiesViewStyle}" TargetType="local:PropertiesView" />
 
 	<Style TargetType="local:PropertiesViewItemSeparator">
diff --git a/src/Files.App.Controls/PropertiesView/PropertiesViewCard.cs b/src/Files.App.Controls/PropertiesView/PropertiesViewCard.cs
index dc32eacd2018..0aa974a257af 100644
--- a/src/Files.App.Controls/PropertiesView/PropertiesViewCard.cs
+++ b/src/Files.App.Controls/PropertiesView/PropertiesViewCard.cs
@@ -51,7 +51,7 @@ public partial class PropertiesViewCard : Button
 	public PropertiesViewCard()
 	{
 		DefaultStyleKey = typeof(PropertiesViewCard);
-		ActionIcon = new FontIcon { Glyph = "\uE974", MirroredWhenRightToLeft = true };
+		ActionIcon = new FontIcon { Glyph = "\uE96F" , MirroredWhenRightToLeft = true };
 	}
 
 	protected override void OnApplyTemplate()
diff --git a/src/Files.App.Controls/PropertiesView/PropertiesViewCard.xaml b/src/Files.App.Controls/PropertiesView/PropertiesViewCard.xaml
index 6cc873d631b5..a7581b72f3be 100644
--- a/src/Files.App.Controls/PropertiesView/PropertiesViewCard.xaml
+++ b/src/Files.App.Controls/PropertiesView/PropertiesViewCard.xaml
@@ -8,145 +8,277 @@
 
 	<ResourceDictionary.ThemeDictionaries>
 		<ResourceDictionary x:Key="Default">
-			<StaticResource x:Key="PropertiesViewCardForeground" ResourceKey="TextFillColorPrimaryBrush" />
-			<StaticResource x:Key="PropertiesViewCardForegroundPointerOver" ResourceKey="TextFillColorPrimaryBrush" />
-			<StaticResource x:Key="PropertiesViewCardForegroundPressed" ResourceKey="TextFillColorSecondaryBrush" />
-			<StaticResource x:Key="PropertiesViewCardForegroundDisabled" ResourceKey="TextFillColorDisabledBrush" />
+			<StaticResource x:Key="PropertiesViewCardActionIconForeground" ResourceKey="AccentTextFillColorPrimaryBrush" />
+			<StaticResource x:Key="PropertiesViewCardActionIconForegroundPointerOver" ResourceKey="AccentTextillColorSecondaryBrush" />
+			<StaticResource x:Key="PropertiesViewCardActionIconForegroundPressed" ResourceKey="AccentTextFillColorTertiaryBrush" />
+			<StaticResource x:Key="PropertiesViewCardActionIconForegroundDisabled" ResourceKey="TextFillColorDisabledBrush" />
+
+			<StaticResource x:Key="PropertiesViewCardHeaderForeground" ResourceKey="TextFillColorSecondaryBrush" />
+			<StaticResource x:Key="PropertiesViewCardHeaderForegroundPointerOver" ResourceKey="AccentTextFillColorPrimaryBrush" />
+			<StaticResource x:Key="PropertiesViewCardHeaderForegroundPressed" ResourceKey="AccentTextFillColorTertiaryBrush" />
+			<StaticResource x:Key="PropertiesViewCardHeaderForegroundDisabled" ResourceKey="TextFillColorDisabledBrush" />
+
+			<StaticResource x:Key="PropertiesViewCardContentForeground" ResourceKey="TextFillColorPrimaryBrush" />
+			<StaticResource x:Key="PropertiesViewCardContentForegroundPointerOver" ResourceKey="TextFillColorSecondaryBrush" />
+			<StaticResource x:Key="PropertiesViewCardContentForegroundPressed" ResourceKey="TextFillColorTertiaryBrush" />
+			<StaticResource x:Key="PropertiesViewCardContentForegroundDisabled" ResourceKey="TextFillColorDisabledBrush" />
+
+			<StaticResource x:Key="PropertiesViewCardBackground" ResourceKey="SubtleFillColorTransparentBrush" />
+			<StaticResource x:Key="PropertiesViewCardBackgroundPointerOver" ResourceKey="SubtleFillColorSecondaryBrush" />
+			<StaticResource x:Key="PropertiesViewCardBackgroundPressed" ResourceKey="SubtleFillColorTertiaryBrush" />
+			<StaticResource x:Key="PropertiesViewCardBackgroundDisabled" ResourceKey="SubtleFillColorDisabledBrush" />
+
+			<StaticResource x:Key="PropertiesViewCardInnerCornerRadius" ResourceKey="ControlCornerRadius" />
+			<StaticResource x:Key="PropertiesViewCardCornerRadius" ResourceKey="OverlayCornerRadius" />
 		</ResourceDictionary>
 		<ResourceDictionary x:Key="Light">
-			<StaticResource x:Key="PropertiesViewCardForeground" ResourceKey="TextFillColorPrimaryBrush" />
-			<StaticResource x:Key="PropertiesViewCardForegroundPointerOver" ResourceKey="TextFillColorPrimaryBrush" />
-			<StaticResource x:Key="PropertiesViewCardForegroundPressed" ResourceKey="TextFillColorSecondaryBrush" />
-			<StaticResource x:Key="PropertiesViewCardForegroundDisabled" ResourceKey="TextFillColorDisabledBrush" />
+			<StaticResource x:Key="PropertiesViewCardActionIconForeground" ResourceKey="AccentTextFillColorPrimaryBrush" />
+			<StaticResource x:Key="PropertiesViewCardActionIconForegroundPointerOver" ResourceKey="AccentTextillColorSecondaryBrush" />
+			<StaticResource x:Key="PropertiesViewCardActionIconForegroundPressed" ResourceKey="AccentTextFillColorTertiaryBrush" />
+			<StaticResource x:Key="PropertiesViewCardActionIconForegroundDisabled" ResourceKey="TextFillColorDisabledBrush" />
+
+			<StaticResource x:Key="PropertiesViewCardHeaderForeground" ResourceKey="TextFillColorSecondaryBrush" />
+			<StaticResource x:Key="PropertiesViewCardHeaderForegroundPointerOver" ResourceKey="AccentTextFillColorPrimaryBrush" />
+			<StaticResource x:Key="PropertiesViewCardHeaderForegroundPressed" ResourceKey="AccentTextFillColorTertiaryBrush" />
+			<StaticResource x:Key="PropertiesViewCardHeaderForegroundDisabled" ResourceKey="TextFillColorDisabledBrush" />
+
+			<StaticResource x:Key="PropertiesViewCardContentForeground" ResourceKey="TextFillColorPrimaryBrush" />
+			<StaticResource x:Key="PropertiesViewCardContentForegroundPointerOver" ResourceKey="TextFillColorSecondaryBrush" />
+			<StaticResource x:Key="PropertiesViewCardContentForegroundPressed" ResourceKey="TextFillColorTertiaryBrush" />
+			<StaticResource x:Key="PropertiesViewCardContentForegroundDisabled" ResourceKey="TextFillColorDisabledBrush" />
+
+			<StaticResource x:Key="PropertiesViewCardBackground" ResourceKey="SubtleFillColorTransparentBrush" />
+			<StaticResource x:Key="PropertiesViewCardBackgroundPointerOver" ResourceKey="SubtleFillColorSecondaryBrush" />
+			<StaticResource x:Key="PropertiesViewCardBackgroundPressed" ResourceKey="SubtleFillColorTertiaryBrush" />
+			<StaticResource x:Key="PropertiesViewCardBackgroundDisabled" ResourceKey="SubtleFillColorDisabledBrush" />
+
+			<StaticResource x:Key="PropertiesViewCardInnerCornerRadius" ResourceKey="ControlCornerRadius" />
+			<StaticResource x:Key="PropertiesViewCardCornerRadius" ResourceKey="OverlayCornerRadius" />
 		</ResourceDictionary>
 		<ResourceDictionary x:Key="HighContrast">
-			<StaticResource x:Key="PropertiesViewCardForeground" ResourceKey="SystemColorButtonTextColorBrush" />
-			<StaticResource x:Key="PropertiesViewCardForegroundPointerOver" ResourceKey="SystemColorHighlightColorBrush" />
-			<StaticResource x:Key="PropertiesViewCardForegroundPressed" ResourceKey="SystemColorHighlightColorBrush" />
-			<StaticResource x:Key="PropertiesViewCardForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+			<StaticResource x:Key="PropertiesViewCardActionIconForeground" ResourceKey="SystemColorHighlightColorBrush" />
+			<StaticResource x:Key="PropertiesViewCardActionIconForegroundPointerOver" ResourceKey="SystemColorHighlightColorBrush" />
+			<StaticResource x:Key="PropertiesViewCardActionIconForegroundPressed" ResourceKey="SystemColorHighlightColorBrush" />
+			<StaticResource x:Key="PropertiesViewCardActionIconForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+
+			<StaticResource x:Key="PropertiesViewCardHeaderForeground" ResourceKey="SystemColorButtonTextColorBrush" />
+			<StaticResource x:Key="PropertiesViewCardHeaderForegroundPointerOver" ResourceKey="SystemColorHighlightColorBrush" />
+			<StaticResource x:Key="PropertiesViewCardHeaderForegroundPressed" ResourceKey="SystemColorHighlightColorBrush" />
+			<StaticResource x:Key="PropertiesViewCardHeaderForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+
+			<StaticResource x:Key="PropertiesViewCardContentForeground" ResourceKey="SystemColorButtonTextColorBrush" />
+			<StaticResource x:Key="PropertiesViewCardContentForegroundPointerOver" ResourceKey="SystemColorHighlightColorBrush" />
+			<StaticResource x:Key="PropertiesViewCardContentForegroundPressed" ResourceKey="SystemColorHighlightColorBrush" />
+			<StaticResource x:Key="PropertiesViewCardContentForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+
+			<StaticResource x:Key="PropertiesViewCardBackground" ResourceKey="SystemColorButtonTextColorBrush" />
+			<StaticResource x:Key="PropertiesViewCardBackgroundPointerOver" ResourceKey="SystemColorHighlightColorBrush" />
+			<StaticResource x:Key="PropertiesViewCardBackgroundPressed" ResourceKey="SystemColorHighlightColorBrush" />
+			<StaticResource x:Key="PropertiesViewCardBackgroundDisabled" ResourceKey="SystemControlTransparentBrush" />
+
+			<StaticResource x:Key="PropertiesViewCardInnerCornerRadius" ResourceKey="ControlCornerRadius" />
+			<StaticResource x:Key="PropertiesViewCardCornerRadius" ResourceKey="OverlayCornerRadius" />
 		</ResourceDictionary>
 	</ResourceDictionary.ThemeDictionaries>
 
-	<Thickness x:Key="PropertiesViewCardPadding">0,6</Thickness>
 	<GridLength x:Key="PropertiesViewCardDefaultLabelWidth">160</GridLength>
+
+	<Thickness x:Key="PropertiesViewCardPadding">0,8</Thickness>
+	<Thickness x:Key="PropertiesViewCardBorderThickness">0</Thickness>
 	<x:Double x:Key="PropertiesViewCardMinWidth">148</x:Double>
 	<x:Double x:Key="PropertiesViewCardMinHeight">48</x:Double>
-	<x:Double x:Key="PropertiesViewCardHeaderIconMaxSize">20</x:Double>
 	<x:Double x:Key="PropertiesViewCardActionIconMaxSize">13</x:Double>
 	<x:Double x:Key="PropertiesViewCardVerticalHeaderContentSpacing">8</x:Double>
 
-	<x:Double x:Key="PropertiesViewCardWrapThreshold">300</x:Double>
-	<x:Double x:Key="PropertiesViewCardRightThreshold">400</x:Double>
-	<x:Double x:Key="PropertiesViewCardLeftThreshold">500</x:Double>
+	<x:Double x:Key="PropertiesViewCardWrapThreshold">360</x:Double>
+	<x:Double x:Key="PropertiesViewCardRightThreshold">520</x:Double>
+	<x:Double x:Key="PropertiesViewCardLeftThreshold">640</x:Double>
 
-	<x:Double x:Key="PropertiesViewCardBitmapIconDisabledOpacity">0.4</x:Double>
-	<Thickness x:Key="PropertiesViewCardHeaderIconMargin">0,0,12,0</Thickness>
-	<Thickness x:Key="PropertiesViewCardHeaderMargin">0,0,24,0</Thickness>
-	<Thickness x:Key="PropertiesViewCardActionIconMargin">14,0,0,0</Thickness>
+	<Thickness x:Key="PropertiesViewCardHeaderIconMargin">12,0,12,0</Thickness>
+	<Thickness x:Key="PropertiesViewCardHeaderMargin">0,8,24,8</Thickness>
+	<Thickness x:Key="PropertiesViewCardContentMargin">0,8,0,8</Thickness>
+	<Thickness x:Key="PropertiesViewCardActionIconMargin">12,0,12,0</Thickness>
 
 	<Style BasedOn="{StaticResource TestPropertiesViewCardStyle}" TargetType="local:PropertiesViewCard" />
 
 	<Style x:Key="TestPropertiesViewCardStyle" TargetType="local:PropertiesViewCard">
 		<Setter Property="HorizontalAlignment" Value="Stretch" />
-
+		<Setter Property="MinHeight" Value="{StaticResource PropertiesViewCardMinHeight}" />
+		<Setter Property="Background" Value="Transparent" />
+		<Setter Property="BorderBrush" Value="Transparent" />
+		<Setter Property="Foreground" Value="{ThemeResource PropertiesViewCardContentForeground}" />
+		<Setter Property="BorderThickness" Value="{StaticResource PropertiesViewCardBorderThickness}" />
+		<Setter Property="MinWidth" Value="{StaticResource PropertiesViewCardMinWidth}" />
+		<Setter Property="LabelWidth" Value="{StaticResource PropertiesViewCardDefaultLabelWidth}" />
+		<Setter Property="Padding" Value="{StaticResource PropertiesViewCardPadding}" />
+		<Setter Property="IsTabStop" Value="False" />
+		<Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
+		<Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
+		<Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}" />
+		<Setter Property="FontWeight" Value="Normal" />
+		<Setter Property="FocusVisualMargin" Value="-3" />
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="local:PropertiesViewCard">
 
-					<Grid
-						x:Name="PART_RootGrid"
-						Height="72"
-						HorizontalAlignment="Stretch">
-						<Grid.RowDefinitions>
-							<RowDefinition x:Name="Row_Label" Height="Auto" />
-							<RowDefinition x:Name="Row_Content" Height="*" />
-						</Grid.RowDefinitions>
-						<Grid.ColumnDefinitions>
-							<ColumnDefinition x:Name="Col_Label" Width="{StaticResource PropertiesViewCardDefaultLabelWidth}" />
-							<ColumnDefinition x:Name="Col_Content" Width="*" />
-						</Grid.ColumnDefinitions>
-
-						<ContentPresenter
-							x:Name="PART_HeaderPresenter"
-							Grid.Row="0"
-							Grid.RowSpan="2"
-							Grid.Column="0"
-							Margin="0,0,24,0"
-							HorizontalAlignment="Left"
-							VerticalAlignment="Center"
-							HorizontalContentAlignment="Stretch"
-							VerticalContentAlignment="Center"
-							Content="{TemplateBinding Header}"
-							Foreground="HotPink" />
-
-						<ContentPresenter
-							x:Name="PART_ContentPresenter"
-							Grid.Row="0"
-							Grid.RowSpan="2"
-							Grid.Column="1"
-							HorizontalContentAlignment="Stretch"
-							VerticalContentAlignment="Center"
-							Content="{TemplateBinding Content}"
-							Foreground="Green" />
-
-						<TextBlock
-							x:Name="testText"
-							Grid.Row="0"
-							Grid.Column="1"
-							Grid.ColumnSpan="2"
-							HorizontalAlignment="Center"
-							VerticalAlignment="Center"
-							Foreground="Yellow"
-							Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=ActualWidth, Mode=OneWay}" />
-
-
-						<Viewbox x:Name="PART_ActionIconPresenterHolder" Visibility="Collapsed">
-							<ContentPresenter x:Name="PART_ActionIconPresenter" Content="{TemplateBinding ActionIcon}" />
-						</Viewbox>
-
-
+					<Border
+						x:Name="PART_RootBorder"
+						MinWidth="{TemplateBinding MinWidth}"
+						MinHeight="{TemplateBinding MinHeight}"
+						MaxWidth="{TemplateBinding MaxWidth}"
+						Margin="{TemplateBinding Margin}"
+						Padding="{TemplateBinding Padding}"
+						HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+						VerticalAlignment="{TemplateBinding VerticalAlignment}"
+						Background="{TemplateBinding Background}"
+						BorderBrush="{TemplateBinding BorderBrush}"
+						BorderThickness="{TemplateBinding BorderThickness}"
+						CornerRadius="{TemplateBinding CornerRadius}">
+						<Grid
+							x:Name="PART_RootGrid"
+							HorizontalAlignment="Stretch"
+							muxc:AnimatedIcon.State="Normal"
+							Background="{ThemeResource PropertiesViewCardBackground}"
+							CornerRadius="{ThemeResource PropertiesViewCardInnerCornerRadius}">
+							<Grid.RowDefinitions>
+								<RowDefinition x:Name="Row_Label" Height="Auto" />
+								<RowDefinition x:Name="Row_Content" Height="*" />
+							</Grid.RowDefinitions>
+							<Grid.ColumnDefinitions>
+								<ColumnDefinition x:Name="Col_ActionIcon" Width="Auto" />
+								<ColumnDefinition x:Name="Col_Label" Width="{Binding LabelWidth, RelativeSource={RelativeSource TemplatedParent}}" />
+								<ColumnDefinition x:Name="Col_Content" Width="*" />
+							</Grid.ColumnDefinitions>
+
+							<ContentPresenter
+								x:Name="PART_HeaderPresenter"
+								Grid.Row="0"
+								Grid.RowSpan="2"
+								Grid.Column="1"
+								Grid.ColumnSpan="1"
+								Margin="{StaticResource PropertiesViewCardHeaderMargin}"
+								HorizontalAlignment="Left"
+								VerticalAlignment="Center"
+								HorizontalContentAlignment="Stretch"
+								VerticalContentAlignment="Center"
+								Content="{TemplateBinding Header}"
+								ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
+								FontFamily="{TemplateBinding FontFamily}"
+								FontSize="{TemplateBinding FontSize}"
+								FontWeight="{TemplateBinding FontWeight}"
+								Foreground="{TemplateBinding Foreground}"
+								HighContrastAdjustment="None"
+								TextWrapping="WrapWholeWords" />
+
+							<ContentPresenter
+								x:Name="PART_ContentPresenter"
+								Grid.Row="0"
+								Grid.RowSpan="2"
+								Grid.Column="2"
+								Grid.ColumnSpan="1"
+								Margin="{StaticResource PropertiesViewCardContentMargin}"
+								HorizontalContentAlignment="Stretch"
+								VerticalContentAlignment="Center"
+								Content="{TemplateBinding Content}"
+								Foreground="{TemplateBinding Foreground}"
+								TextWrapping="WrapWholeWords" />
+
+							<Border
+								x:Name="testText"
+								Grid.Row="0"
+								Grid.RowSpan="2"
+								Grid.Column="0"
+								Grid.ColumnSpan="3"
+								Width="16"
+								Height="16"
+								HorizontalAlignment="Center"
+								VerticalAlignment="Center"
+								Background="Yellow"
+								Canvas.ZIndex="9999" />
+
+
+							<Viewbox
+								x:Name="PART_ActionIconPresenterHolder"
+								Grid.Row="0"
+								Grid.RowSpan="2"
+								Grid.Column="0"
+								Grid.ColumnSpan="1"
+								MaxWidth="{ThemeResource PropertiesViewCardActionIconMaxSize}"
+								MaxHeight="{ThemeResource PropertiesViewCardActionIconMaxSize}"
+								Margin="{StaticResource PropertiesViewCardActionIconMargin}"
+								Visibility="Collapsed">
+								<ContentPresenter
+									x:Name="PART_ActionIconPresenter"
+									Content="{TemplateBinding ActionIcon}"
+									Foreground="{ThemeResource PropertiesViewCardActionIconForeground}" />
+							</Viewbox>
+
+						</Grid>
 
 						<VisualStateManager.VisualStateGroups>
 							<VisualStateGroup x:Name="CommonStates">
-								<VisualState x:Name="Normal" />
+								<VisualState x:Name="Normal">
+									<VisualState.Setters>
+										<Setter Target="PART_RootGrid.Background" Value="{ThemeResource PropertiesViewCardBackground}" />
+										<Setter Target="PART_HeaderPresenter.Foreground" Value="{ThemeResource PropertiesViewCardHeaderForeground}" />
+										<Setter Target="PART_ActionIconPresenter.Foreground" Value="{ThemeResource PropertiesViewCardHeaderForeground}" />
+									</VisualState.Setters>
+								</VisualState>
 								<VisualState x:Name="PointerOver">
-									<VisualState.Setters />
+									<VisualState.Setters>
+										<Setter Target="PART_RootGrid.Background" Value="{ThemeResource PropertiesViewCardBackgroundPointerOver}" />
+										<Setter Target="PART_HeaderPresenter.Foreground" Value="{ThemeResource PropertiesViewCardHeaderForegroundPointerOver}" />
+										<Setter Target="PART_ActionIconPresenter.Foreground" Value="{ThemeResource PropertiesViewCardHeaderForegroundPointerOver}" />
+										<Setter Target="PART_ContentPresenter.Foreground" Value="{ThemeResource PropertiesViewCardContentForegroundPointerOver}" />
+									</VisualState.Setters>
 								</VisualState>
 								<VisualState x:Name="Pressed">
-									<VisualState.Setters />
+									<VisualState.Setters>
+										<Setter Target="PART_RootGrid.Background" Value="{ThemeResource PropertiesViewCardBackgroundPressed}" />
+										<Setter Target="PART_HeaderPresenter.Foreground" Value="{ThemeResource PropertiesViewCardHeaderForegroundPressed}" />
+										<Setter Target="PART_ActionIconPresenter.Foreground" Value="{ThemeResource PropertiesViewCardHeaderForegroundPressed}" />
+										<Setter Target="PART_ContentPresenter.Foreground" Value="{ThemeResource PropertiesViewCardContentForegroundPressed}" />
+									</VisualState.Setters>
 								</VisualState>
 								<VisualState x:Name="Disabled">
-									<VisualState.Setters />
+									<VisualState.Setters>
+										<Setter Target="PART_RootGrid.Background" Value="{ThemeResource PropertiesViewCardBackgroundDisabled}" />
+										<Setter Target="PART_HeaderPresenter.Foreground" Value="{ThemeResource PropertiesViewCardHeaderForegroundDisabled}" />
+										<Setter Target="PART_ActionIconPresenter.Foreground" Value="{ThemeResource PropertiesViewCardHeaderForegroundDisabled}" />
+										<Setter Target="PART_ContentPresenter.Foreground" Value="{ThemeResource PropertiesViewCardContentForegroundDisabled}" />
+									</VisualState.Setters>
 								</VisualState>
 							</VisualStateGroup>
 
 							<VisualStateGroup x:Name="ContentAlignmentStates">
-								<!--	This took a lot of working to get right, because of quirks with how 
-										The Visual State Triggers failover during evaluation.
-								
-										Wrapped HAS to be first, with the EqualStateTrigger to catch the
-										non default Vertical orientation, so we force that one to always
-										use the Wrapped control layout.
-								
-										[ header ]	 
-										========================================================
-										[ content ]   [ action icon ]
-								
-								
-										Then if the first trigger fails, it moves to the next so we are now
-										working with the Horizontal orientation, and we use the ControlSizeTrigger
-										to handle how we lay out the elements based on breakpoints
-								
-										Left is the default state so we do that after Wrapped
-													|											|
-										[ header ]	|	[ content ]  [ action icon ]			|
-													|											|
-								
-								
-										Right is the middle ground between narrow and wide
-													|											|
-										[ header ]	|				[ content ] [ action icon ]	|
-													|											|
+								<!--
+									This took a lot of working to get right, because of quirks with
+									how the Visual State Triggers failover during evaluation.
+									
+									Wrapped HAS to be first, with the EqualStateTrigger to catch the
+									non default Vertical orientation, so we force that one to always
+									use the Wrapped control layout.
+									
+									|		   | [ header ]							 |
+									| [ icon ] | =================================== |
+									|		   | [ content ]                         |
+									
+									
+									Then if the first trigger fails, it moves to the next so we
+									are now working with the Horizontal orientation, and we use
+									the ControlSizeTrigger to handle how we lay out the
+									elements based on breakpoints
+									
+									Left is the default state so we do that after Wrapped
+									|				|								 |
+									| [ header ]	|	[ content ]					 |
+									|				|								 |
+									
+									
+									Right is the middle ground between narrow and wide
+									|		   |			|						 |
+									| [ icon ] | [ header ]	|		     [ content ] |
+									|		   |			|						 |
 								-->
 
 								<VisualState x:Name="Wrapped">
@@ -162,12 +294,30 @@
 											TargetElement="{Binding RelativeSource={RelativeSource TemplatedParent}}" />
 									</VisualState.StateTriggers>
 									<VisualState.Setters>
-										<Setter Target="PART_RootGrid.Background" Value="#110000FF" />
+
+										<Setter Target="Col_Label.Width">
+											<Setter.Value>
+												<GridLength>Auto</GridLength>
+											</Setter.Value>
+										</Setter>
+
+										<Setter Target="PART_HeaderPresenter.(Grid.Row)" Value="0" />
+										<Setter Target="PART_HeaderPresenter.(Grid.RowSpan)" Value="1" />
+										<Setter Target="PART_HeaderPresenter.(Grid.Column)" Value="0" />
+										<Setter Target="PART_HeaderPresenter.(Grid.ColumnSpan)" Value="3" />
+
+										<Setter Target="PART_ContentPresenter.(Grid.Row)" Value="1" />
+										<Setter Target="PART_ContentPresenter.(Grid.RowSpan)" Value="1" />
+										<Setter Target="PART_ContentPresenter.(Grid.Column)" Value="0" />
+										<Setter Target="PART_ContentPresenter.(Grid.ColumnSpan)" Value="3" />
+
+										<Setter Target="PART_ContentPresenter.HorizontalAlignment" Value="Stretch" />
+										<Setter Target="PART_ContentPresenter.HorizontalContentAlignment" Value="Stretch" />
 									</VisualState.Setters>
 
 								</VisualState>
 
-								<VisualState x:Name="Left">
+								<VisualState x:Name="Right">
 									<VisualState.StateTriggers>
 
 										<!--  Horizontal large width  -->
@@ -177,20 +327,19 @@
 											TargetElement="{Binding RelativeSource={RelativeSource TemplatedParent}}" />
 									</VisualState.StateTriggers>
 									<VisualState.Setters>
-										<Setter Target="PART_RootGrid.Background" Value="#11FF0000" />
+										<Setter Target="PART_ContentPresenter.HorizontalAlignment" Value="Stretch" />
+										<Setter Target="PART_ContentPresenter.HorizontalContentAlignment" Value="Right" />
 									</VisualState.Setters>
 
 								</VisualState>
 
-								<VisualState x:Name="Right">
+								<VisualState x:Name="Left">
 									<VisualState.StateTriggers>
 
 										<!--  Horizontal medium width  -->
 										<toolkit:ControlSizeTrigger MinWidth="{StaticResource PropertiesViewCardRightThreshold}" TargetElement="{Binding RelativeSource={RelativeSource TemplatedParent}}" />
 									</VisualState.StateTriggers>
-									<VisualState.Setters>
-										<Setter Target="PART_RootGrid.Background" Value="#1100FF00" />
-									</VisualState.Setters>
+									<VisualState.Setters />
 
 								</VisualState>
 
@@ -200,12 +349,12 @@
 							<VisualStateGroup x:Name="OrientationStates">
 								<VisualState x:Name="Horizontal">
 									<VisualState.Setters>
-										<Setter Target="testText.Foreground" Value="#FF0000" />
+										<Setter Target="testText.Background" Value="#FF0000" />
 									</VisualState.Setters>
 								</VisualState>
 								<VisualState x:Name="Vertical">
 									<VisualState.Setters>
-										<Setter Target="testText.Foreground" Value="#00FF00" />
+										<Setter Target="testText.Background" Value="#00FF00" />
 									</VisualState.Setters>
 								</VisualState>
 							</VisualStateGroup>
@@ -224,8 +373,7 @@
 								</VisualState>
 							</VisualStateGroup>
 						</VisualStateManager.VisualStateGroups>
-					</Grid>
-
+					</Border>
 				</ControlTemplate>
 			</Setter.Value>
 		</Setter>
diff --git a/src/Files.App.Controls/PropertiesView/PropertiesViewInfo.cs b/src/Files.App.Controls/PropertiesView/PropertiesViewInfo.cs
new file mode 100644
index 000000000000..c13183698152
--- /dev/null
+++ b/src/Files.App.Controls/PropertiesView/PropertiesViewInfo.cs
@@ -0,0 +1,138 @@
+using CommunityToolkit.WinUI;
+using Microsoft.UI.Xaml.Input;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Files.App.Controls
+{
+    #region Template
+        [TemplatePart( Name = InfoIconPresenterHolderName , Type = typeof( Viewbox ) )]
+
+    [TemplateVisualState( Name = NormalStateName , GroupName = CommonStatesName )]
+    [TemplateVisualState( Name = PointerOverStateName , GroupName = CommonStatesName )]
+    [TemplateVisualState( Name = PressedStateName , GroupName = CommonStatesName )]
+    [TemplateVisualState( Name = DisabledStateName , GroupName = CommonStatesName )]
+    #endregion
+    public partial class PropertiesViewInfo : Button
+    {
+        #region Constants
+        private const string CommonStatesName = "CommonStates";
+        private const string NormalStateName = "Normal";
+        private const string PointerOverStateName = "PointerOver";
+        private const string PressedStateName = "Pressed";
+        private const string DisabledStateName = "Disabled";
+
+        private const string InfoIconPresenterHolderName = "PART_InfoIconPresenterHolder";
+        #endregion
+
+
+
+        #region Properties
+
+        [GeneratedDependencyProperty]
+        public partial IconElement? InfoIcon { get; set; }
+        #endregion
+
+
+
+
+        public PropertiesViewInfo()
+        {
+            DefaultStyleKey = typeof( PropertiesViewInfo );
+            InfoIcon = new FontIcon { Glyph = "\uEA80" , MirroredWhenRightToLeft = true  };
+        }
+
+
+
+        protected override void OnApplyTemplate()
+        {
+            IsEnabledChanged -= OnIsEnabledChanged;
+
+            base.OnApplyTemplate();
+
+            UpdateInfoIcon();
+
+            IsEnabledChanged += OnIsEnabledChanged;
+        }
+
+
+
+
+        protected override void OnPointerPressed(PointerRoutedEventArgs e)
+        {
+            base.OnPointerPressed( e );
+            VisualStateManager.GoToState( this , PressedStateName , true );
+        }
+
+        protected override void OnPointerReleased(PointerRoutedEventArgs e)
+        {
+            base.OnPointerReleased( e );
+            VisualStateManager.GoToState( this , NormalStateName , true );
+        }
+
+        protected override void OnPointerEntered(PointerRoutedEventArgs e)
+        {
+            base.OnPointerEntered( e );
+            VisualStateManager.GoToState( this , PointerOverStateName , true );
+        }
+
+        protected override void OnPointerExited(PointerRoutedEventArgs e)
+        {
+            base.OnPointerExited( e );
+            VisualStateManager.GoToState( this , NormalStateName , true );
+        }
+
+        protected override void OnPointerCaptureLost(PointerRoutedEventArgs e)
+        {
+            base.OnPointerCaptureLost( e );
+            VisualStateManager.GoToState( this , NormalStateName , true );
+        }
+
+        protected override void OnPointerCanceled(PointerRoutedEventArgs e)
+        {
+            base.OnPointerCanceled( e );
+            VisualStateManager.GoToState( this , NormalStateName , true );
+        }
+
+        protected override void OnKeyDown(KeyRoutedEventArgs e)
+        {
+            base.OnKeyDown( e );
+        }
+
+        protected override void OnKeyUp(KeyRoutedEventArgs e)
+        {
+            base.OnKeyUp( e );
+        }
+        
+        
+        
+
+        partial void OnInfoIconChanged(IconElement? newValue)
+        {
+            UpdateInfoIcon();
+        }
+
+        private void UpdateInfoIcon()
+        {
+            if ( GetTemplateChild( InfoIconPresenterHolderName ) is FrameworkElement presenter )
+                presenter.Visibility = InfoIcon is not null
+                    ? Visibility.Visible
+                    : Visibility.Collapsed;
+        }
+
+
+
+
+        private void OnIsEnabledChanged(object sender , DependencyPropertyChangedEventArgs e)
+        {
+            UpdateCommonState( true );
+        }
+
+
+        private void UpdateCommonState(bool useTransitions)
+        {
+            VisualStateManager.GoToState( this , IsEnabled ? NormalStateName : DisabledStateName , useTransitions );
+        }
+    }
+}
diff --git a/tests/Files.App.UITests/Dialogs/PropertiesGeneralPage.xaml b/tests/Files.App.UITests/Dialogs/PropertiesGeneralPage.xaml
index 972e96742591..f6e787b3d885 100644
--- a/tests/Files.App.UITests/Dialogs/PropertiesGeneralPage.xaml
+++ b/tests/Files.App.UITests/Dialogs/PropertiesGeneralPage.xaml
@@ -85,29 +85,59 @@
 						<Button
 							Grid.Column="1"
 							AutomationProperties.Name="Show additional information"
-							ToolTipService.ToolTip="Detailed text displayed on hover">
-							<FontIcon Glyph="&#xE946;" />
+							ToolTipService.ToolTip="Detailed text displayed on hover"
+							Visibility="Collapsed">
+							<FontIcon Glyph="&#xEA80;" />
 						</Button>
+						<controls:PropertiesViewInfo
+							Grid.Column="1"
+							AutomationProperties.Name="Show additional information"
+							ToolTipService.ToolTip="Detailed text displayed on hover" />
 					</Grid>
 				</controls:PropertiesViewCard>
+
+				<controls:PropertiesViewItemSeparator />
+
+				<controls:PropertiesViewCard Header="Disabled card" IsEnabled="False">
+					<TextBlock Text="Disabled value" />
+				</controls:PropertiesViewCard>
+
+				<controls:PropertiesViewItemSeparator />
+
+				<controls:PropertiesViewCard
+					AutomationProperties.AutomationId="ClickablePropertiesViewCard"
+					Header="Clickable card (no content)"
+					IsClickEnabled="True"
+					LabelWidth="Auto" />
+
+				<controls:PropertiesViewItemSeparator />
+
+				<controls:PropertiesViewCard
+					Header="Disabled clickable card (no content)"
+					IsClickEnabled="True"
+					IsEnabled="False"
+					LabelWidth="Auto" />
 				<controls:PropertiesViewItemSeparator />
 
 				<controls:PropertiesViewCard
-					x:Name="ClickableCard"
 					AutomationProperties.AutomationId="ClickablePropertiesViewCard"
-					Click="ClickableCard_Click"
+					Content="Content doesn't look so good in clickable cards"
+					FontSize="{ThemeResource BodyTextBlockFontSize}"
+					FontWeight="Semibold"
 					Header="Clickable card"
-					IsClickEnabled="True">
-					<TextBlock
-						x:Name="ClickResultText"
-						VerticalAlignment="Center"
-						Text="Not clicked" />
-				</controls:PropertiesViewCard>
+					IsClickEnabled="True"
+					LabelWidth="Auto" />
+
 				<controls:PropertiesViewItemSeparator />
 
-				<controls:PropertiesViewCard Header="Disabled card" IsEnabled="False">
-					<TextBlock Text="Disabled value" />
-				</controls:PropertiesViewCard>
+				<controls:PropertiesViewCard
+					Content="Content doesn't look so good in clickable cards"
+					FontSize="{ThemeResource BodyTextBlockFontSize}"
+					FontWeight="Semibold"
+					Header="Disabled clickable card"
+					IsClickEnabled="True"
+					IsEnabled="False"
+					LabelWidth="Auto" />
 			</StackPanel>
 		</controls:PropertiesViewExpander>
 
@@ -130,7 +160,7 @@
 			</StackPanel>
 		</controls:PropertiesViewExpander>
 
-		<controls:PropertiesViewExpander Header="Vertical and wrapping examples">
+		<controls:PropertiesViewExpander Header="Vertical examples" IsExpanded="True">
 			<controls:PropertiesViewExpander.HeaderIcon>
 				<SymbolIcon Symbol="SlideShow" />
 			</controls:PropertiesViewExpander.HeaderIcon>
@@ -148,25 +178,7 @@
 			</StackPanel>
 		</controls:PropertiesViewExpander>
 
-		<controls:PropertiesViewExpander Header="Right and wrapping examples">
-			<controls:PropertiesViewExpander.HeaderIcon>
-				<SymbolIcon Symbol="SlideShow" />
-			</controls:PropertiesViewExpander.HeaderIcon>
-			<StackPanel Padding="0,0,0,8">
-				<controls:PropertiesViewCard Header="Editable right value">
-					<TextBox
-						Margin="{StaticResource PropertiesValueTextBoxMargin}"
-						HorizontalAlignment="Stretch"
-						Text="Item value text" />
-				</controls:PropertiesViewCard>
-				<controls:PropertiesViewItemSeparator />
-				<controls:PropertiesViewCard Header="A long header that demonstrates wrapping when the available width becomes constrained">
-					<TextBlock Text="A long value that also wraps across multiple lines when the properties window becomes narrow." TextWrapping="Wrap" />
-				</controls:PropertiesViewCard>
-			</StackPanel>
-		</controls:PropertiesViewExpander>
-
-		<controls:PropertiesViewExpander Header="Toggle items" IsExpanded="True">
+		<controls:PropertiesViewExpander Header="Toggle items">
 			<controls:PropertiesViewExpander.HeaderIcon>
 				<SymbolIcon Symbol="XboxOneConsole" />
 			</controls:PropertiesViewExpander.HeaderIcon>
@@ -185,7 +197,7 @@
 			</StackPanel>
 		</controls:PropertiesViewExpander>
 
-		<controls:PropertiesViewExpander Header="Check box items" IsExpanded="True">
+		<controls:PropertiesViewExpander Header="Check box items">
 			<controls:PropertiesViewExpander.HeaderIcon>
 				<SymbolIcon Symbol="Accept" />
 			</controls:PropertiesViewExpander.HeaderIcon>
diff --git a/tests/Files.App.UITests/Dialogs/PropertiesGeneralPage.xaml.cs b/tests/Files.App.UITests/Dialogs/PropertiesGeneralPage.xaml.cs
index 56c657f36c34..a1cb5b1d296b 100644
--- a/tests/Files.App.UITests/Dialogs/PropertiesGeneralPage.xaml.cs
+++ b/tests/Files.App.UITests/Dialogs/PropertiesGeneralPage.xaml.cs
@@ -11,10 +11,5 @@ public PropertiesGeneralPage()
 		{
 			InitializeComponent();
 		}
-
-		private void ClickableCard_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
-		{
-			ClickResultText.Text = "Clicked";
-		}
 	}
 }

From 44e0f32f880e7ff0d2bd0a77ad6087b5bf2e37db Mon Sep 17 00:00:00 2001
From: Martin Anderson <mdta@live.co.uk>
Date: Sun, 23 Aug 2026 05:35:07 +0100
Subject: [PATCH 33/36] Some more work done on Styling - there will be more
 tweaks to make though

As @tera implements more of the Dialog pages, we will come across tweaks needed, that I may need help to solve.

At the moment we will need to adjust margins on text boxes, when in vertical cards - not sure if thats at the dialog level or something we need to do in the control.
---
 .../PropertiesView.ThemeResources.xaml        | 70 +++++++++++++++++++
 .../PropertiesView/PropertiesView.xaml        | 48 +++++++++----
 .../PropertiesView/PropertiesViewCard.xaml    | 46 +++++++++---
 .../PropertiesView/PropertiesViewInfo.cs      | 48 +++++++++----
 .../Dialogs/PropertiesDetailsPage.xaml        | 19 ++---
 .../Dialogs/PropertiesGeneralPage.xaml        | 15 ++--
 6 files changed, 197 insertions(+), 49 deletions(-)

diff --git a/src/Files.App.Controls/PropertiesView/PropertiesView.ThemeResources.xaml b/src/Files.App.Controls/PropertiesView/PropertiesView.ThemeResources.xaml
index 2b57301e1772..86823a705b52 100644
--- a/src/Files.App.Controls/PropertiesView/PropertiesView.ThemeResources.xaml
+++ b/src/Files.App.Controls/PropertiesView/PropertiesView.ThemeResources.xaml
@@ -39,8 +39,28 @@
 			<!--#endregion-->
 
 			<StaticResource x:Key="PropertiesItemSeparatorForeground" ResourceKey="DividerStrokeColorDefaultBrush" />
+
+			<Thickness x:Key="PropertiesValueTextBoxMargin">-12,0,0,0</Thickness>
+
+			<!--#region Light PropertiesViewInfo-->
+			<StaticResource x:Key="PropertiesViewInfoForeground" ResourceKey="AccentFillColorDefaultBrush" />
+			<StaticResource x:Key="PropertiesViewInfoPointerOverForeground" ResourceKey="AccentFillColorSecondaryBrush" />
+			<StaticResource x:Key="PropertiesViewInfoPressedForeground" ResourceKey="AccentFillColorTertiaryBrush" />
+			<StaticResource x:Key="PropertiesViewInfoDisabledForeground" ResourceKey="TextFillColorDisabledBrush" />
+
+			<StaticResource x:Key="PropertiesViewInfoBackground" ResourceKey="SubtleFillColorTransparentBrush" />
+			<StaticResource x:Key="PropertiesViewInfoPointerOverBackground" ResourceKey="SubtleFillColorSecondaryBrush" />
+			<StaticResource x:Key="PropertiesViewInfoPressedBackground" ResourceKey="SubtleFillColorSecondaryBrush" />
+			<StaticResource x:Key="PropertiesViewInfoDisabledBackground" ResourceKey="SubtleFillColorTransparentBrush" />
+
+			<StaticResource x:Key="PropertiesViewInfoBorderBrush" ResourceKey="CardStrokeColorDefaultBrush" />
+			<StaticResource x:Key="PropertiesViewInfoPointerOverBorderBrush" ResourceKey="DividerStrokeColorDefaultBrush" />
+			<StaticResource x:Key="PropertiesViewInfoPressedBorderBrush" ResourceKey="DividerStrokeColorDefaultBrush" />
+			<StaticResource x:Key="PropertiesViewInfoDisabledBorderBrush" ResourceKey="SubtleFillColorTransparentBrush" />
+			<!--#endregion-->
 		</ResourceDictionary>
 
+
 		<ResourceDictionary x:Key="Dark">
 			<!--#region Dark PropertiesExpander-->
 			<Thickness x:Key="PropertiesExpanderHeaderPadding">8,8,8,7</Thickness>
@@ -72,8 +92,29 @@
 			<!--#endregion-->
 
 			<StaticResource x:Key="PropertiesItemSeparatorForeground" ResourceKey="DividerStrokeColorDefaultBrush" />
+
+			<Thickness x:Key="PropertiesValueTextBoxMargin">-12,0,0,0</Thickness>
+
+			<!--#region Dark PropertiesViewInfo-->
+			<StaticResource x:Key="PropertiesViewInfoForeground" ResourceKey="AccentFillColorDefaultBrush" />
+			<StaticResource x:Key="PropertiesViewInfoPointerOverForeground" ResourceKey="AccentFillColorSecondaryBrush" />
+			<StaticResource x:Key="PropertiesViewInfoPressedForeground" ResourceKey="AccentFillColorTertiaryBrush" />
+			<StaticResource x:Key="PropertiesViewInfoDisabledForeground" ResourceKey="TextFillColorDisabledBrush" />
+
+			<StaticResource x:Key="PropertiesViewInfoBackground" ResourceKey="SubtleFillColorTransparentBrush" />
+			<StaticResource x:Key="PropertiesViewInfoPointerOverBackground" ResourceKey="SubtleFillColorSecondaryBrush" />
+			<StaticResource x:Key="PropertiesViewInfoPressedBackground" ResourceKey="SubtleFillColorSecondaryBrush" />
+			<StaticResource x:Key="PropertiesViewInfoDisabledBackground" ResourceKey="SubtleFillColorTransparentBrush" />
+
+			<StaticResource x:Key="PropertiesViewInfoBorderBrush" ResourceKey="CardStrokeColorDefaultBrush" />
+			<StaticResource x:Key="PropertiesViewInfoPointerOverBorderBrush" ResourceKey="DividerStrokeColorDefaultBrush" />
+			<StaticResource x:Key="PropertiesViewInfoPressedBorderBrush" ResourceKey="DividerStrokeColorDefaultBrush" />
+			<StaticResource x:Key="PropertiesViewInfoDisabledBorderBrush" ResourceKey="SubtleFillColorTransparentBrush" />
+			<!--#endregion-->
+
 		</ResourceDictionary>
 
+
 		<ResourceDictionary x:Key="HighContrast">
 			<!--#region HighContrastPropertiesExpander-->
 			<Thickness x:Key="PropertiesExpanderHeaderPadding">6,6,6,5</Thickness>
@@ -105,6 +146,26 @@
 			<!--#endregion-->
 
 			<StaticResource x:Key="PropertiesItemSeparatorForeground" ResourceKey="SystemColorWindowTextColorBrush" />
+
+			<Thickness x:Key="PropertiesValueTextBoxMargin">0,0,0,0</Thickness>
+
+			<!--#region HighContrast PropertiesViewInfo-->
+			<StaticResource x:Key="PropertiesViewInfoForeground" ResourceKey="SystemColorHighlightColor" />
+			<StaticResource x:Key="PropertiesViewInfoPointerOverForeground" ResourceKey="SystemColorHighlightTextColor" />
+			<StaticResource x:Key="PropertiesViewInfoPressedForeground" ResourceKey="SystemColorButtonFaceColor" />
+			<StaticResource x:Key="PropertiesViewInfoDisabledForeground" ResourceKey="SystemColorGrayTextColor" />
+
+			<StaticResource x:Key="PropertiesViewInfoBackground" ResourceKey="SystemControlTransparentBrush" />
+			<StaticResource x:Key="PropertiesViewInfoPointerOverBackground" ResourceKey="SystemColorHighlightColor" />
+			<StaticResource x:Key="PropertiesViewInfoPressedBackground" ResourceKey="SystemColorButtonTextColor" />
+			<StaticResource x:Key="PropertiesViewInfoDisabledBackground" ResourceKey="SystemControlTransparentBrush" />
+
+			<StaticResource x:Key="PropertiesViewInfoBorderBrush" ResourceKey="SystemControlTransparentBrush" />
+			<StaticResource x:Key="PropertiesViewInfoPointerOverBorderBrush" ResourceKey="SystemControlTransparentBrush" />
+			<StaticResource x:Key="PropertiesViewInfoPressedBorderBrush" ResourceKey="SystemControlTransparentBrush" />
+			<StaticResource x:Key="PropertiesViewInfoDisabledBorderBrush" ResourceKey="SystemControlTransparentBrush" />
+			<!--#endregion-->
+
 		</ResourceDictionary>
 
 	</ResourceDictionary.ThemeDictionaries>
@@ -145,4 +206,13 @@
 	<Thickness x:Key="PropertiesViewItemCheckPadding">0</Thickness>
 	<!--#endregion-->
 
+
+	<!--#region PropertiesViewInfo-->
+	<x:Double x:Key="PropertiesViewInfoSize">32</x:Double>
+	<x:Double x:Key="PropertiesViewInfoIconSize">16</x:Double>
+	<CornerRadius x:Key="PropertiesViewInfoCornerRadius">16</CornerRadius>
+	<!--  Half the size to make a circle  -->
+	<Thickness x:Key="PropertiesViewInfoBorderThickness">1</Thickness>
+	<!--#endregion-->
+
 </ResourceDictionary>
diff --git a/src/Files.App.Controls/PropertiesView/PropertiesView.xaml b/src/Files.App.Controls/PropertiesView/PropertiesView.xaml
index af17478e52f8..db013c40fad7 100644
--- a/src/Files.App.Controls/PropertiesView/PropertiesView.xaml
+++ b/src/Files.App.Controls/PropertiesView/PropertiesView.xaml
@@ -8,12 +8,16 @@
 	<Style BasedOn="{StaticResource DefaultPropertiesViewInfoStyle}" TargetType="local:PropertiesViewInfo" />
 
 	<Style x:Key="DefaultPropertiesViewInfoStyle" TargetType="local:PropertiesViewInfo">
-		<Setter Property="CornerRadius" Value="16" />
-		<Setter Property="Height" Value="32" />
-		<Setter Property="Width" Value="32" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="Background" Value="#55000000" />
-		<Setter Property="BorderBrush" Value="#55FFFFFF" />
+		<Setter Property="CornerRadius" Value="{StaticResource PropertiesViewInfoCornerRadius}" />
+		<Setter Property="Height" Value="{StaticResource PropertiesViewInfoSize}" />
+		<Setter Property="Width" Value="{StaticResource PropertiesViewInfoSize}" />
+		<Setter Property="MaxHeight" Value="{StaticResource PropertiesViewInfoSize}" />
+		<Setter Property="MaxWidth" Value="{StaticResource PropertiesViewInfoSize}" />
+		<Setter Property="BorderThickness" Value="{StaticResource PropertiesViewInfoBorderThickness}" />
+		<Setter Property="Background" Value="{ThemeResource PropertiesViewInfoBackground}" />
+		<Setter Property="Foreground" Value="{ThemeResource PropertiesViewInfoForeground}" />
+		<Setter Property="BorderBrush" Value="{ThemeResource PropertiesViewInfoBorderBrush}" />
+		<Setter Property="BackgroundSizing" Value="InnerBorderEdge" />
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="local:PropertiesViewInfo">
@@ -28,13 +32,14 @@
 							MaxWidth="{TemplateBinding MaxWidth}"
 							MaxHeight="{TemplateBinding MaxHeight}"
 							Background="{TemplateBinding Background}"
+							BackgroundSizing="{TemplateBinding BackgroundSizing}"
 							BorderBrush="{TemplateBinding BorderBrush}"
 							BorderThickness="{TemplateBinding BorderThickness}"
 							CornerRadius="{TemplateBinding CornerRadius}">
 							<Viewbox
 								x:Name="PART_InfoIconPresenterHolder"
-								MaxWidth="16"
-								MaxHeight="16"
+								MaxWidth="{StaticResource PropertiesViewInfoIconSize}"
+								MaxHeight="{StaticResource PropertiesViewInfoIconSize}"
 								Margin="0"
 								HorizontalAlignment="Center"
 								VerticalAlignment="Center">
@@ -43,23 +48,40 @@
 									HorizontalContentAlignment="Center"
 									VerticalContentAlignment="Center"
 									Content="{TemplateBinding InfoIcon}"
-									Foreground="Cyan" />
+									Foreground="{TemplateBinding Foreground}"
+									HighContrastAdjustment="None" />
 							</Viewbox>
 						</Border>
 
 						<VisualStateManager.VisualStateGroups>
 							<VisualStateGroup x:Name="CommonStates">
 								<VisualState x:Name="Normal">
-									<VisualState.Setters />
+									<VisualState.Setters>
+										<Setter Target="PART_InfoIconPresenter.Foreground" Value="{ThemeResource PropertiesViewInfoForeground}" />
+										<Setter Target="HoverVisual.Background" Value="{ThemeResource PropertiesViewInfoBackground}" />
+										<Setter Target="HoverVisual.BorderBrush" Value="{ThemeResource PropertiesViewInfoBorderBrush}" />
+									</VisualState.Setters>
 								</VisualState>
 								<VisualState x:Name="PointerOver">
-									<VisualState.Setters />
+									<VisualState.Setters>
+										<Setter Target="PART_InfoIconPresenter.Foreground" Value="{ThemeResource PropertiesViewInfoPointerOverForeground}" />
+										<Setter Target="HoverVisual.Background" Value="{ThemeResource PropertiesViewInfoPointerOverBackground}" />
+										<Setter Target="HoverVisual.BorderBrush" Value="{ThemeResource PropertiesViewInfoPointerOverBorderBrush}" />
+									</VisualState.Setters>
 								</VisualState>
 								<VisualState x:Name="Pressed">
-									<VisualState.Setters />
+									<VisualState.Setters>
+										<Setter Target="PART_InfoIconPresenter.Foreground" Value="{ThemeResource PropertiesViewInfoPressedForeground}" />
+										<Setter Target="HoverVisual.Background" Value="{ThemeResource PropertiesViewInfoPressedBackground}" />
+										<Setter Target="HoverVisual.BorderBrush" Value="{ThemeResource PropertiesViewInfoPressedBorderBrush}" />
+									</VisualState.Setters>
 								</VisualState>
 								<VisualState x:Name="Disabled">
-									<VisualState.Setters />
+									<VisualState.Setters>
+										<Setter Target="PART_InfoIconPresenter.Foreground" Value="{ThemeResource PropertiesViewInfoDisabledForeground}" />
+										<Setter Target="HoverVisual.Background" Value="{ThemeResource PropertiesViewInfoDisabledBackground}" />
+										<Setter Target="HoverVisual.BorderBrush" Value="{ThemeResource PropertiesViewInfoDisabledBorderBrush}" />
+									</VisualState.Setters>
 								</VisualState>
 							</VisualStateGroup>
 						</VisualStateManager.VisualStateGroups>
diff --git a/src/Files.App.Controls/PropertiesView/PropertiesViewCard.xaml b/src/Files.App.Controls/PropertiesView/PropertiesViewCard.xaml
index a7581b72f3be..5aac7632ab4d 100644
--- a/src/Files.App.Controls/PropertiesView/PropertiesViewCard.xaml
+++ b/src/Files.App.Controls/PropertiesView/PropertiesViewCard.xaml
@@ -28,8 +28,15 @@
 			<StaticResource x:Key="PropertiesViewCardBackgroundPressed" ResourceKey="SubtleFillColorTertiaryBrush" />
 			<StaticResource x:Key="PropertiesViewCardBackgroundDisabled" ResourceKey="SubtleFillColorDisabledBrush" />
 
+			<StaticResource x:Key="PropertiesViewCardBorderBrush" ResourceKey="SubtleFillColorTransparentBrush" />
+			<StaticResource x:Key="PropertiesViewCardBorderBrushPointerOver" ResourceKey="SubtleFillColorTransparentBrush" />
+			<StaticResource x:Key="PropertiesViewCardBorderBrushPressed" ResourceKey="SubtleFillColorTransparentBrush" />
+			<StaticResource x:Key="PropertiesViewCardBorderBrushDisabled" ResourceKey="SubtleFillColorTransparentBrush" />
+
 			<StaticResource x:Key="PropertiesViewCardInnerCornerRadius" ResourceKey="ControlCornerRadius" />
 			<StaticResource x:Key="PropertiesViewCardCornerRadius" ResourceKey="OverlayCornerRadius" />
+			<Thickness x:Key="PropertiesViewCardBorderThickness">0</Thickness>
+			<Thickness x:Key="PropertiesViewCardPadding">0,8</Thickness>
 		</ResourceDictionary>
 		<ResourceDictionary x:Key="Light">
 			<StaticResource x:Key="PropertiesViewCardActionIconForeground" ResourceKey="AccentTextFillColorPrimaryBrush" />
@@ -52,8 +59,15 @@
 			<StaticResource x:Key="PropertiesViewCardBackgroundPressed" ResourceKey="SubtleFillColorTertiaryBrush" />
 			<StaticResource x:Key="PropertiesViewCardBackgroundDisabled" ResourceKey="SubtleFillColorDisabledBrush" />
 
+			<StaticResource x:Key="PropertiesViewCardBorderBrush" ResourceKey="SubtleFillColorTransparentBrush" />
+			<StaticResource x:Key="PropertiesViewCardBorderBrushPointerOver" ResourceKey="SubtleFillColorTransparentBrush" />
+			<StaticResource x:Key="PropertiesViewCardBorderBrushPressed" ResourceKey="SubtleFillColorTransparentBrush" />
+			<StaticResource x:Key="PropertiesViewCardBorderBrushDisabled" ResourceKey="SubtleFillColorTransparentBrush" />
+
 			<StaticResource x:Key="PropertiesViewCardInnerCornerRadius" ResourceKey="ControlCornerRadius" />
 			<StaticResource x:Key="PropertiesViewCardCornerRadius" ResourceKey="OverlayCornerRadius" />
+			<Thickness x:Key="PropertiesViewCardBorderThickness">0</Thickness>
+			<Thickness x:Key="PropertiesViewCardPadding">0,8</Thickness>
 		</ResourceDictionary>
 		<ResourceDictionary x:Key="HighContrast">
 			<StaticResource x:Key="PropertiesViewCardActionIconForeground" ResourceKey="SystemColorHighlightColorBrush" />
@@ -71,20 +85,25 @@
 			<StaticResource x:Key="PropertiesViewCardContentForegroundPressed" ResourceKey="SystemColorHighlightColorBrush" />
 			<StaticResource x:Key="PropertiesViewCardContentForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
 
-			<StaticResource x:Key="PropertiesViewCardBackground" ResourceKey="SystemColorButtonTextColorBrush" />
-			<StaticResource x:Key="PropertiesViewCardBackgroundPointerOver" ResourceKey="SystemColorHighlightColorBrush" />
-			<StaticResource x:Key="PropertiesViewCardBackgroundPressed" ResourceKey="SystemColorHighlightColorBrush" />
+			<StaticResource x:Key="PropertiesViewCardBackground" ResourceKey="SystemColorButtonFaceColorBrush" />
+			<StaticResource x:Key="PropertiesViewCardBackgroundPointerOver" ResourceKey="SystemControlTransparentBrush" />
+			<StaticResource x:Key="PropertiesViewCardBackgroundPressed" ResourceKey="SystemControlTransparentBrush" />
 			<StaticResource x:Key="PropertiesViewCardBackgroundDisabled" ResourceKey="SystemControlTransparentBrush" />
 
+			<StaticResource x:Key="PropertiesViewCardBorderBrush" ResourceKey="SystemControlTransparentBrush" />
+			<StaticResource x:Key="PropertiesViewCardBorderBrushPointerOver" ResourceKey="SystemColorHighlightColorBrush" />
+			<StaticResource x:Key="PropertiesViewCardBorderBrushPressed" ResourceKey="SystemColorHighlightColorBrush" />
+			<StaticResource x:Key="PropertiesViewCardBorderBrushDisabled" ResourceKey="SystemControlTransparentBrush" />
+
 			<StaticResource x:Key="PropertiesViewCardInnerCornerRadius" ResourceKey="ControlCornerRadius" />
 			<StaticResource x:Key="PropertiesViewCardCornerRadius" ResourceKey="OverlayCornerRadius" />
+			<Thickness x:Key="PropertiesViewCardBorderThickness">2</Thickness>
+			<Thickness x:Key="PropertiesViewCardPadding">0,6</Thickness>
 		</ResourceDictionary>
 	</ResourceDictionary.ThemeDictionaries>
 
 	<GridLength x:Key="PropertiesViewCardDefaultLabelWidth">160</GridLength>
 
-	<Thickness x:Key="PropertiesViewCardPadding">0,8</Thickness>
-	<Thickness x:Key="PropertiesViewCardBorderThickness">0</Thickness>
 	<x:Double x:Key="PropertiesViewCardMinWidth">148</x:Double>
 	<x:Double x:Key="PropertiesViewCardMinHeight">48</x:Double>
 	<x:Double x:Key="PropertiesViewCardActionIconMaxSize">13</x:Double>
@@ -99,18 +118,18 @@
 	<Thickness x:Key="PropertiesViewCardContentMargin">0,8,0,8</Thickness>
 	<Thickness x:Key="PropertiesViewCardActionIconMargin">12,0,12,0</Thickness>
 
-	<Style BasedOn="{StaticResource TestPropertiesViewCardStyle}" TargetType="local:PropertiesViewCard" />
+	<Style BasedOn="{StaticResource DefaultPropertiesViewCardStyle}" TargetType="local:PropertiesViewCard" />
 
-	<Style x:Key="TestPropertiesViewCardStyle" TargetType="local:PropertiesViewCard">
+	<Style x:Key="DefaultPropertiesViewCardStyle" TargetType="local:PropertiesViewCard">
 		<Setter Property="HorizontalAlignment" Value="Stretch" />
 		<Setter Property="MinHeight" Value="{StaticResource PropertiesViewCardMinHeight}" />
 		<Setter Property="Background" Value="Transparent" />
 		<Setter Property="BorderBrush" Value="Transparent" />
 		<Setter Property="Foreground" Value="{ThemeResource PropertiesViewCardContentForeground}" />
-		<Setter Property="BorderThickness" Value="{StaticResource PropertiesViewCardBorderThickness}" />
+		<Setter Property="BorderThickness" Value="{ThemeResource PropertiesViewCardBorderThickness}" />
 		<Setter Property="MinWidth" Value="{StaticResource PropertiesViewCardMinWidth}" />
 		<Setter Property="LabelWidth" Value="{StaticResource PropertiesViewCardDefaultLabelWidth}" />
-		<Setter Property="Padding" Value="{StaticResource PropertiesViewCardPadding}" />
+		<Setter Property="Padding" Value="{ThemeResource PropertiesViewCardPadding}" />
 		<Setter Property="IsTabStop" Value="False" />
 		<Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
 		<Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
@@ -139,6 +158,8 @@
 							HorizontalAlignment="Stretch"
 							muxc:AnimatedIcon.State="Normal"
 							Background="{ThemeResource PropertiesViewCardBackground}"
+							BorderBrush="{ThemeResource PropertiesViewCardBorderBrush}"
+							BorderThickness="{TemplateBinding BorderThickness}"
 							CornerRadius="{ThemeResource PropertiesViewCardInnerCornerRadius}">
 							<Grid.RowDefinitions>
 								<RowDefinition x:Name="Row_Label" Height="Auto" />
@@ -194,7 +215,8 @@
 								HorizontalAlignment="Center"
 								VerticalAlignment="Center"
 								Background="Yellow"
-								Canvas.ZIndex="9999" />
+								Canvas.ZIndex="9999"
+								Visibility="Collapsed" />
 
 
 							<Viewbox
@@ -222,6 +244,7 @@
 										<Setter Target="PART_RootGrid.Background" Value="{ThemeResource PropertiesViewCardBackground}" />
 										<Setter Target="PART_HeaderPresenter.Foreground" Value="{ThemeResource PropertiesViewCardHeaderForeground}" />
 										<Setter Target="PART_ActionIconPresenter.Foreground" Value="{ThemeResource PropertiesViewCardHeaderForeground}" />
+										<Setter Target="PART_RootGrid.BorderBrush" Value="{ThemeResource PropertiesViewCardBorderBrush}" />
 									</VisualState.Setters>
 								</VisualState>
 								<VisualState x:Name="PointerOver">
@@ -230,6 +253,7 @@
 										<Setter Target="PART_HeaderPresenter.Foreground" Value="{ThemeResource PropertiesViewCardHeaderForegroundPointerOver}" />
 										<Setter Target="PART_ActionIconPresenter.Foreground" Value="{ThemeResource PropertiesViewCardHeaderForegroundPointerOver}" />
 										<Setter Target="PART_ContentPresenter.Foreground" Value="{ThemeResource PropertiesViewCardContentForegroundPointerOver}" />
+										<Setter Target="PART_RootGrid.BorderBrush" Value="{ThemeResource PropertiesViewCardBorderBrushPointerOver}" />
 									</VisualState.Setters>
 								</VisualState>
 								<VisualState x:Name="Pressed">
@@ -238,6 +262,7 @@
 										<Setter Target="PART_HeaderPresenter.Foreground" Value="{ThemeResource PropertiesViewCardHeaderForegroundPressed}" />
 										<Setter Target="PART_ActionIconPresenter.Foreground" Value="{ThemeResource PropertiesViewCardHeaderForegroundPressed}" />
 										<Setter Target="PART_ContentPresenter.Foreground" Value="{ThemeResource PropertiesViewCardContentForegroundPressed}" />
+										<Setter Target="PART_RootGrid.BorderBrush" Value="{ThemeResource PropertiesViewCardBorderBrushPressed}" />
 									</VisualState.Setters>
 								</VisualState>
 								<VisualState x:Name="Disabled">
@@ -246,6 +271,7 @@
 										<Setter Target="PART_HeaderPresenter.Foreground" Value="{ThemeResource PropertiesViewCardHeaderForegroundDisabled}" />
 										<Setter Target="PART_ActionIconPresenter.Foreground" Value="{ThemeResource PropertiesViewCardHeaderForegroundDisabled}" />
 										<Setter Target="PART_ContentPresenter.Foreground" Value="{ThemeResource PropertiesViewCardContentForegroundDisabled}" />
+										<Setter Target="PART_RootGrid.BorderBrush" Value="{ThemeResource PropertiesViewCardBorderBrushDisabled}" />
 									</VisualState.Setters>
 								</VisualState>
 							</VisualStateGroup>
diff --git a/src/Files.App.Controls/PropertiesView/PropertiesViewInfo.cs b/src/Files.App.Controls/PropertiesView/PropertiesViewInfo.cs
index c13183698152..6c585d17dd42 100644
--- a/src/Files.App.Controls/PropertiesView/PropertiesViewInfo.cs
+++ b/src/Files.App.Controls/PropertiesView/PropertiesViewInfo.cs
@@ -62,38 +62,62 @@ protected override void OnApplyTemplate()
         protected override void OnPointerPressed(PointerRoutedEventArgs e)
         {
             base.OnPointerPressed( e );
-            VisualStateManager.GoToState( this , PressedStateName , true );
-        }
+
+			if ( IsEnabled )
+				VisualStateManager.GoToState( this , PressedStateName , true );
+			else
+				VisualStateManager.GoToState( this , DisabledStateName , true );
+		}
 
         protected override void OnPointerReleased(PointerRoutedEventArgs e)
         {
             base.OnPointerReleased( e );
-            VisualStateManager.GoToState( this , NormalStateName , true );
-        }
+
+			if ( IsEnabled )
+				VisualStateManager.GoToState( this , NormalStateName , true );
+			else
+				VisualStateManager.GoToState( this , DisabledStateName , true );
+		}
 
         protected override void OnPointerEntered(PointerRoutedEventArgs e)
         {
             base.OnPointerEntered( e );
-            VisualStateManager.GoToState( this , PointerOverStateName , true );
-        }
+
+			if ( IsEnabled )
+				VisualStateManager.GoToState( this , PointerOverStateName , true );
+			else
+				VisualStateManager.GoToState( this , DisabledStateName , true );
+		}
 
         protected override void OnPointerExited(PointerRoutedEventArgs e)
         {
             base.OnPointerExited( e );
-            VisualStateManager.GoToState( this , NormalStateName , true );
-        }
+
+			if ( IsEnabled )
+				VisualStateManager.GoToState( this , NormalStateName , true );
+			else
+				VisualStateManager.GoToState( this , DisabledStateName , true );
+		}
 
         protected override void OnPointerCaptureLost(PointerRoutedEventArgs e)
         {
             base.OnPointerCaptureLost( e );
-            VisualStateManager.GoToState( this , NormalStateName , true );
-        }
+
+			if ( IsEnabled )
+				VisualStateManager.GoToState( this , NormalStateName , true );
+			else
+				VisualStateManager.GoToState( this , DisabledStateName , true );
+		}
 
         protected override void OnPointerCanceled(PointerRoutedEventArgs e)
         {
             base.OnPointerCanceled( e );
-            VisualStateManager.GoToState( this , NormalStateName , true );
-        }
+
+			if ( IsEnabled )
+				VisualStateManager.GoToState( this , NormalStateName , true );
+			else
+				VisualStateManager.GoToState( this , DisabledStateName , true );
+		}
 
         protected override void OnKeyDown(KeyRoutedEventArgs e)
         {
diff --git a/tests/Files.App.UITests/Dialogs/PropertiesDetailsPage.xaml b/tests/Files.App.UITests/Dialogs/PropertiesDetailsPage.xaml
index fe0978e0b09a..7c59fea2c251 100644
--- a/tests/Files.App.UITests/Dialogs/PropertiesDetailsPage.xaml
+++ b/tests/Files.App.UITests/Dialogs/PropertiesDetailsPage.xaml
@@ -8,13 +8,13 @@
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 	mc:Ignorable="d">
 	<Page.Resources>
-		<ResourceDictionary>
-			<GridLength x:Key="PropertiesDetailsLabelWidth">200</GridLength>
-			<Thickness x:Key="PropertiesValueTextBoxMargin">-12,0,0,0</Thickness>
-			<Style BasedOn="{StaticResource DefaultPropertiesViewCardStyle}" TargetType="controls:PropertiesViewCard">
-				<Setter Property="LabelWidth" Value="{StaticResource PropertiesDetailsLabelWidth}" />
-			</Style>
-		</ResourceDictionary>
+
+		<GridLength x:Key="PropertiesDetailsLabelWidth">200</GridLength>
+		<Style BasedOn="{StaticResource DefaultPropertiesViewCardStyle}" TargetType="controls:PropertiesViewCard">
+			<Setter Property="LabelWidth" Value="{StaticResource PropertiesDetailsLabelWidth}" />
+			<Setter Property="VerticalAlignment" Value="Center" />
+		</Style>
+
 	</Page.Resources>
 
 	<controls:PropertiesView>
@@ -23,11 +23,12 @@
 			<controls:PropertiesViewExpander.HeaderIcon>
 				<FontIcon Glyph="&#xF0E3;" />
 			</controls:PropertiesViewExpander.HeaderIcon>
-			<StackPanel Padding="0,0,0,8">
+			<StackPanel Padding="0,0,0,8" HorizontalAlignment="Stretch">
 				<controls:PropertiesViewCard Header="Description" Orientation="Vertical">
 					<TextBox
 						MinHeight="96"
-						Margin="{StaticResource PropertiesValueTextBoxMargin}"
+						Margin="-12,0"
+						Padding="24,4"
 						AcceptsReturn="True"
 						Text="Add a description for this file."
 						TextWrapping="Wrap" />
diff --git a/tests/Files.App.UITests/Dialogs/PropertiesGeneralPage.xaml b/tests/Files.App.UITests/Dialogs/PropertiesGeneralPage.xaml
index f6e787b3d885..03bf94633e5e 100644
--- a/tests/Files.App.UITests/Dialogs/PropertiesGeneralPage.xaml
+++ b/tests/Files.App.UITests/Dialogs/PropertiesGeneralPage.xaml
@@ -11,8 +11,7 @@
 	<Page.Resources>
 		<ResourceDictionary>
 			<GridLength x:Key="PropertiesGeneralLabelWidth">148</GridLength>
-			<Thickness x:Key="PropertiesValueTextBoxMargin">-12,0,0,0</Thickness>
-			<Style BasedOn="{StaticResource TestPropertiesViewCardStyle}" TargetType="controls:PropertiesViewCard">
+			<Style BasedOn="{StaticResource DefaultPropertiesViewCardStyle}" TargetType="controls:PropertiesViewCard">
 				<Setter Property="LabelWidth" Value="{StaticResource PropertiesGeneralLabelWidth}" />
 				<Setter Property="VerticalAlignment" Value="Center" />
 			</Style>
@@ -61,7 +60,7 @@
 			<StackPanel Padding="0,0,0,8" HorizontalAlignment="Stretch">
 				<controls:PropertiesViewCard Header="Name">
 					<TextBox
-						Margin="{StaticResource PropertiesValueTextBoxMargin}"
+						Margin="{ThemeResource PropertiesValueTextBoxMargin}"
 						HorizontalAlignment="Stretch"
 						Text="Filename here" />
 				</controls:PropertiesViewCard>
@@ -76,10 +75,11 @@
 				<controls:PropertiesViewItemSeparator />
 
 				<controls:PropertiesViewCard Header="Additional information">
-					<Grid ColumnSpacing="8">
+					<Grid ColumnSpacing="12">
 						<Grid.ColumnDefinitions>
 							<ColumnDefinition Width="Auto" />
 							<ColumnDefinition Width="Auto" />
+							<ColumnDefinition Width="Auto" />
 						</Grid.ColumnDefinitions>
 						<TextBlock VerticalAlignment="Center" Text="Information value" />
 						<Button
@@ -93,6 +93,11 @@
 							Grid.Column="1"
 							AutomationProperties.Name="Show additional information"
 							ToolTipService.ToolTip="Detailed text displayed on hover" />
+						<controls:PropertiesViewInfo
+							Grid.Column="2"
+							AutomationProperties.Name="Show additional information"
+							IsEnabled="False"
+							ToolTipService.ToolTip="Detailed text displayed on hover" />
 					</Grid>
 				</controls:PropertiesViewCard>
 
@@ -167,7 +172,7 @@
 			<StackPanel Padding="0,0,0,8" HorizontalAlignment="Stretch">
 				<controls:PropertiesViewCard Header="Editable vertical value" Orientation="Vertical">
 					<TextBox
-						Margin="{StaticResource PropertiesValueTextBoxMargin}"
+						Margin="{ThemeResource PropertiesValueTextBoxMargin}"
 						HorizontalAlignment="Stretch"
 						Text="Item value text" />
 				</controls:PropertiesViewCard>

From 1308fa780b13bb552329003076943b8077c49b81 Mon Sep 17 00:00:00 2001
From: Martin Anderson <mdta@live.co.uk>
Date: Sun, 23 Aug 2026 17:54:20 +0100
Subject: [PATCH 34/36] Slight tidy ups

---
 .../PropertiesView.ThemeResources.xaml        |  2 +-
 .../Dialogs/PropertiesGeneralPage.xaml        | 51 +++++++++++--------
 2 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/src/Files.App.Controls/PropertiesView/PropertiesView.ThemeResources.xaml b/src/Files.App.Controls/PropertiesView/PropertiesView.ThemeResources.xaml
index 86823a705b52..45c7018552a6 100644
--- a/src/Files.App.Controls/PropertiesView/PropertiesView.ThemeResources.xaml
+++ b/src/Files.App.Controls/PropertiesView/PropertiesView.ThemeResources.xaml
@@ -173,7 +173,7 @@
 	<!--#region PropertiesExpander-->
 	<x:Double x:Key="PropertiesExpanderMinHeight">48</x:Double>
 
-	<Thickness x:Key="PropertiesExpanderHeaderInnerPadding">12,0,24,0</Thickness>
+	<Thickness x:Key="PropertiesExpanderHeaderInnerPadding">8,0,24,0</Thickness>
 	<Thickness x:Key="PropertiesExpanderChevronMargin">0,0,8,0</Thickness>
 	<x:Double x:Key="PropertiesExpanderChevronSpaceWidth">24</x:Double>
 	<x:Double x:Key="PropertiesExpanderChevronSpaceHeight">32</x:Double>
diff --git a/tests/Files.App.UITests/Dialogs/PropertiesGeneralPage.xaml b/tests/Files.App.UITests/Dialogs/PropertiesGeneralPage.xaml
index 03bf94633e5e..5bf8ccafdc2f 100644
--- a/tests/Files.App.UITests/Dialogs/PropertiesGeneralPage.xaml
+++ b/tests/Files.App.UITests/Dialogs/PropertiesGeneralPage.xaml
@@ -10,7 +10,7 @@
 	mc:Ignorable="d">
 	<Page.Resources>
 		<ResourceDictionary>
-			<GridLength x:Key="PropertiesGeneralLabelWidth">148</GridLength>
+			<GridLength x:Key="PropertiesGeneralLabelWidth">152</GridLength>
 			<Style BasedOn="{StaticResource DefaultPropertiesViewCardStyle}" TargetType="controls:PropertiesViewCard">
 				<Setter Property="LabelWidth" Value="{StaticResource PropertiesGeneralLabelWidth}" />
 				<Setter Property="VerticalAlignment" Value="Center" />
@@ -74,37 +74,40 @@
 				</controls:PropertiesViewCard>
 				<controls:PropertiesViewItemSeparator />
 
+				<controls:PropertiesViewItemSeparator />
+
+				<controls:PropertiesViewCard Header="Disabled card" IsEnabled="False">
+					<TextBlock Text="Disabled value" />
+				</controls:PropertiesViewCard>
+
 				<controls:PropertiesViewCard Header="Additional information">
 					<Grid ColumnSpacing="12">
 						<Grid.ColumnDefinitions>
 							<ColumnDefinition Width="Auto" />
 							<ColumnDefinition Width="Auto" />
-							<ColumnDefinition Width="Auto" />
 						</Grid.ColumnDefinitions>
 						<TextBlock VerticalAlignment="Center" Text="Information value" />
-						<Button
-							Grid.Column="1"
-							AutomationProperties.Name="Show additional information"
-							ToolTipService.ToolTip="Detailed text displayed on hover"
-							Visibility="Collapsed">
-							<FontIcon Glyph="&#xEA80;" />
-						</Button>
 						<controls:PropertiesViewInfo
 							Grid.Column="1"
 							AutomationProperties.Name="Show additional information"
 							ToolTipService.ToolTip="Detailed text displayed on hover" />
-						<controls:PropertiesViewInfo
-							Grid.Column="2"
-							AutomationProperties.Name="Show additional information"
-							IsEnabled="False"
-							ToolTipService.ToolTip="Detailed text displayed on hover" />
 					</Grid>
 				</controls:PropertiesViewCard>
 
 				<controls:PropertiesViewItemSeparator />
 
 				<controls:PropertiesViewCard Header="Disabled card" IsEnabled="False">
-					<TextBlock Text="Disabled value" />
+					<Grid ColumnSpacing="12">
+						<Grid.ColumnDefinitions>
+							<ColumnDefinition Width="Auto" />
+							<ColumnDefinition Width="Auto" />
+						</Grid.ColumnDefinitions>
+						<TextBlock VerticalAlignment="Center" Text="Information value" />
+						<controls:PropertiesViewInfo
+							Grid.Column="1"
+							AutomationProperties.Name="Show additional information"
+							ToolTipService.ToolTip="Detailed text displayed on hover" />
+					</Grid>
 				</controls:PropertiesViewCard>
 
 				<controls:PropertiesViewItemSeparator />
@@ -152,15 +155,18 @@
 			</controls:PropertiesViewExpander.HeaderIcon>
 			<StackPanel Padding="0,0,0,8" HorizontalAlignment="Stretch">
 				<controls:PropertiesViewCard Header="Read-only rating">
-					<RatingControl IsReadOnly="True" Value="4" />
+					<RatingControl
+						HorizontalAlignment="Left"
+						IsReadOnly="True"
+						Value="4" />
 				</controls:PropertiesViewCard>
 				<controls:PropertiesViewItemSeparator />
 				<controls:PropertiesViewCard Header="Editable rating">
-					<RatingControl Value="3" />
+					<RatingControl HorizontalAlignment="Left" Value="3" />
 				</controls:PropertiesViewCard>
 				<controls:PropertiesViewItemSeparator />
 				<controls:PropertiesViewCard Header="Disabled rating" IsEnabled="False">
-					<RatingControl Value="2" />
+					<RatingControl HorizontalAlignment="Left" Value="2" />
 				</controls:PropertiesViewCard>
 			</StackPanel>
 		</controls:PropertiesViewExpander>
@@ -170,11 +176,12 @@
 				<SymbolIcon Symbol="SlideShow" />
 			</controls:PropertiesViewExpander.HeaderIcon>
 			<StackPanel Padding="0,0,0,8" HorizontalAlignment="Stretch">
+				<controls:PropertiesViewCard Header="Typical label example" Orientation="Vertical">
+					<TextBlock Text="A simple value here below." TextWrapping="Wrap" />
+				</controls:PropertiesViewCard>
+				<controls:PropertiesViewItemSeparator />
 				<controls:PropertiesViewCard Header="Editable vertical value" Orientation="Vertical">
-					<TextBox
-						Margin="{ThemeResource PropertiesValueTextBoxMargin}"
-						HorizontalAlignment="Stretch"
-						Text="Item value text" />
+					<TextBox HorizontalAlignment="Stretch" Text="Item value text" />
 				</controls:PropertiesViewCard>
 				<controls:PropertiesViewItemSeparator />
 				<controls:PropertiesViewCard Header="A long header that demonstrates wrapping when the available width becomes constrained" Orientation="Vertical">

From 488a60802955aff40373f77d9152043ec7975c82 Mon Sep 17 00:00:00 2001
From: Martin Anderson <mdta@live.co.uk>
Date: Tue, 25 Aug 2026 09:08:55 +0100
Subject: [PATCH 35/36] Solved the Issue with Content not stretching when right
 aligned...

I have added DependencyProperties to set the alignment via static resources, which allows us to override them in XAML so when placing a TextBox (or other control that needs it) in a PropertiesViewCard - we can have it behave differently when hitting the Left, Right and Wrapped breakpoints (Vertical uses wrapped)

The idea came to me when I was attempting to sleep...
---
 .../PropertiesViewCard.Properties.cs          | 27 +++++++++++++
 .../PropertiesView/PropertiesViewCard.cs      | 38 +++++++++++++++++++
 .../PropertiesView/PropertiesViewCard.xaml    | 31 ++++++++++++---
 .../Dialogs/PropertiesGeneralPage.xaml        | 11 +++++-
 4 files changed, 99 insertions(+), 8 deletions(-)

diff --git a/src/Files.App.Controls/PropertiesView/PropertiesViewCard.Properties.cs b/src/Files.App.Controls/PropertiesView/PropertiesViewCard.Properties.cs
index 5e4a0c9f7e1c..63f97be3448c 100644
--- a/src/Files.App.Controls/PropertiesView/PropertiesViewCard.Properties.cs
+++ b/src/Files.App.Controls/PropertiesView/PropertiesViewCard.Properties.cs
@@ -44,6 +44,33 @@ public GridLength LabelWidth
 
 	[GeneratedDependencyProperty(DefaultValue = Orientation.Horizontal)]
 	public partial Orientation Orientation { get; set; }
+
+
+
+
+	#region ContentAlignment for Breakpoints
+
+	[GeneratedDependencyProperty( DefaultValue = HorizontalAlignment.Left )]
+	public partial HorizontalAlignment LeftBreakpointHorizontalContentAlignment {  get; set; }
+
+	[GeneratedDependencyProperty( DefaultValue = HorizontalAlignment.Right )]
+	public partial HorizontalAlignment RightBreakpointHorizontalContentAlignment { get; set; }
+
+	[GeneratedDependencyProperty( DefaultValue = HorizontalAlignment.Stretch )]
+	public partial HorizontalAlignment WrappedBreakpointHorizontalContentAlignment { get; set; }
+
+
+
+	[GeneratedDependencyProperty( DefaultValue = VerticalAlignment.Center )]
+	public partial VerticalAlignment LeftBreakpointVerticalContentAlignment { get; set; }
+
+	[GeneratedDependencyProperty( DefaultValue = VerticalAlignment.Center )]
+	public partial VerticalAlignment RightBreakpointVerticalContentAlignment { get; set; }
+
+	[GeneratedDependencyProperty( DefaultValue = VerticalAlignment.Center )]
+	public partial VerticalAlignment WrappedBreakpointVerticalContentAlignment { get; set; }
+
+	#endregion
 }
 
 public enum PropertiesViewCardContentAlignment
diff --git a/src/Files.App.Controls/PropertiesView/PropertiesViewCard.cs b/src/Files.App.Controls/PropertiesView/PropertiesViewCard.cs
index 0aa974a257af..91524e1cb66a 100644
--- a/src/Files.App.Controls/PropertiesView/PropertiesViewCard.cs
+++ b/src/Files.App.Controls/PropertiesView/PropertiesViewCard.cs
@@ -326,4 +326,42 @@ private static bool IsNullOrEmptyString(object? value)
 	{
 		return value is null or "";
 	}
+
+
+
+
+	#region ContentAlignment for Breakpoint events
+
+	private void OnLeftBreakpointHorizontalContentAlignmentChanged(object sender , DependencyPropertyChangedEventArgs e)
+	{
+	}
+
+	private void OnRightBreakpointHorizontalContentAlignmentChanged(object sender , DependencyPropertyChangedEventArgs e)
+	{
+
+	}
+
+	private void OnWrappedBreakpointHorizontalContentAlignmentChanged(object sender , DependencyPropertyChangedEventArgs e)
+	{
+
+	}
+
+
+
+	private void OnLeftBreakpointVerticalContentAlignmentChanged(object sender , DependencyPropertyChangedEventArgs e)
+	{
+
+	}
+
+	private void OnRightBreakpointVerticalContentAlignmentChanged(object sender , DependencyPropertyChangedEventArgs e)
+	{
+
+	}
+
+	private void OnWrappedBreakpointVerticalContentAlignmentChanged(object sender , DependencyPropertyChangedEventArgs e)
+	{
+
+	}
+
+	#endregion
 }
diff --git a/src/Files.App.Controls/PropertiesView/PropertiesViewCard.xaml b/src/Files.App.Controls/PropertiesView/PropertiesViewCard.xaml
index 5aac7632ab4d..c78b591cf293 100644
--- a/src/Files.App.Controls/PropertiesView/PropertiesViewCard.xaml
+++ b/src/Files.App.Controls/PropertiesView/PropertiesViewCard.xaml
@@ -118,6 +118,17 @@
 	<Thickness x:Key="PropertiesViewCardContentMargin">0,8,0,8</Thickness>
 	<Thickness x:Key="PropertiesViewCardActionIconMargin">12,0,12,0</Thickness>
 
+	<HorizontalAlignment x:Key="PropertiesViewCardLeftHorizontalAlignment">Left</HorizontalAlignment>
+	<HorizontalAlignment x:Key="PropertiesViewCardRightHorizontalAlignment">Right</HorizontalAlignment>
+	<HorizontalAlignment x:Key="PropertiesViewCardWrappedHorizontalAlignment">Stretch</HorizontalAlignment>
+	<VerticalAlignment x:Key="PropertiesViewCardLeftVerticallignment">Center</VerticalAlignment>
+	<VerticalAlignment x:Key="PropertiesViewCardRightVerticalAlignment">Center</VerticalAlignment>
+	<VerticalAlignment x:Key="PropertiesViewCardWrappedVerticalAlignment">Center</VerticalAlignment>
+
+
+	<HorizontalAlignment x:Key="PropertiesViewCardLabelHorizontalAlignment">Stretch</HorizontalAlignment>
+	<VerticalAlignment x:Key="PropertiesViewCardLabelVerticalAlignment">Center</VerticalAlignment>
+
 	<Style BasedOn="{StaticResource DefaultPropertiesViewCardStyle}" TargetType="local:PropertiesViewCard" />
 
 	<Style x:Key="DefaultPropertiesViewCardStyle" TargetType="local:PropertiesViewCard">
@@ -136,6 +147,12 @@
 		<Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}" />
 		<Setter Property="FontWeight" Value="Normal" />
 		<Setter Property="FocusVisualMargin" Value="-3" />
+		<Setter Property="LeftBreakpointHorizontalContentAlignment" Value="{StaticResource PropertiesViewCardLeftHorizontalAlignment}" />
+		<Setter Property="RightBreakpointHorizontalContentAlignment" Value="{StaticResource PropertiesViewCardRightHorizontalAlignment}" />
+		<Setter Property="WrappedBreakpointHorizontalContentAlignment" Value="{StaticResource PropertiesViewCardWrappedHorizontalAlignment}" />
+		<Setter Property="LeftBreakpointVerticalContentAlignment" Value="{StaticResource PropertiesViewCardLeftVerticallignment}" />
+		<Setter Property="RightBreakpointVerticalContentAlignment" Value="{StaticResource PropertiesViewCardRightVerticalAlignment}" />
+		<Setter Property="WrappedBreakpointVerticalContentAlignment" Value="{StaticResource PropertiesViewCardWrappedVerticalAlignment}" />
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="local:PropertiesViewCard">
@@ -180,8 +197,8 @@
 								Margin="{StaticResource PropertiesViewCardHeaderMargin}"
 								HorizontalAlignment="Left"
 								VerticalAlignment="Center"
-								HorizontalContentAlignment="Stretch"
-								VerticalContentAlignment="Center"
+								HorizontalContentAlignment="{StaticResource PropertiesViewCardLabelHorizontalAlignment}"
+								VerticalContentAlignment="{StaticResource PropertiesViewCardLabelVerticalAlignment}"
 								Content="{TemplateBinding Header}"
 								ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
 								FontFamily="{TemplateBinding FontFamily}"
@@ -198,8 +215,8 @@
 								Grid.Column="2"
 								Grid.ColumnSpan="1"
 								Margin="{StaticResource PropertiesViewCardContentMargin}"
-								HorizontalContentAlignment="Stretch"
-								VerticalContentAlignment="Center"
+								HorizontalContentAlignment="{Binding LeftBreakpointHorizontalContentAlignment, RelativeSource={RelativeSource TemplatedParent}}"
+								VerticalContentAlignment="{Binding LeftBreakpointVerticalContentAlignment, RelativeSource={RelativeSource TemplatedParent}}"
 								Content="{TemplateBinding Content}"
 								Foreground="{TemplateBinding Foreground}"
 								TextWrapping="WrapWholeWords" />
@@ -338,7 +355,8 @@
 										<Setter Target="PART_ContentPresenter.(Grid.ColumnSpan)" Value="3" />
 
 										<Setter Target="PART_ContentPresenter.HorizontalAlignment" Value="Stretch" />
-										<Setter Target="PART_ContentPresenter.HorizontalContentAlignment" Value="Stretch" />
+										<Setter Target="PART_ContentPresenter.HorizontalContentAlignment" Value="{Binding WrappedBreakpointHorizontalContentAlignment, RelativeSource={RelativeSource TemplatedParent}}" />
+										<Setter Target="PART_ContentPresenter.VerticalContentAlignment" Value="{Binding WrappedBreakpointVerticalContentAlignment, RelativeSource={RelativeSource TemplatedParent}}" />
 									</VisualState.Setters>
 
 								</VisualState>
@@ -354,7 +372,8 @@
 									</VisualState.StateTriggers>
 									<VisualState.Setters>
 										<Setter Target="PART_ContentPresenter.HorizontalAlignment" Value="Stretch" />
-										<Setter Target="PART_ContentPresenter.HorizontalContentAlignment" Value="Right" />
+										<Setter Target="PART_ContentPresenter.HorizontalContentAlignment" Value="{Binding RightBreakpointHorizontalContentAlignment, RelativeSource={RelativeSource TemplatedParent}}" />
+										<Setter Target="PART_ContentPresenter.VerticalContentAlignment" Value="{Binding RightBreakpointVerticalContentAlignment, RelativeSource={RelativeSource TemplatedParent}}" />
 									</VisualState.Setters>
 
 								</VisualState>
diff --git a/tests/Files.App.UITests/Dialogs/PropertiesGeneralPage.xaml b/tests/Files.App.UITests/Dialogs/PropertiesGeneralPage.xaml
index 5bf8ccafdc2f..c28c8f500ef9 100644
--- a/tests/Files.App.UITests/Dialogs/PropertiesGeneralPage.xaml
+++ b/tests/Files.App.UITests/Dialogs/PropertiesGeneralPage.xaml
@@ -58,7 +58,10 @@
 				<SymbolIcon Symbol="Document" />
 			</controls:PropertiesViewExpander.HeaderIcon>
 			<StackPanel Padding="0,0,0,8" HorizontalAlignment="Stretch">
-				<controls:PropertiesViewCard Header="Name">
+				<controls:PropertiesViewCard
+					Header="Name"
+					LeftBreakpointHorizontalContentAlignment="Stretch"
+					RightBreakpointHorizontalContentAlignment="Stretch">
 					<TextBox
 						Margin="{ThemeResource PropertiesValueTextBoxMargin}"
 						HorizontalAlignment="Stretch"
@@ -180,7 +183,11 @@
 					<TextBlock Text="A simple value here below." TextWrapping="Wrap" />
 				</controls:PropertiesViewCard>
 				<controls:PropertiesViewItemSeparator />
-				<controls:PropertiesViewCard Header="Editable vertical value" Orientation="Vertical">
+				<controls:PropertiesViewCard
+					Header="Editable vertical value"
+					LeftBreakpointHorizontalContentAlignment="Stretch"
+					Orientation="Vertical"
+					RightBreakpointHorizontalContentAlignment="Stretch">
 					<TextBox HorizontalAlignment="Stretch" Text="Item value text" />
 				</controls:PropertiesViewCard>
 				<controls:PropertiesViewItemSeparator />

From b469e234bd5f410d589d70b700615abd4098166b Mon Sep 17 00:00:00 2001
From: Martin Anderson <mdta@live.co.uk>
Date: Thu, 27 Aug 2026 01:36:49 +0100
Subject: [PATCH 36/36] Adjusted the styles for the PropertiesViewInfo control

---
 .../PropertiesView.ThemeResources.xaml        | 52 ++++++++--------
 .../PropertiesView/PropertiesViewInfo.cs      | 60 +++++++++----------
 2 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/src/Files.App.Controls/PropertiesView/PropertiesView.ThemeResources.xaml b/src/Files.App.Controls/PropertiesView/PropertiesView.ThemeResources.xaml
index 45c7018552a6..86ccfc8de4ec 100644
--- a/src/Files.App.Controls/PropertiesView/PropertiesView.ThemeResources.xaml
+++ b/src/Files.App.Controls/PropertiesView/PropertiesView.ThemeResources.xaml
@@ -44,19 +44,19 @@
 
 			<!--#region Light PropertiesViewInfo-->
 			<StaticResource x:Key="PropertiesViewInfoForeground" ResourceKey="AccentFillColorDefaultBrush" />
-			<StaticResource x:Key="PropertiesViewInfoPointerOverForeground" ResourceKey="AccentFillColorSecondaryBrush" />
-			<StaticResource x:Key="PropertiesViewInfoPressedForeground" ResourceKey="AccentFillColorTertiaryBrush" />
-			<StaticResource x:Key="PropertiesViewInfoDisabledForeground" ResourceKey="TextFillColorDisabledBrush" />
-
-			<StaticResource x:Key="PropertiesViewInfoBackground" ResourceKey="SubtleFillColorTransparentBrush" />
-			<StaticResource x:Key="PropertiesViewInfoPointerOverBackground" ResourceKey="SubtleFillColorSecondaryBrush" />
-			<StaticResource x:Key="PropertiesViewInfoPressedBackground" ResourceKey="SubtleFillColorSecondaryBrush" />
-			<StaticResource x:Key="PropertiesViewInfoDisabledBackground" ResourceKey="SubtleFillColorTransparentBrush" />
-
-			<StaticResource x:Key="PropertiesViewInfoBorderBrush" ResourceKey="CardStrokeColorDefaultBrush" />
-			<StaticResource x:Key="PropertiesViewInfoPointerOverBorderBrush" ResourceKey="DividerStrokeColorDefaultBrush" />
-			<StaticResource x:Key="PropertiesViewInfoPressedBorderBrush" ResourceKey="DividerStrokeColorDefaultBrush" />
-			<StaticResource x:Key="PropertiesViewInfoDisabledBorderBrush" ResourceKey="SubtleFillColorTransparentBrush" />
+			<StaticResource x:Key="PropertiesViewInfoPointerOverForeground" ResourceKey="AccentTextFillColorSecondaryBrush" />
+			<StaticResource x:Key="PropertiesViewInfoPressedForeground" ResourceKey="AccentTextFillColorSecondaryBrush" />
+			<StaticResource x:Key="PropertiesViewInfoDisabledForeground" ResourceKey="AccentTextFillColorDisabledBrush" />
+
+			<StaticResource x:Key="PropertiesViewInfoBackground" ResourceKey="ControlFillColorTransparentBrush" />
+			<StaticResource x:Key="PropertiesViewInfoPointerOverBackground" ResourceKey="ControlFillColorSecondaryBrush" />
+			<StaticResource x:Key="PropertiesViewInfoPressedBackground" ResourceKey="ControlFillColorSecondaryBrush" />
+			<StaticResource x:Key="PropertiesViewInfoDisabledBackground" ResourceKey="ControlFillColorTransparentBrush" />
+
+			<StaticResource x:Key="PropertiesViewInfoBorderBrush" ResourceKey="ControlStrokeColorDefaultBrush" />
+			<StaticResource x:Key="PropertiesViewInfoPointerOverBorderBrush" ResourceKey="ControlStrokeColorSecondaryBrush" />
+			<StaticResource x:Key="PropertiesViewInfoPressedBorderBrush" ResourceKey="ControlStrokeColorSecondaryBrush" />
+			<StaticResource x:Key="PropertiesViewInfoDisabledBorderBrush" ResourceKey="ControlFillColorTransparentBrush" />
 			<!--#endregion-->
 		</ResourceDictionary>
 
@@ -97,19 +97,19 @@
 
 			<!--#region Dark PropertiesViewInfo-->
 			<StaticResource x:Key="PropertiesViewInfoForeground" ResourceKey="AccentFillColorDefaultBrush" />
-			<StaticResource x:Key="PropertiesViewInfoPointerOverForeground" ResourceKey="AccentFillColorSecondaryBrush" />
-			<StaticResource x:Key="PropertiesViewInfoPressedForeground" ResourceKey="AccentFillColorTertiaryBrush" />
-			<StaticResource x:Key="PropertiesViewInfoDisabledForeground" ResourceKey="TextFillColorDisabledBrush" />
-
-			<StaticResource x:Key="PropertiesViewInfoBackground" ResourceKey="SubtleFillColorTransparentBrush" />
-			<StaticResource x:Key="PropertiesViewInfoPointerOverBackground" ResourceKey="SubtleFillColorSecondaryBrush" />
-			<StaticResource x:Key="PropertiesViewInfoPressedBackground" ResourceKey="SubtleFillColorSecondaryBrush" />
-			<StaticResource x:Key="PropertiesViewInfoDisabledBackground" ResourceKey="SubtleFillColorTransparentBrush" />
-
-			<StaticResource x:Key="PropertiesViewInfoBorderBrush" ResourceKey="CardStrokeColorDefaultBrush" />
-			<StaticResource x:Key="PropertiesViewInfoPointerOverBorderBrush" ResourceKey="DividerStrokeColorDefaultBrush" />
-			<StaticResource x:Key="PropertiesViewInfoPressedBorderBrush" ResourceKey="DividerStrokeColorDefaultBrush" />
-			<StaticResource x:Key="PropertiesViewInfoDisabledBorderBrush" ResourceKey="SubtleFillColorTransparentBrush" />
+			<StaticResource x:Key="PropertiesViewInfoPointerOverForeground" ResourceKey="AccentTextFillColorSecondaryBrush" />
+			<StaticResource x:Key="PropertiesViewInfoPressedForeground" ResourceKey="AccentTextFillColorSecondaryBrush" />
+			<StaticResource x:Key="PropertiesViewInfoDisabledForeground" ResourceKey="AccentTextFillColorDisabledBrush" />
+
+			<StaticResource x:Key="PropertiesViewInfoBackground" ResourceKey="ControlFillColorTransparentBrush" />
+			<StaticResource x:Key="PropertiesViewInfoPointerOverBackground" ResourceKey="ControlFillColorSecondaryBrush" />
+			<StaticResource x:Key="PropertiesViewInfoPressedBackground" ResourceKey="ControlFillColorSecondaryBrush" />
+			<StaticResource x:Key="PropertiesViewInfoDisabledBackground" ResourceKey="ControlFillColorTransparentBrush" />
+
+			<StaticResource x:Key="PropertiesViewInfoBorderBrush" ResourceKey="ControlStrokeColorDefaultBrush" />
+			<StaticResource x:Key="PropertiesViewInfoPointerOverBorderBrush" ResourceKey="ControlStrokeColorSecondaryBrush" />
+			<StaticResource x:Key="PropertiesViewInfoPressedBorderBrush" ResourceKey="ControlStrokeColorSecondaryBrush" />
+			<StaticResource x:Key="PropertiesViewInfoDisabledBorderBrush" ResourceKey="ControlFillColorTransparentBrush" />
 			<!--#endregion-->
 
 		</ResourceDictionary>
diff --git a/src/Files.App.Controls/PropertiesView/PropertiesViewInfo.cs b/src/Files.App.Controls/PropertiesView/PropertiesViewInfo.cs
index 6c585d17dd42..83382b939dfe 100644
--- a/src/Files.App.Controls/PropertiesView/PropertiesViewInfo.cs
+++ b/src/Files.App.Controls/PropertiesView/PropertiesViewInfo.cs
@@ -63,61 +63,61 @@ protected override void OnPointerPressed(PointerRoutedEventArgs e)
         {
             base.OnPointerPressed( e );
 
-			if ( IsEnabled )
-				VisualStateManager.GoToState( this , PressedStateName , true );
-			else
-				VisualStateManager.GoToState( this , DisabledStateName , true );
-		}
+            if ( IsEnabled )
+                VisualStateManager.GoToState( this , PressedStateName , true );
+            else
+                VisualStateManager.GoToState( this , DisabledStateName , true );
+        }
 
         protected override void OnPointerReleased(PointerRoutedEventArgs e)
         {
             base.OnPointerReleased( e );
 
-			if ( IsEnabled )
-				VisualStateManager.GoToState( this , NormalStateName , true );
-			else
-				VisualStateManager.GoToState( this , DisabledStateName , true );
-		}
+            if ( IsEnabled )
+                VisualStateManager.GoToState( this , NormalStateName , true );
+            else
+                VisualStateManager.GoToState( this , DisabledStateName , true );
+        }
 
         protected override void OnPointerEntered(PointerRoutedEventArgs e)
         {
             base.OnPointerEntered( e );
 
-			if ( IsEnabled )
-				VisualStateManager.GoToState( this , PointerOverStateName , true );
-			else
-				VisualStateManager.GoToState( this , DisabledStateName , true );
-		}
+            if ( IsEnabled )
+                VisualStateManager.GoToState( this , PointerOverStateName , true );
+            else
+                VisualStateManager.GoToState( this , DisabledStateName , true );
+        }
 
         protected override void OnPointerExited(PointerRoutedEventArgs e)
         {
             base.OnPointerExited( e );
 
-			if ( IsEnabled )
-				VisualStateManager.GoToState( this , NormalStateName , true );
-			else
-				VisualStateManager.GoToState( this , DisabledStateName , true );
-		}
+            if ( IsEnabled )
+                VisualStateManager.GoToState( this , NormalStateName , true );
+            else
+                VisualStateManager.GoToState( this , DisabledStateName , true );
+        }
 
         protected override void OnPointerCaptureLost(PointerRoutedEventArgs e)
         {
             base.OnPointerCaptureLost( e );
 
-			if ( IsEnabled )
-				VisualStateManager.GoToState( this , NormalStateName , true );
-			else
-				VisualStateManager.GoToState( this , DisabledStateName , true );
-		}
+            if ( IsEnabled )
+                VisualStateManager.GoToState( this , NormalStateName , true );
+            else
+                VisualStateManager.GoToState( this , DisabledStateName , true );
+        }
 
         protected override void OnPointerCanceled(PointerRoutedEventArgs e)
         {
             base.OnPointerCanceled( e );
 
-			if ( IsEnabled )
-				VisualStateManager.GoToState( this , NormalStateName , true );
-			else
-				VisualStateManager.GoToState( this , DisabledStateName , true );
-		}
+            if ( IsEnabled )
+                VisualStateManager.GoToState( this , NormalStateName , true );
+            else
+                VisualStateManager.GoToState( this , DisabledStateName , true );
+        }
 
         protected override void OnKeyDown(KeyRoutedEventArgs e)
         {