From 869602c90c59a3d3aabde2ac12689aaab8217689 Mon Sep 17 00:00:00 2001
From: Matt Cooley <macool@microsoft.com>
Date: Fri, 23 Sep 2022 11:41:54 -0700
Subject: [PATCH] More diff fixups

---
 .../CalculatorProgrammerRadixOperators.xaml   |  2 +-
 .../Views/CalculatorScientificOperators.xaml  | 56 ++++++++--------
 .../Views/CalculatorStandardOperators.xaml    | 22 +++----
 src/Calculator/Views/DateCalculator.xaml      |  6 +-
 .../GraphingCalculator/EquationInputArea.xaml | 24 +++----
 .../GraphingCalculator.xaml                   | 28 ++++----
 .../GraphingCalculator/GraphingNumPad.xaml    | 66 +++++++++----------
 .../KeyGraphFeaturesPanel.xaml                |  4 +-
 src/Calculator/Views/HistoryList.xaml         |  6 +-
 src/Calculator/Views/MainPage.xaml            |  2 +-
 src/Calculator/Views/Memory.xaml              |  8 +--
 src/Calculator/Views/MemoryListItem.xaml      |  6 +-
 src/Calculator/Views/Settings.xaml            |  4 +-
 src/Calculator/Views/TitleBar.xaml            |  2 +-
 src/Calculator/Views/UnitConverter.xaml       |  6 +-
 15 files changed, 121 insertions(+), 121 deletions(-)

diff --git a/src/Calculator/Views/CalculatorProgrammerRadixOperators.xaml b/src/Calculator/Views/CalculatorProgrammerRadixOperators.xaml
index d7f1e105..89730bef 100644
--- a/src/Calculator/Views/CalculatorProgrammerRadixOperators.xaml
+++ b/src/Calculator/Views/CalculatorProgrammerRadixOperators.xaml
@@ -237,7 +237,7 @@
                                           Style="{StaticResource OperatorPanelButtonStyle}"
                                           AutomationProperties.AutomationId="bitwiseButton"
                                           AutomationProperties.Name="{utils:ResourceString Name=bitwiseButton/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}"
-                                          Glyph=""
+                                          Glyph="&#xF895;"
                                           Text="{utils:ResourceString Name=bitwiseButton/Text}">
                 <controls:OperatorPanelButton.FlyoutMenu>
                     <Flyout x:Name="BitwiseFlyout"
diff --git a/src/Calculator/Views/CalculatorScientificOperators.xaml b/src/Calculator/Views/CalculatorScientificOperators.xaml
index a4fe7164..12478c7f 100644
--- a/src/Calculator/Views/CalculatorScientificOperators.xaml
+++ b/src/Calculator/Views/CalculatorScientificOperators.xaml
@@ -815,7 +815,7 @@
                                           Style="{StaticResource OperatorPanelButtonStyle}"
                                           AutomationProperties.AutomationId="funcButton"
                                           AutomationProperties.Name="{utils:ResourceString Name=funcButton/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}"
-                                          Glyph=""
+                                          Glyph="&#xF893;"
                                           Text="{utils:ResourceString Name=funcButton/Text}">
 
                 <controls:OperatorPanelButton.FlyoutMenu>
@@ -845,7 +845,7 @@
                                                        ButtonId="Abs"
                                                        Click="FlyoutButton_Clicked"
                                                        Command="{x:Bind Model.ButtonPressed}"
-                                                       Content=""
+                                                       Content="&#xF884;"
                                                        IsEnabled="{x:Bind FuncButton.IsEnabled, Mode=OneWay}"/>
 
                             <controls:CalculatorButton x:Name="FloorButton"
@@ -857,7 +857,7 @@
                                                        ButtonId="Floor"
                                                        Click="FlyoutButton_Clicked"
                                                        Command="{x:Bind Model.ButtonPressed}"
-                                                       Content=""
+                                                       Content="&#xF885;"
                                                        IsEnabled="{x:Bind FuncButton.IsEnabled, Mode=OneWay}"/>
 
                             <controls:CalculatorButton x:Name="CeilButton"
@@ -869,7 +869,7 @@
                                                        ButtonId="Ceil"
                                                        Click="FlyoutButton_Clicked"
                                                        Command="{x:Bind Model.ButtonPressed}"
-                                                       Content=""
+                                                       Content="&#xF886;"
                                                        IsEnabled="{x:Bind FuncButton.IsEnabled, Mode=OneWay}"/>
 
                             <controls:CalculatorButton x:Name="RandButton"
@@ -895,7 +895,7 @@
                                                        ButtonId="DMS"
                                                        Click="FlyoutButton_Clicked"
                                                        Command="{x:Bind Model.ButtonPressed}"
-                                                       Content=""
+                                                       Content="&#xF890;"
                                                        IsEnabled="{x:Bind FuncButton.IsEnabled, Mode=OneWay}"/>
 
                             <controls:CalculatorButton x:Name="DegreesButton"
@@ -907,7 +907,7 @@
                                                        ButtonId="Degrees"
                                                        Click="FlyoutButton_Clicked"
                                                        Command="{x:Bind Model.ButtonPressed}"
-                                                       Content=""
+                                                       Content="&#xF891;"
                                                        IsEnabled="{x:Bind FuncButton.IsEnabled, Mode=OneWay}"/>
                         </Grid>
                     </Flyout>
@@ -924,7 +924,7 @@
                       AutomationProperties.AutomationId="shiftButton"
                       AutomationProperties.Name="{utils:ResourceString Name=shiftButton/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}"
                       Checked="ShiftButton_Check"
-                      Content=""
+                      Content="&#xF897;"
                       IsEnabledChanged="ShiftButton_IsEnabledChanged"
                       Unchecked="ShiftButton_Check"/>
 
@@ -937,7 +937,7 @@
                                    AutomationProperties.AutomationId="piButton"
                                    AutomationProperties.Name="{utils:ResourceString Name=piButton/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}"
                                    ButtonId="Pi"
-                                   Content=""/>
+                                   Content="&#xf7cf;"/>
 
         <controls:CalculatorButton x:Name="EulerButton"
                                    Grid.Row="1"
@@ -993,7 +993,7 @@
                                        AutomationProperties.AutomationId="backSpaceButton"
                                        AutomationProperties.Name="{utils:ResourceString Name=backSpaceButton/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}"
                                        ButtonId="Backspace"
-                                       Content=""/>
+                                       Content="&#xE94F;"/>
         </Grid>
 
         <Grid Grid.Row="2"
@@ -1017,7 +1017,7 @@
                                            AutomationProperties.AutomationId="xpower2Button"
                                            AutomationProperties.Name="{utils:ResourceString Name=xpower2Button/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}"
                                            ButtonId="XPower2"
-                                           Content=""/>
+                                           Content="&#xf7c8;"/>
 
                 <controls:CalculatorButton x:Name="SquareRootButton"
                                            Grid.Row="1"
@@ -1026,7 +1026,7 @@
                                            AutomationProperties.AutomationId="squareRootButton"
                                            AutomationProperties.Name="{utils:ResourceString Name=squareRootButton/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}"
                                            ButtonId="Sqrt"
-                                           Content=""/>
+                                           Content="&#xF899;"/>
 
                 <controls:CalculatorButton x:Name="PowerButton"
                                            Grid.Row="2"
@@ -1037,7 +1037,7 @@
                                            AutomationProperties.AutomationId="powerButton"
                                            AutomationProperties.Name="{utils:ResourceString Name=powerButton/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}"
                                            ButtonId="XPowerY"
