diff --git a/core/language/en-GB/Buttons.multids b/core/language/en-GB/Buttons.multids
index d95a90c49..f4eb75257 100644
--- a/core/language/en-GB/Buttons.multids
+++ b/core/language/en-GB/Buttons.multids
@@ -19,6 +19,7 @@ Delete/Hint: Delete this tiddler
 Edit/Caption: edit
 Edit/Hint: Edit this tiddler
 Encryption/Caption: encryption
+Encryption/Hint: Set or clear a password for saving this wiki
 Encryption/ClearPassword/Caption: clear password
 Encryption/ClearPassword/Hint: Clear the password and save this wiki without encryption
 Encryption/SetPassword/Caption: set password
diff --git a/core/ui/ControlPanel/Appearance/Toolbars/EditToolbar.tid b/core/ui/ControlPanel/Appearance/Toolbars/EditToolbar.tid
index 2425f83c3..eccd2e0d3 100644
--- a/core/ui/ControlPanel/Appearance/Toolbars/EditToolbar.tid
+++ b/core/ui/ControlPanel/Appearance/Toolbars/EditToolbar.tid
@@ -15,7 +15,7 @@ $:/config/EditToolbarButtons/Visibility/$(listItem)$
 
 <$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"/></$checkbox>
+<$checkbox tiddler=<<config-title>> field="text" checked="show" unchecked="hide" default="show"> <$transclude tiddler=<<listItem>> field="caption"/> <i class="tw-muted">-- <$transclude tiddler=<<listItem>> field="description"/></i></$checkbox>
 
 </$list>
 
diff --git a/core/ui/ControlPanel/Appearance/Toolbars/PageControls.tid b/core/ui/ControlPanel/Appearance/Toolbars/PageControls.tid
index 34c45e571..16fa8c957 100644
--- a/core/ui/ControlPanel/Appearance/Toolbars/PageControls.tid
+++ b/core/ui/ControlPanel/Appearance/Toolbars/PageControls.tid
@@ -15,7 +15,7 @@ $:/config/PageControlButtons/Visibility/$(listItem)$
 
 <$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"/></$checkbox>
+<$checkbox tiddler=<<config-title>> field="text" checked="show" unchecked="hide" default="show"> <$transclude tiddler=<<listItem>> field="caption"/> <i class="tw-muted">-- <$transclude tiddler=<<listItem>> field="description"/></i></$checkbox>
 
 </$list>
 
diff --git a/core/ui/ControlPanel/Appearance/Toolbars/ViewToolbar.tid b/core/ui/ControlPanel/Appearance/Toolbars/ViewToolbar.tid
index 390d1eec7..ad50615af 100644
--- a/core/ui/ControlPanel/Appearance/Toolbars/ViewToolbar.tid
+++ b/core/ui/ControlPanel/Appearance/Toolbars/ViewToolbar.tid
@@ -15,7 +15,7 @@ $:/config/ViewToolbarButtons/Visibility/$(listItem)$
 
 <$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"/></$checkbox>
+<$checkbox tiddler=<<config-title>> field="text" checked="show" unchecked="hide" default="show"> <$transclude tiddler=<<listItem>> field="caption"/> <i class="tw-muted">-- <$transclude tiddler=<<listItem>> field="description"/></i></$checkbox>
 
 </$list>
 
diff --git a/core/ui/EditToolbar/cancel.tid b/core/ui/EditToolbar/cancel.tid
index 0f85fe724..179767779 100644
--- a/core/ui/EditToolbar/cancel.tid
+++ b/core/ui/EditToolbar/cancel.tid
@@ -1,6 +1,7 @@
 title: $:/core/ui/Buttons/cancel
 tags: $:/tags/EditToolbar
 caption: {{$:/core/images/cancel-button}} {{$:/language/Buttons/Cancel/Caption}}
+description: {{$:/language/Buttons/Cancel/Hint}}
 
 <$button message="tw-cancel-tiddler" title={{$:/language/Buttons/Cancel/Hint}} aria-label={{$:/language/Buttons/Cancel/Caption}} class=<<tw-config-toolbar-class>>>
 <$list filter="[<tw-config-toolbar-icons>prefix[yes]]">
