Bug 1169679 - Update add-on manager entry design to match in-content prefs styling. r=dao
☠☠ backed out by d3061ac6aff9 ☠ ☠
authorTim Nguyen <ntim.bugs@gmail.com>
Thu, 22 Oct 2015 07:28:00 -0400
changeset 304491 a91f6ca882f27a00cbe98abfb8d3eff8aa7a9f2e
parent 304490 98b24322ef1d8e92ff35ac93c5810f9f2742db47
child 304492 fb30635f06525c6257e7fb02b6dc0d804b81b63a
push id1001
push userraliiev@mozilla.com
push dateMon, 18 Jan 2016 19:06:03 +0000
treeherdermozilla-release@8b89261f3ac4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdao
bugs1169679
milestone44.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1169679 - Update add-on manager entry design to match in-content prefs styling. r=dao
addon-sdk/source/examples/ui-button-apis/lib/main.js
browser/themes/linux/preferences/aboutPermissions.css
browser/themes/osx/preferences/aboutPermissions.css
browser/themes/windows/preferences/aboutPermissions.css
devtools/client/aboutdebugging/components/addons.js
toolkit/themes/linux/mozapps/extensions/extensionGeneric.png
toolkit/themes/linux/mozapps/extensions/extensions.css
toolkit/themes/linux/mozapps/jar.mn
toolkit/themes/osx/mozapps/extensions/about.css
toolkit/themes/osx/mozapps/extensions/alerticon-error.png
toolkit/themes/osx/mozapps/extensions/alerticon-info-negative.png
toolkit/themes/osx/mozapps/extensions/alerticon-info-positive.png
toolkit/themes/osx/mozapps/extensions/alerticon-warning.png
toolkit/themes/osx/mozapps/extensions/eula.css
toolkit/themes/osx/mozapps/extensions/extensionGeneric.png
toolkit/themes/osx/mozapps/extensions/extensions.css
toolkit/themes/osx/mozapps/extensions/navigation.png
toolkit/themes/osx/mozapps/extensions/stripes-error.png
toolkit/themes/osx/mozapps/extensions/stripes-info-negative.png
toolkit/themes/osx/mozapps/extensions/stripes-info-positive.png
toolkit/themes/osx/mozapps/extensions/stripes-warning.png
toolkit/themes/osx/mozapps/extensions/xpinstallConfirm.css
toolkit/themes/osx/mozapps/jar.mn
toolkit/themes/shared/extensions/alerticon-error.svg
toolkit/themes/shared/extensions/alerticon-info-negative.svg
toolkit/themes/shared/extensions/alerticon-info-positive.svg
toolkit/themes/shared/extensions/alerticon-warning.svg
toolkit/themes/shared/extensions/extensionGeneric.svg
toolkit/themes/shared/extensions/extensions.inc.css
toolkit/themes/shared/extensions/newaddon.inc.css
toolkit/themes/windows/mozapps/extensions/about.css
toolkit/themes/windows/mozapps/extensions/alerticon-error.png
toolkit/themes/windows/mozapps/extensions/alerticon-info-negative.png
toolkit/themes/windows/mozapps/extensions/alerticon-info-positive.png
toolkit/themes/windows/mozapps/extensions/alerticon-warning.png
toolkit/themes/windows/mozapps/extensions/eula.css
toolkit/themes/windows/mozapps/extensions/extensionGeneric-XP.png
toolkit/themes/windows/mozapps/extensions/extensionGeneric.png
toolkit/themes/windows/mozapps/extensions/extensions.css
toolkit/themes/windows/mozapps/extensions/stripes-error.png
toolkit/themes/windows/mozapps/extensions/stripes-info-negative.png
toolkit/themes/windows/mozapps/extensions/stripes-info-positive.png
toolkit/themes/windows/mozapps/extensions/stripes-warning.png
toolkit/themes/windows/mozapps/extensions/xpinstallConfirm.css
toolkit/themes/windows/mozapps/jar.mn
--- a/addon-sdk/source/examples/ui-button-apis/lib/main.js
+++ b/addon-sdk/source/examples/ui-button-apis/lib/main.js
@@ -3,17 +3,17 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 "use strict";
 
 var data = require('sdk/self').data;
 var tabs = require('sdk/tabs');
 var { notify } = require('sdk/notifications');
 var { ActionButton, ToggleButton } = require('sdk/ui');
 
