Bug 1559127 - Remove unused code and other new appmenu follow-ups. r=darktrojan a=jorgk
authorPaul Morris <paul@paulwmorris.com>
Fri, 05 Jul 2019 17:16:14 -0400
changeset 36060 3477bbfe61fb4c9a5b06841f22cb3b0c11f5b87b
parent 36059 1128588a732a5d64cd7dc240536fc43ec9d6af27
child 36074 597ef56645a681038a4945c6d8c9057ed779d5b3
push id392
push userclokep@gmail.com
push dateMon, 02 Sep 2019 20:17:19 +0000
reviewersdarktrojan, jorgk
bugs1559127
Bug 1559127 - Remove unused code and other new appmenu follow-ups. r=darktrojan a=jorgk
mail/base/content/attachmentList.css
mail/base/content/msgHdrPopup.inc.xul
mail/components/customizableui/CustomizableWidgets.jsm
mail/components/customizableui/PanelMultiView.jsm
mail/components/customizableui/content/panelUI.inc.xul
mail/components/customizableui/content/panelUI.js
mail/themes/linux/mail/primaryToolbar.css
mail/themes/osx/customizableui/panelUI.css
mail/themes/osx/mail/primaryToolbar.css
mail/themes/shared/customizableui/panelUI.css
mail/themes/windows/mail/primaryToolbar.css
--- a/mail/base/content/attachmentList.css
+++ b/mail/base/content/attachmentList.css
@@ -58,18 +58,17 @@
 }
 
 #attachmentMenuList > menu:hover > .text-link {
   text-decoration-line: underline;
 }
 
 #attachmentName.notfound,
 .attachmentItem.notfound,
-#attachmentMenuList > menu.notfound,
-#appmenu_attachmentMenuList > menu.notfound {
+#attachmentMenuList > menu.notfound {
   text-decoration-line: line-through;
 }
 
 .attachmentItem > * {
   pointer-events: none;
 }
 
 .attachmentcell-size {
--- a/mail/base/content/msgHdrPopup.inc.xul
+++ b/mail/base/content/msgHdrPopup.inc.xul
@@ -93,33 +93,16 @@
      <menuitem label="&detachAllAttachmentsCmd.label;"
                accesskey="&detachAllAttachmentsCmd.accesskey;"
                command="cmd_detachAllAttachments" />
      <menuitem label="&deleteAllAttachmentsCmd.label;"
                accesskey="&deleteAllAttachmentsCmd.accesskey;"
                command="cmd_deleteAllAttachments" />
   </menupopup>
 
-  <menupopup id="appmenu_attachmentMenuList"
-             onpopupshowing="FillAttachmentListPopup(event, this);">
-     <menuseparator/>
-     <menuitem label="&openAllAttachmentsCmd.label;"
-               accesskey="&openAllAttachmentsCmd.accesskey;"
-               command="cmd_openAllAttachments" />
-     <menuitem label="&saveAllAttachmentsCmd.label;"
-               accesskey="&saveAllAttachmentsCmd.accesskey;"
-               command="cmd_saveAllAttachments"/>
-     <menuitem label="&detachAllAttachmentsCmd.label;"
-               accesskey="&detachAllAttachmentsCmd.accesskey;"
-               command="cmd_detachAllAttachments" />
-     <menuitem label="&deleteAllAttachmentsCmd.label;"
-               accesskey="&deleteAllAttachmentsCmd.accesskey;"
-               command="cmd_deleteAllAttachments" />
-  </menupopup>
-
   <menupopup id="attachment-toolbar-context-menu"
              onpopupshowing="return onShowAttachmentToolbarContextMenu(event);">
     <menuitem id="context-expandAttachmentBar"
               type="checkbox"
               label="&startExpandedCmd.label;"
               accesskey="&startExpandedCmd.accesskey;"
               oncommand="Services.prefs.setBoolPref('mailnews.attachments.display.start_expanded', this.getAttribute('checked'));"/>
   </menupopup>
--- a/mail/components/customizableui/CustomizableWidgets.jsm
+++ b/mail/components/customizableui/CustomizableWidgets.jsm
@@ -7,25 +7,20 @@
 var EXPORTED_SYMBOLS = ["CustomizableWidgets"];
 
 const {CustomizableUI} = ChromeUtils.import("resource:///modules/CustomizableUI.jsm");
 const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 const {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
-  // TODO appmenu - The usage of these commented-out modules is commented out below.
-  // Commenting them out here for eslint compliance.
-  // PanelView: "resource:///modules/PanelMultiView.jsm",
   RecentlyClosedTabsAndWindowsMenuUtils: "resource:///modules/sessionstore/RecentlyClosedTabsAndWindowsMenuUtils.jsm",
   ShortcutUtils: "resource://gre/modules/ShortcutUtils.jsm",
   CharsetMenu: "resource://gre/modules/CharsetMenu.jsm",
   PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.jsm",
-  // Sanitizer: "resource:///modules/Sanitizer.jsm",
-  // SyncedTabs: "resource://services-sync/SyncedTabs.jsm",
 });
 
 XPCOMUtils.defineLazyGetter(this, "CharsetBundle", function() {
   const kCharsetBundle = "chrome://global/locale/charsetMenu.properties";
   return Services.strings.createBundle(kCharsetBundle);
 });
 
 const kPrefCustomizationDebug = "browser.uiCustomization.debug";
@@ -502,250 +497,16 @@ const CustomizableWidgets = [
     id: "email-link-button",
     tooltiptext: "email-link-button.tooltiptext3",
     onCommand(aEvent) {
       let win = aEvent.view;
       win.MailIntegration.sendLinkForBrowser(win.gBrowser.selectedBrowser);
     },
   }];
 
