X-Git-Url: https://git-public.kairo.at/?p=themes.git;a=blobdiff_plain;f=LCARStrek%2Fbrowser%2Fbrowser.css;h=e71fc9e401be0440b5ebb9df179010ea544b4c68;hp=51d7fe4b6eddaa5bc4bca21d4eedd59441951c6e;hb=a40f6a794ddf9a8312e4c951d3f6543fa7718819;hpb=143c54092080b8d12a2921b77de796d90323b298

diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css
index 51d7fe4b..e71fc9e4 100644
--- a/LCARStrek/browser/browser.css
+++ b/LCARStrek/browser/browser.css
@@ -1,47 +1,6 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * 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
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-1999
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Joe Hewitt (hewitt@netscape.com)
- *   Jason Kersey (kerz@netscape.com)
- *   Pierre Chanial (chanial@noos.fr)
- *   Dean Tessman (dean_tessman@hotmail.com)
- *   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
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * 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 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 MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 @import url("chrome://global/skin/");
 
@@ -115,9 +74,9 @@ menubar {
   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 {
+#nav-bar[tabsontop="true"],
+#nav-bar[tabsontop="true"][collapsed="true"]:not([customizing]) + toolbar,
+#nav-bar[tabsontop="true"][collapsed="true"]:not([customizing]) + #customToolbars + #PersonalToolbar {
   /* background-image: -moz-linear-gradient(@toolbarHighlight@, rgba(255,255,255,0)); */
 }
 
@@ -136,12 +95,16 @@ menubar {
   background-clip: padding-box;
   border-radius: 0;
   border: none;
-  border-left: 3px solid #000000;
   border-right: 3px solid #000000;
   color: #000000;
   font-weight: bold;
-  padding: 0 1.5em .05em;
-  margin: 0 0 2px;
+  padding: 1px 1.5em;
+  margin: 0;
+}
+
+#appmenu-button:-moz-locale-dir(rtl) {
+  border-left: 3px solid #000000;
+  border-right: none;
 }
 
 #main-window[privatebrowsingmode=temporary] #appmenu-button {
@@ -163,14 +126,20 @@ menubar {
 }
 
 #appmenu-button > .button-box > .button-menu-dropmarker {
-  list-style-image: url("appmenu-dropmarker.png");
+  list-style-image: url("chrome://global/skin/arrow/arrow-down-hover.gif");
   width: auto;
   height: auto;
   padding: 0;
   margin: 0;
+  border: none;
+  background-color: transparent;
   -moz-margin-start: .5em;
 }
 
+#main-window[privatebrowsingmode=temporary] #appmenu-button > .button-box > .button-menu-dropmarker {
+  list-style-image: url("chrome://global/skin/arrow/arrow-down.gif");
+}
+
 #appmenuPrimaryPane > menuitem,
 #appmenuSecondaryPane > menuitem,
 #appmenuPrimaryPane > menu {
@@ -332,13 +301,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 {
@@ -355,19 +339,40 @@ 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");
+}
+
+#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");
+}
+
+#titlebar-close:hover {
+  list-style-image: url("chrome://navigator/skin/icons/win-close-hover.gif");
 }
 
 /* ::::: bookmark buttons ::::: */
 
+/*.bookmark-item:not(#bookmarks-menu-button) > .toolbarbutton-icon */
 .bookmark-item > .toolbarbutton-icon {
   width: 16px;
   height: 16px;
@@ -383,14 +388,12 @@ menubar {
 }
 
 #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 center;
 }
 
 .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 ::::: */
@@ -413,29 +416,36 @@ 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");
-  -moz-image-region: auto;
+  list-style-image: url("chrome://communicator/skin/bookmarks/livemark-item.png");
+  -moz-image-region: rect(0px, 16px, 16px, 0px);
+}
+
+.bookmark-item[container][livemark] .bookmark-item[visited] {
+  -moz-image-region: rect(0px, 32px, 16px, 16px);
 }
 
 .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;
 }
 
@@ -445,16 +455,28 @@ menuitem.bookmark-item {
 }
 
 .bookmark-item[query][dayContainer] {
-  list-style-image: url("chrome://browser/skin/places/calendar.png");
+  list-style-image: url("chrome://communicator/skin/history/calendar.png");
   -moz-image-region: auto;
 }
 
 .bookmark-item[query][hostContainer] {
   list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-closed.gif");
+  -moz-image-region: auto;
 }
 
 .bookmark-item[query][hostContainer][open] {
   list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-open.gif");
+  -moz-image-region: auto;
+}
+
+.bookmark-item[cutting] > .toolbarbutton-icon,
+.bookmark-item[cutting] > .menu-iconic-left > .menu-iconic-icon {
+  opacity: 0.5;
+}
+
+.bookmark-item[cutting] > .toolbarbutton-text,
+.bookmark-item[cutting] > .menu-iconic-left > .menu-iconic-text {
+  opacity: 0.7;
 }
 
 /* ::::: primary toolbar buttons ::::: */
@@ -644,7 +666,9 @@ toolbar[mode="full"] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
   border-bottom-left-radius: 0;
 }
 
-#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #back-button {
+window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
+    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
+    #unified-back-forward-button > #back-button {
   border-radius: 10000px;
   width: 30px;
   height: 30px;
@@ -656,20 +680,32 @@ toolbar[mode="full"] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
   -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"] {
+window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
+    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
+    #unified-back-forward-button > #back-button:not([disabled="true"]):hover,
+window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
+    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
+    #unified-back-forward-button > #back-button[open="true"] {
   -moz-image-region: rect(54px, 40px, 74px, 20px);
 }
 
