From 329b3bb9c8832ce15062f7ca34986095a958530c Mon Sep 17 00:00:00 2001
From: Hongtao Zhang <hongtao_zhang@outlook.com>
Date: Fri, 19 Jan 2024 17:54:26 -0600
Subject: [PATCH] Use Resource for Glyph Font Family

---
 .../Image/ImageLoader.cs                      |   1 +
 Flow.Launcher/App.axaml                       |   2 +-
 .../Resources/CustomControlTemplate.xaml      |   8 +-
 Flow.Launcher/ResultListBox.axaml             |   2 +-
 Flow.Launcher/SettingWindow.xaml              |   4 +-
 Flow.Launcher/ViewModels/MainViewModel.cs     |   2 +-
 Flow.Launcher/ViewModels/ResultViewModel.cs   |  23 ++-
 .../Main.cs                                   |   2 +-
 .../ContextMenu.cs                            |  18 +-
 .../ContextMenu.cs                            |  28 +--
 Plugins/Flow.Launcher.Plugin.Program/Main.cs  |   2 +-
 .../Programs/UWPPackage.cs                    |   4 +-
 .../Programs/Win32.cs                         |   8 +-
 Plugins/Flow.Launcher.Plugin.Shell/Main.cs    |   6 +-
 Plugins/Flow.Launcher.Plugin.Sys/Main.cs      |  22 +--
 .../WindowsSettings.json                      | 176 +++++++++---------
 16 files changed, 164 insertions(+), 144 deletions(-)

diff --git a/Flow.Launcher.Infrastructure/Image/ImageLoader.cs b/Flow.Launcher.Infrastructure/Image/ImageLoader.cs
index 5a6e483cd..cae4c3075 100644
--- a/Flow.Launcher.Infrastructure/Image/ImageLoader.cs
+++ b/Flow.Launcher.Infrastructure/Image/ImageLoader.cs
@@ -224,6 +224,7 @@ namespace Flow.Launcher.Infrastructure.Image
                 else if (extension == ".svg")
                 {
                     var source = SvgSource.Load(path, null);
+                    // very annoying, but we need to create the instance on the UI Thread. It is not an expensive operation though
                     image = Dispatcher.UIThread.Invoke(() => new SvgImage() { Source = source });
                     type = ImageType.FullImageFile;
                 }
diff --git a/Flow.Launcher/App.axaml b/Flow.Launcher/App.axaml
index 7733ecd15..1d9cc72b7 100644
--- a/Flow.Launcher/App.axaml
+++ b/Flow.Launcher/App.axaml
@@ -5,7 +5,7 @@
     <!-- "Default" ThemeVariant follows system theme variant. "Dark" or "Light" are other available options. -->
 
     <Application.Resources>
-        <FontFamily x:Key="IconFont">avares://Flow.Launcher/Resources/#Segoe Fluent Icons</FontFamily>
+        <FontFamily x:Key="SegoeFluentIcons">avares://Flow.Launcher/Resources/#Segoe Fluent Icons</FontFamily>
     </Application.Resources>
 
     <Application.Styles>
diff --git a/Flow.Launcher/Resources/CustomControlTemplate.xaml b/Flow.Launcher/Resources/CustomControlTemplate.xaml
index 505b7c2a3..0104e2de3 100644
--- a/Flow.Launcher/Resources/CustomControlTemplate.xaml
+++ b/Flow.Launcher/Resources/CustomControlTemplate.xaml
@@ -48,7 +48,7 @@
         <Setter Property="Margin" Value="24,0,16,0" />
         <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="FontSize" Value="20" />
-        <Setter Property="FontFamily" Value="/Resources/#Segoe Fluent Icons" />
+        <Setter Property="FontFamily" Value="{StaticResource SegoeFluentIcons}" />
         <Setter Property="Foreground" Value="{DynamicResource Color05B}" />
     </Style>
     <Style x:Key="TabMenu" TargetType="{x:Type TextBlock}">
@@ -60,7 +60,7 @@
         <Setter Property="Margin" Value="0,0,12,0" />
         <Setter Property="FontSize" Value="16" />
         <Setter Property="VerticalAlignment" Value="Center" />
-        <Setter Property="FontFamily" Value="/Resources/#Segoe Fluent Icons" />
+        <Setter Property="FontFamily" Value="{StaticResource SegoeFluentIcons}" />
         <Setter Property="Foreground" Value="{DynamicResource Color05B}" />
     </Style>
     <Style x:Key="SettingSeparatorStyle" TargetType="{x:Type Separator}">
@@ -2942,7 +2942,7 @@
                     Margin="0,1,12,0"
                     HorizontalAlignment="Left"
                     VerticalAlignment="Stretch"
-                    TextBlock.FontFamily="/Resources/#Segoe Fluent Icons">
+                    TextBlock.FontFamily="{StaticResource SegoeFluentIcons}">
                     <ContentPresenter
                         x:Name="IconContent"
                         ContentSource="Icon"
@@ -3266,7 +3266,7 @@
         <Setter Property="HorizontalAlignment" Value="Right" />
         <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="Cursor" Value="Hand" />
-        <Setter Property="FontFamily" Value="/Resources/#Segoe Fluent Icons" />
+        <Setter Property="FontFamily" Value="{StaticResource SegoeFluentIcons}" />
         <Setter Property="FontSize" Value="11" />
         <Style.Triggers>
             <Trigger Property="IsMouseOver" Value="True">
diff --git a/Flow.Launcher/ResultListBox.axaml b/Flow.Launcher/ResultListBox.axaml
index b0169f654..f35b4be5c 100644
--- a/Flow.Launcher/ResultListBox.axaml
+++ b/Flow.Launcher/ResultListBox.axaml
@@ -92,7 +92,7 @@
                                         x:Name="GlyphIcon"
                                         HorizontalAlignment="Center"
                                         VerticalAlignment="Center"
