diff --git a/Modules/Helpdesk/Resources/views/components/layouts/app.blade.php b/Modules/Helpdesk/Resources/views/components/layouts/app.blade.php
index ba964fc2..9eaad997 100644
--- a/Modules/Helpdesk/Resources/views/components/layouts/app.blade.php
+++ b/Modules/Helpdesk/Resources/views/components/layouts/app.blade.php
@@ -398,23 +398,21 @@
 
             @if($helpdeskEnabled || $documentationEnabled)
                 <div class="wms-sidebar-group" data-wms-menu-group="support">
-                    @if(Route::has('helpdesk.index'))
-                        <a href="{{ route('helpdesk.index') }}" wire:navigate class="wms-sidebar-heading wms-sidebar-heading-button" data-wms-sidebar-label title="{{ __('Support') }}">
-                            <span class="wms-sidebar-heading-content">
-                                <i class="fa-solid fa-headset wms-sidebar-icon" aria-hidden="true"></i>
-                                <span>{{ __('Support') }}</span>
-                            </span>
-                        </a>
-                    @else
-                        <button type="button" class="wms-sidebar-heading wms-sidebar-heading-button" data-wms-menu-toggle data-wms-sidebar-label aria-expanded="false">
-                            <span class="wms-sidebar-heading-content">
-                                <i class="fa-solid fa-headset wms-sidebar-icon" aria-hidden="true"></i>
-                                <span>{{ __('Support') }}</span>
-                            </span>
-                        </button>
-                    @endif
+                    <button type="button" class="wms-sidebar-heading wms-sidebar-heading-button" data-wms-menu-toggle data-wms-sidebar-label aria-expanded="true">
+                        <span class="wms-sidebar-heading-content">
+                            <i class="fa-solid fa-headset wms-sidebar-icon" aria-hidden="true"></i>
+                            <span>{{ __('Support') }}</span>
+                        </span>
+                    </button>
+
+                    <div class="wms-sidebar-group-items" data-wms-menu-items>
+                        @if(Route::has('helpdesk.index'))
+                            <a href="{{ route('helpdesk.index') }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('helpdesk.index')) is-active @endif" title="{{ __('Helpdesk Dashboard') }}">
+                                <i class="fa-solid fa-headset wms-sidebar-icon" aria-hidden="true"></i>
+                                <span data-wms-sidebar-label>{{ __('Dashboard') }}</span>
+                            </a>
+                        @endif
 
-                    <div class="wms-sidebar-group-items mt-2 space-y-1" data-wms-menu-items>
                         @if(Route::has('helpdesk.tickets.index'))
                             <a href="{{ route('helpdesk.tickets.index') }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('helpdesk.tickets.index') || request()->routeIs('helpdesk.tickets.show') || request()->routeIs('helpdesk.tickets.edit')) is-active @endif" title="{{ __('Tickets') }}">
                                 <i class="fa-solid fa-ticket wms-sidebar-icon" aria-hidden="true"></i>
@@ -422,6 +420,13 @@
                             </a>
                         @endif
 
+                        @if(Route::has('helpdesk.tickets.create'))
+                            <a href="{{ route('helpdesk.tickets.create') }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('helpdesk.tickets.create')) is-active @endif" title="{{ __('Raise Ticket') }}">
+                                <i class="fa-solid fa-circle-plus wms-sidebar-icon" aria-hidden="true"></i>
+                                <span data-wms-sidebar-label>{{ __('Raise Ticket') }}</span>
+                            </a>
+                        @endif
+
                         @if($helpdeskKanbanRoute)
                             <a href="{{ route($helpdeskKanbanRoute) }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('helpdesk.kanban') || request()->routeIs('helpdesk.kanban.index')) is-active @endif" title="{{ __('Kanban') }}">
                                 <i class="fa-solid fa-table-columns wms-sidebar-icon" aria-hidden="true"></i>
@@ -460,7 +465,6 @@
                 </div>
             @endif
 
-
             <div class="wms-sidebar-group" data-wms-menu-group="integration-reporting">
                 <button type="button" class="wms-sidebar-heading wms-sidebar-heading-button" data-wms-menu-toggle data-wms-sidebar-label aria-expanded="true">
                     <span class="wms-sidebar-heading-content">
@@ -600,75 +604,6 @@
                 </div>
             @endif
         </nav>
