X-Git-Url: https://git-public.kairo.at/?p=themes.git;a=blobdiff_plain;f=LCARStrek%2Fbrowser%2Fbrowser.css;h=4a837437ad2255442bc93af9682f0369c58eccf4;hp=8d1e33de058a7f09ca756230ca1ef2c1e72e0980;hb=71bac47819ce37388bcd358834f02031cccc9abf;hpb=9abeb12c5fc3c4fccd5a3b2c4ea13b84c5bed66f

diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css
index 8d1e33de..4a837437 100644
--- a/LCARStrek/browser/browser.css
+++ b/LCARStrek/browser/browser.css
@@ -52,6 +52,10 @@ toolbar {
   -moz-binding: url("chrome://global/skin/globalBindings.xml#toolbar");
 }
 
+toolbar[type="menubar"][autohide="true"] {
+  -moz-binding: url("chrome://global/skin/globalBindings.xml#toolbar-menubar-autohide");
+}
+
 menubar {
   -moz-binding: url("chrome://global/skin/globalBindings.xml#menubar");
 }
@@ -64,6 +68,18 @@ menubar {
   -moz-box-flex: 1; /* make menu items expand to fill toolbar height */
 }
 
+/* ::::: primary toolbar ::::: */
+
+.toolbar-primary > .toolbar-box > .toolbar-holder {
+  background-color: #FF9F00;
+}
+
+.toolbar-primary > .toolbar-box > .toolbar-startcap,
+.toolbar-primary > .toolbar-box > .toolbar-endcap {
+  background-color: #9C9CFF;
+}
+
+
 #navigator-toolbox {
 }
 
@@ -81,14 +97,12 @@ menubar {
 #navigator-toolbox > toolbar:not(:-moz-lwtheme) {
 }
 
-#main-window[tabsintitlebar] #titlebar-content:not(:-moz-lwtheme),
-#main-window[tabsintitlebar]:not([inFullscreen]) #TabsToolbar:not(:-moz-lwtheme) {
+#main-window[tabsintitlebar]:not([inFullscreen]) #toolbar-menubar[inactive] ~ #TabsToolbar:not(:-moz-lwtheme) {
   /* like menubar */
   background-color: #6000CF;
   color: #FF9F00;
 }
-#main-window[tabsintitlebar] #titlebar-content:not(:-moz-lwtheme):-moz-window-inactive,
-#main-window[tabsintitlebar]:not([inFullscreen]) #TabsToolbar:not(:-moz-lwtheme):-moz-window-inactive {
+#main-window[tabsintitlebar]:not([inFullscreen]) #toolbar-menubar[inactive] ~ #TabsToolbar:not(:-moz-lwtheme):-moz-window-inactive {
   background-color: #8050B0;
   color: #FF9F00;
 }
@@ -101,27 +115,14 @@ menubar {
   visibility: visible;
 }
 
-#navigator-toolbox[iconsize="small"] > #nav-bar,
-#navigator-toolbox > toolbar:not(#nav-bar):not(#toolbar-menubar):not(#TabsToolbar)[iconsize="small"] {
-  padding-top: 1px;
-  padding-bottom: 1px;
-}
-
-#nav-bar:not(:-moz-lwtheme),
-#nav-bar[collapsed="true"] + toolbar:not(:-moz-lwtheme),
-#nav-bar[collapsed="true"] + #customToolbars + #PersonalToolbar:not(:-moz-lwtheme),
 #navigator-toolbox[tabsontop="true"] > #nav-bar,
 #navigator-toolbox[tabsontop="true"]:not([customizing]) > #nav-bar[collapsed="true"] + toolbar,
 #navigator-toolbox[tabsontop="true"]:not([customizing]) > #nav-bar[collapsed="true"] + #customToolbars + #PersonalToolbar {
   /* background-image: -moz-linear-gradient(@toolbarHighlight@, rgba(255,255,255,0)); */
 }
 
-#navigator-toolbox[tabsontop="false"] > #toolbar-menubar:not(:-moz-lwtheme) {
-  /* background-image: -moz-linear-gradient(@toolbarHighlight@, @toolbarHighlight@); */
-}
-
 #personal-bookmarks {
-  min-height: 24px;
+/*  min-height: 24px; */
 }
 
 #print-preview-toolbar:not(:-moz-lwtheme) {
@@ -148,6 +149,12 @@ menubar {
   color: #FFCF00;
 }
 
