diff --git a/platform/firefox/css/legacy-toolbar-button.css b/platform/firefox/css/legacy-toolbar-button.css
index b6489d555..c4e22522d 100644
--- a/platform/firefox/css/legacy-toolbar-button.css
+++ b/platform/firefox/css/legacy-toolbar-button.css
@@ -39,6 +39,8 @@ toolbarpaletteitem #uBlock0-legacy-button[badge]::before {
 }
 
 /* Prevent pale moon from showing the arrow underneath the button */
+/* https://github.com/chrisaljoudi/uBlock/issues/1449#issuecomment-112112761 */
 #uBlock0-legacy-button .toolbarbutton-menu-dropmarker {
+    display: none;
     -moz-box-orient: horizontal;
 }
diff --git a/platform/firefox/vapi-background.js b/platform/firefox/vapi-background.js
index 3e483a3f9..966daec77 100644
--- a/platform/firefox/vapi-background.js
+++ b/platform/firefox/vapi-background.js
@@ -2028,6 +2028,7 @@ vAPI.toolbarButton = {
         toolbarButton.setAttribute('removable', 'true');
         toolbarButton.setAttribute('class', 'toolbarbutton-1 chromeclass-toolbar-additional');
         toolbarButton.setAttribute('label', tbb.label);
+        toolbarButton.setAttribute('tooltiptext', tbb.label);
 
         var toolbarButtonPanel = document.createElement('panel');
         // NOTE: Setting level to parent breaks the popup for PaleMoon under