diff --git a/browser/themes/pinstripe/browser/browser.css b/browser/themes/pinstripe/browser/browser.css
index fab03baff53..c5a3d8a4411 100644
--- a/browser/themes/pinstripe/browser/browser.css
+++ b/browser/themes/pinstripe/browser/browser.css
@@ -121,40 +121,6 @@
   border-top: 1px solid rgba(0,0,0,0.65);
 }
 
-/* ----- INACTIVE WINDOW ----- */
-
-#main-window:not([active="true"]) > #navigator-toolbox > #nav-bar {
-  background-image: url("chrome://global/skin/toolbar/toolbar-background-inactive.png");
-}
-
-#main-window:not([active="true"]) > #navigator-toolbox > #PersonalToolbar {
-  background-color: -moz-mac-chrome-inactive;
-  border-bottom-color: rgba(0, 0, 0, 0.32);
-}
-
-#main-window:not([active="true"]) > #navigator-toolbox > #TabsToolbar:not(:-moz-lwtheme) {
-  background-color: #e2e2e2;
-}
-
-#main-window:not([active="true"]) > #navigator-toolbox > toolbar > toolbaritem,
-#main-window:not([active="true"]) > #navigator-toolbox > toolbar > toolbarbutton,
-#main-window:not([active="true"]) .tabs-newtab-button > .toolbarbutton-icon {
-  opacity: 0.75;
-}
-
-#main-window:not([active="true"]) > #browser > vbox > #sidebar,
-#main-window:not([active="true"]) > #browser > vbox > sidebarheader { 
-  background-color: #e8e8e8;
-}
-
-#main-window:not([active="true"]) .tabbrowser-tab {
-  color: #575757;
-}
-
-#main-window:not([active="true"]) .tabbrowser-tab[selected="true"] {
-  background-color: -moz-mac-chrome-inactive;
-}
-
 /* ----- BOOKMARK TOOLBAR ----- */
 
 #PersonalToolbar {
@@ -167,6 +133,11 @@
   -moz-box-align: center;
 }
 
+#PersonalToolbar:-moz-window-inactive {
+  background-color: -moz-mac-chrome-inactive;
+  border-bottom-color: rgba(0, 0, 0, 0.32);
+}
+
 #personal-bookmarks {
   -moz-box-align: center;
 }
@@ -339,6 +310,11 @@ toolbar[mode="text"] .toolbarbutton-1 > .toolbarbutton-text {
   padding-bottom: 0;
 }
 
+#navigator-toolbox > toolbar > toolbaritem:-moz-window-inactive,
+#navigator-toolbox > toolbar > toolbarbutton:-moz-window-inactive {
+  opacity: 0.75;
+}
+
 #back-button:-moz-locale-dir(rtl) > .toolbarbutton-icon,
 #forward-button:-moz-locale-dir(rtl) > .toolbarbutton-icon,
 #back-forward-dropmarker:-moz-locale-dir(rtl) > .toolbarbutton-icon {
@@ -1364,12 +1340,17 @@ richlistitem[selected="true"][current="true"] > hbox > .ac-result-type-bookmark,
 
 /* ----- SIDEBAR ELEMENTS ----- */
 
-#sidebar { 
+#sidebar,
+sidebarheader {
   background-color: #d4dde5;
 }
 
-sidebarheader { 
-  background-color: #d4dde5;
+#sidebar:-moz-window-inactive,
+sidebarheader:-moz-window-inactive {
+  background-color: #e8e8e8;
+}
+
+sidebarheader {
   padding: 2px;
   text-shadow: none;
 }
@@ -1459,10 +1440,6 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
 }
 
 #nav-bar {
-  background-color: #9e9e9e;
-  background-image: url("chrome://global/skin/toolbar/toolbar-background.gif");
-  background-repeat: repeat-x;
-  background-position: top right;
   padding: 0 4px;
 }
 
@@ -1560,6 +1537,10 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
   padding-top: 1px;
 }
 
+.tabs-newtab-button > .toolbarbutton-icon:-moz-window-inactive {
+  opacity: 0.75;
+}
+
 .tabbrowser-tab[selected="true"] {
   padding: 0 6px 1px;
   border-width: 2px;
@@ -1570,6 +1551,10 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
   background-color: -moz-mac-chrome-active;
 }
 
