X-Git-Url: https://git-public.kairo.at/?p=themes.git;a=blobdiff_plain;f=LCARStrek%2Fbrowser%2Fbrowser.css;h=3c5faec24c7bdfa6d65a69d3a2e140b2621dcbef;hp=2b91e5a347e6e69208d409485303b86615117193;hb=3e6e0e5c00feea277ec18fc64d75b4bdb2f5d0a1;hpb=8caa872d050772c572257f23011c668f70dcaef7

diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css
index 2b91e5a3..3c5faec2 100644
--- a/LCARStrek/browser/browser.css
+++ b/LCARStrek/browser/browser.css
@@ -1,10 +1,10 @@
 /* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
  *
  * Software distributed under the License is distributed on an "AS IS" basis,
  * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
@@ -23,7 +23,11 @@
  *   Jason Kersey (kerz@netscape.com)
  *   Pierre Chanial (chanial@noos.fr)
  *   Dean Tessman (dean_tessman@hotmail.com)
- *   Robert Kaiser (kairo@kairo.at)
+ *   Blake Ross (blake@cs.stanford.edu)
+ *   Pamela Greene (pamg.bugs@gmail.com)
+ *   Dão Gottwald (dao@mozilla.com)
+ *   Jim Mathies (jmathies@mozilla.com)
+ *   Drew Willcoxon (adw@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
@@ -31,60 +35,384 @@
  * in which case the provisions of the GPL or the LGPL are applicable instead
  * of those above. If you wish to allow use of your version of this file only
  * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the NPL, indicate your
+ * use your version of this file under the terms of the MPL, indicate your
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the NPL, the GPL or the LGPL.
+ * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 @import url("chrome://global/skin/");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+@namespace html url("http://www.w3.org/1999/xhtml");
+
+toolbar {
+  -moz-binding: url("chrome://global/skin/globalBindings.xml#toolbar");
+}
+
+toolbar[type="menubar"][autohide="true"] {
+  -moz-binding: url("chrome://global/skin/globalBindings.xml#toolbar-menubar-autohide");
+}
 
 menubar {
-  -moz-binding: url("chrome://global/content/widgets/toolbar.xml#menubar");
-  background-color: transparent;
+  -moz-binding: url("chrome://global/skin/globalBindings.xml#menubar");
 }
 
-toolbar {
-  -moz-binding: url("chrome://browser/skin/browser.xml#toolbar");
+#menubar-items {
+  -moz-box-orient: vertical; /* for flex hack */
 }
 
-menubar > menu {
-  -moz-margin-start: 2px;
+#main-menubar {
+  -moz-box-flex: 1; /* make menu items expand to fill toolbar height */
 }
 
-.toolbar-primary > .toolbar-holder {
+/* ::::: primary toolbar ::::: */
+
+.toolbar-primary > .toolbar-box > .toolbar-holder {
   background-color: #FF9F00;
 }
 
-.toolbar-primary > .toolbar-begcap,
-.toolbar-primary > .toolbar-endcap {
+.toolbar-primary > .toolbar-box > .toolbar-startcap,
+.toolbar-primary > .toolbar-box > .toolbar-endcap {
   background-color: #9C9CFF;
 }
 
-#PersonalToolbar {
-  min-height: 20px;
+
+#navigator-toolbox {
 }
 
-/* ::::: bookmark buttons ::::: */
+#navigator-toolbox::after {
+  content: "";
+  display: -moz-box;
+  -moz-box-ordinal-group: 101; /* tabs toolbar is 100 */
+  height: 1px;
+}
+#navigator-toolbox[tabsontop=false]::after,
+#main-window[disablechrome] #navigator-toolbox::after {
+  visibility: collapse;
+}
+
+#navigator-toolbox > toolbar:not(:-moz-lwtheme) {
+}
+
+#main-window[tabsintitlebar]:not([inFullscreen]) #toolbar-menubar[inactive] ~ #TabsToolbar:not(:-moz-lwtheme) {
+  /* like menubar */
+  background-color: #6000CF;
+  color: #FF9F00;
+}
+#main-window[tabsintitlebar]:not([inFullscreen]) #toolbar-menubar[inactive] ~ #TabsToolbar:not(:-moz-lwtheme):-moz-window-inactive {
+  background-color: #8050B0;
+  color: #FF9F00;
+}
+
+#main-window[tabsintitlebar] #titlebar:-moz-lwtheme {
+  visibility: hidden;
+}
+#main-window[tabsintitlebar] #titlebar-content:-moz-lwtheme {
+  -moz-binding: url("chrome://global/content/bindings/general.xml#windowdragbox");
+  visibility: visible;
+}
+
+#navigator-toolbox[tabsontop="true"] > #nav-bar,
+#navigator-toolbox[tabsontop="true"]:not([customizing]) > #nav-bar[collapsed="true"] + toolbar,
+#navigator-toolbox[tabsontop="true"]:not([customizing]) > #nav-bar[collapsed="true"] + #customToolbars + #PersonalToolbar {
+  /* background-image: -moz-linear-gradient(@toolbarHighlight@, rgba(255,255,255,0)); */
+}
+
+#personal-bookmarks {
+/*  min-height: 24px; */
+}
+
+#print-preview-toolbar:not(:-moz-lwtheme) {
+  /* -moz-appearance: toolbox; */
+}
+
+/* ::::: app menu button ::::: */
+
+#appmenu-button {
+  background-color: #FF9F00;
+  background-clip: padding-box;
+  border-radius: 0;
+  border: none;
+  border-right: 3px solid #000000;
+  color: #000000;
+  font-weight: bold;
+  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 {
+  background-color: #6000CF;
+  color: #FFCF00;
+}
+
+#appmenu-button:hover:not(:active):not([open]) {
+}
+
+#main-window[privatebrowsingmode=temporary] #appmenu-button:hover:not(:active):not([open]) {
+}
+
+#appmenu-button:hover,
+#appmenu-button:hover:active,
+#appmenu-button[open] {
+  background-color: #FFCF00;
+  color: #000000;
+}
 
