diff --git a/assets/sass/expander.scss b/assets/sass/expander.scss
index 4f9862fa..d3a3669f 100644
--- a/assets/sass/expander.scss
+++ b/assets/sass/expander.scss
@@ -1,15 +1,26 @@
+.o-expander > hr {
+  margin: 0;
+}
+
 .o-expander__summary {
   display: flex;
-
+  padding: 1.2rem;
   gap: 0.5rem;
   align-items: center;
+  transition: background .3s ease;
+
+  &:not(.o-expander__summary--booking) {
+    font-weight: 700;
+  }
 
   &:hover,
   &:focus {
     .o-expander__summary-text {
-      font-weight: 700;
       text-decoration: underline;
     }
+
+    border-radius: var(--border-radius-m);
+    background: rgba($link-hovered, 0.15);
   }
 
   &--booking {
@@ -22,29 +33,35 @@
   }
 }
 
+.details-screen[open] > .o-expander__summary {
+  &:hover,
+  &:focus {
+    border-radius: var(--border-radius-m) var(--border-radius-m) 0 0;
+  }
+}
+
+.o-expander__content {
+  padding: 1.2rem;
+}
+
 .details-print {
   display: none;
 }
 
 details {
   position: relative;
-  padding: 1.2rem;
   background-color: var(--bg-neutral);
   border-radius: var(--border-radius-m);
   margin-bottom: 1.2rem;
   border: var(--border);
 }
 
-details[open] > .o-expander__summary {
-  margin-bottom: 0.5rem;
-}
-
 details > summary {
   list-style-type: none;
 }
 
 .details-screen > .o-expander__summary {
-  margin-right: 3.2rem;
+  padding-right: 3.2rem;
 }
 
 details > div {
diff --git a/layouts/partials/booking.html b/layouts/partials/booking.html
index c5f3abdc..a27d0300 100644
--- a/layouts/partials/booking.html
+++ b/layouts/partials/booking.html
@@ -34,6 +34,7 @@
     </div>
 </summary>
 <hr aria-hidden="true">
+<div class="o-expander__content">
 {{- if .info -}}
 <div class="o-booking__info">
     {{- .info | .original_page.RenderString  -}}
@@ -54,3 +55,4 @@
 </div>
 
 {{ partial "booking-links" .page }}
+</div>
diff --git a/layouts/shortcodes/expander.html b/layouts/shortcodes/expander.html
index d8956e64..3f6ff69e 100644
--- a/layouts/shortcodes/expander.html
+++ b/layouts/shortcodes/expander.html
@@ -6,8 +6,8 @@
     {{- partial "icon" (index $iconMapping $param) -}}
     <span class="o-expander__summary-text">{{ (.Get 0) }}</span>
 </summary>
-<div>
-    <hr aria-hidden="true">
+<hr aria-hidden="true">
+<div class="o-expander__content">
     {{ .Inner }}
 </div>
 </details>
@@ -21,8 +21,8 @@
 <summary class="o-expander__summary">
     <span class="o-expander__summary-text">{{ (.Get 0) }}</span>
 </summary>
-<div>
-    <hr aria-hidden="true">
+<hr aria-hidden="true">
+<div class="o-expander__content">
     {{ .Inner }}
 </div>
 </details>