diff --git a/images/blame-dark.png b/images/blame-dark.png
deleted file mode 100644
index a76cb1e..0000000
Binary files a/images/blame-dark.png and /dev/null differ
diff --git a/images/blame-dark.svg b/images/blame-dark.svg
new file mode 100644
index 0000000..bb26282
--- /dev/null
+++ b/images/blame-dark.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="18px" height="18px" viewBox="0 0 18 18" xml:space="preserve">
+    <g>
+        <rect fill="#FFFFFF" fill-opacity="0.75" x="1" y="0" width="4" height="18"/>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/images/blame-light.png b/images/blame-light.png
deleted file mode 100644
index 02b1947..0000000
Binary files a/images/blame-light.png and /dev/null differ
diff --git a/images/blame-light.svg b/images/blame-light.svg
new file mode 100644
index 0000000..5fabefb
--- /dev/null
+++ b/images/blame-light.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="18px" height="18px" viewBox="0 0 18 18" xml:space="preserve">
+    <g>
+        <rect fill="#000000" fill-opacity="0.75" x="1" y="0" width="4" height="18"/>
+    </g>
+</svg>
diff --git a/images/git-icon-dark.svg b/images/git-icon-dark.svg
new file mode 100644
index 0000000..7e7d73c
--- /dev/null
+++ b/images/git-icon-dark.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 93 93" xml:space="preserve">
+    <g>
+        <path fill="#FFFFFF" fill-opacity="0.74" d="M90,41.8L49.9,1.7c-2.3-2.3-6.1-2.3-8.4,0L33.2,10l10.6,10.6c2.5-0.8,5.3-0.3,7.2,1.7c2,2,2.5,4.8,1.7,7.3
+            l10.2,10.2c2.5-0.8,5.3-0.3,7.3,1.7c2.8,2.7,2.8,7.2,0,10s-7.2,2.8-10,0c-2.1-2.1-2.6-5.1-1.5-7.7l-9.5-9.5v25
+            c0.7,0.3,1.3,0.8,1.9,1.3c2.8,2.7,2.8,7.2,0,10c-2.8,2.7-7.2,2.7-10,0c-2.8-2.8-2.8-7.2,0-10c0.7-0.7,1.5-1.2,2.3-1.5V33.8
+            c-0.8-0.3-1.6-0.9-2.3-1.5c-2.1-2.1-2.6-5.1-1.5-7.7L29.2,14.2L1.7,41.7c-2.3,2.3-2.3,6.1,0,8.4l40.1,40.1c2.3,2.3,6.1,2.3,8.4,0
+            l39.9-39.9C92.4,47.9,92.4,44.1,90,41.8z"/>
+    </g>
+</svg>
diff --git a/images/git-icon-light.svg b/images/git-icon-light.svg
new file mode 100644
index 0000000..efb8424
--- /dev/null
+++ b/images/git-icon-light.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 93 93" xml:space="preserve">
+    <g>
+        <path fill="#000000" fill-opacity="0.6" d="M90,41.8L49.9,1.7c-2.3-2.3-6.1-2.3-8.4,0L33.2,10l10.6,10.6c2.5-0.8,5.3-0.3,7.2,1.7c2,2,2.5,4.8,1.7,7.3
+            l10.2,10.2c2.5-0.8,5.3-0.3,7.3,1.7c2.8,2.7,2.8,7.2,0,10s-7.2,2.8-10,0c-2.1-2.1-2.6-5.1-1.5-7.7l-9.5-9.5v25
+            c0.7,0.3,1.3,0.8,1.9,1.3c2.8,2.7,2.8,7.2,0,10c-2.8,2.7-7.2,2.7-10,0c-2.8-2.8-2.8-7.2,0-10c0.7-0.7,1.5-1.2,2.3-1.5V33.8
+            c-0.8-0.3-1.6-0.9-2.3-1.5c-2.1-2.1-2.6-5.1-1.5-7.7L29.2,14.2L1.7,41.7c-2.3,2.3-2.3,6.1,0,8.4l40.1,40.1c2.3,2.3,6.1,2.3,8.4,0
+            l39.9-39.9C92.4,47.9,92.4,44.1,90,41.8z"/>
+    </g>
+</svg>
diff --git a/images/git-icon.svg b/images/git-icon.svg
new file mode 100644
index 0000000..9b16645
--- /dev/null
+++ b/images/git-icon.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 93 93" xml:space="preserve">
+    <g>
+        <path fill="#F05133" d="M90,41.8L49.9,1.7c-2.3-2.3-6.1-2.3-8.4,0L33.2,10l10.6,10.6c2.5-0.8,5.3-0.3,7.2,1.7c2,2,2.5,4.8,1.7,7.3
+            l10.2,10.2c2.5-0.8,5.3-0.3,7.3,1.7c2.8,2.7,2.8,7.2,0,10s-7.2,2.8-10,0c-2.1-2.1-2.6-5.1-1.5-7.7l-9.5-9.5v25
+            c0.7,0.3,1.3,0.8,1.9,1.3c2.8,2.7,2.8,7.2,0,10c-2.8,2.7-7.2,2.7-10,0c-2.8-2.8-2.8-7.2,0-10c0.7-0.7,1.5-1.2,2.3-1.5V33.8
+            c-0.8-0.3-1.6-0.9-2.3-1.5c-2.1-2.1-2.6-5.1-1.5-7.7L29.2,14.2L1.7,41.7c-2.3,2.3-2.3,6.1,0,8.4l40.1,40.1c2.3,2.3,6.1,2.3,8.4,0
+            l39.9-39.9C92.4,47.9,92.4,44.1,90,41.8z"/>
+    </g>
+</svg>
diff --git a/images/gitlens-icon.svg b/images/gitlens-icon.svg
new file mode 100644
index 0000000..f19d9dc
--- /dev/null
+++ b/images/gitlens-icon.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 93 93" style="enable-background:new 0 0 93 93;" xml:space="preserve">
+    <g>
+        <path fill="#F05133" d="M90,41.8L49.9,1.7c-2.3-2.3-6.1-2.3-8.4,0L33.2,10l10.6,10.6c2.5-0.8,5.3-0.3,7.2,1.7c2,2,2.5,4.8,1.7,7.3
+            l10.2,10.2c2.5-0.8,5.3-0.3,7.3,1.7c2.8,2.7,2.8,7.2,0,10s-7.2,2.8-10,0c-2.1-2.1-2.6-5.1-1.5-7.7l-9.5-9.5v25
+            c0.7,0.3,1.3,0.8,1.9,1.3c2.8,2.7,2.8,7.2,0,10c-2.8,2.7-7.2,2.7-10,0c-2.8-2.8-2.8-7.2,0-10c0.7-0.7,1.5-1.2,2.3-1.5V33.8
+            c-0.8-0.3-1.6-0.9-2.3-1.5c-2.1-2.1-2.6-5.1-1.5-7.7L29.2,14.2L1.7,41.7c-2.3,2.3-2.3,6.1,0,8.4l40.1,40.1c2.3,2.3,6.1,2.3,8.4,0
+            l39.9-39.9C92.4,47.9,92.4,44.1,90,41.8z"/>
+    </g>
+    <g>
+        <path fill="#FFFFFF" d="M38.1,56.9l-9-9c1.2-1.6,1.9-3.5,1.9-5.6c0-5.2-4.2-9.4-9.4-9.4s-9.4,4.2-9.4,9.4s4.2,9.4,9.4,9.4
+            c2.1,0,4.1-0.7,5.6-1.9l9,9c0.3,0.3,0.6,0.4,0.9,0.4c0.3,0,0.7-0.1,0.9-0.4C38.6,58.2,38.6,57.4,38.1,56.9z M21.6,49.7
+            c-4.1,0-7.5-3.4-7.5-7.5s3.4-7.5,7.5-7.5s7.5,3.4,7.5,7.5S25.7,49.7,21.6,49.7z"/>
+        <path fill="#FFFFFF" d="M27,41.7c0.1,0,0.2,0,0.2,0c0.5-0.1,0.8-0.6,0.7-1.2c-0.5-1.7-1.5-3.1-3.1-4c-1.5-0.9-3.3-1.1-5-0.7
+            c-0.5,0.1-0.8,0.6-0.7,1.2c0.1,0.5,0.6,0.8,1.2,0.7c1.2-0.3,2.5-0.2,3.6,0.5c1.1,0.6,1.9,1.6,2.2,2.9C26.2,41.4,26.6,41.7,27,41.7z"/>
+        <circle fill="#FFFFFF" cx="27.1" cy="43.9" r="0.9"/>
+    </g>
+</svg>
diff --git a/package.json b/package.json
index 69307f2..3de380a 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
         "color": "#56098c",
         "theme": "dark"
     },