-                                        FontFamily="{StaticResource IconFont}"
+                                        FontFamily="{Binding GlyphFontFamily}"
                                         Text="{Binding Glyph.Glyph}"
                                         IsVisible="{Binding ShowGlyph}" />
                                 </Border>
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index 3a2450431..ba370fc2e 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -1355,7 +1355,7 @@
                                                                         Margin="48,0,10,0"
                                                                         VerticalAlignment="Center"
                                                                         DockPanel.Dock="Left"
-                                                                        FontFamily="/Resources/#Segoe Fluent Icons"
+                                                                        FontFamily="{StaticResource SegoeFluentIcons}"
                                                                         FontSize="20"
                                                                         Style="{StaticResource Glyph}">
                                                                         &#xe819;
@@ -3226,7 +3226,7 @@
                                             <Button
                                                 Margin="0,0,8,0"
                                                 Content="&#xec7a;"
-                                                FontFamily="/Resources/#Segoe Fluent Icons"
+                                                FontFamily="{StaticResource SegoeFluentIcons}"
                                                 FontSize="20">
                                                 <ui:FlyoutService.Flyout>
                                                     <ui:MenuFlyout>
diff --git a/Flow.Launcher/ViewModels/MainViewModel.cs b/Flow.Launcher/ViewModels/MainViewModel.cs
index ed5325e7a..71db5d808 100644
--- a/Flow.Launcher/ViewModels/MainViewModel.cs
+++ b/Flow.Launcher/ViewModels/MainViewModel.cs
@@ -951,7 +951,7 @@ namespace Flow.Launcher.ViewModel
                 {
                     Title = InternationalizationManager.Instance.GetTranslation("setAsTopMostInThisQuery"),
                     IcoPath = "Images\\up.png",
-                    Glyph = new GlyphInfo(FontFamily: "/Resources/#Segoe Fluent Icons", Glyph: "\xeac2"),
+                    Glyph = new GlyphInfo(FontFamily: "SegoeFluentIcons", Glyph: "\xeac2"),
                     PluginDirectory = Constant.ProgramDirectory,
                     Action = _ =>
                     {
diff --git a/Flow.Launcher/ViewModels/ResultViewModel.cs b/Flow.Launcher/ViewModels/ResultViewModel.cs
index 7aa4c3f31..9a159beff 100644
--- a/Flow.Launcher/ViewModels/ResultViewModel.cs
+++ b/Flow.Launcher/ViewModels/ResultViewModel.cs
@@ -1,7 +1,5 @@
 using System;
 using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Media;
 using Flow.Launcher.Infrastructure.Image;
 using Flow.Launcher.Infrastructure.Logger;
 using Flow.Launcher.Infrastructure.UserSettings;
@@ -9,10 +7,12 @@ using Flow.Launcher.Plugin;
 using System.IO;
 using System.Drawing.Text;
 using System.Collections.Generic;
+using Avalonia;
 using Avalonia.Fonts.Inter;
 using Avalonia.Media;
 using Avalonia.Media.Fonts;
 using Avalonia.Media.Imaging;
+using Avalonia.Styling;
 using FontFamily = Avalonia.Media.FontFamily;
 
 namespace Flow.Launcher.ViewModel
@@ -21,7 +21,7 @@ namespace Flow.Launcher.ViewModel
     {
         private static PrivateFontCollection fontCollection = new();
         private static Dictionary<string, string> fonts = new();
-        
+
         public ResultViewModel(Result result, Settings settings)
         {
             Settings = settings;
@@ -63,7 +63,7 @@ namespace Flow.Launcher.ViewModel
                 }
             }
 
-            
+
             LoadImage();
         }
 
@@ -96,6 +96,21 @@ namespace Flow.Launcher.ViewModel
             }
         }
 
+        public FontFamily GlyphFontFamily
+        {
+            get
+            {
+                if (Glyph is null) return FontFamily.DefaultFontFamilyName;
+
+                if (Application.Current!.TryGetResource(Glyph.FontFamily, ThemeVariant.Default, out var fontfamily))
+                {
+                    return fontfamily as FontFamily;
+                }
+
+                return FontFamily.DefaultFontFamilyName;
+            }
+        }
+
         public bool ShowPreviewImage
         {
             get
diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Main.cs b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Main.cs
index a13d6c929..db02456ec 100644
--- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Main.cs
+++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Main.cs
@@ -217,7 +217,7 @@ namespace Flow.Launcher.Plugin.BrowserBookmark
                         }
                     },
                     IcoPath = "Images\\copylink.png",
-                    Glyph = new GlyphInfo(FontFamily: "/Resources/#Segoe Fluent Icons", Glyph: "\ue8c8")
+                    Glyph = new GlyphInfo(FontFamily: "SegoeFluentIcons", Glyph: "\ue8c8")
                 }
             };
         }
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs b/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs
index b4924a0fc..2a4a400c6 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs
@@ -86,7 +86,7 @@ namespace Flow.Launcher.Plugin.Explorer
                         SubTitleToolTip = Context.API.GetTranslation("plugin_explorer_contextmenu_titletooltip"),
                         TitleToolTip = Context.API.GetTranslation("plugin_explorer_contextmenu_titletooltip"),
                         IcoPath = Constants.QuickAccessImagePath,
-                        Glyph = new GlyphInfo(FontFamily: "/Resources/#Segoe Fluent Icons", Glyph: "\ue718"),
+                        Glyph = new GlyphInfo(FontFamily: "SegoeFluentIcons", Glyph: "\ue718"),
                     });
                 }
                 else
@@ -110,7 +110,7 @@ namespace Flow.Launcher.Plugin.Explorer
                         SubTitleToolTip = Context.API.GetTranslation("plugin_explorer_contextmenu_remove_titletooltip"),
                         TitleToolTip = Context.API.GetTranslation("plugin_explorer_contextmenu_remove_titletooltip"),
                         IcoPath = Constants.RemoveQuickAccessImagePath,
