diff --git a/ModernWpf.Controls/ToggleSwitch/ToggleSwitch.xaml b/ModernWpf.Controls/ToggleSwitch/ToggleSwitch.xaml
index b147cc2d..182607fc 100644
--- a/ModernWpf.Controls/ToggleSwitch/ToggleSwitch.xaml
+++ b/ModernWpf.Controls/ToggleSwitch/ToggleSwitch.xaml
@@ -26,6 +26,7 @@
         <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
         <Setter Property="FocusVisualStyle" Value="{DynamicResource {x:Static SystemParameters.FocusVisualStyleKey}}" />
         <Setter Property="ui:FocusVisualHelper.FocusVisualMargin" Value="-7,-3,-7,-3" />
+        <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="local:ToggleSwitch">
@@ -351,11 +352,12 @@
                                     <ColumnDefinition Width="12" MaxWidth="12" />
                                     <ColumnDefinition Width="Auto" />
                                 </Grid.ColumnDefinitions>
-                                <Grid
+                                <Border
                                     x:Name="SwitchAreaGrid"
                                     Grid.RowSpan="3"
                                     Grid.ColumnSpan="3"
                                     Margin="0,5"
+                                    CornerRadius="{TemplateBinding CornerRadius}"
                                     ui:FocusVisualHelper.IsTemplateFocusTarget="True"
                                     Background="{DynamicResource ToggleSwitchContainerBackground}" />
                                 <ContentPresenter
diff --git a/ModernWpf/Controls/Primitives/FocusVisualHelper.cs b/ModernWpf/Controls/Primitives/FocusVisualHelper.cs
index 1dfac4f5..10d3b910 100644
--- a/ModernWpf/Controls/Primitives/FocusVisualHelper.cs
+++ b/ModernWpf/Controls/Primitives/FocusVisualHelper.cs
@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.ComponentModel;
 using System.Diagnostics;
 using System.Windows;
 using System.Windows.Controls;
@@ -486,6 +485,7 @@ private static void OnFocusVisualIsVisibleChanged(object sender, DependencyPrope
                         TransferValue(focusedElement, focusVisual, FocusVisualPrimaryThicknessProperty);
                         TransferValue(focusedElement, focusVisual, FocusVisualSecondaryBrushProperty);
                         TransferValue(focusedElement, focusVisual, FocusVisualSecondaryThicknessProperty);
+                        TransferValue(focusedElement, focusVisual, ControlHelper.CornerRadiusProperty);
                         focusVisual.Margin = GetFocusVisualMargin(focusedElement);
                     }
 
