diff --git a/src/Calculator/Views/Calculator.xaml b/src/Calculator/Views/Calculator.xaml
index 71dddef..aa2e7a9 100644
--- a/src/Calculator/Views/Calculator.xaml
+++ b/src/Calculator/Views/Calculator.xaml
@@ -17,21 +17,17 @@
         <DataTemplate x:Key="Operand" x:DataType="common:DisplayExpressionToken">
             <TextBlock Margin="2,0,0,0"
                        Foreground="{ThemeResource SystemControlPageTextBaseMediumBrush}"
-                       IsTextScaleFactorEnabled="False"
                        Text="{x:Bind Token, Mode=OneWay}"/>
         </DataTemplate>
 
         <DataTemplate x:Key="Operator" x:DataType="common:DisplayExpressionToken">
             <TextBlock Margin="2,0,0,0"
                        Foreground="{ThemeResource SystemControlPageTextBaseMediumBrush}"
-                       IsTextScaleFactorEnabled="False"
                        Text="{x:Bind Token, Mode=OneWay}"/>
         </DataTemplate>
 
         <DataTemplate x:Key="Separator" x:DataType="common:DisplayExpressionToken">
-            <TextBlock x:Name="MainText"
-                       IsTextScaleFactorEnabled="False"
-                       Text="{x:Bind Token, Mode=OneWay}"/>
+            <TextBlock x:Name="MainText" Text="{x:Bind Token, Mode=OneWay}"/>
         </DataTemplate>
 
         <!-- TextBox Styles -->
diff --git a/src/Calculator/Views/CalculatorProgrammerOperators.xaml b/src/Calculator/Views/CalculatorProgrammerOperators.xaml
index bfd76c6..008d219 100644
--- a/src/Calculator/Views/CalculatorProgrammerOperators.xaml
+++ b/src/Calculator/Views/CalculatorProgrammerOperators.xaml
@@ -83,7 +83,7 @@
                                 </Grid.ColumnDefinitions>
                                 <TextBlock x:Name="ContentPresenter"
                                            Grid.Column="2"
-                                           Margin="0,2,4,-2"
+                                           Margin="4,0,4,0"
                                            HorizontalAlignment="Left"
                                            VerticalAlignment="Center"
                                            Foreground="{ThemeResource SystemControlForegroundBaseHighBrush}"
@@ -91,9 +91,8 @@
                                            FontSize="{TemplateBinding FontSize}"
                                            FontWeight="{TemplateBinding FontWeight}"
                                            AutomationProperties.AccessibilityView="Raw"
-                                           IsTextScaleFactorEnabled="False"
+                                           IsTextScaleFactorEnabled="{TemplateBinding IsTextScaleFactorEnabled}"
                                            Text="{TemplateBinding Content}"
-                                           TextLineBounds="TrimToCapHeight"
                                            TextWrapping="Wrap"/>
                                 <TextBlock x:Name="LabelPresenter"
                                            Grid.Column="1"
@@ -105,7 +104,7 @@
                                            FontSize="{TemplateBinding FontSize}"
                                            FontWeight="{TemplateBinding FontWeight}"
                                            AutomationProperties.AccessibilityView="Raw"
-                                           IsTextScaleFactorEnabled="False"
+                                           IsTextScaleFactorEnabled="{TemplateBinding IsTextScaleFactorEnabled}"
                                            Text="{TemplateBinding Tag}"/>
                             </Grid>
                             <Grid x:Name="CheckedStatesGrid"
@@ -124,7 +123,7 @@
                                            Fill="{ThemeResource SystemControlHighlightAccentBrush}"/>
                                 <TextBlock x:Name="CheckedContentPresenter"
                                            Grid.Column="2"
-                                           Margin="0,2,4,-2"
+                                           Margin="4,0,4,0"
                                            HorizontalAlignment="Left"
                                            VerticalAlignment="Center"
                                            Foreground="{ThemeResource SystemControlHighlightAltBaseHighBrush}"
@@ -132,9 +131,8 @@
                                            FontSize="{TemplateBinding FontSize}"
                                            FontWeight="{TemplateBinding FontWeight}"
                                            AutomationProperties.AccessibilityView="Raw"
-                                           IsTextScaleFactorEnabled="False"
+                                           IsTextScaleFactorEnabled="{TemplateBinding IsTextScaleFactorEnabled}"
                                            Text="{TemplateBinding Content}"
-                                           TextLineBounds="TrimToCapHeight"
                                            TextWrapping="Wrap"/>
                                 <TextBlock x:Name="CheckedLabelPresenter"
                                            Grid.Column="1"
@@ -146,7 +144,7 @@
                                            FontSize="{TemplateBinding FontSize}"
                                            FontWeight="{TemplateBinding FontWeight}"
                                            AutomationProperties.AccessibilityView="Raw"
-                                           IsTextScaleFactorEnabled="False"
+                                           IsTextScaleFactorEnabled="{TemplateBinding IsTextScaleFactorEnabled}"
                                            Text="{TemplateBinding Tag}"/>
                             </Grid>
                         </Grid>