+#appmenu-button:hover:not(:active):not([open]) {
+}
+
+#main-window[privatebrowsingmode=temporary] #appmenu-button:hover:not(:active):not([open]) {
+}
+
 #appmenu-button:hover,
 #appmenu-button:hover:active,
 #appmenu-button[open] {
@@ -164,7 +171,22 @@ menubar {
   -moz-margin-start: .5em;
 }
 
+#appmenuPrimaryPane > menuitem,
+#appmenuSecondaryPane > menuitem,
+#appmenuPrimaryPane > menu {
+  padding: 2px;
+}
+
+.splitmenu-menuitem {
+  -moz-padding-start: 2px;
+  padding-top: 2px;
+  padding-bottom: 2px;
+  -moz-margin-end: 1px;
+}
+
 .splitmenu-menu {
+  padding-top: 2px;
+  padding-bottom: 2px;
   -moz-box-pack: end;
 }
 
@@ -219,25 +241,70 @@ menubar {
   -moz-image-region: rect(0 16px 16px 0);
 }
 
+#appmenu-cut:hover:not([disabled="true"]),
+#appmenu-editmenu-cut:hover:not([disabled="true"]) {
+  -moz-image-region: rect(16px 16px 32px 0);
+}
+
+#appmenu-cut[disabled="true"],
+#appmenu-editmenu-cut[disabled="true"] {
+  -moz-image-region: rect(32px 16px 48px 0);
+}
+
 #appmenu-copy,
 #appmenu-editmenu-copy {
   -moz-image-region: rect(0 32px 16px 16px);
 }
 
+#appmenu-copy:hover:not([disabled="true"]),
+#appmenu-editmenu-copy:hover:not([disabled="true"]) {
+  -moz-image-region: rect(16px 32px 32px 16px);
+}
+
+#appmenu-copy[disabled="true"],
+#appmenu-editmenu-copy[disabled="true"] {
+  -moz-image-region: rect(32px 32px 48px 16px);
+}
+
 #appmenu-paste,
 #appmenu-editmenu-paste {
   -moz-image-region: rect(0 48px 16px 32px);
 }
 
+#appmenu-paste:hover:not([disabled="true"]),
+#appmenu-editmenu-paste:hover:not([disabled="true"]) {
+  -moz-image-region: rect(16px 48px 32px 32px);
+}
+
+#appmenu-paste[disabled="true"],
+#appmenu-editmenu-paste[disabled="true"] {
+  -moz-image-region: rect(32px 48px 48px 32px);
+}
+
 #appmenu_print,
 #appmenu_print_popup {
   -moz-image-region: rect(0 64px 16px 48px);
 }
 
+#appmenu_print:hover:not([disabled="true"]),
+#appmenu_print[open="true"],
+#appmenu_print_popup:hover:not([disabled="true"]) {
+  -moz-image-region: rect(16px 64px 32px 48px);
+}
+
+#appmenu-print[disabled="true"],
+#appmenu_print_popup[disabled="true"] {
+  -moz-image-region: rect(32px 64px 48px 48px);
+}
+
 #appmenu-quit {
   -moz-image-region: rect(0 80px 16px 64px);
 }
 
+#appmenu-quit:hover {
+  -moz-image-region: rect(16px 80px 32px 64px);
+}
+
 #appmenu-edit-label {
   -moz-appearance: none;
   background: transparent;
@@ -301,19 +368,6 @@ menubar {
 
 /* ::::: bookmark buttons ::::: */
 
-toolbarbutton.bookmark-item {
-  margin: 0;
-  padding: 2px 3px;
-}
-
-toolbarbutton.bookmark-item:hover:active:not([disabled="true"]),
-toolbarbutton.bookmark-item[open="true"] {
-  padding-top: 3px;
-  padding-bottom: 1px;
-  -moz-padding-start: 4px;
-  -moz-padding-end: 2px;
-}
-
 .bookmark-item > .toolbarbutton-icon {
   width: 16px;
   height: 16px;
@@ -405,7 +459,13 @@ menuitem.bookmark-item {
 
 /* ::::: primary toolbar buttons ::::: */
 
-/* ::::: large toolbar buttons ::::: */
+.toolbarbutton-1 {
+  list-style-image: url("chrome://browser/skin/Toolbar.png");
+}
+
+.toolbarbutton-1:not([type="menu-button"]) {
+  -moz-box-orient: vertical;
+}
 
 .toolbarbutton-1,
 .toolbarbutton-1 > .toolbarbutton-menubutton-button {
@@ -433,10 +493,6 @@ menuitem.bookmark-item {
   -moz-padding-end: 1px;
 }
 
-.toolbarbutton-1[type="menu"] {
-  -moz-binding: url("chrome://global/content/bindings/toolbarbutton.xml#menu-vertical");
-}
-
 /* ::::: small primary toolbar buttons ::::: */
 
 #nav-bar {
@@ -526,6 +582,13 @@ toolbar[mode="full"] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
   min-width: 30px;
 }
 
+#navigator-toolbox[iconsize=small] > #nav-bar {
+}
+
+#navigator-toolbox[iconsize=large][mode=icons] > #nav-bar {
+}
+
+
 /* unified back/forward button */
 
 #back-button {
@@ -533,25 +596,50 @@ toolbar[mode="full"] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
   -moz-margin-end: 0;
 }
 
