Bug 1150006 - Get rid of "-aero" file name suffixes, part 2a: rename XP-specific PNGs to *-XP.png. r=gijs
authorDão Gottwald <dao@mozilla.com>
Thu, 02 Apr 2015 16:25:49 +0200
changeset 237333 c2dfc44c2b51c63d4ef04f50b809311dc3b8b50b
parent 237332 2fe22ffef154b0bf3c913d51c9757457b84908ee
child 237334 82bb0e158d53db454de38bf030cd2a28f42cd3fc
push id28532
push userkwierso@gmail.com
push dateFri, 03 Apr 2015 00:18:39 +0000
treeherdermozilla-central@6177eed6d23d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgijs
bugs1150006
milestone40.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 1150006 - Get rid of "-aero" file name suffixes, part 2a: rename XP-specific PNGs to *-XP.png. r=gijs
toolkit/themes/windows/global/console/console-toolbar-XP.png
toolkit/themes/windows/global/console/console-toolbar.png
toolkit/themes/windows/global/dirListing/folder-XP.png
toolkit/themes/windows/global/dirListing/folder.png
toolkit/themes/windows/global/dirListing/local-XP.png
toolkit/themes/windows/global/dirListing/local.png
toolkit/themes/windows/global/dirListing/remote-XP.png
toolkit/themes/windows/global/dirListing/remote.png
toolkit/themes/windows/global/dirListing/up-XP.png
toolkit/themes/windows/global/dirListing/up.png
toolkit/themes/windows/global/icons/Error-XP.png
toolkit/themes/windows/global/icons/Error.png
toolkit/themes/windows/global/icons/Landscape-XP.png
toolkit/themes/windows/global/icons/Landscape.png
toolkit/themes/windows/global/icons/Portrait-XP.png
toolkit/themes/windows/global/icons/Portrait.png
toolkit/themes/windows/global/icons/Print-preview-XP.png
toolkit/themes/windows/global/icons/Print-preview.png
toolkit/themes/windows/global/icons/Question-XP.png
toolkit/themes/windows/global/icons/Question.png
toolkit/themes/windows/global/icons/Search-close-XP.png
toolkit/themes/windows/global/icons/Search-close.png
toolkit/themes/windows/global/icons/Search-glass-XP.png
toolkit/themes/windows/global/icons/Search-glass.png
toolkit/themes/windows/global/icons/Warning-XP.png
toolkit/themes/windows/global/icons/Warning.png
toolkit/themes/windows/global/icons/autoscroll-XP.png
toolkit/themes/windows/global/icons/autoscroll.png
toolkit/themes/windows/global/icons/blacklist_favicon-XP.png
toolkit/themes/windows/global/icons/blacklist_favicon.png
toolkit/themes/windows/global/icons/blacklist_large-XP.png
toolkit/themes/windows/global/icons/blacklist_large.png
toolkit/themes/windows/global/icons/error-16-XP.png
toolkit/themes/windows/global/icons/error-16.png
toolkit/themes/windows/global/icons/error-24-XP.png
toolkit/themes/windows/global/icons/error-24.png
toolkit/themes/windows/global/icons/error-48-XP.png
toolkit/themes/windows/global/icons/error-48.png
toolkit/themes/windows/global/icons/error-64-XP.png
toolkit/themes/windows/global/icons/error-64.png
toolkit/themes/windows/global/icons/find-XP.png
toolkit/themes/windows/global/icons/find.png
toolkit/themes/windows/global/icons/folder-item-XP.png
toolkit/themes/windows/global/icons/folder-item.png
toolkit/themes/windows/global/icons/information-16-XP.png
toolkit/themes/windows/global/icons/information-16.png
toolkit/themes/windows/global/icons/information-24-XP.png
toolkit/themes/windows/global/icons/information-24.png
toolkit/themes/windows/global/icons/information-32-XP.png
toolkit/themes/windows/global/icons/information-32.png
toolkit/themes/windows/global/icons/information-48-XP.png
toolkit/themes/windows/global/icons/information-48.png
toolkit/themes/windows/global/icons/information-64-XP.png
toolkit/themes/windows/global/icons/information-64.png
toolkit/themes/windows/global/icons/question-16-XP.png
toolkit/themes/windows/global/icons/question-16.png
toolkit/themes/windows/global/icons/question-24-XP.png
toolkit/themes/windows/global/icons/question-24.png
toolkit/themes/windows/global/icons/question-48-XP.png
toolkit/themes/windows/global/icons/question-48.png
toolkit/themes/windows/global/icons/question-64-XP.png
toolkit/themes/windows/global/icons/question-64.png
toolkit/themes/windows/global/icons/sslWarning-XP.png
toolkit/themes/windows/global/icons/sslWarning.png
toolkit/themes/windows/global/icons/warning-16-XP.png
toolkit/themes/windows/global/icons/warning-16.png
toolkit/themes/windows/global/icons/warning-24-XP.png
toolkit/themes/windows/global/icons/warning-24.png
toolkit/themes/windows/global/icons/warning-64-XP.png
toolkit/themes/windows/global/icons/warning-64.png
toolkit/themes/windows/global/icons/warning-large-XP.png
toolkit/themes/windows/global/icons/warning-large.png
toolkit/themes/windows/global/icons/windowControls-XP.png
toolkit/themes/windows/global/icons/windowControls.png
toolkit/themes/windows/global/icons/wrap-XP.png
toolkit/themes/windows/global/icons/wrap.png
toolkit/themes/windows/global/jar.mn
toolkit/themes/windows/global/printpreview/arrow-left-XP.png
toolkit/themes/windows/global/printpreview/arrow-left-end-XP.png
toolkit/themes/windows/global/printpreview/arrow-left-end.png
toolkit/themes/windows/global/printpreview/arrow-left.png
toolkit/themes/windows/global/printpreview/arrow-right-XP.png
toolkit/themes/windows/global/printpreview/arrow-right-end-XP.png
toolkit/themes/windows/global/printpreview/arrow-right-end.png
toolkit/themes/windows/global/printpreview/arrow-right.png
toolkit/themes/windows/global/toolbar/spring-XP.png
toolkit/themes/windows/global/toolbar/spring.png
toolkit/themes/windows/global/tree.css
toolkit/themes/windows/global/tree/sort-asc-XP.png
toolkit/themes/windows/global/tree/sort-asc.png
toolkit/themes/windows/global/tree/sort-dsc-XP.png
toolkit/themes/windows/global/tree/sort-dsc.png
toolkit/themes/windows/global/tree/twisty-clsd-XP.png
toolkit/themes/windows/global/tree/twisty-clsd.png
toolkit/themes/windows/global/tree/twisty-open-XP.png
toolkit/themes/windows/global/tree/twisty-open.png
toolkit/themes/windows/mozapps/downloads/downloadButtons-XP.png
toolkit/themes/windows/mozapps/downloads/downloadButtons.png
toolkit/themes/windows/mozapps/downloads/downloadIcon-XP.png
toolkit/themes/windows/mozapps/downloads/downloadIcon.png
toolkit/themes/windows/mozapps/extensions/category-available-XP.png
toolkit/themes/windows/mozapps/extensions/category-available.png
toolkit/themes/windows/mozapps/extensions/category-dictionaries-XP.png
toolkit/themes/windows/mozapps/extensions/category-dictionaries.png
toolkit/themes/windows/mozapps/extensions/category-discover-XP.png
toolkit/themes/windows/mozapps/extensions/category-discover.png
toolkit/themes/windows/mozapps/extensions/category-experiments-XP.png
toolkit/themes/windows/mozapps/extensions/category-experiments.png
toolkit/themes/windows/mozapps/extensions/category-plugins-XP.png
toolkit/themes/windows/mozapps/extensions/category-plugins.png
toolkit/themes/windows/mozapps/extensions/category-recent-XP.png
toolkit/themes/windows/mozapps/extensions/category-recent.png
toolkit/themes/windows/mozapps/extensions/dictionaryGeneric-16-XP.png
toolkit/themes/windows/mozapps/extensions/dictionaryGeneric-16.png
toolkit/themes/windows/mozapps/extensions/dictionaryGeneric-XP.png
toolkit/themes/windows/mozapps/extensions/dictionaryGeneric.png
toolkit/themes/windows/mozapps/extensions/experimentGeneric-XP.png
toolkit/themes/windows/mozapps/extensions/experimentGeneric.png
toolkit/themes/windows/mozapps/extensions/extensionGeneric-16-XP.png
toolkit/themes/windows/mozapps/extensions/extensionGeneric-16.png
toolkit/themes/windows/mozapps/extensions/extensionGeneric-XP.png
toolkit/themes/windows/mozapps/extensions/extensionGeneric.png
toolkit/themes/windows/mozapps/extensions/localeGeneric-XP.png
toolkit/themes/windows/mozapps/extensions/localeGeneric.png
toolkit/themes/windows/mozapps/extensions/themeGeneric-16-XP.png
toolkit/themes/windows/mozapps/extensions/themeGeneric-16.png
toolkit/themes/windows/mozapps/extensions/themeGeneric-XP.png
toolkit/themes/windows/mozapps/extensions/themeGeneric.png
toolkit/themes/windows/mozapps/jar.mn
toolkit/themes/windows/mozapps/plugins/pluginBlocked-XP.png
toolkit/themes/windows/mozapps/plugins/pluginBlocked.png
toolkit/themes/windows/mozapps/plugins/pluginGeneric-16-XP.png
toolkit/themes/windows/mozapps/plugins/pluginGeneric-16.png
toolkit/themes/windows/mozapps/plugins/pluginGeneric-XP.png
toolkit/themes/windows/mozapps/plugins/pluginGeneric.png
toolkit/themes/windows/mozapps/profile/profileicon-XP.png
toolkit/themes/windows/mozapps/profile/profileicon.png
toolkit/themes/windows/mozapps/update/downloadButtons-XP.png
toolkit/themes/windows/mozapps/update/downloadButtons.png
rename from toolkit/themes/windows/global/console/console-toolbar.png
rename to toolkit/themes/windows/global/console/console-toolbar-XP.png
rename from toolkit/themes/windows/global/dirListing/folder.png
rename to toolkit/themes/windows/global/dirListing/folder-XP.png
rename from toolkit/themes/windows/global/dirListing/local.png
rename to toolkit/themes/windows/global/dirListing/local-XP.png
rename from toolkit/themes/windows/global/dirListing/remote.png
rename to toolkit/themes/windows/global/dirListing/remote-XP.png
rename from toolkit/themes/windows/global/dirListing/up.png
rename to toolkit/themes/windows/global/dirListing/up-XP.png
rename from toolkit/themes/windows/global/icons/Error.png
rename to toolkit/themes/windows/global/icons/Error-XP.png
rename from toolkit/themes/windows/global/icons/Landscape.png
rename to toolkit/themes/windows/global/icons/Landscape-XP.png
rename from toolkit/themes/windows/global/icons/Portrait.png
rename to toolkit/themes/windows/global/icons/Portrait-XP.png
rename from toolkit/themes/windows/global/icons/Print-preview.png
rename to toolkit/themes/windows/global/icons/Print-preview-XP.png
rename from toolkit/themes/windows/global/icons/Question.png
rename to toolkit/themes/windows/global/icons/Question-XP.png
rename from toolkit/themes/windows/global/icons/Search-close.png
rename to toolkit/themes/windows/global/icons/Search-close-XP.png
rename from toolkit/themes/windows/global/icons/Search-glass.png
rename to toolkit/themes/windows/global/icons/Search-glass-XP.png
rename from toolkit/themes/windows/global/icons/Warning.png
rename to toolkit/themes/windows/global/icons/Warning-XP.png
rename from toolkit/themes/windows/global/icons/autoscroll.png
rename to toolkit/themes/windows/global/icons/autoscroll-XP.png
rename from toolkit/themes/windows/global/icons/blacklist_favicon.png
rename to toolkit/themes/windows/global/icons/blacklist_favicon-XP.png
rename from toolkit/themes/windows/global/icons/blacklist_large.png
rename to toolkit/themes/windows/global/icons/blacklist_large-XP.png
rename from toolkit/themes/windows/global/icons/error-16.png
rename to toolkit/themes/windows/global/icons/error-16-XP.png
rename from toolkit/themes/windows/global/icons/error-24.png
rename to toolkit/themes/windows/global/icons/error-24-XP.png
rename from toolkit/themes/windows/global/icons/error-48.png
rename to toolkit/themes/windows/global/icons/error-48-XP.png
rename from toolkit/themes/windows/global/icons/error-64.png
rename to toolkit/themes/windows/global/icons/error-64-XP.png
rename from toolkit/themes/windows/global/icons/find.png
rename to toolkit/themes/windows/global/icons/find-XP.png
rename from toolkit/themes/windows/global/icons/folder-item.png
rename to toolkit/themes/windows/global/icons/folder-item-XP.png
rename from toolkit/themes/windows/global/icons/information-16.png
rename to toolkit/themes/windows/global/icons/information-16-XP.png
rename from toolkit/themes/windows/global/icons/information-24.png
rename to toolkit/themes/windows/global/icons/information-24-XP.png
rename from toolkit/themes/windows/global/icons/information-32.png
rename to toolkit/themes/windows/global/icons/information-32-XP.png
rename from toolkit/themes/windows/global/icons/information-48.png
rename to toolkit/themes/windows/global/icons/information-48-XP.png
rename from toolkit/themes/windows/global/icons/information-64.png
rename to toolkit/themes/windows/global/icons/information-64-XP.png
rename from toolkit/themes/windows/global/icons/question-16.png
rename to toolkit/themes/windows/global/icons/question-16-XP.png
rename from toolkit/themes/windows/global/icons/question-24.png
rename to toolkit/themes/windows/global/icons/question-24-XP.png
rename from toolkit/themes/windows/global/icons/question-48.png
rename to toolkit/themes/windows/global/icons/question-48-XP.png
rename from toolkit/themes/windows/global/icons/question-64.png
rename to toolkit/themes/windows/global/icons/question-64-XP.png
rename from toolkit/themes/windows/global/icons/sslWarning.png
rename to toolkit/themes/windows/global/icons/sslWarning-XP.png
rename from toolkit/themes/windows/global/icons/warning-16.png
rename to toolkit/themes/windows/global/icons/warning-16-XP.png
rename from toolkit/themes/windows/global/icons/warning-24.png
rename to toolkit/themes/windows/global/icons/warning-24-XP.png
rename from toolkit/themes/windows/global/icons/warning-64.png
rename to toolkit/themes/windows/global/icons/warning-64-XP.png
rename from toolkit/themes/windows/global/icons/warning-large.png
rename to toolkit/themes/windows/global/icons/warning-large-XP.png
rename from toolkit/themes/windows/global/icons/windowControls.png
rename to toolkit/themes/windows/global/icons/windowControls-XP.png
rename from toolkit/themes/windows/global/icons/wrap.png
rename to toolkit/themes/windows/global/icons/wrap-XP.png
--- a/toolkit/themes/windows/global/jar.mn
+++ b/toolkit/themes/windows/global/jar.mn
@@ -198,122 +198,116 @@ toolkit.jar:
         skin/classic/global/toolbar/chevron-inverted.png         (toolbar/chevron-inverted.png)
         skin/classic/global/toolbar/spring.png                   (toolbar/spring.png)
         skin/classic/global/tree/columnpicker.gif                (tree/columnpicker.gif)
         skin/classic/global/tree/sort-asc.png                    (tree/sort-asc.png)
         skin/classic/global/tree/sort-dsc.png                    (tree/sort-dsc.png)
         skin/classic/global/tree/sort-asc-classic.png            (tree/sort-asc-classic.png)
         skin/classic/global/tree/sort-dsc-classic.png            (tree/sort-dsc-classic.png)
         skin/classic/global/tree/twisty-clsd.png                 (tree/twisty-clsd.png)