+.tabbrowser-tab[selected="true"]:-moz-window-inactive {
+  background-color: -moz-mac-chrome-inactive;
+}
+
 .tabbrowser-tab:focus > .tab-text {
   -moz-box-shadow: @focusRingShadow@;
 }
@@ -1579,8 +1564,11 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
   color: #000000;
 }
 
-.tabbrowser-tab:-moz-lwtheme,
-#main-window:not([active="true"]) .tabbrowser-tab:-moz-lwtheme {
+.tabbrowser-tab:-moz-window-inactive {
+  color: #575757;
+}
+
+.tabbrowser-tab:-moz-lwtheme {
   color: inherit;
   text-shadow: inherit;
 }
@@ -1595,6 +1583,10 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
   background: #9B9B9B url("chrome://browser/skin/tabbrowser/tabbrowser-tabs-bkgnd.png") repeat-x;
 }
 
+#TabsToolbar:not(:-moz-lwtheme):-moz-window-inactive {
+  background-color: #e2e2e2;
+}
+
 .tabbrowser-tabs {
   -moz-box-align: stretch;
   height: 25px;
diff --git a/browser/themes/pinstripe/browser/places/organizer.css b/browser/themes/pinstripe/browser/places/organizer.css
index 5124a6e1309..0135572a6fd 100644
--- a/browser/themes/pinstripe/browser/places/organizer.css
+++ b/browser/themes/pinstripe/browser/places/organizer.css
@@ -33,7 +33,7 @@
   border-top: @sidebarItemGraphiteFocusedBorderTop@;
 }
 
-window:not([active="true"]) #placesList > treechildren::-moz-tree-row(selected) {
+#placesList > treechildren:-moz-window-inactive::-moz-tree-row(selected) {
   background: @sidebarItemInactiveBackground@;
   border-top: @sidebarItemInactiveBorderTop@;
 }
@@ -103,14 +103,14 @@ window:not([active="true"]) #placesList > treechildren::-moz-tree-row(selected)
                    inset 0 0 0 20px @toolbarbuttonPressedBackgroundColor@;
 }
 
-:root:not([active]) #placesToolbar > toolbarbutton {
+#placesToolbar > toolbarbutton:-moz-window-inactive {
   border-color: @toolbarbuttonInactiveBorderColor@;
   background-image: @toolbarbuttonInactiveBackgroundImage@;
 }
 
 #placesToolbar > toolbarbutton[disabled="true"] > .toolbarbutton-icon,
-:root:not([active]) #placesToolbar > toolbarbutton > .toolbarbutton-icon,
-:root:not([active]) #placesToolbar > toolbarbutton > .toolbarbutton-menu-dropmarker {
+#placesToolbar > toolbarbutton > .toolbarbutton-icon:-moz-window-inactive,
+#placesToolbar > toolbarbutton > .toolbarbutton-menu-dropmarker:-moz-window-inactive {
   opacity: 0.5; /* remove the second and third selector when we support click-through (bug 392188) */
 }
 
@@ -177,7 +177,7 @@ window:not([active="true"]) #placesList > treechildren::-moz-tree-row(selected)
 
 /* Search field */
 
-:root:not([active="true"]) #searchFilter {
+#searchFilter:-moz-window-inactive {
   opacity: 0.7; /* remove this when we support click-through (bug 392188) */
 }
 
@@ -200,7 +200,7 @@ window:not([active="true"]) #placesList > treechildren::-moz-tree-row(selected)
   border: 0px;
 }
 
-#places:not([active="true"]) > #placesView > #placesList {
+#placesList:-moz-window-inactive {
   background-color: #e8e8e8;
 }
 
diff --git a/toolkit/themes/pinstripe/global/console/console.css b/toolkit/themes/pinstripe/global/console/console.css
index 6a10ac6a805..8f3529b5e4e 100644
--- a/toolkit/themes/pinstripe/global/console/console.css
+++ b/toolkit/themes/pinstripe/global/console/console.css
@@ -220,7 +220,7 @@ toolbarseparator {
   -moz-box-shadow: @toolbarbuttonPressedInnerShadow@, @loweredShadow@;
 }
 
