Remove Windows XP and Windows Vista theme components and resources.

45 files changed, 301 insertions, 440 deletions

diff --git a/toolkit/themes/windows/global/dirListing/folder-XP.png b/toolkit/themes/windows/global/dirListing/folder-XP.png
deleted file mode 100644
index 102de5196..000000000
--- a/toolkit/themes/windows/global/dirListing/folder-XP.png
+++ /dev/null
diff --git a/toolkit/themes/windows/global/dirListing/local-XP.png b/toolkit/themes/windows/global/dirListing/local-XP.png
deleted file mode 100644
index 99191f3a5..000000000
--- a/toolkit/themes/windows/global/dirListing/local-XP.png
+++ /dev/null
diff --git a/toolkit/themes/windows/global/dirListing/remote-XP.png b/toolkit/themes/windows/global/dirListing/remote-XP.png
deleted file mode 100644
index 4febb764b..000000000
--- a/toolkit/themes/windows/global/dirListing/remote-XP.png
+++ /dev/null
diff --git a/toolkit/themes/windows/global/dirListing/up-XP.png b/toolkit/themes/windows/global/dirListing/up-XP.png
deleted file mode 100644
index 851502d47..000000000
--- a/toolkit/themes/windows/global/dirListing/up-XP.png
+++ /dev/null
diff --git a/toolkit/themes/windows/global/global.css b/toolkit/themes/windows/global/global.css
index 20a190684..aaddef882 100644
--- a/toolkit/themes/windows/global/global.css
+++ b/toolkit/themes/windows/global/global.css
@@ -350,9 +350,7 @@ popupnotificationcontent {
   width: 20px;
 }
 