+        skin/classic/global/tree/twisty-clsd-rtl.png             (tree/twisty-clsd-rtl.png)
+        skin/classic/global/tree/twisty-clsd-hover.png           (tree/twisty-clsd-hover.png)
+        skin/classic/global/tree/twisty-clsd-hover-rtl.png       (tree/twisty-clsd-hover-rtl.png)
         skin/classic/global/tree/twisty-open.png                 (tree/twisty-open.png)
+        skin/classic/global/tree/twisty-open-rtl.png             (tree/twisty-open-rtl.png)
+        skin/classic/global/tree/twisty-open-hover.png           (tree/twisty-open-hover.png)
+        skin/classic/global/tree/twisty-open-hover-rtl.png       (tree/twisty-open-hover-rtl.png)
 
 #ifdef XP_WIN
-        skin/classic/global/console/console-toolbar-aero.png             (console/console-toolbar-aero.png)
-        skin/classic/global/dirListing/folder-aero.png                   (dirListing/folder-aero.png)
-        skin/classic/global/dirListing/local-aero.png                    (dirListing/local-aero.png)
-        skin/classic/global/dirListing/remote-aero.png                   (dirListing/remote-aero.png)
-        skin/classic/global/dirListing/up-aero.png                       (dirListing/up-aero.png)
-        skin/classic/global/icons/autoscroll-aero.png                    (icons/autoscroll-aero.png)
-        skin/classic/global/icons/blacklist_favicon-aero.png             (icons/blacklist_favicon-aero.png)
-        skin/classic/global/icons/blacklist_large-aero.png               (icons/blacklist_large-aero.png)
-        skin/classic/global/icons/Error-aero.png                         (icons/Error-aero.png)
-        skin/classic/global/icons/error-16-aero.png                      (icons/error-16-aero.png)
-        skin/classic/global/icons/error-24-aero.png                      (icons/error-24-aero.png)
-        skin/classic/global/icons/error-48-aero.png                      (icons/error-48-aero.png)
-        skin/classic/global/icons/error-64-aero.png                      (icons/error-64-aero.png)
-        skin/classic/global/icons/find-aero.png                          (icons/find-aero.png)
-        skin/classic/global/icons/folder-item-aero.png                   (icons/folder-item-aero.png)
-        skin/classic/global/icons/information-16-aero.png                (icons/information-16-aero.png)
-        skin/classic/global/icons/information-24-aero.png                (icons/information-24-aero.png)
-        skin/classic/global/icons/information-32-aero.png                (icons/information-32-aero.png)
-        skin/classic/global/icons/information-48-aero.png                (icons/information-48-aero.png)
-        skin/classic/global/icons/information-64-aero.png                (icons/information-64-aero.png)
-        skin/classic/global/icons/Print-preview-aero.png                 (icons/Print-preview-aero.png)
-        skin/classic/global/icons/Portrait-aero.png                      (icons/Portrait-aero.png)
-        skin/classic/global/icons/Landscape-aero.png                     (icons/Landscape-aero.png)
-        skin/classic/global/icons/Question-aero.png                      (icons/Question-aero.png)
-        skin/classic/global/icons/question-16-aero.png                   (icons/question-16-aero.png)
-        skin/classic/global/icons/question-24-aero.png                   (icons/question-24-aero.png)
-        skin/classic/global/icons/question-48-aero.png                   (icons/question-48-aero.png)
-        skin/classic/global/icons/question-64-aero.png                   (icons/question-64-aero.png)
-        skin/classic/global/icons/Search-close-aero.png                  (icons/Search-close-aero.png)
-        skin/classic/global/icons/Search-glass-aero.png                  (icons/Search-glass-aero.png)
-        skin/classic/global/icons/sslWarning-aero.png                    (icons/sslWarning-aero.png)
-        skin/classic/global/icons/Warning-aero.png                       (icons/Warning-aero.png)
-        skin/classic/global/icons/warning-large-aero.png                 (icons/warning-large-aero.png)
-        skin/classic/global/icons/warning-16-aero.png                    (icons/warning-16-aero.png)
-        skin/classic/global/icons/warning-24-aero.png                    (icons/warning-24-aero.png)
-        skin/classic/global/icons/warning-64-aero.png                    (icons/warning-64-aero.png)
-        skin/classic/global/icons/windowControls-aero.png                (icons/windowControls-aero.png)
-        skin/classic/global/icons/wrap-aero.png                          (icons/wrap-aero.png)
-        skin/classic/global/printpreview/arrow-left-aero.png             (printpreview/arrow-left-aero.png)
-        skin/classic/global/printpreview/arrow-left-end-aero.png         (printpreview/arrow-left-end-aero.png)
-        skin/classic/global/printpreview/arrow-right-aero.png            (printpreview/arrow-right-aero.png)
-        skin/classic/global/printpreview/arrow-right-end-aero.png        (printpreview/arrow-right-end-aero.png)
-        skin/classic/global/toolbar/spring-aero.png                      (toolbar/spring-aero.png)
-        skin/classic/global/tree/sort-asc-aero.png                       (tree/sort-asc-aero.png)
-        skin/classic/global/tree/sort-dsc-aero.png                       (tree/sort-dsc-aero.png)
-        skin/classic/global/tree/twisty-clsd-aero.png                    (tree/twisty-clsd-aero.png)
-        skin/classic/global/tree/twisty-clsd-rtl-aero.png                (tree/twisty-clsd-rtl-aero.png)
-        skin/classic/global/tree/twisty-clsd-hover-aero.png              (tree/twisty-clsd-hover-aero.png)
-        skin/classic/global/tree/twisty-clsd-hover-rtl-aero.png          (tree/twisty-clsd-hover-rtl-aero.png)
-        skin/classic/global/tree/twisty-open-aero.png                    (tree/twisty-open-aero.png)
-        skin/classic/global/tree/twisty-open-rtl-aero.png                (tree/twisty-open-rtl-aero.png)
-        skin/classic/global/tree/twisty-open-hover-aero.png              (tree/twisty-open-hover-aero.png)
-        skin/classic/global/tree/twisty-open-hover-rtl-aero.png          (tree/twisty-open-hover-rtl-aero.png)
+        skin/classic/global/console/console-toolbar-XP.png             (console/console-toolbar-XP.png)
+        skin/classic/global/dirListing/folder-XP.png                   (dirListing/folder-XP.png)
+        skin/classic/global/dirListing/local-XP.png                    (dirListing/local-XP.png)
+        skin/classic/global/dirListing/remote-XP.png                   (dirListing/remote-XP.png)
+        skin/classic/global/dirListing/up-XP.png                       (dirListing/up-XP.png)
+        skin/classic/global/icons/autoscroll-XP.png                    (icons/autoscroll-XP.png)
+        skin/classic/global/icons/blacklist_favicon-XP.png             (icons/blacklist_favicon-XP.png)
+        skin/classic/global/icons/blacklist_large-XP.png               (icons/blacklist_large-XP.png)
+        skin/classic/global/icons/Error-XP.png                         (icons/Error-XP.png)
+        skin/classic/global/icons/error-16-XP.png                      (icons/error-16-XP.png)
+        skin/classic/global/icons/error-24-XP.png                      (icons/error-24-XP.png)
+        skin/classic/global/icons/error-48-XP.png                      (icons/error-48-XP.png)
+        skin/classic/global/icons/error-64-XP.png                      (icons/error-64-XP.png)
+        skin/classic/global/icons/find-XP.png                          (icons/find-XP.png)
+        skin/classic/global/icons/folder-item-XP.png                   (icons/folder-item-XP.png)
+        skin/classic/global/icons/information-16-XP.png                (icons/information-16-XP.png)
+        skin/classic/global/icons/information-24-XP.png                (icons/information-24-XP.png)
+        skin/classic/global/icons/information-32-XP.png                (icons/information-32-XP.png)
+        skin/classic/global/icons/information-48-XP.png                (icons/information-48-XP.png)
+        skin/classic/global/icons/information-64-XP.png                (icons/information-64-XP.png)
+        skin/classic/global/icons/Print-preview-XP.png                 (icons/Print-preview-XP.png)
+        skin/classic/global/icons/Portrait-XP.png                      (icons/Portrait-XP.png)
+        skin/classic/global/icons/Landscape-XP.png                     (icons/Landscape-XP.png)
+        skin/classic/global/icons/Question-XP.png                      (icons/Question-XP.png)
+        skin/classic/global/icons/question-16-XP.png                   (icons/question-16-XP.png)
+        skin/classic/global/icons/question-24-XP.png                   (icons/question-24-XP.png)
+        skin/classic/global/icons/question-48-XP.png                   (icons/question-48-XP.png)
+        skin/classic/global/icons/question-64-XP.png                   (icons/question-64-XP.png)
+        skin/classic/global/icons/Search-close-XP.png                  (icons/Search-close-XP.png)
+        skin/classic/global/icons/Search-glass-XP.png                  (icons/Search-glass-XP.png)
+        skin/classic/global/icons/sslWarning-XP.png                    (icons/sslWarning-XP.png)
+        skin/classic/global/icons/Warning-XP.png                       (icons/Warning-XP.png)
+        skin/classic/global/icons/warning-large-XP.png                 (icons/warning-large-XP.png)
+        skin/classic/global/icons/warning-16-XP.png                    (icons/warning-16-XP.png)
+        skin/classic/global/icons/warning-24-XP.png                    (icons/warning-24-XP.png)
+        skin/classic/global/icons/warning-64-XP.png                    (icons/warning-64-XP.png)
+        skin/classic/global/icons/windowControls-XP.png                (icons/windowControls-XP.png)
+        skin/classic/global/icons/wrap-XP.png                          (icons/wrap-XP.png)
+        skin/classic/global/printpreview/arrow-left-XP.png             (printpreview/arrow-left-XP.png)
+        skin/classic/global/printpreview/arrow-left-end-XP.png         (printpreview/arrow-left-end-XP.png)
+        skin/classic/global/printpreview/arrow-right-XP.png            (printpreview/arrow-right-XP.png)
+        skin/classic/global/printpreview/arrow-right-end-XP.png        (printpreview/arrow-right-end-XP.png)
+        skin/classic/global/toolbar/spring-XP.png                      (toolbar/spring-XP.png)
+        skin/classic/global/tree/sort-asc-XP.png                       (tree/sort-asc-XP.png)
+        skin/classic/global/tree/sort-dsc-XP.png                       (tree/sort-dsc-XP.png)
+        skin/classic/global/tree/twisty-clsd-XP.png                    (tree/twisty-clsd-XP.png)
+        skin/classic/global/tree/twisty-open-XP.png                    (tree/twisty-open-XP.png)
 
