--- a/mail/themes/pinstripe/jar.mn
+++ b/mail/themes/pinstripe/jar.mn
@@ -120,23 +120,17 @@ classic.jar:
   skin/classic/messenger/smime/icons/hdrCryptoOk.gif             (mail/smime/hdrCryptoOk.gif)
   skin/classic/messenger/smime/icons/hdrCryptoNotOk.gif          (mail/smime/hdrCryptoNotOk.gif)
   skin/classic/messenger/icons/chevron.png                       (mail/icons/chevron.png)
   skin/classic/messenger/icons/twisty-open.gif                   (mail/icons/twisty-open.gif)
   skin/classic/messenger/icons/twisty-closed.gif                 (mail/icons/twisty-closed.gif)
   skin/classic/messenger/icons/spin-buttons-active.png           (mail/icons/spin-buttons-active.png)
   skin/classic/messenger/icons/spin-buttons.png                  (mail/icons/spin-buttons.png)
   skin/classic/messenger/icons/tree-selected-overlay.png         (mail/icons/tree-selected-overlay.png)
-  skin/classic/messenger/icons/SearchBarStart.png                (mail/icons/SearchBarStart.png)
-  skin/classic/messenger/icons/SearchBarStart-rtl.png            (mail/icons/SearchBarStart-rtl.png)
-  skin/classic/messenger/icons/SearchBarMiddle.png               (mail/icons/SearchBarMiddle.png)
-  skin/classic/messenger/icons/SearchBarEnd.png                  (mail/icons/SearchBarEnd.png)
-  skin/classic/messenger/icons/SearchBarEnd-rtl.png              (mail/icons/SearchBarEnd-rtl.png)
   skin/classic/messenger/icons/search-bar-background.png         (mail/icons/search-bar-background.png)
-  skin/classic/messenger/icons/Search-bar.png                    (mail/icons/Search-bar.png)
   skin/classic/messenger/icons/attachment-deleted.png            (mail/icons/attachment-deleted.png)
   skin/classic/messenger/icons/attachment-deleted-large.png      (mail/icons/attachment-deleted-large.png)
   skin/classic/messenger/icons/attachment-col.png                (mail/icons/attachment-col.png)
   skin/classic/messenger/icons/attachment-selected.png           (mail/icons/attachment-selected.png)
   skin/classic/messenger/icons/attachment.png                    (mail/icons/attachment.png)
   skin/classic/messenger/icons/check.png                         (mail/icons/check.png)
   skin/classic/messenger/icons/dot.png                           (mail/icons/dot.png)
   skin/classic/messenger/icons/flagcol.png                       (mail/icons/flagcol.png)

deleted file mode 100644
index e2e729354c9ebac4ab97950122b9d00f37f395f0..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001

deleted file mode 100755
index 49c0f3121ab4d37923fcfcb248129308b74ea790..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001

deleted file mode 100755
index 6c64b589cff076f3457e1612182684742d8ccad3..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001

deleted file mode 100644
index c48d95222ee3bc5e841c96d885e8cfe961c1c269..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001

deleted file mode 100755
index 6c64b589cff076f3457e1612182684742d8ccad3..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001

deleted file mode 100755
index 49c0f3121ab4d37923fcfcb248129308b74ea790..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001

--- a/mail/themes/pinstripe/mail/searchBox.css
+++ b/mail/themes/pinstripe/mail/searchBox.css
@@ -37,77 +37,61 @@
 # ***** END LICENSE BLOCK *****
 */
 
 #searchInput[searchCriteria="true"]  {
   color: grey;
 }
 
 #quick-search-button {
-  min-width: 22px;
-  -moz-margin-start: 5px;
-  -moz-margin-end: 3px;
+  -moz-margin-start: -10px;
+  -moz-margin-end: 4px;
   margin-bottom: 0;
   margin-top: 0;
 }
 
 .quick-search-button-image {
   padding: 0px;
-  list-style-image: url("chrome://messenger/skin/icons/Search-bar.png");
 }
 
-
 .quick-search-button-dropmarker {
-  -moz-padding-start: 17px;
+  -moz-padding-start: 8px;
   -moz-padding-end: 0;
   padding-top: 6px;
   padding-bottom: 5px;
   list-style-image: url("chrome://global/skin/arrow/arrow-dn.png");
 }
 
 .quick-search-clearbutton {
-  background: url("chrome://messenger/skin/icons/SearchBarEnd.png") right center no-repeat;
   list-style-image: none;
   -moz-appearance: none;
   padding: 0px !important;
   border: none !important;
-  margin: 0px !important;
-  width: 20px;
-}
-
-.quick-search-clearbutton[chromedir="rtl"] {
-  background: url("chrome://messenger/skin/icons/SearchBarEnd-rtl.png") left center no-repeat;
+  margin: 0 0 1px !important;
+  width: 14px;
 }
 
 .quick-search-clearbutton[clearButtonHidden="false"] {
-  list-style-image: url("chrome://global/skin/icons/closetab.png") !important;
-  margin: 0px !important;
-  padding: 0px 3px;
+  list-style-image: url(chrome://global/skin/icons/searchfield-regular-cancel.png);
+  -moz-image-region: rect(0, 14px, 14px, 0);
 }
 
 .quick-search-clearbutton > .toolbarbutton-text {
   display: none;
 }
 
 .quick-search-clearbutton[clearButtonHidden="false"]:hover:active {
-  list-style-image: url("chrome://global/skin/icons/closetab-active.png") !important;
+  -moz-image-region: rect(0, 28px, 14px, 14px);
 }
 
 #searchInput {
-  background: url("chrome://messenger/skin/icons/SearchBarStart.png") left center no-repeat;
-  margin: 4px !important;
-  -moz-appearance: none;
+  margin: 3px 4px 4px !important;
+  -moz-appearance: searchfield;
   font: icon;
   height: 22px !important;
-  border: none !important;
-}
-
-#searchInput[chromedir="rtl"] {
-  background: url("chrome://messenger/skin/icons/SearchBarStart-rtl.png") right center no-repeat;
 }
 
 #searchInput > .textbox-input-box {
-  background: url("chrome://messenger/skin/icons/SearchBarMiddle.png") center repeat-x;
   border: none;
-  padding-top: 3px;
+  padding-top: 1px;
   height: 21px !important;
   margin: 0 !important;
 }