-var icon = 'chrome://mozapps/skin/extensions/extensionGeneric.png';
+var icon = 'chrome://mozapps/skin/extensions/extensionGeneric.svg';
 exports.icon = icon;
 
 // your basic action button
 var action = ActionButton({
   id: 'test-action-button',
   label: 'Action Button',
   icon: icon,
   onClick: function (state) {
--- a/browser/themes/linux/preferences/aboutPermissions.css
+++ b/browser/themes/linux/preferences/aboutPermissions.css
@@ -96,17 +96,17 @@
 }
 .pref-icon[type="desktop-notification"] {
   list-style-image: url(chrome://browser/skin/web-notifications-icon.svg);
 }
 .pref-icon[type="indexedDB"] {
   list-style-image: url(chrome://global/skin/icons/question-64.png);
 }
 .pref-icon[type="install"] {
-  list-style-image: url(chrome://mozapps/skin/extensions/extensionGeneric.png);
+  list-style-image: url(chrome://mozapps/skin/extensions/extensionGeneric.svg);
 }
 .pref-icon[type="popup"] {
   list-style-image: url(chrome://global/skin/icons/question-64.png);
 }
 .pref-icon[type="image"] {
   list-style-image: url(chrome://global/skin/icons/question-64.png);
 }
 .pref-icon[type="plugins"] {
--- a/browser/themes/osx/preferences/aboutPermissions.css
+++ b/browser/themes/osx/preferences/aboutPermissions.css
@@ -106,17 +106,17 @@
 }
 .pref-icon[type="desktop-notification"] {
   list-style-image: url(chrome://browser/skin/web-notifications-icon.svg);
 }
 .pref-icon[type="indexedDB"] {
   list-style-image: url(chrome://global/skin/icons/question-64.png);
 }
 .pref-icon[type="install"] {
-  list-style-image: url(chrome://mozapps/skin/extensions/extensionGeneric.png);
+  list-style-image: url(chrome://mozapps/skin/extensions/extensionGeneric.svg);
 }
 .pref-icon[type="popup"] {
   list-style-image: url(chrome://global/skin/icons/question-64.png);
 }
 .pref-icon[type="image"] {
   list-style-image: url(chrome://global/skin/icons/question-64.png);
 }
 .pref-icon[type="plugins"] {
--- a/browser/themes/windows/preferences/aboutPermissions.css
+++ b/browser/themes/windows/preferences/aboutPermissions.css
@@ -100,17 +100,17 @@
 }
 .pref-icon[type="desktop-notification"] {
   list-style-image: url(chrome://browser/skin/web-notifications-icon.svg);
 }
 .pref-icon[type="indexedDB"] {
   list-style-image: url(chrome://global/skin/icons/question-64.png);
 }
 .pref-icon[type="install"] {
-  list-style-image: url(chrome://mozapps/skin/extensions/extensionGeneric.png);
+  list-style-image: url(chrome://mozapps/skin/extensions/extensionGeneric.svg);
 }
 .pref-icon[type="popup"] {
   list-style-image: url(chrome://global/skin/icons/question-64.png);
 }
 .pref-icon[type="image"] {
   list-style-image: url(chrome://global/skin/icons/question-64.png);
 }
 .pref-icon[type="plugins"] {
--- a/devtools/client/aboutdebugging/components/addons.js
+++ b/devtools/client/aboutdebugging/components/addons.js
@@ -10,17 +10,17 @@ loader.lazyRequireGetter(this, "React",
   "resource://devtools/client/shared/vendor/react.js");
 loader.lazyRequireGetter(this, "TargetListComponent",
   "devtools/client/aboutdebugging/components/target-list", true);
 loader.lazyRequireGetter(this, "Services");
 
 loader.lazyImporter(this, "AddonManager",
   "resource://gre/modules/AddonManager.jsm");
 
-const ExtensionIcon = "chrome://mozapps/skin/extensions/extensionGeneric.png";
+const ExtensionIcon = "chrome://mozapps/skin/extensions/extensionGeneric.svg";
 const Strings = Services.strings.createBundle(
   "chrome://browser/locale/devtools/aboutdebugging.properties");
 
 exports.AddonsComponent = React.createClass({
   displayName: "AddonsComponent",
 
   getInitialState() {
     return {
deleted file mode 100644
index 2ae95a5b287264b95f635ddc24889bbd59b6c176..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
--- a/toolkit/themes/linux/mozapps/extensions/extensions.css
+++ b/toolkit/themes/linux/mozapps/extensions/extensions.css
@@ -3,32 +3,16 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 %include ../../../shared/extensions/extensions.inc.css
 
 #header-utils-btn .toolbarbutton-icon {
   list-style-image: url("chrome://mozapps/skin/extensions/utilities.svg#utilities-native");
 }
 
-.warning-icon {
-  list-style-image: url("moz-icon://stock/gtk-dialog-warning?size=menu");
-  height: 16px;
-}
-
-.error-icon {
-  list-style-image: url("moz-icon://stock/gtk-dialog-error?size=menu");
-  height: 16px;
-}
-
-.pending-icon,
-.info-icon {
-  list-style-image: url("moz-icon://stock/gtk-dialog-info?size=menu");
-  height: 16px;
-}
-
 .sorter[checkState="1"] .button-icon {
   display: -moz-box;
   list-style-image: url("moz-icon://stock/gtk-sort-descending?size=16");
 }
 
 .sorter[checkState="2"] .button-icon {
   display: -moz-box;
   list-style-image: url("moz-icon://stock/gtk-sort-ascending?size=16");
--- a/toolkit/themes/linux/mozapps/jar.mn
+++ b/toolkit/themes/linux/mozapps/jar.mn
@@ -8,27 +8,31 @@ toolkit.jar:
 + skin/classic/mozapps/downloads/downloads.css             (downloads/downloads.css)
 * skin/classic/mozapps/extensions/extensions.css           (extensions/extensions.css)
 + skin/classic/mozapps/extensions/category-search.png      (extensions/category-search.png)
 + skin/classic/mozapps/extensions/category-discover.png    (extensions/category-discover.png)
 + skin/classic/mozapps/extensions/category-plugins.png     (extensions/category-plugins.png)
 + skin/classic/mozapps/extensions/category-service.png     (extensions/category-service.png)
 + skin/classic/mozapps/extensions/category-recent.png      (extensions/category-recent.png)
 + skin/classic/mozapps/extensions/category-available.png   (extensions/category-available.png)
-+ skin/classic/mozapps/extensions/extensionGeneric.png     (extensions/extensionGeneric.png)
++ skin/classic/mozapps/extensions/extensionGeneric.svg     (../../shared/extensions/extensionGeneric.svg)
 + skin/classic/mozapps/extensions/extensionGeneric-16.png  (extensions/extensionGeneric-16.png)
 + skin/classic/mozapps/extensions/dictionaryGeneric.png    (extensions/dictionaryGeneric.png)
 + skin/classic/mozapps/extensions/dictionaryGeneric-16.png (extensions/dictionaryGeneric-16.png)
 + skin/classic/mozapps/extensions/themeGeneric.png         (extensions/themeGeneric.png)
 + skin/classic/mozapps/extensions/themeGeneric-16.png      (extensions/themeGeneric-16.png)
 + skin/classic/mozapps/extensions/localeGeneric.png        (extensions/localeGeneric.png)
 * skin/classic/mozapps/extensions/newaddon.css             (extensions/newaddon.css)
 + skin/classic/mozapps/extensions/selectAddons.css         (extensions/selectAddons.css)
 + skin/classic/mozapps/extensions/heart.png                (extensions/heart.png)
 + skin/classic/mozapps/extensions/navigation.png           (../../shared/extensions/navigation.png)
++ skin/classic/mozapps/extensions/alerticon-warning.svg    (../../shared/extensions/alerticon-warning.svg)
++ skin/classic/mozapps/extensions/alerticon-error.svg      (../../shared/extensions/alerticon-error.svg)
++ skin/classic/mozapps/extensions/alerticon-info-positive.svg (../../shared/extensions/alerticon-info-positive.svg)
++ skin/classic/mozapps/extensions/alerticon-info-negative.svg (../../shared/extensions/alerticon-info-negative.svg)
 + skin/classic/mozapps/extensions/utilities.svg            (../../shared/extensions/utilities.svg)
 + skin/classic/mozapps/passwordmgr/key-16.png              (passwordmgr/key-16.png)
 + skin/classic/mozapps/passwordmgr/key-64.png              (passwordmgr/key-64.png)
 + skin/classic/mozapps/plugins/pluginGeneric.png           (plugins/pluginGeneric.png)
 + skin/classic/mozapps/plugins/pluginBlocked.png           (plugins/pluginBlocked.png)
 + skin/classic/mozapps/plugins/pluginGeneric-16.png        (plugins/pluginGeneric-16.png)
 + skin/classic/mozapps/profile/profileicon.png             (profile/profileicon.png)
 + skin/classic/mozapps/viewsource/viewsource.css           (viewsource/viewsource.css)
--- a/toolkit/themes/osx/mozapps/extensions/about.css
+++ b/toolkit/themes/osx/mozapps/extensions/about.css
@@ -14,17 +14,17 @@
   color: -moz-DialogText;
 }
 
 .basic-info {
   padding: 10px;
 }
 
 #extensionIcon {
-  list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png");
+  list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.svg");
   max-width: 64px;
   max-height: 64px;
   -moz-margin-end: 6px;
 }
 
 #genericAbout[addontype="theme"] #extensionIcon {
   list-style-image: url("chrome://mozapps/skin/extensions/themeGeneric.png");
 }
deleted file mode 100644
index 8740e4911a857dd0d2e479529594fa4bb17adf11..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 2c5f628ab6001ba2f20a19e20f5d6c556b8f0169..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index a186c6b7adaf4d1606a3b717d3ff00e428e8fa41..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 75ea826f9140c9d1a75f3a9f24213964f43f9447..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
--- a/toolkit/themes/osx/mozapps/extensions/eula.css
+++ b/toolkit/themes/osx/mozapps/extensions/eula.css
@@ -1,14 +1,14 @@
 /* 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/. */
 
 #icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png");
+  list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.svg");
   max-width: 48px;
   max-height: 48px;
   -moz-margin-end: 6px;
 }
 
 #eula-dialog[addontype="theme"] #icon {
   list-style-image: url("chrome://mozapps/skin/extensions/themeGeneric.png");
 }
deleted file mode 100644
index 6a76774c7bf6059748b511207414b34515b7c6a2..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
--- a/toolkit/themes/osx/mozapps/extensions/extensions.css
+++ b/toolkit/themes/osx/mozapps/extensions/extensions.css
@@ -14,37 +14,16 @@
 }
 
 #header-utils-btn > .toolbarbutton-menu-dropmarker {
   list-style-image: url("chrome://mozapps/skin/extensions/toolbarbutton-dropmarker.png");
   padding: 0;
   -moz-margin-start: 2px;
 }
 
-.warning-icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/alerticon-warning.png");
-  height: 15px;
-}
-
-.error-icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/alerticon-error.png");
-  height: 15px;
-}
-
-.pending-icon,
-.info-icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/alerticon-info-positive.png");
-  height: 15px;
-}
-
-.addon-view[pending="disable"] .pending-icon,
-.addon-view[pending="uninstall"] .pending-icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/alerticon-info-negative.png");
-}
-
 .sorter[checkState="1"] {
   list-style-image: url("chrome://global/skin/arrow/arrow-dn.gif");
 }
 
 .sorter[checkState="2"] {
   list-style-image: url("chrome://global/skin/arrow/arrow-up.gif");
 }
 
deleted file mode 100644
index ffc40d7e56b6b7116fb0e1ab3f63c641e4971ed0..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 1dc2d8504cbf625fffc9d5707ef9eb459c70fc0e..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 901ab1ec29fa9d08b240f68653f27f4b0bbda842..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 370ceec0f241b320339bd7a6239eafd4f19944cf..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 69463fb1af3de8f2cb8c9acc2fcbd61b226cb114..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
--- a/toolkit/themes/osx/mozapps/extensions/xpinstallConfirm.css
+++ b/toolkit/themes/osx/mozapps/extensions/xpinstallConfirm.css
@@ -65,17 +65,17 @@ installitem {
   margin-bottom: 1px;
   -moz-margin-start: 6px;
   -moz-margin-end: 5px;
 }
 
 .xpinstallItemIcon {
   max-width: 32px;
   max-height: 32px;
-  list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png");
+  list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.svg");
 }
 
 installitem[type="theme"] .xpinstallItemIcon {
   list-style-image: url("chrome://mozapps/skin/extensions/themeGeneric.png");
 }
 
 installitem[type="locale"] .xpinstallItemIcon {
   list-style-image: url("chrome://mozapps/skin/extensions/localeGeneric.png");
--- a/toolkit/themes/osx/mozapps/jar.mn
+++ b/toolkit/themes/osx/mozapps/jar.mn
@@ -13,39 +13,35 @@ toolkit.jar:
   skin/classic/mozapps/extensions/category-searchengines.png      (extensions/category-searchengines.png)
   skin/classic/mozapps/extensions/category-plugins.png            (extensions/category-plugins.png)
   skin/classic/mozapps/extensions/category-service.png            (extensions/category-service.png)
   skin/classic/mozapps/extensions/category-dictionaries.png       (extensions/category-dictionaries.png)
   skin/classic/mozapps/extensions/category-experiments.png        (extensions/category-experiments.png)
   skin/classic/mozapps/extensions/category-recent.png             (extensions/category-recent.png)
   skin/classic/mozapps/extensions/category-available.png          (extensions/category-available.png)
   skin/classic/mozapps/extensions/discover-logo.png               (extensions/discover-logo.png)
-  skin/classic/mozapps/extensions/extensionGeneric.png            (extensions/extensionGeneric.png)
+  skin/classic/mozapps/extensions/extensionGeneric.svg            (../../shared/extensions/extensionGeneric.svg)
   skin/classic/mozapps/extensions/extensionGeneric-16.png         (extensions/extensionGeneric-16.png)
   skin/classic/mozapps/extensions/themeGeneric.png                (extensions/themeGeneric.png)
   skin/classic/mozapps/extensions/themeGeneric-16.png             (extensions/themeGeneric-16.png)
   skin/classic/mozapps/extensions/dictionaryGeneric.png           (extensions/dictionaryGeneric.png)
   skin/classic/mozapps/extensions/dictionaryGeneric-16.png        (extensions/dictionaryGeneric-16.png)
   skin/classic/mozapps/extensions/experimentGeneric.png           (extensions/experimentGeneric.png)
   skin/classic/mozapps/extensions/localeGeneric.png               (extensions/localeGeneric.png)
   skin/classic/mozapps/extensions/rating-won.png                  (extensions/rating-won.png)
   skin/classic/mozapps/extensions/rating-not-won.png              (extensions/rating-not-won.png)
   skin/classic/mozapps/extensions/cancel.png                      (extensions/cancel.png)
   skin/classic/mozapps/extensions/utilities.svg                   (../../shared/extensions/utilities.svg)
   skin/classic/mozapps/extensions/toolbarbutton-dropmarker.png    (extensions/toolbarbutton-dropmarker.png)
   skin/classic/mozapps/extensions/heart.png                       (extensions/heart.png)
   skin/classic/mozapps/extensions/navigation.png                  (../../shared/extensions/navigation.png)
-  skin/classic/mozapps/extensions/stripes-warning.png             (extensions/stripes-warning.png)
-  skin/classic/mozapps/extensions/stripes-error.png               (extensions/stripes-error.png)
-  skin/classic/mozapps/extensions/stripes-info-positive.png       (extensions/stripes-info-positive.png)
-  skin/classic/mozapps/extensions/stripes-info-negative.png       (extensions/stripes-info-negative.png)
-  skin/classic/mozapps/extensions/alerticon-warning.png           (extensions/alerticon-warning.png)
-  skin/classic/mozapps/extensions/alerticon-error.png             (extensions/alerticon-error.png)
-  skin/classic/mozapps/extensions/alerticon-info-positive.png     (extensions/alerticon-info-positive.png)
-  skin/classic/mozapps/extensions/alerticon-info-negative.png     (extensions/alerticon-info-negative.png)
+  skin/classic/mozapps/extensions/alerticon-warning.svg           (../../shared/extensions/alerticon-warning.svg)
+  skin/classic/mozapps/extensions/alerticon-error.svg             (../../shared/extensions/alerticon-error.svg)
+  skin/classic/mozapps/extensions/alerticon-info-positive.svg     (../../shared/extensions/alerticon-info-positive.svg)
+  skin/classic/mozapps/extensions/alerticon-info-negative.svg     (../../shared/extensions/alerticon-info-negative.svg)
   skin/classic/mozapps/extensions/search.png                      (extensions/search.png)
   skin/classic/mozapps/extensions/about.css                       (extensions/about.css)
 * skin/classic/mozapps/extensions/extensions.css                  (extensions/extensions.css)
 * skin/classic/mozapps/extensions/selectAddons.css                (extensions/selectAddons.css)
   skin/classic/mozapps/extensions/update.css                      (extensions/update.css)
   skin/classic/mozapps/extensions/eula.css                        (extensions/eula.css)
   skin/classic/mozapps/extensions/blocklist.css                   (extensions/blocklist.css)
 * skin/classic/mozapps/extensions/newaddon.css                    (extensions/newaddon.css)
@@ -82,13 +78,12 @@ toolkit.jar:
   skin/classic/mozapps/places/defaultFavicon.png                  (places/defaultFavicon.png)
   skin/classic/mozapps/places/defaultFavicon@2x.png               (places/defaultFavicon@2x.png)
 #endif
   skin/classic/mozapps/handling/handling.css                      (handling/handling.css)
 
 #if MOZ_BUILD_APP == browser
 [browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar:
 #endif
-% override chrome://mozapps/skin/extensions/category-extensions.png       chrome://mozapps/skin/extensions/extensionGeneric.png
+% override chrome://mozapps/skin/extensions/category-extensions.svg       chrome://mozapps/skin/extensions/extensionGeneric.svg
 % override chrome://mozapps/skin/extensions/category-languages.png        chrome://mozapps/skin/extensions/localeGeneric.png
 % override chrome://mozapps/skin/extensions/category-themes.png           chrome://mozapps/skin/extensions/themeGeneric.png
 % override chrome://mozapps/skin/plugins/notifyPluginCrashed.png          chrome://mozapps/skin/plugins/notifyPluginGeneric.png
-% override chrome://mozapps/skin/xpinstall/xpinstallItemGeneric.png       chrome://mozapps/skin/extensions/extensionGeneric.png
new file mode 100644
--- /dev/null
+++ b/toolkit/themes/shared/extensions/alerticon-error.svg
@@ -0,0 +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 18 18">
+	<path fill="#e62117" d="M10.124,1.324l7.705,14.127c0.234,0.421,0.228,0.843-0.019,1.264c-0.114,0.193-0.271,0.347-0.467,0.461c-0.198,0.114-0.41,0.171-0.638,0.171H1.294c-0.228,0-0.44-0.057-0.636-0.171c-0.198-0.114-0.353-0.268-0.467-0.461c-0.247-0.421-0.254-0.843-0.02-1.264L7.876,1.324C7.99,1.117,8.147,0.953,8.348,0.833C8.548,0.712,8.766,0.652,9,0.652c0.234,0,0.451,0.06,0.652,0.181C9.853,0.953,10.009,1.117,10.124,1.324z M10.264,10.695l0.181-4.605c0-0.08-0.034-0.143-0.1-0.191c-0.087-0.073-0.168-0.11-0.241-0.11H7.896c-0.073,0-0.154,0.037-0.241,0.11c-0.067,0.048-0.1,0.118-0.1,0.211l0.17,4.586c0,0.067,0.034,0.122,0.1,0.165c0.067,0.044,0.147,0.065,0.241,0.065h1.856c0.094,0,0.172-0.021,0.236-0.065C10.222,10.818,10.258,10.762,10.264,10.695z M10.284,14.448v-1.907c0-0.094-0.031-0.172-0.095-0.236c-0.064-0.064-0.139-0.095-0.225-0.095H8.036c-0.087,0-0.162,0.031-0.225,0.095c-0.064,0.064-0.095,0.142-0.095,0.236v1.907c0,0.094,0.031,0.173,0.095,0.236c0.064,0.064,0.138,0.095,0.225,0.095h1.927c0.086,0,0.162-0.031,0.225-0.095C10.252,14.621,10.284,14.542,10.284,14.448z"/>
+</svg>
new file mode 100644
--- /dev/null
+++ b/toolkit/themes/shared/extensions/alerticon-info-negative.svg
@@ -0,0 +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 18 18">
+	<path fill="#828282" d="M10.124,1.324l7.705,14.127c0.234,0.421,0.228,0.843-0.019,1.264c-0.114,0.193-0.271,0.347-0.467,0.461c-0.198,0.114-0.41,0.171-0.638,0.171H1.294c-0.228,0-0.44-0.057-0.636-0.171c-0.198-0.114-0.353-0.268-0.467-0.461c-0.247-0.421-0.254-0.843-0.02-1.264L7.876,1.324C7.99,1.117,8.147,0.953,8.348,0.833C8.548,0.712,8.766,0.652,9,0.652c0.234,0,0.451,0.06,0.652,0.181C9.853,0.953,10.009,1.117,10.124,1.324z M10.264,10.695l0.181-4.605c0-0.08-0.034-0.143-0.1-0.191c-0.087-0.073-0.168-0.11-0.241-0.11H7.896c-0.073,0-0.154,0.037-0.241,0.11c-0.067,0.048-0.1,0.118-0.1,0.211l0.17,4.586c0,0.067,0.034,0.122,0.1,0.165c0.067,0.044,0.147,0.065,0.241,0.065h1.856c0.094,0,0.172-0.021,0.236-0.065C10.222,10.818,10.258,10.762,10.264,10.695z M10.284,14.448v-1.907c0-0.094-0.031-0.172-0.095-0.236c-0.064-0.064-0.139-0.095-0.225-0.095H8.036c-0.087,0-0.162,0.031-0.225,0.095c-0.064,0.064-0.095,0.142-0.095,0.236v1.907c0,0.094,0.031,0.173,0.095,0.236c0.064,0.064,0.138,0.095,0.225,0.095h1.927c0.086,0,0.162-0.031,0.225-0.095C10.252,14.621,10.284,14.542,10.284,14.448z"/>
+</svg>
new file mode 100644
--- /dev/null
+++ b/toolkit/themes/shared/extensions/alerticon-info-positive.svg
@@ -0,0 +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 18 18">
+	<path fill="#62c44e" d="M18,4.796c0,0.31-0.109,0.573-0.325,0.79l-8.408,8.406l-1.579,1.58c-0.217,0.217-0.48,0.325-0.789,0.325c-0.31,0-0.573-0.108-0.79-0.325l-1.579-1.58L0.325,9.79C0.108,9.573,0,9.31,0,9s0.108-0.573,0.325-0.79l1.58-1.579c0.216-0.217,0.479-0.325,0.789-0.325s0.573,0.108,0.79,0.325l3.414,3.426l7.617-7.63c0.217-0.216,0.48-0.325,0.79-0.325c0.309,0,0.572,0.109,0.789,0.325l1.58,1.58C17.891,4.224,18,4.487,18,4.796z"/>
+</svg>
new file mode 100644
--- /dev/null
+++ b/toolkit/themes/shared/extensions/alerticon-warning.svg
@@ -0,0 +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 18 18">
+	<path fill="#f0cd2f" d="M10.124,1.324l7.705,14.127c0.234,0.421,0.228,0.843-0.019,1.264c-0.114,0.193-0.271,0.347-0.467,0.461c-0.198,0.114-0.41,0.171-0.638,0.171H1.294c-0.228,0-0.44-0.057-0.636-0.171c-0.198-0.114-0.353-0.268-0.467-0.461c-0.247-0.421-0.254-0.843-0.02-1.264L7.876,1.324C7.99,1.117,8.147,0.953,8.348,0.833C8.548,0.712,8.766,0.652,9,0.652c0.234,0,0.451,0.06,0.652,0.181C9.853,0.953,10.009,1.117,10.124,1.324z M10.264,10.695l0.181-4.605c0-0.08-0.034-0.143-0.1-0.191c-0.087-0.073-0.168-0.11-0.241-0.11H7.896c-0.073,0-0.154,0.037-0.241,0.11c-0.067,0.048-0.1,0.118-0.1,0.211l0.17,4.586c0,0.067,0.034,0.122,0.1,0.165c0.067,0.044,0.147,0.065,0.241,0.065h1.856c0.094,0,0.172-0.021,0.236-0.065C10.222,10.818,10.258,10.762,10.264,10.695z M10.284,14.448v-1.907c0-0.094-0.031-0.172-0.095-0.236c-0.064-0.064-0.139-0.095-0.225-0.095H8.036c-0.087,0-0.162,0.031-0.225,0.095c-0.064,0.064-0.095,0.142-0.095,0.236v1.907c0,0.094,0.031,0.173,0.095,0.236c0.064,0.064,0.138,0.095,0.225,0.095h1.927c0.086,0,0.162-0.031,0.225-0.095C10.252,14.621,10.284,14.542,10.284,14.448z"/>
+</svg>
new file mode 100644
--- /dev/null
+++ b/toolkit/themes/shared/extensions/extensionGeneric.svg
@@ -0,0 +1,12 @@
+<!-- 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="32" height="32" viewBox="0 0 64 64">
+  <defs>
+    <linearGradient id="gradient-linear-puzzle-piece" x1="0%" y1="0%" x2="0%" y2="100%">
+      <stop offset="0%" stop-color="#66cc52" stop-opacity="1"/>
+      <stop offset="100%" stop-color="#60bf4c" stop-opacity="1"/>
+    </linearGradient>
+  </defs>
+  <path fill="url('#gradient-linear-puzzle-piece')" d="M42,62c2.2,0,4-1.8,4-4l0-14.2c0,0,0.4-3.7,2.8-3.7c2.4,0,2.2,3.9,6.7,3.9c2.3,0,6.2-1.2,6.2-8.2 c0-7-3.9-7.9-6.2-7.9c-4.5,0-4.3,3.7-6.7,3.7c-2.4,0-2.8-3.8-2.8-3.8V22c0-2.2-1.8-4-4-4H31.5c0,0-3.4-0.6-3.4-3 c0-2.4,3.8-2.6,3.8-7.1c0-2.3-1.3-5.9-8.3-5.9s-8,3.6-8,5.9c0,4.5,3.4,4.7,3.4,7.1c0,2.4-3.4,3-3.4,3H6c-2.2,0-4,1.8-4,4l0,7.8 c0,0-0.4,6,4.4,6c3.1,0,3.2-4.1,7.3-4.1c2,0,4,1.9,4,6c0,4.2-2,6.3-4,6.3c-4,0-4.2-4.1-7.3-4.1c-4.8,0-4.4,5.8-4.4,5.8L2,58 c0,2.2,1.8,4,4,4H19c0,0,6.3,0.4,6.3-4.4c0-3.1-4-3.6-4-7.7c0-2,2.2-4.5,6.4-4.5c4.2,0,6.6,2.5,6.6,4.5c0,4-3.9,4.6-3.9,7.7 c0,4.9,6.3,4.4,6.3,4.4H42z"/>
+</svg>
--- a/toolkit/themes/shared/extensions/extensions.inc.css
+++ b/toolkit/themes/shared/extensions/extensions.inc.css
@@ -24,24 +24,22 @@
 
 .global-warning-container {
   overflow-x: hidden;
 }
 
 .global-warning {
   -moz-box-align: center;
   padding: 0 8px;
-  color: #916D15;
+  color: #c8a91e;
   font-weight: bold;
 }
 
 #addons-page[warning] .global-warning-container {
-  background-color: rgba(255, 255, 0, 0.1);
-  background-image: url("chrome://mozapps/skin/extensions/stripes-warning.png");
-  background-repeat: repeat-x;
+  background-image: linear-gradient(transparent, rgba(255, 255, 0, 0.1));
 }
 
 #detail-view .global-warning {
   padding: 4px 12px;
   border-bottom: 1px solid #c1c1c1;
 }
 
 @media (max-width: 600px) {
@@ -69,19 +67,37 @@
 
 /*** notification icons ***/
 
 .warning-icon,
 .error-icon,
 .pending-icon,
 .info-icon {
   width: 16px;
+  height: 16px;
   margin: 3px 0;
 }
 
+.warning-icon {
+  list-style-image: url("chrome://mozapps/skin/extensions/alerticon-warning.svg");
+}
+
+.error-icon {
+  list-style-image: url("chrome://mozapps/skin/extensions/alerticon-error.svg");
+}
+
+.pending-icon,
+.info-icon {
+  list-style-image: url("chrome://mozapps/skin/extensions/alerticon-info-positive.svg");
+}
+
+.addon-view[pending="disable"] .pending-icon,
+.addon-view[pending="uninstall"] .pending-icon {
+  list-style-image: url("chrome://mozapps/skin/extensions/alerticon-info-negative.svg");
+}
 
 /*** view alert boxes ***/
 
 .alert-container {
   -moz-box-align: center;
   -moz-margin-end: 48px;
 }
 
@@ -174,17 +190,17 @@
 }
 #category-locale > .category-icon {
   list-style-image: url("chrome://mozapps/skin/extensions/category-languages.png");
 }
 #category-searchengine > .category-icon {
   list-style-image: url("chrome://mozapps/skin/extensions/category-searchengines.png");
 }
 #category-extension > .category-icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/category-extensions.png");
+  list-style-image: url("chrome://mozapps/skin/extensions/category-extensions.svg");
 }
 #category-service > .category-icon {
   list-style-image: url("chrome://mozapps/skin/extensions/category-service.png");
 }
 #category-theme > .category-icon {
   list-style-image: url("chrome://mozapps/skin/extensions/category-themes.png");
 }
 #category-plugin > .category-icon {
@@ -385,19 +401,19 @@
   width: 48px;
   height: 48px;
   margin: 3px 7px;
   -moz-box-align: center;
   -moz-box-pack: center;
 }
 
 .icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png");
-  max-width: 48px;
-  max-height: 48px;
+  list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.svg");
+  max-width: 32px;
+  max-height: 32px;
 }
 
 .content-inner-container {
   -moz-margin-end: 5px;
 }
 
 .addon[active="false"] .icon {
   filter: grayscale(1);
@@ -483,30 +499,30 @@
 }
 
 .status-container,
 .control-container {
   -moz-box-pack: end;
 }
 
 .addon-view .warning {
-  color: #916d15;
+  color: #d8b826;
 }
 
 .addon-view .error {
-  color: #d74345;
+  color: #e62117;
 }
 
 .addon-view .pending {
-  color: #1b7123;
+  color: #62c44e;
 }
 
 .addon-view[pending="disable"] .pending,
 .addon-view[pending="uninstall"] .pending {
-  color: #62666e;
+  color: #898989;
 }
 
 .addon .relnotes-container {
   -moz-box-align: start;
   -moz-margin-start: 6px;
   height: 0;
   overflow: hidden;
   opacity: 0;
@@ -532,45 +548,40 @@
   font-weight: bold;
   cursor: pointer;
 }
 
 .addon .relnotes-toggle > .button-box > .button-icon {
   -moz-padding-start: 4px;
 }
 
+.addon-view[notification],
+.addon-view[pending] {
+  --view-highlight-color: transparent;
+  background-image: radial-gradient(at 50% 0%,
+                                    var(--view-highlight-color) 0%,
+                                    transparent 75%);
+}
 .addon-view[notification="warning"] {
-  background-image: url("chrome://mozapps/skin/extensions/stripes-warning.png"),
-                    linear-gradient(rgba(255, 255, 0, 0.04),
-                                    rgba(255, 255, 0, 0));
-  background-repeat: repeat-x;
+  --view-highlight-color: #F9F5E5;
 }
 
 .addon-view[notification="error"] {
-  background-image: url("chrome://mozapps/skin/extensions/stripes-error.png"),
-                    linear-gradient(rgba(255, 0, 0, 0.04),
-                                    rgba(255, 0, 0, 0));
-  background-repeat: repeat-x;
+  --view-highlight-color: #FFE8E9;
 }
 
 .addon-view[pending="enable"],
 .addon-view[pending="upgrade"],
 .addon-view[pending="install"] {
-  background-image: url("chrome://mozapps/skin/extensions/stripes-info-positive.png"),
-                    linear-gradient(rgba(0, 255, 0, 0.04),
-                                    rgba(0, 255, 0, 0));
-  background-repeat: repeat-x;
+  --view-highlight-color: #EFFAF2;
 }
 
 .addon-view[pending="disable"],
 .addon-view[pending="uninstall"] {
-  background-image: url("chrome://mozapps/skin/extensions/stripes-info-negative.png"),
-                    linear-gradient(rgba(128, 128, 128, 0.04),
-                                    rgba(128, 128, 128, 0));
-  background-repeat: repeat-x;
+  --view-highlight-color: #F2F2F2;
 }
 
 .addon[selected] {
   background-color: #fafafa;
   color: #333;
   -moz-padding-start: 1px; /* compensate the 4px border */
   -moz-border-start: solid 4px #ff9500;
 }
--- a/toolkit/themes/shared/extensions/newaddon.inc.css
+++ b/toolkit/themes/shared/extensions/newaddon.inc.css
@@ -35,17 +35,17 @@
   margin: 25px 10px;
 }
 
 #icon {
   margin-top: 8px;
   -moz-margin-end: 10px;
   max-width: 64px;
   max-height: 64px;
-  list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png");
+  list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.svg");
 }
 
 .addon-info[type="theme"] #icon {
   list-style-image: url("chrome://mozapps/skin/extensions/themeGeneric.png");
 }
 
 .addon-info[type="locale"] #icon {
   list-style-image: url("chrome://mozapps/skin/extensions/localeGeneric.png");
@@ -72,19 +72,19 @@
 }
 
 #warning {
   margin-bottom: 25px;
   -moz-box-align: start;
 }
 
 #warning-icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/alerticon-warning.png");
+  list-style-image: url("chrome://mozapps/skin/extensions/alerticon-warning.svg");
   width: 16px;
-  height: 15px;
+  height: 16px;
   margin-top: 5px;
   -moz-margin-end: 5px;
 }
 
 #allow {
   -moz-margin-start: 84px;
   margin-bottom: 20px;
 }