-                                           Content=""/>
+                                           Content="&#xf7ca;"/>
 
                 <controls:CalculatorButton x:Name="PowerOf10Button"
                                            Grid.Row="3"
@@ -1046,7 +1046,7 @@
                                            AutomationProperties.AutomationId="powerOf10Button"
                                            AutomationProperties.Name="{utils:ResourceString Name=powerOf10Button/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}"
                                            ButtonId="TenPowerX"
-                                           Content=""/>
+                                           Content="&#xF7CC;"/>
 
                 <controls:CalculatorButton x:Name="LogBase10Button"
                                            Grid.Row="4"
@@ -1084,7 +1084,7 @@
                                            AutomationProperties.Name="{utils:ResourceString Name=xpower3Button/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}"
                                            ButtonId="Cube"
                                            Click="ShiftButton_Uncheck"
-                                           Content=""/>
+                                           Content="&#xf7cb;"/>
 
                 <controls:CalculatorButton x:Name="CubeRootButton"
                                            Grid.Row="1"
@@ -1094,7 +1094,7 @@
                                            AutomationProperties.Name="{utils:ResourceString Name=cubeRootButton/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}"
                                            ButtonId="CubeRoot"
                                            Click="ShiftButton_Uncheck"
-                                           Content=""/>
+                                           Content="&#xF881;"/>
 
                 <controls:CalculatorButton x:Name="YSquareRootButton"
                                            Grid.Row="2"
@@ -1105,7 +1105,7 @@
                                            AutomationProperties.Name="{utils:ResourceString Name=ySquareRootButton/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}"
                                            ButtonId="YRootX"
                                            Click="ShiftButton_Uncheck"
-                                           Content=""/>
+                                           Content="&#xf7cd;"/>
 
                 <controls:CalculatorButton x:Name="TwoPowerXButton"
                                            Grid.Row="3"
@@ -1115,7 +1115,7 @@
                                            AutomationProperties.Name="{utils:ResourceString Name=twoPowerXButton/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}"
                                            ButtonId="TwoPowerX"
                                            Click="ShiftButton_Uncheck"
-                                           Content=""/>
+                                           Content="&#xF882;"/>
 
                 <controls:CalculatorButton x:Name="LogBaseY"
                                            Grid.Row="4"
@@ -1125,7 +1125,7 @@
                                            AutomationProperties.Name="{utils:ResourceString Name=logBaseY/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}"
                                            ButtonId="LogBaseY"
                                            Click="ShiftButton_Uncheck"
-                                           Content=""/>
+                                           Content="&#xF883;"/>
 
                 <controls:CalculatorButton x:Name="PowerOfEButton"
                                            Grid.Row="5"
@@ -1135,7 +1135,7 @@
                                            AutomationProperties.Name="{utils:ResourceString Name=powerOfEButton/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}"
                                            ButtonId="EPowerX"
                                            Click="ShiftButton_Uncheck"
-                                           Content=""/>
+                                           Content="&#xf7ce;"/>
             </Grid>
         </Grid>
         <!-- Scientific Row 2 -->
@@ -1156,7 +1156,7 @@
                                        AutomationProperties.AutomationId="invertButton"
                                        AutomationProperties.Name="{utils:ResourceString Name=invertButton/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}"
                                        ButtonId="Invert"
-                                       Content=""/>
+                                       Content="&#xf7c9;"/>
 
             <controls:CalculatorButton x:Name="AbsButton"
                                        Grid.Column="1"
@@ -1165,7 +1165,7 @@
                                        AutomationProperties.AutomationId="absButton"
                                        AutomationProperties.Name="{utils:ResourceString Name=absButton/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}"
                                        ButtonId="Abs"
-                                       Content=""/>
+                                       Content="&#xF884;"/>
 
             <controls:CalculatorButton x:Name="ExpButton"
                                        Grid.Column="2"
@@ -1220,7 +1220,7 @@
                                    AutomationProperties.AutomationId="factorialButton"
                                    AutomationProperties.Name="{utils:ResourceString Name=factorialButton/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}"
                                    ButtonId="Factorial"
-                                   Content=""/>
+                                   Content="&#xF887;"/>
 
         <Grid x:Name="StandardOperators"
               Grid.Row="3"
@@ -1243,7 +1243,7 @@
                                        AutomationProperties.AutomationId="divideButton"
                                        AutomationProperties.Name="{utils:ResourceString Name=divideButton/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}"
                                        ButtonId="Divide"
-                                       Content=""/>
+                                       Content="&#xE94A;"/>
 
             <controls:CalculatorButton x:Name="MultiplyButton"
                                        Grid.Row="1"
@@ -1253,7 +1253,7 @@
                                        AutomationProperties.AutomationId="multiplyButton"
                                        AutomationProperties.Name="{utils:ResourceString Name=multiplyButton/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}"
                                        ButtonId="Multiply"
-                                       Content=""/>
+                                       Content="&#xE947;"/>
 
             <controls:CalculatorButton x:Name="MinusButton"
                                        Grid.Row="2"
@@ -1263,7 +1263,7 @@
                                        AutomationProperties.AutomationId="minusButton"
                                        AutomationProperties.Name="{utils:ResourceString Name=minusButton/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}"
                                        ButtonId="Subtract"
-                                       Content=""/>
+                                       Content="&#xE949;"/>
 
             <controls:CalculatorButton x:Name="PlusButton"
                                        Grid.Row="3"
@@ -1273,7 +1273,7 @@
                                        AutomationProperties.AutomationId="plusButton"
                                        AutomationProperties.Name="{utils:ResourceString Name=plusButton/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}"
                                        ButtonId="Add"
-                                       Content=""/>
+                                       Content="&#xE948;"/>
 
             <controls:CalculatorButton x:Name="EqualButton"
                                        Grid.Row="4"
@@ -1283,7 +1283,7 @@
                                        AutomationProperties.AutomationId="equalButton"
                                        AutomationProperties.Name="{utils:ResourceString Name=equalButton/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}"
                                        ButtonId="Equals"
-                                       Content=""/>
+                                       Content="&#xE94E;"/>
         </Grid>
 
         <controls:CalculatorButton x:Name="NegateButton"
@@ -1296,7 +1296,7 @@
                                    AutomationProperties.AutomationId="negateButton"
                                    AutomationProperties.Name="{utils:ResourceString Name=negateButton/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}"
                                    ButtonId="Negate"
-                                   Content=""
+                                   Content="&#xF898;"
                                    IsEnabled="{x:Bind Model.IsNegateEnabled, Mode=OneWay}"/>
 
         <local:NumberPad x:Name="NumberPad"
diff --git a/src/Calculator/Views/CalculatorStandardOperators.xaml b/src/Calculator/Views/CalculatorStandardOperators.xaml
index 33507fe2..ac54b954 100644
--- a/src/Calculator/Views/CalculatorStandardOperators.xaml
+++ b/src/Calculator/Views/CalculatorStandardOperators.xaml
@@ -189,7 +189,7 @@
                                        AutomationProperties.AutomationId="percentButton"
                                        AutomationProperties.Name="{utils:ResourceString Name=percentButton/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}"
                                        ButtonId="Percent"
-                                       Content=""/>
+                                       Content="&#xE94C;"/>
             <controls:CalculatorButton x:Name="ClearEntryButton"
                                        Grid.Column="1"
                                        Style="{StaticResource OperatorButtonStyle}"