-    "icon": "images/gitlens-icon.png",
+    "icon": "images/gitlens-icon.svg",
     "preview": false,
     "homepage": "https://github.com/eamodio/vscode-gitlens/blob/master/README.md",
     "bugs": {
@@ -324,7 +324,11 @@
             {
                 "command": "gitlens.toggleBlame",
                 "title": "Toggle Blame Annotations",
-                "category": "GitLens"
+                "category": "GitLens",
+                "icon": {
+                    "dark": "images/git-icon-dark.svg",
+                    "light": "images/git-icon-light.svg"
+                }
             },
             {
                 "command": "gitlens.toggleCodeLens",
@@ -384,12 +388,12 @@
                 {
                     "command": "gitlens.toggleBlame",
                     "when": "config.git.enabled",
-                    "group": "1_gitlens@1"
+                    "group": "navigation@100"
                 },
                 {
                     "command": "gitlens.showQuickFileHistory",
                     "when": "config.git.enabled",
-                    "group": "1_gitlens@2"
+                    "group": "1_gitlens"
                 },
                 {
                     "command": "gitlens.diffWithPrevious",
diff --git a/src/blameAnnotationProvider.ts b/src/blameAnnotationProvider.ts
index 7fd42ea..ab8221b 100644
--- a/src/blameAnnotationProvider.ts
+++ b/src/blameAnnotationProvider.ts
@@ -34,12 +34,12 @@ export class BlameAnnotationProvider extends Disposable {
             highlightDecoration = window.createTextEditorDecorationType({
                 dark: {
                     backgroundColor: 'rgba(255, 255, 255, 0.15)',
-                    gutterIconPath: context.asAbsolutePath('images/blame-dark.png'),
+                    gutterIconPath: context.asAbsolutePath('images/blame-dark.svg'),
                     overviewRulerColor: 'rgba(255, 255, 255, 0.75)'
                 },
                 light: {
                     backgroundColor: 'rgba(0, 0, 0, 0.15)',
-                    gutterIconPath: context.asAbsolutePath('images/blame-light.png'),
+                    gutterIconPath: context.asAbsolutePath('images/blame-light.svg'),
                     overviewRulerColor: 'rgba(0, 0, 0, 0.75)'
                 },
                 gutterIconSize: 'contain',