diff --git a/core/language/en-GB/ControlPanel.multids b/core/language/en-GB/ControlPanel.multids
index 3907bda98..be4b6123f 100644
--- a/core/language/en-GB/ControlPanel.multids
+++ b/core/language/en-GB/ControlPanel.multids
@@ -161,12 +161,12 @@ TiddlerFields/Caption: Tiddler Fields
 TiddlerFields/Hint: This is the full set of TiddlerFields in use in this wiki (including system tiddlers but excluding shadow tiddlers).
 Toolbars/Caption: Toolbars
 Toolbars/EditToolbar/Caption: Edit Toolbar
-Toolbars/EditToolbar/Hint: Choose which buttons are displayed for tiddlers in edit mode
+Toolbars/EditToolbar/Hint: Choose which buttons are displayed for tiddlers in edit mode. Drag and drop to change the ordering
 Toolbars/Hint: Select which toolbar buttons are displayed
 Toolbars/PageControls/Caption: Page Toolbar
-Toolbars/PageControls/Hint: Choose which buttons are displayed on the main page toolbar
+Toolbars/PageControls/Hint: Choose which buttons are displayed on the main page toolbar. Drag and drop to change the ordering
 Toolbars/EditorToolbar/Caption: Editor Toolbar
-Toolbars/EditorToolbar/Hint: Choose which buttons are displayed in the editor toolbar. Note that some buttons will only appear when editing tiddlers of a certain type
+Toolbars/EditorToolbar/Hint: Choose which buttons are displayed in the editor toolbar. Note that some buttons will only appear when editing tiddlers of a certain type. Drag and drop to change the ordering
 Toolbars/ViewToolbar/Caption: View Toolbar
-Toolbars/ViewToolbar/Hint: Choose which buttons are displayed for tiddlers in view mode
+Toolbars/ViewToolbar/Hint: Choose which buttons are displayed for tiddlers in view mode. Drag and drop to change the ordering
 Tools/Download/Full/Caption: Download full wiki
diff --git a/core/ui/ControlPanel/Toolbars/EditToolbar.tid b/core/ui/ControlPanel/Toolbars/EditToolbar.tid
index 68d78f854..1688c18b4 100644
--- a/core/ui/ControlPanel/Toolbars/EditToolbar.tid
+++ b/core/ui/ControlPanel/Toolbars/EditToolbar.tid
@@ -3,9 +3,8 @@ tags: $:/tags/ControlPanel/Toolbars
 caption: {{$:/language/ControlPanel/Toolbars/EditToolbar/Caption}}
 
 \define lingo-base() $:/language/TiddlerInfo/
-\define config-title()
-$:/config/EditToolbarButtons/Visibility/$(listItem)$
-\end
+
+\define config-base() $:/config/EditToolbarButtons/Visibility/
 
 {{$:/language/ControlPanel/Toolbars/EditToolbar/Hint}}
 
@@ -13,12 +12,8 @@ $:/config/EditToolbarButtons/Visibility/$(listItem)$
 
 <$set name="tv-config-toolbar-text" value="yes">
 
-<$list filter="[all[shadows+tiddlers]tag[$:/tags/EditToolbar]!has[draft.of]]" variable="listItem">
-
-<$checkbox tiddler=<<config-title>> field="text" checked="show" unchecked="hide" default="show"/> <$transclude tiddler=<<listItem>> field="caption"/> <i class="tc-muted">-- <$transclude tiddler=<<listItem>> field="description"/></i>
-
-</$list>
+<$macrocall $name="list-tagged-draggable" tag="$:/tags/EditToolbar" itemTemplate="$:/core/ui/ControlPanel/Toolbars/ItemTemplate"/>
 
 </$set>
 