-toolbarbutton.bookmark-item {
+#appmenu-button > .button-box > .button-menu-dropmarker {
+  list-style-image: url("chrome://global/skin/arrow/arrow-down-hover.gif");
+  width: auto;
+  height: auto;
+  padding: 0;
   margin: 0;
-  -moz-margin-end: 2px;
-  min-width: 0;
-  max-width: 13em;
-  min-height: 20px;
-  padding: 1px;
+  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;
+}
+
+.appmenu-edit-button {
+}
+
+.appmenu-edit-button[disabled="true"] {
+}
+
+#appmenuPrimaryPane {
+  -moz-border-end: 1px solid #9C9CFF;
+}
+/*
+  #appmenu-popup {
+  }
+  #appmenuPrimaryPane {
+  }
+  #appmenuSecondaryPane {
+  }
+  #appmenuSecondaryPane:-moz-locale-dir(rtl) {
+  }
+
+  #appmenuSecondaryPane menupopup {
+  }
+
+  .appmenu-menuseparator {
+  }
+
+  .appmenu-edit-button:not([disabled]):hover {
+  }
+*/
+#appmenuSecondaryPane-spacer {
+  min-height: 1em;
+}
+
+#appmenu-editmenu {
+  -moz-box-pack: end;
+}
+
+#appmenu_print,
+#appmenu_print_popup,
+.appmenu-edit-button,
+#appmenu-editmenu-cut,
+#appmenu-editmenu-copy,
+#appmenu-editmenu-paste,
+#appmenu-quit {
+  list-style-image: url("appmenu-icons.png");
+}
+
+#appmenu-cut,
+#appmenu-editmenu-cut {
+  -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;
+  font-style: italic;
+}
+
+#appmenu_bookmarks {
+  list-style-image: url("chrome://browser/skin/places/bookmark.png");
+  -moz-image-region: rect(0px 48px 16px 32px);
+}
+
+#appmenu_privateBrowsing {
+  list-style-image: url("chrome://browser/skin/Privacy-16.png");
+}
+
+#appmenu_addons {
+  list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric-16.png");
+}
+
+#BMB_bookmarkThisPage,
+#appmenu_bookmarkThisPage {
+  list-style-image: url("chrome://browser/skin/places/bookmark.png");
+  -moz-image-region: rect(0 16px 16px 0);
+}
+
+/* ::::: 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 {
+}
+
+.titlebar-placeholder[type="appmenu-button"] {
+  margin-left: 4px;
+}
+
+.titlebar-placeholder[type="caption-buttons"] {
+  margin-left: 10px;
+}
+
+/* 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");
+}
+
+#titlebar-max:hover {
+  list-style-image: url("chrome://browser/skin/win-maximize-hover.gif");
+}
+
+#main-window[sizemode="maximized"] #titlebar-max {
+  list-style-image: url("chrome://navigator/skin/icons/win-restore.gif");
+}
+
+#main-window[sizemode="maximized"] #titlebar-max:hover {
+  list-style-image: url("chrome://navigator/skin/icons/win-restore-hover.gif");
+}
+
+#titlebar-close {
+  list-style-image: url("chrome://navigator/skin/icons/win-close.gif");
 }
 
-toolbarbutton.bookmark-item:hover:active,
-toolbarbutton.bookmark-item[open="true"] {
-  padding: 2px 0px 0px 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;
@@ -99,665 +427,1854 @@ toolbarbutton.bookmark-item[open="true"] {
   display: none;
 }
 
-.toolbarpaletteitem-box[type="bookmarks-toolbar"][place="palette"] {
-  width: 32px;
-  height: 32px;
-  background: url("chrome://browser/skin/icons/bookmarks-folder.gif") no-repeat;
+#wrapper-personal-bookmarks[place="palette"] > .toolbarpaletteitem-box {
+  width: 16px;
+  height: 16px;
+  background: url("chrome://communicator/skin/bookmarks/bookmarksToolbar.png") no-repeat;
 }
 
 .bookmarks-toolbar-customize {
-  display: none;
   max-width: 15em !important;
+  list-style-image: url("chrome://communicator/skin/bookmarks/bookmarksToolbar.png") !important;
 }
 
-toolbarpaletteitem[place="toolbar"] .bookmarks-toolbar-customize {
-  display: -moz-box;
+/* ::::: bookmark menus ::::: */
+
+menu.bookmark-item,
+menuitem.bookmark-item {
+  min-width: 0;
+  max-width: 32em;
+}
+
+.bookmark-item > .menu-iconic-left {
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+.bookmark-item > .menu-iconic-left > .menu-iconic-icon {
+  -moz-padding-start: 0px;
+}
+
+/* ::::: bookmark items ::::: */
+
+.bookmark-item  {
+  list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-item.gif");
+  -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://communicator/skin/bookmarks/livemark-folder.png");
+  -moz-image-region: auto;
+}
+
+.bookmark-item[container][livemark] .bookmark-item {
+  list-style-image: url("chrome://communicator/skin/bookmarks/livemark-item.png");
+  -moz-image-region: auto;
+}
+
+.bookmark-item[container][query] {
+  list-style-image: url("chrome://communicator/skin/bookmarks/query.png");
+  -moz-image-region: auto;
+}
+
+.bookmark-item[query][tagContainer] {
+  list-style-image: url("chrome://mozapps/skin/places/tagContainerIcon.png");
+  -moz-image-region: auto;
+}
+
+.bookmark-item[query][dayContainer] {
+  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;
+}
+
+/* ::::: primary toolbar buttons ::::: */
+
+.toolbarbutton-1 {
+  list-style-image: url("chrome://browser/skin/Toolbar.png");
+}
+
+.toolbarbutton-1:not([type="menu-button"]) {
+  -moz-box-orient: vertical;
+}
+
+.toolbarbutton-1,
+.toolbarbutton-1 > .toolbarbutton-menubutton-button {
+  min-width: 36px;
+  min-height: 36px;
+}
+
+.toolbarbutton-1:not([type="menu-button"]) {
+  -moz-box-orient: vertical;
+}
+
+.toolbarbutton-1,
+.toolbarbutton-1 > .toolbarbutton-menubutton-button,
+.toolbarbutton-1[disabled="true"]:hover:active,
+.toolbarbutton-1[disabled="true"]:hover:active > .toolbarbutton-menubutton-button {
+  padding: 1px 2px;
+}
+
+.toolbarbutton-1:hover:active,
+.toolbarbutton-1[open="true"],
+.toolbarbutton-1:hover:active > .toolbarbutton-menubutton-button {
+  padding-top: 2px;
+  padding-bottom: 0px;
+  -moz-padding-start: 3px;
+  -moz-padding-end: 1px;
+}
+
+/* ::::: small primary toolbar buttons ::::: */
+
+#nav-bar {
+  /* force iconsize="small" on this toolbar */
+  counter-reset: smallicons;
+}
+
+toolbar[mode="text"] .toolbarbutton-1,
+toolbar[mode="icons"] .toolbarbutton-1,
+toolbar[iconsize="small"] .toolbarbutton-1,
+:-moz-any(#TabsToolbar, #addon-bar) .toolbarbutton-1,
+toolbar[mode="text"] .toolbarbutton-menubutton-button,
+toolbar[mode="icons"] .toolbarbutton-menubutton-button,
+toolbar[iconsize="small"] .toolbarbutton-menubutton-button,
+:-moz-any(#TabsToolbar, #addon-bar) .toolbarbutton-1 > .toolbarbutton-menubutton-button {
+  min-width: 0px;
+  min-height: 0px;
+}
+
+toolbar[mode="text"] .toolbarbutton-menubutton-dropmarker {
+  padding-top: 4px;
+  padding-bottom: 8px;
+  -moz-padding-start: 1px;
+  -moz-padding-end: 1px;
+}
+
+toolbar[mode="icons"] .toolbarbutton-menubutton-dropmarker,
+toolbar[iconsize="small"] .toolbarbutton-menubutton-dropmarker,
+:-moz-any(#TabsToolbar, #addon-bar) .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
+  padding-top: 0px;
+  padding-bottom: 13px;
+  -moz-padding-start: 1px;
+  -moz-padding-end: 1px;
+}
+
+toolbar[mode="text"] .toolbarbutton-1[type="menu-button"]:hover:active > .toolbarbutton-menubutton-dropmarker,
+toolbar[mode="text"] .toolbarbutton-1[type="menu-button"][open="true"] > .toolbarbutton-menubutton-dropmarker {
+  padding-top: 5px;
+  padding-bottom: 7px;
+  -moz-padding-start: 0px;
+  -moz-padding-end: 2px;
+}
+
+toolbar[mode="icons"] .toolbarbutton-1[type="menu-button"]:hover:active > .toolbarbutton-menubutton-dropmarker,
+toolbar[mode="icons"] .toolbarbutton-1[type="menu-button"][open="true"] > .toolbarbutton-menubutton-dropmarker,
+toolbar[iconsize="small"] .toolbarbutton-1[type="menu-button"]:hover:active > .toolbarbutton-menubutton-dropmarker,
+toolbar[iconsize="small"] .toolbarbutton-1[type="menu-button"][open="true"] > .toolbarbutton-menubutton-dropmarker,
+:-moz-any(#TabsToolbar, #addon-bar) .toolbarbutton-1[type="menu-button"]:hover:active > .toolbarbutton-menubutton-dropmarker,
+:-moz-any(#TabsToolbar, #addon-bar) .toolbarbutton-1[type="menu-button"][open="true"] > .toolbarbutton-menubutton-dropmarker {
+  padding-top: 1px;
+  padding-bottom: 12px;
+  -moz-padding-start: 0px;
+  -moz-padding-end: 2px;
+}
+
+toolbar[mode="text"] .toolbarbutton-menubutton-dropmarker[disabled="true"] {
+  padding-top: 4px !important;
+  padding-bottom: 8px !important;
+  -moz-padding-start: 1px !important;
+  -moz-padding-end: 1px !important;
+}
+
+toolbar[mode="icons"] .toolbarbutton-menubutton-dropmarker[disabled="true"],
+toolbar[iconsize="small"] > .toolbarbutton-menubutton-dropmarker[disabled="true"] {
+  padding-top: 0px !important;
+  padding-bottom: 13px !important;
+  -moz-padding-start: 1px !important;
+  -moz-padding-end: 1px !important;
+}
+
+toolbar[mode="icons"] .toolbarbutton-text,
+toolbar[mode="text"] .toolbarbutton-icon {
+  display: none;
+}
+
+toolbar[mode="text"] .toolbarbutton-text {
+  padding: 4px 0;
+}
+
+toolbar[mode="text"] .toolbarbutton-1,
+toolbar[mode="text"] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
+  -moz-box-orient: horizontal;
+}
+
+toolbar[mode="full"] .toolbarbutton-1,
+toolbar[mode="full"] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
+  min-width: 30px;
+}
+
+#navigator-toolbox[iconsize=small] > #nav-bar {
+}
+
+#navigator-toolbox[iconsize=large][mode=icons] > #nav-bar {
+}
+
+
+/* unified back/forward button */
+
+#back-button {
+  -moz-image-region: rect(0, 18px, 18px, 0);
+  -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;
+}
+
+#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,
+#forward-button:-moz-locale-dir(rtl),
+#forward-button:-moz-locale-dir(rtl) > .toolbarbutton-text {
+  -moz-transform: scaleX(-1);
+}
+
+#nav-bar #back-button {
+  -moz-margin-end: 0 !important;
+}
+
+#nav-bar #forward-button {
+  border-left-style: none;
+  -moz-margin-start: 0 !important;
+}
+
+#nav-bar #back-button:-moz-locale-dir(ltr) {
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+}
+
+#nav-bar #back-button:-moz-locale-dir(rtl),
+#nav-bar #forward-button {
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
+}
+
+#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #back-button {
+  border-radius: 10000px;
+  width: 30px;
+  height: 30px;
+  position: relative;
+  z-index: 1;
+  margin-top: -2px;
+  margin-bottom: -2px;
+  border: none;
+  -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 {
+}
+
+#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #back-button:not([disabled="true"]):hover:active,
+#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #back-button[open="true"] {
+}
+
+#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar[currentset*="unified-back-forward-button"],
+#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar:not([currentset]) {
+/*  padding-top: 3px;
+  padding-bottom: 5px; */
+}
+
+#navigator-toolbox[iconsize="large"][mode="icons"][tabsontop="true"] > #nav-bar[currentset*="unified-back-forward-button"],
+#navigator-toolbox[iconsize="large"][mode="icons"][tabsontop="true"] > #nav-bar:not([currentset]) {
+/*  padding-top: 5px; */
+}
+
+#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #forward-button {
+  /*mask: url(keyhole-forward-mask.svg#mask); XXX: this regresses twinopen */
+  mask: url("chrome://browser/content/browser.xul#winstripe-keyhole-forward-mask");
+  -moz-margin-start: -6px !important;
+  padding-left: 7px;
+  padding-right: 3px;
+}
+
+#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #forward-button:not([disabled="true"]):not(:active):hover {
+  /*mask: url(keyhole-forward-mask.svg#mask-hover);*/
+  mask: url("chrome://browser/content/browser.xul#winstripe-keyhole-forward-mask-hover");
+}
+
+.unified-nav-back[_moz-menuactive]:-moz-locale-dir(ltr),
+.unified-nav-forward[_moz-menuactive]:-moz-locale-dir(rtl) {
+  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://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;
+}
+
+/* stop button */
+
+#stop-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 {
+  list-style-image: url("chrome://browser/skin/Toolbar.png");
+}
+#home-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,
+#menu_tabview {
+  list-style-image: url("chrome://browser/skin/tabview/tabview.png");
+}
+
+#tabview-button {
+  -moz-image-region: rect(0, 90px, 18px, 72px);
+}
+
+#tabview-button[groups="0"] {
+  -moz-image-region: rect(0, 18px, 18px, 0);
+}
+
+#tabview-button[groups="1"] {
+  -moz-image-region: rect(0, 36px, 18px, 18px);
+}
+
+#tabview-button[groups="2"] {
+  -moz-image-region: rect(0, 54px, 18px, 36px);
+}
+
+#tabview-button[groups="3"] {
+  -moz-image-region: rect(0, 72px, 18px, 54px);
+}
+
+#menu_tabview {
+  -moz-image-region: rect(1px, 89px, 17px, 73px);
+}
+
+#menu_tabview[groups="0"] {
+  -moz-image-region: rect(1px, 17px, 17px, 1px);
+}
+
+#menu_tabview[groups="1"] {
+  -moz-image-region: rect(1px, 35px, 17px, 19px);
+}
+
+#menu_tabview[groups="2"] {
+  -moz-image-region: rect(1px, 53px, 17px, 37px);
+}
+
+#menu_tabview[groups="3"] {
+  -moz-image-region: rect(1px, 71px, 17px, 55px);
+}
+
+/* download manager button */
+
+#downloads-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"); */
+}
+
+#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 {
+  -moz-image-region: rect(0, 288px, 18px, 270px);
+  -moz-margin-end: 0;
+}
+
+#zoom-in-button {
+  -moz-image-region: rect(0, 306px, 18px, 288px);
+}
+
+#nav-bar #zoom-out-button {
+  -moz-margin-end: 0;
+}
+
+#nav-bar #zoom-in-button {
+  -moz-border-start: none;
+  -moz-margin-start: 0;
+}
+
+#nav-bar #zoom-out-button:-moz-locale-dir(ltr),
+#nav-bar #zoom-in-button:-moz-locale-dir(rtl) {
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+}
+
+#nav-bar #zoom-out-button:-moz-locale-dir(rtl),
+#nav-bar #zoom-in-button:-moz-locale-dir(ltr) {
+  border-top-left-radius: 0;
+  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 {
+  list-style-image: url("chrome://browser/skin/Toolbar.png") !important; /* for making the palette work */
+  -moz-image-region: rect(0, 324px, 18px, 306px);
+}
+
+#sync-button[status="active"] {
+  list-style-image: url("chrome://browser/skin/sync-throbber.png");
+  -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 {
+  -moz-margin-start: 4px;
+}
+
+#minimize-button,
+#restore-button,
+#close-button {
+/*  padding: 0; */
+}
+
+#minimize-button {
+  list-style-image: url("chrome://navigator/skin/icons/win-minimize.gif");
+}
+
+#minimize-button:hover {
+  list-style-image: url("chrome://navigator/skin/icons/win-minimize-hover.gif");
+}
+
+#restore-button {
+  list-style-image: url("chrome://navigator/skin/icons/win-restore.gif");
+}
+
+#restore-button:hover {
+  list-style-image: url("chrome://navigator/skin/icons/win-restore-hover.gif");
+}
+
+#close-button {
+  list-style-image: url("chrome://navigator/skin/icons/win-close.gif");
+}
+
+#close-button:hover {
+  list-style-image: url("chrome://navigator/skin/icons/win-close-hover.gif");
+}
+
+/* ::::: Location Bar ::::: */
+
+#urlbar {
+  width: 7em;
+  min-width: 7em;
+  color: #FFBFFF;
+}
+
+#urlbar,
+.searchbar-textbox {
+  border-radius: 5px;
+  margin: 0;
+  -moz-margin-start: 3px;
+}
+
+#urlbar:-moz-lwtheme,
+.searchbar-textbox:-moz-lwtheme {
+  /* background-color: rgba(255,255,255,.8);
+  @navbarTextboxCustomBorder@
+  color: black; */
+}
+
+html|*.urlbar-input:-moz-lwtheme:-moz-placeholder,
+.searchbar-textbox:-moz-lwtheme > .autocomplete-textbox-container > .textbox-input-box > html|*.textbox-input:-moz-placeholder {
+  color: #E7ADE7;
+}
+
+#urlbar:-moz-lwtheme[focused="true"],
+.searchbar-textbox:-moz-lwtheme[focused="true"] {
+/*  background-color: white; */
+}
+
+#urlbar-container {
+  -moz-box-orient: horizontal;
+  -moz-box-align: stretch;
+}
+
+.urlbar-textbox-container {
+  -moz-box-align: stretch;
+}
+
+#urlbar-icons {
+  height: 18px;
+  -moz-box-align: center;
+}
+
+.urlbar-icon {
+  padding: 0 2px !important;
+}
+
+.urlbar-icon:-moz-system-metric(touch-enabled) {
+  -moz-margin-end: 1px !important;
+  padding: 0 3px !important;
+}
+
+#urlbar-search-splitter {
+  min-width: 6px;
+  -moz-margin-start: -3px;
+  border: none;
+  background: transparent;
+}
+
+#urlbar-search-splitter + #urlbar-container > #urlbar ,
+#urlbar-search-splitter + #search-container > #searchbar > .searchbar-textbox {
+  -moz-margin-start: 0;
+}
+
+#urlbar-display {
+  -moz-border-end: 1px solid #9C9CFF;
+  -moz-margin-end: 3px;
+  margin-top: 0;
+  margin-bottom: 0;
+  color: #8050B0;
+}
+
+/* identity box */
+
+#identity-box {
+  background-color: #000000;
+  color: #FF9F00;
+  border-radius: 2px;
+}
+
+#identity-box:hover {
+  background-color: #9C9CFF;
+  color: #000000;
+}
+
+#identity-box[open="true"],
+#identity-box:hover:active {
+  background-color: #FF9F00;
+  color: #000000;
+}
+
+#identity-box.verifiedDomain {
+  background-color: #FFCF00;
+  color: #000000;
+}
+
+#identity-box.verifiedIdentity {
+  background-color: #008484;
+  color: #000000;
+}
+
+#identity-box:-moz-focusring {
+  outline: 1px dotted #008484;
+  outline-offset: -1px;
+}
+
+#identity-box.verifiedDomain:-moz-focusring,
+#identity-box.verifiedIdentity:-moz-focusring {
+  outline-color: #000000;
+}
+
+#identity-icon-labels {
+  -moz-margin-start: 1px;
+  -moz-margin-end: 3px;
+}
+
+/* Location bar dropmarker */
+
+.urlbar-history-dropmarker:not(:hover):not([open="true"]) {
+  background-color: transparent;
+}
+
+#urlbar-container[combined="true"] > #urlbar > .urlbar-history-dropmarker {
+  border: none;
+  border-radius: 0px;
+}
+
+/* page proxy icon */
+
+#page-proxy-favicon,
+#urlbar-throbber {
+  width: 16px;
+  height: 16px;
+}
+
+#page-proxy-stack {
+  width: 24px;
+  height: 18px;
+  padding: 1px 4px;
+}
+
+#page-proxy-favicon:not([src]) {
+  list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-item.gif");
+}
+
+#page-proxy-favicon[pageproxystate="invalid"] {
+  list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-item.gif");
+}
+
+#urlbar-throbber {
+  list-style-image: url("chrome://global/skin/icons/loading.gif");
+}
+
+/* autocomplete */
+
+#treecolAutoCompleteImage {
+  max-width: 36px;
+}
+
+.ac-result-type-bookmark,
+.autocomplete-treebody::-moz-tree-image(bookmark, treecolAutoCompleteImage) {
+  list-style-image: url("chrome://browser/skin/places/bookmark.png");
+  -moz-image-region: rect(0px 16px 16px 0px);
+  width: 16px;
+  height: 16px;
+}
+
+.ac-result-type-keyword,
+.autocomplete-treebody::-moz-tree-image(keyword, treecolAutoCompleteImage) {
+  list-style-image: url("chrome://global/skin/icons/Search-glass.png");
+  -moz-image-region: rect(0px 32px 16px 16px);
+  width: 16px;
+  height: 16px;
+}
+
+.ac-result-type-tag,
+.autocomplete-treebody::-moz-tree-image(tag, treecolAutoCompleteImage) {
+  list-style-image: url("chrome://mozapps/skin/places/tagContainerIcon.png");
+  width: 16px;
+  height: 16px;
+}
+
+.ac-comment {
+  font-size: 1.15em;
+}
+
+.ac-extra > .ac-comment {
+  font-size: inherit;
+}
+
+.ac-url-text,
+.ac-action-text {
+  color: #9C9CFF;
+}
+
+richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-icon {
+  list-style-image: url("chrome://browser/skin/actionicon-tab.png");
+}
+
+.autocomplete-treebody::-moz-tree-cell-text(treecolAutoCompleteComment) {
+  color: #8050B0;
+}
+
+.ac-comment[selected="true"],
+.ac-url-text[selected="true"],
+.ac-action-text[selected="true"] {
+  color: inherit !important;
+}
+
+.autocomplete-treebody::-moz-tree-cell-text(suggesthint, treecolAutoCompleteComment),
+.autocomplete-treebody::-moz-tree-cell-text(suggestfirst, treecolAutoCompleteComment)
+{
+  color: #8050B0;
+  font-size: smaller;
+}
+
+.autocomplete-treebody::-moz-tree-cell(suggesthint) {
+  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 */
+
+#urlbar > toolbarbutton {
+  list-style-image: url("chrome://browser/skin/reload-stop-go.png");
+  /* margin: -2px; */
+  -moz-margin-start: 0;
+  padding: 0 3px;
+  background-origin: border-box;
+  border: none;
+  -moz-border-start: 1px solid #9C9CFF;
+}
+
+#urlbar:-moz-locale-dir(ltr) > toolbarbutton {
+  border-top-left-radius: 0px;
+  border-bottom-left-radius: 0px;
+}
+
+#urlbar:-moz-locale-dir(rtl) > toolbarbutton {
+  border-top-right-radius: 0px;
+  border-bottom-right-radius: 0px;
 }
 
