X-Git-Url: https://git-public.kairo.at/?p=themes.git;a=blobdiff_plain;f=LCARStrek%2Fbrowser%2Fbrowser.css;h=a48dc0271c32e68a9eccb945c4152c309d8f0585;hp=b52d9954abea91d9630ed2b975e617e5064914b0;hb=e2734cc744523d8adb0aa3d44644220b98d8201c;hpb=e26e19e6c44b1bf357067b86f7606df982ab76f7

diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css
index b52d9954..a48dc027 100644
--- a/LCARStrek/browser/browser.css
+++ b/LCARStrek/browser/browser.css
@@ -30,7 +30,7 @@ menubar {
 /* ::::: primary toolbar ::::: */
 
 .toolbar-primary > .toolbar-box > .toolbar-holder {
-  background-color: #FF9F00;
+  background-color: #A09090;
 }
 
 .toolbar-primary > .toolbar-box > .toolbar-startcap,
@@ -65,6 +65,9 @@ menubar {
   background-color: #8050B0;
   color: #FF9F00;
 }
+#main-window[tabsintitlebar]:not([inFullscreen]) #toolbar-menubar[inactive] ~ #TabsToolbar > .tabbrowser-tabs > .tabbrowser-tab {
+  padding-top: 3px;
+}
 
 #main-window[tabsintitlebar] #titlebar:-moz-lwtheme {
   visibility: hidden;
@@ -77,7 +80,7 @@ menubar {
 #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)); */
+  /* background-image: linear-gradient(@toolbarHighlight@, rgba(255,255,255,0)); */
 }
 
 #personal-bookmarks {
@@ -285,14 +288,28 @@ menubar {
   -moz-image-region: rect(0px 48px 16px 32px);
 }
 
-#appmenu_privateBrowsing {
+#appmenu_privateBrowsing,
+#appmenu_newPrivateWindow {
   list-style-image: url("chrome://browser/skin/Privacy-16.png");
 }
 
+@media (min-resolution: 1.25dppx) {
+  #appmenu_privateBrowsing,
+  #appmenu_newPrivateWindow {
+    list-style-image: url("chrome://browser/skin/Privacy-32.png");
+  }
+}
+
 #appmenu_addons {
   list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric-16.png");
 }
 
+@media (min-resolution: 1.25dppx) {
+  #appmenu_addons {
+    list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png");
+  }
+}
+
 #BMB_bookmarkThisPage,
 #appmenu_bookmarkThisPage {
   list-style-image: url("chrome://browser/skin/places/bookmark.png");
@@ -378,6 +395,10 @@ menubar {
   height: 16px;
 }
 
+#PlacesToolbarItems > .bookmark-item:not([image]):not([label=""]):not([container]) > .toolbarbutton-icon {
+  display: none;
+}
+
 /* Prevent [mode="icons"] from hiding the label */
 .bookmark-item > .toolbarbutton-text {
   display: -moz-box !important;
@@ -482,7 +503,7 @@ menuitem.bookmark-item {
 /* ::::: primary toolbar buttons ::::: */
 
 .toolbarbutton-1 {
-  list-style-image: url("chrome://browser/skin/Toolbar.png");
+  list-style-image: url("chrome://browser/skin/FxToolbar.png");
 }
 
 .toolbarbutton-1:not([type="menu-button"]) {
@@ -791,8 +812,6 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   background-color: transparent;
 }
 
-/* stop button */
-
 #stop-button {
   -moz-image-region: rect(0, 54px, 18px, 36px);
 }
@@ -805,8 +824,6 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   -moz-image-region: rect(36px, 54px, 54px, 36px);
 }
 
-/* reload button */
-
 #reload-button {
   -moz-image-region: rect(0, 72px, 18px, 54px);
 }
@@ -819,10 +836,8 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   -moz-image-region: rect(36px, 72px, 54px, 54px);
 }
 
-/* home button */
-
 #home-button.bookmark-item {
-  list-style-image: url("chrome://browser/skin/Toolbar.png");
+  list-style-image: url("chrome://browser/skin/FxToolbar.png");
 }
 #home-button {
   -moz-image-region: rect(0, 90px, 18px, 72px);
@@ -836,55 +851,6 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   -moz-image-region: rect(36px, 90px, 54px, 72px);
 }
 
-/* tabview button */
-
-#tabview-button,
-#menu_tabview {
-  list-style-image: url("chrome://browser/skin/tabview/tabview.png");
-}
-
-#tabview-button {
-  -moz-image-region: rect(0, 90px, 18px, 72px);
-}
-
-#tabview-button[groups="0"] {
-  -moz-image-region: rect(0, 18px, 18px, 0);
-}
-
-#tabview-button[groups="1"] {
-  -moz-image-region: rect(0, 36px, 18px, 18px);
-}
-
-#tabview-button[groups="2"] {
-  -moz-image-region: rect(0, 54px, 18px, 36px);
-}
-
-#tabview-button[groups="3"] {
-  -moz-image-region: rect(0, 72px, 18px, 54px);
-}
-
-#menu_tabview {
-  -moz-image-region: rect(1px, 89px, 17px, 73px);
-}
-
-#menu_tabview[groups="0"] {
-  -moz-image-region: rect(1px, 17px, 17px, 1px);
-}
-
-#menu_tabview[groups="1"] {
-  -moz-image-region: rect(1px, 35px, 17px, 19px);
-}
-
-#menu_tabview[groups="2"] {
-  -moz-image-region: rect(1px, 53px, 17px, 37px);
-}
-
-#menu_tabview[groups="3"] {
-  -moz-image-region: rect(1px, 71px, 17px, 55px);
-}
-
-/* download manager button */
-
 #downloads-button {
   -moz-image-region: rect(0, 108px, 18px, 90px);
 }
@@ -897,7 +863,9 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   -moz-image-region: rect(36px, 108px, 54px, 90px);
 }
 
-/* history sidebar button */
+#downloads-button > .toolbarbutton-icon {
+  margin: 0;
+}
 
 #history-button {
   -moz-image-region: rect(0, 126px, 18px, 108px);
@@ -911,16 +879,14 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   -moz-image-region: rect(36px, 126px, 54px, 108px);
 }
 
-/* bookmark sidebar & menu buttons */
-
 #bookmarks-button,
 #bookmarks-menu-button {
