diff --git a/TGit/IconMappings.csv b/TGit/IconMappings.csv
new file mode 100644
index 0000000..ae688d8
--- /dev/null
+++ b/TGit/IconMappings.csv
@@ -0,0 +1,18 @@
+fec49b6d-c04a-42bd-b021-b8b2e5cfb291,1,d53d7256-d44d-4245-bdd2-bfd22943659c,1
+fec49b6d-c04a-42bd-b021-b8b2e5cfb291,2,d53d7256-d44d-4245-bdd2-bfd22943659c,2
+fec49b6d-c04a-42bd-b021-b8b2e5cfb291,3,d53d7256-d44d-4245-bdd2-bfd22943659c,3
+fec49b6d-c04a-42bd-b021-b8b2e5cfb291,4,d53d7256-d44d-4245-bdd2-bfd22943659c,4
+fec49b6d-c04a-42bd-b021-b8b2e5cfb291,5,d53d7256-d44d-4245-bdd2-bfd22943659c,5
+fec49b6d-c04a-42bd-b021-b8b2e5cfb291,6,d53d7256-d44d-4245-bdd2-bfd22943659c,6
+fec49b6d-c04a-42bd-b021-b8b2e5cfb291,7,d53d7256-d44d-4245-bdd2-bfd22943659c,7
+fec49b6d-c04a-42bd-b021-b8b2e5cfb291,8,d53d7256-d44d-4245-bdd2-bfd22943659c,8
+fec49b6d-c04a-42bd-b021-b8b2e5cfb291,9,d53d7256-d44d-4245-bdd2-bfd22943659c,9
+fec49b6d-c04a-42bd-b021-b8b2e5cfb291,10,d53d7256-d44d-4245-bdd2-bfd22943659c,10
+fec49b6d-c04a-42bd-b021-b8b2e5cfb291,11,d53d7256-d44d-4245-bdd2-bfd22943659c,11
+fec49b6d-c04a-42bd-b021-b8b2e5cfb291,12,d53d7256-d44d-4245-bdd2-bfd22943659c,12
+fec49b6d-c04a-42bd-b021-b8b2e5cfb291,13,d53d7256-d44d-4245-bdd2-bfd22943659c,13
+fec49b6d-c04a-42bd-b021-b8b2e5cfb291,14,d53d7256-d44d-4245-bdd2-bfd22943659c,14
+fec49b6d-c04a-42bd-b021-b8b2e5cfb291,15,d53d7256-d44d-4245-bdd2-bfd22943659c,15
+fec49b6d-c04a-42bd-b021-b8b2e5cfb291,16,d53d7256-d44d-4245-bdd2-bfd22943659c,16
+fec49b6d-c04a-42bd-b021-b8b2e5cfb291,17,d53d7256-d44d-4245-bdd2-bfd22943659c,17
+fec49b6d-c04a-42bd-b021-b8b2e5cfb291,18,d53d7256-d44d-4245-bdd2-bfd22943659c,18
diff --git a/TGit/Images.imagemanifest b/TGit/Images.imagemanifest
new file mode 100644
index 0000000..12be814
--- /dev/null
+++ b/TGit/Images.imagemanifest
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+ This file defines icon ID's and which image files they correspond to. This file is used in 
+ conjunction with the CustomMoniker.vsct file to provide the necessary data to display your 
+ custom moniker in menu buttons, toolbars, etc.
+-->
+<ImageManifest xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.microsoft.com/VisualStudio/ImageManifestSchema/2014">
+  <Symbols>
+    <String Name="Resources" Value="/TGit;Component/Resources/Images" />
+    <Guid Name="CustomMoniker" Value="{d53d7256-d44d-4245-bdd2-bfd22943659c}" />
+    <ID Name="ShowChanges" Value="1" />
+    <ID Name="Pull" Value="2" />
+    <ID Name="Push" Value="3" />
+    <ID Name="ShowLog" Value="4" />
+    <ID Name="Revert" Value="5" />
+    <ID Name="Branch" Value="6" />
+    <ID Name="Merge" Value="7" />
+    <ID Name="Differences" Value="8" />
+    <ID Name="Blame" Value="9" />
+    <ID Name="Repo" Value="10" />
+    <ID Name="Resolve" Value="11" />
+    <ID Name="Sync" Value="12" />
+    <ID Name="Commit" Value="13" />
+    <ID Name="Disk" Value="14" />
+    <ID Name="Switch" Value="15" />
+    <ID Name="Cleanup" Value="16" />
+    <ID Name="Stash" Value="17" />
+    <ID Name="Fetch" Value="18" />
+  </Symbols>
+  <Images>
+    <Image Guid="$(CustomMoniker)" ID="$(ShowChanges)">
+      <Source Uri="$(Resources)/ShowChanges.xaml" />
+    </Image>
+    <Image Guid="$(CustomMoniker)" ID="$(Pull)">
+      <Source Uri="$(Resources)/Pull.xaml" />
+    </Image>
+    <Image Guid="$(CustomMoniker)" ID="$(Push)">
+      <Source Uri="$(Resources)/Push.xaml" />
+    </Image>
+    <Image Guid="$(CustomMoniker)" ID="$(ShowLog)">
+      <Source Uri="$(Resources)/ShowLog.xaml" />
+    </Image>
+    <Image Guid="$(CustomMoniker)" ID="$(Revert)">
+      <Source Uri="$(Resources)/Revert.xaml" />
+    </Image>
+    <Image Guid="$(CustomMoniker)" ID="$(Branch)">
+      <Source Uri="$(Resources)/Branch.xaml" />
+    </Image>
+    <Image Guid="$(CustomMoniker)" ID="$(Merge)">
+      <Source Uri="$(Resources)/Merge.xaml" />
+    </Image>
+    <Image Guid="$(CustomMoniker)" ID="$(Differences)">
+      <Source Uri="$(Resources)/Differences.xaml" />
+    </Image>
+    <Image Guid="$(CustomMoniker)" ID="$(Blame)">
+      <Source Uri="$(Resources)/Blame.xaml" />
+    </Image>
+    <Image Guid="$(CustomMoniker)" ID="$(Repo)">
+      <Source Uri="$(Resources)/Repo.xaml" />
+    </Image>
+    <Image Guid="$(CustomMoniker)" ID="$(Resolve)">
+      <Source Uri="$(Resources)/Resolve.xaml" />
+    </Image>
+    <Image Guid="$(CustomMoniker)" ID="$(Sync)">
+      <Source Uri="$(Resources)/Sync.xaml" />
+    </Image>
+    <Image Guid="$(CustomMoniker)" ID="$(Commit)">
+      <Source Uri="$(Resources)/Commit.xaml" />
+    </Image>
+    <Image Guid="$(CustomMoniker)" ID="$(Disk)">
+      <Source Uri="$(Resources)/Disk.xaml" />
+    </Image>
+    <Image Guid="$(CustomMoniker)" ID="$(Switch)">
+      <Source Uri="$(Resources)/Switch.xaml" />
+    </Image>
+    <Image Guid="$(CustomMoniker)" ID="$(Cleanup)">
+      <Source Uri="$(Resources)/Cleanup.xaml" />
+    </Image>
+    <Image Guid="$(CustomMoniker)" ID="$(Stash)">
+      <Source Uri="$(Resources)/Stash.xaml" />
+    </Image>
+    <Image Guid="$(CustomMoniker)" ID="$(Fetch)">
+      <Source Uri="$(Resources)/Fetch.xaml" />
+    </Image>
+  </Images>
+  <ImageLists />
+</ImageManifest>
\ No newline at end of file
diff --git a/TGit/Images.vsct b/TGit/Images.vsct
new file mode 100644
index 0000000..ac9da50
--- /dev/null
+++ b/TGit/Images.vsct
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+ This file defines the Guid data for the custom monikers and the ID symbols for individual 
+ icons. This file is used in conjunction with the imagemanifest file to provide the necessary 
+ data to display your custom icons in menu buttons, toolbars, etc.
+ -->
+
+<!--
+ NOTE: This content does not have to be in a separate .vsct file, the Symbols for the custom
+ monikers can be defined in the main .vsct file. Additional file added here for demonstrative
+ purposes.
+-->
+<CommandTable xmlns="http://schemas.microsoft.com/VisualStudio/2005-10-18/CommandTable">
+  <Symbols>
+    <GuidSymbol name="CustomMoniker" value="{d53d7256-d44d-4245-bdd2-bfd22943659c}">
+      <IDSymbol name="ShowChanges" value="1" />
+      <IDSymbol name="Pull" value="2" />
+      <IDSymbol name="Push" value="3" />
+      <IDSymbol name="ShowLog" value="4" />
+      <IDSymbol name="Revert" value="5" />
+      <IDSymbol name="Branch" value="6" />
+      <IDSymbol name="Merge" value="7" />
+      <IDSymbol name="Differences" value="8" />
+      <IDSymbol name="Blame" value="9" />
+      <IDSymbol name="Repo" value="10" />
+      <IDSymbol name="Resolve" value="11" />
+      <IDSymbol name="Sync" value="12" />
+      <IDSymbol name="Commit" value="13" />
+      <IDSymbol name="Disk" value="14" />
+      <IDSymbol name="Switch" value="15" />
+      <IDSymbol name="Cleanup" value="16" />
+      <IDSymbol name="Stash" value="17" />
+      <IDSymbol name="Fetch" value="18" />
+    </GuidSymbol>
+  </Symbols>
+</CommandTable>
diff --git a/TGit/OptionsFlow.cs b/TGit/OptionsFlow.cs
index 6a7b6b6..0765b3b 100644
--- a/TGit/OptionsFlow.cs
+++ b/TGit/OptionsFlow.cs
@@ -2,6 +2,7 @@
 using System;
 using System.ComponentModel;
 using System.Runtime.InteropServices;
