make the forward-button-hiding really work and give it a nicer shape when it's displayed
[themes.git] / LCARStrek / browser / browser.css
index 01ae429bd565f7e981e2f3a6df95e6645a6c0a3e..603d809753d8dab6f214a7e67604fe70b509369e 100644 (file)
@@ -28,6 +28,8 @@
  *   Dão Gottwald (dao@mozilla.com)
  *   Jim Mathies (jmathies@mozilla.com)
  *   Drew Willcoxon (adw@mozilla.com)
+ *   Paul Rouget (paul@mozilla.com)
+ *   Rob Campbell (rcampbell@mozilla.com)
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -122,7 +124,7 @@ menubar {
 }
 
 #personal-bookmarks {
-  min-height: 24px;
+/*  min-height: 24px; */
 }
 
 #print-preview-toolbar:not(:-moz-lwtheme) {
@@ -136,12 +138,16 @@ menubar {
   background-clip: padding-box;
   border-radius: 0;
   border: none;
-  border-left: 3px solid #000000;
   border-right: 3px solid #000000;
   color: #000000;
   font-weight: bold;
-  padding: 0 1.5em .05em;
-  margin: 0 0 2px;
+  padding: 1px 1.5em;
+  margin: 0;
+}
+
+#appmenu-button:-moz-locale-dir(rtl) {
+  border-left: 3px solid #000000;
+  border-right: none;
 }
 
 #main-window[privatebrowsingmode=temporary] #appmenu-button {
@@ -163,19 +169,36 @@ menubar {
 }
 
 #appmenu-button > .button-box > .button-menu-dropmarker {
-  list-style-image: url("appmenu-dropmarker.png");
+  list-style-image: url("chrome://global/skin/arrow/arrow-down-hover.gif");
   width: auto;
   height: auto;
   padding: 0;
   margin: 0;
+  border: none;
+  background-color: transparent;
   -moz-margin-start: .5em;
 }
 
+#main-window[privatebrowsingmode=temporary] #appmenu-button > .button-box > .button-menu-dropmarker {
+  list-style-image: url("chrome://global/skin/arrow/arrow-down.gif");
+}
+
+#appmenuPrimaryPane > menuitem,
+#appmenuSecondaryPane > menuitem,
+#appmenuPrimaryPane > menu {
+  padding: 2px;
+}
+
 .splitmenu-menuitem {
+  -moz-padding-start: 2px;
+  padding-top: 2px;
+  padding-bottom: 2px;
   -moz-margin-end: 1px;
 }
 
 .splitmenu-menu {
+  padding-top: 2px;
+  padding-bottom: 2px;
   -moz-box-pack: end;
 }
 
@@ -230,25 +253,70 @@ menubar {
   -moz-image-region: rect(0 16px 16px 0);
 }
 
+#appmenu-cut:hover:not([disabled="true"]),
+#appmenu-editmenu-cut:hover:not([disabled="true"]) {
+  -moz-image-region: rect(16px 16px 32px 0);
+}
+
+#appmenu-cut[disabled="true"],
+#appmenu-editmenu-cut[disabled="true"] {
+  -moz-image-region: rect(32px 16px 48px 0);
+}
+
 #appmenu-copy,
 #appmenu-editmenu-copy {
   -moz-image-region: rect(0 32px 16px 16px);
 }
 
+#appmenu-copy:hover:not([disabled="true"]),
+#appmenu-editmenu-copy:hover:not([disabled="true"]) {
+  -moz-image-region: rect(16px 32px 32px 16px);
+}
+
+#appmenu-copy[disabled="true"],
+#appmenu-editmenu-copy[disabled="true"] {
+  -moz-image-region: rect(32px 32px 48px 16px);
+}
+
 #appmenu-paste,
 #appmenu-editmenu-paste {
   -moz-image-region: rect(0 48px 16px 32px);
 }
 
+#appmenu-paste:hover:not([disabled="true"]),
+#appmenu-editmenu-paste:hover:not([disabled="true"]) {
+  -moz-image-region: rect(16px 48px 32px 32px);
+}
+
+#appmenu-paste[disabled="true"],
+#appmenu-editmenu-paste[disabled="true"] {
+  -moz-image-region: rect(32px 48px 48px 32px);
+}
+
 #appmenu_print,
 #appmenu_print_popup {
   -moz-image-region: rect(0 64px 16px 48px);
 }
 
+#appmenu_print:hover:not([disabled="true"]),
+#appmenu_print[open="true"],
+#appmenu_print_popup:hover:not([disabled="true"]) {
+  -moz-image-region: rect(16px 64px 32px 48px);
+}
+
+#appmenu-print[disabled="true"],
+#appmenu_print_popup[disabled="true"] {
+  -moz-image-region: rect(32px 64px 48px 48px);
+}
+
 #appmenu-quit {
   -moz-image-region: rect(0 80px 16px 64px);
 }
 
+#appmenu-quit:hover {
+  -moz-image-region: rect(16px 80px 32px 64px);
+}
+
 #appmenu-edit-label {
   -moz-appearance: none;
   background: transparent;
@@ -276,13 +344,28 @@ menubar {
 
 /* ::::: titlebar ::::: */
 
+#titlebar {
+  /* like menubar */
+  background-color: #6000CF;
+  color: #FF9F00;
+}
+#titlebar:-moz-window-inactive {
+  background-color: #8050B0;
+  color: #FF9F00;
+}
+
 #main-window[sizemode="normal"] > #titlebar {
+  margin-top: -3px;
+  margin-bottom: 3px;
 }
 
 #main-window[sizemode="maximized"] > #titlebar {
+  margin-top: 4px;
 }
 
 #titlebar-buttonbox {
+  margin-top: 5px;
+  -moz-margin-end: 3px;
 }
 
 #main-window[sizemode="maximized"] #titlebar-buttonbox {
@@ -299,32 +382,39 @@ menubar {
 /* titlebar command buttons */
 
 #titlebar-min {
+  list-style-image: url("chrome://navigator/skin/icons/win-minimize.gif");
+}
+
+#titlebar-min:hover {
+  list-style-image: url("chrome://navigator/skin/icons/win-minimize-hover.gif");
 }
 
 #titlebar-max {
+  list-style-image: url("chrome://browser/skin/win-maximize.gif");
 }
 
-#main-window[sizemode="maximized"] #titlebar-max {
+#titlebar-max:hover {
+  list-style-image: url("chrome://browser/skin/win-maximize-hover.gif");
 }
 
-#titlebar-close {
+#main-window[sizemode="maximized"] #titlebar-max {
+  list-style-image: url("chrome://navigator/skin/icons/win-restore.gif");
 }
 
-/* ::::: bookmark buttons ::::: */
+#main-window[sizemode="maximized"] #titlebar-max:hover {
+  list-style-image: url("chrome://navigator/skin/icons/win-restore-hover.gif");
+}
 
-toolbarbutton.bookmark-item {
-  margin: 0;
-  padding: 2px 3px;
+#titlebar-close {
+  list-style-image: url("chrome://navigator/skin/icons/win-close.gif");
 }
 
-toolbarbutton.bookmark-item:hover:active:not([disabled="true"]),
-toolbarbutton.bookmark-item[open="true"] {
-  padding-top: 3px;
-  padding-bottom: 1px;
-  -moz-padding-start: 4px;
-  -moz-padding-end: 2px;
+#titlebar-close:hover {
+  list-style-image: url("chrome://navigator/skin/icons/win-close-hover.gif");
 }
 