-// TODO appmenu - This errors when _defineBuiltInWidgets runs in
-// CustomizableUI.jsm. (We aren't using Firefox accounts, so no problem.)
-// if (Services.prefs.getBoolPref("identity.fxaccounts.enabled")) {
-//   CustomizableWidgets.push({
-//     id: "sync-button",
-//     label: "remotetabs-panelmenu.label",
-//     tooltiptext: "remotetabs-panelmenu.tooltiptext2",
-//     type: "view",
-//     viewId: "PanelUI-remotetabs",
-//     deckIndices: {
-//       DECKINDEX_TABS: 0,
-//       DECKINDEX_TABSDISABLED: 1,
-//       DECKINDEX_FETCHING: 2,
-//       DECKINDEX_NOCLIENTS: 3,
-//     },
-//     TABS_PER_PAGE: 25,
-//     NEXT_PAGE_MIN_TABS: 5, // Minimum number of tabs displayed when we click "Show All"
-//     onViewShowing(aEvent) {
-//       let doc = aEvent.target.ownerDocument;
-//       this._tabsList = doc.getElementById("PanelUI-remotetabs-tabslist");
-//       Services.obs.addObserver(this, SyncedTabs.TOPIC_TABS_CHANGED);
-
-//       if (SyncedTabs.isConfiguredToSyncTabs) {
-//         if (SyncedTabs.hasSyncedThisSession) {
-//           this.setDeckIndex(this.deckIndices.DECKINDEX_TABS);
-//         } else {
-//           // Sync hasn't synced tabs yet, so show the "fetching" panel.
-//           this.setDeckIndex(this.deckIndices.DECKINDEX_FETCHING);
-//         }
-//         // force a background sync.
-//         SyncedTabs.syncTabs().catch(ex => {
-//           Cu.reportError(ex);
-//         });
-//         // show the current list - it will be updated by our observer.
-//         this._showTabs();
-//       } else {
-//         // not configured to sync tabs, so no point updating the list.
-//         this.setDeckIndex(this.deckIndices.DECKINDEX_TABSDISABLED);
-//       }
-//     },
-//     onViewHiding() {
-//       Services.obs.removeObserver(this, SyncedTabs.TOPIC_TABS_CHANGED);
-//       this._tabsList = null;
-//     },
-//     _tabsList: null,
-//     observe(subject, topic, data) {
-//       switch (topic) {
-//         case SyncedTabs.TOPIC_TABS_CHANGED:
-//           this._showTabs();
-//           break;
-//         default:
-//           break;
-//       }
-//     },
-//     setDeckIndex(index) {
-//       let deck = this._tabsList.ownerDocument.getElementById("PanelUI-remotetabs-deck");
-//       // We call setAttribute instead of relying on the XBL property setter due
-//       // to things going wrong when we try and set the index before the XBL
-//       // binding has been created - see bug 1241851 for the gory details.
-//       deck.setAttribute("selectedIndex", index);
-//     },
-
-//     _showTabsPromise: Promise.resolve(),
-//     // Update the tab list after any existing in-flight updates are complete.
-//     _showTabs(paginationInfo) {
-//       this._showTabsPromise = this._showTabsPromise.then(() => {
-//         return this.__showTabs(paginationInfo);
-//       }, e => {
-//         Cu.reportError(e);
-//       });
-//     },
-//     // Return a new promise to update the tab list.
-//     __showTabs(paginationInfo) {
-//       if (!this._tabsList) {
-//         // Closed between the previous `this._showTabsPromise`
-//         // resolving and now.
-//         return undefined;
-//       }
-//       let doc = this._tabsList.ownerDocument;
-//       return SyncedTabs.getTabClients().then(clients => {
-//         // The view may have been hidden while the promise was resolving.
-//         if (!this._tabsList) {
-//           return;
-//         }
-//         if (clients.length === 0 && !SyncedTabs.hasSyncedThisSession) {
-//           // the "fetching tabs" deck is being shown - let's leave it there.
-//           // When that first sync completes we'll be notified and update.
-//           return;
-//         }
-
-//         if (clients.length === 0) {
-//           this.setDeckIndex(this.deckIndices.DECKINDEX_NOCLIENTS);
-//           return;
-//         }
-
-//         this.setDeckIndex(this.deckIndices.DECKINDEX_TABS);
-//         this._clearTabList();
-//         SyncedTabs.sortTabClientsByLastUsed(clients);
-//         let fragment = doc.createDocumentFragment();
-
-//         for (let client of clients) {
-//           // add a menu separator for all clients other than the first.
-//           if (fragment.lastElementChild) {
-//             let separator = doc.createXULElement("menuseparator");
-//             fragment.appendChild(separator);
-//           }
-//           if (paginationInfo && paginationInfo.clientId == client.id) {
-//             this._appendClient(client, fragment, paginationInfo.maxTabs);
-//           } else {
-//             this._appendClient(client, fragment);
-//           }
-//         }
-//         this._tabsList.appendChild(fragment);
-//         PanelView.forNode(this._tabsList.closest("panelview"))
-//                  .descriptionHeightWorkaround();
-//       }).catch(err => {
-//         Cu.reportError(err);
-//       }).then(() => {
-//         // an observer for tests.
-//         Services.obs.notifyObservers(null, "synced-tabs-menu:test:tabs-updated");
-//       });
-//     },
-//     _clearTabList() {
-//       let list = this._tabsList;
-//       while (list.lastChild) {
-//         list.lastChild.remove();
-//       }
-//     },
-//     _showNoClientMessage() {
-//       this._appendMessageLabel("notabslabel");
-//     },
-//     _appendMessageLabel(messageAttr, appendTo = null) {
-//       if (!appendTo) {
-//         appendTo = this._tabsList;
-//       }
-//       let message = this._tabsList.getAttribute(messageAttr);
-//       let doc = this._tabsList.ownerDocument;
-//       let messageLabel = doc.createXULElement("label");
-//       messageLabel.textContent = message;
-//       appendTo.appendChild(messageLabel);
-//       return messageLabel;
-//     },
-//     _appendClient(client, attachFragment, maxTabs = this.TABS_PER_PAGE) {
-//       let doc = attachFragment.ownerDocument;
-//       // Create the element for the remote client.
-//       let clientItem = doc.createXULElement("label");
-//       clientItem.setAttribute("itemtype", "client");
-//       let window = doc.defaultView;
-//       clientItem.setAttribute("tooltiptext",
-//         window.gSync.formatLastSyncDate(new Date(client.lastModified)));
-//       clientItem.textContent = client.name;
-
-//       attachFragment.appendChild(clientItem);
-
-//       if (client.tabs.length == 0) {
-//         let label = this._appendMessageLabel("notabsforclientlabel", attachFragment);
-//         label.setAttribute("class", "PanelUI-remotetabs-notabsforclient-label");
-//       } else {
-//         // If this page will display all tabs, show no additional buttons.
-//         // If the next page will display all the remaining tabs, show a "Show All" button
-//         // Otherwise, show a "Shore More" button
-//         let hasNextPage = client.tabs.length > maxTabs;
-//         let nextPageIsLastPage = hasNextPage && maxTabs + this.TABS_PER_PAGE >= client.tabs.length;
-//         if (nextPageIsLastPage) {
-//           // When the user clicks "Show All", try to have at least NEXT_PAGE_MIN_TABS more tabs
-//           // to display in order to avoid user frustration
-//           maxTabs = Math.min(client.tabs.length - this.NEXT_PAGE_MIN_TABS, maxTabs);
-//         }
-//         if (hasNextPage) {
-//           client.tabs = client.tabs.slice(0, maxTabs);
-//         }
-//         for (let tab of client.tabs) {
-//           let tabEnt = this._createTabElement(doc, tab);
-//           attachFragment.appendChild(tabEnt);
-//         }
-//         if (hasNextPage) {
-//           let showAllEnt = this._createShowMoreElement(doc, client.id,
-//                                                        nextPageIsLastPage ?
-//                                                        Infinity :
-//                                                        maxTabs + this.TABS_PER_PAGE);
-//           attachFragment.appendChild(showAllEnt);
-//         }
-//       }
-//     },
-//     _createTabElement(doc, tabInfo) {
-//       let item = doc.createXULElement("toolbarbutton");
-//       let tooltipText = (tabInfo.title ? tabInfo.title + "\n" : "") + tabInfo.url;
-//       item.setAttribute("itemtype", "tab");
-//       item.setAttribute("class", "subviewbutton");
-//       item.setAttribute("targetURI", tabInfo.url);
-//       item.setAttribute("label", tabInfo.title != "" ? tabInfo.title : tabInfo.url);
-//       item.setAttribute("image", tabInfo.icon);
-//       item.setAttribute("tooltiptext", tooltipText);
-//       // We need to use "click" instead of "command" here so openUILink
-//       // respects different buttons (eg, to open in a new tab).
-//       item.addEventListener("click", e => {
-//         doc.defaultView.openUILink(tabInfo.url, e, {
-//           triggeringPrincipal: Services.scriptSecurityManager.createNullPrincipal({}),
-//         });
-//         if (doc.defaultView.whereToOpenLink(e) != "current") {
-//           e.preventDefault();
-//           e.stopPropagation();
-//         } else {
-//           CustomizableUI.hidePanelForNode(item);
-//         }
-//       });
-//       return item;
-//     },
-//     _createShowMoreElement(doc, clientId, showCount) {
-//       let labelAttr, tooltipAttr;
-//       if (showCount === Infinity) {
-//         labelAttr = "showAllLabel";
-//         tooltipAttr = "showAllTooltipText";
-//       } else {
-//         labelAttr = "showMoreLabel";
-//         tooltipAttr = "showMoreTooltipText";
-//       }
-//       let showAllItem = doc.createXULElement("toolbarbutton");
-//       showAllItem.setAttribute("itemtype", "showmorebutton");
-//       showAllItem.setAttribute("class", "subviewbutton");
-//       let label = this._tabsList.getAttribute(labelAttr);
-//       showAllItem.setAttribute("label", label);
-//       let tooltipText = this._tabsList.getAttribute(tooltipAttr);
-//       showAllItem.setAttribute("tooltiptext", tooltipText);
-//       showAllItem.addEventListener("click", e => {
-//         e.preventDefault();
-//         e.stopPropagation();
-//         this._showTabs({ clientId, maxTabs: showCount });
-//       });
-//       return showAllItem;
-//     },
-//   });
-// }
-
 let preferencesButton = {
   id: "preferences-button",
   onCommand(aEvent) {
     let win = aEvent.target.ownerGlobal;
     win.openPreferences(undefined);
   },
 };
 if (AppConstants.platform == "win") {
@@ -754,113 +515,16 @@ if (AppConstants.platform == "win") {
 } else if (AppConstants.platform == "macosx") {
   preferencesButton.tooltiptext = "preferences-button.tooltiptext.withshortcut";
   preferencesButton.shortcutId = "key_preferencesCmdMac";
 } else {
   preferencesButton.tooltiptext = "preferences-button.tooltiptext2";
 }
 CustomizableWidgets.push(preferencesButton);
 
-// TODO appmenu - This errors when _defineBuiltInWidgets runs in
-// CustomizableUI.jsm.
-// if (Services.prefs.getBoolPref("privacy.panicButton.enabled")) {
-//   CustomizableWidgets.push({
-//     id: "panic-button",
-//     type: "view",
-//     viewId: "PanelUI-panicView",
-
-//     forgetButtonCalled(aEvent) {
-//       let doc = aEvent.target.ownerDocument;
-//       let group = doc.getElementById("PanelUI-panic-timeSpan");
-//       let itemsToClear = [
-//         "cookies", "history", "openWindows", "formdata", "sessions", "cache", "downloads", "offlineApps",
-//       ];
-//       let newWindowPrivateState = PrivateBrowsingUtils.isWindowPrivate(doc.defaultView) ?
-//                                   "private" : "non-private";
-//       let promise = Sanitizer.sanitize(itemsToClear, {
-//         ignoreTimespan: false,
-//         range: Sanitizer.getClearRange(+group.value),
-//         privateStateForNewWindow: newWindowPrivateState,
-//       });
-//       promise.then(function() {
-//         let otherWindow = Services.wm.getMostRecentWindow("navigator:browser");
-//         if (otherWindow.closed) {
-//           Cu.reportError("Got a closed window!");
-//         }
-//         if (otherWindow.PanicButtonNotifier) {
-//           otherWindow.PanicButtonNotifier.notify();
-//         } else {
-//           otherWindow.PanicButtonNotifierShouldNotify = true;
-//         }
-//       });
-//     },
-//     handleEvent(aEvent) {
-//       switch (aEvent.type) {
-//         case "command":
-//           this.forgetButtonCalled(aEvent);
-//           break;
-//       }
-//     },
-//     onViewShowing(aEvent) {
-//       let win = aEvent.target.ownerGlobal;
-//       let doc = win.document;
-//       let eventBlocker = null;
-//       if (!doc.querySelector("#PanelUI-panic-timeframe")) {
-//         win.MozXULElement.insertFTLIfNeeded("browser/panicButton.ftl");
-//         let frag = win.MozXULElement.parseXULToFragment(`
-//           <vbox class="panel-subview-body">
-//             <hbox id="PanelUI-panic-timeframe">
-//               <image id="PanelUI-panic-timeframe-icon" alt=""/>
-//               <vbox flex="1">
-//                 <description data-l10n-id="panic-main-timeframe-desc" id="PanelUI-panic-mainDesc"></description>
-//                 <radiogroup id="PanelUI-panic-timeSpan" aria-labelledby="PanelUI-panic-mainDesc" closemenu="none">
-//                   <radio id="PanelUI-panic-5min" data-l10n-id="panic-button-5min" selected="true"
-//                         value="5" class="subviewradio"/>
-//                   <radio id="PanelUI-panic-2hr" data-l10n-id="panic-button-2hr"
-//                         value="2" class="subviewradio"/>
-//                   <radio id="PanelUI-panic-day" data-l10n-id="panic-button-day"
-//                         value="6" class="subviewradio"/>
-//                 </radiogroup>
-//               </vbox>
-//             </hbox>
-//             <vbox id="PanelUI-panic-explanations">
-//               <label id="PanelUI-panic-actionlist-main-label" data-l10n-id="panic-button-action-desc"></label>
-
-//               <label id="PanelUI-panic-actionlist-windows" class="PanelUI-panic-actionlist" data-l10n-id="panic-button-delete-tabs-and-windows"></label>
-//               <label id="PanelUI-panic-actionlist-cookies" class="PanelUI-panic-actionlist" data-l10n-id="panic-button-delete-cookies"></label>
-//               <label id="PanelUI-panic-actionlist-history" class="PanelUI-panic-actionlist" data-l10n-id="panic-button-delete-history"></label>
-//               <label id="PanelUI-panic-actionlist-newwindow" class="PanelUI-panic-actionlist" data-l10n-id="panic-button-open-new-window"></label>
-
-//               <label id="PanelUI-panic-warning" data-l10n-id="panic-button-undo-warning"></label>
-//             </vbox>
-//             <button id="PanelUI-panic-view-button"
-//                     data-l10n-id="panic-button-forget-button"/>
-//           </vbox>
-//         `);
-
-//         aEvent.target.appendChild(frag);
-//         eventBlocker = doc.l10n.translateElements([aEvent.target]);
-//       }
-
-//       let forgetButton = aEvent.target.querySelector("#PanelUI-panic-view-button");
-//       let group = doc.getElementById("PanelUI-panic-timeSpan");
-//       group.selectedItem = doc.getElementById("PanelUI-panic-5min");
-//       forgetButton.addEventListener("command", this);
-
-//       if (eventBlocker) {
-//         aEvent.detail.addBlocker(eventBlocker);
-//       }
-//     },
-//     onViewHiding(aEvent) {
-//       let forgetButton = aEvent.target.querySelector("#PanelUI-panic-view-button");
-//       forgetButton.removeEventListener("command", this);
-//     },
-//   });
-// }
-
 if (PrivateBrowsingUtils.enabled) {
   CustomizableWidgets.push({
     id: "privatebrowsing-button",
     shortcutId: "key_privatebrowsing",
     onCommand(e) {
       let win = e.target.ownerGlobal;
       win.OpenBrowserWindow({private: true});
     },
--- a/mail/components/customizableui/PanelMultiView.jsm
+++ b/mail/components/customizableui/PanelMultiView.jsm
@@ -976,17 +976,17 @@ var PanelMultiView = class extends Assoc
       return;
     }
 
     // Now set the viewContainer dimensions to that of the new view, which
     // kicks of the height animation.
     this._viewContainer.style.height = viewRect.height + "px";
     this._viewContainer.style.width = viewRect.width + "px";
 
-    // TODO appmenu - Removing the width here causes a double-wide panel flicker.
+    // TODO - Removing the width here causes a double-wide panel flicker.
     // this._panel.removeAttribute("width");
     this._panel.removeAttribute("height");
 
     // We're setting the width property to prevent flickering during the
     // sliding animation with smaller views.
     viewNode.style.width = viewRect.width + "px";
 
     // Kick off the transition!
--- a/mail/components/customizableui/content/panelUI.inc.xul
+++ b/mail/components/customizableui/content/panelUI.inc.xul
@@ -1,132 +1,12 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<panel id="widget-overflow"
-       role="group"
-       type="arrow"
-       noautofocus="true"
-       position="bottomcenter topright"
-       photon="true"
-       hidden="true">
-  <panelmultiview mainViewId="widget-overflow-mainView">
-    <panelview id="widget-overflow-mainView"
-               context="toolbar-context-menu">
-      <vbox class="panel-subview-body">
-        <vbox id="widget-overflow-list" class="widget-overflow-list"
-              overflowfortoolbar="nav-bar"/>
-        <toolbarseparator id="widget-overflow-fixed-separator" hidden="true"/>
-        <vbox id="widget-overflow-fixed-list" class="widget-overflow-list" hidden="true" />
-      </vbox>
-      <toolbarbutton command="cmd_CustomizeToolbars"
-                     id="overflowMenu-customize-button"
-                     class="subviewbutton panel-subview-footer"/>
-                     <!-- TODO appmenu
-                     accesskey="overflowCustomizeToolbar.accesskey;"
-                     label="overflowCustomizeToolbar.label;"/>
-                     -->
-    </panelview>
-  </panelmultiview>
-</panel>
-
-<panel id="appMenu-notification-popup"
-       class="popup-notification-panel"
-       type="arrow"
-       position="after_start"
-       hidden="true"
-       flip="slide"
-       orient="vertical"
-       noautofocus="true"
-       noautohide="true"
-       nopreventnavboxhide="true"
-       role="alert">
-  <popupnotification id="appMenu-update-available-notification"
-                     popupid="update-available"
-                     data-lazy-l10n-id="appmenu-update-available"
-                     data-l10n-attrs="buttonlabel, buttonaccesskey, secondarybuttonlabel, secondarybuttonaccesskey"
-                     closebuttonhidden="true"
-                     dropmarkerhidden="true"
-                     checkboxhidden="true"
-                     buttonhighlight="true"
-                     hidden="true">
-    <popupnotificationcontent id="update-available-notification-content" orient="vertical">
-      <description id="update-available-description" data-lazy-l10n-id="appmenu-update-available-message"></description>
-      <label id="update-available-whats-new" is="text-link" data-lazy-l10n-id="appmenu-update-whats-new"/>
-    </popupnotificationcontent>
-  </popupnotification>
-
-  <popupnotification id="appMenu-update-manual-notification"
-                     popupid="update-manual"
-                     data-lazy-l10n-id="appmenu-update-manual"
-                     data-l10n-attrs="buttonlabel, buttonaccesskey, secondarybuttonlabel, secondarybuttonaccesskey"
-                     closebuttonhidden="true"
-                     dropmarkerhidden="true"
-                     checkboxhidden="true"
-                     buttonhighlight="true"
-                     hidden="true">
-    <popupnotificationcontent id="update-manual-notification-content" orient="vertical">
-      <description id="update-manual-description" data-lazy-l10n-id="appmenu-update-manual-message"></description>
-      <label id="update-manual-whats-new" is="text-link"  data-lazy-l10n-id="appmenu-update-whats-new"/>
-    </popupnotificationcontent>
-  </popupnotification>
-
-  <popupnotification id="appMenu-update-restart-notification"
-                     popupid="update-restart"
-                     data-lazy-l10n-id="appmenu-update-restart"
-                     data-l10n-attrs="buttonlabel, buttonaccesskey, secondarybuttonlabel, secondarybuttonaccesskey"
-                     closebuttonhidden="true"
-                     dropmarkerhidden="true"
-                     checkboxhidden="true"
-                     buttonhighlight="true"
-                     hidden="true">
-    <popupnotificationcontent id="update-restart-notification-content" orient="vertical">
-      <description id="update-restart-description" data-lazy-l10n-id="appmenu-update-restart-message"></description>
-    </popupnotificationcontent>
-  </popupnotification>
-
-  <popupnotification id="appMenu-addon-installed-notification"
-                     popupid="addon-installed"
-                     closebuttonhidden="true"
-                     secondarybuttonhidden="true"
-                     data-lazy-l10n-id="appmenu-addon-private-browsing-installed"
-                     data-l10n-attrs="buttonlabel, buttonaccesskey"
-                     dropmarkerhidden="true"
-                     checkboxhidden="true"
-                     buttonhighlight="true"
-                     hidden="true">
-    <popupnotificationcontent class="addon-installed-notification-content" orient="vertical">
-      <description id="addon-install-description" data-lazy-l10n-id="appmenu-addon-post-install-message">
-        <image data-l10n-name="addon-install-icon" class="addon-addon-icon"></image>
-        <image data-l10n-name="addon-menu-icon" class="addon-toolbar-icon"></image>
-      </description>
-      <checkbox id="addon-incognito-checkbox"
-                data-lazy-l10n-id="appmenu-addon-post-install-incognito-checkbox"/>
-    </popupnotificationcontent>
-  </popupnotification>
-
-  <popupnotification id="appMenu-addon-private-browsing-notification"
-                     popupid="addon-private-browsing"
-                     data-lazy-l10n-id="appmenu-addon-private-browsing"
-                     data-l10n-attrs="buttonlabel, buttonaccesskey, secondarybuttonlabel, secondarybuttonaccesskey"
-                     closebuttonhidden="true"
-                     secondarybuttonhidden="false"
-                     dropmarkerhidden="true"
-                     checkboxhidden="true"
-                     buttonhighlight="true"
-                     hidden="true">
-    <popupnotificationcontent class="addon-private-browsing-notification-content" orient="vertical">
-      <description id="addon-private-browsing-description" data-lazy-l10n-id="appmenu-addon-private-browsing-message"></description>
-      <label id="addon-private-browsing-learn-more"
-             class="text-link" is="text-link" data-lazy-l10n-id="appmenu-addon-private-browsing-learn-more"></label>
-    </popupnotificationcontent>
-  </popupnotification>
-</panel>
-
 <panel id="appMenu-popup"
        class="cui-widget-panel"
        role="group"
        type="arrow"
        hidden="true"
        flip="slide"
        position="bottomcenter topright"
        noautofocus="true">
@@ -507,17 +387,17 @@
                title="&addons.label;"
                class="PanelUI-subView"
                oncommand="openAddonPrefs(event.target.getAttribute('value'), event.target.getAttribute('optionsType'));">
       <vbox class="panel-subview-body">
         <toolbarbutton id="appmenu_Add-Ons"
                        label="&addons.label;"
                        class="subviewbutton subviewbutton-iconic"
                        oncommand="openAddonsMgr(); event.stopPropagation();"/>
-        <toolbarseparator class="appmenu-menuseparator"/>
+        <toolbarseparator/>
         <label
 #ifdef XP_UNIX
                value="&addonPrefsUnix.label;"
 #else
                value="&addonPrefs.label;"
 #endif
                class="subview-subheader"/>
         <!-- This message is shown when there are no addon items to show. -->
--- a/mail/components/customizableui/content/panelUI.js
+++ b/mail/components/customizableui/content/panelUI.js
@@ -41,21 +41,16 @@ const PanelUI = {
   get kElements() {
     return {
       mainView: "appMenu-mainView",
       multiView: "appMenu-multiView",
       menuButtonMail: "button-appmenu",
       menuButtonChat: "button-chat-appmenu",
       panel: "appMenu-popup",
       navbar: "mail-bar3",
-      // TODO appmenu - do we need all of these?
-      // notificationPanel: "appMenu-notification-popup",
-      // addonNotificationContainer: "appMenu-addon-banners",
-      overflowFixedList: "widget-overflow-fixed-list",
-      // overflowPanel: "widget-overflow",
     };
   },
 
   /**
    * Used for the View / Text Encoding view.
    * Not ideal: copied from: mozilla-central/toolkit/modules/CharsetMenu.jsm
    * This set contains encodings that are in the Encoding Standard, except:
    *  - Japanese encodings are represented by one autodetection item
@@ -167,29 +162,16 @@ const PanelUI = {
     } else {
       window.addEventListener("MozDOMFullscreen:Entered", this);
       window.addEventListener("MozDOMFullscreen:Exited", this);
     }
 
     window.addEventListener("activate", this);
     CustomizableUI.addListener(this);
 
-    // We are not currently using the notificationPanel.
-    // for (let event of this.kEvents) {
-    //   this.notificationPanel.addEventListener(event, this);
-    // }
-
-    // We do this sync on init because in order to have the overflow button show up
-    // we need to know whether anything is in the permanent panel area.
-    this.overflowFixedList.hidden = false;
-    // Also unhide the separator. We use CSS to hide/show it based on the panel's content.
-    this.overflowFixedList.previousElementSibling.hidden = false;
-    CustomizableUI.registerMenuPanel(this.overflowFixedList, CustomizableUI.AREA_FIXED_OVERFLOW_PANEL);
-    this.updateOverflowStatus();
-
     Services.obs.notifyObservers(null, "appMenu-notifications-request", "refresh");
 
     this._initialized = true;
   },
 
   _initElements() {
     for (let [k, v] of Object.entries(this.kElements)) {
       // Need to do fresh let-bindings per iteration
@@ -222,21 +204,16 @@ const PanelUI = {
       this.panel.removeEventListener(event, this);
     }
     this._eventListenersAdded = false;
   },
 
   uninit() {
     this._removeEventListeners();
 
-    // We are not currently using the notificationPanel.
-    // for (let event of this.kEvents) {
-    //   this.notificationPanel.removeEventListener(event, this);
-    // }
-
     Services.obs.removeObserver(this, "fullscreen-nav-toolbox");
     Services.obs.removeObserver(this, "appMenu-notifications");
 
     window.removeEventListener("MozDOMFullscreen:Entered", this);
     window.removeEventListener("MozDOMFullscreen:Exited", this);
     window.removeEventListener("fullscreen", this);
     window.removeEventListener("activate", this);
 
@@ -632,40 +609,16 @@ const PanelUI = {
   disableSingleSubviewPanelAnimations() {
     this._disableAnimations = true;
   },
 
   enableSingleSubviewPanelAnimations() {
     this._disableAnimations = false;
   },
 
-  updateOverflowStatus() {
-    let hasKids = this.overflowFixedList.hasChildNodes();
-    if (hasKids && !this.navbar.hasAttribute("nonemptyoverflow")) {
-      this.navbar.setAttribute("nonemptyoverflow", "true");
-      this.overflowPanel.setAttribute("hasfixeditems", "true");
-    } else if (!hasKids && this.navbar.hasAttribute("nonemptyoverflow")) {
-      PanelMultiView.hidePopup(this.overflowPanel);
-      this.overflowPanel.removeAttribute("hasfixeditems");
-      this.navbar.removeAttribute("nonemptyoverflow");
-    }
-  },
-
-  onWidgetAfterDOMChange(aNode, aNextNode, aContainer, aWasRemoval) {
-    if (aContainer == this.overflowFixedList) {
-      this.updateOverflowStatus();
-    }
-  },
-
-  onAreaReset(aArea, aContainer) {
-    if (aContainer == this.overflowFixedList) {
-      this.updateOverflowStatus();
-    }
-  },
-
   /**
    * Sets the anchor node into the open or closed state, depending
    * on the state of the panel.
    */
   _updatePanelButton() {
     this.menuButton.open = this.panel.state == "open" ||
                            this.panel.state == "showing";
   },
@@ -744,30 +697,16 @@ const PanelUI = {
 
     // Each attachment gets its own subview with options for opening, saving, deleting, etc.
     item.setAttribute("oncommand", "PanelUI.showSubView('appMenu-attachmentView', this)");
 
     // Add the attachment data to the item so that when the item is clicked and the subview is
     // shown, we can access the attachment data from the ViewShowing event's explicitOriginalTarget.
     item.attachment = attachment;
 
-    // TODO appmenu - Test that these classes still work as intended.
-    if (attachment.isExternalAttachment) {
-      if (!attachment.hasFile) {
-        item.classList.add("notfound");
-      } else {
-        // TODO appmenu - Is this still needed?  It's from the old menupopup code.
-        //
-        // The text-link class must be added to the <label> and have a <menu> hover rule.
-        // Adding to <menu> makes hover overflow the underline to the popup items.
-        // const label = item.firstChild.nextSibling;
-        // label.classList.add("text-link");
-      }
-    }
-
     if (attachment.isDeleted) {
       item.classList.add("notfound");
     }
 
     if (!attachment.hasFile) {
       item.setAttribute("disabled", "true");
     }
 
--- a/mail/themes/linux/mail/primaryToolbar.css
+++ b/mail/themes/linux/mail/primaryToolbar.css
@@ -211,26 +211,16 @@ toolbar[mode="text"] .button-appmenu .to
 
 .msgNotificaton-smallText {
   padding-inline-start: 10px;
   font-size: 90%;
 }
 
 /* AppMenu styling */
 
-/* TODO appmenu - remove? needed? */
-
-#appmenuSecondaryPane {
-  border-inline-start: 1px solid ThreeDShadow;
-}
-
-.appmenuPane-spacer {
-  min-height: 1em;
-}
-
 .appmenu-edit-button {
   -moz-image-region: auto;
 }
 
 .appmenu-edit-button[disabled="true"] {
   fill-opacity: .3;
 }
 
--- a/mail/themes/osx/customizableui/panelUI.css
+++ b/mail/themes/osx/customizableui/panelUI.css
@@ -15,31 +15,16 @@
 .subviewbutton.download {
   padding-inline-start: 14px;
 }
 
 panelmultiview .toolbaritem-combined-buttons > spacer.before-label {
   width: 42px; /* 18px toolbarbutton padding + 16px icon + 8px label padding start */
 }
 
-#appMenu-addon-banners > .addon-banner-item,
-#appMenu-mainView > .panel-subview-body > .panel-banner-item {
-  padding-inline-start: 18px;
-}
-
-#appMenu-fxa-container[fxastatus="signedin"] > #appMenu-fxa-status > #appMenu-fxa-label {
-  /* 18px space before the avatar, then 16px for the avatar */
-  padding-inline-start: 34px;
-  margin-inline-start: -34px;
-}
-
-#appMenu-fxa-container[fxastatus="signedin"] > #appMenu-fxa-status > #appMenu-fxa-avatar {
-  margin-inline-start: 18px;
-}
-
 .subviewbutton:not(:-moz-any([image],[targetURI],.bookmark-item)) > .menu-iconic-left {
   display: none;
 }
 
 #BMB_bookmarksPopup menupopup[placespopup=true]:-moz-lwtheme {
   -moz-appearance: none;
   background: transparent;
 }