-toolbarpaletteitem[place="toolbar"] .bookmarks-toolbar-overflow-items {
-  visibility: hidden;
+#urlbar > toolbarbutton:not([disabled]):active:hover {
+  -moz-padding-start: 4px;
+  -moz-border-start: none;
 }
 
-toolbarpaletteitem[place="toolbar"] .bookmarks-toolbar-items {
-  visibility: hidden;
+#urlbar-go-button {
+  -moz-image-region: rect(0px, 56px, 14px, 42px);
 }
 
-/* ::::: bookmark menus ::::: */
+#urlbar-go-button:hover {
+  -moz-image-region: rect(14px, 56px, 28px, 42px);
+}
 
-menu.bookmark-item,
-menuitem.bookmark-item {
-  min-width: 0;
-  max-width: 26em;
-  border-top: 1px solid transparent !important;
-  border-bottom: 1px solid transparent !important;
-  padding: 1px 3px 1px 2px;
-  margin-top: -1px;
+#urlbar-reload-button {
+  -moz-image-region: rect(0px, 28px, 14px, 14px);
 }
 
-.bookmark-item > .menu-iconic-left > .menu-iconic-icon {
-  width: 16px;
-  height: 16px;
+#urlbar-reload-button[disabled] {
+  -moz-image-region: rect(0px, 14px, 14px, 0px);
 }
 
