diff --git a/src/Calculator/Views/GraphingCalculator/GraphingSettings.xaml b/src/Calculator/Views/GraphingCalculator/GraphingSettings.xaml
index 58451b5..bac5491 100644
--- a/src/Calculator/Views/GraphingCalculator/GraphingSettings.xaml
+++ b/src/Calculator/Views/GraphingCalculator/GraphingSettings.xaml
@@ -82,13 +82,16 @@
             </Style>
             <Style x:Key="SubTitleTextBoxStyle" TargetType="TextBlock">
                 <Setter Property="FontSize" Value="16"/>
-                <Setter Property="FontWeight" Value="SemiBold"/>
+                <Setter Property="FontWeight" Value="Medium"/>
             </Style>
 
             <Style x:Key="ErrorTextBoxStyle" TargetType="TextBox">
                 <Setter Property="BorderBrush" Value="{ThemeResource GraphSettingsErrorBorderBrush}"/>
                 <Setter Property="Background" Value="{ThemeResource GraphSettingsErrorBackgroundBrush}"/>
             </Style>
+            <DataTemplate x:Key="XYTextBoxHeaderTemplate" x:DataType="x:String">
+                <TextBlock FontSize="14" Text="{x:Bind}"/>
+            </DataTemplate>
         </ResourceDictionary>
     </UserControl.Resources>
 
@@ -96,7 +99,8 @@
         <StackPanel Margin="4,0,4,4">
             <TextBlock x:Name="GraphOptionsHeading"
                        x:Uid="GraphOptionsHeading"
-                       FontSize="22"
+                       FontSize="20"
+                       FontWeight="Medium"
                        AutomationProperties.HeadingLevel="Level1"/>
             <TextBlock x:Name="GridHeading"
                        x:Uid="GridHeading"
@@ -119,6 +123,7 @@
                          x:Uid="GraphSettingsXMin"
                          MaxWidth="160"
                          Style="{x:Bind SelectTextBoxStyle(ViewModel.XError, ViewModel.XMinError), Mode=OneWay}"
+                         HeaderTemplate="{StaticResource XYTextBoxHeaderTemplate}"
                          PreviewKeyDown="GridSettingsTextBox_PreviewKeyDown"
                          Text="{x:Bind ViewModel.XMin, Mode=TwoWay}"/>
                 <TextBox x:Name="SettingsXMax"
@@ -126,6 +131,7 @@
                          Grid.Column="2"
                          MaxWidth="160"
                          Style="{x:Bind SelectTextBoxStyle(ViewModel.XError, ViewModel.XMaxError), Mode=OneWay}"
+                         HeaderTemplate="{StaticResource XYTextBoxHeaderTemplate}"
                          PreviewKeyDown="GridSettingsTextBox_PreviewKeyDown"
                          Text="{x:Bind ViewModel.XMax, Mode=TwoWay}"/>
 
@@ -134,6 +140,7 @@
                          Grid.Row="2"
                          MaxWidth="160"
                          Style="{x:Bind SelectTextBoxStyle(ViewModel.YError, ViewModel.YMinError), Mode=OneWay}"
+                         HeaderTemplate="{StaticResource XYTextBoxHeaderTemplate}"
                          PreviewKeyDown="GridSettingsTextBox_PreviewKeyDown"
                          Text="{x:Bind ViewModel.YMin, Mode=TwoWay}"/>
                 <TextBox x:Name="SettingsYMax"
@@ -142,6 +149,7 @@
                          Grid.Column="2"
                          MaxWidth="160"
                          Style="{x:Bind SelectTextBoxStyle(ViewModel.YError, ViewModel.YMaxError), Mode=OneWay}"
+                         HeaderTemplate="{StaticResource XYTextBoxHeaderTemplate}"
                          PreviewKeyDown="GridSettingsTextBox_PreviewKeyDown"
                          Text="{x:Bind ViewModel.YMax, Mode=TwoWay}"/>
             </Grid>
diff --git a/src/Calculator/Views/GraphingCalculator/KeyGraphFeaturesPanel.xaml b/src/Calculator/Views/GraphingCalculator/KeyGraphFeaturesPanel.xaml
index de7a04b..8db279b 100644
--- a/src/Calculator/Views/GraphingCalculator/KeyGraphFeaturesPanel.xaml
+++ b/src/Calculator/Views/GraphingCalculator/KeyGraphFeaturesPanel.xaml
@@ -59,7 +59,7 @@
 
             <Style x:Name="KGF_TitleTextBlockStyle" TargetType="TextBlock">
                 <Setter Property="FontWeight" Value="Medium"/>
-                <Setter Property="FontSize" Value="14"/>
+                <Setter Property="FontSize" Value="16"/>
                 <Setter Property="TextWrapping" Value="WrapWholeWords"/>
                 <Setter Property="AutomationProperties.HeadingLevel" Value="Level2"/>
             </Style>
@@ -194,7 +194,7 @@
                    Grid.Row="1"
                    Margin="12,12,10,0"
                    Style="{StaticResource KGF_TitleTextBlockStyle}"
-                   FontSize="18"
+                   FontSize="20"
                    AutomationProperties.HeadingLevel="Level1"/>
 
         <ListView x:Name="KeyGraphFeaturesListView"