--- a/mail/components/compose/content/editorOverlay.xul
+++ b/mail/components/compose/content/editorOverlay.xul
@@ -870,18 +870,17 @@
              tooltiptext="&FontFaceSelect.tooltip;"
              observes="cmd_renderedHTMLEnabler">
   <menulist id="FontFaceSelect"
             class="toolbar-focustarget"
             oncommand="doStatefulCommand('cmd_fontFace', event.target.value)"
             crop="right">
     <observes element="font-face-select-container" attribute="disabled"/>
     <observes element="cmd_fontFace" attribute="state" onbroadcast="onFontFaceChange(this.parentNode, 'cmd_fontFace')"/>
-    <menupopup id="FontFacePopup"
-               class="noIconPopup">
+    <menupopup id="FontFacePopup">
       <menuitem id="toolbarmenu_fontVarWidth" label="&fontVarWidth.label;" value=""/>
       <menuitem id="toolbarmenu_fontFixedWidth" label="&fontFixedWidth.label;" value="tt"/>
       <menuseparator id="toolbarmenuAfterGenericFontsSeparator"/>
       <menuitem id="toolbarmenu_fontHelvetica" label="&fontHelvetica.label;"
                 value="Helvetica, Arial, sans-serif"/>
       <menuitem id="toolbarmenu_fontTimes" label="&fontTimes.label;"
                 value="Times New Roman, Times, serif"/>
       <menuitem id="toolbarmenu_fontCourier" label="&fontCourier.label;"

--- a/mail/components/compose/content/messengercompose.xul
+++ b/mail/components/compose/content/messengercompose.xul
@@ -917,18 +917,17 @@
           <hbox id="top-gradient-box">
             <hbox align="center" pack="end" style="&headersSpace.style;">
               <label id="identityLabel" value="&fromAddr.label;"
                      accesskey="&fromAddr.accesskey;" control="msgIdentity"/>
             </hbox>
             <menulist id="msgIdentity" type="description" flex="1"
                       disableautoselect="true" onkeypress="fromKeyPress(event);"
                       oncommand="LoadIdentity(false);" disableonsend="true">
-              <menupopup id="msgIdentityPopup"
-                         class="noIconPopup"/>
+              <menupopup id="msgIdentityPopup"/>
             </menulist>
           </hbox>
           <listbox id="addressingWidget" flex="1" seltype="multiple" rows="1"
                    onkeydown="awKeyDown(event, this)"
                    onclick="awClickEmptySpace(event.originalTarget, true)"
                    disableonsend="true">
             <listcols>
               <listcol id="typecol-addressingWidget" style="&headersSpace.style;"/>

--- a/mail/themes/windows/mail/messenger.css
+++ b/mail/themes/windows/mail/messenger.css
@@ -429,25 +429,16 @@ button[type="menu-button"] > button {
       transition-duration: 10ms;
     }
 
     .toolbarbutton-1[checked=true]:not(:active):hover {
       background-color: var(--toolbarbutton-checkedhover-backgroundcolor);
       transition: background-color .4s;
     }
   }
-
-  .noIconPopup > menuseparator {
-    -moz-appearance: none;
-    margin-top: 3px;
-    margin-bottom: 3px;
-    padding-top: 0;
-    padding-bottom: 0;
-    border-top-color: #d7d7d7;
-  }
 }
 
 @media (-moz-windows-default-theme) and (-moz-os-version: windows-vista),
        (-moz-windows-default-theme) and (-moz-os-version: windows-win7) {
   :root {
     --toolbarbutton-hover-background: linear-gradient(hsla(0, 0%, 100%, .6), hsla(0, 0%, 100%, .1));
     --toolbarbutton-hover-bordercolor: hsla(210, 54%, 20%, .15) hsla(210, 54%, 20%, .2) hsla(210, 54%, 20%, .25);
     --toolbarbutton-hover-boxshadow: 0 1px hsla(0, 0%, 100%, .3) inset,