--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -391,17 +391,17 @@ html|*.addon-webext-perm-list {
   height: 14px;
   vertical-align: bottom;
   margin-bottom: 1px;
   -moz-context-properties: fill;
   fill: currentColor;
 }
 
 .addon-addon-icon {
-  list-style-image: url("chrome://browser/skin/addons.svg");
+  list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric-16.svg");
 }
 
 .addon-toolbar-icon {
   list-style-image: url("chrome://browser/skin/menu.svg");
 }
 
 /* Notification icon box */
 

--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -1354,17 +1354,17 @@ html|*.addon-webext-perm-list {
   height: 14px;
   vertical-align: bottom;
   margin-bottom: 1px;
   -moz-context-properties: fill;
   fill: currentColor;
 }
 
 .addon-addon-icon {
-  list-style-image: url("chrome://browser/skin/addons.svg");
+  list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric-16.svg");
 }
 
 .addon-toolbar-icon {
   list-style-image: url("chrome://browser/skin/menu.svg");
 }
 
 /* Status panel */
 

deleted file mode 100755
--- a/browser/themes/shared/icons/addons.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
-  <path fill="context-fill" d="M14.5 8c-.971 0-1 1-1.75 1a.765.765 0 0 1-.75-.75V5a1 1 0 0 0-1-1H7.75A.765.765 0 0 1 7 3.25c0-.75 1-.779 1-1.75C8 .635 7.1 0 6 0S4 .635 4 1.5c0 .971 1 1 1 1.75a.765.765 0 0 1-.75.75H1a1 1 0 0 0-1 1v2.25A.765.765 0 0 0 .75 8c.75 0 .779-1 1.75-1C3.365 7 4 7.9 4 9s-.635 2-1.5 2c-.971 0-1-1-1.75-1a.765.765 0 0 0-.75.75V15a1 1 0 0 0 1 1h3.25a.765.765 0 0 0 .75-.75c0-.75-1-.779-1-1.75 0-.865.9-1.5 2-1.5s2 .635 2 1.5c0 .971-1 1-1 1.75a.765.765 0 0 0 .75.75H11a1 1 0 0 0 1-1v-3.25a.765.765 0 0 1 .75-.75c.75 0 .779 1 1.75 1 .865 0 1.5-.9 1.5-2s-.635-2-1.5-2z"/>
-</svg>

--- a/browser/themes/shared/jar.inc.mn
+++ b/browser/themes/shared/jar.inc.mn
@@ -97,17 +97,16 @@
   skin/classic/browser/fxa/logo@2x.png                         (../shared/fxa/logo@2x.png)
   skin/classic/browser/fxa/sync-illustration.svg               (../shared/fxa/sync-illustration.svg)
   skin/classic/browser/fxa/android.png                         (../shared/fxa/android.png)
   skin/classic/browser/fxa/android@2x.png                      (../shared/fxa/android@2x.png)
   skin/classic/browser/fxa/ios.png                             (../shared/fxa/ios.png)
   skin/classic/browser/fxa/ios@2x.png                          (../shared/fxa/ios@2x.png)
 
 
-  skin/classic/browser/addons.svg                     (../shared/icons/addons.svg)
   skin/classic/browser/arrow-dropdown-12.svg          (../shared/icons/arrow-dropdown-12.svg)
   skin/classic/browser/arrow-dropdown-16.svg          (../shared/icons/arrow-dropdown-16.svg)
   skin/classic/browser/arrow-left.svg                 (../shared/icons/arrow-left.svg)
   skin/classic/browser/back.svg                       (../shared/icons/back.svg)
   skin/classic/browser/back-12.svg                    (../shared/icons/back-12.svg)
   skin/classic/browser/bookmark.svg                   (../shared/icons/bookmark.svg)
   skin/classic/browser/bookmark-animation.svg         (../shared/icons/bookmark-animation.svg)
   skin/classic/browser/bookmark-hollow.svg            (../shared/icons/bookmark-hollow.svg)

--- a/browser/themes/shared/menupanel.inc.css
+++ b/browser/themes/shared/menupanel.inc.css
@@ -18,17 +18,17 @@
   list-style-image: url(chrome://browser/skin/print.svg);
 }
 
 #appMenu-library-button {
   list-style-image: url(chrome://browser/skin/library.svg);
 }
 
 #appMenu-addons-button {
