From 1d401d0955255f8bd16d72fdac7d9181ae50e1cb Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Fri, 2 Apr 2021 15:45:31 +0800
Subject: [PATCH] style<*>: use Style.Icon as default style of Path

---
 src/Resources/Styles/Button.xaml   |  2 +-
 src/Resources/Styles/ComboBox.xaml |  5 ++-
 src/Resources/Styles/Path.xaml     |  3 ++
 src/Resources/Styles/TreeView.xaml | 16 ++++----
 src/UI/About.xaml                  |  6 +--
 src/UI/Apply.xaml                  |  2 +-
 src/UI/Blame.xaml                  |  7 ++--
 src/UI/CherryPick.xaml             |  2 +-
 src/UI/Clone.xaml                  |  2 +-
 src/UI/CommitViewer.xaml           | 12 +++---
 src/UI/CommitViewer.xaml.cs        |  1 -
 src/UI/CreateBranch.xaml           |  2 +-
 src/UI/CreateTag.xaml              |  2 +-
 src/UI/Dashboard.xaml              | 62 +++++++++++++++---------------
 src/UI/Dashboard.xaml.cs           |  3 --
 src/UI/DeleteBranch.xaml           |  2 +-
 src/UI/DeleteRemote.xaml           |  2 +-
 src/UI/DeleteTag.xaml              |  2 +-
 src/UI/DiffViewer.xaml             | 16 ++++----
 src/UI/DiffViewer.xaml.cs          |  1 -
 src/UI/Discard.xaml                |  2 +-
 src/UI/Fetch.xaml                  |  2 +-
 src/UI/FileHistories.xaml          |  7 ++--
 src/UI/FolderDialog.xaml           |  6 +--
 src/UI/GitFlowFinishBranch.xaml    |  2 +-
 src/UI/Histories.xaml              | 10 ++---
 src/UI/Histories.xaml.cs           |  5 ---
 src/UI/Init.xaml                   |  2 +-
 src/UI/InteractiveRebase.xaml      | 18 ++++-----
 src/UI/Launcher.xaml               | 23 ++++++-----
 src/UI/Launcher.xaml.cs            |  1 -
 src/UI/Merge.xaml                  |  4 +-
 src/UI/NewPage.xaml                | 10 ++---
 src/UI/NewPage.xaml.cs             |  1 -
 src/UI/PopupManager.xaml           |  2 +-
 src/UI/Pull.xaml                   |  6 +--
 src/UI/Push.xaml                   |  6 +--
 src/UI/PushTag.xaml                |  4 +-
 src/UI/Rebase.xaml                 |  4 +-
 src/UI/RenameBranch.xaml           |  2 +-
 src/UI/Reset.xaml                  |  6 +--
 src/UI/Revert.xaml                 |  2 +-
 src/UI/SettingDialog.xaml          | 10 ++---
 src/UI/TwoCommitsDiff.xaml         |  4 +-
 src/UI/UpdateAvailable.xaml        |  6 +--
 src/UI/WorkingCopy.xaml            | 16 ++++----
 46 files changed, 150 insertions(+), 161 deletions(-)

diff --git a/src/Resources/Styles/Button.xaml b/src/Resources/Styles/Button.xaml
index cf164da9..64dda4c3 100644
--- a/src/Resources/Styles/Button.xaml
+++ b/src/Resources/Styles/Button.xaml
@@ -4,8 +4,8 @@
     <Style x:Key="Style.Button" TargetType="{x:Type Button}">
         <Setter Property="Background" Value="Transparent"/>
         <Setter Property="TextElement.Foreground" Value="{DynamicResource Brush.FG1}"/>
-        <Setter Property="Opacity" Value="0.9"/>
         <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="Opacity" Value=".8"/>
         <Setter Property="SnapsToDevicePixels" Value="True"/>
 
         <Setter Property="Template">
diff --git a/src/Resources/Styles/ComboBox.xaml b/src/Resources/Styles/ComboBox.xaml
index d70aa1b1..2285841e 100644
--- a/src/Resources/Styles/ComboBox.xaml
+++ b/src/Resources/Styles/ComboBox.xaml
@@ -9,7 +9,7 @@
             
             <Border x:Name="Border" Grid.ColumnSpan="2" CornerRadius="0" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{DynamicResource Brush.Border1}" Background="Transparent"/>
             <Border Grid.Column="0" CornerRadius="0" Margin="1" Background="Transparent"/>
-            <Path x:Name="Arrow" Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center" Data="M 0 0 L 4 4 L 8 0 Z" Fill="{DynamicResource Brush.Border1}"/>
+            <Path x:Name="Arrow" Grid.Column="1" Width="10" Height="10" HorizontalAlignment="Center" VerticalAlignment="Center" Data="M 0 0 L 4 4 L 8 0 Z" Fill="{DynamicResource Brush.Border1}"/>
         </Grid>
 
         <ControlTemplate.Triggers>
@@ -56,6 +56,9 @@
                             <Setter TargetName="DropDownBorder" Property="CornerRadius" Value="0" />
                             <Setter TargetName="DropDownBorder" Property="Margin" Value="0,2,0,0" />
                         </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Opacity" Value=".5"/>
+                        </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>
diff --git a/src/Resources/Styles/Path.xaml b/src/Resources/Styles/Path.xaml
index 1758621b..26a304f2 100644
--- a/src/Resources/Styles/Path.xaml
+++ b/src/Resources/Styles/Path.xaml
@@ -9,4 +9,7 @@
         <Setter Property="SnapsToDevicePixels" Value="True"/>
         <Setter Property="RenderOptions.BitmapScalingMode" Value="HighQuality"/>
     </Style>
+
+    <!-- 修改默认样式 -->
+    <Style TargetType="{x:Type Path}" BasedOn="{StaticResource Style.Icon}"/>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Resources/Styles/TreeView.xaml b/src/Resources/Styles/TreeView.xaml
index 605f8c0b..66cbbf12 100644
--- a/src/Resources/Styles/TreeView.xaml
+++ b/src/Resources/Styles/TreeView.xaml
@@ -12,7 +12,7 @@
             <Setter.Value>
                 <ControlTemplate TargetType="ToggleButton">
                     <Grid Width="16" Height="16" Margin="1" Background="Transparent">
-                        <Path x:Name="ExpandPath" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="1,1,1,1" Fill="{DynamicResource Brush.FG1}" Data="M 4 0 L 8 4 L 4 8 Z"/>
+                        <Path x:Name="ExpandPath" HorizontalAlignment="Left" Width="8" Height="8" VerticalAlignment="Center" Margin="4,0,0,0" Fill="{DynamicResource Brush.FG1}" Data="M 4 0 L 8 4 L 4 8 Z"/>
                     </Grid>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsChecked" Value="True">
@@ -31,16 +31,15 @@
         <Setter Property="HorizontalContentAlignment" Value="{Binding HorizontalContentAlignment, Mode=OneWay, FallbackValue=Stretch, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
         <Setter Property="VerticalContentAlignment" Value="{Binding VerticalContentAlignment, Mode=OneWay, FallbackValue=Center, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
         <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="Padding" Value="{Binding Padding, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type TreeViewItem}">
                     <StackPanel>
-                        <Border 
-                            x:Name="BG" 
-                            Background="Transparent" 
-                            BorderThickness="0" 
-                            Padding="{TemplateBinding Padding}"
-                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
+                        <Border x:Name="BG" 
+                                Background="Transparent" 
+                                Padding="{TemplateBinding Padding}" 
+                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
                             <Grid
                                 Margin="{Binding Converter={StaticResource Converter.TreeViewItemIndent}, RelativeSource={x:Static RelativeSource.TemplatedParent}}"
                                 VerticalAlignment="Stretch" 
@@ -179,8 +178,7 @@
                             BorderThickness="0"
                             CornerRadius="0"
                             SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
-                        <ScrollViewer Padding="{TemplateBinding Padding}"
-                                      CanContentScroll="{TemplateBinding ScrollViewer.CanContentScroll}"
+                        <ScrollViewer CanContentScroll="{TemplateBinding ScrollViewer.CanContentScroll}"
                                       Focusable="False"
                                       HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
                                       VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}"
diff --git a/src/UI/About.xaml b/src/UI/About.xaml
index 020ce733..56f88e60 100644
--- a/src/UI/About.xaml
+++ b/src/UI/About.xaml
@@ -31,7 +31,7 @@
                 </Grid.ColumnDefinitions>
 
                 <!-- LOGO -->
-                <Path Margin="6,0,2,0" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Info}"/>
+                <Path Margin="6,0,2,0" Data="{StaticResource Icon.Info}"/>
 
                 <!-- Title -->
                 <Label Grid.Column="1" Content="{StaticResource Text.About}" FontWeight="Light"/>
@@ -48,7 +48,7 @@
                         </Style>
                     </Button.Style>
 
-                    <Path Width="10" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Close}"/>
+                    <Path Width="10" Data="{StaticResource Icon.Close}"/>
                 </Button>
             </Grid>
 
@@ -62,7 +62,7 @@
                 </Grid.RowDefinitions>
 
                 <StackPanel Grid.Row="0" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,6,0,0">
-                    <Path Width="64" Height="64" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Git}" Fill="{StaticResource Brush.Logo}"/>
+                    <Path Width="64" Height="64" Data="{StaticResource Icon.Git}" Fill="{StaticResource Brush.Logo}"/>
                 </StackPanel>
 
                 <Label Grid.Row="1" Content="{StaticResource Text.About.Title}" HorizontalContentAlignment="Center" VerticalContentAlignment="Bottom" FontSize="18" FontWeight="Bold"/>
diff --git a/src/UI/Apply.xaml b/src/UI/Apply.xaml
index a3e58021..94643256 100644
--- a/src/UI/Apply.xaml
+++ b/src/UI/Apply.xaml
@@ -52,7 +52,7 @@
             </TextBox>
 
             <Button Grid.Column="1" Width="24" Height="24" Click="FindPatchFile" Padding="0" BorderThickness="1" Style="{StaticResource Style.Button.Bordered}">
-                <Path Width="14" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Folder}"/>
+                <Path Width="14" Data="{StaticResource Icon.Folder}"/>
             </Button>
         </Grid>
 
diff --git a/src/UI/Blame.xaml b/src/UI/Blame.xaml
index 2c6fc20f..74a0538f 100644
--- a/src/UI/Blame.xaml
+++ b/src/UI/Blame.xaml
@@ -50,7 +50,6 @@
                 <StackPanel Grid.Column="0" Orientation="Horizontal">
                     <Path
                         Width="20" Height="20" Margin="6,-1,2,0"
-                        Style="{StaticResource Style.Icon}" 
                         Data="{StaticResource Icon.Git}" 
                         Fill="{StaticResource Brush.Logo}"
                         WindowChrome.IsHitTestVisibleInChrome="True"
@@ -61,10 +60,10 @@
                 <!-- Options -->
                 <StackPanel Grid.Column="2" Orientation="Horizontal" WindowChrome.IsHitTestVisibleInChrome="True">
                     <Button Click="Minimize" Width="32" Style="{StaticResource Style.Button.HighlightHover}">
-                        <Path Width="10" Height="10" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Minimize}"/>
+                        <Path Width="10" Height="10" Data="{StaticResource Icon.Minimize}"/>
                     </Button>
                     <Button Click="MaximizeOrRestore" Width="32" Style="{StaticResource Style.Button.HighlightHover}">
-                        <Path Width="10" Height="10" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Maximize}"/>
+                        <Path Width="10" Height="10" Data="{StaticResource Icon.Maximize}"/>
                     </Button>
                     <Button Click="Quit" Width="32">
                         <Button.Style>
@@ -77,7 +76,7 @@
                             </Style>
                         </Button.Style>
 
-                        <Path Width="10" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Close}"/>
+                        <Path Width="10" Data="{StaticResource Icon.Close}"/>
                     </Button>
                 </StackPanel>
             </Grid>