--- a/toolkit/themes/windows/mozapps/extensions/about.css
+++ b/toolkit/themes/windows/mozapps/extensions/about.css
@@ -26,17 +26,17 @@
 }
 
 
 .basic-info {
   padding: 10px;
 }
 
 #extensionIcon {
-  list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png");
+  list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.svg");
   max-width: 64px;
   max-height: 64px;
   -moz-margin-end: 6px;
 }
 
 #genericAbout[addontype="theme"] #extensionIcon {
   list-style-image: url("chrome://mozapps/skin/extensions/themeGeneric.png");
 }
deleted file mode 100644
index 8740e4911a857dd0d2e479529594fa4bb17adf11..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 2c5f628ab6001ba2f20a19e20f5d6c556b8f0169..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index a186c6b7adaf4d1606a3b717d3ff00e428e8fa41..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 75ea826f9140c9d1a75f3a9f24213964f43f9447..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
--- a/toolkit/themes/windows/mozapps/extensions/eula.css
+++ b/toolkit/themes/windows/mozapps/extensions/eula.css
@@ -1,14 +1,14 @@
 /* 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/. */
 
 #icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png");
+  list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.svg");
   max-width: 48px;
   max-height: 48px;
   -moz-margin-end: 6px;
 }
 
 #eula-dialog[addontype="theme"] #icon {
   list-style-image: url("chrome://mozapps/skin/extensions/themeGeneric.png");
 }
