diff --git a/packages/admin/resources/views/livewire/components/settings/legal/_form.blade.php b/packages/admin/resources/views/livewire/components/settings/legal/_form.blade.php
index 3a3293f2d..295f2143d 100755
--- a/packages/admin/resources/views/livewire/components/settings/legal/_form.blade.php
+++ b/packages/admin/resources/views/livewire/components/settings/legal/_form.blade.php
@@ -2,7 +2,7 @@
     {{ $this->form }}
 
     <div class="mt-6 flex justify-end">
-        <x-shopper::buttons.primary wire:click="store" type="submit" wire:loading.attr="disabled">
+        <x-shopper::buttons.primary type="submit" wire:loading.attr="disabled">
             <x-shopper::loader wire:loading wire:target="store" class="text-white" />
             {{ __('shopper::forms.actions.save') }}
         </x-shopper::buttons.primary>
diff --git a/packages/admin/resources/views/livewire/components/settings/legal/index.blade.php b/packages/admin/resources/views/livewire/components/settings/legal/index.blade.php
new file mode 100755
index 000000000..6adc5a3fe
--- /dev/null
+++ b/packages/admin/resources/views/livewire/components/settings/legal/index.blade.php
@@ -0,0 +1,5 @@
+<div class="lg:grid lg:grid-cols-3 lg:gap-x-12 lg:gap-y-6">
+    <x-shopper::section-heading class="lg:col-span-1" :title="$title" :description="$description" />
+
+    <livewire:shopper-settings.legal.form :legal="$legal" />
+</div>
diff --git a/packages/admin/resources/views/livewire/components/settings/legal/privacy.blade.php b/packages/admin/resources/views/livewire/components/settings/legal/privacy.blade.php
deleted file mode 100755
index aceb38189..000000000
--- a/packages/admin/resources/views/livewire/components/settings/legal/privacy.blade.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<div class="lg:grid lg:grid-cols-3 lg:gap-x-12 lg:gap-y-6">
-    <div class="lg:col-span-1">
-        <div>
-            <h3 class="font-heading text-lg font-semibold leading-6 text-gray-900 dark:text-white">
-                {{ __('shopper::pages/settings.legal.privacy') }}
-            </h3>
-            <p class="mt-2 text-sm leading-5 text-gray-500 dark:text-gray-400">
-                {{ __('shopper::pages/settings.legal.summary', ['policy' => __('shopper::pages/settings.legal.privacy')]) }}
-            </p>
-        </div>
-    </div>
-
-    <livewire:shopper-settings.legal.form :legal="$legal" />
-</div>
diff --git a/packages/admin/resources/views/livewire/components/settings/legal/refund.blade.php b/packages/admin/resources/views/livewire/components/settings/legal/refund.blade.php
deleted file mode 100755
index 06d9e43b5..000000000
--- a/packages/admin/resources/views/livewire/components/settings/legal/refund.blade.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<div class="lg:grid lg:grid-cols-3 lg:gap-x-12 lg:gap-y-6">
-    <div class="lg:col-span-1">
-        <div>
-            <h3 class="font-heading text-lg font-semibold leading-6 text-gray-900 dark:text-white">
-                {{ __('shopper::pages/settings.legal.refund') }}
-            </h3>
-            <p class="mt-2 text-sm leading-5 text-gray-500 dark:text-gray-400">
-                {{ __('shopper::pages/settings.legal.summary', ['policy' => __('shopper::pages/settings.legal.refund')]) }}
-            </p>
-        </div>
-    </div>
-    <livewire:shopper-settings.legal.form :legal="$legal" />
-</div>
diff --git a/packages/admin/resources/views/livewire/components/settings/legal/shipping.blade.php b/packages/admin/resources/views/livewire/components/settings/legal/shipping.blade.php
deleted file mode 100755
index 24dee2827..000000000
--- a/packages/admin/resources/views/livewire/components/settings/legal/shipping.blade.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<div class="lg:grid lg:grid-cols-3 lg:gap-x-12 lg:gap-y-6">
-    <div class="lg:col-span-1">
-        <div>
-            <h3 class="font-heading text-lg font-semibold leading-6 text-gray-900 dark:text-white">
-                {{ __('shopper::pages/settings.legal.shipping') }}
-            </h3>
-            <p class="mt-2 text-sm leading-5 text-gray-500 dark:text-gray-400">
-                {{ __('shopper::pages/settings.legal.summary', ['policy' => __('shopper::pages/settings.legal.shipping')]) }}
-            </p>
-        </div>
-    </div>
-
-    <livewire:shopper-settings.legal.form :legal="$legal" />
-</div>
diff --git a/packages/admin/resources/views/livewire/components/settings/legal/terms.blade.php b/packages/admin/resources/views/livewire/components/settings/legal/terms.blade.php
deleted file mode 100755
index 5d3386bac..000000000
--- a/packages/admin/resources/views/livewire/components/settings/legal/terms.blade.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<div class="lg:grid lg:grid-cols-3 lg:gap-x-12 lg:gap-y-6">
-    <div class="lg:col-span-1">
-        <div>
-            <h3 class="font-heading text-lg font-semibold leading-6 text-gray-900 dark:text-white">
-                {{ __('shopper::pages/settings.legal.terms_of_use') }}
-            </h3>
-            <p class="mt-2 text-sm leading-5 text-gray-500 dark:text-gray-400">
-                {{ __('shopper::pages/settings.legal.summary', ['policy' => __('shopper::pages/settings.legal.terms_of_use')]) }}
-            </p>
-        </div>
-    </div>
-
-    <livewire:shopper-settings.legal.form :legal="$legal" />
-</div>
diff --git a/packages/admin/resources/views/livewire/pages/settings/legal.blade.php b/packages/admin/resources/views/livewire/pages/settings/legal.blade.php
index 20d85b59c..43be3ac57 100755
--- a/packages/admin/resources/views/livewire/pages/settings/legal.blade.php
+++ b/packages/admin/resources/views/livewire/pages/settings/legal.blade.php
@@ -5,7 +5,7 @@
     <x-shopper::container>
         <x-shopper::breadcrumb
             :back="route('shopper.settings.index')"
