--- a/suite/themes/modern/communicator/sidebar/sidebar.css
+++ b/suite/themes/modern/communicator/sidebar/sidebar.css
@@ -85,20 +85,24 @@
   padding-left: 2px;
 }
 
 /* ..... close button ..... */
 
 #sidebar-close-button {
   margin: 0px 1px;
   -moz-binding: url("chrome://global/content/bindings/toolbarbutton.xml#toolbarbutton-image");
-  padding: 4px 2px 4px 4px;
+  padding: 0px;
   list-style-image: url("chrome://global/skin/icons/closebox.gif");
 }
 
+#sidebar-close-button > .toolbarbutton-icon {
+  margin: 0px;
+}
+
 /* ::::: loading info ::::: */
 
 .text-panel-loading {
   margin: 5px 0px;
 }
 
 .text-panel-loading[loading="false"] {
   margin-left: 11px;

index 20666696fd91cfa7726567bb988fe47782fbaf15..da69691601fab3fb7964879cc75dbfd08526ccc7
GIT binary patch
literal 67
zc${<hbhEHb6ky<IXkY+=|Ns9h{$ycfU|?j>0r5dH3`|lz{VPwu&1Z1fbhTjZ9E06w
RGXqyt$h9n670ke34FE#-6iEO8

--- a/suite/themes/modern/global/textbox.css
+++ b/suite/themes/modern/global/textbox.css
@@ -104,16 +104,26 @@ textbox[readonly="true"] {
 /* ::::: plain textbox ::::: */
 
 textbox.plain {
   margin: 0px !important;
   border: none !important;
   padding: 0px !important;
 }
 
+/* ::::: search textbox ::::: */
+
+.textbox-search-icon {
+  list-style-image: url("chrome://global/skin/icons/search.gif");
+}
+
+.textbox-search-clear {
+  list-style-image: url("chrome://global/skin/icons/closebox.gif");
+}
+
 /* ::::: scrollable textbox ::::: */
 
 .scrollfield {
   border: none !important;
   margin: 0px;
   margin-top: 1px;      
   padding: 0px !important;
   background: inherit;

--- a/suite/themes/modern/jar.mn
+++ b/suite/themes/modern/jar.mn
@@ -43,17 +43,16 @@ modern.jar:
   skin/modern/communicator/icons/lock-broken.gif                   (communicator/icons/lock-broken.gif)
   skin/modern/communicator/icons/lock-insecure.gif                 (communicator/icons/lock-insecure.gif)
   skin/modern/communicator/icons/lock-mixed.gif                    (communicator/icons/lock-mixed.gif)
   skin/modern/communicator/icons/lock-secure.gif                   (communicator/icons/lock-secure.gif)
   skin/modern/communicator/icons/offline.gif                       (communicator/icons/offline.gif)
   skin/modern/communicator/icons/online.gif                        (communicator/icons/online.gif)
   skin/modern/communicator/icons/plugin.png                        (communicator/icons/plugin.png)
   skin/modern/communicator/icons/save.png                          (communicator/icons/save.png)
-  skin/modern/communicator/icons/search.gif                        (communicator/icons/search.gif)
   skin/modern/communicator/icons/smileys/smile_n.gif               (communicator/icons/smileys/smile_n.gif)
   skin/modern/communicator/icons/smileys/frown_n.gif               (communicator/icons/smileys/frown_n.gif)
   skin/modern/communicator/icons/smileys/wink_n.gif                (communicator/icons/smileys/wink_n.gif)
   skin/modern/communicator/icons/smileys/tongue_n.gif              (communicator/icons/smileys/tongue_n.gif)
   skin/modern/communicator/icons/smileys/laughing_n.gif            (communicator/icons/smileys/laughing_n.gif)
   skin/modern/communicator/icons/smileys/embarrassed_n.gif         (communicator/icons/smileys/embarrassed_n.gif)
   skin/modern/communicator/icons/smileys/undecided_n.gif           (communicator/icons/smileys/undecided_n.gif)
   skin/modern/communicator/icons/smileys/surprise_n.gif            (communicator/icons/smileys/surprise_n.gif)
@@ -209,26 +208,27 @@ modern.jar:
   skin/modern/global/filepicker/folder-home.gif                    (global/filepicker/folder-home.gif)
   skin/modern/global/filepicker/folder-new.gif                     (global/filepicker/folder-new.gif)
   skin/modern/global/icons/alert-error.gif                         (global/icons/alert-error.gif)
   skin/modern/global/icons/alert-exclam.gif                        (global/icons/alert-exclam.gif)
   skin/modern/global/icons/alert-message.gif                       (global/icons/alert-message.gif)
   skin/modern/global/icons/alert-question.gif                      (global/icons/alert-question.gif)
   skin/modern/global/icons/alert-security.gif                      (global/icons/alert-security.gif)
   skin/modern/global/icons/autoscroll.png                          (/mozilla/toolkit/themes/winstripe/global/icons/autoscroll.png)
+  skin/modern/global/icons/close-act.gif                           (global/icons/close-act.gif)
   skin/modern/global/icons/close-dis.gif                           (global/icons/close-dis.gif)
-  skin/modern/global/icons/close-act.gif                           (global/icons/close-act.gif)
+  skin/modern/global/icons/close-hov.gif                           (global/icons/close-hov.gif)
   skin/modern/global/icons/close.gif                               (global/icons/close.gif)
-  skin/modern/global/icons/close-hov.gif                           (global/icons/close-hov.gif)
+  skin/modern/global/icons/closebox.gif                            (global/icons/closebox.gif)
   skin/modern/global/icons/pg-landscape.gif                        (global/icons/pg-landscape.gif)
   skin/modern/global/icons/pg-landscape-small.gif                  (global/icons/pg-landscape-small.gif)
   skin/modern/global/icons/pg-portrait.gif                         (global/icons/pg-portrait.gif)
   skin/modern/global/icons/pg-portrait-small.gif                   (global/icons/pg-portrait-small.gif)
-  skin/modern/global/icons/closebox.gif                            (global/icons/closebox.gif)
   skin/modern/global/icons/resizer.png                             (global/icons/resizer.png)
+  skin/modern/global/icons/search.gif                              (global/icons/search.gif)
   skin/modern/global/menu/menu-arrow-dis.gif                       (global/menu/menu-arrow-dis.gif)
   skin/modern/global/menu/menu-arrow-hov.gif                       (global/menu/menu-arrow-hov.gif)
   skin/modern/global/menu/menu-arrow.gif                           (global/menu/menu-arrow.gif)
   skin/modern/global/menu/menu-check-dis.gif                       (global/menu/menu-check-dis.gif)
   skin/modern/global/menu/menu-check-hov.gif                       (global/menu/menu-check-hov.gif)
   skin/modern/global/menu/menu-check.gif                           (global/menu/menu-check.gif)
   skin/modern/global/menu/menu-radio-dis.gif                       (global/menu/menu-radio-dis.gif)
   skin/modern/global/menu/menu-radio-hov.gif                       (global/menu/menu-radio-hov.gif)

--- a/suite/themes/modern/navigator/navigator.css
+++ b/suite/themes/modern/navigator/navigator.css
@@ -504,17 +504,17 @@ panel[nomatch="true"] > .autocomplete-se
 #search-button {
   margin: 0px 4px 0px 0px;
   min-width: 0px;
   font: message-box;
   font-weight: bold;
 }
 
 #search-button {
-  list-style-image: url("chrome://communicator/skin/icons/search.gif");
+  list-style-image: url("chrome://global/skin/icons/search.gif");
 }
 
 /* ::::: navigator throbber ::::: */
 
 #throbber-box {
   background: none; /* override bg used to cover toolbar line */
   margin: 0px 0px 2px 0px;
 }