X-Git-Url: https://git-public.kairo.at/?p=themes.git;a=blobdiff_plain;f=LCARStrek%2Fbrowser%2Fbrowser.css;h=3b023ed27e6ae6f83e4271d40eacd2b2b6a78bfa;hp=72546cfec6a8ae7f32fa5164e7b7be1e484120ab;hb=5517da5a50c272b558c77e9672db5d868ce21f6c;hpb=e0c47e26dd93b86f3dbd5c0042b56f3b24b3c2ae

diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css
index 72546cfe..3b023ed2 100644
--- a/LCARStrek/browser/browser.css
+++ b/LCARStrek/browser/browser.css
@@ -1,49 +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)
- *   Paul Rouget (paul@mozilla.com)
- *   Rob Campbell (rcampbell@mozilla.com)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * 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/");
 
@@ -117,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)); */
 }
 
@@ -415,6 +372,7 @@ menubar {
 
 /* ::::: bookmark buttons ::::: */
 
+/*.bookmark-item:not(#bookmarks-menu-button) > .toolbarbutton-icon */
 .bookmark-item > .toolbarbutton-icon {
   width: 16px;
   height: 16px;
@@ -430,9 +388,7 @@ menubar {
 }
 
 #wrapper-personal-bookmarks[place="palette"] > .toolbarpaletteitem-box {
-  width: 16px;
-  height: 16px;
-  background: url("chrome://communicator/skin/bookmarks/bookmarksToolbar.png") no-repeat;
+  background: url("chrome://communicator/skin/bookmarks/bookmarksToolbar.png") no-repeat center;
 }
 
 .bookmarks-toolbar-customize {
@@ -481,7 +437,11 @@ menuitem.bookmark-item {
 
 .bookmark-item[container][livemark] .bookmark-item {
   list-style-image: url("chrome://communicator/skin/bookmarks/livemark-item.png");
-  -moz-image-region: auto;
+  -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] {
@@ -706,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;
@@ -718,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"],
@@ -745,17 +719,30 @@ 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");
+  /*clip-path: url("chrome://browser/content/browser.xul#winstripe-keyhole-forward-clip-path"); */
   -moz-margin-start: -6px !important;
   padding-left: 7px;
   padding-right: 3px;
+  margin-top: 2px;
+  margin-bottom: 2px;
 }
 
-#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #forward-button: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");
+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;
 }
 
 .unified-nav-back[_moz-menuactive]:-moz-locale-dir(ltr),
@@ -781,9 +768,9 @@ toolbar[mode="full"] .toolbarbutton-1 > .toolbarbutton-menubutton-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 {
-  border-top-right-radius: 0;
+/*  border-top-right-radius: 0;
   border-bottom-right-radius: 0;
-  -moz-margin-end: 0;
+  -moz-margin-end: 0; */
 }
 
 window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
@@ -798,6 +785,12 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   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 */
 
 #stop-button {
@@ -1054,27 +1047,6 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   -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);
 }
@@ -1119,7 +1091,7 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
 
 /* ::::: fullscreen window controls ::::: */
 
-#TabsToolbar > #window-controls {
+#window-controls {
   -moz-margin-start: 4px;
 }
 
@@ -1165,6 +1137,8 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
 #urlbar {
   width: 7em;
   min-width: 7em;
+  /* make color as light as possible to deal with dark non-domain parts */
+  color: #FFBFFF;
 }
 
 #urlbar:-moz-lwtheme,
@@ -1176,73 +1150,67 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
 
 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-buttonbox + #urlbar-container {
