Bug 589219 - [OS X] Update Close Buttons Appearance; f=fryn r=dao ui-r=shorlander a=dolske
authorAnthony Ricaud <anthony@ricaud.me>
Thu, 10 Feb 2011 20:03:47 -0500
changeset 62320 8665df09de8bcc9c7c96711a8c11fde6538b0b13
parent 62319 722013f84d1f80353fb8e8fc0ad1725f000f16dc
child 62321 fd3209b6c4df7a65d0aa605dc9beb6041a351247
push idunknown
push userunknown
push dateunknown
reviewersdao, shorlander, dolske
bugs589219
milestone2.0b12pre
Bug 589219 - [OS X] Update Close Buttons Appearance; f=fryn r=dao ui-r=shorlander a=dolske
browser/themes/pinstripe/browser/browser.css
browser/themes/pinstripe/browser/jar.mn
browser/themes/pinstripe/browser/tabview/close.png
browser/themes/pinstripe/browser/tabview/tabview.css
toolkit/themes/pinstripe/global/findBar.css
toolkit/themes/pinstripe/global/icons/close-sidebar.png
toolkit/themes/pinstripe/global/icons/close.png
toolkit/themes/pinstripe/global/icons/closetab-active.png
toolkit/themes/pinstripe/global/icons/closetab-hover.png
toolkit/themes/pinstripe/global/icons/closetab.png
toolkit/themes/pinstripe/global/jar.mn
toolkit/themes/pinstripe/global/notification.css
toolkit/themes/pinstripe/global/notification/close.png
toolkit/themes/pinstripe/global/webConsole.css
--- a/browser/themes/pinstripe/browser/browser.css
+++ b/browser/themes/pinstripe/browser/browser.css
@@ -1774,31 +1774,32 @@ toolbarbutton.chevron > .toolbarbutton-m
  * In-tab close button
  */
 
 .tab-close-button > .toolbarbutton-icon {
   -moz-margin-end: 0px !important;
 }
 
 .tab-close-button {
-  list-style-image: url("chrome://global/skin/icons/closetab.png");
+  list-style-image: url("chrome://global/skin/icons/close.png");
   -moz-appearance: none;
   border: none !important;
   padding: 0;
   margin: 0;
   background: none;
   cursor: default;
+  -moz-image-region: rect(0, 16px, 16px, 0);
 }
 
 .tab-close-button:hover {
-  list-style-image: url("chrome://global/skin/icons/closetab-hover.png");
+  -moz-image-region: rect(0, 32px, 16px, 16px);
 }
 
 .tab-close-button:hover:active {
-  list-style-image: url("chrome://global/skin/icons/closetab-active.png");
+  -moz-image-region: rect(0, 48px, 16px, 32px);
 }
 
 .tabbrowser-arrowscrollbox > .scrollbutton-up,
 .tabbrowser-arrowscrollbox > .scrollbutton-down {
   -moz-image-region: rect(0, 11px, 17px, 0);
   margin: 0;
   padding: 0 4px;
   border: none;
@@ -1946,22 +1947,31 @@ toolbarbutton.chevron > .toolbarbutton-m
 
 .alltabs-item[busy] > .menu-iconic-left > .menu-iconic-icon {
   list-style-image: url("chrome://global/skin/icons/loading_16.png") !important;
 }
 
 /* Tabstrip close button */
 .tabs-closebutton {
   -moz-padding-end: 4px;
-  list-style-image: url("chrome://global/skin/icons/closetab.png");
+  list-style-image: url("chrome://global/skin/icons/close.png");
+  -moz-image-region: rect(0, 16px, 16px, 0);
   border: none;
 }
 
+#sidebar-header > .tabs-closebutton {
+  list-style-image: url("chrome://global/skin/icons/close-sidebar.png");
+}
+
+.tabs-closebutton:hover {
+  -moz-image-region: rect(0, 32px, 16px, 16px);
+}
+
 .tabs-closebutton:hover:active {
-  list-style-image: url("chrome://global/skin/icons/closetab-active.png");
+  -moz-image-region: rect(0, 48px, 16px, 32px);
 }
 
 /* Bookmarks toolbar */
 #PlacesToolbarDropIndicator {
   list-style-image: url(chrome://browser/skin/places/toolbarDropMarker.png);
 }
 
 /* Bookmark drag and drop styles */