-:root:not([active]) #Console\:clear {
+#Console\:clear:-moz-window-inactive {
   color: @toolbarbuttonInactiveFontColor@ !important; /* remove this when we support click-through */
   border-color: @toolbarbuttonInactiveBorderColor@;
   background-image: @toolbarbuttonInactiveBackgroundImage@;
diff --git a/toolkit/themes/pinstripe/global/jar.mn b/toolkit/themes/pinstripe/global/jar.mn
index bf71cfb7dc7..6cf31825f29 100644
--- a/toolkit/themes/pinstripe/global/jar.mn
+++ b/toolkit/themes/pinstripe/global/jar.mn
@@ -141,8 +141,6 @@ toolkit.jar:
   skin/classic/global/splitter/grip-vrt-after.gif                    (splitter/grip-vrt-after.gif)
   skin/classic/global/splitter/grip-vrt-before.gif                   (splitter/grip-vrt-before.gif)
   skin/classic/global/toolbar/spring.png                             (toolbar/spring.png)
-  skin/classic/global/toolbar/toolbar-background.gif                 (toolbar/toolbar-background.gif)
-  skin/classic/global/toolbar/toolbar-background-inactive.png        (toolbar/toolbar-background-inactive.png)
   skin/classic/global/toolbar/toolbar-separator.png                  (toolbar/toolbar-separator.png)
   skin/classic/global/tree/columnpicker.gif                          (tree/columnpicker.gif)
   skin/classic/global/tree/folder.png                                (tree/folder.png)
diff --git a/toolkit/themes/pinstripe/global/preferences.css b/toolkit/themes/pinstripe/global/preferences.css
index 12a7b91176f..7829e265ccb 100644
--- a/toolkit/themes/pinstripe/global/preferences.css
+++ b/toolkit/themes/pinstripe/global/preferences.css
@@ -79,7 +79,7 @@ radio[pane][selected="true"] {
   -moz-border-image: url("chrome://global/skin/icons/panebutton-active.png") 0 2 repeat stretch;
 }
 
-prefwindow:not([active]) radio[pane][selected="true"] {
+radio[pane][selected="true"]:-moz-window-inactive {
   -moz-border-image: url("chrome://global/skin/icons/panebutton-inactive.png") 0 2 repeat stretch;
 }
 
diff --git a/toolkit/themes/pinstripe/global/toolbar/toolbar-background-inactive.png b/toolkit/themes/pinstripe/global/toolbar/toolbar-background-inactive.png
deleted file mode 100644
index a4751e7a673..00000000000
Binary files a/toolkit/themes/pinstripe/global/toolbar/toolbar-background-inactive.png and /dev/null differ
diff --git a/toolkit/themes/pinstripe/global/toolbar/toolbar-background.gif b/toolkit/themes/pinstripe/global/toolbar/toolbar-background.gif
deleted file mode 100644
index cd3fecb63e9..00000000000
Binary files a/toolkit/themes/pinstripe/global/toolbar/toolbar-background.gif and /dev/null differ
diff --git a/toolkit/themes/pinstripe/global/viewbuttons.css b/toolkit/themes/pinstripe/global/viewbuttons.css
index ee370da1ec5..ba29831f865 100644
--- a/toolkit/themes/pinstripe/global/viewbuttons.css
+++ b/toolkit/themes/pinstripe/global/viewbuttons.css
@@ -88,19 +88,19 @@
   -moz-box-shadow: inset #1c1c1c 0 3px 5px;
 }
 
-:root:not([active]) #viewGroup {
+#viewGroup:-moz-window-inactive {
   background-color: rgba(0, 0, 0, 0.25);
 }
 
-:root:not([active]) #viewGroup > radio,
-:root:not([active]) #viewGroup > toolbarbutton {
+#viewGroup > radio:-moz-window-inactive,
+#viewGroup > toolbarbutton:-moz-window-inactive {
   color: @toolbarbuttonInactiveFontColor@ !important; /* remove this when we support click-through */
   border-color: rgba(0, 0, 0, 0.4);
   background-image: @toolbarbuttonInactiveBackgroundImage@;
 }
 
-:root:not([active]) #viewGroup > radio[selected=true],
-:root:not([active]) #viewGroup > toolbarbutton[checked=true] {
+#viewGroup > radio[selected=true]:-moz-window-inactive,
+#viewGroup > toolbarbutton[checked=true]:-moz-window-inactive {
   color: #E6E6E6 !important; /* remove this when we support click-through */
   background: #8E8E8E;
   -moz-box-shadow: inset rgba(0, 0, 0, 0.5) 0 3px 5px;
