diff --git a/docs/index.html b/docs/index.html
index 6d937e3..b375b3c 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -1211,7 +1211,7 @@ github: https://github.com/sobjornstad/zettelkasten-sib</pre>
 <div created="20200404141629548" creator="soren" modified="20200404141630712" modifier="soren" title="$:/config/ViewToolbarButtons/Visibility/$:/plugins/bimlas/locator/viewtemplate/open-in-sidebar" type="text/vnd.tiddlywiki">
 <pre>hide</pre>
 </div>
-<div created="20210525001044166" modified="20210525000849030" title="$:/config/ViewToolbarButtons/Visibility/$:/sib/Buttons/CopyPublicZettelkastenLink" type="text/vnd.tiddlywiki">
+<div created="20210525001044166" creator="soren" modified="20210922125743198" modifier="soren" title="$:/config/ViewToolbarButtons/Visibility/$:/sib/Buttons/CopyPublicZettelkastenLink" type="text/vnd.tiddlywiki">
 <pre>hide</pre>
 </div>
 <div created="20210525001045047" modified="20210525000850061" title="$:/config/ViewToolbarButtons/Visibility/$:/sib/Buttons/CopyTitleReference" type="text/vnd.tiddlywiki">
@@ -16043,22 +16043,38 @@ Info: CoreVersion parameter is needed for TiddlyWiki only!
     }
 }</pre>
 </div>
-<div caption="Copy public Zettelkasten link" created="20201120172611922" creator="soren" description="Copy a link to this tiddler in the public Zettelkasten" list-after="$:/core/ui/Buttons/info" modified="20210825162715432" modifier="soren" tags="$:/tags/ViewToolbar" title="$:/sib/Buttons/CopyPublicZettelkastenLink" type="text/vnd.tiddlywiki">
+<div caption="copy public link" created="20201120172611922" creator="soren" description="Copy a link to this tiddler in the public Zettelkasten" list-after="$:/core/ui/Buttons/info" modified="20210922125543768" modifier="soren" tags="$:/tags/ViewToolbar" title="$:/sib/Buttons/CopyPublicZettelkastenLink" type="text/vnd.tiddlywiki">
 <pre>\whitespace trim
 \define copier()
   https://zettelkasten.sorenbjornstad.com/#$(tidTitle)$
 \end
 
 &lt;$set name=&quot;tidTitle&quot; value={{!!title}}&gt;
-&lt;$button message=&quot;tm-copy-to-clipboard&quot; param=&lt;&lt;copier&gt;&gt; tooltip={{!!caption}} class=&lt;&lt;tv-config-toolbar-class&gt;&gt;&gt;
+&lt;$button message=&quot;tm-copy-to-clipboard&quot; param=&lt;&lt;copier&gt;&gt; tooltip={{$:/sib/Buttons/CopyPublicZettelkastenLink!!caption}} class=&lt;&lt;tv-config-toolbar-class&gt;&gt;&gt;
+	&lt;$list filter=&quot;[&lt;tv-config-toolbar-icons&gt;match[yes]]&quot;&gt;
   {{$:/core/images/permalink-button}}
+	&lt;/$list&gt;
+	&lt;$list filter=&quot;[&lt;tv-config-toolbar-text&gt;match[yes]]&quot;&gt;
+	&lt;span class=&quot;tc-btn-text&quot;&gt;
+	&lt;$text text=&quot; &quot;/&gt;
+	&lt;$text text={{$:/sib/Buttons/CopyPublicZettelkastenLink!!caption}}/&gt;
+	&lt;/span&gt;
+	&lt;/$list&gt;
 &lt;/$button&gt;
 &lt;/$set&gt;</pre>
 </div>
-<div caption="Copy tiddler title" created="20200419143537510" creator="soren" description="Copy the name of this tiddler to the clipboard" list-after="$:/core/ui/Buttons/info" modified="20210825162721583" modifier="soren" tags="$:/tags/ViewToolbar" title="$:/sib/Buttons/CopyTitleReference" type="text/vnd.tiddlywiki">
+<div caption="copy tiddler title" created="20200419143537510" creator="soren" description="Copy the name of this tiddler to the clipboard" list-after="$:/core/ui/Buttons/info" modified="20210922125723154" modifier="soren" tags="$:/tags/ViewToolbar" title="$:/sib/Buttons/CopyTitleReference" type="text/vnd.tiddlywiki">
 <pre>\whitespace trim
-&lt;$button message=&quot;tm-copy-to-clipboard&quot; param={{!!title}} tooltip={{!!caption}} class=&lt;&lt;tv-config-toolbar-class&gt;&gt;&gt;
-	&lt;i class=&quot;far fa-copy&quot; style=&quot;font-size:160%; position:relative; bottom:-4px; left:-1px;&quot;/&gt;
+&lt;$button message=&quot;tm-copy-to-clipboard&quot; param={{!!title}} tooltip={{$:/sib/Buttons/CopyTitleReference!!caption}} class=&lt;&lt;tv-config-toolbar-class&gt;&gt;&gt;
+	&lt;$list filter=&quot;[&lt;tv-config-toolbar-icons&gt;match[yes]]&quot;&gt;
+		&lt;i class=&quot;far fa-copy&quot; style=&quot;font-size:160%; position:relative; bottom:-4px; left:-1px;&quot;/&gt;
+	&lt;/$list&gt;
+	&lt;$list filter=&quot;[&lt;tv-config-toolbar-text&gt;match[yes]]&quot;&gt;
+	&lt;span class=&quot;tc-btn-text&quot;&gt;
+	&lt;$text text=&quot; &quot;/&gt;
+	&lt;$text text={{$:/sib/Buttons/CopyTitleReference!!caption}}/&gt;
+	&lt;/span&gt;
+	&lt;/$list&gt;
 &lt;/$button&gt;</pre>
 </div>
 <div caption="Excise private chunk" condition="[&lt;targetTiddler&gt;type[]] [&lt;targetTiddler&gt;type[text/vnd.tiddlywiki]] +[first[]]" created="20210522034413324" description="Create a new private chunk from the selection" icon="$:/core/images/locked-padlock" list-after="$:/core/ui/EditorToolbar/excise" modified="20210522034828757" shortcuts="((excise-private-chunk))" tags="$:/tags/EditorToolbar" title="$:/sib/Buttons/excise-private-chunk" type="text/vnd.tiddlywiki">
