diff --git a/SourceGit/Resources/Styles/ToggleButton.xaml b/SourceGit/Resources/Styles/ToggleButton.xaml
index 3920885e..b12157d6 100644
--- a/SourceGit/Resources/Styles/ToggleButton.xaml
+++ b/SourceGit/Resources/Styles/ToggleButton.xaml
@@ -94,8 +94,8 @@
                             Width="12"
                             Style="{DynamicResource Style.Icon}"
                             Fill="Transparent"
-                            Stroke="{DynamicResource Brush.FG2}"
-                            StrokeThickness="1"
+                            Stroke="{DynamicResource Brush.FG}"
+                            StrokeThickness=".4"
                             Data="{DynamicResource Icon.Tree}"/>
                     </Grid>
 
diff --git a/SourceGit/UI/CommitViewer.xaml b/SourceGit/UI/CommitViewer.xaml
index f0117f78..715c44fd 100644
--- a/SourceGit/UI/CommitViewer.xaml
+++ b/SourceGit/UI/CommitViewer.xaml
@@ -35,7 +35,7 @@
                 </Grid.ColumnDefinitions>
 
                 <!-- SHA -->
-                <Label Grid.Row="0" Grid.Column="0" Content="SHA" HorizontalAlignment="Right" Opacity=".5"/>
+                <Label Grid.Row="0" Grid.Column="0" Content="SHA" HorizontalAlignment="Right" Opacity=".6"/>
                 <TextBox Grid.Row="0" Grid.Column="1" 
                      x:Name="SHA" 
                      IsReadOnly="True" 
@@ -44,7 +44,7 @@
                      Margin="11,0,0,0"/>
 
                 <!-- Refs -->
-                <Label x:Name="lblRefs" Grid.Row="0" Grid.Column="2" Content="REFS" HorizontalAlignment="Right" Opacity=".5"/>
+                <Label x:Name="lblRefs" Grid.Row="0" Grid.Column="2" Content="REFS" HorizontalAlignment="Right" Opacity=".6"/>
                 <ItemsControl Grid.Row="0" Grid.Column="3" x:Name="refs" Margin="8,0,0,0">
                     <ItemsControl.ItemsPanel>
                         <ItemsPanelTemplate>
@@ -93,7 +93,7 @@
                 </ItemsControl>
 
                 <!-- PARENTS -->
-                <Label Grid.Row="1" Grid.Column="0" Content="PARENTS" HorizontalAlignment="Right" Opacity=".5"/>
+                <Label Grid.Row="1" Grid.Column="0" Content="PARENTS" HorizontalAlignment="Right" Opacity=".6"/>
                 <ItemsControl Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="3" x:Name="parents" Margin="8,0,0,0">
                     <ItemsControl.ItemsPanel>
                         <ItemsPanelTemplate>
@@ -116,7 +116,7 @@
                 </ItemsControl>
 
                 <!-- AUTHOR -->
-                <Label Grid.Row="2" Grid.Column="0" Content="AUTHOR" HorizontalAlignment="Right" Opacity=".5"/>
+                <Label Grid.Row="2" Grid.Column="0" Content="AUTHOR" HorizontalAlignment="Right" Opacity=".6"/>
                 <TextBox Grid.Row="2" Grid.Column="1" x:Name="author"
                      IsReadOnly="True" 
                      Background="Transparent"
@@ -125,7 +125,7 @@
                      Margin="11,0,0,0"/>
 
                 <!-- AUTHOR TIME -->
-                <Label Grid.Row="2" Grid.Column="2" Content="AUTHOR TIME" HorizontalAlignment="Right" Opacity=".5"/>
+                <Label Grid.Row="2" Grid.Column="2" Content="AUTHOR TIME" HorizontalAlignment="Right" Opacity=".6"/>
                 <TextBox Grid.Row="2" Grid.Column="3" Grid.ColumnSpan="3" x:Name="authorTime"
                      IsReadOnly="True" 
                      Background="Transparent"