diff --git a/src/UI/CherryPick.xaml b/src/UI/CherryPick.xaml
index 2b0b4ec0..b6081361 100644
--- a/src/UI/CherryPick.xaml
+++ b/src/UI/CherryPick.xaml
@@ -24,7 +24,7 @@
 
         <Label Grid.Row="2" Grid.Column="0" HorizontalAlignment="Right" Content="{StaticResource Text.CherryPick.Commit}"/>
         <StackPanel Grid.Row="2" Grid.Column="1" Orientation="Horizontal">
-            <Path Width="12" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Commit}" Margin="4,0"/>
+            <Path Width="12" Data="{StaticResource Icon.Commit}" Margin="4,0"/>
             <TextBlock x:Name="desc" Text="cad" Padding="4,0,0,0" Foreground="{StaticResource Brush.FG1}" VerticalAlignment="Center"/>
         </StackPanel>
 
diff --git a/src/UI/Clone.xaml b/src/UI/Clone.xaml
index abff5f00..d8a76a49 100644
--- a/src/UI/Clone.xaml
+++ b/src/UI/Clone.xaml
@@ -60,7 +60,7 @@
                 </TextBox.Text>
             </TextBox>
             <Button Grid.Column="1" Width="24" Height="24" Padding="0" BorderThickness="1" Click="SelectParentFolder" Style="{StaticResource Style.Button.Bordered}">
-                <Path Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Folder}"/>
+                <Path Data="{StaticResource Icon.Folder}"/>
             </Button>
         </Grid>
 
diff --git a/src/UI/CommitViewer.xaml b/src/UI/CommitViewer.xaml
index 8200e010..5c26b016 100644
--- a/src/UI/CommitViewer.xaml
+++ b/src/UI/CommitViewer.xaml
@@ -163,7 +163,7 @@
                                         </Grid.ColumnDefinitions>
 
                                         <Border Grid.Column="0" Background="{StaticResource Brush.Decorator}">
-                                            <Path x:Name="Icon" Width="8" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Branch}"/>
+                                            <Path x:Name="Icon" Width="8" Data="{StaticResource Icon.Branch}"/>
                                         </Border>
 
                                         <Label x:Name="Name" Grid.Column="1" Content="{Binding Name}" FontSize="11" Padding="4,0" Foreground="Black"/>
@@ -289,7 +289,7 @@
                         </Grid.ColumnDefinitions>
 
                         <Border Grid.Column="0" Grid.ColumnSpan="2" BorderThickness="1" BorderBrush="{StaticResource Brush.Border2}"/>
-                        <Path Grid.Column="0" Width="14" Height="14" Fill="{StaticResource Brush.FG2}" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Search}"/>
+                        <Path Grid.Column="0" Width="14" Height="14" Fill="{StaticResource Brush.FG2}" Data="{StaticResource Icon.Search}"/>
                         <TextBox Grid.Column="1" x:Name="txtChangeFilter" BorderThickness="0" helpers:TextBoxHelper.Placeholder="{StaticResource Text.CommitViewer.Changes.Search}" TextChanged="SearchChangeFileTextChanged"/>
                         <ToggleButton
                             Grid.Column="2" 
@@ -327,7 +327,7 @@
                                     <Border x:Name="status" Width="14" Height="14" Visibility="Collapsed" Background="{Binding Change, Converter={StaticResource StatusColorConverter}}" CornerRadius="2" Margin="0,0,4,0">
                                         <TextBlock Text="{Binding Change, Converter={StaticResource StatusIconConverter}}" Foreground="{StaticResource Brush.FG1}" TextAlignment="Center" VerticalAlignment="Center" FontSize="10" RenderOptions.BitmapScalingMode="HighQuality"/>
                                     </Border>
-                                    <Path x:Name="icon" Width="14" Style="{StaticResource Style.Icon}" Fill="Goldenrod" Data="{StaticResource Icon.Folder.Fill}"/>
+                                    <Path x:Name="icon" Width="14" Fill="Goldenrod" Data="{StaticResource Icon.Folder.Fill}"/>
                                     <TextBlock Text="{Binding Name}" Foreground="{StaticResource Brush.FG1}" TextAlignment="Center" VerticalAlignment="Center" Margin="4,0,0,0" FontSize="11"/>
                                 </StackPanel>
 
@@ -420,7 +420,7 @@
                         <TreeView.ItemTemplate>
                             <HierarchicalDataTemplate ItemsSource="{Binding Children}">
                                 <StackPanel Orientation="Horizontal" Height="24">
-                                    <Path x:Name="icon" Width="14" Style="{StaticResource Style.Icon}" Fill="Goldenrod" Data="{StaticResource Icon.Folder.Fill}"/>
+                                    <Path x:Name="icon" Width="14" Fill="Goldenrod" Data="{StaticResource Icon.Folder.Fill}"/>
                                     <TextBlock Text="{Binding Name}" Foreground="{StaticResource Brush.FG1}" TextAlignment="Center" VerticalAlignment="Center" Margin="6,0,0,0" FontSize="11"/>
                                 </StackPanel>
 
@@ -455,12 +455,12 @@
                         </ScrollViewer>
 
                         <StackPanel x:Name="maskRevision" Orientation="Vertical" VerticalAlignment="Center" HorizontalAlignment="Center" Visibility="Collapsed">
-                            <Path x:Name="iconPreviewRevision" Width="64" Height="64" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Submodule}" Fill="{StaticResource Brush.FG2}"/>
+                            <Path x:Name="iconPreviewRevision" Width="64" Height="64" Data="{StaticResource Icon.Submodule}" Fill="{StaticResource Brush.FG2}"/>
                             <Label x:Name="txtPreviewRevision" Margin="0,16,0,0" FontFamily="Consolas" FontSize="18" FontWeight="UltraBold" HorizontalAlignment="Center" Foreground="{StaticResource Brush.FG2}"/>
                         </StackPanel>
 
                         <StackPanel x:Name="maskPreviewNotSupported" Orientation="Vertical" VerticalAlignment="Center" HorizontalAlignment="Center" Visibility="Collapsed">
-                            <Path Width="64" Height="64" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Info}" Fill="{StaticResource Brush.FG2}"/>
+                            <Path Width="64" Height="64" Data="{StaticResource Icon.Info}" Fill="{StaticResource Brush.FG2}"/>
                             <Label Margin="0,16,0,0" Content="{StaticResource Text.BinaryNotSupported}" FontFamily="Consolas" FontSize="18" FontWeight="UltraBold" HorizontalAlignment="Center" Foreground="{StaticResource Brush.FG2}"/>
                         </StackPanel>
                     </Grid>
diff --git a/src/UI/CommitViewer.xaml.cs b/src/UI/CommitViewer.xaml.cs
index 9e72bdc2..54e6622d 100644
--- a/src/UI/CommitViewer.xaml.cs
+++ b/src/UI/CommitViewer.xaml.cs
@@ -438,7 +438,6 @@ namespace SourceGit.UI {
             var menu = new ContextMenu();
 
             var copyIcon = new System.Windows.Shapes.Path();
-            copyIcon.Style = FindResource("Style.Icon") as Style;
             copyIcon.Data = FindResource("Icon.Copy") as Geometry;
             copyIcon.Width = 10;
 
diff --git a/src/UI/CreateBranch.xaml b/src/UI/CreateBranch.xaml
index 54a4a2d7..048e51dd 100644
--- a/src/UI/CreateBranch.xaml
+++ b/src/UI/CreateBranch.xaml
@@ -33,7 +33,7 @@
 
         <Label Grid.Row="2" Grid.Column="0" HorizontalAlignment="Right" Content="{StaticResource Text.CreateBranch.BasedOn}"/>
         <StackPanel Grid.Row="2" Grid.Column="1" Orientation="Horizontal">
-            <Path x:Name="basedOnType" Width="12" Style="{StaticResource Style.Icon}"/>
+            <Path x:Name="basedOnType" Width="12"/>
             <TextBlock x:Name="basedOnDesc" Padding="4,0,0,0" Foreground="{StaticResource Brush.FG1}" VerticalAlignment="Center" Text="master"/>
         </StackPanel>
 
diff --git a/src/UI/CreateTag.xaml b/src/UI/CreateTag.xaml
index 5467c7c6..0d9f67dd 100644
--- a/src/UI/CreateTag.xaml
+++ b/src/UI/CreateTag.xaml
@@ -27,7 +27,7 @@
 
         <Label Grid.Row="2" Grid.Column="0" HorizontalAlignment="Right" VerticalAlignment="Center" Content="{StaticResource Text.CreateTag.BasedOn}"/>
         <StackPanel Grid.Row="2" Grid.Column="1" Orientation="Horizontal">
-            <Path Width="12" x:Name="basedOnType" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Commit}"/>
+            <Path Width="12" x:Name="basedOnType" Data="{StaticResource Icon.Commit}"/>
             <TextBlock x:Name="basedOnDesc" Padding="4,0,0,0" Foreground="{StaticResource Brush.FG1}" VerticalAlignment="Center" Text="xxx"/>
         </StackPanel>
 
diff --git a/src/UI/Dashboard.xaml b/src/UI/Dashboard.xaml
index 50bd093e..30464ba8 100644
--- a/src/UI/Dashboard.xaml
+++ b/src/UI/Dashboard.xaml
@@ -43,14 +43,14 @@
                 <StackPanel Grid.Column="0" Orientation="Horizontal" Margin="6,0">
                     <Button Click="OpenExplorer" Margin="4,0,0,0" ToolTip="{StaticResource Text.Dashboard.Explore.Tip}">
                         <StackPanel Orientation="Horizontal">
-                            <Path Width="16" Height="12" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Folder.Open}"/>
+                            <Path Width="16" Height="12" Data="{StaticResource Icon.Folder.Open}"/>
                             <Label Content="{StaticResource Text.Dashboard.Explore}"/>
                         </StackPanel>
                     </Button>
 
                     <Button Click="OpenTerminal" Margin="4,0" ToolTip="{StaticResource Text.Dashboard.Terminal.Tip}">
                         <StackPanel Orientation="Horizontal">
-                            <Path Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Terminal}"/>
+                            <Path Data="{StaticResource Icon.Terminal}"/>
                             <Label Content="{StaticResource Text.Dashboard.Terminal}"/>
                         </StackPanel>
                     </Button>
@@ -58,33 +58,33 @@
                 
                 <!-- Common Git Options -->
                 <StackPanel Grid.Column="1" Orientation="Horizontal">
-                    <Button Click="OpenFetch" Style="{StaticResource Style.Button.HighlightHover}">
+                    <Button Click="OpenFetch">
                         <StackPanel Orientation="Horizontal" Margin="6,0">
-                            <Path Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Fetch}"/>
+                            <Path Data="{StaticResource Icon.Fetch}"/>
                             <Label Content="{StaticResource Text.Fetch}" Margin="4,0,0,0"/>
                         </StackPanel>
                     </Button>
-                    <Button Click="OpenPull" Style="{StaticResource Style.Button.HighlightHover}">
+                    <Button Click="OpenPull">
                         <StackPanel Orientation="Horizontal" Margin="6,0">
-                            <Path Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Pull}"/>
+                            <Path Data="{StaticResource Icon.Pull}"/>
                             <Label Content="{StaticResource Text.Pull}" Margin="4,0,0,0"/>
                         </StackPanel>
                     </Button>
-                    <Button Click="OpenPush" Style="{StaticResource Style.Button.HighlightHover}">
+                    <Button Click="OpenPush">
                         <StackPanel Orientation="Horizontal" Margin="6,0">
-                            <Path Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Push}"/>
+                            <Path Data="{StaticResource Icon.Push}"/>
                             <Label Content="{StaticResource Text.Push}" Margin="4,0,0,0"/>
                         </StackPanel>
                     </Button>