@@ -216,7 +216,7 @@
                                        AutomationProperties.AutomationId="backSpaceButton"
                                        AutomationProperties.Name="{utils:ResourceString Name=backSpaceButton/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}"
                                        ButtonId="Backspace"
-                                       Content=""/>
+                                       Content="&#xE94F;"/>
         </Grid>
 
         <Grid x:Name="StandardFunctions"
@@ -245,7 +245,7 @@
                                        AutomationProperties.AutomationId="invertButton"
                                        AutomationProperties.Name="{utils:ResourceString Name=invertButton/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}"
                                        ButtonId="Invert"
-                                       Content=""/>
+                                       Content="&#xf7c9;"/>
             <controls:CalculatorButton x:Name="XPower2Button"
                                        Grid.Column="1"
                                        Style="{StaticResource SymbolOperatorButtonStyle}"
@@ -254,7 +254,7 @@
                                        AutomationProperties.AutomationId="xpower2Button"
                                        AutomationProperties.Name="{utils:ResourceString Name=xpower2Button/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}"
                                        ButtonId="XPower2"
-                                       Content=""/>
+                                       Content="&#xf7c8;"/>
             <controls:CalculatorButton x:Name="SquareRootButton"
                                        Grid.Column="2"
                                        Style="{StaticResource SymbolOperatorButtonStyle}"
@@ -262,7 +262,7 @@
                                        AutomationProperties.AutomationId="squareRootButton"
                                        AutomationProperties.Name="{utils:ResourceString Name=squareRootButton/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}"
                                        ButtonId="Sqrt"
-                                       Content=""/>
+                                       Content="&#xF899;"/>
         </Grid>
 
         <Grid x:Name="StandardOperators"
@@ -286,7 +286,7 @@
                                        AutomationProperties.AutomationId="divideButton"
                                        AutomationProperties.Name="{utils:ResourceString Name=divideButton/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}"
                                        ButtonId="Divide"
-                                       Content=""/>
+                                       Content="&#xE94A;"/>
             <controls:CalculatorButton x:Name="MultiplyButton"
                                        Grid.Row="1"
                                        Style="{StaticResource SymbolOperatorButtonStyle}"
@@ -295,7 +295,7 @@
                                        AutomationProperties.AutomationId="multiplyButton"
                                        AutomationProperties.Name="{utils:ResourceString Name=multiplyButton/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}"
                                        ButtonId="Multiply"
-                                       Content=""/>
+                                       Content="&#xE947;"/>
             <controls:CalculatorButton x:Name="MinusButton"
                                        Grid.Row="2"
                                        Style="{StaticResource SymbolOperatorButtonStyle}"
@@ -304,7 +304,7 @@
                                        AutomationProperties.AutomationId="minusButton"
                                        AutomationProperties.Name="{utils:ResourceString Name=minusButton/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}"
                                        ButtonId="Subtract"
-                                       Content=""/>
+                                       Content="&#xE949;"/>
             <controls:CalculatorButton x:Name="PlusButton"
                                        Grid.Row="3"
                                        Style="{StaticResource SymbolOperatorButtonStyle}"
@@ -313,7 +313,7 @@
                                        AutomationProperties.AutomationId="plusButton"
                                        AutomationProperties.Name="{utils:ResourceString Name=plusButton/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}"
                                        ButtonId="Add"
-                                       Content=""/>
+                                       Content="&#xE948;"/>
             <controls:CalculatorButton x:Name="EqualButton"
                                        Grid.Row="4"
                                        Style="{StaticResource AccentEmphasizedCalcButtonStyle}"
@@ -322,7 +322,7 @@
                                        AutomationProperties.AutomationId="equalButton"
                                        AutomationProperties.Name="{utils:ResourceString Name=equalButton/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}"
                                        ButtonId="Equals"
-                                       Content=""/>
+                                       Content="&#xE94E;"/>
         </Grid>
 
         <local:NumberPad x:Name="NumberPad"
@@ -343,6 +343,6 @@
                                    AutomationProperties.AutomationId="negateButton"
                                    AutomationProperties.Name="{utils:ResourceString Name=negateButton/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}"
                                    ButtonId="Negate"
-                                   Content=""/>
+                                   Content="&#xF898;"/>
     </Grid>
 </UserControl>
diff --git a/src/Calculator/Views/DateCalculator.xaml b/src/Calculator/Views/DateCalculator.xaml
index f3a24fe3..3d088ab6 100644
--- a/src/Calculator/Views/DateCalculator.xaml
+++ b/src/Calculator/Views/DateCalculator.xaml
@@ -311,7 +311,7 @@
                                           Foreground="{ThemeResource TextFillColorPrimaryBrush}"
                                           FontFamily="{ThemeResource CalculatorFontFamily}"
                                           FontSize="16"
-                                          Glyph=""/>
+                                          Glyph="&#xE787;"/>
                                 <contract7Present:ContentPresenter x:Name="DescriptionPresenter"
                                                                    Grid.Row="2"
                                                                    Grid.Column="1"
@@ -822,7 +822,7 @@
                                                 FontSize="8"
                                                 contract7Present:BackgroundSizing="InnerBorderEdge"
                                                 contract7Present:CornerRadius="{StaticResource ControlCornerRadius}"
-                                                Content=""
+                                                Content="&#xEDDB;"
                                                 IsTabStop="True"
                                                 IsEnabled="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.HasMoreContentBefore}"/>
                                         <Button x:Name="NextButton"
@@ -834,7 +834,7 @@
                                                 FontSize="8"
                                                 contract7Present:BackgroundSizing="InnerBorderEdge"
                                                 contract7Present:CornerRadius="{StaticResource ControlCornerRadius}"
-                                                Content=""
+                                                Content="&#xEDDC;"
                                                 IsTabStop="True"
                                                 IsEnabled="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.HasMoreContentAfter}"/>
                                     </Grid>
diff --git a/src/Calculator/Views/GraphingCalculator/EquationInputArea.xaml b/src/Calculator/Views/GraphingCalculator/EquationInputArea.xaml
index 2db1a444..a14e5b4f 100644
--- a/src/Calculator/Views/GraphingCalculator/EquationInputArea.xaml
+++ b/src/Calculator/Views/GraphingCalculator/EquationInputArea.xaml
@@ -497,7 +497,7 @@
                                                             Background="Transparent"
                                                             FlowDirection="LeftToRight"
                                                             Orientation="Horizontal">
-                                                    <FontIcon FontFamily="{StaticResource CalculatorFontFamily}" Glyph=""/>
+                                                    <FontIcon FontFamily="{StaticResource CalculatorFontFamily}" Glyph="&#xF893;"/>
                                                     <TextBlock x:Name="FunctionNumberLabelTextBlock"
                                                                Margin="-5,19,0,0"
                                                                FontSize="11"
@@ -588,7 +588,7 @@
                                                                                     <Setter Target="Overlay.Opacity" Value="{StaticResource EquationButtonOverlayPointerOverOpacity}"/>
                                                                                     <Setter Target="ContentPresenter.Visibility" Value="Collapsed"/>
                                                                                     <Setter Target="ShowHideIcon.Visibility" Value="Visible"/>
-                                                                                    <Setter Target="ShowHideIcon.Glyph" Value=""/>
+                                                                                    <Setter Target="ShowHideIcon.Glyph" Value="&#xF6AC;"/>
                                                                                 </VisualState.Setters>
                                                                             </VisualState>
                                                                             <VisualState x:Name="Pressed">