-            :current="__('shopper::pages/settings.legal.title')"
+            :current="__('shopper::pages/settings/global.legal.title')"
         >
             <x-untitledui-chevron-left class="h-4 w-4 shrink-0 text-gray-300 dark:text-gray-600" aria-hidden="true" />
             <x-shopper::breadcrumb.link
@@ -15,7 +15,7 @@
         </x-shopper::breadcrumb>
         <x-shopper::heading class="my-6">
             <x-slot name="title">
-                {{ __('shopper::pages/settings.legal.title') }}
+                {{ __('shopper::pages/settings/global.legal.title') }}
             </x-slot>
         </x-shopper::heading>
     </x-shopper::container>
@@ -23,16 +23,16 @@
     <div class="relative border-t border-gray-200 dark:border-gray-700">
         <x-filament::tabs :contained="true">
             <x-filament::tabs.item alpine-active="currentTab === 'privacy'" x-on:click="currentTab = 'privacy'">
-                {{ __('shopper::pages/settings.legal.privacy') }}
+                {{ __('shopper::pages/settings/global.legal.privacy') }}
             </x-filament::tabs.item>
             <x-filament::tabs.item alpine-active="currentTab === 'terms'" x-on:click="currentTab = 'terms'">
-                {{ __('shopper::pages/settings.legal.terms_of_use') }}
+                {{ __('shopper::pages/settings/global.legal.terms_of_use') }}
             </x-filament::tabs.item>
             <x-filament::tabs.item alpine-active="currentTab === 'shipping'" x-on:click="currentTab = 'shipping'">
-                {{ __('shopper::pages/settings.legal.shipping') }}
+                {{ __('shopper::pages/settings/global.legal.shipping') }}
             </x-filament::tabs.item>
             <x-filament::tabs.item alpine-active="currentTab === 'refund'" x-on:click="currentTab = 'refund'">
-                {{ __('shopper::pages/settings.legal.refund') }}
+                {{ __('shopper::pages/settings/global.legal.refund') }}
             </x-filament::tabs.item>
         </x-filament::tabs>
     </div>
@@ -40,25 +40,25 @@
     <x-shopper::container class="mt-8">
         <div x-show="currentTab === 'refund'">
             <livewire:shopper-settings.legal.refund
-                :legal="$legals[Str::slug(__('shopper::pages/settings.legal.refund'))]"
+                :legal="$legals[Str::slug(__('shopper::pages/settings/global.legal.refund'))]"
             />
         </div>
         <div x-cloak x-show="currentTab === 'privacy'">
             <livewire:shopper-settings.legal.privacy
-                :legal="$legals[Str::slug(__('shopper::pages/settings.legal.privacy'))]"
+                :legal="$legals[Str::slug(__('shopper::pages/settings/global.legal.privacy'))]"
             />
         </div>
         <div x-cloak x-show="currentTab === 'terms'">
             <livewire:shopper-settings.legal.terms
-                :legal="$legals[Str::slug(__('shopper::pages/settings.legal.terms_of_use'))]"
+                :legal="$legals[Str::slug(__('shopper::pages/settings/global.legal.terms_of_use'))]"
             />
         </div>
         <div x-cloak x-show="currentTab === 'shipping'">
             <livewire:shopper-settings.legal.shipping
-                :legal="$legals[Str::slug(__('shopper::pages/settings.legal.shipping'))]"
+                :legal="$legals[Str::slug(__('shopper::pages/settings/global.legal.shipping'))]"
             />
         </div>
     </x-shopper::container>
 
-    <x-shopper::learn-more :name="__('shopper::pages/settings.legal.title')" link="legal" />
+    <x-shopper::learn-more :name="__('shopper::pages/settings/global.legal.title')" link="legal" />
 </div>
