From e2a7299543529750623d3e4309ecf2fc0eb1d02a Mon Sep 17 00:00:00 2001
From: 0x5BFA <62196528+0x5bfa@users.noreply.github.com>
Date: Thu, 29 Feb 2024 00:56:25 +0900
Subject: [PATCH 01/11] Initial commit

---
 .../PinFolderToSidebarAction.cs}                         | 7 ++-----
 .../UnpinFolderToSidebarAction.cs}                       | 9 +++------
 src/Files.App/Data/Commands/CommandCodes.cs              | 4 ++--
 src/Files.App/Data/Commands/Manager/CommandManager.cs    | 8 ++++----
 src/Files.App/Data/Commands/Manager/ICommandManager.cs   | 4 ++--
 .../Data/Factories/ContentPageContextFlyoutFactory.cs    | 8 ++++----
 6 files changed, 17 insertions(+), 23 deletions(-)
 rename src/Files.App/Actions/{Favorites/PinItemAction.cs => Sidebar/PinFolderToSidebarAction.cs} (93%)
 rename src/Files.App/Actions/{Favorites/UnpinItemAction.cs => Sidebar/UnpinFolderToSidebarAction.cs} (89%)

diff --git a/src/Files.App/Actions/Favorites/PinItemAction.cs b/src/Files.App/Actions/Sidebar/PinFolderToSidebarAction.cs
similarity index 93%
rename from src/Files.App/Actions/Favorites/PinItemAction.cs
rename to src/Files.App/Actions/Sidebar/PinFolderToSidebarAction.cs
index 0fa3b8a97c71..f8462cc1236e 100644
--- a/src/Files.App/Actions/Favorites/PinItemAction.cs
+++ b/src/Files.App/Actions/Sidebar/PinFolderToSidebarAction.cs
@@ -1,16 +1,13 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using Files.App.Services;
-using Files.App.UserControls.Widgets;
 using Windows.Storage;
 
 namespace Files.App.Actions
 {
-	internal class PinItemAction : ObservableObject, IAction
+	internal sealed class PinFolderToSidebarAction : ObservableObject, IAction
 	{
 		private readonly IContentPageContext context;
-
 		private readonly IQuickAccessService service;
 
 		public string Label
@@ -25,7 +22,7 @@ public RichGlyph Glyph
 		public bool IsExecutable
 			=> GetIsExecutable();
 
-		public PinItemAction()
+		public PinFolderToSidebarAction()
 		{
 			context = Ioc.Default.GetRequiredService<IContentPageContext>();
 			service = Ioc.Default.GetRequiredService<IQuickAccessService>();
diff --git a/src/Files.App/Actions/Favorites/UnpinItemAction.cs b/src/Files.App/Actions/Sidebar/UnpinFolderToSidebarAction.cs
similarity index 89%
rename from src/Files.App/Actions/Favorites/UnpinItemAction.cs
rename to src/Files.App/Actions/Sidebar/UnpinFolderToSidebarAction.cs
index b76a3b77f5d7..0eaa4bfa4ac7 100644
--- a/src/Files.App/Actions/Favorites/UnpinItemAction.cs
+++ b/src/Files.App/Actions/Sidebar/UnpinFolderToSidebarAction.cs
@@ -1,12 +1,9 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using Files.App.Services;
-using Files.App.UserControls.Widgets;
-
 namespace Files.App.Actions
 {
-	internal class UnpinItemAction : ObservableObject, IAction
+	internal sealed class UnpinFolderToSidebarAction : ObservableObject, IAction
 	{
 		private readonly IContentPageContext context;
 
@@ -16,7 +13,7 @@ public string Label
 			=> "UnpinFromFavorites".GetLocalizedResource();
 
 		public string Description
-			=> "UnpinItemFromFavoritesDescription".GetLocalizedResource();
+			=> "UnpinFolderToSidebarDescription".GetLocalizedResource();
 
 		public RichGlyph Glyph
 			=> new(opacityStyle: "ColorIconUnpinFromFavorites");
@@ -24,7 +21,7 @@ public RichGlyph Glyph
 		public bool IsExecutable
 			=> GetIsExecutable();
 
-		public UnpinItemAction()
+		public UnpinFolderToSidebarAction()
 		{
 			context = Ioc.Default.GetRequiredService<IContentPageContext>();
 			service = Ioc.Default.GetRequiredService<IQuickAccessService>();
diff --git a/src/Files.App/Data/Commands/CommandCodes.cs b/src/Files.App/Data/Commands/CommandCodes.cs
index b423e4d0730e..9e7b8d560433 100644
--- a/src/Files.App/Data/Commands/CommandCodes.cs
+++ b/src/Files.App/Data/Commands/CommandCodes.cs
@@ -64,8 +64,8 @@ public enum CommandCodes
 		UnpinFromStart,
 
 		// Favorites
-		PinItemToFavorites,
-		UnpinItemFromFavorites,
+		PinFolderToSidebar,
+		UnpinFolderToSidebar,
 
 		// Backgrounds
 		SetAsWallpaperBackground,
diff --git a/src/Files.App/Data/Commands/Manager/CommandManager.cs b/src/Files.App/Data/Commands/Manager/CommandManager.cs
index 3d5a98c37963..eca8dae95cb8 100644
--- a/src/Files.App/Data/Commands/Manager/CommandManager.cs
+++ b/src/Files.App/Data/Commands/Manager/CommandManager.cs
@@ -69,8 +69,8 @@ public IRichCommand this[HotKey hotKey]
 		public IRichCommand AddItem => commands[CommandCodes.AddItem];
 		public IRichCommand PinToStart => commands[CommandCodes.PinToStart];
 		public IRichCommand UnpinFromStart => commands[CommandCodes.UnpinFromStart];
-		public IRichCommand PinItemToFavorites => commands[CommandCodes.PinItemToFavorites];
-		public IRichCommand UnpinItemFromFavorites => commands[CommandCodes.UnpinItemFromFavorites];
+		public IRichCommand PinFolderToSidebar => commands[CommandCodes.PinFolderToSidebar];
+		public IRichCommand UnpinFolderToSidebar => commands[CommandCodes.UnpinFolderToSidebar];
 		public IRichCommand SetAsWallpaperBackground => commands[CommandCodes.SetAsWallpaperBackground];
 		public IRichCommand SetAsSlideshowBackground => commands[CommandCodes.SetAsSlideshowBackground];
 		public IRichCommand SetAsLockscreenBackground => commands[CommandCodes.SetAsLockscreenBackground];
@@ -238,8 +238,8 @@ public CommandManager()
 			[CommandCodes.AddItem] = new AddItemAction(),
 			[CommandCodes.PinToStart] = new PinToStartAction(),
 			[CommandCodes.UnpinFromStart] = new UnpinFromStartAction(),
-			[CommandCodes.PinItemToFavorites] = new PinItemAction(),
-			[CommandCodes.UnpinItemFromFavorites] = new UnpinItemAction(),
+			[CommandCodes.PinFolderToSidebar] = new PinFolderToSidebarAction(),
+			[CommandCodes.UnpinFolderToSidebar] = new UnpinFolderToSidebarAction(),
 			[CommandCodes.SetAsWallpaperBackground] = new SetAsWallpaperBackgroundAction(),
 			[CommandCodes.SetAsSlideshowBackground] = new SetAsSlideshowBackgroundAction(),
 			[CommandCodes.SetAsLockscreenBackground] = new SetAsLockscreenBackgroundAction(),
diff --git a/src/Files.App/Data/Commands/Manager/ICommandManager.cs b/src/Files.App/Data/Commands/Manager/ICommandManager.cs
index 9b1359646aab..b931a7491428 100644
--- a/src/Files.App/Data/Commands/Manager/ICommandManager.cs
+++ b/src/Files.App/Data/Commands/Manager/ICommandManager.cs
@@ -58,8 +58,8 @@ public interface ICommandManager : IEnumerable<IRichCommand>
 
 		IRichCommand PinToStart { get; }
 		IRichCommand UnpinFromStart { get; }
-		IRichCommand PinItemToFavorites { get; }
-		IRichCommand UnpinItemFromFavorites { get; }
+		IRichCommand PinFolderToSidebar { get; }
+		IRichCommand UnpinFolderToSidebar { get; }
 
 		IRichCommand SetAsWallpaperBackground { get; }
 		IRichCommand SetAsSlideshowBackground { get; }
diff --git a/src/Files.App/Data/Factories/ContentPageContextFlyoutFactory.cs b/src/Files.App/Data/Factories/ContentPageContextFlyoutFactory.cs
index fab303d42ba1..529903060672 100644
--- a/src/Files.App/Data/Factories/ContentPageContextFlyoutFactory.cs
+++ b/src/Files.App/Data/Factories/ContentPageContextFlyoutFactory.cs
@@ -484,13 +484,13 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseItemMenuItems(
 					IsVisible = Commands.OpenProperties.IsExecutable
 				}.Build(),
 				new ContextMenuFlyoutItemViewModelBuilder(Commands.OpenParentFolder).Build(),
-				new ContextMenuFlyoutItemViewModelBuilder(Commands.PinItemToFavorites)
+				new ContextMenuFlyoutItemViewModelBuilder(Commands.PinFolderToSidebar)
 				{
-					IsVisible = Commands.PinItemToFavorites.IsExecutable && UserSettingsService.GeneralSettingsService.ShowFavoritesSection,
+					IsVisible = Commands.PinFolderToSidebar.IsExecutable && UserSettingsService.GeneralSettingsService.ShowFavoritesSection,
 				}.Build(),
-				new ContextMenuFlyoutItemViewModelBuilder(Commands.UnpinItemFromFavorites)
+				new ContextMenuFlyoutItemViewModelBuilder(Commands.UnpinFolderToSidebar)
 				{
-					IsVisible = Commands.UnpinItemFromFavorites.IsExecutable && UserSettingsService.GeneralSettingsService.ShowFavoritesSection,
+					IsVisible = Commands.UnpinFolderToSidebar.IsExecutable && UserSettingsService.GeneralSettingsService.ShowFavoritesSection,
 				}.Build(),
 				new ContextMenuFlyoutItemViewModelBuilder(Commands.PinToStart)
 				{

From 3faff07d86e390f950f2ecc1d169ddf91a82663f Mon Sep 17 00:00:00 2001
From: 0x5BFA <62196528+0x5bfa@users.noreply.github.com>
Date: Thu, 29 Feb 2024 01:09:44 +0900
Subject: [PATCH 02/11] Renamed 1

---
 .../Sidebar/PinFolderToSidebarAction.cs       |  4 +--
 .../Sidebar/UnpinFolderToSidebarAction.cs     |  4 +--
 .../Actions/Start/PinToStartAction.cs         |  2 +-
 .../Actions/Start/UnpinFromStartAction.cs     |  2 +-
 .../ResourceDictionaries/PathIcons.xaml       |  4 +--
 .../Widgets/BaseWidgetViewModel.cs            |  8 ++---
 .../UserControls/Widgets/DrivesWidget.xaml.cs | 24 +++++++-------
 .../Widgets/FileTagsWidget.xaml.cs            | 16 +++++-----
 .../Widgets/QuickAccessWidget.xaml.cs         | 32 +++++++++----------
 .../UserControls/SidebarViewModel.cs          | 10 +++---
 10 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/src/Files.App/Actions/Sidebar/PinFolderToSidebarAction.cs b/src/Files.App/Actions/Sidebar/PinFolderToSidebarAction.cs
index f8462cc1236e..384dec3499a4 100644
--- a/src/Files.App/Actions/Sidebar/PinFolderToSidebarAction.cs
+++ b/src/Files.App/Actions/Sidebar/PinFolderToSidebarAction.cs
@@ -11,13 +11,13 @@ internal sealed class PinFolderToSidebarAction : ObservableObject, IAction
 		private readonly IQuickAccessService service;
 
 		public string Label
-			=> "PinToFavorites".GetLocalizedResource();
+			=> "PinToSidebar".GetLocalizedResource();
 
 		public string Description
 			=> "PinItemToFavoritesDescription".GetLocalizedResource();
 
 		public RichGlyph Glyph
-			=> new(opacityStyle: "ColorIconPinToFavorites");
+			=> new(opacityStyle: "ColorIconPinToSidebar");
 
 		public bool IsExecutable
 			=> GetIsExecutable();
diff --git a/src/Files.App/Actions/Sidebar/UnpinFolderToSidebarAction.cs b/src/Files.App/Actions/Sidebar/UnpinFolderToSidebarAction.cs
index 0eaa4bfa4ac7..edf98efef405 100644
--- a/src/Files.App/Actions/Sidebar/UnpinFolderToSidebarAction.cs
+++ b/src/Files.App/Actions/Sidebar/UnpinFolderToSidebarAction.cs
@@ -10,13 +10,13 @@ internal sealed class UnpinFolderToSidebarAction : ObservableObject, IAction
 		private readonly IQuickAccessService service;
 
 		public string Label
-			=> "UnpinFromFavorites".GetLocalizedResource();
+			=> "UnpinFromSidebar".GetLocalizedResource();
 
 		public string Description
 			=> "UnpinFolderToSidebarDescription".GetLocalizedResource();
 
 		public RichGlyph Glyph
-			=> new(opacityStyle: "ColorIconUnpinFromFavorites");
+			=> new(opacityStyle: "ColorIconUnpinFromSidebar");
 
 		public bool IsExecutable
 			=> GetIsExecutable();
diff --git a/src/Files.App/Actions/Start/PinToStartAction.cs b/src/Files.App/Actions/Start/PinToStartAction.cs
index 8d518a5d450f..8923d488cdf7 100644
--- a/src/Files.App/Actions/Start/PinToStartAction.cs
+++ b/src/Files.App/Actions/Start/PinToStartAction.cs
@@ -21,7 +21,7 @@ public string Description
 			=> "PinToStartDescription".GetLocalizedResource();
 
 		public RichGlyph Glyph
-			=> new(opacityStyle: "ColorIconPinToFavorites");
+			=> new(opacityStyle: "ColorIconPinToSidebar");
 
 		public bool IsExecutable =>
 			context.ShellPage is not null;
diff --git a/src/Files.App/Actions/Start/UnpinFromStartAction.cs b/src/Files.App/Actions/Start/UnpinFromStartAction.cs
index 854bcd70ec85..ebc9b6b4c170 100644
--- a/src/Files.App/Actions/Start/UnpinFromStartAction.cs
+++ b/src/Files.App/Actions/Start/UnpinFromStartAction.cs
@@ -20,7 +20,7 @@ public string Description
 			=> "UnpinFromStartDescription".GetLocalizedResource();
 
 		public RichGlyph Glyph
-			=> new(opacityStyle: "ColorIconUnpinFromFavorites");
+			=> new(opacityStyle: "ColorIconUnpinFromSidebar");
 
 		public UnpinFromStartAction()
 		{
diff --git a/src/Files.App/ResourceDictionaries/PathIcons.xaml b/src/Files.App/ResourceDictionaries/PathIcons.xaml
index 425c1eea45ef..975dc888eef4 100644
--- a/src/Files.App/ResourceDictionaries/PathIcons.xaml
+++ b/src/Files.App/ResourceDictionaries/PathIcons.xaml
@@ -1448,7 +1448,7 @@
 				</Setter>
 			</Style>
 
-			<Style x:Key="ColorIconPinToFavorites" TargetType="local:OpacityIcon">
+			<Style x:Key="ColorIconPinToSidebar" TargetType="local:OpacityIcon">
 				<Setter Property="Template">
 					<Setter.Value>
 						<ControlTemplate>
@@ -1489,7 +1489,7 @@
 				</Setter>
 			</Style>
 
-			<Style x:Key="ColorIconUnpinFromFavorites" TargetType="local:OpacityIcon">
+			<Style x:Key="ColorIconUnpinFromSidebar" TargetType="local:OpacityIcon">
 				<Setter Property="Template">
 					<Setter.Value>
 						<ControlTemplate>
diff --git a/src/Files.App/UserControls/Widgets/BaseWidgetViewModel.cs b/src/Files.App/UserControls/Widgets/BaseWidgetViewModel.cs
index 2cb21a79dbd9..4fbad67e6554 100644
--- a/src/Files.App/UserControls/Widgets/BaseWidgetViewModel.cs
+++ b/src/Files.App/UserControls/Widgets/BaseWidgetViewModel.cs
@@ -33,8 +33,8 @@ public abstract class BaseWidgetViewModel : UserControl
 		protected ICommand? OpenInNewTabCommand { get; set; }
 		protected ICommand? OpenInNewWindowCommand { get; set; }
 		protected ICommand? OpenPropertiesCommand { get; set; }
-		protected ICommand? PinToFavoritesCommand { get; set; }
-		protected ICommand? UnpinFromFavoritesCommand { get; set; }
+		protected ICommand? PinToSidebarCommand { get; set; }
+		protected ICommand? UnpinFromSidebarCommand { get; set; }
 
 		// Events
 
@@ -101,12 +101,12 @@ public async Task OpenInNewWindowAsync(WidgetCardItem item)
 			await NavigationHelpers.OpenPathInNewWindowAsync(item.Path);
 		}
 
-		public virtual async Task PinToFavoritesAsync(WidgetCardItem item)
+		public virtual async Task PinToSidebarAsync(WidgetCardItem item)
 		{
 			await QuickAccessService.PinToSidebarAsync(item.Path);
 		}
 
-		public virtual async Task UnpinFromFavoritesAsync(WidgetCardItem item)
+		public virtual async Task UnpinFromSidebarAsync(WidgetCardItem item)
 		{
 			await QuickAccessService.UnpinFromSidebarAsync(item.Path);
 		}
diff --git a/src/Files.App/UserControls/Widgets/DrivesWidget.xaml.cs b/src/Files.App/UserControls/Widgets/DrivesWidget.xaml.cs
index 9638ab031a8c..d6c9ef0193c7 100644
--- a/src/Files.App/UserControls/Widgets/DrivesWidget.xaml.cs
+++ b/src/Files.App/UserControls/Widgets/DrivesWidget.xaml.cs
@@ -79,8 +79,8 @@ public DrivesWidget()
 			OpenInNewWindowCommand = new AsyncRelayCommand<WidgetCardItem>(OpenInNewWindowAsync);
 			OpenInNewPaneCommand = new AsyncRelayCommand<WidgetDriveCardItem>(OpenInNewPaneAsync);
 			OpenPropertiesCommand = new RelayCommand<WidgetDriveCardItem>(OpenProperties);
-			PinToFavoritesCommand = new AsyncRelayCommand<WidgetCardItem>(PinToFavoritesAsync);
-			UnpinFromFavoritesCommand = new AsyncRelayCommand<WidgetCardItem>(UnpinFromFavoritesAsync);
+			PinToSidebarCommand = new AsyncRelayCommand<WidgetCardItem>(PinToSidebarAsync);
+			UnpinFromSidebarCommand = new AsyncRelayCommand<WidgetCardItem>(UnpinFromSidebarAsync);
 			MapNetworkDriveCommand = new AsyncRelayCommand(DoNetworkMapDriveAsync); 
 			DisconnectNetworkDriveCommand = new RelayCommand<WidgetDriveCardItem>(DisconnectNetworkDrive);
 		}
@@ -145,23 +145,23 @@ public override List<ContextMenuFlyoutItemViewModel> GetItemMenuItems(WidgetCard
 				},
 				new ContextMenuFlyoutItemViewModel()
 				{
-					Text = "PinToFavorites".GetLocalizedResource(),
+					Text = "PinToSidebar".GetLocalizedResource(),
 					OpacityIcon = new OpacityIconModel()
 					{
-						OpacityIconStyle = "ColorIconPinToFavorites",
+						OpacityIconStyle = "ColorIconPinToSidebar",
 					},
-					Command = PinToFavoritesCommand,
+					Command = PinToSidebarCommand,
 					CommandParameter = item,
 					ShowItem = !isPinned
 				},
 				new ContextMenuFlyoutItemViewModel()
 				{
-					Text = "UnpinFromFavorites".GetLocalizedResource(),
+					Text = "UnpinFromSidebar".GetLocalizedResource(),
 					OpacityIcon = new OpacityIconModel()
 					{
-						OpacityIconStyle = "ColorIconUnpinFromFavorites",
+						OpacityIconStyle = "ColorIconUnpinFromSidebar",
 					},
-					Command = UnpinFromFavoritesCommand,
+					Command = UnpinFromSidebarCommand,
 					CommandParameter = item,
 					ShowItem = isPinned
 				},
@@ -303,11 +303,11 @@ private async Task OpenInNewPaneAsync(WidgetDriveCardItem item)
 
 		private void MenuFlyout_Opening(object sender, object e)
 		{
-			var pinToFavoritesItem = (sender as MenuFlyout).Items.Single(x => x.Name == "PinToFavorites");
-			pinToFavoritesItem.Visibility = (pinToFavoritesItem.DataContext as DriveItem).IsPinned ? Visibility.Collapsed : Visibility.Visible;
+			var pinToSidebarItem = (sender as MenuFlyout).Items.Single(x => x.Name == "PinToSidebar");
+			pinToSidebarItem.Visibility = (pinToSidebarItem.DataContext as DriveItem).IsPinned ? Visibility.Collapsed : Visibility.Visible;
 
-			var unpinFromFavoritesItem = (sender as MenuFlyout).Items.Single(x => x.Name == "UnpinFromFavorites");
-			unpinFromFavoritesItem.Visibility = (unpinFromFavoritesItem.DataContext as DriveItem).IsPinned ? Visibility.Visible : Visibility.Collapsed;
+			var unpinFromSidebarItem = (sender as MenuFlyout).Items.Single(x => x.Name == "UnpinFromSidebar");
+			unpinFromSidebarItem.Visibility = (unpinFromSidebarItem.DataContext as DriveItem).IsPinned ? Visibility.Visible : Visibility.Collapsed;
 		}
 
 		private void DisconnectNetworkDrive(WidgetDriveCardItem item)
diff --git a/src/Files.App/UserControls/Widgets/FileTagsWidget.xaml.cs b/src/Files.App/UserControls/Widgets/FileTagsWidget.xaml.cs
index dec9cecef530..2491f074e45b 100644
--- a/src/Files.App/UserControls/Widgets/FileTagsWidget.xaml.cs
+++ b/src/Files.App/UserControls/Widgets/FileTagsWidget.xaml.cs
@@ -59,8 +59,8 @@ public FileTagsWidget()
 			OpenInNewWindowCommand = new AsyncRelayCommand<WidgetCardItem>(OpenInNewWindowAsync);
 			OpenFileLocationCommand = new RelayCommand<WidgetCardItem>(OpenFileLocation);
 			OpenInNewPaneCommand = new RelayCommand<WidgetCardItem>(OpenInNewPane);
-			PinToFavoritesCommand = new AsyncRelayCommand<WidgetCardItem>(PinToFavoritesAsync);
-			UnpinFromFavoritesCommand = new AsyncRelayCommand<WidgetCardItem>(UnpinFromFavoritesAsync);
+			PinToSidebarCommand = new AsyncRelayCommand<WidgetCardItem>(PinToSidebarAsync);
+			UnpinFromSidebarCommand = new AsyncRelayCommand<WidgetCardItem>(UnpinFromSidebarAsync);
 			OpenPropertiesCommand = new RelayCommand<WidgetCardItem>(OpenProperties);
 		}
 
@@ -204,23 +204,23 @@ public override List<ContextMenuFlyoutItemViewModel> GetItemMenuItems(WidgetCard
 				},
 				new ContextMenuFlyoutItemViewModel()
 				{
-					Text = "PinToFavorites".GetLocalizedResource(),
+					Text = "PinToSidebar".GetLocalizedResource(),
 					OpacityIcon = new OpacityIconModel()
 					{
-						OpacityIconStyle = "ColorIconPinToFavorites",
+						OpacityIconStyle = "ColorIconPinToSidebar",
 					},
-					Command = PinToFavoritesCommand,
+					Command = PinToSidebarCommand,
 					CommandParameter = item,
 					ShowItem = !isPinned && isFolder
 				},
 				new ContextMenuFlyoutItemViewModel()
 				{
-					Text = "UnpinFromFavorites".GetLocalizedResource(),
+					Text = "UnpinFromSidebar".GetLocalizedResource(),
 					OpacityIcon = new OpacityIconModel()
 					{
-						OpacityIconStyle = "ColorIconUnpinFromFavorites",
+						OpacityIconStyle = "ColorIconUnpinFromSidebar",
 					},
-					Command = UnpinFromFavoritesCommand,
+					Command = UnpinFromSidebarCommand,
 					CommandParameter = item,
 					ShowItem = isPinned && isFolder
 				},
diff --git a/src/Files.App/UserControls/Widgets/QuickAccessWidget.xaml.cs b/src/Files.App/UserControls/Widgets/QuickAccessWidget.xaml.cs
index 7a9cf3684788..dc10835b694f 100644
--- a/src/Files.App/UserControls/Widgets/QuickAccessWidget.xaml.cs
+++ b/src/Files.App/UserControls/Widgets/QuickAccessWidget.xaml.cs
@@ -39,8 +39,8 @@ public QuickAccessWidget()
 			OpenInNewWindowCommand = new AsyncRelayCommand<WidgetFolderCardItem>(OpenInNewWindowAsync);
 			OpenInNewPaneCommand = new RelayCommand<WidgetFolderCardItem>(OpenInNewPane);
 			OpenPropertiesCommand = new RelayCommand<WidgetFolderCardItem>(OpenProperties);
-			PinToFavoritesCommand = new AsyncRelayCommand<WidgetFolderCardItem>(PinToFavoritesAsync);
-			UnpinFromFavoritesCommand = new AsyncRelayCommand<WidgetFolderCardItem>(UnpinFromFavoritesAsync);
+			PinToSidebarCommand = new AsyncRelayCommand<WidgetFolderCardItem>(PinToSidebarAsync);
+			UnpinFromSidebarCommand = new AsyncRelayCommand<WidgetFolderCardItem>(UnpinFromSidebarAsync);
 		}
 
 		public delegate void QuickAccessCardInvokedEventHandler(object sender, QuickAccessCardInvokedEventArgs e);
@@ -98,23 +98,23 @@ public override List<ContextMenuFlyoutItemViewModel> GetItemMenuItems(WidgetCard
 				},
 				new ContextMenuFlyoutItemViewModel()
 				{
-					Text = "PinToFavorites".GetLocalizedResource(),
+					Text = "PinToSidebar".GetLocalizedResource(),
 					OpacityIcon = new OpacityIconModel()
 					{
-						OpacityIconStyle = "ColorIconPinToFavorites",
+						OpacityIconStyle = "ColorIconPinToSidebar",
 					},
-					Command = PinToFavoritesCommand,
+					Command = PinToSidebarCommand,
 					CommandParameter = item,
 					ShowItem = !isPinned
 				},
 				new ContextMenuFlyoutItemViewModel()
 				{
-					Text = "UnpinFromFavorites".GetLocalizedResource(),
+					Text = "UnpinFromSidebar".GetLocalizedResource(),
 					OpacityIcon = new OpacityIconModel()
 					{
-						OpacityIconStyle = "ColorIconUnpinFromFavorites",
+						OpacityIconStyle = "ColorIconUnpinFromSidebar",
 					},
-					Command = UnpinFromFavoritesCommand,
+					Command = UnpinFromSidebarCommand,
 					CommandParameter = item,
 					ShowItem = isPinned
 				},
@@ -255,13 +255,13 @@ private static async void ItemsAdded_CollectionChanged(object? sender, NotifyCol
 
 		private void MenuFlyout_Opening(object sender)
 		{
-			var pinToFavoritesItem = (sender as MenuFlyout)?.Items.SingleOrDefault(x => x.Name == "PinToFavorites");
-			if (pinToFavoritesItem is not null)
-				pinToFavoritesItem.Visibility = (pinToFavoritesItem.DataContext as WidgetFolderCardItem)?.IsPinned ?? false ? Visibility.Collapsed : Visibility.Visible;
+			var pinToSidebarItem = (sender as MenuFlyout)?.Items.SingleOrDefault(x => x.Name == "PinToSidebar");
+			if (pinToSidebarItem is not null)
+				pinToSidebarItem.Visibility = (pinToSidebarItem.DataContext as WidgetFolderCardItem)?.IsPinned ?? false ? Visibility.Collapsed : Visibility.Visible;
 
-			var unpinFromFavoritesItem = (sender as MenuFlyout)?.Items.SingleOrDefault(x => x.Name == "UnpinFromFavorites");
-			if (unpinFromFavoritesItem is not null)
-				unpinFromFavoritesItem.Visibility = (unpinFromFavoritesItem.DataContext as WidgetFolderCardItem)?.IsPinned ?? false ? Visibility.Visible : Visibility.Collapsed;
+			var unpinFromSidebarItem = (sender as MenuFlyout)?.Items.SingleOrDefault(x => x.Name == "UnpinFromSidebar");
+			if (unpinFromSidebarItem is not null)
+				unpinFromSidebarItem.Visibility = (unpinFromSidebarItem.DataContext as WidgetFolderCardItem)?.IsPinned ?? false ? Visibility.Visible : Visibility.Collapsed;
 		}
 
 		private void NotifyPropertyChanged([CallerMemberName] string propertyName = "")
@@ -300,7 +300,7 @@ private void OpenProperties(WidgetFolderCardItem item)
 			flyout!.Closed += flyoutClosed;
 		}
 
-		public override async Task PinToFavoritesAsync(WidgetCardItem item)
+		public override async Task PinToSidebarAsync(WidgetCardItem item)
 		{
 			await QuickAccessService.PinToSidebarAsync(item.Path);
 
@@ -319,7 +319,7 @@ public override async Task PinToFavoritesAsync(WidgetCardItem item)
 			}
 		}
 
-		public override async Task UnpinFromFavoritesAsync(WidgetCardItem item)
+		public override async Task UnpinFromSidebarAsync(WidgetCardItem item)
 		{
 			await QuickAccessService.UnpinFromSidebarAsync(item.Path);
 
diff --git a/src/Files.App/ViewModels/UserControls/SidebarViewModel.cs b/src/Files.App/ViewModels/UserControls/SidebarViewModel.cs
index b158a39aa6ce..c47154609dfd 100644
--- a/src/Files.App/ViewModels/UserControls/SidebarViewModel.cs
+++ b/src/Files.App/ViewModels/UserControls/SidebarViewModel.cs
@@ -1002,20 +1002,20 @@ private List<ContextMenuFlyoutItemViewModel> GetLocationItemMenuItems(INavigatio
 				},
 				new ContextMenuFlyoutItemViewModel()
 				{
-					Text = "PinToFavorites".GetLocalizedResource(),
+					Text = "PinToSidebar".GetLocalizedResource(),
 					OpacityIcon = new OpacityIconModel()
 					{
-						OpacityIconStyle = "ColorIconPinToFavorites",
+						OpacityIconStyle = "ColorIconPinToSidebar",
 					},
 					Command = PinItemCommand,
 					ShowItem = isDriveItem && !isDriveItemPinned
 				},
 				new ContextMenuFlyoutItemViewModel()
 				{
-					Text = "UnpinFromFavorites".GetLocalizedResource(),
+					Text = "UnpinFromSidebar".GetLocalizedResource(),
 					OpacityIcon = new OpacityIconModel()
 					{
-						OpacityIconStyle = "ColorIconUnpinFromFavorites",
+						OpacityIconStyle = "ColorIconUnpinFromSidebar",
 					},
 					Command = UnpinItemCommand,
 					ShowItem = options.ShowUnpinItem || isDriveItemPinned
@@ -1109,7 +1109,7 @@ private async Task HandleLocationItemDragOverAsync(LocationItem locationItem, It
 					}
 					else
 					{
-						var captionText = "PinToFavorites".GetLocalizedResource();
+						var captionText = "PinToSidebar".GetLocalizedResource();
 						CompleteDragEventArgs(rawEvent, captionText, DataPackageOperation.Move);
 					}
 				}

From a2e82ce29d210f2f834ce53880deaf03c758f71c Mon Sep 17 00:00:00 2001
From: 0x5BFA <62196528+0x5bfa@users.noreply.github.com>
Date: Thu, 29 Feb 2024 01:15:52 +0900
Subject: [PATCH 03/11] Rename 2

---
 docs/rich-commands.md                                    | 4 ++--
 .../Actions/Sidebar/PinFolderToSidebarAction.cs          | 4 ++--
 .../Actions/Sidebar/UnpinFolderToSidebarAction.cs        | 9 ++++-----
 src/Files.App/Data/Commands/CommandCodes.cs              | 2 +-
 src/Files.App/Data/Commands/Manager/CommandManager.cs    | 4 ++--
 src/Files.App/Data/Commands/Manager/ICommandManager.cs   | 2 +-
 .../Data/Factories/ContentPageContextFlyoutFactory.cs    | 4 ++--
 7 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/docs/rich-commands.md b/docs/rich-commands.md
index 1a02acf20f05..626214430d9d 100644
--- a/docs/rich-commands.md
+++ b/docs/rich-commands.md
@@ -51,8 +51,8 @@ This is the list of all commands defined in `CommandCodes` enum except `None`.
 | Share              | ShareItem                           | Share                                     | Share selected file(s) with others                       |                     |
 | Start              | PinToStart                          | Pin to the Start Menu                     | Pin item(s) to the Start Menu                            |                     |
 |                    | UnpinFromStart                      | Unpin from the Start Menu                 | Unpin item(s) from the Start Menu                        |                     |
-| Favorites          | PinItemToFavorites                  | Pin to Favorites                          | Pin folder(s) to Favorites                               |                     |
-|                    | UnpinItemFromFavorites              | Unpin from Favorites                      | Unpin folder(s) from Favorites                           |                     |
+| Sidebar          | PinItemToSidebar                  | Pin to Sidebar                          | Pin folder(s) to Sidebar                               |                     |
+|                    | UnpinItemFromSidebar              | Unpin from Sidebar                      | Unpin folder(s) from Sidebar                           |                     |
 | Backgrounds        | SetAsWallpaperBackground            | Set as desktop background                 | Set selected picture as desktop background               |                     |
 |                    | SetAsSlideshowBackground            | Set as desktop slideshow                  | Set selected pictures as desktop slideshow               |                     |
 |                    | SetAsLockscreenBackground           | Set as lockscreen background              | Set selected picture as lockscreen background            |                     |
diff --git a/src/Files.App/Actions/Sidebar/PinFolderToSidebarAction.cs b/src/Files.App/Actions/Sidebar/PinFolderToSidebarAction.cs
index 384dec3499a4..25762bcdda78 100644
--- a/src/Files.App/Actions/Sidebar/PinFolderToSidebarAction.cs
+++ b/src/Files.App/Actions/Sidebar/PinFolderToSidebarAction.cs
@@ -11,10 +11,10 @@ internal sealed class PinFolderToSidebarAction : ObservableObject, IAction
 		private readonly IQuickAccessService service;
 
 		public string Label
-			=> "PinToSidebar".GetLocalizedResource();
+			=> "PinFolderToSidebar".GetLocalizedResource();
 
 		public string Description
-			=> "PinItemToFavoritesDescription".GetLocalizedResource();
+			=> "PinFolderToSidebar".GetLocalizedResource();
 
 		public RichGlyph Glyph
 			=> new(opacityStyle: "ColorIconPinToSidebar");
diff --git a/src/Files.App/Actions/Sidebar/UnpinFolderToSidebarAction.cs b/src/Files.App/Actions/Sidebar/UnpinFolderToSidebarAction.cs
index edf98efef405..b281130d9895 100644
--- a/src/Files.App/Actions/Sidebar/UnpinFolderToSidebarAction.cs
+++ b/src/Files.App/Actions/Sidebar/UnpinFolderToSidebarAction.cs
@@ -3,17 +3,16 @@
 
 namespace Files.App.Actions
 {
-	internal sealed class UnpinFolderToSidebarAction : ObservableObject, IAction
+	internal sealed class UnpinFolderFromSidebarAction : ObservableObject, IAction
 	{
 		private readonly IContentPageContext context;
-
 		private readonly IQuickAccessService service;
 
 		public string Label
-			=> "UnpinFromSidebar".GetLocalizedResource();
+			=> "UnpinFolderFromSidebar".GetLocalizedResource();
 
 		public string Description
-			=> "UnpinFolderToSidebarDescription".GetLocalizedResource();
+			=> "UnpinFolderFromSidebarDescription".GetLocalizedResource();
 
 		public RichGlyph Glyph
 			=> new(opacityStyle: "ColorIconUnpinFromSidebar");
@@ -21,7 +20,7 @@ public RichGlyph Glyph
 		public bool IsExecutable
 			=> GetIsExecutable();
 
-		public UnpinFolderToSidebarAction()
+		public UnpinFolderFromSidebarAction()
 		{
 			context = Ioc.Default.GetRequiredService<IContentPageContext>();
 			service = Ioc.Default.GetRequiredService<IQuickAccessService>();
diff --git a/src/Files.App/Data/Commands/CommandCodes.cs b/src/Files.App/Data/Commands/CommandCodes.cs
index 9e7b8d560433..bc8fdc4fda8b 100644
--- a/src/Files.App/Data/Commands/CommandCodes.cs
+++ b/src/Files.App/Data/Commands/CommandCodes.cs
@@ -65,7 +65,7 @@ public enum CommandCodes
 
 		// Favorites
 		PinFolderToSidebar,
-		UnpinFolderToSidebar,
+		UnpinFolderFromSidebar,
 
 		// Backgrounds
 		SetAsWallpaperBackground,
diff --git a/src/Files.App/Data/Commands/Manager/CommandManager.cs b/src/Files.App/Data/Commands/Manager/CommandManager.cs
index eca8dae95cb8..2610576b7534 100644
--- a/src/Files.App/Data/Commands/Manager/CommandManager.cs
+++ b/src/Files.App/Data/Commands/Manager/CommandManager.cs
@@ -70,7 +70,7 @@ public IRichCommand this[HotKey hotKey]
 		public IRichCommand PinToStart => commands[CommandCodes.PinToStart];
 		public IRichCommand UnpinFromStart => commands[CommandCodes.UnpinFromStart];
 		public IRichCommand PinFolderToSidebar => commands[CommandCodes.PinFolderToSidebar];
-		public IRichCommand UnpinFolderToSidebar => commands[CommandCodes.UnpinFolderToSidebar];
+		public IRichCommand UnpinFolderFromSidebar => commands[CommandCodes.UnpinFolderFromSidebar];
 		public IRichCommand SetAsWallpaperBackground => commands[CommandCodes.SetAsWallpaperBackground];
 		public IRichCommand SetAsSlideshowBackground => commands[CommandCodes.SetAsSlideshowBackground];
 		public IRichCommand SetAsLockscreenBackground => commands[CommandCodes.SetAsLockscreenBackground];
@@ -239,7 +239,7 @@ public CommandManager()
 			[CommandCodes.PinToStart] = new PinToStartAction(),
 			[CommandCodes.UnpinFromStart] = new UnpinFromStartAction(),
 			[CommandCodes.PinFolderToSidebar] = new PinFolderToSidebarAction(),
-			[CommandCodes.UnpinFolderToSidebar] = new UnpinFolderToSidebarAction(),
+			[CommandCodes.UnpinFolderFromSidebar] = new UnpinFolderFromSidebarAction(),
 			[CommandCodes.SetAsWallpaperBackground] = new SetAsWallpaperBackgroundAction(),
 			[CommandCodes.SetAsSlideshowBackground] = new SetAsSlideshowBackgroundAction(),
 			[CommandCodes.SetAsLockscreenBackground] = new SetAsLockscreenBackgroundAction(),
diff --git a/src/Files.App/Data/Commands/Manager/ICommandManager.cs b/src/Files.App/Data/Commands/Manager/ICommandManager.cs
index b931a7491428..e248262d4529 100644
--- a/src/Files.App/Data/Commands/Manager/ICommandManager.cs
+++ b/src/Files.App/Data/Commands/Manager/ICommandManager.cs
@@ -59,7 +59,7 @@ public interface ICommandManager : IEnumerable<IRichCommand>
 		IRichCommand PinToStart { get; }
 		IRichCommand UnpinFromStart { get; }
 		IRichCommand PinFolderToSidebar { get; }
-		IRichCommand UnpinFolderToSidebar { get; }
+		IRichCommand UnpinFolderFromSidebar { get; }
 
 		IRichCommand SetAsWallpaperBackground { get; }
 		IRichCommand SetAsSlideshowBackground { get; }
diff --git a/src/Files.App/Data/Factories/ContentPageContextFlyoutFactory.cs b/src/Files.App/Data/Factories/ContentPageContextFlyoutFactory.cs
index 529903060672..55f42e63fbce 100644
--- a/src/Files.App/Data/Factories/ContentPageContextFlyoutFactory.cs
+++ b/src/Files.App/Data/Factories/ContentPageContextFlyoutFactory.cs
@@ -488,9 +488,9 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseItemMenuItems(
 				{
 					IsVisible = Commands.PinFolderToSidebar.IsExecutable && UserSettingsService.GeneralSettingsService.ShowFavoritesSection,
 				}.Build(),
-				new ContextMenuFlyoutItemViewModelBuilder(Commands.UnpinFolderToSidebar)
+				new ContextMenuFlyoutItemViewModelBuilder(Commands.UnpinFolderFromSidebar)
 				{
-					IsVisible = Commands.UnpinFolderToSidebar.IsExecutable && UserSettingsService.GeneralSettingsService.ShowFavoritesSection,
+					IsVisible = Commands.UnpinFolderFromSidebar.IsExecutable && UserSettingsService.GeneralSettingsService.ShowFavoritesSection,
 				}.Build(),
 				new ContextMenuFlyoutItemViewModelBuilder(Commands.PinToStart)
 				{

From 18c15ce958125f7f55064f0d379ff3d048329de8 Mon Sep 17 00:00:00 2001
From: 0x5BFA <62196528+0x5bfa@users.noreply.github.com>
Date: Thu, 29 Feb 2024 01:25:34 +0900
Subject: [PATCH 04/11] Rename 3

---
 .../FluentIcons/{Favorites.png => Star.png}   | Bin
 src/Files.App/Constants.cs                    |   2 +-
 src/Files.App/Data/Commands/CommandCodes.cs   |   2 +-
 .../Data/Contexts/SideBar/SideBarContext.cs   |   4 +-
 .../Data/Contracts/INavigationControlItem.cs  |   2 +-
 .../ContentPageContextFlyoutFactory.cs        |   4 +-
 src/Files.App/Data/Items/LocationItem.cs      |   2 +-
 ...PinnedModel.cs => PinnedFoldersManager.cs} |  40 +++++++--------
 .../Settings/GeneralSettingsService.cs        |   4 +-
 .../Utils/Global/QuickAccessManager.cs        |   2 +-
 .../ReorderSidebarItemsDialogViewModel.cs     |   4 +-
 .../UserControls/SidebarViewModel.cs          |  48 +++++++++---------
 src/Files.App/Views/HomePage.xaml.cs          |   1 -
 src/Files.App/Views/MainPage.xaml             |   2 +-
 .../Settings/IGeneralSettingsService.cs       |   2 +-
 15 files changed, 59 insertions(+), 60 deletions(-)
 rename src/Files.App/Assets/FluentIcons/{Favorites.png => Star.png} (100%)
 rename src/Files.App/Data/Models/{SidebarPinnedModel.cs => PinnedFoldersManager.cs} (82%)

diff --git a/src/Files.App/Assets/FluentIcons/Favorites.png b/src/Files.App/Assets/FluentIcons/Star.png
similarity index 100%
rename from src/Files.App/Assets/FluentIcons/Favorites.png
rename to src/Files.App/Assets/FluentIcons/Star.png
diff --git a/src/Files.App/Constants.cs b/src/Files.App/Constants.cs
index 8c01c0f48350..8f8966b08301 100644
--- a/src/Files.App/Constants.cs
+++ b/src/Files.App/Constants.cs
@@ -64,7 +64,7 @@ public static class Shell32
 		public static class FluentIconsPaths
 		{
 			public const string CloudDriveIcon = "ms-appx:///Assets/FluentIcons/CloudDrive.png";
-			public const string FavoritesIcon = "ms-appx:///Assets/FluentIcons/Favorites.png";
+			public const string StarIcon = "ms-appx:///Assets/FluentIcons/Star.png";
 			public const string FileTagsIcon = "ms-appx:///Assets/FluentIcons/FileTags.png";
 			public const string HomeIcon = "ms-appx:///Assets/FluentIcons/Home.png";
 		}
diff --git a/src/Files.App/Data/Commands/CommandCodes.cs b/src/Files.App/Data/Commands/CommandCodes.cs
index bc8fdc4fda8b..f7c33aa411d8 100644
--- a/src/Files.App/Data/Commands/CommandCodes.cs
+++ b/src/Files.App/Data/Commands/CommandCodes.cs
@@ -63,7 +63,7 @@ public enum CommandCodes
 		PinToStart,
 		UnpinFromStart,
 
-		// Favorites
+		// Pinned
 		PinFolderToSidebar,
 		UnpinFolderFromSidebar,
 
diff --git a/src/Files.App/Data/Contexts/SideBar/SideBarContext.cs b/src/Files.App/Data/Contexts/SideBar/SideBarContext.cs
index 3a8f2f8f03dc..1539f5da1ebb 100644
--- a/src/Files.App/Data/Contexts/SideBar/SideBarContext.cs
+++ b/src/Files.App/Data/Contexts/SideBar/SideBarContext.cs
@@ -6,7 +6,7 @@ namespace Files.App.Data.Contexts
 	/// <inheritdoc cref="ISidebarContext"/>
 	internal class SidebarContext : ObservableObject, ISidebarContext
 	{
-		private readonly SidebarPinnedModel favoriteModel = App.QuickAccessManager.Model;
+		private readonly PinnedFoldersManager favoriteModel = App.QuickAccessManager.Model;
 
 		private int FavoriteIndex =>
 			IsItemRightClicked
@@ -21,7 +21,7 @@ internal class SidebarContext : ObservableObject, ISidebarContext
 
 		public bool IsFavoriteItem =>
 			IsItemRightClicked &&
-			_RightClickedItem!.Section is SectionType.Favorites &&
+			_RightClickedItem!.Section is SectionType.Pinned &&
 			FavoriteIndex is not -1;
 
 		public DriveItem? OpenDriveItem
diff --git a/src/Files.App/Data/Contracts/INavigationControlItem.cs b/src/Files.App/Data/Contracts/INavigationControlItem.cs
index 53e4f502f096..ed215e687158 100644
--- a/src/Files.App/Data/Contracts/INavigationControlItem.cs
+++ b/src/Files.App/Data/Contracts/INavigationControlItem.cs
@@ -29,7 +29,7 @@ public enum NavigationControlItemType
 	public enum SectionType
 	{
 		Home,
-		Favorites,
+		Pinned,
 		Library,
 		Drives,
 		CloudDrives,
diff --git a/src/Files.App/Data/Factories/ContentPageContextFlyoutFactory.cs b/src/Files.App/Data/Factories/ContentPageContextFlyoutFactory.cs
index 55f42e63fbce..d735b7449771 100644
--- a/src/Files.App/Data/Factories/ContentPageContextFlyoutFactory.cs
+++ b/src/Files.App/Data/Factories/ContentPageContextFlyoutFactory.cs
@@ -486,11 +486,11 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseItemMenuItems(
 				new ContextMenuFlyoutItemViewModelBuilder(Commands.OpenParentFolder).Build(),
 				new ContextMenuFlyoutItemViewModelBuilder(Commands.PinFolderToSidebar)
 				{
-					IsVisible = Commands.PinFolderToSidebar.IsExecutable && UserSettingsService.GeneralSettingsService.ShowFavoritesSection,
+					IsVisible = Commands.PinFolderToSidebar.IsExecutable && UserSettingsService.GeneralSettingsService.ShowPinnedSection,
 				}.Build(),
 				new ContextMenuFlyoutItemViewModelBuilder(Commands.UnpinFolderFromSidebar)
 				{
-					IsVisible = Commands.UnpinFolderFromSidebar.IsExecutable && UserSettingsService.GeneralSettingsService.ShowFavoritesSection,
+					IsVisible = Commands.UnpinFolderFromSidebar.IsExecutable && UserSettingsService.GeneralSettingsService.ShowPinnedSection,
 				}.Build(),
 				new ContextMenuFlyoutItemViewModelBuilder(Commands.PinToStart)
 				{
diff --git a/src/Files.App/Data/Items/LocationItem.cs b/src/Files.App/Data/Items/LocationItem.cs
index d5b319e6b5a4..2ba4ad31a9de 100644
--- a/src/Files.App/Data/Items/LocationItem.cs
+++ b/src/Files.App/Data/Items/LocationItem.cs
@@ -101,7 +101,7 @@ public FrameworkElement? ItemDecorator
 		{
 			get
 			{
-				if (Section == SectionType.Favorites)
+				if (Section == SectionType.Pinned)
 				{
 					return new OpacityIcon()
 					{
diff --git a/src/Files.App/Data/Models/SidebarPinnedModel.cs b/src/Files.App/Data/Models/PinnedFoldersManager.cs
similarity index 82%
rename from src/Files.App/Data/Models/SidebarPinnedModel.cs
rename to src/Files.App/Data/Models/PinnedFoldersManager.cs
index 423ba9b87a96..257ace1da283 100644
--- a/src/Files.App/Data/Models/SidebarPinnedModel.cs
+++ b/src/Files.App/Data/Models/PinnedFoldersManager.cs
@@ -7,7 +7,7 @@
 
 namespace Files.App.Data.Models
 {
-	public class SidebarPinnedModel
+	public class PinnedFoldersManager
 	{
 		private IUserSettingsService userSettingsService { get; } = Ioc.Default.GetRequiredService<IUserSettingsService>();
 		private IQuickAccessService QuickAccessService { get; } = Ioc.Default.GetRequiredService<IQuickAccessService>();
@@ -18,15 +18,15 @@ public class SidebarPinnedModel
 
 		public List<string> FavoriteItems { get; set; } = new List<string>();
 
-		public readonly List<INavigationControlItem> favoriteList = new();
+		public readonly List<INavigationControlItem> _PinnedFolders = new();
 
 		[JsonIgnore]
-		public IReadOnlyList<INavigationControlItem> Favorites
+		public IReadOnlyList<INavigationControlItem> PinnedFolders
 		{
 			get
 			{
-				lock (favoriteList)
-					return favoriteList.ToList().AsReadOnly();
+				lock (_PinnedFolders)
+					return _PinnedFolders.ToList().AsReadOnly();
 			}
 		}
 
@@ -58,9 +58,9 @@ public async Task UpdateItemsWithExplorerAsync()
 		/// <returns>Index of the item</returns>
 		public int IndexOfItem(INavigationControlItem locationItem)
 		{
-			lock (favoriteList)
+			lock (_PinnedFolders)
 			{
-				return favoriteList.FindIndex(x => x.Path == locationItem.Path);
+				return _PinnedFolders.FindIndex(x => x.Path == locationItem.Path);
 			}
 		}
 
@@ -83,7 +83,7 @@ public async Task<LocationItem> CreateLocationItemFromPathAsync(string path)
 			}
 
 			locationItem.Path = path;
-			locationItem.Section = SectionType.Favorites;
+			locationItem.Section = SectionType.Pinned;
 			locationItem.MenuOptions = new ContextMenuOptions
 			{
 				IsLocationItem = true,
@@ -143,17 +143,17 @@ public async Task AddItemToSidebarAsync(string path)
 		private void AddLocationItemToSidebar(LocationItem locationItem)
 		{
 			int insertIndex = -1;
-			lock (favoriteList)
+			lock (_PinnedFolders)
 			{
-				if (favoriteList.Any(x => x.Path == locationItem.Path))
+				if (_PinnedFolders.Any(x => x.Path == locationItem.Path))
 					return;
 
-				var lastItem = favoriteList.LastOrDefault(x => x.ItemType is NavigationControlItemType.Location);
-				insertIndex = lastItem is not null ? favoriteList.IndexOf(lastItem) + 1 : 0;
-				favoriteList.Insert(insertIndex, locationItem);
+				var lastItem = _PinnedFolders.LastOrDefault(x => x.ItemType is NavigationControlItemType.Location);
+				insertIndex = lastItem is not null ? _PinnedFolders.IndexOf(lastItem) + 1 : 0;
+				_PinnedFolders.Insert(insertIndex, locationItem);
 			}
 
-			DataChanged?.Invoke(SectionType.Favorites, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Add, locationItem, insertIndex));
+			DataChanged?.Invoke(SectionType.Pinned, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Add, locationItem, insertIndex));
 		}
 
 		/// <summary>
@@ -161,7 +161,7 @@ private void AddLocationItemToSidebar(LocationItem locationItem)
 		/// </summary>
 		public async Task AddAllItemsToSidebarAsync()
 		{
-			if (userSettingsService.GeneralSettingsService.ShowFavoritesSection)
+			if (userSettingsService.GeneralSettingsService.ShowPinnedSection)
 				foreach (string path in FavoriteItems)
 					await AddItemToSidebarAsync(path);
 		}
@@ -172,20 +172,20 @@ public async Task AddAllItemsToSidebarAsync()
 		public void RemoveStaleSidebarItems()
 		{
 			// Remove unpinned items from favoriteList
-			foreach (var childItem in Favorites)
+			foreach (var childItem in PinnedFolders)
 			{
 				if (childItem is LocationItem item && !item.IsDefaultLocation && !FavoriteItems.Contains(item.Path))
 				{
-					lock (favoriteList)
+					lock (_PinnedFolders)
 					{
-						favoriteList.Remove(item);
+						_PinnedFolders.Remove(item);
 					}
-					DataChanged?.Invoke(SectionType.Favorites, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Remove, item));
+					DataChanged?.Invoke(SectionType.Pinned, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Remove, item));
 				}
 			}
 
 			// Remove unpinned items from sidebar
-			DataChanged?.Invoke(SectionType.Favorites, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset));
+			DataChanged?.Invoke(SectionType.Pinned, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset));
 		}
 
 		public async void LoadAsync(object? sender, FileSystemEventArgs e)
diff --git a/src/Files.App/Services/Settings/GeneralSettingsService.cs b/src/Files.App/Services/Settings/GeneralSettingsService.cs
index 7659d1bb2bdb..dee136a0c146 100644
--- a/src/Files.App/Services/Settings/GeneralSettingsService.cs
+++ b/src/Files.App/Services/Settings/GeneralSettingsService.cs
@@ -127,7 +127,7 @@ public bool FileTagsWidgetExpanded
 			set => Set(value);
 		}
 
-		public bool ShowFavoritesSection
+		public bool ShowPinnedSection
 		{
 			get => Get(true);
 			set => Set(value);
@@ -272,7 +272,7 @@ protected override void RaiseOnSettingChangedEvent(object sender, SettingChanged
 				case nameof(FoldersWidgetExpanded):
 				case nameof(RecentFilesWidgetExpanded):
 				case nameof(DrivesWidgetExpanded):
-				case nameof(ShowFavoritesSection):
+				case nameof(ShowPinnedSection):
 				case nameof(ShowLibrarySection):
 				case nameof(ShowCloudDrivesSection):
 				case nameof(ShowNetworkDrivesSection):
diff --git a/src/Files.App/Utils/Global/QuickAccessManager.cs b/src/Files.App/Utils/Global/QuickAccessManager.cs
index 7bbe19ffc5a8..72c99bdfd515 100644
--- a/src/Files.App/Utils/Global/QuickAccessManager.cs
+++ b/src/Files.App/Utils/Global/QuickAccessManager.cs
@@ -17,7 +17,7 @@ public sealed class QuickAccessManager
 
 		public IQuickAccessService QuickAccessService;
 
-		public SidebarPinnedModel Model;
+		public PinnedFoldersManager Model;
 		public QuickAccessManager()
 		{
 			QuickAccessService = Ioc.Default.GetRequiredService<IQuickAccessService>();
diff --git a/src/Files.App/ViewModels/Dialogs/ReorderSidebarItemsDialogViewModel.cs b/src/Files.App/ViewModels/Dialogs/ReorderSidebarItemsDialogViewModel.cs
index 8e0f3ae5e971..b7a301d5265c 100644
--- a/src/Files.App/ViewModels/Dialogs/ReorderSidebarItemsDialogViewModel.cs
+++ b/src/Files.App/ViewModels/Dialogs/ReorderSidebarItemsDialogViewModel.cs
@@ -14,8 +14,8 @@ public class ReorderSidebarItemsDialogViewModel : ObservableObject
 		public string HeaderText = "ReorderSidebarItemsDialogText".GetLocalizedResource();
 		public ICommand PrimaryButtonCommand { get; private set; }
 
-		public ObservableCollection<LocationItem> SidebarFavoriteItems = new(App.QuickAccessManager.Model.favoriteList
-			.Where(x => x is LocationItem loc && loc.Section is SectionType.Favorites && !loc.IsHeader)
+		public ObservableCollection<LocationItem> SidebarFavoriteItems = new(App.QuickAccessManager.Model._PinnedFolders
+			.Where(x => x is LocationItem loc && loc.Section is SectionType.Pinned && !loc.IsHeader)
 			.Cast<LocationItem>());
 
 		public ReorderSidebarItemsDialogViewModel() 
diff --git a/src/Files.App/ViewModels/UserControls/SidebarViewModel.cs b/src/Files.App/ViewModels/UserControls/SidebarViewModel.cs
index c47154609dfd..b8799a1afea2 100644
--- a/src/Files.App/ViewModels/UserControls/SidebarViewModel.cs
+++ b/src/Files.App/ViewModels/UserControls/SidebarViewModel.cs
@@ -48,7 +48,7 @@ public IFilesystemHelpers FilesystemHelpers
 
 		public object SidebarItems => sidebarItems;
 		public BulkConcurrentObservableCollection<INavigationControlItem> sidebarItems { get; init; }
-		public SidebarPinnedModel SidebarPinnedModel => App.QuickAccessManager.Model;
+		public PinnedFoldersManager SidebarPinnedModel => App.QuickAccessManager.Model;
 		public IQuickAccessService QuickAccessService { get; } = Ioc.Default.GetRequiredService<IQuickAccessService>();
 
 		private SidebarDisplayMode sidebarDisplayMode;
@@ -77,7 +77,7 @@ public SidebarDisplayMode SidebarDisplayMode
 			new SectionType[]
 			{
 				SectionType.Home,
-				SectionType.Favorites,
+				SectionType.Pinned,
 				SectionType.Library,
 				SectionType.Drives,
 				SectionType.CloudDrives,
@@ -139,15 +139,15 @@ public bool IsSidebarOpen
 			}
 		}
 
-		public bool ShowFavoritesSection
+		public bool ShowPinnedFoldersSection
 		{
-			get => UserSettingsService.GeneralSettingsService.ShowFavoritesSection;
+			get => UserSettingsService.GeneralSettingsService.ShowPinnedSection;
 			set
 			{
-				if (value == UserSettingsService.GeneralSettingsService.ShowFavoritesSection)
+				if (value == UserSettingsService.GeneralSettingsService.ShowPinnedSection)
 					return;
 
-				UserSettingsService.GeneralSettingsService.ShowFavoritesSection = value;
+				UserSettingsService.GeneralSettingsService.ShowPinnedSection = value;
 			}
 		}
 
@@ -240,7 +240,7 @@ public SidebarViewModel()
 			UserSettingsService.OnSettingChangedEvent += UserSettingsService_OnSettingChangedEvent;
 			CreateItemHomeAsync();
 
-			Manager_DataChanged(SectionType.Favorites, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset));
+			Manager_DataChanged(SectionType.Pinned, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset));
 			Manager_DataChanged(SectionType.Library, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset));
 			Manager_DataChanged(SectionType.Drives, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset));
 			Manager_DataChanged(SectionType.CloudDrives, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset));
@@ -282,7 +282,7 @@ await dispatcherQueue.EnqueueOrInvokeAsync(async () =>
 				var section = await GetOrCreateSectionAsync(sectionType);
 				Func<IReadOnlyList<INavigationControlItem>> getElements = () => sectionType switch
 				{
-					SectionType.Favorites => App.QuickAccessManager.Model.Favorites,
+					SectionType.Pinned => App.QuickAccessManager.Model.PinnedFolders,
 					SectionType.CloudDrives => CloudDrivesManager.Drives,
 					SectionType.Drives => drivesViewModel.Drives.Cast<DriveItem>().ToList().AsReadOnly(),
 					SectionType.Network => networkDrivesViewModel.Drives.Cast<DriveItem>().ToList().AsReadOnly(),
@@ -400,7 +400,7 @@ await lib.CheckDefaultSaveFolderAccess() &&
 				}
 			}
 
-			section.IsExpanded = Ioc.Default.GetRequiredService<SettingsViewModel>().Get(section.Text == "SidebarFavorites".GetLocalizedResource(), $"section:{section.Text.Replace('\\', '_')}");
+			section.IsExpanded = Ioc.Default.GetRequiredService<SettingsViewModel>().Get(section.Text == "SidebarPinned".GetLocalizedResource(), $"section:{section.Text.Replace('\\', '_')}");
 			section.PropertyChanged += Section_PropertyChanged;
 		}
 
@@ -441,15 +441,15 @@ private async Task<LocationItem> CreateSectionAsync(SectionType sectionType)
 						break;
 					}
 
-				case SectionType.Favorites:
+				case SectionType.Pinned:
 					{
-						if (ShowFavoritesSection == false)
+						if (ShowPinnedFoldersSection == false)
 						{
 							break;
 						}
 
-						section = BuildSection("SidebarFavorites".GetLocalizedResource(), sectionType, new ContextMenuOptions { ShowHideSection = true }, false);
-						icon = new BitmapImage(new Uri(Constants.FluentIconsPaths.FavoritesIcon));
+						section = BuildSection("SidebarPinned".GetLocalizedResource(), sectionType, new ContextMenuOptions { ShowHideSection = true }, false);
+						icon = new BitmapImage(new Uri(Constants.FluentIconsPaths.StarIcon));
 						section.IsHeader = true;
 
 						break;
@@ -584,7 +584,7 @@ public async Task UpdateSectionVisibilityAsync(SectionType sectionType, bool sho
 					SectionType.WSL when generalSettingsService.ShowWslSection => WSLDistroManager.UpdateDrivesAsync,
 					SectionType.FileTag when generalSettingsService.ShowFileTagsSection => App.FileTagsManager.UpdateFileTagsAsync,
 					SectionType.Library => App.LibraryManager.UpdateLibrariesAsync,
-					SectionType.Favorites => App.QuickAccessManager.Model.AddAllItemsToSidebarAsync,
+					SectionType.Pinned => App.QuickAccessManager.Model.AddAllItemsToSidebarAsync,
 					_ => () => Task.CompletedTask
 				};
 
@@ -608,9 +608,9 @@ private async void UserSettingsService_OnSettingChangedEvent(object sender, Sett
 						OnPropertyChanged(nameof(IsSidebarOpen));
 					}
 					break;
-				case nameof(UserSettingsService.GeneralSettingsService.ShowFavoritesSection):
-					await UpdateSectionVisibilityAsync(SectionType.Favorites, ShowFavoritesSection);
-					OnPropertyChanged(nameof(ShowFavoritesSection));
+				case nameof(UserSettingsService.GeneralSettingsService.ShowPinnedSection):
+					await UpdateSectionVisibilityAsync(SectionType.Pinned, ShowPinnedFoldersSection);
+					OnPropertyChanged(nameof(ShowPinnedFoldersSection));
 					break;
 				case nameof(UserSettingsService.GeneralSettingsService.ShowLibrarySection):
 					await UpdateSectionVisibilityAsync(SectionType.Library, ShowLibrarySection);
@@ -849,7 +849,7 @@ private void PinItem()
 		}
 		private void UnpinItem()
 		{
-			if (rightClickedItem.Section == SectionType.Favorites || rightClickedItem is DriveItem)
+			if (rightClickedItem.Section == SectionType.Pinned || rightClickedItem is DriveItem)
 				_ = QuickAccessService.UnpinFromSidebarAsync(rightClickedItem.Path);
 		}
 
@@ -857,8 +857,8 @@ private void HideSection()
 		{
 			switch (rightClickedItem.Section)
 			{
-				case SectionType.Favorites:
-					UserSettingsService.GeneralSettingsService.ShowFavoritesSection = false;
+				case SectionType.Pinned:
+					UserSettingsService.GeneralSettingsService.ShowPinnedSection = false;
 					break;
 				case SectionType.Library:
 					UserSettingsService.GeneralSettingsService.ShowLibrarySection = false;
@@ -943,7 +943,7 @@ private List<ContextMenuFlyoutItemViewModel> GetLocationItemMenuItems(INavigatio
 			var favoriteIndex = favoriteModel.IndexOfItem(item);
 			var favoriteCount = favoriteModel.FavoriteItems.Count;
 
-			var isFavoriteItem = item.Section is SectionType.Favorites && favoriteIndex is not -1;
+			var isFavoriteItem = item.Section is SectionType.Pinned && favoriteIndex is not -1;
 			var showMoveItemUp = isFavoriteItem && favoriteIndex > 0;
 			var showMoveItemDown = isFavoriteItem && favoriteIndex < favoriteCount - 1;
 
@@ -1025,7 +1025,7 @@ private List<ContextMenuFlyoutItemViewModel> GetLocationItemMenuItems(INavigatio
 					Text = "ReorderSidebarItemsDialogText".GetLocalizedResource(),
 					Glyph = "\uE8D8",
 					Command = ReorderItemsCommand,
-					ShowItem = isFavoriteItem || item.Section is SectionType.Favorites
+					ShowItem = isFavoriteItem || item.Section is SectionType.Pinned
 				},
 				new ContextMenuFlyoutItemViewModel()
 				{
@@ -1099,7 +1099,7 @@ private async Task HandleLocationItemDragOverAsync(LocationItem locationItem, It
 				var storageItems = await Utils.Storage.FilesystemHelpers.GetDraggedStorageItems(args.DroppedItem);
 				var hasStorageItems = storageItems.Any();
 
-				if (isPathNull && hasStorageItems && SectionType.Favorites.Equals(locationItem.Section))
+				if (isPathNull && hasStorageItems && SectionType.Pinned.Equals(locationItem.Section))
 				{
 					var haveFoldersToPin = storageItems.Any(item => item.ItemType == FilesystemItemType.Directory && !SidebarPinnedModel.FavoriteItems.Contains(item.Path));
 
@@ -1256,7 +1256,7 @@ private async Task HandleLocationItemDroppedAsync(LocationItem locationItem, Ite
 		{
 			if (Utils.Storage.FilesystemHelpers.HasDraggedStorageItems(args.DroppedItem))
 			{
-				if (string.IsNullOrEmpty(locationItem.Path) && SectionType.Favorites.Equals(locationItem.Section)) // Pin to Favorites section
+				if (string.IsNullOrEmpty(locationItem.Path) && SectionType.Pinned.Equals(locationItem.Section)) // Pin to "Pinned" section
 				{
 					var storageItems = await Utils.Storage.FilesystemHelpers.GetDraggedStorageItems(args.DroppedItem);
 					foreach (var item in storageItems)
diff --git a/src/Files.App/Views/HomePage.xaml.cs b/src/Files.App/Views/HomePage.xaml.cs
index 593fee5e594c..a6f3c1e90155 100644
--- a/src/Files.App/Views/HomePage.xaml.cs
+++ b/src/Files.App/Views/HomePage.xaml.cs
@@ -71,7 +71,6 @@ protected override async void OnNavigatedTo(NavigationEventArgs e)
 
 			AppInstance.SlimContentPage?.DirectoryPropertiesViewModel.UpdateGitInfo(false, string.Empty, null);
 
-			// Clear the path UI and replace with Favorites
 			AppInstance.ToolbarViewModel.PathComponents.Clear();
 
 			string componentLabel =
diff --git a/src/Files.App/Views/MainPage.xaml b/src/Files.App/Views/MainPage.xaml
index b58863c5262c..7b0cee0ad9a0 100644
--- a/src/Files.App/Views/MainPage.xaml
+++ b/src/Files.App/Views/MainPage.xaml
@@ -37,7 +37,7 @@
 
 
 			<MenuFlyout x:Key="SidebarContextMenu">
-				<ToggleMenuFlyoutItem IsChecked="{x:Bind SidebarAdaptiveViewModel.ShowFavoritesSection, Mode=TwoWay}" Text="{helpers:ResourceString Name=SidebarFavorites}" />
+				<ToggleMenuFlyoutItem IsChecked="{x:Bind SidebarAdaptiveViewModel.ShowPinnedFoldersSection, Mode=TwoWay}" Text="{helpers:ResourceString Name=SidebarPinned}" />
 				<ToggleMenuFlyoutItem IsChecked="{x:Bind SidebarAdaptiveViewModel.ShowLibrarySection, Mode=TwoWay}" Text="{helpers:ResourceString Name=SidebarLibraries}" />
 				<ToggleMenuFlyoutItem IsChecked="{x:Bind SidebarAdaptiveViewModel.ShowDrivesSection, Mode=TwoWay}" Text="{helpers:ResourceString Name=Drives}" />
 				<ToggleMenuFlyoutItem IsChecked="{x:Bind SidebarAdaptiveViewModel.ShowCloudDrivesSection, Mode=TwoWay}" Text="{helpers:ResourceString Name=SidebarCloudDrives}" />
diff --git a/src/Files.Core/Services/Settings/IGeneralSettingsService.cs b/src/Files.Core/Services/Settings/IGeneralSettingsService.cs
index 0e35c7f657a2..87d9b1296617 100644
--- a/src/Files.Core/Services/Settings/IGeneralSettingsService.cs
+++ b/src/Files.Core/Services/Settings/IGeneralSettingsService.cs
@@ -107,7 +107,7 @@ public interface IGeneralSettingsService : IBaseSettingsService, INotifyProperty
 		/// <summary>
 		/// Gets or sets a value indicating if the favorites section should be visible.
 		/// </summary>
-		bool ShowFavoritesSection { get; set; }
+		bool ShowPinnedSection { get; set; }
 
 		/// <summary>
 		/// Gets or sets a value indicating if the library section should be visible.

From 00cfea656305269f73283c2633ae8bc2ce586598 Mon Sep 17 00:00:00 2001
From: 0x5BFA <62196528+0x5bfa@users.noreply.github.com>
Date: Thu, 29 Feb 2024 01:34:22 +0900
Subject: [PATCH 05/11] Rename 4

---
 .../Sidebar/PinFolderToSidebarAction.cs       |  4 +--
 .../Sidebar/UnpinFolderToSidebarAction.cs     |  4 +--
 .../Data/Contexts/SideBar/ISideBarContext.cs  |  2 +-
 .../Data/Contexts/SideBar/SideBarContext.cs   | 10 +++---
 src/Files.App/Data/Items/DriveItem.cs         |  2 +-
 src/Files.App/Data/Items/ListedItem.cs        |  2 +-
 src/Files.App/Data/Items/LocationItem.cs      |  2 +-
 .../Data/Models/PinnedFoldersManager.cs       | 36 +++++++++----------
 .../Dialogs/ReorderSidebarItemsDialog.xaml    |  2 +-
 .../Dialogs/ReorderSidebarItemsDialog.xaml.cs |  2 +-
 src/Files.App/Services/JumpListService.cs     |  2 +-
 src/Files.App/Services/QuickAccessService.cs  |  4 +--
 .../Utils/Global/QuickAccessManager.cs        |  2 +-
 .../ReorderSidebarItemsDialogViewModel.cs     |  8 ++---
 .../UserControls/SidebarViewModel.cs          | 20 +++++------
 .../Views/Layouts/ColumnsLayoutPage.xaml.cs   |  2 +-
 16 files changed, 51 insertions(+), 53 deletions(-)

diff --git a/src/Files.App/Actions/Sidebar/PinFolderToSidebarAction.cs b/src/Files.App/Actions/Sidebar/PinFolderToSidebarAction.cs
index 25762bcdda78..2ac61bb1b556 100644
--- a/src/Files.App/Actions/Sidebar/PinFolderToSidebarAction.cs
+++ b/src/Files.App/Actions/Sidebar/PinFolderToSidebarAction.cs
@@ -47,7 +47,7 @@ public async Task ExecuteAsync()
 
 		private bool GetIsExecutable()
 		{
-			string[] favorites = App.QuickAccessManager.Model.FavoriteItems.ToArray();
+			string[] pinnedFolders = App.QuickAccessManager.Model.PinnedFolders.ToArray();
 
 			return context.HasSelection
 				? context.SelectedItems.All(IsPinnable)
@@ -57,7 +57,7 @@ bool IsPinnable(ListedItem item)
 			{
 				return
 					item.PrimaryItemAttribute is StorageItemTypes.Folder &&
-					!favorites.Contains(item.ItemPath);
+					!pinnedFolders.Contains(item.ItemPath);
 			}
 		}
 
diff --git a/src/Files.App/Actions/Sidebar/UnpinFolderToSidebarAction.cs b/src/Files.App/Actions/Sidebar/UnpinFolderToSidebarAction.cs
index b281130d9895..f2eff29d5123 100644
--- a/src/Files.App/Actions/Sidebar/UnpinFolderToSidebarAction.cs
+++ b/src/Files.App/Actions/Sidebar/UnpinFolderToSidebarAction.cs
@@ -44,7 +44,7 @@ public async Task ExecuteAsync()
 
 		private bool GetIsExecutable()
 		{
-			string[] favorites = App.QuickAccessManager.Model.FavoriteItems.ToArray();
+			string[] pinnedFolders = App.QuickAccessManager.Model.PinnedFolders.ToArray();
 
 			return context.HasSelection
 				? context.SelectedItems.All(IsPinned)
@@ -52,7 +52,7 @@ private bool GetIsExecutable()
 
 			bool IsPinned(ListedItem item)
 			{
-				return favorites.Contains(item.ItemPath);
+				return pinnedFolders.Contains(item.ItemPath);
 			}
 		}
 
diff --git a/src/Files.App/Data/Contexts/SideBar/ISideBarContext.cs b/src/Files.App/Data/Contexts/SideBar/ISideBarContext.cs
index 73897d0ddd65..016c4da7d827 100644
--- a/src/Files.App/Data/Contexts/SideBar/ISideBarContext.cs
+++ b/src/Files.App/Data/Contexts/SideBar/ISideBarContext.cs
@@ -21,7 +21,7 @@ public interface ISidebarContext
 		/// <summary>
 		/// Gets the value that indicates whether right clicked item is a favorite item
 		/// </summary>
-		bool IsFavoriteItem { get; }
+		bool IsPinnedFolderItem { get; }
 
 		/// <summary>
 		/// Gets the drive item to open if any
diff --git a/src/Files.App/Data/Contexts/SideBar/SideBarContext.cs b/src/Files.App/Data/Contexts/SideBar/SideBarContext.cs
index 1539f5da1ebb..a7580f39995d 100644
--- a/src/Files.App/Data/Contexts/SideBar/SideBarContext.cs
+++ b/src/Files.App/Data/Contexts/SideBar/SideBarContext.cs
@@ -8,7 +8,7 @@ internal class SidebarContext : ObservableObject, ISidebarContext
 	{
 		private readonly PinnedFoldersManager favoriteModel = App.QuickAccessManager.Model;
 
-		private int FavoriteIndex =>
+		private int PinnedFolderItemIndex =>
 			IsItemRightClicked
 				? favoriteModel.IndexOfItem(_RightClickedItem!)
 				: -1;
@@ -19,10 +19,10 @@ internal class SidebarContext : ObservableObject, ISidebarContext
 		public bool IsItemRightClicked =>
 			_RightClickedItem is not null;
 
-		public bool IsFavoriteItem =>
+		public bool IsPinnedFolderItem =>
 			IsItemRightClicked &&
 			_RightClickedItem!.Section is SectionType.Pinned &&
-			FavoriteIndex is not -1;
+			PinnedFolderItemIndex is not -1;
 
 		public DriveItem? OpenDriveItem
 			=> _RightClickedItem as DriveItem;
@@ -37,8 +37,8 @@ public void SidebarControl_RightClickedItemChanged(object? sender, INavigationCo
 			if (SetProperty(ref _RightClickedItem, e, nameof(RightClickedItem)))
 			{
 				OnPropertyChanged(nameof(IsItemRightClicked));
-				OnPropertyChanged(nameof(FavoriteIndex));
-				OnPropertyChanged(nameof(IsFavoriteItem));
+				OnPropertyChanged(nameof(PinnedFolderItemIndex));
+				OnPropertyChanged(nameof(IsPinnedFolderItem));
 				OnPropertyChanged(nameof(OpenDriveItem));
 			}
 		}
diff --git a/src/Files.App/Data/Items/DriveItem.cs b/src/Files.App/Data/Items/DriveItem.cs
index c98a94dcf88a..f315d797c3a9 100644
--- a/src/Files.App/Data/Items/DriveItem.cs
+++ b/src/Files.App/Data/Items/DriveItem.cs
@@ -48,7 +48,7 @@ public bool IsNetwork
 			=> Type == DriveType.Network;
 
 		public bool IsPinned
-			=> App.QuickAccessManager.Model.FavoriteItems.Contains(path);
+			=> App.QuickAccessManager.Model.PinnedFolders.Contains(path);
 
 		public string MaxSpaceText
 			=> MaxSpace.ToSizeString();
diff --git a/src/Files.App/Data/Items/ListedItem.cs b/src/Files.App/Data/Items/ListedItem.cs
index 3e5acd32e182..36211bf2d438 100644
--- a/src/Files.App/Data/Items/ListedItem.cs
+++ b/src/Files.App/Data/Items/ListedItem.cs
@@ -375,7 +375,7 @@ public override string ToString()
 		public bool IsGitItem => this is GitItem;
 		public virtual bool IsExecutable => FileExtensionHelpers.IsExecutableFile(ItemPath);
 		public virtual bool IsPythonFile => FileExtensionHelpers.IsPythonFile(ItemPath);
-		public bool IsPinned => App.QuickAccessManager.Model.FavoriteItems.Contains(itemPath);
+		public bool IsPinned => App.QuickAccessManager.Model.PinnedFolders.Contains(itemPath);
 		public bool IsDriveRoot => ItemPath == PathNormalization.GetPathRoot(ItemPath);
 		public bool IsElevationRequired { get; set; }
 
diff --git a/src/Files.App/Data/Items/LocationItem.cs b/src/Files.App/Data/Items/LocationItem.cs
index 2ba4ad31a9de..25fa3449b975 100644
--- a/src/Files.App/Data/Items/LocationItem.cs
+++ b/src/Files.App/Data/Items/LocationItem.cs
@@ -79,7 +79,7 @@ public bool IsExpanded
 
 		public bool IsInvalid { get; set; } = false;
 
-		public bool IsPinned => App.QuickAccessManager.Model.FavoriteItems.Contains(path);
+		public bool IsPinned => App.QuickAccessManager.Model.PinnedFolders.Contains(path);
 
 		public SectionType Section { get; set; }
 
diff --git a/src/Files.App/Data/Models/PinnedFoldersManager.cs b/src/Files.App/Data/Models/PinnedFoldersManager.cs
index 257ace1da283..0bc605662144 100644
--- a/src/Files.App/Data/Models/PinnedFoldersManager.cs
+++ b/src/Files.App/Data/Models/PinnedFoldersManager.cs
@@ -16,17 +16,17 @@ public class PinnedFoldersManager
 
 		private readonly SemaphoreSlim addSyncSemaphore = new(1, 1);
 
-		public List<string> FavoriteItems { get; set; } = new List<string>();
+		public List<string> PinnedFolders { get; set; } = [];
 
-		public readonly List<INavigationControlItem> _PinnedFolders = new();
+		public readonly List<INavigationControlItem> _PinnedFolderItems = [];
 
 		[JsonIgnore]
-		public IReadOnlyList<INavigationControlItem> PinnedFolders
+		public IReadOnlyList<INavigationControlItem> PinnedFolderItems
 		{
 			get
 			{
-				lock (_PinnedFolders)
-					return _PinnedFolders.ToList().AsReadOnly();
+				lock (_PinnedFolderItems)
+					return _PinnedFolderItems.ToList().AsReadOnly();
 			}
 		}
 
@@ -39,7 +39,7 @@ public async Task UpdateItemsWithExplorerAsync()
 
 			try
 			{
-				FavoriteItems = (await QuickAccessService.GetPinnedFoldersAsync())
+				PinnedFolders = (await QuickAccessService.GetPinnedFoldersAsync())
 					.Where(link => (bool?)link.Properties["System.Home.IsPinned"] ?? false)
 					.Select(link => link.FilePath).ToList();
 				RemoveStaleSidebarItems();
@@ -58,9 +58,9 @@ public async Task UpdateItemsWithExplorerAsync()
 		/// <returns>Index of the item</returns>
 		public int IndexOfItem(INavigationControlItem locationItem)
 		{
-			lock (_PinnedFolders)
+			lock (_PinnedFolderItems)
 			{
-				return _PinnedFolders.FindIndex(x => x.Path == locationItem.Path);
+				return _PinnedFolderItems.FindIndex(x => x.Path == locationItem.Path);
 			}
 		}
 
@@ -143,14 +143,14 @@ public async Task AddItemToSidebarAsync(string path)
 		private void AddLocationItemToSidebar(LocationItem locationItem)
 		{
 			int insertIndex = -1;
-			lock (_PinnedFolders)
+			lock (_PinnedFolderItems)
 			{
-				if (_PinnedFolders.Any(x => x.Path == locationItem.Path))
+				if (_PinnedFolderItems.Any(x => x.Path == locationItem.Path))
 					return;
 
-				var lastItem = _PinnedFolders.LastOrDefault(x => x.ItemType is NavigationControlItemType.Location);
-				insertIndex = lastItem is not null ? _PinnedFolders.IndexOf(lastItem) + 1 : 0;
-				_PinnedFolders.Insert(insertIndex, locationItem);
+				var lastItem = _PinnedFolderItems.LastOrDefault(x => x.ItemType is NavigationControlItemType.Location);
+				insertIndex = lastItem is not null ? _PinnedFolderItems.IndexOf(lastItem) + 1 : 0;
+				_PinnedFolderItems.Insert(insertIndex, locationItem);
 			}
 
 			DataChanged?.Invoke(SectionType.Pinned, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Add, locationItem, insertIndex));
@@ -162,7 +162,7 @@ private void AddLocationItemToSidebar(LocationItem locationItem)
 		public async Task AddAllItemsToSidebarAsync()
 		{
 			if (userSettingsService.GeneralSettingsService.ShowPinnedSection)
-				foreach (string path in FavoriteItems)
+				foreach (string path in PinnedFolders)
 					await AddItemToSidebarAsync(path);
 		}
 
@@ -172,13 +172,13 @@ public async Task AddAllItemsToSidebarAsync()
 		public void RemoveStaleSidebarItems()
 		{
 			// Remove unpinned items from favoriteList
-			foreach (var childItem in PinnedFolders)
+			foreach (var childItem in PinnedFolderItems)
 			{
-				if (childItem is LocationItem item && !item.IsDefaultLocation && !FavoriteItems.Contains(item.Path))
+				if (childItem is LocationItem item && !item.IsDefaultLocation && !PinnedFolders.Contains(item.Path))
 				{
-					lock (_PinnedFolders)
+					lock (_PinnedFolderItems)
 					{
-						_PinnedFolders.Remove(item);
+						_PinnedFolderItems.Remove(item);
 					}
 					DataChanged?.Invoke(SectionType.Pinned, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Remove, item));
 				}
diff --git a/src/Files.App/Dialogs/ReorderSidebarItemsDialog.xaml b/src/Files.App/Dialogs/ReorderSidebarItemsDialog.xaml
index 9c50007d6e07..41e571d395b1 100644
--- a/src/Files.App/Dialogs/ReorderSidebarItemsDialog.xaml
+++ b/src/Files.App/Dialogs/ReorderSidebarItemsDialog.xaml
@@ -19,7 +19,7 @@
 	mc:Ignorable="d">
 
 	<Grid x:Name="DestinationPathGrid">
-		<ListView x:Name="SidebarNavView" ItemsSource="{x:Bind ViewModel.SidebarFavoriteItems, Mode=OneWay}">
+		<ListView x:Name="SidebarNavView" ItemsSource="{x:Bind ViewModel.SidebarPinnedFolderItems, Mode=OneWay}">
 
 			<ListView.ItemTemplate>
 				<DataTemplate x:DataType="dataitems:LocationItem">
diff --git a/src/Files.App/Dialogs/ReorderSidebarItemsDialog.xaml.cs b/src/Files.App/Dialogs/ReorderSidebarItemsDialog.xaml.cs
index 4b032415ee6f..5a7f05b105e5 100644
--- a/src/Files.App/Dialogs/ReorderSidebarItemsDialog.xaml.cs
+++ b/src/Files.App/Dialogs/ReorderSidebarItemsDialog.xaml.cs
@@ -87,7 +87,7 @@ private void ListViewItem_Drop(object sender, DragEventArgs e)
 				return;
 
 			if ((e.DataView.Properties["sourceLocationItem"] as Grid)?.DataContext is LocationItem sourceLocationItem)
-				ViewModel.SidebarFavoriteItems.Move(ViewModel.SidebarFavoriteItems.IndexOf(sourceLocationItem), ViewModel.SidebarFavoriteItems.IndexOf(locationItem));
+				ViewModel.SidebarPinnedFolderItems.Move(ViewModel.SidebarPinnedFolderItems.IndexOf(sourceLocationItem), ViewModel.SidebarPinnedFolderItems.IndexOf(locationItem));
 		}
 
 		public new async Task<DialogResult> ShowAsync()
diff --git a/src/Files.App/Services/JumpListService.cs b/src/Files.App/Services/JumpListService.cs
index 92b8fa1051ad..fdb87c3d4787 100644
--- a/src/Files.App/Services/JumpListService.cs
+++ b/src/Files.App/Services/JumpListService.cs
@@ -72,7 +72,7 @@ public async Task RefreshPinnedFoldersAsync()
 
 					var itemsToRemove = instance.Items.Where(x => string.Equals(x.GroupName, JumpListPinnedGroupHeader, StringComparison.OrdinalIgnoreCase)).ToList();
 					itemsToRemove.ForEach(x => instance.Items.Remove(x));
-					App.QuickAccessManager.Model.FavoriteItems.ForEach(x => AddFolder(x, JumpListPinnedGroupHeader, instance));
+					App.QuickAccessManager.Model.PinnedFolders.ForEach(x => AddFolder(x, JumpListPinnedGroupHeader, instance));
 					await instance.SaveAsync();
 				}
 			}
diff --git a/src/Files.App/Services/QuickAccessService.cs b/src/Files.App/Services/QuickAccessService.cs
index bf54f15754fb..4d1bfec79430 100644
--- a/src/Files.App/Services/QuickAccessService.cs
+++ b/src/Files.App/Services/QuickAccessService.cs
@@ -80,12 +80,12 @@ await SafetyExtensions.IgnoreExceptions(async () =>
 
 		public bool IsItemPinned(string folderPath)
 		{
-			return App.QuickAccessManager.Model.FavoriteItems.Contains(folderPath);
+			return App.QuickAccessManager.Model.PinnedFolders.Contains(folderPath);
 		}
 
 		public async Task SaveAsync(string[] items)
 		{
-			if (Equals(items, App.QuickAccessManager.Model.FavoriteItems.ToArray()))
+			if (Equals(items, App.QuickAccessManager.Model.PinnedFolders.ToArray()))
 				return;
 
 			App.QuickAccessManager.PinnedItemsWatcher.EnableRaisingEvents = false;
diff --git a/src/Files.App/Utils/Global/QuickAccessManager.cs b/src/Files.App/Utils/Global/QuickAccessManager.cs
index 72c99bdfd515..16e6b29c18e7 100644
--- a/src/Files.App/Utils/Global/QuickAccessManager.cs
+++ b/src/Files.App/Utils/Global/QuickAccessManager.cs
@@ -45,7 +45,7 @@ public async Task InitializeAsync()
 		{
 			PinnedItemsModified += Model.LoadAsync;
 
-			//if (!Model.FavoriteItems.Contains(Constants.UserEnvironmentPaths.RecycleBinPath) && SystemInformation.Instance.IsFirstRun)
+			//if (!Model.PinnedFolders.Contains(Constants.UserEnvironmentPaths.RecycleBinPath) && SystemInformation.Instance.IsFirstRun)
 			//	await QuickAccessService.PinToSidebar(Constants.UserEnvironmentPaths.RecycleBinPath);
 
 			await Model.LoadAsync();
diff --git a/src/Files.App/ViewModels/Dialogs/ReorderSidebarItemsDialogViewModel.cs b/src/Files.App/ViewModels/Dialogs/ReorderSidebarItemsDialogViewModel.cs
index b7a301d5265c..bd12cca8b10e 100644
--- a/src/Files.App/ViewModels/Dialogs/ReorderSidebarItemsDialogViewModel.cs
+++ b/src/Files.App/ViewModels/Dialogs/ReorderSidebarItemsDialogViewModel.cs
@@ -1,8 +1,6 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using Files.App.Data.Items;
-using Files.App.Services;
 using System.Windows.Input;
 
 namespace Files.App.ViewModels.Dialogs
@@ -14,19 +12,19 @@ public class ReorderSidebarItemsDialogViewModel : ObservableObject
 		public string HeaderText = "ReorderSidebarItemsDialogText".GetLocalizedResource();
 		public ICommand PrimaryButtonCommand { get; private set; }
 
-		public ObservableCollection<LocationItem> SidebarFavoriteItems = new(App.QuickAccessManager.Model._PinnedFolders
+		public ObservableCollection<LocationItem> SidebarPinnedFolderItems = new(App.QuickAccessManager.Model._PinnedFolderItems
 			.Where(x => x is LocationItem loc && loc.Section is SectionType.Pinned && !loc.IsHeader)
 			.Cast<LocationItem>());
 
 		public ReorderSidebarItemsDialogViewModel() 
 		{
-			//App.Logger.LogWarning(string.Join(", ", SidebarFavoriteItems.Select(x => x.Path)));
+			//App.Logger.LogWarning(string.Join(", ", SidebarPinnedFolderItems.Select(x => x.Path)));
 			PrimaryButtonCommand = new RelayCommand(SaveChanges);
 		}
 
 		public void SaveChanges()
 		{
-			quickAccessService.SaveAsync(SidebarFavoriteItems.Select(x => x.Path).ToArray());
+			quickAccessService.SaveAsync(SidebarPinnedFolderItems.Select(x => x.Path).ToArray());
 		}
 	}
 }
diff --git a/src/Files.App/ViewModels/UserControls/SidebarViewModel.cs b/src/Files.App/ViewModels/UserControls/SidebarViewModel.cs
index b8799a1afea2..75ebe05f46a0 100644
--- a/src/Files.App/ViewModels/UserControls/SidebarViewModel.cs
+++ b/src/Files.App/ViewModels/UserControls/SidebarViewModel.cs
@@ -282,7 +282,7 @@ await dispatcherQueue.EnqueueOrInvokeAsync(async () =>
 				var section = await GetOrCreateSectionAsync(sectionType);
 				Func<IReadOnlyList<INavigationControlItem>> getElements = () => sectionType switch
 				{
-					SectionType.Pinned => App.QuickAccessManager.Model.PinnedFolders,
+					SectionType.Pinned => App.QuickAccessManager.Model.PinnedFolderItems,
 					SectionType.CloudDrives => CloudDrivesManager.Drives,
 					SectionType.Drives => drivesViewModel.Drives.Cast<DriveItem>().ToList().AsReadOnly(),
 					SectionType.Network => networkDrivesViewModel.Drives.Cast<DriveItem>().ToList().AsReadOnly(),
@@ -939,13 +939,13 @@ private List<ContextMenuFlyoutItemViewModel> GetLocationItemMenuItems(INavigatio
 		{
 			var options = item.MenuOptions;
 
-			var favoriteModel = App.QuickAccessManager.Model;
-			var favoriteIndex = favoriteModel.IndexOfItem(item);
-			var favoriteCount = favoriteModel.FavoriteItems.Count;
+			var pinnedFolderModel = App.QuickAccessManager.Model;
+			var pinnedFolderIndex = pinnedFolderModel.IndexOfItem(item);
+			var pinnedFolderCount = pinnedFolderModel.PinnedFolders.Count;
 
-			var isFavoriteItem = item.Section is SectionType.Pinned && favoriteIndex is not -1;
-			var showMoveItemUp = isFavoriteItem && favoriteIndex > 0;
-			var showMoveItemDown = isFavoriteItem && favoriteIndex < favoriteCount - 1;
+			var isPinnedItem = item.Section is SectionType.Pinned && pinnedFolderIndex is not -1;
+			var showMoveItemUp = isPinnedItem && pinnedFolderIndex > 0;
+			var showMoveItemDown = isPinnedItem && pinnedFolderIndex < pinnedFolderCount - 1;
 
 			var isDriveItem = item is DriveItem;
 			var isDriveItemPinned = isDriveItem && ((DriveItem)item).IsPinned;
@@ -1025,7 +1025,7 @@ private List<ContextMenuFlyoutItemViewModel> GetLocationItemMenuItems(INavigatio
 					Text = "ReorderSidebarItemsDialogText".GetLocalizedResource(),
 					Glyph = "\uE8D8",
 					Command = ReorderItemsCommand,
-					ShowItem = isFavoriteItem || item.Section is SectionType.Pinned
+					ShowItem = isPinnedItem || item.Section is SectionType.Pinned
 				},
 				new ContextMenuFlyoutItemViewModel()
 				{
@@ -1101,7 +1101,7 @@ private async Task HandleLocationItemDragOverAsync(LocationItem locationItem, It
 
 				if (isPathNull && hasStorageItems && SectionType.Pinned.Equals(locationItem.Section))
 				{
-					var haveFoldersToPin = storageItems.Any(item => item.ItemType == FilesystemItemType.Directory && !SidebarPinnedModel.FavoriteItems.Contains(item.Path));
+					var haveFoldersToPin = storageItems.Any(item => item.ItemType == FilesystemItemType.Directory && !SidebarPinnedModel.PinnedFolders.Contains(item.Path));
 
 					if (!haveFoldersToPin)
 					{
@@ -1261,7 +1261,7 @@ private async Task HandleLocationItemDroppedAsync(LocationItem locationItem, Ite
 					var storageItems = await Utils.Storage.FilesystemHelpers.GetDraggedStorageItems(args.DroppedItem);
 					foreach (var item in storageItems)
 					{
-						if (item.ItemType == FilesystemItemType.Directory && !SidebarPinnedModel.FavoriteItems.Contains(item.Path))
+						if (item.ItemType == FilesystemItemType.Directory && !SidebarPinnedModel.PinnedFolders.Contains(item.Path))
 							await QuickAccessService.PinToSidebarAsync(item.Path);
 					}
 				}
diff --git a/src/Files.App/Views/Layouts/ColumnsLayoutPage.xaml.cs b/src/Files.App/Views/Layouts/ColumnsLayoutPage.xaml.cs
index e4c32ecfff15..a9f42c96cb83 100644
--- a/src/Files.App/Views/Layouts/ColumnsLayoutPage.xaml.cs
+++ b/src/Files.App/Views/Layouts/ColumnsLayoutPage.xaml.cs
@@ -96,7 +96,7 @@ protected override void OnNavigatedTo(NavigationEventArgs eventArgs)
 
 			if (!string.IsNullOrEmpty(pathRoot))
 			{
-				var rootPathList = App.QuickAccessManager.Model.FavoriteItems.Select(NormalizePath)
+				var rootPathList = App.QuickAccessManager.Model.PinnedFolders.Select(NormalizePath)
 					.Concat(CloudDrivesManager.Drives.Select(x => NormalizePath(x.Path))).ToList()
 					.Concat(App.LibraryManager.Libraries.Select(x => NormalizePath(x.Path))).ToList();
 				rootPathList.Add(NormalizePath(pathRoot));

From 22caddb570a98025e49ebd1ac6ed8b19b752607b Mon Sep 17 00:00:00 2001
From: 0x5BFA <62196528+0x5bfa@users.noreply.github.com>
Date: Thu, 29 Feb 2024 01:36:20 +0900
Subject: [PATCH 06/11] Update

---
 src/Files.App/Data/Contexts/SideBar/ISideBarContext.cs | 2 +-
 src/Files.App/Data/Models/PinnedFoldersManager.cs      | 2 +-
 src/Files.Core/Services/IQuickAccessService.cs         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Files.App/Data/Contexts/SideBar/ISideBarContext.cs b/src/Files.App/Data/Contexts/SideBar/ISideBarContext.cs
index 016c4da7d827..fab7ec001841 100644
--- a/src/Files.App/Data/Contexts/SideBar/ISideBarContext.cs
+++ b/src/Files.App/Data/Contexts/SideBar/ISideBarContext.cs
@@ -19,7 +19,7 @@ public interface ISidebarContext
 		bool IsItemRightClicked { get; }
 
 		/// <summary>
-		/// Gets the value that indicates whether right clicked item is a favorite item
+		/// Gets the value that indicates whether right clicked item is a pinned folder item
 		/// </summary>
 		bool IsPinnedFolderItem { get; }
 
diff --git a/src/Files.App/Data/Models/PinnedFoldersManager.cs b/src/Files.App/Data/Models/PinnedFoldersManager.cs
index 0bc605662144..fbefa1025283 100644
--- a/src/Files.App/Data/Models/PinnedFoldersManager.cs
+++ b/src/Files.App/Data/Models/PinnedFoldersManager.cs
@@ -171,7 +171,7 @@ public async Task AddAllItemsToSidebarAsync()
 		/// </summary>
 		public void RemoveStaleSidebarItems()
 		{
-			// Remove unpinned items from favoriteList
+			// Remove unpinned items from PinnedFolderItems
 			foreach (var childItem in PinnedFolderItems)
 			{
 				if (childItem is LocationItem item && !item.IsDefaultLocation && !PinnedFolders.Contains(item.Path))
diff --git a/src/Files.Core/Services/IQuickAccessService.cs b/src/Files.Core/Services/IQuickAccessService.cs
index b15e8b54707f..004ab5a93c10 100644
--- a/src/Files.Core/Services/IQuickAccessService.cs
+++ b/src/Files.Core/Services/IQuickAccessService.cs
@@ -47,7 +47,7 @@ public interface IQuickAccessService
 		bool IsItemPinned(string folderPath);
 
 		/// <summary>
-		/// Saves a state of favorite items in the sidebar
+		/// Saves a state of pinned folder items in the sidebar
 		/// </summary>
 		/// <param name="items">The array of items to save</param>
 		/// <returns></returns>

From e81da3bb886c27b5c933dd82a7ea5ea078cf2b85 Mon Sep 17 00:00:00 2001
From: 0x5BFA <62196528+0x5bfa@users.noreply.github.com>
Date: Thu, 29 Feb 2024 01:40:48 +0900
Subject: [PATCH 07/11] Rename 5

---
 .../Sidebar/PinFolderToSidebarAction.cs       |  2 +-
 src/Files.App/Strings/en-US/Resources.resw    | 20 +++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/Files.App/Actions/Sidebar/PinFolderToSidebarAction.cs b/src/Files.App/Actions/Sidebar/PinFolderToSidebarAction.cs
index 2ac61bb1b556..f33dc3e1d232 100644
--- a/src/Files.App/Actions/Sidebar/PinFolderToSidebarAction.cs
+++ b/src/Files.App/Actions/Sidebar/PinFolderToSidebarAction.cs
@@ -14,7 +14,7 @@ public string Label
 			=> "PinFolderToSidebar".GetLocalizedResource();
 
 		public string Description
-			=> "PinFolderToSidebar".GetLocalizedResource();
+			=> "PinFolderToSidebarDescription".GetLocalizedResource();
 
 		public RichGlyph Glyph
 			=> new(opacityStyle: "ColorIconPinToSidebar");
diff --git a/src/Files.App/Strings/en-US/Resources.resw b/src/Files.App/Strings/en-US/Resources.resw
index 78966cb0a948..48081fc45ec0 100644
--- a/src/Files.App/Strings/en-US/Resources.resw
+++ b/src/Files.App/Strings/en-US/Resources.resw
@@ -273,8 +273,8 @@
   <data name="Delete" xml:space="preserve">
     <value>Delete</value>
   </data>
-  <data name="PinToFavorites" xml:space="preserve">
-    <value>Pin to Favorites</value>
+  <data name="PinFolderToSidebar" xml:space="preserve">
+    <value>Pin to Sidebar</value>
   </data>
   <data name="WelcomeDialog.Title" xml:space="preserve">
     <value>Welcome to Files!</value>
@@ -1071,8 +1071,8 @@
   <data name="PropertyItemName" xml:space="preserve">
     <value>Item Name</value>
   </data>
-  <data name="UnpinFromFavorites" xml:space="preserve">
-    <value>Unpin from Favorites</value>
+  <data name="UnpinFolderFromSidebar" xml:space="preserve">
+    <value>Unpin from Sidebar</value>
   </data>
   <data name="SidebarNetworkDrives" xml:space="preserve">
     <value>Network Drives</value>
@@ -1158,8 +1158,8 @@
   <data name="DrivesWidgetOptionsFlyoutMapNetDriveMenuItem.Text" xml:space="preserve">
     <value>Map network drive</value>
   </data>
-  <data name="SidebarFavorites" xml:space="preserve">
-    <value>Favorites</value>
+  <data name="Pinned" xml:space="preserve">
+    <value>Pinned</value>
   </data>
   <data name="SidebarLibraries" xml:space="preserve">
     <value>Libraries</value>
@@ -2460,11 +2460,11 @@
   <data name="UnpinFromStartDescription" xml:space="preserve">
     <value>Unpin item(s) from the Start Menu</value>
   </data>
-  <data name="PinItemToFavoritesDescription" xml:space="preserve">
-    <value>Pin folder(s) to Favorites</value>
+  <data name="PinFolderToSidebarDescription" xml:space="preserve">
+    <value>Pin folder(s) to Sidebar</value>
   </data>
-  <data name="UnpinItemFromFavoritesDescription" xml:space="preserve">
-    <value>Unpin folder(s) from Favorites</value>
+  <data name="UnpinFolderFromSidebarDescription" xml:space="preserve">
+    <value>Unpin folder(s) from Sidebar</value>
   </data>
   <data name="SetAsWallpaperBackgroundDescription" xml:space="preserve">
     <value>Set selected picture as desktop background</value>

From bc5b2cff08a1114c1bc8289a992849d5637b3423 Mon Sep 17 00:00:00 2001
From: 0x5BFA <62196528+0x5bfa@users.noreply.github.com>
Date: Thu, 29 Feb 2024 01:47:57 +0900
Subject: [PATCH 08/11] Update 2

---
 docs/rich-commands.md                       | 4 ++--
 src/Files.App/Data/Commands/CommandCodes.cs | 2 +-
 src/Files.App/Strings/en-US/Resources.resw  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/rich-commands.md b/docs/rich-commands.md
index 626214430d9d..35f230849088 100644
--- a/docs/rich-commands.md
+++ b/docs/rich-commands.md
@@ -51,8 +51,8 @@ This is the list of all commands defined in `CommandCodes` enum except `None`.
 | Share              | ShareItem                           | Share                                     | Share selected file(s) with others                       |                     |
 | Start              | PinToStart                          | Pin to the Start Menu                     | Pin item(s) to the Start Menu                            |                     |
 |                    | UnpinFromStart                      | Unpin from the Start Menu                 | Unpin item(s) from the Start Menu                        |                     |
-| Sidebar          | PinItemToSidebar                  | Pin to Sidebar                          | Pin folder(s) to Sidebar                               |                     |
-|                    | UnpinItemFromSidebar              | Unpin from Sidebar                      | Unpin folder(s) from Sidebar                           |                     |
+| Sidebar          | PinFolderToSidebar                  | Pin to Sidebar                          | Pin folder(s) to Sidebar                               |                     |
+|                    | UnpinFolderFromSidebar              | Unpin from Sidebar                      | Unpin folder(s) from Sidebar                           |                     |
 | Backgrounds        | SetAsWallpaperBackground            | Set as desktop background                 | Set selected picture as desktop background               |                     |
 |                    | SetAsSlideshowBackground            | Set as desktop slideshow                  | Set selected pictures as desktop slideshow               |                     |
 |                    | SetAsLockscreenBackground           | Set as lockscreen background              | Set selected picture as lockscreen background            |                     |
diff --git a/src/Files.App/Data/Commands/CommandCodes.cs b/src/Files.App/Data/Commands/CommandCodes.cs
index f7c33aa411d8..8a0f81c9ba80 100644
--- a/src/Files.App/Data/Commands/CommandCodes.cs
+++ b/src/Files.App/Data/Commands/CommandCodes.cs
@@ -63,7 +63,7 @@ public enum CommandCodes
 		PinToStart,
 		UnpinFromStart,
 
-		// Pinned
+		// Sidebar
 		PinFolderToSidebar,
 		UnpinFolderFromSidebar,
 
diff --git a/src/Files.App/Strings/en-US/Resources.resw b/src/Files.App/Strings/en-US/Resources.resw
index 48081fc45ec0..b1b47a25c0d8 100644
--- a/src/Files.App/Strings/en-US/Resources.resw
+++ b/src/Files.App/Strings/en-US/Resources.resw
@@ -1158,7 +1158,7 @@
   <data name="DrivesWidgetOptionsFlyoutMapNetDriveMenuItem.Text" xml:space="preserve">
     <value>Map network drive</value>
   </data>
-  <data name="Pinned" xml:space="preserve">
+  <data name="SidebarPinned" xml:space="preserve">
     <value>Pinned</value>
   </data>
   <data name="SidebarLibraries" xml:space="preserve">

From 337bcbfa0302c3058216157dfa994dedf5ac5d37 Mon Sep 17 00:00:00 2001
From: 0x5BFA <62196528+0x5bfa@users.noreply.github.com>
Date: Thu, 29 Feb 2024 03:07:54 +0900
Subject: [PATCH 09/11] Requested changes

---
 src/Files.App/Actions/Sidebar/PinFolderToSidebarAction.cs | 2 +-
 .../Actions/Sidebar/UnpinFolderToSidebarAction.cs         | 2 +-
 src/Files.App/Actions/Start/PinToStartAction.cs           | 2 +-
 src/Files.App/Actions/Start/UnpinFromStartAction.cs       | 2 +-
 src/Files.App/ResourceDictionaries/PathIcons.xaml         | 4 ++--
 src/Files.App/Strings/en-US/Resources.resw                | 2 +-
 src/Files.App/UserControls/Widgets/DrivesWidget.xaml.cs   | 4 ++--
 src/Files.App/UserControls/Widgets/FileTagsWidget.xaml.cs | 4 ++--
 .../UserControls/Widgets/QuickAccessWidget.xaml.cs        | 4 ++--
 src/Files.App/ViewModels/UserControls/SidebarViewModel.cs | 8 ++++----
 src/Files.App/Views/MainPage.xaml                         | 2 +-
 11 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/Files.App/Actions/Sidebar/PinFolderToSidebarAction.cs b/src/Files.App/Actions/Sidebar/PinFolderToSidebarAction.cs
index f33dc3e1d232..d5d13bdc3f23 100644
--- a/src/Files.App/Actions/Sidebar/PinFolderToSidebarAction.cs
+++ b/src/Files.App/Actions/Sidebar/PinFolderToSidebarAction.cs
@@ -17,7 +17,7 @@ public string Description
 			=> "PinFolderToSidebarDescription".GetLocalizedResource();
 
 		public RichGlyph Glyph
-			=> new(opacityStyle: "ColorIconPinToSidebar");
+			=> new(opacityStyle: "ColorIcon.PinToSidebar.16x16");
 
 		public bool IsExecutable
 			=> GetIsExecutable();
diff --git a/src/Files.App/Actions/Sidebar/UnpinFolderToSidebarAction.cs b/src/Files.App/Actions/Sidebar/UnpinFolderToSidebarAction.cs
index f2eff29d5123..ae31bf41a8cd 100644
--- a/src/Files.App/Actions/Sidebar/UnpinFolderToSidebarAction.cs
+++ b/src/Files.App/Actions/Sidebar/UnpinFolderToSidebarAction.cs
@@ -15,7 +15,7 @@ public string Description
 			=> "UnpinFolderFromSidebarDescription".GetLocalizedResource();
 
 		public RichGlyph Glyph
-			=> new(opacityStyle: "ColorIconUnpinFromSidebar");
+			=> new(opacityStyle: "ColorIcon.UnpinFromSidebar.16x16");
 
 		public bool IsExecutable
 			=> GetIsExecutable();
diff --git a/src/Files.App/Actions/Start/PinToStartAction.cs b/src/Files.App/Actions/Start/PinToStartAction.cs
index 8923d488cdf7..5170309d2169 100644
--- a/src/Files.App/Actions/Start/PinToStartAction.cs
+++ b/src/Files.App/Actions/Start/PinToStartAction.cs
@@ -21,7 +21,7 @@ public string Description
 			=> "PinToStartDescription".GetLocalizedResource();
 
 		public RichGlyph Glyph
-			=> new(opacityStyle: "ColorIconPinToSidebar");
+			=> new(opacityStyle: "ColorIcon.PinToSidebar.16x16");
 
 		public bool IsExecutable =>
 			context.ShellPage is not null;
diff --git a/src/Files.App/Actions/Start/UnpinFromStartAction.cs b/src/Files.App/Actions/Start/UnpinFromStartAction.cs
index ebc9b6b4c170..f8ba38eb5718 100644
--- a/src/Files.App/Actions/Start/UnpinFromStartAction.cs
+++ b/src/Files.App/Actions/Start/UnpinFromStartAction.cs
@@ -20,7 +20,7 @@ public string Description
 			=> "UnpinFromStartDescription".GetLocalizedResource();
 
 		public RichGlyph Glyph
-			=> new(opacityStyle: "ColorIconUnpinFromSidebar");
+			=> new(opacityStyle: "ColorIcon.UnpinFromSidebar.16x16");
 
 		public UnpinFromStartAction()
 		{
diff --git a/src/Files.App/ResourceDictionaries/PathIcons.xaml b/src/Files.App/ResourceDictionaries/PathIcons.xaml
index 975dc888eef4..b8c32a302b23 100644
--- a/src/Files.App/ResourceDictionaries/PathIcons.xaml
+++ b/src/Files.App/ResourceDictionaries/PathIcons.xaml
@@ -1448,7 +1448,7 @@
 				</Setter>
 			</Style>
 
-			<Style x:Key="ColorIconPinToSidebar" TargetType="local:OpacityIcon">
+			<Style x:Key="ColorIcon.PinToSidebar.16x16" TargetType="local:OpacityIcon">
 				<Setter Property="Template">
 					<Setter.Value>
 						<ControlTemplate>
@@ -1489,7 +1489,7 @@
 				</Setter>
 			</Style>
 
-			<Style x:Key="ColorIconUnpinFromSidebar" TargetType="local:OpacityIcon">
+			<Style x:Key="ColorIcon.UnpinFromSidebar.16x16" TargetType="local:OpacityIcon">
 				<Setter Property="Template">
 					<Setter.Value>
 						<ControlTemplate>
diff --git a/src/Files.App/Strings/en-US/Resources.resw b/src/Files.App/Strings/en-US/Resources.resw
index b1b47a25c0d8..48081fc45ec0 100644
--- a/src/Files.App/Strings/en-US/Resources.resw
+++ b/src/Files.App/Strings/en-US/Resources.resw
@@ -1158,7 +1158,7 @@
   <data name="DrivesWidgetOptionsFlyoutMapNetDriveMenuItem.Text" xml:space="preserve">
     <value>Map network drive</value>
   </data>
-  <data name="SidebarPinned" xml:space="preserve">
+  <data name="Pinned" xml:space="preserve">
     <value>Pinned</value>
   </data>
   <data name="SidebarLibraries" xml:space="preserve">
diff --git a/src/Files.App/UserControls/Widgets/DrivesWidget.xaml.cs b/src/Files.App/UserControls/Widgets/DrivesWidget.xaml.cs
index d6c9ef0193c7..2ca3b04faaab 100644
--- a/src/Files.App/UserControls/Widgets/DrivesWidget.xaml.cs
+++ b/src/Files.App/UserControls/Widgets/DrivesWidget.xaml.cs
@@ -148,7 +148,7 @@ public override List<ContextMenuFlyoutItemViewModel> GetItemMenuItems(WidgetCard
 					Text = "PinToSidebar".GetLocalizedResource(),
 					OpacityIcon = new OpacityIconModel()
 					{
-						OpacityIconStyle = "ColorIconPinToSidebar",
+						OpacityIconStyle = "ColorIcon.PinToSidebar.16x16",
 					},
 					Command = PinToSidebarCommand,
 					CommandParameter = item,
@@ -159,7 +159,7 @@ public override List<ContextMenuFlyoutItemViewModel> GetItemMenuItems(WidgetCard
 					Text = "UnpinFromSidebar".GetLocalizedResource(),
 					OpacityIcon = new OpacityIconModel()
 					{
-						OpacityIconStyle = "ColorIconUnpinFromSidebar",
+						OpacityIconStyle = "ColorIcon.UnpinFromSidebar.16x16",
 					},
 					Command = UnpinFromSidebarCommand,
 					CommandParameter = item,
diff --git a/src/Files.App/UserControls/Widgets/FileTagsWidget.xaml.cs b/src/Files.App/UserControls/Widgets/FileTagsWidget.xaml.cs
index 2491f074e45b..ce609b58c2a3 100644
--- a/src/Files.App/UserControls/Widgets/FileTagsWidget.xaml.cs
+++ b/src/Files.App/UserControls/Widgets/FileTagsWidget.xaml.cs
@@ -207,7 +207,7 @@ public override List<ContextMenuFlyoutItemViewModel> GetItemMenuItems(WidgetCard
 					Text = "PinToSidebar".GetLocalizedResource(),
 					OpacityIcon = new OpacityIconModel()
 					{
-						OpacityIconStyle = "ColorIconPinToSidebar",
+						OpacityIconStyle = "ColorIcon.PinToSidebar.16x16",
 					},
 					Command = PinToSidebarCommand,
 					CommandParameter = item,
@@ -218,7 +218,7 @@ public override List<ContextMenuFlyoutItemViewModel> GetItemMenuItems(WidgetCard
 					Text = "UnpinFromSidebar".GetLocalizedResource(),
 					OpacityIcon = new OpacityIconModel()
 					{
-						OpacityIconStyle = "ColorIconUnpinFromSidebar",
+						OpacityIconStyle = "ColorIcon.UnpinFromSidebar.16x16",
 					},
 					Command = UnpinFromSidebarCommand,
 					CommandParameter = item,
diff --git a/src/Files.App/UserControls/Widgets/QuickAccessWidget.xaml.cs b/src/Files.App/UserControls/Widgets/QuickAccessWidget.xaml.cs
index dc10835b694f..8ec9eec22822 100644
--- a/src/Files.App/UserControls/Widgets/QuickAccessWidget.xaml.cs
+++ b/src/Files.App/UserControls/Widgets/QuickAccessWidget.xaml.cs
@@ -101,7 +101,7 @@ public override List<ContextMenuFlyoutItemViewModel> GetItemMenuItems(WidgetCard
 					Text = "PinToSidebar".GetLocalizedResource(),
 					OpacityIcon = new OpacityIconModel()
 					{
-						OpacityIconStyle = "ColorIconPinToSidebar",
+						OpacityIconStyle = "ColorIcon.PinToSidebar.16x16",
 					},
 					Command = PinToSidebarCommand,
 					CommandParameter = item,
@@ -112,7 +112,7 @@ public override List<ContextMenuFlyoutItemViewModel> GetItemMenuItems(WidgetCard
 					Text = "UnpinFromSidebar".GetLocalizedResource(),
 					OpacityIcon = new OpacityIconModel()
 					{
-						OpacityIconStyle = "ColorIconUnpinFromSidebar",
+						OpacityIconStyle = "ColorIcon.UnpinFromSidebar.16x16",
 					},
 					Command = UnpinFromSidebarCommand,
 					CommandParameter = item,
diff --git a/src/Files.App/ViewModels/UserControls/SidebarViewModel.cs b/src/Files.App/ViewModels/UserControls/SidebarViewModel.cs
index 75ebe05f46a0..1a453485ad45 100644
--- a/src/Files.App/ViewModels/UserControls/SidebarViewModel.cs
+++ b/src/Files.App/ViewModels/UserControls/SidebarViewModel.cs
@@ -400,7 +400,7 @@ await lib.CheckDefaultSaveFolderAccess() &&
 				}
 			}
 
-			section.IsExpanded = Ioc.Default.GetRequiredService<SettingsViewModel>().Get(section.Text == "SidebarPinned".GetLocalizedResource(), $"section:{section.Text.Replace('\\', '_')}");
+			section.IsExpanded = Ioc.Default.GetRequiredService<SettingsViewModel>().Get(section.Text == "Pinned".GetLocalizedResource(), $"section:{section.Text.Replace('\\', '_')}");
 			section.PropertyChanged += Section_PropertyChanged;
 		}
 
@@ -448,7 +448,7 @@ private async Task<LocationItem> CreateSectionAsync(SectionType sectionType)
 							break;
 						}
 
-						section = BuildSection("SidebarPinned".GetLocalizedResource(), sectionType, new ContextMenuOptions { ShowHideSection = true }, false);
+						section = BuildSection("Pinned".GetLocalizedResource(), sectionType, new ContextMenuOptions { ShowHideSection = true }, false);
 						icon = new BitmapImage(new Uri(Constants.FluentIconsPaths.StarIcon));
 						section.IsHeader = true;
 
@@ -1005,7 +1005,7 @@ private List<ContextMenuFlyoutItemViewModel> GetLocationItemMenuItems(INavigatio
 					Text = "PinToSidebar".GetLocalizedResource(),
 					OpacityIcon = new OpacityIconModel()
 					{
-						OpacityIconStyle = "ColorIconPinToSidebar",
+						OpacityIconStyle = "ColorIcon.PinToSidebar.16x16",
 					},
 					Command = PinItemCommand,
 					ShowItem = isDriveItem && !isDriveItemPinned
@@ -1015,7 +1015,7 @@ private List<ContextMenuFlyoutItemViewModel> GetLocationItemMenuItems(INavigatio
 					Text = "UnpinFromSidebar".GetLocalizedResource(),
 					OpacityIcon = new OpacityIconModel()
 					{
-						OpacityIconStyle = "ColorIconUnpinFromSidebar",
+						OpacityIconStyle = "ColorIcon.UnpinFromSidebar.16x16",
 					},
 					Command = UnpinItemCommand,
 					ShowItem = options.ShowUnpinItem || isDriveItemPinned
diff --git a/src/Files.App/Views/MainPage.xaml b/src/Files.App/Views/MainPage.xaml
index 7b0cee0ad9a0..8502e1383017 100644
--- a/src/Files.App/Views/MainPage.xaml
+++ b/src/Files.App/Views/MainPage.xaml
@@ -37,7 +37,7 @@
 
 
 			<MenuFlyout x:Key="SidebarContextMenu">
-				<ToggleMenuFlyoutItem IsChecked="{x:Bind SidebarAdaptiveViewModel.ShowPinnedFoldersSection, Mode=TwoWay}" Text="{helpers:ResourceString Name=SidebarPinned}" />
+				<ToggleMenuFlyoutItem IsChecked="{x:Bind SidebarAdaptiveViewModel.ShowPinnedFoldersSection, Mode=TwoWay}" Text="{helpers:ResourceString Name=Pinned}" />
 				<ToggleMenuFlyoutItem IsChecked="{x:Bind SidebarAdaptiveViewModel.ShowLibrarySection, Mode=TwoWay}" Text="{helpers:ResourceString Name=SidebarLibraries}" />
 				<ToggleMenuFlyoutItem IsChecked="{x:Bind SidebarAdaptiveViewModel.ShowDrivesSection, Mode=TwoWay}" Text="{helpers:ResourceString Name=Drives}" />
 				<ToggleMenuFlyoutItem IsChecked="{x:Bind SidebarAdaptiveViewModel.ShowCloudDrivesSection, Mode=TwoWay}" Text="{helpers:ResourceString Name=SidebarCloudDrives}" />

From ca4d995725813c95926b35b35e3af258bd5645b9 Mon Sep 17 00:00:00 2001
From: Yair <39923744+yaira2@users.noreply.github.com>
Date: Wed, 28 Feb 2024 13:56:29 -0500
Subject: [PATCH 10/11] Rename icon

---
 src/Files.App/Actions/Sidebar/PinFolderToSidebarAction.cs    | 2 +-
 src/Files.App/Actions/Sidebar/UnpinFolderToSidebarAction.cs  | 2 +-
 src/Files.App/Actions/Start/PinToStartAction.cs              | 2 +-
 src/Files.App/Actions/Start/UnpinFromStartAction.cs          | 2 +-
 src/Files.App/ResourceDictionaries/PathIcons.xaml            | 4 ++--
 src/Files.App/UserControls/Widgets/DrivesWidget.xaml.cs      | 4 ++--
 src/Files.App/UserControls/Widgets/FileTagsWidget.xaml.cs    | 4 ++--
 src/Files.App/UserControls/Widgets/QuickAccessWidget.xaml.cs | 4 ++--
 src/Files.App/ViewModels/UserControls/SidebarViewModel.cs    | 4 ++--
 9 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/Files.App/Actions/Sidebar/PinFolderToSidebarAction.cs b/src/Files.App/Actions/Sidebar/PinFolderToSidebarAction.cs
index d5d13bdc3f23..553209e02d99 100644
--- a/src/Files.App/Actions/Sidebar/PinFolderToSidebarAction.cs
+++ b/src/Files.App/Actions/Sidebar/PinFolderToSidebarAction.cs
@@ -17,7 +17,7 @@ public string Description
 			=> "PinFolderToSidebarDescription".GetLocalizedResource();
 
 		public RichGlyph Glyph
-			=> new(opacityStyle: "ColorIcon.PinToSidebar.16x16");
+			=> new(opacityStyle: "Icons.Pin.16x16");
 
 		public bool IsExecutable
 			=> GetIsExecutable();
diff --git a/src/Files.App/Actions/Sidebar/UnpinFolderToSidebarAction.cs b/src/Files.App/Actions/Sidebar/UnpinFolderToSidebarAction.cs
index ae31bf41a8cd..a8c8df7fe37f 100644
--- a/src/Files.App/Actions/Sidebar/UnpinFolderToSidebarAction.cs
+++ b/src/Files.App/Actions/Sidebar/UnpinFolderToSidebarAction.cs
@@ -15,7 +15,7 @@ public string Description
 			=> "UnpinFolderFromSidebarDescription".GetLocalizedResource();
 
 		public RichGlyph Glyph
-			=> new(opacityStyle: "ColorIcon.UnpinFromSidebar.16x16");
+			=> new(opacityStyle: "Icons.Unpin.16x16");
 
 		public bool IsExecutable
 			=> GetIsExecutable();
diff --git a/src/Files.App/Actions/Start/PinToStartAction.cs b/src/Files.App/Actions/Start/PinToStartAction.cs
index 5170309d2169..73579fc08abf 100644
--- a/src/Files.App/Actions/Start/PinToStartAction.cs
+++ b/src/Files.App/Actions/Start/PinToStartAction.cs
@@ -21,7 +21,7 @@ public string Description
 			=> "PinToStartDescription".GetLocalizedResource();
 
 		public RichGlyph Glyph
-			=> new(opacityStyle: "ColorIcon.PinToSidebar.16x16");
+			=> new(opacityStyle: "Icons.Pin.16x16");
 
 		public bool IsExecutable =>
 			context.ShellPage is not null;
diff --git a/src/Files.App/Actions/Start/UnpinFromStartAction.cs b/src/Files.App/Actions/Start/UnpinFromStartAction.cs
index f8ba38eb5718..3e69164fe3ea 100644
--- a/src/Files.App/Actions/Start/UnpinFromStartAction.cs
+++ b/src/Files.App/Actions/Start/UnpinFromStartAction.cs
@@ -20,7 +20,7 @@ public string Description
 			=> "UnpinFromStartDescription".GetLocalizedResource();
 
 		public RichGlyph Glyph
-			=> new(opacityStyle: "ColorIcon.UnpinFromSidebar.16x16");
+			=> new(opacityStyle: "Icons.Unpin.16x16");
 
 		public UnpinFromStartAction()
 		{
diff --git a/src/Files.App/ResourceDictionaries/PathIcons.xaml b/src/Files.App/ResourceDictionaries/PathIcons.xaml
index b8c32a302b23..d4585a4324eb 100644
--- a/src/Files.App/ResourceDictionaries/PathIcons.xaml
+++ b/src/Files.App/ResourceDictionaries/PathIcons.xaml
@@ -1448,7 +1448,7 @@
 				</Setter>
 			</Style>
 
-			<Style x:Key="ColorIcon.PinToSidebar.16x16" TargetType="local:OpacityIcon">
+			<Style x:Key="Icons.Pin.16x16" TargetType="local:OpacityIcon">
 				<Setter Property="Template">
 					<Setter.Value>
 						<ControlTemplate>
@@ -1489,7 +1489,7 @@
 				</Setter>
 			</Style>
 
-			<Style x:Key="ColorIcon.UnpinFromSidebar.16x16" TargetType="local:OpacityIcon">
+			<Style x:Key="Icons.Unpin.16x16" TargetType="local:OpacityIcon">
 				<Setter Property="Template">
 					<Setter.Value>
 						<ControlTemplate>
diff --git a/src/Files.App/UserControls/Widgets/DrivesWidget.xaml.cs b/src/Files.App/UserControls/Widgets/DrivesWidget.xaml.cs
index 2ca3b04faaab..dd538c88aa93 100644
--- a/src/Files.App/UserControls/Widgets/DrivesWidget.xaml.cs
+++ b/src/Files.App/UserControls/Widgets/DrivesWidget.xaml.cs
@@ -148,7 +148,7 @@ public override List<ContextMenuFlyoutItemViewModel> GetItemMenuItems(WidgetCard
 					Text = "PinToSidebar".GetLocalizedResource(),
 					OpacityIcon = new OpacityIconModel()
 					{
-						OpacityIconStyle = "ColorIcon.PinToSidebar.16x16",
+						OpacityIconStyle = "Icons.Pin.16x16",
 					},
 					Command = PinToSidebarCommand,
 					CommandParameter = item,
@@ -159,7 +159,7 @@ public override List<ContextMenuFlyoutItemViewModel> GetItemMenuItems(WidgetCard
 					Text = "UnpinFromSidebar".GetLocalizedResource(),
 					OpacityIcon = new OpacityIconModel()
 					{
-						OpacityIconStyle = "ColorIcon.UnpinFromSidebar.16x16",
+						OpacityIconStyle = "Icons.Unpin.16x16",
 					},
 					Command = UnpinFromSidebarCommand,
 					CommandParameter = item,
diff --git a/src/Files.App/UserControls/Widgets/FileTagsWidget.xaml.cs b/src/Files.App/UserControls/Widgets/FileTagsWidget.xaml.cs
index ce609b58c2a3..a456ff92727b 100644
--- a/src/Files.App/UserControls/Widgets/FileTagsWidget.xaml.cs
+++ b/src/Files.App/UserControls/Widgets/FileTagsWidget.xaml.cs
@@ -207,7 +207,7 @@ public override List<ContextMenuFlyoutItemViewModel> GetItemMenuItems(WidgetCard
 					Text = "PinToSidebar".GetLocalizedResource(),
 					OpacityIcon = new OpacityIconModel()
 					{
-						OpacityIconStyle = "ColorIcon.PinToSidebar.16x16",
+						OpacityIconStyle = "Icons.Pin.16x16",
 					},
 					Command = PinToSidebarCommand,
 					CommandParameter = item,
@@ -218,7 +218,7 @@ public override List<ContextMenuFlyoutItemViewModel> GetItemMenuItems(WidgetCard
 					Text = "UnpinFromSidebar".GetLocalizedResource(),
 					OpacityIcon = new OpacityIconModel()
 					{
-						OpacityIconStyle = "ColorIcon.UnpinFromSidebar.16x16",
+						OpacityIconStyle = "Icons.Unpin.16x16",
 					},
 					Command = UnpinFromSidebarCommand,
 					CommandParameter = item,
diff --git a/src/Files.App/UserControls/Widgets/QuickAccessWidget.xaml.cs b/src/Files.App/UserControls/Widgets/QuickAccessWidget.xaml.cs
index 8ec9eec22822..20bf58caf2a3 100644
--- a/src/Files.App/UserControls/Widgets/QuickAccessWidget.xaml.cs
+++ b/src/Files.App/UserControls/Widgets/QuickAccessWidget.xaml.cs
@@ -101,7 +101,7 @@ public override List<ContextMenuFlyoutItemViewModel> GetItemMenuItems(WidgetCard
 					Text = "PinToSidebar".GetLocalizedResource(),
 					OpacityIcon = new OpacityIconModel()
 					{
-						OpacityIconStyle = "ColorIcon.PinToSidebar.16x16",
+						OpacityIconStyle = "Icons.Pin.16x16",
 					},
 					Command = PinToSidebarCommand,
 					CommandParameter = item,
@@ -112,7 +112,7 @@ public override List<ContextMenuFlyoutItemViewModel> GetItemMenuItems(WidgetCard
 					Text = "UnpinFromSidebar".GetLocalizedResource(),
 					OpacityIcon = new OpacityIconModel()
 					{
-						OpacityIconStyle = "ColorIcon.UnpinFromSidebar.16x16",
+						OpacityIconStyle = "Icons.Unpin.16x16",
 					},
 					Command = UnpinFromSidebarCommand,
 					CommandParameter = item,
diff --git a/src/Files.App/ViewModels/UserControls/SidebarViewModel.cs b/src/Files.App/ViewModels/UserControls/SidebarViewModel.cs
index 1a453485ad45..7c1f764767ca 100644
--- a/src/Files.App/ViewModels/UserControls/SidebarViewModel.cs
+++ b/src/Files.App/ViewModels/UserControls/SidebarViewModel.cs
@@ -1005,7 +1005,7 @@ private List<ContextMenuFlyoutItemViewModel> GetLocationItemMenuItems(INavigatio
 					Text = "PinToSidebar".GetLocalizedResource(),
 					OpacityIcon = new OpacityIconModel()
 					{
-						OpacityIconStyle = "ColorIcon.PinToSidebar.16x16",
+						OpacityIconStyle = "Icons.Pin.16x16",
 					},
 					Command = PinItemCommand,
 					ShowItem = isDriveItem && !isDriveItemPinned
@@ -1015,7 +1015,7 @@ private List<ContextMenuFlyoutItemViewModel> GetLocationItemMenuItems(INavigatio
 					Text = "UnpinFromSidebar".GetLocalizedResource(),
 					OpacityIcon = new OpacityIconModel()
 					{
-						OpacityIconStyle = "ColorIcon.UnpinFromSidebar.16x16",
+						OpacityIconStyle = "Icons.Unpin.16x16",
 					},
 					Command = UnpinItemCommand,
 					ShowItem = options.ShowUnpinItem || isDriveItemPinned

From d441844c6cd1078d9a86c522b7c10740be44bc6f Mon Sep 17 00:00:00 2001
From: Yair <39923744+yaira2@users.noreply.github.com>
Date: Wed, 28 Feb 2024 14:05:07 -0500
Subject: [PATCH 11/11] Update PathIcons.xaml

---
 .../ResourceDictionaries/PathIcons.xaml       | 30 ++++++++++---------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/Files.App/ResourceDictionaries/PathIcons.xaml b/src/Files.App/ResourceDictionaries/PathIcons.xaml
index d4585a4324eb..dd7a27980248 100644
--- a/src/Files.App/ResourceDictionaries/PathIcons.xaml
+++ b/src/Files.App/ResourceDictionaries/PathIcons.xaml
@@ -1452,11 +1452,12 @@
 				<Setter Property="Template">
 					<Setter.Value>
 						<ControlTemplate>
-							<Viewbox
-								Width="12"
-								Height="12"
-								Stretch="Fill">
-								<Grid Width="16" Height="16">
+							<Grid>
+								<Canvas
+									Width="16"
+									Height="16"
+									HorizontalAlignment="Center"
+									VerticalAlignment="Center">
 									<Path
 										x:Name="Path1"
 										Data="M7.99984 2.00989L6.01984 6.02389L1.58984 6.66789L4.79484 9.79189L4.03784 14.2039L7.07081 12.6098C6.94389 11.7115 7.43745 10.7652 8.39895 10.433L9.50068 10.0524L10.303 8.40545C10.9478 7.08155 12.5464 6.64041 13.7545 7.30728L14.4108 6.66789L10.5008 6.09889L9.98084 6.02389L7.99984 2.00989Z"
@@ -1469,7 +1470,7 @@
 										x:Name="Path3"
 										Data="M15.5382 10.3666L13.6111 8.4396C12.8825 7.71102 11.6532 7.91706 11.202 8.84338L10.3997 10.4904C10.2836 10.7286 10.0777 10.9111 9.8272 10.9976L8.72547 11.3782C8.02732 11.6194 7.82259 12.5082 8.34489 13.0305L9.29256 13.9782L8 15.2709V15.9778H8.70729L9.99966 14.6853L10.9473 15.6329C11.4695 16.1552 12.3584 15.9505 12.5995 15.2523L12.9801 14.1506C13.0667 13.9001 13.2491 13.6942 13.4874 13.5781L15.1344 12.7758C16.0608 12.3246 16.2668 11.0952 15.5382 10.3666Z"
 										Fill="{ThemeResource Local.IconAccentStrokeColor}" />
-								</Grid>
+								</Canvas>
 
 								<VisualStateManager.VisualStateGroups>
 									<VisualStateGroup>
@@ -1483,7 +1484,7 @@
 										</VisualState>
 									</VisualStateGroup>
 								</VisualStateManager.VisualStateGroups>
-							</Viewbox>
+							</Grid>
 						</ControlTemplate>
 					</Setter.Value>
 				</Setter>
@@ -1493,11 +1494,12 @@
 				<Setter Property="Template">
 					<Setter.Value>
 						<ControlTemplate>
-							<Viewbox
-								Width="12"
-								Height="12"
-								Stretch="Fill">
-								<Grid Width="16" Height="16">
+							<Grid>
+								<Canvas
+									Width="16"
+									Height="16"
+									HorizontalAlignment="Center"
+									VerticalAlignment="Center">
 									<Path
 										x:Name="Path1"
 										Data="M5.40613 6.1131L1.58984 6.66789L4.79484 9.79189L4.03784 14.2039L7.07081 12.6098C6.94389 11.7115 7.43745 10.7652 8.39895 10.433L9.38532 10.0923L5.40613 6.1131Z"
@@ -1528,7 +1530,7 @@
 										x:Name="Path7"
 										Data="M0.146447 0.146447C0.341709 -0.0488155 0.658291 -0.0488155 0.853553 0.146447L15.8536 15.1464C16.0488 15.3417 16.0488 15.6583 15.8536 15.8536C15.6583 16.0488 15.3417 16.0488 15.1464 15.8536C7.11629 7.8234 3.97578 4.68289 0.146447 0.853553C-0.0488155 0.658291 -0.0488155 0.341709 0.146447 0.146447Z"
 										Fill="{ThemeResource Local.IconAccentStrokeColor}" />
-								</Grid>
+								</Canvas>
 
 								<VisualStateManager.VisualStateGroups>
 									<VisualStateGroup>
@@ -1546,7 +1548,7 @@
 										</VisualState>
 									</VisualStateGroup>
 								</VisualStateManager.VisualStateGroups>
-							</Viewbox>
+							</Grid>
 						</ControlTemplate>
 					</Setter.Value>
 				</Setter>