+#back-button:not([disabled="true"]):hover {
+  -moz-image-region: rect(18px, 18px, 36px, 0);
+}
+
+#back-button[disabled="true"] {
+  -moz-image-region: rect(36px, 18px, 54px, 0);
+}
+
 #forward-button {
   -moz-image-region: rect(0, 36px, 18px, 18px);
   border-left: none;
   -moz-margin-start: 0;
 }
 
+#forward-button:not([disabled="true"]):hover {
+  -moz-image-region: rect(18px, 36px, 36px, 18px);
+}
+
+#forward-button[disabled="true"] {
+  -moz-image-region: rect(36px, 36px, 54px, 18px);
+}
+
 #back-button:-moz-locale-dir(rtl) > .toolbarbutton-icon,
 #forward-button:-moz-locale-dir(rtl),
 #forward-button:-moz-locale-dir(rtl) > .toolbarbutton-text {
   -moz-transform: scaleX(-1);
 }
 
-#back-button:-moz-locale-dir(ltr) {
+#nav-bar #back-button {
+  -moz-margin-end: 0 !important;
+}
+
+#nav-bar #forward-button {
+  border-left-style: none;
+  -moz-margin-start: 0 !important;
+}
+
+#nav-bar #back-button:-moz-locale-dir(ltr) {
   border-top-right-radius: 0;
   border-bottom-right-radius: 0;
 }
 
-#back-button:-moz-locale-dir(rtl),
-#forward-button {
+#nav-bar #back-button:-moz-locale-dir(rtl),
+#nav-bar #forward-button {
   border-top-left-radius: 0;
   border-bottom-left-radius: 0;
 }
@@ -565,7 +653,16 @@ toolbar[mode="full"] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
   margin-top: -2px;
   margin-bottom: -2px;
   border: none;
-  -moz-image-region: rect(18px, 20px, 38px, 0);
+  -moz-image-region: rect(54px, 20px, 74px, 0);
+}
+
+#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #back-button:not([disabled="true"]):hover,
+#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #back-button[open="true"] {
+  -moz-image-region: rect(54px, 40px, 74px, 20px);
+}
+
+#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #back-button[disabled="true"] {
+  -moz-image-region: rect(54px, 60px, 74px, 40px);
 }
 
 #navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #back-button:not([disabled="true"]):not([open="true"]):not(:active):hover {
@@ -601,12 +698,22 @@ toolbar[mode="full"] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
 
 .unified-nav-back[_moz-menuactive]:-moz-locale-dir(ltr),
 .unified-nav-forward[_moz-menuactive]:-moz-locale-dir(rtl) {
-  list-style-image: url("chrome://browser/skin/menu-back.png") !important;
+  list-style-image: url("chrome://global/skin/arrow/arrow-left.gif") !important;
+}
+
+.unified-nav-back[_moz-menuactive]:-moz-locale-dir(ltr):hover,
+.unified-nav-forward[_moz-menuactive]:-moz-locale-dir(rtl):hover {
+  list-style-image: url("chrome://global/skin/arrow/arrow-left-hover.gif") !important;
 }
 
 .unified-nav-forward[_moz-menuactive]:-moz-locale-dir(ltr),
 .unified-nav-back[_moz-menuactive]:-moz-locale-dir(rtl) {
-  list-style-image: url("chrome://browser/skin/menu-forward.png") !important;
+  list-style-image: url("chrome://global/skin/arrow/arrow-right.gif") !important;
+}
+
+.unified-nav-forward[_moz-menuactive]:-moz-locale-dir(ltr):hover,
+.unified-nav-back[_moz-menuactive]:-moz-locale-dir(rtl):hover {
+  list-style-image: url("chrome://global/skin/arrow/arrow-right.gif") !important;
 }
 
 /* stop button */
