diff --git a/layouts/partials/content.html b/layouts/partials/content.html
index 6d93e3f..1ca0cb3 100644
--- a/layouts/partials/content.html
+++ b/layouts/partials/content.html
@@ -1,8 +1,11 @@
 {{ $showAnchor := (and (default true .Page.Params.GeekdocAnchor) (default true .Site.Params.GeekdocAnchor)) }}
+{{ $anchorLeft := (default false .Site.Params.GeekdocAnchorLeft) }}
 
 {{ $.Scratch.Set "content" (.Content | replaceRE `<nav id="TableOfContents">\s*<ul>\s*<li>\s*<ul>` `<nav id="TableOfContents"><ul>` | replaceRE `</ul>\s*</li>\s*</ul>\s*</nav>` `</ul></nav>` | safeHTML) }}
-{{ if $showAnchor }}
-    {{ $.Scratch.Set "content" ($.Scratch.Get "content" | replaceRE "(<h[2-9] id=\"([^\"]+)\".+)(</h[2-9]+>)" `${1}&nbsp;<a class="gdoc-page__anchor" href="#${2}"><svg class="icon link"><use xlink:href="#link"></use></svg></a> ${3}</h>` | safeHTML) }}
+{{ if and $showAnchor $anchorLeft }}
+    {{ $.Scratch.Set "content" ($.Scratch.Get "content" | replaceRE "(<h[2-9] id=\"([^\"]+)\"[^>]*>)(.*?)(</h[2-9]+>)" `${1}<a class="gdoc-page__anchor gdoc-page__anchor--left" href="#${2}"><svg class="icon link"><use xlink:href="#link"></use></svg></a>${3}${4}` | safeHTML) }}
+{{ else if and $showAnchor (not $anchorLeft) }}
+    {{ $.Scratch.Set "content" ($.Scratch.Get "content" | replaceRE "(<h[2-9] id=\"([^\"]+)\"[^>]*>)(.*?)(</h[2-9]+>)" `${1}${3}<a class="gdoc-page__anchor gdoc-page__anchor--right" href="#${2}"><svg class="icon link"><use xlink:href="#link"></use></svg></a>${4}` | safeHTML) }}
 {{ end }}
 
 {{ $.Scratch.Get "content" }}
diff --git a/src/sass/_base.scss b/src/sass/_base.scss
index d4d778a..1aff497 100644
--- a/src/sass/_base.scss
+++ b/src/sass/_base.scss
@@ -222,8 +222,19 @@ img {
     }
   }
 
-  &__anchor .icon {
-    color: $gray-400;
+  &__anchor{
+    &--left {
+      min-width: 35px;
+      text-align: left;
+    }
+
+    &--right {
+      margin-left: 0.5em;
+    }
+
+    .icon {
+      color: $gray-400;
+    }
   }
 }