Merge branch 'ext-work'

91 files changed, 112 insertions, 91 deletions

diff --git a/toolkit/themes/linux/mozapps/jar.mn b/toolkit/themes/linux/mozapps/jar.mn
index 8d1c12305..0965662bd 100644
--- a/toolkit/themes/linux/mozapps/jar.mn
+++ b/toolkit/themes/linux/mozapps/jar.mn
@@ -6,21 +6,23 @@ toolkit.jar:
 #include ../../shared/mozapps.inc.mn
   skin/classic/mozapps/downloads/downloadIcon.png          (downloads/downloadIcon.png)
   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-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/heart.png                (extensions/heart.png)
+#ifdef MOZ_WEBEXTENSIONS
+* skin/classic/mozapps/extensions/extensions.css           (webextensions/extensions.css)
+  skin/classic/mozapps/extensions/category-search.png      (webextensions/category-search.png)
+  skin/classic/mozapps/extensions/category-discover.png    (webextensions/category-discover.png)
+  skin/classic/mozapps/extensions/category-plugins.png     (webextensions/category-plugins.png)
+  skin/classic/mozapps/extensions/category-service.png     (webextensions/category-service.png)
+  skin/classic/mozapps/extensions/category-recent.png      (webextensions/category-recent.png)
+  skin/classic/mozapps/extensions/category-available.png   (webextensions/category-available.png)
+  skin/classic/mozapps/extensions/extensionGeneric-16.png  (webextensions/extensionGeneric-16.png)
+  skin/classic/mozapps/extensions/dictionaryGeneric.png    (webextensions/dictionaryGeneric.png)
+  skin/classic/mozapps/extensions/dictionaryGeneric-16.png (webextensions/dictionaryGeneric-16.png)
+  skin/classic/mozapps/extensions/themeGeneric.png         (webextensions/themeGeneric.png)
+  skin/classic/mozapps/extensions/themeGeneric-16.png      (webextensions/themeGeneric-16.png)
+  skin/classic/mozapps/extensions/localeGeneric.png        (webextensions/localeGeneric.png)
+* skin/classic/mozapps/extensions/newaddon.css             (webextensions/newaddon.css)
+  skin/classic/mozapps/extensions/heart.png                (webextensions/heart.png)
+#endif
   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)
diff --git a/toolkit/themes/linux/mozapps/extensions/category-available.png b/toolkit/themes/linux/mozapps/webextensions/category-available.png
index 689d526c9..689d526c9 100644
--- a/toolkit/themes/linux/mozapps/extensions/category-available.png
+++ b/toolkit/themes/linux/mozapps/webextensions/category-available.png
diff --git a/toolkit/themes/linux/mozapps/extensions/category-discover.png b/toolkit/themes/linux/mozapps/webextensions/category-discover.png
index ccea27524..ccea27524 100644
--- a/toolkit/themes/linux/mozapps/extensions/category-discover.png
+++ b/toolkit/themes/linux/mozapps/webextensions/category-discover.png
diff --git a/toolkit/themes/linux/mozapps/extensions/category-plugins.png b/toolkit/themes/linux/mozapps/webextensions/category-plugins.png
index b253dd08f..b253dd08f 100644
--- a/toolkit/themes/linux/mozapps/extensions/category-plugins.png
+++ b/toolkit/themes/linux/mozapps/webextensions/category-plugins.png
diff --git a/toolkit/themes/linux/mozapps/extensions/category-recent.png b/toolkit/themes/linux/mozapps/webextensions/category-recent.png
index 9039b27aa..9039b27aa 100644
--- a/toolkit/themes/linux/mozapps/extensions/category-recent.png
+++ b/toolkit/themes/linux/mozapps/webextensions/category-recent.png
diff --git a/toolkit/themes/linux/mozapps/extensions/category-search.png b/toolkit/themes/linux/mozapps/webextensions/category-search.png
index 52e91a7ce..52e91a7ce 100644
--- a/toolkit/themes/linux/mozapps/extensions/category-search.png
+++ b/toolkit/themes/linux/mozapps/webextensions/category-search.png
diff --git a/toolkit/themes/linux/mozapps/extensions/category-service.png b/toolkit/themes/linux/mozapps/webextensions/category-service.png
index 997c8541c..997c8541c 100644
--- a/toolkit/themes/linux/mozapps/extensions/category-service.png
+++ b/toolkit/themes/linux/mozapps/webextensions/category-service.png
diff --git a/toolkit/themes/linux/mozapps/extensions/dictionaryGeneric-16.png b/toolkit/themes/linux/mozapps/webextensions/dictionaryGeneric-16.png
index 08a0447a4..08a0447a4 100644
--- a/toolkit/themes/linux/mozapps/extensions/dictionaryGeneric-16.png
+++ b/toolkit/themes/linux/mozapps/webextensions/dictionaryGeneric-16.png
diff --git a/toolkit/themes/linux/mozapps/extensions/dictionaryGeneric.png b/toolkit/themes/linux/mozapps/webextensions/dictionaryGeneric.png
index a1e0d5359..a1e0d5359 100644
--- a/toolkit/themes/linux/mozapps/extensions/dictionaryGeneric.png
+++ b/toolkit/themes/linux/mozapps/webextensions/dictionaryGeneric.png
diff --git a/toolkit/themes/linux/mozapps/extensions/extensionGeneric-16.png b/toolkit/themes/linux/mozapps/webextensions/extensionGeneric-16.png
index b1a2f3652..b1a2f3652 100644
--- a/toolkit/themes/linux/mozapps/extensions/extensionGeneric-16.png
+++ b/toolkit/themes/linux/mozapps/webextensions/extensionGeneric-16.png
diff --git a/toolkit/themes/linux/mozapps/extensions/extensions.css b/toolkit/themes/linux/mozapps/webextensions/extensions.css
index a75669937..5a11df119 100644
--- a/toolkit/themes/linux/mozapps/extensions/extensions.css
+++ b/toolkit/themes/linux/mozapps/webextensions/extensions.css
@@ -2,7 +2,7 @@
  * 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/. */
 
-%include ../../../shared/extensions/extensions.inc.css
+%include ../../../shared/webextensions/extensions.inc.css
 
 #header-utils-btn .toolbarbutton-icon {
   list-style-image: url("chrome://mozapps/skin/extensions/utilities.svg#utilities-native");