-/* ..... drag and drop styles ..... */
+#urlbar-reload-button:not([disabled]):hover {
+  -moz-image-region: rect(14px, 28px, 28px, 14px);
+}
 
-.bookmark-item[dragover-left="true"] {
-  -moz-border-left-colors: #008484;
+#urlbar-stop-button {
+  -moz-image-region: rect(0px, 42px, 14px, 28px);
 }
-.bookmark-item[dragover-right="true"] {
-  -moz-border-right-colors: #008484;
+
+#urlbar-stop-button:hover {
+  -moz-image-region: rect(14px, 42px, 28px, 28px);
 }
-.bookmark-item[dragover-top="true"] {
-  -moz-border-top-colors: #008484;
+
+/* popup blocker button */
+
+#page-report-button {
+  list-style-image: url("chrome://browser/skin/urlbar-popup-blocked.png");
+  -moz-image-region: rect(0, 16px, 16px, 0);
 }
-.bookmark-item[dragover-bottom="true"] {
-  -moz-border-bottom-colors: #008484;
+
+#page-report-button:hover ,
+#page-report-button:hover:active,
+#page-report-button[open="true"] {
+  -moz-image-region: rect(0, 32px, 16px, 16px);
 }
 
-/* ::::: bookmark items ::::: */
+/* star button */
 
-.bookmark-item  {
-  list-style-image: url("chrome://browser/skin/icons/bookmark-item.gif");
+#star-button {
+  list-style-image: url("chrome://communicator/skin/bookmarks/bookmark.png");
+  -moz-image-region: rect(16px 16px 32px 0px);
 }
 
-.bookmark-item[container="true"] {
-  list-style-image: url("chrome://browser/skin/icons/bookmark-folder-closed.gif");
+#star-button:hover {
+  -moz-image-region: rect(16px 32px 32px 16px);
 }
-.bookmark-item[open="true"],
-.bookmark-item[container="true"][open="true"] {
-  list-style-image: url("chrome://browser/skin/icons/bookmark-folder-open.gif");
+
+#star-button:hover:active {
+  -moz-image-region: rect(16px 48px 32px 32px);
 }
 
-/* ::::: primary toolbar buttons ::::: */
+#star-button[starred="true"] {
+  -moz-image-region: rect(0px 16px 16px 0px);
+}
 
-.toolbarbutton-1,
-.toolbarbutton-1 > .toolbarbutton-menubutton-button {
-  -moz-box-orient: vertical;
-  min-width: 0px;
+#star-button[starred="true"]:hover {
+  -moz-image-region: rect(0px 32px 16px 16px);
 }
 
-toolbarbutton:not([disabled="true"]):hover,
-menubutton:not([disabled="true"]):hover,
-toolbarbutton:not([disabled="true"]):hover:active,
-menubutton:not([disabled="true"]):hover:active {
-  color: #000000 !important;
+#star-button[starred="true"]:hover:active {
+  -moz-image-region: rect(0px 48px 16px 32px);
 }
 
-/*
-.toolbarbutton-menubutton-stack,
-.toolbarbutton-menubutton-button,
-.toolbarbutton-menubutton-stack:hover,
-.toolbarbutton-menubutton-button:hover,
-.toolbarbutton-menubutton-stack:hover:active,
-.toolbarbutton-menubutton-button:hover:active {
-  margin: 0 !important;
-  display: -moz-box;
+/* bookmarking panel */
+#editBookmarkPanelStarIcon {
+  list-style-image: url("chrome://browser/skin/places/starred48.png");
+  width: 48px;
+  height: 48px;
 }
-*/
 
-toolbarbutton[type="menu-button"] {
-  -moz-box-orient: horizontal;
+#editBookmarkPanelStarIcon[unstarred] {
+  list-style-image: url("chrome://browser/skin/places/unstarred48.png");
 }
 
-toolbar[mode="icons"] .toolbarbutton-text {
-  display: none;
+#editBookmarkPanelTitle {
+  font-size: 130%;
 }
 
-toolbar[mode="text"] .toolbarbutton-menubutton-dropmarker,
-toolbar[mode="text"] .toolbarbutton-icon {
-  display: none;
+#editBookmarkPanelHeader,
+#editBookmarkPanelContent {
+  margin-bottom: .5em;
 }
 
-toolbar[mode="text"] .toolbarbutton-text {
-  padding: 0 !important;
-  margin: 3px 5px !important;
+/* Implements editBookmarkPanel resizing on folderTree un-collapse. */
+#editBMPanel_folderTree {
+  min-width: 27em;
 }
 
-#back-button {
-/*  -moz-binding: url("chrome://browser/skin/browser.xml#toolbar-menu-button"); */
-  list-style-image: url("chrome://browser/skin/icons/back.gif");
+.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;
 }
-#back-button:hover,
-#back-button[open="true"] {
-  list-style-image: url("chrome://browser/skin/icons/back-hover.gif");
+
+.panel-promo-icon {
+  list-style-image: url("chrome://browser/skin/sync-notification-24.png");
+  -moz-margin-end: 10px;
+  vertical-align: middle;
 }
-#back-button[disabled="true"] {
-  list-style-image: url("chrome://browser/skin/icons/back-disabled.gif");
+
+.panel-promo-closebutton {
+  list-style-image: url("chrome://global/skin/icons/close-button.gif");
+  -moz-margin-end: -3px;
+  margin-top: -3px;
 }
 
-#forward-button {
-/*  -moz-binding: url("chrome://browser/skin/browser.xml#toolbar-menu-button"); */
-  list-style-image: url("chrome://browser/skin/icons/forward.gif");
+.panel-promo-closebutton:hover {
+  list-style-image: url("chrome://global/skin/icons/close-button-hover.gif");
 }
-#forward-button:hover,
-#forward-button[open="true"] {
-  list-style-image: url("chrome://browser/skin/icons/forward-hover.gif");
+
+.panel-promo-closebutton:hover:active {
+  list-style-image: url("chrome://global/skin/icons/close-button-hover.gif");
 }
-#forward-button[disabled="true"] {
-  list-style-image: url("chrome://browser/skin/icons/forward-disabled.gif");
+
+.panel-promo-closebutton > .toolbarbutton-text {
+  padding: 0;
+  margin: 0;
 }
 
-#reload-button {
-  list-style-image: url("chrome://browser/skin/icons/reload.gif");
+/* ::::: content area ::::: */
+
+#sidebar {
+  background-color: Window;
 }
-#reload-button:hover {
-  list-style-image: url("chrome://browser/skin/icons/reload-hover.gif");
+
+#sidebar-title {
+  -moz-padding-start: 0px;
 }
-#reload-button[disabled="true"] {
-  list-style-image: url("chrome://browser/skin/icons/reload-disabled.gif");
+
+/* ::::: throbber ::::: */
+
+#navigator-throbber {
+  width: 16px;
+  min-height: 16px;
+  margin: 0 3px;
 }
 
-#stop-button {
-  list-style-image: url("chrome://browser/skin/icons/stop.gif");
+#navigator-throbber[busy="true"] {
+  list-style-image: url("chrome://communicator/skin/brand/throbber16-anim.gif");
 }
-#stop-button:hover {
-  list-style-image: url("chrome://browser/skin/icons/stop-hover.gif");
+
+#navigator-throbber,
+#wrapper-navigator-throbber > #navigator-throbber {
+  list-style-image: url("chrome://communicator/skin/brand/throbber16-single.gif");
 }
-#stop-button[disabled="true"] {
-  list-style-image: url("chrome://browser/skin/icons/stop-disabled.gif");
+
+/* Tabstrip */
+
+#TabsToolbar {
+  min-height: 0;
+  padding: 0;
+  -moz-binding: url("chrome://global/content/bindings/toolbar.xml#toolbar");
 }
 
