diff --git a/resources/views/partials/mobile-bottom-nav.blade.php b/resources/views/partials/mobile-bottom-nav.blade.php
index 5fbdf50..a308a67 100644
--- a/resources/views/partials/mobile-bottom-nav.blade.php
+++ b/resources/views/partials/mobile-bottom-nav.blade.php
@@ -57,12 +57,14 @@
                        },
                    }"
                @endif
-               class="relative flex flex-col items-center justify-center gap-1 px-2 py-2 transition hover:text-slate-900 {{ $navActive($notificationsActive ?? false) }}">
-                <svg class="h-6 w-6" fill="none" stroke="currentColor" stroke-width="1.5" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" d="M14.857 17.082a23.848 23.848 0 0 0 5.454-1.31A8.967 8.967 0 0 1 18 9.75V9a6 6 0 1 0-12 0v.75a8.967 8.967 0 0 1-2.312 6.022c1.733.64 3.56 1.08 5.455 1.31m5.714 0a24.255 24.255 0 0 1-5.714 0m5.714 0a3 3 0 1 1-5.714 0"/></svg>
-                @if ($unreadUrl)
-                    <span x-show="unread > 0" x-cloak x-text="unread > 9 ? '9+' : unread"
-                          class="absolute right-3 top-1.5 inline-flex min-w-4 items-center justify-center rounded-full bg-rose-500 px-1 py-0.5 text-[9px] font-semibold text-white"></span>
-                @endif
+               class="flex flex-col items-center justify-center gap-1 px-2 py-2 transition hover:text-slate-900 {{ $navActive($notificationsActive ?? false) }}">
+                <span class="relative inline-flex shrink-0">
+                    <svg class="h-6 w-6" fill="none" stroke="currentColor" stroke-width="1.5" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" d="M14.857 17.082a23.848 23.848 0 0 0 5.454-1.31A8.967 8.967 0 0 1 18 9.75V9a6 6 0 1 0-12 0v.75a8.967 8.967 0 0 1-2.312 6.022c1.733.64 3.56 1.08 5.455 1.31m5.714 0a24.255 24.255 0 0 1-5.714 0m5.714 0a3 3 0 1 1-5.714 0"/></svg>
+                    @if ($unreadUrl)
+                        <span x-show="unread > 0" x-cloak x-text="unread > 9 ? '9+' : unread"
+                              class="absolute -right-1 -top-1 inline-flex min-w-5 items-center justify-center rounded-full bg-rose-500 px-1.5 py-0.5 text-[10px] font-semibold text-white"></span>
+                    @endif
+                </span>
                 <span class="text-[10px] font-medium">Notifications</span>
             </a>
 
diff --git a/resources/views/partials/mobile-icon-link.blade.php b/resources/views/partials/mobile-icon-link.blade.php
index b1a96c4..152c58f 100644
--- a/resources/views/partials/mobile-icon-link.blade.php
+++ b/resources/views/partials/mobile-icon-link.blade.php
@@ -2,14 +2,20 @@
     $icon = $icon ?? 'arrow';
     $desktopClass = $desktopClass ?? 'text-xs font-medium text-indigo-600 hover:text-indigo-700';
     $label = $label ?? '';
+    $extraAttributes = $attributes ?? '';
 @endphp
 
 <a href="{{ $href }}"
    aria-label="{{ $label }}"
    title="{{ $label }}"
+   @if ($extraAttributes !== '') {!! $extraAttributes !!} @endif
    class="inline-flex h-9 w-9 items-center justify-center rounded-full bg-indigo-50 text-indigo-600 ring-1 ring-indigo-100 transition hover:bg-indigo-100 lg:h-auto lg:w-auto lg:rounded-none lg:bg-transparent lg:ring-0 lg:hover:bg-transparent">
     <span class="lg:hidden">
-        @if ($icon === 'shield')
+        @if ($icon === 'plus')
+            <svg class="h-4 w-4" fill="none" stroke="currentColor" stroke-width="2" viewBox="0 0 24 24" aria-hidden="true">
+                <path stroke-linecap="round" stroke-linejoin="round" d="M12 4.5v15m7.5-7.5h-15"/>
+            </svg>
+        @elseif ($icon === 'shield')
             <svg class="h-4 w-4" fill="none" stroke="currentColor" stroke-width="2" viewBox="0 0 24 24" aria-hidden="true">
                 <path stroke-linecap="round" stroke-linejoin="round" d="M9 12.75 11.25 15 15 9.75m-3-7.036A11.959 11.959 0 0 1 3.598 6 11.99 11.99 0 0 0 3 9.749c0 5.592 3.824 10.29 9 11.623 5.176-1.332 9-6.03 9-11.622 0-1.31-.21-2.571-.598-3.751h-.152c-3.196 0-6.1-1.248-8.25-3.285Z"/>
             </svg>
diff --git a/resources/views/qms/dashboard.blade.php b/resources/views/qms/dashboard.blade.php
index 83cf951..b85a90c 100644
--- a/resources/views/qms/dashboard.blade.php
+++ b/resources/views/qms/dashboard.blade.php
@@ -59,12 +59,16 @@
     @endphp
 
     <div class="mb-6 flex items-center justify-between gap-3">
-        <div>
-            <h1 class="text-2xl font-semibold text-slate-900 dark:text-white">{{ $organization->name }}</h1>
-            <p class="mt-1 text-sm text-slate-600 dark:text-slate-400">Real-time queue operations overview</p>
+        <div class="min-w-0 flex-1">
+            <h1 class="truncate text-lg font-semibold text-slate-900 dark:text-white lg:text-2xl">{{ $organization->name }}</h1>
+            <p class="mt-1 hidden text-sm text-slate-600 dark:text-slate-400 sm:block">Real-time queue operations overview</p>
         </div>
         @if(auth()->user() && app(\App\Services\Qms\QmsPermissions::class)->can(app(\App\Services\Qms\OrganizationResolver::class)->memberFor(auth()->user()), 'queues.manage'))
-            <a href="{{ route('qms.queues.create') }}" class="btn-primary">New queue</a>
+            @include('partials.mobile-header-btn', [
+                'href' => route('qms.queues.create'),
+                'label' => 'New queue',
+                'variant' => 'primary',
+            ])
         @endif
     </div>