diff --git a/core/ui/TagTemplate.tid b/core/ui/TagTemplate.tid
index b4db35a0f..d9d16adcb 100644
--- a/core/ui/TagTemplate.tid
+++ b/core/ui/TagTemplate.tid
@@ -1,6 +1,6 @@
 title: $:/core/ui/TagTemplate
 
-<$button popup="$:/state/tagpopup" qualifyTiddlerTitles="yes" class="btn-invisible"><$setstyle name="background-color" value={{!!color}} class="tw-tag-label"><$view field="title" format="text" /></$setstyle></$button>
+<$button popup="$:/state/tagpopup" qualifyTiddlerTitles="yes" class="btn-invisible"><$setstyle name="background-color" value={{!!color}} class="tw-tag-label"><$transclude target={{!!icon}}/> <$view field="title" format="text" /></$setstyle></$button>
 <$reveal state="$:/state/tagpopup" type="popup" position="below" qualifyTiddlerTitles="yes" ><div class="tw-drop-down">
 <$view field="title" format="link" />
 ----
diff --git a/editions/tw5.com/tiddlers/tags/done.tid b/editions/tw5.com/tiddlers/tags/done.tid
index 55827afcd..34edfebf1 100644
--- a/editions/tw5.com/tiddlers/tags/done.tid
+++ b/editions/tw5.com/tiddlers/tags/done.tid
@@ -1,4 +1,5 @@
 color: #3ae745
 modified: 201306131058
 title: done
+icon: $:/core/images/done-button
 
diff --git a/themes/tiddlywiki/snowwhite/base.tid b/themes/tiddlywiki/snowwhite/base.tid
index 205a83847..8e2bf4849 100644
--- a/themes/tiddlywiki/snowwhite/base.tid
+++ b/themes/tiddlywiki/snowwhite/base.tid
@@ -264,6 +264,12 @@ a.tw-tiddlylink-external {
 	<<border-radius 8px>>
 }
 
+.tw-tag-label svg {
+	height: 1em;
+	width: 1em;
+	fill: #fff;
+}
+
 /*
 ** Page layout
 */
@@ -541,6 +547,7 @@ canvas.tw-edit-bitmapeditor  {
 
 .tw-add-tag svg {
 	height: 1em;
+	width: 1em;
 	fill: #999;
 }
 
@@ -591,6 +598,7 @@ canvas.tw-edit-bitmapeditor  {
 
 .tw-edit-field-remove svg {
 	height: 1em;
+	width: 1em;
 	fill: #888;
 	vertical-align: middle;
 }