@@ -599,7 +599,7 @@
                                                                                     <Setter Target="ShowHideIcon.Foreground" Value="{ThemeResource ToggleButtonForegroundPressed}"/>
                                                                                     <Setter Target="ContentPresenter.Visibility" Value="Collapsed"/>
                                                                                     <Setter Target="ShowHideIcon.Visibility" Value="Visible"/>
-                                                                                    <Setter Target="ShowHideIcon.Glyph" Value=""/>
+                                                                                    <Setter Target="ShowHideIcon.Glyph" Value="&#xF6AC;"/>
                                                                                 </VisualState.Setters>
                                                                             </VisualState>
                                                                             <VisualState x:Name="Checked">
@@ -617,7 +617,7 @@
                                                                                     <Setter Target="Overlay.Opacity" Value="{StaticResource EquationButtonOverlayPointerOverOpacity}"/>
                                                                                     <Setter Target="ContentPresenter.Visibility" Value="Collapsed"/>
                                                                                     <Setter Target="ShowHideIcon.Visibility" Value="Visible"/>
-                                                                                    <Setter Target="ShowHideIcon.Glyph" Value=""/>
+                                                                                    <Setter Target="ShowHideIcon.Glyph" Value="&#xE890;"/>
                                                                                 </VisualState.Setters>
                                                                             </VisualState>
                                                                             <VisualState x:Name="CheckedPressed">
@@ -628,7 +628,7 @@
                                                                                     <Setter Target="Overlay.Opacity" Value="{StaticResource EquationButtonOverlayPressedOpacity}"/>
                                                                                     <Setter Target="ContentPresenter.Visibility" Value="Collapsed"/>
                                                                                     <Setter Target="ShowHideIcon.Visibility" Value="Visible"/>
-                                                                                    <Setter Target="ShowHideIcon.Glyph" Value=""/>
+                                                                                    <Setter Target="ShowHideIcon.Glyph" Value="&#xE890;"/>
                                                                                 </VisualState.Setters>
                                                                             </VisualState>
                                                                         </VisualStateGroup>
@@ -684,17 +684,17 @@
                                                     <MenuFlyoutSeparator/>
                                                     <MenuFlyoutItem x:Name="FunctionAnalysisMenuItem">
                                                         <MenuFlyoutItem.Icon>
-                                                            <FontIcon FontFamily="{StaticResource CalculatorFontFamily}" Glyph=""/>
+                                                            <FontIcon FontFamily="{StaticResource CalculatorFontFamily}" Glyph="&#xE945;"/>
                                                         </MenuFlyoutItem.Icon>
                                                     </MenuFlyoutItem>
                                                     <MenuFlyoutItem x:Name="ChangeFunctionStyleMenuItem">
                                                         <MenuFlyoutItem.Icon>
-                                                            <FontIcon FontFamily="{StaticResource CalculatorFontFamily}" Glyph=""/>
+                                                            <FontIcon FontFamily="{StaticResource CalculatorFontFamily}" Glyph="&#xE790;"/>
                                                         </MenuFlyoutItem.Icon>
                                                     </MenuFlyoutItem>
                                                     <MenuFlyoutItem x:Name="RemoveFunctionMenuItem">
                                                         <MenuFlyoutItem.Icon>
-                                                            <FontIcon FontFamily="{StaticResource CalculatorFontFamily}" Glyph=""/>
+                                                            <FontIcon FontFamily="{StaticResource CalculatorFontFamily}" Glyph="&#xECC9;"/>
                                                         </MenuFlyoutItem.Icon>
                                                     </MenuFlyoutItem>
                                                 </MenuFlyout>
@@ -711,7 +711,7 @@
                                                 FontFamily="{StaticResource CalculatorFontFamily}"
                                                 AutomationProperties.AccessibilityView="Raw"
                                                 AutomationProperties.Name="{utils:ResourceString Name=functionAnalysisButton/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}"
-                                                Content=""
+                                                Content="&#xE945;"
                                                 IsTabStop="False"
                                                 ToolTipService.ToolTip="{utils:ResourceString Name=functionAnalysisButton/[using:Windows.UI.Xaml.Controls]ToolTipService/ToolTip}"
                                                 Visibility="Collapsed"/>
@@ -725,7 +725,7 @@
                                                       FontFamily="{StaticResource CalculatorFontFamily}"
                                                       AutomationProperties.AccessibilityView="Raw"
                                                       AutomationProperties.Name="{utils:ResourceString Name=colorChooserButton/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}"
-                                                      Content=""
+                                                      Content="&#xE790;"
                                                       IsTabStop="False"
                                                       ToolTipService.ToolTip="{utils:ResourceString Name=colorChooserButton/[using:Windows.UI.Xaml.Controls]ToolTipService/ToolTip}"
                                                       Visibility="Collapsed">
@@ -765,7 +765,7 @@
                                                   FontFamily="{ThemeResource CalculatorFontFamily}"
                                                   FontSize="16"
                                                   AutomationProperties.AccessibilityView="Raw"
-                                                  Glyph=""
+                                                  Glyph="&#xF736;"
                                                   ToolTipService.ToolTip="{TemplateBinding ErrorText}"
                                                   Visibility="Collapsed"/>
                                         <Grid x:Name="RemoveButtonPanel" Grid.Column="5">
@@ -794,7 +794,7 @@
                                                 FontFamily="{ThemeResource CalculatorFontFamily}"
                                                 FontSize="12"
                                                 AutomationProperties.AccessibilityView="Raw"
-                                                Content=""
+                                                Content="&#xE947;"
                                                 IsTabStop="False"
                                                 Visibility="Collapsed"/>
                                     </Grid>
diff --git a/src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml b/src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml
index b2388cb0..e1fab359 100644
--- a/src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml
+++ b/src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml
@@ -1,6 +1,7 @@
 <UserControl x:Class="CalculatorApp.GraphingCalculator"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:common="using:CalculatorApp.Common"
              xmlns:contract7NotPresent="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,7)"
              xmlns:contract7Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,7)"
              xmlns:contract8Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract, 8)"
@@ -215,7 +216,7 @@
                                                   Foreground="{ThemeResource ToggleSwitchIconOnBrush}"
                                                   FontFamily="{StaticResource CalculatorFontFamily}"
                                                   FontSize="14"
-                                                  Glyph=""/>
+                                                  Glyph="&#xF770;"/>
                                         <Grid Margin="-2,0,2,0"
                                               VerticalAlignment="Center"
                                               FlowDirection="LeftToRight">
@@ -224,7 +225,7 @@
                                                       Foreground="{ThemeResource ToggleSwitchIconOffBrush}"
                                                       FontFamily="{StaticResource CalculatorFontFamily}"
                                                       FontSize="12"
-                                                      Glyph=""/>
+                                                      Glyph="&#xF893;"/>
                                             <TextBlock x:Name="EquationsIconX"
                                                        Margin="0,8,-1,0"
                                                        HorizontalAlignment="Right"
@@ -245,13 +246,13 @@
                                                   Foreground="{ThemeResource ToggleSwitchIconOffBrush}"
                                                   FontFamily="{StaticResource CalculatorFontFamily}"
                                                   FontSize="14"
