From 28444d92a33e9bcacca9c1ce4f8cb60e811656dd Mon Sep 17 00:00:00 2001
From: Martin Anderson <mdta@live.co.uk>
Date: Wed, 24 Jul 2024 16:41:50 +0100
Subject: [PATCH 1/4] Added Eject 12, and Pinned 12 Icons

Also added explicit layer sizes on non 16px icons
---
 .../ThemedIcon/Styles/Icons.Action.xaml       | 54 +++++++++++
 .../ThemedIcon/Styles/Icons.SizeLayout28.xaml | 92 +++++++++++++++----
 .../ThemedIcon/Styles/Icons.Status.xaml       | 20 +++-
 .../UserControls/ThemedIconsUC.xaml           |  2 +-
 4 files changed, 145 insertions(+), 23 deletions(-)

diff --git a/src/Files.App.Controls/ThemedIcon/Styles/Icons.Action.xaml b/src/Files.App.Controls/ThemedIcon/Styles/Icons.Action.xaml
index eb99ac4f0b96..aa8ef8ff4496 100644
--- a/src/Files.App.Controls/ThemedIcon/Styles/Icons.Action.xaml
+++ b/src/Files.App.Controls/ThemedIcon/Styles/Icons.Action.xaml
@@ -220,4 +220,58 @@
 		</Setter>
 	</Style>
 
+	<Style
+		x:Key="App.ThemedIcons.Actions.Eject.12"
+		BasedOn="{StaticResource DefaultThemedIconStyle}"
+		TargetType="local:ThemedIcon">
+
+
+		<Setter Property="IconSize" Value="12" />
+
+		<Setter Property="OutlineIconData" Value="m2.04,8h7.91c1.04,0,1.63-1.2.98-2.02L6.98.94c-.5-.64-1.47-.64-1.97,0L1.06,5.98c-.64.82-.06,2.02.98,2.02Zm-.2-1.4L5.8,1.56c.1-.13.29-.13.39,0l3.96,5.04c.13.16.01.4-.2.4H2.04c-.21,0-.33-.24-.2-.4Zm9.15,3.4H1c-.28,0-.5.22-.5.5s.22.5.5.5h10c.28,0,.5-.22.5-.5s-.22-.5-.5-.5Z" />
+		<Setter Property="FilledIconData" Value="m2.04,8h7.91c1.04,0,1.63-1.2.98-2.02L6.98.94c-.5-.64-1.47-.64-1.97,0L1.06,5.98c-.64.82-.06,2.02.98,2.02Zm8.96,2H1c-.28,0-.5.22-.5.5s.22.5.5.5h10c.28,0,.5-.22.5-.5s-.22-.5-.5-.5Z" />
+
+		<Setter Property="Layers">
+			<Setter.Value>
+				<local:ThemedIconLayers>
+					<local:ThemedIconLayer
+						LayerSize="12"
+						LayerType="Alt"
+						PathData="m9.92,7.5H2c-.63,0-.98-.72-.59-1.21L5.37,1.25c.3-.38.88-.38,1.18,0l3.96,5.04c.39.49.04,1.21-.59,1.21Z" />
+					<local:ThemedIconLayer
+						LayerSize="12"
+						LayerType="Base"
+						PathData="m2.04,8h7.91c1.04,0,1.63-1.2.98-2.02L6.98.94c-.5-.64-1.47-.64-1.97,0L1.06,5.98c-.64.82-.06,2.02.98,2.02Zm-.2-1.4L5.8,1.56c.1-.13.29-.13.39,0l3.96,5.04c.13.16.01.4-.2.4H2.04c-.21,0-.33-.24-.2-.4Zm9.15,3.4H1c-.28,0-.5.22-.5.5s.22.5.5.5h10c.28,0,.5-.22.5-.5s-.22-.5-.5-.5Z" />
+				</local:ThemedIconLayers>
+			</Setter.Value>
+		</Setter>
+	</Style>
+
+	<Style
+		x:Key="App.ThemedIcons.Actions.Pinned.12"
+		BasedOn="{StaticResource DefaultThemedIconStyle}"
+		TargetType="local:ThemedIcon">
+
+
+		<Setter Property="IconSize" Value="12" />
+
+		<Setter Property="OutlineIconData" Value="m8.05,1.44c-.71-.71-1.9-.54-2.38.35l-1.53,2.82-2.33.93c-.16.06-.27.2-.3.36-.03.16.02.34.14.45l1.65,1.65-2.15,2.15-.15.85.85-.15,2.15-2.15,1.65,1.65c.12.12.29.17.45.14.16-.03.3-.15.36-.3l.93-2.33,2.82-1.53c.88-.48,1.06-1.67.35-2.38l-2.51-2.51Zm-1.5.82c.16-.29.56-.35.79-.12l2.51,2.51c.24.24.18.63-.12.79l-2.98,1.61c-.1.06-.18.15-.23.25l-.72,1.8-2.93-2.93,1.79-.71c.11-.04.2-.12.25-.23l1.61-2.98Z" />
+		<Setter Property="FilledIconData" Value="m8.05,1.44c-.71-.71-1.9-.54-2.38.35l-1.53,2.82-2.33.93c-.16.06-.27.2-.3.36-.03.16.02.34.14.45l1.65,1.65-2.15,2.15-.15.85.85-.15,2.15-2.15,1.65,1.65c.12.12.29.17.45.14s.3-.15.36-.3l.93-2.33,2.82-1.53c.88-.48,1.06-1.67.35-2.38l-2.51-2.51Z" />
+
+		<Setter Property="Layers">
+			<Setter.Value>
+				<local:ThemedIconLayers>
+					<local:ThemedIconLayer
+						LayerSize="12"
+						LayerType="Alt"
+						PathData="m8.12,1.75l2.27,2.52c.55.61.34,1.57-.4,1.9l-2.99,1.33-.89,2.22c-.05.13-.23.17-.33.07l-3.57-3.57c-.1-.1-.07-.27.07-.33l2.22-.89,1.68-3.03c.4-.72,1.39-.83,1.94-.22Z" />
+					<local:ThemedIconLayer
+						LayerSize="12"
+						LayerType="Base"
+						PathData="m8.05,1.44c-.71-.71-1.9-.54-2.38.35l-1.53,2.82-2.33.93c-.16.06-.27.2-.3.36-.03.16.02.34.14.45l1.65,1.65-2.15,2.15-.15.85.85-.15,2.15-2.15,1.65,1.65c.12.12.29.17.45.14.16-.03.3-.15.36-.3l.93-2.33,2.82-1.53c.88-.48,1.06-1.67.35-2.38l-2.51-2.51Zm-1.5.82c.16-.29.56-.35.79-.12l2.51,2.51c.24.24.18.63-.12.79l-2.98,1.61c-.1.06-.18.15-.23.25l-.72,1.8-2.93-2.93,1.79-.71c.11-.04.2-.12.25-.23l1.61-2.98Z" />
+				</local:ThemedIconLayers>
+			</Setter.Value>
+		</Setter>
+	</Style>
+
 </ResourceDictionary>
diff --git a/src/Files.App.Controls/ThemedIcon/Styles/Icons.SizeLayout28.xaml b/src/Files.App.Controls/ThemedIcon/Styles/Icons.SizeLayout28.xaml
index 5ad48867f5b9..acef0be97f77 100644
--- a/src/Files.App.Controls/ThemedIcon/Styles/Icons.SizeLayout28.xaml
+++ b/src/Files.App.Controls/ThemedIcon/Styles/Icons.SizeLayout28.xaml
@@ -18,8 +18,14 @@
 		<Setter Property="Layers">
 			<Setter.Value>
 				<local:ThemedIconLayers>