+/* ::::: bookmark buttons ::::: */
+
 .bookmark-item > .toolbarbutton-icon {
   width: 16px;
   height: 16px;
@@ -342,12 +432,12 @@ toolbarbutton.bookmark-item[open="true"] {
 #wrapper-personal-bookmarks[place="palette"] > .toolbarpaletteitem-box {
   width: 16px;
   height: 16px;
-  background: url("chrome://browser/skin/places/bookmarksToolbar.png") no-repeat;
+  background: url("chrome://communicator/skin/bookmarks/bookmarksToolbar.png") no-repeat;
 }
 
 .bookmarks-toolbar-customize {
   max-width: 15em !important;
-  list-style-image: url("chrome://browser/skin/places/bookmarksToolbar.png") !important;
+  list-style-image: url("chrome://communicator/skin/bookmarks/bookmarksToolbar.png") !important;
 }
 
 /* ::::: bookmark menus ::::: */
@@ -370,29 +460,32 @@ menuitem.bookmark-item {
 /* ::::: bookmark items ::::: */
 
 .bookmark-item  {
-  list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-item.gif");
+  list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
+  -moz-image-region: auto;
 }
 
 .bookmark-item[container] {
   list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-closed.gif");
+  -moz-image-region: auto;
 }
 
 .bookmark-item[container][open] {
   list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-open.gif");
+  -moz-image-region: auto;
 }
 
-.bookmark-item[container][livemark] { 
-  list-style-image: url("chrome://browser/skin/livemark-folder.png");
+.bookmark-item[container][livemark] {
+  list-style-image: url("chrome://communicator/skin/bookmarks/livemark-folder.png");
   -moz-image-region: auto;
 }
 
 .bookmark-item[container][livemark] .bookmark-item {
-  list-style-image: url("chrome://browser/skin/livemark-item.png");
+  list-style-image: url("chrome://communicator/skin/bookmarks/livemark-item.png");
   -moz-image-region: auto;
 }
 
 .bookmark-item[container][query] {
-  list-style-image: url("chrome://browser/skin/places/query.png");
+  list-style-image: url("chrome://communicator/skin/bookmarks/query.png");
   -moz-image-region: auto;
 }
 
@@ -402,16 +495,28 @@ menuitem.bookmark-item {
 }
 
 .bookmark-item[query][dayContainer] {
-  list-style-image: url("chrome://browser/skin/places/calendar.png");
+  list-style-image: url("chrome://communicator/skin/history/calendar.png");
   -moz-image-region: auto;
 }
 
 .bookmark-item[query][hostContainer] {
   list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-closed.gif");
+  -moz-image-region: auto;
 }
 
 .bookmark-item[query][hostContainer][open] {
   list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-open.gif");
+  -moz-image-region: auto;
+}
+
+.bookmark-item[cutting] > .toolbarbutton-icon,
+.bookmark-item[cutting] > .menu-iconic-left > .menu-iconic-icon {
+  opacity: 0.5;
+}
+
+.bookmark-item[cutting] > .toolbarbutton-text,
+.bookmark-item[cutting] > .menu-iconic-left > .menu-iconic-text {
+  opacity: 0.7;
 }
 
 /* ::::: primary toolbar buttons ::::: */
@@ -553,14 +658,26 @@ toolbar[mode="full"] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
   -moz-margin-end: 0;
 }
 
+#back-button:not([disabled="true"]):hover {
+  -moz-image-region: rect(18px, 18px, 36px, 0);
+}
+
+#back-button[disabled="true"] {
+  -moz-image-region: rect(36px, 18px, 54px, 0);
+}
+
 #forward-button {
   -moz-image-region: rect(0, 36px, 18px, 18px);
   border-left: none;
   -moz-margin-start: 0;
 }
 
-#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #back-button {
-  -moz-image-region: rect(18px, 20px, 38px, 0);
+#forward-button:not([disabled="true"]):hover {
+  -moz-image-region: rect(18px, 36px, 36px, 18px);
+}
+
+#forward-button[disabled="true"] {
+  -moz-image-region: rect(36px, 36px, 54px, 18px);
 }
 
 #back-button:-moz-locale-dir(rtl) > .toolbarbutton-icon,
@@ -598,7 +715,16 @@ toolbar[mode="full"] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
   margin-top: -2px;
   margin-bottom: -2px;
   border: none;
-  -moz-image-region: rect(18px, 20px, 38px, 0);
+  -moz-image-region: rect(54px, 20px, 74px, 0);
+}
+
+#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #back-button:not([disabled="true"]):hover,
+#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #back-button[open="true"] {
+  -moz-image-region: rect(54px, 40px, 74px, 20px);
+}
+
+#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #back-button[disabled="true"] {
+  -moz-image-region: rect(54px, 60px, 74px, 40px);
 }
 
 #navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #back-button:not([disabled="true"]):not([open="true"]):not(:active):hover {
@@ -625,6 +751,18 @@ toolbar[mode="full"] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
   -moz-margin-start: -6px !important;
   padding-left: 7px;
   padding-right: 3px;
+  margin-top: 2px;
+  margin-bottom: 2px;
+}
+
+#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #forward-button:-moz-locale-dir(ltr) {
+  border-top-right-radius: 11px;
+  border-bottom-right-radius: 11px;
+}
+
+#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #forward-button:-moz-locale-dir(rtl) {
+  border-top-left-radius: 11px;
+  border-bottom-left-radius: 11px;
 }
 
 #navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #forward-button:not([disabled="true"]):not(:active):hover {
@@ -634,12 +772,48 @@ toolbar[mode="full"] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
 
 .unified-nav-back[_moz-menuactive]:-moz-locale-dir(ltr),
 .unified-nav-forward[_moz-menuactive]:-moz-locale-dir(rtl) {
-  list-style-image: url("chrome://browser/skin/menu-back.png") !important;
+  list-style-image: url("chrome://global/skin/arrow/arrow-left.gif") !important;
+}
+
+.unified-nav-back[_moz-menuactive]:-moz-locale-dir(ltr):hover,
+.unified-nav-forward[_moz-menuactive]:-moz-locale-dir(rtl):hover {
+  list-style-image: url("chrome://global/skin/arrow/arrow-left-hover.gif") !important;
 }
 
 .unified-nav-forward[_moz-menuactive]:-moz-locale-dir(ltr),
 .unified-nav-back[_moz-menuactive]:-moz-locale-dir(rtl) {
-  list-style-image: url("chrome://browser/skin/menu-forward.png") !important;
+  list-style-image: url("chrome://global/skin/arrow/arrow-right.gif") !important;
+}
+
+.unified-nav-forward[_moz-menuactive]:-moz-locale-dir(ltr):hover,
+.unified-nav-back[_moz-menuactive]:-moz-locale-dir(rtl):hover {
+  list-style-image: url("chrome://global/skin/arrow/arrow-right.gif") !important;
+}
+
+window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
+    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
+    #unified-back-forward-button > #forward-button {
+/*  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+  -moz-margin-end: 0; */
+}
+
+window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
+    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
+    #unified-back-forward-button:not([switchingtabs]) > #forward-button {
+  -moz-transition: opacity 150ms ease-out;
+}
+
+window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
+    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
+    #unified-back-forward-button:not(:hover) > #forward-button[disabled] {
+  opacity: 0;
+}
+
+window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
+    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
+    #unified-back-forward-button:hover > #forward-button[disabled] {
+  background-color: transparent;
 }
 
 /* stop button */