-</$set>
+</$set>
\ No newline at end of file
diff --git a/core/ui/ControlPanel/Toolbars/EditorItemTemplate.tid b/core/ui/ControlPanel/Toolbars/EditorItemTemplate.tid
new file mode 100644
index 000000000..e417e766c
--- /dev/null
+++ b/core/ui/ControlPanel/Toolbars/EditorItemTemplate.tid
@@ -0,0 +1,9 @@
+title: $:/core/ui/ControlPanel/Toolbars/EditorItemTemplate
+
+\define config-title()
+$(config-base)$$(currentTiddler)$
+\end
+
+<$draggable tiddler=<<currentTiddler>>>
+<$checkbox tiddler=<<config-title>> field="text" checked="show" unchecked="hide" default="show"/> <span class="tc-icon-wrapper"><$transclude tiddler={{!!icon}}/></span> <$transclude field="caption"/> -- <i class="tc-muted"><$transclude field="description"/></i>
+</$draggable>
diff --git a/core/ui/ControlPanel/Toolbars/EditorToolbar.tid b/core/ui/ControlPanel/Toolbars/EditorToolbar.tid
index ce700fa98..66c30de3f 100644
--- a/core/ui/ControlPanel/Toolbars/EditorToolbar.tid
+++ b/core/ui/ControlPanel/Toolbars/EditorToolbar.tid
@@ -4,18 +4,8 @@ caption: {{$:/language/ControlPanel/Toolbars/EditorToolbar/Caption}}
 
 \define lingo-base() $:/language/TiddlerInfo/
 
-\define config-title()
-$:/config/EditorToolbarButtons/Visibility/$(listItem)$
-\end
-
-\define toolbar-button()
-<$checkbox tiddler=<<config-title>> field="text" checked="show" unchecked="hide" default="show"> <$transclude tiddler={{$(listItem)$!!icon}}/> <$transclude tiddler=<<listItem>> field="caption"/> -- <i class="tc-muted"><$transclude tiddler=<<listItem>> field="description"/></i></$checkbox>
-\end
+\define config-base() $:/config/EditorToolbarButtons/Visibility/
 
 {{$:/language/ControlPanel/Toolbars/EditorToolbar/Hint}}
 
-<$list filter="[all[shadows+tiddlers]tag[$:/tags/EditorToolbar]!has[draft.of]]" variable="listItem">
-
-<<toolbar-button>>
-
-</$list>
+<$macrocall $name="list-tagged-draggable" tag="$:/tags/EditorToolbar" itemTemplate="$:/core/ui/ControlPanel/Toolbars/EditorItemTemplate"/>
diff --git a/core/ui/ControlPanel/Toolbars/ItemTemplate.tid b/core/ui/ControlPanel/Toolbars/ItemTemplate.tid
new file mode 100644
index 000000000..6b92d8189
--- /dev/null
+++ b/core/ui/ControlPanel/Toolbars/ItemTemplate.tid
@@ -0,0 +1,9 @@
+title: $:/core/ui/ControlPanel/Toolbars/ItemTemplate
+
+\define config-title()
+$(config-base)$$(currentTiddler)$
+\end
+
+<$draggable tiddler=<<currentTiddler>>>
+<$checkbox tiddler=<<config-title>> field="text" checked="show" unchecked="hide" default="show"/> <span class="tc-icon-wrapper"> <$transclude field="caption"/> <i class="tc-muted">-- <$transclude field="description"/></i></span>
+</$draggable>
diff --git a/core/ui/ControlPanel/Toolbars/PageControls.tid b/core/ui/ControlPanel/Toolbars/PageControls.tid
index 981b6be27..6eadd8b22 100644
--- a/core/ui/ControlPanel/Toolbars/PageControls.tid
+++ b/core/ui/ControlPanel/Toolbars/PageControls.tid
@@ -3,9 +3,8 @@ tags: $:/tags/ControlPanel/Toolbars
 caption: {{$:/language/ControlPanel/Toolbars/PageControls/Caption}}
 
 \define lingo-base() $:/language/TiddlerInfo/