-					<local:ThemedIconLayer LayerType="Alt" PathData="m9.75,3.5h-4.5c-.97,0-1.75.78-1.75,1.75v4.5c0,.97.78,1.75,1.75,1.75h4.5c.97,0,1.75-.78,1.75-1.75v-4.5c0-.97-.78-1.75-1.75-1.75Zm13,0h-4.5c-.97,0-1.75.78-1.75,1.75v4.5c0,.97.78,1.75,1.75,1.75h4.5c.97,0,1.75-.78,1.75-1.75v-4.5c0-.97-.78-1.75-1.75-1.75Zm-13,13h-4.5c-.97,0-1.75.78-1.75,1.75v4.5c0,.97.78,1.75,1.75,1.75h4.5c.97,0,1.75-.78,1.75-1.75v-4.5c0-.97-.78-1.75-1.75-1.75Zm13,0h-4.5c-.97,0-1.75.78-1.75,1.75v4.5c0,.97.78,1.75,1.75,1.75h4.5c.97,0,1.75-.78,1.75-1.75v-4.5c0-.97-.78-1.75-1.75-1.75Z" />
-					<local:ThemedIconLayer LayerType="Base" PathData="m5.25,4c-.69,0-1.25.56-1.25,1.25v4.5c0,.69.56,1.25,1.25,1.25h4.5c.69,0,1.25-.56,1.25-1.25v-4.5c0-.69-.56-1.25-1.25-1.25h-4.5Zm-2.25,1.25c0-1.24,1.01-2.25,2.25-2.25h4.5c1.24,0,2.25,1.01,2.25,2.25v4.5c0,1.24-1.01,2.25-2.25,2.25h-4.5c-1.24,0-2.25-1.01-2.25-2.25v-4.5Zm13,0c0-1.24,1.01-2.25,2.25-2.25h4.5c1.24,0,2.25,1.01,2.25,2.25v4.5c0,1.24-1.01,2.25-2.25,2.25h-4.5c-1.24,0-2.25-1.01-2.25-2.25v-4.5Zm2.25-1.25c-.69,0-1.25.56-1.25,1.25v4.5c0,.69.56,1.25,1.25,1.25h4.5c.69,0,1.25-.56,1.25-1.25v-4.5c0-.69-.56-1.25-1.25-1.25h-4.5Zm-13,13c-.69,0-1.25.56-1.25,1.25v4.5c0,.69.56,1.25,1.25,1.25h4.5c.69,0,1.25-.56,1.25-1.25v-4.5c0-.69-.56-1.25-1.25-1.25h-4.5Zm-2.25,1.25c0-1.24,1.01-2.25,2.25-2.25h4.5c1.24,0,2.25,1.01,2.25,2.25v4.5c0,1.24-1.01,2.25-2.25,2.25h-4.5c-1.24,0-2.25-1.01-2.25-2.25v-4.5Zm15.25-1.25c-.69,0-1.25.56-1.25,1.25v4.5c0,.69.56,1.25,1.25,1.25h4.5c.69,0,1.25-.56,1.25-1.25v-4.5c0-.69-.56-1.25-1.25-1.25h-4.5Zm-2.25,1.25c0-1.24,1.01-2.25,2.25-2.25h4.5c1.24,0,2.25,1.01,2.25,2.25v4.5c0,1.24-1.01,2.25-2.25,2.25h-4.5c-1.24,0-2.25-1.01-2.25-2.25v-4.5Z" />
+					<local:ThemedIconLayer
+						LayerSize="28"
+						LayerType="Alt"
+						PathData="m9.75,3.5h-4.5c-.97,0-1.75.78-1.75,1.75v4.5c0,.97.78,1.75,1.75,1.75h4.5c.97,0,1.75-.78,1.75-1.75v-4.5c0-.97-.78-1.75-1.75-1.75Zm13,0h-4.5c-.97,0-1.75.78-1.75,1.75v4.5c0,.97.78,1.75,1.75,1.75h4.5c.97,0,1.75-.78,1.75-1.75v-4.5c0-.97-.78-1.75-1.75-1.75Zm-13,13h-4.5c-.97,0-1.75.78-1.75,1.75v4.5c0,.97.78,1.75,1.75,1.75h4.5c.97,0,1.75-.78,1.75-1.75v-4.5c0-.97-.78-1.75-1.75-1.75Zm13,0h-4.5c-.97,0-1.75.78-1.75,1.75v4.5c0,.97.78,1.75,1.75,1.75h4.5c.97,0,1.75-.78,1.75-1.75v-4.5c0-.97-.78-1.75-1.75-1.75Z" />
+					<local:ThemedIconLayer
+						LayerSize="28"
+						LayerType="Base"
+						PathData="m5.25,4c-.69,0-1.25.56-1.25,1.25v4.5c0,.69.56,1.25,1.25,1.25h4.5c.69,0,1.25-.56,1.25-1.25v-4.5c0-.69-.56-1.25-1.25-1.25h-4.5Zm-2.25,1.25c0-1.24,1.01-2.25,2.25-2.25h4.5c1.24,0,2.25,1.01,2.25,2.25v4.5c0,1.24-1.01,2.25-2.25,2.25h-4.5c-1.24,0-2.25-1.01-2.25-2.25v-4.5Zm13,0c0-1.24,1.01-2.25,2.25-2.25h4.5c1.24,0,2.25,1.01,2.25,2.25v4.5c0,1.24-1.01,2.25-2.25,2.25h-4.5c-1.24,0-2.25-1.01-2.25-2.25v-4.5Zm2.25-1.25c-.69,0-1.25.56-1.25,1.25v4.5c0,.69.56,1.25,1.25,1.25h4.5c.69,0,1.25-.56,1.25-1.25v-4.5c0-.69-.56-1.25-1.25-1.25h-4.5Zm-13,13c-.69,0-1.25.56-1.25,1.25v4.5c0,.69.56,1.25,1.25,1.25h4.5c.69,0,1.25-.56,1.25-1.25v-4.5c0-.69-.56-1.25-1.25-1.25h-4.5Zm-2.25,1.25c0-1.24,1.01-2.25,2.25-2.25h4.5c1.24,0,2.25,1.01,2.25,2.25v4.5c0,1.24-1.01,2.25-2.25,2.25h-4.5c-1.24,0-2.25-1.01-2.25-2.25v-4.5Zm15.25-1.25c-.69,0-1.25.56-1.25,1.25v4.5c0,.69.56,1.25,1.25,1.25h4.5c.69,0,1.25-.56,1.25-1.25v-4.5c0-.69-.56-1.25-1.25-1.25h-4.5Zm-2.25,1.25c0-1.24,1.01-2.25,2.25-2.25h4.5c1.24,0,2.25,1.01,2.25,2.25v4.5c0,1.24-1.01,2.25-2.25,2.25h-4.5c-1.24,0-2.25-1.01-2.25-2.25v-4.5Z" />
 				</local:ThemedIconLayers>
 			</Setter.Value>
 		</Setter>
@@ -40,8 +46,14 @@
 		<Setter Property="Layers">
 			<Setter.Value>
 				<local:ThemedIconLayers>