--- a/mail/themes/osx/mail/primaryToolbar.css
+++ b/mail/themes/osx/mail/primaryToolbar.css
@@ -175,20 +175,16 @@
 }
 
 .button-appmenu {
   list-style-image: url("chrome://messenger/skin/icons/appbutton.svg");
   margin-right: 7px;
   margin-left: 7px;
 }
 
-#appmenu-popup {
-  color: menuText;
-}
-
 #button-chat[unreadMessages="true"] {
   fill: var(--toolbarbutton-icon-fill-attention);
   stroke-opacity: 0.5;
   color: #0969b2;
   text-shadow: 0 1px 0 rgba(255, 255, 255, 0.4);
 }
 
 #button-newMsgPopup .menuitem-iconic {
@@ -239,18 +235,16 @@ toolbar[mode="text"] .button-appmenu .to
 
 .msgNotification-smallText {
   padding-inline-start: 10px;
   font-size: 90%;
 }
 
 /* AppMenu styling */
 
-/* TODO appmenu - remove? needed? */
-
 .appmenu-edit-button {
   -moz-appearance: none;
   border-width: 0;
   padding: 0 2px;
 }
 
 .appmenu-edit-button[disabled="true"] {
   opacity: .3;
@@ -329,67 +323,16 @@ toolbar[mode="text"] .button-appmenu .to
 #appmenu_openHelp {
   list-style-image: url(chrome://global/skin/icons/help.svg);
 }
 
 #appmenu_addressBook {
   list-style-image: url("chrome://messenger/skin/icons/address.svg");
 }
 
