diff --git a/src/Notepads/Controls/FindAndReplace/FindAndReplaceControl.xaml b/src/Notepads/Controls/FindAndReplace/FindAndReplaceControl.xaml
index 0015256b3..76074e062 100644
--- a/src/Notepads/Controls/FindAndReplace/FindAndReplaceControl.xaml
+++ b/src/Notepads/Controls/FindAndReplace/FindAndReplaceControl.xaml
@@ -9,6 +9,44 @@
              d:DesignHeight="72"
              mc:Ignorable="d">
 
+    <UserControl.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="ms-appx:///Resource/ExpanderToggleButtonStyle.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+
+            <x:Double x:Key="ExpanderChevronEndRotateTransformAngle">90.0</x:Double>
+
+            <x:String x:Key="LineAnimationDuration">00:00:00.500</x:String>
+            <BackEase x:Key="LineEaseOutBackEase" EasingMode="EaseOut" Amplitude="0.75" />
+            <BackEase x:Key="LineEaseInBackEase" EasingMode="EaseIn" Amplitude="0.75" />
+
+            <Storyboard x:Name="OptionButtonSelectionIndicatorLineVisible">
+                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="OptionButtonSelectionIndicator" Storyboard.TargetProperty="Visibility">
+                    <DiscreteObjectKeyFrame KeyTime="0" Value="Visible" />
+                </ObjectAnimationUsingKeyFrames>
+                <DoubleAnimationUsingKeyFrames Storyboard.TargetName="OptionButtonSelectionIndicator" Storyboard.TargetProperty="X1" EnableDependentAnimation="True">
+                    <EasingDoubleKeyFrame KeyTime="{StaticResource LineAnimationDuration}" Value="9" EasingFunction="{StaticResource LineEaseOutBackEase}" />
+                </DoubleAnimationUsingKeyFrames>
+                <DoubleAnimationUsingKeyFrames Storyboard.TargetName="OptionButtonSelectionIndicator" Storyboard.TargetProperty="X2" EnableDependentAnimation="True">
+                    <EasingDoubleKeyFrame KeyTime="{StaticResource LineAnimationDuration}" Value="23" EasingFunction="{StaticResource LineEaseOutBackEase}" />
+                </DoubleAnimationUsingKeyFrames>
+            </Storyboard>
+
+            <Storyboard x:Name="OptionButtonSelectionIndicatorLineCollapsed">
+                <DoubleAnimationUsingKeyFrames Storyboard.TargetName="OptionButtonSelectionIndicator" Storyboard.TargetProperty="X1" EnableDependentAnimation="True">
+                    <EasingDoubleKeyFrame KeyTime="{StaticResource LineAnimationDuration}" Value="16" EasingFunction="{StaticResource LineEaseInBackEase}" />
+                </DoubleAnimationUsingKeyFrames>
+                <DoubleAnimationUsingKeyFrames Storyboard.TargetName="OptionButtonSelectionIndicator" Storyboard.TargetProperty="X2" EnableDependentAnimation="True">
+                    <EasingDoubleKeyFrame KeyTime="{StaticResource LineAnimationDuration}" Value="16" EasingFunction="{StaticResource LineEaseInBackEase}" />
+                </DoubleAnimationUsingKeyFrames>
+                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="OptionButtonSelectionIndicator" Storyboard.TargetProperty="Visibility">
+                    <DiscreteObjectKeyFrame KeyTime="{StaticResource LineAnimationDuration}" Value="Collapsed" />
+                </ObjectAnimationUsingKeyFrames>
+            </Storyboard>
+        </ResourceDictionary>
+    </UserControl.Resources>
+
     <Grid x:Name="FindAndReplaceRootGrid"
           Padding="1,1,1,1"
           RowSpacing="4"
@@ -26,15 +64,14 @@
         <Grid x:Name="ToggleReplaceModeButtonGrid"
               Grid.Row="0"
               Grid.Column="0">
