diff --git a/src/Avalonia.Themes.Fluent/Controls/Expander.xaml b/src/Avalonia.Themes.Fluent/Controls/Expander.xaml
index 3cf819c4b8..37e9b71185 100644
--- a/src/Avalonia.Themes.Fluent/Controls/Expander.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/Expander.xaml
@@ -103,17 +103,18 @@
                     RenderTransformOrigin="50%,50%"
                     Stretch="None"
                     Stroke="{DynamicResource ExpanderChevronForeground}"
-                    StrokeThickness="1" />
-              <Border.RenderTransform>
-                <RotateTransform />
-              </Border.RenderTransform>
+                    StrokeThickness="1">
+                <Path.RenderTransform>
+                  <RotateTransform />
+                </Path.RenderTransform>
+              </Path>
             </Border>
           </Grid>
         </Border>
       </ControlTemplate>
     </Setter>
 
-    <Style Selector="^:checked /template/ Border#ExpandCollapseChevronBorder">
+    <Style Selector="^:checked /template/ Path#ExpandCollapseChevron">
       <Style.Animations>
         <Animation FillMode="Both" Duration="0:0:0.0625">
           <KeyFrame Cue="100%">
@@ -122,8 +123,8 @@
         </Animation>
       </Style.Animations>
     </Style>
-    
-    <Style Selector="^:not(:checked) /template/ Border#ExpandCollapseChevronBorder">
+
+    <Style Selector="^:not(:checked) /template/ Path#ExpandCollapseChevron">
       <Style.Animations>
         <Animation FillMode="Both" Duration="0:0:0.0625">
           <KeyFrame Cue="0%">