diff --git a/core/language/en-GB/Buttons.multids b/core/language/en-GB/Buttons.multids
index 14a5b4382..edcff716b 100644
--- a/core/language/en-GB/Buttons.multids
+++ b/core/language/en-GB/Buttons.multids
@@ -18,6 +18,8 @@ Edit/Caption: edit
 Edit/Hint: Edit this tiddler
 Info/Caption: info
 Info/Hint: Show information for this tiddler
+Home/Caption: home
+Home/Hint: Open home tiddlers
 NewTiddler/Caption: new tiddler
 NewTiddler/Hint: Create a new tiddler
 More/Caption: more
diff --git a/core/language/en-GB/ControlPanel.multids b/core/language/en-GB/ControlPanel.multids
index e7c0c2aec..6df4fb76d 100644
--- a/core/language/en-GB/ControlPanel.multids
+++ b/core/language/en-GB/ControlPanel.multids
@@ -40,6 +40,14 @@ Appearance/StoryView/Caption: Story View
 Appearance/StoryView/Prompt: Current view:
 Appearance/Theme/Caption: Theme
 Appearance/Theme/Prompt: Current theme:
+Appearance/Toolbars/Caption: Toolbars
+Appearance/Toolbars/Hint: Select which toolbar buttons are displayed
+Appearance/Toolbars/EditToolbar/Caption: Edit Toolbar
+Appearance/Toolbars/EditToolbar/Hint: Choose which buttons are displayed for tiddlers in edit mode
+Appearance/Toolbars/ViewToolbar/Caption: View Toolbar
+Appearance/Toolbars/ViewToolbar/Hint: Choose which buttons are displayed for tiddlers in view mode
+Appearance/Toolbars/PageControls/Caption: Page Toolbar
+Appearance/Toolbars/PageControls/Hint: Choose which buttons are displayed on the main page toolbar  
 Basics/AnimDuration/Prompt: Animation duration:
 Basics/Caption: Basics
 Basics/DefaultTiddlers/BottomHint: Use &#91;&#91;double square brackets&#93;&#93; for titles with spaces. Or you can choose to <$button set="$:/DefaultTiddlers" setTo="[list[$:/StoryList]]">retain story ordering</$button>
