diff --git a/plugins/tiddlywiki/text-slicer/macros.tid b/plugins/tiddlywiki/text-slicer/macros.tid
index bcba9bc62..fb1c0f41f 100644
--- a/plugins/tiddlywiki/text-slicer/macros.tid
+++ b/plugins/tiddlywiki/text-slicer/macros.tid
@@ -1,15 +1,11 @@
 title: $:/plugins/tiddlywiki/text-slicer/macros
 tags: $:/tags/Macro
 
-\define display-tiddler()
-<$list filter="[draft.of<currentTiddler>limit[1]]" editTemplate="$:/core/ui/EditTemplate" emptyMessage="""<$transclude mode='block'/>"""/>
-\end
-
 \define display-heading-tiddler(level:"h1")
 <$level$><$view field="title"/></$level$>
 <$list filter='[tag<currentTiddler>!has[draft.of]]'>
 <$tiddler>
-<<display-tiddler>>
+{{||$:/plugins/tiddlywiki/text-slicer/templates/display-tiddler}}
 </$tiddler>
 </$list>
 \end
@@ -19,7 +15,7 @@ tags: $:/tags/Macro
 <$list filter='[tag<currentTiddler>!has[draft.of]]'>
 <li>
 <$tiddler>
-<<display-tiddler>>
+{{||$:/plugins/tiddlywiki/text-slicer/templates/display-tiddler}}
 </$tiddler>
 </li>
 </$list>
diff --git a/plugins/tiddlywiki/text-slicer/slice-button.tid b/plugins/tiddlywiki/text-slicer/slice-button.tid
index e82c6f8be..2ce65e615 100644
--- a/plugins/tiddlywiki/text-slicer/slice-button.tid
+++ b/plugins/tiddlywiki/text-slicer/slice-button.tid
@@ -1,5 +1,6 @@
 title: $:/plugins/tiddlywiki/text-slicer/ui/slice-button
 tags: $:/tags/ViewToolbar
+list-before: $:/core/ui/Buttons/edit
 caption: {{$:/plugins/tiddlywiki/text-slicer/text-slicer-icon}} Slice tiddler
 description: Slice this tiddler by headings and lists
 
diff --git a/plugins/tiddlywiki/text-slicer/slicer.js b/plugins/tiddlywiki/text-slicer/slicer.js
index 10f2013af..51a38360e 100644
--- a/plugins/tiddlywiki/text-slicer/slicer.js
+++ b/plugins/tiddlywiki/text-slicer/slicer.js
@@ -121,7 +121,7 @@ function sliceTiddler(title) {
 	if(parser) {
 		parentStack.push({type: "h0", title: addTiddler({
 			title: "Sliced up " + title,
-			text: "<div class='tc-table-of-contents'>\n\n<<toc-selective-expandable 'Sliced up " + title + "'>>\n\n</div>\n<<display-heading-tiddler level:'h1'>>",
+			text: "{{||$:/plugins/tiddlywiki/text-slicer/templates/display-document}}",
 			list: []
 		})});
 		processNodeList(parser.tree);
diff --git a/plugins/tiddlywiki/text-slicer/template-display-document.tid b/plugins/tiddlywiki/text-slicer/template-display-document.tid
new file mode 100644
index 000000000..c2344b1c3
--- /dev/null
+++ b/plugins/tiddlywiki/text-slicer/template-display-document.tid
@@ -0,0 +1,21 @@
+title: $:/plugins/tiddlywiki/text-slicer/templates/display-document
+
+\define config-show-toolbar()
+$:/plugins/tiddlywiki/text-slicer/config/show-toolbar/$(currentTiddler)$
+\end
+
+\define display-tiddler()
+<$set name="tv-show-toolbar" value={{$(config-show-toolbar)$}}>
+<<display-heading-tiddler level:'h1'>>
+</$set>
+\end
+
+<div class='tc-table-of-contents'>
+
+<$macrocall $name="toc-selective-expandable" tag=<<currentTiddler>>/>
+
+</div>
+
+<$checkbox tiddler=<<config-show-toolbar>> field="text" checked="yes" unchecked="no" default="no"> Show toolbar</$checkbox>
+
+<<display-tiddler>>
diff --git a/plugins/tiddlywiki/text-slicer/template-display-tiddler.tid b/plugins/tiddlywiki/text-slicer/template-display-tiddler.tid
new file mode 100644
index 000000000..0a4023560
--- /dev/null
+++ b/plugins/tiddlywiki/text-slicer/template-display-tiddler.tid
@@ -0,0 +1,6 @@
+title: $:/plugins/tiddlywiki/text-slicer/templates/display-tiddler
+
+<$list filter="[<tv-show-toolbar>prefix[yes]]" variable="hasToolbar">
+{{||$:/plugins/tiddlywiki/text-slicer/templates/tiddler-toolbar}}
+</$list>
+<$list filter="[draft.of<currentTiddler>limit[1]]" editTemplate="$:/core/ui/EditTemplate" emptyMessage="""<$transclude mode='block'/>"""/>
diff --git a/plugins/tiddlywiki/text-slicer/template-tiddler-toolbar.tid b/plugins/tiddlywiki/text-slicer/template-tiddler-toolbar.tid
new file mode 100644
index 000000000..68c603fcb
--- /dev/null
+++ b/plugins/tiddlywiki/text-slicer/template-tiddler-toolbar.tid
@@ -0,0 +1,5 @@
+title: $:/plugins/tiddlywiki/text-slicer/templates/tiddler-toolbar
+
+<div class="tc-slice-toolbar" style="background:#def;">
+<$link><$text text=<<currentTiddler>>/></$link>
+</div>