diff --git a/core/ui/EditToolbar/delete.tid b/core/ui/EditToolbar/delete.tid
index fd35491a9..1b5eec1be 100644
--- a/core/ui/EditToolbar/delete.tid
+++ b/core/ui/EditToolbar/delete.tid
@@ -1,6 +1,7 @@
 title: $:/core/ui/Buttons/delete
 tags: $:/tags/EditToolbar
 caption: {{$:/core/images/delete-button}} {{$:/language/Buttons/Delete/Caption}}
+description: {{$:/language/Buttons/Delete/Hint}}
 
 <$button message="tw-delete-tiddler" title={{$:/language/Buttons/Delete/Hint}} aria-label={{$:/language/Buttons/Delete/Caption}} class=<<tw-config-toolbar-class>>>
 <$list filter="[<tw-config-toolbar-icons>prefix[yes]]">
diff --git a/core/ui/EditToolbar/save.tid b/core/ui/EditToolbar/save.tid
index a9a889b72..65caeb5eb 100644
--- a/core/ui/EditToolbar/save.tid
+++ b/core/ui/EditToolbar/save.tid
@@ -1,6 +1,7 @@
 title: $:/core/ui/Buttons/save
 tags: $:/tags/EditToolbar
 caption: {{$:/core/images/done-button}} {{$:/language/Buttons/Save/Caption}}
+description: {{$:/language/Buttons/Save/Hint}}
 
 <$button message="tw-save-tiddler" title={{$:/language/Buttons/Save/Hint}} aria-label={{$:/language/Buttons/Save/Caption}} class=<<tw-config-toolbar-class>>>
 <$list filter="[<tw-config-toolbar-icons>prefix[yes]]">
diff --git a/core/ui/PageControls/closeall.tid b/core/ui/PageControls/closeall.tid
index 5c5c30b95..676df6f12 100644
--- a/core/ui/PageControls/closeall.tid
+++ b/core/ui/PageControls/closeall.tid
@@ -1,6 +1,7 @@
 title: $:/core/ui/Buttons/close-all
 tags: $:/tags/PageControls
 caption: {{$:/core/images/close-all-button}} {{$:/language/Buttons/CloseAll/Caption}}
+description: {{$:/language/Buttons/CloseAll/Hint}}
 
 <$button message="tw-close-all-tiddlers" title={{$:/language/Buttons/CloseAll/Hint}} aria-label={{$:/language/Buttons/CloseAll/Caption}} class=<<tw-config-toolbar-class>>>
 <$list filter="[<tw-config-toolbar-icons>prefix[yes]]">
diff --git a/core/ui/PageControls/controlpanel.tid b/core/ui/PageControls/controlpanel.tid
index 77783e0c8..aac9af0e5 100644
--- a/core/ui/PageControls/controlpanel.tid
+++ b/core/ui/PageControls/controlpanel.tid
@@ -1,6 +1,7 @@
 title: $:/core/ui/Buttons/control-panel
 tags: $:/tags/PageControls
 caption: {{$:/core/images/options-button}} {{$:/language/Buttons/ControlPanel/Caption}}
+description: {{$:/language/Buttons/ControlPanel/Hint}}
 
 <$button to="$:/ControlPanel" title={{$:/language/Buttons/ControlPanel/Hint}} aria-label={{$:/language/Buttons/ControlPanel/Caption}} class=<<tw-config-toolbar-class>>>
 <$list filter="[<tw-config-toolbar-icons>prefix[yes]]">
diff --git a/core/ui/PageControls/encryption.tid b/core/ui/PageControls/encryption.tid
index 2859a1a46..43bd9b8de 100644
--- a/core/ui/PageControls/encryption.tid
+++ b/core/ui/PageControls/encryption.tid
@@ -1,6 +1,7 @@
 title: $:/core/ui/Buttons/encryption
 tags: $:/tags/PageControls
 caption: {{$:/core/images/locked-padlock}} {{$:/language/Buttons/Encryption/Caption}}