diff --git a/core/ui/ControlPanel/Appearance/Toolbars.tid b/core/ui/ControlPanel/Appearance/Toolbars.tid
new file mode 100644
index 000000000..bcb0aa843
--- /dev/null
+++ b/core/ui/ControlPanel/Appearance/Toolbars.tid
@@ -0,0 +1,9 @@
+title: $:/core/ui/ControlPanel/Appearance/Toolbars
+tags: $:/tags/ControlPanel/Appearance
+caption: {{$:/language/ControlPanel/Appearance/Toolbars/Caption}}
+
+{{$:/language/ControlPanel/Appearance/Toolbars/Hint}}
+
+<div class="tw-control-panel">
+<<tabs "[all[shadows+tiddlers]tag[$:/tags/ControlPanel/Appearance/Toolbars]!has[draft.of]]" "$:/core/ui/ControlPanel/Appearance/Toolbars/ViewToolbar" "$:/state/tabs/controlpanel/toolbars" "tw-vertical">>
+</div>
diff --git a/core/ui/ControlPanel/Appearance/Toolbars/EditToolbar.tid b/core/ui/ControlPanel/Appearance/Toolbars/EditToolbar.tid
new file mode 100644
index 000000000..2425f83c3
--- /dev/null
+++ b/core/ui/ControlPanel/Appearance/Toolbars/EditToolbar.tid
@@ -0,0 +1,24 @@
+title: $:/core/ui/ControlPanel/Appearance/Toolbars/EditToolbar
+tags: $:/tags/ControlPanel/Appearance/Toolbars
+caption: {{$:/language/ControlPanel/Appearance/Toolbars/EditToolbar/Caption}}
+
+\define lingo-base() $:/language/TiddlerInfo/
+\define config-title()
+$:/config/EditToolbarButtons/Visibility/$(listItem)$
+\end
+
+{{$:/language/ControlPanel/Appearance/Toolbars/EditToolbar/Hint}}
+
+<$set name="tw-config-toolbar-icons" value="yes">
+
+<$set name="tw-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"/></$checkbox>
+
+</$list>
+
+</$set>
+
+</$set>
diff --git a/core/ui/ControlPanel/Appearance/Toolbars/PageControls.tid b/core/ui/ControlPanel/Appearance/Toolbars/PageControls.tid
new file mode 100644
index 000000000..34c45e571
--- /dev/null
+++ b/core/ui/ControlPanel/Appearance/Toolbars/PageControls.tid
@@ -0,0 +1,24 @@
+title: $:/core/ui/ControlPanel/Appearance/Toolbars/PageControls
+tags: $:/tags/ControlPanel/Appearance/Toolbars
+caption: {{$:/language/ControlPanel/Appearance/Toolbars/PageControls/Caption}}
+
+\define lingo-base() $:/language/TiddlerInfo/
+\define config-title()
+$:/config/PageControlButtons/Visibility/$(listItem)$
+\end
+
+{{$:/language/ControlPanel/Appearance/Toolbars/PageControls/Hint}}
+
+<$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]]" variable="listItem">
+
+<$checkbox tiddler=<<config-title>> field="text" checked="show" unchecked="hide" default="show"> <$transclude tiddler=<<listItem>> field="caption"/></$checkbox>
+
+</$list>
+
+</$set>
+
+</$set>
diff --git a/core/ui/ControlPanel/Appearance/Toolbars/ViewToolbar.tid b/core/ui/ControlPanel/Appearance/Toolbars/ViewToolbar.tid
new file mode 100644
index 000000000..390d1eec7
--- /dev/null
+++ b/core/ui/ControlPanel/Appearance/Toolbars/ViewToolbar.tid
@@ -0,0 +1,24 @@
+title: $:/core/ui/ControlPanel/Appearance/Toolbars/ViewToolbar
+tags: $:/tags/ControlPanel/Appearance/Toolbars
+caption: {{$:/language/ControlPanel/Appearance/Toolbars/ViewToolbar/Caption}}
+
+\define lingo-base() $:/language/TiddlerInfo/
+\define config-title()
+$:/config/ViewToolbarButtons/Visibility/$(listItem)$
+\end
+
+{{$:/language/ControlPanel/Appearance/Toolbars/ViewToolbar/Hint}}
+
+<$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]]" variable="listItem">
+
+<$checkbox tiddler=<<config-title>> field="text" checked="show" unchecked="hide" default="show"> <$transclude tiddler=<<listItem>> field="caption"/></$checkbox>
+
+</$list>
+
+</$set>
+
+</$set>
diff --git a/core/ui/EditTemplate/controls.tid b/core/ui/EditTemplate/controls.tid
index 93277362c..e4a574317 100644
--- a/core/ui/EditTemplate/controls.tid
+++ b/core/ui/EditTemplate/controls.tid
@@ -1,4 +1,7 @@
 title: $:/core/ui/EditTemplate/controls
 tags: $:/tags/EditTemplate
 
-<span class="tw-tiddler-controls titlebar"> <$list filter="[all[shadows+tiddlers]tag[$:/tags/EditToolbar]!has[draft.of]]" variable="listItem"><$transclude tiddler=<<listItem>>/></$list> </span>
+\define config-title()
+$:/config/EditToolbarButtons/Visibility/$(listItem)$
+\end
+<span class="tw-tiddler-controls titlebar"><$list filter="[all[shadows+tiddlers]tag[$:/tags/EditToolbar]!has[draft.of]]" variable="listItem"><$reveal type="nomatch" state=<<config-title>> text="hide"><$transclude tiddler=<<listItem>>/></$reveal></$list></span>
diff --git a/core/ui/EditToolbar/cancel.tid b/core/ui/EditToolbar/cancel.tid
index b271f158e..eb253027f 100644
--- a/core/ui/EditToolbar/cancel.tid
+++ b/core/ui/EditToolbar/cancel.tid
@@ -1,4 +1,12 @@
 title: $:/core/ui/EditToolbar/cancel
 tags: $:/tags/EditToolbar
+caption: {{$:/core/images/cancel-button}} {{$:/language/Buttons/Cancel/Caption}}
 