diff --git a/toolkit/themes/linux/mozapps/extensions/heart.png b/toolkit/themes/linux/mozapps/webextensions/heart.png
index 655f4c4be..655f4c4be 100644
--- a/toolkit/themes/linux/mozapps/extensions/heart.png
+++ b/toolkit/themes/linux/mozapps/webextensions/heart.png
diff --git a/toolkit/themes/linux/mozapps/extensions/localeGeneric.png b/toolkit/themes/linux/mozapps/webextensions/localeGeneric.png
index c72115906..c72115906 100644
--- a/toolkit/themes/linux/mozapps/extensions/localeGeneric.png
+++ b/toolkit/themes/linux/mozapps/webextensions/localeGeneric.png
diff --git a/toolkit/themes/linux/mozapps/extensions/newaddon.css b/toolkit/themes/linux/mozapps/webextensions/newaddon.css
index edfba0ef5..5856c08b5 100644
--- a/toolkit/themes/linux/mozapps/extensions/newaddon.css
+++ b/toolkit/themes/linux/mozapps/webextensions/newaddon.css
@@ -2,4 +2,4 @@
  * 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/. */
 
-%include ../../../shared/extensions/newaddon.inc.css
+%include ../../../shared/webextensions/newaddon.inc.css
diff --git a/toolkit/themes/linux/mozapps/extensions/themeGeneric-16.png b/toolkit/themes/linux/mozapps/webextensions/themeGeneric-16.png
index 019886fea..019886fea 100644
--- a/toolkit/themes/linux/mozapps/extensions/themeGeneric-16.png
+++ b/toolkit/themes/linux/mozapps/webextensions/themeGeneric-16.png
diff --git a/toolkit/themes/linux/mozapps/extensions/themeGeneric.png b/toolkit/themes/linux/mozapps/webextensions/themeGeneric.png
index cde1c7834..cde1c7834 100644
--- a/toolkit/themes/linux/mozapps/extensions/themeGeneric.png
+++ b/toolkit/themes/linux/mozapps/webextensions/themeGeneric.png
diff --git a/toolkit/themes/osx/mozapps/jar.mn b/toolkit/themes/osx/mozapps/jar.mn
index 3f5717073..8da83da16 100644
--- a/toolkit/themes/osx/mozapps/jar.mn
+++ b/toolkit/themes/osx/mozapps/jar.mn
@@ -8,34 +8,36 @@ toolkit.jar:
   skin/classic/mozapps/downloads/downloadIcon.png                 (downloads/downloadIcon.png)
 * skin/classic/mozapps/downloads/downloads.css                    (downloads/downloads.css)
   skin/classic/mozapps/downloads/unknownContentType.css           (downloads/unknownContentType.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-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-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/toolbarbutton-dropmarker.png    (extensions/toolbarbutton-dropmarker.png)
-  skin/classic/mozapps/extensions/heart.png                       (extensions/heart.png)
-  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/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)
+#ifdef MOZ_WEBEXTENSIONS
+  skin/classic/mozapps/extensions/category-search.png             (webextensions/category-search.png)
+  skin/classic/mozapps/extensions/category-discover.png           (webextensions/category-discover.png)
+  skin/classic/mozapps/extensions/category-plugins.png            (webextensions/category-plugins.png)
+  skin/classic/mozapps/extensions/category-service.png            (webextensions/category-service.png)
+  skin/classic/mozapps/extensions/category-dictionaries.png       (webextensions/category-dictionaries.png)
+  skin/classic/mozapps/extensions/category-experiments.png        (webextensions/category-experiments.png)
+  skin/classic/mozapps/extensions/category-recent.png             (webextensions/category-recent.png)
+  skin/classic/mozapps/extensions/category-available.png          (webextensions/category-available.png)
+  skin/classic/mozapps/extensions/discover-logo.png               (webextensions/discover-logo.png)
+  skin/classic/mozapps/extensions/extensionGeneric-16.png         (webextensions/extensionGeneric-16.png)
+  skin/classic/mozapps/extensions/themeGeneric.png                (webextensions/themeGeneric.png)
+  skin/classic/mozapps/extensions/themeGeneric-16.png             (webextensions/themeGeneric-16.png)
+  skin/classic/mozapps/extensions/dictionaryGeneric.png           (webextensions/dictionaryGeneric.png)
+  skin/classic/mozapps/extensions/dictionaryGeneric-16.png        (webextensions/dictionaryGeneric-16.png)
+  skin/classic/mozapps/extensions/experimentGeneric.png           (webextensions/experimentGeneric.png)
+  skin/classic/mozapps/extensions/localeGeneric.png               (webextensions/localeGeneric.png)
+  skin/classic/mozapps/extensions/rating-won.png                  (webextensions/rating-won.png)
+  skin/classic/mozapps/extensions/rating-not-won.png              (webextensions/rating-not-won.png)
+  skin/classic/mozapps/extensions/cancel.png                      (webextensions/cancel.png)
+  skin/classic/mozapps/extensions/toolbarbutton-dropmarker.png    (webextensions/toolbarbutton-dropmarker.png)
+  skin/classic/mozapps/extensions/heart.png                       (webextensions/heart.png)
+  skin/classic/mozapps/extensions/search.png                      (webextensions/search.png)
+  skin/classic/mozapps/extensions/about.css                       (webextensions/about.css)
+* skin/classic/mozapps/extensions/extensions.css                  (webextensions/extensions.css)
+  skin/classic/mozapps/extensions/update.css                      (webextensions/update.css)
+  skin/classic/mozapps/extensions/eula.css                        (webextensions/eula.css)
+  skin/classic/mozapps/extensions/blocklist.css                   (webextensions/blocklist.css)
+* skin/classic/mozapps/extensions/newaddon.css                    (webextensions/newaddon.css)
+#endif
   skin/classic/mozapps/plugins/notifyPluginGeneric.png            (plugins/notifyPluginGeneric.png)
   skin/classic/mozapps/plugins/pluginGeneric.png                  (plugins/pluginGeneric.png)
   skin/classic/mozapps/plugins/pluginBlocked.png                  (plugins/pluginBlocked.png)
@@ -48,7 +50,9 @@ toolkit.jar:
   skin/classic/mozapps/update/buttons.png                         (update/buttons.png)
 * skin/classic/mozapps/update/updates.css                         (update/updates.css)
   skin/classic/mozapps/viewsource/viewsource.css                  (viewsource/viewsource.css)