-                    <Button Click="OpenStash" Style="{StaticResource Style.Button.HighlightHover}">
+                    <Button Click="OpenStash">
                         <StackPanel Orientation="Horizontal" Margin="6,0">
-                            <Path Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.SaveStash}"/>
+                            <Path Data="{StaticResource Icon.SaveStash}"/>
                             <Label Content="{StaticResource Text.Stash}" Margin="4,0,0,0"/>
                         </StackPanel>
                     </Button>
-                    <Button Click="OpenApply" Style="{StaticResource Style.Button.HighlightHover}">
+                    <Button Click="OpenApply">
                         <StackPanel Orientation="Horizontal" Margin="6,0">
-                            <Path Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Apply}"/>
+                            <Path Data="{StaticResource Icon.Apply}"/>
                             <Label Content="{StaticResource Text.Apply}" Margin="4,0,0,0"/>
                         </StackPanel>
                     </Button>
@@ -94,13 +94,13 @@
                 <StackPanel Grid.Column="2" Orientation="Horizontal" HorizontalAlignment="Right">
                     <Button Click="OpenSearch" Margin="4,0" ToolTip="{StaticResource Text.Dashboard.Search.Tip}">
                         <StackPanel Orientation="Horizontal">
-                            <Path Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Search}"/>
+                            <Path Data="{StaticResource Icon.Search}"/>
                             <Label Content="{StaticResource Text.Dashboard.Search}"/>
                         </StackPanel>
                     </Button>
                     <Button Click="OpenConfigure" Margin="4,0" ToolTip="{StaticResource Text.Dashboard.Configure.Tip}">
                         <StackPanel Orientation="Horizontal">
-                            <Path Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Setting}"/>
+                            <Path Data="{StaticResource Icon.Setting}"/>
                             <Label Content="{StaticResource Text.Configure}"/>
                         </StackPanel>
                     </Button>
@@ -148,7 +148,7 @@
                     SelectionMode="Single">
                     <ListViewItem x:Name="historiesSwitch" Selected="SwitchHistories" IsSelected="True" Height="28">
                         <StackPanel Margin="16,0,0,0" Orientation="Horizontal">
-                            <Path Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Histories}"/>
+                            <Path Data="{StaticResource Icon.Histories}"/>
                             <Label Margin="4,0,0,0" Content="{StaticResource Text.Histories}"/>
                         </StackPanel>
                     </ListViewItem>
@@ -160,7 +160,7 @@
                                 <ColumnDefinition Width="*"/>
                                 <ColumnDefinition Width="Auto"/>
                             </Grid.ColumnDefinitions>
-                            <Path Grid.Column="0" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.WorkingCopy}"/>
+                            <Path Grid.Column="0" Data="{StaticResource Icon.WorkingCopy}"/>
                             <Label Grid.Column="1" Margin="4,0,0,0" Content="{StaticResource Text.WorkingCopy}"/>
                             <Border Grid.Column="2" x:Name="localChangesBadge" Style="{StaticResource Style.Border.Badge}">
                                 <Label x:Name="localChangesCount" Margin="4,-2,4,-2" Content="999" FontSize="10"/>
@@ -175,7 +175,7 @@
                                 <ColumnDefinition Width="*"/>
                                 <ColumnDefinition Width="Auto"/>
                             </Grid.ColumnDefinitions>
-                            <Path Grid.Column="0" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Stashes}"/>
+                            <Path Grid.Column="0" Data="{StaticResource Icon.Stashes}"/>
                             <Label Grid.Column="1" Margin="4,0,0,0" Content="{StaticResource Text.Stashes}"/>
                             <Border Grid.Column="2" x:Name="stashBadge" Style="{StaticResource Style.Border.Badge}">
                                 <Label x:Name="stashCount" Margin="4,-2,4,-2" Content="999" FontSize="10"/>
@@ -195,10 +195,10 @@
 
                     <Label Grid.Column="0" Margin="4,0,0,0" Content="{StaticResource Text.Dashboard.LocalBranches}" Style="{StaticResource Style.Label.GroupHeader}"/>
                     <Button Grid.Column="1" Click="OpenGitFlow" Background="Transparent" ToolTip="{StaticResource Text.GitFlow}">
-                        <Path Width="14" Height="14" Style="{StaticResource Style.Icon}" Data="{DynamicResource Icon.Flow}"/>
+                        <Path Width="14" Height="14" Data="{DynamicResource Icon.Flow}"/>
                     </Button>
                     <Button Margin="0,0,4,0" Grid.Column="3" Click="OpenNewBranch" Background="Transparent" ToolTip="{StaticResource Text.Dashboard.NewBranch}">
-                        <Path Width="14" Height="14" Style="{StaticResource Style.Icon}" Data="{DynamicResource Icon.Branch.Add}"/>
+                        <Path Width="14" Height="14" Data="{DynamicResource Icon.Branch.Add}"/>
                     </Button>
                 </Grid>
                 <TreeView
@@ -227,7 +227,7 @@
                                     <ColumnDefinition Width="Auto"/>
                                 </Grid.ColumnDefinitions>
 
-                                <Path Grid.Column="0" Width="10" x:Name="icon" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Branch}"/>
+                                <Path Grid.Column="0" Width="10" x:Name="icon" Data="{StaticResource Icon.Branch}"/>
                                 <TextBlock Grid.Column="1" x:Name="name" Text="{Binding Name}" Padding="4,0,0,0" VerticalAlignment="Center" Foreground="{StaticResource Brush.FG1}" ClipToBounds="True"/>
                                 <StackPanel Grid.Column="2" Orientation="Horizontal">
                                     <Border Style="{StaticResource Style.Border.Badge}" Visibility="{Binding TrackVisibility}">
@@ -277,12 +277,12 @@
 
                     <Label Grid.Column="0" Margin="4,0,0,0" Content="{StaticResource Text.Dashboard.Remotes}" Style="{StaticResource Style.Label.GroupHeader}"/>
                     <Button Grid.Column="1" Margin="0,0,4,0" Click="OpenRemote" ToolTip="{StaticResource Text.Dashboard.Remotes.Add}">
-                        <Path Width="14" Height="14" Style="{StaticResource Style.Icon}" Data="{DynamicResource Icon.Remote.Add}"/>
+                        <Path Width="14" Height="14" Data="{DynamicResource Icon.Remote.Add}"/>
                     </Button>
                 </Grid>
                 <TreeView
                     Grid.Row="5"
-                    x:Name="remoteBranchTree"                    
+                    x:Name="remoteBranchTree"
                     Padding="0"
                     FontFamily="Consolas"
                     ScrollViewer.HorizontalScrollBarVisibility="Disabled"
@@ -301,11 +301,11 @@
                         <HierarchicalDataTemplate DataType="{x:Type local:Dashboard+RemoteNode}" ItemsSource="{Binding Children}">
                             <Grid Height="24">
                                 <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="16"/>
+                                    <ColumnDefinition Width="Auto"/>
                                     <ColumnDefinition Width="*"/>
                                 </Grid.ColumnDefinitions>
 
-                                <Path Grid.Column="0" Width="10" x:Name="icon" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Remote}"/>
+                                <Path Grid.Column="0" Width="10" x:Name="icon" Data="{StaticResource Icon.Remote}"/>
                                 <TextBlock Grid.Column="1" x:Name="name" Text="{Binding Name}" Padding="4,0,0,0" VerticalAlignment="Center" Foreground="{StaticResource Brush.FG1}" ClipToBounds="True"/>
                             </Grid>
                         </HierarchicalDataTemplate>
@@ -313,12 +313,12 @@
                         <HierarchicalDataTemplate DataType="{x:Type local:Dashboard+BranchNode}" ItemsSource="{Binding Children}">
                             <Grid Height="24">
                                 <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="16"/>
+                                    <ColumnDefinition Width="Auto"/>
                                     <ColumnDefinition Width="*"/>
                                     <ColumnDefinition Width="Auto"/>
                                 </Grid.ColumnDefinitions>
 
-                                <Path Grid.Column="0" Width="10" x:Name="icon" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Branch}"/>
+                                <Path Grid.Column="0" Width="10" x:Name="icon" Data="{StaticResource Icon.Branch}"/>
                                 <TextBlock Grid.Column="1" x:Name="name" Text="{Binding Name}" Padding="4,0,0,0" VerticalAlignment="Center" Foreground="{StaticResource Brush.FG1}" ClipToBounds="True"/>
                                 <ToggleButton
                                     Grid.Column="2"
@@ -365,7 +365,7 @@
 
                         <Label Grid.Column="0" x:Name="tagCount" Style="{StaticResource Style.Label.GroupHeader}"/>
                         <Button Grid.Column="1" Click="OpenNewTag" ToolTip="{StaticResource Text.Dashboard.Tags.Add}">
-                            <Path Width="14" Height="14" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Tag.Add}"/>
+                            <Path Width="14" Height="14" Data="{StaticResource Icon.Tag.Add}"/>
                         </Button>
                     </Grid>
                 </ToggleButton>
@@ -393,7 +393,7 @@
                         <DataGridTemplateColumn Width="32">
                             <DataGridTemplateColumn.CellTemplate>
                                 <DataTemplate>
-                                    <Path Width="10" HorizontalAlignment="Right" Margin="0,0,8,0" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Tag}"/>
+                                    <Path Width="10" HorizontalAlignment="Right" Margin="0,0,8,0" Data="{StaticResource Icon.Tag}"/>
                                 </DataTemplate>
                             </DataGridTemplateColumn.CellTemplate>
                         </DataGridTemplateColumn>
@@ -433,10 +433,10 @@
 
                         <Label Grid.Column="0" x:Name="submoduleCount" Style="{StaticResource Style.Label.GroupHeader}"/>
                         <Button Grid.Column="1" Click="OpenAddSubmodule" ToolTip="{StaticResource Text.Dashboard.Submodules.Add}">
-                            <Path Width="14" Height="14" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Submodule}"/>
+                            <Path Width="14" Height="14" Data="{StaticResource Icon.Submodule}"/>
                         </Button>
                         <Button Grid.Column="3" Click="UpdateSubmodule" ToolTip="{StaticResource Text.Dashboard.Submodules.Update}">
-                            <Path Width="14" Height="14" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Loading}"/>
+                            <Path Width="14" Height="14" Data="{StaticResource Icon.Loading}"/>
                         </Button>
                     </Grid>
                 </ToggleButton>
@@ -469,7 +469,7 @@
                         <DataGridTemplateColumn Width="26">
                             <DataGridTemplateColumn.CellTemplate>
                                 <DataTemplate>
-                                    <Path Width="10" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Submodule}"/>
+                                    <Path Width="10" Data="{StaticResource Icon.Submodule}"/>
                                 </DataTemplate>
                             </DataGridTemplateColumn.CellTemplate>
                         </DataGridTemplateColumn>
