Remove the tree icons (for the directories and the transparent blank.gif) specific to the XP filepicker and use instead the Qute ones.

Don't capitalize folder-item.png in the jar files.
Extract the page loading icon from folder-item.png in icons/page-loading.png to allow eventual animation and instead put a transparent 16x16 icon used by the XP filepicker and whoever needs it.

browser/base/skin/browser.css

@@ -132,7 +132,7 @@ menuitem.bookmark-item {
 /* ::::: bookmark items ::::: */
 
 .bookmark-item  {
-  list-style-image: url("chrome://global/skin/icons/Folder-item.png") !important;
+  list-style-image: url("chrome://global/skin/icons/folder-item.png") !important;
   -moz-image-region: rect(0px, 16px, 16px, 0px)
 }
 
@@ -478,7 +478,7 @@ toolbar[iconsize="small"] #history-button[disabled="true"] {
 }
 
 #page-proxy-button {
-  list-style-image: url("chrome://global/skin/icons/Folder-item.png") !important;
+  list-style-image: url("chrome://global/skin/icons/folder-item.png") !important;
   -moz-image-region: rect(0px, 16px, 16px, 0px);}
 
 #page-proxy-button[pageproxystate="invalid"] {

toolkit/skin/win/browser.css

@@ -23,12 +23,12 @@ tabpanels {
   margin-right: 3px;
   width: 16px;
   height: 16px;
-  list-style-image: url("chrome://global/skin/icons/Folder-item.png");
+  list-style-image: url("chrome://global/skin/icons/folder-item.png");
   -moz-image-region: rect(0px, 16px, 16px, 0px);
 }
 
 tab[busy] > .tab-icon {
-  -moz-image-region: rect(16px, 16px, 32px, 0px);
+  list-style-image: url("chrome://global/skin/icons/page-loading.png");
 }
 
 tab[selected="true"] {

toolkit/skin/win/filepicker.css

@@ -41,11 +41,12 @@
 /* ::::: file/directory items ::::: */
 
 treechildren:-moz-tree-image(FilenameColumn, directory) {
-  list-style-image: url("chrome://global/skin/filepicker/dir-closed.gif");
+  list-style-image: url("chrome://global/skin/icons/folder-item.png") !important;
+  -moz-image-region: rect(0px, 32px, 16px, 16px);
 }
 
 treechildren:-moz-tree-image(FilenameColumn, file) {
-  list-style-image: url("chrome://global/skin/filepicker/blank.gif");
+  -moz-image-region: rect(16px, 16px, 32px, 0px);
 }
 
 /* ::::: focus rules ::::: */

toolkit/skin/win/jar.mn

@@ -23,7 +23,7 @@ classic.jar:
 +  skin/classic/global/splitter.css
 +  skin/classic/global/tabbox.css
 +  skin/classic/global/textbox.css
-+ skin/classic/global/toolbarbutton.css
++  skin/classic/global/toolbarbutton.css
 +  skin/classic/global/tree.css
 +  skin/classic/global/wizard.css
 +  skin/classic/global/wizardOverlay.css
@@ -55,14 +55,12 @@ classic.jar:
 +  skin/classic/global/checkbox/cbox-check.gif                    (checkbox/cbox-check.gif)
 +  skin/classic/global/console/console-error-caret.gif            (console/console-error-caret.gif)
 +  skin/classic/global/console/console-error-dash.gif             (console/console-error-dash.gif)
-+  skin/classic/global/filepicker/blank.gif                       (filepicker/blank.gif)
-+  skin/classic/global/filepicker/dir-closed.gif                  (filepicker/dir-closed.gif)
-+  skin/classic/global/filepicker/dir-open.gif                    (filepicker/dir-open.gif)
 +  skin/classic/global/filepicker/folder-home.gif                 (filepicker/folder-home.gif)
 +  skin/classic/global/filepicker/folder-new.gif                  (filepicker/folder-new.gif)
 +  skin/classic/global/filepicker/folder-up.gif                   (filepicker/folder-up.gif)
 +  skin/classic/global/icons/Error.png                            (icons/Error.png)
-+  skin/classic/global/icons/Folder-item.png                      (icons/folder-item.png)
++  skin/classic/global/icons/folder-item.png                      (icons/folder-item.png)
++  skin/classic/global/icons/page-loading.png                      (icons/page-loading.png)
 +  skin/classic/global/icons/Message.png                          (icons/Message.png)
 +  skin/classic/global/icons/Question.png                         (icons/Question.png)
 +  skin/classic/global/icons/Warning.png                          (icons/Warning.png)

toolkit/skin/win/tree.css

@@ -266,7 +266,7 @@ treechildren:-moz-tree-image(Name) {
 
 treechildren:-moz-tree-image(Name) {
   margin: 0px 2px;
-  list-style-image: url("chrome://global/skin/icons/Folder-item.png") !important;
+  list-style-image: url("chrome://global/skin/icons/folder-item.png") !important;
   -moz-image-region: rect(0px, 16px, 16px, 0px);
 }