diff --git a/ModernWpf.MahApps/Styles/Controls.FlipView.xaml b/ModernWpf.MahApps/Styles/Controls.FlipView.xaml
index f580ea14..d1750b92 100644
--- a/ModernWpf.MahApps/Styles/Controls.FlipView.xaml
+++ b/ModernWpf.MahApps/Styles/Controls.FlipView.xaml
@@ -20,10 +20,10 @@
             <Setter.Value>
                 <ControlTemplate TargetType="Controls:FlipView">
                     <ControlTemplate.Resources>
-                        <StreamGeometry x:Key="ChevronLeft">M 14.091797 19.970703 L 4.111328 10 L 14.091797 0.029297 L 14.970703 0.908203 L 5.888672 10 L 14.970703 19.091797 Z</StreamGeometry>
-                        <StreamGeometry x:Key="ChevronRight">M 5.029297 19.091797 L 14.111328 10 L 5.029297 0.908203 L 5.908203 0.029297 L 15.888672 10 L 5.908203 19.970703 Z</StreamGeometry>
-                        <StreamGeometry x:Key="ChevronUp">M 19.091797 14.970703 L 10 5.888672 L 0.908203 14.970703 L 0.029297 14.091797 L 10 4.111328 L 19.970703 14.091797 Z</StreamGeometry>
-                        <StreamGeometry x:Key="ChevronDown">M 18.935547 4.560547 L 19.814453 5.439453 L 10 15.253906 L 0.185547 5.439453 L 1.064453 4.560547 L 10 13.496094 Z</StreamGeometry>
+                        <StreamGeometry x:Key="CaretLeft">F1 M 5 10 L 15 0 L 15 20 L 5 10 Z</StreamGeometry>
+                        <StreamGeometry x:Key="CaretRight">F1 M 5 0 L 15 10 L 5 20 L 5 0 Z</StreamGeometry>
+                        <StreamGeometry x:Key="CaretUp">F1 M 10 5 L 20 15 L 0 15 L 10 5 Z</StreamGeometry>
+                        <StreamGeometry x:Key="CaretDown">F1 M 0 5 L 20 5 L 10 15 L 0 5 Z</StreamGeometry>
                         <Storyboard x:Key="ShowBannerStoryboard">
                             <DoubleAnimation
                                 AccelerationRatio="1.0"
@@ -73,7 +73,7 @@
                                             FontFamily="{DynamicResource SymbolThemeFontFamily}"
                                             FontSize="12"
                                             Foreground="{DynamicResource FlipViewNextPreviousArrowForeground}"
-                                            Data="{StaticResource ChevronRight}"
+                                            Data="{StaticResource CaretRight}"
                                             HorizontalAlignment="Center"
                                             VerticalAlignment="Center"
                                             UseLayoutRounding="False" />
@@ -103,7 +103,7 @@
                                             FontFamily="{DynamicResource SymbolThemeFontFamily}"
                                             FontSize="12"
                                             Foreground="{DynamicResource FlipViewNextPreviousArrowForeground}"
-                                            Data="{StaticResource ChevronLeft}"
+                                            Data="{StaticResource CaretLeft}"
                                             HorizontalAlignment="Center"
                                             VerticalAlignment="Center"
                                             UseLayoutRounding="False" />
@@ -133,7 +133,7 @@
                                             FontFamily="{DynamicResource SymbolThemeFontFamily}"
                                             FontSize="12"
                                             Foreground="{DynamicResource FlipViewNextPreviousArrowForeground}"
-                                            Data="{StaticResource ChevronDown}"
+                                            Data="{StaticResource CaretDown}"
                                             HorizontalAlignment="Center"
                                             VerticalAlignment="Center"
                                             UseLayoutRounding="False" />
@@ -163,7 +163,7 @@
                                             FontFamily="{DynamicResource SymbolThemeFontFamily}"
                                             FontSize="12"
                                             Foreground="{DynamicResource FlipViewNextPreviousArrowForeground}"
-                                            Data="{StaticResource ChevronUp}"
+                                            Data="{StaticResource CaretUp}"
                                             HorizontalAlignment="Center"
                                             VerticalAlignment="Center"
                                             UseLayoutRounding="False" />
diff --git a/ModernWpf/Styles/Calendar.xaml b/ModernWpf/Styles/Calendar.xaml
index 9f4d47c4..82b2f3f3 100644
--- a/ModernWpf/Styles/Calendar.xaml
+++ b/ModernWpf/Styles/Calendar.xaml
@@ -32,8 +32,8 @@
                                 Style="{StaticResource WeekDayNameStyle}"
                                 Text="{Binding}" />
                         </DataTemplate>
