diff --git a/app/Http/Controllers/ServerIconController.php b/app/Http/Controllers/ServerIconController.php
deleted file mode 100644
index 208678b71..000000000
--- a/app/Http/Controllers/ServerIconController.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-use Paymenter\Extensions\Servers\Proxmox\Models\Server;
-
-class ServerIconController extends Controller
-{
-    // Update the icon and color for a server
-    public function update(Request $request, $serverId)
-    {
-        $request->validate([
-            'icon' => 'nullable|string|max:64',
-            'color' => 'nullable|string|max:32',
-        ]);
-
-        $server = Server::where('id', $serverId)
-            ->where('user_id', Auth::id())
-            ->firstOrFail();
-
-        $server->user_set_icon = $request->input('icon');
-        $server->user_set_icon_color = $request->input('color');
-        $server->save();
-
-        return response()->json(['success' => true]);
-    }
-
-    // Get the icon and color for a server
-    public function show($serverId)
-    {
-        $server = Server::where('id', $serverId)
-            ->where('user_id', Auth::id())
-            ->firstOrFail();
-
-        return response()->json([
-            'icon' => $server->user_set_icon,
-            'color' => $server->user_set_icon_color,
-        ]);
-    }
-}
diff --git a/extensions/Servers/Proxmox/views/components/layout.blade.php b/extensions/Servers/Proxmox/views/components/layout.blade.php
index 74edf9834..b542df711 100644
--- a/extensions/Servers/Proxmox/views/components/layout.blade.php
+++ b/extensions/Servers/Proxmox/views/components/layout.blade.php
@@ -38,9 +38,16 @@
             @endphp
             
             <div class="flex flex-col gap-4 pb-6 pt-6 lg:flex-row lg:items-center lg:justify-between">
-                <span class="text-2xl font-bold">
-                    {{ $server->hostname }}
-                </span>
+                <div class="flex items-center gap-3">
+                    @if($server->user_set_icon)
+                        <i class="ri-{{ $server->user_set_icon }} text-2xl" style="{{ $server->user_set_icon_color ? 'color: ' . $server->user_set_icon_color : '' }}"></i>
+                    @else
+                        <i class="ri-server-line text-2xl text-secondary"></i>
+                    @endif
+                    <span class="text-2xl font-bold">
+                        {{ $server->hostname }}
+                    </span>
+                </div>
 
                 
                     <div class="hidden lg:flex flex-row gap-2 ml-auto justify-end items-center">
diff --git a/extensions/Servers/Proxmox/views/overview.blade.php b/extensions/Servers/Proxmox/views/overview.blade.php
index d20860ed5..f780b4337 100644
--- a/extensions/Servers/Proxmox/views/overview.blade.php
+++ b/extensions/Servers/Proxmox/views/overview.blade.php
@@ -78,16 +78,12 @@
                 <!-- Standalone Server Icon Customization (Alpine.js, AJAX) -->
                 <div x-data="serverIconModal({
                     serverId: '{{ $server->id }}',
-                    initialIcon: @json($server->user_set_icon),
-                    initialColor: @json($server->user_set_icon_color)
+                    initialIcon: {{ $server->user_set_icon ? "'" . $server->user_set_icon . "'" : 'null' }},
+                    initialColor: {{ $server->user_set_icon_color ? "'" . $server->user_set_icon_color . "'" : 'null' }}
                 })" class="flex items-center gap-2">
                     <button @click="openModal()" :title="icon ? 'Customize server icon' : 'Set server icon'" class="p-2 rounded-lg bg-secondary/10 hover:bg-secondary/20 transition-colors">
-                        <template x-if="icon">
-                            <i :class="'ri-' + icon + ' size-5'" :style="color ? 'color: ' + color : ''"></i>
-                        </template>
-                        <template x-if="!icon">
-                            <x-ri-server-line class="size-5 text-secondary" />
-                        </template>
+                        <i x-show="icon" :class="'ri-' + icon" class="size-5" :style="color ? 'color: ' + color : ''"></i>
+                        <x-ri-server-line x-show="!icon" class="size-5 text-secondary" />
                     </button>
                     <!-- Modal -->
                     <div x-show="show" x-cloak class="fixed inset-0 z-50 flex items-center justify-center bg-black/50 backdrop-blur-sm">
@@ -98,19 +94,15 @@
                             <h3 class="text-lg font-semibold mb-4">Customize Server Icon</h3>
                             <div class="flex items-center gap-4 mb-4">
                                 <div class="size-12 rounded-xl border flex items-center justify-center" :style="color ? 'color: ' + color + '; border-color: ' + color : ''">