-@media (-moz-os-version: windows-xp),
-       (-moz-os-version: windows-vista),
-       (-moz-os-version: windows-win7) {
+@media (-moz-os-version: windows-win7) {
   .close-icon {
     -moz-image-region: rect(0, 16px, 16px, 0);
   }
@@ -386,9 +384,7 @@ popupnotificationcontent {
     -moz-image-region: rect(0, 120px, 40px, 80px);
   }
 
-  @media (-moz-os-version: windows-xp),
-         (-moz-os-version: windows-vista),
-         (-moz-os-version: windows-win7) {
+  @media (-moz-os-version: windows-win7) {
     .close-icon {
       -moz-image-region: rect(0, 32px, 32px, 0);
     }
diff --git a/toolkit/themes/windows/global/icons/Landscape-XP.png b/toolkit/themes/windows/global/icons/Landscape-XP.png
deleted file mode 100644
index cc43abdf3..000000000
--- a/toolkit/themes/windows/global/icons/Landscape-XP.png
+++ /dev/null
diff --git a/toolkit/themes/windows/global/icons/Portrait-XP.png b/toolkit/themes/windows/global/icons/Portrait-XP.png
deleted file mode 100644
index ce36e8413..000000000
--- a/toolkit/themes/windows/global/icons/Portrait-XP.png
+++ /dev/null
diff --git a/toolkit/themes/windows/global/icons/Print-preview-XP.png b/toolkit/themes/windows/global/icons/Print-preview-XP.png
deleted file mode 100644
index 6f4736737..000000000
--- a/toolkit/themes/windows/global/icons/Print-preview-XP.png
+++ /dev/null
diff --git a/toolkit/themes/windows/global/icons/Question-XP.png b/toolkit/themes/windows/global/icons/Question-XP.png
deleted file mode 100644
index c10004078..000000000
--- a/toolkit/themes/windows/global/icons/Question-XP.png
+++ /dev/null
diff --git a/toolkit/themes/windows/global/icons/Search-close-XP.png b/toolkit/themes/windows/global/icons/Search-close-XP.png
deleted file mode 100644
index 39d800e1a..000000000
--- a/toolkit/themes/windows/global/icons/Search-close-XP.png
+++ /dev/null
diff --git a/toolkit/themes/windows/global/icons/Search-glass-XP.png b/toolkit/themes/windows/global/icons/Search-glass-XP.png
deleted file mode 100644
index 9eb0e259f..000000000
--- a/toolkit/themes/windows/global/icons/Search-glass-XP.png
+++ /dev/null
diff --git a/toolkit/themes/windows/global/icons/Warning-XP.png b/toolkit/themes/windows/global/icons/Warning-XP.png
deleted file mode 100644
index c0ec9b519..000000000
--- a/toolkit/themes/windows/global/icons/Warning-XP.png
+++ /dev/null
diff --git a/toolkit/themes/windows/global/icons/autoscroll-XP.png b/toolkit/themes/windows/global/icons/autoscroll-XP.png
deleted file mode 100644
index 6aac3d98e..000000000
--- a/toolkit/themes/windows/global/icons/autoscroll-XP.png
+++ /dev/null
diff --git a/toolkit/themes/windows/global/icons/blacklist_favicon-XP.png b/toolkit/themes/windows/global/icons/blacklist_favicon-XP.png
deleted file mode 100644
index 74af56f57..000000000
--- a/toolkit/themes/windows/global/icons/blacklist_favicon-XP.png
+++ /dev/null
diff --git a/toolkit/themes/windows/global/icons/blacklist_large-XP.png b/toolkit/themes/windows/global/icons/blacklist_large-XP.png
deleted file mode 100644
index 96ff341c0..000000000
--- a/toolkit/themes/windows/global/icons/blacklist_large-XP.png
+++ /dev/null
diff --git a/toolkit/themes/windows/global/icons/close-inverted-XPVista7.png b/toolkit/themes/windows/global/icons/close-inverted-win7.png
index 68596a307..68596a307 100644
--- a/toolkit/themes/windows/global/icons/close-inverted-XPVista7.png
+++ b/toolkit/themes/windows/global/icons/close-inverted-win7.png
diff --git a/toolkit/themes/windows/global/icons/close-inverted-XPVista7@2x.png b/toolkit/themes/windows/global/icons/close-inverted-win7@2x.png
index eec52e6d1..eec52e6d1 100644
--- a/toolkit/themes/windows/global/icons/close-inverted-XPVista7@2x.png
+++ b/toolkit/themes/windows/global/icons/close-inverted-win7@2x.png
diff --git a/toolkit/themes/windows/global/icons/close-XPVista7.png b/toolkit/themes/windows/global/icons/close-win7.png
index ea6ada49e..ea6ada49e 100644
--- a/toolkit/themes/windows/global/icons/close-XPVista7.png
+++ b/toolkit/themes/windows/global/icons/close-win7.png
diff --git a/toolkit/themes/windows/global/icons/close-XPVista7@2x.png b/toolkit/themes/windows/global/icons/close-win7@2x.png
index c25a64a4b..c25a64a4b 100644
--- a/toolkit/themes/windows/global/icons/close-XPVista7@2x.png
+++ b/toolkit/themes/windows/global/icons/close-win7@2x.png
diff --git a/toolkit/themes/windows/global/icons/error-16-XP.png b/toolkit/themes/windows/global/icons/error-16-XP.png
deleted file mode 100644
index 936d2abeb..000000000
--- a/toolkit/themes/windows/global/icons/error-16-XP.png
+++ /dev/null
diff --git a/toolkit/themes/windows/global/icons/error-64-XP.png b/toolkit/themes/windows/global/icons/error-64-XP.png
deleted file mode 100644
index 75a00c490..000000000
--- a/toolkit/themes/windows/global/icons/error-64-XP.png
+++ /dev/null
diff --git a/toolkit/themes/windows/global/icons/folder-item-XP.png b/toolkit/themes/windows/global/icons/folder-item-XP.png
deleted file mode 100644
index 26cda98c9..000000000
--- a/toolkit/themes/windows/global/icons/folder-item-XP.png
+++ /dev/null
diff --git a/toolkit/themes/windows/global/icons/information-16-XP.png b/toolkit/themes/windows/global/icons/information-16-XP.png
deleted file mode 100644
index aa8ce6e88..000000000
--- a/toolkit/themes/windows/global/icons/information-16-XP.png
+++ /dev/null
diff --git a/toolkit/themes/windows/global/icons/information-24-XP.png b/toolkit/themes/windows/global/icons/information-24-XP.png
deleted file mode 100644
index 7fa782d58..000000000
--- a/toolkit/themes/windows/global/icons/information-24-XP.png
+++ /dev/null
diff --git a/toolkit/themes/windows/global/icons/information-32-XP.png b/toolkit/themes/windows/global/icons/information-32-XP.png
deleted file mode 100644
index 5120db685..000000000
--- a/toolkit/themes/windows/global/icons/information-32-XP.png
+++ /dev/null
diff --git a/toolkit/themes/windows/global/icons/question-16-XP.png b/toolkit/themes/windows/global/icons/question-16-XP.png
deleted file mode 100644
index 0c8eafda0..000000000
--- a/toolkit/themes/windows/global/icons/question-16-XP.png
+++ /dev/null
diff --git a/toolkit/themes/windows/global/icons/question-64-XP.png b/toolkit/themes/windows/global/icons/question-64-XP.png
deleted file mode 100644
index a1a51b8d8..000000000
--- a/toolkit/themes/windows/global/icons/question-64-XP.png
+++ /dev/null
diff --git a/toolkit/themes/windows/global/icons/sslWarning-XP.png b/toolkit/themes/windows/global/icons/sslWarning-XP.png
deleted file mode 100644
index 09946986f..000000000
--- a/toolkit/themes/windows/global/icons/sslWarning-XP.png
+++ /dev/null
diff --git a/toolkit/themes/windows/global/icons/warning-16-XP.png b/toolkit/themes/windows/global/icons/warning-16-XP.png
deleted file mode 100644
index a21574370..000000000
--- a/toolkit/themes/windows/global/icons/warning-16-XP.png
+++ /dev/null
diff --git a/toolkit/themes/windows/global/icons/warning-64-XP.png b/toolkit/themes/windows/global/icons/warning-64-XP.png
deleted file mode 100644
index 832f34886..000000000
--- a/toolkit/themes/windows/global/icons/warning-64-XP.png
+++ /dev/null
diff --git a/toolkit/themes/windows/global/icons/warning-large-XP.png b/toolkit/themes/windows/global/icons/warning-large-XP.png
deleted file mode 100644
index 0ec8e79f6..000000000
--- a/toolkit/themes/windows/global/icons/warning-large-XP.png
+++ /dev/null
diff --git a/toolkit/themes/windows/global/icons/windowControls-XP.png b/toolkit/themes/windows/global/icons/windowControls-XP.png
deleted file mode 100644
index d90efb05b..000000000
--- a/toolkit/themes/windows/global/icons/windowControls-XP.png
+++ /dev/null
diff --git a/toolkit/themes/windows/global/jar.mn b/toolkit/themes/windows/global/jar.mn
index 7f0771020..7f2f29942 100644
--- a/toolkit/themes/windows/global/jar.mn
+++ b/toolkit/themes/windows/global/jar.mn
@@ -44,102 +44,36 @@ toolkit.jar:
   skin/classic/global/icons/autocomplete-search.svg        (icons/autocomplete-search.svg)
   skin/classic/global/icons/blacklist_favicon.png          (icons/blacklist_favicon.png)
   skin/classic/global/icons/blacklist_large.png            (icons/blacklist_large.png)
-  skin/classic/global/icons/close-XPVista7.png             (icons/close-XPVista7.png)
-  skin/classic/global/icons/close-XPVista7@2x.png          (icons/close-XPVista7@2x.png)
-  skin/classic/global/icons/close-inverted-XPVista7.png    (icons/close-inverted-XPVista7.png)
-  skin/classic/global/icons/close-inverted-XPVista7@2x.png (icons/close-inverted-XPVista7@2x.png)
+  skin/classic/global/icons/close-win7.png                 (icons/close-win7.png)
+  skin/classic/global/icons/close-win7@2x.png              (icons/close-win7@2x.png)
+  skin/classic/global/icons/close-inverted-win7.png        (icons/close-inverted-win7.png)
+  skin/classic/global/icons/close-inverted-win7@2x.png     (icons/close-inverted-win7@2x.png)
   skin/classic/global/icons/resizer.png                    (icons/resizer.png)
   skin/classic/global/icons/sslWarning.png                 (icons/sslWarning.png)
 * skin/classic/global/in-content/common.css                (in-content/common.css)
 * skin/classic/global/in-content/info-pages.css            (in-content/info-pages.css)
   skin/classic/global/toolbar/spring.png                   (toolbar/spring.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.png                       (icons/autoscroll.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-64-XP.png                      (icons/error-64-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/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-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-64-XP.png                    (icons/warning-64-XP.png)
-  skin/classic/global/icons/windowControls-XP.png                (icons/windowControls-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.svg                            (tree/twisty.svg)
-  skin/classic/global/tree/twisty-XP.svg                         (tree/twisty-XP.svg)
-  skin/classic/global/tree/twisty-Vista78.svg                    (tree/twisty-Vista78.svg)
+  skin/classic/global/icons/autoscroll.png                 (icons/autoscroll.png)
+  skin/classic/global/tree/twisty.svg                      (tree/twisty.svg)
+  skin/classic/global/tree/twisty-preWin10.svg             (tree/twisty-preWin10.svg)
 
 #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
-% 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-64.png                chrome://global/skin/icons/error-64-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/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-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-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/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/icons/close.png                   chrome://global/skin/icons/close-XPVista7.png            osversion<=6.1
-% override chrome://global/skin/icons/close@2x.png                chrome://global/skin/icons/close-XPVista7@2x.png         osversion<=6.1
-% override chrome://global/skin/icons/close-inverted.png          chrome://global/skin/icons/close-inverted-XPVista7.png   osversion<=6.1
-% override chrome://global/skin/icons/close-inverted@2x.png       chrome://global/skin/icons/close-inverted-XPVista7@2x.png osversion<=6.1
+% override chrome://global/skin/icons/close.png                   chrome://global/skin/icons/close-win7.png            osversion<=6.1
+% override chrome://global/skin/icons/close@2x.png                chrome://global/skin/icons/close-win7@2x.png         osversion<=6.1
+% override chrome://global/skin/icons/close-inverted.png          chrome://global/skin/icons/close-inverted-win7.png   osversion<=6.1
+% override chrome://global/skin/icons/close-inverted@2x.png       chrome://global/skin/icons/close-inverted-win7@2x.png osversion<=6.1
 
-% override chrome://global/skin/tree/twisty.svg#clsd              chrome://global/skin/tree/twisty-Vista78.svg#clsd           osversion<=6.3
-% override chrome://global/skin/tree/twisty.svg#clsd-rtl          chrome://global/skin/tree/twisty-Vista78.svg#clsd-rtl       osversion<=6.3
-% override chrome://global/skin/tree/twisty.svg#clsd-hover        chrome://global/skin/tree/twisty-Vista78.svg#clsd-hover     osversion<=6.3
-% override chrome://global/skin/tree/twisty.svg#clsd-hover-rtl    chrome://global/skin/tree/twisty-Vista78.svg#clsd-hover-rtl osversion<=6.3
-% override chrome://global/skin/tree/twisty.svg#open              chrome://global/skin/tree/twisty-Vista78.svg#open           osversion<=6.3
-% override chrome://global/skin/tree/twisty.svg#open-rtl          chrome://global/skin/tree/twisty-Vista78.svg#open-rtl       osversion<=6.3
-% override chrome://global/skin/tree/twisty.svg#open-hover        chrome://global/skin/tree/twisty-Vista78.svg#open-hover     osversion<=6.3
-% override chrome://global/skin/tree/twisty.svg#open-hover-rtl    chrome://global/skin/tree/twisty-Vista78.svg#open-hover-rtl osversion<=6.3
-# to be sure osversion<6 has always higher precedence than osversion<=6.3 we override twisty-Vista78.svg instead of twisty.svg
-% override chrome://global/skin/tree/twisty-Vista78.svg#clsd      chrome://global/skin/tree/twisty-XP.svg#clsd                osversion<6
-% override chrome://global/skin/tree/twisty-Vista78.svg#open      chrome://global/skin/tree/twisty-XP.svg#open                osversion<6
+% override chrome://global/skin/tree/twisty.svg#clsd              chrome://global/skin/tree/twisty-preWin10.svg#clsd           osversion<=6.3
+% override chrome://global/skin/tree/twisty.svg#clsd-rtl          chrome://global/skin/tree/twisty-preWin10.svg#clsd-rtl       osversion<=6.3
+% override chrome://global/skin/tree/twisty.svg#clsd-hover        chrome://global/skin/tree/twisty-preWin10.svg#clsd-hover     osversion<=6.3
+% override chrome://global/skin/tree/twisty.svg#clsd-hover-rtl    chrome://global/skin/tree/twisty-preWin10.svg#clsd-hover-rtl osversion<=6.3
+% override chrome://global/skin/tree/twisty.svg#open              chrome://global/skin/tree/twisty-preWin10.svg#open           osversion<=6.3
+% override chrome://global/skin/tree/twisty.svg#open-rtl          chrome://global/skin/tree/twisty-preWin10.svg#open-rtl       osversion<=6.3
+% override chrome://global/skin/tree/twisty.svg#open-hover        chrome://global/skin/tree/twisty-preWin10.svg#open-hover     osversion<=6.3
+% override chrome://global/skin/tree/twisty.svg#open-hover-rtl    chrome://global/skin/tree/twisty-preWin10.svg#open-hover-rtl osversion<=6.3
diff --git a/toolkit/themes/windows/global/listbox.css b/toolkit/themes/windows/global/listbox.css
index fd60b1693..ddea3f8fa 100644
--- a/toolkit/themes/windows/global/listbox.css
+++ b/toolkit/themes/windows/global/listbox.css
@@ -144,70 +144,67 @@ listheader[sortable="true"]:hover:active {
 }
 
 @media (-moz-windows-default-theme) {
-  @media not all and (-moz-os-version: windows-xp) {
-    listitem {
-      --listitem-selectedColor: rgb(217,217,217);
-      --listitem-selectedBorder: var(--listitem-selectedColor);
-      --listitem-selectedBottomBorder: rgb(204,204,204);
-      --listitem-selectedBackground: var(--listitem-selectedColor);
-      --listitem-selectedImage: none;
-      --listitem-selectedCurrentBorder: rgb(123,195,255);
-      --listitem-selectedFocusColor: rgb(205,232,255);
-      --listitem-selectedFocusBorder: var(--listitem-selectedFocusColor);
-      --listitem-selectedFocusBottomBorder: rgb(165,214,255);
-      --listitem-selectedFocusBackground: var(--listitem-selectedFocusColor);
-      --listitem-selectedFocusImage: none;
-      --listitem-selectedFocusCurrentBorder: var(--listitem-selectedFocusColor);
-      --listitem-selectedFocusCurrentBottomBorder: var(--listitem-selectedFocusBottomBorder);
-      --listitem-selectedFocusCurrentBackground: var(--listitem-selectedFocusColor);
-
-      color: -moz-FieldText;
-      margin-inline-start: 1px;
-      margin-inline-end: 1px;
-      padding-top: 1px;
-      padding-bottom: 1px;
-      border-width: 1px;
-      background-repeat: no-repeat;
-      background-size: 100% 100%;
-    }
+  listitem {
+    --listitem-selectedColor: rgb(217,217,217);
+    --listitem-selectedBorder: var(--listitem-selectedColor);
+    --listitem-selectedBottomBorder: rgb(204,204,204);
+    --listitem-selectedBackground: var(--listitem-selectedColor);
+    --listitem-selectedImage: none;
+    --listitem-selectedCurrentBorder: rgb(123,195,255);
+    --listitem-selectedFocusColor: rgb(205,232,255);
+    --listitem-selectedFocusBorder: var(--listitem-selectedFocusColor);
+    --listitem-selectedFocusBottomBorder: rgb(165,214,255);
+    --listitem-selectedFocusBackground: var(--listitem-selectedFocusColor);
+    --listitem-selectedFocusImage: none;
+    --listitem-selectedFocusCurrentBorder: var(--listitem-selectedFocusColor);
+    --listitem-selectedFocusCurrentBottomBorder: var(--listitem-selectedFocusBottomBorder);
+    --listitem-selectedFocusCurrentBackground: var(--listitem-selectedFocusColor);
+
+    color: -moz-FieldText;
+    margin-inline-start: 1px;
+    margin-inline-end: 1px;
+    padding-top: 1px;
+    padding-bottom: 1px;
+    border-width: 1px;
+    background-repeat: no-repeat;
+    background-size: 100% 100%;
+  }
 
-    listitem[selected="true"] {
-      border-top-color: var(--listitem-selectedBorder);
-      border-right-color: var(--listitem-selectedBorder);
-      border-left-color: var(--listitem-selectedBorder);
-      border-bottom-color: var(--listitem-selectedBottomBorder);
-      background-image: var(--listitem-selectedImage);
-      background-color: var(--listitem-selectedBackground);
-      color: -moz-DialogText;
-    }
+  listitem[selected="true"] {
+    border-top-color: var(--listitem-selectedBorder);
+    border-right-color: var(--listitem-selectedBorder);
+    border-left-color: var(--listitem-selectedBorder);
+    border-bottom-color: var(--listitem-selectedBottomBorder);
+    background-image: var(--listitem-selectedImage);
+    background-color: var(--listitem-selectedBackground);
+    color: -moz-DialogText;
+  }
 
-    listbox:focus > listitem[selected="true"] {
-      border-top-color: var(--listitem-selectedFocusBorder);
-      border-right-color: var(--listitem-selectedFocusBorder);
-      border-left-color: var(--listitem-selectedFocusBorder);
-      border-bottom-color: var(--listitem-selectedFocusBottomBorder);
-      background-image: var(--listitem-selectedFocusImage);
-      background-color: var(--listitem-selectedFocusBackground);
-      color: -moz-DialogText;
-    }
+  listbox:focus > listitem[selected="true"] {
+    border-top-color: var(--listitem-selectedFocusBorder);
+    border-right-color: var(--listitem-selectedFocusBorder);
+    border-left-color: var(--listitem-selectedFocusBorder);
+    border-bottom-color: var(--listitem-selectedFocusBottomBorder);
+    background-image: var(--listitem-selectedFocusImage);
+    background-color: var(--listitem-selectedFocusBackground);
+    color: -moz-DialogText;
+  }
 
-    listbox:focus > listitem[current="true"] {
-      border-color: var(--listitem-selectedCurrentBorder);
-      outline: none;
-    }
+  listbox:focus > listitem[current="true"] {
+    border-color: var(--listitem-selectedCurrentBorder);
+    outline: none;
+  }
 
-    listbox:focus > listitem[selected="true"][current="true"] {
-      border-top-color: var(--listitem-selectedFocusCurrentBorder);
-      border-right-color: var(--listitem-selectedFocusCurrentBorder);
-      border-left-color: var(--listitem-selectedFocusCurrentBorder);
-      border-bottom-color: var(--listitem-selectedFocusCurrentBottomBorder);
-      background-color: var(--listitem-selectedFocusCurrentBackground);
-      outline: none;
-    }
+  listbox:focus > listitem[selected="true"][current="true"] {
+    border-top-color: var(--listitem-selectedFocusCurrentBorder);
+    border-right-color: var(--listitem-selectedFocusCurrentBorder);
+    border-left-color: var(--listitem-selectedFocusCurrentBorder);
+    border-bottom-color: var(--listitem-selectedFocusCurrentBottomBorder);
+    background-color: var(--listitem-selectedFocusCurrentBackground);
+    outline: none;
   }
 
-  @media (-moz-os-version: windows-vista),
-         (-moz-os-version: windows-win7) {
+  @media (-moz-os-version: windows-win7) {
     listitem {
       --listitem-selectedBottomBorder: var(--listitem-selectedColor);
       --listitem-selectedBackground: rgba(190,190,190,.15);
diff --git a/toolkit/themes/windows/global/menu.css b/toolkit/themes/windows/global/menu.css
index 2a228251d..c22aedd7a 100644
--- a/toolkit/themes/windows/global/menu.css
+++ b/toolkit/themes/windows/global/menu.css
@@ -148,15 +148,13 @@ menubar > menu:-moz-lwtheme[_moz-menuactive="true"]:not([disabled="true"]) {
 }
 
 @media (-moz-windows-default-theme) {
-  @media not all and (-moz-os-version: windows-xp) {
-    menubar > menu:-moz-lwtheme {
-      -moz-appearance: menuitem;
-    }
-
-    menubar > menu:-moz-lwtheme[_moz-menuactive="true"]:not([disabled="true"]) {
-      color: inherit !important;
-      text-shadow: inherit;
-    }
+  menubar > menu:-moz-lwtheme {
+    -moz-appearance: menuitem;
+  }
+
+  menubar > menu:-moz-lwtheme[_moz-menuactive="true"]:not([disabled="true"]) {
+    color: inherit !important;
+    text-shadow: inherit;
   }
 }
 
diff --git a/toolkit/themes/windows/global/menulist.css b/toolkit/themes/windows/global/menulist.css
index 9480bffda..de24dbdde 100644
--- a/toolkit/themes/windows/global/menulist.css
+++ b/toolkit/themes/windows/global/menulist.css
@@ -82,12 +82,6 @@ menulist:-moz-focusring:not([open="true"]) > .menulist-label-box {
   border: 1px dotted ThreeDDarkShadow;
 }
 
-@media (-moz-os-version: windows-xp) {
-  menulist:-moz-focusring:not([open="true"]) > .menulist-label-box {
-    border: 1px dotted #F5DB95;
-  }
-}
-
 /* ..... disabled state ..... */
 
 menulist[disabled="true"] {
@@ -113,31 +107,29 @@ html|*.menulist-editable-input {
 }
 
 @media (-moz-windows-default-theme) {
-  @media not all and (-moz-os-version: windows-xp) {
-    .menulist-label-box {
-      background-color: transparent !important;
-      color: inherit !important;
-    }
-
-    .menulist-label {
-      margin-top: -1px !important;
-      margin-bottom: -1px !important;
-      margin-inline-start: 0 !important;
-    }
-
-    .menulist-description {
-      margin-inline-start: 1ex !important;
-    }
-
-    menulist:not([editable="true"]) > .menulist-dropmarker {
-      margin-top: -2px;
-      margin-inline-start: 3px;
-      margin-inline-end: -3px;
-    }
-
-    .menulist-icon {
-      margin-top: -1px;
-      margin-bottom: -1px;
-    }
+  .menulist-label-box {
+    background-color: transparent !important;
+    color: inherit !important;
+  }
+
+  .menulist-label {
+    margin-top: -1px !important;
+    margin-bottom: -1px !important;
+    margin-inline-start: 0 !important;
+  }
+
+  .menulist-description {
+    margin-inline-start: 1ex !important;
+  }
+
+  menulist:not([editable="true"]) > .menulist-dropmarker {
+    margin-top: -2px;
+    margin-inline-start: 3px;
+    margin-inline-end: -3px;
+  }
+
+  .menulist-icon {
+    margin-top: -1px;
+    margin-bottom: -1px;
   }
 }
diff --git a/toolkit/themes/windows/global/popup.css b/toolkit/themes/windows/global/popup.css
index 010e85a93..e5c3c4500 100644
--- a/toolkit/themes/windows/global/popup.css
+++ b/toolkit/themes/windows/global/popup.css
@@ -58,9 +58,7 @@ panel[type="arrow"][side="right"] {
 }
 
 %ifdef XP_WIN
-@media (-moz-os-version: windows-xp),
-       (-moz-os-version: windows-vista),
-       (-moz-os-version: windows-win7) {
+@media (-moz-os-version: windows-win7) {
 %endif
 .panel-arrowcontent {
   border-radius: 4px;
diff --git a/toolkit/themes/windows/global/textbox.css b/toolkit/themes/windows/global/textbox.css
index 78ca7f320..7b136a0ea 100644
--- a/toolkit/themes/windows/global/textbox.css
+++ b/toolkit/themes/windows/global/textbox.css
@@ -37,10 +37,8 @@ html|*.textbox-textarea {
 }
 
 @media (-moz-windows-default-theme) {
-  @media not all and (-moz-os-version: windows-xp) {
-    textbox html|*.textbox-input::placeholder {
-      font-style: italic;
-    }
+  textbox html|*.textbox-input::placeholder {
+    font-style: italic;
   }
 }
 
diff --git a/toolkit/themes/windows/global/toolbar/spring-XP.png b/toolkit/themes/windows/global/toolbar/spring-XP.png
deleted file mode 100644
index e20f602c2..000000000
--- a/toolkit/themes/windows/global/toolbar/spring-XP.png
+++ /dev/null
diff --git a/toolkit/themes/windows/global/toolbarbutton.css b/toolkit/themes/windows/global/toolbarbutton.css
index e96e529cf..ac3c7ba4a 100644
--- a/toolkit/themes/windows/global/toolbarbutton.css
+++ b/toolkit/themes/windows/global/toolbarbutton.css
@@ -84,17 +84,11 @@ toolbarbutton[checked="true"]:not([disabled="true"]) {
     text-shadow: none;
   }
 
-  toolbarbutton:-moz-lwtheme:not(:hover):not([checked="true"]):not([open="true"]):not([disabled="true"]) {
+  toolbarbutton:-moz-lwtheme:not([disabled="true"]) {
     color: inherit;
     text-shadow: inherit;
   }
 
-  @media not all and (-moz-os-version: windows-xp) {
-    toolbarbutton:-moz-lwtheme:not([disabled="true"]) {
-      color: inherit;
-      text-shadow: inherit;
-    }
-  }
 }
 
 @media not all and (-moz-windows-default-theme) {
diff --git a/toolkit/themes/windows/global/tree.css b/toolkit/themes/windows/global/tree.css
index 130096824..2b4957c6c 100644
--- a/toolkit/themes/windows/global/tree.css
+++ b/toolkit/themes/windows/global/tree.css
@@ -310,7 +310,7 @@ treecol:not([hideheader="true"]) > .treecol-sortdirection[sortDirection="descend
 /* ::::: twisty :::::  */
 
 treechildren::-moz-tree-twisty {
-  padding-inline-end: 4px;
+  padding-inline-end: 1px;
   padding-top: 1px;
   width: 9px; /* The image's width is 9 pixels */
   list-style-image: url("chrome://global/skin/tree/twisty.svg#clsd");
@@ -320,8 +320,32 @@ treechildren::-moz-tree-twisty(open) {
   list-style-image: url("chrome://global/skin/tree/twisty.svg#open");
 }
 
+treechildren::-moz-tree-twisty(hover) {
+  list-style-image: url("chrome://global/skin/tree/twisty.svg#clsd-hover");
+}
+
+treechildren::-moz-tree-twisty(hover, open) {
+  list-style-image: url("chrome://global/skin/tree/twisty.svg#open-hover");
+}
+
+treechildren:-moz-locale-dir(rtl)::-moz-tree-twisty {
+  list-style-image: url("chrome://global/skin/tree/twisty.svg#clsd-rtl");
+}
+
+treechildren:-moz-locale-dir(rtl)::-moz-tree-twisty(open) {
+  list-style-image: url("chrome://global/skin/tree/twisty.svg#open-rtl");
+}
+
+treechildren:-moz-locale-dir(rtl)::-moz-tree-twisty(hover) {
+  list-style-image: url("chrome://global/skin/tree/twisty.svg#clsd-hover-rtl");
+}
+
+treechildren:-moz-locale-dir(rtl)::-moz-tree-twisty(hover, open) {
+  list-style-image: url("chrome://global/skin/tree/twisty.svg#open-hover-rtl");
+}
+
 treechildren::-moz-tree-indentation {
-  width: 18px;
+  width: 12px;
 }
 
 /* ::::: gridline style ::::: */
@@ -370,233 +394,196 @@ treechildren::-moz-tree-cell-text(active, selected, editing) {
 }
 
 %ifdef XP_WIN
-@media not all and (-moz-os-version: windows-xp) {
-  /* ::::: twisty :::::  */
-
-  treechildren::-moz-tree-indentation {
-    width: 12px;
+@media (-moz-windows-default-theme) {
+  treechildren {
+    --treechildren-outline: none;
+    --treechildren-2ndBorderColor: rgba(255,255,255,.4);
+    --treechildren-selectedColor: rgb(217,217,217);
+    --treechildren-focusColor: rgb(123,195,255);
+    --treechildren-selectedFocusColor: rgb(205,232,255);
+    --treechildren-currentColor: rgb(125,162,206);
+    --treechildren-hoverColor: rgb(229,243,255);
+    --treechildren-selectedBorder: var(--treechildren-selectedColor);
+    --treechildren-selectedBottomBorder: rgb(204,204,204);
+    --treechildren-selectedImage: linear-gradient(rgb(217,217,217), rgb(217,217,217));
+    --treechildren-selectedBackground: transparent;
+    --treechildren-currentFocusBorder: var(--treechildren-focusColor);
+    --treechildren-currentFocusBottomBorder: var(--treechildren-focusColor);
+    --treechildren-selectedFocusBorder: var(--treechildren-selectedFocusColor);
+    --treechildren-selectedFocusBottomBorder: rgb(165,214,255);
+    --treechildren-selectedFocusImage: none;
+    --treechildren-selectedFocusBackground: var(--treechildren-selectedFocusColor);
+    --treechildren-selectedFocusCurrentBorder: var(--treechildren-focusColor);
+    --treechildren-selectedFocusCurrentBottomBorder: var(--treechildren-focusColor);
+    --treechildren-selectedFocusCurrentImage: linear-gradient(rgb(205,232,255), rgb(205,232,255));
+    --treechildren-hoverBorder: var(--treechildren-hoverColor);
+    --treechildren-hoverBottomBorder: var(--treechildren-hoverColor);
+    --treechildren-hoverImage: linear-gradient(rgb(229,243,255), rgb(229,243,255));
+    --treechildren-hoverCurrentBorder: var(--treechildren-currentColor);
+    --treechildren-hoverCurrentBottomBorder: var(--treechildren-currentColor);
+    --treechildren-hoverCurrentImage: linear-gradient(rgba(131,183,249,.16), rgba(131,183,249,.16));
+    --treechildren-hoverSelectedBorder: var(--treechildren-focusColor);
+    --treechildren-hoverSelectedBottomBorder: var(--treechildren-focusColor);
+    --treechildren-hoverSelectedImage: linear-gradient(rgb(205,232,255), rgb(205,232,255));
   }
 
-  treechildren::-moz-tree-twisty {
-    padding-inline-end: 1px;
+  treechildren:not(.autocomplete-treebody)::-moz-tree-row {
+    height: 1.8em;
+    color: -moz-FieldText;
+    margin-inline-start: 1px;
+    margin-inline-end: 1px;
+    border-width: 1px;
+    border-color: transparent;
+    background-repeat: no-repeat;
+    background-size: 100% 100%;
   }
 
-  treechildren::-moz-tree-twisty(hover) {
-    list-style-image: url("chrome://global/skin/tree/twisty.svg#clsd-hover");
+  treechildren:not(.autocomplete-treebody)::-moz-tree-row(selected) {
+    -moz-border-top-colors: var(--treechildren-selectedBorder);
+    -moz-border-right-colors: var(--treechildren-selectedBorder);
+    -moz-border-left-colors: var(--treechildren-selectedBorder);
+    -moz-border-bottom-colors: var(--treechildren-selectedBottomBorder);
+    background-image: var(--treechildren-selectedImage);
+    background-color: var(--treechildren-selectedBackground);
+    outline: var(--treechildren-outline);
   }
 
-  treechildren::-moz-tree-twisty(hover, open) {
-    list-style-image: url("chrome://global/skin/tree/twisty.svg#open-hover");
+  treechildren:not(.autocomplete-treebody)::-moz-tree-row(current, focus) {
+    border-style: solid;
+    -moz-border-top-colors: var(--treechildren-currentFocusBorder);
+    -moz-border-right-colors: var(--treechildren-currentFocusBorder);
+    -moz-border-left-colors: var(--treechildren-currentFocusBorder);
+    -moz-border-bottom-colors: var(--treechildren-currentFocusBottomBorder);
+    outline: var(--treechildren-outline);
   }
 
-  treechildren:-moz-locale-dir(rtl)::-moz-tree-twisty {
-    list-style-image: url("chrome://global/skin/tree/twisty.svg#clsd-rtl");
+  treechildren:not(.autocomplete-treebody)::-moz-tree-row(selected, focus),
+  treechildren::-moz-tree-row(dropOn) {
+    -moz-border-top-colors: var(--treechildren-selectedFocusBorder);
+    -moz-border-right-colors: var(--treechildren-selectedFocusBorder);
+    -moz-border-left-colors: var(--treechildren-selectedFocusBorder);
+    -moz-border-bottom-colors: var(--treechildren-selectedFocusBottomBorder);
+    background-image: var(--treechildren-selectedFocusImage);
+    background-color: var(--treechildren-selectedFocusBackground);
   }
 
-  treechildren:-moz-locale-dir(rtl)::-moz-tree-twisty(open) {
-    list-style-image: url("chrome://global/skin/tree/twisty.svg#open-rtl");
+  treechildren:not(.autocomplete-treebody)::-moz-tree-row(selected, current, focus) {
+    border-style: solid;
+    -moz-border-top-colors: var(--treechildren-selectedFocusCurrentBorder);
+    -moz-border-right-colors: var(--treechildren-selectedFocusCurrentBorder);
+    -moz-border-left-colors: var(--treechildren-selectedFocusCurrentBorder);
+    -moz-border-bottom-colors: var(--treechildren-selectedFocusCurrentBottomBorder);
+    background-image: var(--treechildren-selectedFocusCurrentImage);
   }
 
-  treechildren:-moz-locale-dir(rtl)::-moz-tree-twisty(hover) {
-    list-style-image: url("chrome://global/skin/tree/twisty.svg#clsd-hover-rtl");
+  treechildren:not(.autocomplete-treebody)::-moz-tree-row(hover) {
+    -moz-border-top-colors: var(--treechildren-hoverBorder);
+    -moz-border-right-colors: var(--treechildren-hoverBorder);
+    -moz-border-left-colors: var(--treechildren-hoverBorder);
+    -moz-border-bottom-colors: var(--treechildren-hoverBottomBorder);
+    background-image: var(--treechildren-hoverImage);
+    outline: var(--treechildren-outline);
   }
 
-  treechildren:-moz-locale-dir(rtl)::-moz-tree-twisty(hover, open) {
-    list-style-image: url("chrome://global/skin/tree/twisty.svg#open-hover-rtl");
+  treechildren:not(.autocomplete-treebody)::-moz-tree-row(hover, current) {
+    -moz-border-top-colors: var(--treechildren-hoverCurrentBorder);
+    -moz-border-right-colors: var(--treechildren-hoverCurrentBorder);
+    -moz-border-left-colors: var(--treechildren-hoverCurrentBorder);
+    -moz-border-bottom-colors: var(--treechildren-hoverCurrentBottomBorder);
+    background-image: var(--treechildren-hoverCurrentImage);
   }
 
-  @media (-moz-windows-default-theme) {
-    treechildren {
-      --treechildren-outline: none;
-      --treechildren-2ndBorderColor: rgba(255,255,255,.4);
-      --treechildren-selectedColor: rgb(217,217,217);
-      --treechildren-focusColor: rgb(123,195,255);
-      --treechildren-selectedFocusColor: rgb(205,232,255);
-      --treechildren-currentColor: rgb(125,162,206);
-      --treechildren-hoverColor: rgb(229,243,255);
-      --treechildren-selectedBorder: var(--treechildren-selectedColor);
-      --treechildren-selectedBottomBorder: rgb(204,204,204);
-      --treechildren-selectedImage: linear-gradient(rgb(217,217,217), rgb(217,217,217));
-      --treechildren-selectedBackground: transparent;
-      --treechildren-currentFocusBorder: var(--treechildren-focusColor);
-      --treechildren-currentFocusBottomBorder: var(--treechildren-focusColor);
-      --treechildren-selectedFocusBorder: var(--treechildren-selectedFocusColor);
-      --treechildren-selectedFocusBottomBorder: rgb(165,214,255);
-      --treechildren-selectedFocusImage: none;
-      --treechildren-selectedFocusBackground: var(--treechildren-selectedFocusColor);
-      --treechildren-selectedFocusCurrentBorder: var(--treechildren-focusColor);
-      --treechildren-selectedFocusCurrentBottomBorder: var(--treechildren-focusColor);
-      --treechildren-selectedFocusCurrentImage: linear-gradient(rgb(205,232,255), rgb(205,232,255));
-      --treechildren-hoverBorder: var(--treechildren-hoverColor);
-      --treechildren-hoverBottomBorder: var(--treechildren-hoverColor);
-      --treechildren-hoverImage: linear-gradient(rgb(229,243,255), rgb(229,243,255));
-      --treechildren-hoverCurrentBorder: var(--treechildren-currentColor);
-      --treechildren-hoverCurrentBottomBorder: var(--treechildren-currentColor);
-      --treechildren-hoverCurrentImage: linear-gradient(rgba(131,183,249,.16), rgba(131,183,249,.16));
-      --treechildren-hoverSelectedBorder: var(--treechildren-focusColor);
-      --treechildren-hoverSelectedBottomBorder: var(--treechildren-focusColor);
-      --treechildren-hoverSelectedImage: linear-gradient(rgb(205,232,255), rgb(205,232,255));
-    }
-
-    treechildren:not(.autocomplete-treebody)::-moz-tree-row {
-      height: 1.8em;
-      color: -moz-FieldText;
-      margin-inline-start: 1px;
-      margin-inline-end: 1px;
-      border-width: 1px;
-      border-color: transparent;
-      background-repeat: no-repeat;
-      background-size: 100% 100%;
-    }
-
-    treechildren:not(.autocomplete-treebody)::-moz-tree-row(selected) {
-      -moz-border-top-colors: var(--treechildren-selectedBorder);
-      -moz-border-right-colors: var(--treechildren-selectedBorder);
-      -moz-border-left-colors: var(--treechildren-selectedBorder);
-      -moz-border-bottom-colors: var(--treechildren-selectedBottomBorder);
-      background-image: var(--treechildren-selectedImage);
-      background-color: var(--treechildren-selectedBackground);
-      outline: var(--treechildren-outline);
-    }
-
-    treechildren:not(.autocomplete-treebody)::-moz-tree-row(current, focus) {
-      border-style: solid;
-      -moz-border-top-colors: var(--treechildren-currentFocusBorder);
-      -moz-border-right-colors: var(--treechildren-currentFocusBorder);
-      -moz-border-left-colors: var(--treechildren-currentFocusBorder);
-      -moz-border-bottom-colors: var(--treechildren-currentFocusBottomBorder);
-      outline: var(--treechildren-outline);
-    }
-
-    treechildren:not(.autocomplete-treebody)::-moz-tree-row(selected, focus),
-    treechildren::-moz-tree-row(dropOn) {
-      -moz-border-top-colors: var(--treechildren-selectedFocusBorder);
-      -moz-border-right-colors: var(--treechildren-selectedFocusBorder);
-      -moz-border-left-colors: var(--treechildren-selectedFocusBorder);
-      -moz-border-bottom-colors: var(--treechildren-selectedFocusBottomBorder);
-      background-image: var(--treechildren-selectedFocusImage);
-      background-color: var(--treechildren-selectedFocusBackground);
-    }
-
-    treechildren:not(.autocomplete-treebody)::-moz-tree-row(selected, current, focus) {
-      border-style: solid;
-      -moz-border-top-colors: var(--treechildren-selectedFocusCurrentBorder);
-      -moz-border-right-colors: var(--treechildren-selectedFocusCurrentBorder);
-      -moz-border-left-colors: var(--treechildren-selectedFocusCurrentBorder);
-      -moz-border-bottom-colors: var(--treechildren-selectedFocusCurrentBottomBorder);
-      background-image: var(--treechildren-selectedFocusCurrentImage);
-    }
-
-    treechildren:not(.autocomplete-treebody)::-moz-tree-row(hover) {
-      -moz-border-top-colors: var(--treechildren-hoverBorder);
-      -moz-border-right-colors: var(--treechildren-hoverBorder);
-      -moz-border-left-colors: var(--treechildren-hoverBorder);
-      -moz-border-bottom-colors: var(--treechildren-hoverBottomBorder);
-      background-image: var(--treechildren-hoverImage);
-      outline: var(--treechildren-outline);
-    }
-
-    treechildren:not(.autocomplete-treebody)::-moz-tree-row(hover, current) {
-      -moz-border-top-colors: var(--treechildren-hoverCurrentBorder);
-      -moz-border-right-colors: var(--treechildren-hoverCurrentBorder);
-      -moz-border-left-colors: var(--treechildren-hoverCurrentBorder);
-      -moz-border-bottom-colors: var(--treechildren-hoverCurrentBottomBorder);
-      background-image: var(--treechildren-hoverCurrentImage);
-    }
+  treechildren:not(.autocomplete-treebody)::-moz-tree-row(hover, selected) {
+    -moz-border-top-colors: var(--treechildren-hoverSelectedBorder);
+    -moz-border-right-colors: var(--treechildren-hoverSelectedBorder);
+    -moz-border-left-colors: var(--treechildren-hoverSelectedBorder);
+    -moz-border-bottom-colors: var(--treechildren-hoverSelectedBottomBorder);
+    background-image: var(--treechildren-hoverSelectedImage);
+  }
 
-    treechildren:not(.autocomplete-treebody)::-moz-tree-row(hover, selected) {
-      -moz-border-top-colors: var(--treechildren-hoverSelectedBorder);
-      -moz-border-right-colors: var(--treechildren-hoverSelectedBorder);
-      -moz-border-left-colors: var(--treechildren-hoverSelectedBorder);
-      -moz-border-bottom-colors: var(--treechildren-hoverSelectedBottomBorder);
-      background-image: var(--treechildren-hoverSelectedImage);
-    }
+  tree[disabled="true"] > treechildren::-moz-tree-row {
+    background: none;
+    -moz-border-top-colors: transparent;
+    -moz-border-right-colors: transparent;
+    -moz-border-left-colors: transparent;
+    -moz-border-bottom-colors: transparent;
+  }
 
-    tree[disabled="true"] > treechildren::-moz-tree-row {
-      background: none;
-      -moz-border-top-colors: transparent;
-      -moz-border-right-colors: transparent;
-      -moz-border-left-colors: transparent;
-      -moz-border-bottom-colors: transparent;
-    }
+  treechildren::-moz-tree-cell(dropOn) {
+    background-image: none;
+    background-color: transparent;
+    border-radius: 0;
+  }
 
-    treechildren::-moz-tree-cell(dropOn) {
-      background-image: none;
-      background-color: transparent;
-      border-radius: 0;
-    }
+  treechildren::-moz-tree-cell-text(primary, dropOn) {
+    color: -moz-FieldText;
+  }
 
-    treechildren::-moz-tree-cell-text(primary, dropOn) {
-      color: -moz-FieldText;
-    }
+  treechildren:not(.autocomplete-treebody)::-moz-tree-cell-text {
+    padding-bottom: initial;
+    border-color: transparent;
+    background-color: transparent;
+  }
 
-    treechildren:not(.autocomplete-treebody)::-moz-tree-cell-text {
-      padding-bottom: initial;
-      border-color: transparent;
-      background-color: transparent;
-    }
+  treechildren:not(.autocomplete-treebody)::-moz-tree-cell-text(selected, focus) {
+    color: -moz-DialogText;
+  }
 
-    treechildren:not(.autocomplete-treebody)::-moz-tree-cell-text(selected, focus) {
-      color: -moz-DialogText;
+  @media (-moz-os-version: windows-win7) {
+    treechildren {
+      --treechildren-outline: 1px solid var(--treechildren-2ndBorderColor);
+      --treechildren-2ndBottomBorderColor: rgba(255,255,255,.6);
+      --treechildren-selectedBorder: var(--treechildren-selectedColor) var(--treechildren-2ndBorderColor);
+      --treechildren-selectedBottomBorder: var(--treechildren-selectedColor) var(--treechildren-2ndBottomBorderColor);
+      --treechildren-selectedImage: linear-gradient(rgba(190,190,190,.1), rgba(190,190,190,.4));
+      --treechildren-currentFocusBorder: var(--treechildren-currentColor) var(--treechildren-2ndBorderColor);
+      --treechildren-currentFocusBottomBorder: var(--treechildren-currentColor) var(--treechildren-2ndBottomBorderColor);
+      --treechildren-selectedFocusBorder: rgb(132,172,221) var(--treechildren-2ndBorderColor);
+      --treechildren-selectedFocusBottomBorder: var(--treechildren-currentColor) var(--treechildren-2ndBottomBorderColor);
+      --treechildren-selectedFocusImage: linear-gradient(rgba(131,183,249,.16), rgba(131,183,249,.375));
+      --treechildren-selectedFocusBackground: transparent;
+      --treechildren-selectedFocusCurrentBorder: var(--treechildren-currentColor) var(--treechildren-2ndBorderColor);
+      --treechildren-selectedFocusCurrentBottomBorder: var(--treechildren-currentColor) var(--treechildren-2ndBottomBorderColor);
+      --treechildren-selectedFocusCurrentImage: linear-gradient(rgba(131,183,249,.28), rgba(131,183,249,.5));
+      --treechildren-hoverBorder: rgb(184,214,251) var(--treechildren-2ndBorderColor);
+      --treechildren-hoverBottomBorder: rgb(184,214,251) var(--treechildren-2ndBottomBorderColor);
+      --treechildren-hoverImage: linear-gradient(rgba(131,183,249,.05), rgba(131,183,249,.16));
+      --treechildren-hoverCurrentBorder: var(--treechildren-currentColor) var(--treechildren-2ndBorderColor);
+      --treechildren-hoverCurrentBottomBorder: var(--treechildren-currentColor) var(--treechildren-2ndBottomBorderColor);
+      --treechildren-hoverCurrentImage: linear-gradient(rgba(131,183,249,.05), rgba(131,183,249,.16));
+      --treechildren-hoverSelectedBorder: var(--treechildren-currentColor) var(--treechildren-2ndBorderColor);
+      --treechildren-hoverSelectedBottomBorder: var(--treechildren-currentColor) var(--treechildren-2ndBottomBorderColor);
+      --treechildren-hoverSelectedImage: linear-gradient(rgba(131,183,249,.28), rgba(131,183,249,.5));
     }
 
-    @media (-moz-os-version: windows-vista),
-           (-moz-os-version: windows-win7) {
-      treechildren {
-        --treechildren-outline: 1px solid var(--treechildren-2ndBorderColor);
-        --treechildren-2ndBottomBorderColor: rgba(255,255,255,.6);
-        --treechildren-selectedBorder: var(--treechildren-selectedColor) var(--treechildren-2ndBorderColor);
-        --treechildren-selectedBottomBorder: var(--treechildren-selectedColor) var(--treechildren-2ndBottomBorderColor);
-        --treechildren-selectedImage: linear-gradient(rgba(190,190,190,.1), rgba(190,190,190,.4));
-        --treechildren-currentFocusBorder: var(--treechildren-currentColor) var(--treechildren-2ndBorderColor);
-        --treechildren-currentFocusBottomBorder: var(--treechildren-currentColor) var(--treechildren-2ndBottomBorderColor);
-        --treechildren-selectedFocusBorder: rgb(132,172,221) var(--treechildren-2ndBorderColor);
-        --treechildren-selectedFocusBottomBorder: var(--treechildren-currentColor) var(--treechildren-2ndBottomBorderColor);
-        --treechildren-selectedFocusImage: linear-gradient(rgba(131,183,249,.16), rgba(131,183,249,.375));
-        --treechildren-selectedFocusBackground: transparent;
-        --treechildren-selectedFocusCurrentBorder: var(--treechildren-currentColor) var(--treechildren-2ndBorderColor);
-        --treechildren-selectedFocusCurrentBottomBorder: var(--treechildren-currentColor) var(--treechildren-2ndBottomBorderColor);
-        --treechildren-selectedFocusCurrentImage: linear-gradient(rgba(131,183,249,.28), rgba(131,183,249,.5));
-        --treechildren-hoverBorder: rgb(184,214,251) var(--treechildren-2ndBorderColor);
-        --treechildren-hoverBottomBorder: rgb(184,214,251) var(--treechildren-2ndBottomBorderColor);
-        --treechildren-hoverImage: linear-gradient(rgba(131,183,249,.05), rgba(131,183,249,.16));
-        --treechildren-hoverCurrentBorder: var(--treechildren-currentColor) var(--treechildren-2ndBorderColor);
-        --treechildren-hoverCurrentBottomBorder: var(--treechildren-currentColor) var(--treechildren-2ndBottomBorderColor);
-        --treechildren-hoverCurrentImage: linear-gradient(rgba(131,183,249,.05), rgba(131,183,249,.16));
-        --treechildren-hoverSelectedBorder: var(--treechildren-currentColor) var(--treechildren-2ndBorderColor);
-        --treechildren-hoverSelectedBottomBorder: var(--treechildren-currentColor) var(--treechildren-2ndBottomBorderColor);
-        --treechildren-hoverSelectedImage: linear-gradient(rgba(131,183,249,.28), rgba(131,183,249,.5));
-      }
-
-      treechildren:not(.autocomplete-treebody)::-moz-tree-row {
-        border-width: 2px;
-        border-radius: 3px;
-        -moz-outline-radius: 3px;
-      }
+    treechildren:not(.autocomplete-treebody)::-moz-tree-row {
+      border-width: 2px;
+      border-radius: 3px;
+      -moz-outline-radius: 3px;
     }
+  }
 
-    @media (-moz-os-version: windows-win8) {
-      treechildren {
-        --treechildren-outline: 1px solid var(--treechildren-2ndBorderColor);
-        --treechildren-selectedBorder: var(--treechildren-selectedColor);
-        --treechildren-selectedBottomBorder: var(--treechildren-selectedColor);
-        --treechildren-selectedImage: linear-gradient(rgba(190,190,190,.4), rgba(190,190,190,.4));
-        --treechildren-currentFocusBorder: var(--treechildren-currentColor);
-        --treechildren-currentFocusBottomBorder: var(--treechildren-currentColor);
-        --treechildren-selectedFocusBorder: rgb(132,172,221) var(--treechildren-2ndBorderColor);
-        --treechildren-selectedFocusBottomBorder: var(--treechildren-currentColor);
-        --treechildren-selectedFocusImage: linear-gradient(rgba(131,183,249,.375), rgba(131,183,249,.375));
-        --treechildren-selectedFocusBackground: transparent;
-        --treechildren-selectedFocusCurrentBorder: var(--treechildren-currentColor);
-        --treechildren-selectedFocusCurrentBottomBorder: var(--treechildren-currentColor);
-        --treechildren-selectedFocusCurrentImage: linear-gradient(rgba(131,183,249,.5), rgba(131,183,249,.5));
-        --treechildren-hoverBorder: rgb(184,214,251);
-        --treechildren-hoverBottomBorder: rgb(184,214,251);
-        --treechildren-hoverImage: linear-gradient(rgba(131,183,249,.16), rgba(131,183,249,.16));
-        --treechildren-hoverSelectedBorder: var(--treechildren-currentColor);
-        --treechildren-hoverSelectedBottomBorder: var(--treechildren-currentColor);
-        --treechildren-hoverSelectedImage: linear-gradient(rgba(131,183,249,.5), rgba(131,183,249,.5));
-      }
+  @media (-moz-os-version: windows-win8) {
+    treechildren {
+      --treechildren-outline: 1px solid var(--treechildren-2ndBorderColor);
+      --treechildren-selectedBorder: var(--treechildren-selectedColor);
+      --treechildren-selectedBottomBorder: var(--treechildren-selectedColor);
+      --treechildren-selectedImage: linear-gradient(rgba(190,190,190,.4), rgba(190,190,190,.4));
+      --treechildren-currentFocusBorder: var(--treechildren-currentColor);
+      --treechildren-currentFocusBottomBorder: var(--treechildren-currentColor);
+      --treechildren-selectedFocusBorder: rgb(132,172,221) var(--treechildren-2ndBorderColor);
+      --treechildren-selectedFocusBottomBorder: var(--treechildren-currentColor);
+      --treechildren-selectedFocusImage: linear-gradient(rgba(131,183,249,.375), rgba(131,183,249,.375));
+      --treechildren-selectedFocusBackground: transparent;
+      --treechildren-selectedFocusCurrentBorder: var(--treechildren-currentColor);
+      --treechildren-selectedFocusCurrentBottomBorder: var(--treechildren-currentColor);
+      --treechildren-selectedFocusCurrentImage: linear-gradient(rgba(131,183,249,.5), rgba(131,183,249,.5));
+      --treechildren-hoverBorder: rgb(184,214,251);
+      --treechildren-hoverBottomBorder: rgb(184,214,251);
+      --treechildren-hoverImage: linear-gradient(rgba(131,183,249,.16), rgba(131,183,249,.16));
+      --treechildren-hoverSelectedBorder: var(--treechildren-currentColor);
+      --treechildren-hoverSelectedBottomBorder: var(--treechildren-currentColor);
+      --treechildren-hoverSelectedImage: linear-gradient(rgba(131,183,249,.5), rgba(131,183,249,.5));
     }
   }
 }
diff --git a/toolkit/themes/windows/global/tree/sort-asc-XP.png b/toolkit/themes/windows/global/tree/sort-asc-XP.png
deleted file mode 100644
index 64d077a8f..000000000
--- a/toolkit/themes/windows/global/tree/sort-asc-XP.png
+++ /dev/null
diff --git a/toolkit/themes/windows/global/tree/sort-dsc-XP.png b/toolkit/themes/windows/global/tree/sort-dsc-XP.png
deleted file mode 100644
index 9c4a82587..000000000
--- a/toolkit/themes/windows/global/tree/sort-dsc-XP.png
+++ /dev/null
diff --git a/toolkit/themes/windows/global/tree/twisty-XP.svg b/toolkit/themes/windows/global/tree/twisty-XP.svg
deleted file mode 100644
index 66219d513..000000000
--- a/toolkit/themes/windows/global/tree/twisty-XP.svg
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="9" height="9">
-  <style>
-    use:not(:target) {
-      display: none;
-    }
-    use {
-      stroke: #000000;
-      stroke-width: 1;
-    }
-  </style>
-  <defs>
-    <linearGradient id="linearGradient1">
-      <stop style="stop-color: #ffffff;" offset="0"/>
-      <stop style="stop-color: #e0e0e0;" offset="1"/>
-    </linearGradient>
-    <linearGradient id="linearGradient2">
-      <stop style="stop-color: #c9c9c9;" offset="0"/>
-      <stop style="stop-color: #f8f8f8;" offset="1"/>
-    </linearGradient>
-    <linearGradient id="gradient1" xlink:href="#linearGradient1" gradientUnits="userSpaceOnUse" x1="4.5" y1="2" x2="4.5" y2="7"/>
-    <linearGradient id="gradient2" xlink:href="#linearGradient2" gradientUnits="userSpaceOnUse" x1="4.5" y1="6" x2="4.5" y2="3"/>
-    <path id="clsd-shape" d="m 2,4.5 5,0 M 4.5,2 l 0,5"/>
-    <path id="open-shape" d="m 2,4.5 5,0"/>
-  </defs>
-  <rect style="fill: url(#gradient1); stroke: #5d5cc2; stroke-linejoin: round; stroke-opacity: 0.8" width="8" height="8" x="0.5" y="0.5"/>
-  <rect style="fill: url(#gradient2);" width="5" height="5" x="2" y="2"/>
-  <use id="clsd" xlink:href="#clsd-shape"/>
-  <use id="open" xlink:href="#open-shape"/>
-</svg>
diff --git a/toolkit/themes/windows/global/tree/twisty-Vista78.svg b/toolkit/themes/windows/global/tree/twisty-preWin10.svg
index 0a6908634..0a6908634 100644
--- a/toolkit/themes/windows/global/tree/twisty-Vista78.svg
+++ b/toolkit/themes/windows/global/tree/twisty-preWin10.svg