-  list-style-image: url("chrome://browser/skin/Toolbar.png") !important; /* for making the palette work */
+  list-style-image: url("chrome://browser/skin/FxToolbar.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/FxToolbar.png"); */
 }
 
 #bookmarks-menu-button.toolbarbutton-1 {
@@ -938,8 +904,6 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   -moz-image-region: rect(36px, 144px, 54px, 126px);
 }
 
-/* print button */
-
 #print-button {
   -moz-image-region: rect(0, 162px, 18px, 144px);
 }
@@ -952,22 +916,18 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   -moz-image-region: rect(36px, 162px, 54px, 144px);
 }
 
-/* toolbar new tab button */
-
 #new-tab-button {
   -moz-image-region: rect(0, 180px, 18px, 162px);
 }
 
-#print-button:not([disabled="true"]):hover {
-  -moz-image-region: rect(18px, 162px, 36px, 144px);
+#new-tab-button:not([disabled="true"]):hover {
+  -moz-image-region: rect(18px, 180px, 36px, 162px);
 }
 
-#print-button[disabled="true"] {
-  -moz-image-region: rect(36px, 162px, 54px, 144px);
+#new-tab-button[disabled="true"] {
+  -moz-image-region: rect(36px, 180px, 54px, 162px);
 }
 
-/* new window button */
-
 #new-window-button {
   -moz-image-region: rect(0, 198px, 18px, 180px);
 }
@@ -980,8 +940,6 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   -moz-image-region: rect(36px, 198px, 54px, 180px);
 }
 
-/* cut button */
-
 #cut-button {
   -moz-image-region: rect(0, 216px, 18px, 198px);
 }
@@ -994,8 +952,6 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   -moz-image-region: rect(36px, 216px, 54px, 198px);
 }
 
-/* copy button */
-
 #copy-button {
   -moz-image-region: rect(0, 234px, 18px, 216px);
 }
@@ -1008,8 +964,6 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   -moz-image-region: rect(36px, 234px, 54px, 216px);
 }
 
-/* paste button */
-
 #paste-button {
   -moz-image-region: rect(0, 252px, 18px, 234px);
 }
@@ -1022,8 +976,6 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   -moz-image-region: rect(36px, 252px, 54px, 234px);
 }
 
-/* fullscreen button */
-
 #fullscreen-button {
   -moz-image-region: rect(0, 270px, 18px, 252px);
 }
@@ -1036,8 +988,6 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   -moz-image-region: rect(36px, 270px, 54px, 252px);
 }
 
-/* zoom controls */
-
 #zoom-out-button {
   -moz-image-region: rect(0, 288px, 18px, 270px);
   -moz-margin-end: 0;
@@ -1063,10 +1013,8 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   -moz-image-region: rect(36px, 306px, 54px, 288px);
 }
 
-/* sync button */
-
 #sync-button:not([status]) {
-  list-style-image: url("chrome://browser/skin/Toolbar.png") !important; /* for making the palette work */
+  list-style-image: url("chrome://browser/skin/FxToolbar.png") !important; /* for making the palette work */
   -moz-image-region: rect(0, 324px, 18px, 306px);
 }
 
@@ -1079,8 +1027,6 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   -moz-image-region: rect(36px, 324px, 54px, 306px);
 }
 
-/* feed button */
-
 #feed-button {
   -moz-image-region: rect(0, 342px, 18px, 324px);
 }
@@ -1089,6 +1035,66 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   -moz-image-region: rect(36px, 342px, 54px, 324px);
 }
 
+#webrtc-status-button {
+  -moz-image-region: rect(0, 360px, 18px, 342px);
+}
+
+#webrtc-status-button:not([disabled="true"]):hover,
+#webrtc-status-button[open="true"] {
+  -moz-image-region: rect(18px, 360px, 36px, 342px);
+}
+
+#webrtc-status-button[disabled="true"] {
+  -moz-image-region: rect(36px, 360px, 54px, 342px);
+}
+
+/* tabview button & menu item */
+
+#tabview-button,
+#menu_tabview {
+  list-style-image: url("chrome://browser/skin/tabview/tabview.png");
+}
+
+#tabview-button {
+  -moz-image-region: rect(0, 90px, 18px, 72px);
+}
+
+#tabview-button[groups="0"] {
+  -moz-image-region: rect(0, 18px, 18px, 0);
+}
+
+#tabview-button[groups="1"] {
+  -moz-image-region: rect(0, 36px, 18px, 18px);
+}
+
+#tabview-button[groups="2"] {
+  -moz-image-region: rect(0, 54px, 18px, 36px);
+}
+
+#tabview-button[groups="3"] {
+  -moz-image-region: rect(0, 72px, 18px, 54px);
+}
+
+#menu_tabview {
+  -moz-image-region: rect(1px, 89px, 17px, 73px);
+}
+
+#menu_tabview[groups="0"] {
+  -moz-image-region: rect(1px, 17px, 17px, 1px);
+}
+
+#menu_tabview[groups="1"] {
+  -moz-image-region: rect(1px, 35px, 17px, 19px);
+}
+
+#menu_tabview[groups="2"] {
+  -moz-image-region: rect(1px, 53px, 17px, 37px);
+}
+
+#menu_tabview[groups="3"] {
+  -moz-image-region: rect(1px, 71px, 17px, 55px);
+}
+
 /* ::::: fullscreen window controls ::::: */
 
 #window-controls {
@@ -1214,8 +1220,8 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   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 {
+html|*.urlbar-input:-moz-lwtheme::-moz-placeholder,
+.searchbar-textbox:-moz-lwtheme > .autocomplete-textbox-container > .textbox-input-box > html|*.textbox-input::-moz-placeholder {
   color: #E7ADE7;
 }
 
@@ -1243,7 +1249,7 @@ html|*.urlbar-input:-moz-lwtheme:-moz-placeholder,
 }
 
 .urlbar-icon {
-  padding: 2px;
+  padding: 0 2px;
 }
 
 .searchbar-engine-button,
@@ -1255,11 +1261,6 @@ html|*.urlbar-input:-moz-lwtheme:-moz-placeholder,
   padding: 0;
 }
 
-.urlbar-icon:-moz-system-metric(touch-enabled) {
-  -moz-margin-end: 1px !important;
-  padding: 0 3px !important;
-}
-
 .urlbar-icon:hover {
 }
 