-\define config-title()
-$:/config/PageControlButtons/Visibility/$(listItem)$
-\end
+
+\define config-base() $:/config/PageControlButtons/Visibility/
 
 {{$:/language/ControlPanel/Toolbars/PageControls/Hint}}
 
@@ -13,11 +12,7 @@ $:/config/PageControlButtons/Visibility/$(listItem)$
 
 <$set name="tv-config-toolbar-text" value="yes">
 
-<$list filter="[all[shadows+tiddlers]tag[$:/tags/PageControls]!has[draft.of]]" variable="listItem">
-
-<$checkbox tiddler=<<config-title>> field="text" checked="show" unchecked="hide" default="show"/> <$transclude tiddler=<<listItem>> field="caption"/> <i class="tc-muted">-- <$transclude tiddler=<<listItem>> field="description"/></i>
-
-</$list>
+<$macrocall $name="list-tagged-draggable" tag="$:/tags/PageControls" itemTemplate="$:/core/ui/ControlPanel/Toolbars/ItemTemplate"/>
 
 </$set>
 
diff --git a/core/ui/ControlPanel/Toolbars/ViewToolbar.tid b/core/ui/ControlPanel/Toolbars/ViewToolbar.tid
index 071fb206c..edabdd56f 100644
--- a/core/ui/ControlPanel/Toolbars/ViewToolbar.tid
+++ b/core/ui/ControlPanel/Toolbars/ViewToolbar.tid
@@ -3,9 +3,8 @@ tags: $:/tags/ControlPanel/Toolbars
 caption: {{$:/language/ControlPanel/Toolbars/ViewToolbar/Caption}}
 
 \define lingo-base() $:/language/TiddlerInfo/
-\define config-title()
-$:/config/ViewToolbarButtons/Visibility/$(listItem)$
-\end
+
+\define config-base() $:/config/ViewToolbarButtons/Visibility/
 
 {{$:/language/ControlPanel/Toolbars/ViewToolbar/Hint}}
 
@@ -13,11 +12,7 @@ $:/config/ViewToolbarButtons/Visibility/$(listItem)$
 
 <$set name="tv-config-toolbar-text" value="yes">
 
-<$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewToolbar]!has[draft.of]]" variable="listItem">
-
-<$checkbox tiddler=<<config-title>> field="text" checked="show" unchecked="hide" default="show"/> <$transclude tiddler=<<listItem>> field="caption"/> <i class="tc-muted">-- <$transclude tiddler=<<listItem>> field="description"/></i>
-
-</$list>
+<$macrocall $name="list-tagged-draggable" tag="$:/tags/ViewToolbar" itemTemplate="$:/core/ui/ControlPanel/Toolbars/ItemTemplate"/>
 
 </$set>
 
diff --git a/themes/tiddlywiki/vanilla/base.tid b/themes/tiddlywiki/vanilla/base.tid
index 19f80688c..7fecc5d79 100644
--- a/themes/tiddlywiki/vanilla/base.tid
+++ b/themes/tiddlywiki/vanilla/base.tid
@@ -143,6 +143,11 @@ svg.tc-image-button {
 	padding: 0px 1px 1px 0px;
 }
 
+.tc-icon-wrapper > svg {
+	width: 1em;
+	height: 1em;
+}
+
 kbd {
 	display: inline-block;
 	padding: 3px 5px;
@@ -312,11 +317,11 @@ a.tc-tiddlylink-external:hover {
 	content: "<<lingo DropMessage>>";
 }
 
-.tc-droppable .tc-droppable-placeholder {
+.tc-droppable > .tc-droppable-placeholder {
 	display: none;
 }
 
-.tc-droppable.tc-dragover .tc-droppable-placeholder {
+.tc-droppable.tc-dragover > .tc-droppable-placeholder {
 	display: block;
 	border: 2px dashed <<colour dropzone-background>>;
 }