-<$button message="tw-cancel-tiddler" title={{$:/language/Buttons/Cancel/Hint}} aria-label={{$:/language/Buttons/Cancel/Caption}} class="btn-invisible">{{$:/core/images/cancel-button}}</$button>
\ No newline at end of file
+<$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]]">
+{{$:/core/images/cancel-button}}
+</$list>
+<$list filter="[<tw-config-toolbar-text>prefix[yes]]">
+<$text text={{$:/language/Buttons/Cancel/Caption}}/>
+</$list>
+</$button>
diff --git a/core/ui/EditToolbar/delete.tid b/core/ui/EditToolbar/delete.tid
index a8f5881d4..548f1a265 100644
--- a/core/ui/EditToolbar/delete.tid
+++ b/core/ui/EditToolbar/delete.tid
@@ -1,4 +1,12 @@
 title: $:/core/ui/EditToolbar/delete
 tags: $:/tags/EditToolbar
+caption: {{$:/core/images/delete-button}} {{$:/language/Buttons/Delete/Caption}}
 
-<$button message="tw-delete-tiddler" title={{$:/language/Buttons/Delete/Hint}} aria-label={{$:/language/Buttons/Delete/Caption}} class="btn-invisible">{{$:/core/images/delete-button}}</$button>
\ No newline at end of file
+<$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]]">
+{{$:/core/images/delete-button}}
+</$list>
+<$list filter="[<tw-config-toolbar-text>prefix[yes]]">
+<$text text={{$:/language/Buttons/Delete/Caption}}/>
+</$list>
+</$button>
\ No newline at end of file
diff --git a/core/ui/EditToolbar/save.tid b/core/ui/EditToolbar/save.tid
index fcd40d461..b86b3cc5d 100644
--- a/core/ui/EditToolbar/save.tid
+++ b/core/ui/EditToolbar/save.tid
@@ -1,4 +1,12 @@
 title: $:/core/ui/EditToolbar/save
 tags: $:/tags/EditToolbar
+caption: {{$:/core/images/done-button}} {{$:/language/Buttons/Save/Caption}}
 
-<$button message="tw-save-tiddler" title={{$:/language/Buttons/Save/Hint}} aria-label={{$:/language/Buttons/Save/Caption}} class="btn-invisible">{{$:/core/images/done-button}}</$button>
\ No newline at end of file
+<$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]]">
+{{$:/core/images/done-button}}
+</$list>
+<$list filter="[<tw-config-toolbar-text>prefix[yes]]">
+<$text text={{$:/language/Buttons/Save/Caption}}/>
+</$list>
+</$button>
\ No newline at end of file
diff --git a/core/ui/PageControls/controlpanel.tid b/core/ui/PageControls/controlpanel.tid
index b0ca856e4..700f33f9c 100644
--- a/core/ui/PageControls/controlpanel.tid
+++ b/core/ui/PageControls/controlpanel.tid
@@ -1,4 +1,12 @@
 title: $:/core/ui/PageControls/control-panel
 tags: $:/tags/PageControls
+caption: {{$:/core/images/options-button}} {{$:/language/Buttons/ControlPanel/Caption}}
 
-<$button to="$:/ControlPanel" title={{$:/language/Buttons/ControlPanel/Hint}} aria-label={{$:/language/Buttons/ControlPanel/Caption}} class="btn-invisible">{{$:/core/images/options-button}}</$button>
\ No newline at end of file
+<$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]]">
+{{$:/core/images/options-button}}
+</$list>
+<$list filter="[<tw-config-toolbar-text>prefix[yes]]">
+<$text text={{$:/language/Buttons/ControlPanel/Caption}}/>
+</$list>
+</$button>
diff --git a/core/ui/PageControls/home.tid b/core/ui/PageControls/home.tid
new file mode 100644
index 000000000..567e03b05
--- /dev/null
+++ b/core/ui/PageControls/home.tid
@@ -0,0 +1,12 @@
+title: $:/core/ui/PageControls/home
+tags: $:/tags/PageControls
+caption: {{$:/core/images/home-button}} {{$:/language/Buttons/Home/Caption}}
+
+<$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]]">
+{{$:/core/images/home-button}}
+</$list>
+<$list filter="[<tw-config-toolbar-text>prefix[yes]]">
+<$text text={{$:/language/Buttons/Home/Caption}}/>
+</$list>
+</$button>
diff --git a/core/ui/PageControls/newtiddler.tid b/core/ui/PageControls/newtiddler.tid
index 576bdc7ad..4dfcc24c7 100644
--- a/core/ui/PageControls/newtiddler.tid
+++ b/core/ui/PageControls/newtiddler.tid
@@ -1,4 +1,12 @@
 title: $:/core/ui/PageControls/new-tiddler
 tags: $:/tags/PageControls
