diff --git a/Modules/Documentation/Resources/views/categories/index.blade.php b/Modules/Documentation/Resources/views/categories/index.blade.php
index f84cf2fb..00bce3c5 100644
--- a/Modules/Documentation/Resources/views/categories/index.blade.php
+++ b/Modules/Documentation/Resources/views/categories/index.blade.php
@@ -16,7 +16,7 @@
     <section class="doc-card">
         <div class="doc-card-header">
             <strong>Categories</strong>
-            <a class="doc-button dark" href="{{ route('documentation.categories.create') }}">New category</a>
+            <a class="doc-button success" href="{{ route('documentation.categories.create') }}">Create category</a>
         </div>
         <div class="doc-card-body">
             <table class="doc-table">
@@ -39,11 +39,11 @@
                             <td>{{ $category->sort_order }}</td>
                             <td><span class="doc-badge {{ $category->is_active ? '' : 'archived' }}">{{ $category->is_active ? 'Active' : 'Inactive' }}</span></td>
                             <td>
-                                <a class="doc-link" href="{{ route('documentation.categories.edit', $category) }}">Edit</a>
+                                <a class="doc-button primary" href="{{ route('documentation.categories.edit', $category) }}">Edit</a>
                                 <form method="POST" action="{{ route('documentation.categories.destroy', $category) }}" style="display:inline;" onsubmit="return confirm('Delete this category? Documents will become uncategorised.')">
                                     @csrf
                                     @method('DELETE')
-                                    <button type="submit" class="doc-link" style="border:0;background:none;cursor:pointer;padding:0;margin-left:10px;">Delete</button>
+                                    <button type="submit" class="doc-button danger" style="border:0;cursor:pointer;margin-left:10px;">Delete</button>
                                 </form>
                             </td>
                         </tr>
diff --git a/Modules/Documentation/Resources/views/documents/index.blade.php b/Modules/Documentation/Resources/views/documents/index.blade.php
index a1766dfa..74489c36 100644
--- a/Modules/Documentation/Resources/views/documents/index.blade.php
+++ b/Modules/Documentation/Resources/views/documents/index.blade.php
@@ -38,7 +38,7 @@
     <section class="doc-card">
         <div class="doc-card-header">
             <strong>Document register</strong>
-            <a class="doc-button dark" href="{{ route('documentation.documents.create') }}">New document</a>
+            <a class="doc-button success" href="{{ route('documentation.documents.create') }}">Create document</a>
         </div>
         <div class="doc-card-body">
             <form class="doc-filter" method="GET" action="{{ route('documentation.documents.index') }}">
@@ -55,7 +55,7 @@
                         <option value="{{ $category->id }}" @selected((string) request('category') === (string) $category->id)>{{ $category->name }}</option>
                     @endforeach
                 </select>
-                <button class="doc-button light" type="submit">Filter</button>
+                <button class="doc-button primary" type="submit">Filter</button>
             </form>
 
             <table class="doc-table">
@@ -80,7 +80,7 @@
                             <td><span class="doc-badge {{ $document->status }}">{{ ucfirst($document->status) }}</span></td>
                             <td>{{ $document->version }}</td>
                             <td>{{ $document->updated_at?->format('d M Y H:i') }}</td>
-                            <td><a class="doc-link" href="{{ route('documentation.documents.edit', $document) }}">Edit</a></td>
+                            <td><a class="doc-button primary" href="{{ route('documentation.documents.edit', $document) }}">Edit</a></td>
                         </tr>
                     @empty
                         <tr><td colspan="6" class="doc-muted">No documents found.</td></tr>
diff --git a/Modules/Documentation/Resources/views/layouts/master.blade.php b/Modules/Documentation/Resources/views/layouts/master.blade.php
index efa01c52..830f5936 100644
--- a/Modules/Documentation/Resources/views/layouts/master.blade.php
+++ b/Modules/Documentation/Resources/views/layouts/master.blade.php
@@ -126,50 +126,75 @@
             }
 
             .doc-button.primary,
+            .doc-button.register,
             .doc-button.dark {
                 background: #2563eb;
                 color: #ffffff;
                 border-color: #2563eb;
+                box-shadow: 0 8px 18px rgba(37, 99, 235, .22);
             }
 
             .doc-button.primary:hover,
+            .doc-button.register:hover,
             .doc-button.dark:hover {
                 background: #1d4ed8;
                 border-color: #1d4ed8;
             }
 