-#appmenu-popup * {
-  font-size: 12px;
-}
-
-#appmenu-popup > .popup-internal-box {
-  padding-top: 0;
-  padding-bottom: 0;
-}
-
-#appmenuPrimaryPane {
-  padding: 2px;
-}
-
-#appmenuSecondaryPane {
-  box-shadow: 1px 0 2px rgb(170, 170, 170) inset;
-  padding-top: 2px;
-  padding-bottom: 2px;
-  padding-inline-start: 3px;
-  padding-inline-end: 2px;
-}
-
-#appmenuSecondaryPane:-moz-locale-dir(rtl) {
-  box-shadow: -1px 0 2px rgb(204, 214, 234) inset;
-}
-
-#appmenuPrimaryPane > menu > .menu-right,
-#appmenuSecondaryPane > menu > .menu-right {
-  margin-inline-start: 0;
-}
-
-#appmenuPrimaryPane > :-moz-any(menu, menuitem),
-#appmenuSecondaryPane > :-moz-any(menu, menuitem) {
-  padding-inline-start: 10px;
-  padding-inline-end: 15px;
-}
-
-.appmenuPane-spacer {
-  min-height: 1em;
-}
-
-#appmenuSecondaryPane > :-moz-any(menu, menuitem):not([_moz-menuactive]),
-#appmenuSecondaryPane > :-moz-any(menu, menuitem)[_moz-menuactive][disabled] {
-  background-color: transparent;
-}
-
-#appmenu-popup
-  menuitem:not([type="radio"]):not([type="checkbox"]):not(.folderMenuItem) >
-  .menu-iconic-left {
-  display: none;
-}
-
 .appmenu-edit-button {
   -moz-context-properties: fill, fill-opacity;
   fill: currentColor;
   fill-opacity: var(--toolbarbutton-icon-fill-opacity);
 }
 
 .appmenu-edit-button:not([disabled="true"]):hover,
 .appmenu-edit-button:not([disabled="true"]):hover:active {
@@ -409,15 +352,8 @@ toolbar[mode="text"] .button-appmenu .to
 
 #appmenu-copy {
   list-style-image: url("chrome://messenger/skin/icons/copy.svg");
 }
 
 #appmenu-paste {
   list-style-image: url("chrome://messenger/skin/icons/paste.svg");
 }
