diff --git a/core/ui/EditTemplate/controls.tid b/core/ui/EditTemplate/controls.tid
index 38ad6cd60..87f16a6cc 100644
--- a/core/ui/EditTemplate/controls.tid
+++ b/core/ui/EditTemplate/controls.tid
@@ -1,4 +1,4 @@
 title: $:/core/ui/EditTemplate/controls
 tags: $:/tags/EditTemplate
 
-<span class="tw-tiddler-controls titlebar"> <$button message="tw-delete-tiddler" class="btn-invisible">{{$:/core/images/delete-button}}</$button> <$button message="tw-cancel-tiddler" class="btn-invisible">{{$:/core/images/cancel-button}}</$button> <$button message="tw-save-tiddler" class="btn-invisible">{{$:/core/images/done-button}}</$button> </span>
+<span class="tw-tiddler-controls titlebar"> <$list filter="[is[shadow]!has[draft.of]tag[$:/tags/EditToolbar]] [!is[shadow]!has[draft.of]tag[$:/tags/EditToolbar]]" variable="listItem"><$transclude tiddler=<<listItem>>/></$list> </span>
diff --git a/core/ui/EditToolbar/cancel.tid b/core/ui/EditToolbar/cancel.tid
new file mode 100644
index 000000000..7f09ee774
--- /dev/null
+++ b/core/ui/EditToolbar/cancel.tid
@@ -0,0 +1,4 @@
+title: $:/core/ui/EditToolbar/cancel
+tags: $:/tags/EditToolbar
+
+<$button message="tw-cancel-tiddler" class="btn-invisible">{{$:/core/images/cancel-button}}</$button>
\ No newline at end of file
diff --git a/core/ui/EditToolbar/delete.tid b/core/ui/EditToolbar/delete.tid
new file mode 100644
index 000000000..66cde605d
--- /dev/null
+++ b/core/ui/EditToolbar/delete.tid
@@ -0,0 +1,4 @@
+title: $:/core/ui/EditToolbar/delete
+tags: $:/tags/EditToolbar
+
+<$button message="tw-delete-tiddler" class="btn-invisible">{{$:/core/images/delete-button}}</$button>
\ No newline at end of file
diff --git a/core/ui/EditToolbar/save.tid b/core/ui/EditToolbar/save.tid
new file mode 100644
index 000000000..4e21cefec
--- /dev/null
+++ b/core/ui/EditToolbar/save.tid
@@ -0,0 +1,4 @@
+title: $:/core/ui/EditToolbar/save
+tags: $:/tags/EditToolbar
+
+<$button message="tw-save-tiddler" class="btn-invisible">{{$:/core/images/done-button}}</$button>
\ No newline at end of file
diff --git a/core/ui/PageControls/controlpanel.tid b/core/ui/PageControls/controlpanel.tid
new file mode 100644
index 000000000..27f762078
--- /dev/null
+++ b/core/ui/PageControls/controlpanel.tid
@@ -0,0 +1,4 @@
+title: $:/core/ui/PageControls/control-panel
+tags: $:/tags/PageControls
+
+<$link to="$:/ControlPanel">{{$:/core/images/options-button}}</$link>
\ No newline at end of file
diff --git a/core/ui/PageControls/newtiddler.tid b/core/ui/PageControls/newtiddler.tid
new file mode 100644
index 000000000..27ca47001
--- /dev/null
+++ b/core/ui/PageControls/newtiddler.tid
@@ -0,0 +1,4 @@
+title: $:/core/ui/PageControls/new-tiddler
+tags: $:/tags/PageControls
+
+<$button message="tw-new-tiddler" class="btn-invisible">{{$:/core/images/new-button}}</$button>
\ No newline at end of file
diff --git a/core/ui/PageControls/savewiki.tid b/core/ui/PageControls/savewiki.tid
new file mode 100644
index 000000000..d855483ff
--- /dev/null
+++ b/core/ui/PageControls/savewiki.tid
@@ -0,0 +1,4 @@
+title: $:/core/ui/PageControls/save-wiki
+tags: $:/tags/PageControls
+
+<$button message="tw-save-wiki" class="btn-invisible">{{$:/core/images/save-button}}</$button>
\ No newline at end of file
diff --git a/core/ui/PageTemplate.tid b/core/ui/PageTemplate.tid
index c83e9ce87..5e88a0dfa 100644
--- a/core/ui/PageTemplate.tid
+++ b/core/ui/PageTemplate.tid
@@ -15,7 +15,7 @@ title: $:/core/ui/PageTemplate
 <header class="sidebar-header"><div class="titlebar">{{SiteTitle}}</div><div class="tw-subtitle">{{SiteSubtitle}}</div>
 
 <div class="tw-page-controls">