-                        <StreamGeometry x:Key="ChevronDown">M 18.935547 4.560547 L 19.814453 5.439453 L 10 15.253906 L 0.185547 5.439453 L 1.064453 4.560547 L 10 13.496094 Z</StreamGeometry>
-                        <StreamGeometry x:Key="ChevronUp">M 19.091797 14.970703 L 10 5.888672 L 0.908203 14.970703 L 0.029297 14.091797 L 10 4.111328 L 19.970703 14.091797 Z</StreamGeometry>
+                        <StreamGeometry x:Key="CaretUp">F1 M 10 5 L 20 15 L 0 15 L 10 5 Z</StreamGeometry>
+                        <StreamGeometry x:Key="CaretDown">F1 M 0 5 L 20 5 L 10 15 L 0 5 Z</StreamGeometry>
                         <DataTemplate x:Key="IconTemplate">
                             <local:FontIconFallback Data="{Binding}" />
                         </DataTemplate>
@@ -105,9 +105,10 @@
                                     <Button
                                         x:Name="PART_PreviousButton"
                                         Grid.Column="1"
-                                        Content="{StaticResource ChevronUp}"
+                                        Content="{StaticResource CaretUp}"
                                         ContentTemplate="{StaticResource IconTemplate}"
                                         FontFamily="{DynamicResource SymbolThemeFontFamily}"
+                                        FontSize="8"
                                         Focusable="False"
                                         Padding="1"
                                         Foreground="{TemplateBinding Foreground}"
@@ -116,9 +117,10 @@
                                     <Button
                                         x:Name="PART_NextButton"
                                         Grid.Column="2"
-                                        Content="{StaticResource ChevronDown}"
+                                        Content="{StaticResource CaretDown}"
                                         ContentTemplate="{StaticResource IconTemplate}"
                                         FontFamily="{DynamicResource SymbolThemeFontFamily}"
+                                        FontSize="8"
                                         Focusable="False"
                                         Padding="1"
                                         Foreground="{TemplateBinding Foreground}"
diff --git a/ModernWpf/Styles/ScrollBar.xaml b/ModernWpf/Styles/ScrollBar.xaml
index 8d14cfe6..54f27b7e 100644
--- a/ModernWpf/Styles/ScrollBar.xaml
+++ b/ModernWpf/Styles/ScrollBar.xaml
@@ -227,8 +227,8 @@
             <Setter.Value>
                 <ControlTemplate TargetType="ScrollBar">
                     <ControlTemplate.Resources>
-                        <StreamGeometry x:Key="ChevronDown">M 18.935547 4.560547 L 19.814453 5.439453 L 10 15.253906 L 0.185547 5.439453 L 1.064453 4.560547 L 10 13.496094 Z</StreamGeometry>
-                        <StreamGeometry x:Key="ChevronUp">M 19.091797 14.970703 L 10 5.888672 L 0.908203 14.970703 L 0.029297 14.091797 L 10 4.111328 L 19.970703 14.091797 Z</StreamGeometry>
+                        <StreamGeometry x:Key="CaretUp">F1 M 10 5 L 20 15 L 0 15 L 10 5 Z</StreamGeometry>
+                        <StreamGeometry x:Key="CaretDown">F1 M 0 5 L 20 5 L 10 15 L 0 5 Z</StreamGeometry>
                     </ControlTemplate.Resources>
                     <Border
                         x:Name="Root"
@@ -342,7 +342,7 @@
                                 IsTabStop="False"
                                 Margin="0"
                                 Grid.Row="0"
-                                Content="{StaticResource ChevronUp}"
+                                Content="{StaticResource CaretUp}"
                                 Template="{StaticResource ScrollBarButtonTemplate}"
                                 HorizontalAlignment="Center" />
                             <Track
@@ -393,7 +393,7 @@
                                 IsTabStop="False"
                                 Margin="0"
                                 Grid.Row="2"
-                                Content="{StaticResource ChevronDown}"
+                                Content="{StaticResource CaretDown}"
                                 Template="{StaticResource ScrollBarButtonTemplate}"
                                 HorizontalAlignment="Center" />
                         </Grid>
@@ -436,8 +436,8 @@
                     <Setter.Value>
                         <ControlTemplate TargetType="ScrollBar">
                             <ControlTemplate.Resources>
-                                <StreamGeometry x:Key="ChevronLeft">M 14.091797 19.970703 L 4.111328 10 L 14.091797 0.029297 L 14.970703 0.908203 L 5.888672 10 L 14.970703 19.091797 Z</StreamGeometry>
-                                <StreamGeometry x:Key="ChevronRight">M 5.029297 19.091797 L 14.111328 10 L 5.029297 0.908203 L 5.908203 0.029297 L 15.888672 10 L 5.908203 19.970703 Z</StreamGeometry>
+                                <StreamGeometry x:Key="CaretLeft">F1 M 5 10 L 15 0 L 15 20 L 5 10 Z</StreamGeometry>
+                                <StreamGeometry x:Key="CaretRight">F1 M 5 0 L 15 10 L 5 20 L 5 0 Z</StreamGeometry>
                             </ControlTemplate.Resources>
                             <Border
                                 x:Name="Root"
@@ -547,7 +547,7 @@
                                         MinHeight="{StaticResource ScrollBarSize}"
                                         IsTabStop="False"
                                         Margin="0"