diff --git a/src/UI/Dashboard.xaml.cs b/src/UI/Dashboard.xaml.cs
index 27cf38b2..397e2a3a 100644
--- a/src/UI/Dashboard.xaml.cs
+++ b/src/UI/Dashboard.xaml.cs
@@ -666,7 +666,6 @@ namespace SourceGit.UI {
                 menu.Items.Add(new Separator());
 
                 var flowIcon = new System.Windows.Shapes.Path();
-                flowIcon.Style = FindResource("Style.Icon") as Style;
                 flowIcon.Data = FindResource("Icon.Flow") as Geometry;
                 flowIcon.Width = 10;
 
@@ -720,13 +719,11 @@ namespace SourceGit.UI {
             var remoteBranches = repo.RemoteBranches();
             if (remoteBranches.Count > 0) {
                 var trackingIcon = new System.Windows.Shapes.Path();
-                trackingIcon.Style = FindResource("Style.Icon") as Style;
                 trackingIcon.Data = FindResource("Icon.Branch") as Geometry;
                 trackingIcon.VerticalAlignment = VerticalAlignment.Bottom;
                 trackingIcon.Width = 10;
 
                 var currentTrackingIcon = new System.Windows.Shapes.Path();
-                currentTrackingIcon.Style = FindResource("Style.Icon") as Style;
                 currentTrackingIcon.Data = FindResource("Icon.Check") as Geometry;
                 currentTrackingIcon.VerticalAlignment = VerticalAlignment.Center;
                 currentTrackingIcon.Width = 10;
diff --git a/src/UI/DeleteBranch.xaml b/src/UI/DeleteBranch.xaml
index 246d8cc8..1cd3a402 100644
--- a/src/UI/DeleteBranch.xaml
+++ b/src/UI/DeleteBranch.xaml
@@ -23,7 +23,7 @@
 
         <Label Grid.Row="2" Grid.Column="0" HorizontalAlignment="Right" Content="{StaticResource Text.DeleteBranch.Branch}"/>
         <StackPanel Grid.Row="2" Grid.Column="1" Orientation="Horizontal">
-            <Path Width="12" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Branch}" Margin="4,0"/>
+            <Path Width="12" Data="{StaticResource Icon.Branch}" Margin="4,0"/>
             <TextBlock x:Name="branchName" Text="master" Foreground="{StaticResource Brush.FG1}" VerticalAlignment="Center"/>
         </StackPanel>
 
diff --git a/src/UI/DeleteRemote.xaml b/src/UI/DeleteRemote.xaml
index e40bc79b..2a8cedae 100644
--- a/src/UI/DeleteRemote.xaml
+++ b/src/UI/DeleteRemote.xaml
@@ -23,7 +23,7 @@
 
         <Label Grid.Row="2" Grid.Column="0" HorizontalAlignment="Right" Content="{StaticResource Text.DeleteRemote.Remote}"/>
         <StackPanel Grid.Row="2" Grid.Column="1" Orientation="Horizontal">
-            <Path Width="12" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Remote}" Margin="4,0"/>
+            <Path Width="12" Data="{StaticResource Icon.Remote}" Margin="4,0"/>
             <TextBlock x:Name="remoteName" Text="origin" Foreground="{StaticResource Brush.FG1}" VerticalAlignment="Center"/>
         </StackPanel>
 
diff --git a/src/UI/DeleteTag.xaml b/src/UI/DeleteTag.xaml
index 71d8bf8b..a3d37dea 100644
--- a/src/UI/DeleteTag.xaml
+++ b/src/UI/DeleteTag.xaml
@@ -24,7 +24,7 @@
 
         <Label Grid.Row="2" Grid.Column="0" HorizontalAlignment="Right" Content="{StaticResource Text.DeleteTag.Tag}"/>
         <StackPanel Grid.Row="2" Grid.Column="1" Orientation="Horizontal">
-            <Path Width="12" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Tag}" Margin="4,0"/>
+            <Path Width="12" Data="{StaticResource Icon.Tag}" Margin="4,0"/>
             <TextBlock x:Name="tagName" Text="v1.0" Padding="4,0,0,0" Foreground="{StaticResource Brush.FG1}" VerticalAlignment="Center"/>
         </StackPanel>
 
diff --git a/src/UI/DiffViewer.xaml b/src/UI/DiffViewer.xaml
index 3c932eab..7f5031cd 100644
--- a/src/UI/DiffViewer.xaml
+++ b/src/UI/DiffViewer.xaml
@@ -37,24 +37,24 @@
                     </Grid.ColumnDefinitions>
 
                     <StackPanel Grid.Column="0" x:Name="orgFileNamePanel" Orientation="Horizontal">
-                        <Path Width="10" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.File}"/>
+                        <Path Width="10" Data="{StaticResource Icon.File}"/>
                         <TextBlock x:Name="orgFileName" Margin="4,0,0,0" VerticalAlignment="Center" Foreground="{StaticResource Brush.FG1}"/>
                         <TextBlock Margin="8,0" VerticalAlignment="Center" Text="→" Foreground="{StaticResource Brush.FG1}"/>
                     </StackPanel>
 
                     <StackPanel Grid.Column="1" Orientation="Horizontal">
-                        <Path Width="10" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.File}"/>
+                        <Path Width="10" Data="{StaticResource Icon.File}"/>
                         <TextBlock x:Name="fileName" Margin="4,0" VerticalAlignment="Center" Foreground="{StaticResource Brush.FG1}"/>
-                        <Path x:Name="loading" Width="10" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Loading}"/>
+                        <Path x:Name="loading" Width="10" Data="{StaticResource Icon.Loading}"/>
                     </StackPanel>
 
                     <StackPanel Grid.Column="2" x:Name="textChangeOptions" Orientation="Horizontal" HorizontalAlignment="Right">
                         <Button Width="26" Click="Go2Next" ToolTip="{StaticResource Text.Diff.Next}" Background="Transparent">
-                            <Path Width="10" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.MoveDown}"/>
+                            <Path Width="10" Data="{StaticResource Icon.MoveDown}"/>
                         </Button>
 
                         <Button Click="Go2Prev" ToolTip="{StaticResource Text.Diff.Prev}" Background="Transparent">
-                            <Path Width="10" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.MoveUp}"/>
+                            <Path Width="10" Data="{StaticResource Icon.MoveUp}"/>
                         </Button>
 
                         <ToggleButton
@@ -80,7 +80,7 @@
             <Border x:Name="sizeChange" Grid.Row="1" ClipToBounds="True" Background="{StaticResource Brush.Window}" Visibility="Collapsed">
                 <StackPanel Orientation="Vertical" VerticalAlignment="Center">
                     <Label x:Name="txtSizeChangeTitle" Content="{StaticResource Text.Diff.Binary}" Margin="0,0,0,32" FontSize="18" FontWeight="UltraBold" Foreground="{StaticResource Brush.FG2}" HorizontalAlignment="Center"/>
-                    <Path x:Name="iconSizeChange" Width="64" Height="64" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Binary}" Fill="{StaticResource Brush.FG2}"/>
+                    <Path x:Name="iconSizeChange" Width="64" Height="64" Data="{StaticResource Icon.Binary}" Fill="{StaticResource Brush.FG2}"/>
                     <Grid Margin="0,16,0,0" HorizontalAlignment="Center" TextElement.FontSize="18" TextElement.FontWeight="UltraBold">
                         <Grid.RowDefinitions>
                             <RowDefinition Height="32"/>
@@ -102,14 +102,14 @@
 
             <Border x:Name="noChange" Grid.Row="1" Visibility="Collapsed">
                 <StackPanel Orientation="Vertical" VerticalAlignment="Center" Opacity=".2">
-                    <Path Width="64" Height="64" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Check}"/>
+                    <Path Width="64" Height="64" Data="{StaticResource Icon.Check}"/>
                     <Label Margin="0,8,0,0" Content="{StaticResource Text.Diff.NoChange}" FontSize="18" FontWeight="UltraBold" HorizontalAlignment="Center"/>
                 </StackPanel>
             </Border>
 
             <Border x:Name="mask" Grid.RowSpan="2" Visibility="Collapsed">
                 <StackPanel Orientation="Vertical" VerticalAlignment="Center" Opacity=".2">
-                    <Path Width="64" Height="64" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Diff}"/>
+                    <Path Width="64" Height="64" Data="{StaticResource Icon.Diff}"/>
                     <Label Margin="0,8,0,0" Content="{StaticResource Text.Diff.Welcome}" FontSize="18" FontWeight="UltraBold" HorizontalAlignment="Center"/>
                 </StackPanel>
             </Border>
diff --git a/src/UI/DiffViewer.xaml.cs b/src/UI/DiffViewer.xaml.cs
index 62a85e0b..6fc2fb2d 100644
--- a/src/UI/DiffViewer.xaml.cs
+++ b/src/UI/DiffViewer.xaml.cs
@@ -757,7 +757,6 @@ namespace SourceGit.UI {
             var menu = new ContextMenu();
 
             var copyIcon = new Path();
-            copyIcon.Style = FindResource("Style.Icon") as Style;
             copyIcon.Data = FindResource("Icon.Copy") as Geometry;
             copyIcon.Width = 10;
 
diff --git a/src/UI/Discard.xaml b/src/UI/Discard.xaml
index 5720e084..7a5d96cc 100644
--- a/src/UI/Discard.xaml
+++ b/src/UI/Discard.xaml
@@ -24,7 +24,7 @@
 
         <Label Grid.Row="2" Grid.Column="0" HorizontalAlignment="Right" Content="{StaticResource Text.Discard.Changes}"/>
         <StackPanel Grid.Row="2" Grid.Column="1" Orientation="Horizontal">
-            <Path x:Name="icon" Width="12" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.File}" Fill="{StaticResource Brush.FG2}" Margin="4,0"/>
+            <Path x:Name="icon" Width="12" Data="{StaticResource Icon.File}" Fill="{StaticResource Brush.FG2}" Margin="4,0"/>
             <TextBlock x:Name="txtPath" Padding="4,0,0,0" Foreground="{StaticResource Brush.FG1}" VerticalAlignment="Center"/>
         </StackPanel>
 
diff --git a/src/UI/Fetch.xaml b/src/UI/Fetch.xaml
index 7fbe9643..ff620339 100644
--- a/src/UI/Fetch.xaml
+++ b/src/UI/Fetch.xaml
@@ -34,7 +34,7 @@
             <ComboBox.ItemTemplate>
                 <DataTemplate DataType="{x:Type git:Remote}">
                     <StackPanel Orientation="Horizontal" Height="20">
-                        <Path Margin="4,0,0,0" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Remote}"/>
+                        <Path Margin="4,0,0,0" Data="{StaticResource Icon.Remote}"/>
                         <TextBlock Text="{Binding Name}" Padding="8,0,0,0" Foreground="{StaticResource Brush.FG1}" VerticalAlignment="Center"/>
                     </StackPanel>
                 </DataTemplate>
diff --git a/src/UI/FileHistories.xaml b/src/UI/FileHistories.xaml
index 714e1670..c0b31b5d 100644
--- a/src/UI/FileHistories.xaml
+++ b/src/UI/FileHistories.xaml
@@ -50,7 +50,6 @@
                 <StackPanel Grid.Column="0" Orientation="Horizontal">
                     <Path
                         Width="20" Height="20" Margin="6,-1,2,0"
-                        Style="{StaticResource Style.Icon}" 
                         Data="{StaticResource Icon.Git}" 
                         Fill="{StaticResource Brush.Logo}"
                         WindowChrome.IsHitTestVisibleInChrome="True"
@@ -61,10 +60,10 @@
                 <!-- Options -->
                 <StackPanel Grid.Column="2" Orientation="Horizontal" WindowChrome.IsHitTestVisibleInChrome="True">
                     <Button Click="Minimize" Width="32" Style="{StaticResource Style.Button.HighlightHover}">
-                        <Path Width="10" Height="10" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Minimize}"/>
+                        <Path Width="10" Height="10" Data="{StaticResource Icon.Minimize}"/>
                     </Button>
                     <Button Click="MaximizeOrRestore" Width="32" Style="{StaticResource Style.Button.HighlightHover}">
-                        <Path Width="10" Height="10" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Maximize}"/>
+                        <Path Width="10" Height="10" Data="{StaticResource Icon.Maximize}"/>
                     </Button>
                     <Button Click="Quit" Width="32">
                         <Button.Style>
@@ -77,7 +76,7 @@
                             </Style>
                         </Button.Style>
 
-                        <Path Width="10" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Close}"/>
+                        <Path Width="10" Data="{StaticResource Icon.Close}"/>
                     </Button>
                 </StackPanel>
             </Grid>
diff --git a/src/UI/FolderDialog.xaml b/src/UI/FolderDialog.xaml
index f7b65041..9d241181 100644
--- a/src/UI/FolderDialog.xaml
+++ b/src/UI/FolderDialog.xaml
@@ -33,7 +33,7 @@
                 </Grid.ColumnDefinitions>
 
                 <!-- LOGO -->