-
-        <div class="wms-sidebar-footer">
-            <flux:dropdown position="top" align="start">
-                <button type="button" class="wms-user-card wms-user-card-button" data-wms-sidebar-label>
-                    <div class="wms-user-avatar">{{ auth()->user()?->initials() ?? 'U' }}</div>
-
-                    <div class="wms-user-copy">
-                        <div class="wms-user-name">{{ auth()->user()?->name ?? __('User') }}</div>
-                        <div class="wms-user-email">{{ auth()->user()?->email ?? '' }}</div>
-                    </div>
-
-                    <i class="fa-solid fa-chevron-up wms-user-chevron" aria-hidden="true"></i>
-                </button>
-
-                <flux:menu>
-                    <flux:menu.radio.group>
-                        <div class="p-0 text-sm font-normal">
-                            <div class="flex items-center gap-2 px-1 py-1.5 text-start text-sm">
-                                <flux:avatar :name="auth()->user()?->name ?? 'User'" :initials="auth()->user()?->initials() ?? 'U'" />
-
-                                <div class="grid flex-1 text-start text-sm leading-tight">
-                                    <flux:heading class="truncate">{{ auth()->user()?->name ?? __('User') }}</flux:heading>
-                                    <flux:text class="truncate">{{ auth()->user()?->email ?? '' }}</flux:text>
-                                </div>
-                            </div>
-                        </div>
-                    </flux:menu.radio.group>
-
-                    <flux:menu.separator />
-
-                    <flux:menu.item :href="route('profile.edit')" icon="cog" wire:navigate>
-                        {{ __('Settings') }}
-                    </flux:menu.item>
-
-                    <flux:menu.separator />
-
-                    <form method="POST" action="{{ route('logout') }}" class="w-full">
-                        @csrf
-
-                        <flux:menu.item as="button" type="submit" icon="arrow-right-start-on-rectangle" class="w-full cursor-pointer" data-test="logout-button">
-                            {{ __('Log out') }}
-                        </flux:menu.item>
-                    </form>
-                </flux:menu>
-            </flux:dropdown>
-
-            <flux:dropdown position="top" align="start">
-                <button type="button" class="wms-user-rail-button" title="{{ __('Account') }}">
-                    {{ auth()->user()?->initials() ?? 'U' }}
-                </button>
-
-                <flux:menu>
-                    <flux:menu.item :href="route('profile.edit')" icon="cog" wire:navigate>
-                        {{ __('Settings') }}
-                    </flux:menu.item>
-
-                    <flux:menu.separator />
-
-                    <form method="POST" action="{{ route('logout') }}" class="w-full">
-                        @csrf
-
-                        <flux:menu.item as="button" type="submit" icon="arrow-right-start-on-rectangle" class="w-full cursor-pointer">
-                            {{ __('Log out') }}
-                        </flux:menu.item>
-                    </form>
-                </flux:menu>
-            </flux:dropdown>
-        </div>
-
         <button
             type="button"
             class="wms-sidebar-resizer"
@@ -679,17 +614,7 @@
     </aside>
 
     <div class="wms-main-panel">
-        <header class="wms-mobile-header" role="banner">
-            <button type="button" class="wms-mobile-menu" data-wms-mobile-open aria-label="{{ __('Open navigation menu') }}" aria-controls="wms-main-sidebar" aria-expanded="false">
-                <i class="fa-solid fa-bars" aria-hidden="true"></i>
-            </button>
-
-            <a href="{{ auth()->user()?->isMpbaPlatformAdmin() && Route::has('platform.dashboard') ? route('platform.dashboard') : route('dashboard') }}" wire:navigate class="wms-mobile-title">
-                {{ __('Warehouse Management System') }}
-            </a>
-
-            <span class="wms-mobile-badge">MPBA</span>
-        </header>
+        @include("layouts.partials.topbar")
 
         <main class="wms-content">
             {{ $slot }}
diff --git a/Modules/Helpdesk/Resources/views/index.blade.php b/Modules/Helpdesk/Resources/views/index.blade.php
index 85d49a16..c4d7263a 100644
--- a/Modules/Helpdesk/Resources/views/index.blade.php
+++ b/Modules/Helpdesk/Resources/views/index.blade.php
@@ -147,7 +147,7 @@
                         <div class="mt-5 flex flex-wrap gap-2">
                             <a href="{{ route('helpdesk.tickets.create') }}" wire:navigate class="hd-btn hd-btn-green">
                                 <i class="fa-solid fa-plus" aria-hidden="true"></i>
-                                <span>New Ticket</span>
+                                <span>+ New Ticket</span>
                             </a>
                             <a href="{{ route('helpdesk.tickets.index') }}" wire:navigate class="hd-btn hd-btn-blue">
                                 <i class="fa-solid fa-ticket" aria-hidden="true"></i>
diff --git a/Modules/Helpdesk/Resources/views/layouts/app/sidebar.blade.php b/Modules/Helpdesk/Resources/views/layouts/app/sidebar.blade.php
index 263de754..d67a712e 100644
--- a/Modules/Helpdesk/Resources/views/layouts/app/sidebar.blade.php
+++ b/Modules/Helpdesk/Resources/views/layouts/app/sidebar.blade.php
@@ -398,23 +398,21 @@
 
             @if($helpdeskEnabled || $documentationEnabled)
                 <div class="wms-sidebar-group" data-wms-menu-group="support">