-					<local:ThemedIconLayer LayerType="Alt" PathData="m9.75,3.5h-4.5c-.97,0-1.75.78-1.75,1.75v4.5c0,.97.78,1.75,1.75,1.75h4.5c.97,0,1.75-.78,1.75-1.75v-4.5c0-.97-.78-1.75-1.75-1.75Zm0,13h-4.5c-.97,0-1.75.78-1.75,1.75v4.5c0,.97.78,1.75,1.75,1.75h4.5c.97,0,1.75-.78,1.75-1.75v-4.5c0-.97-.78-1.75-1.75-1.75Z" />
-					<local:ThemedIconLayer LayerType="Base" PathData="m9.75,3h-4.5c-1.24,0-2.25,1.01-2.25,2.25v4.5c0,1.24,1.01,2.25,2.25,2.25h4.5c1.24,0,2.25-1.01,2.25-2.25v-4.5c0-1.24-1.01-2.25-2.25-2.25Zm1.25,6.75c0,.69-.56,1.25-1.25,1.25h-4.5c-.69,0-1.25-.56-1.25-1.25v-4.5c0-.69.56-1.25,1.25-1.25h4.5c.69,0,1.25.56,1.25,1.25v4.5Zm-1.25,6.25h-4.5c-1.24,0-2.25,1.01-2.25,2.25v4.5c0,1.24,1.01,2.25,2.25,2.25h4.5c1.24,0,2.25-1.01,2.25-2.25v-4.5c0-1.24-1.01-2.25-2.25-2.25Zm1.25,6.75c0,.69-.56,1.25-1.25,1.25h-4.5c-.69,0-1.25-.56-1.25-1.25v-4.5c0-.69.56-1.25,1.25-1.25h4.5c.69,0,1.25.56,1.25,1.25v4.5Zm4.5-14.75h9c.28,0,.5-.22.5-.5s-.22-.5-.5-.5h-9c-.28,0-.5.22-.5.5s.22.5.5.5Zm9,12h-9c-.28,0-.5.22-.5.5s.22.5.5.5h9c.28,0,.5-.22.5-.5s-.22-.5-.5-.5Z" />
+					<local:ThemedIconLayer
+						LayerSize="28"
+						LayerType="Alt"
+						PathData="m9.75,3.5h-4.5c-.97,0-1.75.78-1.75,1.75v4.5c0,.97.78,1.75,1.75,1.75h4.5c.97,0,1.75-.78,1.75-1.75v-4.5c0-.97-.78-1.75-1.75-1.75Zm0,13h-4.5c-.97,0-1.75.78-1.75,1.75v4.5c0,.97.78,1.75,1.75,1.75h4.5c.97,0,1.75-.78,1.75-1.75v-4.5c0-.97-.78-1.75-1.75-1.75Z" />
+					<local:ThemedIconLayer
+						LayerSize="28"
+						LayerType="Base"
+						PathData="m9.75,3h-4.5c-1.24,0-2.25,1.01-2.25,2.25v4.5c0,1.24,1.01,2.25,2.25,2.25h4.5c1.24,0,2.25-1.01,2.25-2.25v-4.5c0-1.24-1.01-2.25-2.25-2.25Zm1.25,6.75c0,.69-.56,1.25-1.25,1.25h-4.5c-.69,0-1.25-.56-1.25-1.25v-4.5c0-.69.56-1.25,1.25-1.25h4.5c.69,0,1.25.56,1.25,1.25v4.5Zm-1.25,6.25h-4.5c-1.24,0-2.25,1.01-2.25,2.25v4.5c0,1.24,1.01,2.25,2.25,2.25h4.5c1.24,0,2.25-1.01,2.25-2.25v-4.5c0-1.24-1.01-2.25-2.25-2.25Zm1.25,6.75c0,.69-.56,1.25-1.25,1.25h-4.5c-.69,0-1.25-.56-1.25-1.25v-4.5c0-.69.56-1.25,1.25-1.25h4.5c.69,0,1.25.56,1.25,1.25v4.5Zm4.5-14.75h9c.28,0,.5-.22.5-.5s-.22-.5-.5-.5h-9c-.28,0-.5.22-.5.5s.22.5.5.5Zm9,12h-9c-.28,0-.5.22-.5.5s.22.5.5.5h9c.28,0,.5-.22.5-.5s-.22-.5-.5-.5Z" />
 				</local:ThemedIconLayers>
 			</Setter.Value>
 		</Setter>
@@ -62,7 +74,10 @@
 		<Setter Property="Layers">
 			<Setter.Value>
 				<local:ThemedIconLayers>
-					<local:ThemedIconLayer LayerType="Base" PathData="m11.5,6H3.5c-.28,0-.5.22-.5.5s.22.5.5.5h8c.28,0,.5-.22.5-.5s-.22-.5-.5-.5Zm5,1h8c.28,0,.5-.22.5-.5s-.22-.5-.5-.5h-8c-.28,0-.5.22-.5.5s.22.5.5.5Zm-5,4H3.5c-.28,0-.5.22-.5.5s.22.5.5.5h8c.28,0,.5-.22.5-.5s-.22-.5-.5-.5Zm13,0h-8c-.28,0-.5.22-.5.5s.22.5.5.5h8c.28,0,.5-.22.5-.5s-.22-.5-.5-.5Zm-13,5H3.5c-.28,0-.5.22-.5.5s.22.5.5.5h8c.28,0,.5-.22.5-.5s-.22-.5-.5-.5Zm13,0h-8c-.28,0-.5.22-.5.5s.22.5.5.5h8c.28,0,.5-.22.5-.5s-.22-.5-.5-.5Zm-13,5H3.5c-.28,0-.5.22-.5.5s.22.5.5.5h8c.28,0,.5-.22.5-.5s-.22-.5-.5-.5Zm13,0h-8c-.28,0-.5.22-.5.5s.22.5.5.5h8c.28,0,.5-.22.5-.5s-.22-.5-.5-.5Z" />
+					<local:ThemedIconLayer
+						LayerSize="28"
+						LayerType="Base"
+						PathData="m11.5,6H3.5c-.28,0-.5.22-.5.5s.22.5.5.5h8c.28,0,.5-.22.5-.5s-.22-.5-.5-.5Zm5,1h8c.28,0,.5-.22.5-.5s-.22-.5-.5-.5h-8c-.28,0-.5.22-.5.5s.22.5.5.5Zm-5,4H3.5c-.28,0-.5.22-.5.5s.22.5.5.5h8c.28,0,.5-.22.5-.5s-.22-.5-.5-.5Zm13,0h-8c-.28,0-.5.22-.5.5s.22.5.5.5h8c.28,0,.5-.22.5-.5s-.22-.5-.5-.5Zm-13,5H3.5c-.28,0-.5.22-.5.5s.22.5.5.5h8c.28,0,.5-.22.5-.5s-.22-.5-.5-.5Zm13,0h-8c-.28,0-.5.22-.5.5s.22.5.5.5h8c.28,0,.5-.22.5-.5s-.22-.5-.5-.5Zm-13,5H3.5c-.28,0-.5.22-.5.5s.22.5.5.5h8c.28,0,.5-.22.5-.5s-.22-.5-.5-.5Zm13,0h-8c-.28,0-.5.22-.5.5s.22.5.5.5h8c.28,0,.5-.22.5-.5s-.22-.5-.5-.5Z" />
 				</local:ThemedIconLayers>
 			</Setter.Value>
 		</Setter>
@@ -83,8 +98,14 @@
 		<Setter Property="Layers">
 			<Setter.Value>
 				<local:ThemedIconLayers>