diff --git a/packages/admin/src/Livewire/Components/Settings/Legal/PolicyForm.php b/packages/admin/src/Livewire/Components/Settings/Legal/PolicyForm.php
index faf58a7ed..73f33d024 100644
--- a/packages/admin/src/Livewire/Components/Settings/Legal/PolicyForm.php
+++ b/packages/admin/src/Livewire/Components/Settings/Legal/PolicyForm.php
@@ -33,7 +33,7 @@ public function form(Form $form): Form
             ->schema([
                 Components\Hidden::make('title'),
                 Components\Toggle::make('is_enabled')
-                    ->label(__('shopper::forms.actions.enabled'))
+                    ->label(__('shopper::words.is_enabled'))
                     ->onColor('success'),
                 Components\RichEditor::make('content')
                     ->label(__('shopper::forms.label.content'))
@@ -50,6 +50,7 @@ public function store(): void
         ], $this->form->getState());
 
         Notification::make()
+            ->title($this->legal->title)
             ->body(__('shopper::notifications.legal'))
             ->success()
             ->send();
diff --git a/packages/admin/src/Livewire/Components/Settings/Legal/Privacy.php b/packages/admin/src/Livewire/Components/Settings/Legal/Privacy.php
index 117e4b3c5..8ecedc2d0 100755
--- a/packages/admin/src/Livewire/Components/Settings/Legal/Privacy.php
+++ b/packages/admin/src/Livewire/Components/Settings/Legal/Privacy.php
@@ -14,6 +14,9 @@ class Privacy extends Component
 
     public function render(): View
     {
-        return view('shopper::livewire.components.settings.legal.privacy');
+        return view('shopper::livewire.components.settings.legal.index', [
+            'title' => __('shopper::pages/settings/global.legal.privacy'),
+            'description' => __('shopper::pages/settings/global.legal.summary', ['policy' => __('shopper::pages/settings/global.legal.privacy')]),
+        ]);
     }
 }
diff --git a/packages/admin/src/Livewire/Components/Settings/Legal/Refund.php b/packages/admin/src/Livewire/Components/Settings/Legal/Refund.php
index 3734f297b..d75c49011 100755
--- a/packages/admin/src/Livewire/Components/Settings/Legal/Refund.php
+++ b/packages/admin/src/Livewire/Components/Settings/Legal/Refund.php
@@ -14,6 +14,9 @@ class Refund extends Component
 
     public function render(): View
     {
-        return view('shopper::livewire.components.settings.legal.refund');
+        return view('shopper::livewire.components.settings.legal.index', [
+            'title' => __('shopper::pages/settings/global.legal.refund'),
+            'description' => __('shopper::pages/settings/global.legal.summary', ['policy' => __('shopper::pages/settings/global.legal.refund')]),
+        ]);
     }
 }
diff --git a/packages/admin/src/Livewire/Components/Settings/Legal/Shipping.php b/packages/admin/src/Livewire/Components/Settings/Legal/Shipping.php
index 827490659..e679cd409 100755
--- a/packages/admin/src/Livewire/Components/Settings/Legal/Shipping.php
+++ b/packages/admin/src/Livewire/Components/Settings/Legal/Shipping.php
@@ -14,6 +14,9 @@ class Shipping extends Component
 
     public function render(): View
     {
-        return view('shopper::livewire.components.settings.legal.shipping');
+        return view('shopper::livewire.components.settings.legal.index', [
+            'title' => __('shopper::pages/settings/global.legal.shipping'),
+            'description' => __('shopper::pages/settings/global.legal.summary', ['policy' => __('shopper::pages/settings/global.legal.shipping')]),
+        ]);
     }
 }
diff --git a/packages/admin/src/Livewire/Components/Settings/Legal/Terms.php b/packages/admin/src/Livewire/Components/Settings/Legal/Terms.php
index 738cf933b..cee72aa22 100755
--- a/packages/admin/src/Livewire/Components/Settings/Legal/Terms.php
+++ b/packages/admin/src/Livewire/Components/Settings/Legal/Terms.php
@@ -14,6 +14,9 @@ class Terms extends Component
 
     public function render(): View
     {
-        return view('shopper::livewire.components.settings.legal.terms');
+        return view('shopper::livewire.components.settings.legal.index', [
+            'title' => __('shopper::pages/settings/global.legal.terms_of_use'),
+            'description' => __('shopper::pages/settings/global.legal.summary', ['policy' => __('shopper::pages/settings/global.legal.terms_of_use')]),
+        ]);
     }
 }
diff --git a/packages/admin/src/Livewire/Pages/Settings/LegalPage.php b/packages/admin/src/Livewire/Pages/Settings/LegalPage.php
index 87f98c984..566f3b5b2 100644
--- a/packages/admin/src/Livewire/Pages/Settings/LegalPage.php
+++ b/packages/admin/src/Livewire/Pages/Settings/LegalPage.php
@@ -17,6 +17,6 @@ public function render(): View
         return view('shopper::livewire.pages.settings.legal', [
             'legals' => Legal::query()->get()->mapWithKeys(fn (Legal $item) => [$item->slug => $item]),
         ])
-            ->title(__('shopper::pages/settings.legal.title'));
+            ->title(__('shopper::pages/settings/global.legal.title'));
     }
 }