-                                                  Glyph=""/>
+                                                  Glyph="&#xF770;"/>
                                         <Grid Margin="-2,0,2,0" VerticalAlignment="Center">
                                             <FontIcon VerticalAlignment="Center"
                                                       Foreground="{ThemeResource ToggleSwitchIconOnBrush}"
                                                       FontFamily="{StaticResource CalculatorFontFamily}"
                                                       FontSize="12"
-                                                      Glyph=""/>
+                                                      Glyph="&#xF893;"/>
                                             <TextBlock Margin="0,8,-1,0"
                                                        HorizontalAlignment="Right"
                                                        VerticalAlignment="Bottom"
@@ -636,7 +637,7 @@
                         </ToolTipService.ToolTip>
                         <FontIcon FontFamily="{StaticResource CalculatorFontFamily}"
                                   FontSize="16"
-                                  Glyph=""/>
+                                  Glyph="&#xE3B3;"/>
                     </ToggleButton>
 
                     <Button MinWidth="32"
@@ -648,7 +649,7 @@
                             ToolTipService.ToolTip="{utils:ResourceString Name=shareButton/[using:Windows.UI.Xaml.Controls]ToolTipService/ToolTip}">
                         <FontIcon FontFamily="{StaticResource CalculatorFontFamily}"
                                   FontSize="16"
-                                  Glyph=""/>
+                                  Glyph="&#xE72D;"/>
                     </Button>
 
                     <Button x:Name="GraphSettingsButton"
@@ -661,7 +662,7 @@
                             ToolTipService.ToolTip="{utils:ResourceString Name=graphSettingsButton/[using:Windows.UI.Xaml.Controls]ToolTipService/ToolTip}">
                         <FontIcon FontFamily="{StaticResource CalculatorFontFamily}"
                                   FontSize="16"
-                                  Glyph=""/>
+                                  Glyph="&#xE3B4;"/>
                     </Button>
                 </StackPanel>
             </Border>
@@ -715,7 +716,7 @@
                                   ToolTipService.ToolTip="{utils:ResourceString Name=zoomInButton/[using:Windows.UI.Xaml.Controls]ToolTipService/ToolTip}">
                         <FontIcon FontFamily="{StaticResource CalculatorFontFamily}"
                                   FontSize="14"
-                                  Glyph=""/>
+                                  Glyph="&#xE948;"/>
                         <RepeatButton.KeyboardAccelerators>
                             <KeyboardAccelerator Key="Add" Modifiers="Control"/>
                         </RepeatButton.KeyboardAccelerators>
@@ -734,18 +735,17 @@
                                   ToolTipService.ToolTip="{utils:ResourceString Name=zoomOutButton/[using:Windows.UI.Xaml.Controls]ToolTipService/ToolTip}">
                         <FontIcon FontFamily="{StaticResource CalculatorFontFamily}"
                                   FontSize="14"
-                                  Glyph=""/>
+                                  Glyph="&#xE949;"/>
                         <RepeatButton.KeyboardAccelerators>
                             <KeyboardAccelerator Key="Subtract" Modifiers="Control"/>
                         </RepeatButton.KeyboardAccelerators>
                     </RepeatButton>
 
-                    <ToggleButton xmlns:d6p1="using:CalculatorApp.Common"
-                                  MinHeight="32"
+                    <ToggleButton MinHeight="32"
                                   Margin="4"
                                   Style="{ThemeResource ThemedGraphViewToggleButtonStyle}"
+                                  common:KeyboardShortcutManager.VirtualKeyControlChord="{utils:ResourceVirtualKey Name=graphViewButton/[using:CalculatorApp.Common]KeyboardShortcutManager/VirtualKeyControlChord}"
                                   contract7Present:CornerRadius="{ThemeResource ControlCornerRadius}"
-                                  d6p1:KeyboardShortcutManager.VirtualKeyControlChord="{utils:ResourceVirtualKey Name=graphViewButton/[using:CalculatorApp.Common]KeyboardShortcutManager/VirtualKeyControlChord}"
                                   AutomationProperties.AutomationId="graphViewButton"
                                   AutomationProperties.Name="{utils:ResourceString Name=graphViewButton/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}"
                                   Click="GraphViewButton_Click"
@@ -755,10 +755,10 @@
                             <Grid>
                                 <FontIcon FontFamily="{StaticResource CalculatorFontFamily}"
                                           FontSize="14"
-                                          Glyph=""/>
+                                          Glyph="&#xE45E;"/>
                                 <FontIcon FontFamily="{StaticResource CalculatorFontFamily}"
                                           FontSize="14"
-                                          Glyph=""
+                                          Glyph="&#xE45D;"
                                           Visibility="{x:Bind IsManualAdjustment, Mode=OneWay, Converter={StaticResource BooleanToVisibilityNegationConverter}}"/>
                             </Grid>
                         </ToggleButton.Content>
diff --git a/src/Calculator/Views/GraphingCalculator/GraphingNumPad.xaml b/src/Calculator/Views/GraphingCalculator/GraphingNumPad.xaml
index 9815108f..39bfca42 100644
--- a/src/Calculator/Views/GraphingCalculator/GraphingNumPad.xaml
+++ b/src/Calculator/Views/GraphingCalculator/GraphingNumPad.xaml
@@ -401,7 +401,7 @@
                                               AutomationProperties.AutomationId="trigShiftButton"
                                               AutomationProperties.Name="{utils:ResourceString Name=trigShiftButton/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}"
                                               Checked="TrigFlyoutShift_Toggle"
-                                              Content=""
+                                              Content="&#xF897;"
                                               IsTabStop="false"
                                               Unchecked="TrigFlyoutShift_Toggle"
                                               IsEnabled="{x:Bind TrigButton.IsEnabled, Mode=OneWay}"/>
@@ -780,7 +780,7 @@
                                               Style="{StaticResource OperatorPanelButtonStyle}"
                                               AutomationProperties.AutomationId="inequalityButton"
                                               AutomationProperties.Name="{utils:ResourceString Name=inequalityButton/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}"
-                                              Glyph=""
+                                              Glyph="&#xF894;"
                                               IsTabStop="false"
                                               Text="{utils:ResourceString Name=inequalityButton/Text}">
                     <controls:OperatorPanelButton.FlyoutMenu>
@@ -812,7 +812,7 @@
                                                            AutomationProperties.Name="{utils:ResourceString Name=lessThanFlyoutButton/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}"
                                                            ButtonId="LessThan"
                                                            Click="FlyoutButton_Clicked"
-                                                           Content=""
+                                                           Content="&#xF88A;"
                                                            IsTabStop="false"
                                                            IsEnabled="{x:Bind InequalityButton.IsEnabled, Mode=OneWay}"/>
 
@@ -823,7 +823,7 @@
                                                            AutomationProperties.Name="{utils:ResourceString Name=lessThanOrEqualFlyoutButton/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}"
                                                            ButtonId="LessThanOrEqualTo"
                                                            Click="FlyoutButton_Clicked"
-                                                           Content=""
+                                                           Content="&#xF88B;"
                                                            IsTabStop="false"
                                                            IsEnabled="{x:Bind InequalityButton.IsEnabled, Mode=OneWay}"/>
 
@@ -834,7 +834,7 @@
                                                            AutomationProperties.Name="{utils:ResourceString Name=equalsFlyoutButton/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}"
                                                            ButtonId="Equals"
                                                            Click="FlyoutButton_Clicked"
-                                                           Content=""
+                                                           Content="&#xE94E;"
                                                            IsTabStop="false"
                                                            IsEnabled="{x:Bind InequalityButton.IsEnabled, Mode=OneWay}"/>
 