+caption: {{$:/core/images/new-button}} {{$:/language/Buttons/NewTiddler/Caption}}
 
-<$button message="tw-new-tiddler" title={{$:/language/Buttons/NewTiddler/Hint}} aria-label={{$:/language/Buttons/NewTiddler/Caption}} class="btn-invisible">{{$:/core/images/new-button}}</$button>
\ No newline at end of file
+<$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]]">
+{{$:/core/images/new-button}}
+</$list>
+<$list filter="[<tw-config-toolbar-text>prefix[yes]]">
+<$text text={{$:/language/Buttons/NewTiddler/Caption}}/>
+</$list>
+</$button>
diff --git a/core/ui/PageControls/savewiki.tid b/core/ui/PageControls/savewiki.tid
index 5e1285c54..88bb67656 100644
--- a/core/ui/PageControls/savewiki.tid
+++ b/core/ui/PageControls/savewiki.tid
@@ -1,4 +1,12 @@
 title: $:/core/ui/PageControls/save-wiki
 tags: $:/tags/PageControls
+caption: {{$:/core/images/save-button}} {{$:/language/Buttons/SaveWiki/Caption}}
 
-<$button message="tw-save-wiki" title={{$:/language/Buttons/SaveWiki/Hint}} aria-label={{$:/language/Buttons/SaveWiki/Caption}} class="btn-invisible">{{$:/core/images/save-button}}</$button>
\ No newline at end of file
+<$button message="tw-save-wiki" title={{$:/language/Buttons/SaveWiki/Hint}} aria-label={{$:/language/Buttons/SaveWiki/Caption}} class=<<tw-config-toolbar-class>>>
+<$list filter="[<tw-config-toolbar-icons>prefix[yes]]">
+{{$:/core/images/save-button}}
+</$list>
+<$list filter="[<tw-config-toolbar-text>prefix[yes]]">
+<$text text={{$:/language/Buttons/SaveWiki/Caption}}/>
+</$list>
+</$button>
\ No newline at end of file
diff --git a/core/ui/PageTemplate.tid b/core/ui/PageTemplate.tid
index 2746db82a..3ce5cad36 100644
--- a/core/ui/PageTemplate.tid
+++ b/core/ui/PageTemplate.tid
@@ -10,6 +10,8 @@ tw-page-container tw-page-view-$(themeTitle)$ tw-language-$(languageTitle)$
 
 <$set name="tw-config-toolbar-text" value={{$:/config/Toolbar/Text}}>
 
+<$set name="tw-config-toolbar-class" value="btn-invisible">
+
 <$set name="themeTitle" value={{$:/view}}>
 
 <$set name="currentTiddler" value={{$:/language}}>
@@ -48,4 +50,6 @@ tw-page-container tw-page-view-$(themeTitle)$ tw-language-$(languageTitle)$
 
 </$set>
 
+</$set>
+
 </$importvariables>
diff --git a/core/ui/PageTemplate/sidebar.tid b/core/ui/PageTemplate/sidebar.tid
index 6e7351728..d202db60e 100644
--- a/core/ui/PageTemplate/sidebar.tid
+++ b/core/ui/PageTemplate/sidebar.tid
@@ -1,6 +1,9 @@
 title: $:/core/ui/PageTemplate/sidebar
 tags: $:/tags/PageTemplate
 
+\define config-title()
+$:/config/PageControlButtons/Visibility/$(listItem)$
+\end
 <$scrollable fallthrough="no" class="tw-sidebar-scrollable">
 
 <div class="sidebar-header">
@@ -20,13 +23,11 @@ tags: $:/tags/PageTemplate
 </div>
 
 <div class="tw-page-controls">
-
 <$list filter="[all[shadows+tiddlers]tag[$:/tags/PageControls]!has[draft.of]]" variable="listItem">
-
+<$reveal type="nomatch" state=<<config-title>> text="hide">
 <$transclude tiddler=<<listItem>> mode="inline"/>
-
+</$reveal>
 </$list>
-
 </div>
 
 <$transclude tiddler="$:/core/ui/SideBarLists" mode="inline"/>
diff --git a/core/ui/TiddlerInfo/Tools.tid b/core/ui/TiddlerInfo/Tools.tid
index 4f4b5b098..7fb69bdde 100644
--- a/core/ui/TiddlerInfo/Tools.tid
+++ b/core/ui/TiddlerInfo/Tools.tid
@@ -4,19 +4,23 @@ caption: {{$:/language/TiddlerInfo/Tools/Caption}}
 
 \define lingo-base() $:/language/TiddlerInfo/
 \define config-title()