-                <Path Margin="6,-1,2,0" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Folder.Open}"/>
+                <Path Margin="6,-1,2,0" Data="{StaticResource Icon.Folder.Open}"/>
 
                 <!-- Title -->
                 <Label Grid.Column="1" x:Name="txtTitle" FontWeight="Light"/>
@@ -50,7 +50,7 @@
                         </Style>
                     </Button.Style>
 
-                    <Path Width="10" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Close}"/>
+                    <Path Width="10" Data="{StaticResource Icon.Close}"/>
                 </Button>
             </Grid>
             
@@ -73,7 +73,7 @@
                     <TreeView.ItemTemplate>
                         <HierarchicalDataTemplate ItemsSource="{Binding Children}">
                             <StackPanel Orientation="Horizontal" Height="24">
-                                <Path x:Name="icon" Width="14" Style="{StaticResource Style.Icon}" Fill="Goldenrod" Data="{StaticResource Icon.Folder.Fill}"/>
+                                <Path x:Name="icon" Width="14" Fill="Goldenrod" Data="{StaticResource Icon.Folder.Fill}"/>
                                 <TextBlock Text="{Binding Name}" Foreground="{StaticResource Brush.FG1}" VerticalAlignment="Center" Margin="6,0,0,0" FontSize="11"/>
                             </StackPanel>
 
diff --git a/src/UI/GitFlowFinishBranch.xaml b/src/UI/GitFlowFinishBranch.xaml
index 052c4d0c..5afabede 100644
--- a/src/UI/GitFlowFinishBranch.xaml
+++ b/src/UI/GitFlowFinishBranch.xaml
@@ -23,7 +23,7 @@
 
         <Label Grid.Row="2" Grid.Column="0" x:Name="txtBranchType" HorizontalAlignment="Right"/>
         <StackPanel Grid.Row="2" Grid.Column="1" Orientation="Horizontal">
-            <Path Width="12" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Branch}" Margin="4,0"/>
+            <Path Width="12" Data="{StaticResource Icon.Branch}" Margin="4,0"/>
             <TextBlock x:Name="txtBranchName" Padding="4,0,0,0" Foreground="{StaticResource Brush.FG1}" VerticalAlignment="Center"/>
         </StackPanel>
 
diff --git a/src/UI/Histories.xaml b/src/UI/Histories.xaml
index cc381e69..b5cff6bb 100644
--- a/src/UI/Histories.xaml
+++ b/src/UI/Histories.xaml
@@ -41,10 +41,10 @@
                 <TextBox x:Name="txtSearch" Margin="4" Height="24" Padding="0,0,22,0" helpers:TextBoxHelper.Placeholder="{StaticResource Text.Histories.Search}" PreviewKeyDown="PreviewSearchKeyDown"/>
                 <StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="8,0">
                     <Button ToolTip="{StaticResource Text.Histories.SearchClear}" Click="ClearSearch">
-                        <Path Width="12" Height="12" Fill="{StaticResource Brush.FG2}" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Clear}"/>
+                        <Path Width="12" Height="12" Fill="{StaticResource Brush.FG2}" Data="{StaticResource Icon.Clear}"/>
                     </Button>
                     <Button Margin="8,0,0,0" ToolTip="{StaticResource Text.Close}" Click="HideSearchBarByButton">
-                        <Path Width="12" Height="12" Fill="{StaticResource Brush.FG2}" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Up}"/>
+                        <Path Width="12" Height="12" Fill="{StaticResource Brush.FG2}" Data="{StaticResource Icon.Up}"/>
                     </Button>
                 </StackPanel>
             </Grid>
@@ -94,7 +94,7 @@
                                                         </Grid.ColumnDefinitions>
 
                                                         <Border Grid.Column="0" Background="{StaticResource Brush.Decorator}">
-                                                            <Path x:Name="Icon" Width="8" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Branch}"/>
+                                                            <Path x:Name="Icon" Width="8" Data="{StaticResource Icon.Branch}"/>
                                                         </Border>
 
                                                         <TextBlock x:Name="Name" Grid.Column="1" Text="{Binding Name}" FontSize="11" Padding="4,0" Foreground="Black" VerticalAlignment="Center" TextWrapping="NoWrap"/>
@@ -184,7 +184,7 @@
             <!-- Mask -->
             <Border x:Name="mask" Background="{StaticResource Brush.CommitViewer}">
                 <StackPanel Orientation="Vertical" VerticalAlignment="Center" Opacity=".25">
-                    <Path Width="128" Height="128" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Detail}"/>
+                    <Path Width="128" Height="128" Data="{StaticResource Icon.Detail}"/>
                     <Label x:Name="txtCounter" Visibility="Hidden" FontFamily="Consolas" Margin="0,16,0,0" FontSize="24" FontWeight="UltraBold" HorizontalAlignment="Center"/>
                 </StackPanel>
             </Border>
@@ -207,7 +207,7 @@
                 <Path
                     Width="20" Height="20"
                     Margin="8,0"
-                    Style="{StaticResource Style.Icon}"
+                   
                     Data="{StaticResource Icon.Info}"
                     Fill="{StaticResource Brush.FG1}">
                     <Path.ToolTip>
diff --git a/src/UI/Histories.xaml.cs b/src/UI/Histories.xaml.cs
index cc289917..ad6964bc 100644
--- a/src/UI/Histories.xaml.cs
+++ b/src/UI/Histories.xaml.cs
@@ -214,7 +214,6 @@ namespace SourceGit.UI {
 
         private MenuItem GetCurrentBranchContextMenu(Git.Branch branch) {
             var icon = new Path();
-            icon.Style = FindResource("Style.Icon") as Style;
             icon.Data = FindResource("Icon.Branch") as Geometry;
             icon.VerticalAlignment = VerticalAlignment.Bottom;
             icon.Width = 10;
@@ -256,7 +255,6 @@ namespace SourceGit.UI {
 
             if (branch.Kind != Git.Branch.Type.Normal) {
                 var flowIcon = new Path();
-                flowIcon.Style = FindResource("Style.Icon") as Style;
                 flowIcon.Data = FindResource("Icon.Flow") as Geometry;
                 flowIcon.Width = 10;
 
@@ -285,7 +283,6 @@ namespace SourceGit.UI {
 
         private MenuItem GetOtherBranchContextMenu(Git.Branch current, Git.Branch branch, bool merged) {
             var icon = new Path();
-            icon.Style = FindResource("Style.Icon") as Style;
             icon.Data = FindResource("Icon.Branch") as Geometry;
             icon.VerticalAlignment = VerticalAlignment.Bottom;
             icon.Width = 10;
@@ -326,7 +323,6 @@ namespace SourceGit.UI {
 
             if (branch.Kind != Git.Branch.Type.Normal) {
                 var flowIcon = new Path();
-                flowIcon.Style = FindResource("Style.Icon") as Style;
                 flowIcon.Data = FindResource("Icon.Flow") as Geometry;
                 flowIcon.Width = 10;
 
@@ -363,7 +359,6 @@ namespace SourceGit.UI {
 
         private MenuItem GetTagContextMenu(Git.Tag tag) {
             var icon = new Path();
-            icon.Style = FindResource("Style.Icon") as Style;
             icon.Data = FindResource("Icon.Tag") as Geometry;
             icon.Width = 10;
 
diff --git a/src/UI/Init.xaml b/src/UI/Init.xaml
index 60ea1d96..285442e2 100644
--- a/src/UI/Init.xaml
+++ b/src/UI/Init.xaml
@@ -24,7 +24,7 @@
 
         <Label Grid.Row="2" Grid.Column="0" HorizontalAlignment="Right" Content="{StaticResource Text.Init.Path}"/>
         <StackPanel Grid.Row="2" Grid.Column="1" Orientation="Horizontal">
-            <Path Width="12" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Folder}" Margin="4,0"/>
+            <Path Width="12" Data="{StaticResource Icon.Folder}" Margin="4,0"/>
             <Label x:Name="txtPath"/>
         </StackPanel>
 
diff --git a/src/UI/InteractiveRebase.xaml b/src/UI/InteractiveRebase.xaml
index 1f1df2d8..3efca37f 100644
--- a/src/UI/InteractiveRebase.xaml
+++ b/src/UI/InteractiveRebase.xaml
@@ -51,7 +51,7 @@
                 <StackPanel Grid.Column="0" Orientation="Horizontal">
                     <Path
                         Width="20" Height="20" Margin="6,-1,2,0"
-                        Style="{StaticResource Style.Icon}" 
+                        
                         Data="{StaticResource Icon.Git}"
                         Fill="{StaticResource Brush.Logo}"
                         WindowChrome.IsHitTestVisibleInChrome="True"
@@ -62,10 +62,10 @@
                 <!-- Options -->
                 <StackPanel Grid.Column="2" Orientation="Horizontal" WindowChrome.IsHitTestVisibleInChrome="True">
                     <Button Click="Minimize" Width="32" Style="{StaticResource Style.Button.HighlightHover}">
-                        <Path Width="10" Height="10" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Minimize}"/>
+                        <Path Width="10" Height="10" Data="{StaticResource Icon.Minimize}"/>
                     </Button>
                     <Button Click="MaximizeOrRestore" Width="32" Style="{StaticResource Style.Button.HighlightHover}">
-                        <Path Width="10" Height="10" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Maximize}"/>
+                        <Path Width="10" Height="10" Data="{StaticResource Icon.Maximize}"/>
                     </Button>
                     <Button Click="Quit" Width="32">
                         <Button.Style>
@@ -78,7 +78,7 @@
                             </Style>
                         </Button.Style>
 
-                        <Path Width="10" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Close}"/>
+                        <Path Width="10" Data="{StaticResource Icon.Close}"/>
                     </Button>
                 </StackPanel>
             </Grid>
@@ -117,7 +117,7 @@
                                                 <ColumnDefinition Width="60"/>
                                                 <ColumnDefinition Width="*"/>
                                             </Grid.ColumnDefinitions>
-                                            <Path Grid.Column="0" Width="12" Height="12" Margin="4,0,0,0" Fill="{Binding Theme}" Style="{StaticResource Style.Icon}" Data="M 0,0 A 180,180 180 1 1 1,1 Z"/>
+                                            <Path Grid.Column="0" Width="12" Height="12" Margin="4,0,0,0" Fill="{Binding Theme}" Data="M 0,0 A 180,180 180 1 1 1,1 Z"/>
                                             <Label Grid.Column="1" Content="{Binding Title}" Padding="4,0"/>
                                             <Label Grid.Column="2" Content="{Binding Desc}" Foreground="{StaticResource Brush.FG2}" FontSize="11" Padding="4,0"/>
                                         </Grid>
@@ -149,11 +149,11 @@
                                 Orientation="Horizontal"
                                 Margin="4,0">
                                 <Button Click="MoveUp" ToolTip="{StaticResource Text.InteractiveRebase.MoveUp}">
-                                    <Path Width="12" Height="12" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.MoveUp}"/>
+                                    <Path Width="12" Height="12" Data="{StaticResource Icon.MoveUp}"/>
                                 </Button>
 
                                 <Button Click="MoveDown" ToolTip="{StaticResource Text.InteractiveRebase.MoveDown}" Margin="4,0,0,0">
-                                    <Path Width="12" Height="12" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.MoveDown}"/>                                    
+                                    <Path Width="12" Height="12" Data="{StaticResource Icon.MoveDown}"/>                                    
                                 </Button>
                             </StackPanel>
                         </Grid>
@@ -199,11 +199,11 @@
 
                 <StackPanel Grid.Column="0" Orientation="Horizontal" Margin="4,0,24,0">
                     <Label Grid.Column="0" Content="{StaticResource Text.InteractiveRebase.Target}"/>
-                    <Path Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Branch}"/>
+                    <Path Data="{StaticResource Icon.Branch}"/>
                     <Label x:Name="branch"/>
                     
                     <Label Grid.Column="2" Content="{StaticResource Text.InteractiveRebase.On}" Margin="8,0,0,0"/>
-                    <Path Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Commit}"/>
+                    <Path Data="{StaticResource Icon.Commit}"/>
                     <Label x:Name="on"/>
                 </StackPanel>
 
diff --git a/src/UI/Launcher.xaml b/src/UI/Launcher.xaml
index 604ecdcd..159109ad 100644
--- a/src/UI/Launcher.xaml
+++ b/src/UI/Launcher.xaml
@@ -62,7 +62,7 @@
                 <!-- Tab scroller left -->
                 <Border Grid.Column="0" x:Name="tabScrollerLeft" Width="18" Height="28" BorderThickness="0,0,1,0" BorderBrush="{StaticResource Brush.Border0}" WindowChrome.IsHitTestVisibleInChrome="True">
                     <Button Click="ScrollToLeft" Margin="0" Padding="0">
-                        <Path Width="10" Height="12" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.ScrollLeft}"/>
+                        <Path Width="10" Height="12" Data="{StaticResource Icon.ScrollLeft}"/>
                     </Button>
                 </Border>
 
@@ -79,12 +79,11 @@
                                                 <Button Margin="4,0,0,0" Click="NewTab" ToolTip="{StaticResource Text.Launcher.NewPageButton}" WindowChrome.IsHitTestVisibleInChrome="True">
                                                     <Button.Style>
                                                         <Style TargetType="{x:Type Button}" BasedOn="{x:Null}">
-                                                            <Setter Property="Opacity" Value="1"/>
                                                             <Setter Property="Template">
                                                                 <Setter.Value>
                                                                     <ControlTemplate>
-                                                                        <Border x:Name="newTabBG" Width="20" Height="20" BorderThickness="0" Background="Transparent" CornerRadius="2">
-                                                                            <Path Width="14" Height="14" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.NewTab}" Fill="{StaticResource Brush.FG1}"/>
+                                                                        <Border x:Name="newTabBG" Width="20" Height="20" BorderThickness="0" Background="Transparent">
+                                                                            <Path Width="14" Height="14" Data="{StaticResource Icon.NewTab}" Fill="{StaticResource Brush.FG1}"/>
                                                                         </Border>
 
                                                                         <ControlTemplate.Triggers>