@@ -845,7 +845,7 @@
                                                            AutomationProperties.Name="{utils:ResourceString Name=greaterThanOrEqualFlyoutButton/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}"
                                                            ButtonId="GreaterThanOrEqualTo"
                                                            Click="FlyoutButton_Clicked"
-                                                           Content=""
+                                                           Content="&#xF88D;"
                                                            IsTabStop="false"
                                                            IsEnabled="{x:Bind InequalityButton.IsEnabled, Mode=OneWay}"/>
 
@@ -856,7 +856,7 @@
                                                            AutomationProperties.Name="{utils:ResourceString Name=greaterThanFlyoutButton/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}"
                                                            ButtonId="GreaterThan"
                                                            Click="FlyoutButton_Clicked"
-                                                           Content=""
+                                                           Content="&#xF88C;"
                                                            IsTabStop="false"
                                                            IsEnabled="{x:Bind InequalityButton.IsEnabled, Mode=OneWay}"/>
 
@@ -869,7 +869,7 @@
                                               Style="{StaticResource OperatorPanelButtonStyle}"
                                               AutomationProperties.AutomationId="funcButton"
                                               AutomationProperties.Name="{utils:ResourceString Name=funcButton/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}"
-                                              Glyph=""
+                                              Glyph="&#xF893;"
                                               IsTabStop="false"
                                               Text="{utils:ResourceString Name=funcButton/Text}">
 
@@ -900,7 +900,7 @@
                                                            AutomationProperties.Name="{utils:ResourceString Name=absButton/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}"
                                                            ButtonId="Abs"
                                                            Click="FlyoutButton_Clicked"
-                                                           Content=""
+                                                           Content="&#xF884;"
                                                            IsTabStop="false"
                                                            IsEnabled="{x:Bind FuncButton.IsEnabled, Mode=OneWay}"/>
 
@@ -912,7 +912,7 @@
                                                            AutomationProperties.Name="{utils:ResourceString Name=floorButton/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}"
                                                            ButtonId="Floor"
                                                            Click="FlyoutButton_Clicked"
-                                                           Content=""
+                                                           Content="&#xF885;"
                                                            IsTabStop="false"
                                                            IsEnabled="{x:Bind FuncButton.IsEnabled, Mode=OneWay}"/>
 
@@ -924,7 +924,7 @@
                                                            AutomationProperties.Name="{utils:ResourceString Name=ceilButton/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}"
                                                            ButtonId="Ceil"
                                                            Click="FlyoutButton_Clicked"
-                                                           Content=""
+                                                           Content="&#xF886;"
                                                            IsTabStop="false"
                                                            IsEnabled="{x:Bind FuncButton.IsEnabled, Mode=OneWay}"/>
                             </Grid>
@@ -941,7 +941,7 @@
                           AutomationProperties.AutomationId="shiftButton"
                           AutomationProperties.Name="{utils:ResourceString Name=shiftButton/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}"
                           Checked="ShiftButton_Check"
-                          Content=""
+                          Content="&#xF897;"
                           IsEnabledChanged="ShiftButton_IsEnabledChanged"
                           IsTabStop="false"
                           Unchecked="ShiftButton_Check"
@@ -957,7 +957,7 @@
                                        AutomationProperties.Name="{utils:ResourceString Name=piButton/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}"
                                        ButtonId="Pi"
                                        Click="Button_Clicked"
-                                       Content=""
+                                       Content="&#xf7cf;"
                                        IsTabStop="false"/>
 
             <controls:CalculatorButton x:Name="EulerButton"
@@ -1006,7 +1006,7 @@
                                            AutomationProperties.Name="{utils:ResourceString Name=backSpaceButton/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}"
                                            ButtonId="Backspace"
                                            Click="BackSpaceButton_Clicked"
-                                           Content=""
+                                           Content="&#xE94F;"
                                            IsTabStop="false"/>
             </Grid>
 
@@ -1032,7 +1032,7 @@
                                                AutomationProperties.Name="{utils:ResourceString Name=xpower2Button/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}"
                                                ButtonId="XPower2"
                                                Click="Button_Clicked"
-                                               Content=""
+                                               Content="&#xf7c8;"
                                                IsTabStop="false"/>
 
                     <controls:CalculatorButton x:Name="SquareRootButton"
@@ -1043,7 +1043,7 @@
                                                AutomationProperties.Name="{utils:ResourceString Name=squareRootButton/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}"
                                                ButtonId="Sqrt"
                                                Click="Button_Clicked"
-                                               Content=""
+                                               Content="&#xF899;"
                                                IsTabStop="false"/>
 
                     <controls:CalculatorButton x:Name="PowerButton"
@@ -1056,7 +1056,7 @@
                                                AutomationProperties.Name="{utils:ResourceString Name=powerButton/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}"
                                                ButtonId="XPowerY"
                                                Click="Button_Clicked"
-                                               Content=""
+                                               Content="&#xf7ca;"
                                                IsTabStop="false"/>
 
                     <controls:CalculatorButton x:Name="PowerOf10Button"
@@ -1067,7 +1067,7 @@
                                                AutomationProperties.Name="{utils:ResourceString Name=powerOf10Button/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}"
                                                ButtonId="TenPowerX"
                                                Click="Button_Clicked"
-                                               Content=""
+                                               Content="&#xF7CC;"
                                                IsTabStop="false"/>
 
                     <controls:CalculatorButton x:Name="LogBase10Button"
@@ -1111,7 +1111,7 @@
                                                AutomationProperties.Name="{utils:ResourceString Name=xpower3Button/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}"
                                                ButtonId="Cube"
                                                Click="ShiftButton_Uncheck"
-                                               Content=""
+                                               Content="&#xf7cb;"
                                                IsTabStop="false"/>
 
                     <controls:CalculatorButton x:Name="CubeRootButton"
@@ -1122,7 +1122,7 @@
                                                AutomationProperties.Name="{utils:ResourceString Name=cubeRootButton/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}"
                                                ButtonId="CubeRoot"
                                                Click="ShiftButton_Uncheck"
-                                               Content=""
+                                               Content="&#xF881;"
                                                IsTabStop="false"/>
 
                     <controls:CalculatorButton x:Name="YSquareRootButton"
@@ -1134,7 +1134,7 @@
                                                AutomationProperties.Name="{utils:ResourceString Name=ySquareRootButton/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}"
                                                ButtonId="YRootX"
                                                Click="ShiftButton_Uncheck"
-                                               Content=""
+                                               Content="&#xf7cd;"
                                                IsTabStop="false"/>
 
                     <controls:CalculatorButton x:Name="TwoPowerXButton"
@@ -1145,7 +1145,7 @@
                                                AutomationProperties.Name="{utils:ResourceString Name=twoPowerXButton/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}"
                                                ButtonId="TwoPowerX"
                                                Click="ShiftButton_Uncheck"
-                                               Content=""
+                                               Content="&#xF882;"
                                                IsTabStop="false"/>
 
                     <controls:CalculatorButton x:Name="LogBaseY"
@@ -1156,7 +1156,7 @@
                                                AutomationProperties.Name="{utils:ResourceString Name=logBaseY/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}"
                                                ButtonId="LogBaseY"
                                                Click="ShiftButton_Uncheck"
-                                               Content=""
+                                               Content="&#xF883;"
                                                IsTabStop="false"/>
 
                     <controls:CalculatorButton x:Name="PowerOfEButton"
