diff --git a/core/styles/base.tid b/core/styles/base.tid
index a477ec965..120ab63d0 100644
--- a/core/styles/base.tid
+++ b/core/styles/base.tid
@@ -80,18 +80,20 @@ a.tw-tiddlylink-missing {
 	border: none;
 }
 
-.label {
+.tw-tag-label {
 	display: inline-block;
 	padding: 2px 4px;
 	font-size: 11.844px;
 	font-weight: bold;
 	line-height: 14px;
 	color: #ffffff;
-	text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+	text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.44);
 	white-space: nowrap;
 	vertical-align: baseline;
 	background-color: #999999;
+	border: 1px solid rgba(0,0,0,0.22);
 	<<border-radius 3px>>
+	<<box-shadow "inset 1px 1px 0 rgba(255,255,255,0.22)">>
 }
 
 .edit-header {
diff --git a/core/templates/TagTemplate.tid b/core/templates/TagTemplate.tid
index c88970648..ac5223bc1 100644
--- a/core/templates/TagTemplate.tid
+++ b/core/templates/TagTemplate.tid
@@ -1,6 +1,6 @@
 title: $:/templates/TagTemplate
 
-<$button popup="tagpopup" qualifyTiddlerTitles="yes" class="btn-invisible"><$setstyle name="background-color" value={{!!color}} class="label"><$view field="title" format="text" /></$setstyle></$button>
+<$button popup="tagpopup" qualifyTiddlerTitles="yes" class="btn-invisible"><$setstyle name="background-color" value={{!!color}} class="tw-tag-label"><$view field="title" format="text" /></$setstyle></$button>
 <$reveal state="tagpopup" type="popup" position="below" qualifyTiddlerTitles="yes" ><div class="tw-drop-down">
 <$view field="title" format="link" />
 ----