@@ -124,7 +123,7 @@
                                         Grid.Column="0"
                                         Width="14" Height="14"
                                         Fill="{Binding Color, Converter={StaticResource IntToRepoColor}}"
-                                        Style="{StaticResource Style.Icon}"
+                                       
                                         Data="{StaticResource Icon.Bookmark}"
                                         VerticalAlignment="Center"/>
 
@@ -138,7 +137,7 @@
                                         <Path
                                             Width="8" Height="8" 
                                             Fill="{StaticResource Brush.FG1}"
-                                            Style="{StaticResource Style.Icon}"
+                                           
                                             Data="{StaticResource Icon.Close}"/>                                        
                                     </Button>
                                 </Grid>
@@ -212,7 +211,7 @@
                 <!-- Tab scroller right -->
                 <Border Grid.Column="2" x:Name="tabScrollerRight" Width="18" Height="28" BorderThickness="1,0,1,0" BorderBrush="{StaticResource Brush.Border0}" WindowChrome.IsHitTestVisibleInChrome="True">
                     <Button Click="ScrollToRight" Margin="0" Padding="0">
-                        <Path Width="10" Height="12" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.ScrollRight}"/>
+                        <Path Width="10" Height="12" Data="{StaticResource Icon.ScrollRight}"/>
                     </Button>
                 </Border>
 
@@ -226,16 +225,16 @@
                     Height="27"
                     WindowChrome.IsHitTestVisibleInChrome="True">
                     <Button Click="ShowPreference" Width="28" ToolTip="{StaticResource Text.Launcher.Preference}">
-                        <Path Width="14" Height="14" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Preference}"/>
+                        <Path Width="14" Height="14" Data="{StaticResource Icon.Preference}"/>
                     </Button>
                     <Button Click="ShowAbout" Width="28" ToolTip="{StaticResource Text.Launcher.About}">
-                        <Path Width="14" Height="14" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Info}"/>
+                        <Path Width="14" Height="14" Data="{StaticResource Icon.Info}"/>
                     </Button>
                     <Button Click="Minimize" Width="28" Style="{StaticResource Style.Button.HighlightHover}">
-                        <Path Width="10" Height="10" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Minimize}"/>
+                        <Path Width="10" Height="10" Data="{StaticResource Icon.Minimize}"/>
                     </Button>
                     <Button Click="MaximizeOrRestore" Width="28" Style="{StaticResource Style.Button.HighlightHover}">
-                        <Path Width="10" Height="10" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Maximize}"/>
+                        <Path Width="10" Height="10" Data="{StaticResource Icon.Maximize}"/>
                     </Button>
                     <Button Click="Quit" Width="28">
                         <Button.Style>
@@ -248,7 +247,7 @@
                             </Style>
                         </Button.Style>
 
-                        <Path Width="10" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Close}"/>
+                        <Path Width="10" Data="{StaticResource Icon.Close}"/>
                     </Button>
                 </StackPanel>
             </Grid>
diff --git a/src/UI/Launcher.xaml.cs b/src/UI/Launcher.xaml.cs
index 91572599..83418145 100644
--- a/src/UI/Launcher.xaml.cs
+++ b/src/UI/Launcher.xaml.cs
@@ -195,7 +195,6 @@ namespace SourceGit.UI {
             bookmark.Header = App.Text("RepoCM.Bookmark");
             for (int i = 0; i < Converters.IntToRepoColor.Colors.Length; i++) {
                 var icon = new System.Windows.Shapes.Path();
-                icon.Style = FindResource("Style.Icon") as Style;
                 icon.Data = iconBookmark;
                 icon.Fill = Converters.IntToRepoColor.Colors[i];
                 icon.Width = 8;
diff --git a/src/UI/Merge.xaml b/src/UI/Merge.xaml
index 7eac73b0..0d7c1043 100644
--- a/src/UI/Merge.xaml
+++ b/src/UI/Merge.xaml
@@ -25,13 +25,13 @@
 
         <Label Grid.Row="2" Grid.Column="0" HorizontalAlignment="Right" Content="{StaticResource Text.Merge.Source}"/>
         <StackPanel Grid.Row="2" Grid.Column="1" Orientation="Horizontal">
-            <Path Width="12" Height="12" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Branch}"/>
+            <Path Width="12" Height="12" Data="{StaticResource Icon.Branch}"/>
             <TextBlock x:Name="sourceBranch" Padding="4,0,0,0" Foreground="{StaticResource Brush.FG1}" VerticalAlignment="Center"/>
         </StackPanel>
         
         <Label Grid.Row="3" Grid.Column="0" HorizontalAlignment="Right" Content="{StaticResource Text.Merge.Into}"/>
         <StackPanel Grid.Row="3" Grid.Column="1" Orientation="Horizontal">
-            <Path Width="12" Height="12" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Branch}"/>
+            <Path Width="12" Height="12" Data="{StaticResource Icon.Branch}"/>
             <TextBlock x:Name="targetBranch" Padding="4,0,0,0" Foreground="{StaticResource Brush.FG1}" VerticalAlignment="Center"/>
         </StackPanel>
 
diff --git a/src/UI/NewPage.xaml b/src/UI/NewPage.xaml
index ffe265de..f0588a7e 100644
--- a/src/UI/NewPage.xaml
+++ b/src/UI/NewPage.xaml
@@ -29,7 +29,7 @@
             </Grid.RowDefinitions>
             
             <!-- Logo -->
-            <Path Grid.Row="0" Margin="0,48,0,0" Width="100" Height="100" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Git}" Fill="#FFF05133"/>
+            <Path Grid.Row="0" Margin="0,48,0,0" Width="100" Height="100" Data="{StaticResource Icon.Git}" Fill="#FFF05133"/>
             
             <!-- Welcome -->
             <TextBlock Grid.Row="1" Margin="0,16" HorizontalAlignment="Center" Text="{StaticResource Text.NewPage.Title}" FontSize="28" FontWeight="ExtraBold" Foreground="{StaticResource Brush.FG2}"/>
@@ -43,13 +43,13 @@
                 </Grid.ColumnDefinitions>
                 <Button Click="OpenOrAddRepo" Grid.Column="0" Style="{StaticResource Style.Button.Bordered}">
                     <StackPanel Orientation="Horizontal">
-                        <Path Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Folder}"/>
+                        <Path Data="{StaticResource Icon.Folder}"/>
                         <Label Margin="4,0,0,0" Content="{StaticResource Text.NewPage.OpenOrInit}"/>
                     </StackPanel>
                 </Button>
                 <Button Click="CloneRepo" Grid.Column="2" Style="{StaticResource Style.Button.Bordered}">
                     <StackPanel Orientation="Horizontal">
-                        <Path Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Pull}"/>
+                        <Path Data="{StaticResource Icon.Pull}"/>
                         <Label Margin="4,0,0,0" Content="{StaticResource Text.NewPage.Clone}"/>
                     </StackPanel>
                 </Button>
@@ -122,7 +122,7 @@
                                     x:Name="icon" 
                                     Grid.Column="0" 
                                     Width="16" Height="16" 
-                                    Style="{StaticResource Style.Icon}" 
+                                    
                                     Data="{StaticResource Icon.Folder.Fill}"/>
 
                                 <StackPanel
@@ -158,7 +158,7 @@
                                     Grid.Column="2" 
                                     Width="14" Height="14" 
                                     Margin="4,0"
-                                    Style="{StaticResource Style.Icon}" 
+                                    
                                     Data="{StaticResource Icon.Bookmark}" 
                                     Fill="{Binding Color, Converter={StaticResource IntToRepoColor}}" 
                                     Visibility="{Binding IsRepo, Converter={StaticResource BoolToCollapsed}}"/>
diff --git a/src/UI/NewPage.xaml.cs b/src/UI/NewPage.xaml.cs
index c90bff38..121b98da 100644
--- a/src/UI/NewPage.xaml.cs
+++ b/src/UI/NewPage.xaml.cs
@@ -256,7 +256,6 @@ namespace SourceGit.UI {
                 bookmark.Header = App.Text("RepoCM.Bookmark");
                 for (int i = 0; i < Converters.IntToRepoColor.Colors.Length; i++) {
                     var icon = new System.Windows.Shapes.Path();
-                    icon.Style = FindResource("Style.Icon") as Style;
                     icon.Data = iconBookmark;
                     icon.Fill = Converters.IntToRepoColor.Colors[i];
                     icon.Width = 8;
diff --git a/src/UI/PopupManager.xaml b/src/UI/PopupManager.xaml
index d0522783..b05c6061 100644
--- a/src/UI/PopupManager.xaml
+++ b/src/UI/PopupManager.xaml
@@ -14,7 +14,7 @@
 
             <Border x:Name="status" Visibility="Collapsed" Background="{StaticResource Brush.Popup}" Margin="1,0,1,1" Opacity=".9">
                 <StackPanel Orientation="Vertical" HorizontalAlignment="Center" VerticalAlignment="Center">
-                    <Path x:Name="statusIcon" Width="48" Height="48" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Loading}" RenderTransformOrigin=".5,.5">
+                    <Path x:Name="statusIcon" Width="48" Height="48" Data="{StaticResource Icon.Loading}" RenderTransformOrigin=".5,.5">
                         <Path.RenderTransform>
                             <RotateTransform Angle="0"/>
                         </Path.RenderTransform>
diff --git a/src/UI/Pull.xaml b/src/UI/Pull.xaml
index ed7fd64f..2cc3ec7d 100644
--- a/src/UI/Pull.xaml
+++ b/src/UI/Pull.xaml
@@ -33,7 +33,7 @@
             <ComboBox.ItemTemplate>
                 <DataTemplate>
                     <StackPanel Orientation="Horizontal" Height="20">
-                        <Path Margin="4,0,0,0" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Remote}"/>
+                        <Path Margin="4,0,0,0" Data="{StaticResource Icon.Remote}"/>
                         <TextBlock Text="{Binding}" Padding="8,0,0,0" Foreground="{StaticResource Brush.FG1}" VerticalAlignment="Center"/>
                     </StackPanel>
                 </DataTemplate>
