diff --git a/assets/sass/booking.scss b/assets/sass/booking.scss
index a46a162d6..2d6e495c3 100644
--- a/assets/sass/booking.scss
+++ b/assets/sass/booking.scss
@@ -68,24 +68,6 @@
   }
 }
 
-.o-booking__links {
-  margin-top: 1.5rem;
-  display: flex;
-  gap: 1rem;
-  flex-wrap: wrap;
-
-  @media print {
-    > a {
-      flex-wrap: wrap;
-      font-weight: bold;
-
-      &::after {
-        font-weight: normal;
-      }
-    }
-  }
-}
-
 .o-booking__info {
   margin-bottom: 1.5rem;
 }
diff --git a/assets/sass/expander.scss b/assets/sass/expander.scss
index e3b94471d..5d424b185 100644
--- a/assets/sass/expander.scss
+++ b/assets/sass/expander.scss
@@ -82,6 +82,29 @@ details[open] > .o-expander__summary {
   }
 }
 
+.o-expander__actions {
+  margin-top: 1.5rem;
+  display: flex;
+  gap: 1rem;
+  flex-wrap: wrap;
+  align-items: center;
+
+  > .a-anchorlink__link {
+    margin-left: auto;
+  }
+
+  @media print {
+    > a {
+      flex-wrap: wrap;
+      font-weight: bold;
+
+      &::after {
+        font-weight: normal;
+      }
+    }
+  }
+}
+
 details {
   position: relative;
   background-color: var(--bg-neutral);
diff --git a/layouts/_markup/render-heading.html b/layouts/_markup/render-heading.html
index b85eac95e..f044c3683 100644
--- a/layouts/_markup/render-heading.html
+++ b/layouts/_markup/render-heading.html
@@ -11,13 +11,7 @@
   {{- partial "intersector" -}}
   <span class="a-anchorlink">
     {{- $heading | safeHTML -}}
-    <button
-      data-anchor="#{{ $id }}"
-      class="a-anchorlink__link"
-      title="{{ T "anchorLink.copy" }}"
-    >
-      {{- partial "icon" "link" -}}
-    </button>
+    {{- partial "anchorlink-button" $id -}}
   </span>
 {{- else -}}
   {{- $heading | safeHTML -}}
diff --git a/layouts/_partials/anchorlink-button.html b/layouts/_partials/anchorlink-button.html
new file mode 100644
index 000000000..e1af91679
--- /dev/null
+++ b/layouts/_partials/anchorlink-button.html
@@ -0,0 +1,7 @@
+<button
+  class="a-anchorlink__link"
+  data-anchor="#{{ . }}"
+  title="{{ T "anchorLink.copy" }}"
+>
+  {{- partial "icon" "link" -}}
+</button>
diff --git a/layouts/_partials/booking/links.html b/layouts/_partials/booking/links.html
index 1947fcbbc..5627da382 100644
--- a/layouts/_partials/booking/links.html
+++ b/layouts/_partials/booking/links.html
@@ -1,4 +1,4 @@
-<div class="o-booking__links">
+<div class="o-expander__actions">
   {{- if .page.Params.booking_link -}}
     {{- partial "button"
       (dict
@@ -15,4 +15,5 @@
       )
     -}}
   {{- end -}}
+  {{- partial "anchorlink-button" .id -}}
 </div>
diff --git a/layouts/_partials/expander.html b/layouts/_partials/expander.html
index fe138a825..3031196b5 100644
--- a/layouts/_partials/expander.html
+++ b/layouts/_partials/expander.html
@@ -18,5 +18,10 @@
 
   <div class="o-expander__content">
     {{ .Content }}
+    {{- with .Id -}}
+      <div class="o-expander__actions">
+        {{- partial "anchorlink-button" . -}}
+      </div>
+    {{- end -}}
   </div>
 </details>
diff --git a/layouts/_partials/train-category.html b/layouts/_partials/train-category.html
index 9d9fc87a2..b27c23cf0 100644
--- a/layouts/_partials/train-category.html
+++ b/layouts/_partials/train-category.html
@@ -123,9 +123,8 @@ <h4 id="{{ .id }}" class="o-expander__title-text">
     {{- $content := partial "transformations/increase-headings" (dict "content" .content "offset" 1) -}}
     {{- $content := partial "transformations/transform-expander-headings" (dict "content" $content "id" .id) -}}
     {{- $content | safeHTML -}}
-
-    {{- if or .route_overview_url .additional_information_url -}}
-      <div data-pagefind-ignore>
+    <div class="o-expander__actions">
+      {{- if or .route_overview_url .additional_information_url -}}
         {{- if .route_overview_url -}}
           {{- partial "button"
             (dict
@@ -142,7 +141,8 @@ <h4 id="{{ .id }}" class="o-expander__title-text">
             )
           -}}
         {{- end -}}
-      </div>
-    {{- end -}}
+      {{- end -}}
+      {{- partial "anchorlink-button" .id -}}
+    </div>
   </div>
 </details>