-
-#appmenu-edit-label {
-  background: transparent;
-  font-style: italic;
-  padding-inline-start: 10px;
-  padding-inline-end: 0;
-}
--- a/mail/themes/shared/customizableui/panelUI.css
+++ b/mail/themes/shared/customizableui/panelUI.css
@@ -46,103 +46,20 @@
   border-image-source: linear-gradient(
     transparent 4px,
     var(--lwt-toolbar-vertical-separator, rgba(255,255,255,.2)) 4px,
     var(--lwt-toolbar-vertical-separator, rgba(255,255,255,.2)) calc(100% - 4px),
     transparent calc(100% - 4px)
   );
 }
 
-/* TODO appmenu - added, more needed? */
 panelview:not([visible]) {
   visibility: collapse;
 }
 
-/* TODO appmenu - "PanelUI-menu-button" is not used as an id in Thunderbird.
-#PanelUI-menu-button[badge-status] > .toolbarbutton-badge-stack > .toolbarbutton-badge {
-  display: -moz-box;
-  height: 10px;
-  width: 10px;
-  background-size: contain;
-  border: none;
-}
-
-#PanelUI-menu-button[badge-status="extension-new-tab"] > .toolbarbutton-badge-stack > .toolbarbutton-badge,
-#PanelUI-menu-button[badge-status="download-success"] > .toolbarbutton-badge-stack > .toolbarbutton-badge {
-  display: none;
-}
-
-#PanelUI-menu-button[badge-status="update-available"] > .toolbarbutton-badge-stack > .toolbarbutton-badge,
-#PanelUI-menu-button[badge-status="update-manual"] > .toolbarbutton-badge-stack > .toolbarbutton-badge,
-#PanelUI-menu-button[badge-status="update-restart"] > .toolbarbutton-badge-stack > .toolbarbutton-badge,
-#PanelUI-menu-button[badge-status="update-unsupported"] > .toolbarbutton-badge-stack > .toolbarbutton-badge {
-  border-radius: 50%;
-  box-shadow: none;
-  */
-  /* "!important" is necessary to override the rule in toolbarbutton.css */
-  /*
-  margin: -7px 0 0 !important;
-  margin-inline-end: -4px !important;
-  min-width: 12px;
-  min-height: 12px;
-}
-*/
-
-#PanelUI-menu-button[badge-status="update-available"] > .toolbarbutton-badge-stack > .toolbarbutton-badge,
-#PanelUI-menu-button[badge-status="update-manual"] > .toolbarbutton-badge-stack > .toolbarbutton-badge,
-#PanelUI-menu-button[badge-status="update-restart"] > .toolbarbutton-badge-stack > .toolbarbutton-badge {
-  background: #74BF43 url(chrome://browser/skin/update-badge.svg) no-repeat center;
-}
-
-#PanelUI-menu-button[badge-status="update-unsupported"] > .toolbarbutton-badge-stack > .toolbarbutton-badge {
-  background: #FFE900 url(chrome://browser/skin/update-badge.svg) no-repeat center;
-}
-
-.panel-banner-item[notificationid="update-available"]::after,
-.panel-banner-item[notificationid="update-manual"]::after,
-.panel-banner-item[notificationid="update-restart"]::after {
-  background: #74BF43 url(chrome://browser/skin/update-badge.svg) no-repeat center;
-  border-radius: 50%;
-}
-
-.panel-banner-item[notificationid="update-unsupported"]::after {
-  background: #FFE900 url(chrome://browser/skin/update-badge.svg) no-repeat center;
-  border-radius: 50%;
-}
-
-.panel-banner-item[notificationid^=update] {
-  list-style-image: url(chrome://branding/content/icon16.png);
-}
-
-/* TODO appmenu - "PanelUI-menu-button" is not used as an id in Thunderbird.
-/*
-#PanelUI-menu-button[badge-status="addon-alert"] > .toolbarbutton-badge-stack > .toolbarbutton-badge,
-#PanelUI-menu-button[badge-status="fxa-needs-authentication"] > .toolbarbutton-badge-stack > .toolbarbutton-badge {
-  height: 13px;
-  background: url(chrome://browser/skin/warning.svg) center / contain no-repeat transparent;
-  box-shadow: none;
-  border-radius: 0;
-  */
-  /* Use the included fallbacks defined in the SVG file instead of inheriting from .toolbarbutton-1. */
-  /*
-  -moz-context-properties: none;
-}
-
-#PanelUI-menu-button[badge-status] > .toolbarbutton-badge-stack > .toolbarbutton-badge:-moz-window-inactive {
-  filter: grayscale(100%);
-}
-
-#nav-bar[brighttext] #PanelUI-menu-button[badge-status="addon-alert"] > .toolbarbutton-badge-stack > .toolbarbutton-badge,
-#nav-bar[brighttext] #PanelUI-menu-button[badge-status="fxa-needs-authentication"] > .toolbarbutton-badge-stack > .toolbarbutton-badge {
-  -moz-context-properties: fill, stroke;
-  fill: #FFE900;
-  stroke: transparent;
-}
-*/
-
 .cui-widget-panel,
 #widget-overflow {
   font: menu;
 }
 
 panelview {
   -moz-box-orient: vertical;
   -moz-box-flex: 1;
@@ -457,188 +374,16 @@ toolbarbutton[constrain-size="true"][cui
 }
 
 #zoom-in-button > .toolbarbutton-text,
 #zoom-out-button > .toolbarbutton-text,
 #zoom-reset-button > .toolbarbutton-icon {
   display: none;
 }
 
-.addon-banner-item::after,
-.panel-banner-item::after {
-  content: "";
-  width: 16px;
-  height: 16px;
-  margin-inline-start: 10px;
-  margin-inline-end: 12px;
-  display: -moz-box;
-}
-
-.addon-banner-item {
-  background-color: var(--appmenu-warning-background-color);
-  color: var(--appmenu-warning-color);
-  /* Force border to override `.addon-banner-item` selector below */
-  border-top: 1px solid var(--appmenu-warning-border-color) !important;
-  display: flex;
-  flex: 1 1 0%;
-  width: calc(var(--menu-panel-width) + 30px);
-  padding-inline-start: 15px;
-  border-inline-start-style: none;
-  -moz-image-region: rect(0, 16px, 16px, 0);
-}
-
-.addon-banner-item:last-child {
-  border-bottom: 1px solid var(--appmenu-warning-border-color);
-}
-
-.addon-banner-item:focus,
-.addon-banner-item:hover {
-  background-color: var(--appmenu-warning-background-color-hover);
-}
-
-.addon-banner-item:hover:active {
-  background-color: var(--appmenu-warning-background-color-active);
-}
-
-.addon-banner-item > .toolbarbutton-icon {
-  width: 16px;
-  height: 16px;
-}
-
-.addon-banner-item::after {
-  background: url(chrome://browser/skin/warning.svg) no-repeat center;
-}
-
-:root[lwt-popup-brighttext] .addon-banner-item::after {
-  -moz-context-properties: fill, stroke;
-  fill: #FFE900;
-  stroke: transparent;
-}
-
-.addon-banner-item,
-.panel-banner-item {
-  margin: 0;
-  padding: 11px 0;
-  box-sizing: border-box;
-  min-height: 40px;
-  -moz-appearance: none;
-  box-shadow: none;
-  border: none;
-  border-radius: 0;
-  transition: background-color;
-  -moz-box-orient: horizontal;
-}
-
-.panel-banner-item {
-  border-top: 1px solid var(--panel-separator-color);
-  border-bottom: 1px solid var(--panel-separator-color);
-  padding-inline-start: 12px;
-}
-
-#appMenu-addon-banners:not(:empty) + .panel-banner-item {
-  /* Overlap the .addon-banner-item border so there's one border. */
-  margin-top: -1px;
-}
-
-#appMenu-addon-banners > .addon-banner-item {
-  padding-inline-start: 12px;
-}
-
-.panel-banner-item > .toolbarbutton-text {
-  width: 0; /* Fancy cropping solution for flexbox. */
-}
-
-.panel-banner-item > .toolbarbutton-icon {
-  width: 16px;
-}
-
-#appMenu-addon-banners:not(:empty) ~ #appMenu-fxa-container,
-.panel-banner-item:not([hidden]) + #appMenu-fxa-container {
-  margin-top: 6px;
-}
-
-/* FxAccount indicator bits. */
-
-/* Add the .toolbaritem-combined-buttons class to increase the specificity so as
- * to override the end margin for .toolbaritem-combined-buttons items further down. */
-#appMenu-fxa-container.toolbaritem-combined-buttons:not([fxastatus="signedin"]) {
-  margin-inline-end: 0;
-}
-
-#appMenu-fxa-label {
-  -moz-context-properties: fill;
-  fill: currentColor;
-  list-style-image: url(chrome://browser/skin/sync.svg);
-}
-
-#appMenu-fxa-label {
-  -moz-box-flex: 1;
-}
-
-@keyframes syncRotate {
-  from { transform: rotate(0); }
-  to { transform: rotate(360deg); }
-}
-
-#PanelUI-fxa-menu-syncnow-button[syncstatus="active"] > .toolbarbutton-icon,
-#PanelUI-remotetabs-syncnow[syncstatus="active"] > .toolbarbutton-icon {
-  animation: syncRotate 0.8s linear infinite;
-  fill: var(--toolbarbutton-icon-fill-attention);
-}
-
-#appMenu-fxa-status {
-  -moz-box-align: center;
-}
-
-#appMenu-fxa-avatar {
-  pointer-events: none;
-  list-style-image: url(chrome://browser/skin/fxa/default-avatar.svg);
-}
-
-/* Handle different UI states. */
-#appMenu-fxa-container[fxastatus="signedin"] > #appMenu-fxa-status > #appMenu-fxa-label > .toolbarbutton-icon,
-#appMenu-fxa-container:not([fxastatus="signedin"]) > #appMenu-fxa-status > #appMenu-fxa-avatar {
-  display: none;
-}
-
-#appMenu-fxa-container[fxastatus="signedin"] > #appMenu-fxa-status > #appMenu-fxa-label {
-  /* 12px space before the avatar, then 16px for the avatar */
-  padding-inline-start: 28px;
-  margin-inline-start: -28px;
-}
-
-#appMenu-fxa-container[fxastatus="signedin"] > #appMenu-fxa-status > #appMenu-fxa-avatar {
-  margin-inline-start: 12px;
-}
-
-/* Error states */
-#appMenu-fxa-container[fxastatus="unverified"] > #appMenu-fxa-status > #appMenu-fxa-label,
-#appMenu-fxa-container[fxastatus="login-failed"] > #appMenu-fxa-status > #appMenu-fxa-label {
-  list-style-image: url(chrome://browser/skin/warning.svg);
-  -moz-image-region: rect(0, 16px, 16px, 0);
-}
-
-#appMenu-fxa-container[fxastatus="login-failed"],
-#appMenu-fxa-container[fxastatus="unverified"] {
-  background-color: var(--appmenu-warning-background-color);
-  color: var(--appmenu-warning-color);
-  border-top: 1px solid var(--appmenu-warning-border-color);
-  border-bottom: 1px solid var(--appmenu-warning-border-color);
-}
-
-#appMenu-fxa-container[fxastatus="login-failed"] > #appMenu-fxa-status:hover,
-#appMenu-fxa-container[fxastatus="unverified"] > #appMenu-fxa-status:hover {
-  background-color: var(--appmenu-warning-background-color-hover);
-}
-
-#appMenu-fxa-container[fxastatus="login-failed"] > #appMenu-fxa-status:hover:active,
-#appMenu-fxa-container[fxastatus="unverified"] > #appMenu-fxa-status:hover:active {
-  background-color: var(--appmenu-warning-background-color-active);
-}
-
 /* Tracking Protection Button & Toggle */
 
 #appMenu-tp-label {
   -moz-context-properties: fill;
   fill: currentColor;
   -moz-box-flex: 1;
   padding: 0;
   padding-inline-start: 8px;
