diff --git a/layouts/partials/posts/metadata.html b/layouts/partials/posts/metadata.html
new file mode 100644
index 0000000..0a5c87c
--- /dev/null
+++ b/layouts/partials/posts/metadata.html
@@ -0,0 +1,54 @@
+<span class="no-wrap">
+  <svg class="icon gdoc_date"><use xlink:href="#gdoc_date"></use></svg>
+  <span class="gdoc-post__tag">
+    <time datetime="{{ .Lastmod.Format "2006-01-02T15:04:05Z07:00" | safeHTML }}">
+      {{ if .Lastmod.After (.Date.AddDate 0 0 1) }}
+        Updated on
+      {{ end }}
+      {{ .Lastmod.Format "Jan 2, 2006" }}
+    </time>
+  </span>
+</span>
+
+<span class="no-wrap">
+  <svg class="icon gdoc_timer"><use xlink:href="#gdoc_timer"></use></svg>
+  <span class="gdoc-post__tag">{{ .ReadingTime }} min read</span>
+</span>
+
+{{ $tc := 0 }}
+{{ with .Params.tags }}
+  {{ range sort . }}
+    {{ $name := . }}
+    {{ with $.Site.GetPage (printf "/tags/%s" $name | urlize) }}
+      {{ if eq $tc 0 }}
+        <span class="no-wrap">
+          <svg class="icon gdoc_bookmark"><use xlink:href="#gdoc_bookmark"></use></svg>
+          {{ template "post-tag" dict "name" $name "page" . }}
+        </span>
+      {{ else }}
+        {{ template "post-tag" dict "name" $name "page" . }}
+      {{ end }}
+    {{ end }}
+    {{ $tc = (add $tc 1) }}
+  {{ end }}
+{{ end }}
+
+{{ define "post-tag" }}
+  <span class="gdoc-post__tag gdoc-button">
+    <a
+      class="gdoc-button__link"
+      href="{{ .page.RelPermalink }}"
+      title="All posts tagged with '{{ .name }}'"
+    >
+      {{ .name }}
+    </a>
+  </span>
+{{ end }}
+
+{{ define "post-author" }}
+  <span class="gdoc-post__tag gdoc-button">
+    <a class="gdoc-button__link" href="{{ .page.RelPermalink }}" title="All posts of this author">
+      {{ .name }}
+    </a>
+  </span>
+{{ end }}
diff --git a/layouts/posts/list.html b/layouts/posts/list.html
index f833e77..b9a7426 100644
--- a/layouts/posts/list.html
+++ b/layouts/posts/list.html
@@ -21,40 +21,7 @@
       </div>
 
       <footer class="gdoc-post__footer">
-        <span class="no-wrap">
-          <svg class="icon gdoc_date"><use xlink:href="#gdoc_date"></use></svg>
-          <span class="gdoc-post__tag">
-            <time datetime="{{ .Lastmod.Format "2006-01-02T15:04:05Z07:00" | safeHTML }}">
-              {{ if .Lastmod.After (.Date.AddDate 0 0 1) }}
-                Updated on
-              {{ end }}
-              {{ .Lastmod.Format "Jan 2, 2006" }}
-            </time>
-          </span>
-        </span>
-
-        <span class="no-wrap">
-          <svg class="icon gdoc_timer"><use xlink:href="#gdoc_timer"></use></svg>
-          <span class="gdoc-post__tag">{{ .ReadingTime }} min read</span>
-        </span>
-
-        {{ $tc := 0 }}
-        {{ with .Params.tags }}
-          {{ range sort . }}
-            {{ $name := . }}
-            {{ with $.Site.GetPage (printf "/tags/%s" $name | urlize) }}
-              {{ if eq $tc 0 }}
-                <span class="no-wrap">
-                  <svg class="icon gdoc_bookmark"><use xlink:href="#gdoc_bookmark"></use></svg>
-                  {{ template "post-tag" dict "name" $name "page" . }}
-                </span>
-              {{ else }}
-                {{ template "post-tag" dict "name" $name "page" . }}
-              {{ end }}
-            {{ end }}
-            {{ $tc = (add $tc 1) }}
-          {{ end }}
-        {{ end }}
+        {{ partial "posts/metadata.html" . }}
       </footer>
     </article>
   {{ end }}
