X-Git-Url: https://git-public.kairo.at/?p=themes.git;a=blobdiff_plain;f=LCARStrek%2Fbrowser%2Fbrowser.css;h=75f3430c258e532b793acd930b975aaaea4d5794;hp=2e1f35ab867fcc022068577b5dc37314f23ea7e1;hb=dce90fefffc4d8c0a4f7eb73c227f64f610d37ce;hpb=319c652960805bfc825e4c20087f0235b3cab27b

diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css
index 2e1f35ab..75f3430c 100644
--- a/LCARStrek/browser/browser.css
+++ b/LCARStrek/browser/browser.css
@@ -52,6 +52,10 @@ 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/skin/globalBindings.xml#menubar");
 }
@@ -64,20 +68,41 @@ menubar {
   -moz-box-flex: 1; /* make menu items expand to fill toolbar height */
 }
 
+/* ::::: primary toolbar ::::: */
+
+.toolbar-primary > .toolbar-box > .toolbar-holder {
+  background-color: #FF9F00;
+}
+
+.toolbar-primary > .toolbar-box > .toolbar-startcap,
+.toolbar-primary > .toolbar-box > .toolbar-endcap {
+  background-color: #9C9CFF;
+}
+
+
 #navigator-toolbox {
 }
 
+#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] #titlebar-content:not(:-moz-lwtheme),
-#main-window[tabsintitlebar]:not([inFullscreen]) #TabsToolbar: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] #titlebar-content:not(:-moz-lwtheme):-moz-window-inactive,
-#main-window[tabsintitlebar]:not([inFullscreen]) #TabsToolbar:not(:-moz-lwtheme):-moz-window-inactive {
+#main-window[tabsintitlebar]:not([inFullscreen]) #toolbar-menubar[inactive] ~ #TabsToolbar:not(:-moz-lwtheme):-moz-window-inactive {
   background-color: #8050B0;
   color: #FF9F00;
 }
@@ -90,32 +115,14 @@ menubar {
   visibility: visible;
 }
 
-#navigator-toolbox > toolbar:not(#toolbar-menubar):not(#TabsToolbar)[iconsize="small"],
-#navigator-toolbox > toolbar:not(#toolbar-menubar):not(#TabsToolbar)[defaulticonsize="small"]:not([iconsize]) {
-  padding-top: 1px;
-  padding-bottom: 1px;
-}
-
-#nav-bar:not(:-moz-lwtheme),
-#nav-bar[collapsed="true"] + toolbar:not(:-moz-lwtheme),
-#nav-bar[collapsed="true"] + #customToolbars + #PersonalToolbar:not(:-moz-lwtheme),
 #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)); */
 }
 
-#navigator-toolbox[tabsontop="false"] > #toolbar-menubar:not(:-moz-lwtheme) {
-  /* background-image: -moz-linear-gradient(@toolbarHighlight@, @toolbarHighlight@); */
-}
-
-#navigator-toolbox[tabsontop="true"] > #nav-bar:not(:-moz-lwtheme),
-#navigator-toolbox[tabsontop="true"]:not([customizing]) > #nav-bar[collapsed="true"] + toolbar:not(:-moz-lwtheme),
-#navigator-toolbox[tabsontop="true"]:not([customizing]) > #nav-bar[collapsed="true"] + #customToolbars + #PersonalToolbar:not(:-moz-lwtheme) {
-}
-
 #personal-bookmarks {
-  min-height: 24px;
+/*  min-height: 24px; */
 }
 
 #print-preview-toolbar:not(:-moz-lwtheme) {
@@ -124,24 +131,36 @@ menubar {
 
 /* ::::: app menu button ::::: */
 
+.tab-drag-preview::before,
 #appmenu-button {
   background-color: #FF9F00;
   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] .tab-drag-preview::before,
 #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] {
@@ -150,15 +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;
 }
 
-.split-menuitem-menu {
+#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;
 }
 
@@ -194,34 +234,89 @@ menubar {
   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-cut,
+#appmenu-editmenu-cut {
   -moz-image-region: rect(0 16px 16px 0);
 }
 