+description: {{$:/language/Buttons/Encryption/Hint}}
 
 <$reveal type="match" state="$:/isEncrypted" text="yes">
 <$button message="tw-clear-password" title={{$:/language/Buttons/Encryption/ClearPassword/Hint}} aria-label={{$:/language/Buttons/Encryption/ClearPassword/Caption}} class=<<tw-config-toolbar-class>>>
diff --git a/core/ui/PageControls/home.tid b/core/ui/PageControls/home.tid
index 8e19896c9..d277f8208 100644
--- a/core/ui/PageControls/home.tid
+++ b/core/ui/PageControls/home.tid
@@ -1,6 +1,7 @@
 title: $:/core/ui/Buttons/home
 tags: $:/tags/PageControls
 caption: {{$:/core/images/home-button}} {{$:/language/Buttons/Home/Caption}}
+description: {{$:/language/Buttons/Home/Hint}}
 
 <$button message="tw-home" title={{$:/language/Buttons/Home/Hint}} aria-label={{$:/language/Buttons/Home/Caption}} class=<<tw-config-toolbar-class>>>
 <$list filter="[<tw-config-toolbar-icons>prefix[yes]]">
diff --git a/core/ui/PageControls/more-page-actions.tid b/core/ui/PageControls/more-page-actions.tid
index 6839637f2..8af852c1f 100644
--- a/core/ui/PageControls/more-page-actions.tid
+++ b/core/ui/PageControls/more-page-actions.tid
@@ -1,6 +1,7 @@
 title: $:/core/ui/Buttons/more-page-actions
 tags: $:/tags/PageControls
 caption: {{$:/core/images/down-arrow}} {{$:/language/Buttons/More/Caption}}
+description: {{$:/language/Buttons/More/Hint}}
 
 \define config-title()
 $:/config/PageControlButtons/Visibility/$(listItem)$
diff --git a/core/ui/PageControls/newtiddler.tid b/core/ui/PageControls/newtiddler.tid
index 360dd78ad..087ecda86 100644
--- a/core/ui/PageControls/newtiddler.tid
+++ b/core/ui/PageControls/newtiddler.tid
@@ -1,6 +1,7 @@
 title: $:/core/ui/Buttons/new-tiddler
 tags: $:/tags/PageControls
 caption: {{$:/core/images/new-button}} {{$:/language/Buttons/NewTiddler/Caption}}
+description: {{$:/language/Buttons/NewTiddler/Hint}}
 
 <$button message="tw-new-tiddler" title={{$:/language/Buttons/NewTiddler/Hint}} aria-label={{$:/language/Buttons/NewTiddler/Caption}} class=<<tw-config-toolbar-class>>>
 <$list filter="[<tw-config-toolbar-icons>prefix[yes]]">
diff --git a/core/ui/PageControls/savewiki.tid b/core/ui/PageControls/savewiki.tid
index 12b082c2d..a463b0034 100644
--- a/core/ui/PageControls/savewiki.tid
+++ b/core/ui/PageControls/savewiki.tid
@@ -1,6 +1,7 @@
 title: $:/core/ui/Buttons/save-wiki
 tags: $:/tags/PageControls
 caption: {{$:/core/images/save-button}} {{$:/language/Buttons/SaveWiki/Caption}}
+description: {{$:/language/Buttons/SaveWiki/Hint}}
 
 <$button message="tw-save-wiki" title={{$:/language/Buttons/SaveWiki/Hint}} aria-label={{$:/language/Buttons/SaveWiki/Caption}} class=<<tw-config-toolbar-class>>>
 <span class="tw-dirty-indicator">
diff --git a/core/ui/TiddlerInfo/Tools.tid b/core/ui/TiddlerInfo/Tools.tid
index 7fb69bdde..1d1336b47 100644
--- a/core/ui/TiddlerInfo/Tools.tid
+++ b/core/ui/TiddlerInfo/Tools.tid
@@ -15,7 +15,7 @@ $:/config/ViewToolbarButtons/Visibility/$(listItem)$
 
 <$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>>/> </$checkbox>