@@ -134,7 +134,7 @@
                      Margin="8,0,0,0"/>
 
                 <!-- COMMITTER -->
-                <Label Grid.Row="3" Grid.Column="0" Content="COMMITTER" HorizontalAlignment="Right" Opacity=".5"/>
+                <Label Grid.Row="3" Grid.Column="0" Content="COMMITTER" HorizontalAlignment="Right" Opacity=".6"/>
                 <TextBox Grid.Row="3" Grid.Column="1" x:Name="committer"
                      IsReadOnly="True" 
                      Background="Transparent"
@@ -143,7 +143,7 @@
                      Margin="11,0,0,0"/>
 
                 <!-- COMMIT TIME -->
-                <Label Grid.Row="3" Grid.Column="2" Content="COMMIT TIME" HorizontalAlignment="Right" Opacity=".5"/>
+                <Label Grid.Row="3" Grid.Column="2" Content="COMMIT TIME" HorizontalAlignment="Right" Opacity=".6"/>
                 <TextBox Grid.Row="3" Grid.Column="3" Grid.ColumnSpan="3" x:Name="committerTime"
                      IsReadOnly="True" 
                      Background="Transparent"
@@ -154,7 +154,7 @@
                 <Rectangle Grid.Row="4" Grid.ColumnSpan="4" Height="1" Margin="8,0" Fill="{StaticResource Brush.Border2}"/>
 
                 <!-- SUBJECT -->
-                <Label Grid.Row="5" Grid.Column="0" Content="SUBJECT" HorizontalAlignment="Right" Opacity=".5"/>
+                <Label Grid.Row="5" Grid.Column="0" Content="SUBJECT" HorizontalAlignment="Right" Opacity=".6"/>
                 <TextBox Grid.Row="5" Grid.Column="1" Grid.ColumnSpan="3" 
                          x:Name="subject"
                          IsReadOnly="True"
@@ -163,7 +163,7 @@
                          Margin="8,0,16,0"/>
 
                 <!-- MESSAGE -->
-                <Label Grid.Row="6" Grid.Column="0" Content="DESCRIPTION" HorizontalAlignment="Right" VerticalAlignment="Top" Opacity=".5"/>
+                <Label Grid.Row="6" Grid.Column="0" Content="DESCRIPTION" HorizontalAlignment="Right" VerticalAlignment="Top" Opacity=".6"/>
                 <TextBox Grid.Row="6" Grid.Column="1" Grid.ColumnSpan="3" 
                      x:Name="message"
                      IsReadOnly="True"
@@ -176,7 +176,7 @@
                 <Rectangle Grid.Row="7" Grid.ColumnSpan="4" Height="1" Margin="8,0" Fill="{StaticResource Brush.Border2}"/>
 
                 <!-- CHANGELIST -->
-                <Label Grid.Row="8" Grid.Column="0" Content="CHANGED" HorizontalAlignment="Right" VerticalAlignment="Top" Opacity=".5"/>
+                <Label Grid.Row="8" Grid.Column="0" Content="CHANGED" HorizontalAlignment="Right" VerticalAlignment="Top" Opacity=".6"/>
                 <DataGrid
                     Grid.Row="8"
                     Grid.Column="1"
diff --git a/SourceGit/UI/Stashes.xaml b/SourceGit/UI/Stashes.xaml
index 0d5aecaa..832b0302 100644
--- a/SourceGit/UI/Stashes.xaml
+++ b/SourceGit/UI/Stashes.xaml
@@ -31,7 +31,7 @@
                     <RowDefinition Height="*"/>
                 </Grid.RowDefinitions>
 
-                <Label Content="STASHES" Foreground="{StaticResource Brush.FG2}" FontWeight="Bold"/>
+                <Label Content="STASHES" Foreground="{StaticResource Brush.FG}"  Opacity=".4" FontWeight="Bold"/>
                 <ListView
                     Grid.Row="1"
                     x:Name="stashList"
@@ -83,7 +83,7 @@
                         <ColumnDefinition Width="Auto"/>
                     </Grid.ColumnDefinitions>
 
