diff --git a/browser/themes/shared/toolbarbuttons.css b/browser/themes/shared/toolbarbuttons.css
index a8df2d5cd8b3009daa033a9bf06908be78adeb3b..8c47fd0056599c539eb309eb90b465921400aae4 100644
--- a/browser/themes/shared/toolbarbuttons.css
+++ b/browser/themes/shared/toolbarbuttons.css
@@ -254,7 +254,7 @@ toolbar .toolbaritem-combined-buttons > separator {
 #nav-bar-overflow-button {
   list-style-image: url("chrome://global/skin/icons/chevron.svg");
 
-  #nav-bar:not([overflowing], [nonemptyoverflow], [customizing]) > & {
+  toolbar:not([overflowing], [nonemptyoverflow], [customizing]) > & {
     display: none;
   }
 
@@ -464,7 +464,7 @@ toolbarbutton.bookmark-item:not(.subviewbutton) {
      */
     align-items: stretch;
     > .toolbarbutton-icon {
-      height: auto;
+      margin-top: auto; margin-bottom: auto;
     }
     > .toolbarbutton-badge-stack {
       align-items: center;