diff --git a/resources/shop/css/main.css b/resources/shop/css/main.css
index 2fd125ae..181eb2c9 100644
--- a/resources/shop/css/main.css
+++ b/resources/shop/css/main.css
@@ -112,3 +112,17 @@ body {
 .bg-darker {
 	background-color: rgba(0,0,0,0.05)!important;
 }
+
+/* Header action buttons aligned with page title */
+.content-header .form-buttons {
+    margin-left: 12px;
+}
+
+.content-header .form-buttons .btn {
+    height: 32px;
+    display: inline-flex;
+    align-items: center;
+    padding-top: 4px;
+    padding-bottom: 4px;
+    line-height: 1.1;
+}
diff --git a/resources/views/components/save.blade.php b/resources/views/components/save.blade.php
index e8466199..fa0b80ac 100644
--- a/resources/views/components/save.blade.php
+++ b/resources/views/components/save.blade.php
@@ -1,7 +1,23 @@
+@php
+    $cancelUrl = $cancel_url ?? $cancelUrl ?? null;
+@endphp
+
+@push('header-actions')
+    <div class="form-buttons d-flex align-items-center ml-3">
+        @include('components.form.buttons.button-cancel', [
+            'class' => 'btn-sm mr-2',
+            'url' => $cancelUrl,
+        ])
+        @include('components.form.buttons.button-save', [
+            'class' => 'btn-sm',
+        ])
+    </div>
+@endpush
+
 <div class="row pt-0 pb-3">
 	<div class="col-12">
 		<div class="text-right form-buttons">
-			@include('components.form.buttons.button-cancel')
+			@include('components.form.buttons.button-cancel', ['url' => $cancelUrl])
 			@include('components.form.buttons.button-save')
 		</div>
 	</div>
diff --git a/resources/views/layout/contentheader.blade.php b/resources/views/layout/contentheader.blade.php
index 544ce7ca..bbab5ad5 100644
--- a/resources/views/layout/contentheader.blade.php
+++ b/resources/views/layout/contentheader.blade.php
@@ -1,13 +1,16 @@
 <div class="content-header pt-2 pb-1">
     <div class="container-fluid">
-        <div class="row mb-2 align-items-end">
+        <div class="row mb-2 align-items-center">
             <div class="col-sm-6">
-                <h1 class="m-0 text-dark">
-                    {{ $title ?? null}}
-                    @isset($subtitle)
-                        <small class="font-weight-light ml-1 text-md">{{ $subtitle }}</small>
-                    @endisset
-                </h1>
+                <div class="d-flex align-items-center flex-wrap">
+                    <h1 class="m-0 text-dark d-flex align-items-center">
+                        {{ $title ?? null}}
+                        @isset($subtitle)
+                            <small class="font-weight-light ml-1 text-md">{{ $subtitle }}</small>
+                        @endisset
+                    </h1>
+                    @stack('header-actions')
+                </div>
             </div>
             <div class="col-sm-6">
                 <ol class="breadcrumb float-sm-right text-sm">