diff --git a/toolkit/themes/faststripe/global/menu.css b/toolkit/themes/faststripe/global/menu.css
index 146dabbd8887..96855eeb577b 100644
--- a/toolkit/themes/faststripe/global/menu.css
+++ b/toolkit/themes/faststripe/global/menu.css
@@ -137,10 +137,7 @@ menuitem.menuitem-iconic > .menu-iconic-left {
 /* ::::: menu/menuitems in menubar ::::: */
 
 menubar > menu {
-  border: 2px solid transparent;
-}
-menubar > menu[_moz-menuactive="true"][open="true"] {
-  border-width: 3px 1px 1px 3px;
+  padding: 1px 2px 2px 2px;
 }
 menubar > menu[_moz-menuactive="true"],
 menubar > menu[_moz-menuactive="true"][open="true"] {
@@ -165,6 +162,7 @@ menupopup > menu,
 popup > menu,
 menupopup > menuitem,
 popup > menuitem {
+  padding-bottom: 1px;
   max-width: 42em;
 }
 
@@ -257,10 +255,7 @@ menuitem[type="radio"] > .menu-iconic-left > .menu-iconic-icon {
 /* ::::: menuseparator ::::: */
 
 menuseparator {
-  padding-left: 4px;
-  padding-right: 4px;
-  padding-top: 2px;
-  padding-bottom: 0px;
+  margin: 3px 1px 5px 1px;
   border-bottom: 1px solid gray;
 }
 
diff --git a/toolkit/themes/winstripe/global/jar.mn b/toolkit/themes/winstripe/global/jar.mn
index d13a4d69f54a..178148cc9f95 100644
--- a/toolkit/themes/winstripe/global/jar.mn
+++ b/toolkit/themes/winstripe/global/jar.mn
@@ -46,7 +46,7 @@ classic.jar:
         skin/classic/global/splitter.css
         skin/classic/global/tabbox.css
         skin/classic/global/textbox.css
-        skin/classic/global/toolbar.css
+*       skin/classic/global/toolbar.css
         skin/classic/global/toolbarbutton.css
         skin/classic/global/tree.css
         skin/classic/global/wizard.css
diff --git a/toolkit/themes/winstripe/global/toolbar.css b/toolkit/themes/winstripe/global/toolbar.css
index 4a64733dd29d..5c3648e1a4c6 100644
--- a/toolkit/themes/winstripe/global/toolbar.css
+++ b/toolkit/themes/winstripe/global/toolbar.css
@@ -47,8 +47,10 @@
 toolbox {
   -moz-appearance: toolbox;
   background-color: -moz-Dialog;
+%ifndef WINCE
   border-top: 2px solid;
   -moz-border-top-colors: ThreeDShadow ThreeDHighlight;
+%endif
 }
 
 /* ::::: toolbar & menubar ::::: */