@@ -648,12 +822,28 @@ toolbar[mode="full"] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
   -moz-image-region: rect(0, 54px, 18px, 36px);
 }
 
+#stop-button:not([disabled="true"]):hover {
+  -moz-image-region: rect(18px, 54px, 36px, 36px);
+}
+
+#stop-button[disabled="true"] {
+  -moz-image-region: rect(36px, 54px, 54px, 36px);
+}
+
 /* reload button */
 
 #reload-button {
   -moz-image-region: rect(0, 72px, 18px, 54px);
 }
 
+#reload-button:not([disabled="true"]):hover {
+  -moz-image-region: rect(18px, 72px, 36px, 54px);
+}
+
+#reload-button[disabled="true"] {
+  -moz-image-region: rect(36px, 72px, 54px, 54px);
+}
+
 /* home button */
 
 #home-button.bookmark-item {
@@ -663,6 +853,14 @@ toolbar[mode="full"] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
   -moz-image-region: rect(0, 90px, 18px, 72px);
 }
 
+#home-button:not([disabled="true"]):hover {
+  -moz-image-region: rect(18px, 90px, 36px, 72px);
+}
+
+#home-button[disabled="true"] {
+  -moz-image-region: rect(36px, 90px, 54px, 72px);
+}
+
 /* tabview button */
 
 #tabview-button,
@@ -716,69 +914,153 @@ toolbar[mode="full"] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
   -moz-image-region: rect(0, 108px, 18px, 90px);
 }
 
+#downloads-button:not([disabled="true"]):hover {
+  -moz-image-region: rect(18px, 108px, 36px, 90px);
+}
+
+#downloads-button[disabled="true"] {
+  -moz-image-region: rect(36px, 108px, 54px, 90px);
+}
+
 /* history sidebar button */
 
 #history-button {
   -moz-image-region: rect(0, 126px, 18px, 108px);
 }
 
+#history-button:not([disabled="true"]):hover {
+  -moz-image-region: rect(18px, 126px, 36px, 108px);
+}
+
+#history-button[disabled="true"] {
+  -moz-image-region: rect(36px, 126px, 54px, 108px);
+}
+
 /* bookmark sidebar & menu buttons */
 
 #bookmarks-button,
 #bookmarks-menu-button {
+  list-style-image: url("chrome://browser/skin/Toolbar.png") !important; /* for making the palette work */
   -moz-image-region: rect(0, 144px, 18px, 126px);
 }
 
 #bookmarks-menu-button.bookmark-item {
-  list-style-image: url("chrome://browser/skin/Toolbar.png");
+  /* list-style-image: url("chrome://browser/skin/Toolbar.png"); */
 }
 
 #bookmarks-menu-button.toolbarbutton-1 {
   -moz-box-orient: horizontal;
 }
 
+#bookmarks-button:not([disabled="true"]):hover,
+#bookmarks-menu-button[open="true"],
+#bookmarks-menu-button:not([disabled="true"]):hover {
+  -moz-image-region: rect(18px, 144px, 36px, 126px);
+}
+
+#bookmarks-button[disabled="true"],
+#bookmarks-menu-button[disabled="true"] {
+  -moz-image-region: rect(36px, 144px, 54px, 126px);
+}
+
 /* print button */
 
 #print-button {
   -moz-image-region: rect(0, 162px, 18px, 144px);
 }
 
+#print-button:not([disabled="true"]):hover {
+  -moz-image-region: rect(18px, 162px, 36px, 144px);
+}
+
+#print-button[disabled="true"] {
+  -moz-image-region: rect(36px, 162px, 54px, 144px);
+}
+
 /* toolbar new tab button */
 
 #new-tab-button {
   -moz-image-region: rect(0, 180px, 18px, 162px);
 }
 
+#print-button:not([disabled="true"]):hover {
+  -moz-image-region: rect(18px, 162px, 36px, 144px);
+}
+
+#print-button[disabled="true"] {
+  -moz-image-region: rect(36px, 162px, 54px, 144px);
+}
+
 /* new window button */
 
 #new-window-button {
   -moz-image-region: rect(0, 198px, 18px, 180px);
 }
 
+#new-window-button:not([disabled="true"]):hover {
+  -moz-image-region: rect(18px, 198px, 36px, 180px);
+}
+
+#new-window-button[disabled="true"] {
+  -moz-image-region: rect(36px, 198px, 54px, 180px);
+}
+
 /* cut button */
 
 #cut-button {
   -moz-image-region: rect(0, 216px, 18px, 198px);
 }
 
+#cut-button:not([disabled="true"]):hover {
+  -moz-image-region: rect(18px, 216px, 36px, 198px);
+}
+
+#cut-button[disabled="true"] {
+  -moz-image-region: rect(36px, 216px, 54px, 198px);
+}
+
 /* copy button */
 
 #copy-button {
   -moz-image-region: rect(0, 234px, 18px, 216px);
 }
 
+#copy-button:not([disabled="true"]):hover {
+  -moz-image-region: rect(18px, 234px, 36px, 216px);
+}
+
+#copy-button[disabled="true"] {
+  -moz-image-region: rect(36px, 234px, 54px, 216px);
+}
+
 /* paste button */
 
 #paste-button {
   -moz-image-region: rect(0, 252px, 18px, 234px);
 }
 
+#paste-button:not([disabled="true"]):hover {
+  -moz-image-region: rect(18px, 252px, 36px, 234px);
+}
+
+#paste-button[disabled="true"] {
+  -moz-image-region: rect(36px, 252px, 54px, 234px);
+}
+
 /* fullscreen button */
 
 #fullscreen-button {
   -moz-image-region: rect(0, 270px, 18px, 252px);
 }
 
+#fullscreen-button:not([disabled="true"]):hover {
+  -moz-image-region: rect(18px, 270px, 36px, 252px);
+}
+
+#fullscreen-button[disabled="true"] {
+  -moz-image-region: rect(36px, 270px, 54px, 252px);
+}
+
 /* zoom controls */
 
 #zoom-out-button {
@@ -811,9 +1093,26 @@ toolbar[mode="full"] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
   border-bottom-left-radius: 0;
 }
 
+#zoom-out-button:not([disabled="true"]):hover {
+  -moz-image-region: rect(18px, 288px, 36px, 270px);
+}
+
+#zoom-out-button[disabled="true"] {
+  -moz-image-region: rect(36px, 288px, 54px, 270px);
+}
+
+#zoom-in-button:not([disabled="true"]):hover {
+  -moz-image-region: rect(18px, 306px, 36px, 288px);
+}
+
+#zoom-in-button[disabled="true"] {
+  -moz-image-region: rect(36px, 306px, 54px, 288px);
+}
+
 /* sync button */
 
-#sync-button {
+#sync-button:not([status]) {
+  list-style-image: url("chrome://browser/skin/Toolbar.png") !important; /* for making the palette work */
   -moz-image-region: rect(0, 324px, 18px, 306px);
 }
 
@@ -822,12 +1121,20 @@ toolbar[mode="full"] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
   -moz-image-region: rect(0, 18px, 18px, 0);
 }
 
+#sync-button[disabled="true"] {
+  -moz-image-region: rect(36px, 324px, 54px, 306px);
+}
+
 /* feed button */
 
 #feed-button {
   -moz-image-region: rect(0, 342px, 18px, 324px);
 }
 
