diff --git a/public_html/css/post.css b/public_html/css/post.css
index 76407700..cc086798 100644
--- a/public_html/css/post.css
+++ b/public_html/css/post.css
@@ -84,7 +84,6 @@
 	margin: 0;
 	padding: 0;
 }
-#sidebar .tags li,
 #sidebar .other-info li {
 	display: block;
 	word-break: break-all;
@@ -92,18 +91,25 @@
 	text-indent: -1em;
 }
 
+#sidebar .tags li {
+	display: block;
+	word-break: break-all;
+	padding-left: 20px;
+	text-indent: -20px;
+}
 #sidebar .tags .tag-wrapper {
 	max-width: 100%;
 	position: relative;
 	display: inline-block;
 }
-#sidebar .tags li a {
-	display: inline-block;
-	padding-left: 1em; /* ? */
+#sidebar .tags li a.tag-edit {
+	margin-left: 20px;
+}
+#sidebar .tags li .tag-name {
+	margin-right: 0.8em;
 }
 #sidebar .tags li .usages {
 	color: silver;
-	padding-left: 0.5em;
 }
 
 #sidebar .author-box img {
diff --git a/public_html/templates/post.tpl b/public_html/templates/post.tpl
index c9f964bb..ae3f347d 100644
--- a/public_html/templates/post.tpl
+++ b/public_html/templates/post.tpl
@@ -73,10 +73,14 @@
 		<h1>Tags (<%= _.size(post.tags) %>)</h1>
 		<ul class="tags">
 			<% _.each(post.tags, function(tag) { %>
-				<li class="tag-category-<%= tag.category %>">
-					<a href="#/posts/query=<%= tag.name %>">
-						<%= tag.name %>
-						<span class="usages"><%= (tag.usages) %></span>
+				<li class="tag-category-<%= tag.category %>"><!--
+					--><a class="tag-edit" href="#/tag/<%= tag.name %>"><!--
+						--><i class="fa fa-tag"></i><!--
+					--></a><!--
+
+					--><a class="post-search" href="#/posts/query=<%= tag.name %>"><!--
+						--><span class="tag-name"><%= tag.name %></span><!--
+						--><span class="usages"><%= (tag.usages) %></span>
 					</a>
 				</li>
 			<% }) %>