Bug 514854 - Default theme issues with some menulists

r/sr=neil a-sm2.0=kairo

editor/ui/dialogs/content/EdImageOverlay.xul

@@ -259,12 +259,22 @@
         <caption id="alignLabel" label="&alignment.label;"/>
         <menulist id="alignTypeSelect" class="align-menu">
           <menupopup>
-            <menuitem class="align-menu" value="top"    label="&topPopup.value;"/>
-            <menuitem class="align-menu" value="middle" label="&centerPopup.value;"/>
-            <menuitem class="align-menu" value="bottom" label="&bottomPopup.value;"/>
+            <menuitem class="align-menu menuitem-iconic"
+                      value="top"
+                      label="&topPopup.value;"/>
+            <menuitem class="align-menu menuitem-iconic"
+                      value="middle"
+                      label="&centerPopup.value;"/>
+            <menuitem class="align-menu menuitem-iconic"
+                      value="bottom"
+                      label="&bottomPopup.value;"/>
             <!-- HTML attribute value is opposite of the button label on purpose -->
-            <menuitem class="align-menu" value="right"  label="&wrapLeftPopup.value;"/>
-            <menuitem class="align-menu" value="left"   label="&wrapRightPopup.value;"/>
+            <menuitem class="align-menu menuitem-iconic"
+                      value="right"
+                      label="&wrapLeftPopup.value;"/>
+            <menuitem class="align-menu menuitem-iconic"
+                      value="left"
+                      label="&wrapRightPopup.value;"/>
           </menupopup>
         </menulist>
       </groupbox>

suite/common/pref/pref-search.xul

@@ -77,7 +77,8 @@
                   preference="browser.search.defaultengine">
           <template>
             <menupopup>
-              <menuitem value="..."
+              <menuitem class="menuitem-iconic"
+                        value="..."
                         uri="..."
                         image="rdf:http://home.netscape.com/NC-rdf#Icon"
                         label="rdf:http://home.netscape.com/NC-rdf#Name"/>

suite/themes/classic/communicator/communicator.css

@@ -101,6 +101,12 @@
   margin: 0px !important;
 }
 
+/* ::::: iconic menuitems ::::: */
+
+menuitem.menuitem-iconic > .menu-iconic-left {
+  display: -moz-box;
+}
+
 /* ::::: download manager ::::: */
 
 #downloadView > treechildren::-moz-tree-image(Name) {