-					<local:ThemedIconLayer LayerType="Alt" PathData="m5.25,10c-.97,0-1.75.78-1.75,1.75v4.5c0,.97.78,1.75,1.75,1.75h4.5c.97,0,1.75-.78,1.75-1.75v-4.5c0-.97-.78-1.75-1.75-1.75h-4.5Z" />
-					<local:ThemedIconLayer LayerType="Base" PathData="m9.75,9.5h-4.5c-1.24,0-2.25,1.01-2.25,2.25v4.5c0,1.24,1.01,2.25,2.25,2.25h4.5c1.24,0,2.25-1.01,2.25-2.25v-4.5c0-1.24-1.01-2.25-2.25-2.25Zm1.25,6.75c0,.69-.56,1.25-1.25,1.25h-4.5c-.69,0-1.25-.56-1.25-1.25v-4.5c0-.69.56-1.25,1.25-1.25h4.5c.69,0,1.25.56,1.25,1.25v4.5Zm13.5-4.75h-10c-.28,0-.5.22-.5.5s.22.5.5.5h10c.28,0,.5-.22.5-.5s-.22-.5-.5-.5Zm-3,4h-7c-.28,0-.5.22-.5.5s.22.5.5.5h7c.28,0,.5-.22.5-.5s-.22-.5-.5-.5Z" />
+					<local:ThemedIconLayer
+						LayerSize="28"
+						LayerType="Alt"
+						PathData="m5.25,10c-.97,0-1.75.78-1.75,1.75v4.5c0,.97.78,1.75,1.75,1.75h4.5c.97,0,1.75-.78,1.75-1.75v-4.5c0-.97-.78-1.75-1.75-1.75h-4.5Z" />
+					<local:ThemedIconLayer
+						LayerSize="28"
+						LayerType="Base"
+						PathData="m9.75,9.5h-4.5c-1.24,0-2.25,1.01-2.25,2.25v4.5c0,1.24,1.01,2.25,2.25,2.25h4.5c1.24,0,2.25-1.01,2.25-2.25v-4.5c0-1.24-1.01-2.25-2.25-2.25Zm1.25,6.75c0,.69-.56,1.25-1.25,1.25h-4.5c-.69,0-1.25-.56-1.25-1.25v-4.5c0-.69.56-1.25,1.25-1.25h4.5c.69,0,1.25.56,1.25,1.25v4.5Zm13.5-4.75h-10c-.28,0-.5.22-.5.5s.22.5.5.5h10c.28,0,.5-.22.5-.5s-.22-.5-.5-.5Zm-3,4h-7c-.28,0-.5.22-.5.5s.22.5.5.5h7c.28,0,.5-.22.5-.5s-.22-.5-.5-.5Z" />
 				</local:ThemedIconLayers>
 			</Setter.Value>
 		</Setter>
@@ -105,8 +126,14 @@
 		<Setter Property="Layers">
 			<Setter.Value>
 				<local:ThemedIconLayers>
-					<local:ThemedIconLayer LayerType="Alt" PathData="m4.75,4.5c-1.24,0-2.25,1.01-2.25,2.25v14.5c0,1.24,1.01,2.25,2.25,2.25h18.5c1.24,0,2.25-1.01,2.25-2.25V6.75c0-1.24-1.01-2.25-2.25-2.25H4.75Z" />
-					<local:ThemedIconLayer LayerType="Base" PathData="m9.5,6c-.28,0-.5.22-.5.5v15c0,.28.22.5.5.5s.5-.22.5-.5V6.5c0-.28-.22-.5-.5-.5Zm9,0c-.28,0-.5.22-.5.5v15c0,.28.22.5.5.5s.5-.22.5-.5V6.5c0-.28-.22-.5-.5-.5Zm4.75-2H4.75c-1.52,0-2.75,1.23-2.75,2.75v14.5c0,1.52,1.23,2.75,2.75,2.75h18.5c1.52,0,2.75-1.23,2.75-2.75V6.75c0-1.52-1.23-2.75-2.75-2.75Zm1.75,17.25c0,.97-.78,1.75-1.75,1.75H4.75c-.97,0-1.75-.78-1.75-1.75V6.75c0-.97.78-1.75,1.75-1.75h18.5c.97,0,1.75.78,1.75,1.75v14.5Z" />
+					<local:ThemedIconLayer
+						LayerSize="28"
+						LayerType="Alt"
+						PathData="m4.75,4.5c-1.24,0-2.25,1.01-2.25,2.25v14.5c0,1.24,1.01,2.25,2.25,2.25h18.5c1.24,0,2.25-1.01,2.25-2.25V6.75c0-1.24-1.01-2.25-2.25-2.25H4.75Z" />
+					<local:ThemedIconLayer
+						LayerSize="28"
+						LayerType="Base"
+						PathData="m9.5,6c-.28,0-.5.22-.5.5v15c0,.28.22.5.5.5s.5-.22.5-.5V6.5c0-.28-.22-.5-.5-.5Zm9,0c-.28,0-.5.22-.5.5v15c0,.28.22.5.5.5s.5-.22.5-.5V6.5c0-.28-.22-.5-.5-.5Zm4.75-2H4.75c-1.52,0-2.75,1.23-2.75,2.75v14.5c0,1.52,1.23,2.75,2.75,2.75h18.5c1.52,0,2.75-1.23,2.75-2.75V6.75c0-1.52-1.23-2.75-2.75-2.75Zm1.75,17.25c0,.97-.78,1.75-1.75,1.75H4.75c-.97,0-1.75-.78-1.75-1.75V6.75c0-.97.78-1.75,1.75-1.75h18.5c.97,0,1.75.78,1.75,1.75v14.5Z" />
 				</local:ThemedIconLayers>
 			</Setter.Value>
 		</Setter>
@@ -127,8 +154,14 @@
 		<Setter Property="Layers">
 			<Setter.Value>
 				<local:ThemedIconLayers>