-#appmenu-copy {
+#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-paste {
+#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;
@@ -249,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 {
@@ -272,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;
@@ -315,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 ::::: */
@@ -328,7 +445,7 @@ toolbarbutton.bookmark-item[open="true"] {
 menu.bookmark-item,
 menuitem.bookmark-item {
   min-width: 0;
-  max-width: 26em;
+  max-width: 32em;
 }
 
 .bookmark-item > .menu-iconic-left {
@@ -343,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;
 }
 
@@ -375,31 +495,48 @@ 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 ::::: */
 
-/* ::::: large 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;
-  -moz-box-orient: vertical;
 }
 
-.toolbarbutton-1[type="menu-button"] {
-  -moz-box-orient: horizontal;
+.toolbarbutton-1:not([type="menu-button"]) {
+  -moz-box-orient: vertical;
 }
 
 .toolbarbutton-1,
@@ -418,12 +555,13 @@ menuitem.bookmark-item {
   -moz-padding-end: 1px;
 }
 
-.toolbarbutton-1[type="menu"] {
-  -moz-binding: url("chrome://global/content/bindings/toolbarbutton.xml#menu-vertical");
-}
-
 /* ::::: 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,
@@ -506,6 +644,13 @@ 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 {
@@ -513,30 +658,55 @@ 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;
 }
 
+#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);
 }
 
-#back-button:-moz-locale-dir(ltr) {
+#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;
 }
 
-#back-button:-moz-locale-dir(rtl),
-#forward-button {
+#nav-bar #back-button:-moz-locale-dir(rtl),
+#nav-bar #forward-button {
   border-top-left-radius: 0;
   border-bottom-left-radius: 0;
 }
 
-toolbar:not([iconsize="small"])[mode="icons"] #back-button {
+#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #back-button {
   border-radius: 10000px;
   width: 30px;
   height: 30px;
@@ -545,47 +715,67 @@ toolbar:not([iconsize="small"])[mode="icons"] #back-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);
 }
 
-toolbar:not([iconsize="small"])[mode="icons"] #back-button:not([disabled="true"]):not([checked="true"]):not(:active):hover {
+#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #back-button:not([disabled="true"]):not([open="true"]):not(:active):hover {
 }
 
-toolbar:not([iconsize="small"])[mode="icons"] #back-button:not([disabled="true"]):hover:active {
+#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"] {
 }
 
-toolbar:not([iconsize="small"])[mode="icons"][currentset*="unified-back-forward-button"],
-#nav-bar:not([iconsize="small"])[mode="icons"]:not([currentset]) {
+#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[tabsontop="true"] > toolbar:not([iconsize="small"])[mode="icons"][currentset*="unified-back-forward-button"],
-#navigator-toolbox[tabsontop="true"] > #nav-bar:not([iconsize="small"])[mode="icons"]:not([currentset]) {
+#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; */
 }
 
-toolbar:not([iconsize="small"])[mode="icons"] #forward-button {
+#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;
+  -moz-margin-start: -6px !important;
   padding-left: 7px;
   padding-right: 3px;
 }
 
-toolbar:not([iconsize="small"])[mode="icons"] #forward-button:not([disabled="true"]):not(:active):hover {
+#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://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;
 }
 
 /* stop button */
@@ -594,12 +784,28 @@ toolbar:not([iconsize="small"])[mode="icons"] #forward-button:not([disabled="tru
   -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 {
@@ -609,10 +815,22 @@ toolbar:not([iconsize="small"])[mode="icons"] #forward-button:not([disabled="tru
   -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 {
+#tabview-button,
+#menu_tabview {
   list-style-image: url("chrome://browser/skin/tabview/tabview.png");
+}
+
+#tabview-button {
   -moz-image-region: rect(0, 90px, 18px, 72px);
 }
 
@@ -632,75 +850,179 @@ toolbar:not([iconsize="small"])[mode="icons"] #forward-button:not([disabled="tru
   -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");