+<$checkbox tiddler=<<config-title>> field="text" checked="show" unchecked="hide" default="show"> <$transclude tiddler=<<listItem>>/> <i class="tw-muted"><$transclude tiddler=<<listItem>> field="description"/></i></$checkbox>
 
 </$list>
 
diff --git a/core/ui/ViewToolbar/clone.tid b/core/ui/ViewToolbar/clone.tid
index 2dbfcf37e..51f41416c 100644
--- a/core/ui/ViewToolbar/clone.tid
+++ b/core/ui/ViewToolbar/clone.tid
@@ -1,6 +1,7 @@
 title: $:/core/ui/Buttons/clone
 tags: $:/tags/ViewToolbar
 caption: {{$:/core/images/clone-button}} {{$:/language/Buttons/Clone/Caption}}
+description: {{$:/language/Buttons/Clone/Hint}}
 
 <$button message="tw-new-tiddler" param=<<currentTiddler>> title={{$:/language/Buttons/Clone/Hint}} aria-label={{$:/language/Buttons/Clone/Caption}} class=<<tw-config-toolbar-class>>>
 <$list filter="[<tw-config-toolbar-icons>prefix[yes]]">
diff --git a/core/ui/ViewToolbar/close-others.tid b/core/ui/ViewToolbar/close-others.tid
index a0196c242..48be05078 100644
--- a/core/ui/ViewToolbar/close-others.tid
+++ b/core/ui/ViewToolbar/close-others.tid
@@ -1,6 +1,7 @@
 title: $:/core/ui/Buttons/close-others
 tags: $:/tags/ViewToolbar
 caption: {{$:/core/images/close-others-button}} {{$:/language/Buttons/CloseOthers/Caption}}
+description: {{$:/language/Buttons/CloseOthers/Hint}}
 
 <$button message="tw-close-other-tiddlers" param=<<currentTiddler>> title={{$:/language/Buttons/CloseOthers/Hint}} aria-label={{$:/language/Buttons/CloseOthers/Caption}} class=<<tw-config-toolbar-class>>>
 <$list filter="[<tw-config-toolbar-icons>prefix[yes]]">
diff --git a/core/ui/ViewToolbar/close.tid b/core/ui/ViewToolbar/close.tid
index 957be1f11..2dd8e2a2b 100644
--- a/core/ui/ViewToolbar/close.tid
+++ b/core/ui/ViewToolbar/close.tid
@@ -1,6 +1,7 @@
 title: $:/core/ui/Buttons/close
 tags: $:/tags/ViewToolbar
 caption: {{$:/core/images/close-button}} {{$:/language/Buttons/Close/Caption}}
+description: {{$:/language/Buttons/Close/Hint}}
 
 <$button message="tw-close-tiddler" title={{$:/language/Buttons/Close/Hint}} aria-label={{$:/language/Buttons/Close/Caption}} class=<<tw-config-toolbar-class>>>
 <$list filter="[<tw-config-toolbar-icons>prefix[yes]]">
diff --git a/core/ui/ViewToolbar/edit.tid b/core/ui/ViewToolbar/edit.tid
index aa21e6675..602662dc0 100644
--- a/core/ui/ViewToolbar/edit.tid
+++ b/core/ui/ViewToolbar/edit.tid
@@ -1,6 +1,7 @@
 title: $:/core/ui/Buttons/edit
 tags: $:/tags/ViewToolbar
 caption: {{$:/core/images/edit-button}} {{$:/language/Buttons/Edit/Caption}}
+description: {{$:/language/Buttons/Edit/Hint}}
 
 <$button message="tw-edit-tiddler" title={{$:/language/Buttons/Edit/Hint}} aria-label={{$:/language/Buttons/Edit/Caption}} class=<<tw-config-toolbar-class>>>
 <$list filter="[<tw-config-toolbar-icons>prefix[yes]]">
