diff --git a/assets/scss/main.scss b/assets/scss/main.scss
index 488876a9e..410d02016 100644
--- a/assets/scss/main.scss
+++ b/assets/scss/main.scss
@@ -19233,7 +19233,7 @@ nav.foldable-nav .with-child ul {
   text-decoration: none;
   visibility: hidden; }
   .td-heading-self-link:before {
-    content: '#'; }
+    content: '🔗'; }
   @media (hover: none) and (pointer: coarse), (max-width: 576px) {
     .td-heading-self-link {
       visibility: visible; } }
diff --git a/layouts/_default/_markup/render-heading.html b/layouts/_default/_markup/render-heading.html
new file mode 100644
index 000000000..a1c8e41d1
--- /dev/null
+++ b/layouts/_default/_markup/render-heading.html
@@ -0,0 +1,8 @@
+<h{{ .Level }} id="{{- .Anchor | safeURL -}}">
+  {{- .Text | safeHTML -}}
+  {{ template "_default/_markup/_td-heading-self-link.html" . -}}
+</h{{ .Level }}>
+
+{{- define "_default/_markup/_td-heading-self-link.html" -}}
+<a class="td-heading-self-link" href="#{{ .Anchor | safeURL }}" aria-label="Heading self-link"></a>
+{{- end -}}
\ No newline at end of file