-                    @if(Route::has('helpdesk.index'))
-                        <a href="{{ route('helpdesk.index') }}" wire:navigate class="wms-sidebar-heading wms-sidebar-heading-button" data-wms-sidebar-label title="{{ __('Support') }}">
-                            <span class="wms-sidebar-heading-content">
-                                <i class="fa-solid fa-headset wms-sidebar-icon" aria-hidden="true"></i>
-                                <span>{{ __('Support') }}</span>
-                            </span>
-                        </a>
-                    @else
-                        <button type="button" class="wms-sidebar-heading wms-sidebar-heading-button" data-wms-menu-toggle data-wms-sidebar-label aria-expanded="false">
-                            <span class="wms-sidebar-heading-content">
-                                <i class="fa-solid fa-headset wms-sidebar-icon" aria-hidden="true"></i>
-                                <span>{{ __('Support') }}</span>
-                            </span>
-                        </button>
-                    @endif
+                    <button type="button" class="wms-sidebar-heading wms-sidebar-heading-button" data-wms-menu-toggle data-wms-sidebar-label aria-expanded="true">
+                        <span class="wms-sidebar-heading-content">
+                            <i class="fa-solid fa-headset wms-sidebar-icon" aria-hidden="true"></i>
+                            <span>{{ __('Support') }}</span>
+                        </span>
+                    </button>
+
+                    <div class="wms-sidebar-group-items" data-wms-menu-items>
+                        @if(Route::has('helpdesk.index'))
+                            <a href="{{ route('helpdesk.index') }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('helpdesk.index')) is-active @endif" title="{{ __('Helpdesk Dashboard') }}">
+                                <i class="fa-solid fa-headset wms-sidebar-icon" aria-hidden="true"></i>
+                                <span data-wms-sidebar-label>{{ __('Dashboard') }}</span>
+                            </a>
+                        @endif
 
-                    <div class="wms-sidebar-group-items mt-2 space-y-1" data-wms-menu-items>
                         @if(Route::has('helpdesk.tickets.index'))
                             <a href="{{ route('helpdesk.tickets.index') }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('helpdesk.tickets.index') || request()->routeIs('helpdesk.tickets.show') || request()->routeIs('helpdesk.tickets.edit')) is-active @endif" title="{{ __('Tickets') }}">
                                 <i class="fa-solid fa-ticket wms-sidebar-icon" aria-hidden="true"></i>
@@ -422,6 +420,13 @@
                             </a>
                         @endif
 
+                        @if(Route::has('helpdesk.tickets.create'))
+                            <a href="{{ route('helpdesk.tickets.create') }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('helpdesk.tickets.create')) is-active @endif" title="{{ __('Raise Ticket') }}">
+                                <i class="fa-solid fa-circle-plus wms-sidebar-icon" aria-hidden="true"></i>
+                                <span data-wms-sidebar-label>{{ __('Raise Ticket') }}</span>
+                            </a>
+                        @endif
+
                         @if($helpdeskKanbanRoute)
                             <a href="{{ route($helpdeskKanbanRoute) }}" wire:navigate class="wms-sidebar-link @if(request()->routeIs('helpdesk.kanban') || request()->routeIs('helpdesk.kanban.index')) is-active @endif" title="{{ __('Kanban') }}">
                                 <i class="fa-solid fa-table-columns wms-sidebar-icon" aria-hidden="true"></i>
@@ -460,7 +465,6 @@
                 </div>
             @endif
 
-
             <div class="wms-sidebar-group" data-wms-menu-group="integration-reporting">
                 <button type="button" class="wms-sidebar-heading wms-sidebar-heading-button" data-wms-menu-toggle data-wms-sidebar-label aria-expanded="true">
                     <span class="wms-sidebar-heading-content">
@@ -594,75 +598,6 @@
                 </div>
             @endif
         </nav>
-
-        <div class="wms-sidebar-footer">
-            <flux:dropdown position="top" align="start">
-                <button type="button" class="wms-user-card wms-user-card-button" data-wms-sidebar-label>
-                    <div class="wms-user-avatar">{{ auth()->user()?->initials() ?? 'U' }}</div>
-
-                    <div class="wms-user-copy">
-                        <div class="wms-user-name">{{ auth()->user()?->name ?? __('User') }}</div>
-                        <div class="wms-user-email">{{ auth()->user()?->email ?? '' }}</div>
-                    </div>
-
-                    <i class="fa-solid fa-chevron-up wms-user-chevron" aria-hidden="true"></i>
-                </button>
-
-                <flux:menu>
-                    <flux:menu.radio.group>
-                        <div class="p-0 text-sm font-normal">
-                            <div class="flex items-center gap-2 px-1 py-1.5 text-start text-sm">
-                                <flux:avatar :name="auth()->user()?->name ?? 'User'" :initials="auth()->user()?->initials() ?? 'U'" />
-
-                                <div class="grid flex-1 text-start text-sm leading-tight">
-                                    <flux:heading class="truncate">{{ auth()->user()?->name ?? __('User') }}</flux:heading>
-                                    <flux:text class="truncate">{{ auth()->user()?->email ?? '' }}</flux:text>
-                                </div>
-                            </div>
-                        </div>
-                    </flux:menu.radio.group>
-
-                    <flux:menu.separator />
-
-                    <flux:menu.item :href="route('profile.edit')" icon="cog" wire:navigate>
-                        {{ __('Settings') }}
-                    </flux:menu.item>
-
-                    <flux:menu.separator />
-
-                    <form method="POST" action="{{ route('logout') }}" class="w-full">
-                        @csrf
-
-                        <flux:menu.item as="button" type="submit" icon="arrow-right-start-on-rectangle" class="w-full cursor-pointer" data-test="logout-button">
-                            {{ __('Log out') }}
-                        </flux:menu.item>
-                    </form>
-                </flux:menu>
-            </flux:dropdown>
-
-            <flux:dropdown position="top" align="start">
-                <button type="button" class="wms-user-rail-button" title="{{ __('Account') }}">
-                    {{ auth()->user()?->initials() ?? 'U' }}
-                </button>
-
-                <flux:menu>
-                    <flux:menu.item :href="route('profile.edit')" icon="cog" wire:navigate>
-                        {{ __('Settings') }}
-                    </flux:menu.item>
-
-                    <flux:menu.separator />
-
-                    <form method="POST" action="{{ route('logout') }}" class="w-full">
-                        @csrf
-
-                        <flux:menu.item as="button" type="submit" icon="arrow-right-start-on-rectangle" class="w-full cursor-pointer">
-                            {{ __('Log out') }}
-                        </flux:menu.item>
-                    </form>
-                </flux:menu>
-            </flux:dropdown>
-        </div>
-
         <button
             type="button"
             class="wms-sidebar-resizer"
