cvs add -kb is my new friend

browser/base/skin/browser.css

@@ -148,7 +148,7 @@ menuitem.bookmark-item {
 
 .bookmark-item  {
   margin: 0px 2px;
-  list-style-image: url("chrome://global/skin/icons/item-folder.png") !important;
+  list-style-image: url("chrome://global/skin/icons/folder-item.png") !important;
   -moz-image-region: rect(0px 16px 16px 0px);
 }
 .bookmark-item:hover {
@@ -159,7 +159,7 @@ menuitem.bookmark-item {
 }
 
 .bookmark-item[container="true"] {
-  list-style-image: url("chrome://global/skin/icons/item-folder.png") !important;
+  list-style-image: url("chrome://global/skin/icons/folder-item.png") !important;
   -moz-image-region: rect(16px 16px 32px 0px);
 }
 .bookmark-item[container="true"]:hover {
@@ -669,7 +669,7 @@ toolbar[iconsize="small"] #history-button[disabled="true"] {
 }
 
 #page-proxy-button {
-  list-style-image: url("chrome://global/skin/icon/item-folder.png") !important;
+  list-style-image: url("chrome://global/skin/icon/folder-item.png") !important;
   -moz-image-region: rect(0px 16px 16px 0px);
 }
 

toolkit/skin/win/browser.css

@@ -25,10 +25,10 @@ tabpanels {
   margin-right: 3px;
   width: 16px;
   height: 16px;
-  list-style-image: url("chrome://global/skin/icons/item-folder.png"); 
+  list-style-image: url("chrome://global/skin/icons/folder-item.png"); 
   -moz-image-region: rect(0px 16px 16px 0px);
 }
 
 tab[busy] > .tab-icon {
-  list-style-image: url("chrome://global/skin/icons/loading.gif");
+  list-style-image: url("chrome://global/skin/icons/loading-anim.gif");
 }

toolkit/skin/win/jar.mn

@@ -36,8 +36,8 @@ classic.jar:
 +  skin/classic/global/icons/alert-error.gif                   (icons/alert-error.gif)
 +  skin/classic/global/icons/alert-message.gif                 (icons/alert-message.gif)
 +  skin/classic/global/icons/alert-question.gif                (icons/alert-question.gif)
-+  skin/classic/global/icons/item-folder.png                   (icons/item-folder.png)
-+  skin/classic/global/icons/loading.gif                       (icons/loading.gif)
++  skin/classic/global/icons/folder-item.png                   (icons/folder-item.png)
++  skin/classic/global/icons/loading-anim.gif                  (icons/loading-anim.gif)
 +  skin/classic/global/checkbox/cbox-check.gif                 (checkbox/cbox-check.gif)
 +  skin/classic/global/checkbox/cbox-check-dis.gif             (checkbox/cbox-check-dis.gif)
 +  skin/classic/global/radio/radio-check-dis.gif               (radio/radio-check-dis.gif)
@@ -56,6 +56,6 @@ classic.jar:
 +  skin/classic/global/tree/twisty-clsd.gif                    (tree/twisty-clsd.gif)
 +  skin/classic/global/progressmeter/progressmeter-busy.gif    (progressmeter/progressmeter-busy.gif)
 +  skin/classic/global/toolbar/spacer-lft.gif                  (toolbar/spacer-lft.gif)
-+  skin/classic/global/toolbar/spacer-mid.gif                  (toolbar/spacer-mid.gif)
++  skin/classic/global/toolbar.gif                  (toolbar/spacer-mid.gif)
 +  skin/classic/global/toolbar/spacer-rit.gif                  (toolbar/spacer-rit.gif)
 +  skin/classic/global/toolbar/chevron.gif                     (toolbar/chevron.gif)

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/item-folder.png") !important;
+  list-style-image: url("chrome://global/skin/icons/folder-item.png") !important;
   -moz-image-region: rect(0px 16px 16px 0px);
 }
 
@@ -279,7 +279,7 @@ treechildren:-moz-tree-image(Name) {
 }
 
 treechildren:-moz-tree-image(Name, container) {
-  list-style-image: url("chrome://global/skin/icons/item-folder.png") !important;
+  list-style-image: url("chrome://global/skin/icons/folder-item.png") !important;
   -moz-image-region: rect(16px 16px 32px 0px);
 }