-                        Glyph = new GlyphInfo(FontFamily: "/Resources/#Segoe Fluent Icons", Glyph: "\uecc9")
+                        Glyph = new GlyphInfo(FontFamily: "SegoeFluentIcons", Glyph: "\uecc9")
                     });
                 }
 
@@ -134,7 +134,7 @@ namespace Flow.Launcher.Plugin.Explorer
                         }
                     },
                     IcoPath = Constants.CopyImagePath,
-                    Glyph = new GlyphInfo(FontFamily: "/Resources/#Segoe Fluent Icons", Glyph: "\ue8c8")
+                    Glyph = new GlyphInfo(FontFamily: "SegoeFluentIcons", Glyph: "\ue8c8")
                 });
 
                 contextMenus.Add(new Result
@@ -158,7 +158,7 @@ namespace Flow.Launcher.Plugin.Explorer
 
                     },
                     IcoPath = icoPath,
-                    Glyph = new GlyphInfo(FontFamily: "/Resources/#Segoe Fluent Icons", Glyph: "\uf12b")
+                    Glyph = new GlyphInfo(FontFamily: "SegoeFluentIcons", Glyph: "\uf12b")
                 });
 
 
@@ -202,7 +202,7 @@ namespace Flow.Launcher.Plugin.Explorer
                             return true;
                         },
                         IcoPath = Constants.DeleteFileFolderImagePath,
-                        Glyph = new GlyphInfo(FontFamily: "/Resources/#Segoe Fluent Icons", Glyph: "\ue74d")
+                        Glyph = new GlyphInfo(FontFamily: "SegoeFluentIcons", Glyph: "\ue74d")
                     });
 
                 if (record.Type is not ResultType.Volume)
@@ -211,7 +211,7 @@ namespace Flow.Launcher.Plugin.Explorer
                     {
                         Title = Context.API.GetTranslation("plugin_explorer_show_contextmenu_title"),
                         IcoPath = Constants.ShowContextMenuImagePath,
-                        Glyph = new GlyphInfo(FontFamily: "/Resources/#Segoe Fluent Icons", Glyph: "\ue700"),
+                        Glyph = new GlyphInfo(FontFamily: "SegoeFluentIcons", Glyph: "\ue700"),
                         Action = _ =>
                         {
                             if (record.Type is ResultType.Volume)
@@ -301,7 +301,7 @@ namespace Flow.Launcher.Plugin.Explorer
                     return true;
                 },
                 IcoPath = Constants.FolderImagePath,
-                Glyph = new GlyphInfo(FontFamily: "/Resources/#Segoe Fluent Icons", Glyph: "\ue838")
+                Glyph = new GlyphInfo(FontFamily: "SegoeFluentIcons", Glyph: "\ue838")
             };
         }
 
@@ -334,7 +334,7 @@ namespace Flow.Launcher.Plugin.Explorer
                         return false;
                     }
                 },
-                Glyph = new GlyphInfo(FontFamily: "/Resources/#Segoe Fluent Icons", Glyph: "\ue70f"),
+                Glyph = new GlyphInfo(FontFamily: "SegoeFluentIcons", Glyph: "\ue70f"),
                 IcoPath = Constants.FileImagePath
             };
         }
@@ -367,7 +367,7 @@ namespace Flow.Launcher.Plugin.Explorer
                         return false;
                     }
                 },
-                Glyph = new GlyphInfo(FontFamily: "/Resources/#Segoe Fluent Icons", Glyph: "\ue756"),
+                Glyph = new GlyphInfo(FontFamily: "SegoeFluentIcons", Glyph: "\ue756"),
                 IcoPath = Constants.FolderImagePath
             };
         }
diff --git a/Plugins/Flow.Launcher.Plugin.PluginsManager/ContextMenu.cs b/Plugins/Flow.Launcher.Plugin.PluginsManager/ContextMenu.cs
index 17e9fe2bc..c8e6d4f4c 100644
--- a/Plugins/Flow.Launcher.Plugin.PluginsManager/ContextMenu.cs
+++ b/Plugins/Flow.Launcher.Plugin.PluginsManager/ContextMenu.cs
@@ -13,13 +13,13 @@ namespace Flow.Launcher.Plugin.PluginsManager
             Context = context;
         }
 