@@ -1414,6 +1415,10 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   list-style-image: url("chrome://browser/skin/identity-icons-https-ev.png");
 }
 
+.mixedActiveContent > #page-proxy-favicon[pageproxystate="valid"] {
+  list-style-image: url("chrome://browser/skin/identity-icons-https-mixed-active.png");
+}
+
 #identity-box:hover > #page-proxy-favicon {
   -moz-image-region: rect(0, 32px, 16px, 16px);
 }
@@ -1425,16 +1430,18 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
 
 #identity-box:hover {
   background-color: #FFCF00;
+  color: #000000;
 }
 
 #identity-box:hover:active,
 #identity-box[open=true] {
   background-color: #FF9F00;
+  color: #000000;
 }
 
-#identity-box.verifiedIdentity:hover,
-#identity-box.verifiedIdentity:hover:active,
-#identity-box.verifiedIdentity[open=true] {
+#urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity:hover,
+#urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity:hover:active,
+#urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity[open=true] {
   background-color: #008484;
   color: #000000;
 }
@@ -1599,48 +1606,113 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
   -moz-image-region: rect(0, 32px, 16px, 16px);
 }
 
-/* social recommending panel */
+/* social share panel */
+
+#social-share-panel > iframe {
+/*  background: linear-gradient(to bottom, #f0f4f7, #fafbfc);*/
+  width: 300px;
+  height: 150px;
+}
 
-#share-button {
+#social-share-button {
+  list-style-image: url("chrome://browser/skin/social/share-button.png");
   -moz-image-region: rect(0, 16px, 16px, 0);
 }
 
-#socialUserPortrait {
-  width: 48px;
-  height: 48px;
+.social-share-toolbar {
+  border-right: 1px solid #9C9CFF;
+/*  background-color: #000000; */
 }
 
-#socialUserDisplayName,
-#socialUserPortrait {
-  cursor: pointer;
+#social-share-provider-buttons {
+  padding: 6px;
 }
 
-#socialUserDisplayName {
+#social-share-provider-buttons > .share-provider-button {
+  -moz-appearance: none;
+  padding: 5px;
+  margin: 1px;
   border: none;
-  background-color: transparent;
-  margin-top: 0;
-  padding-top: 0;
-  font-size: 130%;
-  font-weight: bold;
+  background: none;
+  border-radius: 2px;
 }
 
-#socialUserDisplayName > .button-box {
-  -moz-padding-start: 0;
-  padding-top: 0;
-  border-top-width: 0;
+#social-share-provider-buttons > .share-provider-button[checked="true"]:not([disabled="true"]),
+#social-share-provider-buttons > .share-provider-button:hover,
+#social-share-provider-buttons > .share-provider-button:active {
+  padding: 4px;
 }
 
-#socialUserDisplayName:hover {
-  color: #9C9CFF;
-  text-decoration: underline;
+#social-share-provider-buttons > .share-provider-button[checked="true"]:not([disabled="true"]) {
 }
 
-#unsharePopupText {
-  height: 48px;
+#social-share-provider-buttons > .share-provider-button > .toolbarbutton-text {
+  display: none;
+}
+#social-share-provider-buttons > .share-provider-button > .toolbarbutton-icon {
+  width: 16px;
+  min-height: 16px;
+  max-height: 16px;
+}
+
+/* fixup corners for share panel */
+.social-panel > .social-panel-frame {
+  border-radius: inherit;
+}
+
+#social-share-panel {
+  max-height: 600px;
+  min-height: 100px;
+  max-width: 800px;
+  min-width: 300px;
+}
+
+.social-share-frame {
+/*  background: linear-gradient(to bottom, #f0f4f7, #fafbfc); */
+  width: 330px;
+  height: 150px;
+  /* we resize our panels dynamically, make it look nice */
+  transition: height 100ms ease-out, width 100ms ease-out;
+}
+
+.social-share-frame:-moz-locale-dir(ltr) {
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
+  border-top-right-radius: inherit;
+  border-bottom-right-radius: inherit;
+}
+
+.social-share-frame:-moz-locale-dir(rtl) {
+  border-top-left-radius: inherit;
+  border-bottom-left-radius: inherit;
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+}
+
+#social-share-panel > .social-share-toolbar:-moz-locale-dir(ltr) {
+  border-top-left-radius: inherit;
+  border-bottom-left-radius: inherit;
+}
+
+#social-share-panel > .social-share-toolbar:-moz-locale-dir(rtl) {
+  border-top-right-radius: inherit;
+  border-bottom-right-radius: inherit;
+}
+
+#social-share-provider-buttons:-moz-locale-dir(ltr) {
+  border-top-left-radius: inherit;
+  border-bottom-left-radius: inherit;
+}
+
+#social-share-provider-buttons:-moz-locale-dir(rtl) {
+  border-top-right-radius: inherit;
+  border-bottom-right-radius: inherit;
 }
 
-#unsharePopupBottomButtons {
-  margin-top: 1em;
+/* social recommending panel */
+
+#social-mark-button {
+  -moz-image-region: rect(0, 16px, 16px, 0);
 }
 
 /* star button */
@@ -1769,7 +1841,7 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
 
 #main-window[disablechrome] #TabsToolbar,
 #TabsToolbar[tabsontop="false"] {
-  border-bottom: 1px solid #FF9F00;
+  border-bottom: 1px solid #008484;
 }
 
 .tabbrowser-tab,
@@ -1777,6 +1849,23 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
   margin-top: 0px;
 }
 
+.tabbrowser-tab{
+  padding: 1px 4px 2px;
+}
+
+.tabbrowser-tab:first-of-type {
+  -moz-margin-start: 2px;
+}
+
+.tabs-newtab-button {
+  border-radius: 8px 8px 0px 0px;
+  -moz-margin-start: 0;
+}
+
+.tabs-newtab-button:not(:hover) {
+  background-color: #C09070;
+}
+
 .tabbrowser-tab:hover,
 .tabs-newtab-button:hover {
 }
@@ -1813,7 +1902,7 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
   background-color: #E7ADE7;
 }
 .tabbrowser-tab[pinned][titlechanged]:not([selected="true"]):hover {
-  background-color: #0000FF;
+  background-color: #3333FF;
   color: #000000;
 }
 
@@ -1834,10 +1923,6 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
   list-style-image: url("chrome://communicator/skin/brand/throbber16-anim.png");
 }
 