@@ -652,195 +397,24 @@ toolbarbutton[constrain-size="true"][cui
 #appMenu-tp-button {
   -moz-box-flex: 1;
 }
 
 #appMenu-tp-category {
   margin-inline-end: 0;
 }
 
-.addon-banner-item > .toolbarbutton-text,
-.panel-banner-item > .toolbarbutton-text {
-  margin: 0;
-  padding: 0 6px;
-  text-align: start;
-}
-
-.addon-banner-item > .toolbarbutton-icon,
-.panel-banner-item > .toolbarbutton-icon {
-  margin-inline-end: 0;
-}
-
-.addon-banner-item {
-  flex: 1;
-  padding-inline-start: 15px;
-  border-inline-start-style: none;
-}
-
-:root[lwt-popup-brighttext] .addon-banner-item {
-  color: var(--appmenu-warning-color-bright-text);
-  background: var(--appmenu-warning-background-color-bright-text);
-  /* override `.addon-banner-item` border-top !important defined above */
-  border: 0 !important;
-}
-
-:root[lwt-popup-brighttext] .addon-banner-item:hover,
-:root[lwt-popup-brighttext] .addon-banner-item:focus {
-  background: var(--appmenu-warning-backgound-color-hover-bright-text);
-}
-
-:root[lwt-popup-brighttext] .addon-banner-item:hover:active,
-:root[lwt-popup-brighttext] .addon-banner-item:focus:active {
-  background: var(--appmenu-warning-background-color-active-bright-text);
-}
-
-:root[lwt-popup-brighttext] #appMenu-fxa-container[fxastatus="login-failed"],
-:root[lwt-popup-brighttext] #appMenu-fxa-container[fxastatus="unverified"] {
-  background-color: var(--appmenu-warning-background-color-bright-text);
-  color: var(--appmenu-warning-color-bright-text);
-}
-
-:root[lwt-popup-brighttext] #appMenu-fxa-container[fxastatus="login-failed"] > #appMenu-fxa-status:hover,
-:root[lwt-popup-brighttext] #appMenu-fxa-container[fxastatus="unverified"] > #appMenu-fxa-status:hover {
-  background-color: var(--appmenu-warning-backgound-color-hover-bright-text)
-}
-
-:root[lwt-popup-brighttext] #appMenu-fxa-container[fxastatus="login-failed"] > #appMenu-fxa-status:hover:active,
-:root[lwt-popup-brighttext] #appMenu-fxa-container[fxastatus="unverified"] > #appMenu-fxa-status:hover:active {
-  background-color: var(--appmenu-warning-background-color-active-bright-text);
-}
-
-/* Firefox Account Toolbar Panel */
-
-#fxa-avatar-image {
-  width: 16px;
-  height: 16px;
-}
-
-:root {
-  --avatar-image-url: url(chrome://browser/skin/fxa/avatar.svg);
-}
-
-:root[fxastatus="unverified"] #fxa-avatar-image {
-  list-style-image: url(chrome://browser/skin/fxa/avatar-confirm.svg);
-}
-
-:root[fxastatus="not_configured"] #fxa-avatar-image {
-  list-style-image: url(chrome://browser/skin/fxa/avatar-empty.svg);
-}
-
-:root[fxastatus="not_configured"][fxa_avatar_badged="badged"] #fxa-avatar-image {
-  list-style-image: url(chrome://browser/skin/fxa/avatar-empty-badged.svg);
-}
-
-:root:not([fxatoolbarmenu]) #fxa-toolbar-menu-button {
-  display: none;
-}
-
-:root[fxastatus="signedin"] #fxa-menu-avatar,
-:root[fxastatus="signedin"] #fxa-avatar-image {
-  border-radius: 50%;
-  list-style-image: var(--avatar-image-url);
-}
-
-:root[fxastatus="signedin"] #PanelUI-fxa-signin,
-:root[fxastatus="signedin"] #PanelUI-fxa-unverified,
-:root[fxastatus="unverified"] #PanelUI-fxa-signin,
-:root[fxastatus="unverified"] #PanelUI-fxa-menu,
-:root[fxastatus="not_configured"] #PanelUI-fxa-unverified,
-:root[fxastatus="not_configured"] #PanelUI-fxa-menu {
-  display: none;
-}
-
-:root[fxastatus="not_configured"] #PanelUI-fxa > .panel-subview-body,
-:root[fxastatus="unverified"] #PanelUI-fxa > .panel-subview-body {
-  -moz-box-align: center;
-}
-
-#PanelUI-fxa-signin,
-#PanelUI-fxa-unverified {
-  margin-top: 20px;
-  -moz-box-align: center;
-}
-
-.PanelUI-fxa-signin-instruction-callout {
-  font-size: 1.3em;
-  font-weight: normal;
-  padding: .6em 0 .6em;
-}
-
-.PanelUI-fxa-signin-instruction-label {
-  /* Use 'lighter' font for this to de-emphasize it compared to the title.
-   * We use 300 on Linux because 100 is too light (lacks contrast with
-   * the background) for some fonts in combination with anti-aliasing. */
-
-/* TODO appmenu */
-/* %if defined(XP_MACOSX) || defined(XP_WIN)
-  font-weight: lighter;
-%else */
-  font-weight: 300;
-/* %endif */
-
-}
-
-.fxa-avatar-subpanel {
-  padding-top: 8px;
-  padding-bottom: 4px;
-}
-
-.fxa-avatar-subpanel-description {
-  color: var(--panel-disabled-color);
-}
-
-#fxa-menu-avatar {
-  height: 32px;
-  width: 32px;
-  margin-inline-start: 20px;
-  margin-inline-end: 5px;
-  -moz-context-properties: fill, fill-opacity;
-  fill: var(--arrowpanel-color);
-}
-
-/* From the FxA menu -> remote tabs, we don't need to clutter the view with
-   redundant buttons because these are accessible from the main menu */
-panelmultiview[mainViewId="PanelUI-fxa"] #PanelUI-remotetabs-view-sidebar,
-panelmultiview[mainViewId="PanelUI-fxa"] #PanelUI-remotetabs-syncnow {
-  display: none;
-}
-
 #PanelUI-sendTabToDevice > .panel-subview-body:not([state]) > #PanelUI-sendTabToDevice-syncingDevices {
   display: none;
 }
 