+#feed-button[disabled="true"] {
+  -moz-image-region: rect(36px, 342px, 54px, 324px);
+}
+
 /* ::::: fullscreen window controls ::::: */
 
 #TabsToolbar > #window-controls {
@@ -866,11 +1173,6 @@ toolbar[mode="full"] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
 
 /* ::::: Location Bar ::::: */
 
-#urlbar {
-  width: 7em;
-  min-width: 7em;
-}
-
 #urlbar,
 .searchbar-textbox {
   border-radius: 5px;
@@ -878,6 +1180,11 @@ toolbar[mode="full"] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
   -moz-margin-start: 3px;
 }
 
+#urlbar {
+  width: 7em;
+  min-width: 7em;
+}
+
 #urlbar:-moz-lwtheme,
 .searchbar-textbox:-moz-lwtheme {
   /* background-color: rgba(255,255,255,.8);
@@ -885,6 +1192,79 @@ toolbar[mode="full"] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
   color: black; */
 }
 
+window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
+    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
+    #unified-back-forward-button + #urlbar-container {
+  padding-left: 22px;
+  -moz-margin-start: -22px;
+  position: relative;
+  pointer-events: none;
+}
+
+window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
+    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
+    #unified-back-forward-button + #urlbar-container > #urlbar {
+/*  -moz-border-start: none;
+  margin-left: 0; */
+  pointer-events: all;
+}
+
+window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
+    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
+    #unified-back-forward-button:not([switchingtabs]) + #urlbar-container > #urlbar {
+  -moz-transition: margin-left 150ms ease-out;
+}
+
+window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
+    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
+    #unified-back-forward-button + #urlbar-container > #urlbar:-moz-locale-dir(ltr) {
+/*  border-top-left-radius: 0;
+  border-bottom-left-radius: 0; */
+}
+
+window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
+    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
+    #unified-back-forward-button + #urlbar-container > #urlbar:-moz-locale-dir(rtl) {
+/*  border-top-right-radius: 0;
+  border-bottom-right-radius: 0; */
+}
+
+window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
+    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
+    #unified-back-forward-button[forwarddisabled] + #urlbar-container {
+  mask: url("chrome://browser/content/browser.xul#winstripe-urlbar-back-button-mask");
+}
+
+window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
+    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
+    #unified-back-forward-button[forwarddisabled] + #urlbar-container > #urlbar {
+  margin-left: -22px;
+}
+
+window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
+    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
+    #unified-back-forward-button[forwarddisabled]:hover:not([switchingtabs]) + #urlbar-container > #urlbar {
+  /* delay the hiding of the forward button when hovered to avoid accidental clicks on the url bar */
+  -moz-transition-delay: 100s;
+}
+
+window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
+    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
+    #unified-back-forward-button[forwarddisabled]:not(:hover) + #urlbar-container > #urlbar {
+  /* when not hovered anymore, trigger a new transition to hide the forward button immediately */
+  margin-left: -22.01px;
+}
+
+window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
+    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
+    #unified-back-forward-button + #urlbar-container:-moz-locale-dir(rtl),
+window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
+    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
+    #unified-back-forward-button + #urlbar-container > #urlbar:-moz-locale-dir(rtl) {
+  /* let winstripe-urlbar-back-button-mask clip the urlbar's right side for RTL */
+  -moz-transform: scaleX(-1);
+}
+
 html|*.urlbar-input:-moz-lwtheme:-moz-placeholder,
 .searchbar-textbox:-moz-lwtheme > .autocomplete-textbox-container > .textbox-input-box > html|*.textbox-input:-moz-placeholder {
   color: #E7ADE7;
@@ -905,12 +1285,20 @@ html|*.urlbar-input:-moz-lwtheme:-moz-placeholder,
 }
 
 #urlbar-icons {
-  height: 18px;
   -moz-box-align: center;
 }
 
 .urlbar-icon {
-  padding: 0 2px !important;
+  padding: 2px;
+}
+
+.searchbar-engine-button,
+.search-go-container {
+  padding: 2px;
+}
+
+.search-go-container > .search-go-button {
+  padding: 0;
 }
 
 .urlbar-icon:-moz-system-metric(touch-enabled) {
@@ -918,6 +1306,13 @@ html|*.urlbar-input:-moz-lwtheme:-moz-placeholder,
   padding: 0 3px !important;
 }
 
+.urlbar-icon:hover {
+}
+
+.urlbar-icon[open="true"],
+.urlbar-icon:hover:active {
+}
+
 #urlbar-search-splitter {
   min-width: 6px;
   -moz-margin-start: -3px;
@@ -931,13 +1326,8 @@ html|*.urlbar-input:-moz-lwtheme:-moz-placeholder,
 }
 
 #urlbar-display {
-  margin-top: -2px;
-  margin-bottom: -2px;
   -moz-border-end: 1px solid #9C9CFF;
   -moz-margin-end: 3px;
-}
-
-#urlbar-display {
   margin-top: 0;
   margin-bottom: 0;
   color: #8050B0;
@@ -951,6 +1341,52 @@ html|*.urlbar-input:-moz-lwtheme:-moz-placeholder,
   border-radius: 2px;
 }
 
+#notification-popup-box:not([hidden]) + #identity-box {
+  -moz-padding-start: 10px;
+  border-radius: 0;
+}
+
+window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
+    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
+    #unified-back-forward-button + #urlbar-container > #urlbar > #identity-box {
+  border-radius: 0;
+}
+
+window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
+    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
+    #unified-back-forward-button[forwarddisabled] + #urlbar-container > #urlbar > #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(ltr) {
+  padding-left: 5px;
+  -moz-transition: padding-left;
+}
+
+window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
+    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
+    #unified-back-forward-button[forwarddisabled] + #urlbar-container > #urlbar > #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(rtl) {
+  padding-right: 5px;
+  -moz-transition: padding-right;
+}
+
+window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
+    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
+    #unified-back-forward-button[forwarddisabled]:hover:not([switchingtabs]) + #urlbar-container > #urlbar > #notification-popup-box[hidden] + #identity-box {
+  /* forward button hiding is delayed when hovered */
+  -moz-transition-delay: 100s;
+}
+
+window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
+    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
+    #unified-back-forward-button[forwarddisabled]:not(:hover) + #urlbar-container > #urlbar > #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(ltr) {
+  /* when not hovered anymore, trigger a new non-delayed transition to react to the forward button hiding */
+  padding-left: 5.01px;
+}
+
+window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
+    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
+    #unified-back-forward-button[forwarddisabled]:not(:hover) + #urlbar-container > #urlbar > #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(rtl) {
+  /* when not hovered anymore, trigger a new non-delayed transition to react to the forward button hiding */
+  padding-right: 5.01px;
+}
+
 #identity-box:hover {
   background-color: #9C9CFF;
   color: #000000;
@@ -974,7 +1410,7 @@ html|*.urlbar-input:-moz-lwtheme:-moz-placeholder,
 
 #identity-box:-moz-focusring {
   outline: 1px dotted #008484;
-  outline-offset: -3px;
+  outline-offset: -1px;
 }
 
 #identity-box.verifiedDomain:-moz-focusring,
@@ -985,28 +1421,24 @@ html|*.urlbar-input:-moz-lwtheme:-moz-placeholder,
 #identity-icon-labels {
   -moz-margin-start: 1px;
   -moz-margin-end: 3px;
-  -moz-transform: translate(0, -1px);
 }
 
 /* Location bar dropmarker */
 