-#tabbrowser-tabs[positionpinnedtabs] > .tabbrowser-tab[pinned] {
-  min-height: 16px; /* corresponds to the max. height of non-textual tab contents, i.e. the favicon */
-}
-
 .tab-throbber[pinned],
 .tab-icon-image[pinned] {
   -moz-margin-start: 2px;
@@ -1859,13 +1944,10 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
 .tab-close-button {
   border: none;
   padding: 0px;
+  margin-top: 1px;
   list-style-image: url("chrome://global/skin/icons/close-button.gif");
 }
 
-.tab-close-button:-moz-system-metric(touch-enabled) {
-  transform: scale(1.2);
-}
-
 .tab-close-button:hover,
 .tab-close-button:hover[selected="true"] {
   list-style-image: url("chrome://global/skin/icons/close-button-hover.gif");
@@ -1878,22 +1960,6 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
 
 /* Tab scrollbox arrow, tabstrip new tab and all-tabs buttons */
 
-@media (-moz-touch-enabled) {
-  .tabbrowser-arrowscrollbox > .scrollbutton-up,
-  .tabbrowser-arrowscrollbox > .scrollbutton-down,
-  #TabsToolbar .toolbarbutton-1 {
-    min-width: 8.1mozmm;
-  }
-
-  .tabs-newtab-button {
-    min-width: 10mozmm;
-  }
-
-  .tab-content {
-    min-height: calc(6.8mozmm - 7px); /* subtract borders from the desired height */
-  }
-}
-
 .tabbrowser-arrowscrollbox > .scrollbutton-up,
 .tabbrowser-arrowscrollbox > .scrollbutton-down {
   margin: 0;
@@ -1925,35 +1991,24 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
   width: 26px;
 }
 
+.tabs-newtab-button,
 .tabs-newtab-button:hover,
 #TabsToolbar > #new-tab-button:hover {
   -moz-image-region: rect(0, 32px, 18px, 16px);
 }
 
 #alltabs-button {
-  list-style-image: url("chrome://browser/skin/tabbrowser/alltabs.png");
-  -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://global/skin/arrow/arrow-down.gif");
-  -moz-image-region: auto;
 }
 
-#alltabs-button[type="menu"] > .toolbarbutton-menu-dropmarker {
+#alltabs-button > .toolbarbutton-menu-dropmarker {
   display: none;
 }
 
-#alltabs-button[type="menu"]:hover,
-#alltabs-button[type="menu"]:hover:active,
-#alltabs-button[type="menu"][open="true"] {
+#alltabs-button:hover,
+#alltabs-button:hover:active,
+#alltabs-button[open="true"] {
   list-style-image: url("chrome://global/skin/arrow/arrow-down-hover.gif");
-  -moz-image-region: auto;
 }
 
 /* All tabs menupopup */
@@ -2151,6 +2206,14 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
   list-style-image: url("chrome://mozapps/skin/plugins/pluginBlocked-64.png");
 }
 
+.popup-notification-icon[popupid="plugins-not-found"] {
+  list-style-image: url("chrome://browser/skin/pluginInstall-64.png");
+}
+
+.popup-notification-icon[popupid="web-notifications"] {
+  list-style-image: url("chrome://browser/skin/notification-64.png");
+}
+
 .addon-progress-description {
   width: 350px;
   max-width: 350px;
@@ -2183,7 +2246,9 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
 }
 
 .popup-notification-icon[popupid="indexedDB-permissions-prompt"],
-.popup-notification-icon[popupid="indexedDB-quota-prompt"] {
+.popup-notification-icon[popupid="indexedDB-quota-prompt"],
+.popup-notification-icon[popupid*="offline-app-requested"],
+.popup-notification-icon[popupid="offline-app-usage"] {
   list-style-image: url("chrome://global/skin/icons/alert-question.gif");
 }
 
@@ -2196,6 +2261,19 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
   list-style-image: url("chrome://browser/skin/webapps-64.png");
 }
 
+.popup-notification-icon[popupid="mixed-content-blocked"] {
+  list-style-image: url("chrome://browser/skin/mixed-content-blocked-64.png");
+}
+
+.popup-notification-icon[popupid="webRTC-sharingDevices"],
+.popup-notification-icon[popupid="webRTC-shareDevices"] {
+  list-style-image: url("chrome://browser/skin/webRTC-shareDevice-64.png");
+}
+
+.popup-notification-icon[popupid="pointerLock"] {
+  list-style-image: url("chrome://browser/skin/pointerLock-64.png");
+}
+
 /* Notification icon box */
 #notification-popup-box {
   position: relative;
@@ -2204,7 +2282,7 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
   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;
+  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;
 }
@@ -2231,14 +2309,17 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
 /*  outline-offset: -3px; */
 }
 
+.default-notification-icon,
 #default-notification-icon {
   list-style-image: url("chrome://global/skin/icons/information-16.png");
 }
 
+.identity-notification-icon,
 #identity-notification-icon {
   list-style-image: url("chrome://mozapps/skin/profile/profileicon.png");
 }
 
+.geo-notification-icon,
 #geo-notification-icon {
   list-style-image: url("chrome://browser/skin/Geolocation-16.png");
 }
@@ -2247,6 +2328,7 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric-16.png");
 }
 
+.indexedDB-notification-icon,
 #indexedDB-notification-icon {
   list-style-image: url("chrome://global/skin/icons/question-16.png");
 }
@@ -2263,63 +2345,104 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric-16.png");
 }
 
-#identity-popup-container {
-  min-width: 280px;
+#blocked-plugins-notification-icon {
+  list-style-image: url("chrome://mozapps/skin/plugins/notifyPluginBlocked.png");
 }
 
-#download-monitor {
-  list-style-image: url("chrome://browser/skin/Toolbar.png");
-  -moz-image-region: rect(0, 108px, 18px, 90px);
+#plugin-install-notification-icon {
+  list-style-image: url("chrome://browser/skin/pluginInstall-16.png");
 }
 