-$:/config/Buttons/Hide/$(listItem)$
+$:/config/ViewToolbarButtons/Visibility/$(listItem)$
 \end
 
 <$set name="tw-config-toolbar-icons" value="yes">
 
 <$set name="tw-config-toolbar-text" value="yes">
 
+<$set name="tw-config-toolbar-class" value="">
+
 <$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewToolbar]!has[draft.of]]" variable="listItem">
 
-<$transclude tiddler=<<listItem>>/> (<$checkbox tiddler=<<config-title>> field="text" checked="no" unchecked="yes" default="no"> Show in toolbar</$checkbox>)
+<$checkbox tiddler=<<config-title>> field="text" checked="show" unchecked="hide" default="show"> <$transclude tiddler=<<listItem>>/> </$checkbox>
 
 </$list>
 
 </$set>
 
 </$set>
+
+</$set>
diff --git a/core/ui/ViewTemplate/title.tid b/core/ui/ViewTemplate/title.tid
index d24c9f11f..492eb248c 100644
--- a/core/ui/ViewTemplate/title.tid
+++ b/core/ui/ViewTemplate/title.tid
@@ -5,12 +5,12 @@ tags: $:/tags/ViewTemplate
 fill:$(foregroundColor)$;
 \end
 \define config-title()
-$:/config/Buttons/Hide/$(listItem)$
+$:/config/ViewToolbarButtons/Visibility/$(listItem)$
 \end
 <div class="tw-tiddler-title">
 <h2 class="titlebar">
 <span class="tw-tiddler-controls">
-<$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewToolbar]!has[draft.of]]" variable="listItem"><$reveal type="nomatch" state=<<config-title>> text="yes"><$transclude tiddler=<<listItem>>/></$reveal></$list>
+<$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewToolbar]!has[draft.of]]" variable="listItem"><$reveal type="nomatch" state=<<config-title>> text="hide"><$transclude tiddler=<<listItem>>/></$reveal></$list>
 </span>
 <$set name="foregroundColor" value={{!!color}}>
 <span style=<<title-styles>>>
diff --git a/core/ui/ViewToolbar/clone.tid b/core/ui/ViewToolbar/clone.tid
index 7e4899e1a..9eeef3a12 100644
--- a/core/ui/ViewToolbar/clone.tid
+++ b/core/ui/ViewToolbar/clone.tid
@@ -1,7 +1,8 @@
 title: $:/core/ui/ViewToolbar/clone
 tags: $:/tags/ViewToolbar
+caption: {{$:/core/images/clone-button}} {{$:/language/Buttons/Clone/Caption}}
 
-<$button message="tw-new-tiddler" param=<<currentTiddler>> title={{$:/language/Buttons/Clone/Hint}} aria-label={{$:/language/Buttons/Clone/Caption}} class="btn-invisible">
+<$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]]">
 {{$:/core/images/clone-button}}
 </$list>
diff --git a/core/ui/ViewToolbar/close-others.tid b/core/ui/ViewToolbar/close-others.tid
index 2cd3789a4..7a9362f75 100644
--- a/core/ui/ViewToolbar/close-others.tid
+++ b/core/ui/ViewToolbar/close-others.tid
@@ -1,7 +1,8 @@
 title: $:/core/ui/ViewToolbar/close-others
 tags: $:/tags/ViewToolbar
+caption: {{$:/core/images/close-others-button}} {{$:/language/Buttons/CloseOthers/Caption}}
 
-<$button message="tw-close-other-tiddlers" param=<<currentTiddler>> title={{$:/language/Buttons/CloseOthers/Hint}} aria-label={{$:/language/Buttons/CloseOthers/Caption}} class="btn-invisible">
+<$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]]">
 {{$:/core/images/close-others-button}}
 </$list>
diff --git a/core/ui/ViewToolbar/close.tid b/core/ui/ViewToolbar/close.tid
index ac2468baa..4bfbfe7a9 100644
--- a/core/ui/ViewToolbar/close.tid
+++ b/core/ui/ViewToolbar/close.tid
@@ -1,7 +1,8 @@
 title: $:/core/ui/ViewToolbar/close
 tags: $:/tags/ViewToolbar
