diff --git a/src/Resources/Styles.axaml b/src/Resources/Styles.axaml
index 9d63184a..27f858a0 100644
--- a/src/Resources/Styles.axaml
+++ b/src/Resources/Styles.axaml
@@ -1094,7 +1094,7 @@
     </Style>
   </Style>
   
-  <Style Selector="ToggleButton.change_tree_folder">
+  <Style Selector="ToggleButton.folder">
     <Setter Property="Margin" Value="0" />
     <Setter Property="Background" Value="Transparent"/>
     <Setter Property="IsHitTestVisible" Value="False"/>
@@ -1106,9 +1106,8 @@
                 HorizontalAlignment="Left"
                 VerticalAlignment="Center">
           <Path x:Name="ChevronPath"
-                Margin="0,2,0,0"
                 Data="{StaticResource Icons.Folder.Fill}"
-                Fill="Goldenrod"
+                Fill="{TemplateBinding Foreground}"
                 HorizontalAlignment="Center"
                 VerticalAlignment="Center"/>
         </Border>
@@ -1292,12 +1291,6 @@
       <Setter Property="Opacity" Value=".65"/>
     </Style>
   </Style>
-  <Style Selector="TreeViewItem[IsExpanded=True] Path.folder_icon">
-    <Setter Property="Data" Value="{StaticResource Icons.Folder.Open}"/>
-  </Style>
-  <Style Selector="TreeViewItem[IsExpanded=False] Path.folder_icon">
-    <Setter Property="Data" Value="{StaticResource Icons.Folder.Fill}"/>
-  </Style>
 
   <Style Selector="NumericUpDown">
     <Style Selector="^ /template/ ButtonSpinner#PART_Spinner">
diff --git a/src/Views/ChangeCollectionView.axaml b/src/Views/ChangeCollectionView.axaml
index 442897c6..d67b32be 100644
--- a/src/Views/ChangeCollectionView.axaml
+++ b/src/Views/ChangeCollectionView.axaml
@@ -47,9 +47,10 @@
                                             IsVisible="{Binding IsFolder}"/>
 
               <ToggleButton Grid.Column="1"
-                            Classes="change_tree_folder"
+                            Classes="folder"
                             Focusable="False"
                             Width="14" Height="14"
+                            Foreground="Goldenrod"
                             IsChecked="{Binding IsExpanded}"
                             IsVisible="{Binding IsFolder}"/>
 
diff --git a/src/Views/Welcome.axaml b/src/Views/Welcome.axaml
index 88669bd9..f8e304e9 100644
--- a/src/Views/Welcome.axaml
+++ b/src/Views/Welcome.axaml
@@ -94,18 +94,22 @@
                     PointerReleased="OnPointerReleasedOnTreeNode"
                     DoubleTapped="OnDoubleTappedTreeNode"
                     ClipToBounds="True">
-                <Path Grid.Column="0" Width="12" Height="12" Margin="0,0,8,0"
+                <Path Grid.Column="0" Width="12" Height="12" Margin="0,0,4,0"
                       Fill="{Binding Bookmark, Converter={x:Static c:BookmarkConverters.ToBrush}}"
                       StrokeThickness="{Binding Bookmark, Converter={x:Static c:BookmarkConverters.ToStrokeThickness}}"
                       Stroke="{DynamicResource Brush.FG1}"
                       HorizontalAlignment="Left"
                       Data="{StaticResource Icons.Bookmark}"
                       IsVisible="{Binding IsRepository}"/>
-                <Path Grid.Column="0" Classes="folder_icon"
-                      Width="12" Height="12" Margin="0,2,8,0"
-                      Fill="{DynamicResource Brush.FG1}"
-                      HorizontalAlignment="Left"
-                      IsVisible="{Binding !IsRepository}"/>
+
+                <ToggleButton Grid.Column="0"
+                              Classes="folder"
+                              Focusable="False"
+                              Width="12" Height="12"
+                              Margin="0,0,4,0"
+                              Foreground="{DynamicResource Brush.FG1}"
+                              IsChecked="{Binding IsExpanded}"
+                              IsVisible="{Binding !IsRepository}"/>
 
                 <TextBlock Grid.Column="1" Classes="monospace" VerticalAlignment="Center" Text="{Binding Name}"/>
                 <TextBlock Grid.Column="2"