@@ -673,17 +608,7 @@
     </aside>
 
     <div class="wms-main-panel">
-        <header class="wms-mobile-header" role="banner">
-            <button type="button" class="wms-mobile-menu" data-wms-mobile-open aria-label="{{ __('Open navigation menu') }}" aria-controls="wms-main-sidebar" aria-expanded="false">
-                <i class="fa-solid fa-bars" aria-hidden="true"></i>
-            </button>
-
-            <a href="{{ auth()->user()?->isMpbaPlatformAdmin() && Route::has('platform.dashboard') ? route('platform.dashboard') : route('dashboard') }}" wire:navigate class="wms-mobile-title">
-                {{ __('Warehouse Management System') }}
-            </a>
-
-            <span class="wms-mobile-badge">MPBA</span>
-        </header>
+        @include("layouts.partials.topbar")
 
         <main class="wms-content">
             {{ $slot }}
diff --git a/Modules/Helpdesk/Resources/views/layouts/partials/topbar.blade.php b/Modules/Helpdesk/Resources/views/layouts/partials/topbar.blade.php
new file mode 100644
index 00000000..5bdd7bdc
--- /dev/null
+++ b/Modules/Helpdesk/Resources/views/layouts/partials/topbar.blade.php
@@ -0,0 +1,106 @@
+@php
+    $user = auth()->user();
+    $dashboardRoute = Route::has('platform.dashboard') && method_exists($user, 'isMpbaPlatformAdmin') && $user?->isMpbaPlatformAdmin()
+        ? 'platform.dashboard'
+        : (Route::has('dashboard') ? 'dashboard' : null);
+@endphp
+
+<header class="sticky top-0 z-40 border-b border-white/10 bg-[#111118]/95 backdrop-blur" role="banner">
+    <div class="flex h-16 items-center justify-between px-4 lg:px-6">
+        <div class="flex min-w-0 items-center gap-3">
+            <button
+                type="button"
+                class="inline-flex h-10 w-10 items-center justify-center rounded-xl border border-white/10 bg-white/5 text-white lg:hidden"
+                data-wms-mobile-open
+                aria-label="{{ __('Open navigation menu') }}"
+                aria-controls="wms-main-sidebar"
+                aria-expanded="false"
+            >
+                <i class="fa-solid fa-bars" aria-hidden="true"></i>
+            </button>
+
+            <a
+                href="{{ $dashboardRoute ? route($dashboardRoute) : '#' }}"
+                wire:navigate
+                class="flex min-w-0 items-center gap-3"
+                aria-label="{{ __('Warehouse Management System') }}"
+            >
+                <span class="flex h-10 w-10 shrink-0 items-center justify-center rounded-xl bg-cyan-600 text-sm font-bold text-white shadow-lg shadow-cyan-950/40">
+                    W
+                </span>
+
+                <span class="min-w-0">
+                    <span class="block truncate text-sm font-semibold text-white sm:text-base">
+                        {{ __('Warehouse Management System') }}
+                    </span>
+                    <span class="block text-xs font-semibold uppercase tracking-wide text-cyan-400">
+                        MPBA
+                    </span>
+                </span>
+            </a>
+        </div>
+
+        <div class="relative flex shrink-0 items-center gap-3" x-data="{ open: false }" x-on:keydown.escape.window="open = false">
+            <button
+                type="button"
+                class="flex items-center gap-3 rounded-2xl border border-white/10 bg-white/5 px-3 py-2 text-left transition hover:bg-white/10 focus:outline-none focus:ring-2 focus:ring-blue-400 focus:ring-offset-2 focus:ring-offset-[#111118]"
+                x-on:click="open = ! open"
+                x-bind:aria-expanded="open.toString()"
+                aria-haspopup="menu"
+                data-test="top-user-menu-button"
+            >
+                <span class="hidden text-right sm:block">
+                    <span class="block text-sm font-semibold text-white">{{ $user?->name ?? __('User') }}</span>
+                    <span class="block text-xs text-white/50">{{ $user?->email ?? '' }}</span>
+                </span>
+
+                <span class="flex h-10 w-10 items-center justify-center rounded-full bg-blue-700 text-xs font-bold text-white shadow-lg shadow-blue-950/40">
+                    {{ $user?->initials() ?? 'U' }}
+                </span>
+
+                <i class="fa-solid fa-chevron-down hidden text-white/50 sm:block" aria-hidden="true"></i>
+            </button>
+
+            <div
+                x-cloak
+                x-show="open"
+                x-transition.origin.top.right
+                x-on:click.outside="open = false"
+                class="absolute right-0 top-full mt-2 w-72 overflow-hidden rounded-2xl border border-white/10 bg-[#181820] shadow-2xl shadow-black/40"
+                role="menu"
+            >
+                <div class="border-b border-white/10 px-4 py-3">
+                    <div class="text-sm font-semibold text-white">{{ $user?->name ?? __('User') }}</div>
+                    <div class="truncate text-xs text-white/50">{{ $user?->email ?? '' }}</div>
+                </div>
+
+                <div class="p-2">
+                    @if($dashboardRoute)
+                        <a href="{{ route($dashboardRoute) }}" wire:navigate class="block rounded-xl px-3 py-2 text-sm text-white/80 hover:bg-white/10 hover:text-white" role="menuitem">
+                            {{ __('Dashboard') }}
+                        </a>
+                    @endif
+
+                    @if(Route::has('profile.edit'))
+                        <a href="{{ route('profile.edit') }}" wire:navigate class="block rounded-xl px-3 py-2 text-sm text-white/80 hover:bg-white/10 hover:text-white" role="menuitem">
+                            {{ __('Profile') }}
+                        </a>
+                    @endif
+
+                    @if(Route::has('settings.index'))
+                        <a href="{{ route('settings.index') }}" wire:navigate class="block rounded-xl px-3 py-2 text-sm text-white/80 hover:bg-white/10 hover:text-white" role="menuitem">
+                            {{ __('Settings') }}
+                        </a>
+                    @endif
+
+                    <form method="POST" action="{{ route('logout') }}" class="mt-2 border-t border-white/10 pt-2">
+                        @csrf
+                        <button type="submit" class="w-full rounded-xl px-3 py-2 text-left text-sm text-red-300 hover:bg-red-500/10 hover:text-red-200" role="menuitem" data-test="logout-button">
+                            {{ __('Sign out') }}
+                        </button>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+</header>
diff --git a/Modules/Helpdesk/Resources/views/livewire/kanban-board.blade.php b/Modules/Helpdesk/Resources/views/livewire/kanban-board.blade.php
index 34121b01..acef2684 100644
--- a/Modules/Helpdesk/Resources/views/livewire/kanban-board.blade.php
+++ b/Modules/Helpdesk/Resources/views/livewire/kanban-board.blade.php
@@ -212,7 +212,7 @@
                 <div class="flex flex-wrap gap-2">
                     <a href="{{ route('helpdesk.tickets.create') }}" wire:navigate class="hd-btn hd-btn-green">
                         <i class="fa-solid fa-plus" aria-hidden="true"></i>
