diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index cd93c16..a7373cf 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -1,5 +1,5 @@
 {{ define "main" }}
-    {{ .Content }}
+    {{ partial "anchor.html" .Content }}
 
     {{ range .Data.Pages.ByDate.Reverse }}
         <p>
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index bf703c8..a786d68 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,3 +1,3 @@
 {{ define "main" }}
-    {{ .Content }}
+    {{ partial "anchor.html" .Content }}
 {{ end }}
diff --git a/layouts/blog/single.html b/layouts/blog/single.html
index 78b6340..f34915c 100644
--- a/layouts/blog/single.html
+++ b/layouts/blog/single.html
@@ -6,7 +6,7 @@
     <h1>{{ .Title }}</h1>
     <small>Published on {{.Date.Format "2006-01-02"}}</small>
 
-    {{ .Content }}
+    {{ partial "anchor.html" .Content }}
 
     <hr class="comments-separator">
 
diff --git a/layouts/partials/anchor.html b/layouts/partials/anchor.html
new file mode 100644
index 0000000..eef2dd9
--- /dev/null
+++ b/layouts/partials/anchor.html
@@ -0,0 +1,3 @@
+{{/* Adapted from https://discourse.gohugo.io/t/adding-anchor-next-to-headers/1726 */}}
+
+{{ . | replaceRE "(<h[2-6] id=\"([^\"]+)\".+)(</h[2-6]+>)" `${1}<a aria-label="Anchor" class="anchor" href="#${2}"><svg class="icon icon-link"><use xlink:href="/images/icons.svg#icon-link"></use></svg></a>${3}` | safeHTML }}
diff --git a/layouts/partials/js.html b/layouts/partials/js.html
index cc8d534..3d195ac 100644
--- a/layouts/partials/js.html
+++ b/layouts/partials/js.html
@@ -1,12 +1,8 @@
-<script src="https://cdnjs.cloudflare.com/ajax/libs/anchor-js/4.1.0/anchor.min.js" integrity="sha256-lZaRhKri35AyJSypXXs4o6OPFTbTmUoltBbDCbdzegg=" crossorigin="anonymous"></script>
-
 <script type="text/javascript">
     var greetings = ['Hello', '你好', 'Hola', 'Namaste', 'Marhabaan',
                      'Bonjour', 'Hallå', 'こんにちは', '안녕하세요'];
     document.getElementById('greeting').innerHTML =
         greetings[Math.floor(Math.random() * greetings.length)];
-
-    anchors.add();
 </script>
 
 {{ template "_internal/google_analytics_async.html" . }}