+caption: {{$:/core/images/close-button}} {{$:/language/Buttons/Close/Caption}}
 
-<$button message="tw-close-tiddler" title={{$:/language/Buttons/Close/Hint}} aria-label={{$:/language/Buttons/Close/Caption}} class="btn-invisible">
+<$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]]">
 {{$:/core/images/close-button}}
 </$list>
diff --git a/core/ui/ViewToolbar/edit.tid b/core/ui/ViewToolbar/edit.tid
index 38cfa3220..71b4eba71 100644
--- a/core/ui/ViewToolbar/edit.tid
+++ b/core/ui/ViewToolbar/edit.tid
@@ -1,7 +1,8 @@
 title: $:/core/ui/ViewToolbar/edit
 tags: $:/tags/ViewToolbar
+caption: {{$:/core/images/edit-button}} {{$:/language/Buttons/Edit/Caption}}
 
-<$button message="tw-edit-tiddler" title={{$:/language/Buttons/Edit/Hint}} aria-label={{$:/language/Buttons/Edit/Caption}} class="btn-invisible">
+<$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]]">
 {{$:/core/images/edit-button}}
 </$list>
diff --git a/core/ui/ViewToolbar/info.tid b/core/ui/ViewToolbar/info.tid
index faa4189a1..cbc27d26f 100644
--- a/core/ui/ViewToolbar/info.tid
+++ b/core/ui/ViewToolbar/info.tid
@@ -1,7 +1,8 @@
 title: $:/core/ui/ViewToolbar/info
 tags: $:/tags/ViewToolbar
+caption: {{$:/core/images/info-button}} {{$:/language/Buttons/Info/Caption}}
 
-<$button popup=<<tiddlerInfoState>> title={{$:/language/Buttons/Info/Hint}} aria-label={{$:/language/Buttons/Info/Caption}} class="btn-invisible" selectedClass="tw-selected">
+<$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]]">
 {{$:/core/images/info-button}}
 </$list>
diff --git a/core/ui/ViewToolbar/more.tid b/core/ui/ViewToolbar/more.tid
index 2c485d6af..fae67c2dc 100644
--- a/core/ui/ViewToolbar/more.tid
+++ b/core/ui/ViewToolbar/more.tid
@@ -1,10 +1,11 @@
 title: $:/core/ui/ViewToolbar/more
 tags: $:/tags/ViewToolbar
+caption: {{$:/core/images/down-arrow}} {{$:/language/Buttons/More/Caption}}
 
 \define config-title()
-$:/config/Buttons/Hide/$(listItem)$
+$:/config/ViewToolbarButtons/Visibility/$(listItem)$
 \end
-<$button popup=<<qualify "$:/state/popup/more">> title={{$:/language/Buttons/More/Hint}} aria-label={{$:/language/Buttons/More/Caption}} class="btn-invisible" selectedClass="tw-selected">
+<$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>
@@ -17,7 +18,7 @@ $:/config/Buttons/Hide/$(listItem)$
 <$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/ViewToolbar/more]]" variable="listItem">
-<$reveal type="match" state=<<config-title>> text="yes">
+<$reveal type="match" state=<<config-title>> text="hide">
 <$transclude tiddler=<<listItem>>/>
 </$reveal>
 </$list>
diff --git a/core/ui/ViewToolbar/permalink.tid b/core/ui/ViewToolbar/permalink.tid
index 6ef6810b1..c41cdfbcc 100644
--- a/core/ui/ViewToolbar/permalink.tid
+++ b/core/ui/ViewToolbar/permalink.tid
@@ -1,7 +1,8 @@
 title: $:/core/ui/ViewToolbar/permalink
 tags: $:/tags/ViewToolbar
+caption: {{$:/core/images/permalink-button}} {{$:/language/Buttons/Permalink/Caption}}
 
-<$button message="tw-permalink" title={{$:/language/Buttons/Permalink/Hint}} aria-label={{$:/language/Buttons/Permalink/Caption}} class="btn-invisible">
+<$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]]">
 {{$:/core/images/permalink-button}}
 </$list>
diff --git a/core/ui/ViewToolbar/permaview.tid b/core/ui/ViewToolbar/permaview.tid
index 137d4e8c5..6693a8705 100644
--- a/core/ui/ViewToolbar/permaview.tid
+++ b/core/ui/ViewToolbar/permaview.tid
@@ -1,7 +1,8 @@
 title: $:/core/ui/ViewToolbar/permaview
