diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 6da2477..ee5267d 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -49,11 +49,11 @@
               </div>
 
               {{ if .Params.tags }}
-                <span class="post-meta">
+                <div class="blog-tags">
                   {{ range .Params.tags }}
-                    #<a href="{{ $.Site.LanguagePrefix | absURL }}/tags/{{ . | urlize }}/">{{ . }}</a>&nbsp;
+                    <a href="{{ $.Site.LanguagePrefix | absURL }}/tags/{{ . | urlize }}/">{{ . }}</a>&nbsp;
                   {{ end }}
-                </span>
+                </div>
               {{ end }}
 
             </article>
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 6422dbb..0c54069 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -4,6 +4,15 @@
     <div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1">
       <article role="main" class="blog-post">
         {{ .Content }}
+
+        {{ if .Params.tags }}
+          <div class="blog-tags">
+            {{ range .Params.tags }}
+              <a href="{{ $.Site.LanguagePrefix | absURL }}/tags/{{ . | urlize }}/">{{ . }}</a>&nbsp;
+            {{ end }}
+          </div>
+        {{ end }}
+
         {{ if .Site.Params.socialShare }}
             <hr/>
             <section id="social-share">
diff --git a/layouts/index.html b/layouts/index.html
index 25dc65b..a18ea7f 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -35,11 +35,11 @@
               </div>
 
               {{ if .Params.tags }}
-                <span class="post-meta">
-                {{ range .Params.tags }}
-                  #<a href="{{ $.Site.LanguagePrefix | absURL }}/tags/{{ . | urlize }}/">{{ . }}</a>&nbsp;
-                {{ end }}
-                </span>
+                <div class="blog-tags">
+                  {{ range .Params.tags }}
+                    <a href="{{ $.Site.LanguagePrefix | absURL }}/tags/{{ . | urlize }}/">{{ . }}</a>&nbsp;
+                  {{ end }}
+                </div>
               {{ end }}
             </article>
           {{ end }}
diff --git a/static/css/main.css b/static/css/main.css
index d712772..d1c70a7 100644
--- a/static/css/main.css
+++ b/static/css/main.css
@@ -427,12 +427,20 @@ footer .theme-by {
   margin-bottom: 30px;
 }
 
+.blog-tags:before {
+  content: "Tags: ";
+}
+
 .blog-tags a {
   color: #008AFF;
   text-decoration: none;
   padding: 0px 5px;
 }
 
+.blog-tags a:before {
+  content: "#";
+}
+
 .blog-tags a:hover {
   border-radius: 2px;
   color: #008AFF;