Bug 958413 - [Australis] Bookmarks menu button dropdown icon has the wrong aspect ratio when placed in the Bookmarks Toolbar. r=Gijs

browser/base/content/browser-customization.js

@@ -14,6 +14,9 @@ let CustomizationHandler = {
       case "customizationstarting":
         this._customizationStarting();
         break;
+      case "customizationchange":
+        this._customizationChange();
+        break;
       case "customizationending":
         this._customizationEnding(aEvent.detail);
         break;
@@ -53,6 +56,11 @@ let CustomizationHandler = {
     }
   },
 
+  _customizationChange: function() {
+    gHomeButton.updatePersonalToolbarStyle();
+    BookmarkingUI.customizeChange();
+  },
+
   _customizationEnding: function(aDetails) {
     // Update global UI elements that may have been added or removed
     if (aDetails.changed) {

browser/base/content/browser.js

@@ -1045,7 +1045,6 @@ var gBrowserInit = {
       gBrowser.selectedBrowser.focus();
 
     gNavToolbox.customizeDone = BrowserToolboxCustomizeDone;
-    gNavToolbox.customizeChange = BrowserToolboxCustomizeChange;
 
     // Set up Sanitize Item
     this._initializeSanitizer();
@@ -1151,6 +1150,7 @@ var gBrowserInit = {
     window.addEventListener("dragover", MousePosTracker, false);
 
     gNavToolbox.addEventListener("customizationstarting", CustomizationHandler);
+    gNavToolbox.addEventListener("customizationchange", CustomizationHandler);
     gNavToolbox.addEventListener("customizationending", CustomizationHandler);
 
     // End startup crash tracking after a delay to catch crashes while restoring
@@ -3287,11 +3287,6 @@ function BrowserToolboxCustomizeDone(aToolboxChanged) {
   gCustomizeMode.exit(aToolboxChanged);
 }
 
-function BrowserToolboxCustomizeChange(aType) {
-  gHomeButton.updatePersonalToolbarStyle();
-  BookmarksMenuButton.customizeChange();
-}
-
 /**
  * Update the global flag that tracks whether or not any edit UI (the Edit menu,
  * edit-related items in the context menu, and edit-related toolbar buttons

browser/themes/windows/browser.css

@@ -1375,7 +1375,7 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
   -moz-margin-start: 5px;
 }
 
-#bookmarks-menu-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
+#bookmarks-menu-button[cui-areatype="toolbar"]:not(.bookmark-item) > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
   padding-top: 2px;
   padding-bottom: 2px;
 }