-        private readonly GlyphInfo sourcecodeGlyph = new("/Resources/#Segoe Fluent Icons","\uE943");
-        private readonly GlyphInfo issueGlyph = new("/Resources/#Segoe Fluent Icons", "\ued15");
-        private readonly GlyphInfo manifestGlyph = new("/Resources/#Segoe Fluent Icons", "\uea37");
+        private readonly GlyphInfo sourcecodeGlyph = new("SegoeFluentIcons", "\uE943");
+        private readonly GlyphInfo issueGlyph = new("SegoeFluentIcons", "\ued15");
+        private readonly GlyphInfo manifestGlyph = new("SegoeFluentIcons", "\uea37");
 
         public List<Result> LoadContextMenus(Result selectedResult)
         {
-            if(selectedResult.ContextData is not UserPlugin pluginManifestInfo) 
+            if (selectedResult.ContextData is not UserPlugin pluginManifestInfo)
                 return new List<Result>();
 
             return new List<Result>
@@ -27,9 +27,10 @@ namespace Flow.Launcher.Plugin.PluginsManager
                 new Result
                 {
                     Title = Context.API.GetTranslation("plugin_pluginsmanager_plugin_contextmenu_openwebsite_title"),
-                    SubTitle = Context.API.GetTranslation("plugin_pluginsmanager_plugin_contextmenu_openwebsite_subtitle"),
+                    SubTitle =
+                        Context.API.GetTranslation("plugin_pluginsmanager_plugin_contextmenu_openwebsite_subtitle"),
                     IcoPath = selectedResult.IcoPath,
-                    Action = _ => 
+                    Action = _ =>
                     {
                         Context.API.OpenUrl(pluginManifestInfo.Website);
                         return true;
@@ -38,7 +39,8 @@ namespace Flow.Launcher.Plugin.PluginsManager
                 new Result
                 {
                     Title = Context.API.GetTranslation("plugin_pluginsmanager_plugin_contextmenu_gotosourcecode_title"),
-                    SubTitle = Context.API.GetTranslation("plugin_pluginsmanager_plugin_contextmenu_gotosourcecode_subtitle"),
+                    SubTitle =
+                        Context.API.GetTranslation("plugin_pluginsmanager_plugin_contextmenu_gotosourcecode_subtitle"),
                     IcoPath = "Images\\sourcecode.png",
                     Glyph = sourcecodeGlyph,
                     Action = _ =>
@@ -56,9 +58,9 @@ namespace Flow.Launcher.Plugin.PluginsManager
                     Action = _ =>
                     {
                         // standard UrlSourceCode format in PluginsManifest's plugins.json file: https://github.com/jjw24/Flow.Launcher.Plugin.Putty/tree/master
-                        var link = pluginManifestInfo.UrlSourceCode.StartsWith("https://github.com") 
-                                        ? Regex.Replace(pluginManifestInfo.UrlSourceCode, @"\/tree\/\w+$", "") + "/issues"
-                                        : pluginManifestInfo.UrlSourceCode;
+                        var link = pluginManifestInfo.UrlSourceCode.StartsWith("https://github.com")
+                            ? Regex.Replace(pluginManifestInfo.UrlSourceCode, @"\/tree\/\w+$", "") + "/issues"
+                            : pluginManifestInfo.UrlSourceCode;
 
                         Context.API.OpenUrl(link);
                         return true;
@@ -66,8 +68,10 @@ namespace Flow.Launcher.Plugin.PluginsManager
                 },
                 new Result
                 {
-                    Title = Context.API.GetTranslation("plugin_pluginsmanager_plugin_contextmenu_pluginsmanifest_title"),
-                    SubTitle = Context.API.GetTranslation("plugin_pluginsmanager_plugin_contextmenu_pluginsmanifest_subtitle"),
+                    Title =
+                        Context.API.GetTranslation("plugin_pluginsmanager_plugin_contextmenu_pluginsmanifest_title"),
+                    SubTitle =
+                        Context.API.GetTranslation("plugin_pluginsmanager_plugin_contextmenu_pluginsmanifest_subtitle"),
                     IcoPath = "Images\\manifestsite.png",
                     Glyph = manifestGlyph,
                     Action = _ =>
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Main.cs b/Plugins/Flow.Launcher.Plugin.Program/Main.cs
index c02573ed8..60d3abc20 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/Main.cs
+++ b/Plugins/Flow.Launcher.Plugin.Program/Main.cs
@@ -183,7 +183,7 @@ namespace Flow.Launcher.Plugin.Program
                         return false;
                     },
                     IcoPath = "Images/disable.png",
-                    Glyph = new GlyphInfo(FontFamily: "/Resources/#Segoe Fluent Icons", Glyph: "\xece4"),
+                    Glyph = new GlyphInfo(FontFamily: "SegoeFluentIcons", Glyph: "\xece4"),
                 }
             );
 
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Programs/UWPPackage.cs b/Plugins/Flow.Launcher.Plugin.Program/Programs/UWPPackage.cs
index 654897cc5..5c0bf110d 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/Programs/UWPPackage.cs
+++ b/Plugins/Flow.Launcher.Plugin.Program/Programs/UWPPackage.cs
@@ -487,7 +487,7 @@ namespace Flow.Launcher.Plugin.Program.Programs
                         return true;
                     },
                     IcoPath = "Images/folder.png",
-                    Glyph = new GlyphInfo(FontFamily: "/Resources/#Segoe Fluent Icons", Glyph: "\xe838"),
+                    Glyph = new GlyphInfo(FontFamily: "SegoeFluentIcons", Glyph: "\xe838"),
                 }
             };
 
@@ -502,7 +502,7 @@ namespace Flow.Launcher.Plugin.Program.Programs
                         return true;
                     },
                     IcoPath = "Images/cmd.png",
-                    Glyph = new GlyphInfo(FontFamily: "/Resources/#Segoe Fluent Icons", Glyph: "\xe7ef")
+                    Glyph = new GlyphInfo(FontFamily: "SegoeFluentIcons", Glyph: "\xe7ef")
                 });
             }
 
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs b/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs
index 25213c667..0da1a8b6d 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs
+++ b/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs
@@ -174,7 +174,7 @@ namespace Flow.Launcher.Plugin.Program.Programs
                 Title = title,
                 AutoCompleteText = resultName,
                 SubTitle = subtitle,
-                IcoPath = @"C:\Users\hongt\Downloads\Vector-based_example.svg", // IcoPath,
+                IcoPath = IcoPath,
                 Score = matchResult.Score,
                 TitleHighlightData = matchResult.MatchData,
                 ContextData = this,
@@ -228,7 +228,7 @@ namespace Flow.Launcher.Plugin.Program.Programs
                         return true;
                     },
                     IcoPath = "Images/user.png",
-                    Glyph = new GlyphInfo(FontFamily: "/Resources/#Segoe Fluent Icons", Glyph: "\xe7ee"),
+                    Glyph = new GlyphInfo(FontFamily: "SegoeFluentIcons", Glyph: "\xe7ee"),
                 },
                 new Result
                 {
@@ -248,7 +248,7 @@ namespace Flow.Launcher.Plugin.Program.Programs
                         return true;
                     },
                     IcoPath = "Images/cmd.png",