-/* Bookmarks roots menu-items */
-#appmenu_subscribeToPage:not([disabled]),
-#appmenu_subscribeToPageMenu,
-#subscribeToPageMenuitem:not([disabled]),
-#subscribeToPageMenupopup,
-#BMB_subscribeToPageMenuitem:not([disabled]),
-#BMB_subscribeToPageMenupopup {
-  list-style-image: url("chrome://browser/skin/feeds/feedIcon16.png");
+#notification-popup-box[hidden] {
+  /* Override display:none to make the pluginBlockedNotification animation work
+     when showing the notification repeatedly. */
+  display: -moz-box;
+  visibility: collapse;
 }
 
-#bookmarksToolbarFolderMenu,
-#appmenu_bookmarksToolbar,
-#BMB_bookmarksToolbar {
-  list-style-image: url("chrome://communicator/skin/bookmarks/bookmarksToolbar.png");
-  -moz-image-region: auto;
+#blocked-plugins-notification-icon[showing] {
+  animation: pluginBlockedNotification 500ms ease 0s 5 alternate both;
 }
 
-#appmenu_unsortedBookmarks,
-#BMB_unsortedBookmarks {
-  list-style-image: url("chrome://communicator/skin/bookmarks/unsortedBookmarks.png");
-  -moz-image-region: auto;
+@keyframes pluginBlockedNotification {
+  from {
+    opacity: 0;
+  }
+  to {
+    opacity: 1;
+  }
 }
 
-/* ::::: Keyboard UI Panel ::::: */
+.mixed-content-blocked-notification-icon,
+#mixed-content-blocked-notification-icon {
+  list-style-image: url("chrome://browser/skin/mixed-content-blocked-16.png");
+}
 
-.KUI-panel {
-  color: #FF9F00;
-  border-style: none;
-  border-radius: 20px;
+.webRTC-shareDevices-notification-icon,
+#webRTC-shareDevices-notification-icon {
+  list-style-image: url("chrome://browser/skin/webRTC-shareDevice-16.png");
 }
 
-.KUI-panel[level="top"] {
-  /*background-color: rgba(27%,27%,27%,.65);*/
+.webRTC-sharingDevices-notification-icon,
+#webRTC-sharingDevices-notification-icon {
+  list-style-image: url("chrome://browser/skin/webRTC-sharingDevice-16.png");
 }
 
-.KUI-panel-closebutton {
-  list-style-image: url("KUI-close.png");
-  width: 24px;
-  height: 24px;
+.web-notifications-notification-icon,
+#web-notifications-notification-icon {
+  list-style-image: url("chrome://browser/skin/notification-16.png");
+}
+
+#pointerLock-notification-icon {
+  list-style-image: url("chrome://browser/skin/pointerLock-16.png");
+}
+#pointerLock-cancel {
+  margin: 0px;
 }
 
-.KUI-panel-closebutton:not(:hover) {
+#identity-popup-container {
+  min-width: 280px;
 }
 
-.KUI-panel-closebutton > .toolbarbutton-icon {
+#download-monitor {
+  list-style-image: url("chrome://browser/skin/FxToolbar.png");
+  -moz-image-region: rect(0, 108px, 18px, 90px);
+}
+
+/* Bookmarks roots menu-items */
+#appmenu_subscribeToPage:not([disabled]),
+#appmenu_subscribeToPageMenu,
+#subscribeToPageMenuitem:not([disabled]),
+#subscribeToPageMenupopup,
+#BMB_subscribeToPageMenuitem:not([disabled]),
+#BMB_subscribeToPageMenupopup {
+  list-style-image: url("chrome://browser/skin/feeds/feedIcon16.png");
+}
+
+#bookmarksToolbarFolderMenu,
+#appmenu_bookmarksToolbar,
+#BMB_bookmarksToolbar {
+  list-style-image: url("chrome://communicator/skin/bookmarks/bookmarksToolbar.png");
+  -moz-image-region: auto;
+}
+
+#appmenu_unsortedBookmarks,
+#BMB_unsortedBookmarks {
+  list-style-image: url("chrome://communicator/skin/bookmarks/unsortedBookmarks.png");
+  -moz-image-region: auto;
+}
+
+/* ::::: Keyboard UI Panel ::::: */
+
+.KUI-panel {
+  color: #FF9F00;
+  border-style: none;
+  border-radius: 20px;
 }
 
-/* ::::: Ctrl-Tab and All Tabs Panels ::::: */
+.KUI-panel[level="top"] {
+  /*background-color: rgba(27%,27%,27%,.65);*/
+}
 
 /* Ctrl-Tab */
 
@@ -2369,53 +2492,6 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   margin-top: .5em;
 }
 
-/* All Tabs */
-
-#allTabs-panel {
-  padding-bottom: 10px;
-}
-
-#allTabs-meta {
-  margin: 10px;
-}
-
-#allTabs-filter {
-  -moz-margin-start: 24px;
-  -moz-margin-end: 0;
-}
-
-#allTabs-tab-close-button > .toolbarbutton-icon {
-  margin: 0;
-}
-
-.allTabs-favicon[src] {
-  width: 22px;
-  height: 22px;
-  padding-top: 1px;
-  padding-bottom: 5px;
-  -moz-padding-start: 1px;
-  -moz-padding-end: 5px;
-  margin-top: -2px;
-  -moz-margin-start: -2px;
-  border-bottom-right-radius: 4px;
-}
-
-.allTabs-favicon[src]:-moz-locale-dir(rtl) {
-  border-bottom-right-radius: 0;
-  border-bottom-left-radius: 4px;
-}
-
-.allTabs-preview-inner > .tabPreview-canvas {
-  background-color: #E7ADE7;
-}
-
-.allTabs-preview:not(:hover):not([closebuttonhover]) > html|canvas {
-}
-
-.allTabs-preview:focus > * > .allTabs-preview-inner {
-  outline: 1px dotted #008484;
-}
-
 /* Add-on bar */
 
 #addon-bar {
@@ -2503,29 +2579,18 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
 
 /* Highlighter */
 
-#highlighter-outline {
+.highlighter-outline {
   box-shadow: 0 0 0 1px black;
   outline: 1px dashed white;
 }
 
-#highlighter-outline[locked]  {
+.highlighter-outline[locked]  {
   box-shadow: 0 0 0 1px rgba(0,0,0,0.3);
   outline-color: rgba(255,255,255,0.7);
 }
 
-/* Highlighter toolbar */
-
-#inspector-inspect-toolbutton {
-  list-style-image: url("chrome://browser/skin/devtools/inspect-button.png");
-  -moz-image-region: rect(0 16px 16px 0);
-}
+/* Developer toolbar */
 
