diff --git a/extensions/configuration-editing/images/icon.png b/extensions/configuration-editing/images/icon.png
new file mode 100644
index 00000000000..2af18a8dc1b
Binary files /dev/null and b/extensions/configuration-editing/images/icon.png differ
diff --git a/extensions/configuration-editing/package.json b/extensions/configuration-editing/package.json
index 406b0a645aa..bb0a8384829 100644
--- a/extensions/configuration-editing/package.json
+++ b/extensions/configuration-editing/package.json
@@ -8,6 +8,7 @@
   "engines": {
     "vscode": "^1.0.0"
   },
+  "icon": "images/icon.png",
   "activationEvents": [
     "onLanguage:json",
     "onLanguage:jsonc"
diff --git a/extensions/extension-editing/images/icon.png b/extensions/extension-editing/images/icon.png
new file mode 100644
index 00000000000..45e0f8d47b6
Binary files /dev/null and b/extensions/extension-editing/images/icon.png differ
diff --git a/extensions/extension-editing/package.json b/extensions/extension-editing/package.json
index 0299bcf3d1a..ae9bfe5c060 100644
--- a/extensions/extension-editing/package.json
+++ b/extensions/extension-editing/package.json
@@ -8,6 +8,7 @@
   "engines": {
     "vscode": "^1.4.0"
   },
+  "icon": "images/icon.png",
   "activationEvents": [
     "onLanguage:json",
     "onLanguage:markdown",
diff --git a/extensions/github-authentication/images/icon.png b/extensions/github-authentication/images/icon.png
new file mode 100644
index 00000000000..d20a3fbf989
Binary files /dev/null and b/extensions/github-authentication/images/icon.png differ
diff --git a/extensions/github-authentication/package.json b/extensions/github-authentication/package.json
index 9c23f5dc192..51884d90c33 100644
--- a/extensions/github-authentication/package.json
+++ b/extensions/github-authentication/package.json
@@ -8,6 +8,7 @@
   "engines": {
     "vscode": "^1.41.0"
   },
+  "icon": "images/icon.png",
   "enableProposedApi": true,
   "categories": [
     "Other"
diff --git a/extensions/github/images/icon.png b/extensions/github/images/icon.png
new file mode 100644
index 00000000000..d706dc83e7a
Binary files /dev/null and b/extensions/github/images/icon.png differ
diff --git a/extensions/github/package.json b/extensions/github/package.json
index 603a13d90ae..a96155e5a44 100644
--- a/extensions/github/package.json
+++ b/extensions/github/package.json
@@ -8,6 +8,7 @@
   "engines": {
     "vscode": "^1.41.0"
   },
+  "icon": "images/icon.png",
   "enableProposedApi": true,
   "categories": [
     "Other"
diff --git a/extensions/image-preview/icon.png b/extensions/image-preview/icon.png
index 64dcf7d463c..7c90a41cd4d 100644
Binary files a/extensions/image-preview/icon.png and b/extensions/image-preview/icon.png differ
diff --git a/extensions/merge-conflict/media/icon.png b/extensions/merge-conflict/media/icon.png
new file mode 100644
index 00000000000..ace1157de49
Binary files /dev/null and b/extensions/merge-conflict/media/icon.png differ
diff --git a/extensions/merge-conflict/package.json b/extensions/merge-conflict/package.json
index 187d1315a64..cce89a21379 100644
--- a/extensions/merge-conflict/package.json
+++ b/extensions/merge-conflict/package.json
@@ -3,7 +3,7 @@
   "publisher": "vscode",
   "displayName": "%displayName%",
   "description": "%description%",
-  "icon": "resources/icons/merge-conflict.png",
+  "icon": "media/icon.png",
   "version": "1.0.0",
   "license": "MIT",
   "aiKey": "AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217",
diff --git a/extensions/merge-conflict/resources/icons/merge-conflict.png b/extensions/merge-conflict/resources/icons/merge-conflict.png
deleted file mode 100644
index 3cf8d7b80bd..00000000000
Binary files a/extensions/merge-conflict/resources/icons/merge-conflict.png and /dev/null differ
diff --git a/extensions/microsoft-authentication/media/icon.png b/extensions/microsoft-authentication/media/icon.png
new file mode 100644
index 00000000000..c179f87a711
Binary files /dev/null and b/extensions/microsoft-authentication/media/icon.png differ
diff --git a/extensions/microsoft-authentication/package.json b/extensions/microsoft-authentication/package.json
index d215df5b123..94c4b795ef6 100644
--- a/extensions/microsoft-authentication/package.json
+++ b/extensions/microsoft-authentication/package.json
@@ -8,6 +8,7 @@
   "engines": {
     "vscode": "^1.42.0"
   },
+  "icon": "media/icon.png",
   "categories": [
     "Other"
   ],
diff --git a/extensions/simple-browser/media/icon.png b/extensions/simple-browser/media/icon.png
new file mode 100644
index 00000000000..a1aafad6fdf
Binary files /dev/null and b/extensions/simple-browser/media/icon.png differ
diff --git a/extensions/simple-browser/package.json b/extensions/simple-browser/package.json
index cf28fbd3a8a..b636e6acb39 100644
--- a/extensions/simple-browser/package.json
+++ b/extensions/simple-browser/package.json
@@ -4,7 +4,7 @@
   "description": "%description%",
   "enableProposedApi": true,
   "version": "1.0.0",
-  "icon": "icon.png",
+  "icon": "media/icon.png",
   "publisher": "vscode",
   "license": "MIT",
   "aiKey": "AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217",
diff --git a/extensions/testing-editor-contributions/media/icon.png b/extensions/testing-editor-contributions/media/icon.png
new file mode 100644
index 00000000000..cec42c43b41
Binary files /dev/null and b/extensions/testing-editor-contributions/media/icon.png differ
diff --git a/extensions/testing-editor-contributions/package.json b/extensions/testing-editor-contributions/package.json
index 383ed5fe09e..a8f10782cc1 100644
--- a/extensions/testing-editor-contributions/package.json
+++ b/extensions/testing-editor-contributions/package.json
@@ -9,6 +9,7 @@
   "engines": {
     "vscode": "^1.39.0"
   },
+  "icon": "media/icon.png",
   "categories": [
     "Other"
   ],
diff --git a/extensions/typescript-language-features/icon.png b/extensions/typescript-language-features/icon.png
deleted file mode 100644
index b57f886607e..00000000000
Binary files a/extensions/typescript-language-features/icon.png and /dev/null differ
diff --git a/extensions/typescript-language-features/media/icon.png b/extensions/typescript-language-features/media/icon.png
new file mode 100644
index 00000000000..013843b544d
Binary files /dev/null and b/extensions/typescript-language-features/media/icon.png differ
diff --git a/extensions/typescript-language-features/package.json b/extensions/typescript-language-features/package.json
index 4ca1ca1d3ae..60a2651a35d 100644
--- a/extensions/typescript-language-features/package.json
+++ b/extensions/typescript-language-features/package.json
@@ -3,7 +3,6 @@
   "description": "%description%",
   "displayName": "%displayName%",
   "version": "1.0.0",
-  "icon": "icon.png",
   "author": "vscode",
   "publisher": "vscode",
   "license": "MIT",
@@ -21,6 +20,7 @@
   "engines": {
     "vscode": "^1.30.0"
   },
+  "icon": "media/icon.png",
   "categories": [
     "Programming Languages"
   ],
diff --git a/extensions/vscode-api-tests/media/icon.png b/extensions/vscode-api-tests/media/icon.png
new file mode 100644
index 00000000000..f785ef70316
Binary files /dev/null and b/extensions/vscode-api-tests/media/icon.png differ
diff --git a/extensions/vscode-api-tests/package.json b/extensions/vscode-api-tests/package.json
index bce3f10fa67..e1c16dace63 100644
--- a/extensions/vscode-api-tests/package.json
+++ b/extensions/vscode-api-tests/package.json
@@ -11,6 +11,7 @@
   "engines": {
     "vscode": "^1.55.0"
   },
+  "icon": "media/icon.png",
   "contributes": {
     "configuration": {
       "type": "object",
diff --git a/extensions/vscode-colorize-tests/media/icon.png b/extensions/vscode-colorize-tests/media/icon.png
new file mode 100644
index 00000000000..f785ef70316
Binary files /dev/null and b/extensions/vscode-colorize-tests/media/icon.png differ
diff --git a/extensions/vscode-colorize-tests/package.json b/extensions/vscode-colorize-tests/package.json
index 21cb61f6527..0ec286b3385 100644
--- a/extensions/vscode-colorize-tests/package.json
+++ b/extensions/vscode-colorize-tests/package.json
@@ -13,6 +13,7 @@
   "engines": {
     "vscode": "*"
   },
+  "icon": "media/icon.png",
   "scripts": {
     "vscode:prepublish": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.extensions.js compile-extension:vscode-colorize-tests ./tsconfig.json"
   },
diff --git a/extensions/vscode-custom-editor-tests/media/icon.png b/extensions/vscode-custom-editor-tests/media/icon.png
new file mode 100644
index 00000000000..f785ef70316
Binary files /dev/null and b/extensions/vscode-custom-editor-tests/media/icon.png differ
diff --git a/extensions/vscode-custom-editor-tests/package.json b/extensions/vscode-custom-editor-tests/package.json
index 8feb93bad37..c718e324bc9 100644
--- a/extensions/vscode-custom-editor-tests/package.json
+++ b/extensions/vscode-custom-editor-tests/package.json
@@ -13,6 +13,7 @@
   "engines": {
     "vscode": "^1.48.0"
   },
+  "icon": "media/icon.png",
   "scripts": {
     "compile": "node ./node_modules/vscode/bin/compile -watch -p ./",
     "vscode:prepublish": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.extensions.js compile-extension:vscode-notebook-tests ./tsconfig.json"
diff --git a/extensions/vscode-notebook-tests/media/icon.png b/extensions/vscode-notebook-tests/media/icon.png
new file mode 100644
index 00000000000..f785ef70316
Binary files /dev/null and b/extensions/vscode-notebook-tests/media/icon.png differ
diff --git a/extensions/vscode-notebook-tests/package.json b/extensions/vscode-notebook-tests/package.json
index 78164843df9..f1bdd988bee 100644
--- a/extensions/vscode-notebook-tests/package.json
+++ b/extensions/vscode-notebook-tests/package.json
@@ -13,6 +13,7 @@
   "engines": {
     "vscode": "^1.25.0"
   },
+  "icon": "media/icon.png",
   "scripts": {
     "compile": "node ./node_modules/vscode/bin/compile -watch -p ./",
     "vscode:prepublish": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.extensions.js compile-extension:vscode-notebook-tests ./tsconfig.json"
diff --git a/extensions/vscode-test-resolver/media/icon.png b/extensions/vscode-test-resolver/media/icon.png
new file mode 100644
index 00000000000..18b2ca94e51
Binary files /dev/null and b/extensions/vscode-test-resolver/media/icon.png differ
diff --git a/extensions/vscode-test-resolver/package.json b/extensions/vscode-test-resolver/package.json
index b56645fa86d..a8d706caca5 100644
--- a/extensions/vscode-test-resolver/package.json
+++ b/extensions/vscode-test-resolver/package.json
@@ -9,6 +9,7 @@
   "engines": {
     "vscode": "^1.25.0"
   },
+  "icon": "media/icon.png",
   "extensionKind": [
     "ui"
   ],