-                    Glyph = new GlyphInfo(FontFamily: "/Resources/#Segoe Fluent Icons", Glyph: "\xe7ef"),
+                    Glyph = new GlyphInfo(FontFamily: "SegoeFluentIcons", Glyph: "\xe7ef"),
                 },
                 new Result
                 {
@@ -260,7 +260,7 @@ namespace Flow.Launcher.Plugin.Program.Programs
                         return true;
                     },
                     IcoPath = "Images/folder.png",
-                    Glyph = new GlyphInfo(FontFamily: "/Resources/#Segoe Fluent Icons", Glyph: "\xe838"),
+                    Glyph = new GlyphInfo(FontFamily: "SegoeFluentIcons", Glyph: "\xe838"),
                 }
             };
             return contextMenus;
diff --git a/Plugins/Flow.Launcher.Plugin.Shell/Main.cs b/Plugins/Flow.Launcher.Plugin.Shell/Main.cs
index 66917d594..16ea2b0a9 100644
--- a/Plugins/Flow.Launcher.Plugin.Shell/Main.cs
+++ b/Plugins/Flow.Launcher.Plugin.Shell/Main.cs
@@ -403,7 +403,7 @@ namespace Flow.Launcher.Plugin.Shell
                         return true;
                     },
                     IcoPath = "Images/user.png",
-                    Glyph = new GlyphInfo(FontFamily: "/Resources/#Segoe Fluent Icons", Glyph: "\xe7ee")
+                    Glyph = new GlyphInfo(FontFamily: "SegoeFluentIcons", Glyph: "\xe7ee")
                 },
                 new()
                 {
@@ -414,7 +414,7 @@ namespace Flow.Launcher.Plugin.Shell
                         return true;
                     },
                     IcoPath = "Images/admin.png",
-                    Glyph = new GlyphInfo(FontFamily: "/Resources/#Segoe Fluent Icons", Glyph: "\xe7ef")
+                    Glyph = new GlyphInfo(FontFamily: "SegoeFluentIcons", Glyph: "\xe7ef")
                 },
                 new()
                 {
@@ -425,7 +425,7 @@ namespace Flow.Launcher.Plugin.Shell
                         return true;
                     },
                     IcoPath = "Images/copy.png",
-                    Glyph = new GlyphInfo(FontFamily: "/Resources/#Segoe Fluent Icons", Glyph: "\xe8c8")
+                    Glyph = new GlyphInfo(FontFamily: "SegoeFluentIcons", Glyph: "\xe8c8")
                 }
             };
 