-					<local:ThemedIconLayer LayerType="Alt" PathData="m6.75,4h-1.5c-.69,0-1.25.56-1.25,1.25v1.5c0,.69.56,1.25,1.25,1.25h1.5c.69,0,1.25-.56,1.25-1.25v-1.5c0-.69-.56-1.25-1.25-1.25Zm0,8h-1.5c-.69,0-1.25.56-1.25,1.25v1.5c0,.69.56,1.25,1.25,1.25h1.5c.69,0,1.25-.56,1.25-1.25v-1.5c0-.69-.56-1.25-1.25-1.25Zm0,8h-1.5c-.69,0-1.25.56-1.25,1.25v1.5c0,.69.56,1.25,1.25,1.25h1.5c.69,0,1.25-.56,1.25-1.25v-1.5c0-.69-.56-1.25-1.25-1.25Z" />
-					<local:ThemedIconLayer LayerType="Base" PathData="m6.75,3h-1.5c-1.24,0-2.25,1.01-2.25,2.25v1.5c0,1.24,1.01,2.25,2.25,2.25h1.5c1.24,0,2.25-1.01,2.25-2.25v-1.5c0-1.24-1.01-2.25-2.25-2.25Zm1.25,3.75c0,.69-.56,1.25-1.25,1.25h-1.5c-.69,0-1.25-.56-1.25-1.25v-1.5c0-.69.56-1.25,1.25-1.25h1.5c.69,0,1.25.56,1.25,1.25v1.5Zm-1.25,4.25h-1.5c-1.24,0-2.25,1.01-2.25,2.25v1.5c0,1.24,1.01,2.25,2.25,2.25h1.5c1.24,0,2.25-1.01,2.25-2.25v-1.5c0-1.24-1.01-2.25-2.25-2.25Zm1.25,3.75c0,.69-.56,1.25-1.25,1.25h-1.5c-.69,0-1.25-.56-1.25-1.25v-1.5c0-.69.56-1.25,1.25-1.25h1.5c.69,0,1.25.56,1.25,1.25v1.5Zm-1.25,4.25h-1.5c-1.24,0-2.25,1.01-2.25,2.25v1.5c0,1.24,1.01,2.25,2.25,2.25h1.5c1.24,0,2.25-1.01,2.25-2.25v-1.5c0-1.24-1.01-2.25-2.25-2.25Zm1.25,3.75c0,.69-.56,1.25-1.25,1.25h-1.5c-.69,0-1.25-.56-1.25-1.25v-1.5c0-.69.56-1.25,1.25-1.25h1.5c.69,0,1.25.56,1.25,1.25v1.5ZM12.5,6h12c.28,0,.5-.22.5-.5s-.22-.5-.5-.5h-12c-.28,0-.5.22-.5.5s.22.5.5.5Zm12,7h-12c-.28,0-.5.22-.5.5s.22.5.5.5h12c.28,0,.5-.22.5-.5s-.22-.5-.5-.5Zm0,8h-12c-.28,0-.5.22-.5.5s.22.5.5.5h12c.28,0,.5-.22.5-.5s-.22-.5-.5-.5Z" />
+					<local:ThemedIconLayer
+						LayerSize="28"
+						LayerType="Alt"
+						PathData="m6.75,4h-1.5c-.69,0-1.25.56-1.25,1.25v1.5c0,.69.56,1.25,1.25,1.25h1.5c.69,0,1.25-.56,1.25-1.25v-1.5c0-.69-.56-1.25-1.25-1.25Zm0,8h-1.5c-.69,0-1.25.56-1.25,1.25v1.5c0,.69.56,1.25,1.25,1.25h1.5c.69,0,1.25-.56,1.25-1.25v-1.5c0-.69-.56-1.25-1.25-1.25Zm0,8h-1.5c-.69,0-1.25.56-1.25,1.25v1.5c0,.69.56,1.25,1.25,1.25h1.5c.69,0,1.25-.56,1.25-1.25v-1.5c0-.69-.56-1.25-1.25-1.25Z" />
+					<local:ThemedIconLayer
+						LayerSize="28"
+						LayerType="Base"
+						PathData="m6.75,3h-1.5c-1.24,0-2.25,1.01-2.25,2.25v1.5c0,1.24,1.01,2.25,2.25,2.25h1.5c1.24,0,2.25-1.01,2.25-2.25v-1.5c0-1.24-1.01-2.25-2.25-2.25Zm1.25,3.75c0,.69-.56,1.25-1.25,1.25h-1.5c-.69,0-1.25-.56-1.25-1.25v-1.5c0-.69.56-1.25,1.25-1.25h1.5c.69,0,1.25.56,1.25,1.25v1.5Zm-1.25,4.25h-1.5c-1.24,0-2.25,1.01-2.25,2.25v1.5c0,1.24,1.01,2.25,2.25,2.25h1.5c1.24,0,2.25-1.01,2.25-2.25v-1.5c0-1.24-1.01-2.25-2.25-2.25Zm1.25,3.75c0,.69-.56,1.25-1.25,1.25h-1.5c-.69,0-1.25-.56-1.25-1.25v-1.5c0-.69.56-1.25,1.25-1.25h1.5c.69,0,1.25.56,1.25,1.25v1.5Zm-1.25,4.25h-1.5c-1.24,0-2.25,1.01-2.25,2.25v1.5c0,1.24,1.01,2.25,2.25,2.25h1.5c1.24,0,2.25-1.01,2.25-2.25v-1.5c0-1.24-1.01-2.25-2.25-2.25Zm1.25,3.75c0,.69-.56,1.25-1.25,1.25h-1.5c-.69,0-1.25-.56-1.25-1.25v-1.5c0-.69.56-1.25,1.25-1.25h1.5c.69,0,1.25.56,1.25,1.25v1.5ZM12.5,6h12c.28,0,.5-.22.5-.5s-.22-.5-.5-.5h-12c-.28,0-.5.22-.5.5s.22.5.5.5Zm12,7h-12c-.28,0-.5.22-.5.5s.22.5.5.5h12c.28,0,.5-.22.5-.5s-.22-.5-.5-.5Zm0,8h-12c-.28,0-.5.22-.5.5s.22.5.5.5h12c.28,0,.5-.22.5-.5s-.22-.5-.5-.5Z" />
 				</local:ThemedIconLayers>
 			</Setter.Value>
 		</Setter>
@@ -148,8 +181,14 @@
 		<Setter Property="Layers">
 			<Setter.Value>
 				<local:ThemedIconLayers>
-					<local:ThemedIconLayer LayerType="Alt" PathData="m9.75,9h-3.5c-.69,0-1.25.56-1.25,1.25v3.5c0,.69.56,1.25,1.25,1.25h3.5c.69,0,1.25-.56,1.25-1.25v-3.5c0-.69-.56-1.25-1.25-1.25Zm12,0h-3.5c-.69,0-1.25.56-1.25,1.25v3.5c0,.69.56,1.25,1.25,1.25h3.5c.69,0,1.25-.56,1.25-1.25v-3.5c0-.69-.56-1.25-1.25-1.25Z" />
-					<local:ThemedIconLayer LayerType="Base" PathData="m6.25,16h3.5c1.24,0,2.25-1.01,2.25-2.25v-3.5c0-1.24-1.01-2.25-2.25-2.25h-3.5c-1.24,0-2.25,1.01-2.25,2.25v3.5c0,1.24,1.01,2.25,2.25,2.25Zm-1.25-5.75c0-.69.56-1.25,1.25-1.25h3.5c.69,0,1.25.56,1.25,1.25v3.5c0,.69-.56,1.25-1.25,1.25h-3.5c-.69,0-1.25-.56-1.25-1.25v-3.5Zm13.25,5.75h3.5c1.24,0,2.25-1.01,2.25-2.25v-3.5c0-1.24-1.01-2.25-2.25-2.25h-3.5c-1.24,0-2.25,1.01-2.25,2.25v3.5c0,1.24,1.01,2.25,2.25,2.25Zm-1.25-5.75c0-.69.56-1.25,1.25-1.25h3.5c.69,0,1.25.56,1.25,1.25v3.5c0,.69-.56,1.25-1.25,1.25h-3.5c-.69,0-1.25-.56-1.25-1.25v-3.5Zm-4.5,8.75H3.5c-.28,0-.5.22-.5.5s.22.5.5.5h9c.28,0,.5-.22.5-.5s-.22-.5-.5-.5Zm12,0h-9c-.28,0-.5.22-.5.5s.22.5.5.5h9c.28,0,.5-.22.5-.5s-.22-.5-.5-.5Z" />
+					<local:ThemedIconLayer
+						LayerSize="28"
+						LayerType="Alt"
+						PathData="m9.75,9h-3.5c-.69,0-1.25.56-1.25,1.25v3.5c0,.69.56,1.25,1.25,1.25h3.5c.69,0,1.25-.56,1.25-1.25v-3.5c0-.69-.56-1.25-1.25-1.25Zm12,0h-3.5c-.69,0-1.25.56-1.25,1.25v3.5c0,.69.56,1.25,1.25,1.25h3.5c.69,0,1.25-.56,1.25-1.25v-3.5c0-.69-.56-1.25-1.25-1.25Z" />
+					<local:ThemedIconLayer
+						LayerSize="28"
+						LayerType="Base"
+						PathData="m6.25,16h3.5c1.24,0,2.25-1.01,2.25-2.25v-3.5c0-1.24-1.01-2.25-2.25-2.25h-3.5c-1.24,0-2.25,1.01-2.25,2.25v3.5c0,1.24,1.01,2.25,2.25,2.25Zm-1.25-5.75c0-.69.56-1.25,1.25-1.25h3.5c.69,0,1.25.56,1.25,1.25v3.5c0,.69-.56,1.25-1.25,1.25h-3.5c-.69,0-1.25-.56-1.25-1.25v-3.5Zm13.25,5.75h3.5c1.24,0,2.25-1.01,2.25-2.25v-3.5c0-1.24-1.01-2.25-2.25-2.25h-3.5c-1.24,0-2.25,1.01-2.25,2.25v3.5c0,1.24,1.01,2.25,2.25,2.25Zm-1.25-5.75c0-.69.56-1.25,1.25-1.25h3.5c.69,0,1.25.56,1.25,1.25v3.5c0,.69-.56,1.25-1.25,1.25h-3.5c-.69,0-1.25-.56-1.25-1.25v-3.5Zm-4.5,8.75H3.5c-.28,0-.5.22-.5.5s.22.5.5.5h9c.28,0,.5-.22.5-.5s-.22-.5-.5-.5Zm12,0h-9c-.28,0-.5.22-.5.5s.22.5.5.5h9c.28,0,.5-.22.5-.5s-.22-.5-.5-.5Z" />
 				</local:ThemedIconLayers>
 			</Setter.Value>
 		</Setter>