-#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #back-button[disabled="true"] {
+window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
+    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
+    #unified-back-forward-button > #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 {
+window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
+    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
+    #unified-back-forward-button > #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"] {
+window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
+    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
+    #unified-back-forward-button > #back-button:not([disabled="true"]):hover:active,
+window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
+    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
+    #unified-back-forward-button > #back-button[open="true"] {
 }
 
 #navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar[currentset*="unified-back-forward-button"],
@@ -683,27 +719,83 @@ toolbar[mode="full"] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
 /*  padding-top: 5px; */
 }
 
-#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #forward-button {
+window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
+    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
+    #unified-back-forward-button > #forward-button {
   /*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;
+  margin-top: 2px;
+  margin-bottom: 2px;
+}
+
+window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
+    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
+    #unified-back-forward-button > #forward-button:-moz-locale-dir(ltr) {
+  border-top-right-radius: 11px;
+  border-bottom-right-radius: 11px;
+}
+
+window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
+    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
+    #unified-back-forward-button > #forward-button:-moz-locale-dir(rtl) {
+  border-top-left-radius: 11px;
+  border-bottom-left-radius: 11px;
 }
 
-#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #forward-button:not([disabled="true"]):not(:active):hover {
+window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
+    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
+    #unified-back-forward-button > #forward-button: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;
+}
+
+window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
+    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
+    #unified-back-forward-button > #forward-button {
+/*  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+  -moz-margin-end: 0; */
+}
+
+window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
+    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
+    #unified-back-forward-button:not([switchingtabs]) > #forward-button {
+  -moz-transition: opacity 150ms ease-out;
+}
+
+window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
+    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
+    #unified-back-forward-button:not(:hover) > #forward-button[disabled] {
+  opacity: 0;
+}
+
+window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
+    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
+    #unified-back-forward-button:hover > #forward-button[disabled] {
+  background-color: transparent;
 }
 
 /* stop button */
@@ -830,11 +922,12 @@ toolbar[mode="full"] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
 
 #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 {
@@ -961,27 +1054,6 @@ toolbar[mode="full"] .toolbarbutton-1 > .toolbarbutton-menubutton-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);
 }
@@ -1000,7 +1072,8 @@ toolbar[mode="full"] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
 
 /* 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);
 }
 
@@ -1025,7 +1098,7 @@ toolbar[mode="full"] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
 
 /* ::::: fullscreen window controls ::::: */
 
-#TabsToolbar > #window-controls {
+#window-controls {
   -moz-margin-start: 4px;
 }
 
@@ -1061,11 +1134,6 @@ toolbar[mode="full"] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
 
 /* ::::: Location Bar ::::: */
 
-#urlbar {
-  width: 7em;
-  min-width: 7em;
-}
-
 #urlbar,
 .searchbar-textbox {
   border-radius: 5px;
@@ -1073,6 +1141,13 @@ toolbar[mode="full"] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
   -moz-margin-start: 3px;
 }
 
+#urlbar {
+  width: 7em;
+  min-width: 7em;
+  /* make color as light as possible to deal with dark non-domain parts */
+  color: #FFBFFF;
+}
+
 #urlbar:-moz-lwtheme,
 .searchbar-textbox:-moz-lwtheme {
   /* background-color: rgba(255,255,255,.8);
@@ -1080,6 +1155,79 @@ toolbar[mode="full"] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
   color: black; */
 }
 
+window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
+    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
+    #unified-back-forward-button + #urlbar-container {
+  padding-left: 22px;
+  -moz-margin-start: -22px;
+  position: relative;
+  pointer-events: none;
+}
+
+window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
+    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
+    #unified-back-forward-button + #urlbar-container > #urlbar {
+/*  -moz-border-start: none;
+  margin-left: 0; */
+  pointer-events: all;
+}
+
+window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
+    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
+    #unified-back-forward-button:not([switchingtabs]) + #urlbar-container > #urlbar {
+  -moz-transition: margin-left 150ms ease-out;
+}
+
+window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
+    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
+    #unified-back-forward-button + #urlbar-container > #urlbar:-moz-locale-dir(ltr) {
+/*  border-top-left-radius: 0;
+  border-bottom-left-radius: 0; */
+}
+
+window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
+    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
+    #unified-back-forward-button + #urlbar-container > #urlbar:-moz-locale-dir(rtl) {
+/*  border-top-right-radius: 0;
+  border-bottom-right-radius: 0; */
+}
+
+window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
+    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
+    #unified-back-forward-button[forwarddisabled] + #urlbar-container {
+  mask: url("chrome://browser/content/browser.xul#winstripe-urlbar-back-button-mask");
+}
+
+window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
+    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
+    #unified-back-forward-button[forwarddisabled] + #urlbar-container > #urlbar {
+  margin-left: -22px;
+}
+
+window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
+    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
+    #unified-back-forward-button[forwarddisabled]:hover:not([switchingtabs]) + #urlbar-container > #urlbar {
+  /* delay the hiding of the forward button when hovered to avoid accidental clicks on the url bar */
+  -moz-transition-delay: 100s;
+}
+
+window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
+    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
+    #unified-back-forward-button[forwarddisabled]:not(:hover) + #urlbar-container > #urlbar {
+  /* when not hovered anymore, trigger a new transition to hide the forward button immediately */
+  margin-left: -22.01px;
+}
+
+window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
+    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
+    #unified-back-forward-button + #urlbar-container:-moz-locale-dir(rtl),
+window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
+    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
+    #unified-back-forward-button + #urlbar-container > #urlbar:-moz-locale-dir(rtl) {
+  /* let winstripe-urlbar-back-button-mask clip the urlbar's right side for RTL */
+  -moz-transform: scaleX(-1);
+}
+
 html|*.urlbar-input:-moz-lwtheme:-moz-placeholder,
 .searchbar-textbox:-moz-lwtheme > .autocomplete-textbox-container > .textbox-input-box > html|*.textbox-input:-moz-placeholder {
   color: #E7ADE7;
@@ -1099,13 +1247,25 @@ html|*.urlbar-input:-moz-lwtheme:-moz-placeholder,
   -moz-box-align: stretch;
 }
 