-  list-style-image: url(chrome://browser/skin/addons.svg);
+  list-style-image: url(chrome://mozapps/skin/extensions/extensionGeneric-16.svg);
 }
 
 #appMenu-preferences-button {
   list-style-image: url(chrome://browser/skin/settings.svg);
 }
 
 #appMenu-customize-button {
   list-style-image: url(chrome://browser/skin/customize.svg);

--- a/browser/themes/shared/toolbarbutton-icons.inc.css
+++ b/browser/themes/shared/toolbarbutton-icons.inc.css
@@ -201,17 +201,17 @@ toolbar:not([brighttext]) #bookmarks-men
   list-style-image: url("chrome://browser/skin/history.svg");
 }
 
 #downloads-button {
   list-style-image: url("chrome://browser/skin/downloads/download-icons.svg#arrow-with-bar");
 }
 
 #add-ons-button {
-  list-style-image: url("chrome://browser/skin/addons.svg");
+  list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric-16.svg");
 }
 
 #open-file-button {
   list-style-image: url("chrome://browser/skin/open.svg");
 }
 
 #save-page-button {
   list-style-image: url("chrome://browser/skin/save.svg");

--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -1104,17 +1104,17 @@ html|*.addon-webext-perm-list {
   height: 14px;
   vertical-align: bottom;
   margin-bottom: 1px;
   -moz-context-properties: fill;
   fill: currentColor;
 }
 
 .addon-addon-icon {
-  list-style-image: url("chrome://browser/skin/addons.svg");
+  list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric-16.svg");
 }
 
 .addon-toolbar-icon {
   list-style-image: url("chrome://browser/skin/menu.svg");
 }
 
 /* Notification icon box */
 

--- a/toolkit/themes/shared/extensions/extensionGeneric-16.svg
+++ b/toolkit/themes/shared/extensions/extensionGeneric-16.svg
@@ -1,6 +1,6 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
-  <path fill="context-fill" d="M14.5 8c-.97 0-1 1-1.75 1a.76.76 0 0 1-.75-.75V5a1 1 0 0 0-1-1H7.75A.76.76 0 0 1 7 3.25c0-.75 1-.78 1-1.75C8 .63 7.1 0 6 0S4 .63 4 1.5c0 .97 1 1 1 1.75a.76.76 0 0 1-.75.75H1a1 1 0 0 0-1 1v2.25A.76.76 0 0 0 .75 8c.75 0 .78-1 1.75-1C3.36 7 4 7.9 4 9s-.63 2-1.5 2c-.97 0-1-1-1.75-1a.76.76 0 0 0-.75.75V15a1 1 0 0 0 1 1h3.25a.76.76 0 0 0 .75-.75c0-.75-1-.78-1-1.75 0-.86.9-1.5 2-1.5s2 .63 2 1.5c0 .97-1 1-1 1.75a.76.76 0 0 0 .75.75H11a1 1 0 0 0 1-1v-3.25a.76.76 0 0 1 .75-.75c.75 0 .78 1 1.75 1 .86 0 1.5-.9 1.5-2s-.63-2-1.5-2z"/>
+  <path fill="context-fill" d="M14.5 8c-.971 0-1 1-1.75 1a.765.765 0 0 1-.75-.75V5a1 1 0 0 0-1-1H7.75A.765.765 0 0 1 7 3.25c0-.75 1-.779 1-1.75C8 .635 7.1 0 6 0S4 .635 4 1.5c0 .971 1 1 1 1.75a.765.765 0 0 1-.75.75H1a1 1 0 0 0-1 1v2.25A.765.765 0 0 0 .75 8c.75 0 .779-1 1.75-1C3.365 7 4 7.9 4 9s-.635 2-1.5 2c-.971 0-1-1-1.75-1a.765.765 0 0 0-.75.75V15a1 1 0 0 0 1 1h3.25a.765.765 0 0 0 .75-.75c0-.75-1-.779-1-1.75 0-.865.9-1.5 2-1.5s2 .635 2 1.5c0 .971-1 1-1 1.75a.765.765 0 0 0 .75.75H11a1 1 0 0 0 1-1v-3.25a.765.765 0 0 1 .75-.75c.75 0 .779 1 1.75 1 .865 0 1.5-.9 1.5-2s-.635-2-1.5-2z"/>
 </svg>