-<$button message="tw-new-tiddler" class="btn-invisible">{{$:/core/images/new-button}}</$button><$link to="$:/ControlPanel">{{$:/core/images/options-button}}</$link><$button message="tw-save-wiki" class="btn-invisible">{{$:/core/images/save-button}}</$button>
+<$list filter="[is[shadow]!has[draft.of]tag[$:/tags/PageControls]] [!is[shadow]!has[draft.of]tag[$:/tags/PageControls]]" variable="listItem"><$transclude tiddler=<<listItem>>/></$list>
 </div>
 
 {{$:/core/ui/SideBar}}
diff --git a/core/ui/ViewTemplate.tid b/core/ui/ViewTemplate.tid
index 9ac01180e..27eb7608f 100644
--- a/core/ui/ViewTemplate.tid
+++ b/core/ui/ViewTemplate.tid
@@ -4,6 +4,6 @@ modifier: JeremyRuston
 \define frame-classes()
 tw-tiddler-frame $(missingTiddlerClass)$ $(shadowTiddlerClass)$ $(systemTiddlerClass)$
 \end
-<$tiddler tiddler=<<currentTiddler>>><div class=<<frame-classes>>><$list filter="[is[shadow]!has[draft.of]tag[$:/tags/ViewTemplate]] [!is[shadow]!has[draft.of]tag[$:/tags/ViewTemplate]]" variable="listItem"><$transclude tiddler=<<listItem>>/></$list>
+<$set name="tiddlerInfoState" value=<<qualify "$:/state/tiddlerInfo">>><$tiddler tiddler=<<currentTiddler>>><div class=<<frame-classes>>><$list filter="[is[shadow]!has[draft.of]tag[$:/tags/ViewTemplate]] [!is[shadow]!has[draft.of]tag[$:/tags/ViewTemplate]]" variable="listItem"><$transclude tiddler=<<listItem>>/></$list>
 </div>
-</$tiddler>
+</$tiddler></$set>
diff --git a/core/ui/ViewTemplate/title.tid b/core/ui/ViewTemplate/title.tid
index 711f65770..2a25be3e9 100644
--- a/core/ui/ViewTemplate/title.tid
+++ b/core/ui/ViewTemplate/title.tid
@@ -4,11 +4,11 @@ tags: $:/tags/ViewTemplate
 \define title-styles()
 fill:$(foregroundColor)$;
 \end
-<div class="tw-tiddler-title"><div class="titlebar"><span class="tw-tiddler-controls"><$button popup=<<qualify "$:/state/tiddlerInfo">> class="btn-invisible" selectedClass="tw-selected">{{$:/core/images/info-button}}</$button><$button message="tw-edit-tiddler" class="btn-invisible">{{$:/core/images/edit-button}}</$button><$button message="tw-close-tiddler" class="btn-invisible">{{$:/core/images/close-button}}</$button>
+<div class="tw-tiddler-title"><div class="titlebar"><span class="tw-tiddler-controls"><$list filter="[is[shadow]!has[draft.of]tag[$:/tags/ViewToolbar]] [!is[shadow]!has[draft.of]tag[$:/tags/ViewToolbar]]" variable="listItem"><$transclude tiddler=<<listItem>>/></$list>
 
 </span><$set name="foregroundColor" value={{!!color}}><span style=<<title-styles>>><$transclude tiddler={{!!icon}}/></span></$set> <span class="title"><$view field="title"/></span></div>
 
-<$reveal type="nomatch" text="" default="" state=<<qualify "$:/state/tiddlerInfo">> class="tw-tiddler-info tw-popup" animate="yes">
+<$reveal type="nomatch" text="" default="" state=<<tiddlerInfoState>> class="tw-tiddler-info tw-popup" animate="yes">
 
 <$transclude tiddler="$:/core/ui/TiddlerInfo"/>
 