@@ -1167,7 +1167,7 @@
                                                AutomationProperties.Name="{utils:ResourceString Name=powerOfEButton/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}"
                                                ButtonId="EPowerX"
                                                Click="ShiftButton_Uncheck"
-                                               Content=""
+                                               Content="&#xf7ce;"
                                                IsTabStop="false"/>
                 </Grid>
             </Grid>
@@ -1190,7 +1190,7 @@
                                            AutomationProperties.Name="{utils:ResourceString Name=invertButton/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}"
                                            ButtonId="Invert"
                                            Click="Button_Clicked"
-                                           Content=""
+                                           Content="&#xf7c9;"
                                            IsTabStop="false"/>
 
                 <controls:CalculatorButton x:Name="AbsButton"
@@ -1201,7 +1201,7 @@
                                            AutomationProperties.Name="{utils:ResourceString Name=absButton/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}"
                                            ButtonId="Abs"
                                            Click="Button_Clicked"
-                                           Content=""
+                                           Content="&#xF884;"
                                            IsTabStop="false"/>
 
                 <controls:CalculatorButton x:Name="XButton"
@@ -1265,7 +1265,7 @@
                                        AutomationProperties.Name="{utils:ResourceString Name=equalButton/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}"
                                        ButtonId="Equals"
                                        Click="Button_Clicked"
-                                       Content=""
+                                       Content="&#xE94E;"
                                        IsTabStop="false"/>
 
             <Grid x:Name="StandardOperators"
@@ -1290,7 +1290,7 @@
                                            AutomationProperties.Name="{utils:ResourceString Name=divideButton/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}"
                                            ButtonId="Divide"
                                            Click="Button_Clicked"
-                                           Content=""
+                                           Content="&#xE94A;"
                                            IsTabStop="false"/>
 
                 <controls:CalculatorButton x:Name="MultiplyButton"
@@ -1302,7 +1302,7 @@
                                            AutomationProperties.Name="{utils:ResourceString Name=multiplyButton/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}"
                                            ButtonId="Multiply"
                                            Click="Button_Clicked"
-                                           Content=""
+                                           Content="&#xE947;"
                                            IsTabStop="false"/>
 
                 <controls:CalculatorButton x:Name="MinusButton"
@@ -1314,7 +1314,7 @@
                                            AutomationProperties.Name="{utils:ResourceString Name=minusButton/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}"
                                            ButtonId="Subtract"
                                            Click="Button_Clicked"
-                                           Content=""
+                                           Content="&#xE949;"
                                            IsTabStop="false"/>
 
                 <controls:CalculatorButton x:Name="PlusButton"
@@ -1326,7 +1326,7 @@
                                            AutomationProperties.Name="{utils:ResourceString Name=plusButton/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}"
                                            ButtonId="Add"
                                            Click="Button_Clicked"
-                                           Content=""
+                                           Content="&#xE948;"
                                            IsTabStop="false"/>
 
                 <controls:CalculatorButton x:Name="SubmitButton"
@@ -1336,7 +1336,7 @@
                                            AutomationProperties.AutomationId="submitButton"
                                            AutomationProperties.Name="{utils:ResourceString Name=submitButton/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}"
                                            Click="SubmitButton_Clicked"
-                                           Content=""
+                                           Content="&#xE751;"
                                            IsTabStop="false"/>
             </Grid>
 
@@ -1351,7 +1351,7 @@
                                        AutomationProperties.Name="{utils:ResourceString Name=negateButton/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}"
                                        ButtonId="Negate"
                                        Click="Button_Clicked"
-                                       Content=""
+                                       Content="&#xE3B5;"
                                        IsTabStop="false"/>
 
             <controls:CalculatorButton x:Name="Num0Button"
diff --git a/src/Calculator/Views/GraphingCalculator/KeyGraphFeaturesPanel.xaml b/src/Calculator/Views/GraphingCalculator/KeyGraphFeaturesPanel.xaml
index 5238bd18..8c415dfa 100644
--- a/src/Calculator/Views/GraphingCalculator/KeyGraphFeaturesPanel.xaml
+++ b/src/Calculator/Views/GraphingCalculator/KeyGraphFeaturesPanel.xaml
@@ -251,9 +251,9 @@
                               VerticalAlignment="Center"
                               FontFamily="{StaticResource CalculatorFontFamily}"
                               FontSize="16"
-                              Glyph=""/>
+                              Glyph="&#xE72B;"/>
                     <StackPanel FlowDirection="LeftToRight" Orientation="Horizontal">
-                        <FontIcon FontFamily="{StaticResource CalculatorFontFamily}" Glyph=""/>
+                        <FontIcon FontFamily="{StaticResource CalculatorFontFamily}" Glyph="&#xF893;"/>
                         <TextBlock Margin="-5,19,0,0"
                                    FontSize="11"
                                    Text="{x:Bind ViewModel.FunctionLabelIndex}"/>
diff --git a/src/Calculator/Views/HistoryList.xaml b/src/Calculator/Views/HistoryList.xaml
index 6f863d69..8988c336 100644
--- a/src/Calculator/Views/HistoryList.xaml
+++ b/src/Calculator/Views/HistoryList.xaml
@@ -2,6 +2,7 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:automation="using:CalculatorApp.ViewModel.Common.Automation"
+             xmlns:common="using:CalculatorApp.Common"
              xmlns:converters="using:CalculatorApp.Converters"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:local="using:CalculatorApp"
@@ -164,11 +165,10 @@
                     </TransitionCollection>
                 </ListView.ItemContainerTransitions>
             </ListView>
-            <Button xmlns:d4p1="using:CalculatorApp.Common"
-                    x:Name="ClearHistory"
+            <Button x:Name="ClearHistory"
                     Grid.Row="1"
                     Style="{StaticResource ClearAllHistoryMemoryButtonStyle}"
-                    d4p1:KeyboardShortcutManager.VirtualKeyControlShiftChord="{utils:ResourceVirtualKey Name=ClearHistory/[using:CalculatorApp.Common]KeyboardShortcutManager/VirtualKeyControlShiftChord}"
+                    common:KeyboardShortcutManager.VirtualKeyControlShiftChord="{utils:ResourceVirtualKey Name=ClearHistory/[using:CalculatorApp.Common]KeyboardShortcutManager/VirtualKeyControlShiftChord}"
                     AccessKey="{utils:ResourceString Name=ClearHistory/AccessKey}"
                     AutomationProperties.AutomationId="ClearHistory"
                     AutomationProperties.Name="{utils:ResourceString Name=ClearHistory/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}"
diff --git a/src/Calculator/Views/MainPage.xaml b/src/Calculator/Views/MainPage.xaml
index dc5b1ac8..c2001c29 100644
--- a/src/Calculator/Views/MainPage.xaml
+++ b/src/Calculator/Views/MainPage.xaml
@@ -168,7 +168,7 @@
                             AutomationProperties.AutomationId="NormalAlwaysOnTopButton"
                             AutomationProperties.Name="{utils:ResourceString Name=EnterAlwaysOnTopButton/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}"
                             Click="AlwaysOnTopButtonClick"
-                            Content=""
+                            Content="&#xEE49;"
                             TabIndex="3"
                             ToolTipService.ToolTip="{utils:ResourceString Name=EnterAlwaysOnTopButton/[using:Windows.UI.Xaml.Controls]ToolTipService/ToolTip}"
                             Visibility="{x:Bind Model.DisplayNormalAlwaysOnTopOption, Mode=OneWay}">