+  /* 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 {
@@ -710,25 +1032,49 @@ toolbar:not([iconsize="small"])[mode="icons"] #forward-button:not([disabled="tru
 
 #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;
 }
 
-#zoom-out-button:-moz-locale-dir(ltr),
-#zoom-in-button:-moz-locale-dir(rtl) {
+#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;
 }
 
-#zoom-out-button:-moz-locale-dir(rtl),
-#zoom-in-button:-moz-locale-dir(ltr) {
+#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 {
+#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);
 }
 
@@ -737,14 +1083,26 @@ toolbar:not([iconsize="small"])[mode="icons"] #forward-button:not([disabled="tru
   -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 {
@@ -780,6 +1138,7 @@ toolbar:not([iconsize="small"])[mode="icons"] #forward-button:not([disabled="tru
 #urlbar {
   width: 7em;
   min-width: 7em;
+  color: #FFBFFF;
 }
 
 #urlbar,
@@ -789,22 +1148,6 @@ toolbar:not([iconsize="small"])[mode="icons"] #forward-button:not([disabled="tru
   -moz-margin-start: 3px;
 }
 
-.urlbar-textbox-container {
-  border-radius: 3px 0 0 3px;
-  padding: 2px;
-}
-
-.urlbar-frontcap {
-/*  margin-top: 2px;
-  margin-bottom: 2px;
-  margin-left: 2px; */
-}
-
-.searchbar-textbox {
-  border-radius: 3px;
-  padding: 2px;
-}
-
 #urlbar:-moz-lwtheme,
 .searchbar-textbox:-moz-lwtheme {
   /* background-color: rgba(255,255,255,.8);
@@ -827,6 +1170,10 @@ html|*.urlbar-input:-moz-lwtheme:-moz-placeholder,
   -moz-box-align: stretch;
 }
 
+.urlbar-textbox-container {
+  -moz-box-align: stretch;
+}
+
 #urlbar-icons {
   height: 18px;
   -moz-box-align: center;
@@ -853,42 +1200,12 @@ html|*.urlbar-input:-moz-lwtheme:-moz-placeholder,
   -moz-margin-start: 0;
 }
 
-.urlbar-frontcap-and-textbox {
-  direction: ltr;
-  -moz-box-align: stretch;
-}
-
 #urlbar-display {
-  margin-top: -2px;
-  margin-bottom: -2px;
-  padding-top: 3px;
-  padding-bottom: 2px;
-  -moz-padding-end: 3px;
-  color: #8050B0;
   -moz-border-end: 1px solid #9C9CFF;
   -moz-margin-end: 3px;
-}
-
-/* over-link in location bar */
-
-.urlbar-origin-label {
-  padding: 0 0 0 4px;
-  margin: 0;
-}
-
-.urlbar-over-link-box {
-  position: relative;
-  right: 0;
+  margin-top: 0;
+  margin-bottom: 0;
   color: #8050B0;
-  padding: 0 5px 0 18px;
-  min-height: 22px;
-  background: url("chrome://browser/skin/urlbar-over-link-arrow.png") no-repeat left center;
-}
-
-.urlbar-over-link-host-label,
-.urlbar-over-link-path-label {
-  padding: 0;
-  margin: 0;
 }
 
 /* identity box */
@@ -922,7 +1239,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,
@@ -933,28 +1250,17 @@ 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;
-  border: none;
-  width: auto;
-  list-style-image: url("mainwindow-dropdown-arrow.png");
-  -moz-image-region: rect(0, 13px, 11px, 0);
-}
-
-.urlbar-history-dropmarker:-moz-system-metric(touch-enabled) {
-  min-width: 6.4mozmm;
 }
 
-.urlbar-history-dropmarker:hover:active,
-.urlbar-history-dropmarker[open="true"] {
-  -moz-image-region: rect(0, 26px, 11px, 13px);
+#urlbar-container[combined="true"] > #urlbar > .urlbar-history-dropmarker {
+  border: none;
+  border-radius: 0px;
 }
 
 /* page proxy icon */
@@ -969,15 +1275,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 {
@@ -986,28 +1291,15 @@ html|*.urlbar-input:-moz-lwtheme:-moz-placeholder,
 
 /* autocomplete */
 
-#PopupAutoComplete,
-#PopupAutoCompleteRichResult {
-  direction: ltr !important;
-}
-
-#PopupAutoComplete:-moz-locale-dir(rtl) > tree > treerows {
-  direction: rtl;
-}
-
-#PopupAutoComplete .autocomplete-treebody {
-  direction: ltr;
-}
-
 #treecolAutoCompleteImage {
   max-width: 36px;
 }
 
 .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;
 }
 
@@ -1021,8 +1313,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;
 }
 
@@ -1053,8 +1345,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;
@@ -1071,6 +1363,10 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
   -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);
 }
@@ -1079,17 +1375,31 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
 
 #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;
-  border-left: 1px solid #9C9CFF;
-  border-top-right-radius: 2px;
-  border-bottom-right-radius: 2px;
+  -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;
+}
+
+#urlbar > toolbarbutton:not([disabled]):active:hover,
+#urlbar-reload-button:not(:hover) {
+  -moz-border-start-style: none;
+  -moz-padding-start: 4px;
 }
 
 #urlbar > toolbarbutton:not([disabled]):active:hover {