@@ -615,12 +722,28 @@ toolbar[mode="full"] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
   -moz-image-region: rect(0, 54px, 18px, 36px);
 }
 
+#stop-button:not([disabled="true"]):hover {
+  -moz-image-region: rect(18px, 54px, 36px, 36px);
+}
+
+#stop-button[disabled="true"] {
+  -moz-image-region: rect(36px, 54px, 54px, 36px);
+}
+
 /* reload button */
 
 #reload-button {
   -moz-image-region: rect(0, 72px, 18px, 54px);
 }
 
+#reload-button:not([disabled="true"]):hover {
+  -moz-image-region: rect(18px, 72px, 36px, 54px);
+}
+
+#reload-button[disabled="true"] {
+  -moz-image-region: rect(36px, 72px, 54px, 54px);
+}
+
 /* home button */
 
 #home-button.bookmark-item {
@@ -630,10 +753,22 @@ toolbar[mode="full"] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
   -moz-image-region: rect(0, 90px, 18px, 72px);
 }
 
+#home-button:not([disabled="true"]):hover {
+  -moz-image-region: rect(18px, 90px, 36px, 72px);
+}
+
+#home-button[disabled="true"] {
+  -moz-image-region: rect(36px, 90px, 54px, 72px);
+}
+
 /* tabview button */
 
-#tabview-button {
+#tabview-button,
+#menu_tabview {
   list-style-image: url("chrome://browser/skin/tabview/tabview.png");
+}
+
+#tabview-button {
   -moz-image-region: rect(0, 90px, 18px, 72px);
 }
 
@@ -653,18 +788,54 @@ toolbar[mode="full"] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
   -moz-image-region: rect(0, 72px, 18px, 54px);
 }
 
+#menu_tabview {
+  -moz-image-region: rect(1px, 89px, 17px, 73px);
+}
+
+#menu_tabview[groups="0"] {
+  -moz-image-region: rect(1px, 17px, 17px, 1px);
+}
+
+#menu_tabview[groups="1"] {
+  -moz-image-region: rect(1px, 35px, 17px, 19px);
+}
+
+#menu_tabview[groups="2"] {
+  -moz-image-region: rect(1px, 53px, 17px, 37px);
+}
+
+#menu_tabview[groups="3"] {
+  -moz-image-region: rect(1px, 71px, 17px, 55px);
+}
+
 /* download manager button */
 
 #downloads-button {
   -moz-image-region: rect(0, 108px, 18px, 90px);
 }
 
+#downloads-button:not([disabled="true"]):hover {
+  -moz-image-region: rect(18px, 108px, 36px, 90px);
+}
+
+#downloads-button[disabled="true"] {
+  -moz-image-region: rect(36px, 108px, 54px, 90px);
+}
+
 /* history sidebar button */
 
 #history-button {
   -moz-image-region: rect(0, 126px, 18px, 108px);
 }
 
+#history-button:not([disabled="true"]):hover {
+  -moz-image-region: rect(18px, 126px, 36px, 108px);
+}
+
+#history-button[disabled="true"] {
+  -moz-image-region: rect(36px, 126px, 54px, 108px);
+}
+
 /* bookmark sidebar & menu buttons */
 
 #bookmarks-button,
@@ -680,48 +851,115 @@ toolbar[mode="full"] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
   -moz-box-orient: horizontal;
 }
 
+#bookmarks-button:not([disabled="true"]):hover,
+#bookmarks-menu-button[open="true"],
+#bookmarks-menu-button:not([disabled="true"]):hover {
+  -moz-image-region: rect(18px, 144px, 36px, 126px);
+}
+
+#bookmarks-button[disabled="true"],
+#bookmarks-menu-button[disabled="true"] {
+  -moz-image-region: rect(36px, 144px, 54px, 126px);
+}
+
 /* print button */
 
 #print-button {
   -moz-image-region: rect(0, 162px, 18px, 144px);
 }
 
+#print-button:not([disabled="true"]):hover {
+  -moz-image-region: rect(18px, 162px, 36px, 144px);
+}
+
+#print-button[disabled="true"] {
+  -moz-image-region: rect(36px, 162px, 54px, 144px);
+}
+
 /* toolbar new tab button */
 
 #new-tab-button {
   -moz-image-region: rect(0, 180px, 18px, 162px);
 }
 
