From 680f89e0f71a218ce7dd422cb788bdbab092c6ec Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Fri, 15 Jul 2022 11:17:18 +0200
Subject: [PATCH] [General] Update Segoe icon glyph codes (#19311)

* Updating icons

* Tweak fontsizes

* Changes based on feedback
---
 .../ColorPickerUI/Controls/ColorFormatControl.xaml |  2 +-
 .../ColorPickerUI/Views/ColorEditorView.xaml       |  4 ++--
 .../colorPicker/ColorPickerUI/Views/ZoomView.xaml  |  2 +-
 .../FancyZonesEditor/CanvasEditorWindow.xaml       |  2 +-
 .../editor/FancyZonesEditor/CanvasZone.xaml        |  2 +-
 .../editor/FancyZonesEditor/GridZone.xaml          |  2 +-
 .../editor/FancyZonesEditor/MainWindow.xaml        | 14 +++++++-------
 src/modules/imageresizer/ui/Views/InputPage.xaml   |  4 ++--
 .../EditKeyboardWindow.cpp                         |  2 +-
 .../EditShortcutsWindow.cpp                        |  2 +-
 src/modules/powerrename/PowerRenameUILib/App.xaml  |  2 +-
 .../powerrename/PowerRenameUILib/MainWindow.xaml   |  4 ++--
 .../Settings.UI/Views/ColorPickerPage.xaml         |  6 +++---
 .../Settings.UI/Views/FancyZonesPage.xaml          |  8 ++++----
 src/settings-ui/Settings.UI/Views/GeneralPage.xaml |  4 ++--
 .../Settings.UI/Views/ImageResizerPage.xaml        |  4 ++--
 .../Settings.UI/Views/KeyboardManagerPage.xaml     |  4 ++--
 .../Settings.UI/Views/PowerLauncherPage.xaml       |  6 +++---
 .../Settings.UI/Views/PowerRenamePage.xaml         |  2 +-
 19 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/src/modules/colorPicker/ColorPickerUI/Controls/ColorFormatControl.xaml b/src/modules/colorPicker/ColorPickerUI/Controls/ColorFormatControl.xaml
index 5746d7e185..4cd00d3759 100644
--- a/src/modules/colorPicker/ColorPickerUI/Controls/ColorFormatControl.xaml
+++ b/src/modules/colorPicker/ColorPickerUI/Controls/ColorFormatControl.xaml
@@ -57,7 +57,7 @@
                     Style="{StaticResource DefaultButtonStyle}"
                     FontFamily="Segoe MDL2 Assets">
                 <Button.Content>
-                    <TextBlock Text="&#xE16F;" AutomationProperties.Name="{x:Static p:Resources.Copy_to_clipboard}" />
+                    <TextBlock Text="&#xE8C8;" AutomationProperties.Name="{x:Static p:Resources.Copy_to_clipboard}" />
                 </Button.Content>
             </Button>
         </Grid>
diff --git a/src/modules/colorPicker/ColorPickerUI/Views/ColorEditorView.xaml b/src/modules/colorPicker/ColorPickerUI/Views/ColorEditorView.xaml
index d9afed19e3..164d704f75 100644
--- a/src/modules/colorPicker/ColorPickerUI/Views/ColorEditorView.xaml
+++ b/src/modules/colorPicker/ColorPickerUI/Views/ColorEditorView.xaml
@@ -41,7 +41,7 @@
                                   Command="{Binding RemoveColorsCommand}" 
                                   CommandParameter="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ContextMenu}}, Path=PlacementTarget.SelectedItems}">
                             <MenuItem.Icon>
-                                <ui:FontIcon Glyph="&#xE107;" />
+                                <ui:FontIcon Glyph="&#xE74D;" />
                             </MenuItem.Icon>
                         </MenuItem>
                         <MenuItem Header="{x:Static p:Resources.Export_by}" >
@@ -205,7 +205,7 @@
                        VerticalAlignment="Center"
                        AutomationProperties.LiveSetting="Assertive"
                        AutomationProperties.Name="{x:Static p:Resources.Copied_to_clipboard}">
-                <Run Text="&#xE16F; " FontFamily="Segoe MDL2 Assets"/>
+                <Run Text="&#xE8C8; " FontFamily="Segoe MDL2 Assets"/>
                 <Run Text="{x:Static p:Resources.Copied_to_clipboard}" FontWeight="SemiBold"/>
             </TextBlock>
         </Border>
diff --git a/src/modules/colorPicker/ColorPickerUI/Views/ZoomView.xaml b/src/modules/colorPicker/ColorPickerUI/Views/ZoomView.xaml
index 5c6c617f6f..0fadecf7ae 100644
--- a/src/modules/colorPicker/ColorPickerUI/Views/ZoomView.xaml
+++ b/src/modules/colorPicker/ColorPickerUI/Views/ZoomView.xaml
@@ -54,7 +54,7 @@
                 </Border.Style>
                 <Button Height="40"
                         Width="40"
-                        Content="&#xE10A;"
+                        Content="&#xE8BB;"
                         FontFamily="Segoe MDL2 Assets"
                         Background="Transparent"/>
             </Border>
diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/CanvasEditorWindow.xaml b/src/modules/fancyzones/editor/FancyZonesEditor/CanvasEditorWindow.xaml
index 29d20ea36c..320afab8ec 100644
--- a/src/modules/fancyzones/editor/FancyZonesEditor/CanvasEditorWindow.xaml
+++ b/src/modules/fancyzones/editor/FancyZonesEditor/CanvasEditorWindow.xaml
@@ -44,7 +44,7 @@
                     Margin="0,8,0,0"
                     Style="{StaticResource AccentButtonStyle}"
                     FontFamily="Segoe MDL2 Assets"
-                    Content="&#xE109;"
+                    Content="&#xE710;"
                     FontSize="24"
                     TabIndex="0"
                     ToolTip="{x:Static props:Resources.Add_zone}"
diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/CanvasZone.xaml b/src/modules/fancyzones/editor/FancyZonesEditor/CanvasZone.xaml
index da36e8db46..f48f7ccb53 100644
--- a/src/modules/fancyzones/editor/FancyZonesEditor/CanvasZone.xaml
+++ b/src/modules/fancyzones/editor/FancyZonesEditor/CanvasZone.xaml
@@ -159,7 +159,7 @@
                            HorizontalAlignment="Center"
                            VerticalAlignment="Center">
                      <Run x:Name="WidthLabel" />
-                     <Run Text="&#xE106;"
+                     <Run Text="&#xE947;"
                           FontSize="10"
                           FontFamily="Segoe MDL2 Assets" />
                     <Run x:Name="HeightLabel" />
diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/GridZone.xaml b/src/modules/fancyzones/editor/FancyZonesEditor/GridZone.xaml
index e3b55d8200..112d3f0ad5 100644
--- a/src/modules/fancyzones/editor/FancyZonesEditor/GridZone.xaml
+++ b/src/modules/fancyzones/editor/FancyZonesEditor/GridZone.xaml
@@ -38,7 +38,7 @@
                        HorizontalAlignment="Center"
                        VerticalAlignment="Center">
                      <Run x:Name="WidthLabel" />
-                     <Run Text="&#xE106;"
+                     <Run Text="&#xe894;"
                           FontSize="10"
                           FontFamily="Segoe MDL2 Assets" />
                     <Run x:Name="HeightLabel" />
diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/MainWindow.xaml b/src/modules/fancyzones/editor/FancyZonesEditor/MainWindow.xaml
index 3fdd021a4c..75ad051411 100644
--- a/src/modules/fancyzones/editor/FancyZonesEditor/MainWindow.xaml
+++ b/src/modules/fancyzones/editor/FancyZonesEditor/MainWindow.xaml
@@ -37,7 +37,7 @@
             <MenuItem Header="{x:Static props:Resources.Edit}"
                       Click="EditLayout_Click">
                 <MenuItem.Icon>
-                    <ui:FontIcon Glyph="&#xE104;" />
+                    <ui:FontIcon Glyph="&#xE70F;" />
                 </MenuItem.Icon>
             </MenuItem>
             <MenuItem Header="{x:Static props:Resources.Edit_zones}"
@@ -69,7 +69,7 @@
                       Click="DeleteLayout_Click"
                       Visibility="{Binding Path=Type, Converter={StaticResource LayoutTypeCustomToVisibilityConverter}}">
                 <MenuItem.Icon>
-                    <ui:FontIcon Glyph="&#xE107;" />
+                    <ui:FontIcon Glyph="&#xE74D;" />
                 </MenuItem.Icon>
             </MenuItem>
         </ContextMenu>
@@ -166,7 +166,7 @@
                         Style="{StaticResource AccentButtonStyle}"
                         ui:ControlHelper.CornerRadius="36">
                     <Button.Content>
-                        <TextBlock Text="&#xE104;" 
+                        <TextBlock Text="&#xE70F;" 
                                        FontFamily="Segoe MDL2 Assets"
                                         FontSize="14"
                                        AutomationProperties.Name="{x:Static props:Resources.Edit}" />
@@ -289,7 +289,7 @@
                     Grid.Row="3">
                 <StackPanel Orientation="Horizontal"
                             Margin="8">
-                    <TextBlock Text="&#xE109;"
+                    <TextBlock Text="&#xE710;"
                                AutomationProperties.Name="{x:Static props:Resources.Create_new_layout}"
                                FontFamily="Segoe MDL2 Assets"
                                Foreground="{DynamicResource AccentButtonForeground}" />
@@ -405,7 +405,7 @@
                             Style="{StaticResource IconOnlyButtonStyle}"
                             Visibility="{Binding Path=Type, Converter={StaticResource LayoutTypeCustomToVisibilityConverter}}">
                         <Button.Content>
-                            <TextBlock Text="&#xE107;" 
+                            <TextBlock Text="&#xE74D;" 
                                        FontFamily="Segoe MDL2 Assets"
                                        Foreground="#c50500"
                                        AutomationProperties.Name="{x:Static props:Resources.Delete}" />
@@ -484,7 +484,7 @@
                            Margin="24,12,0,24">
                         <local:LayoutPreview />
 
-                        <Button Content="&#xE104;"
+                        <Button Content="&#xE70F;"
                                 x:Name="editZoneLayoutButton"
                                 FontFamily="Segoe MDL2 Assets"
                                 FontSize="14"
@@ -649,7 +649,7 @@
                                 <ColumnDefinition Width="32" />
                                 <ColumnDefinition Width="*" />
                             </Grid.ColumnDefinitions>
-                            <TextBlock Text="&#xE138;"
+                            <TextBlock Text="&#xF0E2;"
                                        FontSize="16"
                                        Foreground="{DynamicResource SystemControlBackgroundAccentBrush}"
                                        Margin="0,4,0,0"
diff --git a/src/modules/imageresizer/ui/Views/InputPage.xaml b/src/modules/imageresizer/ui/Views/InputPage.xaml
index 3015001a2e..46ceb36ae5 100644
--- a/src/modules/imageresizer/ui/Views/InputPage.xaml
+++ b/src/modules/imageresizer/ui/Views/InputPage.xaml
@@ -40,7 +40,7 @@
                                     VerticalAlignment="Top">
                             <TextBlock Text="{Binding Fit, Converter={StaticResource EnumValueConverter}, ConverterParameter=ThirdPersonSingular}" FontSize="12" Foreground="{DynamicResource SecondaryForegroundBrush}"/>
                             <TextBlock Text="{Binding Width, Converter={StaticResource AutoDoubleConverter}, ConverterParameter=Auto}" FontWeight="SemiBold" FontSize="12" Margin="3,0,0,0" Foreground="{DynamicResource SecondaryForegroundBrush}"/>
-                            <TextBlock Text="&#xE711;" FontFamily="Segoe MDL2 Assets" FontSize="10" Visibility="{Binding ShowHeight, Converter={StaticResource BoolValueConverter}}" Margin="4,4,0,0" Foreground="{DynamicResource SecondaryForegroundBrush}"/>
+                            <TextBlock Text="&#xE947;" FontFamily="Segoe MDL2 Assets" FontSize="10" Visibility="{Binding ShowHeight, Converter={StaticResource BoolValueConverter}}" Margin="4,4,0,0" Foreground="{DynamicResource SecondaryForegroundBrush}"/>
                             <TextBlock Text="{Binding Height, Converter={StaticResource AutoDoubleConverter}, ConverterParameter=Auto}" FontSize="12" Visibility="{Binding ShowHeight, Converter={StaticResource BoolValueConverter}}" FontWeight="SemiBold" Margin="4,0,0,0" Foreground="{DynamicResource SecondaryForegroundBrush}"/>
                             <TextBlock Text="{Binding Unit, Converter={StaticResource EnumValueConverter}, ConverterParameter=ToLower}" FontSize="12"
                                        Margin="4,0,0,0"
@@ -85,7 +85,7 @@
                 </ui:NumberBox.Value>
             </ui:NumberBox>
             <TextBlock VerticalAlignment="Center"
-                       Text="&#xE711;"
+                       Text="&#xe894;"
                        FontFamily="Segoe MDL2 Assets"
                        Width="25"
                        Foreground="{DynamicResource SecondaryForegroundBrush}"
diff --git a/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/EditKeyboardWindow.cpp b/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/EditKeyboardWindow.cpp
index 2ef8c732f9..1230a25f74 100644
--- a/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/EditKeyboardWindow.cpp
+++ b/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/EditKeyboardWindow.cpp
@@ -324,7 +324,7 @@ inline void CreateEditKeyboardWindowImpl(HINSTANCE hInst, KBMEditor::KeyboardMan
     Windows::UI::Xaml::Controls::Button addRemapKey;
     FontIcon plusSymbol;
     plusSymbol.FontFamily(Media::FontFamily(L"Segoe MDL2 Assets"));
-    plusSymbol.Glyph(L"\xE109");
+    plusSymbol.Glyph(L"\xE710");
     addRemapKey.Content(plusSymbol);
     addRemapKey.Margin({ 10, 10, 0, 25 });
     addRemapKey.Click([&](winrt::Windows::Foundation::IInspectable const& sender, RoutedEventArgs const&) {
diff --git a/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/EditShortcutsWindow.cpp b/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/EditShortcutsWindow.cpp
index dd7d19171a..0350cc590a 100644
--- a/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/EditShortcutsWindow.cpp
+++ b/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/EditShortcutsWindow.cpp
@@ -278,7 +278,7 @@ inline void CreateEditShortcutsWindowImpl(HINSTANCE hInst, KBMEditor::KeyboardMa
     Windows::UI::Xaml::Controls::Button addShortcut;
     FontIcon plusSymbol;
     plusSymbol.FontFamily(Xaml::Media::FontFamily(L"Segoe MDL2 Assets"));
-    plusSymbol.Glyph(L"\xE109");
+    plusSymbol.Glyph(L"\xE710");
     addShortcut.Content(plusSymbol);
     addShortcut.Margin({ 10, 10, 0, 25 });
     addShortcut.Click([&](winrt::Windows::Foundation::IInspectable const& sender, RoutedEventArgs const&) {
diff --git a/src/modules/powerrename/PowerRenameUILib/App.xaml b/src/modules/powerrename/PowerRenameUILib/App.xaml
index d5e4cc81c6..6cec5ae349 100644
--- a/src/modules/powerrename/PowerRenameUILib/App.xaml
+++ b/src/modules/powerrename/PowerRenameUILib/App.xaml
@@ -696,7 +696,7 @@
                                                     HorizontalAlignment="Center"
                                                     FontStyle="Normal"
                                                     FontSize="{ThemeResource AutoSuggestBoxIconFontSize}"
-                                                    Text="&#xE10A;"
+                                                    Text="&#xe894;"
                                                     FontFamily="{ThemeResource SymbolThemeFontFamily}"
                                                     AutomationProperties.AccessibilityView="Raw" />
                                                     </Grid>
diff --git a/src/modules/powerrename/PowerRenameUILib/MainWindow.xaml b/src/modules/powerrename/PowerRenameUILib/MainWindow.xaml
index 23a0d95c7a..8df6adf9db 100644
--- a/src/modules/powerrename/PowerRenameUILib/MainWindow.xaml
+++ b/src/modules/powerrename/PowerRenameUILib/MainWindow.xaml
@@ -330,7 +330,7 @@
                 </Button.Content>
             </Button>
 
-            <Button x:Name="button_docs" Content="&#xE11B;" FontFamily="{ThemeResource SymbolThemeFontFamily}" x:Uid="DocsButton" Background="Transparent" BorderBrush="Transparent" Grid.Row="1" Height="32" VerticalAlignment="Bottom" HorizontalAlignment="Left" Click="OpenDocs" />
+            <Button x:Name="button_docs" Content="&#xE897;" FontFamily="{ThemeResource SymbolThemeFontFamily}" x:Uid="DocsButton" Background="Transparent" BorderBrush="Transparent" Grid.Row="1" Height="32" VerticalAlignment="Bottom" HorizontalAlignment="Left" Click="OpenDocs" />
 
 
             <!--<Button Content="&#xE728;"
@@ -362,7 +362,7 @@
             </muxc:SplitButton.KeyboardAccelerators>
             <muxc:SplitButton.Content>
                 <StackPanel Orientation="Horizontal">
-                    <FontIcon Glyph="&#xE13E;" FontSize="14" VerticalAlignment="Center" Margin="0,2,10,0" />
+                    <FontIcon Glyph="&#xE8AC;" FontSize="14" VerticalAlignment="Center" Margin="0,2,10,0" />
                     <TextBlock x:Uid="TxtBlock_ButtonApply" />
                 </StackPanel>
             </muxc:SplitButton.Content>
diff --git a/src/settings-ui/Settings.UI/Views/ColorPickerPage.xaml b/src/settings-ui/Settings.UI/Views/ColorPickerPage.xaml
index b788bd065d..b55c9913be 100644
--- a/src/settings-ui/Settings.UI/Views/ColorPickerPage.xaml
+++ b/src/settings-ui/Settings.UI/Views/ColorPickerPage.xaml
@@ -78,7 +78,7 @@
                 </controls:SettingsGroup>
 
                 <controls:SettingsGroup x:Uid="ColorPicker_Editor" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
-                    <controls:Setting x:Name="ColorFormatsSetting" x:Uid="ColorPicker_ColorFormats" Icon="&#xE14C;"/>
+                    <controls:Setting x:Name="ColorFormatsSetting" x:Uid="ColorPicker_ColorFormats" Icon="&#xE8FD;"/>
 
                     <!-- Disabled reordering by dragging -->
                     <!-- CanReorderItems="True" AllowDrop="True" -->
@@ -123,13 +123,13 @@
                                             VerticalAlignment="Center"
                                             Grid.RowSpan="2"
                                             x:Uid="More_Options_Button"
-                                            Content="&#xE10C;">
+                                            Content="&#xEDE3;">
                                         <Button.Flyout>
                                             <MenuFlyout>
                                                 <MenuFlyoutItem IsEnabled="{x:Bind CanMoveUp}" Icon="Up" x:Uid="MoveUp" Click="ReorderButtonUp_Click"/>
                                                 <MenuFlyoutItem IsEnabled="{x:Bind CanMoveDown}" x:Uid="MoveDown" Click="ReorderButtonDown_Click">
                                                     <MenuFlyoutItem.Icon>
-                                                        <FontIcon Glyph="&#xE1FD;" />
+                                                        <FontIcon Glyph="&#xF0AE;" />
                                                     </MenuFlyoutItem.Icon>
                                                 </MenuFlyoutItem>
                                             </MenuFlyout>
diff --git a/src/settings-ui/Settings.UI/Views/FancyZonesPage.xaml b/src/settings-ui/Settings.UI/Views/FancyZonesPage.xaml
index 7dc66c863b..daa62e1c6b 100644
--- a/src/settings-ui/Settings.UI/Views/FancyZonesPage.xaml
+++ b/src/settings-ui/Settings.UI/Views/FancyZonesPage.xaml
@@ -39,7 +39,7 @@
                                 <PathIcon Data="M45,48H25.5V45H45V25.5H25.5v-3H45V3H25.5V0H48V48ZM22.5,48H3V45H22.5V3H3V0H25.5V48ZM0,48V0H3V48Z"/>
                             </controls:Setting.Icon>-->
                             <controls:Setting.ActionContent>
-                                <FontIcon Glyph="&#xE2B4;" FontFamily="{ThemeResource SymbolThemeFontFamily}" />
+                                <FontIcon Glyph="&#xE8A7;" FontSize="18" FontFamily="{ThemeResource SymbolThemeFontFamily}" />
                             </controls:Setting.ActionContent>
                         </controls:Setting>
                     </Button>
@@ -51,7 +51,7 @@
                         </controls:Setting.ActionContent>
                     </controls:Setting>
 
-                    <controls:Setting x:Uid="FancyZones_UseCursorPosEditorStartupScreen" Icon="&#xE7F9;">
+                    <controls:Setting x:Uid="FancyZones_UseCursorPosEditorStartupScreen" Icon="&#xe7b5;">
                         <controls:Setting.ActionContent>
                             <ComboBox SelectedIndex="{x:Bind Mode=TwoWay, Path=ViewModel.UseCursorPosEditorStartupScreen, Converter={StaticResource BoolToComboBoxIndexConverter}}" MinWidth="{StaticResource SettingActionControlMinWidth}">
                                 <ComboBoxItem x:Uid="FancyZones_LaunchPositionScreen" />
@@ -224,7 +224,7 @@
 
                     <controls:SettingExpander IsExpanded="True">
                         <controls:SettingExpander.Header>
-                            <controls:Setting x:Uid="FancyZones_OverrideSnapHotkeys" Icon="&#xE145;" Style="{StaticResource ExpanderHeaderSettingStyle}">
+                            <controls:Setting x:Uid="FancyZones_OverrideSnapHotkeys" Icon="&#xE90C;" Style="{StaticResource ExpanderHeaderSettingStyle}">
                                 <controls:Setting.ActionContent>
                                     <ToggleSwitch IsOn="{x:Bind Mode=TwoWay, Path=ViewModel.OverrideSnapHotkeys}" x:Uid="ToggleSwitch"/>
                                 </controls:Setting.ActionContent>
@@ -269,7 +269,7 @@
                 <controls:SettingsGroup x:Uid="FancyZones_Layouts" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
                     <controls:SettingExpander IsExpanded="True">
                         <controls:SettingExpander.Header>
-                            <controls:Setting x:Uid="FancyZones_QuickLayoutSwitch" Icon="&#xE737;" Style="{StaticResource ExpanderHeaderSettingStyle}" >
+                            <controls:Setting x:Uid="FancyZones_QuickLayoutSwitch" Icon="&#xeda7;" Style="{StaticResource ExpanderHeaderSettingStyle}" >
                                 <controls:Setting.ActionContent>
                                     <ToggleSwitch IsOn="{x:Bind Mode=TwoWay, Path=ViewModel.QuickLayoutSwitch}" x:Uid="ToggleSwitch"/>
                                 </controls:Setting.ActionContent>
diff --git a/src/settings-ui/Settings.UI/Views/GeneralPage.xaml b/src/settings-ui/Settings.UI/Views/GeneralPage.xaml
index aa1b8c7f17..cc851817d2 100644
--- a/src/settings-ui/Settings.UI/Views/GeneralPage.xaml
+++ b/src/settings-ui/Settings.UI/Views/GeneralPage.xaml
@@ -22,7 +22,7 @@
         <controls:SettingsPageControl.ModuleContent>
             <StackPanel Orientation="Vertical">
                 <controls:SettingsGroup x:Uid="General_Version" Margin="0,-32,0,0">
-                    <controls:Setting Header="{Binding PowerToysVersion}" Icon="&#xE117;">
+                    <controls:Setting Header="{Binding PowerToysVersion}" Icon="&#xE895;">
                         <controls:Setting.Description>
                             <StackPanel Orientation="Vertical">
                                
@@ -177,7 +177,7 @@
                 <controls:SettingsGroup x:Uid="Admin_Mode">
                     <controls:SettingExpander IsExpanded="True">
                         <controls:SettingExpander.Header>
-                            <controls:Setting x:Uid="Admin_Mode" Icon="&#xE1A7;" Description="{Binding Mode=OneWay, Path=RunningAsText}" Style="{StaticResource ExpanderHeaderSettingStyle}">
+                            <controls:Setting x:Uid="Admin_Mode" Icon="&#xE7EF;" Description="{Binding Mode=OneWay, Path=RunningAsText}" Style="{StaticResource ExpanderHeaderSettingStyle}">
                                 <controls:Setting.ActionContent>
                                     <Button x:Uid="GeneralPage_RestartAsAdmin_Button"
                                             Command = "{Binding RestartElevatedButtonEventHandler}"
diff --git a/src/settings-ui/Settings.UI/Views/ImageResizerPage.xaml b/src/settings-ui/Settings.UI/Views/ImageResizerPage.xaml
index 8eb209c0e4..217d3c066c 100644
--- a/src/settings-ui/Settings.UI/Views/ImageResizerPage.xaml
+++ b/src/settings-ui/Settings.UI/Views/ImageResizerPage.xaml
@@ -78,7 +78,7 @@
                                     <Button 
                                         x:Uid="EditButton"
                                         Background="Transparent"
-                                        FontFamily="Segoe MDL2 Assets"
+                                        FontFamily="{ThemeResource SymbolThemeFontFamily}"
                                         Width="40"
                                         Height="36"
                                         Content="&#xE70F;">
@@ -138,7 +138,7 @@
                                     <Button x:Name="RemoveButton"
                                         x:Uid="RemoveButton"
                                         Background="Transparent"
-                                        FontFamily="Segoe MDL2 Assets"
+                                        FontFamily="{ThemeResource SymbolThemeFontFamily}"
                                         Width="40"
                                         Height="36"
                                         Content="&#xE74D;"
diff --git a/src/settings-ui/Settings.UI/Views/KeyboardManagerPage.xaml b/src/settings-ui/Settings.UI/Views/KeyboardManagerPage.xaml
index 5b74ecbb2a..c12219523c 100644
--- a/src/settings-ui/Settings.UI/Views/KeyboardManagerPage.xaml
+++ b/src/settings-ui/Settings.UI/Views/KeyboardManagerPage.xaml
@@ -70,7 +70,7 @@
                     <Button x:Uid="KeyboardManager_RemapKeyboardButton_Accessible" Style="{StaticResource SettingButtonStyle}" Command="{Binding Path=RemapKeyboardCommand}">
                         <controls:Setting x:Uid="KeyboardManager_RemapKeyboardButton" Style="{StaticResource ExpanderHeaderSettingStyle}" Icon="&#xE92E;">
                             <controls:Setting.ActionContent>
-                                <FontIcon Glyph="&#xE8A7;" FontFamily="{ThemeResource SymbolThemeFontFamily}" />
+                                <FontIcon Glyph="&#xE8A7;" FontSize="18" FontFamily="{ThemeResource SymbolThemeFontFamily}" />
                             </controls:Setting.ActionContent>
                         </controls:Setting>
                     </Button>
@@ -128,7 +128,7 @@
                     <Button x:Uid="KeyboardManager_RemapShortcutsButton_Accessible" Style="{StaticResource SettingButtonStyle}" Command="{Binding Path=EditShortcutCommand}">
                         <controls:Setting x:Uid="KeyboardManager_RemapShortcutsButton" Style="{StaticResource ExpanderHeaderSettingStyle}" Icon="&#xE92E;">
                             <controls:Setting.ActionContent>
-                                <FontIcon Glyph="&#xE8A7;" FontFamily="{ThemeResource SymbolThemeFontFamily}" />
+                                <FontIcon Glyph="&#xE8A7;" FontSize="18" FontFamily="{ThemeResource SymbolThemeFontFamily}" />
                             </controls:Setting.ActionContent>
                         </controls:Setting>
                     </Button>
diff --git a/src/settings-ui/Settings.UI/Views/PowerLauncherPage.xaml b/src/settings-ui/Settings.UI/Views/PowerLauncherPage.xaml
index a8012621a6..ec82a4edd5 100644
--- a/src/settings-ui/Settings.UI/Views/PowerLauncherPage.xaml
+++ b/src/settings-ui/Settings.UI/Views/PowerLauncherPage.xaml
@@ -96,7 +96,7 @@
                 <controls:SettingsGroup x:Uid="PowerLauncher_SearchResults" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.EnablePowerLauncher}">
                     <controls:SettingExpander IsExpanded="True">
                         <controls:SettingExpander.Header>
-                            <controls:Setting x:Uid="PowerLauncher_SearchQueryResultsWithDelay" Icon="&#xF182;" Style="{StaticResource ExpanderHeaderSettingStyle}" >
+                            <controls:Setting x:Uid="PowerLauncher_SearchQueryResultsWithDelay" Icon="&#xec48;" Style="{StaticResource ExpanderHeaderSettingStyle}" >
                                 <controls:Setting.ActionContent>
                                     <ToggleSwitch IsOn="{x:Bind Mode=TwoWay, Path=ViewModel.SearchQueryResultsWithDelay}"/>
                                 </controls:Setting.ActionContent>
@@ -135,7 +135,7 @@
 
                     <controls:SettingExpander IsExpanded="True">
                         <controls:SettingExpander.Header>
-                            <controls:Setting x:Uid="PowerLauncher_SearchQueryTuningEnabled" Icon="&#xE14C;" Style="{StaticResource ExpanderHeaderSettingStyle}" >
+                            <controls:Setting x:Uid="PowerLauncher_SearchQueryTuningEnabled" Icon="&#xE8FD;" Style="{StaticResource ExpanderHeaderSettingStyle}" >
                                 <controls:Setting.ActionContent>
                                     <ToggleSwitch IsOn="{x:Bind Mode=TwoWay, Path=ViewModel.SearchQueryTuningEnabled}"/>
                                 </controls:Setting.ActionContent>
@@ -198,7 +198,7 @@
                       />-->
 
                 <controls:SettingsGroup x:Uid="Run_PositionAppearance_GroupSettings" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.EnablePowerLauncher}">
-                    <controls:Setting x:Uid="Run_PositionHeader" Icon="&#xE18C;">
+                    <controls:Setting x:Uid="Run_PositionHeader" Icon="&#xe78b;">
                         <controls:Setting.ActionContent>
                             <ComboBox SelectedIndex="{x:Bind Mode=TwoWay, Path=ViewModel.MonitorPositionIndex}" MinWidth="{StaticResource SettingActionControlMinWidth}">
                                 <ComboBoxItem x:Uid="Run_Radio_Position_Cursor"/>
diff --git a/src/settings-ui/Settings.UI/Views/PowerRenamePage.xaml b/src/settings-ui/Settings.UI/Views/PowerRenamePage.xaml
index 20af429639..1be4820297 100644
--- a/src/settings-ui/Settings.UI/Views/PowerRenamePage.xaml
+++ b/src/settings-ui/Settings.UI/Views/PowerRenamePage.xaml
@@ -77,7 +77,7 @@
                             </StackPanel>
                         </controls:SettingExpander.Content>
                     </controls:SettingExpander>
-                    <controls:Setting x:Uid="PowerRename_Toggle_RestoreFlagsOnLaunch">
+                    <controls:Setting x:Uid="PowerRename_Toggle_RestoreFlagsOnLaunch" Icon="&#xe81c;">
                         <controls:Setting.ActionContent>
                             <ToggleSwitch IsOn="{x:Bind Mode=TwoWay, Path=ViewModel.RestoreFlagsOnLaunch}" x:Uid="ToggleSwitch"/>
                         </controls:Setting.ActionContent>