-  skin/classic/mozapps/xpinstall/xpinstallConfirm.css             (extensions/xpinstallConfirm.css)
+#ifdef MOZ_WEBEXTENSIONS
+  skin/classic/mozapps/xpinstall/xpinstallConfirm.css             (webextensions/xpinstallConfirm.css)
+#endif
   skin/classic/mozapps/handling/handling.css                      (handling/handling.css)
 
 #ifdef MOZ_PHOENIX
@@ -56,7 +60,9 @@ toolkit.jar:
 #elif MOZ_SEPARATE_MANIFEST_FOR_THEME_OVERRIDES
 [extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar:
 #endif
+#ifdef MOZ_WEBEXTENSIONS
 % 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
+#endif
 % override chrome://mozapps/skin/plugins/notifyPluginCrashed.png          chrome://mozapps/skin/plugins/notifyPluginGeneric.png
diff --git a/toolkit/themes/osx/mozapps/extensions/about.css b/toolkit/themes/osx/mozapps/webextensions/about.css
index c13ce5f59..c13ce5f59 100644
--- a/toolkit/themes/osx/mozapps/extensions/about.css
+++ b/toolkit/themes/osx/mozapps/webextensions/about.css
diff --git a/toolkit/themes/osx/mozapps/extensions/blocklist.css b/toolkit/themes/osx/mozapps/webextensions/blocklist.css
index 02f6e1d49..02f6e1d49 100644
--- a/toolkit/themes/osx/mozapps/extensions/blocklist.css
+++ b/toolkit/themes/osx/mozapps/webextensions/blocklist.css
diff --git a/toolkit/themes/osx/mozapps/extensions/cancel.png b/toolkit/themes/osx/mozapps/webextensions/cancel.png
index 0d98ab235..0d98ab235 100644
--- a/toolkit/themes/osx/mozapps/extensions/cancel.png
+++ b/toolkit/themes/osx/mozapps/webextensions/cancel.png
diff --git a/toolkit/themes/osx/mozapps/extensions/category-available.png b/toolkit/themes/osx/mozapps/webextensions/category-available.png
index d1b737ab0..d1b737ab0 100644
--- a/toolkit/themes/osx/mozapps/extensions/category-available.png
+++ b/toolkit/themes/osx/mozapps/webextensions/category-available.png
diff --git a/toolkit/themes/osx/mozapps/extensions/category-dictionaries.png b/toolkit/themes/osx/mozapps/webextensions/category-dictionaries.png
index 54ae4f93f..54ae4f93f 100644
--- a/toolkit/themes/osx/mozapps/extensions/category-dictionaries.png
+++ b/toolkit/themes/osx/mozapps/webextensions/category-dictionaries.png
diff --git a/toolkit/themes/osx/mozapps/extensions/category-discover.png b/toolkit/themes/osx/mozapps/webextensions/category-discover.png
index a6f5b49b3..a6f5b49b3 100644
--- a/toolkit/themes/osx/mozapps/extensions/category-discover.png
+++ b/toolkit/themes/osx/mozapps/webextensions/category-discover.png
diff --git a/toolkit/themes/osx/mozapps/extensions/category-experiments.png b/toolkit/themes/osx/mozapps/webextensions/category-experiments.png
index a9d00545e..a9d00545e 100644
--- a/toolkit/themes/osx/mozapps/extensions/category-experiments.png
+++ b/toolkit/themes/osx/mozapps/webextensions/category-experiments.png
diff --git a/toolkit/themes/osx/mozapps/extensions/category-plugins.png b/toolkit/themes/osx/mozapps/webextensions/category-plugins.png
index 5c4d8bf47..5c4d8bf47 100644
--- a/toolkit/themes/osx/mozapps/extensions/category-plugins.png
+++ b/toolkit/themes/osx/mozapps/webextensions/category-plugins.png
diff --git a/toolkit/themes/osx/mozapps/extensions/category-recent.png b/toolkit/themes/osx/mozapps/webextensions/category-recent.png
index 7ecfc7d4c..7ecfc7d4c 100644
--- a/toolkit/themes/osx/mozapps/extensions/category-recent.png
+++ b/toolkit/themes/osx/mozapps/webextensions/category-recent.png
diff --git a/toolkit/themes/osx/mozapps/extensions/category-search.png b/toolkit/themes/osx/mozapps/webextensions/category-search.png
index 52e91a7ce..52e91a7ce 100644
--- a/toolkit/themes/osx/mozapps/extensions/category-search.png
+++ b/toolkit/themes/osx/mozapps/webextensions/category-search.png
diff --git a/toolkit/themes/osx/mozapps/extensions/category-service.png b/toolkit/themes/osx/mozapps/webextensions/category-service.png
index 997c8541c..997c8541c 100644
--- a/toolkit/themes/osx/mozapps/extensions/category-service.png
+++ b/toolkit/themes/osx/mozapps/webextensions/category-service.png
diff --git a/toolkit/themes/osx/mozapps/extensions/dictionaryGeneric-16.png b/toolkit/themes/osx/mozapps/webextensions/dictionaryGeneric-16.png
index 4ad1a1a82..4ad1a1a82 100644
--- a/toolkit/themes/osx/mozapps/extensions/dictionaryGeneric-16.png
+++ b/toolkit/themes/osx/mozapps/webextensions/dictionaryGeneric-16.png
diff --git a/toolkit/themes/osx/mozapps/extensions/dictionaryGeneric.png b/toolkit/themes/osx/mozapps/webextensions/dictionaryGeneric.png
index 54ae4f93f..54ae4f93f 100644
--- a/toolkit/themes/osx/mozapps/extensions/dictionaryGeneric.png
+++ b/toolkit/themes/osx/mozapps/webextensions/dictionaryGeneric.png
diff --git a/toolkit/themes/osx/mozapps/extensions/discover-logo.png b/toolkit/themes/osx/mozapps/webextensions/discover-logo.png
index cd50735a8..cd50735a8 100644
--- a/toolkit/themes/osx/mozapps/extensions/discover-logo.png
+++ b/toolkit/themes/osx/mozapps/webextensions/discover-logo.png
diff --git a/toolkit/themes/osx/mozapps/extensions/eula.css b/toolkit/themes/osx/mozapps/webextensions/eula.css
index 05aeb3c1c..05aeb3c1c 100644
--- a/toolkit/themes/osx/mozapps/extensions/eula.css
+++ b/toolkit/themes/osx/mozapps/webextensions/eula.css
diff --git a/toolkit/themes/osx/mozapps/extensions/experimentGeneric.png b/toolkit/themes/osx/mozapps/webextensions/experimentGeneric.png
index a9d00545e..a9d00545e 100644
--- a/toolkit/themes/osx/mozapps/extensions/experimentGeneric.png
+++ b/toolkit/themes/osx/mozapps/webextensions/experimentGeneric.png
diff --git a/toolkit/themes/osx/mozapps/extensions/extensionGeneric-16.png b/toolkit/themes/osx/mozapps/webextensions/extensionGeneric-16.png
index fc6c8a258..fc6c8a258 100644
--- a/toolkit/themes/osx/mozapps/extensions/extensionGeneric-16.png
+++ b/toolkit/themes/osx/mozapps/webextensions/extensionGeneric-16.png
diff --git a/toolkit/themes/osx/mozapps/extensions/extensions.css b/toolkit/themes/osx/mozapps/webextensions/extensions.css
index d4dac2f01..cbdd9a5b0 100644
--- a/toolkit/themes/osx/mozapps/extensions/extensions.css
+++ b/toolkit/themes/osx/mozapps/webextensions/extensions.css
@@ -2,7 +2,7 @@
  * 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/. */
 
-%include ../../../shared/extensions/extensions.inc.css
+%include ../../../shared/webextensions/extensions.inc.css
 
 .no-auto-hide > .menulist-dropmarker {
   padding-inline-start: 0px !important;
diff --git a/toolkit/themes/osx/mozapps/extensions/heart.png b/toolkit/themes/osx/mozapps/webextensions/heart.png
index 655f4c4be..655f4c4be 100644
--- a/toolkit/themes/osx/mozapps/extensions/heart.png
+++ b/toolkit/themes/osx/mozapps/webextensions/heart.png
diff --git a/toolkit/themes/osx/mozapps/extensions/localeGeneric.png b/toolkit/themes/osx/mozapps/webextensions/localeGeneric.png
index 4d9ac5ad8..4d9ac5ad8 100644
--- a/toolkit/themes/osx/mozapps/extensions/localeGeneric.png
+++ b/toolkit/themes/osx/mozapps/webextensions/localeGeneric.png
diff --git a/toolkit/themes/windows/mozapps/extensions/newaddon.css b/toolkit/themes/osx/mozapps/webextensions/newaddon.css
index edfba0ef5..5856c08b5 100644
--- a/toolkit/themes/windows/mozapps/extensions/newaddon.css
+++ b/toolkit/themes/osx/mozapps/webextensions/newaddon.css
@@ -2,4 +2,4 @@
  * 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/. */
 
-%include ../../../shared/extensions/newaddon.inc.css
+%include ../../../shared/webextensions/newaddon.inc.css
diff --git a/toolkit/themes/osx/mozapps/extensions/rating-not-won.png b/toolkit/themes/osx/mozapps/webextensions/rating-not-won.png
index 2761f1925..2761f1925 100644
--- a/toolkit/themes/osx/mozapps/extensions/rating-not-won.png
+++ b/toolkit/themes/osx/mozapps/webextensions/rating-not-won.png
diff --git a/toolkit/themes/osx/mozapps/extensions/rating-won.png b/toolkit/themes/osx/mozapps/webextensions/rating-won.png
index 336dd8f6e..336dd8f6e 100644
--- a/toolkit/themes/osx/mozapps/extensions/rating-won.png
+++ b/toolkit/themes/osx/mozapps/webextensions/rating-won.png
diff --git a/toolkit/themes/osx/mozapps/extensions/search.png b/toolkit/themes/osx/mozapps/webextensions/search.png
index 93196dbbf..93196dbbf 100644
--- a/toolkit/themes/osx/mozapps/extensions/search.png
+++ b/toolkit/themes/osx/mozapps/webextensions/search.png
diff --git a/toolkit/themes/osx/mozapps/extensions/themeGeneric-16.png b/toolkit/themes/osx/mozapps/webextensions/themeGeneric-16.png
index 190bb30d7..190bb30d7 100644
--- a/toolkit/themes/osx/mozapps/extensions/themeGeneric-16.png
+++ b/toolkit/themes/osx/mozapps/webextensions/themeGeneric-16.png
diff --git a/toolkit/themes/osx/mozapps/extensions/themeGeneric.png b/toolkit/themes/osx/mozapps/webextensions/themeGeneric.png
index be645f76d..be645f76d 100644
--- a/toolkit/themes/osx/mozapps/extensions/themeGeneric.png
+++ b/toolkit/themes/osx/mozapps/webextensions/themeGeneric.png
diff --git a/toolkit/themes/osx/mozapps/extensions/toolbarbutton-dropmarker.png b/toolkit/themes/osx/mozapps/webextensions/toolbarbutton-dropmarker.png
index e7674c62a..e7674c62a 100644
--- a/toolkit/themes/osx/mozapps/extensions/toolbarbutton-dropmarker.png
+++ b/toolkit/themes/osx/mozapps/webextensions/toolbarbutton-dropmarker.png
diff --git a/toolkit/themes/osx/mozapps/extensions/update.css b/toolkit/themes/osx/mozapps/webextensions/update.css
index a0a016868..a0a016868 100644
--- a/toolkit/themes/osx/mozapps/extensions/update.css
+++ b/toolkit/themes/osx/mozapps/webextensions/update.css
diff --git a/toolkit/themes/osx/mozapps/extensions/xpinstallConfirm.css b/toolkit/themes/osx/mozapps/webextensions/xpinstallConfirm.css
index 48af7c1a9..48af7c1a9 100644
--- a/toolkit/themes/osx/mozapps/extensions/xpinstallConfirm.css
+++ b/toolkit/themes/osx/mozapps/webextensions/xpinstallConfirm.css
diff --git a/toolkit/themes/shared/mozapps.inc.mn b/toolkit/themes/shared/mozapps.inc.mn
index bb43fd4d2..fadd203b0 100644
--- a/toolkit/themes/shared/mozapps.inc.mn
+++ b/toolkit/themes/shared/mozapps.inc.mn
@@ -7,13 +7,15 @@
 # be specified once. As a result, the source file paths are relative
 # to the location of the actual manifest.
 
-  skin/classic/mozapps/extensions/extensionGeneric.svg       (../../shared/extensions/extensionGeneric.svg)
-  skin/classic/mozapps/extensions/utilities.svg              (../../shared/extensions/utilities.svg)
-  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)
+#ifdef MOZ_WEBEXTENSIONS
+  skin/classic/mozapps/extensions/extensionGeneric.svg       (../../shared/webextensions/extensionGeneric.svg)
+  skin/classic/mozapps/extensions/utilities.svg              (../../shared/webextensions/utilities.svg)
+  skin/classic/mozapps/extensions/navigation.png             (../../shared/webextensions/navigation.png)
+  skin/classic/mozapps/extensions/alerticon-warning.svg      (../../shared/webextensions/alerticon-warning.svg)
+  skin/classic/mozapps/extensions/alerticon-error.svg        (../../shared/webextensions/alerticon-error.svg)
+  skin/classic/mozapps/extensions/alerticon-info-positive.svg (../../shared/webextensions/alerticon-info-positive.svg)
+  skin/classic/mozapps/extensions/alerticon-info-negative.svg (../../shared/webextensions/alerticon-info-negative.svg)
+#endif
   skin/classic/mozapps/formautofill/requestAutocomplete.css  (../../shared/formautofill/requestAutocomplete.css)
   skin/classic/mozapps/plugins/pluginProblem.css             (../../shared/plugins/pluginProblem.css)
   skin/classic/mozapps/aboutNetworking.css                   (../../shared/aboutNetworking.css)
diff --git a/toolkit/themes/shared/non-mac.jar.inc.mn b/toolkit/themes/shared/non-mac.jar.inc.mn
index 859f1ba4a..a783bbb3c 100644
--- a/toolkit/themes/shared/non-mac.jar.inc.mn
+++ b/toolkit/themes/shared/non-mac.jar.inc.mn
@@ -107,27 +107,32 @@
 
   skin/classic/mozapps/downloads/downloadButtons.png         (../../windows/mozapps/downloads/downloadButtons.png)
   skin/classic/mozapps/downloads/unknownContentType.css      (../../windows/mozapps/downloads/unknownContentType.css)
-  skin/classic/mozapps/extensions/about.css                  (../../windows/mozapps/extensions/about.css)
-  skin/classic/mozapps/extensions/blocklist.css              (../../windows/mozapps/extensions/blocklist.css)
-  skin/classic/mozapps/extensions/update.css                 (../../windows/mozapps/extensions/update.css)
-  skin/classic/mozapps/extensions/discover-logo.png          (../../windows/mozapps/extensions/discover-logo.png)
-  skin/classic/mozapps/extensions/experimentGeneric.png      (../../windows/mozapps/extensions/experimentGeneric.png)
-  skin/classic/mozapps/extensions/rating-won.png             (../../windows/mozapps/extensions/rating-won.png)
-  skin/classic/mozapps/extensions/rating-not-won.png         (../../windows/mozapps/extensions/rating-not-won.png)
-  skin/classic/mozapps/extensions/cancel.png                 (../../windows/mozapps/extensions/cancel.png)
-  skin/classic/mozapps/extensions/eula.css                   (../../windows/mozapps/extensions/eula.css)
+#ifdef MOZ_WEBEXTENSIONS
+  skin/classic/mozapps/extensions/about.css                  (../../windows/mozapps/webextensions/about.css)
+  skin/classic/mozapps/extensions/blocklist.css              (../../windows/mozapps/webextensions/blocklist.css)
+  skin/classic/mozapps/extensions/update.css                 (../../windows/mozapps/webextensions/update.css)
+  skin/classic/mozapps/extensions/discover-logo.png          (../../windows/mozapps/webextensions/discover-logo.png)
+  skin/classic/mozapps/extensions/experimentGeneric.png      (../../windows/mozapps/webextensions/experimentGeneric.png)
+  skin/classic/mozapps/extensions/rating-won.png             (../../windows/mozapps/webextensions/rating-won.png)
+  skin/classic/mozapps/extensions/rating-not-won.png         (../../windows/mozapps/webextensions/rating-not-won.png)
+  skin/classic/mozapps/extensions/cancel.png                 (../../windows/mozapps/webextensions/cancel.png)
+  skin/classic/mozapps/extensions/eula.css                   (../../windows/mozapps/webextensions/eula.css)
+#endif
   skin/classic/mozapps/handling/handling.css                 (../../windows/mozapps/handling/handling.css)
   skin/classic/mozapps/plugins/pluginBlocked-64.png          (../../windows/mozapps/plugins/pluginBlocked-64.png)
   skin/classic/mozapps/plugins/pluginHelp-16.png             (../../windows/mozapps/plugins/pluginHelp-16.png)
   skin/classic/mozapps/profile/profileSelection.css          (../../windows/mozapps/profile/profileSelection.css)
   skin/classic/mozapps/update/downloadButtons.png            (../../windows/mozapps/update/downloadButtons.png)
-* skin/classic/mozapps/xpinstall/xpinstallConfirm.css        (../../windows/mozapps/extensions/xpinstallConfirm.css)
+#ifdef MOZ_WEBEXTENSIONS
+* skin/classic/mozapps/xpinstall/xpinstallConfirm.css        (../../windows/mozapps/webextensions/xpinstallConfirm.css)
+#endif
 
 #ifdef MOZ_PHOENIX
 [browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar:
 #elif MOZ_SEPARATE_MANIFEST_FOR_THEME_OVERRIDES
 [extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar:
 #endif
+#ifdef MOZ_WEBEXTENSIONS
 % override chrome://global/skin/arrow/arrow-lft-hov.gif           chrome://global/skin/arrow/arrow-lft.gif
 % override chrome://global/skin/arrow/arrow-rit-hov.gif           chrome://global/skin/arrow/arrow-rit.gif
 % override chrome://mozapps/skin/extensions/category-dictionaries.png     chrome://mozapps/skin/extensions/dictionaryGeneric.png
@@ -138,4 +143,4 @@
 % 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
-
+#endif
diff --git a/toolkit/themes/shared/extensions/alerticon-error.svg b/toolkit/themes/shared/webextensions/alerticon-error.svg
index cb883e16e..cb883e16e 100644
--- a/toolkit/themes/shared/extensions/alerticon-error.svg
+++ b/toolkit/themes/shared/webextensions/alerticon-error.svg
diff --git a/toolkit/themes/shared/extensions/alerticon-info-negative.svg b/toolkit/themes/shared/webextensions/alerticon-info-negative.svg
index 733f8571a..733f8571a 100644
--- a/toolkit/themes/shared/extensions/alerticon-info-negative.svg
+++ b/toolkit/themes/shared/webextensions/alerticon-info-negative.svg
diff --git a/toolkit/themes/shared/extensions/alerticon-info-positive.svg b/toolkit/themes/shared/webextensions/alerticon-info-positive.svg
index 031190bce..031190bce 100644
--- a/toolkit/themes/shared/extensions/alerticon-info-positive.svg
+++ b/toolkit/themes/shared/webextensions/alerticon-info-positive.svg
diff --git a/toolkit/themes/shared/extensions/alerticon-warning.svg b/toolkit/themes/shared/webextensions/alerticon-warning.svg
index 2b403220e..2b403220e 100644
--- a/toolkit/themes/shared/extensions/alerticon-warning.svg
+++ b/toolkit/themes/shared/webextensions/alerticon-warning.svg
diff --git a/toolkit/themes/shared/extensions/extensionGeneric.svg b/toolkit/themes/shared/webextensions/extensionGeneric.svg
index 28c2f7ba3..28c2f7ba3 100644
--- a/toolkit/themes/shared/extensions/extensionGeneric.svg
+++ b/toolkit/themes/shared/webextensions/extensionGeneric.svg
diff --git a/toolkit/themes/shared/extensions/extensions.inc.css b/toolkit/themes/shared/webextensions/extensions.inc.css
index c4523bbe6..c4523bbe6 100644
--- a/toolkit/themes/shared/extensions/extensions.inc.css
+++ b/toolkit/themes/shared/webextensions/extensions.inc.css
diff --git a/toolkit/themes/shared/extensions/navigation.png b/toolkit/themes/shared/webextensions/navigation.png
index 67ff3d9a7..67ff3d9a7 100644
--- a/toolkit/themes/shared/extensions/navigation.png
+++ b/toolkit/themes/shared/webextensions/navigation.png
diff --git a/toolkit/themes/shared/extensions/newaddon.inc.css b/toolkit/themes/shared/webextensions/newaddon.inc.css
index 52352ccd2..52352ccd2 100644
--- a/toolkit/themes/shared/extensions/newaddon.inc.css
+++ b/toolkit/themes/shared/webextensions/newaddon.inc.css
diff --git a/toolkit/themes/shared/extensions/utilities.svg b/toolkit/themes/shared/webextensions/utilities.svg
index 8bf24458c..8bf24458c 100644
--- a/toolkit/themes/shared/extensions/utilities.svg
+++ b/toolkit/themes/shared/webextensions/utilities.svg
diff --git a/toolkit/themes/windows/mozapps/jar.mn b/toolkit/themes/windows/mozapps/jar.mn
index 901e93e4e..b5907d016 100644
--- a/toolkit/themes/windows/mozapps/jar.mn
+++ b/toolkit/themes/windows/mozapps/jar.mn
@@ -6,21 +6,23 @@ toolkit.jar:
 #include ../../shared/mozapps.inc.mn
   skin/classic/mozapps/downloads/downloadIcon.png            (downloads/downloadIcon.png)
   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-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/localeGeneric.png          (extensions/localeGeneric.png)
-  skin/classic/mozapps/extensions/heart.png                  (extensions/heart.png)
-* skin/classic/mozapps/extensions/newaddon.css               (extensions/newaddon.css)
+#ifdef MOZ_WEBEXTENSIONS
+* skin/classic/mozapps/extensions/extensions.css             (webextensions/extensions.css)
+  skin/classic/mozapps/extensions/category-search.png        (webextensions/category-search.png)
+  skin/classic/mozapps/extensions/category-discover.png      (webextensions/category-discover.png)
+  skin/classic/mozapps/extensions/category-plugins.png       (webextensions/category-plugins.png)
+  skin/classic/mozapps/extensions/category-service.png       (webextensions/category-service.png)
+  skin/classic/mozapps/extensions/category-recent.png        (webextensions/category-recent.png)
+  skin/classic/mozapps/extensions/category-available.png     (webextensions/category-available.png)
+  skin/classic/mozapps/extensions/extensionGeneric-16.png    (webextensions/extensionGeneric-16.png)
+  skin/classic/mozapps/extensions/themeGeneric.png           (webextensions/themeGeneric.png)
+  skin/classic/mozapps/extensions/themeGeneric-16.png        (webextensions/themeGeneric-16.png)
+  skin/classic/mozapps/extensions/dictionaryGeneric.png      (webextensions/dictionaryGeneric.png)
+  skin/classic/mozapps/extensions/dictionaryGeneric-16.png   (webextensions/dictionaryGeneric-16.png)
+  skin/classic/mozapps/extensions/localeGeneric.png          (webextensions/localeGeneric.png)
+  skin/classic/mozapps/extensions/heart.png                  (webextensions/heart.png)
+* skin/classic/mozapps/extensions/newaddon.css               (webextensions/newaddon.css)
+#endif
   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)
@@ -29,14 +31,16 @@ toolkit.jar:
   skin/classic/mozapps/viewsource/viewsource.css             (viewsource/viewsource.css)
   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-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)
+#ifdef MOZ_WEBEXTENSIONS
+  skin/classic/mozapps/extensions/category-discover-XP.png   (webextensions/category-discover-XP.png)
+  skin/classic/mozapps/extensions/category-plugins-XP.png    (webextensions/category-plugins-XP.png)
+  skin/classic/mozapps/extensions/category-recent-XP.png     (webextensions/category-recent-XP.png)
+  skin/classic/mozapps/extensions/category-available-XP.png  (webextensions/category-available-XP.png)
+  skin/classic/mozapps/extensions/extensionGeneric-16-XP.png (webextensions/extensionGeneric-16-XP.png)
+  skin/classic/mozapps/extensions/themeGeneric-XP.png        (webextensions/themeGeneric-XP.png)
+  skin/classic/mozapps/extensions/themeGeneric-16-XP.png     (webextensions/themeGeneric-16-XP.png)
+  skin/classic/mozapps/extensions/localeGeneric-XP.png       (webextensions/localeGeneric-XP.png)
+#endif
   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)
