diff --git a/app/Helpers/SupportRun.php b/app/Helpers/SupportRun.php
index d3a2295..c869f9c 100644
--- a/app/Helpers/SupportRun.php
+++ b/app/Helpers/SupportRun.php
@@ -6,6 +6,7 @@
 
 use App\Models\Support\Category\SupportCategory;
 use App\Models\Support\SupportTicket;
+use App\Models\Support\SupportTicketMessage;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Facades\Auth;
@@ -32,10 +33,10 @@ public static function nextTicket(?int $category_id): ?SupportTicket
         if (! empty($category_id)) {
             if (
                 $category_id > 0 &&
-                ! empty($category = SupportCategory::byId($category_id)) &&
+                ! empty($category = SupportCategory::where('id', '=', $category_id)->first()) &&
                 $category->assignments->where('user_id', '=', Auth::id())
             ) {
-                return SupportTicket::where('category_id', '=', $category_id)
+                $tickets = SupportTicket::where('category_id', '=', $category->id)
                     ->where('status', '=', 'open')
                     ->whereDoesntHave('history', function (Builder $builder) {
                         return $builder->where('user_id', '=', Auth::id())
@@ -46,19 +47,15 @@ public static function nextTicket(?int $category_id): ?SupportTicket
                     ->whereDoesntHave('run', function (Builder $builder) {
                         return $builder->whereNull('ended_at');
                     })
-                    ->whereHas('messages', function (Builder $builder) {
-                        return $builder
-                            ->latest()
-                            ->whereHas('user', function (Builder $builder) {
-                                return $builder->where('role', '=', 'customer');
-                            });
-                    })
                     ->orderByDesc('escalated')
                     ->orderBy('hold')
                     ->orderBy('created_at')
-                    ->first();
+                    ->get();
             } elseif ($category_id === 0) {
-                return SupportTicket::where('category_id', '=', 0)
+                $tickets = SupportTicket::where(function (Builder $builder) {
+                    return $builder->where('category_id', '=', 0)
+                        ->orWhereNull('category_id');
+                })
                     ->where('status', '=', 'open')
                     ->whereDoesntHave('history', function (Builder $builder) {
                         return $builder->where('user_id', '=', Auth::id())
@@ -69,20 +66,13 @@ public static function nextTicket(?int $category_id): ?SupportTicket
                     ->whereDoesntHave('run', function (Builder $builder) {
                         return $builder->whereNull('ended_at');
                     })
-                    ->whereHas('messages', function (Builder $builder) {
-                        return $builder
-                            ->latest()
-                            ->whereHas('user', function (Builder $builder) {
-                                return $builder->where('role', '=', 'customer');
-                            });
-                    })
                     ->orderByDesc('escalated')
                     ->orderBy('hold')
                     ->orderBy('created_at')
-                    ->first();
+                    ->get();
             }
         } else {
-            return SupportTicket::where(function (Builder $builder) {
+            $tickets = SupportTicket::where(function (Builder $builder) {
                 return $builder->where('category_id', '=', 0)
                         ->orWhereNull('category_id')
                         ->orWhereHas('category', function (Builder $builder) {
@@ -101,19 +91,25 @@ public static function nextTicket(?int $category_id): ?SupportTicket
                 ->whereDoesntHave('run', function (Builder $builder) {
                     return $builder->whereNull('ended_at');
                 })
-                ->whereHas('messages', function (Builder $builder) {
-                    return $builder
-                        ->latest()
-                        ->whereHas('user', function (Builder $builder) {
-                            return $builder->where('role', '=', 'customer');
-                        });
-                })
                 ->orderByDesc('escalated')
                 ->orderBy('hold')
                 ->orderBy('created_at')
-                ->first();
+                ->get();
         }
 
-        return null;
+        if (empty($tickets)) {
+            return null;
+        }
+
+        return $tickets->filter(function (SupportTicket $ticket) {
+            $lastMessage = $ticket->messages->filter(function (SupportTicketMessage $message) {
+                return !$message->note;
+            })->last();
+
+            return !in_array($lastMessage->user?->role, [
+                'admin',
+                'employee',
+            ]);
+        })->first();
     }
 }
diff --git a/app/Http/Controllers/AdminSettingsController.php b/app/Http/Controllers/AdminSettingsController.php
index adeccce..ba5b779 100644
--- a/app/Http/Controllers/AdminSettingsController.php
+++ b/app/Http/Controllers/AdminSettingsController.php
@@ -82,7 +82,7 @@ public function settings_list(Request $request): JsonResponse
                 ->get()
                 ->transform(function (Setting $setting) {
                     $edit = '
-<a class="btn btn-warning btn-sm w-100" data-toggle="modal" data-target="#edit' . $setting->id . '" data-type="edit" data-category="' . $setting->id . '" data-table="#settings-' . $setting->id . '"><i class="bi bi-pencil-square"></i></a>
+<a class="btn btn-warning btn-sm" data-toggle="modal" data-target="#edit' . $setting->id . '" data-type="edit" data-category="' . $setting->id . '" data-table="#settings-' . $setting->id . '"><i class="bi bi-pencil-square"></i></a>
 <div class="modal fade" id="edit' . $setting->id . '" tabindex="-1" aria-labelledby="edit' . $setting->id . 'Label" aria-hidden="true">
     <div class="modal-dialog">
         <div class="modal-content">
diff --git a/app/Http/Controllers/AdminSupportController.php b/app/Http/Controllers/AdminSupportController.php
index 4428885..6de2b3a 100644
--- a/app/Http/Controllers/AdminSupportController.php
+++ b/app/Http/Controllers/AdminSupportController.php
@@ -71,7 +71,13 @@ public function support_index_list(Request $request): JsonResponse
                 })
                 ->orWhere('category_id', '=', 0)
                 ->orWhereNull('category_id');
-        })->where('category_id', '=', $request->category);
+        });
+
+        if ($request->category) {
+            $query = $query->where('category_id', '=', $request->category);
+        } else {
+            $query = $query->whereNull('category_id');
+        }
 
         switch ($request->type) {
             case 'open':
@@ -678,7 +684,7 @@ public function support_move(Request $request): RedirectResponse
     {
         Validator::make($request->toArray(), [
             'ticket_id'   => ['required', 'integer'],
-            'category_id' => ['required', 'integer'],
+            'category_id' => ['nullable', 'integer'],
         ])->validate();
 
         if (
@@ -891,7 +897,7 @@ public function support_run_start(Request $request): RedirectResponse
                 ->exists()
         ) {
             /* @var SupportTicket|null $ticket */
-            if (! empty($ticket = SupportRunHelper::nextTicket($request->category ?? null))) {
+            if (! empty($ticket = SupportRunHelper::nextTicket($request->category ? (int) $request->category : null))) {
                 /* @var SupportRun|null $run */
                 $run = SupportRun::create([
                     'category_id' => $request->category ?? null,
@@ -1076,7 +1082,7 @@ public function support_categories_list(Request $request): JsonResponse
                 ->get()
                 ->transform(function (SupportCategory $category) {
                     $edit = '
-<a class="btn btn-warning btn-sm w-100" data-toggle="modal" data-target="#edit' . $category->id . '" data-type="edit" data-category="' . $category->id . '" data-table="#category-users-' . $category->id . '"><i class="bi bi-pencil-square"></i></a>
+<a class="btn btn-warning btn-sm" data-toggle="modal" data-target="#edit' . $category->id . '" data-type="edit" data-category="' . $category->id . '" data-table="#category-users-' . $category->id . '"><i class="bi bi-pencil-square"></i></a>
 <div class="modal fade" id="edit' . $category->id . '" tabindex="-1" aria-labelledby="edit' . $category->id . 'Label" aria-hidden="true">
     <div class="modal-dialog">
         <div class="modal-content">
diff --git a/app/Http/Controllers/CustomerSupportController.php b/app/Http/Controllers/CustomerSupportController.php
index b1b2a6c..c2813a9 100644
--- a/app/Http/Controllers/CustomerSupportController.php
+++ b/app/Http/Controllers/CustomerSupportController.php
@@ -201,7 +201,7 @@ public function support_details(Request $request)
     public function support_create(Request $request): RedirectResponse
     {
         Validator::make($request->toArray(), [
-            'category_id' => ['required', 'integer'],
+            'category_id' => ['nullable', 'integer'],
             'subject'     => ['required', 'string'],
             'priority'    => ['required', 'string'],
             'message'     => ['required', 'string'],
diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index bc70acd..d64d643 100644
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -7,7 +7,9 @@
 use App\Http\Middleware\Authenticate;
 use App\Http\Middleware\EncryptCookies;
 use App\Http\Middleware\IdentifyAdminProductLists;
+use App\Http\Middleware\IdentifyAdminStatus;
 use App\Http\Middleware\IdentifyCustomerProductLists;
+use App\Http\Middleware\IdentifyCustomerStatus;
 use App\Http\Middleware\IdentifyTenant;
 use App\Http\Middleware\InjectNavigateables;
 use App\Http\Middleware\InjectShopCategoryOrProduct;
@@ -112,5 +114,7 @@ class Kernel extends HttpKernel
         'shop.categoryOrProduct' => InjectShopCategoryOrProduct::class,
         'products.admin'         => IdentifyAdminProductLists::class,
         'products.customer'      => IdentifyCustomerProductLists::class,
+        'status.admin'           => IdentifyAdminStatus::class,
+        'status.customer'        => IdentifyCustomerStatus::class,
     ];
 }
diff --git a/app/Http/Middleware/IdentifyAdminProductLists.php b/app/Http/Middleware/IdentifyAdminProductLists.php
index 7a6cbec..a39aacd 100644
--- a/app/Http/Middleware/IdentifyAdminProductLists.php
+++ b/app/Http/Middleware/IdentifyAdminProductLists.php
@@ -29,7 +29,7 @@ public function handle(Request $request, Closure $next)
     {
         $results = [];
 
-        $products = Products::list()->reject(function ($handler) {
+        Products::list()->reject(function ($handler) {
             return !$handler->ui()->admin;
         })->each(function ($handler) use (&$results) {
             $results[] = (object) [
diff --git a/app/Http/Middleware/IdentifyAdminStatus.php b/app/Http/Middleware/IdentifyAdminStatus.php
new file mode 100644
index 0000000..7fbcefd
--- /dev/null
+++ b/app/Http/Middleware/IdentifyAdminStatus.php
@@ -0,0 +1,70 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Middleware;
+
+use App\Models\Shop\OrderQueue\ShopOrderQueue;
+use App\Models\Support\SupportTicket;
+use App\Models\Support\SupportTicketMessage;
+use Closure;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+
+/**
+ * Class IdentifyAdminStatus.
+ *
+ * This class is the middleware for identifying the admin status.
+ *
+ * @author Marcel Menk <marcel.menk@ipvx.io>
+ */
+class IdentifyAdminStatus
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param Request $request
+     * @param Closure $next
+     *
+     * @return mixed
+     */
+    public function handle(Request $request, Closure $next)
+    {
+        $request->attributes->add([
+            'badges' => (object) [
+                'orders' => ShopOrderQueue::where('invalid', '=', false)
+                    ->where('approved', '=', true)
+                    ->where('disapproved', '=', false)
+                    ->where('setup', '=', false)
+                    ->where('deleted', '=', false)
+                    ->where('fails', '<', 3)
+                    ->count(),
+                'tickets' => SupportTicket::where('status', '=', 'open')
+                    ->where(function (Builder $builder) {
+                        return $builder->where('category_id', '=', 0)
+                            ->orWhereNull('category_id')
+                            ->orWhereHas('category', function (Builder $builder) {
+                                return $builder->whereHas('assignments', function (Builder $builder) {
+                                    return $builder->where('user_id', '=', Auth::id());
+                                });
+                            });
+                    })
+                    ->get()
+                    ->filter(function (SupportTicket $ticket) {
+                        $lastMessage = $ticket->messages->filter(function (SupportTicketMessage $message) {
+                            return !$message->note;
+                        })->last();
+
+                        return !in_array($lastMessage->user?->role, [
+                            'admin',
+                            'employee',
+                        ]);
+                    })
+                    ->count(),
+            ],
+        ]);
+
+        return $next($request);
+    }
+}
diff --git a/app/Http/Middleware/IdentifyCustomerProductLists.php b/app/Http/Middleware/IdentifyCustomerProductLists.php
index 4186f06..e7da4fa 100644
--- a/app/Http/Middleware/IdentifyCustomerProductLists.php
+++ b/app/Http/Middleware/IdentifyCustomerProductLists.php
@@ -29,7 +29,7 @@ public function handle(Request $request, Closure $next)
     {
         $results = [];
 
-        $products = Products::list()->reject(function ($handler) {
+        Products::list()->reject(function ($handler) {
             return !$handler->ui()->customer;
         })->each(function ($handler) use (&$results) {
             $results[] = (object) [
diff --git a/app/Http/Middleware/IdentifyCustomerStatus.php b/app/Http/Middleware/IdentifyCustomerStatus.php
new file mode 100644
index 0000000..ea2d6e0
--- /dev/null
+++ b/app/Http/Middleware/IdentifyCustomerStatus.php
@@ -0,0 +1,70 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Middleware;
+
+use App\Models\Accounting\Invoice\Invoice;
+use App\Models\Support\SupportTicket;
+use App\Models\Support\SupportTicketMessage;
+use Closure;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+
+/**
+ * Class IdentifyCustomerStatus.
+ *
+ * This class is the middleware for identifying the customer status.
+ *
+ * @author Marcel Menk <marcel.menk@ipvx.io>
+ */
+class IdentifyCustomerStatus
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param Request $request
+     * @param Closure $next
+     *
+     * @return mixed
+     */
+    public function handle(Request $request, Closure $next)
+    {
+        $invoices = Invoice::where('user_id', '=', Auth::id())
+            ->where('status', '=', 'unpaid')
+            ->whereDoesntHave('type', function (Builder $builder) {
+                return $builder->where('type', '=', 'prepaid');
+            })
+            ->get();
+
+        $request->attributes->add([
+            'badges' => (object) [
+                'invoices' => (object) [
+                    'total'   => (clone $invoices)->count(),
+                    'overdue' => (clone $invoices)->filter(function (Invoice $invoice) {
+                        return $invoice->overdue;
+                    })->count(),
+                ],
+                'tickets' => SupportTicket::whereHas('assignments', function (Builder $builder) {
+                    return $builder->where('user_id', '=', Auth::id());
+                })
+                    ->where('status', '=', 'open')
+                    ->get()
+                    ->filter(function (SupportTicket $ticket) {
+                        $lastMessage = $ticket->messages->filter(function (SupportTicketMessage $message) {
+                            return !$message->note;
+                        })->last();
+
+                        return in_array($lastMessage->user?->role, [
+                            'admin',
+                            'employee',
+                        ]);
+                    })
+                    ->count(),
+            ],
+        ]);
+
+        return $next($request);
+    }
+}
diff --git a/composer.lock b/composer.lock
index 3d200ca..4bcfc0d 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "11227b59f860e2dd590368b44e4652b8",
+    "content-hash": "defde7552a959aa4b07010a9b742ee3b",
     "packages": [
         {
             "name": "awobaz/compoships",
@@ -2055,16 +2055,16 @@
         },
         {
             "name": "forepath/obms-theme-aurora",
-            "version": "v1.2.1",
+            "version": "v1.3.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/forepath/obms-theme-aurora.git",
-                "reference": "f1ff227a81818b7d71c495ce70838e8b03791aa0"
+                "reference": "df5bd322fcc432c159e3761b228a156fe0eda1e0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/forepath/obms-theme-aurora/zipball/f1ff227a81818b7d71c495ce70838e8b03791aa0",
-                "reference": "f1ff227a81818b7d71c495ce70838e8b03791aa0",
+                "url": "https://api.github.com/repos/forepath/obms-theme-aurora/zipball/df5bd322fcc432c159e3761b228a156fe0eda1e0",
+                "reference": "df5bd322fcc432c159e3761b228a156fe0eda1e0",
                 "shasum": ""
             },
             "require": {
@@ -2094,7 +2094,7 @@
                 "issues": "https://github.com/forepath/obms-theme-aurora/issues",
                 "source": "https://github.com/forepath/obms-theme-aurora"
             },
-            "time": "2025-08-09T08:16:15+00:00"
+            "time": "2025-08-09T20:15:56+00:00"
         },
         {
             "name": "fruitcake/php-cors",
diff --git a/database/migrations/2025_08_09_000001_update_support_tables.php b/database/migrations/2025_08_09_000001_update_support_tables.php
new file mode 100644
index 0000000..0977958
--- /dev/null
+++ b/database/migrations/2025_08_09_000001_update_support_tables.php
@@ -0,0 +1,75 @@
+<?php
+
+declare(strict_types=1);
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class () extends Migration {
+    /**
+     * Run the migrations.
+     */
+    public function up()
+    {
+        Schema::table('support_tickets', function (Blueprint $table) {
+            $table->foreignId('category_id')->nullable()->change();
+        });
+
+        Schema::table('support_ticket_history', function (Blueprint $table) {
+            $table->enum('type', [
+                'message',
+                'priority',
+                'assignment',
+                'category',
+                'escalation',
+                'deescalation',
+                'lock',
+                'unlock',
+                'hold',
+                'unhold',
+                'close',
+                'reopen',
+                'file',
+                'status',
+                'run',
+            ])->change();
+        });
+
+        Schema::table('support_runs', function (Blueprint $table) {
+            $table->foreignId('category_id')->nullable()->change();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down()
+    {
+        Schema::table('support_runs', function (Blueprint $table) {
+            $table->foreignId('category_id')->nullable(false)->change();
+        });
+
+        Schema::table('support_ticket_history', function (Blueprint $table) {
+            $table->enum('type', [
+                'message',
+                'priority',
+                'assignment',
+                'category',
+                'escalation',
+                'deescalation',
+                'lock',
+                'unlock',
+                'hold',
+                'unhold',
+                'close',
+                'reopen',
+                'file',
+            ])->change();
+        });
+
+        Schema::table('tenants', function (Blueprint $table) {
+            $table->foreignId('category_id')->nullable(false)->change();
+        });
+    }
+};
diff --git a/routes/web.php b/routes/web.php
index 7cbcac1..ecf73cf 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -67,6 +67,7 @@
         'middleware' => [
             'role.customer',
             'products.customer',
+            'status.customer',
         ],
     ], function () {
         Route::get('/accept', [App\Http\Controllers\CustomerDashboardController::class, 'accept'])->name('customer.accept');
@@ -179,6 +180,7 @@
         'middleware' => [
             'role.employee',
             'products.admin',
+            'status.admin',
         ],
     ], function () {
         Route::get('/home', [App\Http\Controllers\AdminDashboardController::class, 'index'])->name('admin.home');
@@ -526,6 +528,7 @@
     Route::group([
         'middleware' => [
             'products.customer',
+            'status.customer',
         ],
     ], function () {
         Page::query()->each(function (Page $page) {
@@ -540,6 +543,7 @@
     'middleware' => [
         'shop.categoryOrProduct',
         'products.customer',
+        'status.customer',
     ],
 ], function () {
     Route::get('/shop', [App\Http\Controllers\CustomerShopController::class, 'render_category'])->name('public.shop');