+.urlbar-input-box {
+  -moz-margin-start: 0;
+}
+
 #urlbar-icons {
-  height: 18px;
   -moz-box-align: center;
 }
 
 .urlbar-icon {
-  padding: 0 2px !important;
+  padding: 2px;
+}
+
+.searchbar-engine-button,
+.search-go-container {
+  padding: 2px;
+}
+
+.search-go-container > .search-go-button {
+  padding: 0;
 }
 
 .urlbar-icon:-moz-system-metric(touch-enabled) {
@@ -1113,6 +1273,13 @@ html|*.urlbar-input:-moz-lwtheme:-moz-placeholder,
   padding: 0 3px !important;
 }
 
+.urlbar-icon:hover {
+}
+
+.urlbar-icon[open="true"],
+.urlbar-icon:hover:active {
+}
+
 #urlbar-search-splitter {
   min-width: 6px;
   -moz-margin-start: -3px;
@@ -1120,56 +1287,95 @@ html|*.urlbar-input:-moz-lwtheme:-moz-placeholder,
   background: transparent;
 }
 
-#urlbar-search-splitter + #urlbar-container > #urlbar ,
+#urlbar-search-splitter + #urlbar-container > #urlbar,
 #urlbar-search-splitter + #search-container > #searchbar > .searchbar-textbox {
   -moz-margin-start: 0;
 }
 
 #urlbar-display {
-  margin-top: -2px;
-  margin-bottom: -2px;
   -moz-border-end: 1px solid #9C9CFF;
   -moz-margin-end: 3px;
-}
-
-#urlbar-display {
   margin-top: 0;
   margin-bottom: 0;
+  -moz-margin-start: 0;
   color: #8050B0;
 }
 
 /* identity box */
 
 #identity-box {
-  background-color: #000000;
-  color: #FF9F00;
   border-radius: 2px;
 }
 
-#identity-box:hover {
-  background-color: #9C9CFF;
-  color: #000000;
+#notification-popup-box:not([hidden]) + #identity-box {
+  -moz-padding-start: 10px;
+  border-radius: 0;
 }
 
-#identity-box[open="true"],
-#identity-box:hover:active {
-  background-color: #FF9F00;
-  color: #000000;
+window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
+    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
+    #unified-back-forward-button + #urlbar-container > #urlbar > #identity-box {
+/*   border-radius: 0; */
 }
 
-#identity-box.verifiedDomain {
-  background-color: #FFCF00;
-  color: #000000;
+window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
+    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
+    #unified-back-forward-button[forwarddisabled] + #urlbar-container > #urlbar > #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(ltr) {
+  padding-left: 5px;
+  -moz-transition: padding-left;
+}
+
+window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
+    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
+    #unified-back-forward-button[forwarddisabled] + #urlbar-container > #urlbar > #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(rtl) {
+  padding-right: 5px;
+  -moz-transition: padding-right;
+}
+
+window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
+    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
+    #unified-back-forward-button[forwarddisabled]:hover:not([switchingtabs]) + #urlbar-container > #urlbar > #notification-popup-box[hidden] + #identity-box {
+  /* forward button hiding is delayed when hovered */
+  -moz-transition-delay: 100s;
+}
+
+window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
+    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
+    #unified-back-forward-button[forwarddisabled]:not(:hover) + #urlbar-container > #urlbar > #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(ltr) {
+  /* when not hovered anymore, trigger a new non-delayed transition to react to the forward button hiding */
+  padding-left: 5.01px;
+}
+
+window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
+    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
+    #unified-back-forward-button[forwarddisabled]:not(:hover) + #urlbar-container > #urlbar > #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(rtl) {
+  /* when not hovered anymore, trigger a new non-delayed transition to react to the forward button hiding */
+  padding-right: 5.01px;
 }
 
 #identity-box.verifiedIdentity {
-  background-color: #008484;
-  color: #000000;
+  color: #008484;
+  -moz-border-end: 1px solid #008484;
+  -moz-margin-end: 3px;
+}
+
+#identity-box.verifiedIdentity:-moz-locale-dir(ltr) {
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+}
+
+#identity-box.verifiedIdentity:-moz-locale-dir(rtl) {
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
+}
+
+#identity-box.verifiedIdentity:not(:-moz-lwtheme) {
+  background-color: #000000;
 }
 
 #identity-box:-moz-focusring {
   outline: 1px dotted #008484;
-  outline-offset: -3px;
+  outline-offset: -1px;
 }
 
 #identity-box.verifiedDomain:-moz-focusring,
@@ -1180,7 +1386,6 @@ 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 */
@@ -1194,31 +1399,41 @@ html|*.urlbar-input:-moz-lwtheme:-moz-placeholder,
   border-radius: 0px;
 }
 
+.urlbar-history-dropmarker:hover {
+}
+
+.urlbar-history-dropmarker:hover:active,
+.urlbar-history-dropmarker[open="true"] {
+}
+
 /* page proxy icon */
 