-  padding-left: 27px;
-  -moz-margin-start: -27px;
+    #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-buttonbox + #urlbar-container > #urlbar {
-  -moz-border-start: none;
-  margin-left: 0;
+    #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-buttonbox:not([switchingtabs]) + #urlbar-container > #urlbar {
+    #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-buttonbox + #urlbar-container > #urlbar:-moz-locale-dir(ltr) {
-  border-top-left-radius: 0;
-  border-bottom-left-radius: 0;
+    #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-buttonbox + #urlbar-container > #urlbar:-moz-locale-dir(rtl) {
-  border-top-right-radius: 0;
-  border-bottom-right-radius: 0;
+    #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-buttonbox[forwarddisabled] + #urlbar-container {
-  mask: url("chrome://browser/content/browser.xul#winstripe-urlbar-back-button-mask");
+    #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-buttonbox[forwarddisabled] + #urlbar-container > #urlbar {
-  margin-left: -27px;
-}
-
-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-buttonbox[forwarddisabled]:hover:not([switchingtabs]) + #urlbar-container > #urlbar {
+    #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-buttonbox[forwarddisabled]:not(:hover) + #urlbar-container > #urlbar {
+    #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: -27.01px;
+  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-buttonbox + #urlbar-container:-moz-locale-dir(rtl),
+    #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-buttonbox + #urlbar-container > #urlbar:-moz-locale-dir(rtl) {
+    #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);
 }
@@ -1266,6 +1234,10 @@ html|*.urlbar-input:-moz-lwtheme:-moz-placeholder,
   -moz-box-align: stretch;
 }
 
+.urlbar-input-box {
+  -moz-margin-start: 0;
+}
+
 #urlbar-icons {
   -moz-box-align: center;
 }
@@ -1302,7 +1274,7 @@ 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;
 }
@@ -1312,82 +1284,83 @@ html|*.urlbar-input:-moz-lwtheme:-moz-placeholder,
   -moz-margin-end: 3px;
   margin-top: 0;
   margin-bottom: 0;
+  -moz-margin-start: 0;
   color: #8050B0;
 }
 
 /* identity box */
 
 #identity-box {
-  background-color: #000000;
-  color: #FF9F00;
   border-radius: 2px;
 }
 
 #notification-popup-box:not([hidden]) + #identity-box {
-  -moz-padding-start: 10px;
+  -moz-padding-start: 10px !important;
   border-radius: 0;
 }
 
 window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
     :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
-    #unified-back-forward-buttonbox + #urlbar-container > #urlbar > #identity-box {
-  border-radius: 0;
+    #unified-back-forward-button + #urlbar-container > #urlbar > #identity-box {
+/*   border-radius: 0; */
+  -moz-padding-start: 2px;
+  -moz-padding-end: 2px;
+  -moz-margin-end: 1px;
 }
 
 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-buttonbox[forwarddisabled] + #urlbar-container > #urlbar > #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(ltr) {
-  padding-left: 5px;
+    #unified-back-forward-button[forwarddisabled] + #urlbar-container > #urlbar > #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(ltr) {
+  padding-left: 2px;
   -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-buttonbox[forwarddisabled] + #urlbar-container > #urlbar > #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(rtl) {
-  padding-right: 5px;
+    #unified-back-forward-button[forwarddisabled] + #urlbar-container > #urlbar > #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(rtl) {
+  padding-right: 2px;
   -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-buttonbox[forwarddisabled]:hover:not([switchingtabs]) + #urlbar-container > #urlbar > #notification-popup-box[hidden] + #identity-box {
+    #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-buttonbox[forwarddisabled]:not(:hover) + #urlbar-container > #urlbar > #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(ltr) {
+    #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;
+  padding-left: 2.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-buttonbox[forwarddisabled]:not(:hover) + #urlbar-container > #urlbar > #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(rtl) {
+    #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;
+  padding-right: 2.01px;
 }
 
-#identity-box:hover {
-  background-color: #9C9CFF;
-  color: #000000;
+#identity-box.verifiedIdentity {
+  color: #008484;
+  -moz-border-end: 1px solid #008484;
+  -moz-margin-end: 3px;
 }
 
