--- a/browser/themes/shared/customizableui/panelUI.inc.css
+++ b/browser/themes/shared/customizableui/panelUI.inc.css
@@ -945,21 +945,20 @@ panelview .toolbarbutton-1,
 
 .subviewbutton > .menu-accel-container > .menu-iconic-accel,
 .subviewbutton > .menu-accel-container > .menu-accel {
   margin-inline-end: 0 !important; /* to override menu.css on Windows */
 }
 
 #widget-overflow-fixed-list .toolbarbutton-1 > .toolbarbutton-text,
 #widget-overflow-list .toolbarbutton-1 > .toolbarbutton-text,
-.subviewbutton:not(.panel-subview-footer) > .toolbarbutton-text,
-.addon-banner-item > .toolbarbutton-text,
-/* Bookmark items need a more specific selector. */
-.PanelUI-subView .subviewbutton:not(.panel-subview-footer) > .menu-text,
-.PanelUI-subView .subviewbutton:not(.panel-subview-footer) > .menu-iconic-text {
+.addon-banner-item,
+.subviewbutton,
+.subviewbutton-nav,
+.subview-subheader {
   font: menu;
 }
 
 .subviewbutton[shortcut]::after {
   content: attr(shortcut);
   float: right;
   color: var(--panel-disabled-color);
 }
@@ -1090,21 +1089,16 @@ panelmultiview .toolbaritem-combined-but
   font-size: 1em;
   padding-inline-start: 0;
 }
 
 .subview-subheader {
   color: var(--panel-disabled-color);
 }
 
-.subview-subheader,
-.panel-subview-footer {
-  font: menu;
-}
-
 panelview .toolbarbutton-1 {
   margin-top: 6px;
 }
 
 panelview .toolbarbutton-1@buttonStateHover@,
 toolbarbutton.subviewbutton@buttonStateHover@,
 menu.subviewbutton@menuStateHover@,
 menuitem.subviewbutton@menuStateHover@,
@@ -1138,21 +1132,16 @@ menuitem.panel-subview-footer@menuStateH
 }
 
 menuitem.panel-subview-footer@menuStateActive@,
 .subviewbutton.panel-subview-footer@buttonStateActive@ {
   background-color: var(--arrowpanel-dimmed-even-further);
   box-shadow: 0 1px 0 hsla(210,4%,10%,.05) inset;
 }
 
-#BMB_bookmarksPopup .subviewbutton {
-  font: menu;
-  font-weight: normal;
-}
-
 #BMB_bookmarksPopup .subviewbutton:not([disabled="true"]) {
   color: inherit;
 }
 
 #BMB_bookmarksPopup .subviewbutton > .menu-iconic-left {
   margin-inline-end: 3px;
 }