@@ -50,6 +54,7 @@ toolkit.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
+#ifdef MOZ_WEBEXTENSIONS
 % 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
@@ -58,6 +63,7 @@ toolkit.jar:
 % 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
+#endif
 % 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
diff --git a/toolkit/themes/windows/mozapps/extensions/about.css b/toolkit/themes/windows/mozapps/webextensions/about.css
index 19eaddca8..19eaddca8 100644
--- a/toolkit/themes/windows/mozapps/extensions/about.css
+++ b/toolkit/themes/windows/mozapps/webextensions/about.css
diff --git a/toolkit/themes/windows/mozapps/extensions/blocklist.css b/toolkit/themes/windows/mozapps/webextensions/blocklist.css
index 1cdbb35ac..1cdbb35ac 100644
--- a/toolkit/themes/windows/mozapps/extensions/blocklist.css
+++ b/toolkit/themes/windows/mozapps/webextensions/blocklist.css
diff --git a/toolkit/themes/windows/mozapps/extensions/cancel.png b/toolkit/themes/windows/mozapps/webextensions/cancel.png
index 0d98ab235..0d98ab235 100644
--- a/toolkit/themes/windows/mozapps/extensions/cancel.png
+++ b/toolkit/themes/windows/mozapps/webextensions/cancel.png
diff --git a/toolkit/themes/windows/mozapps/extensions/category-available-XP.png b/toolkit/themes/windows/mozapps/webextensions/category-available-XP.png
index d1b737ab0..d1b737ab0 100644
--- a/toolkit/themes/windows/mozapps/extensions/category-available-XP.png
+++ b/toolkit/themes/windows/mozapps/webextensions/category-available-XP.png
diff --git a/toolkit/themes/windows/mozapps/extensions/category-available.png b/toolkit/themes/windows/mozapps/webextensions/category-available.png
index 9341f2aa7..9341f2aa7 100644
--- a/toolkit/themes/windows/mozapps/extensions/category-available.png
+++ b/toolkit/themes/windows/mozapps/webextensions/category-available.png
diff --git a/toolkit/themes/windows/mozapps/extensions/category-discover-XP.png b/toolkit/themes/windows/mozapps/webextensions/category-discover-XP.png
index a6f5b49b3..a6f5b49b3 100644
--- a/toolkit/themes/windows/mozapps/extensions/category-discover-XP.png
+++ b/toolkit/themes/windows/mozapps/webextensions/category-discover-XP.png
diff --git a/toolkit/themes/windows/mozapps/extensions/category-discover.png b/toolkit/themes/windows/mozapps/webextensions/category-discover.png
index af954a613..af954a613 100644
--- a/toolkit/themes/windows/mozapps/extensions/category-discover.png
+++ b/toolkit/themes/windows/mozapps/webextensions/category-discover.png
diff --git a/toolkit/themes/windows/mozapps/extensions/category-plugins-XP.png b/toolkit/themes/windows/mozapps/webextensions/category-plugins-XP.png
index 5c4d8bf47..5c4d8bf47 100644
--- a/toolkit/themes/windows/mozapps/extensions/category-plugins-XP.png
+++ b/toolkit/themes/windows/mozapps/webextensions/category-plugins-XP.png
diff --git a/toolkit/themes/windows/mozapps/extensions/category-plugins.png b/toolkit/themes/windows/mozapps/webextensions/category-plugins.png
index 100a90307..100a90307 100644
--- a/toolkit/themes/windows/mozapps/extensions/category-plugins.png
+++ b/toolkit/themes/windows/mozapps/webextensions/category-plugins.png
diff --git a/toolkit/themes/windows/mozapps/extensions/category-recent-XP.png b/toolkit/themes/windows/mozapps/webextensions/category-recent-XP.png
index 7ecfc7d4c..7ecfc7d4c 100644
--- a/toolkit/themes/windows/mozapps/extensions/category-recent-XP.png
+++ b/toolkit/themes/windows/mozapps/webextensions/category-recent-XP.png
diff --git a/toolkit/themes/windows/mozapps/extensions/category-recent.png b/toolkit/themes/windows/mozapps/webextensions/category-recent.png
index d65158646..d65158646 100644
--- a/toolkit/themes/windows/mozapps/extensions/category-recent.png
+++ b/toolkit/themes/windows/mozapps/webextensions/category-recent.png
diff --git a/toolkit/themes/windows/mozapps/extensions/category-search.png b/toolkit/themes/windows/mozapps/webextensions/category-search.png
index 52e91a7ce..52e91a7ce 100644
--- a/toolkit/themes/windows/mozapps/extensions/category-search.png
+++ b/toolkit/themes/windows/mozapps/webextensions/category-search.png
diff --git a/toolkit/themes/windows/mozapps/extensions/category-service.png b/toolkit/themes/windows/mozapps/webextensions/category-service.png
index 997c8541c..997c8541c 100644
--- a/toolkit/themes/windows/mozapps/extensions/category-service.png
+++ b/toolkit/themes/windows/mozapps/webextensions/category-service.png
diff --git a/toolkit/themes/windows/mozapps/extensions/dictionaryGeneric-16.png b/toolkit/themes/windows/mozapps/webextensions/dictionaryGeneric-16.png
index 37e2a5e4c..37e2a5e4c 100644
--- a/toolkit/themes/windows/mozapps/extensions/dictionaryGeneric-16.png
+++ b/toolkit/themes/windows/mozapps/webextensions/dictionaryGeneric-16.png
diff --git a/toolkit/themes/windows/mozapps/extensions/dictionaryGeneric.png b/toolkit/themes/windows/mozapps/webextensions/dictionaryGeneric.png
index b26bb7100..b26bb7100 100644
--- a/toolkit/themes/windows/mozapps/extensions/dictionaryGeneric.png
+++ b/toolkit/themes/windows/mozapps/webextensions/dictionaryGeneric.png
diff --git a/toolkit/themes/windows/mozapps/extensions/discover-logo.png b/toolkit/themes/windows/mozapps/webextensions/discover-logo.png
index cd50735a8..cd50735a8 100644
--- a/toolkit/themes/windows/mozapps/extensions/discover-logo.png
+++ b/toolkit/themes/windows/mozapps/webextensions/discover-logo.png
diff --git a/toolkit/themes/windows/mozapps/extensions/eula.css b/toolkit/themes/windows/mozapps/webextensions/eula.css
index 05aeb3c1c..05aeb3c1c 100644
--- a/toolkit/themes/windows/mozapps/extensions/eula.css
+++ b/toolkit/themes/windows/mozapps/webextensions/eula.css
diff --git a/toolkit/themes/windows/mozapps/extensions/experimentGeneric.png b/toolkit/themes/windows/mozapps/webextensions/experimentGeneric.png
index a9d00545e..a9d00545e 100644
--- a/toolkit/themes/windows/mozapps/extensions/experimentGeneric.png
+++ b/toolkit/themes/windows/mozapps/webextensions/experimentGeneric.png
diff --git a/toolkit/themes/windows/mozapps/extensions/extensionGeneric-16-XP.png b/toolkit/themes/windows/mozapps/webextensions/extensionGeneric-16-XP.png
index 36e7689a3..36e7689a3 100644
--- a/toolkit/themes/windows/mozapps/extensions/extensionGeneric-16-XP.png
+++ b/toolkit/themes/windows/mozapps/webextensions/extensionGeneric-16-XP.png
diff --git a/toolkit/themes/windows/mozapps/extensions/extensionGeneric-16.png b/toolkit/themes/windows/mozapps/webextensions/extensionGeneric-16.png
index 2724b9e7c..2724b9e7c 100644
--- a/toolkit/themes/windows/mozapps/extensions/extensionGeneric-16.png
+++ b/toolkit/themes/windows/mozapps/webextensions/extensionGeneric-16.png
diff --git a/toolkit/themes/windows/mozapps/extensions/extensions.css b/toolkit/themes/windows/mozapps/webextensions/extensions.css
index 335a31bde..7c4aed05e 100644
--- a/toolkit/themes/windows/mozapps/extensions/extensions.css
+++ b/toolkit/themes/windows/mozapps/webextensions/extensions.css
@@ -2,7 +2,7 @@
  * 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/. */
 