deleted file mode 100644
index 6a76774c7bf6059748b511207414b34515b7c6a2..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 7756f973b27387403b4fe572a8dcb404914a64ec..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
--- a/toolkit/themes/windows/mozapps/extensions/extensions.css
+++ b/toolkit/themes/windows/mozapps/extensions/extensions.css
@@ -10,37 +10,16 @@
 }
 
 @media not all and (-moz-windows-default-theme) {
   #header-utils-btn {
     list-style-image: url("chrome://mozapps/skin/extensions/utilities.svg#utilities-native");
   }
 }
 
-.warning-icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/alerticon-warning.png");
-  height: 15px;
-}
-
-.error-icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/alerticon-error.png");
-  height: 15px;
-}
-
-.pending-icon,
-.info-icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/alerticon-info-positive.png");
-  height: 15px;
-}
-
-.addon-view[pending="disable"] .pending-icon,
-.addon-view[pending="uninstall"] .pending-icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/alerticon-info-negative.png");
-}
-
 .sorter[checkState="1"] {
   list-style-image: url("chrome://global/skin/arrow/arrow-dn.gif");
 }
 
 .sorter[checkState="2"] {
   list-style-image: url("chrome://global/skin/arrow/arrow-up.gif");
 }
 
deleted file mode 100644
index 1dc2d8504cbf625fffc9d5707ef9eb459c70fc0e..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 901ab1ec29fa9d08b240f68653f27f4b0bbda842..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 370ceec0f241b320339bd7a6239eafd4f19944cf..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 69463fb1af3de8f2cb8c9acc2fcbd61b226cb114..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
--- a/toolkit/themes/windows/mozapps/extensions/xpinstallConfirm.css
+++ b/toolkit/themes/windows/mozapps/extensions/xpinstallConfirm.css
@@ -76,17 +76,17 @@ installitem {
   margin-bottom: 1px;
   -moz-margin-start: 6px;
   -moz-margin-end: 5px;
 }
 
 .xpinstallItemIcon {
   max-width: 32px;
   max-height: 32px;
-  list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png");
+  list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.svg");
 }
 
 installitem[type="theme"] .xpinstallItemIcon {
   list-style-image: url("chrome://mozapps/skin/extensions/themeGeneric.png");
 }
 
 installitem[type="locale"] .xpinstallItemIcon {
   list-style-image: url("chrome://mozapps/skin/extensions/localeGeneric.png");
--- a/toolkit/themes/windows/mozapps/jar.mn
+++ b/toolkit/themes/windows/mozapps/jar.mn
@@ -16,38 +16,34 @@ toolkit.jar:
         skin/classic/mozapps/extensions/category-search.png        (extensions/category-search.png)
         skin/classic/mozapps/extensions/category-discover.png      (extensions/category-discover.png)
         skin/classic/mozapps/extensions/category-searchengines.png (extensions/category-searchengines.png)
         skin/classic/mozapps/extensions/category-plugins.png       (extensions/category-plugins.png)
         skin/classic/mozapps/extensions/category-service.png       (extensions/category-service.png)
         skin/classic/mozapps/extensions/category-recent.png        (extensions/category-recent.png)
         skin/classic/mozapps/extensions/category-available.png     (extensions/category-available.png)
         skin/classic/mozapps/extensions/discover-logo.png          (extensions/discover-logo.png)
-        skin/classic/mozapps/extensions/extensionGeneric.png       (extensions/extensionGeneric.png)
+        skin/classic/mozapps/extensions/extensionGeneric.svg       (../../shared/extensions/extensionGeneric.svg)
         skin/classic/mozapps/extensions/extensionGeneric-16.png    (extensions/extensionGeneric-16.png)
         skin/classic/mozapps/extensions/themeGeneric.png           (extensions/themeGeneric.png)
         skin/classic/mozapps/extensions/themeGeneric-16.png        (extensions/themeGeneric-16.png)
         skin/classic/mozapps/extensions/dictionaryGeneric.png      (extensions/dictionaryGeneric.png)
         skin/classic/mozapps/extensions/dictionaryGeneric-16.png   (extensions/dictionaryGeneric-16.png)
         skin/classic/mozapps/extensions/experimentGeneric.png      (extensions/experimentGeneric.png)
         skin/classic/mozapps/extensions/localeGeneric.png          (extensions/localeGeneric.png)
         skin/classic/mozapps/extensions/rating-won.png             (extensions/rating-won.png)
         skin/classic/mozapps/extensions/rating-not-won.png         (extensions/rating-not-won.png)
         skin/classic/mozapps/extensions/cancel.png                 (extensions/cancel.png)
         skin/classic/mozapps/extensions/utilities.svg              (../../shared/extensions/utilities.svg)
         skin/classic/mozapps/extensions/heart.png                  (extensions/heart.png)
         skin/classic/mozapps/extensions/navigation.png             (../../shared/extensions/navigation.png)
-        skin/classic/mozapps/extensions/stripes-warning.png        (extensions/stripes-warning.png)
-        skin/classic/mozapps/extensions/stripes-error.png          (extensions/stripes-error.png)
-        skin/classic/mozapps/extensions/stripes-info-positive.png  (extensions/stripes-info-positive.png)
-        skin/classic/mozapps/extensions/stripes-info-negative.png  (extensions/stripes-info-negative.png)
-        skin/classic/mozapps/extensions/alerticon-warning.png      (extensions/alerticon-warning.png)
-        skin/classic/mozapps/extensions/alerticon-error.png        (extensions/alerticon-error.png)
-        skin/classic/mozapps/extensions/alerticon-info-positive.png (extensions/alerticon-info-positive.png)
-        skin/classic/mozapps/extensions/alerticon-info-negative.png (extensions/alerticon-info-negative.png)
+        skin/classic/mozapps/extensions/alerticon-warning.svg      (../../shared/extensions/alerticon-warning.svg)
+        skin/classic/mozapps/extensions/alerticon-error.svg        (../../shared/extensions/alerticon-error.svg)
+        skin/classic/mozapps/extensions/alerticon-info-positive.svg (../../shared/extensions/alerticon-info-positive.svg)
+        skin/classic/mozapps/extensions/alerticon-info-negative.svg (../../shared/extensions/alerticon-info-negative.svg)
         skin/classic/mozapps/extensions/eula.css                   (extensions/eula.css)
 *       skin/classic/mozapps/extensions/newaddon.css               (extensions/newaddon.css)
         skin/classic/mozapps/handling/handling.css                 (handling/handling.css)
         skin/classic/mozapps/passwordmgr/key.png                   (passwordmgr/key.png)
         skin/classic/mozapps/passwordmgr/key-16.png                (passwordmgr/key-16.png)
         skin/classic/mozapps/passwordmgr/key-64.png                (passwordmgr/key-64.png)
 #ifdef MOZ_PLACES
         skin/classic/mozapps/places/defaultFavicon.png             (places/defaultFavicon.png)
@@ -78,17 +74,16 @@ toolkit.jar:
 *       skin/classic/mozapps/xpinstall/xpinstallConfirm.css        (extensions/xpinstallConfirm.css)
 #ifdef XP_WIN
         skin/classic/mozapps/downloads/downloadButtons-XP.png      (downloads/downloadButtons-XP.png)
         skin/classic/mozapps/downloads/downloadIcon-XP.png         (downloads/downloadIcon-XP.png)
         skin/classic/mozapps/extensions/category-discover-XP.png   (extensions/category-discover-XP.png)
         skin/classic/mozapps/extensions/category-plugins-XP.png    (extensions/category-plugins-XP.png)
         skin/classic/mozapps/extensions/category-recent-XP.png     (extensions/category-recent-XP.png)
         skin/classic/mozapps/extensions/category-available-XP.png  (extensions/category-available-XP.png)
-        skin/classic/mozapps/extensions/extensionGeneric-XP.png    (extensions/extensionGeneric-XP.png)
         skin/classic/mozapps/extensions/extensionGeneric-16-XP.png (extensions/extensionGeneric-16-XP.png)
         skin/classic/mozapps/extensions/themeGeneric-XP.png        (extensions/themeGeneric-XP.png)
         skin/classic/mozapps/extensions/themeGeneric-16-XP.png     (extensions/themeGeneric-16-XP.png)
         skin/classic/mozapps/extensions/localeGeneric-XP.png       (extensions/localeGeneric-XP.png)
         skin/classic/mozapps/plugins/pluginGeneric-XP.png          (plugins/pluginGeneric-XP.png)
         skin/classic/mozapps/plugins/pluginBlocked-XP.png          (plugins/pluginBlocked-XP.png)
         skin/classic/mozapps/plugins/pluginGeneric-16-XP.png       (plugins/pluginGeneric-16-XP.png)
         skin/classic/mozapps/profile/profileicon-XP.png            (profile/profileicon-XP.png)
@@ -98,31 +93,29 @@ toolkit.jar:
 [browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar:
 #endif
 % override chrome://mozapps/skin/downloads/downloadButtons.png            chrome://mozapps/skin/downloads/downloadButtons-XP.png        osversion<6
 % override chrome://mozapps/skin/downloads/downloadIcon.png               chrome://mozapps/skin/downloads/downloadIcon-XP.png           osversion<6
 % override chrome://mozapps/skin/extensions/category-discover.png         chrome://mozapps/skin/extensions/category-discover-XP.png     osversion<6
 % override chrome://mozapps/skin/extensions/category-plugins.png          chrome://mozapps/skin/extensions/category-plugins-XP.png      osversion<6
 % override chrome://mozapps/skin/extensions/category-recent.png           chrome://mozapps/skin/extensions/category-recent-XP.png       osversion<6
 % override chrome://mozapps/skin/extensions/category-available.png        chrome://mozapps/skin/extensions/category-available-XP.png    osversion<6
-% override chrome://mozapps/skin/extensions/extensionGeneric.png          chrome://mozapps/skin/extensions/extensionGeneric-XP.png      osversion<6
 % override chrome://mozapps/skin/extensions/extensionGeneric-16.png       chrome://mozapps/skin/extensions/extensionGeneric-16-XP.png   osversion<6
 % override chrome://mozapps/skin/extensions/themeGeneric.png              chrome://mozapps/skin/extensions/themeGeneric-XP.png          osversion<6
 % override chrome://mozapps/skin/extensions/themeGeneric-16.png           chrome://mozapps/skin/extensions/themeGeneric-16-XP.png       osversion<6
 % override chrome://mozapps/skin/extensions/localeGeneric.png             chrome://mozapps/skin/extensions/localeGeneric-XP.png         osversion<6
 % override chrome://mozapps/skin/plugins/pluginGeneric.png                chrome://mozapps/skin/plugins/pluginGeneric-XP.png            osversion<6
 % override chrome://mozapps/skin/plugins/pluginBlocked.png                chrome://mozapps/skin/plugins/pluginBlocked-XP.png            osversion<6
 % override chrome://mozapps/skin/plugins/pluginGeneric-16.png             chrome://mozapps/skin/plugins/pluginGeneric-16-XP.png         osversion<6
 % override chrome://mozapps/skin/profile/profileicon.png                  chrome://mozapps/skin/profile/profileicon-XP.png              osversion<6
 % override chrome://mozapps/skin/update/downloadButtons.png               chrome://mozapps/skin/update/downloadButtons-XP.png           osversion<6
 #endif
 
 #if MOZ_BUILD_APP == browser
 [browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar:
 #endif
 % override chrome://mozapps/skin/extensions/category-dictionaries.png     chrome://mozapps/skin/extensions/dictionaryGeneric.png
 % override chrome://mozapps/skin/extensions/category-experiments.png      chrome://mozapps/skin/extensions/experimentGeneric.png
-% override chrome://mozapps/skin/extensions/category-extensions.png       chrome://mozapps/skin/extensions/extensionGeneric.png
+% override chrome://mozapps/skin/extensions/category-extensions.svg       chrome://mozapps/skin/extensions/extensionGeneric.svg
 % override chrome://mozapps/skin/extensions/category-languages.png        chrome://mozapps/skin/extensions/localeGeneric.png
 % override chrome://mozapps/skin/extensions/category-themes.png           chrome://mozapps/skin/extensions/themeGeneric.png
 % override chrome://mozapps/skin/plugins/notifyPluginCrashed.png          chrome://mozapps/skin/plugins/pluginGeneric-16.png
 % override chrome://mozapps/skin/plugins/notifyPluginGeneric.png          chrome://mozapps/skin/plugins/pluginGeneric-16.png
-% override chrome://mozapps/skin/xpinstall/xpinstallItemGeneric.png       chrome://mozapps/skin/extensions/extensionGeneric.png