diff --git a/src/Calculator/Views/Memory.xaml b/src/Calculator/Views/Memory.xaml
index ab354adc..4968a2c7 100644
--- a/src/Calculator/Views/Memory.xaml
+++ b/src/Calculator/Views/Memory.xaml
@@ -21,17 +21,17 @@
         <MenuFlyout x:Name="MemoryContextMenu">
             <MenuFlyoutItem Click="OnClearMenuItemClicked" Text="{utils:ResourceString Name=ClearMemoryMenuItem/Text}">
                 <MenuFlyoutItem.Icon>
-                    <FontIcon FontFamily="{StaticResource CalculatorFontFamily}" Glyph=""/>
+                    <FontIcon FontFamily="{StaticResource CalculatorFontFamily}" Glyph="&#xf754;"/>
                 </MenuFlyoutItem.Icon>
             </MenuFlyoutItem>
             <MenuFlyoutItem Click="OnMemoryAddMenuItemClicked" Text="{utils:ResourceString Name=MemPlusMenuItem/Text}">
                 <MenuFlyoutItem.Icon>
-                    <FontIcon FontFamily="{StaticResource CalculatorFontFamily}" Glyph=""/>
+                    <FontIcon FontFamily="{StaticResource CalculatorFontFamily}" Glyph="&#xf757;"/>
                 </MenuFlyoutItem.Icon>
             </MenuFlyoutItem>
             <MenuFlyoutItem Click="OnMemorySubtractMenuItemClicked" Text="{utils:ResourceString Name=MemMinusMenuItem/Text}">
                 <MenuFlyoutItem.Icon>
-                    <FontIcon FontFamily="{StaticResource CalculatorFontFamily}" Glyph=""/>
+                    <FontIcon FontFamily="{StaticResource CalculatorFontFamily}" Glyph="&#xf758;"/>
                 </MenuFlyoutItem.Icon>
             </MenuFlyoutItem>
         </MenuFlyout>
@@ -130,7 +130,7 @@
                     AutomationProperties.AutomationId="ClearMemory"
                     AutomationProperties.Name="{utils:ResourceString Name=ClearMemory/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}"
                     Command="{x:Bind Model.ClearMemoryCommand, Mode=OneWay}"
-                    Content=""
+                    Content="&#xE74D;"
                     ToolTipService.ToolTip="{utils:ResourceString Name=ClearMemory/[using:Windows.UI.Xaml.Controls]ToolTipService/ToolTip}"
                     Visibility="{x:Bind Model.IsMemoryEmpty, Mode=OneWay, Converter={StaticResource BooleanToVisibilityNegationConverter}}"/>
         </Grid>
diff --git a/src/Calculator/Views/MemoryListItem.xaml b/src/Calculator/Views/MemoryListItem.xaml
index 32b5a619..8004a29a 100644
--- a/src/Calculator/Views/MemoryListItem.xaml
+++ b/src/Calculator/Views/MemoryListItem.xaml
@@ -10,13 +10,13 @@
     <UserControl.Resources>
         <muxc:FontIconSource x:Key="MemClearGlyph"
                              FontFamily="{StaticResource CalculatorFontFamily}"
-                             Glyph=""/>
+                             Glyph="&#xf754;"/>
         <muxc:FontIconSource x:Key="MemPlusGlyph"
                              FontFamily="{StaticResource CalculatorFontFamily}"
-                             Glyph=""/>
+                             Glyph="&#xf757;"/>
         <muxc:FontIconSource x:Key="MemMinusGlyph"
                              FontFamily="{StaticResource CalculatorFontFamily}"
-                             Glyph=""/>
+                             Glyph="&#xf758;"/>
 
         <muxc:SwipeItems x:Key="MemorySwipeItems" Mode="Reveal">
             <muxc:SwipeItem Background="{ThemeResource SystemControlBackgroundAccentBrush}"
diff --git a/src/Calculator/Views/Settings.xaml b/src/Calculator/Views/Settings.xaml
index 844c7c41..a9ef71b2 100644
--- a/src/Calculator/Views/Settings.xaml
+++ b/src/Calculator/Views/Settings.xaml
@@ -91,7 +91,7 @@
                 FontSize="12"
                 AutomationProperties.Name="{utils:ResourceString Name=TitleBarBackButton/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}"
                 Click="BackButton_Click"
-                Content=""/>
+                Content="&#xE72B;"/>
 
         <Grid Grid.Row="1"
               Height="{StaticResource HamburgerHeight}"
@@ -144,7 +144,7 @@
                                       Foreground="{ThemeResource TextFillColorPrimaryBrush}"
                                       FontFamily="{ThemeResource CalculatorFontFamily}"
                                       FontSize="16"
-                                      Glyph=""/>
+                                      Glyph="&#xE790;"/>
 
                             <StackPanel Grid.Column="1"
                                         Margin="0,12"
diff --git a/src/Calculator/Views/TitleBar.xaml b/src/Calculator/Views/TitleBar.xaml
index 53ab4066..0df1c026 100644
--- a/src/Calculator/Views/TitleBar.xaml
+++ b/src/Calculator/Views/TitleBar.xaml
@@ -86,7 +86,7 @@
                 AutomationProperties.AutomationId="ExitAlwaysOnTopButton"
                 AutomationProperties.Name="{utils:ResourceString Name=ExitAlwaysOnTopButton/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}"
                 Click="AlwaysOnTopButton_Click"
-                Content=""
+                Content="&#xEE47;"
                 ToolTipService.ToolTip="{utils:ResourceString Name=ExitAlwaysOnTopButton/[using:Windows.UI.Xaml.Controls]ToolTipService/ToolTip}"
                 Visibility="Collapsed"
                 x:Load="False">
diff --git a/src/Calculator/Views/UnitConverter.xaml b/src/Calculator/Views/UnitConverter.xaml
index 836925f8..fde65064 100644
--- a/src/Calculator/Views/UnitConverter.xaml
+++ b/src/Calculator/Views/UnitConverter.xaml
@@ -155,7 +155,7 @@
                                            FontSize="12"
                                            AutomationProperties.AccessibilityView="Raw"
                                            IsHitTestVisible="False"
-                                           Text=""/>
+                                           Text="&#xE70D;"/>
                                 <Popup x:Name="Popup">
                                     <Border x:Name="PopupBorder"
                                             Margin="0,-0.5,0,-1"
@@ -749,7 +749,7 @@
                                            common:KeyboardShortcutManager.VirtualKey="{utils:ResourceVirtualKey Name=backSpaceButton/[using:CalculatorApp.Common]KeyboardShortcutManager/VirtualKey}"
                                            AutomationProperties.Name="{utils:ResourceString Name=backSpaceButton/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}"
                                            ButtonId="Backspace"
-                                           Content=""
+                                           Content="&#xE94F;"
                                            TabIndex="8"/>
             </Grid>
 
@@ -773,7 +773,7 @@
                                        common:KeyboardShortcutManager.VirtualKey="{utils:ResourceVirtualKey Name=converterNegateButton/[using:CalculatorApp.Common]KeyboardShortcutManager/VirtualKey}"
                                        AutomationProperties.Name="{utils:ResourceString Name=converterNegateButton/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}"
                                        ButtonId="Negate"
-                                       Content=""
+                                       Content="&#xF898;"
                                        TabIndex="6"
                                        Visibility="{x:Bind Model.CurrentCategory.NegateVisibility, Mode=OneWay}"/>
         </Grid>