@@ -174,7 +213,10 @@
 						LayerType="Base"
 						Opacity="0.3"
 						PathData="m14.71,10.71l3.51,3.51c.47.47.14,1.28-.53,1.28h-7.38c-.67,0-1-.81-.53-1.28l3.51-3.51c.39-.39,1.02-.39,1.41,0Z" />
-					<local:ThemedIconLayer LayerType="Base" PathData="m16.5,8.5c.55,0,1-.45,1-1s-.45-1-1-1-1,.45-1,1,.45,1,1,1Zm-6,7.5h7c1.38,0,2.5-1.12,2.5-2.5v-7c0-1.38-1.12-2.5-2.5-2.5h-7c-1.38,0-2.5,1.12-2.5,2.5v7c0,1.38,1.12,2.5,2.5,2.5Zm7-1h-7c-.23,0-.45-.05-.65-.15l3.65-3.65c.27-.27.72-.27.99,0l3.65,3.65c-.2.09-.42.15-.65.15ZM9,6.5c0-.83.67-1.5,1.5-1.5h7c.83,0,1.5.67,1.5,1.5v7c0,.23-.05.45-.15.65l-3.65-3.65c-.66-.66-1.74-.66-2.4,0l-3.65,3.65c-.09-.2-.15-.42-.15-.65v-7Zm12.5,12.5H6.5c-.28,0-.5.22-.5.5s.22.5.5.5h15c.28,0,.5-.22.5-.5s-.22-.5-.5-.5Zm-2,4h-11c-.28,0-.5.22-.5.5s.22.5.5.5h11c.28,0,.5-.22.5-.5s-.22-.5-.5-.5Z" />
+					<local:ThemedIconLayer
+						LayerSize="28"
+						LayerType="Base"
+						PathData="m16.5,8.5c.55,0,1-.45,1-1s-.45-1-1-1-1,.45-1,1,.45,1,1,1Zm-6,7.5h7c1.38,0,2.5-1.12,2.5-2.5v-7c0-1.38-1.12-2.5-2.5-2.5h-7c-1.38,0-2.5,1.12-2.5,2.5v7c0,1.38,1.12,2.5,2.5,2.5Zm7-1h-7c-.23,0-.45-.05-.65-.15l3.65-3.65c.27-.27.72-.27.99,0l3.65,3.65c-.2.09-.42.15-.65.15ZM9,6.5c0-.83.67-1.5,1.5-1.5h7c.83,0,1.5.67,1.5,1.5v7c0,.23-.05.45-.15.65l-3.65-3.65c-.66-.66-1.74-.66-2.4,0l-3.65,3.65c-.09-.2-.15-.42-.15-.65v-7Zm12.5,12.5H6.5c-.28,0-.5.22-.5.5s.22.5.5.5h15c.28,0,.5-.22.5-.5s-.22-.5-.5-.5Zm-2,4h-11c-.28,0-.5.22-.5.5s.22.5.5.5h11c.28,0,.5-.22.5-.5s-.22-.5-.5-.5Z" />
 				</local:ThemedIconLayers>
 			</Setter.Value>
 		</Setter>
@@ -194,12 +236,19 @@
 		<Setter Property="Layers">
 			<Setter.Value>
 				<local:ThemedIconLayers>
-					<local:ThemedIconLayer LayerType="Alt" PathData="m6.5,7.75v9.34c0,.89,1.08,1.34,1.71.71l4.91-4.91c.49-.49,1.28-.49,1.77,0l4.91,4.91c.63.63,1.71.18,1.71-.71V7.75c0-1.79-1.46-3.25-3.25-3.25h-8.5c-1.79,0-3.25,1.46-3.25,3.25Z" />
 					<local:ThemedIconLayer
+						LayerSize="28"
+						LayerType="Alt"
+						PathData="m6.5,7.75v9.34c0,.89,1.08,1.34,1.71.71l4.91-4.91c.49-.49,1.28-.49,1.77,0l4.91,4.91c.63.63,1.71.18,1.71-.71V7.75c0-1.79-1.46-3.25-3.25-3.25h-8.5c-1.79,0-3.25,1.46-3.25,3.25Z" />
+					<local:ThemedIconLayer
+						LayerSize="28"
 						LayerType="Base"
 						Opacity="0.3"
 						PathData="m13.12,12.88l-4.91,4.91c-.63.63-.18,1.71.71,1.71h10.17c.89,0,1.34-1.08.71-1.71l-4.91-4.91c-.49-.49-1.28-.49-1.77,0Z" />
-					<local:ThemedIconLayer LayerType="Base" PathData="m17.5,10c.83,0,1.5-.67,1.5-1.5s-.67-1.5-1.5-1.5-1.5.67-1.5,1.5.67,1.5,1.5,1.5Zm-7.75,10h8.5c2.07,0,3.75-1.68,3.75-3.75V7.75c0-2.07-1.68-3.75-3.75-3.75h-8.5c-2.07,0-3.75,1.68-3.75,3.75v8.5c0,2.07,1.68,3.75,3.75,3.75Zm8.5-1h-8.5c-.58,0-1.12-.18-1.56-.48l5.28-5.28c.29-.29.77-.29,1.06,0l5.28,5.28c-.44.31-.98.48-1.56.48ZM7,7.75c0-1.52,1.23-2.75,2.75-2.75h8.5c1.52,0,2.75,1.23,2.75,2.75v8.5c0,.58-.18,1.12-.48,1.56l-5.28-5.28c-.68-.68-1.79-.68-2.47,0l-5.28,5.28c-.31-.44-.48-.98-.48-1.56V7.75Zm16.5,15.25H4.5c-.28,0-.5.22-.5.5s.22.5.5.5h19c.28,0,.5-.22.5-.5s-.22-.5-.5-.5Z" />
+					<local:ThemedIconLayer
+						LayerSize="28"
+						LayerType="Base"
+						PathData="m17.5,10c.83,0,1.5-.67,1.5-1.5s-.67-1.5-1.5-1.5-1.5.67-1.5,1.5.67,1.5,1.5,1.5Zm-7.75,10h8.5c2.07,0,3.75-1.68,3.75-3.75V7.75c0-2.07-1.68-3.75-3.75-3.75h-8.5c-2.07,0-3.75,1.68-3.75,3.75v8.5c0,2.07,1.68,3.75,3.75,3.75Zm8.5-1h-8.5c-.58,0-1.12-.18-1.56-.48l5.28-5.28c.29-.29.77-.29,1.06,0l5.28,5.28c-.44.31-.98.48-1.56.48ZM7,7.75c0-1.52,1.23-2.75,2.75-2.75h8.5c1.52,0,2.75,1.23,2.75,2.75v8.5c0,.58-.18,1.12-.48,1.56l-5.28-5.28c-.68-.68-1.79-.68-2.47,0l-5.28,5.28c-.31-.44-.48-.98-.48-1.56V7.75Zm16.5,15.25H4.5c-.28,0-.5.22-.5.5s.22.5.5.5h19c.28,0,.5-.22.5-.5s-.22-.5-.5-.5Z" />
 				</local:ThemedIconLayers>
 			</Setter.Value>
 		</Setter>
@@ -220,12 +269,19 @@
 		<Setter Property="Layers">
 			<Setter.Value>
 				<local:ThemedIconLayers>
-					<local:ThemedIconLayer LayerType="Alt" PathData="m4.5,18.48V6.5c0-2.21,1.79-4,4-4h11c2.21,0,4,1.79,4,4v11.98c0,1.11-1.35,1.67-2.13.88l-6.66-6.66c-.39-.39-1.02-.39-1.41,0l-6.66,6.66c-.79.79-2.13.23-2.13-.88Z" />
 					<local:ThemedIconLayer