diff --git a/core/ui/ViewToolbar/close.tid b/core/ui/ViewToolbar/close.tid
new file mode 100644
index 000000000..7c58b126e
--- /dev/null
+++ b/core/ui/ViewToolbar/close.tid
@@ -0,0 +1,4 @@
+title: $:/core/ui/ViewToolbar/close
+tags: $:/tags/ViewToolbar
+
+<$button message="tw-close-tiddler" class="btn-invisible">{{$:/core/images/close-button}}</$button>
\ No newline at end of file
diff --git a/core/ui/ViewToolbar/edit.tid b/core/ui/ViewToolbar/edit.tid
new file mode 100644
index 000000000..e2efb1884
--- /dev/null
+++ b/core/ui/ViewToolbar/edit.tid
@@ -0,0 +1,4 @@
+title: $:/core/ui/ViewToolbar/edit
+tags: $:/tags/ViewToolbar
+
+<$button message="tw-edit-tiddler" class="btn-invisible">{{$:/core/images/edit-button}}</$button>
\ No newline at end of file
diff --git a/core/ui/ViewToolbar/info.tid b/core/ui/ViewToolbar/info.tid
new file mode 100644
index 000000000..d22c2761f
--- /dev/null
+++ b/core/ui/ViewToolbar/info.tid
@@ -0,0 +1,4 @@
+title: $:/core/ui/ViewToolbar/info
+tags: $:/tags/ViewToolbar
+
+<$button popup=<<tiddlerInfoState>> class="btn-invisible" selectedClass="tw-selected">{{$:/core/images/info-button}}</$button>
\ No newline at end of file
diff --git a/core/wiki/tags/EditToolbar.tid b/core/wiki/tags/EditToolbar.tid
new file mode 100644
index 000000000..96d595b9b
--- /dev/null
+++ b/core/wiki/tags/EditToolbar.tid
@@ -0,0 +1,2 @@
+title: $:/tags/EditToolbar
+list: [[$:/core/ui/EditToolbar/delete]] [[$:/core/ui/EditToolbar/cancel]] [[$:/core/ui/EditToolbar/save]]
diff --git a/core/wiki/tags/PageControls.tid b/core/wiki/tags/PageControls.tid
new file mode 100644
index 000000000..94f4fee0c
--- /dev/null
+++ b/core/wiki/tags/PageControls.tid
@@ -0,0 +1,2 @@
+title: $:/tags/PageControls
+list: [[$:/core/ui/PageControls/new-tiddler]] [[$:/core/ui/PageControls/control-panel]] [[$:/core/ui/PageControls/save-wiki]]
diff --git a/core/wiki/tags/ViewToolbar.tid b/core/wiki/tags/ViewToolbar.tid
new file mode 100644
index 000000000..e64d0c90f
--- /dev/null
+++ b/core/wiki/tags/ViewToolbar.tid
@@ -0,0 +1,2 @@
+title: $:/tags/ViewToolbar
+list: [[$:/core/ui/ViewToolbar/info]] [[$:/core/ui/ViewToolbar/edit]] [[$:/core/ui/ViewToolbar/close]]
diff --git a/editions/tw5.com/tiddlers/Release 5.0.0alpha15.tid b/editions/tw5.com/tiddlers/Release 5.0.0alpha15.tid
index b4475931d..ea44787b2 100644
--- a/editions/tw5.com/tiddlers/Release 5.0.0alpha15.tid	
+++ b/editions/tw5.com/tiddlers/Release 5.0.0alpha15.tid	
@@ -19,7 +19,10 @@ This release has several bug fixes and improvements:
 * For http://five.tiddlywiki.com, add a tiddler info tab with a link to the static representation of the tiddler
 * Improve the popup mechanism so that the tiddler info panel doesn't close so easily
 * Make more UI elements extensible via system tags:
+** [[$:/tags/ViewToolbar]] for the view mode tiddler toolbar
 ** [[$:/tags/EditTemplate]] for the edit template
+** [[$:/tags/EditToolbar]] for the edit mode tiddler toolbar
+** [[$:/tags/PageControls]] for the page control tools in the sidebar
 * Various improvements for working with TiddlyWeb, including:
 ** Updated control panel
 * Fixed the module type names in the internal tab of the control panel