-#identity-box[open="true"],
-#identity-box:hover:active {
-  background-color: #FF9F00;
-  color: #000000;
+#identity-box.verifiedIdentity:-moz-locale-dir(ltr) {
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
 }
 
-#identity-box.verifiedDomain {
-  background-color: #FFCF00;
-  color: #000000;
+#identity-box.verifiedIdentity:-moz-locale-dir(rtl) {
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
 }
 
-#identity-box.verifiedIdentity {
-  background-color: #008484;
-  color: #000000;
+#identity-box.verifiedIdentity:not(:-moz-lwtheme) {
+  background-color: #000000;
 }
 
 #identity-box:-moz-focusring {
@@ -1425,28 +1398,53 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
 
 /* 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;
+.verifiedDomain > #identity-box-inner > #page-proxy-stack > #page-proxy-favicon,
+.verifiedDomain > #page-proxy-favicon[pageproxystate="valid"] {
+  list-style-image: url("chrome://browser/skin/identity-icons-https.png");
 }
 
-#page-proxy-favicon:not([src]) {
-  list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
+.verifiedIdentity > #identity-box-inner > #page-proxy-stack > #page-proxy-favicon,
+.verifiedIdentity > #page-proxy-favicon[pageproxystate="valid"] {
+  list-style-image: url("chrome://browser/skin/identity-icons-https-ev.png");
 }
 
-#page-proxy-favicon[pageproxystate="invalid"] {
-  opacity: 0.5;
+#identity-box:hover > #identity-box-inner > #page-proxy-stack > #page-proxy-favicon,
+#identity-box:hover > #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,
+#identity-box:hover:active > #page-proxy-favicon,
+#identity-box[open=true] > #page-proxy-favicon {
+  -moz-image-region: rect(0, 48px, 16px, 32px);
+}
+
+#identity-box:hover {
+  background-color: #FFCF00;
+}
+
+#identity-box:hover:active,
+#identity-box[open=true] {
+  background-color: #FF9F00;
+}
+
+#identity-box.verifiedIdentity:hover,
+#identity-box.verifiedIdentity:hover:active,
+#identity-box.verifiedIdentity[open=true] {
+  background-color: #008484;
+  color: #000000;
+}
+
+#page-proxy-favicon[pageproxystate="invalid"] {
+  opacity: 0.5;
 }
 
 /* autocomplete */
@@ -1652,10 +1650,8 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
 }
 
 .panel-promo-box {
-  margin: 5px -6px -6px -6px;
+  margin: 5px -6px -6px;
   padding: 5px;
-  background-color: #000000;
-  color: #FF9F00;
   border-bottom-left-radius: 5px;
   border-bottom-right-radius: 5px;
   border-top: 1px solid #9C9CFF;
@@ -1836,7 +1832,7 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
 
 /* 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 {
@@ -2040,7 +2036,7 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
   margin: 0;
 }
 
-#identity-popup-content-host ,
+#identity-popup-content-host,
 #identity-popup-content-box.verifiedIdentity > #identity-popup-content-owner {
   font-size: 1.2em;
 }
@@ -2105,6 +2101,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;
@@ -2146,21 +2148,27 @@ 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 {
   position: relative;
   background-color: #000000;
   background-clip: padding-box;
   padding-left: 3px;
+  padding-right: 8px;
   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;
+  border-right-width: 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-buttonbox[forwarddisabled] + #urlbar-container > #urlbar > #notification-popup-box {
-  padding-left: 5px;
+    #unified-back-forward-button[forwarddisabled] + #urlbar-container > #urlbar > #notification-popup-box {
+/*  padding-left: 5px; */
 }
 
 #notification-popup-box:-moz-locale-dir(rtl),
@@ -2198,6 +2206,14 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   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;
 }