-#inspector-inspect-toolbutton[checked=true],
-#inspector-inspect-toolbutton:hover {
-  -moz-image-region: rect(0 32px 16px 16px);
-}
-
-#inspector-toolbar,
 #developer-toolbar {
   border-top: 3px solid #000000;
   border-bottom: none;
@@ -2546,24 +2611,9 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   background-color: #6000CF;
 }
 
-#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 {
+.highlighter-nodeinfobar {
   color: #FF9F00;
   border: 1px solid rgba(156, 156, 255, .5);
   border-radius: 3px;
@@ -2573,21 +2623,21 @@ html|*#highlighter-nodeinfobar-pseudo-classes {
 
 /* Highlighter - Node Infobar - text */
 
-#highlighter-nodeinfobar-text {
+.highlighter-nodeinfobar-text {
   /* 100% - size of the buttons and margins */
   max-width: calc(100% - 2 * (26px + 6px));
   padding-bottom: 1px;
 }
 
-html|*#highlighter-nodeinfobar-tagname {
+html|*.highlighter-nodeinfobar-tagname {
   color: #FFCF00;
 }
 
-html|*#highlighter-nodeinfobar-id {
+html|*.highlighter-nodeinfobar-id {
   color: #9C9CFF;
 }
 
-html|*#highlighter-nodeinfobar-pseudo-classes {
+html|*.highlighter-nodeinfobar-pseudo-classes {
   color: #FF9F00;
 }
 
@@ -2599,29 +2649,29 @@ html|*#highlighter-nodeinfobar-pseudo-classes {
   min-height: 26px;
 }
 
-#highlighter-nodeinfobar-inspectbutton {
+.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:-moz-locale-dir(rtl) {
 }
 
-#highlighter-nodeinfobar-inspectbutton:hover,
-#highlighter-nodeinfobar-inspectbutton:hover:active/*,
-#highlighter-nodeinfobar-container:not([locked]) >  #highlighter-nodeinfobar >  #highlighter-nodeinfobar-inspectbutton*/ {
+.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 {
 }
 
-#highlighter-nodeinfobar-menu:-moz-locale-dir(rtl) {
+.highlighter-nodeinfobar-menu:-moz-locale-dir(rtl) {
 }
 
-#highlighter-nodeinfobar-menu > .toolbarbutton-menu-dropmarker {
+.highlighter-nodeinfobar-menu > .toolbarbutton-menu-dropmarker {
   -moz-box-align: center;
   -moz-margin-start: -1px;
 }
@@ -2638,28 +2688,28 @@ html|*#highlighter-nodeinfobar-pseudo-classes {
   background-repeat: no-repeat;
 }
 
-#highlighter-nodeinfobar-arrow-top {
+.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%);
+  background-image: linear-gradient(bottom left, transparent 50%, rgb(0, 132, 132) 50%);
 }
 
-#highlighter-nodeinfobar-arrow-bottom {
+.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%);
+  background-image: 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 {
+.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 {
+.highlighter-nodeinfobar-container[hide-arrow] > .highlighter-nodeinfobar {
   margin: 7px 0;
 }
 
@@ -2689,272 +2739,6 @@ html|*#highlighter-nodeinfobar-pseudo-classes {
   font-size: 120%;
 }
 
-/* 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) {
-/*  transform: scaleX(-1); */
-}
-
-.inspector-breadcrumbs-button {
-  /*background-color: transparent;*/
-  border-style: solid;
-  border-width: 2px 13px;
-  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 > .button-box {
-  border-width: 0;
-}
-
-.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 fill 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 fill stretch;
-}
-
-.inspector-breadcrumbs-button[checked] {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-middle-selected.png") 2 13 2 13 fill 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 fill stretch;
-}
-
-.inspector-breadcrumbs-button:first-of-type {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-start.png") 2 13 2 13 fill 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 fill 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 fill 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 fill stretch;
-}
-
-.inspector-breadcrumbs-button:last-of-type {
-  -moz-border-image: url("chrome://browser/skin/devtools/breadcrumbs/ltr-end.png") 2 13 2 13 fill 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 fill 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 fill 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 fill 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 fill 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 fill 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 fill 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 fill 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 fill 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 fill 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 fill 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 fill 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 fill 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 fill 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 fill 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 fill 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;*/
-}
-
-/* Highlight toolbar - Option menu */
-
-#inspector-option-toolbarbutton:-moz-focusring {
-  outline: 1px dotted #008484;
-  outline-offset: -2px;
-}
-
 html|*#gcli-tooltip-frame,
 html|*#gcli-output-frame {
   padding: 0;
@@ -2990,6 +2774,12 @@ html|*#gcli-output-frame {
   border-color: transparent;
 }
 
+.gclitoolbar-input-node > .textbox-input-box > html|*.textbox-input::-moz-selection {
+  background-color: #008484;
+  color: #000000;
+  text-shadow: none;
+}
+
 .gclitoolbar-complete-node {
   padding-left: 21px;
   background-color: transparent;
@@ -3039,13 +2829,12 @@ html|*#gcli-output-frame {
 
 /* Responsive Mode */
 
-vbox[anonid=browserContainer][responsivemode] {
-  background: #392900 url("chrome://browser/skin/devtools/responsive-background.png");
-  box-shadow: 0 0 7px #9C9CFF inset;
+.browserContainer[responsivemode] {
+  background: #221500 url("chrome://browser/skin/devtools/responsive-background.png");
   padding: 0 20px 20px 20px;
 }
 
-stack[anonid=browserStack][responsivemode] {
+.browserStack[responsivemode] {
   box-shadow: 0 0 7px #9C9CFF;
 }
 
@@ -3096,6 +2885,18 @@ stack[anonid=browserStack][responsivemode] {
 
 /* Developer Toolbar */
 
+#developer-toolbar-toolbox-button {
+  min-width: 18px;
+}
+
+#developer-toolbar-toolbox-button > .toolbarbutton-text {
+  display: none;
+}
+
+#developer-toolbar-toolbox-button > .toolbarbutton-icon {
+  -moz-margin-end: 0;
+}
+
 .developer-toolbar-button {
   min-width: 78px;
   min-height: 21px;
@@ -3111,33 +2912,13 @@ stack[anonid=browserStack][responsivemode] {
 .developer-toolbar-button[checked=true] {
 }
 
-#developer-toolbar-webconsole {
-  -moz-image-region: rect(0, 16px, 16px, 0);
-}
-
-#developer-toolbar-inspector {
-  -moz-image-region: rect(16px, 16px, 32px, 0);
-}
-
-#developer-toolbar-styleeditor {
-  -moz-image-region: rect(32px, 16px, 48px, 0);
-}
-
-#developer-toolbar-debugger {
-  -moz-image-region: rect(48px, 16px, 64px, 0);
-}
-
-#developer-toolbar-other-tools {
+#developer-toolbar-toolbox-button {
   -moz-image-region: rect(64px, 16px, 80px, 0);
 }
 
