--- a/browser/themes/shared/devtools/toolbars.inc.css
+++ b/browser/themes/shared/devtools/toolbars.inc.css
@@ -80,16 +80,25 @@
 }
 
 #toolbox-buttons .devtools-toolbarbutton[text-as-image] {
   -moz-padding-start: 5px;
   -moz-padding-end: 5px;
   min-width: inherit;
 }
 
+/* Command buttons with menupopups should be styled slightly differently -
+   no background color and a bit more narrow */
+#toolbox-buttons .devtools-toolbarbutton:not([text-as-image]):not(:hover):not([open=true]) {
+  background: transparent;
+}
+#toolbox-buttons .devtools-toolbarbutton[type=menu] > .toolbarbutton-menu-dropmarker {
+  padding: 0 2px;
+}
+
 .devtools-toolbarbutton:not([label]) > .toolbarbutton-text {
   display: none;
 }
 
 .devtools-toolbar .devtools-toolbarbutton {
   border-width: 0;
 }
 
@@ -562,16 +571,19 @@
   background-position: -16px center;
 }
 .command-button:hover:active > image {
   background-position: -32px center;
 }
 .command-button[checked=true] > image {
   background-position: -48px center;
 }
+.command-button[open=true] > image {
+  background-position: 0 center;
+}
 
 #command-button-paintflashing > image {
   background-image: url("chrome://browser/skin/devtools/command-paintflashing.png");
 }
 
 #command-button-screenshot > image {
   background-image: url("chrome://browser/skin/devtools/command-screenshot.png");
 }