diff --git a/src/Calculator/Views/GraphingCalculator/GraphingSettings.xaml b/src/Calculator/Views/GraphingCalculator/GraphingSettings.xaml
index eab4de4..5981f12 100644
--- a/src/Calculator/Views/GraphingCalculator/GraphingSettings.xaml
+++ b/src/Calculator/Views/GraphingCalculator/GraphingSettings.xaml
@@ -1,6 +1,7 @@
 <UserControl x:Class="CalculatorApp.GraphingSettings"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:contract7Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract, 7)"
              xmlns:converters="using:CalculatorApp.Converters"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:local="using:CalculatorApp"
@@ -33,7 +34,9 @@
                 <Setter Property="Template">
                     <Setter.Value>
                         <ControlTemplate TargetType="RadioButton">
-                            <Grid Name="LayoutRoot" Background="{ThemeResource ToggleButtonBackground}">
+                            <Grid Name="LayoutRoot"
+                                  Background="{ThemeResource ToggleButtonBackground}"
+                                  contract7Present:CornerRadius="{TemplateBinding CornerRadius}">
                                 <VisualStateManager.VisualStateGroups>
                                     <VisualStateGroup x:Name="CommonStates">
                                         <VisualState x:Name="Normal"/>
@@ -63,7 +66,8 @@
                                 </VisualStateManager.VisualStateGroups>
                                 <Border Name="AccessibilityBorder"
                                         BorderBrush="{ThemeResource ToggleButtonBorderBrush}"
-                                        BorderThickness="1"/>
+                                        BorderThickness="1"
+                                        contract7Present:CornerRadius="{TemplateBinding CornerRadius}"/>
                                 <Rectangle Name="SelectedBackgroundRectangle"
                                            Fill="{ThemeResource ToggleButtonBackgroundChecked}"
                                            Opacity="0"/>
@@ -172,12 +176,11 @@
                        Style="{StaticResource SubTitleTextBoxStyle}"
                        AutomationProperties.HeadingLevel="Level2"/>
 
-            <StackPanel AutomationProperties.LabeledBy="{Binding ElementName=UnitsHeading}"
-                        CornerRadius="4"
-                        Orientation="Horizontal">
+            <StackPanel AutomationProperties.LabeledBy="{Binding ElementName=UnitsHeading}" Orientation="Horizontal">
                 <RadioButton x:Name="Radians"
                              x:Uid="TrigModeRadians"
                              Style="{StaticResource TrigUnitsRadioButtonStyle}"
+                             contract7Present:CornerRadius="4,0,0,4"
                              IsChecked="{x:Bind ViewModel.TrigModeRadians, Mode=TwoWay}"/>
                 <RadioButton x:Name="Degrees"
                              x:Uid="TrigModeDegrees"
@@ -187,6 +190,7 @@
                 <RadioButton x:Name="Gradians"
                              x:Uid="TrigModeGradians"
                              Style="{StaticResource TrigUnitsRadioButtonStyle}"
+                             contract7Present:CornerRadius="0,4,4,0"
                              IsChecked="{x:Bind ViewModel.TrigModeGradians, Mode=TwoWay}"/>
             </StackPanel>