diff --git a/src/Resources/Styles/ToggleButton.xaml b/src/Resources/Styles/ToggleButton.xaml
index 7a737715..302e084f 100644
--- a/src/Resources/Styles/ToggleButton.xaml
+++ b/src/Resources/Styles/ToggleButton.xaml
@@ -4,9 +4,37 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ToggleButton}">
-                    <Grid Background="Transparent">
-                        <ContentPresenter/>
+                    <Grid Background="Transparent" Margin="4,0">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="*"/>
+                        </Grid.ColumnDefinitions>
+
+                        <Path
+                            x:Name="ExpanderIcon"
+                            Grid.Column="0"
+                            Width="10" Height="10"
+                            Style="{DynamicResource Style.Icon}"
+                            Data="{DynamicResource Icon.Down}"
+                            Fill="{DynamicResource Brush.FG2}"
+                            RenderTransformOrigin=".5,.5">
+                            <Path.RenderTransform>
+                                <RotateTransform Angle="270"/>
+                            </Path.RenderTransform>
+                        </Path>
+                        
+                        <ContentPresenter Grid.Column="1"/>
                     </Grid>
+
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsChecked" Value="True">
+                            <Setter TargetName="ExpanderIcon" Property="RenderTransform">
+                                <Setter.Value>
+                                    <RotateTransform Angle="0"/>
+                                </Setter.Value>
+                            </Setter>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
diff --git a/src/UI/Dashboard.xaml b/src/UI/Dashboard.xaml
index b3d909b8..ff841b7d 100644
--- a/src/UI/Dashboard.xaml
+++ b/src/UI/Dashboard.xaml
@@ -360,7 +360,7 @@
                     Grid.Row="6" 
                     Style="{StaticResource Style.ToggleButton.Expender}"
                     IsChecked="{Binding Source={x:Static source:App.Preference}, Path=UIShowTags, Mode=TwoWay}">
-                    <Grid Margin="4,0,2,0">
+                    <Grid>
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="*"/>
                             <ColumnDefinition Width="16"/>
@@ -427,7 +427,7 @@
                     Grid.Row="9" 
                     Style="{StaticResource Style.ToggleButton.Expender}"
                     IsChecked="False">
-                    <Grid Margin="4,0,2,0">
+                    <Grid>
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="*"/>
                             <ColumnDefinition Width="16"/>