diff --git a/src/components/notifications/notifications.scss b/src/components/notifications/notifications.scss
index b57dfb3a..245e3f47 100644
--- a/src/components/notifications/notifications.scss
+++ b/src/components/notifications/notifications.scss
@@ -36,7 +36,7 @@
     width: var(--__panel-heading-height);
     height: var(--__panel-heading-height);
     margin: calc(-1 * var(--panel-heading-height-padding)) 0;
-    margin-right: -0.5em;
+    margin-right: calc(-1 * var(--__panel-heading-gap));
 
     > button {
       box-sizing: border-box;
diff --git a/src/components/timeline/timeline.scss b/src/components/timeline/timeline.scss
index 18a80a63..f5dbb639 100644
--- a/src/components/timeline/timeline.scss
+++ b/src/components/timeline/timeline.scss
@@ -19,7 +19,7 @@
     width: var(--__panel-heading-height);
     height: var(--__panel-heading-height);
     margin: calc(-1 * var(--panel-heading-height-padding)) 0;
-    margin-right: -0.5em;
+    margin-right: calc(-1 * var(--__panel-heading-gap));
 
     > button {
       box-sizing: border-box;
@@ -38,7 +38,7 @@
     align-self: stretch;
     text-align: center;
     width: var(--__panel-heading-height);
-    margin-right: -0.5em;
+    margin-right: calc(-1 * var(--__panel-heading-gap));
 
     svg {
       font-size: 1.2em;
diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue
index fe5d4822..15d097e8 100644
--- a/src/components/timeline/timeline.vue
+++ b/src/components/timeline/timeline.vue
@@ -5,9 +5,11 @@
         v-if="!embedded"
         :timeline-name="timelineName"
       />
-      <div class="timeline-header-button">
+      <div
+        class="timeline-header-button"
+        v-if="showScrollTop && !embedded"
+      >
         <button
-          v-if="showScrollTop"
           class="button-unstyled scroll-to-top-button"
           type="button"
           @click="scrollToTop"
diff --git a/src/panel.scss b/src/panel.scss
index 2e769e27..b5ef67e9 100644
--- a/src/panel.scss
+++ b/src/panel.scss
@@ -45,6 +45,7 @@
 .panel-heading,
 .panel-footer {
   --panel-heading-height-padding: 0.6em;
+  --__panel-heading-gap: 0.5em;
   --__panel-heading-height: 3.2em;
   --__panel-heading-height-inner: calc(var(--__panel-heading-height) - 2 * var(--panel-heading-height-padding, 0));
 
@@ -54,7 +55,7 @@
   grid-auto-flow: column;
   grid-template-columns: minmax(50%, 1fr);
   grid-auto-columns: auto;
-  grid-column-gap: 0.5em;
+  grid-column-gap: var(--__panel-heading-gap);
   flex: none;
   background-size: cover;
   padding: var(--panel-heading-height-padding);