-                        <span>New Ticket</span>
+                        <span>+ New Ticket</span>
                     </a>
                     <a href="{{ route('helpdesk.settings') }}" wire:navigate class="hd-btn hd-btn-amber">
                         <i class="fa-solid fa-gear" aria-hidden="true"></i>
diff --git a/Modules/Helpdesk/Resources/views/livewire/settings-manager.blade.php b/Modules/Helpdesk/Resources/views/livewire/settings-manager.blade.php
index 340cd3a0..99421e0f 100644
--- a/Modules/Helpdesk/Resources/views/livewire/settings-manager.blade.php
+++ b/Modules/Helpdesk/Resources/views/livewire/settings-manager.blade.php
@@ -179,7 +179,7 @@
                     </a>
                     <a href="{{ route('helpdesk.tickets.create') }}" wire:navigate class="hd-btn hd-btn-green">
                         <i class="fa-solid fa-plus" aria-hidden="true"></i>
-                        <span>New Ticket</span>
+                        <span>+ New Ticket</span>
                     </a>
                     <a href="{{ route('helpdesk.kanban') }}" wire:navigate class="hd-btn hd-btn-amber">
                         <i class="fa-solid fa-table-columns" aria-hidden="true"></i>
diff --git a/Modules/Helpdesk/Resources/views/livewire/ticket-index.blade.php b/Modules/Helpdesk/Resources/views/livewire/ticket-index.blade.php
index 2cea2289..408acddb 100644
--- a/Modules/Helpdesk/Resources/views/livewire/ticket-index.blade.php
+++ b/Modules/Helpdesk/Resources/views/livewire/ticket-index.blade.php
@@ -152,7 +152,7 @@
                     </a>
                     <a href="{{ route('helpdesk.tickets.create') }}" wire:navigate class="hd-btn hd-btn-green">
                         <i class="fa-solid fa-plus" aria-hidden="true"></i>
-                        <span>New Ticket</span>
+                        <span>+ New Ticket</span>
                     </a>
                 </div>
             </div>
diff --git a/Modules/Helpdesk/changelog.yaml b/Modules/Helpdesk/changelog.yaml
index a81609fa..8ead24dc 100644
--- a/Modules/Helpdesk/changelog.yaml
+++ b/Modules/Helpdesk/changelog.yaml
@@ -371,12 +371,3 @@ versions:
     - Reworked Kanban drag/drop refresh to move the card in the browser immediately, update visible column counts, and then force a Livewire refresh after the database move completes.
     - Added a browser reload fallback for Kanban moves if Livewire does not expose a refresh method after drag/drop.
     - Kept module.json version in sync with changelog.yaml.