diff --git a/Plugins/Flow.Launcher.Plugin.Sys/Main.cs b/Plugins/Flow.Launcher.Plugin.Sys/Main.cs
index 750ab476c..853078029 100644
--- a/Plugins/Flow.Launcher.Plugin.Sys/Main.cs
+++ b/Plugins/Flow.Launcher.Plugin.Sys/Main.cs
@@ -91,7 +91,7 @@ namespace Flow.Launcher.Plugin.Sys
                 {
                     Title = "Shutdown",
                     SubTitle = context.API.GetTranslation("flowlauncher_plugin_sys_shutdown_computer"),
-                    Glyph = new GlyphInfo (FontFamily:"/Resources/#Segoe Fluent Icons", Glyph:"\xe7e8"),
+                    Glyph = new GlyphInfo (FontFamily:"SegoeFluentIcons", Glyph:"\xe7e8"),
                     IcoPath = "Images\\shutdown.png",
                     Action = c =>
                     {
@@ -111,7 +111,7 @@ namespace Flow.Launcher.Plugin.Sys
                 {
                     Title = "Restart",
                     SubTitle = context.API.GetTranslation("flowlauncher_plugin_sys_restart_computer"),
-                    Glyph = new GlyphInfo (FontFamily:"/Resources/#Segoe Fluent Icons", Glyph:"\xe777"),
+                    Glyph = new GlyphInfo (FontFamily:"SegoeFluentIcons", Glyph:"\xe777"),
                     IcoPath = "Images\\restart.png",
                     Action = c =>
                     {
@@ -131,7 +131,7 @@ namespace Flow.Launcher.Plugin.Sys
                 {
                     Title = "Restart With Advanced Boot Options",
                     SubTitle = context.API.GetTranslation("flowlauncher_plugin_sys_restart_advanced"),
-                    Glyph = new GlyphInfo (FontFamily:"/Resources/#Segoe Fluent Icons", Glyph:"\xecc5"),
+                    Glyph = new GlyphInfo (FontFamily:"SegoeFluentIcons", Glyph:"\xecc5"),
                     IcoPath = "Images\\restart_advanced.png",
                     Action = c =>
                     {
@@ -150,7 +150,7 @@ namespace Flow.Launcher.Plugin.Sys
                 {
                     Title = "Log Off/Sign Out",
                     SubTitle = context.API.GetTranslation("flowlauncher_plugin_sys_log_off"),
-                    Glyph = new GlyphInfo (FontFamily:"/Resources/#Segoe Fluent Icons", Glyph:"\xe77b"),
+                    Glyph = new GlyphInfo (FontFamily:"SegoeFluentIcons", Glyph:"\xe77b"),
                     IcoPath = "Images\\logoff.png",
                     Action = c =>
                     {
@@ -169,7 +169,7 @@ namespace Flow.Launcher.Plugin.Sys
                 {
                     Title = "Lock",
                     SubTitle = context.API.GetTranslation("flowlauncher_plugin_sys_lock"),
-                    Glyph = new GlyphInfo (FontFamily:"/Resources/#Segoe Fluent Icons", Glyph:"\xe72e"),
+                    Glyph = new GlyphInfo (FontFamily:"SegoeFluentIcons", Glyph:"\xe72e"),
                     IcoPath = "Images\\lock.png",
                     Action = c =>
                     {
@@ -181,7 +181,7 @@ namespace Flow.Launcher.Plugin.Sys
                 {
                     Title = "Sleep",
                     SubTitle = context.API.GetTranslation("flowlauncher_plugin_sys_sleep"),
-                    Glyph = new GlyphInfo (FontFamily:"/Resources/#Segoe Fluent Icons", Glyph:"\xec46"),
+                    Glyph = new GlyphInfo (FontFamily:"SegoeFluentIcons", Glyph:"\xec46"),
                     IcoPath = "Images\\sleep.png",
                     Action = c => FormsApplication.SetSuspendState(PowerState.Suspend, false, false)
                 },
@@ -189,7 +189,7 @@ namespace Flow.Launcher.Plugin.Sys
                 {
                     Title = "Hibernate",
                     SubTitle = context.API.GetTranslation("flowlauncher_plugin_sys_hibernate"),
-                    Glyph = new GlyphInfo (FontFamily:"/Resources/#Segoe Fluent Icons", Glyph:"\xe945"),
+                    Glyph = new GlyphInfo (FontFamily:"SegoeFluentIcons", Glyph:"\xe945"),
                     IcoPath = "Images\\hibernate.png",
                     Action= c =>
                     {
@@ -207,7 +207,7 @@ namespace Flow.Launcher.Plugin.Sys
                     Title = "Index Option",
                     SubTitle = context.API.GetTranslation("flowlauncher_plugin_sys_indexoption"),
                     IcoPath = "Images\\indexoption.png",
-                    Glyph = new GlyphInfo (FontFamily:"/Resources/#Segoe Fluent Icons", Glyph:"\xe773"),
+                    Glyph = new GlyphInfo (FontFamily:"SegoeFluentIcons", Glyph:"\xe773"),
                     Action = c =>
                     {
                         {
@@ -222,7 +222,7 @@ namespace Flow.Launcher.Plugin.Sys
                     Title = "Empty Recycle Bin",
                     SubTitle = context.API.GetTranslation("flowlauncher_plugin_sys_emptyrecyclebin"),
                     IcoPath = "Images\\recyclebin.png",
-                    Glyph = new GlyphInfo (FontFamily:"/Resources/#Segoe Fluent Icons", Glyph:"\xe74d"),
+                    Glyph = new GlyphInfo (FontFamily:"SegoeFluentIcons", Glyph:"\xe74d"),
                     Action = c =>
                     {
                         // http://www.pinvoke.net/default.aspx/shell32/SHEmptyRecycleBin.html
@@ -245,7 +245,7 @@ namespace Flow.Launcher.Plugin.Sys
                     Title = "Open Recycle Bin",
                     SubTitle = context.API.GetTranslation("flowlauncher_plugin_sys_openrecyclebin"),
                     IcoPath = "Images\\openrecyclebin.png",
-                    Glyph = new GlyphInfo (FontFamily:"/Resources/#Segoe Fluent Icons", Glyph:"\xe74d"),
+                    Glyph = new GlyphInfo (FontFamily:"SegoeFluentIcons", Glyph:"\xe74d"),
                     Action = c =>
                     {
                         {
@@ -372,7 +372,7 @@ namespace Flow.Launcher.Plugin.Sys
                     Title = "Toggle Game Mode",
                     SubTitle = context.API.GetTranslation("flowlauncher_plugin_sys_toggle_game_mode"),
                     IcoPath = "Images\\app.png",
-                    Glyph = new GlyphInfo (FontFamily:"/Resources/#Segoe Fluent Icons", Glyph:"\ue7fc"),
+                    Glyph = new GlyphInfo (FontFamily:"SegoeFluentIcons", Glyph:"\ue7fc"),
                     Action = c =>
                     {
                         context.API.ToggleGameMode();
diff --git a/Plugins/Flow.Launcher.Plugin.WindowsSettings/WindowsSettings.json b/Plugins/Flow.Launcher.Plugin.WindowsSettings/WindowsSettings.json
index 9a0783faf..c937b2124 100644
--- a/Plugins/Flow.Launcher.Plugin.WindowsSettings/WindowsSettings.json
+++ b/Plugins/Flow.Launcher.Plugin.WindowsSettings/WindowsSettings.json
@@ -9,7 +9,7 @@
     "Command": "ms-settings:workplace",
     "IconGlyph": {
       "Glyph": "\ue821",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -43,7 +43,7 @@
     "Command": "ms-settings:signinoptions",
     "IconGlyph": {
       "Glyph": "\ue8d7",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -59,7 +59,7 @@
     "Command": "ms-settings:sync",
     "IconGlyph": {
       "Glyph": "\ue895",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -81,7 +81,7 @@
     "Command": "ms-settings:yourinfo",
     "IconGlyph": {
       "Glyph": "\ue779",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -91,7 +91,7 @@
     "Command": "ms-settings:appsfeatures",
     "IconGlyph": {
       "Glyph": "\ue71d",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -107,7 +107,7 @@
     "Command": "ms-settings:appsforwebsites",
     "IconGlyph": {
       "Glyph": "\ue78b",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -117,7 +117,7 @@
     "Command": "ms-settings:defaultapps",
     "IconGlyph": {
       "Glyph": "\ue7ac",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -127,7 +127,7 @@
     "Command": "ms-settings:optionalfeatures",
     "IconGlyph": {
       "Glyph": "\ue71d",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -137,7 +137,7 @@
     "Command": "ms-settings:maps",
     "IconGlyph": {
       "Glyph": "\ue826",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -153,7 +153,7 @@
     "Command": "ms-settings:startupapps",
     "IconGlyph": {
       "Glyph": "\ue7b5",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -163,7 +163,7 @@
     "Command": "ms-settings:videoplayback",
     "IconGlyph": {
       "Glyph": "\ue714",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -185,7 +185,7 @@
     "Command": "ms-settings:cortana-permissions",
     "IconGlyph": {
       "Glyph": "\ue7ef",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -195,7 +195,7 @@
     "Command": "ms-settings:cortana-windowssearch",
     "IconGlyph": {
       "Glyph": "\ue713",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -226,7 +226,7 @@
     "Command": "ms-settings:autoplay",
     "IconGlyph": {
       "Glyph": "\uec57",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -236,7 +236,7 @@
     "Command": "ms-settings:bluetooth",
     "IconGlyph": {
       "Glyph": "\ue772",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -267,7 +267,7 @@
     "Command": "ms-settings:pen",
     "IconGlyph": {
       "Glyph": "\uedc6",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -277,7 +277,7 @@
     "Command": "ms-settings:printers",
     "IconGlyph": {
       "Glyph": "\ue749",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -294,7 +294,7 @@
     "Command": "ms-settings:typing",
     "IconGlyph": {
       "Glyph": "\ue765",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -304,7 +304,7 @@
     "Command": "ms-settings:usb",
     "IconGlyph": {
       "Glyph": "\ue88e",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -341,7 +341,7 @@
     "Command": "ms-settings:easeofaccess-closedcaptioning",
     "IconGlyph": {
       "Glyph": "\ue7f0",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -389,7 +389,7 @@
     "Command": "ms-settings:easeofaccess-eyecontrol",
     "IconGlyph": {
       "Glyph": "\uf19d",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -401,7 +401,7 @@
     "Command": "ms-settings:fonts",
     "IconGlyph": {
       "Glyph": "\ue8d2",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -411,7 +411,7 @@
     "Command": "ms-settings:easeofaccess-highcontrast",
     "IconGlyph": {
       "Glyph": "\ue706",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -430,7 +430,7 @@
     "Command": "ms-settings:easeofaccess-keyboard",
     "IconGlyph": {
       "Glyph": "\ued4d",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -443,7 +443,7 @@
     "Command": "ms-settings:easeofaccess-magnifier",
     "IconGlyph": {
       "Glyph": "\uf19d",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -500,7 +500,7 @@
     "Command": "ms-settings:gaming-gamebar",
     "IconGlyph": {
       "Glyph": "\ue713",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -510,7 +510,7 @@
     "Command": "ms-settings:gaming-gamedvr",
     "IconGlyph": {
       "Glyph": "\ue713",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -520,7 +520,7 @@
     "Command": "ms-settings:gaming-gamemode",
     "IconGlyph": {
       "Glyph": "\uec4a",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -547,7 +547,7 @@
     "Command": "ms-settings:gaming-xboxnetworking",
     "IconGlyph": {
       "Glyph": "\ue713",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -621,7 +621,7 @@
     "Command": "ms-settings:datausage",
     "IconGlyph": {
       "Glyph": "\uec27",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -631,7 +631,7 @@
     "Command": "ms-settings:network-dialup",
     "IconGlyph": {
       "Glyph": "\ue83c",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -656,7 +656,7 @@
     "Command": "ms-settings:network-ethernet",
     "IconGlyph": {
       "Glyph": "\ue839",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -692,7 +692,7 @@
     "Command": "ms-settings:network-proxy",
     "IconGlyph": {
       "Glyph": "\ue774",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -702,7 +702,7 @@
     "Command": "ms-settings:network-status",
     "IconGlyph": {
       "Glyph": "\uec27",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -726,7 +726,7 @@
     "Command": "ms-settings:network-vpn",
     "IconGlyph": {
       "Glyph": "\ue705",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -763,7 +763,7 @@
     "Command": "ms-settings:personalization-background",
     "IconGlyph": {
       "Glyph": "\ueb9f",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -776,7 +776,7 @@
     "Command": "ms-settings:personalization-start-places",
     "IconGlyph": {
       "Glyph": "\ueca5",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -795,7 +795,7 @@
     "Command": "ms-settings:colors",
     "IconGlyph": {
       "Glyph": "\ue790",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -843,7 +843,7 @@
     "Command": "ms-settings:taskbar",
     "IconGlyph": {
       "Glyph": "\ue90e",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -853,7 +853,7 @@
     "Command": "ms-settings:themes",
     "IconGlyph": {
       "Glyph": "\ue771",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -885,7 +885,7 @@
     "Command": "ms-settings:privacy-accountinfo",
     "IconGlyph": {
       "Glyph": "\ue779",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -895,7 +895,7 @@
     "Command": "ms-settings:privacy-activityhistory",
     "IconGlyph": {
       "Glyph": "\ue7c4",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -907,7 +907,7 @@
     "Command": "ms-settings:privacy-advertisingid",
     "IconGlyph": {
       "Glyph": "\ue72e",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -917,7 +917,7 @@
     "Command": "ms-settings:privacy-appdiagnostics",
     "IconGlyph": {
       "Glyph": "\ue9d2",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -927,7 +927,7 @@
     "Command": "ms-settings:privacy-automaticfiledownloads",
     "IconGlyph": {
       "Glyph": "\ue753",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -937,7 +937,7 @@
     "Command": "ms-settings:privacy-backgroundapps",
     "IconGlyph": {
       "Glyph": "\ue9d9",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -953,7 +953,7 @@
     "Command": "ms-settings:privacy-callhistory",
     "IconGlyph": {
       "Glyph": "\uf738",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -963,7 +963,7 @@
     "Command": "ms-settings:privacy-webcam",
     "IconGlyph": {
       "Glyph": "\uf439",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -973,7 +973,7 @@
     "Command": "ms-settings:privacy-contacts",
     "IconGlyph": {
       "Glyph": "\ue716",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -983,7 +983,7 @@
     "Command": "ms-settings:privacy-documents",
     "IconGlyph": {
       "Glyph": "\ue7c3",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -1012,7 +1012,7 @@
     "Command": "ms-settings:privacy-broadfilesystemaccess",
     "IconGlyph": {
       "Glyph": "\ue7c3",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -1022,7 +1022,7 @@
     "Command": "ms-settings:privacy or privacy-general",
     "IconGlyph": {
       "Glyph": "\uec20",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -1035,7 +1035,7 @@
     "Command": "ms-settings:privacy-speechtyping",
     "IconGlyph": {
       "Glyph": "\ueadf",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -1045,7 +1045,7 @@
     "Command": "ms-settings:privacy-location",
     "IconGlyph": {
       "Glyph": "\ue707",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -1055,7 +1055,7 @@
     "Command": "ms-settings:privacy-messaging",
     "IconGlyph": {
       "Glyph": "\uebdb",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -1065,7 +1065,7 @@
     "Command": "ms-settings:privacy-microphone",
     "IconGlyph": {
       "Glyph": "\ue720",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -1090,7 +1090,7 @@
     "Command": "ms-settings:privacy-customdevices",
     "IconGlyph": {
       "Glyph": "\ue772",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -1100,7 +1100,7 @@
     "Command": "ms-settings:privacy-phonecalls",
     "IconGlyph": {
       "Glyph": "\ue77e",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -1116,7 +1116,7 @@
     "Command": "ms-settings:privacy-radios",
     "IconGlyph": {
       "Glyph": "\uec05",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -1138,7 +1138,7 @@
     "Command": "ms-settings:privacy-videos",
     "IconGlyph": {
       "Glyph": "\ue8b2",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -1148,7 +1148,7 @@
     "Command": "ms-settings:privacy-voiceactivation",
     "IconGlyph": {
       "Glyph": "\uf12e",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -1185,7 +1185,7 @@
     "Command": "ms-settings:surfacehub-welcome",
     "IconGlyph": {
       "Glyph": "\uee3f",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -1203,7 +1203,7 @@
     "Command": "ms-settings:about",
     "IconGlyph": {
       "Glyph": "\ue946",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -1214,7 +1214,7 @@
     "Command": "ms-settings:display-advanced",
     "IconGlyph": {
       "Glyph": "\ue7f4",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -1256,7 +1256,7 @@
     "Command": "ms-settings:clipboard",
     "IconGlyph": {
       "Glyph": "\ue77f",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -1278,7 +1278,7 @@
     "Command": "ms-settings:savelocations",
     "IconGlyph": {
       "Glyph": "\ueda2",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -1288,7 +1288,7 @@
     "Command": "ms-settings:screenrotation",
     "IconGlyph": {
       "Glyph": "\ue7f4",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -1344,7 +1344,7 @@
     "Command": "ms-settings:messaging",
     "IconGlyph": {
       "Glyph": "\uebdb",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -1360,7 +1360,7 @@
     "Command": "ms-settings:multitasking",
     "IconGlyph": {
       "Glyph": "\ue7c4",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -1382,7 +1382,7 @@
     "Command": "ms-settings:project",
     "IconGlyph": {
       "Glyph": "\uebc6",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -1395,7 +1395,7 @@
     "Command": "ms-settings:crossdevice",
     "IconGlyph": {
       "Glyph": "\uf22c",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -1405,7 +1405,7 @@
     "Command": "ms-settings:tabletmode",
     "IconGlyph": {
       "Glyph": "\uebfc",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -1435,7 +1435,7 @@
     "Command": "ms-settings:powersleep",
     "IconGlyph": {
       "Glyph": "\uf83d",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -1445,7 +1445,7 @@
     "Command": "ms-settings:sound",
     "IconGlyph": {
       "Glyph": "\ue995",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -1455,7 +1455,7 @@
     "Command": "ms-settings:storagesense",
     "IconGlyph": {
       "Glyph": "\ueda2",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -1471,7 +1471,7 @@
     "Command": "ms-settings:dateandtime",
     "IconGlyph": {
       "Glyph": "\uec92",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -1494,7 +1494,7 @@
     "Command": "ms-settings:regionformatting",
     "IconGlyph": {
       "Glyph": "\uf49a",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -1504,7 +1504,7 @@
     "Command": "ms-settings:keyboard",
     "IconGlyph": {
       "Glyph": "\ued4d",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -1585,7 +1585,7 @@
     "Command": "ms-settings:activation",
     "IconGlyph": {
       "Glyph": "\ue930",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -1601,7 +1601,7 @@
     "Command": "ms-settings:delivery-optimization",
     "IconGlyph": {
       "Glyph": "\uf785",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -1611,7 +1611,7 @@
     "Command": "ms-settings:findmydevice",
     "IconGlyph": {
       "Glyph": "\ue707",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -1633,7 +1633,7 @@
     "Command": "ms-settings:troubleshoot",
     "IconGlyph": {
       "Glyph": "\ue90f",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -1665,7 +1665,7 @@
     "Command": "ms-settings:windowsupdate",
     "IconGlyph": {
       "Glyph": "\ue895",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -1715,7 +1715,7 @@
     "Command": "ms-settings:provisioning",
     "IconGlyph": {
       "Glyph": "\ue821",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -1768,7 +1768,7 @@
     "Command": "control /name Microsoft.AutoPlay",
     "IconGlyph": {
       "Glyph": "\uec57",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -1829,7 +1829,7 @@
     "Command": "control /name Microsoft.DateAndTime",
     "IconGlyph": {
       "Glyph": "\uec92",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -1875,7 +1875,7 @@
     "Command": "control /name Microsoft.Fonts",
     "IconGlyph": {
       "Glyph": "\ue8d2",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {
@@ -2101,7 +2101,7 @@
     "Command": "control /name Microsoft.Sound",
     "IconGlyph": {
       "Glyph": "\ue995",
-      "FontFamily": "/Resources/#Segoe Fluent Icons"
+      "FontFamily": "SegoeFluentIcons"
     }
   },
   {