-#PanelUI-fxa-menu-sendtab-button {
-  list-style-image: url("chrome://browser/skin/send-to-device.svg");
-}
-
-#PanelUI-fxa-menu-sendtab-button:-moz-locale-dir(rtl) > .toolbarbutton-icon {
-  transform: scaleX(-1);
-}
-
-.fxaChooseWhatToSyncDevices {
-  height: 102px;
-  width: 201px;
-  list-style-image: url(chrome://browser/skin/fxa/choose-what-to-sync-devices.svg);
-}
-
-.fxaGraphicMail {
-  height: 71px;
-  width: 143px;
-  list-style-image: url(chrome://browser/skin/fxa/graphic-mail.svg);
-}
-
 #PanelUI-remotetabs {
   --panel-ui-sync-illustration-height: 91px;
 }
 
-.PanelUI-fxa-signin-instruction-label,
-.PanelUI-fxa-signin-instruction-callout,
 .PanelUI-remotetabs-instruction-label {
   /* If you change the margin here, the min-height of the synced tabs panel
     (e.g. #PanelUI-remotetabs[mainview] #PanelUI-remotetabs-setupsync, etc) may
     need adjusting (see bug 1248506) */
   margin: 0;
   text-align: center;
   text-shadow: none;
   max-width: 15em;
@@ -854,17 +428,16 @@ panelmultiview[mainViewId="PanelUI-fxa"]
    around the illustration and buttons */
 .PanelUI-remotetabs-instruction-box {
   /* If you change the padding here, the min-height of the synced tabs panel
     (e.g. #PanelUI-remotetabs[mainview] #PanelUI-remotetabs-setupsync, etc) may
     need adjusting (see bug 1248506) */
   padding-bottom: 30px;
 }
 
-.PanelUI-fxa-signin-button,
 .PanelUI-remotetabs-button {
   -moz-appearance: none;
   background-color: #0060df;
   /* !important for the color as an OSX specific rule when a lightweight theme
      is used for buttons in the toolbox overrides. See bug 1238531 for details */
   color: white !important;
   border-radius: 2px;
   /* If you change the margin or padding below, the min-height of the synced tabs
@@ -872,26 +445,20 @@ panelmultiview[mainViewId="PanelUI-fxa"]
      etc) may need adjusting (see bug 1248506) */
   margin-top: 15px;
   margin-bottom: 15px;
   padding: 8px;
   text-shadow: none;
   min-width: 200px;
 }
 
-.PanelUI-fxa-signin-button {
-  padding: 1em;
-}
-
-.PanelUI-fxa-signin-button:hover,
 .PanelUI-remotetabs-button:hover {
   background-color: #003eaa;
 }
 
-.PanelUI-fxa-signin-button:hover:active,
 .PanelUI-remotetabs-button:hover:active {
   background-color: #002275;
 }
 
 .remotetabs-promo-link {
   margin: 0;
 }
 
@@ -900,37 +467,16 @@ panelmultiview[mainViewId="PanelUI-fxa"]
   /* This margin is to line this label up with the labels in toolbarbuttons. */
   margin-left: 28px;
 }
 
 #PanelUI-remotetabs[mainview] .PanelUI-remotetabs-notabsforclient-label {
   margin-left: 32px;
 }
 
-.fxaSyncIllustration,
-.fxaSyncIllustrationIssue {
-  /* If you change the margin here, the min-height of the synced tabs panel
-    (e.g. #PanelUI-remotetabs[mainview] #PanelUI-remotetabs-setupsync, etc) may
-    need adjusting (see bug 1248506) */
-  width: 104px;
-  height: var(--panel-ui-sync-illustration-height);
-  margin: 38px 0 15px;
-  -moz-context-properties: fill;
-  fill: #cdcdcd;
-}
-
-.fxaSyncIllustration {
-  list-style-image: url(chrome://browser/skin/fxa/sync-illustration.svg);
-}
-
-.fxaSyncIllustrationIssue {
-  list-style-image: url(chrome://browser/skin/fxa/sync-illustration-issue.svg);
-}
-
-.PanelUI-fxa-signin-button > .toolbarbutton-text,
 .PanelUI-remotetabs-button > .toolbarbutton-text {
   /* !important to override ".cui-widget-panel toolbarbutton > .toolbarbutton-text" above. */
   text-align: center !important;
   text-shadow: none;
 }
 
 #PanelUI-remotetabs[mainview] { /* panel anchored to toolbar button might be too skinny */
   min-width: 19em;
@@ -1071,17 +617,16 @@ panelview .toolbarbutton-1,
 .subviewbutton > .menu-right,
 .subviewbutton > .menu-accel-container > .menu-iconic-accel,
 .subviewbutton > .menu-iconic-left,
 .subviewbutton > .menu-iconic-text {
   padding-bottom: 0;
   padding-top: 0;
 }
 
-.addon-banner-item > .toolbarbutton-text,
 .subviewbutton-iconic > .toolbarbutton-text,
 .subviewbutton[image] > .toolbarbutton-text,
 .subviewbutton[targetURI] > .toolbarbutton-text,
 .subviewbutton.restoreallitem > .toolbarbutton-text,
 .subviewbutton.bookmark-item > .toolbarbutton-text,
 .subviewbutton[checked="true"] > .toolbarbutton-text {
   padding-inline-start: 8px; /* See '.subviewbutton-iconic > .toolbarbutton-text' rule above. */
 }
@@ -1385,31 +930,25 @@ menuitem.panel-subview-footer:not([disab
 
 #PanelUI-remotetabs-tabslist > toolbarbutton[itemtype="tab"],
 #PanelUI-historyItems > toolbarbutton {
   list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.svg");
   -moz-context-properties: fill;
   fill: currentColor;
 }
 
-#appMenu-fxa-avatar,
-#appMenu-fxa-label > .toolbarbutton-icon,
 #PanelUI-containersItems > .subviewbutton > .toolbarbutton-icon,
 #PanelUI-remotetabs-tabslist > toolbarbutton[itemtype="tab"] > .toolbarbutton-icon,
 #PanelUI-recentlyClosedWindows > toolbarbutton > .toolbarbutton-icon,
 #PanelUI-recentlyClosedTabs > toolbarbutton > .toolbarbutton-icon,
 #PanelUI-historyItems > toolbarbutton > .toolbarbutton-icon {
   width: 16px;
   height: 16px;
 }
 
-#appMenu-fxa-avatar {
-  border-radius: 50%;
-}
-
 toolbarpaletteitem[place="palette"] > .toolbarbutton-1 > .toolbarbutton-menu-dropmarker,
 #bookmarks-menu-button[cui-areatype="menu-panel"] > .toolbarbutton-menu-dropmarker,
 #bookmarks-menu-button[overflowedItem] > .toolbarbutton-menu-dropmarker {
   display: none;
 }
 
 #search-container[cui-areatype="menu-panel"] {
   padding-top: 6px;
@@ -1440,24 +979,21 @@ toolbarpaletteitem[place="menu-panel"] >
 
 .toolbaritem-combined-buttons:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > toolbarbutton:not(.toolbarbutton-1)[disabled] {
   opacity: 0.4;
   /* Override toolbarbutton.css which sets the color to GrayText */
   color: inherit;
 }
 
 #zoom-controls[cui-areatype="toolbar"] > #zoom-reset-button > .toolbarbutton-text {
-
-/* TODO appmenu */
-/* %ifdef XP_MACOSX
+%ifdef XP_MACOSX
   min-width: 6ch;
-%else */
+%else
   min-width: 7ch;
-/* %endif */
-
+%endif
 }
 
 .toolbaritem-combined-buttons:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > separator {
   -moz-appearance: none;
   -moz-box-align: stretch;
   margin: .5em 0;
   width: 1px;
   height: auto;
@@ -1783,22 +1319,21 @@ toolbarpaletteitem[place="menu-panel"] >
 }
 
 .subviewbutton.download > .action-button {
   -moz-appearance: none; /* To avoid native Windows hover styling */
   -moz-context-properties: fill, fill-opacity;
   fill: currentColor;
   fill-opacity: 1;
 
-/* TODO appmenu */
-/* %ifdef XP_MACOSX
+%ifdef XP_MACOSX
   list-style-image: url("chrome://browser/skin/search-glass.svg");
-%else */
+%else
   list-style-image: url("chrome://browser/skin/folder.svg");
-/* %endif */
+%endif
 
 /* Measurement to vertically center this button: 1 line of text minus half of 4px top margin. */
   margin: calc(1em - 2px) 0 0;
   padding: 4px;
 }
 
 .subviewbutton.download[canRetry] > .action-button {
   list-style-image: url("chrome://browser/skin/reload.svg");
--- a/mail/themes/windows/mail/primaryToolbar.css
+++ b/mail/themes/windows/mail/primaryToolbar.css
@@ -205,82 +205,37 @@ toolbar[mode="text"] .button-appmenu .to
 
 .msgNotificaton-smallText {
   padding-inline-start: 10px;
   font-size: 90%;
 }
 
 /* AppMenu styling */
 
-/* TODO appmenu - remove? needed? */
-
 .appmenu-edit-button {
   -moz-appearance: none;
   border: 1px solid transparent;
   padding: 2px;
   background: transparent;
   border-radius: 3px;
 }
 
 .appmenu-edit-button[disabled="true"] {
   opacity: .3;
 }
 
-#appmenuPrimaryPane {
-  border-inline-end: 1px solid ThreeDShadow;
-}
-
 @media (-moz-windows-default-theme) {
-  #appmenu-popup {
-    -moz-appearance: none;
-    background: -moz-Field;
-    border: 1px solid ThreeDShadow;
-  }
-  #appmenuPrimaryPane {
-    background-color: rgba(255, 255, 255, .5);
-    padding: 2px;
-    border-inline-end: none;
-  }
-  #appmenuSecondaryPane {
-    background-color: var(--appMenu-bg-color);
-    box-shadow: 1px 0 2px var(--appMenu-bg-box-shadow) inset;
-    padding-inline-start: 3px;
-    padding-inline-end: 2px;
-    padding-top: 2px;
-    padding-bottom: 2px;
-  }
-  #appmenuSecondaryPane:-moz-locale-dir(rtl) {
-    box-shadow: -1px 0 2px var(--appMenu-bg-box-shadow) inset;
-  }
-
-  .appmenu-menuseparator {
-    -moz-appearance: none;
-    margin-top: 3px;
-    margin-bottom: 3px;
-    padding: 0;
-    border-top: 1px solid #d6e5f5;
-    border-bottom: none;
-  }
-
   .appmenu-edit-button:not([disabled]):hover {
     border: 1px solid #b8d6fb;
     box-shadow: inset 0 0 1px white;
     background: linear-gradient(#fafbfd, #ebf3fd);
     transition: .2s ease-in;
   }
 }
 
-.appmenuPane-spacer {
-  min-height: 1em;
-}
-
-#appmenu-editmenu {
-  -moz-box-pack: end;
-}
-
 .subviewbutton-iconic {
   -moz-context-properties: fill, fill-opacity;
   fill: currentColor;
   fill-opacity: var(--toolbarbutton-icon-fill-opacity);
 }
 
 #appmenu_new {
   list-style-image: url("chrome://messenger/skin/icons/new.svg");
