diff --git a/src/Avalonia.Themes.Fluent/Calendar.xaml b/src/Avalonia.Themes.Fluent/Calendar.xaml
index 2fbc705d83..6ae334dbae 100644
--- a/src/Avalonia.Themes.Fluent/Calendar.xaml
+++ b/src/Avalonia.Themes.Fluent/Calendar.xaml
@@ -5,7 +5,7 @@
 // All other rights reserved.
 -->
 
-<Styles xmlns="https://github.com/avaloniaui">
+<Styles xmlns="https://github.com/avaloniaui">  
   <Style Selector="Calendar">
     <Setter Property="Foreground" Value="{DynamicResource CalendarViewForeground}" />
     <Setter Property="Background" Value="{DynamicResource CalendarViewBackground}" />
diff --git a/src/Avalonia.Themes.Fluent/CalendarButton.xaml b/src/Avalonia.Themes.Fluent/CalendarButton.xaml
index 2ba4489204..bd5b62a7f7 100644
--- a/src/Avalonia.Themes.Fluent/CalendarButton.xaml
+++ b/src/Avalonia.Themes.Fluent/CalendarButton.xaml
@@ -22,8 +22,9 @@
     <Setter Property="Template">
       <ControlTemplate>
         <Panel>
+          <!-- To mimic WinUI SystemFocusVisual, Focus visual is drawn outside the bounds of the item -->
           <Border Name="Root" Background="{TemplateBinding Background}"
-                  BorderThickness="0" CornerRadius="2" ClipToBounds="True">
+                  BorderThickness="0" CornerRadius="{DynamicResource ControlCornerRadius}" ClipToBounds="True">
 
             <ContentControl Name="Content"
                   ContentTemplate="{TemplateBinding ContentTemplate}"
@@ -40,12 +41,14 @@
           <Border Name="Border"
                   BorderThickness="2"
                   BorderBrush="{TemplateBinding BorderBrush}"
-                  CornerRadius="2"/>
+                  CornerRadius="{DynamicResource ControlCornerRadius}"/>
 
+          <!--Removed for now...WinUI doesn't have selection follow focus, and only uses 
+              focus visual w/ keyboard focus
           <Border Name="FocusVisual" BorderThickness="2"
                      BorderBrush="{DynamicResource SystemControlHighlightBaseHighBrush}"
                      IsHitTestVisible="False"
-                     Margin="-1"  CornerRadius="2"/>
+                     Margin="-2"  CornerRadius="{DynamicResource ControlCornerRadius}"/>-->
         </Panel>
       </ControlTemplate>
     </Setter>
diff --git a/src/Avalonia.Themes.Fluent/CalendarDayButton.xaml b/src/Avalonia.Themes.Fluent/CalendarDayButton.xaml
index 1e5953ab2d..4f6f5951d2 100644
--- a/src/Avalonia.Themes.Fluent/CalendarDayButton.xaml
+++ b/src/Avalonia.Themes.Fluent/CalendarDayButton.xaml
@@ -22,11 +22,9 @@
     <Setter Property="Template">
       <ControlTemplate>
         <Panel>
-          <!-- To mimic WinUI SystemFocusVisual 
-                        Focus visual is drawn outside the bounds of the item
-                        -->
+          <!-- To mimic WinUI SystemFocusVisual, Focus visual is drawn outside the bounds of the item -->
           <Border Name="Root" Background="{TemplateBinding Background}"
-                  BorderThickness="0" CornerRadius="2" ClipToBounds="True">
+                  BorderThickness="0" CornerRadius="{DynamicResource ControlCornerRadius}" ClipToBounds="True">
 
             <ContentControl Name="Content"
                   ContentTemplate="{TemplateBinding ContentTemplate}"
@@ -43,14 +41,14 @@
           <Border Name="Border"
                   BorderThickness="2"
                   BorderBrush="{TemplateBinding BorderBrush}"
-                  CornerRadius="2"/>
+                  CornerRadius="{DynamicResource ControlCornerRadius}"/>
 
-          <!--Removed for now...WinUI doesn't have selection follow focus, and it leads to
-              an undesired effect with both borders displayed
+          <!--Removed for now...WinUI doesn't have selection follow focus, and only uses 
+              focus visual w/ keyboard focus
                 <Border Name="FocusVisual" BorderThickness="2"
                             BorderBrush="{DynamicResource SystemControlHighlightBaseHighBrush}"
                             IsHitTestVisible="False"
-                            Margin="-1"  CornerRadius="2"/>-->
+                            Margin="-2"  CornerRadius="2"/>-->
         </Panel>
       </ControlTemplate>
     </Setter>
diff --git a/src/Avalonia.Themes.Fluent/CalendarItem.xaml b/src/Avalonia.Themes.Fluent/CalendarItem.xaml
index 41f3fcbc1f..7e17ee7075 100644
--- a/src/Avalonia.Themes.Fluent/CalendarItem.xaml
+++ b/src/Avalonia.Themes.Fluent/CalendarItem.xaml
@@ -21,7 +21,7 @@
         <Border BorderThickness="{TemplateBinding BorderThickness}"
                 Background="{TemplateBinding Background}"
                 BorderBrush="{TemplateBinding BorderBrush}"
-                CornerRadius="2">
+                CornerRadius="{DynamicResource ControlCornerRadius}">
           <Border.Styles>
             <Style Selector="Button.CalendarHeader">
               <Setter Property="HorizontalAlignment" Value="Stretch" />