-#page-proxy-favicon,
-#urlbar-throbber {
+#page-proxy-favicon {
   width: 16px;
   height: 16px;
+  list-style-image: url("chrome://browser/skin/identity-icons-generic.png");
+  -moz-image-region: rect(0, 16px, 16px, 0);
 }
 
-#page-proxy-stack {
-  width: 24px;
-  height: 18px;
-  padding: 1px 4px;
-  background: url("urlbar-favicon-glow.png") center center no-repeat;
+.verifiedDomain > #identity-box-inner > #page-proxy-stack > #page-proxy-favicon {
+  list-style-image: url("chrome://browser/skin/identity-icons-https.png");
 }
 
-#page-proxy-favicon:not([src]) {
-  list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-item.gif");
+.verifiedIdentity > #identity-box-inner > #page-proxy-stack > #page-proxy-favicon {
+  list-style-image: url("chrome://browser/skin/identity-icons-https-ev.png");
 }
 
-#page-proxy-favicon[pageproxystate="invalid"] {
-  list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-item.gif");
+#identity-box:hover > #identity-box-inner > #page-proxy-stack > #page-proxy-favicon {
+  -moz-image-region: rect(0, 32px, 16px, 16px);
 }
 
-#urlbar-throbber {
-  list-style-image: url("chrome://global/skin/icons/loading.gif");
+#identity-box:hover:active > #identity-box-inner > #page-proxy-stack > #page-proxy-favicon,
+#identity-box[open=true] > #identity-box-inner > #page-proxy-stack > #page-proxy-favicon {
+  -moz-image-region: rect(0, 48px, 16px, 32px);
+}
+
+#page-proxy-favicon[pageproxystate="invalid"] {
+  opacity: 0.5;
 }
 
 /* autocomplete */
@@ -1229,9 +1444,9 @@ html|*.urlbar-input:-moz-lwtheme:-moz-placeholder,
 
 .ac-result-type-bookmark,
 .autocomplete-treebody::-moz-tree-image(bookmark, treecolAutoCompleteImage) {
-  list-style-image: url("chrome://browser/skin/places/editBookmark.png");
+  list-style-image: url("chrome://browser/skin/places/bookmark.png");
   -moz-image-region: rect(0px 16px 16px 0px);
-  width: 16px; 
+  width: 16px;
   height: 16px;
 }
 
@@ -1245,8 +1460,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;
 }
 
@@ -1277,8 +1492,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;
@@ -1288,33 +1503,23 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
   border-top: 1px solid #9C9CFF;
 }
 
-/* go button */
-
-#go-button {
-  list-style-image: url("chrome://browser/skin/Go-arrow.png");
-  -moz-image-region: rect(0px, 16px, 16px, 0px);
-}
-
-#go-button:-moz-locale-dir(rtl) > .toolbarbutton-icon {
-  -moz-transform: scaleX(-1);
-}
-
-#go-button:hover {
-  -moz-image-region: rect(16px, 16px, 32px, 0px);
-}
-
 /* combined go/reload/stop button in location bar */
 
+#go-button,
 #urlbar > toolbarbutton {
   list-style-image: url("chrome://browser/skin/reload-stop-go.png");
   /* margin: -2px; */
   -moz-margin-start: 0;
-  padding: 0 3px;
+  padding: 0 2px;
   background-origin: border-box;
   border: none;
   -moz-border-start: 1px solid #9C9CFF;
 }
 
+#go-button {
+  padding: 0 3px;
+}
+
 #urlbar:-moz-locale-dir(ltr) > toolbarbutton {
   border-top-left-radius: 0px;
   border-bottom-left-radius: 0px;
@@ -1325,37 +1530,47 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
   border-bottom-right-radius: 0px;
 }
 
+#urlbar > toolbarbutton:not([disabled]):active:hover,
+#urlbar-reload-button:not(:hover) {
+  -moz-border-start-style: none;
+  -moz-padding-start: 3px;
+}
+
 #urlbar > toolbarbutton:not([disabled]):active:hover {
-  -moz-padding-start: 4px;
-  -moz-border-start: none;
 }
 
 #urlbar-go-button {
-  -moz-image-region: rect(0px, 56px, 14px, 42px);
+  -moz-image-region: rect(0, 42px, 14px, 28px);
 }
 
-#urlbar-go-button:hover {
-  -moz-image-region: rect(14px, 56px, 28px, 42px);
+#go-button:-moz-locale-dir(rtl) > .toolbarbutton-icon,
+#urlbar-go-button:-moz-locale-dir(rtl) > .toolbarbutton-icon {
+  -moz-transform: scaleX(-1);
+}
+
+#urlbar-go-button:hover,
+#go-button:hover {
+  -moz-image-region: rect(14px, 42px, 28px, 28px);
 }
 
 #urlbar-reload-button {
-  -moz-image-region: rect(0px, 28px, 14px, 14px);
+  -moz-image-region: rect(0px, 14px, 14px, 0px);
 }
 
 #urlbar-reload-button[disabled] {
-  -moz-image-region: rect(0px, 14px, 14px, 0px);
+  -moz-image-region: rect(28px, 14px, 42px, 0px);
 }
 
 #urlbar-reload-button:not([disabled]):hover {
-  -moz-image-region: rect(14px, 28px, 28px, 14px);
+  -moz-image-region: rect(14px, 14px, 28px, 0px);
 }
 
 #urlbar-stop-button {