-#home-button {
-  list-style-image: url("chrome://browser/skin/icons/home.gif");
+#TabsToolbar .toolbar-holder {
+  background-color: #000000; /* correct effect of being an actual toolbar */
 }
-#home-button:hover {
-  list-style-image: url("chrome://browser/skin/icons/home-hover.gif");
+
+#main-window[disablechrome] #TabsToolbar,
+#TabsToolbar[tabsontop="false"] {
+  border-bottom: 1px solid #FF9F00;
 }
-#home-button[disabled="true"] {
-  list-style-image: url("chrome://browser/skin/icons/home-disabled.gif");
+
+.tabbrowser-tab,
+.tabs-newtab-button {
+  margin-top: 0px;
 }
 
-#print-button {
-  list-style-image: url("chrome://browser/skin/icons/print.gif");
+.tabbrowser-tab:hover,
+.tabs-newtab-button:hover {
 }
-#print-button:hover {
-  list-style-image: url("chrome://browser/skin/icons/print-hover.gif");
+
+.tabbrowser-tab[selected="true"] {
 }
-#print-button[disabled="true"] {
-  list-style-image: url("chrome://browser/skin/icons/print-disabled.gif");
+
+#main-window[tabsontop=false]:not([disablechrome]) .tabbrowser-tab[selected=true]:not(:-moz-lwtheme) {
 }
 
-#new-tab-button {
-  list-style-image: url("chrome://browser/skin/icons/new-tab.gif");
+.tabbrowser-tab:-moz-lwtheme {
 }
-#new-tab-button:hover {
-  list-style-image: url("chrome://browser/skin/icons/new-tab-hover.gif");
+
+.tabbrowser-tab[selected="true"]:-moz-lwtheme {
 }
-#new-tab-button[disabled="true"] {
-  list-style-image: url("chrome://browser/skin/icons/new-tab-disabled.gif");
+
+.tabbrowser-tab:-moz-lwtheme-brighttext:not([selected="true"]),
+.tabs-newtab-button:-moz-lwtheme-brighttext {
 }
 
-#new-window-button {
-  list-style-image: url("chrome://browser/skin/icons/new-window.gif");
+.tabbrowser-tab:-moz-lwtheme-brighttext:not([selected="true"]):hover,
+.tabs-newtab-button:-moz-lwtheme-brighttext:hover {
 }
-#new-window-button:hover {
-  list-style-image: url("chrome://browser/skin/icons/new-window-hover.gif");
+
+.tabbrowser-tab:-moz-lwtheme-darktext:not([selected="true"]),
+.tabs-newtab-button:-moz-lwtheme-darktext {
 }
-#new-window-button[disabled="true"] {
-  list-style-image: url("chrome://browser/skin/icons/new-window-disabled.gif");
+
+.tabbrowser-tab:-moz-lwtheme-darktext:not([selected="true"]):hover,
+.tabs-newtab-button:-moz-lwtheme-darktext:hover {
 }
 
-#downloads-button {
-  list-style-image: url("chrome://browser/skin/icons/downloads.gif");
+.tabbrowser-tab[pinned][titlechanged]:not([selected="true"]) {
+  background-color: #E7ADE7;
 }
-#downloads-button:hover {
-  list-style-image: url("chrome://browser/skin/icons/downloads-hover.gif");
+.tabbrowser-tab[pinned][titlechanged]:not([selected="true"]):hover {
+  background-color: #0000FF;
+  color: #000000;
 }
-#downloads-button[disabled="true"] {
-  list-style-image: url("chrome://browser/skin/icons/downloads-disabled.gif");
+
+.tab-throbber,
+.tab-icon-image {
+  width: 16px;
+  height: 16px;
+  list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-item.gif");
+  -moz-image-region: auto;
+  -moz-margin-end: 3px;
 }
 
-#bookmarks-button {
-  list-style-image: url("chrome://browser/skin/icons/bookmarks.gif");
+.tab-throbber {
+  list-style-image: url("chrome://browser/skin/tabbrowser/connecting.png");
 }
-#bookmarks-button:hover {
-  list-style-image: url("chrome://browser/skin/icons/bookmarks-hover.gif");
+
+.tab-throbber[progress] {
+  list-style-image: url("chrome://browser/skin/tabbrowser/loading.png");
 }
-#bookmarks-button[disabled="true"] {
-  list-style-image: url("chrome://browser/skin/icons/bookmarks-disabled.gif");
+
+#tabbrowser-tabs[positionpinnedtabs] > .tabbrowser-tab[pinned] {
+  min-height: 16px; /* corresponds to the max. height of non-textual tab contents, i.e. the favicon */
 }
 
-#history-button {
-  list-style-image: url("chrome://browser/skin/icons/history.gif");
+.tab-throbber[pinned],
+.tab-icon-image[pinned] {
+  -moz-margin-start: 2px;
+  -moz-margin-end: 2px;
 }
-#history-button:hover {
-  list-style-image: url("chrome://browser/skin/icons/history-hover.gif");
+
+/* tabbrowser-tab focus ring */
+.tabbrowser-tab:focus > .tab-stack {
+  outline: 1px dotted;
 }
-#history-button[disabled="true"] {
-  list-style-image: url("chrome://browser/skin/icons/history-disabled.gif");
+
+/* Tab DnD indicator */
+.tab-drop-indicator {
+  list-style-image: url("chrome://browser/skin/tabbrowser/tabDragIndicator.png");
+  margin-bottom: -11px;
 }
 
-#cut-button {
-  list-style-image: url("chrome://browser/skin/icons/cut.gif");
+/* Tab close button */
+.tab-close-button {
+  border: none;
+  padding: 0px;
+  list-style-image: url("chrome://global/skin/icons/close-button.gif");
 }
-#cut-button:hover {
-  list-style-image: url("chrome://browser/skin/icons/cut-hover.gif");
+
+.tab-close-button:-moz-system-metric(touch-enabled) {
+  -moz-transform: scale(1.2);
 }
-#cut-button[disabled="true"] {
-  list-style-image: url("chrome://browser/skin/icons/cut-disabled.gif");
+
+.tab-close-button:hover,
+.tab-close-button:hover[selected="true"] {
+  list-style-image: url("chrome://global/skin/icons/close-button-hover.gif");
 }
 
-#copy-button {
-  list-style-image: url("chrome://browser/skin/icons/copy.gif");
+.tab-close-button:hover:active,
+.tab-close-button:hover:active[selected="true"] {
+  list-style-image: url("chrome://global/skin/icons/close-button-hover.gif");
 }
-#copy-button:hover {
-  list-style-image: url("chrome://browser/skin/icons/copy-hover.gif");
+
+.tab-close-button:focus {
+  outline: none !important;
 }
-#copy-button[disabled="true"] {
-  list-style-image: url("chrome://browser/skin/icons/copy-disabled.gif");
+
+/* Tab scrollbox arrow, tabstrip new tab and all-tabs buttons */
+
+@media all and (-moz-touch-enabled) {
+  .tabbrowser-arrowscrollbox > .scrollbutton-up,
+  .tabbrowser-arrowscrollbox > .scrollbutton-down,
+  #TabsToolbar .toolbarbutton-1 {
+    min-width: 8.1mozmm;
+  }
+
+  .tabs-newtab-button {
+    min-width: 10mozmm;
+  }
+
+  .tab-content {
+    min-height: -moz-calc(6.8mozmm - 7px); /* subtract borders from the desired height */
+  }
 }
 
-#paste-button {
-  list-style-image: url("chrome://browser/skin/icons/paste.gif");
+.tabbrowser-arrowscrollbox > .scrollbutton-up,
+.tabbrowser-arrowscrollbox > .scrollbutton-down {
+  margin: 0;
+  padding-top: 0;
+  padding-bottom: 0;
 }
-#paste-button:hover {
-  list-style-image: url("chrome://browser/skin/icons/paste-hover.gif");
+
+.tabbrowser-arrowscrollbox > .scrollbutton-down[notifybgtab] {
+  background-color: #008484;
 }
-#paste-button[disabled="true"] {
-  list-style-image: url("chrome://browser/skin/icons/paste-disabled.gif");
+
+.tabs-newtab-button > .toolbarbutton-icon {
+  margin-top: -1px;
+  margin-bottom: -1px;
 }
 
+.tabs-newtab-button,
+#TabsToolbar > #new-tab-button,
+#TabsToolbar > toolbarpaletteitem > #new-tab-button {
+  list-style-image: url("chrome://browser/skin/tabbrowser/newtab.png");
+  -moz-image-region: rect(0, 16px, 18px, 0);
+}
 
-/* ::::: small primary toolbar buttons ::::: */
+.tabs-newtab-button {
+  width: 28px;
+}
 
-toolbar[iconsize="small"] #back-button {
-  list-style-image: url("chrome://browser/skin/icons/back-small.gif");
+#TabsToolbar > #new-tab-button {
+  width: 26px;
 }
-toolbar[iconsize="small"] #back-button:hover {
-  list-style-image: url("chrome://browser/skin/icons/back-small-hover.gif");
+
+.tabs-newtab-button:hover,
+#TabsToolbar > #new-tab-button:hover {
+  -moz-image-region: rect(0, 32px, 18px, 16px);
 }
-toolbar[iconsize="small"] #back-button[disabled="true"] {
-  list-style-image: url("chrome://browser/skin/icons/back-small-disabled.gif");
+
+#alltabs-button {
+  list-style-image: url("chrome://browser/skin/tabbrowser/alltabs.png");
+  -moz-image-region: rect(0, 14px, 16px, 0);
 }
 
