diff --git a/app/scripts/fetch_xulrunner b/app/scripts/fetch_xulrunner
index b01afa3d63..28c7a49d68 100755
--- a/app/scripts/fetch_xulrunner
+++ b/app/scripts/fetch_xulrunner
@@ -502,6 +502,17 @@ function modify_omni {
        }
        popupset.appendChild(this._autoScrollPopup);' chrome/toolkit/content/global/elements/browser-custom-element.mjs
 	
+	# Add the dropmarker for toolbarbuttons with wantdropmarker, which Firefox no longer creates
+	replace_line 'this.appendChild\(this.constructor.fragment.cloneNode\(true\)\);' \
+		'this.appendChild(this.constructor.fragment.cloneNode(true));
+
+        if (this.hasAttribute("wantdropmarker")) {
+          let dropmarker = document.createXULElement("dropmarker");
+          dropmarker.setAttribute("type", "menu");
+          dropmarker.className = "toolbarbutton-menu-dropmarker";
+          this.appendChild(dropmarker);
+        }' chrome/toolkit/content/global/elements/toolbarbutton.js
+
 	# Remove non-native text input styles
 	remove_between 'html\|input\:where\(' '^}' chrome/toolkit/skin/classic/global/global-shared.css
 	
diff --git a/scss/components/_toolbarbutton.scss b/scss/components/_toolbarbutton.scss
index bca4cecd0e..11ba0d1dff 100644
--- a/scss/components/_toolbarbutton.scss
+++ b/scss/components/_toolbarbutton.scss
@@ -10,14 +10,6 @@ toolbarbutton {
 	background-color: transparent;
 
 
-	.toolbarbutton-menu-dropmarker {
-		-moz-default-appearance: none;
-		@include svgicon-menu("chevron-8", "universal", "8");
-		color: var(--fill-secondary);
-		width: 8px;
-		height: 8px;
-	}
-
 	&:hover {
 		background-color: var(--fill-quinary);
 	}
@@ -43,6 +35,15 @@ toolbarbutton {
 	}
 }
 
+// Also hosted by plain <button>s, e.g., in the feed settings dialog
+.toolbarbutton-menu-dropmarker {
+	-moz-default-appearance: none;
+	@include svgicon("chevron-6", "universal", "8");
+	color: var(--fill-secondary);
+	width: 8px;
+	height: 8px;
+}
+
 @keyframes rotating {
 	from {
 		transform: rotate(0deg);
diff --git a/scss/scaffold.scss b/scss/scaffold.scss
index 23affca4c3..081b1bf561 100644
--- a/scss/scaffold.scss
+++ b/scss/scaffold.scss
@@ -83,6 +83,11 @@ $scaffold-toolbarbutton-icons: (
 		margin: 0 4px;
 		
 		.toolbarbutton-menu-dropmarker {
+			-moz-default-appearance: none;
+			@include svgicon("chevron-6", "universal", "8");
+			color: var(--fill-secondary);
+			width: 8px;
+			height: 8px;
 			margin-inline-start: 4px;
 		}
 	}