-  padding-left: 4px;
-  border-left: none;
 }
 
 #urlbar-go-button {
@@ -1097,14 +1407,19 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
 }
 
 #urlbar-go-button:hover {
+  -moz-image-region: rect(14px, 56px, 28px, 42px);
 }
 
 #urlbar-reload-button {
+  -moz-image-region: rect(0px, 28px, 14px, 14px);
+}
+
+#urlbar-reload-button[disabled] {
   -moz-image-region: rect(0px, 14px, 14px, 0px);
 }
 
 #urlbar-reload-button:not([disabled]):hover {
-  -moz-image-region: rect(0px, 28px, 14px, 14px);
+  -moz-image-region: rect(14px, 28px, 28px, 14px);
 }
 
 #urlbar-stop-button {
@@ -1112,6 +1427,7 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
 }
 
 #urlbar-stop-button:hover {
+  -moz-image-region: rect(14px, 42px, 28px, 28px);
 }
 
 /* popup blocker button */
@@ -1121,32 +1437,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 */
@@ -1174,6 +1495,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 {
@@ -1202,27 +1558,22 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
 }
 
 /* Tabstrip */
+
 #TabsToolbar {
   min-height: 0;
   padding: 0;
+  -moz-binding: url("chrome://global/content/bindings/toolbar.xml#toolbar");
 }
 
-#TabsToolbar[tabsontop="false"] {
-  border-bottom: 1px solid #FF9F00;
-}
-
-#tabbrowser-tabs[tabsontop="true"] > .tabbrowser-arrowscrollbox > scrollbox:not(:-moz-lwtheme) {
-  padding-bottom: 1px;
-  margin-bottom: -1px;
-  position: relative;
+#TabsToolbar .toolbar-holder {
+  background-color: #000000; /* correct effect of being an actual toolbar */
 }
 
-#tabbrowser-tabs[tabsontop="true"] > .tabbrowser-tab[selected="true"]:not(:-moz-lwtheme) {
-  margin-bottom: -1px;
-  padding-bottom: 1px;
+#main-window[disablechrome] #TabsToolbar,
+#TabsToolbar[tabsontop="false"] {
+  border-bottom: 1px solid #FF9F00;
 }
 
-/* Tabs */
 .tabbrowser-tab,
 .tabs-newtab-button {
   margin-top: 0px;
@@ -1235,6 +1586,9 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
 .tabbrowser-tab[selected="true"] {
 }
 
+#main-window[tabsontop=false]:not([disablechrome]) .tabbrowser-tab[selected=true]:not(:-moz-lwtheme) {
+}
+
 .tabbrowser-tab:-moz-lwtheme {
 }
 
@@ -1269,8 +1623,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;
 }
 
@@ -1282,7 +1636,7 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
   list-style-image: url("chrome://browser/skin/tabbrowser/loading.png");
 }
 
-.tabbrowser-tab[pinned] {
+#tabbrowser-tabs[positionpinnedtabs] > .tabbrowser-tab[pinned] {
   min-height: 16px; /* corresponds to the max. height of non-textual tab contents, i.e. the favicon */
 }
 
@@ -1297,9 +1651,28 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
   outline: 1px dotted;
 }
 
-/* Tab DnD indicator */
+/* Tab drag and drop */
+.tab-drag-panel {
+  border: 0 !important;
+}
+
+.tab-drag-label {
+  margin: 0 !important;
+  padding: 5px;
+  border: 1px solid #8050B0;
+}
+
+.tab-drag-panel:not([target]) > .tab-drag-label {
+  display: none;
+}
+
+.tab-drag-preview {
+  border: 1px solid #9C9CFF;
+}
+
 .tab-drop-indicator {
   list-style-image: url("chrome://browser/skin/tabbrowser/tabDragIndicator.png");
+  margin-bottom: -11px;
 }
 
 /* Tab close button */
@@ -1347,31 +1720,11 @@ 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="true"],
-.tabbrowser-arrowscrollbox > .scrollbutton-down[disabled="true"] {
-  opacity: .4;
-}
-
-.tabbrowser-arrowscrollbox > .scrollbutton-up:not([disabled="true"]):hover:active,
-.tabbrowser-arrowscrollbox > .scrollbutton-down:not([disabled="true"]):hover:active {
-  -moz-image-region: rect(0, 30px, 17px, 15px);
-}
-
-.tabbrowser-arrowscrollbox > .scrollbutton-up:-moz-locale-dir(rtl) > .toolbarbutton-icon,
-.tabbrowser-arrowscrollbox > .scrollbutton-down:-moz-locale-dir(ltr) > .toolbarbutton-icon {
-  -moz-transform: scaleX(-1);
-}
-
-.tabbrowser-arrowscrollbox > .scrollbutton-down {
-}
-
 .tabbrowser-arrowscrollbox > .scrollbutton-down[notifybgtab] {
   background-color: #008484;
 }