+#print-button:not([disabled="true"]):hover {
+  -moz-image-region: rect(18px, 162px, 36px, 144px);
+}
+
+#print-button[disabled="true"] {
+  -moz-image-region: rect(36px, 162px, 54px, 144px);
+}
+
 /* new window button */
 
 #new-window-button {
   -moz-image-region: rect(0, 198px, 18px, 180px);
 }
 
+#new-window-button:not([disabled="true"]):hover {
+  -moz-image-region: rect(18px, 198px, 36px, 180px);
+}
+
+#new-window-button[disabled="true"] {
+  -moz-image-region: rect(36px, 198px, 54px, 180px);
+}
+
 /* cut button */
 
 #cut-button {
   -moz-image-region: rect(0, 216px, 18px, 198px);
 }
 
+#cut-button:not([disabled="true"]):hover {
+  -moz-image-region: rect(18px, 216px, 36px, 198px);
+}
+
+#cut-button[disabled="true"] {
+  -moz-image-region: rect(36px, 216px, 54px, 198px);
+}
+
 /* copy button */
 
 #copy-button {
   -moz-image-region: rect(0, 234px, 18px, 216px);
 }
 
+#copy-button:not([disabled="true"]):hover {
+  -moz-image-region: rect(18px, 234px, 36px, 216px);
+}
+
+#copy-button[disabled="true"] {
+  -moz-image-region: rect(36px, 234px, 54px, 216px);
+}
+
 /* paste button */
 
 #paste-button {
   -moz-image-region: rect(0, 252px, 18px, 234px);
 }
 
+#paste-button:not([disabled="true"]):hover {
+  -moz-image-region: rect(18px, 252px, 36px, 234px);
+}
+
+#paste-button[disabled="true"] {
+  -moz-image-region: rect(36px, 252px, 54px, 234px);
+}
+
 /* fullscreen button */
 
 #fullscreen-button {
   -moz-image-region: rect(0, 270px, 18px, 252px);
 }
 
+#fullscreen-button:not([disabled="true"]):hover {
+  -moz-image-region: rect(18px, 270px, 36px, 252px);
+}
+
+#fullscreen-button[disabled="true"] {
+  -moz-image-region: rect(36px, 270px, 54px, 252px);
+}
+
 /* zoom controls */
 
 #zoom-out-button {
@@ -731,22 +969,45 @@ toolbar[mode="full"] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
 
 #zoom-in-button {
   -moz-image-region: rect(0, 306px, 18px, 288px);
+}
+
+#nav-bar #zoom-out-button {
+  -moz-margin-end: 0;
+}
+
+#nav-bar #zoom-in-button {
   -moz-border-start: none;
   -moz-margin-start: 0;
 }
 
-#zoom-out-button:-moz-locale-dir(ltr),
-#zoom-in-button:-moz-locale-dir(rtl) {
+#nav-bar #zoom-out-button:-moz-locale-dir(ltr),
+#nav-bar #zoom-in-button:-moz-locale-dir(rtl) {
   border-top-right-radius: 0;
   border-bottom-right-radius: 0;
 }
 
-#zoom-out-button:-moz-locale-dir(rtl),
-#zoom-in-button:-moz-locale-dir(ltr) {
+#nav-bar #zoom-out-button:-moz-locale-dir(rtl),
+#nav-bar #zoom-in-button:-moz-locale-dir(ltr) {
   border-top-left-radius: 0;
   border-bottom-left-radius: 0;
 }
 
+#zoom-out-button:not([disabled="true"]):hover {
+  -moz-image-region: rect(18px, 288px, 36px, 270px);
+}
+
+#zoom-out-button[disabled="true"] {
+  -moz-image-region: rect(36px, 288px, 54px, 270px);
+}
+
+#zoom-in-button:not([disabled="true"]):hover {
+  -moz-image-region: rect(18px, 306px, 36px, 288px);
+}
+
+#zoom-in-button[disabled="true"] {
+  -moz-image-region: rect(36px, 306px, 54px, 288px);
+}
+
 /* sync button */
 
 #sync-button {
@@ -758,12 +1019,20 @@ toolbar[mode="full"] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
   -moz-image-region: rect(0, 18px, 18px, 0);
 }
 
+#sync-button[disabled="true"] {
+  -moz-image-region: rect(36px, 324px, 54px, 306px);
+}
+
 /* feed button */
 
 #feed-button {
   -moz-image-region: rect(0, 342px, 18px, 324px);
 }
 