-            .doc-button.secondary {
-                background: rgba(255, 255, 255, .10);
+            .doc-button.secondary,
+            .doc-button.category,
+            .doc-button.settings {
+                background: #7c3aed;
                 color: #ffffff;
-                border-color: rgba(255, 255, 255, .22);
+                border-color: #7c3aed;
+                box-shadow: 0 8px 18px rgba(124, 58, 237, .22);
             }
 
-            .doc-button.secondary:hover {
-                background: rgba(255, 255, 255, .16);
+            .doc-button.secondary:hover,
+            .doc-button.category:hover,
+            .doc-button.settings:hover {
+                background: #6d28d9;
+                border-color: #6d28d9;
             }
 
-            .doc-button.light {
-                background: #f8fafc;
-                color: #18181b;
-                border-color: #d4d4d8;
+            .doc-button.light,
+            .doc-button.cancel,
+            .doc-button.warning {
+                background: #f59e0b;
+                color: #ffffff;
+                border-color: #f59e0b;
+                box-shadow: 0 8px 18px rgba(245, 158, 11, .22);
             }
 
-            html.dark .doc-button.light {
-                background: #09090b;
-                color: #f4f4f5;
-                border-color: #3f3f46;
+            .doc-button.light:hover,
+            .doc-button.cancel:hover,
+            .doc-button.warning:hover {
+                background: #d97706;
+                border-color: #d97706;
             }
 
             .doc-button.success {
                 background: #059669;
                 color: #ffffff;
                 border-color: #059669;
+                box-shadow: 0 8px 18px rgba(5, 150, 105, .22);
+            }
+
+            .doc-button.success:hover {
+                background: #047857;
+                border-color: #047857;
             }
 
             .doc-button.danger {
                 background: #dc2626;
                 color: #ffffff;
                 border-color: #dc2626;
+                box-shadow: 0 8px 18px rgba(220, 38, 38, .22);
+            }
+
+            .doc-button.danger:hover {
+                background: #b91c1c;
+                border-color: #b91c1c;
             }
 
             .doc-card {
diff --git a/Modules/Documentation/Resources/views/partials/category-form.blade.php b/Modules/Documentation/Resources/views/partials/category-form.blade.php
index 14657b2f..c4bde08a 100644
--- a/Modules/Documentation/Resources/views/partials/category-form.blade.php
+++ b/Modules/Documentation/Resources/views/partials/category-form.blade.php
@@ -38,6 +38,6 @@
     </div>
 </div>
 <div class="doc-actions" style="margin-top:22px;">
-    <button class="doc-button dark" type="submit">Save category</button>
-    <a class="doc-button light" href="{{ route('documentation.categories.index') }}">Cancel</a>
+    <button class="doc-button success" type="submit">Save category</button>
+    <a class="doc-button warning" href="{{ route('documentation.categories.index') }}">Cancel</a>
 </div>
diff --git a/Modules/Documentation/Resources/views/partials/document-form.blade.php b/Modules/Documentation/Resources/views/partials/document-form.blade.php
index b49c33cb..32e6adca 100644
--- a/Modules/Documentation/Resources/views/partials/document-form.blade.php
+++ b/Modules/Documentation/Resources/views/partials/document-form.blade.php
@@ -104,6 +104,6 @@
     </div>
 </div>
 <div class="doc-actions" style="margin-top:22px;">
-    <button class="doc-button dark" type="submit">Save document</button>
-    <a class="doc-button light" href="{{ route('documentation.documents.index') }}">Cancel</a>
+    <button class="doc-button success" type="submit">Save document</button>
+    <a class="doc-button warning" href="{{ route('documentation.documents.index') }}">Cancel</a>
 </div>
diff --git a/Modules/Documentation/Resources/views/partials/hero.blade.php b/Modules/Documentation/Resources/views/partials/hero.blade.php
index 47f584bf..2f5b6d93 100644
--- a/Modules/Documentation/Resources/views/partials/hero.blade.php
+++ b/Modules/Documentation/Resources/views/partials/hero.blade.php
@@ -8,9 +8,9 @@
             </div>
 
             <div class="doc-actions">
-                <a class="doc-button primary" href="{{ route('documentation.documents.create') }}" wire:navigate>Create document</a>
-                <a class="doc-button secondary" href="{{ route('documentation.categories.index') }}" wire:navigate>Manage categories</a>
-                <a class="doc-button secondary" href="{{ route('documentation.documents.index') }}" wire:navigate>Document register</a>
+                <a class="doc-button success" href="{{ route('documentation.documents.create') }}" wire:navigate>Create document</a>
+                <a class="doc-button category" href="{{ route('documentation.categories.index') }}" wire:navigate>Manage categories</a>
+                <a class="doc-button register" href="{{ route('documentation.documents.index') }}" wire:navigate>Document register</a>
             </div>
         </div>
     </div>
diff --git a/Modules/Documentation/changelog.yaml b/Modules/Documentation/changelog.yaml
index f22bc63d..c17c3e18 100644
--- a/Modules/Documentation/changelog.yaml
+++ b/Modules/Documentation/changelog.yaml
@@ -10,3 +10,22 @@ releases:
       - Fixed missing DocumentationCategoryController binding failure for documentation category routes.
       - Added explicit DocumentationServiceProvider, route files, config, and guarded migrations so the module registers cleanly in nwidart/laravel-modules.
       - Preserved WMS shell styling and Documentation CRUD/Markdown/attachment functionality.
+
+1.6.2:
+  date: 2026-06-15
+  changes:
+    - Applied explicit coloured action buttons for Documentation create, category management, register, save, cancel, filter, edit and delete actions.
+    - Preserved existing Documentation CRUD, Markdown editor and attachment behaviour.
+
+releases:
+  - version: 1.6.2
+    date: 2026-06-15
+    changes:
+      - Applied explicit coloured Documentation action buttons across pages and forms.
+
+1.6.3:
+  date: 2026-06-15
+  changes:
+    - Coloured Documentation register/category edit actions as blue buttons.
+    - Standardised Create document and Create category actions as green buttons.
+    - Preserved existing Documentation CRUD, Markdown editor and attachment behaviour.
diff --git a/Modules/Documentation/module.json b/Modules/Documentation/module.json
index 221462b1..00f69c29 100644
--- a/Modules/Documentation/module.json
+++ b/Modules/Documentation/module.json
@@ -1,7 +1,7 @@
 {
     "name": "Documentation",
     "alias": "documentation",
-    "version": "1.6.1",
+    "version": "1.6.3",
     "description": "Professional document management and knowledge-base module with WMS shell styling, categories, CRUD, publishing, Markdown editing/import support, code blocks, attachments, and Support navigation integration.",
     "keywords": [
         "documentation",
diff --git a/Modules/Helpdesk/Resources/views/components/lookup-table.blade.php b/Modules/Helpdesk/Resources/views/components/lookup-table.blade.php
index d7712d32..a20153c4 100644
--- a/Modules/Helpdesk/Resources/views/components/lookup-table.blade.php
+++ b/Modules/Helpdesk/Resources/views/components/lookup-table.blade.php
@@ -23,8 +23,23 @@
                     </td>
                     <td class="px-4 py-3 text-zinc-500">{{ $item->tickets_count ?? 0 }}</td>
                     <td class="px-4 py-3 text-right">
-                        <flux:button size="sm" wire:click="{{ $edit }}({{ $item- class="!bg-blue-600 !text-white hover:!bg-blue-700 focus:!ring-blue-400/60">id }})" variant="primary">Edit</flux:button>
-                        <flux:button size="sm" wire:click="{{ $delete }}({{ $item- class="!bg-red-600 !text-white hover:!bg-red-700 focus:!ring-red-400/60">id }})" variant="danger">Delete</flux:button>
+                        <div class="flex justify-end gap-2">
+                            <button
+                                type="button"
+                                wire:click="{{ $edit }}({{ $item->id }})"
+                                class="inline-flex items-center rounded-lg bg-blue-600 px-3 py-1.5 text-xs font-semibold text-white shadow-sm transition hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-blue-400/60"
+                            >
+                                Edit
+                            </button>
+
+                            <button
+                                type="button"
+                                wire:click="{{ $delete }}({{ $item->id }})"
+                                class="inline-flex items-center rounded-lg bg-red-600 px-3 py-1.5 text-xs font-semibold text-white shadow-sm transition hover:bg-red-700 focus:outline-none focus:ring-2 focus:ring-red-400/60"
+                            >
+                                Delete
+                            </button>
+                        </div>
                     </td>
                 </tr>
             @empty
diff --git a/Modules/Helpdesk/Resources/views/components/project-table.blade.php b/Modules/Helpdesk/Resources/views/components/project-table.blade.php
index 4f31291a..7cfea02d 100644
--- a/Modules/Helpdesk/Resources/views/components/project-table.blade.php
+++ b/Modules/Helpdesk/Resources/views/components/project-table.blade.php
@@ -3,9 +3,8 @@
         <thead class="bg-zinc-50 text-left text-xs font-semibold uppercase tracking-wide text-zinc-500 dark:bg-zinc-800 dark:text-zinc-300">
             <tr>
                 <th class="px-4 py-3">Project</th>
+                <th class="px-4 py-3">Company</th>
                 <th class="px-4 py-3">Team</th>
-                <th class="px-4 py-3">Slug</th>
-                <th class="px-4 py-3">Colour</th>
                 <th class="px-4 py-3">Default</th>
                 <th class="px-4 py-3">Tickets</th>
                 <th class="px-4 py-3 text-right">Actions</th>
@@ -15,22 +14,19 @@
             @forelse ($items as $item)
                 <tr>
                     <td class="px-4 py-3 font-medium text-zinc-900 dark:text-zinc-100">{{ $item->title }}</td>
+                    <td class="px-4 py-3 text-zinc-500">{{ $item->company?->name ?? 'Global' }}</td>
                     <td class="px-4 py-3 text-zinc-500">{{ $item->team?->name ?? 'No team' }}</td>
-                    <td class="px-4 py-3 font-mono text-xs text-zinc-500">{{ $item->slug }}</td>
-                    <td class="px-4 py-3"><flux:badge color="{{ $item->color }}">{{ $item->color }}</flux:badge></td>
-                    <td class="px-4 py-3">
-                        <flux:badge color="{{ ($item->is_default ?? false) ? 'emerald' : 'zinc' }}">
-                            {{ ($item->is_default ?? false) ? 'Default' : 'No' }}
-                        </flux:badge>
-                    </td>
-                    <td class="px-4 py-3 text-zinc-500">{{ $item->tickets_count }}</td>
+                    <td class="px-4 py-3"><flux:badge color="{{ ($item->is_default ?? false) ? 'emerald' : 'zinc' }}">{{ ($item->is_default ?? false) ? 'Default' : 'No' }}</flux:badge></td>
+                    <td class="px-4 py-3 text-zinc-500">{{ $item->tickets_count ?? 0 }}</td>
                     <td class="px-4 py-3 text-right">
-                        <flux:button size="sm" wire:click="editProject({{ $item- class="!bg-blue-600 !text-white hover:!bg-blue-700 focus:!ring-blue-400/60">id }})" variant="primary">Edit</flux:button>
-                        <flux:button size="sm" wire:click="deleteProject({{ $item- class="!bg-red-600 !text-white hover:!bg-red-700 focus:!ring-red-400/60">id }})" variant="danger">Delete</flux:button>
+                        <div class="flex justify-end gap-2">
+                            <button type="button" wire:click="editProject({{ $item->id }})" class="inline-flex items-center rounded-lg bg-blue-600 px-3 py-1.5 text-xs font-semibold text-white shadow-sm transition hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-blue-400/60">Edit</button>
+                            <button type="button" wire:click="deleteProject({{ $item->id }})" class="inline-flex items-center rounded-lg bg-red-600 px-3 py-1.5 text-xs font-semibold text-white shadow-sm transition hover:bg-red-700 focus:outline-none focus:ring-2 focus:ring-red-400/60">Delete</button>
+                        </div>
                     </td>
                 </tr>
             @empty
-                <tr><td colspan="7" class="px-4 py-10 text-center text-zinc-500">No projects yet.</td></tr>
+                <tr><td colspan="6" class="px-4 py-10 text-center text-zinc-500">No projects yet.</td></tr>
             @endforelse
         </tbody>
     </table>
diff --git a/Modules/Helpdesk/Resources/views/components/repository-table.blade.php b/Modules/Helpdesk/Resources/views/components/repository-table.blade.php
index 19054d41..9a9deea7 100644
--- a/Modules/Helpdesk/Resources/views/components/repository-table.blade.php
+++ b/Modules/Helpdesk/Resources/views/components/repository-table.blade.php
@@ -1,15 +1,12 @@
-@props(['items'])
-
-<div class="overflow-hidden rounded-2xl border border-zinc-200 bg-white dark:border-zinc-700 dark:bg-zinc-900">
+<div class="overflow-x-auto">
     <table class="min-w-full divide-y divide-zinc-200 text-sm dark:divide-zinc-700">
         <thead class="bg-zinc-50 text-left text-xs font-semibold uppercase tracking-wide text-zinc-500 dark:bg-zinc-800 dark:text-zinc-300">
             <tr>
                 <th class="px-4 py-3">Repository</th>
-                <th class="px-4 py-3">Project</th>
                 <th class="px-4 py-3">Provider</th>
+                <th class="px-4 py-3">Project</th>
                 <th class="px-4 py-3">Branch</th>
                 <th class="px-4 py-3">Commits</th>
-                <th class="px-4 py-3">Webhook</th>
                 <th class="px-4 py-3 text-right">Actions</th>
             </tr>
         </thead>
@@ -17,21 +14,19 @@
             @forelse ($items as $item)
                 <tr>
                     <td class="px-4 py-3 font-medium text-zinc-900 dark:text-zinc-100">{{ $item->name }}</td>
-                    <td class="px-4 py-3 text-zinc-600 dark:text-zinc-300">{{ $item->project?->title ?? 'Global' }}</td>
-                    <td class="px-4 py-3 text-zinc-600 dark:text-zinc-300">{{ $item->provider }}</td>
-                    <td class="px-4 py-3 text-zinc-600 dark:text-zinc-300">{{ $item->default_branch }}</td>
-                    <td class="px-4 py-3"><flux:badge color="zinc">{{ $item->commits_count }}</flux:badge></td>
-                    <td class="px-4 py-3 text-xs text-zinc-600 dark:text-zinc-300">
-                        <div class="font-medium text-zinc-800 dark:text-zinc-100">{{ $item->webhook_logs_count ?? 0 }} deliveries</div>
-                        <code class="mt-1 block max-w-xs truncate rounded bg-zinc-100 px-2 py-1 text-[11px] text-zinc-700 dark:bg-zinc-800 dark:text-zinc-200">{{ route('api.helpdesk.git.webhook', ['repository' => $item->id]) }}</code>
-                    </td>
+                    <td class="px-4 py-3 text-zinc-500">{{ $item->provider }}</td>
+                    <td class="px-4 py-3 text-zinc-500">{{ $item->project?->title ?? 'No project' }}</td>
+                    <td class="px-4 py-3 font-mono text-xs text-zinc-500">{{ $item->default_branch }}</td>
+                    <td class="px-4 py-3 text-zinc-500">{{ $item->commits_count ?? 0 }}</td>
                     <td class="px-4 py-3 text-right">
-                        <flux:button size="sm" variant="primary" wire:click="editRepository({{ $item- class="!bg-blue-600 !text-white hover:!bg-blue-700 focus:!ring-blue-400/60">id }})">Edit</flux:button>
-                        <flux:button size="sm" variant="danger" wire:click="deleteRepository({{ $item- class="!bg-red-600 !text-white hover:!bg-red-700 focus:!ring-red-400/60">id }})" wire:confirm="Delete this repository?">Delete</flux:button>
+                        <div class="flex justify-end gap-2">
+                            <button type="button" wire:click="editRepository({{ $item->id }})" class="inline-flex items-center rounded-lg bg-blue-600 px-3 py-1.5 text-xs font-semibold text-white shadow-sm transition hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-blue-400/60">Edit</button>
+                            <button type="button" wire:click="deleteRepository({{ $item->id }})" class="inline-flex items-center rounded-lg bg-red-600 px-3 py-1.5 text-xs font-semibold text-white shadow-sm transition hover:bg-red-700 focus:outline-none focus:ring-2 focus:ring-red-400/60">Delete</button>
+                        </div>
                     </td>
                 </tr>
             @empty
-                <tr><td colspan="7" class="px-4 py-8 text-center text-zinc-500">No repositories yet.</td></tr>
+                <tr><td colspan="6" class="px-4 py-10 text-center text-zinc-500">No repositories yet.</td></tr>
             @endforelse
         </tbody>
     </table>
diff --git a/Modules/Helpdesk/Resources/views/components/team-table.blade.php b/Modules/Helpdesk/Resources/views/components/team-table.blade.php
index 3b829dab..4c75d476 100644
--- a/Modules/Helpdesk/Resources/views/components/team-table.blade.php
+++ b/Modules/Helpdesk/Resources/views/components/team-table.blade.php
@@ -3,10 +3,9 @@
         <thead class="bg-zinc-50 text-left text-xs font-semibold uppercase tracking-wide text-zinc-500 dark:bg-zinc-800 dark:text-zinc-300">
             <tr>
                 <th class="px-4 py-3">Team</th>
-                <th class="px-4 py-3">Slug</th>
+                <th class="px-4 py-3">Company</th>
                 <th class="px-4 py-3">Colour</th>
                 <th class="px-4 py-3">Default</th>
-                <th class="px-4 py-3">Projects</th>
                 <th class="px-4 py-3">Tickets</th>
                 <th class="px-4 py-3 text-right">Actions</th>
             </tr>
@@ -15,22 +14,19 @@
             @forelse ($items as $item)
                 <tr>
                     <td class="px-4 py-3 font-medium text-zinc-900 dark:text-zinc-100">{{ $item->name }}</td>
-                    <td class="px-4 py-3 font-mono text-xs text-zinc-500">{{ $item->slug }}</td>
+                    <td class="px-4 py-3 text-zinc-500">{{ $item->company?->name ?? 'Global' }}</td>
                     <td class="px-4 py-3"><flux:badge color="{{ $item->color }}">{{ $item->color }}</flux:badge></td>
-                    <td class="px-4 py-3">
-                        <flux:badge color="{{ ($item->is_default ?? false) ? 'emerald' : 'zinc' }}">
-                            {{ ($item->is_default ?? false) ? 'Default' : 'No' }}
-                        </flux:badge>
-                    </td>
-                    <td class="px-4 py-3 text-zinc-500">{{ $item->projects_count }}</td>
-                    <td class="px-4 py-3 text-zinc-500">{{ $item->tickets_count }}</td>
+                    <td class="px-4 py-3"><flux:badge color="{{ ($item->is_default ?? false) ? 'emerald' : 'zinc' }}">{{ ($item->is_default ?? false) ? 'Default' : 'No' }}</flux:badge></td>
+                    <td class="px-4 py-3 text-zinc-500">{{ $item->tickets_count ?? 0 }}</td>
                     <td class="px-4 py-3 text-right">
-                        <flux:button size="sm" wire:click="editTeam({{ $item- class="!bg-blue-600 !text-white hover:!bg-blue-700 focus:!ring-blue-400/60">id }})" variant="primary">Edit</flux:button>
-                        <flux:button size="sm" wire:click="deleteTeam({{ $item- class="!bg-red-600 !text-white hover:!bg-red-700 focus:!ring-red-400/60">id }})" variant="danger">Delete</flux:button>
+                        <div class="flex justify-end gap-2">
+                            <button type="button" wire:click="editTeam({{ $item->id }})" class="inline-flex items-center rounded-lg bg-blue-600 px-3 py-1.5 text-xs font-semibold text-white shadow-sm transition hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-blue-400/60">Edit</button>
+                            <button type="button" wire:click="deleteTeam({{ $item->id }})" class="inline-flex items-center rounded-lg bg-red-600 px-3 py-1.5 text-xs font-semibold text-white shadow-sm transition hover:bg-red-700 focus:outline-none focus:ring-2 focus:ring-red-400/60">Delete</button>
+                        </div>
                     </td>
                 </tr>
             @empty
-                <tr><td colspan="7" class="px-4 py-10 text-center text-zinc-500">No teams yet.</td></tr>
+                <tr><td colspan="6" class="px-4 py-10 text-center text-zinc-500">No teams yet.</td></tr>
             @endforelse
         </tbody>
     </table>
diff --git a/Modules/Helpdesk/Resources/views/livewire/dashboard-widget.blade.php b/Modules/Helpdesk/Resources/views/livewire/dashboard-widget.blade.php
index ac196a8f..5d434425 100644
--- a/Modules/Helpdesk/Resources/views/livewire/dashboard-widget.blade.php
+++ b/Modules/Helpdesk/Resources/views/livewire/dashboard-widget.blade.php
@@ -46,7 +46,7 @@
         <div class="rounded-2xl border border-zinc-200 bg-white p-5 shadow-sm dark:border-zinc-700 dark:bg-zinc-900">
             <div class="mb-5 flex items-center justify-between">
                 <h2 class="text-lg font-semibold text-zinc-900 dark:text-white">Recent commits</h2>
-                <flux:button :href="route('helpdesk.settings')" wire:navigate size="sm" variant="ghost" class="!bg-violet-600 !text-white hover:!bg-violet-700 focus:!ring-violet-400/60">Git setup</flux:button>
+                <a href="{{ route('helpdesk.settings') }}" wire:navigate class="inline-flex items-center rounded-lg bg-violet-600 px-3 py-1.5 text-xs font-semibold text-white shadow-sm transition hover:bg-violet-700 focus:outline-none focus:ring-2 focus:ring-violet-400/60">Git setup</a>
             </div>
             <div class="space-y-2">
                 @forelse ($recentCommits as $commit)
@@ -67,7 +67,7 @@
                 <h2 class="text-lg font-semibold text-zinc-900 dark:text-white">Recent tickets</h2>
                 <p class="text-sm text-zinc-500 dark:text-zinc-400">Latest support activity.</p>
             </div>
-            <flux:button :href="route('helpdesk.tickets.index')" wire:navigate size="sm" variant="ghost" class="!bg-blue-600 !text-white hover:!bg-blue-700 focus:!ring-blue-400/60">View all</flux:button>
+            <a href="{{ route('helpdesk.tickets.index') }}" wire:navigate class="inline-flex items-center rounded-lg bg-blue-600 px-3 py-1.5 text-xs font-semibold text-white shadow-sm transition hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-blue-400/60">View all</a>
         </div>
         <div class="space-y-2">
             @forelse ($recentTickets as $ticket)
diff --git a/Modules/Helpdesk/Resources/views/livewire/kanban-board.blade.php b/Modules/Helpdesk/Resources/views/livewire/kanban-board.blade.php
index b81d2e6c..0ec8ee95 100644
--- a/Modules/Helpdesk/Resources/views/livewire/kanban-board.blade.php
+++ b/Modules/Helpdesk/Resources/views/livewire/kanban-board.blade.php
@@ -13,7 +13,7 @@
                         <i class="fa-solid fa-plus" aria-hidden="true"></i>
                         <span>+ New Ticket</span>
                     </a>
-                    <a href="{{ route('helpdesk.settings') }}" wire:navigate class="inline-flex items-center gap-2 rounded-xl bg-violet-600 px-4 py-2 text-sm font-semibold text-white shadow-sm transition hover:bg-violet-700 focus:outline-none focus:ring-2 focus:ring-violet-400/60">
+                    <a href="{{ route('helpdesk.settings') }}" wire:navigate class="inline-flex items-center gap-2 rounded-xl bg-amber-500 px-4 py-2 text-sm font-semibold text-white shadow-sm transition hover:bg-amber-600 focus:outline-none focus:ring-2 focus:ring-amber-300/60">
                         <i class="fa-solid fa-gear" aria-hidden="true"></i>
                         <span>Configure boards</span>
                     </a>
@@ -118,7 +118,7 @@
                                 <div class="mt-4 flex items-center justify-between gap-2 border-t border-zinc-100 pt-3 dark:border-zinc-800">
                                     <a href="{{ route('helpdesk.tickets.show', $ticket) }}" wire:navigate class="rounded-lg bg-blue-600 px-3 py-1.5 text-xs font-semibold text-white hover:bg-blue-700">Open</a>
                                     @can('update', $ticket)
-                                        <a href="{{ route('helpdesk.tickets.edit', $ticket) }}" wire:navigate class="rounded-lg bg-emerald-600 px-3 py-1.5 text-xs font-semibold text-white hover:bg-emerald-700">Edit</a>
+                                        <a href="{{ route('helpdesk.tickets.edit', $ticket) }}" wire:navigate class="rounded-lg bg-blue-600 px-3 py-1.5 text-xs font-semibold text-white hover:bg-blue-700">Edit</a>
                                     @endcan
                                 </div>
                             </article>
diff --git a/Modules/Helpdesk/Resources/views/livewire/settings-manager.blade.php b/Modules/Helpdesk/Resources/views/livewire/settings-manager.blade.php
index 6ccff88b..ea6b6424 100644
--- a/Modules/Helpdesk/Resources/views/livewire/settings-manager.blade.php
+++ b/Modules/Helpdesk/Resources/views/livewire/settings-manager.blade.php
@@ -39,6 +39,14 @@
                         <i class="fa-solid fa-ticket" aria-hidden="true"></i>
                         <span>Tickets</span>
                     </a>
+                    <a href="{{ route('helpdesk.tickets.create') }}" wire:navigate class="inline-flex items-center gap-2 rounded-xl bg-green-600 px-4 py-2 text-sm font-semibold text-white shadow-sm transition hover:bg-green-700 focus:outline-none focus:ring-2 focus:ring-green-400/60">
+                        <i class="fa-solid fa-plus" aria-hidden="true"></i>
+                        <span>+ New Ticket</span>
+                    </a>
+                    <a href="{{ route('helpdesk.kanban') }}" wire:navigate class="inline-flex items-center gap-2 rounded-xl bg-amber-500 px-4 py-2 text-sm font-semibold text-white shadow-sm transition hover:bg-amber-600 focus:outline-none focus:ring-2 focus:ring-amber-300/60">
+                        <i class="fa-solid fa-table-columns" aria-hidden="true"></i>
+                        <span>Kanban</span>
+                    </a>
                 </div>
             </div>
         </div>
@@ -122,7 +130,7 @@
                     </flux:select>
 
                     <div class="md:col-span-3 flex gap-2">
-                        <flux:button type="submit" variant="primary" class="!bg-green-600 !text-white hover:!bg-green-700 focus:!ring-green-400/60">Save default company</flux:button>
+                        <button type="submit" class="inline-flex items-center rounded-xl bg-green-600 px-4 py-2 text-sm font-semibold text-white shadow-sm transition hover:bg-green-700 focus:outline-none focus:ring-2 focus:ring-green-400/60">Save default company</button>
                     </div>
                 </form>
             </x-slot:form>
@@ -147,7 +155,7 @@
                         <input type="checkbox" wire:model="statusForm.is_default" class="rounded border-zinc-300 bg-zinc-950 text-blue-600 focus:ring-blue-500">
                         Default status for new tickets
                     </label>
-                    <div class="md:col-span-5 flex gap-2"><flux:button type="submit" variant="primary" class="!bg-green-600 !text-white hover:!bg-green-700 focus:!ring-green-400/60">Save status</flux:button><flux:button type="button" wire:click="resetStatusForm" variant="ghost" class="!bg-amber-500 !text-white hover:!bg-amber-600 focus:!ring-amber-300/60">Reset</flux:button></div>
+                    <div class="md:col-span-5 flex gap-2"><button type="submit" class="inline-flex items-center rounded-xl bg-green-600 px-4 py-2 text-sm font-semibold text-white shadow-sm transition hover:bg-green-700 focus:outline-none focus:ring-2 focus:ring-green-400/60">Save status</button><button type="button" wire:click="resetStatusForm" class="inline-flex items-center rounded-xl bg-amber-500 px-4 py-2 text-sm font-semibold text-white shadow-sm transition hover:bg-amber-600 focus:outline-none focus:ring-2 focus:ring-amber-300/60">Reset</button></div>
                 </form>
             </x-slot:form>
             <x-helpdesk::lookup-table :items="$statuses" edit="editStatus" delete="deleteStatus" />
@@ -166,7 +174,7 @@
                         <input type="checkbox" wire:model="priorityForm.is_default" class="rounded border-zinc-300 bg-zinc-950 text-blue-600 focus:ring-blue-500">
                         Default for new tickets
                     </label>
-                    <div class="md:col-span-4 flex gap-2"><flux:button type="submit" variant="primary" class="!bg-green-600 !text-white hover:!bg-green-700 focus:!ring-green-400/60">Save priority</flux:button><flux:button type="button" wire:click="resetPriorityForm" variant="ghost" class="!bg-amber-500 !text-white hover:!bg-amber-600 focus:!ring-amber-300/60">Reset</flux:button></div>
+                    <div class="md:col-span-4 flex gap-2"><button type="submit" class="inline-flex items-center rounded-xl bg-green-600 px-4 py-2 text-sm font-semibold text-white shadow-sm transition hover:bg-green-700 focus:outline-none focus:ring-2 focus:ring-green-400/60">Save priority</button><button type="button" wire:click="resetPriorityForm" class="inline-flex items-center rounded-xl bg-amber-500 px-4 py-2 text-sm font-semibold text-white shadow-sm transition hover:bg-amber-600 focus:outline-none focus:ring-2 focus:ring-amber-300/60">Reset</button></div>
                 </form>
             </x-slot:form>
             <x-helpdesk::lookup-table :items="$priorities" edit="editPriority" delete="deletePriority" />
@@ -186,7 +194,7 @@
                         <input type="checkbox" wire:model="categoryForm.is_default" class="rounded border-zinc-300 bg-zinc-950 text-blue-600 focus:ring-blue-500">
                         Default category for new tickets
                     </label>
-                    <div class="md:col-span-4 flex gap-2"><flux:button type="submit" variant="primary" class="!bg-green-600 !text-white hover:!bg-green-700 focus:!ring-green-400/60">Save category</flux:button><flux:button type="button" wire:click="resetCategoryForm" variant="ghost" class="!bg-amber-500 !text-white hover:!bg-amber-600 focus:!ring-amber-300/60">Reset</flux:button></div>
+                    <div class="md:col-span-4 flex gap-2"><button type="submit" class="inline-flex items-center rounded-xl bg-green-600 px-4 py-2 text-sm font-semibold text-white shadow-sm transition hover:bg-green-700 focus:outline-none focus:ring-2 focus:ring-green-400/60">Save category</button><button type="button" wire:click="resetCategoryForm" class="inline-flex items-center rounded-xl bg-amber-500 px-4 py-2 text-sm font-semibold text-white shadow-sm transition hover:bg-amber-600 focus:outline-none focus:ring-2 focus:ring-amber-300/60">Reset</button></div>
                 </form>
             </x-slot:form>
             <x-helpdesk::lookup-table :items="$categories" edit="editCategory" delete="deleteCategory" />
@@ -206,7 +214,7 @@
                         <input type="checkbox" wire:model="teamForm.is_default" class="rounded border-zinc-300 bg-zinc-950 text-blue-600 focus:ring-blue-500">
                         Default team for new tickets
                     </label>
-                    <div class="md:col-span-4 flex gap-2"><flux:button type="submit" variant="primary" class="!bg-green-600 !text-white hover:!bg-green-700 focus:!ring-green-400/60">Save team</flux:button><flux:button type="button" wire:click="resetTeamForm" variant="ghost" class="!bg-amber-500 !text-white hover:!bg-amber-600 focus:!ring-amber-300/60">Reset</flux:button></div>
+                    <div class="md:col-span-4 flex gap-2"><button type="submit" class="inline-flex items-center rounded-xl bg-green-600 px-4 py-2 text-sm font-semibold text-white shadow-sm transition hover:bg-green-700 focus:outline-none focus:ring-2 focus:ring-green-400/60">Save team</button><button type="button" wire:click="resetTeamForm" class="inline-flex items-center rounded-xl bg-amber-500 px-4 py-2 text-sm font-semibold text-white shadow-sm transition hover:bg-amber-600 focus:outline-none focus:ring-2 focus:ring-amber-300/60">Reset</button></div>
                 </form>
             </x-slot:form>
             <x-helpdesk::team-table :items="$teams" />
@@ -227,7 +235,7 @@
                         <input type="checkbox" wire:model="projectForm.is_default" class="rounded border-zinc-300 bg-zinc-950 text-blue-600 focus:ring-blue-500">
                         Default project for new tickets
                     </label>
-                    <div class="md:col-span-5 flex gap-2"><flux:button type="submit" variant="primary" class="!bg-green-600 !text-white hover:!bg-green-700 focus:!ring-green-400/60">Save project</flux:button><flux:button type="button" wire:click="resetProjectForm" variant="ghost" class="!bg-amber-500 !text-white hover:!bg-amber-600 focus:!ring-amber-300/60">Reset</flux:button></div>
+                    <div class="md:col-span-5 flex gap-2"><button type="submit" class="inline-flex items-center rounded-xl bg-green-600 px-4 py-2 text-sm font-semibold text-white shadow-sm transition hover:bg-green-700 focus:outline-none focus:ring-2 focus:ring-green-400/60">Save project</button><button type="button" wire:click="resetProjectForm" class="inline-flex items-center rounded-xl bg-amber-500 px-4 py-2 text-sm font-semibold text-white shadow-sm transition hover:bg-amber-600 focus:outline-none focus:ring-2 focus:ring-amber-300/60">Reset</button></div>
                 </form>
             </x-slot:form>
             <x-helpdesk::project-table :items="$projects" />
@@ -261,8 +269,8 @@
                         </div>
                     </div>
                     <div class="md:col-span-6 flex gap-2">
-                        <flux:button type="submit" variant="primary" class="!bg-green-600 !text-white hover:!bg-green-700 focus:!ring-green-400/60">Save board</flux:button>
-                        <flux:button type="button" wire:click="resetBoardForm" variant="ghost" class="!bg-amber-500 !text-white hover:!bg-amber-600 focus:!ring-amber-300/60">Reset</flux:button>
+                        <button type="submit" class="inline-flex items-center rounded-xl bg-green-600 px-4 py-2 text-sm font-semibold text-white shadow-sm transition hover:bg-green-700 focus:outline-none focus:ring-2 focus:ring-green-400/60">Save board</button>
+                        <button type="button" wire:click="resetBoardForm" class="inline-flex items-center rounded-xl bg-amber-500 px-4 py-2 text-sm font-semibold text-white shadow-sm transition hover:bg-amber-600 focus:outline-none focus:ring-2 focus:ring-amber-300/60">Reset</button>
                     </div>
                 </form>
             </x-slot:form>
@@ -293,8 +301,8 @@
                                 </td>
                                 <td class="px-4 py-3"><flux:badge color="{{ $boardItem->is_default ? 'emerald' : 'zinc' }}">{{ $boardItem->is_default ? 'Default' : 'No' }}</flux:badge></td>
                                 <td class="px-4 py-3 text-right">
-                                    <flux:button size="sm" variant="primary" wire:click="editBoard({{ $boardItem- class="!bg-blue-600 !text-white hover:!bg-blue-700 focus:!ring-blue-400/60">id }})">Edit</flux:button>
-                                    <flux:button size="sm" variant="danger" wire:click="deleteBoard({{ $boardItem- class="!bg-red-600 !text-white hover:!bg-red-700 focus:!ring-red-400/60">id }})" wire:confirm="Delete this board?">Delete</flux:button>
+                                    <button type="button" wire:click="editBoard({{ $boardItem->id }})" class="inline-flex items-center rounded-lg bg-blue-600 px-3 py-1.5 text-xs font-semibold text-white shadow-sm transition hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-blue-400/60">Edit</button>
+                                    <button type="button" wire:click="deleteBoard({{ $boardItem->id }})" wire:confirm="Delete this board?" class="inline-flex items-center rounded-lg bg-red-600 px-3 py-1.5 text-xs font-semibold text-white shadow-sm transition hover:bg-red-700 focus:outline-none focus:ring-2 focus:ring-red-400/60">Delete</button>
                                 </td>
                             </tr>
                         @empty
@@ -330,8 +338,8 @@
                         <flux:input wire:model="repositoryForm.remote_url" label="Remote URL" placeholder="git@github.com:company/repo.git" />
                     </div>
                     <div class="md:col-span-6 flex gap-2">
-                        <flux:button type="submit" variant="primary" class="!bg-green-600 !text-white hover:!bg-green-700 focus:!ring-green-400/60">Save repository</flux:button>
-                        <flux:button type="button" wire:click="resetRepositoryForm" variant="ghost" class="!bg-amber-500 !text-white hover:!bg-amber-600 focus:!ring-amber-300/60">Reset</flux:button>
+                        <button type="submit" class="inline-flex items-center rounded-xl bg-green-600 px-4 py-2 text-sm font-semibold text-white shadow-sm transition hover:bg-green-700 focus:outline-none focus:ring-2 focus:ring-green-400/60">Save repository</button>
+                        <button type="button" wire:click="resetRepositoryForm" class="inline-flex items-center rounded-xl bg-amber-500 px-4 py-2 text-sm font-semibold text-white shadow-sm transition hover:bg-amber-600 focus:outline-none focus:ring-2 focus:ring-amber-300/60">Reset</button>
                     </div>
                 </form>
             </x-slot:form>
@@ -370,8 +378,8 @@
                         <flux:textarea wire:model="workflowForm.text_body" label="Plain text body" rows="4" placeholder="Optional fallback text" />
                     </div>
                     <div class="md:col-span-6 flex gap-2">
-                        <flux:button type="submit" variant="primary" class="!bg-green-600 !text-white hover:!bg-green-700 focus:!ring-green-400/60">Save workflow message</flux:button>
-                        <flux:button type="button" wire:click="resetWorkflowTemplateForm" variant="ghost" class="!bg-amber-500 !text-white hover:!bg-amber-600 focus:!ring-amber-300/60">Reset</flux:button>
+                        <button type="submit" class="inline-flex items-center rounded-xl bg-green-600 px-4 py-2 text-sm font-semibold text-white shadow-sm transition hover:bg-green-700 focus:outline-none focus:ring-2 focus:ring-green-400/60">Save workflow message</button>
+                        <button type="button" wire:click="resetWorkflowTemplateForm" class="inline-flex items-center rounded-xl bg-amber-500 px-4 py-2 text-sm font-semibold text-white shadow-sm transition hover:bg-amber-600 focus:outline-none focus:ring-2 focus:ring-amber-300/60">Reset</button>
                     </div>
                 </form>
             </x-slot:form>
@@ -395,8 +403,8 @@
                                 <td class="px-4 py-3 text-zinc-600 dark:text-zinc-300">{{ $template->to_role }}</td>
                                 <td class="px-4 py-3"><flux:badge color="{{ $template->is_active ? 'emerald' : 'zinc' }}">{{ $template->is_active ? 'Active' : 'Inactive' }}</flux:badge></td>
                                 <td class="px-4 py-3 text-right">
-                                    <flux:button size="sm" variant="ghost" wire:click="editWorkflowTemplate({{ $template- class="!bg-blue-600 !text-white hover:!bg-blue-700 focus:!ring-blue-400/60">id }})">Edit</flux:button>
-                                    <flux:button size="sm" variant="danger" wire:click="deleteWorkflowTemplate({{ $template- class="!bg-red-600 !text-white hover:!bg-red-700 focus:!ring-red-400/60">id }})" wire:confirm="Delete this workflow message?">Delete</flux:button>
+                                    <button type="button" wire:click="editWorkflowTemplate({{ $template->id }})" class="inline-flex items-center rounded-lg bg-blue-600 px-3 py-1.5 text-xs font-semibold text-white shadow-sm transition hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-blue-400/60">Edit</button>
+                                    <button type="button" wire:click="deleteWorkflowTemplate({{ $template->id }})" wire:confirm="Delete this workflow message?" class="inline-flex items-center rounded-lg bg-red-600 px-3 py-1.5 text-xs font-semibold text-white shadow-sm transition hover:bg-red-700 focus:outline-none focus:ring-2 focus:ring-red-400/60">Delete</button>
                                 </td>
                             </tr>
                         @empty
@@ -421,7 +429,7 @@
                     <label class="flex items-end gap-2 pb-2 text-sm text-zinc-700 dark:text-zinc-200"><input type="checkbox" wire:model="cannedForm.is_active" class="rounded border-zinc-300"> Active</label>
                     <div class="md:col-span-6"><flux:input wire:model="cannedForm.subject" label="Optional subject" /></div>
                     <div class="md:col-span-6"><flux:textarea wire:model="cannedForm.body" label="Reply body" rows="6" placeholder="Hello @{{ requester.name }},&#10;&#10;Your ticket @{{ ticket.reference }} has been reviewed." /></div>
-                    <div class="md:col-span-6 flex gap-2"><flux:button type="submit" variant="primary" class="!bg-green-600 !text-white hover:!bg-green-700 focus:!ring-green-400/60">Save canned response</flux:button><flux:button type="button" wire:click="resetCannedResponseForm" variant="ghost" class="!bg-amber-500 !text-white hover:!bg-amber-600 focus:!ring-amber-300/60">Reset</flux:button></div>
+                    <div class="md:col-span-6 flex gap-2"><button type="submit" class="inline-flex items-center rounded-xl bg-green-600 px-4 py-2 text-sm font-semibold text-white shadow-sm transition hover:bg-green-700 focus:outline-none focus:ring-2 focus:ring-green-400/60">Save canned response</button><button type="button" wire:click="resetCannedResponseForm" class="inline-flex items-center rounded-xl bg-amber-500 px-4 py-2 text-sm font-semibold text-white shadow-sm transition hover:bg-amber-600 focus:outline-none focus:ring-2 focus:ring-amber-300/60">Reset</button></div>
                 </form>
             </x-slot:form>
             <div class="grid gap-3 md:grid-cols-2 xl:grid-cols-3">
@@ -429,7 +437,7 @@
                     <div class="rounded-2xl border border-zinc-200 bg-white p-4 dark:border-zinc-700 dark:bg-zinc-900">
                         <div class="flex items-start justify-between gap-3"><div><h3 class="font-semibold text-zinc-900 dark:text-zinc-100">{{ $response->name }}</h3><p class="text-xs text-zinc-500">{{ $response->category?->name ?? 'Any category' }} · {{ $response->team?->name ?? 'Any team' }}</p></div><flux:badge color="{{ $response->is_active ? 'emerald' : 'zinc' }}">{{ $response->is_active ? 'Active' : 'Inactive' }}</flux:badge></div>
                         <p class="mt-3 line-clamp-3 text-sm text-zinc-600 dark:text-zinc-300">{{ strip_tags($response->body) }}</p>
-                        <div class="mt-4 flex justify-end gap-2"><flux:button size="sm" variant="primary" wire:click="editCannedResponse({{ $response- class="!bg-blue-600 !text-white hover:!bg-blue-700 focus:!ring-blue-400/60">id }})">Edit</flux:button><flux:button size="sm" variant="danger" wire:click="deleteCannedResponse({{ $response- class="!bg-red-600 !text-white hover:!bg-red-700 focus:!ring-red-400/60">id }})" wire:confirm="Delete this canned response?">Delete</flux:button></div>
+                        <div class="mt-4 flex justify-end gap-2"><button type="button" wire:click="editCannedResponse({{ $response->id }})" class="inline-flex items-center rounded-lg bg-blue-600 px-3 py-1.5 text-xs font-semibold text-white shadow-sm transition hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-blue-400/60">Edit</button><button type="button" wire:click="deleteCannedResponse({{ $response->id }})" wire:confirm="Delete this canned response?" class="inline-flex items-center rounded-lg bg-red-600 px-3 py-1.5 text-xs font-semibold text-white shadow-sm transition hover:bg-red-700 focus:outline-none focus:ring-2 focus:ring-red-400/60">Delete</button></div>
                     </div>
                 @empty
                     <div class="rounded-2xl border border-dashed border-zinc-300 p-8 text-center text-sm text-zinc-500 dark:border-zinc-700 md:col-span-2 xl:col-span-3">No canned responses yet.</div>
@@ -451,10 +459,10 @@
                     <label class="flex items-center gap-2 text-sm text-zinc-700 dark:text-zinc-200"><input type="checkbox" wire:model="slaForm.is_default" class="rounded border-zinc-300"> Default</label>
                     <label class="flex items-center gap-2 text-sm text-zinc-700 dark:text-zinc-200"><input type="checkbox" wire:model="slaForm.business_hours_only" class="rounded border-zinc-300"> Business hours</label>
                     <label class="flex items-center gap-2 text-sm text-zinc-700 dark:text-zinc-200"><input type="checkbox" wire:model="slaForm.is_active" class="rounded border-zinc-300"> Active</label>
-                    <div class="md:col-span-6 flex gap-2"><flux:button type="submit" variant="primary" class="!bg-green-600 !text-white hover:!bg-green-700 focus:!ring-green-400/60">Save SLA policy</flux:button><flux:button type="button" wire:click="resetSlaPolicyForm" variant="ghost" class="!bg-amber-500 !text-white hover:!bg-amber-600 focus:!ring-amber-300/60">Reset</flux:button></div>
+                    <div class="md:col-span-6 flex gap-2"><button type="submit" class="inline-flex items-center rounded-xl bg-green-600 px-4 py-2 text-sm font-semibold text-white shadow-sm transition hover:bg-green-700 focus:outline-none focus:ring-2 focus:ring-green-400/60">Save SLA policy</button><button type="button" wire:click="resetSlaPolicyForm" class="inline-flex items-center rounded-xl bg-amber-500 px-4 py-2 text-sm font-semibold text-white shadow-sm transition hover:bg-amber-600 focus:outline-none focus:ring-2 focus:ring-amber-300/60">Reset</button></div>
                 </form>
             </x-slot:form>
-            <div class="overflow-hidden rounded-2xl border border-zinc-200 bg-white dark:border-zinc-700 dark:bg-zinc-900"><table class="min-w-full divide-y divide-zinc-200 text-sm dark:divide-zinc-700"><thead class="bg-zinc-50 text-left text-xs font-semibold uppercase text-zinc-500 dark:bg-zinc-800"><tr><th class="px-4 py-3">Policy</th><th class="px-4 py-3">Targets</th><th class="px-4 py-3">Applies to</th><th class="px-4 py-3 text-right">Actions</th></tr></thead><tbody class="divide-y divide-zinc-100 dark:divide-zinc-800">@forelse ($slaPolicies as $policy)<tr><td class="px-4 py-3 font-medium">{{ $policy->name }} @if($policy->is_default)<flux:badge color="blue">Default</flux:badge>@endif</td><td class="px-4 py-3">{{ $policy->first_response_minutes }}m response · {{ $policy->resolution_minutes }}m close</td><td class="px-4 py-3">{{ $policy->priority?->name ?? 'Any priority' }} · {{ $policy->category?->name ?? 'Any category' }}</td><td class="px-4 py-3 text-right"><flux:button size="sm" variant="primary" wire:click="editSlaPolicy({{ $policy- class="!bg-blue-600 !text-white hover:!bg-blue-700 focus:!ring-blue-400/60">id }})">Edit</flux:button> <flux:button size="sm" variant="danger" wire:click="deleteSlaPolicy({{ $policy- class="!bg-red-600 !text-white hover:!bg-red-700 focus:!ring-red-400/60">id }})" wire:confirm="Delete this SLA policy?">Delete</flux:button></td></tr>@empty<tr><td colspan="4" class="px-4 py-8 text-center text-zinc-500">No SLA policies yet.</td></tr>@endforelse</tbody></table></div>
+            <div class="overflow-hidden rounded-2xl border border-zinc-200 bg-white dark:border-zinc-700 dark:bg-zinc-900"><table class="min-w-full divide-y divide-zinc-200 text-sm dark:divide-zinc-700"><thead class="bg-zinc-50 text-left text-xs font-semibold uppercase text-zinc-500 dark:bg-zinc-800"><tr><th class="px-4 py-3">Policy</th><th class="px-4 py-3">Targets</th><th class="px-4 py-3">Applies to</th><th class="px-4 py-3 text-right">Actions</th></tr></thead><tbody class="divide-y divide-zinc-100 dark:divide-zinc-800">@forelse ($slaPolicies as $policy)<tr><td class="px-4 py-3 font-medium">{{ $policy->name }} @if($policy->is_default)<flux:badge color="blue">Default</flux:badge>@endif</td><td class="px-4 py-3">{{ $policy->first_response_minutes }}m response · {{ $policy->resolution_minutes }}m close</td><td class="px-4 py-3">{{ $policy->priority?->name ?? 'Any priority' }} · {{ $policy->category?->name ?? 'Any category' }}</td><td class="px-4 py-3 text-right"><button type="button" wire:click="editSlaPolicy({{ $policy->id }})" class="inline-flex items-center rounded-lg bg-blue-600 px-3 py-1.5 text-xs font-semibold text-white shadow-sm transition hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-blue-400/60">Edit</button> <button type="button" wire:click="deleteSlaPolicy({{ $policy->id }})" wire:confirm="Delete this SLA policy?" class="inline-flex items-center rounded-lg bg-red-600 px-3 py-1.5 text-xs font-semibold text-white shadow-sm transition hover:bg-red-700 focus:outline-none focus:ring-2 focus:ring-red-400/60">Delete</button></td></tr>@empty<tr><td colspan="4" class="px-4 py-8 text-center text-zinc-500">No SLA policies yet.</td></tr>@endforelse</tbody></table></div>
         </x-helpdesk::settings-section>
     @endif
 
@@ -474,31 +482,31 @@
                     <flux:select wire:model="automationForm.set_project_id" label="Set project"><option value="">No change</option>@foreach ($projects as $project)<option value="{{ $project->id }}">{{ $project->title }}</option>@endforeach</flux:select>
                     <flux:select wire:model="automationForm.set_status_id" label="Set status"><option value="">No change</option>@foreach ($statuses as $status)<option value="{{ $status->id }}">{{ $status->name }}</option>@endforeach</flux:select>
                     <label class="flex items-end gap-2 pb-2 text-sm text-zinc-700 dark:text-zinc-200"><input type="checkbox" wire:model="automationForm.is_active" class="rounded border-zinc-300"> Active</label>
-                    <div class="md:col-span-6 flex gap-2"><flux:button type="submit" variant="primary" class="!bg-green-600 !text-white hover:!bg-green-700 focus:!ring-green-400/60">Save automation rule</flux:button><flux:button type="button" wire:click="resetAutomationRuleForm" variant="ghost" class="!bg-amber-500 !text-white hover:!bg-amber-600 focus:!ring-amber-300/60">Reset</flux:button></div>
+                    <div class="md:col-span-6 flex gap-2"><button type="submit" class="inline-flex items-center rounded-xl bg-green-600 px-4 py-2 text-sm font-semibold text-white shadow-sm transition hover:bg-green-700 focus:outline-none focus:ring-2 focus:ring-green-400/60">Save automation rule</button><button type="button" wire:click="resetAutomationRuleForm" class="inline-flex items-center rounded-xl bg-amber-500 px-4 py-2 text-sm font-semibold text-white shadow-sm transition hover:bg-amber-600 focus:outline-none focus:ring-2 focus:ring-amber-300/60">Reset</button></div>
                 </form>
             </x-slot:form>
-            <div class="grid gap-3 md:grid-cols-2">@forelse ($automationRules as $rule)<div class="rounded-2xl border border-zinc-200 bg-white p-4 dark:border-zinc-700 dark:bg-zinc-900"><h3 class="font-semibold">{{ $rule->name }}</h3><p class="mt-1 text-sm text-zinc-500">Sender: {{ $rule->match_sender ?: 'Any' }} · Subject: {{ $rule->match_subject ?: 'Any' }}</p><div class="mt-4 flex justify-end gap-2"><flux:button size="sm" variant="primary" wire:click="editAutomationRule({{ $rule- class="!bg-blue-600 !text-white hover:!bg-blue-700 focus:!ring-blue-400/60">id }})">Edit</flux:button><flux:button size="sm" variant="danger" wire:click="deleteAutomationRule({{ $rule- class="!bg-red-600 !text-white hover:!bg-red-700 focus:!ring-red-400/60">id }})" wire:confirm="Delete this rule?">Delete</flux:button></div></div>@empty<div class="rounded-2xl border border-dashed border-zinc-300 p-8 text-center text-sm text-zinc-500 dark:border-zinc-700 md:col-span-2">No automation rules yet.</div>@endforelse</div>
+            <div class="grid gap-3 md:grid-cols-2">@forelse ($automationRules as $rule)<div class="rounded-2xl border border-zinc-200 bg-white p-4 dark:border-zinc-700 dark:bg-zinc-900"><h3 class="font-semibold">{{ $rule->name }}</h3><p class="mt-1 text-sm text-zinc-500">Sender: {{ $rule->match_sender ?: 'Any' }} · Subject: {{ $rule->match_subject ?: 'Any' }}</p><div class="mt-4 flex justify-end gap-2"><button type="button" wire:click="editAutomationRule({{ $rule->id }})" class="inline-flex items-center rounded-lg bg-blue-600 px-3 py-1.5 text-xs font-semibold text-white shadow-sm transition hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-blue-400/60">Edit</button><button type="button" wire:click="deleteAutomationRule({{ $rule->id }})" wire:confirm="Delete this rule?" class="inline-flex items-center rounded-lg bg-red-600 px-3 py-1.5 text-xs font-semibold text-white shadow-sm transition hover:bg-red-700 focus:outline-none focus:ring-2 focus:ring-red-400/60">Delete</button></div></div>@empty<div class="rounded-2xl border border-dashed border-zinc-300 p-8 text-center text-sm text-zinc-500 dark:border-zinc-700 md:col-span-2">No automation rules yet.</div>@endforelse</div>
         </x-helpdesk::settings-section>
     @endif
 
     @if ($section === 'checklists')
         <x-helpdesk::settings-section title="Checklist templates" description="Apply repeatable checklist items by category or project and show completion progress on tickets and Kanban cards.">
-            <x-slot:form><form wire:submit="saveChecklistTemplate" class="grid gap-4 md:grid-cols-6"><flux:input wire:model="checklistTemplateForm.name" label="Name" /><flux:input wire:model="checklistTemplateForm.slug" label="Slug" /><flux:select wire:model="checklistTemplateForm.category_id" label="Category"><option value="">Any category</option>@foreach ($categories as $category)<option value="{{ $category->id }}">{{ $category->name }}</option>@endforeach</flux:select><flux:select wire:model="checklistTemplateForm.project_id" label="Project"><option value="">Any project</option>@foreach ($projects as $project)<option value="{{ $project->id }}">{{ $project->title }}</option>@endforeach</flux:select><label class="flex items-end gap-2 pb-2 text-sm"><input type="checkbox" wire:model="checklistTemplateForm.is_active" class="rounded border-zinc-300"> Active</label><div class="md:col-span-6"><flux:textarea wire:model="checklistTemplateForm.items_text" label="Checklist items, one per line" rows="6" /></div><div class="md:col-span-6 flex gap-2"><flux:button type="submit" variant="primary" class="!bg-green-600 !text-white hover:!bg-green-700 focus:!ring-green-400/60">Save checklist</flux:button><flux:button type="button" wire:click="resetChecklistTemplateForm" variant="ghost" class="!bg-amber-500 !text-white hover:!bg-amber-600 focus:!ring-amber-300/60">Reset</flux:button></div></form></x-slot:form>
-            <div class="grid gap-3 md:grid-cols-2 xl:grid-cols-3">@forelse ($checklistTemplates as $template)<div class="rounded-2xl border border-zinc-200 bg-white p-4 dark:border-zinc-700 dark:bg-zinc-900"><h3 class="font-semibold">{{ $template->name }}</h3><p class="mt-1 text-sm text-zinc-500">{{ count($template->items ?? []) }} items</p><div class="mt-4 flex justify-end gap-2"><flux:button size="sm" variant="primary" wire:click="editChecklistTemplate({{ $template- class="!bg-blue-600 !text-white hover:!bg-blue-700 focus:!ring-blue-400/60">id }})">Edit</flux:button><flux:button size="sm" variant="danger" wire:click="deleteChecklistTemplate({{ $template- class="!bg-red-600 !text-white hover:!bg-red-700 focus:!ring-red-400/60">id }})" wire:confirm="Delete this checklist?">Delete</flux:button></div></div>@empty<div class="rounded-2xl border border-dashed border-zinc-300 p-8 text-center text-sm text-zinc-500 dark:border-zinc-700 md:col-span-2 xl:col-span-3">No checklist templates yet.</div>@endforelse</div>
+            <x-slot:form><form wire:submit="saveChecklistTemplate" class="grid gap-4 md:grid-cols-6"><flux:input wire:model="checklistTemplateForm.name" label="Name" /><flux:input wire:model="checklistTemplateForm.slug" label="Slug" /><flux:select wire:model="checklistTemplateForm.category_id" label="Category"><option value="">Any category</option>@foreach ($categories as $category)<option value="{{ $category->id }}">{{ $category->name }}</option>@endforeach</flux:select><flux:select wire:model="checklistTemplateForm.project_id" label="Project"><option value="">Any project</option>@foreach ($projects as $project)<option value="{{ $project->id }}">{{ $project->title }}</option>@endforeach</flux:select><label class="flex items-end gap-2 pb-2 text-sm"><input type="checkbox" wire:model="checklistTemplateForm.is_active" class="rounded border-zinc-300"> Active</label><div class="md:col-span-6"><flux:textarea wire:model="checklistTemplateForm.items_text" label="Checklist items, one per line" rows="6" /></div><div class="md:col-span-6 flex gap-2"><button type="submit" class="inline-flex items-center rounded-xl bg-green-600 px-4 py-2 text-sm font-semibold text-white shadow-sm transition hover:bg-green-700 focus:outline-none focus:ring-2 focus:ring-green-400/60">Save checklist</button><button type="button" wire:click="resetChecklistTemplateForm" class="inline-flex items-center rounded-xl bg-amber-500 px-4 py-2 text-sm font-semibold text-white shadow-sm transition hover:bg-amber-600 focus:outline-none focus:ring-2 focus:ring-amber-300/60">Reset</button></div></form></x-slot:form>
+            <div class="grid gap-3 md:grid-cols-2 xl:grid-cols-3">@forelse ($checklistTemplates as $template)<div class="rounded-2xl border border-zinc-200 bg-white p-4 dark:border-zinc-700 dark:bg-zinc-900"><h3 class="font-semibold">{{ $template->name }}</h3><p class="mt-1 text-sm text-zinc-500">{{ count($template->items ?? []) }} items</p><div class="mt-4 flex justify-end gap-2"><button type="button" wire:click="editChecklistTemplate({{ $template->id }})" class="inline-flex items-center rounded-lg bg-blue-600 px-3 py-1.5 text-xs font-semibold text-white shadow-sm transition hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-blue-400/60">Edit</button><button type="button" wire:click="deleteChecklistTemplate({{ $template->id }})" wire:confirm="Delete this checklist?" class="inline-flex items-center rounded-lg bg-red-600 px-3 py-1.5 text-xs font-semibold text-white shadow-sm transition hover:bg-red-700 focus:outline-none focus:ring-2 focus:ring-red-400/60">Delete</button></div></div>@empty<div class="rounded-2xl border border-dashed border-zinc-300 p-8 text-center text-sm text-zinc-500 dark:border-zinc-700 md:col-span-2 xl:col-span-3">No checklist templates yet.</div>@endforelse</div>
         </x-helpdesk::settings-section>
     @endif
 
     @if ($section === 'tags')
         <x-helpdesk::settings-section title="Ticket tags" description="Maintain visible ticket labels for search, triage and Kanban card context.">
-            <x-slot:form><form wire:submit="saveTag" class="grid gap-4 md:grid-cols-5"><flux:input wire:model="tagForm.name" label="Name" /><flux:input wire:model="tagForm.slug" label="Slug" /><flux:input wire:model="tagForm.color" label="Colour" /><div class="md:col-span-5 flex gap-2"><flux:button type="submit" variant="primary" class="!bg-green-600 !text-white hover:!bg-green-700 focus:!ring-green-400/60">Save tag</flux:button><flux:button type="button" wire:click="resetTagForm" variant="ghost" class="!bg-amber-500 !text-white hover:!bg-amber-600 focus:!ring-amber-300/60">Reset</flux:button></div></form></x-slot:form>
-            <div class="flex flex-wrap gap-3">@forelse ($tags as $tag)<div class="rounded-2xl border border-zinc-200 bg-white px-4 py-3 dark:border-zinc-700 dark:bg-zinc-900"><span class="rounded-full px-2 py-1 text-xs font-semibold text-white" style="background-color: {{ \Modules\Helpdesk\Support\Color::css($tag->color) }}">{{ $tag->name }}</span><div class="mt-3 flex gap-2"><flux:button size="sm" variant="primary" wire:click="editTag({{ $tag- class="!bg-blue-600 !text-white hover:!bg-blue-700 focus:!ring-blue-400/60">id }})">Edit</flux:button><flux:button size="sm" variant="danger" wire:click="deleteTag({{ $tag- class="!bg-red-600 !text-white hover:!bg-red-700 focus:!ring-red-400/60">id }})" wire:confirm="Delete this tag?">Delete</flux:button></div></div>@empty<div class="rounded-2xl border border-dashed border-zinc-300 p-8 text-center text-sm text-zinc-500 dark:border-zinc-700">No tags yet.</div>@endforelse</div>
+            <x-slot:form><form wire:submit="saveTag" class="grid gap-4 md:grid-cols-5"><flux:input wire:model="tagForm.name" label="Name" /><flux:input wire:model="tagForm.slug" label="Slug" /><flux:input wire:model="tagForm.color" label="Colour" /><div class="md:col-span-5 flex gap-2"><button type="submit" class="inline-flex items-center rounded-xl bg-green-600 px-4 py-2 text-sm font-semibold text-white shadow-sm transition hover:bg-green-700 focus:outline-none focus:ring-2 focus:ring-green-400/60">Save tag</button><button type="button" wire:click="resetTagForm" class="inline-flex items-center rounded-xl bg-amber-500 px-4 py-2 text-sm font-semibold text-white shadow-sm transition hover:bg-amber-600 focus:outline-none focus:ring-2 focus:ring-amber-300/60">Reset</button></div></form></x-slot:form>
+            <div class="flex flex-wrap gap-3">@forelse ($tags as $tag)<div class="rounded-2xl border border-zinc-200 bg-white px-4 py-3 dark:border-zinc-700 dark:bg-zinc-900"><span class="rounded-full px-2 py-1 text-xs font-semibold text-white" style="background-color: {{ \Modules\Helpdesk\Support\Color::css($tag->color) }}">{{ $tag->name }}</span><div class="mt-3 flex gap-2"><button type="button" wire:click="editTag({{ $tag->id }})" class="inline-flex items-center rounded-lg bg-blue-600 px-3 py-1.5 text-xs font-semibold text-white shadow-sm transition hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-blue-400/60">Edit</button><button type="button" wire:click="deleteTag({{ $tag->id }})" wire:confirm="Delete this tag?" class="inline-flex items-center rounded-lg bg-red-600 px-3 py-1.5 text-xs font-semibold text-white shadow-sm transition hover:bg-red-700 focus:outline-none focus:ring-2 focus:ring-red-400/60">Delete</button></div></div>@empty<div class="rounded-2xl border border-dashed border-zinc-300 p-8 text-center text-sm text-zinc-500 dark:border-zinc-700">No tags yet.</div>@endforelse</div>
         </x-helpdesk::settings-section>
     @endif
 
     @if ($section === 'products')
         <x-helpdesk::settings-section title="Products and services" description="Link tickets to products, services, releases or builds and report support cost/time by product.">
-            <x-slot:form><form wire:submit="saveProduct" class="grid gap-4 md:grid-cols-6"><flux:input wire:model="productForm.name" label="Name" /><flux:input wire:model="productForm.slug" label="Slug" /><flux:input wire:model="productForm.type" label="Type" /><flux:input wire:model="productForm.version" label="Version" /><flux:input wire:model="productForm.release_channel" label="Release/build" /><label class="flex items-end gap-2 pb-2 text-sm"><input type="checkbox" wire:model="productForm.is_active" class="rounded border-zinc-300"> Active</label><div class="md:col-span-6"><flux:textarea wire:model="productForm.description" label="Description" rows="3" /></div><div class="md:col-span-6 flex gap-2"><flux:button type="submit" variant="primary" class="!bg-green-600 !text-white hover:!bg-green-700 focus:!ring-green-400/60">Save product/service</flux:button><flux:button type="button" wire:click="resetProductForm" variant="ghost" class="!bg-amber-500 !text-white hover:!bg-amber-600 focus:!ring-amber-300/60">Reset</flux:button></div></form></x-slot:form>
-            <div class="grid gap-3 md:grid-cols-2 xl:grid-cols-3">@forelse ($products as $product)<div class="rounded-2xl border border-zinc-200 bg-white p-4 dark:border-zinc-700 dark:bg-zinc-900"><h3 class="font-semibold">{{ $product->name }}</h3><p class="mt-1 text-sm text-zinc-500">{{ ucfirst($product->type) }} · {{ $product->version ?: 'No version' }} · {{ $product->tickets_count }} tickets</p><div class="mt-4 flex justify-end gap-2"><flux:button size="sm" variant="primary" wire:click="editProduct({{ $product- class="!bg-blue-600 !text-white hover:!bg-blue-700 focus:!ring-blue-400/60">id }})">Edit</flux:button><flux:button size="sm" variant="danger" wire:click="deleteProduct({{ $product- class="!bg-red-600 !text-white hover:!bg-red-700 focus:!ring-red-400/60">id }})" wire:confirm="Delete this product/service?">Delete</flux:button></div></div>@empty<div class="rounded-2xl border border-dashed border-zinc-300 p-8 text-center text-sm text-zinc-500 dark:border-zinc-700 md:col-span-2 xl:col-span-3">No products or services yet.</div>@endforelse</div>
+            <x-slot:form><form wire:submit="saveProduct" class="grid gap-4 md:grid-cols-6"><flux:input wire:model="productForm.name" label="Name" /><flux:input wire:model="productForm.slug" label="Slug" /><flux:input wire:model="productForm.type" label="Type" /><flux:input wire:model="productForm.version" label="Version" /><flux:input wire:model="productForm.release_channel" label="Release/build" /><label class="flex items-end gap-2 pb-2 text-sm"><input type="checkbox" wire:model="productForm.is_active" class="rounded border-zinc-300"> Active</label><div class="md:col-span-6"><flux:textarea wire:model="productForm.description" label="Description" rows="3" /></div><div class="md:col-span-6 flex gap-2"><button type="submit" class="inline-flex items-center rounded-xl bg-green-600 px-4 py-2 text-sm font-semibold text-white shadow-sm transition hover:bg-green-700 focus:outline-none focus:ring-2 focus:ring-green-400/60">Save product/service</button><button type="button" wire:click="resetProductForm" class="inline-flex items-center rounded-xl bg-amber-500 px-4 py-2 text-sm font-semibold text-white shadow-sm transition hover:bg-amber-600 focus:outline-none focus:ring-2 focus:ring-amber-300/60">Reset</button></div></form></x-slot:form>
+            <div class="grid gap-3 md:grid-cols-2 xl:grid-cols-3">@forelse ($products as $product)<div class="rounded-2xl border border-zinc-200 bg-white p-4 dark:border-zinc-700 dark:bg-zinc-900"><h3 class="font-semibold">{{ $product->name }}</h3><p class="mt-1 text-sm text-zinc-500">{{ ucfirst($product->type) }} · {{ $product->version ?: 'No version' }} · {{ $product->tickets_count }} tickets</p><div class="mt-4 flex justify-end gap-2"><button type="button" wire:click="editProduct({{ $product->id }})" class="inline-flex items-center rounded-lg bg-blue-600 px-3 py-1.5 text-xs font-semibold text-white shadow-sm transition hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-blue-400/60">Edit</button><button type="button" wire:click="deleteProduct({{ $product->id }})" wire:confirm="Delete this product/service?" class="inline-flex items-center rounded-lg bg-red-600 px-3 py-1.5 text-xs font-semibold text-white shadow-sm transition hover:bg-red-700 focus:outline-none focus:ring-2 focus:ring-red-400/60">Delete</button></div></div>@empty<div class="rounded-2xl border border-dashed border-zinc-300 p-8 text-center text-sm text-zinc-500 dark:border-zinc-700 md:col-span-2 xl:col-span-3">No products or services yet.</div>@endforelse</div>
         </x-helpdesk::settings-section>
     @endif
 
diff --git a/Modules/Helpdesk/Resources/views/livewire/ticket-show.blade.php b/Modules/Helpdesk/Resources/views/livewire/ticket-show.blade.php
index 9c1118ea..3c8f3d65 100644
--- a/Modules/Helpdesk/Resources/views/livewire/ticket-show.blade.php
+++ b/Modules/Helpdesk/Resources/views/livewire/ticket-show.blade.php
@@ -16,7 +16,7 @@
                         <i class="fa-solid fa-arrow-left mr-2" aria-hidden="true"></i> Back
                     </a>
                     @can('update', $ticket)
-                        <a href="{{ route('helpdesk.tickets.edit', $ticket) }}" wire:navigate class="inline-flex items-center rounded-xl bg-emerald-600 px-4 py-2 text-sm font-semibold text-white shadow-sm hover:bg-emerald-700">
+                        <a href="{{ route('helpdesk.tickets.edit', $ticket) }}" wire:navigate class="inline-flex items-center rounded-xl bg-blue-600 px-4 py-2 text-sm font-semibold text-white shadow-sm hover:bg-blue-700">
                             <i class="fa-solid fa-pen-to-square mr-2" aria-hidden="true"></i> Edit
                         </a>
                     @endcan
@@ -68,7 +68,7 @@
                             @endforeach
                         </flux:select>
                         <div class="flex items-end">
-                            <flux:button type="button" wire:click="applyCannedResponse" variant="ghost" icon="document-duplicate" class="!bg-blue-600 !text-white hover:!bg-blue-700 focus:!ring-blue-400/60">Insert response</flux:button>
+                            <button type="button" wire:click="applyCannedResponse" class="inline-flex items-center rounded-lg bg-blue-600 px-3 py-1.5 text-xs font-semibold text-white shadow-sm transition hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-blue-400/60">Insert response</button>
                         </div>
                     </div>
                 @endif
@@ -88,10 +88,10 @@
                 </div>
 
                 <div class="mt-5 flex justify-end">
-                    <flux:button dusk="post-comment" type="submit" variant="primary" icon="chat-bubble-left-right" class="!bg-emerald-600 !text-white hover:!bg-emerald-700 !bg-emerald-600 !text-white hover:!bg-emerald-700 focus:!ring-emerald-400/60" wire:loading.attr="disabled">
+                    <button dusk="post-comment" type="submit" wire:loading.attr="disabled" class="inline-flex items-center rounded-lg bg-red-600 px-3 py-1.5 text-xs font-semibold text-white shadow-sm transition hover:bg-red-700 focus:outline-none focus:ring-2 focus:ring-red-400/60">
                         <span wire:loading.remove>Post reply</span>
                         <span wire:loading>Posting...</span>
-                    </flux:button>
+                    </button>
                 </div>
             </form>
         </div>
@@ -185,14 +185,14 @@
                             <option value="{{ $status->id }}">{{ $status->name }}</option>
                         @endforeach
                     </flux:select>
-                    <flux:button dusk="update-status" wire:click="updateStatus" class="mt-4 w-full !bg-blue-600 !text-white hover:!bg-blue-700 focus:!ring-blue-400/60" variant="primary" icon="check">Update status</flux:button>
+                    <button type="button" dusk="update-status" wire:click="updateStatus" class="inline-flex items-center rounded-lg bg-blue-600 px-3 py-1.5 text-xs font-semibold text-white shadow-sm transition hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-blue-400/60">Update status</button>
                     <div class="mt-5">
                         <flux:select wire:model="priority_id" label="Priority">
                             @foreach ($priorities as $priority)
                                 <option value="{{ $priority->id }}">{{ $priority->name }}</option>
                             @endforeach
                         </flux:select>
-                        <flux:button dusk="update-priority" wire:click="updatePriority" class="mt-4 w-full !bg-amber-500 !text-white hover:!bg-amber-600 focus:!ring-amber-300/60" variant="ghost" icon="flag">Update priority</flux:button>
+                        <button type="button" dusk="update-priority" wire:click="updatePriority" class="inline-flex items-center rounded-lg bg-blue-600 px-3 py-1.5 text-xs font-semibold text-white shadow-sm transition hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-blue-400/60">Update priority</button>
                     </div>
                 </div>
             @endcan
diff --git a/Modules/Helpdesk/Resources/views/partials/comment-thread.blade.php b/Modules/Helpdesk/Resources/views/partials/comment-thread.blade.php
index 14274338..9620c005 100644
--- a/Modules/Helpdesk/Resources/views/partials/comment-thread.blade.php
+++ b/Modules/Helpdesk/Resources/views/partials/comment-thread.blade.php
@@ -39,7 +39,7 @@
             @endif
 
             <div class="mt-3 flex justify-end">
-                <flux:button size="sm" variant="ghost" wire:click="startReply({{ $comment- class="!bg-blue-600 !text-white hover:!bg-blue-700 focus:!ring-blue-400/60">id }})">Reply</flux:button>
+                <button type="button" wire:click="startReply({{ $comment->id }})" class="inline-flex items-center rounded-lg bg-blue-600 px-3 py-1.5 text-xs font-semibold text-white shadow-sm transition hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-blue-400/60">Reply</button>
             </div>
 
             @if (($reply_parent_id ?? null) === $comment->id)
@@ -47,8 +47,8 @@
                     <x-helpdesk::html-editor wire:key="reply-editor-{{ $comment->id }}" wire:model="replyBody" label="Reply" rows="4" placeholder="Write a reply..." />
 
                     <div class="mt-4 flex justify-end gap-2">
-                        <flux:button type="button" wire:click="cancelReply" variant="ghost" class="!bg-slate-600 !text-white hover:!bg-slate-700 focus:!ring-slate-400/60">Cancel</flux:button>
-                        <flux:button type="submit" variant="primary" class="!bg-emerald-600 !text-white hover:!bg-emerald-700 !bg-emerald-600 !text-white hover:!bg-emerald-700 focus:!ring-emerald-400/60">Post reply</flux:button>
+                        <button type="button" wire:click="cancelReply" class="inline-flex items-center rounded-xl bg-amber-500 px-4 py-2 text-sm font-semibold text-white shadow-sm transition hover:bg-amber-600 focus:outline-none focus:ring-2 focus:ring-amber-300/60">Cancel</button>
+                        <button type="submit" class="inline-flex items-center rounded-lg bg-blue-600 px-3 py-1.5 text-xs font-semibold text-white shadow-sm transition hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-blue-400/60">Post reply</button>
                     </div>
                 </form>
             @endif
diff --git a/Modules/Helpdesk/changelog.yaml b/Modules/Helpdesk/changelog.yaml
index 6fa9288f..87028cd7 100644
--- a/Modules/Helpdesk/changelog.yaml
+++ b/Modules/Helpdesk/changelog.yaml
@@ -134,3 +134,18 @@ versions:
       - Coloured settings section navigation tiles by domain so Statuses, Priorities, Categories, Teams, Projects, Boards, Workflow, SLA, Tags, Products and Defaults are visually distinct.
       - Coloured save, reset, edit, delete, settings, ticket, Kanban, reply and update action buttons consistently.
       - Kept module.json version in sync with changelog.yaml.
+
+
+  "1.3.0":
+    changed:
+      - Fixed malformed Helpdesk settings action buttons that caused Blade parse errors.
+      - Applied explicit coloured action buttons across settings tables, settings forms and Kanban board configuration actions.
+      - Kept module.json version in sync with changelog.yaml.
+
+
+  "1.3.1":
+    changed:
+      - Replaced malformed Flux settings action buttons with native coloured buttons to fix Blade parse errors and white edit/delete actions.
+      - Added coloured Helpdesk settings header actions for Tickets, + New Ticket and Kanban.
+      - Standardised support edit actions as blue and destructive actions as red.
+      - Kept module.json version in sync with changelog.yaml.
diff --git a/Modules/Helpdesk/module.json b/Modules/Helpdesk/module.json
index 56219f94..e9db97dd 100644
--- a/Modules/Helpdesk/module.json
+++ b/Modules/Helpdesk/module.json
@@ -22,5 +22,5 @@
         "Modules\\Helpdesk\\Providers\\HelpdeskServiceProvider"
     ],
     "files": [],
-    "version": "1.2.9"
+    "version": "1.3.1"
 }