-            <Button x:Name="ToggleReplaceModeButton"
-                    x:Uid="FindAndReplace_ToggleReplaceModeButton"
-                    Style="{StaticResource DismissButtonStyle}"
-                    Width="20"
-                    MinHeight="32"
-                    d:Content="&#xE76C;"
-                    FontSize="12"
-                    Click="ToggleReplaceModeButton_OnClick"
-                    IsTabStop="False" />
+            <ToggleButton x:Name="ToggleReplaceModeButton"
+                          x:Uid="FindAndReplace_ToggleReplaceModeButton"
+                          Style="{StaticResource ExpanderToggleButtonStyle}"
+                          Width="20"
+                          MinHeight="32"
+                          Content="{StaticResource ExpanderChevronRightGlyph}"
+                          Click="ToggleReplaceModeButton_OnClick"
+                          IsTabStop="False" />
         </Grid>
 
         <RelativePanel x:Name="FindBarPlaceHolder"
@@ -61,61 +98,15 @@
 
             <Grid x:Name="OptionButtonGrid" RelativePanel.AlignRightWithPanel="True">
                 <Line x:Name="OptionButtonSelectionIndicator"
-                      X1="16" Y1="24"
-                      X2="16" Y2="24"
+                      X1="16" Y1="24" d:X1="9"
+                      X2="16" Y2="24" d:X2="23"
                       Stroke="{ThemeResource SystemControlHighlightAccentBrush}"
                       StrokeThickness="2"
                       StrokeStartLineCap="Round"
                       StrokeEndLineCap="Round"
                       Visibility="Collapsed"
                       d:Visibility="Visible"
-                      IsHitTestVisible="False">
-                    <Line.Resources>
-                        <Storyboard x:Name="OptionButtonSelectionIndicatorLineVisible">
-                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="OptionButtonSelectionIndicator" Storyboard.TargetProperty="Visibility">
-                                <DiscreteObjectKeyFrame KeyTime="0" Value="Visible" />
-                            </ObjectAnimationUsingKeyFrames>
-                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="OptionButtonSelectionIndicator" Storyboard.TargetProperty="X1" EnableDependentAnimation="True">
-                                <DiscreteDoubleKeyFrame KeyTime="0" Value="16" />
-                                <EasingDoubleKeyFrame KeyTime="00:00:00.500" Value="9">
-                                    <EasingDoubleKeyFrame.EasingFunction>
-                                        <BackEase Amplitude="0.75" EasingMode="EaseOut" />
-                                    </EasingDoubleKeyFrame.EasingFunction>
-                                </EasingDoubleKeyFrame>
-                            </DoubleAnimationUsingKeyFrames>
-                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="OptionButtonSelectionIndicator" Storyboard.TargetProperty="X2" EnableDependentAnimation="True">
-                                <DiscreteDoubleKeyFrame KeyTime="0" Value="16" />
-                                <EasingDoubleKeyFrame KeyTime="00:00:00.500" Value="23">
-                                    <EasingDoubleKeyFrame.EasingFunction>
-                                        <BackEase Amplitude="0.75" EasingMode="EaseOut" />
-                                    </EasingDoubleKeyFrame.EasingFunction>
-                                </EasingDoubleKeyFrame>
-                            </DoubleAnimationUsingKeyFrames>
-                        </Storyboard>
-
-                        <Storyboard x:Name="OptionButtonSelectionIndicatorLineCollapsed">
-                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="OptionButtonSelectionIndicator" Storyboard.TargetProperty="X1" EnableDependentAnimation="True">
-                                <DiscreteDoubleKeyFrame KeyTime="0" Value="9" />
-                                <EasingDoubleKeyFrame KeyTime="00:00:00.500" Value="16">
-                                    <EasingDoubleKeyFrame.EasingFunction>
-                                        <BackEase Amplitude="0.75" EasingMode="EaseIn" />
-                                    </EasingDoubleKeyFrame.EasingFunction>
-                                </EasingDoubleKeyFrame>
-                            </DoubleAnimationUsingKeyFrames>
-                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="OptionButtonSelectionIndicator" Storyboard.TargetProperty="X2" EnableDependentAnimation="True">
-                                <DiscreteDoubleKeyFrame KeyTime="0" Value="23" />
-                                <EasingDoubleKeyFrame KeyTime="00:00:00.500" Value="16">
-                                    <EasingDoubleKeyFrame.EasingFunction>
-                                        <BackEase Amplitude="0.75" EasingMode="EaseIn" />
-                                    </EasingDoubleKeyFrame.EasingFunction>
-                                </EasingDoubleKeyFrame>
-                            </DoubleAnimationUsingKeyFrames>
-                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="OptionButtonSelectionIndicator" Storyboard.TargetProperty="Visibility">
-                                <DiscreteObjectKeyFrame KeyTime="00:0:00.500" Value="Collapsed" />
-                            </ObjectAnimationUsingKeyFrames>
-                        </Storyboard>
-                    </Line.Resources>
-                </Line>
+                      IsHitTestVisible="False" />
                 <Button x:Name="OptionButton"
                         x:Uid="FindAndReplace_SearchOptionButton"
                         Style="{StaticResource DismissButtonStyle}"