+#feed-button[disabled="true"] {
+  -moz-image-region: rect(36px, 342px, 54px, 324px);
+}
+
 /* ::::: fullscreen window controls ::::: */
 
 #TabsToolbar > #window-controls {
@@ -926,23 +1195,13 @@ html|*.urlbar-input:-moz-lwtheme:-moz-placeholder,
 
 /* Location bar dropmarker */
 
-.urlbar-history-dropmarker {
-  -moz-appearance: none;
-  padding: 0 1px;
+.urlbar-history-dropmarker:not(:hover):not([open="true"]) {
   background-color: transparent;
-  border: none;
-  width: auto;
-  list-style-image: url("mainwindow-dropdown-arrow.png");
-  -moz-image-region: rect(0, 13px, 11px, 0);
-}
-
-.urlbar-history-dropmarker:-moz-system-metric(touch-enabled) {
-  min-width: 6.4mozmm;
 }
 
-.urlbar-history-dropmarker:hover:active,
-.urlbar-history-dropmarker[open="true"] {
-  -moz-image-region: rect(0, 26px, 11px, 13px);
+#urlbar-container[combined="true"] > #urlbar > .urlbar-history-dropmarker {
+  border: none;
+  border-radius: 0px;
 }
 
 /* page proxy icon */
@@ -974,26 +1233,13 @@ html|*.urlbar-input:-moz-lwtheme:-moz-placeholder,
 
 /* autocomplete */
 
-#PopupAutoComplete,
-#PopupAutoCompleteRichResult {
-  direction: ltr !important;
-}
-
-#PopupAutoComplete:-moz-locale-dir(rtl) > tree > treerows {
-  direction: rtl;
-}
-
-#PopupAutoComplete .autocomplete-treebody {
-  direction: ltr;
-}
-
 #treecolAutoCompleteImage {
   max-width: 36px;
 }
 
 .ac-result-type-bookmark,
 .autocomplete-treebody::-moz-tree-image(bookmark, treecolAutoCompleteImage) {
-  list-style-image: url("chrome://browser/skin/places/editBookmark.png");
+  list-style-image: url("chrome://browser/skin/places/bookmark.png");
   -moz-image-region: rect(0px 16px 16px 0px);
   width: 16px; 
   height: 16px;
@@ -1071,7 +1317,7 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
 
 #urlbar > toolbarbutton {
   list-style-image: url("chrome://browser/skin/reload-stop-go.png");
-  margin: -2px;
+  /* margin: -2px; */
   -moz-margin-start: 0;
   padding: 0 3px;
   background-origin: border-box;
@@ -1080,13 +1326,13 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
 }
 
 #urlbar:-moz-locale-dir(ltr) > toolbarbutton {
-  border-top-right-radius: 2px;
-  border-bottom-right-radius: 2px;
+  border-top-left-radius: 0px;
+  border-bottom-left-radius: 0px;
 }
 
 #urlbar:-moz-locale-dir(rtl) > toolbarbutton {
-  border-top-left-radius: 2px;
-  border-bottom-left-radius: 2px;
+  border-top-right-radius: 0px;
+  border-bottom-right-radius: 0px;
 }
 
 #urlbar > toolbarbutton:not([disabled]):active:hover {
@@ -1098,19 +1344,20 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
   -moz-image-region: rect(0px, 56px, 14px, 42px);
 }
 
-#urlbar-go-button:-moz-locale-dir(rtl) > .toolbarbutton-icon {
-  -moz-transform: scaleX(-1);
-}
-
 #urlbar-go-button:hover {
+  -moz-image-region: rect(14px, 56px, 28px, 42px);
 }
 
 #urlbar-reload-button {
+  -moz-image-region: rect(0px, 28px, 14px, 14px);
+}
+
+#urlbar-reload-button[disabled] {
   -moz-image-region: rect(0px, 14px, 14px, 0px);
 }
 
 #urlbar-reload-button:not([disabled]):hover {
-  -moz-image-region: rect(0px, 28px, 14px, 14px);
+  -moz-image-region: rect(14px, 28px, 28px, 14px);
 }
 
 #urlbar-stop-button {
@@ -1118,6 +1365,7 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
 }
 
 #urlbar-stop-button:hover {
+  -moz-image-region: rect(14px, 42px, 28px, 28px);
 }
 
 /* popup blocker button */