-.urlbar-history-dropmarker {
-  -moz-appearance: none;
-  padding: 0 1px;
+.urlbar-history-dropmarker:not(:hover):not([open="true"]) {
   background-color: transparent;
+}
+
+#urlbar-container[combined="true"] > #urlbar > .urlbar-history-dropmarker {
   border: none;
-  width: auto;
-  list-style-image: url("mainwindow-dropdown-arrow.png");
-  -moz-image-region: rect(0, 13px, 11px, 0);
+  border-radius: 0px;
 }
 
-.urlbar-history-dropmarker:-moz-system-metric(touch-enabled) {
-  min-width: 6.4mozmm;
+.urlbar-history-dropmarker:hover {
 }
 
 .urlbar-history-dropmarker:hover:active,
 .urlbar-history-dropmarker[open="true"] {
-  -moz-image-region: rect(0, 26px, 11px, 13px);
 }
 
 /* page proxy icon */
@@ -1021,15 +1453,14 @@ html|*.urlbar-input:-moz-lwtheme:-moz-placeholder,
   width: 24px;
   height: 18px;
   padding: 1px 4px;
-  background: url("urlbar-favicon-glow.png") center center no-repeat;
 }
 
 #page-proxy-favicon:not([src]) {
-  list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-item.gif");
+  list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
 }
 
 #page-proxy-favicon[pageproxystate="invalid"] {
-  list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-item.gif");
+  opacity: 0.5;
 }
 
 #urlbar-throbber {
@@ -1044,9 +1475,9 @@ html|*.urlbar-input:-moz-lwtheme:-moz-placeholder,
 
 .ac-result-type-bookmark,
 .autocomplete-treebody::-moz-tree-image(bookmark, treecolAutoCompleteImage) {
-  list-style-image: url("chrome://browser/skin/places/editBookmark.png");
+  list-style-image: url("chrome://browser/skin/places/bookmark.png");
   -moz-image-region: rect(0px 16px 16px 0px);
-  width: 16px; 
+  width: 16px;
   height: 16px;
 }
 
@@ -1060,8 +1491,8 @@ html|*.urlbar-input:-moz-lwtheme:-moz-placeholder,
 
 .ac-result-type-tag,
 .autocomplete-treebody::-moz-tree-image(tag, treecolAutoCompleteImage) {
-  list-style-image: url("chrome://browser/skin/places/tag.png");
-  width: 16px; 
+  list-style-image: url("chrome://mozapps/skin/places/tagContainerIcon.png");
+  width: 16px;
   height: 16px;
 }
 
@@ -1092,8 +1523,8 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
   color: inherit !important;
 }
 
-.autocomplete-treebody::-moz-tree-cell-text(suggesthint, treecolAutoCompleteComment), 
-.autocomplete-treebody::-moz-tree-cell-text(suggestfirst, treecolAutoCompleteComment) 
+.autocomplete-treebody::-moz-tree-cell-text(suggesthint, treecolAutoCompleteComment),
+.autocomplete-treebody::-moz-tree-cell-text(suggestfirst, treecolAutoCompleteComment)
 {
   color: #8050B0;
   font-size: smaller;
@@ -1103,72 +1534,74 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
   border-top: 1px solid #9C9CFF;
 }
 
-/* go button */
-
-#go-button {
-  list-style-image: url("chrome://browser/skin/Go-arrow.png");
-  -moz-image-region: rect(0px, 16px, 16px, 0px);
-}
-
-#go-button:-moz-locale-dir(rtl) > .toolbarbutton-icon {
-  -moz-transform: scaleX(-1);
-}
-
-#go-button:hover {
-  -moz-image-region: rect(16px, 16px, 32px, 0px);
-}
-
 /* combined go/reload/stop button in location bar */
 
+#go-button,
 #urlbar > toolbarbutton {
   list-style-image: url("chrome://browser/skin/reload-stop-go.png");
-  margin: -2px;
+  /* margin: -2px; */
   -moz-margin-start: 0;
-  padding: 0 3px;
+  padding: 0 2px;
   background-origin: border-box;
   border: none;
   -moz-border-start: 1px solid #9C9CFF;
 }
 
+#go-button {
+  padding: 0 3px;
+}
+
 #urlbar:-moz-locale-dir(ltr) > toolbarbutton {
-  border-top-right-radius: 2px;
-  border-bottom-right-radius: 2px;
+  border-top-left-radius: 0px;
+  border-bottom-left-radius: 0px;
 }
 
 #urlbar:-moz-locale-dir(rtl) > toolbarbutton {
-  border-top-left-radius: 2px;
-  border-bottom-left-radius: 2px;
+  border-top-right-radius: 0px;
+  border-bottom-right-radius: 0px;
+}
+
+#urlbar > toolbarbutton:not([disabled]):active:hover,
+#urlbar-reload-button:not(:hover) {
+  -moz-border-start-style: none;
+  -moz-padding-start: 3px;
 }
 
 #urlbar > toolbarbutton:not([disabled]):active:hover {
-  -moz-padding-start: 4px;
-  -moz-border-start: none;
 }
 
 #urlbar-go-button {
-  -moz-image-region: rect(0px, 56px, 14px, 42px);
+  -moz-image-region: rect(0, 42px, 14px, 28px);
 }
 
+#go-button:-moz-locale-dir(rtl) > .toolbarbutton-icon,
 #urlbar-go-button:-moz-locale-dir(rtl) > .toolbarbutton-icon {
   -moz-transform: scaleX(-1);
 }
 
-#urlbar-go-button:hover {
+#urlbar-go-button:hover,
+#go-button:hover {
+  -moz-image-region: rect(14px, 42px, 28px, 28px);
 }
 
 #urlbar-reload-button {
   -moz-image-region: rect(0px, 14px, 14px, 0px);
 }
 
+#urlbar-reload-button[disabled] {
+  -moz-image-region: rect(28px, 14px, 42px, 0px);
+}
+
 #urlbar-reload-button:not([disabled]):hover {
-  -moz-image-region: rect(0px, 28px, 14px, 14px);
+  -moz-image-region: rect(14px, 14px, 28px, 0px);
 }
 
 #urlbar-stop-button {
-  -moz-image-region: rect(0px, 42px, 14px, 28px);
+  -moz-image-region: rect(0px, 28px, 14px, 14px);
 }
 
 #urlbar-stop-button:hover {
+  -moz-image-region: rect(14px, 28px, 28px, 14px);
 }
 
 /* popup blocker button */
@@ -1178,32 +1611,37 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
   -moz-image-region: rect(0, 16px, 16px, 0);
 }
 
-#page-report-button:hover {
-  -moz-image-region: rect(0, 32px, 16px, 16px);
-}
-
+#page-report-button:hover ,
 #page-report-button:hover:active,
 #page-report-button[open="true"] {
-  -moz-image-region: rect(0, 48px, 16px, 32px);
+  -moz-image-region: rect(0, 32px, 16px, 16px);
 }
 
 /* star button */
 
 #star-button {
-  list-style-image: url("chrome://browser/skin/places/bookmark.png");
-  -moz-image-region: rect(0px 16px 16px 0px);
+  list-style-image: url("chrome://communicator/skin/bookmarks/bookmark.png");
+  -moz-image-region: rect(16px 16px 32px 0px);
 }
 
 #star-button:hover {