-% override chrome://global/skin/console/console-toolbar.png       chrome://global/skin/console/console-toolbar-aero.png      osversion>=6
-% override chrome://global/skin/dirListing/folder.png             chrome://global/skin/dirListing/folder-aero.png            osversion>=6
-% override chrome://global/skin/dirListing/local.png              chrome://global/skin/dirListing/local-aero.png             osversion>=6
-% override chrome://global/skin/dirListing/remote.png             chrome://global/skin/dirListing/remote-aero.png            osversion>=6
-% override chrome://global/skin/dirListing/up.png                 chrome://global/skin/dirListing/up-aero.png                osversion>=6
-% override chrome://global/skin/icons/autoscroll.png              chrome://global/skin/icons/autoscroll-aero.png             osversion>=6
-% override chrome://global/skin/icons/blacklist_favicon.png       chrome://global/skin/icons/blacklist_favicon-aero.png      osversion>=6
-% override chrome://global/skin/icons/blacklist_large.png         chrome://global/skin/icons/blacklist_large-aero.png        osversion>=6
-% override chrome://global/skin/icons/Error.png                   chrome://global/skin/icons/Error-aero.png                  osversion>=6
-% override chrome://global/skin/icons/error-16.png                chrome://global/skin/icons/error-16-aero.png               osversion>=6
-% override chrome://global/skin/icons/error-24.png                chrome://global/skin/icons/error-24-aero.png               osversion>=6
-% override chrome://global/skin/icons/error-48.png                chrome://global/skin/icons/error-48-aero.png               osversion>=6
-% override chrome://global/skin/icons/error-64.png                chrome://global/skin/icons/error-64-aero.png               osversion>=6
-% override chrome://global/skin/icons/find.png                    chrome://global/skin/icons/find-aero.png                   osversion>=6
-% override chrome://global/skin/icons/folder-item.png             chrome://global/skin/icons/folder-item-aero.png            osversion>=6
-% override chrome://global/skin/icons/information-16.png          chrome://global/skin/icons/information-16-aero.png         osversion>=6
-% override chrome://global/skin/icons/information-24.png          chrome://global/skin/icons/information-24-aero.png         osversion>=6
-% override chrome://global/skin/icons/information-32.png          chrome://global/skin/icons/information-32-aero.png         osversion>=6
-% override chrome://global/skin/icons/information-48.png          chrome://global/skin/icons/information-48-aero.png         osversion>=6
-% override chrome://global/skin/icons/information-64.png          chrome://global/skin/icons/information-64-aero.png         osversion>=6
-% override chrome://global/skin/icons/Print-preview.png           chrome://global/skin/icons/Print-preview-aero.png          osversion>=6
-% override chrome://global/skin/icons/Portrait.png                chrome://global/skin/icons/Portrait-aero.png               osversion>=6
-% override chrome://global/skin/icons/Landscape.png               chrome://global/skin/icons/Landscape-aero.png              osversion>=6
-% override chrome://global/skin/icons/Question.png                chrome://global/skin/icons/Question-aero.png               osversion>=6
-% override chrome://global/skin/icons/question-16.png             chrome://global/skin/icons/question-16-aero.png            osversion>=6
-% override chrome://global/skin/icons/question-24.png             chrome://global/skin/icons/question-24-aero.png            osversion>=6
-% override chrome://global/skin/icons/question-48.png             chrome://global/skin/icons/question-48-aero.png            osversion>=6
-% override chrome://global/skin/icons/question-64.png             chrome://global/skin/icons/question-64-aero.png            osversion>=6
-% override chrome://global/skin/icons/Search-close.png            chrome://global/skin/icons/Search-close-aero.png           osversion>=6
-% override chrome://global/skin/icons/Search-glass.png            chrome://global/skin/icons/Search-glass-aero.png           osversion>=6
-% override chrome://global/skin/icons/sslWarning.png              chrome://global/skin/icons/sslWarning-aero.png             osversion>=6
-% override chrome://global/skin/icons/Warning.png                 chrome://global/skin/icons/Warning-aero.png                osversion>=6
-% override chrome://global/skin/icons/warning-large.png           chrome://global/skin/icons/warning-large-aero.png          osversion>=6
-% override chrome://global/skin/icons/warning-16.png              chrome://global/skin/icons/warning-16-aero.png             osversion>=6
-% override chrome://global/skin/icons/warning-24.png              chrome://global/skin/icons/warning-24-aero.png             osversion>=6
-% override chrome://global/skin/icons/warning-64.png              chrome://global/skin/icons/warning-64-aero.png             osversion>=6
-% override chrome://global/skin/icons/windowControls.png          chrome://global/skin/icons/windowControls-aero.png         osversion>=6
-% override chrome://global/skin/icons/wrap.png                    chrome://global/skin/icons/wrap-aero.png                   osversion>=6
-% override chrome://global/skin/printpreview/arrow-left.png       chrome://global/skin/printpreview/arrow-left-aero.png      osversion>=6
-% override chrome://global/skin/printpreview/arrow-left-end.png   chrome://global/skin/printpreview/arrow-left-end-aero.png  osversion>=6
-% override chrome://global/skin/printpreview/arrow-right.png      chrome://global/skin/printpreview/arrow-right-aero.png     osversion>=6
-% override chrome://global/skin/printpreview/arrow-right-end.png  chrome://global/skin/printpreview/arrow-right-end-aero.png osversion>=6
-% override chrome://global/skin/toolbar/spring.png                chrome://global/skin/toolbar/spring-aero.png               osversion>=6
-% override chrome://global/skin/tree/sort-asc.png                 chrome://global/skin/tree/sort-asc-aero.png                osversion>=6
-% override chrome://global/skin/tree/sort-dsc.png                 chrome://global/skin/tree/sort-dsc-aero.png                osversion>=6
-% override chrome://global/skin/tree/twisty-clsd.png              chrome://global/skin/tree/twisty-clsd-aero.png             osversion>=6
-% override chrome://global/skin/tree/twisty-clsd-rtl.png          chrome://global/skin/tree/twisty-clsd-rtl-aero.png         osversion>=6
-% override chrome://global/skin/tree/twisty-clsd-hover.png        chrome://global/skin/tree/twisty-clsd-hover-aero.png       osversion>=6
-% override chrome://global/skin/tree/twisty-clsd-hover-rtl.png    chrome://global/skin/tree/twisty-clsd-hover-rtl-aero.png   osversion>=6
-% override chrome://global/skin/tree/twisty-open.png              chrome://global/skin/tree/twisty-open-aero.png             osversion>=6
-% override chrome://global/skin/tree/twisty-open-rtl.png          chrome://global/skin/tree/twisty-open-rtl-aero.png         osversion>=6
-% override chrome://global/skin/tree/twisty-open-hover.png        chrome://global/skin/tree/twisty-open-hover-aero.png       osversion>=6
-% override chrome://global/skin/tree/twisty-open-hover-rtl.png    chrome://global/skin/tree/twisty-open-hover-rtl-aero.png   osversion>=6
+% override chrome://global/skin/console/console-toolbar.png       chrome://global/skin/console/console-toolbar-XP.png      osversion<6
+% override chrome://global/skin/dirListing/folder.png             chrome://global/skin/dirListing/folder-XP.png            osversion<6
+% override chrome://global/skin/dirListing/local.png              chrome://global/skin/dirListing/local-XP.png             osversion<6
+% override chrome://global/skin/dirListing/remote.png             chrome://global/skin/dirListing/remote-XP.png            osversion<6
+% override chrome://global/skin/dirListing/up.png                 chrome://global/skin/dirListing/up-XP.png                osversion<6
+% override chrome://global/skin/icons/autoscroll.png              chrome://global/skin/icons/autoscroll-XP.png             osversion<6
+% override chrome://global/skin/icons/blacklist_favicon.png       chrome://global/skin/icons/blacklist_favicon-XP.png      osversion<6
+% override chrome://global/skin/icons/blacklist_large.png         chrome://global/skin/icons/blacklist_large-XP.png        osversion<6
+% override chrome://global/skin/icons/Error.png                   chrome://global/skin/icons/Error-XP.png                  osversion<6
+% override chrome://global/skin/icons/error-16.png                chrome://global/skin/icons/error-16-XP.png               osversion<6
+% override chrome://global/skin/icons/error-24.png                chrome://global/skin/icons/error-24-XP.png               osversion<6
+% override chrome://global/skin/icons/error-48.png                chrome://global/skin/icons/error-48-XP.png               osversion<6
+% override chrome://global/skin/icons/error-64.png                chrome://global/skin/icons/error-64-XP.png               osversion<6
+% override chrome://global/skin/icons/find.png                    chrome://global/skin/icons/find-XP.png                   osversion<6
+% override chrome://global/skin/icons/folder-item.png             chrome://global/skin/icons/folder-item-XP.png            osversion<6
+% override chrome://global/skin/icons/information-16.png          chrome://global/skin/icons/information-16-XP.png         osversion<6
+% override chrome://global/skin/icons/information-24.png          chrome://global/skin/icons/information-24-XP.png         osversion<6
+% override chrome://global/skin/icons/information-32.png          chrome://global/skin/icons/information-32-XP.png         osversion<6
+% override chrome://global/skin/icons/information-48.png          chrome://global/skin/icons/information-48-XP.png         osversion<6
+% override chrome://global/skin/icons/information-64.png          chrome://global/skin/icons/information-64-XP.png         osversion<6
+% override chrome://global/skin/icons/Print-preview.png           chrome://global/skin/icons/Print-preview-XP.png          osversion<6
+% override chrome://global/skin/icons/Portrait.png                chrome://global/skin/icons/Portrait-XP.png               osversion<6
+% override chrome://global/skin/icons/Landscape.png               chrome://global/skin/icons/Landscape-XP.png              osversion<6
+% override chrome://global/skin/icons/Question.png                chrome://global/skin/icons/Question-XP.png               osversion<6
+% override chrome://global/skin/icons/question-16.png             chrome://global/skin/icons/question-16-XP.png            osversion<6
+% override chrome://global/skin/icons/question-24.png             chrome://global/skin/icons/question-24-XP.png            osversion<6
+% override chrome://global/skin/icons/question-48.png             chrome://global/skin/icons/question-48-XP.png            osversion<6
+% override chrome://global/skin/icons/question-64.png             chrome://global/skin/icons/question-64-XP.png            osversion<6
+% override chrome://global/skin/icons/Search-close.png            chrome://global/skin/icons/Search-close-XP.png           osversion<6
+% override chrome://global/skin/icons/Search-glass.png            chrome://global/skin/icons/Search-glass-XP.png           osversion<6
+% override chrome://global/skin/icons/sslWarning.png              chrome://global/skin/icons/sslWarning-XP.png             osversion<6
+% override chrome://global/skin/icons/Warning.png                 chrome://global/skin/icons/Warning-XP.png                osversion<6
+% override chrome://global/skin/icons/warning-large.png           chrome://global/skin/icons/warning-large-XP.png          osversion<6
+% override chrome://global/skin/icons/warning-16.png              chrome://global/skin/icons/warning-16-XP.png             osversion<6
+% override chrome://global/skin/icons/warning-24.png              chrome://global/skin/icons/warning-24-XP.png             osversion<6
+% override chrome://global/skin/icons/warning-64.png              chrome://global/skin/icons/warning-64-XP.png             osversion<6
+% override chrome://global/skin/icons/windowControls.png          chrome://global/skin/icons/windowControls-XP.png         osversion<6
+% override chrome://global/skin/icons/wrap.png                    chrome://global/skin/icons/wrap-XP.png                   osversion<6
+% override chrome://global/skin/printpreview/arrow-left.png       chrome://global/skin/printpreview/arrow-left-XP.png      osversion<6
+% override chrome://global/skin/printpreview/arrow-left-end.png   chrome://global/skin/printpreview/arrow-left-end-XP.png  osversion<6
+% override chrome://global/skin/printpreview/arrow-right.png      chrome://global/skin/printpreview/arrow-right-XP.png     osversion<6
+% override chrome://global/skin/printpreview/arrow-right-end.png  chrome://global/skin/printpreview/arrow-right-end-XP.png osversion<6
+% override chrome://global/skin/toolbar/spring.png                chrome://global/skin/toolbar/spring-XP.png               osversion<6
+% override chrome://global/skin/tree/sort-asc.png                 chrome://global/skin/tree/sort-asc-XP.png                osversion<6
+% override chrome://global/skin/tree/sort-dsc.png                 chrome://global/skin/tree/sort-dsc-XP.png                osversion<6
+% override chrome://global/skin/tree/twisty-clsd.png              chrome://global/skin/tree/twisty-clsd-XP.png             osversion<6
+% override chrome://global/skin/tree/twisty-open.png              chrome://global/skin/tree/twisty-open-XP.png             osversion<6
 #endif
 
 % 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