-#developer-toolbar-other-tools > .toolbarbutton-menu-dropmarker {
-  display: none;
-}
-
 /* Error counter */
 
-#developer-toolbar-webconsole[error-count]:before {
+#developer-toolbar-toolbox-button[error-count]:before {
   color: #000000;
   min-width: 16px;
   text-shadow: none;
@@ -3148,32 +2929,40 @@ stack[anonid=browserStack][responsivemode] {
 
 /* Social toolbar item */
 
-#social-provider-button > .toolbarbutton-menu-dropmarker {
-  display: none;
+#social-provider-button {
+  -moz-image-region: rect(0, 16px, 16px, 0);
+  list-style-image: url("chrome://browser/skin/social/services-16.png");
 }
 
-#social-toolbar-item > .toolbarbutton-1 {
+#social-provider-button > .toolbarbutton-menu-dropmarker {
+  display: none;
 }
 
-#navigator-toolbox[iconsize=large][mode=icons] > #nav-bar > #social-toolbar-item > .toolbarbutton-1 {
+.toolbarbutton-badge-container {
+  margin: 0;
+  padding: 0;
+  position: relative;
 }
 
-#navigator-toolbox[iconsize=large][mode=icons] > #nav-bar > #social-toolbar-item > .toolbarbutton-1:first-child {
+#navigator-toolbox[iconsize=large][mode=icons] > #nav-bar .toolbarbutton-1 > .toolbarbutton-badge-container {
+  padding: 2px 2px;
 }
 
-#navigator-toolbox[iconsize=large][mode=icons] > #nav-bar > #social-toolbar-item > .toolbarbutton-1:last-child {
+.toolbarbutton-1 > .toolbarbutton-badge-container > .toolbar-icon {
+  position: absolute;
+  top: 2px;
+  right: 2px;
 }
 
-.social-notification-icon-hbox {
-  pointer-events: none;
+.toolbarbutton-badge-container > .toolbarbutton-icon[label]:not([label=""]) {
+  -moz-margin-end: 0;
 }
 
-.social-notification-icon-stack > image {
-  max-height: 20px;
+.toolbarbutton-badge[badge=""] {
+  display: none;
 }
-
-.social-notification-icon-label {
-  text-align: end;
+.toolbarbutton-badge[badge]:not([badge=""])::after {
+  /* The |content| property is set in the content stylesheet. */
   font-size: 9px;
   font-weight: bold;
   padding: 0 1px;
@@ -3181,14 +2970,24 @@ stack[anonid=browserStack][responsivemode] {
   background-color: #000000;
   border: 1px solid #9C9CFF;
   border-radius: 2px;
+  position: absolute;
+  top: 0;
+  right: 0;
 }
 
-.social-notification-icon-label[value=""] {
-  display: none;
+#navigator-toolbox[iconsize=large][mode=icons] > #nav-bar *|* > .toolbarbutton-badge[badge]:not([badge=""])::after {
+  top: 1px;
+  right: 1px;
 }
 
-.social-notification-icon-image {
-  -moz-image-region: rect(0, 16px, 16px, 0);
+.toolbarbutton-badge[badge]:not([badge=""]):-moz-locale-dir(rtl)::after {
+  left: 0;
+  right: auto;
+}
+
+#navigator-toolbox[iconsize=large][mode=icons] > #nav-bar *|* > .toolbarbutton-badge[badge]:not([badge=""]):-moz-locale-dir(rtl)::after {
+  left: 1px;
+  right: auto;
 }
 
 #social-notification-icon-mentions {
@@ -3209,14 +3008,44 @@ stack[anonid=browserStack][responsivemode] {
   border: 0;
 }
 
+.popup-notification-icon[popupid="servicesInstall"] {
+  list-style-image: url("chrome://browser/skin/social/services-64.png");
+}
+#servicesInstall-notification-icon {
+  list-style-image: url("chrome://browser/skin/social/services-16.png");
+}
+#social-undoactivation-button,
+#servicesInstall-learnmore-link {
+  -moz-margin-start: 0; /* override default label margin to match description margin */
+}
+
+#socialActivatedNotification .popup-notification-button-container {
+  margin-left: 6px;
+}
+
+.social-activation-icon {
+  width: auto;
+  height: auto;
+  max-height: 64px;
+  max-width: 64px;
+}
+
+#social-activation-message {
+  max-width: 250px;
+}
+
+#social-activation-message > label {
+  margin: 0;
+}
+
 /* social toolbar provider menu */
-#social-statusarea-popup {
+.social-statusarea-popup {
   margin-top: 0;
   margin-left: -12px;
   margin-right: -12px;
 }
 
-#social-statusarea-user {
+.social-statusarea-user {
   border-bottom: 1px solid #9C9CFF;
   background-color: #000000;
   color: #FF9F00;
@@ -3224,25 +3053,23 @@ stack[anonid=browserStack][responsivemode] {
   cursor: pointer;
 }
 
-#social-statusarea-user-portrait {
+.social-statusarea-user-portrait {
   width: 32px;
   height: 32px;
   border-radius: 2px;
   margin: 10px;
 }
 
-#social-statusarea-user > vbox > #social-statusarea-notloggedin,
-#social-statusarea-user > vbox > #social-statusarea-username {
+.social-statusarea-loggedInStatus {
   background: transparent;
   border: none;
-  color: #9C9CFF;
+  color: #3333FF;
   min-width: 0;
   margin: 0 6px;
   list-style-image: none;
 }
 
-#social-statusarea-user[_moz-menuactive] > vbox > #social-statusarea-notloggedin,
-#social-statusarea-user[_moz-menuactive] > vbox > #social-statusarea-username {
+#social-statusarea-user[_moz-menuactive] > vbox > .social-statusarea-loggedInStatus {
   text-decoration: underline;
 }
 
