diff --git a/src/Files.App/Assets/FluentIcons/CloudDrive.png b/src/Files.App/Assets/FluentIcons/CloudDrive.png index c5980cd39a22..bd5a15143b5b 100644 Binary files a/src/Files.App/Assets/FluentIcons/CloudDrive.png and b/src/Files.App/Assets/FluentIcons/CloudDrive.png differ diff --git a/src/Files.App/Assets/FluentIcons/Drives.png b/src/Files.App/Assets/FluentIcons/Drives.png new file mode 100644 index 000000000000..8c0121987c13 Binary files /dev/null and b/src/Files.App/Assets/FluentIcons/Drives.png differ diff --git a/src/Files.App/Assets/FluentIcons/FileTags.png b/src/Files.App/Assets/FluentIcons/FileTags.png index f91982fa57f0..4591a430ca74 100644 Binary files a/src/Files.App/Assets/FluentIcons/FileTags.png and b/src/Files.App/Assets/FluentIcons/FileTags.png differ diff --git a/src/Files.App/Assets/FluentIcons/Home.png b/src/Files.App/Assets/FluentIcons/Home.png index b6121308740e..86a8327a03ca 100644 Binary files a/src/Files.App/Assets/FluentIcons/Home.png and b/src/Files.App/Assets/FluentIcons/Home.png differ diff --git a/src/Files.App/Assets/FluentIcons/Libraries.png b/src/Files.App/Assets/FluentIcons/Libraries.png new file mode 100644 index 000000000000..02820fbb43fe Binary files /dev/null and b/src/Files.App/Assets/FluentIcons/Libraries.png differ diff --git a/src/Files.App/Assets/FluentIcons/Network.png b/src/Files.App/Assets/FluentIcons/Network.png new file mode 100644 index 000000000000..39359ef17b81 Binary files /dev/null and b/src/Files.App/Assets/FluentIcons/Network.png differ diff --git a/src/Files.App/Assets/FluentIcons/Pinned.png b/src/Files.App/Assets/FluentIcons/Pinned.png new file mode 100644 index 000000000000..a6f132113645 Binary files /dev/null and b/src/Files.App/Assets/FluentIcons/Pinned.png differ diff --git a/src/Files.App/Assets/FluentIcons/Star.png b/src/Files.App/Assets/FluentIcons/Star.png deleted file mode 100644 index 595636435259..000000000000 Binary files a/src/Files.App/Assets/FluentIcons/Star.png and /dev/null differ diff --git a/src/Files.App/Assets/FluentIcons/Wsl.png b/src/Files.App/Assets/FluentIcons/Wsl.png new file mode 100644 index 000000000000..439853e6eb28 Binary files /dev/null and b/src/Files.App/Assets/FluentIcons/Wsl.png differ diff --git a/src/Files.App/Constants.cs b/src/Files.App/Constants.cs index b92eb22f08a0..2584c91195f6 100644 --- a/src/Files.App/Constants.cs +++ b/src/Files.App/Constants.cs @@ -67,9 +67,13 @@ public static class Shell32 public static class FluentIconsPaths { public const string CloudDriveIcon = "ms-appx:///Assets/FluentIcons/CloudDrive.png"; - public const string StarIcon = "ms-appx:///Assets/FluentIcons/Star.png"; + public const string PinnedIcon = "ms-appx:///Assets/FluentIcons/Pinned.png"; public const string FileTagsIcon = "ms-appx:///Assets/FluentIcons/FileTags.png"; public const string HomeIcon = "ms-appx:///Assets/FluentIcons/Home.png"; + public const string NetworkIcon = "ms-appx:///Assets/FluentIcons/Network.png"; + public const string WslIcon = "ms-appx:///Assets/FluentIcons/Wsl.png"; + public const string LibrariesIcon = "ms-appx:///Assets/FluentIcons/Libraries.png"; + public const string DrivesIcon = "ms-appx:///Assets/FluentIcons/Drives.png"; } public static class WslIconsPaths diff --git a/src/Files.App/Data/Items/DriveItem.cs b/src/Files.App/Data/Items/DriveItem.cs index ef3952d4ebbb..61a53b952feb 100644 --- a/src/Files.App/Data/Items/DriveItem.cs +++ b/src/Files.App/Data/Items/DriveItem.cs @@ -348,6 +348,7 @@ public async Task LoadThumbnailAsync() if (string.Equals(DeviceID, "network-folder")) IconData ??= UIHelpers.GetSidebarIconResourceInfo(Constants.ImageRes.Network)?.IconData; + IconData ??= UIHelpers.GetSidebarIconResourceInfo(Constants.ImageRes.Network)?.IconData; IconData ??= UIHelpers.GetSidebarIconResourceInfo(Constants.ImageRes.Folder)?.IconData; diff --git a/src/Files.App/ViewModels/UserControls/SidebarViewModel.cs b/src/Files.App/ViewModels/UserControls/SidebarViewModel.cs index 37c13ec64a7e..c14cce47c6e7 100644 --- a/src/Files.App/ViewModels/UserControls/SidebarViewModel.cs +++ b/src/Files.App/ViewModels/UserControls/SidebarViewModel.cs @@ -477,7 +477,7 @@ private async Task CreateSectionAsync(SectionType sectionType) } section = BuildSection(Strings.Pinned.GetLocalizedResource(), sectionType, new ContextMenuOptions { ShowHideSection = true }, false); - icon = new BitmapImage(new Uri(Constants.FluentIconsPaths.StarIcon)); + icon = new BitmapImage(new Uri(Constants.FluentIconsPaths.PinnedIcon)); section.IsHeader = true; section.IsExpanded = UserSettingsService.GeneralSettingsService.IsPinnedSectionExpanded; @@ -491,7 +491,7 @@ private async Task CreateSectionAsync(SectionType sectionType) break; } section = BuildSection(Strings.SidebarLibraries.GetLocalizedResource(), sectionType, new ContextMenuOptions { IsLibrariesHeader = true, ShowHideSection = true }, false); - iconIdex = Constants.ImageRes.Libraries; + icon = new BitmapImage(new Uri(Constants.FluentIconsPaths.LibrariesIcon)); section.IsHeader = true; section.IsExpanded = UserSettingsService.GeneralSettingsService.IsLibrarySectionExpanded; @@ -505,7 +505,7 @@ private async Task CreateSectionAsync(SectionType sectionType) break; } section = BuildSection(Strings.Drives.GetLocalizedResource(), sectionType, new ContextMenuOptions { ShowHideSection = true }, false); - iconIdex = Constants.ImageRes.ThisPC; + icon = new BitmapImage(new Uri(Constants.FluentIconsPaths.DrivesIcon)); section.IsHeader = true; section.IsExpanded = UserSettingsService.GeneralSettingsService.IsDriveSectionExpanded; @@ -533,7 +533,7 @@ private async Task CreateSectionAsync(SectionType sectionType) break; } section = BuildSection(Strings.Network.GetLocalizedResource(), sectionType, new ContextMenuOptions { ShowHideSection = true }, false); - iconIdex = Constants.ImageRes.Network; + icon = new BitmapImage(new Uri(Constants.FluentIconsPaths.NetworkIcon)); section.IsHeader = true; section.IsExpanded = UserSettingsService.GeneralSettingsService.IsNetworkSectionExpanded; @@ -547,7 +547,7 @@ private async Task CreateSectionAsync(SectionType sectionType) break; } section = BuildSection(Strings.WSL.GetLocalizedResource(), sectionType, new ContextMenuOptions { ShowHideSection = true }, false); - icon = new BitmapImage(new Uri(Constants.WslIconsPaths.GenericIcon)); + icon = new BitmapImage(new Uri(Constants.FluentIconsPaths.WslIcon)); section.IsHeader = true; section.IsExpanded = UserSettingsService.GeneralSettingsService.IsWslSectionExpanded;