diff --git a/src/Notepads/Controls/FindAndReplace/FindAndReplaceControl.xaml.cs b/src/Notepads/Controls/FindAndReplace/FindAndReplaceControl.xaml.cs
index 6367221e7..9747843b7 100644
--- a/src/Notepads/Controls/FindAndReplace/FindAndReplaceControl.xaml.cs
+++ b/src/Notepads/Controls/FindAndReplace/FindAndReplaceControl.xaml.cs
@@ -119,7 +119,6 @@ public void ShowReplaceBar(bool showReplaceBar)
             {
                 ToggleReplaceModeButtonGrid.SetValue(Grid.RowSpanProperty, 2);
                 ToggleReplaceModeButton.VerticalAlignment = VerticalAlignment.Stretch;
-                ToggleReplaceModeButton.Content = "\uE70D";
                 ReplaceBarPlaceHolder.Visibility = Visibility.Visible;
                 if (!string.IsNullOrEmpty(FindBar.Text))
                 {
@@ -131,7 +130,6 @@ public void ShowReplaceBar(bool showReplaceBar)
             {
                 ToggleReplaceModeButtonGrid.SetValue(Grid.RowSpanProperty, 1);
                 ToggleReplaceModeButton.VerticalAlignment = VerticalAlignment.Top;
-                ToggleReplaceModeButton.Content = "\uE76C";
                 ReplaceBarPlaceHolder.Visibility = Visibility.Collapsed;
                 ReplaceButton.IsEnabled = false;
                 ReplaceAllButton.IsEnabled = false;
diff --git a/src/Notepads/Notepads.csproj b/src/Notepads/Notepads.csproj
index 22000c977..0885d6024 100644
--- a/src/Notepads/Notepads.csproj
+++ b/src/Notepads/Notepads.csproj
@@ -405,6 +405,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Resource\ExpanderToggleButtonStyle.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Resource\TransparentTextBoxStyle.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/src/Notepads/Resource/ExpanderToggleButtonStyle.xaml b/src/Notepads/Resource/ExpanderToggleButtonStyle.xaml
new file mode 100644
index 000000000..0bc10fabf
--- /dev/null
+++ b/src/Notepads/Resource/ExpanderToggleButtonStyle.xaml
@@ -0,0 +1,181 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="using:Notepads">
+
+    <x:Double x:Key="ExpanderChevronGlyphSize">12</x:Double>
+    <x:String x:Key="ExpanderChevronRightGlyph">&#xE76C;</x:String>
+    <x:Double x:Key="ExpanderChevronStartRotateTransformAngle">0</x:Double>
+    <x:Double x:Key="ExpanderChevronEndRotateTransformAngle">180.0</x:Double>
+    <x:String x:Key="ExpandCollapseChevronAnimationDuration">00:00:00.200</x:String>
+    <x:String x:Key="ExpandCollapseChevronKeySpline">0.1,0.25,0.1,0.75</x:String>
+
+    <Style x:Key="ExpanderToggleButtonStyle" TargetType="ToggleButton">
+        <Setter Property="Background" Value="{ThemeResource SystemControlTransparentBrush}" />
+        <Setter Property="BackgroundSizing" Value="OuterBorderEdge" />
+        <Setter Property="BorderBrush" Value="{ThemeResource HyperlinkButtonBorderBrush}" />
+        <Setter Property="Padding" Value="0,0,0,0" />
+        <Setter Property="FontFamily" Value="{ThemeResource SymbolThemeFontFamily}" />
+        <Setter Property="FontSize" Value="{ThemeResource ExpanderChevronGlyphSize}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ToggleButton">
+                    <Grid x:Name="ToggleButtonGrid"
+                          Background="{TemplateBinding Background}"
+                          BackgroundSizing="{TemplateBinding BackgroundSizing}"
+                          BorderBrush="{TemplateBinding BorderBrush}"
+                          BorderThickness="{TemplateBinding BorderThickness}"
+                          CornerRadius="{TemplateBinding CornerRadius}"
+                          Padding="{TemplateBinding Padding}">
+                        <Grid.BackgroundTransition>
+                            <BrushTransition />
+                        </Grid.BackgroundTransition>
+
+                        <TextBlock x:Name="ExpandCollapseChevron"
+                                   HorizontalAlignment="Center"
+                                   VerticalAlignment="Center"
+                                   FontFamily="{TemplateBinding FontFamily}"
+                                   FontSize="{TemplateBinding FontSize}"
+                                   Text="{TemplateBinding Content}"
+                                   RenderTransformOrigin="0.5,0.5"
+                                   IsTextScaleFactorEnabled="False"
+                                   AutomationProperties.AccessibilityView="Raw">
+                            <TextBlock.RenderTransform>
+                                <RotateTransform x:Name="ExpandCollapseChevronRotateTransform" Angle="{ThemeResource ExpanderChevronStartRotateTransformAngle}" />
+                            </TextBlock.RenderTransform>
+                        </TextBlock>
+
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CommonStates">
+                                <VisualState x:Name="Normal">
+                                    <Storyboard>
+                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="ExpandCollapseChevronRotateTransform" Storyboard.TargetProperty="Angle">
+                                            <SplineDoubleKeyFrame KeyTime="{StaticResource ExpandCollapseChevronAnimationDuration}" Value="{ThemeResource ExpanderChevronStartRotateTransformAngle}" KeySpline="{ThemeResource ExpandCollapseChevronKeySpline}" />
+                                        </DoubleAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+
+                                <VisualState x:Name="PointerOver">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ToggleButtonGrid" Storyboard.TargetProperty="Background">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SystemControlTransparentBrush}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ToggleButtonGrid" Storyboard.TargetProperty="BorderBrush">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource HyperlinkButtonBorderBrushPointerOver}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ExpandCollapseChevron" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource HyperlinkButtonForegroundPointerOver}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="ExpandCollapseChevronRotateTransform" Storyboard.TargetProperty="Angle">
+                                            <SplineDoubleKeyFrame KeyTime="{StaticResource ExpandCollapseChevronAnimationDuration}" Value="{ThemeResource ExpanderChevronStartRotateTransformAngle}" KeySpline="{ThemeResource ExpandCollapseChevronKeySpline}" />
+                                        </DoubleAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+
+                                <VisualState x:Name="Pressed">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ToggleButtonGrid" Storyboard.TargetProperty="Background">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SystemControlTransparentBrush}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ToggleButtonGrid" Storyboard.TargetProperty="BorderBrush">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource HyperlinkButtonBorderBrushPressed}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ExpandCollapseChevron" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource HyperlinkButtonForegroundPressed}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="ExpandCollapseChevronRotateTransform" Storyboard.TargetProperty="Angle">
+                                            <SplineDoubleKeyFrame KeyTime="{StaticResource ExpandCollapseChevronAnimationDuration}" Value="{ThemeResource ExpanderChevronStartRotateTransformAngle}" KeySpline="{ThemeResource ExpandCollapseChevronKeySpline}" />
+                                        </DoubleAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+
+                                <VisualState x:Name="Disabled">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ToggleButtonGrid" Storyboard.TargetProperty="Background">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SystemControlTransparentBrush}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ToggleButtonGrid" Storyboard.TargetProperty="BorderBrush">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource HyperlinkButtonBorderBrushDisabled}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ExpandCollapseChevron" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource HyperlinkButtonForegroundDisabled}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="ExpandCollapseChevronRotateTransform" Storyboard.TargetProperty="Angle">
+                                            <SplineDoubleKeyFrame KeyTime="{StaticResource ExpandCollapseChevronAnimationDuration}" Value="{ThemeResource ExpanderChevronStartRotateTransformAngle}" KeySpline="{ThemeResource ExpandCollapseChevronKeySpline}" />
+                                        </DoubleAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+
+                                <VisualState x:Name="Checked">
+                                    <Storyboard>
+                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="ExpandCollapseChevronRotateTransform" Storyboard.TargetProperty="Angle">
+                                            <SplineDoubleKeyFrame KeyTime="{StaticResource ExpandCollapseChevronAnimationDuration}" Value="{ThemeResource ExpanderChevronEndRotateTransformAngle}" KeySpline="{ThemeResource ExpandCollapseChevronKeySpline}" />
+                                        </DoubleAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+
+                                <VisualState x:Name="CheckedPointerOver">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ToggleButtonGrid" Storyboard.TargetProperty="Background">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SystemControlTransparentBrush}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ToggleButtonGrid" Storyboard.TargetProperty="BorderBrush">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource HyperlinkButtonBorderBrushPointerOver}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ExpandCollapseChevron" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource HyperlinkButtonForegroundPointerOver}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="ExpandCollapseChevronRotateTransform" Storyboard.TargetProperty="Angle">
+                                            <SplineDoubleKeyFrame KeyTime="{StaticResource ExpandCollapseChevronAnimationDuration}" Value="{ThemeResource ExpanderChevronEndRotateTransformAngle}" KeySpline="{ThemeResource ExpandCollapseChevronKeySpline}" />
+                                        </DoubleAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+
+                                <VisualState x:Name="CheckedPressed">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ToggleButtonGrid" Storyboard.TargetProperty="Background">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SystemControlTransparentBrush}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ToggleButtonGrid" Storyboard.TargetProperty="BorderBrush">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource HyperlinkButtonBorderBrushPressed}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ExpandCollapseChevron" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource HyperlinkButtonForegroundPressed}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="ExpandCollapseChevronRotateTransform" Storyboard.TargetProperty="Angle">
+                                            <SplineDoubleKeyFrame KeyTime="{StaticResource ExpandCollapseChevronAnimationDuration}" Value="{ThemeResource ExpanderChevronEndRotateTransformAngle}" KeySpline="{ThemeResource ExpandCollapseChevronKeySpline}" />
+                                        </DoubleAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+
+                                <VisualState x:Name="CheckedDisabled">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ToggleButtonGrid" Storyboard.TargetProperty="Background">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SystemControlTransparentBrush}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ToggleButtonGrid" Storyboard.TargetProperty="BorderBrush">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource HyperlinkButtonBorderBrushDisabled}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ExpandCollapseChevron" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource HyperlinkButtonForegroundDisabled}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="ExpandCollapseChevronRotateTransform" Storyboard.TargetProperty="Angle">
+                                            <SplineDoubleKeyFrame KeyTime="{StaticResource ExpandCollapseChevronAnimationDuration}" Value="{ThemeResource ExpanderChevronEndRotateTransformAngle}" KeySpline="{ThemeResource ExpandCollapseChevronKeySpline}" />
+                                        </DoubleAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+
+                                <VisualState x:Name="Indeterminate" />
+                                <VisualState x:Name="IndeterminatePointerOver" />
+                                <VisualState x:Name="IndeterminatePressed" />
+                                <VisualState x:Name="IndeterminateDisabled" />
+
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                    </Grid>
+
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+</ResourceDictionary>