diff --git a/beastify/icons/LICENSE b/beastify/icons/LICENSE
index 003a5c9..9a206f8 100644
--- a/beastify/icons/LICENSE
+++ b/beastify/icons/LICENSE
@@ -1,4 +1,4 @@
 
 The icon "beasts-32.png" is taken from the IconBeast Lite iconset, and used under the terms of its license (http://www.iconbeast.com/faq/), with a link back to the website: http://www.iconbeast.com/free/.
 
-The icon "beasts-64.png" is taken from Aha-Soft’s Free Retina iconset, and used under the terms of its license (http://www.aha-soft.com/free-icons/free-retina-icon-set/), with a link back to the website: http://www.aha-soft.com/.
+The icon "beasts-48.png" is taken from Aha-Soft’s Free Retina iconset, and used under the terms of its license (http://www.aha-soft.com/free-icons/free-retina-icon-set/), with a link back to the website: http://www.aha-soft.com/.
diff --git a/beastify/icons/beasts-64.png b/beastify/icons/beasts-48.png
similarity index 100%
rename from beastify/icons/beasts-64.png
rename to beastify/icons/beasts-48.png
diff --git a/beastify/manifest.json b/beastify/manifest.json
index 4ac23c2..e322c84 100644
--- a/beastify/manifest.json
+++ b/beastify/manifest.json
@@ -6,8 +6,7 @@
   "version": "1.0",
   "homepage_url": "https://github.com/mdn/webextensions-examples/tree/master/beastify",
   "icons": {
-    "32": "icons/beasts-32.png",
-    "64": "icons/beasts-64.png"
+    "48": "icons/beasts-48.png"
   },
 
   "applications": {
diff --git a/borderify/icons/LICENSE b/borderify/icons/LICENSE
index 01672ae..9f3eac1 100644
--- a/borderify/icons/LICENSE
+++ b/borderify/icons/LICENSE
@@ -1 +1 @@
-The icons “border-32.png” and “border-64.png” are taken from the Google Material Design iconset, and used under the terms of the Creative Commons Attribution-ShareAlike license: http://creativecommons.org/licenses/by-sa/3.0/.
+The icon “border-48.png” is taken from the Google Material Design iconset, and is used under the terms of the Creative Commons Attribution-ShareAlike license: http://creativecommons.org/licenses/by-sa/3.0/.
diff --git a/borderify/icons/border-32.png b/borderify/icons/border-32.png
deleted file mode 100644
index 52862ac..0000000
Binary files a/borderify/icons/border-32.png and /dev/null differ
diff --git a/borderify/icons/border-48.png b/borderify/icons/border-48.png
new file mode 100644
index 0000000..90687de
Binary files /dev/null and b/borderify/icons/border-48.png differ
diff --git a/borderify/icons/border-64.png b/borderify/icons/border-64.png
deleted file mode 100644
index a35a3e6..0000000
Binary files a/borderify/icons/border-64.png and /dev/null differ
diff --git a/borderify/manifest.json b/borderify/manifest.json
index c81e019..66ffed4 100644
--- a/borderify/manifest.json
+++ b/borderify/manifest.json
@@ -6,8 +6,7 @@
   "version": "1.0",
   "homepage_url": "https://github.com/mdn/webextensions-examples/tree/master/borderify",
   "icons": {
-    "32": "icons/border-32.png",
-    "64": "icons/border-64.png"
+    "48": "icons/border-48.png"
   },
 
   "applications": {
diff --git a/notify-link-clicks-i18n/_locales/en/messages.json b/notify-link-clicks-i18n/_locales/en/messages.json
index c7d1597..d0e720b 100644
--- a/notify-link-clicks-i18n/_locales/en/messages.json
+++ b/notify-link-clicks-i18n/_locales/en/messages.json
@@ -1,6 +1,6 @@
 {
   "extensionName": {
-    "message": "Notify link clicks",
+    "message": "Notify link clicks i18n",
     "description": "Name of the extension."
   },
 
diff --git a/notify-link-clicks-i18n/icons/LICENSE b/notify-link-clicks-i18n/icons/LICENSE
index 52160ae..3bab068 100644
--- a/notify-link-clicks-i18n/icons/LICENSE
+++ b/notify-link-clicks-i18n/icons/LICENSE
@@ -1 +1 @@
-The "link-48" and "link-64" icons are taken from the Geomicons iconset, and are used here under the MIT license: http://opensource.org/licenses/MIT.
+The "link-48.png" icon is taken from the Geomicons iconset, and is used here under the MIT license: http://opensource.org/licenses/MIT.
diff --git a/notify-link-clicks-i18n/icons/link-64.png b/notify-link-clicks-i18n/icons/link-64.png
deleted file mode 100644
index 3aa9b5a..0000000
Binary files a/notify-link-clicks-i18n/icons/link-64.png and /dev/null differ
diff --git a/notify-link-clicks-i18n/manifest.json b/notify-link-clicks-i18n/manifest.json
index 361b9bb..9e0ca1a 100644
--- a/notify-link-clicks-i18n/manifest.json
+++ b/notify-link-clicks-i18n/manifest.json
@@ -6,13 +6,12 @@
   "version": "1.0",
   "homepage_url": "https://github.com/mdn/webextensions-examples/tree/master/notify-link-clicks-i18n",
   "icons": {
-    "48": "icons/link-48.png",
-    "64": "icons/link-64.png"
+    "48": "icons/link-48.png"
   },
 
   "applications": {
     "gecko": {
-      "id": "notify-link-clicks@mozilla.org"
+      "id": "notify-link-clicks-i18n@mozilla.org"
     }
   },
 
diff --git a/notify-link-clicks/icons/LICENSE b/notify-link-clicks/icons/LICENSE
index db757d0..3bab068 100644
--- a/notify-link-clicks/icons/LICENSE
+++ b/notify-link-clicks/icons/LICENSE
@@ -1 +1 @@
-The "link-48.png" and "link-64.png" icons are taken from the Geomicons iconset, and are used here under the MIT license: http://opensource.org/licenses/MIT.
+The "link-48.png" icon is taken from the Geomicons iconset, and is used here under the MIT license: http://opensource.org/licenses/MIT.
diff --git a/notify-link-clicks/icons/link-64.png b/notify-link-clicks/icons/link-64.png
deleted file mode 100644
index 3aa9b5a..0000000
Binary files a/notify-link-clicks/icons/link-64.png and /dev/null differ
diff --git a/notify-link-clicks/manifest.json b/notify-link-clicks/manifest.json
index 7318d6f..8e1bec1 100644
--- a/notify-link-clicks/manifest.json
+++ b/notify-link-clicks/manifest.json
@@ -6,8 +6,7 @@
   "version": "1.0",
   "homepage_url": "https://github.com/mdn/webextensions-examples/tree/master/notify-link-clicks",
   "icons": {
-    "48": "icons/link-48.png",
-    "64": "icons/link-64.png"
+    "48": "icons/link-48.png"
   },
 
   "applications": {
diff --git a/open-my-page-button/icons/LICENSE b/open-my-page-button/icons/LICENSE
index e31c9e4..20e821d 100644
--- a/open-my-page-button/icons/LICENSE
+++ b/open-my-page-button/icons/LICENSE
@@ -1,2 +1,2 @@
 
-The "page-32.png" and "page-64.png" icons are taken from the miu iconset created by Linh Pham Thi Dieu, and are used under the terms of its license: http://linhpham.me/miu/.
+The "page-32.png" and "page-48.png" icons are taken from the miu iconset created by Linh Pham Thi Dieu, and are used under the terms of its license: http://linhpham.me/miu/.
diff --git a/open-my-page-button/icons/page-48.png b/open-my-page-button/icons/page-48.png
new file mode 100644
index 0000000..ba042cd
Binary files /dev/null and b/open-my-page-button/icons/page-48.png differ
diff --git a/open-my-page-button/icons/page-64.png b/open-my-page-button/icons/page-64.png
deleted file mode 100644
index 24eeb8d..0000000
Binary files a/open-my-page-button/icons/page-64.png and /dev/null differ
diff --git a/open-my-page-button/manifest.json b/open-my-page-button/manifest.json
index 4b9df95..b62e559 100644
--- a/open-my-page-button/manifest.json
+++ b/open-my-page-button/manifest.json
@@ -6,8 +6,7 @@
   "version": "1.0",
   "homepage_url": "https://github.com/mdn/webextensions-examples/tree/master/open-my-page-button",
   "icons": {
-    "32": "icons/page-32.png",
-    "64": "icons/page-64.png"
+    "48": "icons/page-48.png"
   },
 
   "applications": {
diff --git a/page-to-extension-messaging/icons/LICENSE b/page-to-extension-messaging/icons/LICENSE
index 87e7cf0..a414ec0 100644
--- a/page-to-extension-messaging/icons/LICENSE
+++ b/page-to-extension-messaging/icons/LICENSE
@@ -1,2 +1,2 @@
 
-The "message-32.png" and "message-64.png" icons are taken from the miu iconset created by Linh Pham Thi Dieu, and are used under the terms of its license: http://linhpham.me/miu/.
+The "message-48.png" icon is taken from the miu iconset created by Linh Pham Thi Dieu, and is used under the terms of its license: http://linhpham.me/miu/.
diff --git a/page-to-extension-messaging/icons/message-32.png b/page-to-extension-messaging/icons/message-32.png
deleted file mode 100644
index 2f48683..0000000
Binary files a/page-to-extension-messaging/icons/message-32.png and /dev/null differ
diff --git a/page-to-extension-messaging/icons/message-48.png b/page-to-extension-messaging/icons/message-48.png
new file mode 100644
index 0000000..cf77c5a
Binary files /dev/null and b/page-to-extension-messaging/icons/message-48.png differ
diff --git a/page-to-extension-messaging/icons/message-64.png b/page-to-extension-messaging/icons/message-64.png
deleted file mode 100644
index 7c22687..0000000
Binary files a/page-to-extension-messaging/icons/message-64.png and /dev/null differ
diff --git a/page-to-extension-messaging/manifest.json b/page-to-extension-messaging/manifest.json
index 0959ec1..a9f7235 100644
--- a/page-to-extension-messaging/manifest.json
+++ b/page-to-extension-messaging/manifest.json
@@ -6,8 +6,7 @@
   "version": "1.0",
   "homepage_url": "https://github.com/mdn/webextensions-examples/tree/master/page-to-extension-messaging",
   "icons": {
-    "32": "icons/message-32.png",
-    "64": "icons/message-64.png"
+    "48": "icons/message-48.png"
   },
 
   "applications": {
diff --git a/user-agent-rewriter/icons/LICENSE b/user-agent-rewriter/icons/LICENSE
index 01d3dce..18fae49 100644
--- a/user-agent-rewriter/icons/LICENSE
+++ b/user-agent-rewriter/icons/LICENSE
@@ -1 +1 @@
-The "person-32.png" and "person-64.png" icons are taken from the Ionicons iconset (http://ionicons.com/), and are used here under the MIT license: http://opensource.org/licenses/MIT.
+The "person-32.png" "person-48.png" icons are taken from the Ionicons iconset (http://ionicons.com/), and are used here under the MIT license: http://opensource.org/licenses/MIT.
diff --git a/user-agent-rewriter/icons/person-48.png b/user-agent-rewriter/icons/person-48.png
new file mode 100644
index 0000000..0cb787b
Binary files /dev/null and b/user-agent-rewriter/icons/person-48.png differ
diff --git a/user-agent-rewriter/icons/person-64.png b/user-agent-rewriter/icons/person-64.png
deleted file mode 100644
index 048d44d..0000000
Binary files a/user-agent-rewriter/icons/person-64.png and /dev/null differ
diff --git a/user-agent-rewriter/manifest.json b/user-agent-rewriter/manifest.json
index edcbd30..92b5f7e 100644
--- a/user-agent-rewriter/manifest.json
+++ b/user-agent-rewriter/manifest.json
@@ -6,8 +6,7 @@
   "version": "1.0",
   "homepage_url": "https://github.com/mdn/webextensions-examples/tree/master/user-agent-rewriter",
   "icons": {
-    "32": "icons/person-32.png",
-    "64": "icons/person-64.png"
+    "48": "icons/person-48.png"
   },
 
   "applications": {