@@ -47,7 +47,7 @@
             <ComboBox.ItemTemplate>
                 <DataTemplate>
                     <StackPanel Orientation="Horizontal" Height="20">
-                        <Path Margin="4,0,0,0" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Branch}"/>
+                        <Path Margin="4,0,0,0" Data="{StaticResource Icon.Branch}"/>
                         <TextBlock Text="{Binding}" Padding="8,0,0,0" Foreground="{StaticResource Brush.FG1}" VerticalAlignment="Center"/>
                     </StackPanel>
                 </DataTemplate>
@@ -56,7 +56,7 @@
 
         <Label Grid.Row="4" Grid.Column="0" HorizontalAlignment="Right" VerticalAlignment="Center" Content="{StaticResource Text.Pull.Into}"/>
         <StackPanel Grid.Row="4" Grid.Column="1" Orientation="Horizontal">
-            <Path Width="12" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Branch}"/>
+            <Path Width="12" Data="{StaticResource Icon.Branch}"/>
             <TextBlock x:Name="txtInto" Padding="4,0,0,0" Foreground="{StaticResource Brush.FG1}" VerticalAlignment="Center"/>
         </StackPanel>
 
diff --git a/src/UI/Push.xaml b/src/UI/Push.xaml
index 447d8f96..5e585798 100644
--- a/src/UI/Push.xaml
+++ b/src/UI/Push.xaml
@@ -34,7 +34,7 @@
             <ComboBox.ItemTemplate>
                 <DataTemplate DataType="{x:Type git:Branch}">
                     <StackPanel Orientation="Horizontal" Height="20">
-                        <Path Margin="4,0,0,0" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Branch}"/>
+                        <Path Margin="4,0,0,0" Data="{StaticResource Icon.Branch}"/>
                         <TextBlock Text="{Binding Name}" Padding="8,0,0,0" Foreground="{StaticResource Brush.FG1}" VerticalAlignment="Center"/>
                     </StackPanel>
                 </DataTemplate>
@@ -49,7 +49,7 @@
             <ComboBox.ItemTemplate>
                 <DataTemplate>
                     <StackPanel Orientation="Horizontal" Height="20">
-                        <Path Margin="4,0,0,0" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Remote}"/>
+                        <Path Margin="4,0,0,0" Data="{StaticResource Icon.Remote}"/>
                         <TextBlock Text="{Binding}" Padding="8,0,0,0" Foreground="{StaticResource Brush.FG1}" VerticalAlignment="Center"/>
                     </StackPanel>
                 </DataTemplate>
@@ -63,7 +63,7 @@
             <ComboBox.ItemTemplate>
                 <DataTemplate>
                     <StackPanel Orientation="Horizontal" Height="20">
-                        <Path Margin="4,0,0,0" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Branch}"/>
+                        <Path Margin="4,0,0,0" Data="{StaticResource Icon.Branch}"/>
                         <TextBlock Text="{Binding}" Padding="8,0,0,0" Foreground="{StaticResource Brush.FG1}" VerticalAlignment="Center"/>
                     </StackPanel>
                 </DataTemplate>
diff --git a/src/UI/PushTag.xaml b/src/UI/PushTag.xaml
index 46d44749..39474dc3 100644
--- a/src/UI/PushTag.xaml
+++ b/src/UI/PushTag.xaml
@@ -24,7 +24,7 @@
 
         <Label Grid.Row="2" Grid.Column="0" HorizontalAlignment="Right" Content="{StaticResource Text.PushTag.Tag}"/>
         <StackPanel Grid.Row="2" Grid.Column="1" Orientation="Horizontal">
-            <Path Width="12" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Tag}" Margin="4,0"/>
+            <Path Width="12" Data="{StaticResource Icon.Tag}" Margin="4,0"/>
             <TextBlock x:Name="tagName" Text="v1.0" Padding="4,0,0,0" Foreground="{StaticResource Brush.FG1}" VerticalAlignment="Center"/>
         </StackPanel>
 
@@ -35,7 +35,7 @@
             <ComboBox.ItemTemplate>
                 <DataTemplate>
                     <StackPanel Orientation="Horizontal" Height="20">
-                        <Path Margin="4,0,0,0" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Remote}"/>
+                        <Path Margin="4,0,0,0" Data="{StaticResource Icon.Remote}"/>
                         <TextBlock Text="{Binding Name}" Padding="8,0,0,0" Foreground="{StaticResource Brush.FG1}" VerticalAlignment="Center"/>
                     </StackPanel>
                 </DataTemplate>
diff --git a/src/UI/Rebase.xaml b/src/UI/Rebase.xaml
index 7548a89c..511e085b 100644
--- a/src/UI/Rebase.xaml
+++ b/src/UI/Rebase.xaml
@@ -25,13 +25,13 @@
 
         <Label Grid.Row="2" Grid.Column="0" HorizontalAlignment="Right" Content="{StaticResource Text.Rebase.Target}"/>
         <StackPanel Grid.Row="2" Grid.Column="1" Orientation="Horizontal">
-            <Path Width="12" Height="12" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Branch}"/>
+            <Path Width="12" Height="12" Data="{StaticResource Icon.Branch}"/>
             <TextBlock x:Name="branch" Text="master" Padding="4,0,0,0" Foreground="{StaticResource Brush.FG1}" VerticalAlignment="Center"/>
         </StackPanel>
 
         <Label Grid.Row="3" Grid.Column="0" HorizontalAlignment="Right" Content="{StaticResource Text.Rebase.On}"/>
         <StackPanel Grid.Row="3" Grid.Column="1" Orientation="Horizontal">
-            <Path x:Name="type" Width="12" Height="12" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Branch}"/>
+            <Path x:Name="type" Width="12" Height="12" Data="{StaticResource Icon.Branch}"/>
             <TextBlock x:Name="desc" Text="branch" Padding="4,0,0,0" Foreground="{StaticResource Brush.FG1}" VerticalAlignment="Center"/>
         </StackPanel>
 
diff --git a/src/UI/RenameBranch.xaml b/src/UI/RenameBranch.xaml
index 08fdbcd9..ca1c34ac 100644
--- a/src/UI/RenameBranch.xaml
+++ b/src/UI/RenameBranch.xaml
@@ -26,7 +26,7 @@
 
         <Label Grid.Row="2" Grid.Column="0" HorizontalAlignment="Right" Content="{StaticResource Text.RenameBranch.Target}"/>
         <StackPanel Grid.Row="2" Grid.Column="1" Orientation="Horizontal">
-            <Path Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Branch}"/>
+            <Path Data="{StaticResource Icon.Branch}"/>
             <TextBlock x:Name="txtOldName" Padding="4,0,0,0" Foreground="{StaticResource Brush.FG1}" VerticalAlignment="Center"/>
         </StackPanel>
 
diff --git a/src/UI/Reset.xaml b/src/UI/Reset.xaml
index 87b86f05..db6ddbef 100644
--- a/src/UI/Reset.xaml
+++ b/src/UI/Reset.xaml
@@ -25,13 +25,13 @@
 
         <Label Grid.Row="2" Grid.Column="0" HorizontalAlignment="Right" Content="{StaticResource Text.Reset.Target}"/>
         <StackPanel Grid.Row="2" Grid.Column="1" Orientation="Horizontal">
-            <Path Width="12" Height="12" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Branch}"/>
+            <Path Width="12" Height="12" Data="{StaticResource Icon.Branch}"/>
             <TextBlock x:Name="branch" Padding="4,0,0,0" Foreground="{StaticResource Brush.FG1}" VerticalAlignment="Center"/>
         </StackPanel>
 
         <Label Grid.Row="3" Grid.Column="0" HorizontalAlignment="Right" Content="{StaticResource Text.Reset.MoveTo}"/>
         <StackPanel Grid.Row="3" Grid.Column="1" Orientation="Horizontal">
-            <Path Width="12" Height="12" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Commit}"/>
+            <Path Width="12" Height="12" Data="{StaticResource Icon.Commit}"/>
             <TextBlock x:Name="desc" Padding="4,0,0,0" Foreground="{StaticResource Brush.FG1}" VerticalAlignment="Center"/>
         </StackPanel>
 
@@ -40,7 +40,7 @@
             <ComboBox.ItemTemplate>
                 <DataTemplate>
                     <StackPanel Orientation="Horizontal" Height="20">
-                        <Path Width="12" Height="12" Margin="4,0,0,0" Fill="{Binding Color}" Style="{StaticResource Style.Icon}" Data="M 0,0 A 180,180 180 1 1 1,1 Z"/>
+                        <Path Width="12" Height="12" Margin="4,0,0,0" Fill="{Binding Color}" Data="M 0,0 A 180,180 180 1 1 1,1 Z"/>
                         <Label Content="{Binding Name}" Padding="4,0"/>
                         <Label Content="{Binding Desc}" Foreground="{StaticResource Brush.FG2}" FontSize="11" Padding="4,0"/>
                     </StackPanel>
diff --git a/src/UI/Revert.xaml b/src/UI/Revert.xaml
index 3d799975..aa82e9ce 100644
--- a/src/UI/Revert.xaml
+++ b/src/UI/Revert.xaml
@@ -24,7 +24,7 @@
 
         <Label Grid.Row="2" Grid.Column="0" HorizontalAlignment="Right" Content="{StaticResource Text.Revert.Commit}"/>
         <StackPanel Grid.Row="2" Grid.Column="1" Orientation="Horizontal">
-            <Path x:Name="icon" Width="12" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Commit}" Margin="4,0"/>
+            <Path x:Name="icon" Width="12" Data="{StaticResource Icon.Commit}" Margin="4,0"/>
             <TextBlock x:Name="txtDesc" Padding="4,0,0,0" Foreground="{StaticResource Brush.FG1}" VerticalAlignment="Center"/>
         </StackPanel>
 
diff --git a/src/UI/SettingDialog.xaml b/src/UI/SettingDialog.xaml
index 0e06451d..7059eb00 100644
--- a/src/UI/SettingDialog.xaml
+++ b/src/UI/SettingDialog.xaml
@@ -35,7 +35,7 @@
                 </Grid.ColumnDefinitions>
 
                 <!-- LOGO -->
-                <Path Width="20" Height="20" Margin="6,-1,2,0" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Git}" Fill="{StaticResource Brush.Logo}"/>
+                <Path Width="20" Height="20" Margin="6,-1,2,0" Data="{StaticResource Icon.Git}" Fill="{StaticResource Brush.Logo}"/>
 
                 <!-- Title -->
                 <Label Grid.Column="1" Content="{StaticResource Text.Preference}" FontWeight="Light"/>
@@ -52,7 +52,7 @@
                         </Style>
                     </Button.Style>
 
-                    <Path Width="10" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Close}"/>
+                    <Path Width="10" Data="{StaticResource Icon.Close}"/>
                 </Button>
             </Grid>
 
@@ -138,7 +138,7 @@
                         Text="{Binding Source={x:Static app:App.Setting}, Path=Tools.GitExecutable, Mode=TwoWay}"
                         helpers:TextBoxHelper.Placeholder="{StaticResource Text.Preference.Git.Path.Placeholder}"/>
                     <Button Grid.Column="1" Width="24" Height="24" Click="SelectGitPath" Padding="0" BorderThickness="1" Style="{StaticResource Style.Button.Bordered}">