@@ -1127,32 +1375,37 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
   -moz-image-region: rect(0, 16px, 16px, 0);
 }
 
-#page-report-button:hover {
-  -moz-image-region: rect(0, 32px, 16px, 16px);
-}
-
+#page-report-button:hover ,
 #page-report-button:hover:active,
 #page-report-button[open="true"] {
-  -moz-image-region: rect(0, 48px, 16px, 32px);
+  -moz-image-region: rect(0, 32px, 16px, 16px);
 }
 
 /* star button */
 
 #star-button {
-  list-style-image: url("chrome://browser/skin/places/bookmark.png");
-  -moz-image-region: rect(0px 16px 16px 0px);
+  list-style-image: url("chrome://communicator/skin/bookmarks/bookmark.png");
+  -moz-image-region: rect(16px 16px 32px 0px);
 }
 
 #star-button:hover {
-  -moz-image-region: rect(0px 32px 16px 16px);
+  -moz-image-region: rect(16px 32px 32px 16px);
 }
 
 #star-button:hover:active {
-  -moz-image-region: rect(0px 48px 16px 32px);
+  -moz-image-region: rect(16px 48px 32px 32px);
 }
 
 #star-button[starred="true"] {
-  list-style-image: url("chrome://browser/skin/places/editBookmark.png");
+  -moz-image-region: rect(0px 16px 16px 0px);
+}
+
+#star-button[starred="true"]:hover {
+  -moz-image-region: rect(0px 32px 16px 16px);
+}
+
+#star-button[starred="true"]:hover:active {
+  -moz-image-region: rect(0px 48px 16px 32px);
 }
 
 /* bookmarking panel */
@@ -1208,11 +1461,18 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
 }
 
 /* Tabstrip */
+
 #TabsToolbar {
   min-height: 0;
   padding: 0;
+  -moz-binding: url("chrome://global/content/bindings/toolbar.xml#toolbar");
+}
+
+#TabsToolbar .toolbar-holder {
+  background-color: #000000; /* correct effect of being an actal toolbar */
 }
 
+#main-window[disablechrome] #TabsToolbar,
 #TabsToolbar[tabsontop="false"] {
   border-bottom: 1px solid #FF9F00;
 }
@@ -1279,7 +1539,7 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
   list-style-image: url("chrome://browser/skin/tabbrowser/loading.png");
 }
 
-.tabbrowser-tab[pinned] {
+#tabbrowser-tabs[positionpinnedtabs] > .tabbrowser-tab[pinned] {
   min-height: 16px; /* corresponds to the max. height of non-textual tab contents, i.e. the favicon */
 }
 
@@ -1345,63 +1605,15 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
 
 .tabbrowser-arrowscrollbox > .scrollbutton-up,
 .tabbrowser-arrowscrollbox > .scrollbutton-down {
-  list-style-image: url("chrome://browser/skin/tabbrowser/tab-arrow-left.png");
-  -moz-image-region: rect(0, 15px, 17px, 0);
   margin: 0;
   padding-top: 0;
   padding-bottom: 0;
 }
 
-.tabbrowser-arrowscrollbox > .scrollbutton-up[disabled],
-.tabbrowser-arrowscrollbox > .scrollbutton-down[disabled] {
-  opacity: .4;
-}
-
-.tabbrowser-arrowscrollbox > .scrollbutton-up:not([disabled]):hover:active,
-.tabbrowser-arrowscrollbox > .scrollbutton-down:not([disabled]):hover:active {
-  -moz-image-region: rect(0, 30px, 17px, 15px);
-}
-
-.tabbrowser-arrowscrollbox > .scrollbutton-up:-moz-locale-dir(rtl) > .toolbarbutton-icon,
-.tabbrowser-arrowscrollbox > .scrollbutton-down:-moz-locale-dir(ltr) > .toolbarbutton-icon {
-  -moz-transform: scaleX(-1);
-}
-
-.tabbrowser-arrowscrollbox > .scrollbutton-down {
-}
-
 .tabbrowser-arrowscrollbox > .scrollbutton-down[notifybgtab] {
   background-color: #008484;
 }
 