rename from toolkit/themes/windows/global/printpreview/arrow-left.png
rename to toolkit/themes/windows/global/printpreview/arrow-left-XP.png
rename from toolkit/themes/windows/global/printpreview/arrow-left-end.png
rename to toolkit/themes/windows/global/printpreview/arrow-left-end-XP.png
rename from toolkit/themes/windows/global/printpreview/arrow-right.png
rename to toolkit/themes/windows/global/printpreview/arrow-right-XP.png
rename from toolkit/themes/windows/global/printpreview/arrow-right-end.png
rename to toolkit/themes/windows/global/printpreview/arrow-right-end-XP.png
rename from toolkit/themes/windows/global/toolbar/spring.png
rename to toolkit/themes/windows/global/toolbar/spring-XP.png
--- a/toolkit/themes/windows/global/tree.css
+++ b/toolkit/themes/windows/global/tree.css
@@ -389,25 +389,16 @@ treechildren::-moz-tree-cell-text(select
     width: 12px;
   }
 
   treechildren::-moz-tree-twisty {
     -moz-padding-end: 1px;
     width: 9px;
   }
 
-  /*
-    Please note that the following RTL icons are only available in Aero themes:
-     * chrome://global/skin/tree/twisty-clsd-hover.png
-     * chrome://global/skin/tree/twisty-open-hover.png
-     * chrome://global/skin/tree/twisty-clsd-rtl.png
-     * chrome://global/skin/tree/twisty-open-rtl.png
-     * chrome://global/skin/tree/twisty-clsd-hover-rtl.png
-     * chrome://global/skin/tree/twisty-open-hover-rtl.png
-  */
   treechildren::-moz-tree-twisty(hover) {
     list-style-image: url("chrome://global/skin/tree/twisty-clsd-hover.png");
   }
 
   treechildren::-moz-tree-twisty(hover, open) {
     list-style-image: url("chrome://global/skin/tree/twisty-open-hover.png");
   }
 