-  -moz-image-region: rect(0px 32px 16px 16px);
+  -moz-image-region: rect(16px 32px 32px 16px);
 }
 
 #star-button:hover:active {
-  -moz-image-region: rect(0px 48px 16px 32px);
+  -moz-image-region: rect(16px 48px 32px 32px);
 }
 
 #star-button[starred="true"] {
-  list-style-image: url("chrome://browser/skin/places/editBookmark.png");
+  -moz-image-region: rect(0px 16px 16px 0px);
+}
+
+#star-button[starred="true"]:hover {
+  -moz-image-region: rect(0px 32px 16px 16px);
+}
+
+#star-button[starred="true"]:hover:active {
+  -moz-image-region: rect(0px 48px 16px 32px);
 }
 
 /* bookmarking panel */
@@ -1231,6 +1669,41 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
   min-width: 27em;
 }
 
+.panel-promo-box {
+  margin: 5px -6px -6px -6px;
+  padding: 5px;
+  background-color: #000000;
+  color: #FF9F00;
+  border-bottom-left-radius: 5px;
+  border-bottom-right-radius: 5px;
+  border-top: 1px solid #9C9CFF;
+}
+
+.panel-promo-icon {
+  list-style-image: url("chrome://browser/skin/sync-notification-24.png");
+  -moz-margin-end: 10px;
+  vertical-align: middle;
+}
+
+.panel-promo-closebutton {
+  list-style-image: url("chrome://global/skin/icons/close-button.gif");
+  -moz-margin-end: -3px;
+  margin-top: -3px;
+}
+
+.panel-promo-closebutton:hover {
+  list-style-image: url("chrome://global/skin/icons/close-button-hover.gif");
+}
+
+.panel-promo-closebutton:hover:active {
+  list-style-image: url("chrome://global/skin/icons/close-button-hover.gif");
+}
+
+.panel-promo-closebutton > .toolbarbutton-text {
+  padding: 0;
+  margin: 0;
+}
+
 /* ::::: content area ::::: */
 
 #sidebar {
@@ -1267,7 +1740,7 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
 }
 
 #TabsToolbar .toolbar-holder {
-  background-color: #000000; /* correct effect of being an actal toolbar */
+  background-color: #000000; /* correct effect of being an actual toolbar */
 }
 
 #main-window[disablechrome] #TabsToolbar,
@@ -1324,8 +1797,8 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
 .tab-icon-image {
   width: 16px;
   height: 16px;
-  list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-item.gif");
-  -moz-image-region: rect(0px, 16px, 16px, 0px);
+  list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
+  -moz-image-region: auto;
   -moz-margin-end: 3px;
 }
 
@@ -1379,10 +1852,6 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
   list-style-image: url("chrome://global/skin/icons/close-button-hover.gif");
 }
 
-.tab-close-button:focus {
-  outline: none !important;
-}
-
 /* Tab scrollbox arrow, tabstrip new tab and all-tabs buttons */
 
 @media all and (-moz-touch-enabled) {
@@ -1403,40 +1872,15 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
 
 .tabbrowser-arrowscrollbox > .scrollbutton-up,
 .tabbrowser-arrowscrollbox > .scrollbutton-down {
-  list-style-image: url("chrome://browser/skin/tabbrowser/tab-arrow-left.png");
-  -moz-image-region: rect(0, 15px, 17px, 0);
   margin: 0;
   padding-top: 0;
   padding-bottom: 0;
 }
 
-.tabbrowser-arrowscrollbox > .scrollbutton-up[disabled],
-.tabbrowser-arrowscrollbox > .scrollbutton-down[disabled] {
-  opacity: .4;
-}
-
-.tabbrowser-arrowscrollbox > .scrollbutton-up:not([disabled]):hover:active,
-.tabbrowser-arrowscrollbox > .scrollbutton-down:not([disabled]):hover:active {
-  -moz-image-region: rect(0, 30px, 17px, 15px);
-}
-
-.tabbrowser-arrowscrollbox > .scrollbutton-up:-moz-locale-dir(rtl),
-.tabbrowser-arrowscrollbox > .scrollbutton-down:-moz-locale-dir(ltr) {
-  -moz-transform: scaleX(-1);
-}
-
-.tabbrowser-arrowscrollbox > .scrollbutton-down {
-}
-
 .tabbrowser-arrowscrollbox > .scrollbutton-down[notifybgtab] {
   background-color: #008484;
 }
 
-.tabbrowser-arrowscrollbox > .scrollbutton-up:not([disabled]),
-.tabbrowser-arrowscrollbox > .scrollbutton-down:not([disabled]) {
-  -moz-border-image: url("chrome://browser/skin/tabbrowser/tab-overflow-border.png") 0 2 0 2 / 0 2px 0 0;
-}
-
 .tabs-newtab-button > .toolbarbutton-icon {
   margin-top: -1px;
   margin-bottom: -1px;
@@ -1445,16 +1889,20 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
 .tabs-newtab-button,
 #TabsToolbar > #new-tab-button,
 #TabsToolbar > toolbarpaletteitem > #new-tab-button {
-  list-style-image: url(chrome://browser/skin/tabbrowser/newtab.png);
+  list-style-image: url("chrome://browser/skin/tabbrowser/newtab.png");
   -moz-image-region: rect(0, 16px, 18px, 0);
 }
 
 .tabs-newtab-button {
-  width: 31px;
+  width: 28px;
+}
+
+#TabsToolbar > #new-tab-button {
+  width: 26px;
 }
 
-.tabs-newtab-button:hover:active,
-#TabsToolbar > #new-tab-button:hover:active {
+.tabs-newtab-button:hover,
+#TabsToolbar > #new-tab-button:hover {
   -moz-image-region: rect(0, 32px, 18px, 16px);
 }
 
@@ -1463,32 +1911,31 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
   -moz-image-region: rect(0, 14px, 16px, 0);
 }
 
+#alltabs-button:hover,
 #alltabs-button:hover:active {
   -moz-image-region: rect(0, 28px, 16px, 14px);
 }
 
 #alltabs-button[type="menu"] {
-  list-style-image: url("chrome://browser/skin/mainwindow-dropdown-arrow.png");
-  -moz-image-region: rect(0, 13px, 11px, 0);
-}
-
-#alltabs-button[type="menu"] > .toolbarbutton-icon {
-  margin: 3px 0;
+  list-style-image: url("chrome://global/skin/arrow/arrow-down.gif");
+  -moz-image-region: auto;
 }
 
 #alltabs-button[type="menu"] > .toolbarbutton-menu-dropmarker {
   display: none;
 }
 
+#alltabs-button[type="menu"]:hover,
 #alltabs-button[type="menu"]:hover:active,
 #alltabs-button[type="menu"][open="true"] {
-  -moz-image-region: rect(0, 26px, 11px, 13px);
+  list-style-image: url("chrome://global/skin/arrow/arrow-down-hover.gif");
+  -moz-image-region: auto;
 }
 
 /* All tabs menupopup */
 .alltabs-item > .menu-iconic-left > .menu-iconic-icon {
-  list-style-image: url("chrome://global/skin/icons/folder-item.png");
-  -moz-image-region: rect(0px, 16px, 16px, 0px);
+  list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
+  -moz-image-region: auto;
 }
 
 .alltabs-item[selected="true"] {
@@ -1499,6 +1946,10 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
   list-style-image: url("chrome://global/skin/icons/loading.gif");
 }
 