-                        <Path Width="14" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Folder}"/>
+                        <Path Width="14" Data="{StaticResource Icon.Folder}"/>
                     </Button>
                 </Grid>
                 <Label Grid.Row="8" Grid.Column="0" Content="{StaticResource Text.Preference.Git.Dir}" HorizontalAlignment="Right"/>
@@ -154,7 +154,7 @@
                         Text="{Binding Source={x:Static app:App.Setting}, Path=Tools.GitDefaultCloneDir, Mode=TwoWay}"
                         helpers:TextBoxHelper.Placeholder="{StaticResource Text.Preference.Git.Dir.Placeholder}"/>
                     <Button Grid.Column="1" Width="24" Height="24" Click="SelectDefaultClonePath" Padding="0" BorderThickness="1" Style="{StaticResource Style.Button.Bordered}">
-                        <Path Width="14" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Folder}"/>
+                        <Path Width="14" Data="{StaticResource Icon.Folder}"/>
                     </Button>
                 </Grid>
 
@@ -206,7 +206,7 @@
                         Text="{Binding Source={x:Static app:App.Setting}, Path=Tools.MergeExecutable, Mode=TwoWay}"
                         helpers:TextBoxHelper.Placeholder="{StaticResource Text.Preference.Merger.Path.Placeholder}"/>
                     <Button Grid.Column="1" Width="24" Height="24" Click="SelectMergeToolPath" Padding="0" BorderThickness="1" Style="{StaticResource Style.Button.Bordered}">
-                        <Path Width="14" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Folder}"/>
+                        <Path Width="14" Data="{StaticResource Icon.Folder}"/>
                     </Button>
                 </Grid>
                 <Label Grid.Row="18" Grid.Column="0" Content="{StaticResource Text.Preference.Merger.Cmd}" HorizontalAlignment="Right"/>
diff --git a/src/UI/TwoCommitsDiff.xaml b/src/UI/TwoCommitsDiff.xaml
index 643c1356..63765873 100644
--- a/src/UI/TwoCommitsDiff.xaml
+++ b/src/UI/TwoCommitsDiff.xaml
@@ -43,7 +43,7 @@
                     </Grid.ColumnDefinitions>
 
                     <Border Grid.Column="0" Grid.ColumnSpan="2" BorderThickness="1" BorderBrush="{StaticResource Brush.Border2}"/>
-                    <Path Grid.Column="0" Width="14" Height="14" Fill="{StaticResource Brush.FG2}" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Search}"/>
+                    <Path Grid.Column="0" Width="14" Height="14" Fill="{StaticResource Brush.FG2}" Data="{StaticResource Icon.Search}"/>
                     <TextBox Grid.Column="1" x:Name="txtChangeFilter" BorderThickness="0" helpers:TextBoxHelper.Placeholder="{StaticResource Text.CommitViewer.Changes.Search}" TextChanged="SearchChangeFileTextChanged"/>
                     <ToggleButton
                             Grid.Column="2" 
@@ -78,7 +78,7 @@
                                 <Border x:Name="status" Width="14" Height="14" Visibility="Collapsed" Background="{Binding Change, Converter={StaticResource StatusColorConverter}}" CornerRadius="2" Margin="0,0,4,0">
                                     <TextBlock Text="{Binding Change, Converter={StaticResource StatusIconConverter}}" Foreground="{StaticResource Brush.FG1}" TextAlignment="Center" VerticalAlignment="Center" FontSize="10" RenderOptions.BitmapScalingMode="HighQuality"/>
                                 </Border>
-                                <Path x:Name="icon" Width="14" Style="{StaticResource Style.Icon}" Fill="Goldenrod" Data="{StaticResource Icon.Folder.Fill}"/>
+                                <Path x:Name="icon" Width="14" Fill="Goldenrod" Data="{StaticResource Icon.Folder.Fill}"/>
                                 <TextBlock Text="{Binding Name}" Foreground="{StaticResource Brush.FG1}" TextAlignment="Center" VerticalAlignment="Center" Margin="4,0,0,0" FontSize="11"/>
                             </StackPanel>
 
diff --git a/src/UI/UpdateAvailable.xaml b/src/UI/UpdateAvailable.xaml
index 785a6151..ca637ae6 100644
--- a/src/UI/UpdateAvailable.xaml
+++ b/src/UI/UpdateAvailable.xaml
@@ -31,7 +31,7 @@
                 </Grid.ColumnDefinitions>
 
                 <!-- LOGO -->
-                <Path Width="20" Height="20" Margin="6,-1,2,0" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Fetch}" Fill="{StaticResource Brush.FG1}"/>
+                <Path Width="20" Height="20" Margin="6,-1,2,0" Data="{StaticResource Icon.Fetch}" Fill="{StaticResource Brush.FG1}"/>
 
                 <!-- Title -->
                 <Label Grid.Column="1" Content="{StaticResource Text.UpdateAvailable}" FontWeight="Light"/>
@@ -48,7 +48,7 @@
                         </Style>
                     </Button.Style>
 
-                    <Path Width="10" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Close}"/>
+                    <Path Width="10" Data="{StaticResource Icon.Close}"/>
                 </Button>
             </Grid>
 
@@ -70,7 +70,7 @@
                 </Grid.ColumnDefinitions>
 
                 <StackPanel Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="3" Orientation="Horizontal" HorizontalAlignment="Center">
-                    <Path Width="20" Height="20" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Git}" Fill="#FFF05133"/>
+                    <Path Width="20" Height="20" Data="{StaticResource Icon.Git}" Fill="#FFF05133"/>
                     <Label x:Name="txtRelease" FontSize="18" FontWeight="Bold"/>
                 </StackPanel>
 
diff --git a/src/UI/WorkingCopy.xaml b/src/UI/WorkingCopy.xaml
index ee9512ad..3ebd473c 100644
--- a/src/UI/WorkingCopy.xaml
+++ b/src/UI/WorkingCopy.xaml
@@ -64,10 +64,10 @@
                         Opacity=".4"/>
                     <Label Grid.Column="1" Content="{StaticResource Text.WorkingCopy.Unstaged}" FontWeight="Bold" Foreground="{StaticResource Brush.FG1}" Opacity=".4"/>
                     <Button Grid.Column="3" Click="Stage" Margin="4,0" ToolTip="{StaticResource Text.WorkingCopy.Unstaged.Stage}" Background="Transparent">
-                        <Path Width="14" Height="14" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Down}" Opacity=".4"/>
+                        <Path Width="14" Height="14" Data="{StaticResource Icon.Down}" Opacity=".4"/>
                     </Button>
                     <Button Grid.Column="4" Click="StageAll" Margin="4,0" ToolTip="{StaticResource Text.WorkingCopy.Unstaged.StageAll}" Background="Transparent">
-                        <Path Width="14" Height="14" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.DoubleDown}" Opacity=".4"/>
+                        <Path Width="14" Height="14" Data="{StaticResource Icon.DoubleDown}" Opacity=".4"/>
                     </Button>
                 </Grid>
 
@@ -107,7 +107,7 @@
                                 <Border x:Name="status" Width="14" Height="14" Visibility="Collapsed" Background="{Binding Change, Converter={StaticResource UnstagedStatusConverter}}" CornerRadius="2" Margin="0,0,4,0">
                                     <TextBlock Text="{Binding Change, Converter={StaticResource UnstagedStatusIconConverter}}" Foreground="{StaticResource Brush.FG1}" TextAlignment="Center" VerticalAlignment="Center" FontSize="10" RenderOptions.BitmapScalingMode="HighQuality"/>
                                 </Border>
-                                <Path x:Name="icon" Width="14" Style="{StaticResource Style.Icon}" Fill="Goldenrod" Data="{StaticResource Icon.Folder.Fill}"/>
+                                <Path x:Name="icon" Width="14" Fill="Goldenrod" Data="{StaticResource Icon.Folder.Fill}"/>
                                 <TextBlock Text="{Binding Name}" Foreground="{StaticResource Brush.FG1}" TextAlignment="Center" VerticalAlignment="Center" Margin="4,0,0,0" FontSize="11"/>
                             </StackPanel>
 
@@ -225,10 +225,10 @@
                         Opacity=".4"/>
                     <Label Grid.Column="1" Content="{StaticResource Text.WorkingCopy.Staged}" FontWeight="Bold" Foreground="{StaticResource Brush.FG1}"  Opacity=".4"/>
                     <Button Grid.Column="3" Click="Unstage" ToolTip="{StaticResource Text.WorkingCopy.Staged.Unstage}" Margin="4,0" Background="Transparent">
-                        <Path Width="14" Height="14" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Up}" Opacity=".4"/>
+                        <Path Width="14" Height="14" Data="{StaticResource Icon.Up}" Opacity=".4"/>
                     </Button>
                     <Button Grid.Column="4" Click="UnstageAll" ToolTip="{StaticResource Text.WorkingCopy.Staged.UnstageAll}" Margin="4,0" Background="Transparent">
-                        <Path Width="14" Height="14" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.DoubleUp}" Opacity=".4"/>
+                        <Path Width="14" Height="14" Data="{StaticResource Icon.DoubleUp}" Opacity=".4"/>
                     </Button>
                 </Grid>
 
@@ -268,7 +268,7 @@
                                 <Border x:Name="status" Width="14" Height="14" Visibility="Collapsed" Background="{Binding Change, Converter={StaticResource StagedStatusConverter}}" CornerRadius="2" Margin="0,0,4,0">
                                     <TextBlock Text="{Binding Change, Converter={StaticResource StagedStatusIconConverter}}" Foreground="{StaticResource Brush.FG1}" TextAlignment="Center" VerticalAlignment="Center" FontSize="10" RenderOptions.BitmapScalingMode="HighQuality"/>
                                 </Border>
-                                <Path x:Name="icon" Width="14" Style="{StaticResource Style.Icon}" Fill="Goldenrod" Data="{StaticResource Icon.Folder.Fill}"/>
+                                <Path x:Name="icon" Width="14" Fill="Goldenrod" Data="{StaticResource Icon.Folder.Fill}"/>
                                 <TextBlock Text="{Binding Name}" Foreground="{StaticResource Brush.FG1}" TextAlignment="Center" VerticalAlignment="Center" Margin="4,0,0,0" FontSize="11"/>
                             </StackPanel>
 
@@ -378,7 +378,7 @@
             <!-- Merge -->
             <Grid Grid.Row="0" x:Name="mergePanel" Background="{StaticResource Brush.Window}" Visibility="Collapsed">
                 <StackPanel Orientation="Vertical" HorizontalAlignment="Center" VerticalAlignment="Center">
-                    <Path Width="64" Height="64" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.Conflict}" Margin="0,0,0,16"/>
+                    <Path Width="64" Height="64" Data="{StaticResource Icon.Conflict}" Margin="0,0,0,16"/>
                     <Label Content="{StaticResource Text.WorkingCopy.Conflicts}" FontSize="20" HorizontalAlignment="Center" FontWeight="DemiBold" Foreground="{StaticResource Brush.FG2}" Margin="0,0,0,24"/>
                     <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,4">
                         <Button Click="UseTheirs" Style="{StaticResource Style.Button.Bordered}" Content="{StaticResource Text.WorkingCopy.UseTheirs}" Height="24"/>
@@ -423,7 +423,7 @@
                 </Grid.ColumnDefinitions>
 
                 <Button Grid.Column="0" Width="16" Height="16" Margin="0,0,8,0" Click="OpenCommitMessageSelector" ToolTip="{StaticResource Text.WorkingCopy.MessageHistories}">
-                    <Path Width="14" Height="14" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.List}"/>
+                    <Path Width="14" Height="14" Data="{StaticResource Icon.List}"/>
                 </Button>
 
                 <CheckBox Grid.Column="1" x:Name="chkAmend" HorizontalAlignment="Left" Content="{StaticResource Text.WorkingCopy.Amend}" Checked="StartAmend" Unchecked="EndAmend"/>