rename from toolkit/themes/windows/global/tree/sort-asc.png
rename to toolkit/themes/windows/global/tree/sort-asc-XP.png
rename from toolkit/themes/windows/global/tree/sort-dsc.png
rename to toolkit/themes/windows/global/tree/sort-dsc-XP.png
rename from toolkit/themes/windows/global/tree/twisty-clsd.png
rename to toolkit/themes/windows/global/tree/twisty-clsd-XP.png
rename from toolkit/themes/windows/global/tree/twisty-open.png
rename to toolkit/themes/windows/global/tree/twisty-open-XP.png
rename from toolkit/themes/windows/mozapps/downloads/downloadButtons.png
rename to toolkit/themes/windows/mozapps/downloads/downloadButtons-XP.png
rename from toolkit/themes/windows/mozapps/downloads/downloadIcon.png
rename to toolkit/themes/windows/mozapps/downloads/downloadIcon-XP.png
rename from toolkit/themes/windows/mozapps/extensions/category-available.png
rename to toolkit/themes/windows/mozapps/extensions/category-available-XP.png
rename from toolkit/themes/windows/mozapps/extensions/category-dictionaries.png
rename to toolkit/themes/windows/mozapps/extensions/category-dictionaries-XP.png
rename from toolkit/themes/windows/mozapps/extensions/category-discover.png
rename to toolkit/themes/windows/mozapps/extensions/category-discover-XP.png
rename from toolkit/themes/windows/mozapps/extensions/experimentGeneric.png
rename to toolkit/themes/windows/mozapps/extensions/category-experiments-XP.png
deleted file mode 100644
index a9d00545ef31fbb7dfb4295be97cfc800f5289ea..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
rename from toolkit/themes/windows/mozapps/extensions/category-plugins.png
rename to toolkit/themes/windows/mozapps/extensions/category-plugins-XP.png
rename from toolkit/themes/windows/mozapps/extensions/category-recent.png
rename to toolkit/themes/windows/mozapps/extensions/category-recent-XP.png
rename from toolkit/themes/windows/mozapps/extensions/dictionaryGeneric-16.png
rename to toolkit/themes/windows/mozapps/extensions/dictionaryGeneric-16-XP.png
copy from toolkit/themes/windows/mozapps/extensions/category-dictionaries.png
copy to toolkit/themes/windows/mozapps/extensions/dictionaryGeneric-XP.png
deleted file mode 100644
index b26bb7100c8c3935ca0bec4218648a1085f43651..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
copy from toolkit/themes/windows/mozapps/extensions/experimentGeneric.png
copy to toolkit/themes/windows/mozapps/extensions/experimentGeneric-XP.png
rename from toolkit/themes/windows/mozapps/extensions/extensionGeneric-16.png
rename to toolkit/themes/windows/mozapps/extensions/extensionGeneric-16-XP.png
rename from toolkit/themes/windows/mozapps/extensions/extensionGeneric.png
rename to toolkit/themes/windows/mozapps/extensions/extensionGeneric-XP.png
rename from toolkit/themes/windows/mozapps/extensions/localeGeneric.png
rename to toolkit/themes/windows/mozapps/extensions/localeGeneric-XP.png
rename from toolkit/themes/windows/mozapps/extensions/themeGeneric-16.png
rename to toolkit/themes/windows/mozapps/extensions/themeGeneric-16-XP.png
rename from toolkit/themes/windows/mozapps/extensions/themeGeneric.png
rename to toolkit/themes/windows/mozapps/extensions/themeGeneric-XP.png
--- a/toolkit/themes/windows/mozapps/jar.mn
+++ b/toolkit/themes/windows/mozapps/jar.mn
@@ -72,59 +72,59 @@ toolkit.jar:
         skin/classic/mozapps/plugins/pluginHelp-16.png             (plugins/pluginHelp-16.png)
         skin/classic/mozapps/profile/profileicon.png               (profile/profileicon.png)
         skin/classic/mozapps/profile/profileSelection.css          (profile/profileSelection.css)
         skin/classic/mozapps/update/downloadButtons.png            (update/downloadButtons.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 XP_WIN
-        skin/classic/mozapps/downloads/downloadButtons-aero.png    (downloads/downloadButtons-aero.png)
-        skin/classic/mozapps/downloads/downloadIcon-aero.png       (downloads/downloadIcon-aero.png)
-        skin/classic/mozapps/extensions/category-discover-aero.png (extensions/category-discover-aero.png)
-        skin/classic/mozapps/extensions/category-plugins-aero.png  (extensions/category-plugins-aero.png)
-        skin/classic/mozapps/extensions/category-dictionaries-aero.png (extensions/category-dictionaries-aero.png)
-        skin/classic/mozapps/extensions/category-experiments-aero.png (extensions/category-experiments-aero.png)
-        skin/classic/mozapps/extensions/category-recent-aero.png   (extensions/category-recent-aero.png)
-        skin/classic/mozapps/extensions/category-available-aero.png (extensions/category-available-aero.png)
-        skin/classic/mozapps/extensions/extensionGeneric-aero.png  (extensions/extensionGeneric-aero.png)
-        skin/classic/mozapps/extensions/extensionGeneric-16-aero.png (extensions/extensionGeneric-16-aero.png)
-        skin/classic/mozapps/extensions/themeGeneric-aero.png      (extensions/themeGeneric-aero.png)
-        skin/classic/mozapps/extensions/themeGeneric-16-aero.png   (extensions/themeGeneric-16-aero.png)
-        skin/classic/mozapps/extensions/dictionaryGeneric-aero.png (extensions/dictionaryGeneric-aero.png)
-        skin/classic/mozapps/extensions/dictionaryGeneric-16-aero.png (extensions/dictionaryGeneric-16-aero.png)
-        skin/classic/mozapps/extensions/localeGeneric-aero.png     (extensions/localeGeneric-aero.png)
-        skin/classic/mozapps/extensions/experimentGeneric-aero.png (extensions/experimentGeneric-aero.png)
-        skin/classic/mozapps/plugins/pluginGeneric-aero.png        (plugins/pluginGeneric-aero.png)
-        skin/classic/mozapps/plugins/pluginBlocked-aero.png        (plugins/pluginBlocked-aero.png)
-        skin/classic/mozapps/plugins/pluginGeneric-16-aero.png     (plugins/pluginGeneric-16-aero.png)
-        skin/classic/mozapps/profile/profileicon-aero.png          (profile/profileicon-aero.png)
-        skin/classic/mozapps/update/downloadButtons-aero.png       (update/downloadButtons-aero.png)
+        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-dictionaries-XP.png (extensions/category-dictionaries-XP.png)
+        skin/classic/mozapps/extensions/category-experiments-XP.png (extensions/category-experiments-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/dictionaryGeneric-XP.png   (extensions/dictionaryGeneric-XP.png)
+        skin/classic/mozapps/extensions/dictionaryGeneric-16-XP.png (extensions/dictionaryGeneric-16-XP.png)
+        skin/classic/mozapps/extensions/localeGeneric-XP.png       (extensions/localeGeneric-XP.png)
+        skin/classic/mozapps/extensions/experimentGeneric-XP.png   (extensions/experimentGeneric-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)
+        skin/classic/mozapps/update/downloadButtons-XP.png         (update/downloadButtons-XP.png)
 
-% override chrome://mozapps/skin/downloads/downloadButtons.png            chrome://mozapps/skin/downloads/downloadButtons-aero.png        osversion>=6
-% override chrome://mozapps/skin/downloads/downloadIcon.png               chrome://mozapps/skin/downloads/downloadIcon-aero.png           osversion>=6
-% override chrome://mozapps/skin/extensions/category-discover.png         chrome://mozapps/skin/extensions/category-discover-aero.png     osversion>=6
-% override chrome://mozapps/skin/extensions/category-plugins.png          chrome://mozapps/skin/extensions/category-plugins-aero.png      osversion>=6
-% override chrome://mozapps/skin/extensions/category-dictionaries.png     chrome://mozapps/skin/extensions/category-dictionaries-aero.png osversion>=6
-% override chrome://mozapps/skin/extensions/category-experiments.png      chrome://mozapps/skin/extensions/category-experiments-aero.png  osversion>=6
-% override chrome://mozapps/skin/extensions/category-recent.png           chrome://mozapps/skin/extensions/category-recent-aero.png       osversion>=6
-% override chrome://mozapps/skin/extensions/category-available.png        chrome://mozapps/skin/extensions/category-available-aero.png    osversion>=6
-% override chrome://mozapps/skin/extensions/extensionGeneric.png          chrome://mozapps/skin/extensions/extensionGeneric-aero.png      osversion>=6
-% override chrome://mozapps/skin/extensions/extensionGeneric-16.png       chrome://mozapps/skin/extensions/extensionGeneric-16-aero.png   osversion>=6
-% override chrome://mozapps/skin/extensions/themeGeneric.png              chrome://mozapps/skin/extensions/themeGeneric-aero.png          osversion>=6
-% override chrome://mozapps/skin/extensions/themeGeneric-16.png           chrome://mozapps/skin/extensions/themeGeneric-16-aero.png       osversion>=6
-% override chrome://mozapps/skin/extensions/dictionaryGeneric.png         chrome://mozapps/skin/extensions/dictionaryGeneric-aero.png     osversion>=6
-% override chrome://mozapps/skin/extensions/dictionaryGeneric-16.png      chrome://mozapps/skin/extensions/dictionaryGeneric-16-aero.png  osversion>=6
-% override chrome://mozapps/skin/extensions/localeGeneric.png             chrome://mozapps/skin/extensions/localeGeneric-aero.png         osversion>=6
-% override chrome://mozapps/skin/extensions/experimentGeneric.png         chrome://mozapps/skin/extensions/experimentGeneric-aero.png     osversion>=6
-% override chrome://mozapps/skin/plugins/pluginGeneric.png                chrome://mozapps/skin/plugins/pluginGeneric-aero.png            osversion>=6
-% override chrome://mozapps/skin/plugins/pluginBlocked.png                chrome://mozapps/skin/plugins/pluginBlocked-aero.png            osversion>=6
-% override chrome://mozapps/skin/plugins/pluginGeneric-16.png             chrome://mozapps/skin/plugins/pluginGeneric-16-aero.png         osversion>=6
-% override chrome://mozapps/skin/profile/profileicon.png                  chrome://mozapps/skin/profile/profileicon-aero.png              osversion>=6
-% override chrome://mozapps/skin/update/downloadButtons.png               chrome://mozapps/skin/update/downloadButtons-aero.png           osversion>=6
+% 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-dictionaries.png     chrome://mozapps/skin/extensions/category-dictionaries-XP.png osversion<6
+% override chrome://mozapps/skin/extensions/category-experiments.png      chrome://mozapps/skin/extensions/category-experiments-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/dictionaryGeneric.png         chrome://mozapps/skin/extensions/dictionaryGeneric-XP.png     osversion<6
+% override chrome://mozapps/skin/extensions/dictionaryGeneric-16.png      chrome://mozapps/skin/extensions/dictionaryGeneric-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/extensions/experimentGeneric.png         chrome://mozapps/skin/extensions/experimentGeneric-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
 
 % override chrome://mozapps/skin/extensions/category-extensions.png       chrome://mozapps/skin/extensions/extensionGeneric.png
 % 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
rename from toolkit/themes/windows/mozapps/plugins/pluginBlocked.png
rename to toolkit/themes/windows/mozapps/plugins/pluginBlocked-XP.png
rename from toolkit/themes/windows/mozapps/plugins/pluginGeneric-16.png
rename to toolkit/themes/windows/mozapps/plugins/pluginGeneric-16-XP.png
rename from toolkit/themes/windows/mozapps/plugins/pluginGeneric.png
rename to toolkit/themes/windows/mozapps/plugins/pluginGeneric-XP.png
rename from toolkit/themes/windows/mozapps/profile/profileicon.png
rename to toolkit/themes/windows/mozapps/profile/profileicon-XP.png
copy from toolkit/themes/windows/mozapps/downloads/downloadButtons.png
copy to toolkit/themes/windows/mozapps/update/downloadButtons-XP.png
deleted file mode 100644
index d36385ce535cc71aeb76224137340dac5fd529fb..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001