-
-- version: 1.9.24
-  date: 2026-06-17
-  changed:
-    - Reworked the Support sidebar heading so it links directly to the Helpdesk dashboard while keeping child support links properly spaced.
-    - Removed the Helpdesk Dashboard and Raise Ticket child menu entries from the Support sidebar flow.
-    - Restored the Helpdesk Settings entry under Support.
-    - Removed the duplicated plus character from New Ticket buttons across Helpdesk screens.
-    - Kept module.json version in sync with changelog.yaml.
diff --git a/Modules/Helpdesk/module.json b/Modules/Helpdesk/module.json
index e1a97b1a..e483c90c 100644
--- a/Modules/Helpdesk/module.json
+++ b/Modules/Helpdesk/module.json
@@ -22,5 +22,5 @@
         "Modules\\Helpdesk\\Providers\\HelpdeskServiceProvider"
     ],
     "files": [],
-    "version": "1.9.24"
+    "version": "1.9.23"
 }
diff --git a/resources/views/components/layouts/app.blade.php b/resources/views/components/layouts/app.blade.php
index 072220cd..eb2dd97e 100644
--- a/resources/views/components/layouts/app.blade.php
+++ b/resources/views/components/layouts/app.blade.php
@@ -458,7 +458,6 @@
                 </div>
             @endif
 
-
             <div class="wms-sidebar-group" data-wms-menu-group="integration-reporting">
                 <button type="button" class="wms-sidebar-heading wms-sidebar-heading-button" data-wms-menu-toggle data-wms-sidebar-label aria-expanded="false">
                     <span class="wms-sidebar-heading-content">
@@ -598,75 +597,6 @@
                 </div>
             @endif
         </nav>
-
-        <div class="wms-sidebar-footer">
-            <flux:dropdown position="top" align="start">
-                <button type="button" class="wms-user-card wms-user-card-button" data-wms-sidebar-label>
-                    <div class="wms-user-avatar">{{ auth()->user()?->initials() ?? 'U' }}</div>
-
-                    <div class="wms-user-copy">
-                        <div class="wms-user-name">{{ auth()->user()?->name ?? __('User') }}</div>
-                        <div class="wms-user-email">{{ auth()->user()?->email ?? '' }}</div>
-                    </div>
-
-                    <i class="fa-solid fa-chevron-up wms-user-chevron" aria-hidden="true"></i>
-                </button>
-
-                <flux:menu>
-                    <flux:menu.radio.group>
-                        <div class="p-0 text-sm font-normal">
-                            <div class="flex items-center gap-2 px-1 py-1.5 text-start text-sm">
-                                <flux:avatar :name="auth()->user()?->name ?? 'User'" :initials="auth()->user()?->initials() ?? 'U'" />
-
-                                <div class="grid flex-1 text-start text-sm leading-tight">
-                                    <flux:heading class="truncate">{{ auth()->user()?->name ?? __('User') }}</flux:heading>
-                                    <flux:text class="truncate">{{ auth()->user()?->email ?? '' }}</flux:text>
-                                </div>
-                            </div>
-                        </div>
-                    </flux:menu.radio.group>
-
-                    <flux:menu.separator />
-
-                    <flux:menu.item :href="route('profile.edit')" icon="cog" wire:navigate>
-                        {{ __('Settings') }}
-                    </flux:menu.item>
-
-                    <flux:menu.separator />
-
-                    <form method="POST" action="{{ route('logout') }}" class="w-full">
-                        @csrf
-
-                        <flux:menu.item as="button" type="submit" icon="arrow-right-start-on-rectangle" class="w-full cursor-pointer" data-test="logout-button">
-                            {{ __('Log out') }}
-                        </flux:menu.item>
-                    </form>
-                </flux:menu>
-            </flux:dropdown>
-
-            <flux:dropdown position="top" align="start">
-                <button type="button" class="wms-user-rail-button" title="{{ __('Account') }}">
-                    {{ auth()->user()?->initials() ?? 'U' }}
-                </button>
-
-                <flux:menu>
-                    <flux:menu.item :href="route('profile.edit')" icon="cog" wire:navigate>
-                        {{ __('Settings') }}
-                    </flux:menu.item>
-
-                    <flux:menu.separator />
-
-                    <form method="POST" action="{{ route('logout') }}" class="w-full">
-                        @csrf
-
-                        <flux:menu.item as="button" type="submit" icon="arrow-right-start-on-rectangle" class="w-full cursor-pointer">
-                            {{ __('Log out') }}
-                        </flux:menu.item>
-                    </form>
-                </flux:menu>
-            </flux:dropdown>
-        </div>
-
         <button
             type="button"
             class="wms-sidebar-resizer"
@@ -677,17 +607,7 @@
     </aside>
 
     <div class="wms-main-panel">