diff --git a/core/ui/ViewToolbar/info.tid b/core/ui/ViewToolbar/info.tid
index 8d000023c..fd00d2cf2 100644
--- a/core/ui/ViewToolbar/info.tid
+++ b/core/ui/ViewToolbar/info.tid
@@ -1,6 +1,7 @@
 title: $:/core/ui/Buttons/info
 tags: $:/tags/ViewToolbar
 caption: {{$:/core/images/info-button}} {{$:/language/Buttons/Info/Caption}}
+description: {{$:/language/Buttons/Info/Hint}}
 
 <$button popup=<<tiddlerInfoState>> title={{$:/language/Buttons/Info/Hint}} aria-label={{$:/language/Buttons/Info/Caption}} class=<<tw-config-toolbar-class>> selectedClass="tw-selected">
 <$list filter="[<tw-config-toolbar-icons>prefix[yes]]">
diff --git a/core/ui/ViewToolbar/more-tiddler-actions.tid b/core/ui/ViewToolbar/more-tiddler-actions.tid
index d997c0c74..6bc6d49f6 100644
--- a/core/ui/ViewToolbar/more-tiddler-actions.tid
+++ b/core/ui/ViewToolbar/more-tiddler-actions.tid
@@ -1,6 +1,7 @@
 title: $:/core/ui/Buttons/more-tiddler-actions
 tags: $:/tags/ViewToolbar
 caption: {{$:/core/images/down-arrow}} {{$:/language/Buttons/More/Caption}}
+description: {{$:/language/Buttons/More/Hint}}
 
 \define config-title()
 $:/config/ViewToolbarButtons/Visibility/$(listItem)$
diff --git a/core/ui/ViewToolbar/permalink.tid b/core/ui/ViewToolbar/permalink.tid
index aa5a0d959..ffac398c2 100644
--- a/core/ui/ViewToolbar/permalink.tid
+++ b/core/ui/ViewToolbar/permalink.tid
@@ -1,6 +1,7 @@
 title: $:/core/ui/Buttons/permalink
 tags: $:/tags/ViewToolbar
 caption: {{$:/core/images/permalink-button}} {{$:/language/Buttons/Permalink/Caption}}
+description: {{$:/language/Buttons/Permalink/Hint}}
 
 <$button message="tw-permalink" title={{$:/language/Buttons/Permalink/Hint}} aria-label={{$:/language/Buttons/Permalink/Caption}} class=<<tw-config-toolbar-class>>>
 <$list filter="[<tw-config-toolbar-icons>prefix[yes]]">
diff --git a/core/ui/ViewToolbar/permaview.tid b/core/ui/ViewToolbar/permaview.tid
index 83a6246d0..be40d8e0b 100644
--- a/core/ui/ViewToolbar/permaview.tid
+++ b/core/ui/ViewToolbar/permaview.tid
@@ -1,6 +1,7 @@
 title: $:/core/ui/Buttons/permaview
 tags: $:/tags/ViewToolbar $:/tags/PageControls
 caption: {{$:/core/images/permaview-button}} {{$:/language/Buttons/Permaview/Caption}}
+description: {{$:/language/Buttons/Permaview/Hint}}
 
 <$button message="tw-permaview" title={{$:/language/Buttons/Permaview/Hint}} aria-label={{$:/language/Buttons/Permaview/Caption}} class=<<tw-config-toolbar-class>>>
 <$list filter="[<tw-config-toolbar-icons>prefix[yes]]">
diff --git a/themes/tiddlywiki/vanilla/base.tid b/themes/tiddlywiki/vanilla/base.tid
index c68f68b90..769404647 100644
--- a/themes/tiddlywiki/vanilla/base.tid
+++ b/themes/tiddlywiki/vanilla/base.tid
@@ -79,6 +79,10 @@ dl dt {
 	margin-top: 6px;
 }
 
+.tw-muted {
+	color: <<colour muted-foreground>>;
+}
+
 /*
 Markdown likes putting code elements inside pre elements
 */