diff --git a/layouts/posts/single.html b/layouts/posts/single.html
index 3e0f2b7..1087156 100644
--- a/layouts/posts/single.html
+++ b/layouts/posts/single.html
@@ -3,22 +3,7 @@
     <header class="gdoc-post__header">
       <h1 class="gdoc-post__title">{{ .Title }}</h1>
       <div class="gdoc-post__meta">
-        <span class="no-wrap">
-          <svg class="icon gdoc_date"><use xlink:href="#gdoc_date"></use></svg>
-          <span class="gdoc-post__tag">
-            <time datetime="{{ .Lastmod.Format "2006-01-02T15:04:05Z07:00" | safeHTML }}">
-              {{ if ne (.Lastmod.Format "2006-01-02") (.Date.Format "2006-01-02") }}
-                Updated on
-              {{ end }}
-              {{ .Lastmod.Format "Jan 2, 2006" }}
-            </time>
-          </span>
-        </span>
-
-        <span class="no-wrap">
-          <svg class="icon gdoc_timer"><use xlink:href="#gdoc_timer"></use></svg>
-          <span class="gdoc-post__tag">{{ .ReadingTime }} min read</span>
-        </span>
+        {{ partial "posts/metadata.html" . }}
       </div>
     </header>
     <div>
diff --git a/layouts/taxonomy/list.html b/layouts/taxonomy/list.html
index f833e77..b9a7426 100644
--- a/layouts/taxonomy/list.html
+++ b/layouts/taxonomy/list.html
@@ -21,40 +21,7 @@
       </div>
 
       <footer class="gdoc-post__footer">
-        <span class="no-wrap">
-          <svg class="icon gdoc_date"><use xlink:href="#gdoc_date"></use></svg>
-          <span class="gdoc-post__tag">
-            <time datetime="{{ .Lastmod.Format "2006-01-02T15:04:05Z07:00" | safeHTML }}">
-              {{ if .Lastmod.After (.Date.AddDate 0 0 1) }}
-                Updated on
-              {{ end }}
-              {{ .Lastmod.Format "Jan 2, 2006" }}
-            </time>
-          </span>
-        </span>
-
-        <span class="no-wrap">
-          <svg class="icon gdoc_timer"><use xlink:href="#gdoc_timer"></use></svg>
-          <span class="gdoc-post__tag">{{ .ReadingTime }} min read</span>
-        </span>
-
-        {{ $tc := 0 }}
-        {{ with .Params.tags }}
-          {{ range sort . }}
-            {{ $name := . }}
-            {{ with $.Site.GetPage (printf "/tags/%s" $name | urlize) }}
-              {{ if eq $tc 0 }}
-                <span class="no-wrap">
-                  <svg class="icon gdoc_bookmark"><use xlink:href="#gdoc_bookmark"></use></svg>
-                  {{ template "post-tag" dict "name" $name "page" . }}
-                </span>
-              {{ else }}
-                {{ template "post-tag" dict "name" $name "page" . }}
-              {{ end }}
-            {{ end }}
-            {{ $tc = (add $tc 1) }}
-          {{ end }}
-        {{ end }}
+        {{ partial "posts/metadata.html" . }}
       </footer>
     </article>
   {{ end }}
diff --git a/src/sass/_base.scss b/src/sass/_base.scss
index 1d92b8e..44a228b 100644
--- a/src/sass/_base.scss
+++ b/src/sass/_base.scss
@@ -163,9 +163,9 @@ img {
 
 .icon {
   display: inline-block;
-  width: 1em;
-  height: 1em;
-  top: 0.125em;
+  width: 1.3em;
+  height: 1.3em;
+  vertical-align: middle;
   stroke-width: 0;
   stroke: currentColor;
   fill: currentColor;
@@ -456,12 +456,8 @@ img {
   &__tag {
     margin: $padding-4 0 !important;
 
-    .gdoc-button {
-      background: var(--body-background);
-
-      &__link {
-        padding: $padding-4 $padding-8;
-      }
+    .gdoc-button__link {
+      padding: $padding-4 $padding-8;
     }
   }