-tags: $:/tags/ViewToolbar
+tags: $:/tags/ViewToolbar $:/tags/PageControls
+caption: {{$:/core/images/permaview-button}} {{$:/language/Buttons/Permaview/Caption}}
 
-<$button message="tw-permaview" title={{$:/language/Buttons/Permaview/Hint}} aria-label={{$:/language/Buttons/Permaview/Caption}} class="btn-invisible">
+<$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]]">
 {{$:/core/images/permaview-button}}
 </$list>
diff --git a/core/wiki/config/ButtonsHide.multids b/core/wiki/config/ButtonsHide.multids
deleted file mode 100644
index 5daa2e529..000000000
--- a/core/wiki/config/ButtonsHide.multids
+++ /dev/null
@@ -1,7 +0,0 @@
-title: $:/config/Buttons/Hide/$:/
-
-core/ui/ViewToolbar/clone: yes
-core/ui/ViewToolbar/close-others: yes
-core/ui/ViewToolbar/more: yes
-core/ui/ViewToolbar/permalink: yes
-core/ui/ViewToolbar/permaview: yes
diff --git a/core/wiki/config/PageControlButtons.multids b/core/wiki/config/PageControlButtons.multids
new file mode 100644
index 000000000..b7dd52fe1
--- /dev/null
+++ b/core/wiki/config/PageControlButtons.multids
@@ -0,0 +1,4 @@
+title: $:/config/PageControlButtons/Visibility/$:/
+
+core/ui/PageControls/home: hide
+core/ui/ViewToolbar/permaview: hide
diff --git a/core/wiki/config/ViewToolbarButtons.multids b/core/wiki/config/ViewToolbarButtons.multids
new file mode 100644
index 000000000..e7c5e603a
--- /dev/null
+++ b/core/wiki/config/ViewToolbarButtons.multids
@@ -0,0 +1,7 @@
+title: $:/config/ViewToolbarButtons/Visibility/$:/
+
+core/ui/ViewToolbar/clone: hide
+core/ui/ViewToolbar/close-others: hide
+core/ui/ViewToolbar/more: hide
+core/ui/ViewToolbar/permalink: hide
+core/ui/ViewToolbar/permaview: hide
diff --git a/core/wiki/tags/PageControls.tid b/core/wiki/tags/PageControls.tid
index 94f4fee0c..bd6e59046 100644
--- a/core/wiki/tags/PageControls.tid
+++ b/core/wiki/tags/PageControls.tid
@@ -1,2 +1,2 @@
 title: $:/tags/PageControls
-list: [[$:/core/ui/PageControls/new-tiddler]] [[$:/core/ui/PageControls/control-panel]] [[$:/core/ui/PageControls/save-wiki]]
+list: [[$:/core/ui/PageControls/home]] [[$:/core/ui/ViewToolbar/permaview]] [[$:/core/ui/PageControls/new-tiddler]] [[$:/core/ui/PageControls/control-panel]] [[$:/core/ui/PageControls/save-wiki]]
diff --git a/editions/tw5.com/tiddlers/system/github-fork-ribbon.tid b/editions/tw5.com/tiddlers/system/github-fork-ribbon.tid
index d09dcfabd..5d9c7e385 100644
--- a/editions/tw5.com/tiddlers/system/github-fork-ribbon.tid
+++ b/editions/tw5.com/tiddlers/system/github-fork-ribbon.tid
@@ -1,5 +1,6 @@
 title: $:/editions/tw5.com/github-fork-ribbon
 tags: $:/tags/PageControls
+caption: ~GitHub ribbon
 
 <div class="github-fork-ribbon-wrapper right"><div class="github-fork-ribbon"><a href="https://github.com/Jermolene/TiddlyWiki5" target="_blank">Find me on ~GitHub</a></div>
 </div>
\ No newline at end of file
diff --git a/themes/tiddlywiki/vanilla/base.tid b/themes/tiddlywiki/vanilla/base.tid
index aefe6b734..de0649030 100644
--- a/themes/tiddlywiki/vanilla/base.tid
+++ b/themes/tiddlywiki/vanilla/base.tid
@@ -379,10 +379,6 @@ a.tw-tiddlylink-external:hover {
 	width: 60%;
 }
 
-.tw-search {
-	padding-top: 14px;
-}
-
 .tw-search a svg {
 	height: 0.75em;
 }