diff --git a/src/lib/components/empty.svelte b/src/lib/components/empty.svelte
index 91f62cf5c..d71f594d4 100644
--- a/src/lib/components/empty.svelte
+++ b/src/lib/components/empty.svelte
@@ -53,9 +53,9 @@
         class="card u-grid u-cross-center u-width-full-line dashed">
         <div class="u-flex u-cross-center u-flex-vertical u-main-center u-flex">
             <div class="common-section">
-                <Button secondary round>
+                <div class="button is-secondary is-only-icon">
                     <i class="icon-plus" />
-                </Button>
+                </div>
             </div>
             <div class="common-section">
                 <slot />
diff --git a/src/lib/layout/cover.svelte b/src/lib/layout/cover.svelte
index bc13b13d0..2d7970bce 100644
--- a/src/lib/layout/cover.svelte
+++ b/src/lib/layout/cover.svelte
@@ -10,7 +10,7 @@
 
 <div class="top-cover" class:is-adjust-content-to-cover={adjustContentToCover}>
     <div class="container" {style}>
-        <div class="u-flex u-cross-center u-gap-16 u-margin-block-start-20">
+        <div class="u-flex u-cross-center u-gap-16 u-margin-block-start-20 u-flex-wrap">
             <slot name="header" />
         </div>
         <slot />
diff --git a/src/lib/layout/shell.svelte b/src/lib/layout/shell.svelte
index 1855cd210..31d961ef4 100644
--- a/src/lib/layout/shell.svelte
+++ b/src/lib/layout/shell.svelte
@@ -44,7 +44,7 @@
     class:grid={!showSideNavigation}
     class:is-open={isOpen}
     class:u-hide={$wizard.show || $log.show}>
-    <header class="main-header">
+    <header class="main-header u-padding-inline-end-0">
         <button
             class:u-hide={!showSideNavigation}
             class="icon-button is-no-desktop"