diff --git a/toolkit/themes/pinstripe/mozapps/downloads/downloads.css b/toolkit/themes/pinstripe/mozapps/downloads/downloads.css
index fed4ebef027..922c9c33a03 100644
--- a/toolkit/themes/pinstripe/mozapps/downloads/downloads.css
+++ b/toolkit/themes/pinstripe/mozapps/downloads/downloads.css
@@ -110,7 +110,7 @@ richlistitem[type="download"] button {
   -moz-appearance: statusbar;
 }
 
-:root:not([active]) #searchbox {
+#searchbox:-moz-window-inactive {
   opacity: 0.7;
 }
 
@@ -134,7 +134,7 @@ richlistitem[type="download"] button {
   -moz-box-shadow: @toolbarbuttonPressedInnerShadow@, @loweredShadow@;
 }
 
-:root:not([active]) #clearListButton {
+#clearListButton:-moz-window-inactive {
   color: @toolbarbuttonInactiveFontColor@ !important; /* remove this when we support click-through, bug 392188 */
   border-color: @toolbarbuttonInactiveBorderColor@;
   background-image: @toolbarbuttonInactiveBackgroundImage@;
diff --git a/toolkit/themes/pinstripe/mozapps/update/updates.css b/toolkit/themes/pinstripe/mozapps/update/updates.css
index 909fb794f17..f48c24b0a02 100644
--- a/toolkit/themes/pinstripe/mozapps/update/updates.css
+++ b/toolkit/themes/pinstripe/mozapps/update/updates.css
@@ -57,7 +57,7 @@ wizardpage {
   -moz-box-shadow: @toolbarbuttonPressedInnerShadow@, @loweredShadow@;
 }
 
-:root:not([active]) .wizard-buttons button {
+.wizard-buttons button:-moz-window-inactive {
   color: @toolbarbuttonInactiveFontColor@ !important; /* remove this when we support click-through, bug 392188 */
   border-color: @toolbarbuttonInactiveBorderColor@;
   background-image: @toolbarbuttonInactiveBackgroundImage@;
diff --git a/toolkit/themes/winstripe/global/global.css b/toolkit/themes/winstripe/global/global.css
index faec1e81b42..c0736b8d58d 100644
--- a/toolkit/themes/winstripe/global/global.css
+++ b/toolkit/themes/winstripe/global/global.css
@@ -164,12 +164,6 @@ statusbarpanel:not(.statusbar-resizerpanel):-moz-lwtheme {
   padding: 0 1px;
 }
 
-%ifdef XP_WIN
-window:not([active="true"]) menubar > menu {
-  color: ThreeDShadow;
-}
-%endif
-
 /* XXXBlake yeah, shoot me -- these don't belong here.  I'll move them later. */
 
 sidebarheader {
diff --git a/toolkit/themes/winstripe/global/jar.mn b/toolkit/themes/winstripe/global/jar.mn
index 1ded0a017bc..510b6aca9d4 100644
--- a/toolkit/themes/winstripe/global/jar.mn
+++ b/toolkit/themes/winstripe/global/jar.mn
@@ -26,7 +26,7 @@ toolkit.jar:
         skin/classic/global/groupbox.css
         skin/classic/global/linkTree.css
         skin/classic/global/listbox.css
-        skin/classic/global/menu.css
+*       skin/classic/global/menu.css
         skin/classic/global/menulist.css
         skin/classic/global/netError.css
         skin/classic/global/numberbox.css
diff --git a/toolkit/themes/winstripe/global/menu.css b/toolkit/themes/winstripe/global/menu.css
index cef00749713..33b5f7ca4e8 100644
--- a/toolkit/themes/winstripe/global/menu.css
+++ b/toolkit/themes/winstripe/global/menu.css
@@ -169,6 +169,12 @@ menubar > menu:-moz-lwtheme[_moz-menuactive="true"]:not([disabled="true"]) {
   text-shadow: none;
 }
 
+%ifdef XP_WIN
+menubar > menu:-moz-window-inactive {
+  color: ThreeDShadow;
+}
+%endif
+
 /* ..... internal content .... */
 
 .menubar-left {