-                    <Label Grid.Column="0" Content="CHANGES" Foreground="{StaticResource Brush.FG2}" FontWeight="Bold"/>
+                    <Label Grid.Column="0" Content="CHANGES" Foreground="{StaticResource Brush.FG}"  Opacity=".4" FontWeight="Bold"/>
                     <Label Grid.Column="1" Content="Untracked files not included" Foreground="{StaticResource Brush.FG2}" FontSize="10"/>
                 </Grid>
                 
diff --git a/SourceGit/UI/WorkingCopy.xaml b/SourceGit/UI/WorkingCopy.xaml
index f0ad97da..63fd3747 100644
--- a/SourceGit/UI/WorkingCopy.xaml
+++ b/SourceGit/UI/WorkingCopy.xaml
@@ -54,16 +54,16 @@
                     <ToggleButton 
                         Grid.Column="0" 
                         x:Name="toggleUnstangedMode"
-                        Margin="4,0,0,0" 
+                        Margin="4,0,4,0" 
                         ToolTip="SWITCH TO LIST/TREE VIEW"
                         Style="{StaticResource Style.ToggleButton.ListOrTree}" 
                         IsChecked="{Binding Source={x:Static source:App.Preference}, Path=UIUseListInUnstaged, Mode=TwoWay}"/>
-                    <Label Grid.Column="1" Content="UNSTAGED" FontWeight="Bold" Foreground="{StaticResource Brush.FG2}"/>
+                    <Label Grid.Column="1" Content="UNSTAGED" FontWeight="Bold" Foreground="{StaticResource Brush.FG}" Opacity=".4"/>
                     <Button Grid.Column="3" Click="Stage" Margin="4,0" ToolTip="STAGE" Background="Transparent">
-                        <Path Width="14" Height="14" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.StageSelected}" Fill="{StaticResource Brush.FG2}"/>
+                        <Path Width="14" Height="14" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.StageSelected}" Opacity=".4"/>
                     </Button>
                     <Button Grid.Column="4" Click="StageAll" Margin="4,0" ToolTip="STAGE ALL" Background="Transparent">
-                        <Path Width="14" Height="14" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.StageAll}" Fill="{StaticResource Brush.FG2}"/>
+                        <Path Width="14" Height="14" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.StageAll}" Opacity=".4"/>
                     </Button>
                 </Grid>
 
@@ -189,16 +189,16 @@
                     <ToggleButton
                         Grid.Column="0" 
                         x:Name="toggleStagedMode"
-                        Margin="4,0,0,0"
+                        Margin="4,0,4,0"
                         ToolTip="SWITCH TO LIST/TREE VIEW"
                         Style="{StaticResource Style.ToggleButton.ListOrTree}"
                         IsChecked="{Binding Source={x:Static source:App.Preference}, Path=UIUseListInStaged, Mode=TwoWay}"/>
-                    <Label Grid.Column="1" Content="STAGED" FontWeight="Bold" Foreground="{StaticResource Brush.FG2}"/>
+                    <Label Grid.Column="1" Content="STAGED" FontWeight="Bold" Foreground="{StaticResource Brush.FG}"  Opacity=".4"/>
                     <Button Grid.Column="3" Click="Unstage" ToolTip="UNSTAGE" Margin="4,0" Background="Transparent">
-                        <Path Width="14" Height="14" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.UnstageSelected}" Fill="{StaticResource Brush.FG2}"/>
+                        <Path Width="14" Height="14" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.UnstageSelected}" Opacity=".4"/>
                     </Button>
                     <Button Grid.Column="4" Click="UnstageAll" ToolTip="UNSTAGE ALL" Margin="4,0" Background="Transparent">
-                        <Path Width="14" Height="14" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.UnstageAll}" Fill="{StaticResource Brush.FG2}"/>
+                        <Path Width="14" Height="14" Style="{StaticResource Style.Icon}" Data="{StaticResource Icon.UnstageAll}" Opacity=".4"/>
                     </Button>
                 </Grid>