diff --git a/tzk/editions/tzk/tiddlers/$__config_ViewToolbarButtons_Visibility_$__sib_Buttons_CopyPublicZettelkastenLink.tid b/tzk/editions/tzk/tiddlers/$__config_ViewToolbarButtons_Visibility_$__sib_Buttons_CopyPublicZettelkastenLink.tid
index a480a1b..4b81512 100644
--- a/tzk/editions/tzk/tiddlers/$__config_ViewToolbarButtons_Visibility_$__sib_Buttons_CopyPublicZettelkastenLink.tid
+++ b/tzk/editions/tzk/tiddlers/$__config_ViewToolbarButtons_Visibility_$__sib_Buttons_CopyPublicZettelkastenLink.tid
@@ -1,5 +1,7 @@
 created: 20210525001044166
-modified: 20210525000849030
+creator: soren
+modified: 20210922125743198
+modifier: soren
 title: $:/config/ViewToolbarButtons/Visibility/$:/sib/Buttons/CopyPublicZettelkastenLink
 type: text/vnd.tiddlywiki
 
diff --git a/tzk/editions/tzk/tiddlers/$__sib_Buttons_CopyPublicZettelkastenLink.tid b/tzk/editions/tzk/tiddlers/$__sib_Buttons_CopyPublicZettelkastenLink.tid
index bba1c47..f7a24cc 100644
--- a/tzk/editions/tzk/tiddlers/$__sib_Buttons_CopyPublicZettelkastenLink.tid
+++ b/tzk/editions/tzk/tiddlers/$__sib_Buttons_CopyPublicZettelkastenLink.tid
@@ -1,9 +1,9 @@
-caption: Copy public Zettelkasten link
+caption: copy public link
 created: 20201120172611922
 creator: soren
 description: Copy a link to this tiddler in the public Zettelkasten
 list-after: $:/core/ui/Buttons/info
-modified: 20210825162715432
+modified: 20210922125543768
 modifier: soren
 tags: $:/tags/ViewToolbar
 title: $:/sib/Buttons/CopyPublicZettelkastenLink
@@ -15,7 +15,15 @@ type: text/vnd.tiddlywiki
 \end
 
 <$set name="tidTitle" value={{!!title}}>
-<$button message="tm-copy-to-clipboard" param=<<copier>> tooltip={{!!caption}} class=<<tv-config-toolbar-class>>>
+<$button message="tm-copy-to-clipboard" param=<<copier>> tooltip={{$:/sib/Buttons/CopyPublicZettelkastenLink!!caption}} class=<<tv-config-toolbar-class>>>
+	<$list filter="[<tv-config-toolbar-icons>match[yes]]">
   {{$:/core/images/permalink-button}}
+	</$list>
+	<$list filter="[<tv-config-toolbar-text>match[yes]]">
+	<span class="tc-btn-text">
+	<$text text=" "/>
+	<$text text={{$:/sib/Buttons/CopyPublicZettelkastenLink!!caption}}/>
+	</span>
+	</$list>
 </$button>
 </$set>
\ No newline at end of file
diff --git a/tzk/editions/tzk/tiddlers/$__sib_Buttons_CopyTitleReference.tid b/tzk/editions/tzk/tiddlers/$__sib_Buttons_CopyTitleReference.tid
index a7da9ae..80691d2 100644
--- a/tzk/editions/tzk/tiddlers/$__sib_Buttons_CopyTitleReference.tid
+++ b/tzk/editions/tzk/tiddlers/$__sib_Buttons_CopyTitleReference.tid
@@ -1,15 +1,23 @@
-caption: Copy tiddler title
+caption: copy tiddler title
 created: 20200419143537510
 creator: soren
 description: Copy the name of this tiddler to the clipboard
 list-after: $:/core/ui/Buttons/info
-modified: 20210825162721583
+modified: 20210922125723154
 modifier: soren
 tags: $:/tags/ViewToolbar
 title: $:/sib/Buttons/CopyTitleReference
 type: text/vnd.tiddlywiki
 
 \whitespace trim
-<$button message="tm-copy-to-clipboard" param={{!!title}} tooltip={{!!caption}} class=<<tv-config-toolbar-class>>>
-	<i class="far fa-copy" style="font-size:160%; position:relative; bottom:-4px; left:-1px;"/>
+<$button message="tm-copy-to-clipboard" param={{!!title}} tooltip={{$:/sib/Buttons/CopyTitleReference!!caption}} class=<<tv-config-toolbar-class>>>
+	<$list filter="[<tv-config-toolbar-icons>match[yes]]">
+		<i class="far fa-copy" style="font-size:160%; position:relative; bottom:-4px; left:-1px;"/>
+	</$list>
+	<$list filter="[<tv-config-toolbar-text>match[yes]]">
+	<span class="tc-btn-text">
+	<$text text=" "/>
+	<$text text={{$:/sib/Buttons/CopyTitleReference!!caption}}/>
+	</span>
+	</$list>
 </$button>
\ No newline at end of file