diff --git a/core/ui/PageControls/more-page-actions.tid b/core/ui/PageControls/more-page-actions.tid
new file mode 100644
index 000000000..6839637f2
--- /dev/null
+++ b/core/ui/PageControls/more-page-actions.tid
@@ -0,0 +1,29 @@
+title: $:/core/ui/Buttons/more-page-actions
+tags: $:/tags/PageControls
+caption: {{$:/core/images/down-arrow}} {{$:/language/Buttons/More/Caption}}
+
+\define config-title()
+$:/config/PageControlButtons/Visibility/$(listItem)$
+\end
+<$button popup=<<qualify "$:/state/popup/more">> title={{$:/language/Buttons/More/Hint}} aria-label={{$:/language/Buttons/More/Caption}} class=<<tw-config-toolbar-class>> selectedClass="tw-selected">
+<$list filter="[<tw-config-toolbar-icons>prefix[yes]]">
+{{$:/core/images/down-arrow}}
+</$list>
+<$list filter="[<tw-config-toolbar-text>prefix[yes]]">
+<$text text={{$:/language/Buttons/More/Caption}}/>
+</$list>
+</$button>
+<$reveal state=<<qualify "$:/state/popup/more">> type="popup" position="below" animate="yes">
+<div class="tw-drop-down">
+<$set name="tw-config-toolbar-icons" value="yes">
+<$set name="tw-config-toolbar-text" value="yes">
+<$list filter="[all[shadows+tiddlers]tag[$:/tags/PageControls]!has[draft.of]] -[[$:/core/ui/Buttons/more-page-actions]]" variable="listItem">
+<$reveal type="match" state=<<config-title>> text="hide">
+<$transclude tiddler=<<listItem>>/>
+</$reveal>
+</$list>
+</$set>
+</$set>
+</div>
+</$reveal>
+
diff --git a/core/ui/ViewToolbar/more.tid b/core/ui/ViewToolbar/more-tiddler-actions.tid
similarity index 89%
rename from core/ui/ViewToolbar/more.tid
rename to core/ui/ViewToolbar/more-tiddler-actions.tid
index 1ea0c95f2..d997c0c74 100644
--- a/core/ui/ViewToolbar/more.tid
+++ b/core/ui/ViewToolbar/more-tiddler-actions.tid
@@ -1,4 +1,4 @@
-title: $:/core/ui/Buttons/more
+title: $:/core/ui/Buttons/more-tiddler-actions
 tags: $:/tags/ViewToolbar
 caption: {{$:/core/images/down-arrow}} {{$:/language/Buttons/More/Caption}}
 
@@ -17,7 +17,7 @@ $:/config/ViewToolbarButtons/Visibility/$(listItem)$
 <div class="tw-drop-down">
 <$set name="tw-config-toolbar-icons" value="yes">
 <$set name="tw-config-toolbar-text" value="yes">
-<$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewToolbar]!has[draft.of]] -[[$:/core/ui/Buttons/more]]" variable="listItem">
+<$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewToolbar]!has[draft.of]] -[[$:/core/ui/Buttons/more-tiddler-actions]]" variable="listItem">
 <$reveal type="match" state=<<config-title>> text="hide">
 <$transclude tiddler=<<listItem>>/>
 </$reveal>
diff --git a/core/wiki/config/ViewToolbarButtons.multids b/core/wiki/config/ViewToolbarButtons.multids
index 0b3cc743d..998e49032 100644
--- a/core/wiki/config/ViewToolbarButtons.multids
+++ b/core/wiki/config/ViewToolbarButtons.multids
@@ -2,6 +2,6 @@ title: $:/config/ViewToolbarButtons/Visibility/$:/
 
 core/ui/Buttons/clone: hide
 core/ui/Buttons/close-others: hide
-core/ui/Buttons/more: hide
+core/ui/Buttons/more-tiddler-actions: hide
 core/ui/Buttons/permalink: hide
 core/ui/Buttons/permaview: hide
diff --git a/core/wiki/tags/ViewToolbar.tid b/core/wiki/tags/ViewToolbar.tid
index 75850e27a..230a2d680 100644
--- a/core/wiki/tags/ViewToolbar.tid
+++ b/core/wiki/tags/ViewToolbar.tid
@@ -1,2 +1,2 @@
 title: $:/tags/ViewToolbar
-list: [[$:/core/ui/Buttons/more]] [[$:/core/ui/Buttons/info]] [[$:/core/ui/Buttons/clone]] [[$:/core/ui/Buttons/edit]] [[$:/core/ui/Buttons/permalink]] [[$:/core/ui/Buttons/permaview]] [[$:/core/ui/Buttons/close-others]] [[$:/core/ui/Buttons/close]]
+list: [[$:/core/ui/Buttons/more-tiddler-actions]] [[$:/core/ui/Buttons/info]] [[$:/core/ui/Buttons/clone]] [[$:/core/ui/Buttons/edit]] [[$:/core/ui/Buttons/permalink]] [[$:/core/ui/Buttons/permaview]] [[$:/core/ui/Buttons/close-others]] [[$:/core/ui/Buttons/close]]
diff --git a/themes/tiddlywiki/vanilla/base.tid b/themes/tiddlywiki/vanilla/base.tid
index 1d111956f..c96803f04 100644
--- a/themes/tiddlywiki/vanilla/base.tid
+++ b/themes/tiddlywiki/vanilla/base.tid
@@ -867,6 +867,7 @@ canvas.tw-edit-bitmapeditor  {
 	padding: 0 14px 0 14px;
 	width: 100%;
 	text-align: left;
+	color: <<colour foreground>>;
 }
 
 .tw-drop-down a:hover, .tw-drop-down button:hover {