diff --git a/src/Calculator/App.xaml b/src/Calculator/App.xaml
index 10283837..4db00b45 100644
--- a/src/Calculator/App.xaml
+++ b/src/Calculator/App.xaml
@@ -1628,6 +1628,7 @@
             <Style x:Name="EquationTextBoxButtonStyle" TargetType="Button">
                 <Setter Property="Background" Value="Transparent"/>
                 <Setter Property="Foreground" Value="Transparent"/>
+                <Setter Property="FontSize" Value="16"/>
                 <Setter Property="Template">
                     <Setter.Value>
                         <ControlTemplate TargetType="Button">
@@ -1683,7 +1684,7 @@
                                            VerticalAlignment="Center"
                                            Foreground="{ThemeResource EquationBoxHoverButtonForegroundBrush}"
                                            FontFamily="{TemplateBinding FontFamily}"
-                                           FontSize="12"
+                                           FontSize="{TemplateBinding FontSize}"
                                            FontStyle="Normal"
                                            AutomationProperties.AccessibilityView="Raw"
                                            Text="{TemplateBinding Content}"/>
@@ -2056,9 +2057,9 @@
                                                     VerticalAlignment="Center"
                                                     Background="Transparent"
                                                     Orientation="Horizontal">
-                                            <TextBlock Text="ƒ"/>
-                                            <TextBlock Margin="0,10,0,0"
-                                                       FontSize="9"
+                                            <FontIcon FontFamily="{StaticResource CalculatorFontFamily}" Glyph="&#xF893;"/>
+                                            <TextBlock Margin="-5,19,0,0"
+                                                       FontSize="11"
                                                        Text="{TemplateBinding EquationButtonContentIndex}"/>
                                         </StackPanel>
                                     </ToggleButton.Content>
@@ -2092,7 +2093,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="&#xE890;"/>
+                                                                            <Setter Target="ShowHideIcon.Glyph" Value="&#xF6AC;"/>
                                                                         </VisualState.Setters>
                                                                     </VisualState>
                                                                     <VisualState x:Name="Pressed">
@@ -2102,7 +2103,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="&#xE890;"/>
+                                                                            <Setter Target="ShowHideIcon.Glyph" Value="&#xF6AC;"/>
                                                                         </VisualState.Setters>
                                                                     </VisualState>
                                                                     <VisualState x:Name="Checked">
@@ -2120,7 +2121,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="&#xED1A;"/>
+                                                                            <Setter Target="ShowHideIcon.Glyph" Value="&#xE890;"/>
                                                                         </VisualState.Setters>
                                                                     </VisualState>
                                                                     <VisualState x:Name="CheckedPressed">
@@ -2131,7 +2132,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="&#xED1A;"/>
+                                                                            <Setter Target="ShowHideIcon.Glyph" Value="&#xE890;"/>
                                                                         </VisualState.Setters>
                                                                     </VisualState>
                                                                 </VisualStateGroup>
@@ -2144,7 +2145,7 @@
                                                                               AutomationProperties.AccessibilityView="Raw"
                                                                               IsHitTestVisible="False"/>
                                                             <FontIcon x:Name="ShowHideIcon"
-                                                                      FontFamily="{ThemeResource SymbolThemeFontFamily}"
+                                                                      FontFamily="{StaticResource CalculatorFontFamily}"
                                                                       Visibility="Collapsed"/>
                                                         </Grid>
                                                     </ControlTemplate>
@@ -2190,7 +2191,7 @@
                                                 Foreground="{TemplateBinding EquationColor}"
                                                 BorderThickness="0"
                                                 FontFamily="{ThemeResource SymbolThemeFontFamily}"
-                                                FontSize="{TemplateBinding FontSize}"
+                                                FontSize="12"
                                                 AutomationProperties.AccessibilityView="Raw"
                                                 Content="&#xE10A;"
                                                 IsTabStop="False"
@@ -2214,8 +2215,7 @@
                                                 Background="{TemplateBinding EquationColor}"
                                                 Foreground="{TemplateBinding EquationColor}"
                                                 BorderThickness="0"
