diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index a09cfc8..2283e9a 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -15,15 +15,17 @@
 		</div>
 
 		<div class="post-tags">
-			<small>
-				{{ if ne .Type "page" }}
-					{{ if gt .Params.tags 0 }}
-						{{ range .Params.tags }}
-							<a href="{{ "/tags/" | relLangURL }}{{ . | urlize }}">{{ . }}</a> 
-						{{ end }}
-					{{ end }}
+			{{ if ne .Type "page" }}
+				{{ if gt .Params.tags 0 }}
+					<nav class="nav tags">
+							<ul class="flat">
+								{{ range .Params.tags }}
+								<li><a href="{{ "/tags/" | relLangURL }}{{ . | urlize }}">{{ . }}</a></li>
+								{{ end }}
+							</ul>
+					</nav>
 				{{ end }}
-			</small>
+			{{ end }}
 		</div>
 
 		{{- $.Scratch.Set "isDisqus" true -}}
diff --git a/static/css/dark.css b/static/css/dark.css
index 1b6eb1f..cc1fe66 100644
--- a/static/css/dark.css
+++ b/static/css/dark.css
@@ -34,6 +34,11 @@ a:hover {
 	opacity: 0.8;
 }
 
+.post-tags .tags a {
+    border: 1px solid #fff;
+    color: #fff;
+}
+
 .header nav,
 .footer {
 	border-color: #333;
diff --git a/static/css/main.css b/static/css/main.css
index 355f437..000e721 100644
--- a/static/css/main.css
+++ b/static/css/main.css
@@ -301,6 +301,23 @@ ul {
     background-color: #f9f2f4;
 }
 
+.post-tags .tags li {
+    margin-bottom: 0;
+    margin-top: 20px;
+}
+
+.post-tags .tags a {
+    display: inline-block;
+    border: 1px solid #a00;
+    border-radius: 4px;
+    padding: 0px 6px;
+    color: #a00;
+    line-height: 20px;
+    font-size: 12px;
+    text-decoration: none;
+    margin: 0 1px;
+}
+
 .list .posts .post .meta {
     margin-bottom: 0;
     margin-left: 5px;