-toolbar[iconsize="small"] #forward-button {
-  list-style-image: url("chrome://browser/skin/icons/forward-small.gif");
+#alltabs-button:hover,
+#alltabs-button:hover:active {
+  -moz-image-region: rect(0, 28px, 16px, 14px);
 }
-toolbar[iconsize="small"] #forward-button:hover {
-  list-style-image: url("chrome://browser/skin/icons/forward-small-hover.gif");
+
+#alltabs-button[type="menu"] {
+  list-style-image: url("chrome://global/skin/arrow/arrow-down.gif");
+  -moz-image-region: auto;
 }
-toolbar[iconsize="small"] #forward-button[disabled="true"] {
-  list-style-image: url("chrome://browser/skin/icons/forward-small-disabled.gif");
+
+#alltabs-button[type="menu"] > .toolbarbutton-menu-dropmarker {
+  display: none;
 }
 
-toolbar[iconsize="small"] #reload-button {
-  list-style-image: url("chrome://browser/skin/icons/reload-small.gif");
+#alltabs-button[type="menu"]:hover,
+#alltabs-button[type="menu"]:hover:active,
+#alltabs-button[type="menu"][open="true"] {
+  list-style-image: url("chrome://global/skin/arrow/arrow-down-hover.gif");
+  -moz-image-region: auto;
 }
-toolbar[iconsize="small"] #reload-button:hover {
-  list-style-image: url("chrome://browser/skin/icons/reload-small-hover.gif");
+
+/* 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);
+  -moz-image-region: auto;
 }
-toolbar[iconsize="small"] #reload-button[disabled="true"] {
-  list-style-image: url("chrome://browser/skin/icons/reload-small-disabled.gif");
+
+.alltabs-item[selected="true"] {
+  font-weight: bold;
 }
 
-toolbar[iconsize="small"] #stop-button {
-  list-style-image: url("chrome://browser/skin/icons/stop-small.gif");
+.alltabs-item[busy] > .menu-iconic-left > .menu-iconic-icon {
+  list-style-image: url("chrome://global/skin/icons/loading.gif");
 }
-toolbar[iconsize="small"] #stop-button:hover {
-  list-style-image: url("chrome://browser/skin/icons/stop-small-hover.gif");
+
+/* Tabstrip close button */
+.tabs-closebutton {
+  -moz-box-flex: 1;
+  margin: 0px;
+  padding: 2px;
+  list-style-image: url("chrome://global/skin/icons/close-button.gif");
 }
-toolbar[iconsize="small"] #stop-button[disabled="true"] {
-  list-style-image: url("chrome://browser/skin/icons/stop-small-disabled.gif");
+
+.tabs-closebutton > .toolbarbutton-icon {
 }
 
-toolbar[iconsize="small"] #home-button {
-  list-style-image: url("chrome://browser/skin/icons/home-small.gif");
+.tabs-closebutton > .toolbarbutton-text {
+  display: none;
 }
-toolbar[iconsize="small"] #home-button:hover {
-  list-style-image: url("chrome://browser/skin/icons/home-small-hover.gif");
+
+.tabs-closebutton:hover,
+.tabs-closebutton:hover:active {
+  list-style-image: url("chrome://global/skin/icons/close-button-hover.gif");
 }
-toolbar[iconsize="small"] #home-button[disabled="true"] {
-  list-style-image: url("chrome://browser/skin/icons/home-small-disabled.gif");
+
+toolbarbutton.chevron {
+  list-style-image: url("chrome://global/skin/toolbar/chevron.gif") !important;
 }
 
-toolbar[iconsize="small"] #print-button {
-  list-style-image: url("chrome://browser/skin/icons/print-small.gif");
+toolbarbutton.chevron:hover {
+  list-style-image: url("chrome://global/skin/toolbar/chevron-hover.gif") !important;
 }
-toolbar[iconsize="small"] #print-button:hover {
-  list-style-image: url("chrome://browser/skin/icons/print-small-hover.gif");
+
+toolbarbutton.chevron:-moz-locale-dir(rtl) > .toolbarbutton-icon,
+toolbarbutton.chevron:-moz-locale-dir(rtl):hover > .toolbarbutton-icon {
+  -moz-transform: scaleX(-1);
 }
-toolbar[iconsize="small"] #print-button[disabled="true"] {
-  list-style-image: url("chrome://browser/skin/icons/print-small-disabled.gif");
+
+toolbarbutton.chevron > .toolbarbutton-text,
+toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
+  display: none;
 }
 
-toolbar[iconsize="small"] #downloads-button {
-  list-style-image: url("chrome://browser/skin/icons/downloads-small.gif");
+toolbarbutton.chevron > .toolbarbutton-icon {
+  margin: 0;
 }
-toolbar[iconsize="small"] #downloads-button:hover {
-  list-style-image: url("chrome://browser/skin/icons/downloads-small-hover.gif");
+
+toolbar[mode="text"] toolbarbutton.chevron > .toolbarbutton-icon {
+  display: -moz-box; /* display chevron icon in text mode */
 }
-toolbar[iconsize="small"] #downloads-button[disabled="true"] {
-  list-style-image: url("chrome://browser/skin/icons/downloads-small-disabled.gif");
+
+#sidebar-throbber[loading="true"] {
+  list-style-image: url("chrome://global/skin/icons/loading.gif");
+  -moz-margin-end: 4px;
 }
 
-toolbar[iconsize="small"] #new-tab-button {
-  list-style-image: url("chrome://browser/skin/icons/new-tab-small.gif");
+/* Bookmarks toolbar */
+#PlacesToolbarDropIndicator {
+  list-style-image: url("chrome://communicator/skin/bookmarks/toolbarDropMarker.png");
 }
-toolbar[iconsize="small"] #new-tab-button:hover {
-  list-style-image: url("chrome://browser/skin/icons/new-tab-small-hover.gif");
+
+toolbarbutton.bookmark-item[dragover="true"][open="true"] {
+  background-color: #008484 !important;
+  color: #FFCF00 !important;
 }
-toolbar[iconsize="small"] #new-tab-button[disabled="true"] {
-  list-style-image: url("chrome://browser/skin/icons/new-tab-small-disabled.gif");
+
+/* rules for menupopup drop indicators */
+.menupopup-drop-indicator-bar {
+  position: relative;
+  /* these two margins must together compensate the indicator's height */
+  margin-top: -1px;
+  margin-bottom: -1px;
 }
 
-toolbar[iconsize="small"] #new-window-button {
-  list-style-image: url("chrome://browser/skin/icons/new-window-small.gif");
+.menupopup-drop-indicator {
+  list-style-image: none;
+  height: 2px;
+  -moz-margin-end: -4em;
+  background-color: #008484;
 }
-toolbar[iconsize="small"] #new-window-button:hover {
-  list-style-image: url("chrome://browser/skin/icons/new-window-small-hover.gif");
+
+/* ::::: Identity Indicator Styling ::::: */
+
+/* Popup Icons */
+#identity-popup-icon {
+  height: 64px;
+  width: 64px;
+  padding: 0;
+  list-style-image: url("chrome://browser/skin/identity.png");
+  -moz-image-region: rect(0px, 64px, 64px, 0px);
 }
-toolbar[iconsize="small"] #new-window-button[disabled="true"] {
-  list-style-image: url("chrome://browser/skin/icons/new-window-small-disabled.gif");
+
+#identity-popup.verifiedDomain > #identity-popup-container > #identity-popup-icon {
+  -moz-image-region: rect(64px, 64px, 128px, 0px);
 }
 
-toolbar[iconsize="small"] #bookmarks-button {
-  list-style-image: url("chrome://browser/skin/icons/bookmarks-small.gif");
+#identity-popup.verifiedIdentity > #identity-popup-container > #identity-popup-icon {
+  -moz-image-region: rect(128px, 64px, 192px, 0px);
 }
-toolbar[iconsize="small"] #bookmarks-button:hover {
-  list-style-image: url("chrome://browser/skin/icons/bookmarks-small-hover.gif");
+
+/* Popup Body Text */
+.identity-popup-description {
+  white-space: pre-wrap;
+  -moz-padding-start: 15px;
+  margin: 2px 0 4px;
 }
-toolbar[iconsize="small"] #bookmarks-button[disabled="true"] {
-  list-style-image: url("chrome://browser/skin/icons/bookmarks-small-disabled.gif");
+
+.identity-popup-label {
+  white-space: pre-wrap;
+  -moz-padding-start: 15px;
+  margin: 0;
 }
 
-toolbar[iconsize="small"] #history-button {
-  list-style-image: url("chrome://browser/skin/icons/history-small.gif");
+#identity-popup-content-host ,
+#identity-popup-content-box.verifiedIdentity > #identity-popup-content-owner {
+  font-size: 1.2em;
 }
-toolbar[iconsize="small"] #history-button:hover {
-  list-style-image: url("chrome://browser/skin/icons/history-small-hover.gif");
+
+#identity-popup-content-host {
+  margin-top: 3px;
+  margin-bottom: 5px;
+  font-weight: bold;
+  max-width: 300px;
 }
-toolbar[iconsize="small"] #history-button[disabled="true"] {
-  list-style-image: url("chrome://browser/skin/icons/history-small-disabled.gif");
+
+#identity-popup-content-owner {
+  margin-top: 4px;
+  margin-bottom: 0 !important;
+  font-weight: bold;
+  max-width: 300px;
 }
 
-toolbar[iconsize="small"] #cut-button {
-  list-style-image: url("chrome://browser/skin/icons/cut-small.gif");
+.verifiedDomain > #identity-popup-content-owner {
+  font-weight: normal;
 }
-toolbar[iconsize="small"] #cut-button:hover {
-  list-style-image: url("chrome://browser/skin/icons/cut-small-hover.gif");
+
+#identity-popup-content-verifier {
+  margin: 4px 0 2px;
 }