+.alltabs-item[tabIsVisible] {
+  background-color: #402800;
+}
+
 /* Tabstrip close button */
 .tabs-closebutton {
   -moz-box-flex: 1;
@@ -1510,6 +1961,10 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
 .tabs-closebutton > .toolbarbutton-icon {
 }
 
+.tabs-closebutton > .toolbarbutton-text {
+  display: none;
+}
+
 .tabs-closebutton:hover,
 .tabs-closebutton:hover:active {
   list-style-image: url("chrome://global/skin/icons/close-button-hover.gif");
@@ -1548,7 +2003,7 @@ toolbar[mode="text"] toolbarbutton.chevron > .toolbarbutton-icon {
 
 /* Bookmarks toolbar */
 #PlacesToolbarDropIndicator {
-  list-style-image: url("chrome://browser/skin/places/toolbarDropMarker.png");
+  list-style-image: url("chrome://communicator/skin/bookmarks/toolbarDropMarker.png");
 }
 
 toolbarbutton.bookmark-item[dragover="true"][open="true"] {
@@ -1711,7 +2166,24 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
 
 /* Notification icon box */
 #notification-popup-box {
-  margin: 0 3px;
+  position: relative;
+  background-color: #000000;
+  background-clip: padding-box;
+  padding-left: 3px;
+  border-radius: 3px 0 0 3px;
+  -moz-border-image: url("chrome://browser/skin/urlbar-arrow.png") 0 8 0 0 / 0 8px 0 0;
+  -moz-margin-end: -8px;
+}
+
+window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
+    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
+    #unified-back-forward-button[forwarddisabled] + #urlbar-container > #urlbar > #notification-popup-box {
+  padding-left: 5px;
+}
+
+#notification-popup-box:-moz-locale-dir(rtl),
+.notification-anchor-icon:-moz-locale-dir(rtl) {
+  -moz-transform: scaleX(-1);
 }
 
 .notification-anchor-icon {
@@ -1720,8 +2192,8 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
 }
 
 .notification-anchor-icon:-moz-focusring {
-  outline: 1px dotted -moz-DialogText;
-  outline-offset: -3px;
+  outline: 1px dotted #008484;
+/*  outline-offset: -3px; */
 }
 
 #default-notification-icon {
@@ -1766,13 +2238,13 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
 #bookmarksToolbarFolderMenu,
 #appmenu_bookmarksToolbar,
 #BMB_bookmarksToolbar {
-  list-style-image: url("chrome://browser/skin/places/bookmarksToolbar.png");
+  list-style-image: url("chrome://communicator/skin/bookmarks/bookmarksToolbar.png");
   -moz-image-region: auto;
 }
 
 #appmenu_unsortedBookmarks,
 #BMB_unsortedBookmarks {
-  list-style-image: url("chrome://browser/skin/places/unsortedBookmarks.png");
+  list-style-image: url("chrome://communicator/skin/bookmarks/unsortedBookmarks.png");
   -moz-image-region: auto;
 }
 
@@ -1925,10 +2397,7 @@ panel[dimmed="true"] {
 #addon-bar {
   min-height: 20px;
   border-top: 3px solid #000000;
-}
-
-#addon-bar:not(:-moz-lwtheme) {
-  -moz-appearance: statusbar;
+  border-bottom-width: 0;
 }
 
 #addon-bar .toolbar-holder {
@@ -1952,6 +2421,13 @@ panel[dimmed="true"] {
   border-width: 0;
 }
 