-%include ../../../shared/extensions/extensions.inc.css
+%include ../../../shared/webextensions/extensions.inc.css
 
 #header-utils-btn {
   list-style-image: url("chrome://mozapps/skin/extensions/utilities.svg#utilities");
diff --git a/toolkit/themes/windows/mozapps/extensions/heart.png b/toolkit/themes/windows/mozapps/webextensions/heart.png
index 655f4c4be..655f4c4be 100644
--- a/toolkit/themes/windows/mozapps/extensions/heart.png
+++ b/toolkit/themes/windows/mozapps/webextensions/heart.png
diff --git a/toolkit/themes/windows/mozapps/extensions/localeGeneric-XP.png b/toolkit/themes/windows/mozapps/webextensions/localeGeneric-XP.png
index 4d9ac5ad8..4d9ac5ad8 100644
--- a/toolkit/themes/windows/mozapps/extensions/localeGeneric-XP.png
+++ b/toolkit/themes/windows/mozapps/webextensions/localeGeneric-XP.png
diff --git a/toolkit/themes/windows/mozapps/extensions/localeGeneric.png b/toolkit/themes/windows/mozapps/webextensions/localeGeneric.png
index 623ba3a6a..623ba3a6a 100644
--- a/toolkit/themes/windows/mozapps/extensions/localeGeneric.png
+++ b/toolkit/themes/windows/mozapps/webextensions/localeGeneric.png
diff --git a/toolkit/themes/osx/mozapps/extensions/newaddon.css b/toolkit/themes/windows/mozapps/webextensions/newaddon.css
index edfba0ef5..5856c08b5 100644
--- a/toolkit/themes/osx/mozapps/extensions/newaddon.css
+++ b/toolkit/themes/windows/mozapps/webextensions/newaddon.css
@@ -2,4 +2,4 @@
  * 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/. */
 