@@ -2357,26 +2367,27 @@ panel[dimmed="true"] {
 #status-bar > statusbarpanel {
   border-width: 0;
   -moz-appearance: none;
 }
 
 #addonbar-closebutton {
   padding: 0;
   margin: 0 4px;
-  list-style-image: url("chrome://global/skin/icons/closetab.png");
+  list-style-image: url("chrome://global/skin/icons/close.png");
   border: none;
+  -moz-image-region: rect(0, 16px, 16px, 0);
 }
 
 #addonbar-closebutton:hover {
-  list-style-image: url("chrome://global/skin/icons/closetab-hover.png");
+  -moz-image-region: rect(0, 32px, 16px, 16px);
 }
 
 #addonbar-closebutton:hover:active {
-  list-style-image: url("chrome://global/skin/icons/closetab-active.png");
+  -moz-image-region: rect(0, 48px, 16px, 32px);
 }
 
 /* Status panel */
 
 .statuspanel-label {
   margin: 0;
   padding: 2px 4px;
   background: -moz-linear-gradient(white, #ddd);
--- a/browser/themes/pinstripe/browser/jar.mn
+++ b/browser/themes/pinstripe/browser/jar.mn
@@ -111,16 +111,17 @@ browser.jar:
   skin/classic/browser/tabbrowser/tab-bottom-selected-active.png         (tabbrowser/tab-bottom-selected-active.png)
   skin/classic/browser/tabbrowser/tabbar-top-bg-active.png               (tabbrowser/tabbar-top-bg-active.png)
   skin/classic/browser/tabbrowser/tabbar-top-bg-inactive.png             (tabbrowser/tabbar-top-bg-inactive.png)
   skin/classic/browser/tabbrowser/tab-top-normal-active.png              (tabbrowser/tab-top-normal-active.png)
   skin/classic/browser/tabbrowser/tab-top-hover-active.png               (tabbrowser/tab-top-hover-active.png)
   skin/classic/browser/tabbrowser/tab-top-selected-active.png            (tabbrowser/tab-top-selected-active.png)
   skin/classic/browser/tabbrowser/tab-overflow-border.png                (tabbrowser/tab-overflow-border.png)
   skin/classic/browser/tabbrowser/tabDragIndicator.png                   (tabbrowser/tabDragIndicator.png)
+  skin/classic/browser/tabview/close.png                    (tabview/close.png)
   skin/classic/browser/tabview/edit-light.png               (tabview/edit-light.png)
   skin/classic/browser/tabview/new-tab.png                  (tabview/new-tab.png)
   skin/classic/browser/tabview/search.png                   (tabview/search.png)
   skin/classic/browser/tabview/stack-expander.png           (tabview/stack-expander.png)
   skin/classic/browser/tabview/tabview.png                  (tabview/tabview.png)
   skin/classic/browser/tabview/tabview.css                  (tabview/tabview.css)
 #ifdef MOZ_SERVICES_SYNC
   skin/classic/browser/sync-throbber.png
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0945af275e8860ed810900b6d1f36d1707622eae
GIT binary patch
literal 833
zc$@)21HSx;P)<h;3K|Lk000e1NJLTq001xm000mO1ONa4`lmEH0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!<4Ht8R5;7El;2BJVHn3Brx(sMZKPg>
zgrXC?aWeOd$#xvEHACBUTU(oF%gxPcKhB(xWT0XS5>X*$rA{N67hZZLcp-TaLEY3}
zVPU0olMbGqqf^e=)u7@FXYcv$<^8<x_j%p}2>(}wOp>7jFJV2ZM5-r8LI3;{K>32T
zDGWilDN?X0ykN!h+#)LAVG_ngnj}Y+4=`iJ$*%%g381Dr1QyVN9<<O38hYyK%~Bo0
zn$sDwF^EEdw%~^wBtMM;5S5Kd0e#CGd+TUL_S^dF4eS#gzX3XEQTBb@-U&u9S~@?(
zp`Dx#Y{;Ep1bQG8h*b512RxOrPy|BcjEDi&rA+C(A-$K`&zM$9=U-&db`DU19Sk1_
z@L6_-^%&jRNBH#fAQ-@osvLj^cc>q2yMc>IW%6ARZLxlE11|<t?627#FsZgV^Bgl`
zx&L(yl@frit^1hA>Fm_e6iy$ftUVNx7|?y;_M8sYyMdivY+2PPhv)>nG$Q-K8&{kO
zGhs*c=PF(k)j$BWf~h%pbPuO#`J{#e6FFkQb?B8pe6B||wk&GP#(*Oy55WFda}O~#
z#^xOS{+4PX1!%yibN}XX0w<1=W-rx33g`k~`RL1bp@o;s%2Du<BLOJ(Gv+5Hevgyu
zDe;*e?`3iwbsmwWld`AX3#Z7=*t+r}a#qHLa2B<~DRu)@F>px%SJLUCxIJ)~{<Y%d
ziej&p@v5}QpAtg$8m>7g)Z$AbzsOwlB%E>ign)=f@{0_3XLI&og|fFFu5QlaT`Uo`
zse_u*vCZjyl)Xvg-R4f6^EORFHzd?vW*GY5R@t!H3kh<PQh*G-SbZ|8q>=a|P}At4
z%(c|}21>q_p296KHhRu3nmh$w5=S@OMe@^#-sP!6KNS^Qky<zH*)Ec!*1Z)ut5cYj
z^DszCzyK*BjOBcoEfi3Um(hj6Jh{j%&dp%3PVy-fR7Y-sfWOioZs(PVino5$00000
LNkvXXu0mjf5T1k#
--- a/browser/themes/pinstripe/browser/tabview/tabview.css
+++ b/browser/themes/pinstripe/browser/tabview/tabview.css
@@ -79,21 +79,24 @@ html[dir=rtl] .favicon {
   height: 16px;
 }
 
 .close {
   top: 6px;
   right: 6px;
   width: 16px;
   height: 16px;
-  background: url(chrome://global/skin/icons/closetab.png) no-repeat;
-  -moz-transition-property: opacity;
-  -moz-transition-duration: 0.5s;
-  -moz-transition-timing-function: ease-out;
-  opacity: 0.2;
+  background-image: -moz-image-rect(url(chrome://browser/skin/tabview/close.png), 0, 16, 16, 0);
+  background-repeat: no-repeat;
+}
+.close:hover {
+  background-image: -moz-image-rect(url(chrome://browser/skin/tabview/close.png), 0, 32, 16, 16);
+}
+.close:active {
+  background-image: -moz-image-rect(url(chrome://browser/skin/tabview/close.png), 0, 48, 16, 32);
 }
 
 html[dir=rtl] .close {
   right: auto;
   left: 6px;
 }
 
 .expander {
@@ -109,27 +112,25 @@ html[dir=rtl] .close {
 }
 
 html[dir=rtl] .expander {
   right: auto;
   left: 6px;
   -moz-transform: scaleX(-1);
 }
 
-.close:hover,
 .expander:hover,
 .appTabIcon:hover {
   -moz-transition-property: opacity;
   -moz-transition-duration: 0.5s;
   -moz-transition-timing-function: ease-out;
   opacity: 1.0;
 }
 
 .favicon img:hover, 
-.close img:hover, 
 .expander img:hover {
   opacity: 1;
   border: none;
 }
 
 .tab-title {
   bottom: -20px;
   text-align: center;
--- a/toolkit/themes/pinstripe/global/findBar.css
+++ b/toolkit/themes/pinstripe/global/findBar.css
@@ -25,26 +25,27 @@ label.findbar-find-fast:-moz-lwtheme,
 .findbar-find-status:-moz-lwtheme {
   color: inherit;
   text-shadow: inherit;
 }
 
 .findbar-closebutton {
   padding: 0;
   margin: 0 4px;
-  list-style-image: url("chrome://global/skin/icons/closetab.png");
+  list-style-image: url("chrome://global/skin/icons/close.png");
   border: none;
+  -moz-image-region: rect(0, 16px, 16px, 0);
 }
 
 .findbar-closebutton:hover {
-  list-style-image: url("chrome://global/skin/icons/closetab-hover.png") !important;
+  -moz-image-region: rect(0, 32px, 16px, 16px);
 }
 
 .findbar-closebutton:hover:active {
-  list-style-image: url("chrome://global/skin/icons/closetab-active.png") !important;
+  -moz-image-region: rect(0, 48px, 16px, 32px);
 }
 
 .findbar-find-next,
 .findbar-find-previous,
 .findbar-highlight {
   margin: 0 4px;
   padding: 1px 3px;
   -moz-appearance: none;
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0b95e1788759e6826bb498298b6c7914cf4a3f6b
GIT binary patch
literal 1163
zc%17D@N?(olHy`uVBq!ia0vp^20$#p!3-qR3wWA=lw^r(L`iUdT1k0gQ7VIDN`6wR
zf@f}GdTLN=VoGJ<$y6H#2F7OrJ|V9Ekw9o-et2>rgamTuE?qlk@fveSe;`{{-56Qr
z`ODYOT)0}<&<^2-B^3ZsOh(ztbz6aCdT~Q$N#nB@uV1`+^W@pfXD?noeg5*{qo=Z3
zR`I#@Ak(z0VzX;ywJc+^Yk*`-W_3(f^`j@xfb6J@%IM6h?n$#`wJbo~^vVYhpG2gV
zMWmKPL_(5^WHl|UT!TXr3qul%K&EM00Lh^Ed{qP6hSu)p_Fio>CmnNVAU7a9F|D9J
zt*~BJ)7(EgJ0-uisl5m27a-R!Dl0fHCqAtpDYK}lt!MJ|*+DVcNtwmTnZ@b3r9KfE
zK9L#exn)3=I%dv35$Q2$#j)vSTBeRuXU@|wwvWju)iQAaO37-N1;u1Wrxhn=R{+`C
zrj7y8nQ<8<TX!8;vvKFT&AZoc-R<BVxpC{BExQg(m@;$1)S0vAFYyUY@(oLt*EI7B
zPf<6r)ikz;gd|X<y=S<(p{<6Y?d!Mi-@f}Gt8M~B>$dJ)w{34?Zgoa+BZw?%%qVH<
zoIJl{^8A**Sv}JhPnox}xp!9gv_+HVtVk)SD{bg2ZS1S<m|EL8tz+^6opT$u0h7g?
zk|4ie25ufcAt6ywNf`xQJp*G?GYc2bz`)3a<g|>OywcLrs;ZjWhK7cwrsn1rAZP`G
zwzjtRj*iaG?j9iM?d$8GFk!;PiIad}G7wCGf~i0-ZQ8WyATVRb%$c)h%?5%wATW3C
z+<EinFI>2A(W1qRmo8hrV&$sUtJkjGvUS_GbLTEzy!i0(%a<?Tym=En_jv;_Wlr{V
zaSYKopPV4Ua3J^gH7>T?ZFdyx@)P{cCBCqHO1c`5w|433g{xLAT%8)r_vpHHR@Um(
zD^_G@TU|SRrDL<9!3GZp%Z*asRPET<{w*z&+Ne<1w99uz`@VhEGkU9-LOP$!>3p;1
zZ}AdE8~eLm)7I_jIrq#<)?VO#xb>=KR)$+wsm0wEU*(u_YmcY!vvVSCSr<IQ%3i!G
z3G%wwlo4>g#CP>NuVU>BEtv^ZX4}>O(_vLx!4}$WmCCNZl&v_lgH3dG+4U_Z+xfgj
zXRxuI)8rQSdz#dcX>h_cIQX)*QETP}fByasjuS?W*$HzE>c91{PQIDw_lbQM`wOl7
z8I$iczGK{Vius+&%$=J>o-RK>xwUc^&x?6csqINKmM;cLYO%e`{1?Zn=C;$$kwZU1
z`JBe_JBu!8cq&UA;SW0hEo;-3tS_g+`I~+^GQ5a)W7JST;&Aw;L+I5Dk%tvnj+9>v
z=Qj!qG~^7rUVc#Oa?r$sbqNA8nyinyE7*QEIZjy45ymUCC@DbU6yqb~&mSBa`Hdw#
ag&E}AvQ|4-Y&Zu@Mhu>=elF{r5}E*AnHpsP
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..9d5b280f258346cfcc848d37380478c57307f965
GIT binary patch
literal 771
zc$@(P1N{7nP)<h;3K|Lk000e1NJLTq001xm000mO1ONa4`lmEH0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!rAb6VR5;7cl<!YcVHC#?jtjEuFVsm|
z8yhjKX=}9Al3pYTXil9QqTIHcS_Zy=R*H$kP%7oeR7wzk48<SRax@E6>>sH%U-Y)Q
zUNrxK+Yy4ePj7rvYv1j;=bp1YpZk2zb1ty(cLo0i0HkmiY+%ik4KvbQy&k3^3afdF
zVy6Do0Ll#Q&;(l0fEpTc)#6(_WzN<M7Qh1&C>M;QT<O?Tus{F=O@h+&vsj=bPSAs!
zw#A*-7|?@G$-Ey&payz!^&mK4^8R9t7oQG^&k_bVMnMihpeYQACa4msNaQLE3G^I*
z0kjDhyL-HS<z9W?kGE_xHHoJ%<mv$!H7_MnuanjDRj*=+M9R8?fB**&mn$svkjO3?
zqKD;{Ed>E+s_Q%QvKz<Sxc$a=|K)x(={H~wMyuw$k*#=acQd*9&cAvFGcd=si29<c
zGt#|u??vOM8?1l;sG&vr@C0$P{dpVQ!c0EE4(_tZ^xFE)`i?JJ9zlynNC22hYmKy?
z*2|4|#6%Aa*jn9%{%^DF61#LXs~o^yZ~?>MtXTBK!trq27n3YwtL+4USH!pSnM-P=
zns4G;c_pMpN+x4Y#;B{e35!M~{<VXZy%#a}*2-S=pxXb(35sv>%<{IwhOgIa+jtL(
zHDr@NJk6MsG3q0?$>{h%WO@JjoAULtHFs=ze=rJTq(wE3j?XIeo;qxBbg<_*fG)h0
zrk9TugXn#W%rgH77|e9#-y-n01}nla1ykZsYY_aH36O(!_E&2uj5s~0WI%@-cBY+I
zW88^vx=JQn7tY}KI^h|P*b|fsBPWarXHGrIA-$NvQyB8pC1ygoS?O*T`rt%foM;cO
z7z=&f&8Pp_m9r|gk&p_r**eY2SOp;&X8*<C^e4mSiNx~bt9AeY002ovPDHLkV1l;=
BY&ie`
deleted file mode 100644
index 831053175f4658deabe3afb96b1c38fc8f372592..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 22b1c46d95f2db524a215a2987182432b56e6c54..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 118be6dcab57d89459ae39abce26f5b1e29b7429..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
--- a/toolkit/themes/pinstripe/global/jar.mn
+++ b/toolkit/themes/pinstripe/global/jar.mn
@@ -87,19 +87,18 @@ toolkit.jar:
   skin/classic/global/dirListing/remote.png                          (dirListing/remote.png)
   skin/classic/global/dirListing/up.png                              (dirListing/up.png)
   skin/classic/global/icons/autocomplete-dropmarker.png              (icons/autocomplete-dropmarker.png)
   skin/classic/global/icons/autoscroll.png                           (icons/autoscroll.png)
   skin/classic/global/icons/blacklist_favicon.png                    (icons/blacklist_favicon.png)
   skin/classic/global/icons/blacklist_64.png                         (icons/blacklist_64.png)
   skin/classic/global/icons/chevron.png                              (icons/chevron.png)
   skin/classic/global/icons/checkbox.png                             (icons/checkbox.png)
-  skin/classic/global/icons/closetab-active.png                      (icons/closetab-active.png)
-  skin/classic/global/icons/closetab-hover.png                       (icons/closetab-hover.png)
-  skin/classic/global/icons/closetab.png                             (icons/closetab.png)
+  skin/classic/global/icons/close-sidebar.png                        (icons/close-sidebar.png)
+  skin/classic/global/icons/close.png                                (icons/close.png)
   skin/classic/global/icons/commandline.png                          (icons/commandline.png)
   skin/classic/global/icons/information-16.png                       (icons/information-16.png)
   skin/classic/global/icons/information-24.png                       (icons/information-24.png)
   skin/classic/global/icons/information-32.png                       (icons/information-32.png)
   skin/classic/global/icons/information-64.png                       (icons/information-64.png)
   skin/classic/global/icons/information-large.png                    (icons/information-large.png)
   skin/classic/global/icons/loading_16.png                           (icons/loading_16.png)
   skin/classic/global/icons/menulist-dropmarker.png                  (icons/menulist-dropmarker.png)
@@ -126,16 +125,17 @@ toolkit.jar:
   skin/classic/global/icons/Error.png                                (icons/Error.png)
   skin/classic/global/icons/question-16.png                          (icons/question-16.png)
   skin/classic/global/icons/question-24.png                          (icons/question-24.png)
   skin/classic/global/icons/question-32.png                          (icons/question-32.png)
   skin/classic/global/icons/question-64.png                          (icons/question-64.png)
   skin/classic/global/icons/question-large.png                       (icons/question-large.png)
   skin/classic/global/icons/sslWarning.png                           (icons/sslWarning.png)
   skin/classic/global/icons/webconsole.png                           (icons/webconsole.png)
+  skin/classic/global/notification/close.png                         (notification/close.png)
   skin/classic/global/notification/critical-bar-background.png       (notification/critical-bar-background.png)
   skin/classic/global/notification/error-icon.png                    (notification/error-icon.png)
   skin/classic/global/notification/info-bar-background.png           (notification/info-bar-background.png)
   skin/classic/global/notification/info-icon.png                     (notification/info-icon.png)
   skin/classic/global/notification/warning-bar-background.png        (notification/warning-bar-background.png)
   skin/classic/global/notification/warning-icon.png                  (notification/warning-icon.png)
   skin/classic/global/media/videocontrols.css                        (media/videocontrols.css)
   skin/classic/global/media/pauseButton.png                          (media/pauseButton.png)
--- a/toolkit/themes/pinstripe/global/notification.css
+++ b/toolkit/themes/pinstripe/global/notification.css
@@ -56,30 +56,31 @@ notification[type="critical"] .messageIm
   padding: 0;
   font-weight: bold;
 }
 
 .messageCloseButton {
   -moz-appearance: none;
   padding: 0;
   margin: 0 2px;
-  list-style-image: url("chrome://global/skin/icons/closetab.png");
+  list-style-image: url("chrome://global/skin/notification/close.png");
   border: none;
+  -moz-image-region: rect(0, 16px, 16px, 0);
 }
 
 .messageCloseButton > .toolbarbutton-text {
   display: none;
 }
 
 .messageCloseButton:hover {
-  list-style-image: url("chrome://global/skin/icons/closetab-hover.png");
+  -moz-image-region: rect(0, 32px, 16px, 16px);
 }
 
 .messageCloseButton:hover:active {
-  list-style-image: url("chrome://global/skin/icons/closetab-active.png");
+  -moz-image-region: rect(0, 48px, 16px, 32px);
 }
 
 .messageCloseButton:-moz-focusring > .toolbarbutton-icon {
   border-radius: 10000px;
   box-shadow: 0 0 2px 1px -moz-mac-focusring,
               0 0 0 2px -moz-mac-focusring inset;
 }
 
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..3300a4d61ec92c7afb2dce9ce6e58898b46f8bfe
GIT binary patch
literal 795
zc$@(n1LXXPP)<h;3K|Lk000e1NJLTq001xm000mO1ONa4`lmEH0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!y-7qtR5;7Elubw!VI0OEm7Q^wRosOn
z{3r`s>S81-$bfbby@ZK~<iTTy4u&jt2#oflZPiv&DKb+_HWiHMn63LU>&Id^=2uM#
zhR`91BEhrpblA0Kc1eVY-(`4tXMViTf8Gbg|K%u~(kReGGc6j-G*Mt$Vn;d+6p}D7
z{ip)5QOfmT7(*I{b3Kg`#rWroCBq~XENf5<lf@F#H39(VkqrPa;(|_`Blg1!7lv^c
z4mjY!6S&|N`<X)!G-L!Z2N??H5kUlVP#|M2BS?c*P=0IF+Ky}(OWGWxsL%+^=z|l_
zt}hkNq8r})fc-7T;Y1(J1VI5Y$XK<`h?`izyzt@dYpg*=jDkk+y@kq7*xFvwwjHAK
zqg5lYzz6q;pX$~|K_ow<Zcz14zzrWQ3Be+w(je=4?4l~Do(|Sk4<L#~oq&1!(^PiC
z+aW6ZuM)5R5x7bRcY|F2w5G0ceJ^}&04|+CHU@?oDRs5G?3DcV*#XE&0^sHGuK_Al
zzJ;cWbThEP2M0VQqn~4Z$JH-OrK9k`p%X+973JHltYoF{icv-skz|1}9!@+cWTyzc
z$HMQIxx$r?%LNg1rwHZ+^~N>YXuEk;RI!jEsH~2M6A$WQO>#tq6Y2)n_kus)aD8jz
z<WzD*nM-#%DETivx=g9Zp1G6~5t|a(=j~5ZVN3FmpFid1Uii$=smHrPZoU{#9&+`4
zR{86*LSlHRkySPKQicq$nHB(G9-DPDFrybv^p1^KAHoCA=?7yY@fF=~8Y}l^%_54Z
zI9u+Gujo(kcXCWUaKni%xZ!{UZgjy3x2fmgq6ssILdF7QL=Z_lMTHsNMLVo2I-5*B
z^unj1*W~MLI;e`;215WbENX}u0<{ggsyMXl%q*jg6&h?TqxpB)8Ck>=Nfgm|)Ux|0
ZegU22(-a8^IJp1-002ovPDHLkV1m8JWbFU|
--- a/toolkit/themes/pinstripe/global/webConsole.css
+++ b/toolkit/themes/pinstripe/global/webConsole.css
@@ -275,31 +275,32 @@
   -moz-image-region: rect(24px, 40px, 32px, 32px);
 }
 
 .webconsole-msg-output.webconsole-msg-log > .webconsole-msg-icon-container > .webconsole-msg-icon {
   -moz-image-region: rect(24px, 48px, 32px, 40px);
 }
 
 .webconsole-close-button {
-  list-style-image: url("chrome://global/skin/icons/closetab.png");
+  list-style-image: url("chrome://global/skin/icons/close.png");
   margin-top: 0;
   margin-bottom: 0;
   -moz-margin-start: 3px;
   -moz-margin-end: -14px;
   min-width: 0;
   -moz-appearance: none;
+  -moz-image-region: rect(0, 16px, 16px, 0);
 }
 
 .webconsole-close-button:hover {
-  list-style-image: url("chrome://global/skin/icons/closetab-hover.png");
+  -moz-image-region: rect(0, 32px, 16px, 16px);
 }
 
 .webconsole-close-button:hover:active {
-  list-style-image: url("chrome://global/skin/icons/closetab-active.png");
+  -moz-image-region: rect(0, 48px, 16px, 32px);
 }
 
 /* JSTerm Styles */
 
 .jsterm-wrapper-node {
   font-family: monospace;
   font-size: 1em;
   background-color: #000;