-                                                FontFamily="{ThemeResource SymbolThemeFontFamily}"
-                                                FontSize="{TemplateBinding FontSize}"
+                                                FontFamily="{StaticResource CalculatorFontFamily}"
                                                 AutomationProperties.AccessibilityView="Raw"
                                                 Content="&#xECC9;"
                                                 IsTabStop="False"
@@ -2228,8 +2228,7 @@
                                                       VerticalAlignment="Stretch"
                                                       Background="{ThemeResource AppControlTransparentButtonBackgroundBrush}"
                                                       BorderThickness="0"
-                                                      FontFamily="{ThemeResource SymbolThemeFontFamily}"
-                                                      FontSize="{TemplateBinding FontSize}"
+                                                      FontFamily="{StaticResource CalculatorFontFamily}"
                                                       AutomationProperties.AccessibilityView="Raw"
                                                       Content="&#xE790;"
                                                       IsTabStop="False"
@@ -2256,9 +2255,9 @@
                                                 Background="{TemplateBinding EquationColor}"
                                                 Foreground="{TemplateBinding EquationColor}"
                                                 BorderThickness="{TemplateBinding BorderThickness}"
-                                                FontSize="{TemplateBinding FontSize}"
+                                                FontFamily="{StaticResource CalculatorFontFamily}"
                                                 AutomationProperties.AccessibilityView="Raw"
-                                                Content="ƒₓ"
+                                                Content="&#xE3B5;"
                                                 IsTabStop="False"
                                                 Visibility="Collapsed"/>
                                     </Grid>
diff --git a/src/Calculator/Assets/CalcMDL2.ttf b/src/Calculator/Assets/CalcMDL2.ttf
index 9e6bfaa4..62461d0b 100644
Binary files a/src/Calculator/Assets/CalcMDL2.ttf and b/src/Calculator/Assets/CalcMDL2.ttf differ
diff --git a/src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml b/src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml
index 21317458..2efbcb60 100644
--- a/src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml
+++ b/src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml
@@ -387,8 +387,7 @@
                           ToolTipService.ToolTip="{x:Bind local:GraphingCalculator.GetInfoForSwitchModeToggleButton(SwitchModeToggleButton.IsChecked.Value), Mode=OneWay}"
                           Unchecked="SwitchModeToggleButton_Checked"
                           Visibility="Collapsed">
-                <!-- TODO: update this icon -->
-                <FontIcon FontFamily="{ThemeResource SymbolThemeFontFamily}" Glyph=""/>
+                <FontIcon FontFamily="{StaticResource CalculatorFontFamily}" Glyph="&#xF770;"/>
             </ToggleButton>
         </Grid>
         <!-- Left portion of the screen -->
@@ -591,7 +590,7 @@
                             Style="{StaticResource GraphButtonStyle}"
                             Click="OnActiveTracingClick"
                             RequestedTheme="Light">
-                        <FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE73F;"/>
+                        <FontIcon FontFamily="{StaticResource CalculatorFontFamily}" Glyph="&#xE3B3;"/>
                     </Button>
 
                     <Button x:Name="Share"
diff --git a/src/Calculator/Views/GraphingCalculator/KeyGraphFeaturesPanel.xaml b/src/Calculator/Views/GraphingCalculator/KeyGraphFeaturesPanel.xaml
index 5b0545d8..e85cd875 100644
--- a/src/Calculator/Views/GraphingCalculator/KeyGraphFeaturesPanel.xaml
+++ b/src/Calculator/Views/GraphingCalculator/KeyGraphFeaturesPanel.xaml
@@ -55,10 +55,10 @@
                                         <FontIcon VerticalAlignment="Center"
                                                   FontFamily="{ThemeResource SymbolThemeFontFamily}"
                                                   FontSize="16"
-                                                  Glyph="&#xE72B;"/>
-                                        <TextBlock Text="ƒ" Margin="12,0,0,0"/>
-                                        <TextBlock Margin="0,10,0,0"
-                                                       FontSize="9"
+                                                  Glyph="&#xE72B;" Margin="0,0,6,0"/>
+                                        <FontIcon FontFamily="{StaticResource CalculatorFontFamily}" Glyph="&#xF893;"/>
+                                        <TextBlock Margin="-5,19,0,0"
+                                                       FontSize="11"
                                                        Text="{TemplateBinding EquationButtonContentIndex}"/>
                                     </StackPanel>