+// ReSharper disable InconsistentNaming
 
 namespace SamirBoulema.TGit
 {
diff --git a/TGit/Resources/Images/Blame.xaml b/TGit/Resources/Images/Blame.xaml
new file mode 100644
index 0000000..d1eed1b
--- /dev/null
+++ b/TGit/Resources/Images/Blame.xaml
@@ -0,0 +1,13 @@
+<Viewbox xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+    <Rectangle Width="16" Height="16">
+        <Rectangle.Fill>
+            <DrawingBrush Stretch="None">
+                <DrawingBrush.Drawing>
+                    <DrawingGroup>
+                        <GeometryDrawing Brush="#FF242424" Geometry="F1 M12,16z M0,0z M5.05,0.31C5.86,2.48 5.46,3.69 4.53,4.62 3.55,5.67 1.98,6.45 0.9,7.98 -0.55,10.03 -0.8,14.51 4.43,15.68 2.23,14.52 1.76,11.16 4.13,9.07 3.52,11.1 4.66,12.4 6.07,11.93 7.46,11.46 8.37,12.46 8.34,13.6 8.32,14.38 8.03,15.04 7.21,15.41 10.63,14.82 11.99,11.99 11.99,9.85 11.99,7.01 9.46,6.63 10.74,4.24 9.22,4.37 8.71,5.37 8.85,6.99 8.94,8.07 7.83,8.79 6.99,8.32 6.32,7.91 6.33,7.13 6.93,6.54 8.18,5.31 8.68,2.45 5.05,0.32L5.03,0.3 5.05,0.31z" />
+                    </DrawingGroup>
+                </DrawingBrush.Drawing>
+            </DrawingBrush>
+        </Rectangle.Fill>
+    </Rectangle>
+</Viewbox>
\ No newline at end of file
diff --git a/TGit/Resources/Images/Branch.xaml b/TGit/Resources/Images/Branch.xaml
new file mode 100644
index 0000000..7d494c4
--- /dev/null
+++ b/TGit/Resources/Images/Branch.xaml
@@ -0,0 +1,13 @@
+<Viewbox xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+    <Rectangle Width="16" Height="16">
+        <Rectangle.Fill>
+            <DrawingBrush Stretch="None">
+                <DrawingBrush.Drawing>
+                    <DrawingGroup>
+                        <GeometryDrawing Brush="#FF242424" Geometry="F1 M10,16z M0,0z M10,5C10,3.89,9.11,3,8,3A1.993,1.993,0,0,0,7,6.72L7,7.02C6.98,7.54 6.77,8 6.37,8.4 5.97,8.8 5.51,9.01 4.99,9.03 4.16,9.05 3.51,9.19 2.99,9.48L2.99,4.72A1.993,1.993,0,0,0,1.99,1C0.88,1,0,1.89,0,3A2,2,0,0,0,1,4.72L1,11.28C0.41,11.63 0,12.27 0,13 0,14.11 0.89,15 2,15 3.11,15 4,14.11 4,13 4,12.47 3.8,12 3.47,11.64 3.56,11.58 3.95,11.23 4.06,11.17 4.31,11.06 4.62,11 5,11 6.05,10.95 6.95,10.55 7.75,9.75 8.55,8.95 8.95,7.77 9,6.73L8.98,6.73C9.59,6.37,10,5.73,10,5z M2,1.8C2.66,1.8 3.2,2.35 3.2,3 3.2,3.65 2.65,4.2 2,4.2 1.35,4.2 0.8,3.65 0.8,3 0.8,2.35 1.35,1.8 2,1.8z M2,14.21C1.34,14.21 0.8,13.66 0.8,13.01 0.8,12.36 1.35,11.81 2,11.81 2.65,11.81 3.2,12.36 3.2,13.01 3.2,13.66 2.65,14.21 2,14.21z M8,6.21C7.34,6.21 6.8,5.66 6.8,5.01 6.8,4.36 7.35,3.81 8,3.81 8.65,3.81 9.2,4.36 9.2,5.01 9.2,5.66 8.65,6.21 8,6.21z" />
+                    </DrawingGroup>
+                </DrawingBrush.Drawing>
+            </DrawingBrush>
+        </Rectangle.Fill>
+    </Rectangle>
+</Viewbox>
\ No newline at end of file
diff --git a/TGit/Resources/Images/Cleanup.xaml b/TGit/Resources/Images/Cleanup.xaml
new file mode 100644
index 0000000..c4d81f2
--- /dev/null
+++ b/TGit/Resources/Images/Cleanup.xaml
@@ -0,0 +1,13 @@
+<Viewbox xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+    <Rectangle Width="16" Height="16">
+        <Rectangle.Fill>
+            <DrawingBrush Stretch="None">
+                <DrawingBrush.Drawing>
+                    <DrawingGroup>
+                        <GeometryDrawing Brush="#FF242424" Geometry="F1 M12,16z M0,0z M11,2L9,2C9,1.45,8.55,1,8,1L5,1C4.45,1,4,1.45,4,2L2,2C1.45,2,1,2.45,1,3L1,4C1,4.55,1.45,5,2,5L2,14C2,14.55,2.45,15,3,15L10,15C10.55,15,11,14.55,11,14L11,5C11.55,5,12,4.55,12,4L12,3C12,2.45,11.55,2,11,2z M10,14L3,14 3,5 4,5 4,13 5,13 5,5 6,5 6,13 7,13 7,5 8,5 8,13 9,13 9,5 10,5 10,14z M11,4L2,4 2,3 11,3 11,4z" />
+                    </DrawingGroup>
+                </DrawingBrush.Drawing>
+            </DrawingBrush>
+        </Rectangle.Fill>
+    </Rectangle>
+</Viewbox>
\ No newline at end of file
diff --git a/TGit/Resources/Images/Commit.xaml b/TGit/Resources/Images/Commit.xaml
new file mode 100644
index 0000000..34c9220
--- /dev/null
+++ b/TGit/Resources/Images/Commit.xaml
@@ -0,0 +1,13 @@
+<Viewbox xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+    <Rectangle Width="16" Height="16">
+        <Rectangle.Fill>
+            <DrawingBrush Stretch="None">
+                <DrawingBrush.Drawing>
+                    <DrawingGroup>
+                        <GeometryDrawing Brush="#FF242424" Geometry="F1 M14,16z M0,0z M10.86,7C10.41,5.28 8.86,4 7,4 5.14,4 3.59,5.28 3.14,7L0,7 0,9 3.14,9C3.59,10.72 5.14,12 7,12 8.86,12 10.41,10.72 10.86,9L14,9 14,7 10.86,7z M7,10.2C5.78,10.2 4.8,9.22 4.8,8 4.8,6.78 5.78,5.8 7,5.8 8.22,5.8 9.2,6.78 9.2,8 9.2,9.22 8.22,10.2 7,10.2z" />
+                    </DrawingGroup>
+                </DrawingBrush.Drawing>
+            </DrawingBrush>
+        </Rectangle.Fill>
+    </Rectangle>
+</Viewbox>
\ No newline at end of file
diff --git a/TGit/Resources/Images/Differences.xaml b/TGit/Resources/Images/Differences.xaml
new file mode 100644
index 0000000..07768c5
--- /dev/null
+++ b/TGit/Resources/Images/Differences.xaml
@@ -0,0 +1,13 @@
+<Viewbox xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+    <Rectangle Width="16" Height="16">
+        <Rectangle.Fill>
+            <DrawingBrush Stretch="None">
+                <DrawingBrush.Drawing>
+                    <DrawingGroup>
+                        <GeometryDrawing Brush="#FF242424" Geometry="F1 M13,16z M0,0z M6,7L8,7 8,8 6,8 6,10 5,10 5,8 3,8 3,7 5,7 5,5 6,5 6,7z M3,13L8,13 8,12 3,12 3,13z M7.5,2L11,5.5 11,15C11,15.55,10.55,16,10,16L1,16C0.45,16,0,15.55,0,15L0,3C0,2.45,0.45,2,1,2L7.5,2z M10,6L7,3 1,3 1,15 10,15 10,6z M8.5,0L3,0 3,1 8,1 12,5 12,13 13,13 13,4.5 8.5,0z" />
+                    </DrawingGroup>
+                </DrawingBrush.Drawing>
+            </DrawingBrush>
+        </Rectangle.Fill>
+    </Rectangle>
+</Viewbox>
\ No newline at end of file
diff --git a/TGit/Resources/Images/Disk.xaml b/TGit/Resources/Images/Disk.xaml
new file mode 100644
index 0000000..3d3136e
--- /dev/null
+++ b/TGit/Resources/Images/Disk.xaml
@@ -0,0 +1,13 @@
+<Viewbox xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+    <Rectangle Width="16" Height="16">
+        <Rectangle.Fill>
+            <DrawingBrush Stretch="None">
+                <DrawingBrush.Drawing>
+                    <DrawingGroup>
+                        <GeometryDrawing Brush="#FF242424" Geometry="F1 M16,16z M0,0z M15,2L1,2C0.45,2,0,2.45,0,3L0,12C0,12.55,0.45,13,1,13L6.34,13C6.09,13.61,5.48,14.39,4,15L12,15C10.52,14.39,9.91,13.61,9.66,13L15,13C15.55,13,16,12.55,16,12L16,3C16,2.45,15.55,2,15,2z M15,11L1,11 1,3 15,3 15,11z" />
+                    </DrawingGroup>
+                </DrawingBrush.Drawing>
+            </DrawingBrush>
+        </Rectangle.Fill>
+    </Rectangle>
+</Viewbox>
\ No newline at end of file
diff --git a/TGit/Resources/Images/Fetch.xaml b/TGit/Resources/Images/Fetch.xaml
new file mode 100644
index 0000000..5c484c7
--- /dev/null
+++ b/TGit/Resources/Images/Fetch.xaml
@@ -0,0 +1,13 @@
+<Viewbox xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+    <Rectangle Width="16" Height="16">
+        <Rectangle.Fill>
+            <DrawingBrush Stretch="None">
+                <DrawingBrush.Drawing>
+                    <DrawingGroup ClipGeometry="M0,0 V16 H16 V0 H0 Z">
+                        <GeometryDrawing Brush="#FF242424" Geometry="F1 M16,16z M0,0z M9,12L11,12 8,15 5,12 7,12 7,7 9,7 9,12z M12,4C12,3.56 11.09,1 7.5,1 5.08,1 3,2.92 3,5 1.02,5 0,6.52 0,8 0,9.53 1,11 3,11L6,11 6,9.7 3,9.7C1.38,9.7 1.3,8.28 1.3,8 1.3,7.83 1.35,6.3 3,6.3L4.3,6.3 4.3,5C4.3,3.61 5.86,2.3 7.5,2.3 10.05,2.3 10.63,3.85 10.7,4.1L10.7,5.3 12,5.3C12.81,5.3 14.7,5.52 14.7,7.5 14.7,9.59 12.45,9.7 12,9.7L10,9.7 10,11 12,11C14.08,11 16,9.84 16,7.5 16,5.06 14.08,4 12,4z" />
+                    </DrawingGroup>
+                </DrawingBrush.Drawing>
+            </DrawingBrush>
+        </Rectangle.Fill>
+    </Rectangle>
+</Viewbox>
\ No newline at end of file
diff --git a/TGit/Resources/Images/Merge.xaml b/TGit/Resources/Images/Merge.xaml
new file mode 100644
index 0000000..d0a38a5
--- /dev/null
+++ b/TGit/Resources/Images/Merge.xaml
@@ -0,0 +1,13 @@
+<Viewbox xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+    <Rectangle Width="16" Height="16">
+        <Rectangle.Fill>
+            <DrawingBrush Stretch="None">
+                <DrawingBrush.Drawing>
+                    <DrawingGroup>
+                        <GeometryDrawing Brush="#FF242424" Geometry="F1 M12,16z M0,0z M10,7C9.27,7,8.62,7.41,8.27,8.02L8.27,8C7.22,7.98 6,7.64 5.14,6.98 4.39,6.4 3.64,5.37 3.25,4.54A1.993,1.993,0,0,0,2,0.99C0.89,0.99,0,1.89,0,3A2,2,0,0,0,1,4.72L1,11.28C0.41,11.63 0,12.27 0,13 0,14.11 0.89,15 2,15A1.993,1.993,0,0,0,3,11.28L3,7.67C3.67,8.37 4.44,8.94 5.3,9.36 6.16,9.78 7.33,9.99 8.27,10L8.27,9.98C8.63,10.59 9.27,11 10,11 11.11,11 12,10.11 12,9 12,7.89 11.11,7 10,7z M3.2,13C3.2,13.66 2.65,14.2 2,14.2 1.35,14.2 0.8,13.65 0.8,13 0.8,12.35 1.35,11.8 2,11.8 2.65,11.8 3.2,12.35 3.2,13z M2,4.2C1.34,4.2 0.8,3.65 0.8,3 0.8,2.35 1.35,1.8 2,1.8 2.65,1.8 3.2,2.35 3.2,3 3.2,3.65 2.65,4.2 2,4.2z M10,10.2C9.34,10.2 8.8,9.65 8.8,9 8.8,8.35 9.35,7.8 10,7.8 10.65,7.8 11.2,8.35 11.2,9 11.2,9.65 10.65,10.2 10,10.2z" />
+                    </DrawingGroup>
+                </DrawingBrush.Drawing>
+            </DrawingBrush>
+        </Rectangle.Fill>
+    </Rectangle>
+</Viewbox>
\ No newline at end of file
diff --git a/TGit/Resources/Images/Pull.xaml b/TGit/Resources/Images/Pull.xaml
new file mode 100644
index 0000000..a28dcff
--- /dev/null
+++ b/TGit/Resources/Images/Pull.xaml
@@ -0,0 +1,13 @@
+<Viewbox xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+    <Rectangle Width="16" Height="16">
+        <Rectangle.Fill>
+            <DrawingBrush Stretch="None">
+                <DrawingBrush.Drawing>
+                    <DrawingGroup ClipGeometry="M0,0 V16 H16 V0 H0 Z">
+                        <GeometryDrawing Brush="#FF242424" Geometry="F1 M16,16z M0,0z M13,8L13,6 7,6 7,4 13,4 13,2 16,5 13,8z M4,2L3,2 3,3 4,3 4,2z M11,7L12,7 12,13C12,13.55,11.55,14,11,14L6,14 6,16 4.5,14.5 3,16 3,14 1,14C0.45,14,0,13.55,0,13L0,1C0,0.45,0.45,0,1,0L11,0C11.55,0,12,0.45,12,1L12,3 11,3 11,1 2,1 2,10 11,10 11,7z M11,11L1,11 1,13 3,13 3,12 6,12 6,13 11,13 11,11z M4,6L3,6 3,7 4,7 4,6z M4,4L3,4 3,5 4,5 4,4z M3,9L4,9 4,8 3,8 3,9z" />
+                    </DrawingGroup>
+                </DrawingBrush.Drawing>
+            </DrawingBrush>
+        </Rectangle.Fill>
+    </Rectangle>
+</Viewbox>
\ No newline at end of file
diff --git a/TGit/Resources/Images/Push.xaml b/TGit/Resources/Images/Push.xaml
new file mode 100644
index 0000000..7e83959
--- /dev/null
+++ b/TGit/Resources/Images/Push.xaml
@@ -0,0 +1,13 @@
+<Viewbox xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+    <Rectangle Width="16" Height="16">
+        <Rectangle.Fill>
+            <DrawingBrush Stretch="None">
+                <DrawingBrush.Drawing>
+                    <DrawingGroup>
+                        <GeometryDrawing Brush="#FF242424" Geometry="F1 M12,16z M0,0z M4,3L3,3 3,2 4,2 4,3z M3,5L4,5 4,4 3,4 3,5z M7,5L4,9 6,9 6,16 8,16 8,9 10,9 7,5z M11,0L1,0C0.45,0,0,0.45,0,1L0,13C0,13.55,0.45,14,1,14L5,14 5,13 1,13 1,11 5,11 5,10 2,10 2,1 11.02,1 11,10 9,10 9,11 11,11 11,13 9,13 9,14 11,14C11.55,14,12,13.55,12,13L12,1C12,0.45,11.55,0,11,0z" />
+                    </DrawingGroup>
+                </DrawingBrush.Drawing>
+            </DrawingBrush>
+        </Rectangle.Fill>
+    </Rectangle>
+</Viewbox>
\ No newline at end of file
diff --git a/TGit/Resources/Images/Repo.xaml b/TGit/Resources/Images/Repo.xaml
new file mode 100644
index 0000000..f487af4
--- /dev/null
+++ b/TGit/Resources/Images/Repo.xaml
@@ -0,0 +1,13 @@
+<Viewbox xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+    <Rectangle Width="16" Height="16">
+        <Rectangle.Fill>
+            <DrawingBrush Stretch="None">
+                <DrawingBrush.Drawing>
+                    <DrawingGroup>
+                        <GeometryDrawing Brush="#FF242424" Geometry="F1 M12,16z M0,0z M4,9L3,9 3,8 4,8 4,9z M4,6L3,6 3,7 4,7 4,6z M4,4L3,4 3,5 4,5 4,4z M4,2L3,2 3,3 4,3 4,2z M12,1L12,13C12,13.55,11.55,14,11,14L6,14 6,16 4.5,14.5 3,16 3,14 1,14C0.45,14,0,13.55,0,13L0,1C0,0.45,0.45,0,1,0L11,0C11.55,0,12,0.45,12,1z M11,11L1,11 1,13 3,13 3,12 6,12 6,13 11,13 11,11z M11,1L2,1 2,10 11,10 11,1z" />
+                    </DrawingGroup>
+                </DrawingBrush.Drawing>
+            </DrawingBrush>
+        </Rectangle.Fill>
+    </Rectangle>
+</Viewbox>
\ No newline at end of file
diff --git a/TGit/Resources/Images/Resolve.xaml b/TGit/Resources/Images/Resolve.xaml
new file mode 100644
index 0000000..230e791
--- /dev/null
+++ b/TGit/Resources/Images/Resolve.xaml
@@ -0,0 +1,13 @@
+<Viewbox xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+    <Rectangle Width="16" Height="16">
+        <Rectangle.Fill>
+            <DrawingBrush Stretch="None">
+                <DrawingBrush.Drawing>
+                    <DrawingGroup ClipGeometry="M0,0 V16 H16 V0 H0 Z">
+                        <GeometryDrawing Brush="#FF242424" Geometry="F1 M16,16z M0,0z M8.865,1.52C8.685,1.21 8.355,1.02 7.995,1.02 7.635,1.02 7.305,1.21 7.125,1.52L0.275,13.5C0.095,13.81 0.095,14.19 0.275,14.5 0.465,14.81 0.795,15 1.145,15L14.845,15C15.205,15 15.535,14.81 15.705,14.5 15.875,14.19 15.885,13.81 15.715,13.5L8.865,1.52z M8.995,13L6.995,13 6.995,11 8.995,11 8.995,13z M8.995,10L6.995,10 6.995,6 8.995,6 8.995,10z" />
+                    </DrawingGroup>
+                </DrawingBrush.Drawing>
+            </DrawingBrush>
+        </Rectangle.Fill>
+    </Rectangle>
+</Viewbox>
\ No newline at end of file
diff --git a/TGit/Resources/Images/Revert.xaml b/TGit/Resources/Images/Revert.xaml
new file mode 100644
index 0000000..8e8bd0f
--- /dev/null
+++ b/TGit/Resources/Images/Revert.xaml
@@ -0,0 +1,13 @@
+<Viewbox xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+    <Rectangle Width="16" Height="16">
+        <Rectangle.Fill>
+            <DrawingBrush Stretch="None">
+                <DrawingBrush.Drawing>
+                    <DrawingGroup>
+                        <GeometryDrawing Brush="#FF242424" Geometry="F1 M12,16z M0,0z M6,2.5L0,7 6,11.5 6,8.5C7.73,8.5 11.14,9.45 12,12.88 12,8.33 8.94,5.83 6,5.5L6,2.5z" />
+                    </DrawingGroup>
+                </DrawingBrush.Drawing>
+            </DrawingBrush>
+        </Rectangle.Fill>
+    </Rectangle>
+</Viewbox>
\ No newline at end of file
diff --git a/TGit/Resources/Images/ShowChanges.xaml b/TGit/Resources/Images/ShowChanges.xaml
new file mode 100644
index 0000000..39214c5
--- /dev/null
+++ b/TGit/Resources/Images/ShowChanges.xaml
@@ -0,0 +1,13 @@
+<Viewbox xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+    <Rectangle Width="16" Height="16">
+        <Rectangle.Fill>
+            <DrawingBrush Stretch="None">
+                <DrawingBrush.Drawing>
+                    <DrawingGroup ClipGeometry="M0,0 V16 H16 V0 H0 Z">
+                        <GeometryDrawing Brush="#FF242424" Geometry="F1 M16,16z M0,0z M8.06,2C3,2 0,8 0,8 0,8 3,14 8.06,14 13,14 16,8 16,8 16,8 13,2 8.06,2z M8,12C5.8,12 4,10.22 4,8 4,5.8 5.8,4 8,4 10.22,4 12,5.8 12,8 12,10.22 10.22,12 8,12z M10,8C10,9.11 9.11,10 8,10 6.89,10 6,9.11 6,8 6,6.89 6.89,6 8,6 9.11,6 10,6.89 10,8z" />
+                    </DrawingGroup>
+                </DrawingBrush.Drawing>
+            </DrawingBrush>
+        </Rectangle.Fill>
+    </Rectangle>
+</Viewbox>
\ No newline at end of file
diff --git a/TGit/Resources/Images/ShowLog.xaml b/TGit/Resources/Images/ShowLog.xaml
new file mode 100644
index 0000000..93c082e
--- /dev/null
+++ b/TGit/Resources/Images/ShowLog.xaml
@@ -0,0 +1,13 @@
+<Viewbox xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+    <Rectangle Width="16" Height="16">
+        <Rectangle.Fill>
+            <DrawingBrush Stretch="None">
+                <DrawingBrush.Drawing>
+                    <DrawingGroup>
+                        <GeometryDrawing Brush="#FF242424" Geometry="F1 M14,16z M0,0z M8,13L6,13 6,6 11,6 11,8 8,8 8,13z M7,1C4.81,1,2.87,2.02,1.59,3.59L0,2 0,6 4,6 2.5,4.5C3.55,3.17 5.17,2.3 7,2.3 10.14,2.3 12.7,4.86 12.7,8 12.7,11.14 10.14,13.7 7,13.7A5.71,5.71,0,0,1,1.3,8C1.3,7.66,1.33,7.33,1.39,7L0.08,7C0.03,7.33 0,7.66 0,8 0,11.86 3.14,15 7,15 10.86,15 14,11.86 14,8 14,4.14 10.86,1 7,1z" />
+                    </DrawingGroup>
+                </DrawingBrush.Drawing>
+            </DrawingBrush>
+        </Rectangle.Fill>
+    </Rectangle>
+</Viewbox>
\ No newline at end of file
diff --git a/TGit/Resources/Images/Stash.xaml b/TGit/Resources/Images/Stash.xaml
new file mode 100644
index 0000000..30b3edb
--- /dev/null
+++ b/TGit/Resources/Images/Stash.xaml
@@ -0,0 +1,13 @@
+<Viewbox xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+    <Rectangle Width="16" Height="16">
+        <Rectangle.Fill>
+            <DrawingBrush Stretch="None">
+                <DrawingBrush.Drawing>
+                    <DrawingGroup>
+                        <GeometryDrawing Brush="#FF242424" Geometry="F1 M16,16z M0,0z M1,4.27L1,11.74C1,12.19,1.3,12.58,1.75,12.71L8.25,14.44C8.41,14.49,8.59,14.49,8.75,14.44L15.25,12.71C15.7,12.58,16,12.19,16,11.74L16,4.27C16,3.82,15.7,3.43,15.25,3.3L8.75,1.56A1.4,1.4,0,0,0,8.25,1.56L1.75,3.3C1.3,3.43,1,3.82,1,4.27z M8,13.36L2,11.77 2,5 8,6.61 8,13.36z M2,4L4.5,3.33 11,5.06 8.5,5.73 2,4z M15,11.77L9,13.36 9,6.61 11,6.06 11,8.5 13,7.97 13,5.53 15,5 15,11.77z M13,4.53L6.5,2.8 8.5,2.27 15,4 13,4.53z" />
+                    </DrawingGroup>
+                </DrawingBrush.Drawing>
+            </DrawingBrush>
+        </Rectangle.Fill>
+    </Rectangle>
+</Viewbox>
\ No newline at end of file
diff --git a/TGit/Resources/Images/Switch.xaml b/TGit/Resources/Images/Switch.xaml
new file mode 100644
index 0000000..b054cf0
--- /dev/null
+++ b/TGit/Resources/Images/Switch.xaml
@@ -0,0 +1,13 @@
+<Viewbox xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+    <Rectangle Width="16" Height="16">
+        <Rectangle.Fill>
+            <DrawingBrush Stretch="None">
+                <DrawingBrush.Drawing>
+                    <DrawingGroup>
+                        <GeometryDrawing Brush="#FF242424" Geometry="F1 M14,16z M0,0z M5,12L4,12C3.73,11.98 3.52,11.89 3.31,11.69 3.1,11.49 3.01,11.27 3,11L3,4.72A1.993,1.993,0,0,0,2,1A1.993,1.993,0,0,0,1,4.72L1,11C1.03,11.78 1.34,12.47 1.94,13.06 2.54,13.65 3.22,13.97 4,14L5,14 5,16 8,13 5,10 5,12z M2,1.8C2.66,1.8 3.2,2.35 3.2,3 3.2,3.65 2.65,4.2 2,4.2 1.35,4.2 0.8,3.65 0.8,3 0.8,2.35 1.35,1.8 2,1.8z M13,11.28L13,5C12.97,4.22 12.66,3.53 12.06,2.94 11.46,2.35 10.78,2.03 10,2L9,2 9,0 6,3 9,6 9,4 10,4C10.27,4.02 10.48,4.11 10.69,4.31 10.9,4.51 10.99,4.73 11,5L11,11.28A1.993,1.993,0,0,0,12,15A1.993,1.993,0,0,0,13,11.28z M12,14.2C11.34,14.2 10.8,13.65 10.8,13 10.8,12.35 11.35,11.8 12,11.8 12.65,11.8 13.2,12.35 13.2,13 13.2,13.65 12.65,14.2 12,14.2z" />
+                    </DrawingGroup>
+                </DrawingBrush.Drawing>
+            </DrawingBrush>
+        </Rectangle.Fill>
+    </Rectangle>
+</Viewbox>
\ No newline at end of file
diff --git a/TGit/Resources/Images/Sync.xaml b/TGit/Resources/Images/Sync.xaml
new file mode 100644
index 0000000..8287bbf
--- /dev/null
+++ b/TGit/Resources/Images/Sync.xaml
@@ -0,0 +1,13 @@
+<Viewbox xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+    <Rectangle Width="16" Height="16">
+        <Rectangle.Fill>
+            <DrawingBrush Stretch="None">
+                <DrawingBrush.Drawing>
+                    <DrawingGroup>
+                        <GeometryDrawing Brush="#FF242424" Geometry="F1 M12,16z M0,0z M10.24,7.4A4.15,4.15,0,0,1,9.04,11A4.346,4.346,0,0,1,3.63,11.54L4.8,10.4 0.5,9.8 1.1,14 2.41,12.74C4.77,14.48,8.11,14.31,10.25,12.2A5.876,5.876,0,0,0,11.99,7.74L10.24,7.4z M2.96,5A4.346,4.346,0,0,1,8.37,4.46L7.2,5.6 11.5,6.2 10.9,2 9.59,3.26C7.23,1.52 3.89,1.69 1.74,3.8 0.5,5.03 -0.06,6.65 0.01,8.26L1.76,8.61A4.17,4.17,0,0,1,2.96,5z" />
+                    </DrawingGroup>
+                </DrawingBrush.Drawing>
+            </DrawingBrush>
+        </Rectangle.Fill>
+    </Rectangle>
+</Viewbox>
\ No newline at end of file
diff --git a/TGit/TGIT.csproj b/TGit/TGIT.csproj
index 22b7ab1..2f5e56a 100644
--- a/TGit/TGIT.csproj
+++ b/TGit/TGIT.csproj
@@ -29,6 +29,9 @@
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationManifest>Images.imagemanifest</ApplicationManifest>
+  </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -75,34 +78,46 @@
       <HintPath>..\packages\VSSDK.GraphModel.11.0.4\lib\net45\Microsoft.VisualStudio.GraphModel.dll</HintPath>
       <Private>False</Private>
     </Reference>
+    <Reference Include="Microsoft.VisualStudio.ImageCatalog, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.VisualStudio.ImageCatalog.14.3.25407\lib\net45\Microsoft.VisualStudio.ImageCatalog.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Imaging, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.VisualStudio.Imaging.14.3.25407\lib\net45\Microsoft.VisualStudio.Imaging.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+      <HintPath>..\packages\Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime.14.3.25407\lib\Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="Microsoft.VisualStudio.OLE.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-      <Private>False</Private>
-      <HintPath>..\packages\VSSDK.OLE.Interop.7.0.4\lib\net20\Microsoft.VisualStudio.OLE.Interop.dll</HintPath>
+      <HintPath>..\packages\Microsoft.VisualStudio.OLE.Interop.7.10.6070\lib\Microsoft.VisualStudio.OLE.Interop.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.VisualStudio.Shell.12.0, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\VSSDK.Shell.12.12.0.4\lib\net45\Microsoft.VisualStudio.Shell.12.0.dll</HintPath>
-      <Private>False</Private>
+    <Reference Include="Microsoft.VisualStudio.Shell.14.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.VisualStudio.Shell.14.0.14.3.25407\lib\Microsoft.VisualStudio.Shell.14.0.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <Private>False</Private>
-      <HintPath>..\packages\VSSDK.Shell.Immutable.10.10.0.4\lib\net40\Microsoft.VisualStudio.Shell.Immutable.10.0.dll</HintPath>
+      <HintPath>..\packages\Microsoft.VisualStudio.Shell.Immutable.10.0.10.0.30319\lib\net40\Microsoft.VisualStudio.Shell.Immutable.10.0.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.Shell.Immutable.11.0, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <Private>False</Private>
-      <HintPath>..\packages\VSSDK.Shell.Immutable.11.11.0.4\lib\net45\Microsoft.VisualStudio.Shell.Immutable.11.0.dll</HintPath>
+      <HintPath>..\packages\Microsoft.VisualStudio.Shell.Immutable.11.0.11.0.50727\lib\net45\Microsoft.VisualStudio.Shell.Immutable.11.0.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.Shell.Immutable.12.0, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <Private>False</Private>
-      <HintPath>..\packages\VSSDK.Shell.Immutable.12.12.0.4\lib\net45\Microsoft.VisualStudio.Shell.Immutable.12.0.dll</HintPath>
+      <HintPath>..\packages\Microsoft.VisualStudio.Shell.Immutable.12.0.12.0.21003\lib\net45\Microsoft.VisualStudio.Shell.Immutable.12.0.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.VisualStudio.Shell.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-      <Private>False</Private>
-      <HintPath>..\packages\VSSDK.Shell.Interop.7.0.4\lib\net20\Microsoft.VisualStudio.Shell.Interop.dll</HintPath>
+    <Reference Include="Microsoft.VisualStudio.Shell.Immutable.14.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.VisualStudio.Shell.Immutable.14.0.14.3.25407\lib\net45\Microsoft.VisualStudio.Shell.Immutable.14.0.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.VisualStudio.Shell.Interop.8.0, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-      <Private>False</Private>
-      <HintPath>..\packages\VSSDK.Shell.Interop.8.8.0.4\lib\net20\Microsoft.VisualStudio.Shell.Interop.8.0.dll</HintPath>
+    <Reference Include="Microsoft.VisualStudio.Shell.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <HintPath>..\packages\Microsoft.VisualStudio.Shell.Interop.7.10.6071\lib\Microsoft.VisualStudio.Shell.Interop.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.Shell.Interop.10.0" />
     <Reference Include="Microsoft.VisualStudio.Shell.Interop.11.0">
@@ -111,22 +126,33 @@
     <Reference Include="Microsoft.VisualStudio.Shell.Interop.12.0">
       <EmbedInteropTypes>true</EmbedInteropTypes>
     </Reference>
+    <Reference Include="Microsoft.VisualStudio.Shell.Interop.8.0, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <HintPath>..\packages\Microsoft.VisualStudio.Shell.Interop.8.0.8.0.50727\lib\Microsoft.VisualStudio.Shell.Interop.8.0.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="Microsoft.VisualStudio.Shell.Interop.9.0, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-      <Private>False</Private>
-      <HintPath>..\packages\VSSDK.Shell.Interop.9.9.0.4\lib\net20\Microsoft.VisualStudio.Shell.Interop.9.0.dll</HintPath>
+      <HintPath>..\packages\Microsoft.VisualStudio.Shell.Interop.9.0.9.0.30729\lib\Microsoft.VisualStudio.Shell.Interop.9.0.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.TextManager.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-      <Private>False</Private>
-      <HintPath>..\packages\VSSDK.TextManager.Interop.7.0.4\lib\net20\Microsoft.VisualStudio.TextManager.Interop.dll</HintPath>
+      <HintPath>..\packages\Microsoft.VisualStudio.TextManager.Interop.7.10.6070\lib\Microsoft.VisualStudio.TextManager.Interop.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.TextManager.Interop.8.0, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-      <Private>False</Private>
-      <HintPath>..\packages\VSSDK.TextManager.Interop.8.8.0.4\lib\net20\Microsoft.VisualStudio.TextManager.Interop.8.0.dll</HintPath>
+      <HintPath>..\packages\Microsoft.VisualStudio.TextManager.Interop.8.0.8.0.50727\lib\Microsoft.VisualStudio.TextManager.Interop.8.0.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.VisualStudio.Threading, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\VSSDK.Threading.12.0.4\lib\net45\Microsoft.VisualStudio.Threading.dll</HintPath>
-      <Private>False</Private>
+    <Reference Include="Microsoft.VisualStudio.Threading, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.VisualStudio.Threading.14.1.111\lib\net45\Microsoft.VisualStudio.Threading.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Utilities, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.VisualStudio.Utilities.14.3.25407\lib\net45\Microsoft.VisualStudio.Utilities.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Validation, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.VisualStudio.Validation.14.1.111\lib\net45\Microsoft.VisualStudio.Validation.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
@@ -199,6 +225,16 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
+    <Content Include="Images.vsct">
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="IconMappings.csv">
+      <IncludeInVSIX>true</IncludeInVSIX>
+    </Content>
+    <Content Include="Images.imagemanifest">
+      <IncludeInVSIX>true</IncludeInVSIX>
+      <SubType>Designer</SubType>
+    </Content>
     <None Include="packages.config" />
     <None Include="source.extension.vsixmanifest">
       <SubType>Designer</SubType>
@@ -240,6 +276,80 @@
       <Install>false</Install>
     </BootstrapperPackage>
   </ItemGroup>
+  <ItemGroup>
+    <Page Include="Resources\Images\Cleanup.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Resources\Images\Stash.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Resources\Images\Switch.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Resources\Images\Disk.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Resources\Images\Commit.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Resources\Images\Sync.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Resources\Images\Resolve.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Resources\Images\Repo.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Resources\Images\Differences.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Resources\Images\Blame.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Resources\Images\Merge.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Resources\Images\Revert.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Resources\Images\ShowLog.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Resources\Images\Push.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Resources\Images\Fetch.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Resources\Images\Pull.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Resources\Images\ShowChanges.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Resources\Images\Branch.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
   <PropertyGroup>
     <UseCodebase>true</UseCodebase>
   </PropertyGroup>
diff --git a/TGit/TGIT.vsct b/TGit/TGIT.vsct
index 1762352..972e4d9 100644
--- a/TGit/TGIT.vsct
+++ b/TGit/TGIT.vsct
@@ -2,6 +2,7 @@
 <CommandTable xmlns="http://schemas.microsoft.com/VisualStudio/2005-10-18/CommandTable" xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <Extern href="stdidcmd.h"/>
   <Extern href="vsshlids.h"/>
+  <Include href="Images.vsct"/>
 
   <Commands package="guidTGitPkg">
     <Menus>
diff --git a/TGit/TGITPackage.cs b/TGit/TGITPackage.cs
index b6dcec2..4e8a8ce 100644
--- a/TGit/TGITPackage.cs
+++ b/TGit/TGITPackage.cs
@@ -10,7 +10,7 @@ namespace SamirBoulema.TGit
 {
     [PackageRegistration(UseManagedResourcesOnly = true)]
     [InstalledProductRegistration("#110", "#112", "1.0", IconResourceID = 400)]
-    [ProvideMenuResource("Menus.ctmenu", 1)]
+    [ProvideMenuResource("Menus.ctmenu", 1, IconMappingFilename = "IconMappings.csv")]
     [Guid(GuidList.GuidTgitPkgString)]
     [ProvideAutoLoad(UIContextGuids80.NoSolution)]
     [ProvideOptionPage(typeof(OptionPageGrid), "TGit", "General", 0, 0, true)]
diff --git a/TGit/packages.config b/TGit/packages.config
index e80a47b..1e46120 100644
--- a/TGit/packages.config
+++ b/TGit/packages.config
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="Microsoft.VisualStudio.ImageCatalog" version="14.3.25407" targetFramework="net45" />
+  <package id="Microsoft.VisualStudio.Imaging" version="14.3.25407" targetFramework="net45" />
+  <package id="Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime" version="14.3.25407" targetFramework="net45" />
+  <package id="Microsoft.VisualStudio.OLE.Interop" version="7.10.6070" targetFramework="net45" />
+  <package id="Microsoft.VisualStudio.Shell.14.0" version="14.3.25407" targetFramework="net45" />
+  <package id="Microsoft.VisualStudio.Shell.Immutable.10.0" version="10.0.30319" targetFramework="net45" />
+  <package id="Microsoft.VisualStudio.Shell.Immutable.11.0" version="11.0.50727" targetFramework="net45" />
+  <package id="Microsoft.VisualStudio.Shell.Immutable.12.0" version="12.0.21003" targetFramework="net45" />
+  <package id="Microsoft.VisualStudio.Shell.Immutable.14.0" version="14.3.25407" targetFramework="net45" />
+  <package id="Microsoft.VisualStudio.Shell.Interop" version="7.10.6071" targetFramework="net45" />
+  <package id="Microsoft.VisualStudio.Shell.Interop.8.0" version="8.0.50727" targetFramework="net45" />
+  <package id="Microsoft.VisualStudio.Shell.Interop.9.0" version="9.0.30729" targetFramework="net45" />
+  <package id="Microsoft.VisualStudio.TextManager.Interop" version="7.10.6070" targetFramework="net45" />
+  <package id="Microsoft.VisualStudio.TextManager.Interop.8.0" version="8.0.50727" targetFramework="net45" />
+  <package id="Microsoft.VisualStudio.Threading" version="14.1.111" targetFramework="net45" />
+  <package id="Microsoft.VisualStudio.Utilities" version="14.3.25407" targetFramework="net45" />
+  <package id="Microsoft.VisualStudio.Validation" version="14.1.111" targetFramework="net45" />
   <package id="VSSDK.DTE" version="7.0.4" targetFramework="net45" />
   <package id="VSSDK.GraphModel" version="11.0.4" targetFramework="net45" />
   <package id="VSSDK.IDE" version="7.0.4" targetFramework="net45" />
@@ -9,7 +26,6 @@
   <package id="VSSDK.IDE.8" version="8.0.4" targetFramework="net45" />
   <package id="VSSDK.IDE.9" version="9.0.4" targetFramework="net45" />
   <package id="VSSDK.OLE.Interop" version="7.0.4" targetFramework="net45" />
-  <package id="VSSDK.Shell.12" version="12.0.4" targetFramework="net45" />
   <package id="VSSDK.Shell.Immutable.10" version="10.0.4" targetFramework="net45" />
   <package id="VSSDK.Shell.Immutable.11" version="11.0.4" targetFramework="net45" />
   <package id="VSSDK.Shell.Immutable.12" version="12.0.4" targetFramework="net45" />