+#addon-bar[customizing] > #status-bar {
+  opacity: .5;
+/*  background-image: -moz-repeating-linear-gradient(-45deg,
+                                                   rgba(255,255,255,.3), rgba(255,255,255,.3) 5px,
+                                                   rgba(0,0,0,.3) 5px, rgba(0,0,0,.3) 10px);*/
+}
+
 /* Remove all borders from statusbarpanel children of
    the statusbar.
 #status-bar > statusbarpanel {
@@ -1974,7 +2450,7 @@ panel[dimmed="true"] {
 .statuspanel-label {
   margin: 0;
   padding: 2px 4px;
-  background: -moz-linear-gradient(white, #ddd);
+  background: #404000;
   border: 1px none #9C9CFF;
   border-top-style: solid;
   color: #FF9F00;
@@ -1994,3 +2470,308 @@ panel[dimmed="true"] {
   border-top-left-radius: .3em;
   margin-left: 1em;
 }
+
+/* HACK to abolish devily color on main content */
+
+#content {
+  background-color: transparent !important;
+}
+
+/* Highlighter */
+
+.highlighter-veil {
+  background-color: rgba(0, 0, 0, 0.5);
+}
+
+#highlighter-closebutton {
+  list-style-image: url("chrome://global/skin/icons/close-button.gif");
+}
+
+#highlighter-closebutton:hover,
+#highlighter-closebutton:hover:active {
+  list-style-image: url("chrome://global/skin/icons/close-button-hover.gif");
+}
+
+highlighter-veil-transparentbox {
+  box-shadow: 0 0 0 1px rgba(0,0,0,0.5);
+  outline: 1px dashed rgba(255,255,255,0.5);
+  outline-offset: -1px;
+}
+
+#highlighter-veil-container[locked] > #highlighter-veil-middlebox > #highlighter-veil-transparentbox {
+  box-shadow: 0 0 0 1px black;
+  outline-color: white;
+}
+
+/* Highlighter toolbar */
+
+#inspector-toolbar {
+  border-top: 3px solid #000000;
+  border-bottom: none;
+}
+
+#inspector-toolbar[treepanel-open] {
+  padding-top: 0;
+  -moz-padding-end: 0;
+}
+
+#inspector-tools {
+  -moz-padding-start: 2px;
+  -moz-padding-end: 2px;
+  border-left: 3px solid #000000;
+  border-right: 3px solid #000000;
+  -moz-margin-start: 2px;
+  -moz-margin-end: 2px;
+}
+
+/* Highlighter - toolbar resizers */
+
+.inspector-resizer {
+  -moz-appearance: none;
+  cursor: n-resize;
+}
+
+#inspector-top-resizer {
+  background: none;
+  height: 4px;
+}
+
+#inspector-end-resizer {
+  width: 12px;
+  height: 8px;
+  border-width: 1px 1px 0;
+  border-style: solid;
+  border-color: #008484;
+  margin: 7px 7px 8px;
+}
+
+/* Highlighter - Node Infobar */
+
+/* Highlighter - Node Infobar - text */
+
+#highlighter-nodeinfobar-tagname {
+  color: #FFCF00;
+}
+
+#highlighter-nodeinfobar-id {
+  color: #9C9CFF;
+}
+
+.highlighter-nodeinfobar-class {
+  color: #FF9F00;
+}
+
+/* Highlighter - Node Infobar - box & arrow */
+
+#highlighter-nodeinfobar {
+  border: 1px solid rgba(156, 156, 255, .5);
+  border-radius: 3px;
+  padding: 8px 16px;
+  background: #000000 padding-box;
+}
+
+.highlighter-nodeinfobar-arrow {
+  width: 14px;
+  height: 14px;
+  -moz-margin-start: -moz-calc(50% - 7px);
+  -moz-transform: rotate(-45deg);
+  border: 1px solid transparent;
+  background-clip: padding-box;
+  background-repeat: no-repeat;
+}
+
+#highlighter-nodeinfobar-arrow-top {
+  margin-bottom: -8px;
+  margin-top: 8px;
+  border-right-color: rgba(0, 132, 132, .5);
+  border-top-color: rgba(0, 132, 132, .5);
+  background-image: -moz-linear-gradient(bottom left, transparent 50%, rgb(0, 132, 132) 50%);
+}
+
+#highlighter-nodeinfobar-arrow-bottom {
+  margin-top: -8px;
+  margin-bottom: 8px;
+  border-left-color: rgba(0, 132, 132, .5);
+  border-bottom-color: rgba(0, 132, 132, .5);
+  background-image: -moz-linear-gradient(top right, transparent 50%, rgb(0, 132, 132) 50%);
+}
+
+#highlighter-nodeinfobar-container[position="top"] > #highlighter-nodeinfobar,
+#highlighter-nodeinfobar-container[position="overlap"] > #highlighter-nodeinfobar {
+  box-shadow: 0 1px 0 hsla(0, 0%, 100%, .1) inset;
+}
+
+#highlighter-nodeinfobar-container[hide-arrow] > #highlighter-nodeinfobar {
+  margin: 7px 0;
+}
+
+#full-screen-warning-message {
+  background-color: #000000;
+  color: #FF9F00;
+  font-size: 32px;
+  border-radius: 8px;
+  margin-top: 30px;
+  padding: 30px 50px;
+  box-shadow: 0 0 2px #9C9CFF;
+}
+
+#full-screen-warning-container[obscure-browser] {
+  background-color: rgba(0,0,0,0.75);
+}
+
+#full-screen-warning-container[stop-obscuring-browser] {
+  -moz-transition-property: background-color;
+  -moz-transition-duration: 500ms;
+  background-color: rgba(0,0,0,0);
+}
+
+/* Highlighter toolbar - breadcrumbs */
+
+#inspector-breadcrumbs {
+  padding: 0 6px;
+}
+
+.inspector-breadcrumbs-button {
+  -moz-appearance: none;
+  border-width: 1px 13px 2px 13px;
+  /* color: hsl(210,30%,85%); */
+  max-width: 85px;
+  /* The content of the button can be larger than the button */
+  overflow: hidden;
+  min-height: 25px;
+  margin: 0 -11px 0 0;
+  padding: 0 9px;
+}
+
+.inspector-breadcrumbs-button[checked] > .inspector-breadcrumbs-tag {
+  /*color: hsl(208,100%,60%); */
+}
+
+.inspector-breadcrumbs-button[checked] > .inspector-breadcrumbs-id {
+  /*color: hsl(205,100%,70%); */
+}
+
+.inspector-breadcrumbs-id,
+.inspector-breadcrumbs-classes {
+  /*color: #8d99a6; */
+}
+
+/* Highlighter toolbar - breadcrumbs - LTR */
+
+.inspector-breadcrumbs-button:-moz-locale-dir(ltr):first-of-type {
+  margin-left: 0;
+}
+
+.inspector-breadcrumbs-button {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle.png") 1 13 2 13 stretch;
+}
+
+.inspector-breadcrumbs-button[siblings-menu-open]:not([checked]),
+.inspector-breadcrumbs-button:not([checked]):hover:active {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle-pressed.png") 1 13 2 13 stretch;
+}
+
+.inspector-breadcrumbs-button[checked] {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle-selected.png") 1 13 2 13 stretch;
+}
+
+.inspector-breadcrumbs-button[checked][siblings-menu-open],
+.inspector-breadcrumbs-button[checked]:hover:active {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle-selected-pressed.png") 1 13 2 13 stretch;
+}
+
+.inspector-breadcrumbs-button:first-of-type {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start.png") 1 13 2 13 stretch;
+}
+
+.inspector-breadcrumbs-button[siblings-menu-open]:first-of-type:not([checked]),
+.inspector-breadcrumbs-button:first-of-type:not([checked]):hover:active {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start-pressed.png") 1 13 2 13 stretch;
+}
+
+.inspector-breadcrumbs-button:first-of-type[checked] {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start-selected.png") 1 13 2 13 stretch;
+}
+
+.inspector-breadcrumbs-button[siblings-menu-open]:first-of-type[checked],
+.inspector-breadcrumbs-button:first-of-type[checked]:hover:active {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start-selected-pressed.png") 1 13 2 13 stretch;
+}
+
+.inspector-breadcrumbs-button:last-of-type {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end.png") 1 13 2 13 stretch;
+}
+
+.inspector-breadcrumbs-button[siblings-menu-open]:last-of-type:not([checked]),
+.inspector-breadcrumbs-button:last-of-type:not([checked]):hover:active {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end-pressed.png") 1 13 2 13 stretch;
+}
+
+.inspector-breadcrumbs-button:last-of-type[checked] {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end-selected.png") 1 13 2 13 stretch;
+}
+
+.inspector-breadcrumbs-button[siblings-menu-open]:last-of-type[checked],
+.inspector-breadcrumbs-button:last-of-type[checked]:hover:active {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end-selected-pressed.png") 1 13 2 13 stretch;
+}
+
+/* Highlighter toolbar - breadcrumbs - RTL */
+
+.inspector-breadcrumbs-button:-moz-locale-dir(rtl):first-of-type {
+  margin-right: 0;
+}
+
+.inspector-breadcrumbs-button:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle.png") 1 13 2 13 stretch;
+}
+
+.inspector-breadcrumbs-button[siblings-menu-open]:not([checked]):-moz-locale-dir(rtl),
+.inspector-breadcrumbs-button:not([checked]):hover:active:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle-pressed.png") 1 13 2 13 stretch;
+}
+
+.inspector-breadcrumbs-button[checked]:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle-selected.png") 1 13 2 13 stretch;
+}
+
+.inspector-breadcrumbs-button[checked][siblings-menu-open]:-moz-locale-dir(rtl),
+.inspector-breadcrumbs-button[checked]:hover:active:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle-selected-pressed.png") 1 13 2 13 stretch;
+}
+
+.inspector-breadcrumbs-button:first-of-type:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start.png") 1 13 2 13 stretch;
+}
+
+.inspector-breadcrumbs-button[siblings-menu-open]:first-of-type:not([checked]):-moz-locale-dir(rtl),
+.inspector-breadcrumbs-button:first-of-type:not([checked]):hover:active:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start-pressed.png") 1 13 2 13 stretch;
+}
+
+.inspector-breadcrumbs-button:first-of-type[checked]:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start-selected.png") 1 13 2 13 stretch;
+}
+
+.inspector-breadcrumbs-button[siblings-menu-open]:first-of-type[checked]:-moz-locale-dir(rtl),
+.inspector-breadcrumbs-button:first-of-type[checked]:hover:active:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start-selected-pressed.png") 1 13 2 13 stretch;
+}
+
+.inspector-breadcrumbs-button:last-of-type:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end.png") 1 13 2 13 stretch;
+}
+
+.inspector-breadcrumbs-button[siblings-menu-open]:last-of-type:not([checked]):-moz-locale-dir(rtl),
+.inspector-breadcrumbs-button:last-of-type:not([checked]):hover:active:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end-pressed.png") 1 13 2 13 stretch;
+}
+
+.inspector-breadcrumbs-button:last-of-type[checked]:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end-selected.png") 1 13 2 13 stretch;
+}
+
+.inspector-breadcrumbs-button[siblings-menu-open]:last-of-type[checked]:-moz-locale-dir(rtl),
+.inspector-breadcrumbs-button:last-of-type[checked]:hover:active:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end-selected-pressed.png") 1 13 2 13 stretch;
+}