-toolbar[iconsize="small"] #cut-button[disabled="true"] {
-  list-style-image: url("chrome://browser/skin/icons/cut-small-disabled.gif");
+
+#identity-popup-content-box.verifiedIdentity > #identity-popup-encryption ,
+#identity-popup-content-box.verifiedDomain > #identity-popup-encryption {
+  margin-top: 10px;
+  -moz-margin-start: -24px;
 }
 
-toolbar[iconsize="small"] #copy-button {
-  list-style-image: url("chrome://browser/skin/icons/copy-small.gif");
+#identity-popup-content-box.verifiedIdentity > #identity-popup-encryption > vbox > #identity-popup-encryption-icon ,
+#identity-popup-content-box.verifiedDomain > #identity-popup-encryption > vbox > #identity-popup-encryption-icon {
+  list-style-image: url("chrome://browser/skin/Secure24.png");
 }
-toolbar[iconsize="small"] #copy-button:hover {
-  list-style-image: url("chrome://browser/skin/icons/copy-small-hover.gif");
+
+#identity-popup-more-info-button {
+  margin-top: 6px;
+  margin-bottom: 0;
+  -moz-margin-end: 0;
 }
-toolbar[iconsize="small"] #copy-button[disabled="true"] {
-  list-style-image: url("chrome://browser/skin/icons/copy-small-disabled.gif");
+
+.popup-notification-icon {
+  width: 64px;
+  height: 64px;
+  -moz-margin-end: 10px;
 }
 
-toolbar[iconsize="small"] #paste-button {
-  list-style-image: url("chrome://browser/skin/icons/paste-small.gif");
+.popup-notification-icon[popupid="geolocation"] {
+  list-style-image: url("chrome://browser/skin/Geolocation-64.png");
 }
-toolbar[iconsize="small"] #paste-button:hover {
-  list-style-image: url("chrome://browser/skin/icons/paste-small-hover.gif");
+
+.popup-notification-icon[popupid="xpinstall-disabled"],
+.popup-notification-icon[popupid="addon-progress"],
+.popup-notification-icon[popupid="addon-install-cancelled"],
+.popup-notification-icon[popupid="addon-install-blocked"],
+.popup-notification-icon[popupid="addon-install-failed"],
+.popup-notification-icon[popupid="addon-install-complete"] {
+  list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png");
+  width: 32px;
+  height: 32px;
 }
-toolbar[iconsize="small"] #paste-button[disabled="true"] {
-  list-style-image: url("chrome://browser/skin/icons/paste-small-disabled.gif");
+
+.addon-progress-description {
+  width: 350px;
+  max-width: 350px;
 }
 
+.popup-progress-label,
+.popup-progress-meter {
+  -moz-margin-start: 0;
+  -moz-margin-end: 0;
+}
 
-/* Smaller padding on small toolbar buttons */
+.popup-progress-cancel {
+  -moz-appearance: none;
+  background: transparent;
+  border: none;
+  padding: 0;
+  margin: 0;
+  min-height: 0;
+  min-width: 0;
+  list-style-image: url("chrome://mozapps/skin/downloads/downloadButtons.png");
+  -moz-image-region: rect(0px, 32px, 16px, 16px);
+}
 
-toolbar[iconsize="small"] .toolbarbutton-1 {
-  padding: 2px;
+.popup-progress-cancel:hover {
+  -moz-image-region: rect(16px, 32px, 32px, 16px);
 }
 
-toolbar[iconsize="small"] .toolbarbutton-1:hover:active,
-toolbar[iconsize="small"] .toolbarbutton-1[open="true"] {
-  padding: 3px 1px 1px 3px;
+.popup-progress-cancel:active {
+  -moz-image-region: rect(32px, 32px, 48px, 16px);
 }
 
-toolbar[iconsize="small"] .toolbarbutton-1[disabled="true"],
-toolbar[iconsize="small"] .toolbarbutton-1[disabled="true"]:hover,
-toolbar[iconsize="small"] .toolbarbutton-1[disabled="true"]:hover:active,
-toolbar[iconsize="small"] .toolbarbutton-1[disabled="true"][open="true"] {
-  padding: 2px;
+.popup-notification-icon[popupid="indexedDB-permissions-prompt"],
+.popup-notification-icon[popupid="indexedDB-quota-prompt"] {
+  list-style-image: url("chrome://global/skin/icons/alert-question.gif");
 }
 
-toolbar[iconsize="small"] .toolbarbutton-1[checked="true"] {
-  padding: 3px 1px 1px 3px !important;
+.popup-notification-icon[popupid="password-save"],
+.popup-notification-icon[popupid="password-change"] {
+  list-style-image: url("chrome://mozapps/skin/passwordmgr/key-64.png");
 }
 
-toolbar[iconsize="small"] .toolbarbutton-1[type="menu-button"],
-toolbar[iconsize="small"] .toolbarbutton-1[type="menu-button"]:hover,
-toolbar[iconsize="small"] .toolbarbutton-1[type="menu-button"]:hover:active,
-toolbar[iconsize="small"] .toolbarbutton-1[type="menu-button"][open="true"],
-toolbar[iconsize="small"] .toolbarbutton-1[type="menu-button"][disabled="true"],
-toolbar[iconsize="small"] .toolbarbutton-1[type="menu-button"][disabled="true"]:hover,
-toolbar[iconsize="small"] .toolbarbutton-1[type="menu-button"][disabled="true"]:hover:active {
-  padding: 0;
+/* Notification icon box */
+#notification-popup-box {
+  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;
 }
 
-/* ::::: fullscreen window controls ::::: */
+#notification-popup-box:not([hidden]) + #identity-box {
+  -moz-padding-start: 10px;
+}
 
-#window-controls {
-  -moz-box-align: center;
-  padding: 0 2px 0 0px;
-  border-left: 3px solid #000000;
-  min-height: 28px;
+#notification-popup-box:-moz-locale-dir(rtl),
+.notification-anchor-icon:-moz-locale-dir(rtl) {
+  -moz-transform: scaleX(-1);
 }
 
-#minimize-button {
-  list-style-image: url("chrome://navigator/skin/icons/win-minimize.gif");
+.notification-anchor-icon {
+  width: 16px;
+  height: 16px;
 }
-#minimize-button:hover {
-  list-style-image: url("chrome://navigator/skin/icons/win-minimize-hover.gif");
+
+.notification-anchor-icon:-moz-focusring {
+  outline: 1px dotted #008484;
+/*  outline-offset: -3px; */
 }
-#restore-button {
-  list-style-image: url("chrome://navigator/skin/icons/win-restore.gif");
+
+#default-notification-icon {
+  list-style-image: url("chrome://global/skin/icons/information-16.png");
 }
-#restore-button:hover {
-  list-style-image: url("chrome://navigator/skin/icons/win-restore-hover.gif");
+
+#geo-notification-icon {
+  list-style-image: url("chrome://browser/skin/Geolocation-16.png");
 }
-#close-button {
-  list-style-image: url("chrome://navigator/skin/icons/win-close.gif");
+
+#addons-notification-icon {
+  list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric-16.png");
 }
-#close-button:hover {
-  list-style-image: url("chrome://navigator/skin/icons/win-close-hover.gif");
+
+#indexedDB-notification-icon {
+  list-style-image: url("chrome://global/skin/icons/question-16.png");
 }
 
-/* ::::: nav-bar-inner ::::: */
+#password-notification-icon {
+  list-style-image: url("chrome://mozapps/skin/passwordmgr/key-16.png");
+}
 
-#urlbar {
-  margin: 2px 3px;
+#identity-popup-container {
+  min-width: 280px;
 }
 
-#search-bar {
-  width: 12em;
+#download-monitor {
+  list-style-image: url("chrome://browser/skin/Toolbar.png");
+  -moz-image-region: rect(0, 108px, 18px, 90px);
 }
 
-/* ::::: page proxy icon ::::: */
+/* Bookmarks roots menu-items */
+#appmenu_subscribeToPage:not([disabled]),
+#appmenu_subscribeToPageMenu,
+#subscribeToPageMenuitem:not([disabled]),
+#subscribeToPageMenupopup,
+#BMB_subscribeToPageMenuitem:not([disabled]),
+#BMB_subscribeToPageMenupopup {
+  list-style-image: url("chrome://browser/skin/feeds/feedIcon16.png");
+}
 
-#page-proxy-deck,
-#page-proxy-favicon,
-#page-proxy-button {
-  width: 16px;
-  height: 16px;
+#bookmarksToolbarFolderMenu,
+#appmenu_bookmarksToolbar,
+#BMB_bookmarksToolbar {
+  list-style-image: url("chrome://communicator/skin/bookmarks/bookmarksToolbar.png");
+  -moz-image-region: auto;
 }
 
-#page-proxy-deck {
-  cursor: -moz-grab;
-  margin: 2px 3px;
+#appmenu_unsortedBookmarks,
+#BMB_unsortedBookmarks {
+  list-style-image: url("chrome://communicator/skin/bookmarks/unsortedBookmarks.png");
+  -moz-image-region: auto;
 }
 
-#page-proxy-favicon {
-  list-style-image: none;
+/* ::::: Keyboard UI Panel ::::: */
+
+.KUI-panel {
+  color: #FF9F00;
+  border-style: none;
+  border-radius: 20px;
 }
 
-#page-proxy-button {
-  list-style-image: url("chrome://browser/skin/icons/bookmark-item.gif") !important;
+.KUI-panel[level="top"] {
+  /*background-color: rgba(27%,27%,27%,.65);*/
 }
 