-%include ../../../shared/extensions/newaddon.inc.css
+%include ../../../shared/webextensions/newaddon.inc.css
diff --git a/toolkit/themes/windows/mozapps/extensions/rating-not-won.png b/toolkit/themes/windows/mozapps/webextensions/rating-not-won.png
index 2761f1925..2761f1925 100644
--- a/toolkit/themes/windows/mozapps/extensions/rating-not-won.png
+++ b/toolkit/themes/windows/mozapps/webextensions/rating-not-won.png
diff --git a/toolkit/themes/windows/mozapps/extensions/rating-won.png b/toolkit/themes/windows/mozapps/webextensions/rating-won.png
index 336dd8f6e..336dd8f6e 100644
--- a/toolkit/themes/windows/mozapps/extensions/rating-won.png
+++ b/toolkit/themes/windows/mozapps/webextensions/rating-won.png
diff --git a/toolkit/themes/windows/mozapps/extensions/themeGeneric-16-XP.png b/toolkit/themes/windows/mozapps/webextensions/themeGeneric-16-XP.png
index 16d77a4a2..16d77a4a2 100644
--- a/toolkit/themes/windows/mozapps/extensions/themeGeneric-16-XP.png
+++ b/toolkit/themes/windows/mozapps/webextensions/themeGeneric-16-XP.png
diff --git a/toolkit/themes/windows/mozapps/extensions/themeGeneric-16.png b/toolkit/themes/windows/mozapps/webextensions/themeGeneric-16.png
index ff13ce37f..ff13ce37f 100644
--- a/toolkit/themes/windows/mozapps/extensions/themeGeneric-16.png
+++ b/toolkit/themes/windows/mozapps/webextensions/themeGeneric-16.png
diff --git a/toolkit/themes/windows/mozapps/extensions/themeGeneric-XP.png b/toolkit/themes/windows/mozapps/webextensions/themeGeneric-XP.png
index be645f76d..be645f76d 100644
--- a/toolkit/themes/windows/mozapps/extensions/themeGeneric-XP.png
+++ b/toolkit/themes/windows/mozapps/webextensions/themeGeneric-XP.png
diff --git a/toolkit/themes/windows/mozapps/extensions/themeGeneric.png b/toolkit/themes/windows/mozapps/webextensions/themeGeneric.png
index 9cea549dd..9cea549dd 100644
--- a/toolkit/themes/windows/mozapps/extensions/themeGeneric.png
+++ b/toolkit/themes/windows/mozapps/webextensions/themeGeneric.png
diff --git a/toolkit/themes/windows/mozapps/extensions/update.css b/toolkit/themes/windows/mozapps/webextensions/update.css
index 0db179330..0db179330 100644
--- a/toolkit/themes/windows/mozapps/extensions/update.css
+++ b/toolkit/themes/windows/mozapps/webextensions/update.css
diff --git a/toolkit/themes/windows/mozapps/extensions/xpinstallConfirm.css b/toolkit/themes/windows/mozapps/webextensions/xpinstallConfirm.css
index 42db4cd4d..42db4cd4d 100644
--- a/toolkit/themes/windows/mozapps/extensions/xpinstallConfirm.css
+++ b/toolkit/themes/windows/mozapps/webextensions/xpinstallConfirm.css