diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index e6b11cd96909..b1ed61b1babe 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -776,7 +776,7 @@
                        cui-areatype="toolbar"
                        oncommand="BookmarkingUI.onCommand(event);">
           <menupopup id="BMB_bookmarksPopup"
-                     class="cui-widget-panel cui-widget-panelview cui-widget-panelWithFooter"
+                     class="cui-widget-panel cui-widget-panelview cui-widget-panelWithFooter PanelUI-subView"
                      placespopup="true"
                      context="placesContext"
                      openInTabs="children"
diff --git a/browser/themes/osx/customizableui/panelUIOverlay.css b/browser/themes/osx/customizableui/panelUIOverlay.css
index ccb62a1e5d35..fe45e8bda2bd 100644
--- a/browser/themes/osx/customizableui/panelUIOverlay.css
+++ b/browser/themes/osx/customizableui/panelUIOverlay.css
@@ -89,3 +89,8 @@
 .cui-widget-panelview menuseparator {
   padding: 0 !important;
 }
+
+.PanelUI-subView menuitem[checked="true"]::before,
+.PanelUI-subView toolbarbutton[checked="true"]::before {
+  margin: 0 5px;
+}
diff --git a/browser/themes/shared/customizableui/panelUIOverlay.inc.css b/browser/themes/shared/customizableui/panelUIOverlay.inc.css
index 81311f499942..4ba2b2b62d21 100644
--- a/browser/themes/shared/customizableui/panelUIOverlay.inc.css
+++ b/browser/themes/shared/customizableui/panelUIOverlay.inc.css
@@ -84,6 +84,7 @@
 
 .cui-widget-panelview .subviewbutton.panel-subview-footer {
   margin: 4px 0 0;
+  -moz-box-pack: center;
 }
 
 #PanelUI-mainView {
@@ -549,7 +550,8 @@ panelview .toolbarbutton-1,
 .subviewbutton.panel-subview-footer > .toolbarbutton-text,
 .subviewbutton.panel-subview-footer > .menu-text {
   -moz-padding-start: 0;
-  text-align: center;
+  -moz-padding-end: 12px;
+  -moz-box-flex: 0;
 }
 
 .subviewbutton:not(.panel-subview-footer) {
diff --git a/browser/themes/windows/customizableui/panelUIOverlay.css b/browser/themes/windows/customizableui/panelUIOverlay.css
index 2c43be6f684d..e2ce3fb1d067 100644
--- a/browser/themes/windows/customizableui/panelUIOverlay.css
+++ b/browser/themes/windows/customizableui/panelUIOverlay.css
@@ -35,6 +35,11 @@
   padding: 0 6px;
 }
 
+#BMB_bookmarksPopup menuitem[checked="true"]::before,
+#BMB_bookmarksPopup toolbarbutton[checked="true"]::before {
+  margin: 0 9px;
+}
+
 %ifdef WINDOWS_AERO
 /* Win8 and beyond. */
 @media not all and (-moz-os-version: windows-vista) {
diff --git a/toolkit/content/widgets/menu.xml b/toolkit/content/widgets/menu.xml
index 767f2f6bad38..628c8f643e59 100644
--- a/toolkit/content/widgets/menu.xml
+++ b/toolkit/content/widgets/menu.xml
@@ -169,7 +169,7 @@
   <binding id="menu"
            extends="chrome://global/content/bindings/menu.xml#menu-base">
     <content>
-      <xul:label class="menu-text" flex="1" xbl:inherits="value=label,accesskey,crop" crop="right"/>
+      <xul:label class="menu-text" xbl:inherits="value=label,accesskey,crop" crop="right"/>
       <xul:hbox class="menu-accel-container" anonid="accel">
         <xul:label class="menu-accel" xbl:inherits="value=acceltext"/>
       </xul:hbox>
@@ -182,7 +182,7 @@
 
   <binding id="menuitem" extends="chrome://global/content/bindings/menu.xml#menuitem-base">
     <content>
-      <xul:label class="menu-text" flex="1" xbl:inherits="value=label,accesskey,crop" crop="right"/>
+      <xul:label class="menu-text" xbl:inherits="value=label,accesskey,crop" crop="right"/>
       <xul:hbox class="menu-accel-container" anonid="accel">
         <xul:label class="menu-accel" xbl:inherits="value=acceltext"/>
       </xul:hbox>
diff --git a/toolkit/content/xul.css b/toolkit/content/xul.css
index 9ed03f7f697d..595ace6f03d3 100644
--- a/toolkit/content/xul.css
+++ b/toolkit/content/xul.css
@@ -369,6 +369,10 @@ menuitem.menuitem-non-iconic {
   -moz-binding: url("chrome://global/content/bindings/menu.xml#menubutton-item");
 }
 
+.menu-text {
+  -moz-box-flex: 1;
+}
+
 %ifdef MOZ_WIDGET_GTK
 /********* detection of system setting to use icons in menus ***********/
 @media not all and (-moz-images-in-menus) {