-.tabbrowser-arrowscrollbox > .scrollbutton-up:not([disabled]):not(:hover):-moz-locale-dir(ltr),
-.tabbrowser-arrowscrollbox > .scrollbutton-down:not([disabled]):not(:hover):-moz-locale-dir(rtl) {
-  -moz-appearance: none;
-  -moz-border-image: url("chrome://browser/skin/tabbrowser/tab-overflow-border.png") 0 2 0 2 / 0 2px 0 0;
-  padding-right: 1px;
-}
-
-.tabbrowser-arrowscrollbox > .scrollbutton-down:not([disabled]):not(:hover):-moz-locale-dir(ltr),
-.tabbrowser-arrowscrollbox > .scrollbutton-up:not([disabled]):not(:hover):-moz-locale-dir(rtl) {
-  -moz-appearance: none;
-  -moz-border-image: url("chrome://browser/skin/tabbrowser/tab-overflow-border.png") 0 2 0 2 / 0 0 0 2px;
-  padding-left: 1px;
-}
-
-@media all and (-moz-windows-classic) {
-  .tabbrowser-arrowscrollbox > .scrollbutton-up:not([disabled]):not(:hover):-moz-locale-dir(ltr),
-  .tabbrowser-arrowscrollbox > .scrollbutton-down:not([disabled]):not(:hover):-moz-locale-dir(rtl) {
-    padding-left: 4px;
-    padding-right: 2px;
-  }
-
-  .tabbrowser-arrowscrollbox > .scrollbutton-down:not([disabled]):not(:hover):-moz-locale-dir(ltr),
-  .tabbrowser-arrowscrollbox > .scrollbutton-up:not([disabled]):not(:hover):-moz-locale-dir(rtl) {
-    padding-left: 2px;
-    padding-right: 4px;
-  }
-}
-
 .tabs-newtab-button > .toolbarbutton-icon {
   margin-top: -1px;
   margin-bottom: -1px;
@@ -1410,7 +1622,7 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
 .tabs-newtab-button,
 #TabsToolbar > #new-tab-button,
 #TabsToolbar > toolbarpaletteitem > #new-tab-button {
-  list-style-image: url(chrome://browser/skin/tabbrowser/newtab.png);
+  list-style-image: url("chrome://browser/skin/tabbrowser/newtab.png");
   -moz-image-region: rect(0, 16px, 18px, 0);
 }
 
@@ -1418,8 +1630,8 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
   width: 31px;
 }
 
-.tabs-newtab-button:hover:active,
-#TabsToolbar > #new-tab-button:hover:active {
+.tabs-newtab-button:hover,
+#TabsToolbar > #new-tab-button:hover {
   -moz-image-region: rect(0, 32px, 18px, 16px);
 }
 
@@ -1472,6 +1684,9 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
   list-style-image: url("chrome://global/skin/icons/close-button.gif");
 }
 
+.tabs-closebutton > .toolbarbutton-icon {
+}
+
 .tabs-closebutton:hover,
 .tabs-closebutton:hover:active {
   list-style-image: url("chrome://global/skin/icons/close-button-hover.gif");
@@ -1882,12 +2097,34 @@ panel[dimmed="true"] {
   opacity: 0.5;
 }
 
-/* Vertically-center the statusbar compatibility shim, because
-   toolbars, even in small-icon mode, are a bit taller than
-   statusbars. Also turn off the statusbar border. On Windows
-   we have to disable borders on statusbar *and* child statusbar
-   elements. */
+/* Add-on bar */
+
+#addon-bar {
+  min-height: 20px;
+  border-top: 3px solid #000000;
+}
+
+#addon-bar:not(:-moz-lwtheme) {
+  -moz-appearance: statusbar;
+}
+
+#addon-bar .toolbar-holder {
+  background-color: #8050B0;
+  color: #FFCF00;
+}
+
+#addon-bar .toolbar-holder {
+  background-color: #8050B0;
+  color: #FFCF00;
+}
+
+#addon-bar .toolbar-startcap,
+#addon-bar .toolbar-endcap{
+  background-color: #6000CF;
+}
+
 #status-bar {
+  -moz-binding: url("chrome://global/content/bindings/general.xml#statusbar");
   margin-top: .3em;
   border-width: 0;
 }
@@ -1898,7 +2135,6 @@ panel[dimmed="true"] {
   border-width: 0;
 } */
 
-/* Add-on bar close button */
 #addonbar-closebutton {
   border: none;
   padding: 3px 5px;
@@ -1915,7 +2151,7 @@ panel[dimmed="true"] {
 .statuspanel-label {
   margin: 0;
   padding: 2px 4px;
-  background: -moz-linear-gradient(white, #ddd);
+  background: #404000;
   border: 1px none #9C9CFF;
   border-top-style: solid;
   color: #FF9F00;