+						LayerSize="28"
+						LayerType="Alt"
+						PathData="m4.5,18.48V6.5c0-2.21,1.79-4,4-4h11c2.21,0,4,1.79,4,4v11.98c0,1.11-1.35,1.67-2.13.88l-6.66-6.66c-.39-.39-1.02-.39-1.41,0l-6.66,6.66c-.79.79-2.13.23-2.13-.88Z" />
+					<local:ThemedIconLayer
+						LayerSize="28"
 						LayerType="Base"
 						Opacity="0.3"
 						PathData="m14.71,12.71l6.66,6.66c.79.79.23,2.13-.88,2.13H7.52c-1.11,0-1.67-1.35-.88-2.13l6.66-6.66c.39-.39,1.02-.39,1.41,0Z" />
-					<local:ThemedIconLayer LayerType="Base" PathData="m18.5,6c-.83,0-1.5.67-1.5,1.5s.67,1.5,1.5,1.5,1.5-.67,1.5-1.5-.67-1.5-1.5-1.5Zm1-4h-11c-2.49,0-4.5,2.01-4.5,4.5v11c0,2.49,2.01,4.5,4.5,4.5h11c2.49,0,4.5-2.01,4.5-4.5V6.5c0-2.49-2.01-4.5-4.5-4.5Zm0,19h-11c-.79,0-1.51-.26-2.1-.7l7.1-7.1c.27-.27.72-.27.99,0l7.1,7.1c-.58.44-1.31.7-2.1.7Zm3.5-3.5c0,.79-.26,1.51-.7,2.1l-7.1-7.1c-.66-.66-1.74-.66-2.4,0l-7.1,7.1c-.44-.58-.7-1.31-.7-2.1V6.5c0-1.93,1.57-3.5,3.5-3.5h11c1.93,0,3.5,1.57,3.5,3.5v11Zm-1.5,7.5H6.5c-.28,0-.5.22-.5.5s.22.5.5.5h15c.28,0,.5-.22.5-.5s-.22-.5-.5-.5Z" />
+					<local:ThemedIconLayer
+						LayerSize="28"
+						LayerType="Base"
+						PathData="m18.5,6c-.83,0-1.5.67-1.5,1.5s.67,1.5,1.5,1.5,1.5-.67,1.5-1.5-.67-1.5-1.5-1.5Zm1-4h-11c-2.49,0-4.5,2.01-4.5,4.5v11c0,2.49,2.01,4.5,4.5,4.5h11c2.49,0,4.5-2.01,4.5-4.5V6.5c0-2.49-2.01-4.5-4.5-4.5Zm0,19h-11c-.79,0-1.51-.26-2.1-.7l7.1-7.1c.27-.27.72-.27.99,0l7.1,7.1c-.58.44-1.31.7-2.1.7Zm3.5-3.5c0,.79-.26,1.51-.7,2.1l-7.1-7.1c-.66-.66-1.74-.66-2.4,0l-7.1,7.1c-.44-.58-.7-1.31-.7-2.1V6.5c0-1.93,1.57-3.5,3.5-3.5h11c1.93,0,3.5,1.57,3.5,3.5v11Zm-1.5,7.5H6.5c-.28,0-.5.22-.5.5s.22.5.5.5h15c.28,0,.5-.22.5-.5s-.22-.5-.5-.5Z" />
 				</local:ThemedIconLayers>
 			</Setter.Value>
 		</Setter>
diff --git a/src/Files.App.Controls/ThemedIcon/Styles/Icons.Status.xaml b/src/Files.App.Controls/ThemedIcon/Styles/Icons.Status.xaml
index ba4164f2f70c..330a4630624c 100644
--- a/src/Files.App.Controls/ThemedIcon/Styles/Icons.Status.xaml
+++ b/src/Files.App.Controls/ThemedIcon/Styles/Icons.Status.xaml
@@ -326,8 +326,14 @@
 		<Setter Property="Layers">
 			<Setter.Value>
 				<local:ThemedIconLayers>
-					<local:ThemedIconLayer LayerType="Alt" PathData="m5.41,1.22c.06.26.09.53.09.8l-.02,3.36c0,.92-.38,1.8-1.03,2.45l-1.73,1.72,1.52,1.51c.59.59,1.54.59,2.13,0l4.67-4.65c.28-.28.44-.65.44-1.05l.02-3.36c0-.83-.67-1.51-1.51-1.51h-3.25c-.4.02-.78.17-1.06.45l-.27.27Z" />
-					<local:ThemedIconLayer LayerType="Base" PathData="m9.99,0h-3.25c-.53.02-1.04.23-1.41.6l-.08.08c.15.36.23.75.25,1.16l.54-.54c.19-.19.44-.29.7-.29h3.25c.56-.02,1.01.44,1.01.99l-.02,3.36c0,.26-.11.51-.29.7l-4.67,4.65c-.39.39-1.03.39-1.42,0l-1.52-1.51-.71.71,1.52,1.51c.78.78,2.05.78,2.84,0l4.67-4.65c.37-.37.58-.87.59-1.4l.02-3.36C12.01.9,11.1,0,9.99,0Zm.01,3c0-.55-.45-1-1-1s-1,.45-1,1,.45,1,1,1,1-.45,1-1Z" />
+					<local:ThemedIconLayer
+						LayerSize="12"
+						LayerType="Alt"
+						PathData="m5.41,1.22c.06.26.09.53.09.8l-.02,3.36c0,.92-.38,1.8-1.03,2.45l-1.73,1.72,1.52,1.51c.59.59,1.54.59,2.13,0l4.67-4.65c.28-.28.44-.65.44-1.05l.02-3.36c0-.83-.67-1.51-1.51-1.51h-3.25c-.4.02-.78.17-1.06.45l-.27.27Z" />
+					<local:ThemedIconLayer
+						LayerSize="12"
+						LayerType="Base"
+						PathData="m9.99,0h-3.25c-.53.02-1.04.23-1.41.6l-.08.08c.15.36.23.75.25,1.16l.54-.54c.19-.19.44-.29.7-.29h3.25c.56-.02,1.01.44,1.01.99l-.02,3.36c0,.26-.11.51-.29.7l-4.67,4.65c-.39.39-1.03.39-1.42,0l-1.52-1.51-.71.71,1.52,1.51c.78.78,2.05.78,2.84,0l4.67-4.65c.37-.37.58-.87.59-1.4l.02-3.36C12.01.9,11.1,0,9.99,0Zm.01,3c0-.55-.45-1-1-1s-1,.45-1,1,.45,1,1,1,1-.45,1-1Z" />
 				</local:ThemedIconLayers>
 			</Setter.Value>
 		</Setter>
@@ -348,8 +354,14 @@
 		<Setter Property="Layers">
 			<Setter.Value>
 				<local:ThemedIconLayers>
