Bug 431002 – Search fields should use search-close instead of the close button for tabs. r=dao

browser/themes/winstripe/browser/places/organizer.css

@@ -148,8 +148,8 @@
   background-color: transparent;
   border: none;
   padding: 0 !important;
-  list-style-image: url("chrome://global/skin/icons/close.png");
-  -moz-image-region: rect(0px 14px 14px 0px);
+  list-style-image: url("chrome://global/skin/icons/Search-close.png");
+  -moz-image-region: rect(0px 16px 16px 0px);
   width: 14px;
   height: 14px;
   cursor: default;
@@ -162,11 +162,11 @@
 }
 
 .textbox-input-closebutton:hover {
-  -moz-image-region: rect(0px 28px 14px 14px);
+  -moz-image-region: rect(0px 32px 16px 16px);
 }
 
 .textbox-input-closebutton:hover:active {
-  -moz-image-region: rect(0px 42px 14px 28px);
+  -moz-image-region: rect(0px 48px 16px 32px);
 }
 
 .small, .small[disabled="true"] {

toolkit/themes/winstripe/mozapps/extensions/extensions.css

@@ -343,18 +343,27 @@ vbox[typeName="status"][type="header-recommended"] {
   width: 16px;
   height: 16px;
   min-width: 16px;
-  list-style-image: url("chrome://mozapps/skin/extensions/searchIcons.png");
   background-color: -moz-field;
 }
 
 .searchbox-search {
+  list-style-image: url("chrome://mozapps/skin/extensions/searchIcons.png");
   -moz-image-region: rect(0px 16px 16px 0px);
 }
 
 .searchbox-cancel {
+  list-style-image: url("chrome://global/skin/icons/Search-close.png");
+  -moz-image-region: rect(0px 16px 16px 0px);
+}
+
+.searchbox-cancel:hover {
   -moz-image-region: rect(0px 32px 16px 16px);
 }
 
+.searchbox-cancel:hover:active {
+  -moz-image-region: rect(0px 48px 16px 32px);
+}
+
 .searchbox-search .button-box,
 .searchbox-cancel .button-box {
   border: 0px;