-                                    <template x-if="icon">
-                                        <i :class="'ri-' + icon + ' size-8'" :style="color ? 'color: ' + color : ''"></i>
-                                    </template>
-                                    <template x-if="!icon">
-                                        <x-ri-server-line class="size-8 text-base/40" />
-                                    </template>
+                                    <i x-show="icon" :class="'ri-' + icon" class="size-8"></i>
+                                    <x-ri-server-line x-show="!icon" class="size-8 text-base/40" />
                                 </div>
                                 <input x-model="search" type="text" placeholder="Search icons..." class="border rounded px-2 py-1 text-sm w-40" />
                             </div>
                             <div class="grid grid-cols-6 gap-2 mb-4 max-h-32 overflow-y-auto">
                                 <template x-for="i in filteredIcons" :key="i">
-                                    <button @click="icon = i" :class="icon === i ? 'ring-2 ring-primary' : ''" class="rounded p-1 border flex items-center justify-center">
-                                        <i :class="'ri-' + i + ' size-5'"></i>
+                                    <button @click="icon = i" :class="icon === i ? 'ring-2 ring-primary' : ''" class="rounded p-1 border flex items-center justify-center hover:bg-secondary/10">
+                                        <i :class="'ri-' + i" class="size-5"></i>
                                     </button>
                                 </template>
                             </div>
diff --git a/extensions/Servers/Proxmox/views/server.blade.php b/extensions/Servers/Proxmox/views/server.blade.php
index 073ae2f48..aa9becc13 100644
--- a/extensions/Servers/Proxmox/views/server.blade.php
+++ b/extensions/Servers/Proxmox/views/server.blade.php
@@ -5,11 +5,7 @@
             <div class="flex items-center justify-between mb-2">
                 <div class="flex items-center gap-3">
                     <div class="bg-secondary/10 p-2 rounded-lg">
-                        @if($server->user_set_icon)
-                            <i class="ri-{{ $server->user_set_icon }} size-5" @if($server->user_set_icon_color) style="color: {{ $server->user_set_icon_color }}" @endif></i>
-                        @else
-                            <x-ri-server-line class="size-5 text-secondary" />
-                        @endif
+                        <x-ri-server-line class="size-5 text-secondary" />
                     </div>
                     <span class="font-medium">{{ $status->name }}</span>
                 </div>
diff --git a/routes/web.php b/routes/web.php
index 1e0923d2c..6fc19a96c 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -1,12 +1,6 @@
-
-// Server icon API (AJAX, not Livewire)
-use App\Http\Controllers\ServerIconController;
-Route::middleware(['web', 'auth'])->group(function () {
-    Route::get('/proxmox/server/{server}/icon', [ServerIconController::class, 'show']);
-    Route::post('/proxmox/server/{server}/icon', [ServerIconController::class, 'update']);
-});
 <?php
 
+use Paymenter\Extensions\Servers\Proxmox\Http\Controllers\ServerIconController;
 use App\Http\Controllers\SocialLoginController;
 use App\Http\Middleware\MustVerfiyEmail;
 use App\Livewire\Auth;
@@ -21,6 +15,12 @@ use App\Livewire\Tickets;
 use Illuminate\Foundation\Auth\EmailVerificationRequest;
 use Illuminate\Support\Facades\Route;
 
+// Server icon API (AJAX, not Livewire)
+Route::middleware(['web', 'auth'])->group(function () {
+    Route::get('/proxmox/server/{server}/icon', [ServerIconController::class, 'show']);
+    Route::post('/proxmox/server/{server}/icon', [ServerIconController::class, 'update']);
+});
+
 Route::get('/', Home::class)->name('home');
 
 // Destroy the session and log out the user.
diff --git a/themes/lucentui/views/services/index.blade.php b/themes/lucentui/views/services/index.blade.php
index 81f4f9bce..b2c157a40 100644
--- a/themes/lucentui/views/services/index.blade.php
+++ b/themes/lucentui/views/services/index.blade.php
@@ -48,7 +48,11 @@
 
                     <div class="flex items-start md:items-center gap-4 flex-grow">
                         <div class="bg-primary/10 p-3 rounded-full flex-shrink-0 shadow-sm">
-                            <x-ri-instance-line class="size-6 text-primary" />
+                            @if(optional($service->product->server)->extension === 'Proxmox' && $service->proxmoxServer && $service->proxmoxServer->user_set_icon)
+                                <i class="ri-{{ $service->proxmoxServer->user_set_icon }} text-2xl" style="{{ $service->proxmoxServer->user_set_icon_color ? 'color: ' . $service->proxmoxServer->user_set_icon_color : '' }}"></i>
+                            @else
+                                <x-ri-instance-line class="size-6 text-primary" />
+                            @endif
                         </div>
                     <div class="flex flex-col">
                         <div class="flex items-center gap-2 flex-wrap">