-        <header class="wms-mobile-header" role="banner">
-            <button type="button" class="wms-mobile-menu" data-wms-mobile-open aria-label="{{ __('Open navigation menu') }}" aria-controls="wms-main-sidebar" aria-expanded="false">
-                <i class="fa-solid fa-bars" aria-hidden="true"></i>
-            </button>
-
-            <a href="{{ auth()->user()?->isMpbaPlatformAdmin() && Route::has('platform.dashboard') ? route('platform.dashboard') : route('dashboard') }}" wire:navigate class="wms-mobile-title">
-                {{ __('Warehouse Management System') }}
-            </a>
-
-            <span class="wms-mobile-badge">MPBA</span>
-        </header>
+        @include("layouts.partials.topbar")
 
         <main class="wms-content">
             {{ $slot }}
diff --git a/resources/views/layouts/app/sidebar.blade.php b/resources/views/layouts/app/sidebar.blade.php
index 39080fc8..335b635f 100644
--- a/resources/views/layouts/app/sidebar.blade.php
+++ b/resources/views/layouts/app/sidebar.blade.php
@@ -458,7 +458,6 @@
                 </div>
             @endif
 
-
             <div class="wms-sidebar-group" data-wms-menu-group="integration-reporting">
                 <button type="button" class="wms-sidebar-heading wms-sidebar-heading-button" data-wms-menu-toggle data-wms-sidebar-label aria-expanded="false">
                     <span class="wms-sidebar-heading-content">
@@ -592,75 +591,6 @@
                 </div>
             @endif
         </nav>
-
-        <div class="wms-sidebar-footer">
-            <flux:dropdown position="top" align="start">
-                <button type="button" class="wms-user-card wms-user-card-button" data-wms-sidebar-label>
-                    <div class="wms-user-avatar">{{ auth()->user()?->initials() ?? 'U' }}</div>
-
-                    <div class="wms-user-copy">
-                        <div class="wms-user-name">{{ auth()->user()?->name ?? __('User') }}</div>
-                        <div class="wms-user-email">{{ auth()->user()?->email ?? '' }}</div>
-                    </div>
-
-                    <i class="fa-solid fa-chevron-up wms-user-chevron" aria-hidden="true"></i>
-                </button>
-
-                <flux:menu>
-                    <flux:menu.radio.group>
-                        <div class="p-0 text-sm font-normal">
-                            <div class="flex items-center gap-2 px-1 py-1.5 text-start text-sm">
-                                <flux:avatar :name="auth()->user()?->name ?? 'User'" :initials="auth()->user()?->initials() ?? 'U'" />
-
-                                <div class="grid flex-1 text-start text-sm leading-tight">
-                                    <flux:heading class="truncate">{{ auth()->user()?->name ?? __('User') }}</flux:heading>
-                                    <flux:text class="truncate">{{ auth()->user()?->email ?? '' }}</flux:text>
-                                </div>
-                            </div>
-                        </div>
-                    </flux:menu.radio.group>
-
-                    <flux:menu.separator />
-
-                    <flux:menu.item :href="route('profile.edit')" icon="cog" wire:navigate>
-                        {{ __('Settings') }}
-                    </flux:menu.item>
-
-                    <flux:menu.separator />
-
-                    <form method="POST" action="{{ route('logout') }}" class="w-full">
-                        @csrf
-
-                        <flux:menu.item as="button" type="submit" icon="arrow-right-start-on-rectangle" class="w-full cursor-pointer" data-test="logout-button">
-                            {{ __('Log out') }}
-                        </flux:menu.item>
-                    </form>
-                </flux:menu>
-            </flux:dropdown>
-
-            <flux:dropdown position="top" align="start">
-                <button type="button" class="wms-user-rail-button" title="{{ __('Account') }}">
-                    {{ auth()->user()?->initials() ?? 'U' }}
-                </button>
-
-                <flux:menu>
-                    <flux:menu.item :href="route('profile.edit')" icon="cog" wire:navigate>
-                        {{ __('Settings') }}
-                    </flux:menu.item>
-
-                    <flux:menu.separator />
-
-                    <form method="POST" action="{{ route('logout') }}" class="w-full">
-                        @csrf
-
-                        <flux:menu.item as="button" type="submit" icon="arrow-right-start-on-rectangle" class="w-full cursor-pointer">
-                            {{ __('Log out') }}
-                        </flux:menu.item>
-                    </form>
-                </flux:menu>
-            </flux:dropdown>
-        </div>
-
         <button
             type="button"
             class="wms-sidebar-resizer"
@@ -671,17 +601,7 @@
     </aside>
 
     <div class="wms-main-panel">
-        <header class="wms-mobile-header" role="banner">
-            <button type="button" class="wms-mobile-menu" data-wms-mobile-open aria-label="{{ __('Open navigation menu') }}" aria-controls="wms-main-sidebar" aria-expanded="false">
-                <i class="fa-solid fa-bars" aria-hidden="true"></i>
-            </button>
-
-            <a href="{{ auth()->user()?->isMpbaPlatformAdmin() && Route::has('platform.dashboard') ? route('platform.dashboard') : route('dashboard') }}" wire:navigate class="wms-mobile-title">
-                {{ __('Warehouse Management System') }}
-            </a>
-
-            <span class="wms-mobile-badge">MPBA</span>
-        </header>
+        @include("layouts.partials.topbar")
 
         <main class="wms-content">
             {{ $slot }}