@@ -2462,7 +2478,7 @@ panel[dimmed="true"] {
 /* Highlighter */
 
 .highlighter-veil {
-  background-color: rgba(0, 0, 0, 0.5);
+  background-color: rgba(25, 25, 25, 0.5);
 }
 
 #highlighter-closebutton {
@@ -2487,71 +2503,113 @@ highlighter-veil-transparentbox {
 
 /* 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-toolbar[treepanel-open] {
-  padding-top: 0;
-  -moz-padding-end: 0;
-}
-
 #inspector-tools {
-  -moz-padding-start: 2px;
   -moz-padding-end: 2px;
   border-left: 3px solid #000000;
   border-right: 3px solid #000000;
   -moz-margin-start: 2px;
-  -moz-margin-end: 2px;
 }
 
-/* Highlighter - toolbar resizers */
-
-.inspector-resizer {
-  -moz-appearance: none;
-  cursor: n-resize;
-}
-
-#inspector-top-resizer {
-  background: none;
-  height: 4px;
+#devtools-sidebar-box {
+  background-color: #000000;
 }
 
-#inspector-end-resizer {
-  width: 12px;
-  height: 8px;
-  border-width: 1px 1px 0;
-  border-style: solid;
-  border-color: #008484;
-  margin: 7px 7px 8px;
+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-tagname {
+#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;
 }
 
-#highlighter-nodeinfobar-id {
+html|*#highlighter-nodeinfobar-id {
   color: #9C9CFF;
 }
 
-.highlighter-nodeinfobar-class {
+html|*#highlighter-nodeinfobar-pseudo-classes {
   color: #FF9F00;
 }
 
-/* Highlighter - Node Infobar - box & arrow */
+/* Highlighter - Node Infobar - buttons */
 
-#highlighter-nodeinfobar {
-  border: 1px solid rgba(156, 156, 255, .5);
-  border-radius: 3px;
-  padding: 8px 16px;
-  background: #000000 padding-box;
+.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;
@@ -2610,14 +2668,72 @@ highlighter-veil-transparentbox {
 /* Highlighter toolbar - breadcrumbs */
 
 #inspector-breadcrumbs {
-  padding: 0 6px;
+  -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 {
-  -moz-appearance: none;
-  border-width: 1px 13px 2px 13px;
+  /*background-color: transparent;*/
+  border-width: 2px 13px !important;
+  outline: none;
   /* color: hsl(210,30%,85%); */
-  max-width: 85px;
+  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;
@@ -2625,6 +2741,10 @@ highlighter-veil-transparentbox {
   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%); */
 }
@@ -2633,127 +2753,175 @@ highlighter-veil-transparentbox {
   /*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 {
-  margin-left: 0;
 }
 
 .inspector-breadcrumbs-button {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle.png") 1 13 2 13 stretch;
+  -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") 1 13 2 13 stretch;
+  -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") 1 13 2 13 stretch;
+  -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") 1 13 2 13 stretch;
+  -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") 1 13 2 13 stretch;
+  -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") 1 13 2 13 stretch;
+  -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") 1 13 2 13 stretch;
+  -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") 1 13 2 13 stretch;
+  -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") 1 13 2 13 stretch;
+  -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") 1 13 2 13 stretch;
+  -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") 1 13 2 13 stretch;
+  -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") 1 13 2 13 stretch;
+  -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 {
-  margin-right: 0;
 }
 
 .inspector-breadcrumbs-button:-moz-locale-dir(rtl) {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/rtl-middle.png") 1 13 2 13 stretch;
+  -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") 1 13 2 13 stretch;
+  -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") 1 13 2 13 stretch;
+  -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") 1 13 2 13 stretch;
+  -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") 1 13 2 13 stretch;
+  -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") 1 13 2 13 stretch;
+  -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") 1 13 2 13 stretch;
+  -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") 1 13 2 13 stretch;
+  -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") 1 13 2 13 stretch;
+  -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") 1 13 2 13 stretch;
+  -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") 1 13 2 13 stretch;
+  -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") 1 13 2 13 stretch;
+  -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;
 }