@@ -3273,7 +3100,7 @@ stack[anonid=browserStack][responsivemode] {
 }
 
 .chat-close-button {
-  list-style-image: url('chrome://browser/skin/social/chat-close.png');
+  list-style-image: url('chrome://browser/skin/social/chat-icons.png');
   -moz-image-region: rect(0, 14px, 14px, 0);
 }
 
@@ -3282,6 +3109,36 @@ stack[anonid=browserStack][responsivemode] {
   -moz-image-region: rect(14px, 14px, 28px, 0);
 }
 
+.chat-minimize-button {
+  list-style-image: url('chrome://browser/skin/social/chat-icons.png');
+  -moz-image-region: rect(0, 28px, 14px, 14px);
+}
+
+.chat-minimize-button:hover:active,
+.chat-minimize-button:hover {
+  -moz-image-region: rect(14px, 28px, 28px, 14px);
+}
+
+.chat-swap-button {
+  list-style-image: url('chrome://browser/skin/social/chat-icons.png');
+  -moz-image-region: rect(0, 42px, 14px, 28px);
+}
+
+.chat-swap-button:hover:active,
+.chat-swap-button:hover {
+  -moz-image-region: rect(14px, 42px, 28px, 28px);
+}
+
+chatbar > chatbox > .chat-titlebar > .chat-swap-button {
+  list-style-image: url('chrome://browser/skin/social/chat-icons.png');
+  -moz-image-region: rect(0, 56px, 14px, 42px);
+}
+
+chatbar > chatbox > .chat-titlebar > .chat-swap-button:hover:active,
+chatbar > chatbox > .chat-titlebar > .chat-swap-button:hover {
+  -moz-image-region: rect(14px, 56px, 28px, 42px);
+}
+
 .chat-title {
   font-weight: bold;
   font: 11px "Liberation Sans",Arial,Tahoma,Helvetica,sans-serif;
@@ -3303,6 +3160,11 @@ stack[anonid=browserStack][responsivemode] {
   cursor: pointer;
 }
 
+.chat-titlebar > .notification-anchor-icon {
+  margin-left: 2px;
+  margin-right: 2px;
+}
+
 .chat-titlebar[minimized="true"] {
   border-bottom: none;
 }
@@ -3322,8 +3184,7 @@ stack[anonid=browserStack][responsivemode] {
 }
 
 .chatbar-button {
-  /* XXX get a real image for this */
-  list-style-image: url("chrome://browser/skin/social/social.png");
+  list-style-image: url("chrome://browser/skin/social/services-16.png");
   background-color: #000000;
   border: none;
   margin: 0;
@@ -3334,6 +3195,12 @@ stack[anonid=browserStack][responsivemode] {
   -moz-border-end: 1px solid #008484;
 }
 
+@media (min-resolution: 2dppx) {
+  .chatbar-button {
+    list-style-image: url("chrome://browser/skin/social/services-16@2x.png");
+  }
+}
+
 .chatbar-button > menupopup > .menuitem-iconic > .menu-iconic-left > .menu-iconic-icon {
   width: auto;
   height: auto;
@@ -3350,6 +3217,7 @@ stack[anonid=browserStack][responsivemode] {
   opacity: 1;
 }
 
+.chatbar-button:hover,
 .chatbar-button[open="true"] {
 }
 
@@ -3392,6 +3260,13 @@ chatbox[minimized="true"] {
   height: 20px;
 }
 
+window > chatbox {
+  -moz-margin-start: 0px;
+  margin: 0px;
+  border: none;
+  padding: 0px;
+}
+
 .click-to-play-plugins-notification-content {
   margin: -10px;
   border-radius: 4px;
@@ -3399,10 +3274,13 @@ chatbox[minimized="true"] {
 
 .click-to-play-plugins-notification-icon-box {
   background: #000000;
-  -moz-border-end: 1px solid #9C9CFF;
+  -moz-border-end: 1px solid #FF9F00;
   padding-top: 16px;
   -moz-padding-end: 16px;
   -moz-padding-start: 24px;
+  -moz-margin-start: 4px;
+  margin-top: 4px;
+  margin-bottom: 4px;
 }
 
 .click-to-play-plugins-notification-icon-box:-moz-locale-dir(ltr) {
@@ -3416,13 +3294,9 @@ chatbox[minimized="true"] {
 }
 
 .click-to-play-plugins-notification-separator {
-  -moz-border-start: 1px solid #9C9CFF;
-  border-top: 1px solid #9C9CFF;
 }
 
 .click-to-play-plugins-notification-description-box {
-  border-bottom: 1px solid #9C9CFF;
-  -moz-border-start: 1px solid #9C9CFF;
   padding-top: 12px;
   -moz-padding-end: 11px;
   padding-bottom: 9px;
@@ -3430,15 +3304,13 @@ chatbox[minimized="true"] {
 }
 
 .click-to-play-plugins-notification-center-box {
-  border-top: 1px solid #9C9CFF;
-  border-bottom: 1px solid #9C9CFF;
-  -moz-border-start: 1px solid #9C9CFF;
+  border-top: 1px solid #FF9F00;
+  border-bottom: 1px solid #FF9F00;
   background-color: #000000;
+  -moz-margin-end: 4px;
 }
 
 .click-to-play-plugins-notification-button-container {
-  border-top: 1px solid #9C9CFF;
-  -moz-border-start: 1px solid #9C9CFF;
   margin: 0px;
   padding: 16px;
 }
@@ -3500,3 +3372,19 @@ chatbox[minimized="true"] {
 .center-item-button {
   min-width: 0;
 }
+
+#main-window[privatebrowsingmode=temporary] #toolbar-menubar {
+  background-image: url("chrome://browser/skin/privatebrowsing-dark.png");
+  background-position: top right;
+  background-repeat: no-repeat;
+}
+
+#main-window[privatebrowsingmode=temporary] #toolbar-menubar:-moz-locale-dir(rtl) {
+  background-position: top left;
+}
+
+#main-window[privatebrowsingmode=temporary] #appmenu-button > .button-box > .box-inherit > .button-icon {
+  list-style-image: url("chrome://browser/skin/privatebrowsing-light.png");
+  width: 20px;
+  height: 16px;
+}