@@ -349,22 +304,16 @@ toolbar[mode="text"] .button-appmenu .to
 #appmenu_openHelp {
   list-style-image: url(chrome://global/skin/icons/help.svg);
 }
 
 #appmenu_addressBook {
   list-style-image: url("chrome://messenger/skin/icons/address.svg");
 }
 
-#appmenu-edit-label {
-  -moz-appearance: none;
-  background: transparent;
-  font-style: italic;
-}
-
 .mail-toolbox > toolbar {
   /* force iconsize="small" on these toolbars */
   counter-reset: smallicons;
 }
 
 .mail-toolbox > toolbar:not([type="menubar"]) {
   padding: 1px;
 }
@@ -622,156 +571,24 @@ toolbar:not([mode="text"]) > toolbarpale
                                         rgb(102, 102, 102) 1px,
                                         rgba(255,255,255,.6) 1px,
                                         rgba(255,255,255,.6) 2px, transparent 2px);
     }
   }
 }
 
 @media (-moz-windows-default-theme) {
-  #appmenuSecondaryPane menupopup {
-    -moz-appearance: none;
-    background-color: var(--appMenu-bg-color);
-    border: 1px solid ThreeDShadow;
-    padding: 2px;
-  }
-
-  .appmenu-menuseparator {
-    margin-inline-start: 30px;
-  }
 
   /* Let the Customize window's menulist stay a system menulist */
   #modelist {
     -moz-appearance: menulist;
     margin: 2px 4px;
     padding: 0 !important;
   }
 
-  #appmenuPrimaryPane menupopup {
-    -moz-appearance: none;
-    background-image: linear-gradient(to right, white 26px, ThreeDLightShadow 26px,
-                                      ThreeDLightShadow 27px, ThreeDHighlight 27px,
-                                      ThreeDHighlight 28px, white 28px);
-    border: 1px solid ThreeDShadow;
-    padding: 2px;
-  }
-
-  #appmenuSecondaryPane menupopup {
-    -moz-appearance: none;
-    background-image: linear-gradient(to right, var(--appMenu-bg-color) 26px,
-                                      ThreeDLightShadow 26px, ThreeDLightShadow 27px,
-                                      ThreeDHighlight 27px, ThreeDHighlight 28px,
-                                      var(--appMenu-bg-color) 28px);
-    border: 1px solid ThreeDShadow;
-    padding: 2px;
-  }
-
-  #appmenuPrimaryPane menupopup:-moz-locale-dir(rtl) {
-    background-image: linear-gradient(to left, white 26px, ThreeDLightShadow 26px,
-                                      ThreeDLightShadow 27px, ThreeDHighlight 27px,
-                                      ThreeDHighlight 28px, white 28px);
-  }
-  #appmenuSecondaryPane menupopup:-moz-locale-dir(rtl) {
-    background-image: linear-gradient(to left, var(--appMenu-bg-color) 26px,
-                                      ThreeDLightShadow 26px, ThreeDLightShadow 27px,
-                                      ThreeDHighlight 27px, ThreeDHighlight 28px,
-                                      var(--appMenu-bg-color) 28px);
-  }
-
-  /* Hi-DPI overrides of the menu backgrounds, to adjust where the gutter line falls */
-  @media (min-resolution: 1.25dppx) {
-    #appmenuPrimaryPane menupopup {
-      background-image: linear-gradient(to right, white 22.4px, ThreeDLightShadow 22.4px,
-                                        ThreeDLightShadow 23.2px, ThreeDHighlight 23.2px,
-                                        ThreeDHighlight 24px, white 24px);
-    }
-    #appmenuSecondaryPane menupopup {
-      background-image: linear-gradient(to right, var(--appMenu-bg-color) 22.4px,
-                                        ThreeDLightShadow 22.4px, ThreeDLightShadow 23.2px,
-                                        ThreeDHighlight 23.2px, ThreeDHighlight 24px,
-                                        var(--appMenu-bg-color) 24px);
-    }
-    #appmenuPrimaryPane menupopup:-moz-locale-dir(rtl) {
-      background-image: linear-gradient(to left, white 22.4px, ThreeDLightShadow 22.4px,
-                                        ThreeDLightShadow 23.2px, ThreeDHighlight 23.2px,
-                                        ThreeDHighlight 24px, white 24px);
-    }
-    #appmenuSecondaryPane menupopup:-moz-locale-dir(rtl) {
-      background-image: linear-gradient(to left, var(--appMenu-bg-color) 22.4px,
-                                        ThreeDLightShadow 22.4px, ThreeDLightShadow 23.2px,
-                                        ThreeDHighlight 23.2px, ThreeDHighlight 24px,
-                                        var(--appMenu-bg-color) 24px);
-    }
-  }
-
-  @media (min-resolution: 1.5dppx) {
-    #appmenuPrimaryPane menupopup {
-      background-image: linear-gradient(to right, white 20.6667px, ThreeDLightShadow 20.6667px,
-                                        ThreeDLightShadow 21.3333px, ThreeDHighlight 21.3333px,
-                                        ThreeDHighlight 22px, white 22px);
-    }
-    #appmenuSecondaryPane menupopup {
-      background-image: linear-gradient(to right, var(--appMenu-bg-color) 20.6667px,
-                                        ThreeDLightShadow 20.6667px, ThreeDLightShadow 21.3333px,
-                                        ThreeDHighlight 21.3333px, ThreeDHighlight 22px,
-                                        var(--appMenu-bg-color) 22px);
-    }
-    #appmenuPrimaryPane menupopup:-moz-locale-dir(rtl) {
-      background-image: linear-gradient(to left, white 20.6667px, ThreeDLightShadow 20.6667px,
-                                        ThreeDLightShadow 21.3333px, ThreeDHighlight 21.3333px,
-                                        ThreeDHighlight 22px, white 22px);
-    }
-    #appmenuSecondaryPane menupopup:-moz-locale-dir(rtl) {
-      background-image: linear-gradient(to left, var(--appMenu-bg-color) 20.6667px,
-                                        ThreeDLightShadow 20.6667px, ThreeDLightShadow 21.3333px,
-                                        ThreeDHighlight 21.3333px, ThreeDHighlight 22px,
-                                        var(--appMenu-bg-color) 22px);
-    }
-  }
-
-  @media (min-resolution: 2dppx) {
-    #appmenuPrimaryPane menupopup {
-      background-image: linear-gradient(to right, white 19.5px, ThreeDLightShadow 19.5px,
-                                        ThreeDLightShadow 20px, ThreeDHighlight 20px,
-                                        ThreeDHighlight 20.5px, white 20.5px);
-    }
-    #appmenuSecondaryPane menupopup {
-      background-image: linear-gradient(to right, var(--appMenu-bg-color) 19.5px,
-                                        ThreeDLightShadow 19.5px, ThreeDLightShadow 20px,
-                                        ThreeDHighlight 20px, ThreeDHighlight 20.5px,
-                                        var(--appMenu-bg-color) 20.5px);
-    }
-    #appmenuPrimaryPane menupopup:-moz-locale-dir(rtl) {
-      background-image: linear-gradient(to left, white 19.5px, ThreeDLightShadow 19.5px,
-                                        ThreeDLightShadow 20px, ThreeDHighlight 20px,
-                                        ThreeDHighlight 20.5px, white 20.5px);
-    }
-    #appmenuSecondaryPane menupopup:-moz-locale-dir(rtl) {
-      background-image: linear-gradient(to left, var(--appMenu-bg-color) 19.5px,
-                                        ThreeDLightShadow 19.5px, ThreeDLightShadow 20px,
-                                        ThreeDHighlight 20px, ThreeDHighlight 20.5px,
-                                        var(--appMenu-bg-color) 20.5px);
-    }
-  }
-
-  @media (min-resolution: 1.25dppx) {
-    .appmenu-menuseparator {
-      margin-inline-start: 25px;
-    }
-  }
-  @media (min-resolution: 1.5dppx) {
-    .appmenu-menuseparator {
-      margin-inline-start: 24px;
-    }
-  }
-  @media (min-resolution: 2dppx) {
-    .appmenu-menuseparator {
-      margin-inline-start: 22px;
-    }
-  }
 }
 
 @media (-moz-windows-default-theme: 0) {
   #messengerWindow[tabsintitlebar] #mail-menubar > menu {
     -moz-appearance: none;
     color: inherit;
   }
 }
@@ -843,23 +660,16 @@ toolbar:not([mode="text"]) > toolbarpale
     display: -moz-box;
     margin: 0 60px; /* (30px + 30px) from box-shadow */
     pointer-events: none;
     width: -moz-available;
     z-index: -1;
   }
 }
 
-@media (-moz-os-version: windows-win7) and (-moz-windows-default-theme) {
-  #appmenuSecondaryPane {
-    --appMenu-bg-color: #f1f5fb;
-    --appMenu-bg-box-shadow: rgb(204, 214, 234);
-  }
-}
-
 @media (-moz-os-version: windows-win8) {
   @media (-moz-windows-default-theme) {
     #messengerWindow[darkwindowframe="true"]:not(:-moz-lwtheme):not(:-moz-window-inactive) >
       #navigation-toolbox {
       color: white;
     }
   }
   @media (-moz-windows-default-theme: 0) {
@@ -870,20 +680,16 @@ toolbar:not([mode="text"]) > toolbarpale
     #messengerWindow > #navigation-toolbox:not(:-moz-lwtheme):-moz-window-inactive {
       color: InactiveCaptionText;
     }
   }
 }
 
 @media (-moz-os-version: windows-win8),
        (-moz-os-version: windows-win10) {
-  #appmenuSecondaryPane {
-    --appMenu-bg-color: -moz-dialog;
-    --appMenu-bg-box-shadow: ThreeDShadow;
-  }
 
   .mail-toolbox,
   .contentTabToolbox,
   #folderPane-toolbox {
     box-shadow: none;
   }
 
   #mail-toolbar-menubar2 {