diff --git a/resources/views/layouts/partials/topbar.blade.php b/resources/views/layouts/partials/topbar.blade.php
new file mode 100644
index 00000000..5bdd7bdc
--- /dev/null
+++ b/resources/views/layouts/partials/topbar.blade.php
@@ -0,0 +1,106 @@
+@php
+    $user = auth()->user();
+    $dashboardRoute = Route::has('platform.dashboard') && method_exists($user, 'isMpbaPlatformAdmin') && $user?->isMpbaPlatformAdmin()
+        ? 'platform.dashboard'
+        : (Route::has('dashboard') ? 'dashboard' : null);
+@endphp
+
+<header class="sticky top-0 z-40 border-b border-white/10 bg-[#111118]/95 backdrop-blur" role="banner">
+    <div class="flex h-16 items-center justify-between px-4 lg:px-6">
+        <div class="flex min-w-0 items-center gap-3">
+            <button
+                type="button"
+                class="inline-flex h-10 w-10 items-center justify-center rounded-xl border border-white/10 bg-white/5 text-white lg:hidden"
+                data-wms-mobile-open
+                aria-label="{{ __('Open navigation menu') }}"
+                aria-controls="wms-main-sidebar"
+                aria-expanded="false"
+            >
+                <i class="fa-solid fa-bars" aria-hidden="true"></i>
+            </button>
+
+            <a
+                href="{{ $dashboardRoute ? route($dashboardRoute) : '#' }}"
+                wire:navigate
+                class="flex min-w-0 items-center gap-3"
+                aria-label="{{ __('Warehouse Management System') }}"
+            >
+                <span class="flex h-10 w-10 shrink-0 items-center justify-center rounded-xl bg-cyan-600 text-sm font-bold text-white shadow-lg shadow-cyan-950/40">
+                    W
+                </span>
+
+                <span class="min-w-0">
+                    <span class="block truncate text-sm font-semibold text-white sm:text-base">
+                        {{ __('Warehouse Management System') }}
+                    </span>
+                    <span class="block text-xs font-semibold uppercase tracking-wide text-cyan-400">
+                        MPBA
+                    </span>
+                </span>
+            </a>
+        </div>
+
+        <div class="relative flex shrink-0 items-center gap-3" x-data="{ open: false }" x-on:keydown.escape.window="open = false">
+            <button
+                type="button"
+                class="flex items-center gap-3 rounded-2xl border border-white/10 bg-white/5 px-3 py-2 text-left transition hover:bg-white/10 focus:outline-none focus:ring-2 focus:ring-blue-400 focus:ring-offset-2 focus:ring-offset-[#111118]"
+                x-on:click="open = ! open"
+                x-bind:aria-expanded="open.toString()"
+                aria-haspopup="menu"
+                data-test="top-user-menu-button"
+            >
+                <span class="hidden text-right sm:block">
+                    <span class="block text-sm font-semibold text-white">{{ $user?->name ?? __('User') }}</span>
+                    <span class="block text-xs text-white/50">{{ $user?->email ?? '' }}</span>
+                </span>
+
+                <span class="flex h-10 w-10 items-center justify-center rounded-full bg-blue-700 text-xs font-bold text-white shadow-lg shadow-blue-950/40">
+                    {{ $user?->initials() ?? 'U' }}
+                </span>
+
+                <i class="fa-solid fa-chevron-down hidden text-white/50 sm:block" aria-hidden="true"></i>
+            </button>
+
+            <div
+                x-cloak
+                x-show="open"
+                x-transition.origin.top.right
+                x-on:click.outside="open = false"
+                class="absolute right-0 top-full mt-2 w-72 overflow-hidden rounded-2xl border border-white/10 bg-[#181820] shadow-2xl shadow-black/40"
+                role="menu"
+            >
+                <div class="border-b border-white/10 px-4 py-3">
+                    <div class="text-sm font-semibold text-white">{{ $user?->name ?? __('User') }}</div>
+                    <div class="truncate text-xs text-white/50">{{ $user?->email ?? '' }}</div>
+                </div>
+
+                <div class="p-2">
+                    @if($dashboardRoute)
+                        <a href="{{ route($dashboardRoute) }}" wire:navigate class="block rounded-xl px-3 py-2 text-sm text-white/80 hover:bg-white/10 hover:text-white" role="menuitem">
+                            {{ __('Dashboard') }}
+                        </a>
+                    @endif
+
+                    @if(Route::has('profile.edit'))
+                        <a href="{{ route('profile.edit') }}" wire:navigate class="block rounded-xl px-3 py-2 text-sm text-white/80 hover:bg-white/10 hover:text-white" role="menuitem">
+                            {{ __('Profile') }}
+                        </a>
+                    @endif
+
+                    @if(Route::has('settings.index'))
+                        <a href="{{ route('settings.index') }}" wire:navigate class="block rounded-xl px-3 py-2 text-sm text-white/80 hover:bg-white/10 hover:text-white" role="menuitem">
+                            {{ __('Settings') }}
+                        </a>
+                    @endif
+
+                    <form method="POST" action="{{ route('logout') }}" class="mt-2 border-t border-white/10 pt-2">
+                        @csrf
+                        <button type="submit" class="w-full rounded-xl px-3 py-2 text-left text-sm text-red-300 hover:bg-red-500/10 hover:text-red-200" role="menuitem" data-test="logout-button">
+                            {{ __('Sign out') }}
+                        </button>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+</header>