@@ -502,6 +502,7 @@ private static void OnFocusVisualIsVisibleChanged(object sender, DependencyPrope
                     focusVisual.ClearValue(FocusVisualPrimaryThicknessProperty);
                     focusVisual.ClearValue(FocusVisualSecondaryBrushProperty);
                     focusVisual.ClearValue(FocusVisualSecondaryThicknessProperty);
+                    focusVisual.ClearValue(ControlHelper.CornerRadiusProperty);
                     focusVisual.ClearValue(FrameworkElement.MarginProperty);
                     focusVisual.ClearValue(Control.TemplateProperty);
                     focusVisual.ClearValue(FocusedElementProperty);
@@ -535,6 +536,7 @@ public FocusVisualAdorner(Control focusedElement, UIElement adornedElement, Styl
                 TransferValue(focusedElement, control, FocusVisualPrimaryThicknessProperty);
                 TransferValue(focusedElement, control, FocusVisualSecondaryBrushProperty);
                 TransferValue(focusedElement, control, FocusVisualSecondaryThicknessProperty);
+                TransferValue(focusedElement, control, ControlHelper.CornerRadiusProperty);
                 _adorderChild = control;
                 IsClipEnabled = true;
                 IsHitTestVisible = false;
diff --git a/ModernWpf/Styles/Calendar.xaml b/ModernWpf/Styles/Calendar.xaml
index 82b2f3f3..ff7f160f 100644
--- a/ModernWpf/Styles/Calendar.xaml
+++ b/ModernWpf/Styles/Calendar.xaml
@@ -49,6 +49,8 @@
                                 <Setter Property="primitives:FocusVisualHelper.UseSystemFocusVisuals" Value="{DynamicResource UseSystemFocusVisuals}" />
                                 <Setter Property="FontSize" Value="20" />
                                 <Setter Property="Background" Value="{DynamicResource CalendarViewNavigationButtonBackground}" />
+                                <Setter Property="primitives:ControlHelper.CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+                                <Setter Property="primitives:FocusVisualHelper.FocusVisualMargin" Value="2,2,2,0"/>
                                 <Setter Property="Template">
                                     <Setter.Value>
                                         <ControlTemplate TargetType="Button">
@@ -57,7 +59,8 @@
                                                 Background="{TemplateBinding Background}"
                                                 BorderBrush="{DynamicResource CalendarViewNavigationButtonBorderBrush}"
                                                 BorderThickness="{TemplateBinding BorderThickness}"
-                                                Margin="{TemplateBinding Padding}">
+                                                Margin="{TemplateBinding Padding}"
+                                                CornerRadius="{TemplateBinding primitives:ControlHelper.CornerRadius}">
                                                 <ContentPresenter
                                                     x:Name="Text"
                                                     HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
diff --git a/ModernWpf/Styles/RadioButton.xaml b/ModernWpf/Styles/RadioButton.xaml
index b7cc5826..7f0672c0 100644
--- a/ModernWpf/Styles/RadioButton.xaml
+++ b/ModernWpf/Styles/RadioButton.xaml
@@ -30,6 +30,7 @@
         <Setter Property="FocusVisualStyle" Value="{DynamicResource {x:Static SystemParameters.FocusVisualStyleKey}}" />
         <Setter Property="primitives:FocusVisualHelper.UseSystemFocusVisuals" Value="{DynamicResource UseSystemFocusVisuals}" />
         <Setter Property="primitives:FocusVisualHelper.FocusVisualMargin" Value="-7,-3,-7,-3" />
+        <Setter Property="primitives:ControlHelper.CornerRadius" Value="{DynamicResource ControlCornerRadius}"/>
         <Setter Property="Stylus.IsPressAndHoldEnabled" Value="False" />
         <Setter Property="Template">
             <Setter.Value>
@@ -37,15 +38,15 @@
                     <ControlTemplate.Resources>
                         <primitives:BrushToColorConverter x:Key="BrushToColorConverter" />
                     </ControlTemplate.Resources>
-                    
+
                     <Border
                         x:Name="RootGrid"
                         Background="{TemplateBinding Background}"
                         BorderBrush="{TemplateBinding BorderBrush}"
                         BorderThickness="{TemplateBinding BorderThickness}"
                         CornerRadius="{TemplateBinding primitives:ControlHelper.CornerRadius}"
-                        SnapsToDevicePixels="True">   
-                        
+                        SnapsToDevicePixels="True">
+
                         <Border.Resources>
                             <primitives:BindingProxy x:Key="RadioButtonOuterEllipseFillPointerOverProxy" Value="{DynamicResource RadioButtonOuterEllipseFillPointerOver}" />
                             <primitives:BindingProxy x:Key="RadioButtonOuterEllipseFillPressedProxy" Value="{DynamicResource RadioButtonOuterEllipseFillPressed}" />
@@ -53,7 +54,7 @@
                             <primitives:BindingProxy x:Key="RadioButtonOuterEllipseCheckedStrokeDisabledProxy" Value="{DynamicResource RadioButtonOuterEllipseCheckedStrokeDisabled}" />
                             <primitives:BindingProxy x:Key="RadioButtonOuterEllipseCheckedFillDisabledProxy" Value="{DynamicResource RadioButtonOuterEllipseCheckedFillDisabled}" />
                         </Border.Resources>
-                        
+
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="CommonStates">
                                 <VisualState x:Name="Normal" />
@@ -134,7 +135,7 @@
                                 <VisualState x:Name="Indeterminate" />
                             </VisualStateGroup>
                         </VisualStateManager.VisualStateGroups>
-                        
+
                         <Grid>
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="20" />
diff --git a/ModernWpf/Styles/Slider.xaml b/ModernWpf/Styles/Slider.xaml
index 8a5d86b0..31aec092 100644
--- a/ModernWpf/Styles/Slider.xaml
+++ b/ModernWpf/Styles/Slider.xaml
@@ -151,11 +151,12 @@
                 TextWrapping="Wrap"
                 Visibility="{TemplateBinding primitives:ControlHelper.HeaderVisibility}"
                 SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-            <Grid
+            <Border
                 x:Name="SliderContainer"
                 Grid.Row="1"
                 Background="{DynamicResource SliderContainerBackground}"
-                primitives:FocusVisualHelper.IsTemplateFocusTarget="True">
+                primitives:FocusVisualHelper.IsTemplateFocusTarget="True"
+                CornerRadius="{DynamicResource ControlCornerRadius}">
                 <Grid
                     x:Name="HorizontalTemplate"
                     MinHeight="{DynamicResource SliderHorizontalHeight}">
@@ -230,6 +231,7 @@
                                 DataContext="{TemplateBinding Value}"
                                 Height="{DynamicResource SliderHorizontalThumbHeight}"
                                 Width="{DynamicResource SliderHorizontalThumbWidth}"
+                                primitives:ControlHelper.CornerRadius="{DynamicResource ControlCornerRadius}"
                                 primitives:FocusVisualHelper.FocusVisualMargin="-14,-6,-14,-6">
                                 <Thumb.Resources>
                                     <Style TargetType="ToolTip" BasedOn="{StaticResource SliderAutoToolTipStyle}" />
@@ -238,7 +240,7 @@
                         </Track.Thumb>
                     </Track>
                 </Grid>
-            </Grid>
+            </Border>
         </Grid>
         <ControlTemplate.Triggers>
             <Trigger Property="TickPlacement" Value="TopLeft">
@@ -296,11 +298,12 @@
                 Visibility="{TemplateBinding primitives:ControlHelper.HeaderVisibility}"
                 SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
             </local:ContentPresenterEx>
-            <Grid
+            <Border
                 x:Name="SliderContainer"
                 Grid.Row="1"
                 Background="{DynamicResource SliderContainerBackground}"
-                primitives:FocusVisualHelper.IsTemplateFocusTarget="True">
+                primitives:FocusVisualHelper.IsTemplateFocusTarget="True"
+                CornerRadius="{DynamicResource ControlCornerRadius}">
                 <Grid
                     x:Name="VerticalTemplate"
                     MinWidth="{DynamicResource SliderVerticalWidth}">
@@ -376,6 +379,7 @@
                                 DataContext="{TemplateBinding Value}"
                                 Width="{DynamicResource SliderVerticalThumbWidth}"
                                 Height="{DynamicResource SliderVerticalThumbHeight}"
+                                primitives:ControlHelper.CornerRadius="{DynamicResource ControlCornerRadius}"
                                 primitives:FocusVisualHelper.FocusVisualMargin="-6,-14,-6,-14">
                                 <Thumb.Resources>
                                     <Style TargetType="ToolTip" BasedOn="{StaticResource SliderAutoToolTipStyle}" />
@@ -384,7 +388,7 @@
                         </Track.Thumb>
                     </Track>
                 </Grid>
-            </Grid>
+            </Border>
         </Grid>
         <ControlTemplate.Triggers>
             <Trigger Property="TickPlacement" Value="TopLeft">
diff --git a/ModernWpf/ThemeResources/Dark.xaml b/ModernWpf/ThemeResources/Dark.xaml
index aeaaa4d6..c7fe705d 100644
--- a/ModernWpf/ThemeResources/Dark.xaml
+++ b/ModernWpf/ThemeResources/Dark.xaml
@@ -1768,10 +1768,12 @@
                     <Border
                         BorderBrush="{TemplateBinding primitives:FocusVisualHelper.FocusVisualPrimaryBrush}"
                         BorderThickness="{TemplateBinding primitives:FocusVisualHelper.FocusVisualPrimaryThickness}"
+                        CornerRadius="{TemplateBinding primitives:ControlHelper.CornerRadius}"
                         SnapsToDevicePixels="True">
                         <Border
                             BorderBrush="{TemplateBinding primitives:FocusVisualHelper.FocusVisualSecondaryBrush}"
-                            BorderThickness="{TemplateBinding primitives:FocusVisualHelper.FocusVisualSecondaryThickness}" />
+                            BorderThickness="{TemplateBinding primitives:FocusVisualHelper.FocusVisualSecondaryThickness}"
+                            CornerRadius="{TemplateBinding primitives:ControlHelper.CornerRadius}" />
                     </Border>
                 </ControlTemplate>
             </Setter.Value>
diff --git a/ModernWpf/ThemeResources/HighContrast.xaml b/ModernWpf/ThemeResources/HighContrast.xaml
index adb58780..c9b0d7f5 100644
--- a/ModernWpf/ThemeResources/HighContrast.xaml
+++ b/ModernWpf/ThemeResources/HighContrast.xaml
@@ -1645,10 +1645,12 @@
                     <Border
                         BorderBrush="{StaticResource SystemControlFocusVisualPrimaryBrush}"
                         BorderThickness="2"
+                        CornerRadius="{TemplateBinding primitives:ControlHelper.CornerRadius}"
                         SnapsToDevicePixels="True">
                         <Border
                             BorderBrush="{StaticResource SystemControlFocusVisualSecondaryBrush}"
-                            BorderThickness="1" />
+                            BorderThickness="1"
+                            CornerRadius="{TemplateBinding primitives:ControlHelper.CornerRadius}" />
                     </Border>
                 </ControlTemplate>
             </Setter.Value>
diff --git a/ModernWpf/ThemeResources/Light.xaml b/ModernWpf/ThemeResources/Light.xaml
index d2183b10..cf73b0d8 100644
--- a/ModernWpf/ThemeResources/Light.xaml
+++ b/ModernWpf/ThemeResources/Light.xaml
@@ -1770,10 +1770,12 @@
                     <Border
                         BorderBrush="{TemplateBinding primitives:FocusVisualHelper.FocusVisualPrimaryBrush}"
                         BorderThickness="{TemplateBinding primitives:FocusVisualHelper.FocusVisualPrimaryThickness}"
+                        CornerRadius="{TemplateBinding primitives:ControlHelper.CornerRadius}"
                         SnapsToDevicePixels="True">
                         <Border
                             BorderBrush="{TemplateBinding primitives:FocusVisualHelper.FocusVisualSecondaryBrush}"
-                            BorderThickness="{TemplateBinding primitives:FocusVisualHelper.FocusVisualSecondaryThickness}" />
+                            BorderThickness="{TemplateBinding primitives:FocusVisualHelper.FocusVisualSecondaryThickness}"
+                            CornerRadius="{TemplateBinding primitives:ControlHelper.CornerRadius}" />
                     </Border>
                 </ControlTemplate>
             </Setter.Value>