diff --git a/static/css/general.css b/static/css/general.css
index 0c859aa..ba12cc5 100644
--- a/static/css/general.css
+++ b/static/css/general.css
@@ -27,7 +27,7 @@ a {
 
 /* Animated link underline on hover
    Adapted from https://codepen.io/shshaw/details/pdyJBW */
-a:not(.anchorjs-link):not(.link-button) {
+a:not(.anchor):not(.link-button) {
   background-image: linear-gradient(currentColor, currentColor);
   background-position: 0 100%;
   background-repeat: no-repeat;
@@ -35,10 +35,16 @@ a:not(.anchorjs-link):not(.link-button) {
   transition: background-size .3s;
 }
 
-a:not(.anchorjs-link):not(.link-button):hover {
+a:not(.anchor):not(.link-button):hover {
   background-size: 100% 2px;
 }
 
+.icon-link {
+  font-size: 0.7em;
+  margin-left: 0.6em;
+  margin-bottom: 1px;
+}
+
 body {
   color: #333;
   font-family: 'Open Sans', sans-serif;
@@ -170,3 +176,12 @@ img {
 .email:hover {
   background-color: #920126;
 }
+
+.icon {
+  display: inline-block;
+  width: 1em;
+  height: 1em;
+  stroke-width: 0;
+  stroke: currentColor;
+  fill: currentColor;
+}
diff --git a/static/images/icomoon.json b/static/images/icomoon.json
new file mode 100755
index 0000000..f872ed1
--- /dev/null
+++ b/static/images/icomoon.json
@@ -0,0 +1,82 @@
+{
+  "IcoMoonType": "selection",
+  "icons": [
+    {
+      "icon": {
+        "paths": [
+          "M440.236 635.766c-13.31 0-26.616-5.076-36.77-15.23-95.134-95.136-95.134-249.934 0-345.070l192-192c46.088-46.086 107.36-71.466 172.534-71.466s126.448 25.38 172.536 71.464c95.132 95.136 95.132 249.934 0 345.070l-87.766 87.766c-20.308 20.308-53.23 20.308-73.54 0-20.306-20.306-20.306-53.232 0-73.54l87.766-87.766c54.584-54.586 54.584-143.404 0-197.99-26.442-26.442-61.6-41.004-98.996-41.004s-72.552 14.562-98.996 41.006l-192 191.998c-54.586 54.586-54.586 143.406 0 197.992 20.308 20.306 20.306 53.232 0 73.54-10.15 10.152-23.462 15.23-36.768 15.23z",
+          "M256 1012c-65.176 0-126.45-25.38-172.534-71.464-95.134-95.136-95.134-249.934 0-345.070l87.764-87.764c20.308-20.306 53.234-20.306 73.54 0 20.308 20.306 20.308 53.232 0 73.54l-87.764 87.764c-54.586 54.586-54.586 143.406 0 197.992 26.44 26.44 61.598 41.002 98.994 41.002s72.552-14.562 98.998-41.006l192-191.998c54.584-54.586 54.584-143.406 0-197.992-20.308-20.308-20.306-53.232 0-73.54 20.306-20.306 53.232-20.306 73.54 0.002 95.132 95.134 95.132 249.932 0.002 345.068l-192.002 192c-46.090 46.088-107.364 71.466-172.538 71.466z"
+        ],
+        "tags": [
+          "link",
+          "chain",
+          "url",
+          "uri",
+          "anchor"
+        ],
+        "defaultCode": 59851,
+        "grid": 16,
+        "attrs": []
+      },
+      "attrs": [],
+      "properties": {
+        "ligatures": "link, chain",
+        "name": "link",
+        "order": 5,
+        "id": 204,
+        "prevSize": 32,
+        "code": 59851
+      },
+      "setIdx": 0,
+      "setId": 1,
+      "iconIdx": 203
+    }
+  ],
+  "height": 1024,
+  "preferences": {
+    "showGlyphs": true,
+    "showQuickUse": true,
+    "showQuickUse2": true,
+    "showSVGs": true,
+    "fontPref": {
+      "prefix": "icon-",
+      "metadata": {
+        "fontFamily": "dannyguo",
+        "majorVersion": 1,
+        "minorVersion": 0
+      },
+      "metrics": {
+        "emSize": 1024,
+        "baseline": 6.25,
+        "whitespace": 50
+      },
+      "embed": false,
+      "autoHost": true,
+      "showMetrics": true,
+      "showSelector": true,
+      "showMetadata": true,
+      "noie8": true,
+      "ie7": false,
+      "selector": "",
+      "classSelector": ".icon"
+    },
+    "imagePref": {
+      "prefix": "icon-",
+      "png": false,
+      "useClassSelector": true,
+      "color": 0,
+      "bgColor": 16777215,
+      "classSelector": ".icon",
+      "height": 32,
+      "columns": 16,
+      "margin": 16
+    },
+    "historySize": 50,
+    "showCodes": true,
+    "gridSize": 16,
+    "quickUsageToken": {
+      "dannyguo": "MGU5Yzg0MDI4ZWIzNWVjZGYyNmQ4ZGU3YWFhNTg3MGUjMSMxNTI3NDUzNTY1IyMj"
+    },
+    "showLiga": true
+  }
+}
\ No newline at end of file
diff --git a/static/images/icons.svg b/static/images/icons.svg
new file mode 100755
index 0000000..3321ae3
--- /dev/null
+++ b/static/images/icons.svg
@@ -0,0 +1,9 @@
+<svg aria-hidden="true" style="position: absolute; width: 0; height: 0; overflow: hidden;" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<defs>
+<symbol id="icon-link" viewBox="0 0 32 32">
+<title>link</title>
+<path d="M13.757 19.868c-0.416 0-0.832-0.159-1.149-0.476-2.973-2.973-2.973-7.81 0-10.783l6-6c1.44-1.44 3.355-2.233 5.392-2.233s3.951 0.793 5.392 2.233c2.973 2.973 2.973 7.81 0 10.783l-2.743 2.743c-0.635 0.635-1.663 0.635-2.298 0s-0.635-1.663 0-2.298l2.743-2.743c1.706-1.706 1.706-4.481 0-6.187-0.826-0.826-1.925-1.281-3.094-1.281s-2.267 0.455-3.094 1.281l-6 6c-1.706 1.706-1.706 4.481 0 6.187 0.635 0.635 0.635 1.663 0 2.298-0.317 0.317-0.733 0.476-1.149 0.476z"></path>
+<path d="M8 31.625c-2.037 0-3.952-0.793-5.392-2.233-2.973-2.973-2.973-7.81 0-10.783l2.743-2.743c0.635-0.635 1.664-0.635 2.298 0s0.635 1.663 0 2.298l-2.743 2.743c-1.706 1.706-1.706 4.481 0 6.187 0.826 0.826 1.925 1.281 3.094 1.281s2.267-0.455 3.094-1.281l6-6c1.706-1.706 1.706-4.481 0-6.187-0.635-0.635-0.635-1.663 0-2.298s1.663-0.635 2.298 0c2.973 2.973 2.973 7.81 0 10.783l-6 6c-1.44 1.44-3.355 2.233-5.392 2.233z"></path>
+</symbol>
+</defs>
+</svg>