-					<local:ThemedIconLayer LayerType="Alt" PathData="m11.5,2.01c0-.84-.67-1.51-1.51-1.51h-3.25c-.4.02-.77.17-1.06.45L.94,5.67c-.59.59-.59,1.53,0,2.12l3.3,3.28c.59.58,1.54.58,2.12,0l4.67-4.65c.28-.28.44-.65.44-1.05l.02-3.36Z" />
-					<local:ThemedIconLayer LayerType="Base" PathData="m9,4c-.55,0-1-.45-1-1s.45-1,1-1,1,.45,1,1-.45,1-1,1ZM.59,8.14c-.78-.78-.78-2.04,0-2.82L5.33.6C5.7.23,6.21.02,6.74.01h3.25c1.12-.02,2.02.89,2.01,2l-.02,3.36c0,.52-.21,1.03-.59,1.4l-4.67,4.65c-.78.78-2.05.78-2.84,0l-3.3-3.28Zm.71-2.12c-.39.39-.39,1.02,0,1.41l3.3,3.28c.39.39,1.03.39,1.42,0l4.67-4.65c.19-.19.29-.44.29-.7l.02-3.36c0-.56-.45-1.01-1.01-1h-3.25c-.26.01-.52.12-.7.31L1.3,6.02Z" />
+					<local:ThemedIconLayer
+						LayerSize="12"
+						LayerType="Alt"
+						PathData="m11.5,2.01c0-.84-.67-1.51-1.51-1.51h-3.25c-.4.02-.77.17-1.06.45L.94,5.67c-.59.59-.59,1.53,0,2.12l3.3,3.28c.59.58,1.54.58,2.12,0l4.67-4.65c.28-.28.44-.65.44-1.05l.02-3.36Z" />
+					<local:ThemedIconLayer
+						LayerSize="12"
+						LayerType="Base"
+						PathData="m9,4c-.55,0-1-.45-1-1s.45-1,1-1,1,.45,1,1-.45,1-1,1ZM.59,8.14c-.78-.78-.78-2.04,0-2.82L5.33.6C5.7.23,6.21.02,6.74.01h3.25c1.12-.02,2.02.89,2.01,2l-.02,3.36c0,.52-.21,1.03-.59,1.4l-4.67,4.65c-.78.78-2.05.78-2.84,0l-3.3-3.28Zm.71-2.12c-.39.39-.39,1.02,0,1.41l3.3,3.28c.39.39,1.03.39,1.42,0l4.67-4.65c.19-.19.29-.44.29-.7l.02-3.36c0-.56-.45-1.01-1.01-1h-3.25c-.26.01-.52.12-.7.31L1.3,6.02Z" />
 				</local:ThemedIconLayers>
 			</Setter.Value>
 		</Setter>
diff --git a/tests/Files.App.UITests/UserControls/ThemedIconsUC.xaml b/tests/Files.App.UITests/UserControls/ThemedIconsUC.xaml
index ff4be306155c..040363318ba2 100644
--- a/tests/Files.App.UITests/UserControls/ThemedIconsUC.xaml
+++ b/tests/Files.App.UITests/UserControls/ThemedIconsUC.xaml
@@ -17,7 +17,7 @@
 		<Grid.Resources>
 			<Style
 				x:Key="IconTest"
-				BasedOn="{StaticResource App.ThemedIcons.Properties.Library}"
+				BasedOn="{StaticResource App.ThemedIcons.IconSize.Medium.28}"
 				TargetType="controls:ThemedIcon" />
 		</Grid.Resources>
 

From a61e20629ca6454456666345b0a32f7df7d097dc Mon Sep 17 00:00:00 2001
From: Yair <39923744+yaira2@users.noreply.github.com>
Date: Wed, 24 Jul 2024 16:52:15 -0400
Subject: [PATCH 2/4] Use smaller sizes

---
 src/Files.App/Data/Items/DriveItem.cs                   | 2 +-
 src/Files.App/Styles/SidebarStyles.xaml                 | 2 +-
 tests/Files.App.UITests/UserControls/ThemedIconsUC.xaml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Files.App/Data/Items/DriveItem.cs b/src/Files.App/Data/Items/DriveItem.cs
index 0168e683b839..1a0d4021c569 100644
--- a/src/Files.App/Data/Items/DriveItem.cs
+++ b/src/Files.App/Data/Items/DriveItem.cs
@@ -202,7 +202,7 @@ public FrameworkElement? ItemDecorator
 					Style = Application.Current.Resources["SidebarEjectButtonStyle"] as Style,
 					Content = new ThemedIcon()
 					{
-						Style = Application.Current.Resources["App.ThemedIcons.Actions.Eject"] as Style,
+						Style = Application.Current.Resources["App.ThemedIcons.Actions.Eject.12"] as Style,
 						Height = 16,
 						Width = 16
 					}
diff --git a/src/Files.App/Styles/SidebarStyles.xaml b/src/Files.App/Styles/SidebarStyles.xaml
index efc107056bd2..0e6f8b90d4ab 100644
--- a/src/Files.App/Styles/SidebarStyles.xaml
+++ b/src/Files.App/Styles/SidebarStyles.xaml
@@ -28,7 +28,7 @@
 
 	<Style
 		x:Key="SidebarFavouritesPinnedIcon"
-		BasedOn="{StaticResource App.ThemedIcons.Actions.Pinned}"
+		BasedOn="{StaticResource App.ThemedIcons.Actions.Pinned.12}"
 		TargetType="controls:ThemedIcon">
 		<Setter Target="MinWidth" Value="16" />
 		<Setter Target="Width" Value="16" />
diff --git a/tests/Files.App.UITests/UserControls/ThemedIconsUC.xaml b/tests/Files.App.UITests/UserControls/ThemedIconsUC.xaml
index 040363318ba2..ff4be306155c 100644
--- a/tests/Files.App.UITests/UserControls/ThemedIconsUC.xaml
+++ b/tests/Files.App.UITests/UserControls/ThemedIconsUC.xaml
@@ -17,7 +17,7 @@
 		<Grid.Resources>
 			<Style
 				x:Key="IconTest"
-				BasedOn="{StaticResource App.ThemedIcons.IconSize.Medium.28}"
+				BasedOn="{StaticResource App.ThemedIcons.Properties.Library}"
 				TargetType="controls:ThemedIcon" />
 		</Grid.Resources>
 

From 310d649473b897bfbe02a0a2f345b04ba5f7bd29 Mon Sep 17 00:00:00 2001
From: Yair <39923744+yaira2@users.noreply.github.com>
Date: Wed, 24 Jul 2024 16:58:01 -0400
Subject: [PATCH 3/4] Update SidebarStyles.xaml

---
 src/Files.App/Styles/SidebarStyles.xaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Files.App/Styles/SidebarStyles.xaml b/src/Files.App/Styles/SidebarStyles.xaml
index 0e6f8b90d4ab..5b3558c1c704 100644
--- a/src/Files.App/Styles/SidebarStyles.xaml
+++ b/src/Files.App/Styles/SidebarStyles.xaml
@@ -30,10 +30,10 @@
 		x:Key="SidebarFavouritesPinnedIcon"
 		BasedOn="{StaticResource App.ThemedIcons.Actions.Pinned.12}"
 		TargetType="controls:ThemedIcon">
-		<Setter Target="MinWidth" Value="16" />
-		<Setter Target="Width" Value="16" />
-		<Setter Target="MinHeight" Value="16" />
-		<Setter Target="Height" Value="16" />
+		<Setter Target="MinWidth" Value="12" />
+		<Setter Target="Width" Value="12" />
+		<Setter Target="MinHeight" Value="12" />
+		<Setter Target="Height" Value="12" />
 		<Setter Target="Padding" Value="0" />
 	</Style>
 

From 68c920aab3e020276ffb09da296965781cc02ffa Mon Sep 17 00:00:00 2001
From: Yair <39923744+yaira2@users.noreply.github.com>
Date: Wed, 24 Jul 2024 17:00:38 -0400
Subject: [PATCH 4/4] Update DriveItem.cs

---
 src/Files.App/Data/Items/DriveItem.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Files.App/Data/Items/DriveItem.cs b/src/Files.App/Data/Items/DriveItem.cs
index 1a0d4021c569..118ca94160bd 100644
--- a/src/Files.App/Data/Items/DriveItem.cs
+++ b/src/Files.App/Data/Items/DriveItem.cs
@@ -195,7 +195,7 @@ public FrameworkElement? ItemDecorator
 			get
 			{
 				if (!IsRemovable)
-					return null; // Removable items don't need the eject button
+					return null; // Non-removable items don't need the eject button
 
 				var itemDecorator = new Button()
 				{
@@ -203,8 +203,8 @@ public FrameworkElement? ItemDecorator
 					Content = new ThemedIcon()
 					{
 						Style = Application.Current.Resources["App.ThemedIcons.Actions.Eject.12"] as Style,
-						Height = 16,
-						Width = 16
+						Height = 12,
+						Width = 12
 					}
 				};