-  -moz-image-region: rect(0px, 42px, 14px, 28px);
+  -moz-image-region: rect(0px, 28px, 14px, 14px);
 }
 
 #urlbar-stop-button:hover {
-  -moz-image-region: rect(14px, 42px, 28px, 28px);
+  -moz-image-region: rect(14px, 28px, 28px, 14px);
 }
 
 /* popup blocker button */
@@ -1365,32 +1580,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 */
@@ -1418,6 +1638,39 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
   min-width: 27em;
 }
 
+.panel-promo-box {
+  margin: 5px -6px -6px;
+  padding: 5px;
+  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 {
@@ -1454,7 +1707,7 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
 }
 
 #TabsToolbar .toolbar-holder {
-  background-color: #000000; /* correct effect of being an actal toolbar */
+  background-color: #000000; /* correct effect of being an actual toolbar */
 }
 
 #main-window[disablechrome] #TabsToolbar,
@@ -1511,8 +1764,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;
 }
 
@@ -1566,13 +1819,9 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
   list-style-image: url("chrome://global/skin/icons/close-button-hover.gif");
 }
 
-.tab-close-button:focus {
-  outline: none !important;
-}
-
 /* Tab scrollbox arrow, tabstrip new tab and all-tabs buttons */
 
-@media all and (-moz-touch-enabled) {
+@media (-moz-touch-enabled) {
   .tabbrowser-arrowscrollbox > .scrollbutton-up,
   .tabbrowser-arrowscrollbox > .scrollbutton-down,
   #TabsToolbar .toolbarbutton-1 {
@@ -1612,7 +1861,11 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
 }
 
 .tabs-newtab-button {
-  width: 31px;
+  width: 28px;
+}
+
+#TabsToolbar > #new-tab-button {
+  width: 26px;
 }
 
 .tabs-newtab-button:hover,
@@ -1625,32 +1878,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"] {
@@ -1661,6 +1913,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;
@@ -1672,6 +1928,10 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
 .tabs-closebutton > .toolbarbutton-icon {
 }
 
+.tabs-closebutton > .toolbarbutton-text {
+  display: none;
+}
+
 .tabs-closebutton:hover,
 .tabs-closebutton:hover:active {
   list-style-image: url("chrome://global/skin/icons/close-button-hover.gif");
@@ -1710,7 +1970,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"] {
@@ -1830,6 +2090,12 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
   height: 32px;
 }
 
+.popup-notification-icon[popupid="click-to-play-plugins"] {
+  list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.png");
+  width: 32px;
+  height: 32px;
+}
+
 .addon-progress-description {
   width: 350px;
   max-width: 350px;
@@ -1871,9 +2137,30 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
   list-style-image: url("chrome://mozapps/skin/passwordmgr/key-64.png");
 }
 
+.popup-notification-icon[popupid="webapps-install"] {
+  list-style-image: url("chrome://browser/skin/webapps-64.png");
+}
+
 /* Notification icon box */
 #notification-popup-box {
-  margin: 0 3px;
+  position: relative;
+  background-color: #000000;
+  background-clip: padding-box;
+  padding-left: 3px;
+  border-radius: 3px 0 0 3px;
+  -moz-border-image: url("chrome://browser/skin/urlbar-arrow.png") 0 8 0 0 / 0 8px 0 0;
+  -moz-margin-end: -8px;
+}
+
+window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
+    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
+    #unified-back-forward-button[forwarddisabled] + #urlbar-container > #urlbar > #notification-popup-box {
+  padding-left: 5px;
+}
+
+#notification-popup-box:-moz-locale-dir(rtl),
+.notification-anchor-icon:-moz-locale-dir(rtl) {
+  -moz-transform: scaleX(-1);
 }
 
 .notification-anchor-icon {
@@ -1882,8 +2169,8 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
 }
 
 .notification-anchor-icon:-moz-focusring {
-  outline: 1px dotted -moz-DialogText;
-  outline-offset: -3px;
+  outline: 1px dotted #008484;
+/*  outline-offset: -3px; */
 }
 
 #default-notification-icon {
@@ -1906,6 +2193,14 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
   list-style-image: url("chrome://mozapps/skin/passwordmgr/key-16.png");
 }
 
+#webapps-notification-icon {
+  list-style-image: url("chrome://browser/skin/webapps-16.png");
+}
+
+#plugins-notification-icon {
+  list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric-16.png");
+}
+
 #identity-popup-container {
   min-width: 280px;
 }
@@ -1928,13 +2223,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;
 }
 
@@ -2087,10 +2382,7 @@ panel[dimmed="true"] {
 #addon-bar {
   min-height: 20px;
   border-top: 3px solid #000000;
-}
-
-#addon-bar:not(:-moz-lwtheme) {
-  -moz-appearance: statusbar;
+  border-bottom-width: 0;
 }
 
 #addon-bar .toolbar-holder {
@@ -2114,6 +2406,13 @@ panel[dimmed="true"] {
   border-width: 0;
 }
 
