# HG changeset patch
# User Matt A. Tobin <email@mattatobin.com>
# Date 1724007608 18000
# Node ID 8a4065f3f2865f273c415ea45a24eb8b5e120ebf
# Parent  af089bd84175261f48c6e2d6955c1906856badf5
[UNFINISHED] Issue 9999999 - Use Aviary style on the navi tabstrip.

diff --git a/suite/themes/classic/communicator/icons/tab-close.png b/suite/themes/classic/communicator/icons/tab-close.png
new file mode 100644
index 0000000000000000000000000000000000000000..b594742ace93538d1f7514986dfc7246b3fe9cad
GIT binary patch
literal 1289
zc$@(V1@`)hP)<h;3K|Lk000e1NJLTq002M$000mO1^@s6rssJn00004XF*Lt006O%
z3;baP00009a7bBm000XT000XT0n*)m`~Uy|2XskIMF-mn3kwbq;azbz0000ObVXQn
zQ*UN;cVTj60B~VxZgehgWpp4kE-)@RY%_jN000DZNkl<ZSV!eoYfKbZ6u$m4Cf2Gk
z(dhaDk;Jeos|J1;9#KM{G)77Zq1jSn($<6@EvZQjr4&-I(V8}?f!4N=t&%F#RMcvP
zSlu>lmoA}HYhl4qHw8+xv37M`UO7GA-8;jb4WLU*`ooiaGiT2EzQa9dX73Dwh#qRl
zL(B5zHjgve-C6K#_>!xDrUN+OLL-!oCMDU%vbMO#ONzteZ<NrqU=Fy@D7n}#gpE<l
z2r}p%00&%CKT|UYaNeHe9ym}%gCD$mUjP>xRY%;(NOzB%XrPhP$L<fzg+|H6d$VTM
zp3TXjE9K?nudbdJ;D8H_lF!)80eGLx4hJerDHcGZ>WEuAT;b4>Pbd~ZqvXP!kPy1G
zXAi{!Xq0@$W)9$|$Fitz_p1_tx8J1OogLg{*+h(e8RMK0gGSX6H(Z7E@4*8S!Ov=F
zw5OYbbstT{*q1TR88K*-Tzr|5LhZ%HCOS(?E!UI9pi%N@dxWuz@u<9t7<|N#GtC^p
z_ZeyAe|e`w(DyTkh=vCT>FVwh3HUJN!0|ovG@Y>7%mobO<<j5pluHa>xh%P3H?Gso
z_xDS{ham^f&`Ue%54+veA5BiCABu`3e%-s5`Y&Fj%lr13G5ClfCu1%b)vsDL)d0|F
zJ)@d|#sT<<A!iydDRQ`wnnJ%97D)8$dWDAj`y&hHv*F(j1jv)Mm5wi6N=Fwilu&iV
zwVbDD==Ikmu2;N8V?#qygR|j}4h&ErKcD>Ec-NXW5=t%_)~%xp+qX;nQc*$u9*;z4
zWu=61-CkBkjT<&l&4LATLsar;(;LQF_w}b@VgRiUJ9RwqIQg=&$eWo#ZM@0c>FbjV
zhu!k~>G;~U)G&X(1*(qd*}8@PEP8<g&ll3Q{O2gJ<3$?bff*L=?WNyRQ>im9&H^PD
zpU213x$JBc?fkeKO&j=z?>cXMmN$ZuPiFcMCT$+ZON$)b^X8F`#)Jg=r@LD&9tIz=
zXr8Jg+E%Y79Uc7pyvt1+1|P9#o|21$T<g;%OX%Z8i>QVN`{CTV)W$o$(Y&{+%F_4)
zA3z=dK?7g#-7uQRS@)6CxvGx%Zskfc;N7%|LaKS3bsssMtK|3&urzimFVAxK0mPzt
zN*--`^Em6iWeB{i$l=hOIb`5!Q<Gfq&8{vw%o_~=ABLRHRdqz`iWOwwuahSw_ck}|
z*|<>xJ`6dXtK^meH0S18n%0MboX%D9Xp4OlteriZ4Ad`MM!k)V<mLq$G5Clfr*l;u
zahl%<23ppyr-9~XYIQoz7<|N#)457+8NgTDw#gk|zvFTU979g$DtWZU{u-=Xyf{?P
zzrk1ljjAKgBqoN=CMHrWfJVtN0Lv%vA>JSK>nUPEC7-dG12_^F*K&+sMX>-HRY#n2
zI9ks0qaF*OQF06b-}ccB-U|=zQ}}RvytBz}_nq3jdHn0NG@1_JfD4VPBhEM+&Tmsv
zd_ShAk9#vS`BgeKzyTK;CC32%-+zW4UXb_?n5%ZuUyfvE00000NkvXXu0mjfzB^-;

diff --git a/suite/themes/classic/jar.mn b/suite/themes/classic/jar.mn
--- a/suite/themes/classic/jar.mn
+++ b/suite/themes/classic/jar.mn
@@ -181,16 +181,17 @@ classic.jar:
   skin/classic/communicator/icons/alwaysAsk.png                         (communicator/icons/alwaysAsk.png)
   skin/classic/communicator/icons/application.png                       (communicator/icons/application.png)
   skin/classic/communicator/icons/feedIcon.png                          (communicator/icons/feedIcon.png)
   skin/classic/communicator/icons/feedIcon16.png                        (communicator/icons/feedIcon16.png)
   skin/classic/communicator/icons/notification-16.png                   (communicator/icons/notification-16.png)
   skin/classic/communicator/icons/notification-64.png                   (communicator/icons/notification-64.png)
   skin/classic/communicator/icons/geo.png                               (communicator/icons/geo.png)
   skin/classic/communicator/icons/save.png                              (communicator/icons/save.png)
+  skin/classic/communicator/icons/tab-close.png                         (communicator/icons/tab-close.png)
   skin/classic/communicator/icons/smileys/smiley-smile.png              (communicator/icons/smileys/smiley-smile.png)
   skin/classic/communicator/icons/smileys/smiley-frown.png              (communicator/icons/smileys/smiley-frown.png)
   skin/classic/communicator/icons/smileys/smiley-wink.png               (communicator/icons/smileys/smiley-wink.png)
   skin/classic/communicator/icons/smileys/smiley-tongue.png             (communicator/icons/smileys/smiley-tongue.png)
   skin/classic/communicator/icons/smileys/smiley-laughing.png           (communicator/icons/smileys/smiley-laughing.png)
   skin/classic/communicator/icons/smileys/smiley-embarrassed.png        (communicator/icons/smileys/smiley-embarrassed.png)
   skin/classic/communicator/icons/smileys/smiley-undecided.png          (communicator/icons/smileys/smiley-undecided.png)
   skin/classic/communicator/icons/smileys/smiley-surprise.png           (communicator/icons/smileys/smiley-surprise.png)
@@ -497,14 +498,18 @@ classic.jar:
   skin/classic/navigator/btn1/next.png                                  (navigator/btn1/next.png)
   skin/classic/navigator/btn1/previous.png                              (navigator/btn1/previous.png)
   skin/classic/navigator/btn1/top.png                                   (navigator/btn1/top.png)
   skin/classic/navigator/btn1/up.png                                    (navigator/btn1/up.png)
   skin/classic/navigator/icons/chevron.png                              (navigator/icons/chevron.png)
   skin/classic/navigator/icons/popup-blocked.png                        (navigator/icons/popup-blocked.png)
   skin/classic/navigator/icons/tab-drag-indicator.png                   (navigator/icons/tab-drag-indicator.png)
   skin/classic/navigator/icons/tab-new.png                              (navigator/icons/tab-new.png)
+  skin/classic/navigator/icons/tab.png                                  (navigator/icons/tab.png)
+  skin/classic/navigator/icons/tab-active-bkgnd.png                     (navigator/icons/tab-active-bkgnd.png)
+  skin/classic/navigator/icons/tab-bkgnd.png                            (navigator/icons/tab-bkgnd.png)
+  skin/classic/navigator/icons/tab-hover-bkgnd.png                      (navigator/icons/tab-hover-bkgnd.png)
 [extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar:
 % override chrome://global/skin/about.css                         chrome://communicator/skin/about.css
 % override chrome://global/skin/aboutSupport.css                  chrome://communicator/skin/aboutSupport.css
 % override chrome://global/skin/config.css                        chrome://communicator/skin/config.css
 % override chrome://global/skin/in-content/info-pages.css         chrome://communicator/skin/communicator.css
 % override chrome://mozapps/skin/places/defaultFavicon.svg        chrome://communicator/skin/places/bookmark-item.svg
diff --git a/suite/themes/classic/navigator/icons/tab-active-bkgnd.png b/suite/themes/classic/navigator/icons/tab-active-bkgnd.png
new file mode 100644
index 0000000000000000000000000000000000000000..6030278c3057b76a0496dec96d36fddd32c223a8
GIT binary patch
literal 188
zc%17D@N?(olHy`uVBq!ia0vp^j6m$o!3HEZUVGaNq*&4&eI0?kzM9{GlYxBB0*}aI
z1_rr<Ak26;Gb9)&80YEY7$R}`?#Ye3%!(o`7ZVkKyYBdZC3m8t#pyZyr3FF@xeGp-
zT)I$Qucf4O+gWp|^8tZ^oMX?HUYiw~z4cnu@`m7T>vuQw7o97<9z98KYS1#Jq@>@4
g_va@_GuEFFKbdXXV*A_iKhP!yPgg&ebxsLQ0DC7z0ssI2

diff --git a/suite/themes/classic/navigator/icons/tab-bkgnd.png b/suite/themes/classic/navigator/icons/tab-bkgnd.png
new file mode 100644
index 0000000000000000000000000000000000000000..34cbf61ea3bb201906d43f8e2ffb526b492177d3
GIT binary patch
literal 189
zc%17D@N?(olHy`uVBq!ia0vp^j6m$o!3HEZUVGaNq*&4&eI0?kzM9{GlYxBB0*}aI
z1_rr<Ak26;Gb9)&81L!g7$R}`?(vO+%!)iN7gJA$&aPfA(AMFoy@Xrlr&qzJXZ1aX
zc2i0u1l!-$NeC`dS-!iw`n|K~^laUtb2lSHPp;BpI$^HzetT5*$$P(-&Qv|?!xFIn
hNp@hULPPyi#tWS;ZJm~VTYy$Ec)I$ztaD0e0stqFLofgU

diff --git a/suite/themes/classic/navigator/icons/tab-hover-bkgnd.png b/suite/themes/classic/navigator/icons/tab-hover-bkgnd.png
new file mode 100644
index 0000000000000000000000000000000000000000..75d2fba75b7ac71fd3b6cd12ed342a302681ed8c
GIT binary patch
literal 892
zc%17D@N?(olHy`uVBq!ia0vp^j6m$o!3HEZUVGaNq&O0jLwtZV3rLdtRG1r(mP&(&
zF~Br1z<?3+3r5D{N8_Y`?3tb}jv*3L?;hO9)fB+cc2QqRNhzyKfuo5-NvVC?v}Mbd
z9cznwf9QRc;2l>Py%!1^9E&>6C%(UExh41a()YjlW3TVcob}8#_PYP7RaF7gp3YsQ
zk@uwX-9(j>qS<TPRro!{Ywp`8_gE(OSSr12SYkV=%;Q$l+Pea64`-S9hFd(J<`TF?
z;q)fULYea%O$lAac}+_U4;%FSNVZQ&@&3MWW57=&uP|cwO3bz`=YZ^`X(^5&K$;2a
z9S4SnhxSbhO$t#`Qccq`1e!RcdbVxbwhV|Duz#`fo5LC#;}R&t_w)+;j(dyWJ7@n*
zm1yIyy}$qEu6M15&pHjCIo{q@K5N;|g<JOpg--RJq#`~gNYAOmc;EZ^A8g)t2s~<-
za>>zar#eTItk+82M2WnPMH#-+QngQQikbBMXOoHV^DCvci#5753uXK_T<hC-tq<s}
zrxKwbHcL<BM)DRjc5iJ|NLL54mqWe90`k_v?n4O@2Oi2dISTMJB^XNTMd-x{c1Q5c
z>Uoy!_Im5-^8Yu#_3<A|$jwPi&B<xr`~J}L{|`S0T>onS*y7*9Rr_b$<WKu{<c!>k
zSLUm#(k0rYYwyRO{QRe@_+3-SoX$lrTqN4uU7k1yuvE_}j_)|3UMTb4W73mm6W{G3
zt{WG=-esD5dtJt?G|$jb?o*rQOisPY^Zu{M`@b#b-<bZri+-9Y7;_TIW2`vh>y>CM
zklhFM7#rAQ>zWuO8ZPD=OYpEYA51Ww`7X_P29KC|x9i$(x6h{SzPau_)9=QOhDwc2
zY4hJdv@D7J?pS;I`(N&_oxdFRF1{D=KXCmD@mt$$CqMt$*<mp$^=4zojmat}`yftN
zRJt}Lb?2g0tL$Ixio0ZTmZ`MQ%6aZ0zkuT_l&>hhYLNfNx{Ntt$HRSJUx1wH>FVdQ
I&MBb@07dC#^8f$<

diff --git a/suite/themes/classic/navigator/icons/tab-new.png b/suite/themes/classic/navigator/icons/tab-new.png
index c87613aa3cbcd80bd0017beb35a2d448b6a52305..4282a1b1c7d4887aa7a9392d594f57bab65fc739
GIT binary patch
literal 762
zc$@+H0tNkvP)<h;3K|Lk000e1NJLTq000&M000pP1^@s6*|A)M00007bV*G`2j&SI
z0U{t9-|P<n000SaNLh0L03N{r03N{s!)a7g00004XF*Lt006O%3;baP0007sNkl<Z
zc-rMuPe>F|9RA+C+1Z`hogKB<O+mvpQd~tNc9S%sl<FW7M$w^5haiKZQ-`1;>d+zZ
zmJl6+g6JYi)Wtef80sM_B-{MQuCckRtvkDGqvh=McGAU`jor@uVEE1N_kQo2?|tuM
z2-afk-H@3hDQZL#ame}{EU_po(FmLtJA4<elHA$#sBdaUZg3lm5A&tQ_<{gQlF`v|
z60VAB@KzC2Q}O=n5d;4a{Q65MQD)3*3cQueh%KsSufpSn)YuHsq2S~BqZmHjY4kLl
z!;M$TTpaRO;EA{!-YSZ=Mi;B9%$~b?hnc4z-7&KqoWz+EX&BTEtCfdU5ODMLOkT!W
zDdH=3yq!wo*>Diw)YKnC?!AXl*4)Nq5ui<vGpTHlL>olW3O$`)AwIXUSrM^Gab)Yo
z&=h1>1spXE&{*9YC<Ow;=2}m8I|DADu}e&VP#%q*Qp8jh;V+Y@_wIrknn0lUI^?Ak
zVv>R`zY}|Q`XE?%@I1w8A;#slAU>;Gm=qyssTnv|!zOS^r3Z6tUDuXydqu+ckp%ii
zUYL9CUhFI^#a3mBe3~9I!gL!XPB-uQ&6E3B4vay{Sh3cJmU0gc``h7=ZQv;drA08d
zu%ors%H-wfpz%|2!Y2JdEE>i#@4#R@f@EwK`rLL5j6Tn9esJYjahF%(bfDc|N5&?D
z#@B@u`WKsUs$RoBS1b0n)Iqk}OqP^#>>=Pd4!TjKE9}fhyBlgu!}mRo8VCIc(B1PC
z{iCzlnTOYogAfiJ`+%+&3A`~fYy^Sg-leWAOTt)Ej{F8@xgg_wKN8>Ner73)377#U
sBy)VamSN_CKF-THokrWO0sJ5F3q~Q>eNGd2VgLXD07*qoM6N<$g8OA*X#fBK

diff --git a/suite/themes/classic/navigator/icons/tab.png b/suite/themes/classic/navigator/icons/tab.png
new file mode 100644
index 0000000000000000000000000000000000000000..fb0fc676f11c54d4b5af1e284e72a8e8b5b3f684
GIT binary patch
literal 238
zc%17D@N?(olHy`uVBq!ia0vp^Ahrw#8<33Ht7i?QBuiW)N`mv#O3D+9QW+dm@{>{(
zJaZG%Q-e|yQz{EjrrH1%P4IMa45_%4BqBIHDJda=Au&zEjjev+4|(nh39Lz?3SkUM
zb|$U!8-6ef+-ID*Bs)2G>Hgf$Zs)G+&$DwsreHWh#)Fsn!mA0(&(Ev;`~QEuM90jA
z8H`<yIf)>d6E0<%o}LpvzIVuT+$46Sj(uu!dK1?_#z+5oW<0PD;d>M9#&)QoFy!Hi
hLxHU(K^y`J3|Ft%GfduRr3G{wgQu&X%Q~loCIBBuRU!ZY

diff --git a/suite/themes/classic/navigator/tabbrowser.css b/suite/themes/classic/navigator/tabbrowser.css
--- a/suite/themes/classic/navigator/tabbrowser.css
+++ b/suite/themes/classic/navigator/tabbrowser.css
@@ -1,112 +1,171 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-.tabbrowser-strip {
-  min-height: 0px;
-  padding: 0px;
-  /* 1px ThreeDShadow bottom border that doesn't take up space and that
-     selected panel can just draw over */
-  box-shadow: 0px -1px ThreeDShadow inset;
-}
-
 tabpanels {
   -moz-appearance: none;
 }
 
-.tabbrowser-tabs {
-  padding-top: 1px;
-}
-
-.tabs-left,
-.tabs-right {
-  width: 3px;
+.tabbrowser-strip {
+  -moz-appearance: none;
+  background-image: linear-gradient(rgba(0, 0, 0, .11), transparent, rgba(0, 0, 0, .06));
   border-bottom: none;
 }
 
-.tab-icon {
-  margin-top: 1px;
-  margin-inline-start: 1px;
-  margin-inline-end: 4px;
-  width: 16px;
-  height: 16px;
+@media (-moz-os-version: windows-win8) {
+  .tabbrowser-strip { border-top: 1px solid ThreeDShadow !important; }
+}
+
+@media (-moz-os-version: windows-win7) and (-moz-windows-theme: aero) {
+  .tabbrowser-strip { -moz-appearance: -moz-win-browsertabbar-toolbox; }
+}
+
+.tabbrowser-arrowscrollbox {
+  margin-bottom: 3px;
+ }
+
+.tabbrowser-tabs[overflow="true"] {
+  -moz-padding-start: 0px;
+}
+
+.tabbrowser-tabs > .tabbrowser-tab:first-child > .tab-close-button {
+  visibility: collapse;
 }
 
+/**
+ * Tab
+ */
+
 .tabbrowser-tab {
+  -moz-appearance: none;
   list-style-image: url("chrome://communicator/skin/places/bookmark-item.svg");
-  padding: 0px 2px 2px;
-  margin-bottom: 1px;
+  background: url("chrome://navigator/skin/icons/tab-bkgnd.png") repeat-x;
+  margin: 3px 0px 4px;
+  border: 2px solid;
+  border-right-width: 1px;
   border-bottom: none;
+  border-radius: 2px 2px 0 0;
+  padding: 1px 4px 2px 4px;
+  -moz-border-right-colors: rgba(0,0,0,.1);
+  -moz-border-top-colors: ThreeDShadow rgba(255,255,255,.3);
+  -moz-border-left-colors: ThreeDShadow rgba(255,255,255,.3);
+  margin-bottom: 0;
+  height: 23px !important;
+}
+
+.tabbrowser-tab:not(:hover):not([selected]):last-child {
+  -moz-border-right-colors: ThreeDShadow rgba(255,255,255,.3);
 }
 
-.tabbrowser-tab[busy] {
+.tabbrowser-tab:hover,
+.tabbrowser-tab[selected="true"] {
+  border-radius: 4px 4px 0 0;
+  -moz-border-top-colors: ThreeDShadow transparent;
+  -moz-border-right-colors: ThreeDShadow transparent;
+  -moz-border-left-colors: ThreeDShadow transparent;
+  margin-top: 2px;
+}
+
+.tabbrowser-tab:not([selected="true"]):hover {
+  background: url("chrome://navigator/skin/icons/tab-hover-bkgnd.png") 0px 0px repeat-x;
+  padding: 1px 4px 1px 4px;
+}
+
+.tabbrowser-tab[selected="true"] {
+  background: -moz-Dialog url("chrome://navigator/skin/icons/tab-active-bkgnd.png") repeat-x;
+  font-weight: bold;
+  padding: 1px 4px 0px 4px;
+  height: 24px !important;
+}
+
+.tabbrowser-tab[selected="true"] .tab-text {
+  margin-top: -1px !important;
+}
+
+.tabbrowser-tab[busy]
+.tabbrowser-tab[thinking] {
   list-style-image: url("chrome://communicator/skin/icons/connecting.png");
 }
 
 .tabbrowser-tab[progress] {
   list-style-image: url("chrome://global/skin/icons/loading.png");
 }
 
-.tabbrowser-tab[selected="true"] {
-  margin-bottom: 0px;
-  padding-top: 2px; /* compensates the top margin of background tabs */
-  padding-bottom: 3px; /* compensates the bottom margin of background tabs */
-  background-color: -moz-dialog;
-  color: -moz-dialogtext;
-  border-top: 2px solid RoyalBlue;
-  border-right: 1px solid Gray;
-  border-bottom: 0px none;
-  border-left: 1px solid Gray;
-  -moz-appearance: none;
+.tabs-bottom {
+  height: 4px !important;
+  margin: 0px !important;
+  background: -moz-dialog !important;
+  border-top: 1px solid threedshadow;
+  border-bottom: 1px solid threedshadow;
+}
+
+.tab-icon,
+.tab-throbber {
+  -moz-margin-end: 3px;
+  margin-bottom: 1px;
+
+  width: 16px;
+  height: 16px;
 }
 
-.tabbrowser-tab:-moz-lwtheme {
-  text-shadow: none;
+tabpanels {
+  -moz-appearance: none;
+  background-color: transparent;
 }
 
-.scrollbutton-up:-moz-lwtheme,
-.scrollbutton-down:-moz-lwtheme:not([selected="true"]),
-.tabbrowser-tab:-moz-lwtheme:not([selected="true"]) {
-  opacity: .8;
+.tabs-left,
+.tabs-right {
+  width: 3px;
+  border-bottom-width: 0px;
+}
+
+/* tabbrowser-tab focus ring */
+.tabbrowser-tab >  .tab-image-middle > .tab-text {
+  border: 1px dotted transparent;
+}
+
+.tabbrowser-tab:focus > .tab-image-middle > .tab-text {
+  border: 1px dotted -moz-DialogText;
 }
 
 /* ::::: Tab scrollbox arrow, and all-tabs buttons ::::: */
 
 .scrollbutton-up,
 .scrollbutton-down {
   -moz-appearance: tab;
   margin: 2px 0px 1px;
   padding: 0px;
-  border-top: 1px solid ThreeDLightShadow;
-  border-right: 1px solid ThreeDDarkShadow;
+  border-top: 2px solid;
+  border-right: 2px solid;
+  border-left: 2px solid;
   border-bottom: 1px solid ThreeDHighlight;
-  border-left: 1px solid ThreeDLightShadow;
+  -moz-border-top-colors: ThreeDHighlight ThreeDLightShadow;
+  -moz-border-right-colors: ThreeDDarkShadow ThreeDShadow;
+  -moz-border-left-colors: ThreeDHighlight ThreeDLightShadow;
   border-radius: 2px 2px 0px 0px;
 }
 
 @media (-moz-windows-theme: aero) {
   .scrollbutton-up,
   .scrollbutton-down {
     padding: 0px 2px;
   }
 }
 
 .scrollbutton-up:-moz-locale-dir(rtl),
 .scrollbutton-down:-moz-locale-dir(ltr) {
-  border-right-color: ThreeDShadow;
+  -moz-border-right-colors: ThreeDHighlight ThreeDShadow;
 }
 
 .scrollbutton-up:-moz-locale-dir(ltr),
 .scrollbutton-down:-moz-locale-dir(rtl) {
-  border-left-color: ThreeDShadow;
+  -moz-border-left-colors: ThreeDHighlight ThreeDShadow;
 }
 
 .scrollbutton-up,
 .scrollbutton-down:-moz-locale-dir(rtl) {
   list-style-image: url("chrome://navigator/skin/icons/tab-arrow-left.png");
 }
 
 .scrollbutton-down,
@@ -137,53 +196,116 @@ tabpanels {
 
 .scrollbutton-up:not([disabled="true"]):hover:active,
 .scrollbutton-down:not([disabled="true"]):hover:active,
 .scrollbutton-down[notifybgtab="true"] {
   box-shadow: 0px 0px 0px 9px ThreeDShadow inset;
 }
 
 .tabs-alltabs-button {
-  margin: 2px 0px 1px;
+  margin-bottom: 1px;
 }
 
 .tabs-alltabs-button > .toolbarbutton-icon {
   margin: 0px !important;
 }
 
 /* All tabs menupopup */
 .alltabs-item {
   list-style-image: url("chrome://communicator/skin/places/bookmark-item.svg");
 }
 
 .alltabs-item[selected="true"] {
   font-weight: bold;
 }
 
 .alltabs-item[busy] {
-  list-style-image: url("chrome://communicator/skin/icons/loading.png");
+  list-style-image: url("chrome://communicator/skin/icons/connecting.png");
 }
 
 .alltabs-item[tabIsScrolled] {
   font-style: italic;
 }
 
 /* ::::: close button ::::: */
 
+.tabs-closebutton-box {
+  padding-bottom: 2px;
+} 
+
 .tabs-closebutton {
-  margin: 3px;
-  list-style-image: url("chrome://communicator/skin/icons/close-button.png");
+  -moz-appearance: none;
+  list-style-image: url("chrome://communicator/skin/icons/tab-close.png") !important;
+  -moz-image-region: rect(0px, 64px, 16px, 48px);
+  -moz-user-focus: normal;
+  margin-inline-end: 2px;
+  margin-top: 0px;
+  padding: 0 3px;
+  border: none !important;
+  cursor: default;
+}
+
+.tabs-closebutton:not([selected="true"]) {
+  -moz-image-region: rect(0, 64px, 16px, 48px);
 }
 
+.tabs-closebutton:hover,
+.tabs-closebutton:hover[selected="true"] {
+  -moz-image-region: rect(0, 32px, 16px, 16px);
+}
+
+.tabs-closebutton:hover:active,
+.tabs-closebutton:hover:active[selected="true"] {
+  -moz-image-region: rect(0, 48px, 16px, 32px);
+}
+
+.tabs-closebutton[selected="true"] {
+  -moz-image-region: rect(0, 16px, 16px, 0);
+}
+
+.tabs-closebutton:focus {
+  outline: none !important;
+}
+
+.tab-close-button > .toolbarbutton-icon {
+  -moz-margin-end: 0px !important;
+}
+
+
+/* ::::: new tab button ::::: */
+
 .tabs-newbutton {
-  margin: 0px;
+  -moz-appearance: none;
+  border: none;
   list-style-image: url("chrome://navigator/skin/icons/tab-new.png");
 }
 
+.tabs-newbutton:hover:not(:active) {
+  filter: saturate(120%) brightness(110%);
+}
+
+.tabs-newbutton:not([disabled="true"]):hover:active {
+  filter: brightness(75%);
+}
+
+.tabs-newbutton:focus {
+  outline: none !important;
+}
+
+.tab-drop-indicator-bar {
+    height: 11px;
+    margin-top: -11px;
+    margin-inline-start: -6px;
+    position: relative;
+}
+
 .tab-drop-indicator {
-  position: relative;
-  z-index: 1;
-  list-style-image: url('chrome://navigator/skin/icons/tab-drag-indicator.png');
+    height: 11px;
+    width: 11px;
+    margin-bottom: -5px;
+    position: relative;
+    z-index: 1;
+    list-style-image: url('chrome://navigator/skin/icons/tab-drag-indicator.png');
 }
 
 tooltip[tabpreview="true"] {
   max-width: none;
 }