-                                        Content="{StaticResource ChevronLeft}"
+                                        Content="{StaticResource CaretLeft}"
                                         Template="{StaticResource ScrollBarButtonTemplate}"
                                         Width="{StaticResource ScrollBarSize}"
                                         VerticalAlignment="Center" />
@@ -597,7 +597,7 @@
                                         MinHeight="{StaticResource ScrollBarSize}"
                                         IsTabStop="False"
                                         Margin="0"
-                                        Content="{StaticResource ChevronRight}"
+                                        Content="{StaticResource CaretRight}"
                                         Template="{StaticResource ScrollBarButtonTemplate}"
                                         Width="{StaticResource ScrollBarSize}"
                                         VerticalAlignment="Center" />
diff --git a/ModernWpf/ThemeResources/Dark.xaml b/ModernWpf/ThemeResources/Dark.xaml
index f2cf4049..a38db942 100644
--- a/ModernWpf/ThemeResources/Dark.xaml
+++ b/ModernWpf/ThemeResources/Dark.xaml
@@ -1637,11 +1637,11 @@
     <m:StaticResource x:Key="ToggleSwitchFillOn" ResourceKey="AccentAAFillColorDefaultBrush" />
     <m:StaticResource x:Key="ToggleSwitchFillOnPointerOver" ResourceKey="AccentAAFillColorSecondaryBrush" />
     <m:StaticResource x:Key="ToggleSwitchFillOnPressed" ResourceKey="AccentAAFillColorTertiaryBrush" />
-    <m:StaticResource x:Key="ToggleSwitchFillOnDisabled" ResourceKey="AccentAAFillColorDisabled" />
+    <m:StaticResource x:Key="ToggleSwitchFillOnDisabled" ResourceKey="AccentAAFillColorDefaultBrush" />
     <m:StaticResource x:Key="ToggleSwitchStrokeOn" ResourceKey="AccentAAFillColorDefaultBrush" />
     <m:StaticResource x:Key="ToggleSwitchStrokeOnPointerOver" ResourceKey="AccentAAFillColorSecondaryBrush" />
     <m:StaticResource x:Key="ToggleSwitchStrokeOnPressed" ResourceKey="AccentAAFillColorTertiaryBrush" />
-    <m:StaticResource x:Key="ToggleSwitchStrokeOnDisabled" ResourceKey="AccentAAFillColorDisabled" />
+    <m:StaticResource x:Key="ToggleSwitchStrokeOnDisabled" ResourceKey="AccentAAFillColorDefaultBrush" />
     <m:StaticResource x:Key="ToggleSwitchKnobFillOff" ResourceKey="TextFillColorSecondaryBrush" />
     <m:StaticResource x:Key="ToggleSwitchKnobFillOffPointerOver" ResourceKey="TextFillColorSecondary" />
     <m:StaticResource x:Key="ToggleSwitchKnobFillOffPressed" ResourceKey="TextFillColorSecondary" />
diff --git a/ModernWpf/ThemeResources/Light.xaml b/ModernWpf/ThemeResources/Light.xaml
index 38da3aa9..a28ab444 100644
--- a/ModernWpf/ThemeResources/Light.xaml
+++ b/ModernWpf/ThemeResources/Light.xaml
@@ -1639,11 +1639,11 @@
     <m:StaticResource x:Key="ToggleSwitchFillOn" ResourceKey="AccentAAFillColorDefaultBrush" />
     <m:StaticResource x:Key="ToggleSwitchFillOnPointerOver" ResourceKey="AccentAAFillColorSecondaryBrush" />
     <m:StaticResource x:Key="ToggleSwitchFillOnPressed" ResourceKey="AccentAAFillColorTertiaryBrush" />
-    <m:StaticResource x:Key="ToggleSwitchFillOnDisabled" ResourceKey="AccentAAFillColorDisabled" />
+    <m:StaticResource x:Key="ToggleSwitchFillOnDisabled" ResourceKey="AccentAAFillColorDefaultBrush" />
     <m:StaticResource x:Key="ToggleSwitchStrokeOn" ResourceKey="AccentAAFillColorDefaultBrush" />
     <m:StaticResource x:Key="ToggleSwitchStrokeOnPointerOver" ResourceKey="AccentAAFillColorSecondaryBrush" />
     <m:StaticResource x:Key="ToggleSwitchStrokeOnPressed" ResourceKey="AccentAAFillColorTertiaryBrush" />
-    <m:StaticResource x:Key="ToggleSwitchStrokeOnDisabled" ResourceKey="AccentAAFillColorDisabled" />
+    <m:StaticResource x:Key="ToggleSwitchStrokeOnDisabled" ResourceKey="AccentAAFillColorDisabledBrush" />
     <m:StaticResource x:Key="ToggleSwitchKnobFillOff" ResourceKey="TextFillColorSecondaryBrush" />
     <m:StaticResource x:Key="ToggleSwitchKnobFillOffPointerOver" ResourceKey="TextFillColorSecondary" />
     <m:StaticResource x:Key="ToggleSwitchKnobFillOffPressed" ResourceKey="TextFillColorSecondary" />