diff --git a/assets/css/paige/paige.css b/assets/css/paige/paige.css
index 55b5bc5b..bffe3d21 100644
--- a/assets/css/paige/paige.css
+++ b/assets/css/paige/paige.css
@@ -12,17 +12,6 @@
     content: "{{ i18n `paige_figure` | safeCSS }} " counter(paige-shortcode-figure-numbered);
 }
 
-.paige-header-link {
-    opacity: 0;
-    margin-left: 0.5rem;
-    position: absolute;
-    transition: color 0.15s ease-in-out, opacity 0.15s ease-in-out;
-}
-
-.paige-header-link::after {
-    content: "#";
-}
-
 .paige-shortcode-quote .blockquote-footer {
     margin-top: 0;
 }
@@ -75,13 +64,6 @@ table {
     margin-bottom: 1rem;
 }
 
-.paige-header-link:focus,
-.paige-header-link:hover,
-:hover > .paige-header-link,
-:target > .paige-header-link {
-    opacity: 1;
-}
-
 {{ $colorscheme := $page.Param "paige.site.color_scheme" }}
 
 {{ if eq $colorscheme "dark" }}
@@ -97,9 +79,3 @@ table {
         {{ partial "paige/light.css" $page | safeCSS }}
     }
 {{ end }}
-
-@media (prefers-reduced-motion: reduce) {
-    .paige-header-link {
-        transition: none;
-    }
-}
diff --git a/layouts/_default/_markup/render-heading.html b/layouts/_default/_markup/render-heading.html
new file mode 100644
index 00000000..b591393b
--- /dev/null
+++ b/layouts/_default/_markup/render-heading.html
@@ -0,0 +1,3 @@
+<h{{ .Level }} id="{{ .Anchor }}" {{ range $k, $v := .Attributes }} {{ printf `%s="%s"` $k $v | safeHTMLAttr }} {{ end }}>
+    <a aria-label="{{ i18n "paige_link_to_this_section" }}" class="text-body text-decoration-none" href="#{{ .Anchor }}">{{ .Text }}</a>
+</h{{ .Level }}>
diff --git a/layouts/partials/paige/page.html b/layouts/partials/paige/page.html
index 806813fb..92efd54e 100644
--- a/layouts/partials/paige/page.html
+++ b/layouts/partials/paige/page.html
@@ -1,7 +1,7 @@
 {{ $page := . }}
 
 {{ $class := slice }}
-{{ $content := $page.Content | replaceRE `(<h[1-6] id="([^"]+)".+)(</h[1-6]+>)` (printf `${1}<a aria-label="%s" class="paige-header-link" href="#${2}"></a>${3}` (i18n "paige_link_to_this_section")) }}
+{{ $content := $page.Content }}
 {{ $draft := $page.Draft }}
 {{ $expired := and $page.ExpiryDate (lt $page.ExpiryDate now) }}
 {{ $future := and $page.PublishDate (gt $page.PublishDate now) }}