-#page-proxy-button[pageproxystate="invalid"] {
-  cursor: default;
-  list-style-image: url("chrome://browser/skin/icons/bookmark-item.gif") !important;
+.KUI-panel-closebutton {
+  list-style-image: url("KUI-close.png");
+  width: 24px;
+  height: 24px;
 }
 
+.KUI-panel-closebutton:not(:hover) {
+}
 
-statusbarpanel#statusbar-display {
-  -moz-padding-start: 0;
+.KUI-panel-closebutton > .toolbarbutton-icon {
 }
 
-/* ::::: search-bar ::::: */
+/* ::::: Ctrl-Tab and All Tabs Panels ::::: */
 
-#search-proxy-button {
-  margin: 2px;
-  list-style-image: url("chrome://browser/skin/icons/search-bar.gif");
+/* Ctrl-Tab */
+
+#ctrlTab-panel {
+  padding: 20px 10px 10px;
+  font-weight: bold;
 }
 
-#miSearchModeFind {
-  list-style-image: url("chrome://browser/skin/icons/search-bar.gif");
+.ctrlTab-favicon[src] {
+  background-color: #000000;
+  width: 20px;
+  height: 20px;
+  padding: 2px;
 }
 
-/* ::::: autocomplete ::::: */
+.ctrlTab-preview-inner > .tabPreview-canvas {
+}
 
-.autocomplete-treebody::-moz-tree-cell-text(treecolAutoCompleteComment) {
-  color: #336699;
+.ctrlTab-preview:not(#ctrlTab-showAll) > * > .ctrlTab-preview-inner > .tabPreview-canvas {
+  margin-bottom: 2px;
 }
 
-/* ::::: go button ::::: */
+.ctrlTab-preview-inner {
+  padding-bottom: 10px;
+}
 
-#go-button,
-#go-container {
-  background-color: transparent;
-  border: none;
-  margin: 0;
-  padding: 0;
-  min-width: 0;
-  list-style-image: url("chrome://browser/skin/icons/go.gif");
+#ctrlTab-showAll:not(:focus) > * > .ctrlTab-preview-inner {
+  padding: 10px;
+  background-color: #000000;
+  border-radius: .5em;
 }
 
-#go-button {
-  border: 1px solid transparent;
+.ctrlTab-preview:focus > * > .ctrlTab-preview-inner {
+  color: white;
+  background-color: #000000;
+  text-shadow: none;
+  padding: 8px;
+  border: 2px solid #9C9CFF;
+  border-radius: .5em;
 }
 
-#go-button:hover,
-#go-button:hover:active {
-  list-style-image: url("chrome://browser/skin/icons/go-hover.gif");
-  border: 1px outset #CCD0DD;
+.ctrlTab-preview:not(#ctrlTab-showAll):focus > * > .ctrlTab-preview-inner {
+  margin: -10px -10px 0;
 }
 
-#go-button[disabled="true"] {
-  list-style-image: url("chrome://browser/skin/icons/go-disabled.gif");
-  border: 1px solid transparent;
+#ctrlTab-showAll {
+  margin-top: .5em;
 }
 
-#go-button > .button-box > .button-text {
-  -moz-margin-start: 5px !important;
+/* All Tabs */
+
+#allTabs-panel {
+  padding-bottom: 10px;
 }
 
-#go-button > .button-box {
-  border: none;
+#allTabs-meta {
+  margin: 10px;
 }
 
-#sidebar {
-  background-color: #CCD0DD;
+#allTabs-filter {
+  -moz-margin-start: 24px;
+  -moz-margin-end: 0;
 }
 
-/* ::::: content area ::::: */
+#allTabs-tab-close-button > .toolbarbutton-icon {
+  margin: 0;
+}
 
-#status-bar {
-  border-top: none;
+.allTabs-favicon[src] {
+  width: 22px;
+  height: 22px;
+  padding-top: 1px;
+  padding-bottom: 5px;
+  -moz-padding-start: 1px;
+  -moz-padding-end: 5px;
+  margin-top: -2px;
+  -moz-margin-start: -2px;
+  border-bottom-right-radius: 4px;
 }
 
-#security-button {
-  display: none;
+.allTabs-favicon[src]:-moz-locale-dir(rtl) {
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 4px;
 }
 
-#security-button[level="high"] {
-  list-style-image: url("chrome://browser/skin/icons/secure.gif");
-  display: -moz-box;
+.allTabs-preview-inner > .tabPreview-canvas {
+  background-color: #E7ADE7;
 }
 
-#security-button[level="low"] {
-  list-style-image: url("chrome://browser/skin/icons/secure.gif");
-  display: -moz-box;
+.allTabs-preview:not(:hover):not([closebuttonhover]) > html|canvas {
 }
 
-#security-button[level="broken"] {
-  list-style-image: url("chrome://browser/skin/icons/security-broken.gif");
- display: -moz-box;
+.allTabs-preview:focus > * > .allTabs-preview-inner {
+  outline: 1px dotted #008484;
 }
 
-#page-report-button {
-  display: none;
+/* Inspector / Highlighter */
+
+#highlighter-panel {
+  -moz-window-shadow: none;
+  background: #000000;
+  border: none;
 }
 
-#page-report-button[blocked] {
-  display: -moz-box;
-  list-style-image: url("chrome://browser/skin/icons/info.gif");
-  padding: 0px 3px 0px 3px;
+listitem.style-selector {
+  background-color: #9C9CFF;
+  color: #000000;
 }
 
-#page-theme-button {
-  display: none;
+listitem.style-section {
+  background-color: #E7ADE7;
+  color: #000000;
+  font-weight: bold;
 }
 
-#page-theme-button[themes] {
-  display: -moz-box;
-  list-style-image: url("chrome://browser/skin/icons/page-themes.gif");
-  padding: 0px 3px 0px 3px;
+panel[dimmed="true"] {
+  opacity: 0.5;
 }
 
-/* ::::: throbber ::::: */
+/* Add-on bar */
 
-#navigator-throbber {
-  -moz-user-focus: ignore;
-  margin: 0;
-  -moz-margin-end: 2px;
-  border: none !important;
-  padding: 0px !important;
-  min-width: 0;
-  list-style-image: url("chrome://browser/skin/icons/throbber-stopped.gif");
-}
-#navigator-throbber[busy="true"] {
-  list-style-image: url("chrome://browser/skin/icons/throbber.gif");
+#addon-bar {
+  min-height: 20px;
+  border-top: 3px solid #000000;
+  border-bottom-width: 0;
 }
 
-toolbar[iconsize="small"] #navigator-throbber,
-toolbar[mode="text"] #navigator-throbber {
-  list-style-image: url("chrome://browser/skin/icons/throbber-small-stopped.gif");
+#addon-bar .toolbar-holder {
+  background-color: #8050B0;
+  color: #FFCF00;
 }
-toolbar[iconsize="small"] #navigator-throbber[busy="true"],
-toolbar[mode="text"] #navigator-throbber[busy="true"] {
-  list-style-image: url("chrome://browser/skin/icons/throbber-small.gif");
+
+#addon-bar .toolbar-holder {
+  background-color: #8050B0;
+  color: #FFCF00;
 }
 
-.tabs-closebutton {
-  list-style-image: url("chrome://global/skin/icons/close-button.gif");
+#addon-bar .toolbar-startcap,
+#addon-bar .toolbar-endcap{
+  background-color: #6000CF;
 }
-/*
-#content .tabs-closebutton {
-  list-style-image: url("chrome://browser/skin/Close-tab.png");
-  -moz-image-region: rect(0px, 18px, 14px, 0px);
+
+#status-bar {
+  -moz-binding: url("chrome://global/content/bindings/general.xml#statusbar");
+  margin-top: .3em;
+  border-width: 0;
 }
 
-#content .tabs-closebutton:hover {
-  -moz-image-region: rect(0px, 36px, 14px, 18px);
+/* Remove all borders from statusbarpanel children of
+   the statusbar.
+#status-bar > statusbarpanel {
+  border-width: 0;
+} */
+
+#addonbar-closebutton {
+  border: none;
+  padding: 3px 5px;
+  list-style-image: url("chrome://global/skin/icons/close-button.gif");
 }
-*/
-toolbarbutton.chevron {
-  list-style-image: url("chrome://global/skin/toolbar/chevron.gif") !important;
+
+#addonbar-closebutton:hover,
+#addonbar-closebutton:hover:active {
+  list-style-image: url("chrome://global/skin/icons/close-button-hover.gif");
 }
 
+/* Status panel */
 
-toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
-  display: none;
+.statuspanel-label {
+  margin: 0;
+  padding: 2px 4px;
+  background: #404000;
+  border: 1px none #9C9CFF;
+  border-top-style: solid;
+  color: #FF9F00;
+  text-shadow: none;
 }
 
-toolbar[mode="text"] > #window-controls > toolbarbutton > .toolbarbutton-icon {
-  display: -moz-box;
+.statuspanel-label:-moz-locale-dir(ltr):not([mirror]),
+.statuspanel-label:-moz-locale-dir(rtl)[mirror] {
+  border-right-style: solid;
+  border-top-right-radius: .3em;
+  margin-right: 1em;
 }
 
-toolbar[mode="text"] > #window-controls > toolbarbutton > .toolbarbutton-text {
-   display: none;
+.statuspanel-label:-moz-locale-dir(rtl):not([mirror]),
+.statuspanel-label:-moz-locale-dir(ltr)[mirror] {
+  border-left-style: solid;
+  border-top-left-radius: .3em;
+  margin-left: 1em;
 }
 
-#sidebar-throbber[loading="true"] {
-  list-style-image: url(chrome://global/skin/icons/loading.gif);
+/* HACK to abolish devily color on main content */
+
+#content {
+  background-color: transparent !important;
 }