@@ -1384,16 +1737,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;
 }
 
-.tabs-newtab-button:hover:active,
-#TabsToolbar > #new-tab-button:hover:active {
+#TabsToolbar > #new-tab-button {
+  width: 26px;
+}
+
+.tabs-newtab-button:hover,
+#TabsToolbar > #new-tab-button:hover {
   -moz-image-region: rect(0, 32px, 18px, 16px);
 }
 
@@ -1402,32 +1759,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"] {
@@ -1438,6 +1794,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;
@@ -1446,6 +1806,13 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
   list-style-image: url("chrome://global/skin/icons/close-button.gif");
 }
 
+.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");
@@ -1484,7 +1851,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"] {
@@ -1593,10 +1960,6 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
   list-style-image: url("chrome://browser/skin/Geolocation-64.png");
 }
 
-.geolocation-text-link {
-  margin-top: 17px;
-}
-
 .popup-notification-icon[popupid="xpinstall-disabled"],
 .popup-notification-icon[popupid="addon-progress"],
 .popup-notification-icon[popupid="addon-install-cancelled"],
@@ -1651,7 +2014,22 @@ 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;
+}
+
+#notification-popup-box:not([hidden]) + #identity-box {
+  -moz-padding-start: 10px;
+}
+
+#notification-popup-box:-moz-locale-dir(rtl),
+.notification-anchor-icon:-moz-locale-dir(rtl) {
+  -moz-transform: scaleX(-1);
 }
 
 .notification-anchor-icon {
@@ -1660,8 +2038,12 @@ 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 {
+  list-style-image: url("chrome://global/skin/icons/information-16.png");
 }
 
 #geo-notification-icon {
@@ -1702,13 +2084,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;
 }
 
@@ -1856,12 +2238,31 @@ panel[dimmed="true"] {
   opacity: 0.5;
 }
 
-/* Vertically-center the statusbar compatibility shim, because
-   toolbars, even in small-icon mode, are a bit taller than
-   statusbars. Also turn off the statusbar border. On Windows
-   we have to disable borders on statusbar *and* child statusbar
-   elements. */
+/* Add-on bar */
+
+#addon-bar {
+  min-height: 20px;
+  border-top: 3px solid #000000;
+  border-bottom-width: 0;
+}
+
+#addon-bar .toolbar-holder {
+  background-color: #8050B0;
+  color: #FFCF00;
+}
+
+#addon-bar .toolbar-holder {
+  background-color: #8050B0;
+  color: #FFCF00;
+}
+
+#addon-bar .toolbar-startcap,
+#addon-bar .toolbar-endcap{
+  background-color: #6000CF;
+}
+
 #status-bar {
+  -moz-binding: url("chrome://global/content/bindings/general.xml#statusbar");
   margin-top: .3em;
   border-width: 0;
 }
@@ -1872,7 +2273,6 @@ panel[dimmed="true"] {
   border-width: 0;
 } */
 
-/* Add-on bar close button */
 #addonbar-closebutton {
   border: none;
   padding: 3px 5px;
@@ -1883,3 +2283,64 @@ panel[dimmed="true"] {
 #addonbar-closebutton:hover:active {
   list-style-image: url("chrome://global/skin/icons/close-button-hover.gif");
 }
+
+/* Status panel */
+
+.statuspanel-label {
+  margin: 0;
+  padding: 2px 4px;
+  background: #404000;
+  border: 1px none #9C9CFF;
+  border-top-style: solid;
+  color: #FF9F00;
+  text-shadow: none;
+}
+
+.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;
+}
+
+.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;
+}
+
+/* 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-close-button {
+  list-style-image: url("chrome://browser/skin/KUI-close.png");
+  top: 12px;
+  right: 12px;
+  cursor: pointer;
+}
+
+#highlighter-close-button:-moz-locale-dir(rtl)  {
+  right: auto;
+  left: 12px;
+}
+
+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-transparentbox[locked] {
+  box-shadow: 0 0 0 1px black;
+  outline-color: white;
+}