+#addon-bar[customizing] > #status-bar {
+  opacity: .5;
+/*  background-image: -moz-repeating-linear-gradient(-45deg,
+                                                   rgba(255,255,255,.3), rgba(255,255,255,.3) 5px,
+                                                   rgba(0,0,0,.3) 5px, rgba(0,0,0,.3) 10px);*/
+}
+
 /* Remove all borders from statusbarpanel children of
    the statusbar.
 #status-bar > statusbarpanel {
@@ -2156,3 +2455,460 @@ panel[dimmed="true"] {
   border-top-left-radius: .3em;
   margin-left: 1em;
 }
+
+/* HACK to abolish devily color on main content */
+
+#content {
+  background-color: transparent !important;
+}
+
+/* Highlighter */
+
+.highlighter-veil {
+  background-color: rgba(25, 25, 25, 0.5);
+}
+
+#highlighter-closebutton {
+  list-style-image: url("chrome://global/skin/icons/close-button.gif");
+}
+
+#highlighter-closebutton:hover,
+#highlighter-closebutton:hover:active {
+  list-style-image: url("chrome://global/skin/icons/close-button-hover.gif");
+}
+
+highlighter-veil-transparentbox {
+  box-shadow: 0 0 0 1px rgba(0,0,0,0.5);
+  outline: 1px dashed rgba(255,255,255,0.5);
+  outline-offset: -1px;
+}
+
+#highlighter-veil-container[locked] > #highlighter-veil-middlebox > #highlighter-veil-transparentbox {
+  box-shadow: 0 0 0 1px black;
+  outline-color: white;
+}
+
+/* Highlighter toolbar */
+
+#inspector-inspect-toolbutton {
+  list-style-image: url("chrome://browser/skin/devtools/inspect-button.png");
+  -moz-image-region: rect(0 16px 16px 0);
+}
+
+#inspector-inspect-toolbutton[checked=true],
+#inspector-inspect-toolbutton:hover {
+  -moz-image-region: rect(0 32px 16px 16px);
+}
+
+#inspector-option-toolbarbutton {
+  list-style-image: url("chrome://browser/skin/devtools/inspector-option-icon.png");
+  -moz-image-region: rect(0 16px 16px 0);
+}
+
+#inspector-option-toolbarbutton[open],
+#inspector-option-toolbarbutton:hover {
+  -moz-image-region: rect(0 32px 16px 16px);
+}
+
+#inspector-toolbar {
+  border-top: 3px solid #000000;
+  border-bottom: none;
+}
+
+#inspector-tools {
+  -moz-padding-end: 2px;
+  border-left: 3px solid #000000;
+  border-right: 3px solid #000000;
+  -moz-margin-start: 2px;
+}
+
+#devtools-sidebar-box {
+  background-color: #000000;
+}
+
+html|*#highlighter-nodeinfobar-pseudo-classes {
+  color: #FF9F00;
+}
+
+/* Highlighter - Node Infobar */
+
+#highlighter-nodeinfobar {
+  color: #FF9F00;
+  border: 1px solid rgba(156, 156, 255, .5);
+  border-radius: 3px;
+  background-color: #000000;
+  background-clip: padding-box;
+}
+
+/* Highlighter - Node Infobar - text */
+
+#highlighter-nodeinfobar-text {
+  /* 100% - size of the buttons and margins */
+  max-width: -moz-calc(100% - 2 * (26px + 6px));
+  padding-bottom: 1px;
+}
+
+html|*#highlighter-nodeinfobar-tagname {
+  color: #FFCF00;
+}
+
+html|*#highlighter-nodeinfobar-id {
+  color: #9C9CFF;
+}
+
+html|*#highlighter-nodeinfobar-pseudo-classes {
+  color: #FF9F00;
+}
+
+/* Highlighter - Node Infobar - buttons */
+
+.highlighter-nodeinfobar-button {
+  padding: 0;
+  width: 26px;
+  min-height: 26px;
+}
+
+#highlighter-nodeinfobar-inspectbutton {
+  list-style-image: url("chrome://browser/skin/devtools/inspect-button.png");
+  -moz-image-region: rect(0px 16px 16px 0px);
+  -moz-margin-start: 0px;
+  -moz-margin-end: 2px;
+}
+
+#highlighter-nodeinfobar-inspectbutton:-moz-locale-dir(rtl) {
+}
+
+#highlighter-nodeinfobar-inspectbutton:hover,
+#highlighter-nodeinfobar-inspectbutton:hover:active/*,
+#highlighter-nodeinfobar-container:not([locked]) >  #highlighter-nodeinfobar >  #highlighter-nodeinfobar-inspectbutton*/ {
+  -moz-image-region: rect(0px 32px 16px 16px);
+}
+
+#highlighter-nodeinfobar-menu {
+}
+
+#highlighter-nodeinfobar-menu:-moz-locale-dir(rtl) {
+}
+
+#highlighter-nodeinfobar-menu > .toolbarbutton-menu-dropmarker {
+  -moz-box-align: center;
+  -moz-margin-start: -1px;
+}
+
+/* Highlighter - Node Infobar - box & arrow */
+
+.highlighter-nodeinfobar-arrow {
+  width: 14px;
+  height: 14px;
+  -moz-margin-start: -moz-calc(50% - 7px);
+  -moz-transform: rotate(-45deg);
+  border: 1px solid transparent;
+  background-clip: padding-box;
+  background-repeat: no-repeat;
+}
+
+#highlighter-nodeinfobar-arrow-top {
+  margin-bottom: -8px;
+  margin-top: 8px;
+  border-right-color: rgba(0, 132, 132, .5);
+  border-top-color: rgba(0, 132, 132, .5);
+  background-image: -moz-linear-gradient(bottom left, transparent 50%, rgb(0, 132, 132) 50%);
+}
+
+#highlighter-nodeinfobar-arrow-bottom {
+  margin-top: -8px;
+  margin-bottom: 8px;
+  border-left-color: rgba(0, 132, 132, .5);
+  border-bottom-color: rgba(0, 132, 132, .5);
+  background-image: -moz-linear-gradient(top right, transparent 50%, rgb(0, 132, 132) 50%);
+}
+
+#highlighter-nodeinfobar-container[position="top"] > #highlighter-nodeinfobar,
+#highlighter-nodeinfobar-container[position="overlap"] > #highlighter-nodeinfobar {
+  box-shadow: 0 1px 0 hsla(0, 0%, 100%, .1) inset;
+}
+
+#highlighter-nodeinfobar-container[hide-arrow] > #highlighter-nodeinfobar {
+  margin: 7px 0;
+}
+
+#full-screen-warning-message {
+  background-color: #000000;
+  color: #FF9F00;
+  font-size: 32px;
+  border-radius: 8px;
+  margin-top: 30px;
+  padding: 30px 50px;
+  box-shadow: 0 0 2px #9C9CFF;
+}
+
+#full-screen-warning-container[obscure-browser] {
+  background-color: rgba(0,0,0,0.75);
+}
+
+#full-screen-warning-container[stop-obscuring-browser] {
+  -moz-transition-property: background-color;
+  -moz-transition-duration: 500ms;
+  background-color: rgba(0,0,0,0);
+}
+
+/* Highlighter toolbar - breadcrumbs */
+
+#inspector-breadcrumbs {
+  -moz-margin-start: 2px;
+}
+
+#inspector-breadcrumbs > .scrollbutton-up,
+#inspector-breadcrumbs > .scrollbutton-down {
+  min-height: 25px;
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+#inspector-breadcrumbs > .scrollbutton-up {
+  -moz-margin-end: 1px;
+}
+
+#inspector-breadcrumbs > .scrollbutton-down {
+  -moz-margin-end: 0;
+}
+
+#inspector-breadcrumbs > .scrollbutton-up:not([disabled]):active:hover,
+#inspector-breadcrumbs > .scrollbutton-down:not([disabled]):active:hover {
+}
+
+#inspector-breadcrumbs > .scrollbutton-up > .toolbarbutton-icon,
+#inspector-breadcrumbs > .scrollbutton-down > .toolbarbutton-icon {
+  /* margin: 0 5px; */
+}
+
+#inspector-breadcrumbs > .scrollbutton-up[disabled] > .toolbarbutton-icon,
+#inspector-breadcrumbs > .scrollbutton-down[disabled] > .toolbarbutton-icon {
+}
+
+#inspector-breadcrumbs > .scrollbutton-up:not([disabled]):active:hover > .toolbarbutton-icon,
+#inspector-breadcrumbs > .scrollbutton-down:not([disabled]):active:hover > .toolbarbutton-icon {
+}
+
+#inspector-breadcrumbs > .scrollbutton-up:-moz-locale-dir(ltr) {
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+}
+
+#inspector-breadcrumbs > .scrollbutton-down:-moz-locale-dir(ltr) {
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
+}
+
+#inspector-breadcrumbs > .scrollbutton-up:-moz-locale-dir(rtl) {
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
+}
+
+#inspector-breadcrumbs > .scrollbutton-down:-moz-locale-dir(rtl) {
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+}
+
+#inspector-breadcrumbs > .scrollbutton-up > .toolbarbutton-icon:-moz-locale-dir(rtl),
+#inspector-breadcrumbs > .scrollbutton-down > .toolbarbutton-icon:-moz-locale-dir(ltr) {
+/*  -moz-transform: scaleX(-1); */
+}
+
+.inspector-breadcrumbs-button {
+  /*background-color: transparent;*/
+  border-width: 2px 13px !important;
+  outline: none;
+  /* color: hsl(210,30%,85%); */
+  width: 85px; /* Can't use max-width. See bug 723132 */
+  /* The content of the button can be larger than the button */
+  overflow: hidden;
+  min-height: 25px;
+  margin: 0 -11px 0 0;
+  padding: 0 9px;
+}
+
+.inspector-breadcrumbs-button:-moz-focusring > label {
+  border-bottom: 1px dotted #008484;
+}
+
+.inspector-breadcrumbs-button[checked] > .inspector-breadcrumbs-tag {
+  /*color: hsl(208,100%,60%); */
+}
+
+.inspector-breadcrumbs-button[checked] > .inspector-breadcrumbs-id {
+  /*color: hsl(205,100%,70%); */
+}
+
+.inspector-breadcrumbs-button[checked] > .inspector-breadcrumbs-pseudo-classes {
+  color: #FF9F00;
+}
+
+.inspector-breadcrumbs-id,
+.inspector-breadcrumbs-classes {
+  /*color: #8d99a6; */
+}
+
+/* fit height of other buttons to breadcrumbs */
+#inspector-toolbar .devtools-toolbarbutton,
+#highlighter-closebutton,
+#inspector-option-toolbarbutton {
+  min-height: 25px;
+}
+
+.inspector-breadcrumbs-pseudo-classes {
+  color: #FFCF00;
+}
+
+/* Highlighter toolbar - breadcrumbs - LTR */
+
+.inspector-breadcrumbs-button:-moz-locale-dir(ltr):first-of-type {
+}
+
+.inspector-breadcrumbs-button {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle.png") 2 13 2 13 stretch;
+}
+
+.inspector-breadcrumbs-button[siblings-menu-open]:not([checked]),
+.inspector-breadcrumbs-button:not([checked]):hover:active {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle-pressed.png") 2 13 2 13 stretch;
+}
+
+.inspector-breadcrumbs-button[checked] {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle-selected.png") 2 13 2 13 stretch;
+}
+
+.inspector-breadcrumbs-button[checked][siblings-menu-open],
+.inspector-breadcrumbs-button[checked]:hover:active {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle-selected-pressed.png") 2 13 2 13 stretch;
+}
+
+.inspector-breadcrumbs-button:first-of-type {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start.png") 2 13 2 13 stretch;
+}
+
+.inspector-breadcrumbs-button[siblings-menu-open]:first-of-type:not([checked]),
+.inspector-breadcrumbs-button:first-of-type:not([checked]):hover:active {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start-pressed.png") 2 13 2 13 stretch;
+}
+
+.inspector-breadcrumbs-button:first-of-type[checked] {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start-selected.png") 2 13 2 13 stretch;
+}
+
+.inspector-breadcrumbs-button[siblings-menu-open]:first-of-type[checked],
+.inspector-breadcrumbs-button:first-of-type[checked]:hover:active {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start-selected-pressed.png") 2 13 2 13 stretch;
+}
+
+.inspector-breadcrumbs-button:last-of-type {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end.png") 2 13 2 13 stretch;
+}
+
+#inspector-breadcrumbs[overflows] > .inspector-breadcrumbs-button:-moz-locale-dir(ltr):last-of-type {
+}
+
+.inspector-breadcrumbs-button[siblings-menu-open]:last-of-type:not([checked]),
+.inspector-breadcrumbs-button:last-of-type:not([checked]):hover:active {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end-pressed.png") 2 13 2 13 stretch;
+}
+
+.inspector-breadcrumbs-button:last-of-type[checked] {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end-selected.png") 2 13 2 13 stretch;
+}
+
+.inspector-breadcrumbs-button[siblings-menu-open]:last-of-type[checked],
+.inspector-breadcrumbs-button:last-of-type[checked]:hover:active {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end-selected-pressed.png") 2 13 2 13 stretch;
+}
+
+/* Highlighter toolbar - breadcrumbs - RTL */
+
+.inspector-breadcrumbs-button:-moz-locale-dir(rtl):first-of-type {
+}
+
+.inspector-breadcrumbs-button:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle.png") 2 13 2 13 stretch;
+}
+
+.inspector-breadcrumbs-button[siblings-menu-open]:not([checked]):-moz-locale-dir(rtl),
+.inspector-breadcrumbs-button:not([checked]):hover:active:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle-pressed.png") 2 13 2 13 stretch;
+}
+
+.inspector-breadcrumbs-button[checked]:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle-selected.png") 2 13 2 13 stretch;
+}
+
+.inspector-breadcrumbs-button[checked][siblings-menu-open]:-moz-locale-dir(rtl),
+.inspector-breadcrumbs-button[checked]:hover:active:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle-selected-pressed.png") 2 13 2 13 stretch;
+}
+
+.inspector-breadcrumbs-button:first-of-type:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start.png") 2 13 2 13 stretch;
+}
+
+.inspector-breadcrumbs-button[siblings-menu-open]:first-of-type:not([checked]):-moz-locale-dir(rtl),
+.inspector-breadcrumbs-button:first-of-type:not([checked]):hover:active:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start-pressed.png") 2 13 2 13 stretch;
+}
+
+.inspector-breadcrumbs-button:first-of-type[checked]:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start-selected.png") 2 13 2 13 stretch;
+}
+
+.inspector-breadcrumbs-button[siblings-menu-open]:first-of-type[checked]:-moz-locale-dir(rtl),
+.inspector-breadcrumbs-button:first-of-type[checked]:hover:active:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-start-selected-pressed.png") 2 13 2 13 stretch;
+}
+
+.inspector-breadcrumbs-button:last-of-type:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end.png") 2 13 2 13 stretch;
+}
+
+#inspector-breadcrumbs[overflows] > .inspector-breadcrumbs-button:last-of-type:-moz-locale-dir(rtl) {
+}
+
+.inspector-breadcrumbs-button[siblings-menu-open]:last-of-type:not([checked]):-moz-locale-dir(rtl),
+.inspector-breadcrumbs-button:last-of-type:not([checked]):hover:active:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end-pressed.png") 2 13 2 13 stretch;
+}
+
+.inspector-breadcrumbs-button:last-of-type[checked]:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end-selected.png") 2 13 2 13 stretch;
+}
+
+.inspector-breadcrumbs-button[siblings-menu-open]:last-of-type[checked]:-moz-locale-dir(rtl),
+.inspector-breadcrumbs-button:last-of-type[checked]:hover:active:-moz-locale-dir(rtl) {
+  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-end-selected-pressed.png") 2 13 2 13 stretch;
+}
+
+/* Highlighter toolbar - HTML Tree */
+
+#inspector-treepanel-toolbutton {
+  list-style-image: url("chrome://browser/skin/devtools/treepanel-button.png");
+  -moz-image-region: rect(0 18px 16px 0);
+}
+
+#inspector-treepanel-toolbutton[checked],
+#inspector-treepanel-toolbutton:hover {
+  -moz-image-region: rect(0 36px 16px 18px);
+}
+
+#inspector-breadcrumbs > .scrollbutton-down:-moz-locale-dir(rtl),
+#inspector-treepanel-toolbutton:-moz-locale-dir(ltr) {
+/*  border-radius: 3px 0 0 3px;*/
+}
+
+#inspector-breadcrumbs > .scrollbutton-down:-moz-locale-dir(ltr),
+#inspector-treepanel-toolbutton:-moz-locale-dir(rtl) {
+/*  border-radius: 0 3px 3px 0;*/
+}
+
+#inspector-tree-splitter {
+  border: none;
+  min-height: 3px;
+  height: 3px;
+  position: relative;
+}