diff --git a/app/Filament/App/Resources/ServerResource/Pages/ListServers.php b/app/Filament/App/Resources/ServerResource/Pages/ListServers.php
index 2807bae64..ce512f94c 100644
--- a/app/Filament/App/Resources/ServerResource/Pages/ListServers.php
+++ b/app/Filament/App/Resources/ServerResource/Pages/ListServers.php
@@ -256,9 +256,9 @@ class ListServers extends ListRecords
         } else {
             return [
                 ActionGroup::make($actions)
-                    ->icon(fn (Server $server) => $server->condition->getIcon())
-                    ->color(fn (Server $server) => $server->condition->getColor())
-                    ->tooltip(fn (Server $server) => $server->condition->getLabel())
+                    ->icon('tabler-power')
+                    ->color('primary')
+                    ->tooltip('Power Actions')
                     ->iconSize(IconSize::Large),
             ];
         }
diff --git a/resources/views/livewire/server-entry.blade.php b/resources/views/livewire/server-entry.blade.php
index 4eec55548..2376a9e30 100644
--- a/resources/views/livewire/server-entry.blade.php
+++ b/resources/views/livewire/server-entry.blade.php
@@ -8,6 +8,18 @@
 
     <div class="flex-1 dark:bg-gray-800 dark:text-white rounded-lg overflow-hidden p-3">
         <div class="flex items-center mb-5 gap-2">
+            <x-filament::icon-button
+                :icon="$server->condition->getIcon()"
+                :color="$server->condition->getColor()"
+                :tooltip="$server->condition->getLabel()"
+                size="lg"
+            />
+            <h2 class="text-xl font-bold">
+                {{ $server->name }}
+                <span class="dark:text-gray-400">
+                    ({{ $server->formatResource('uptime', type: \App\Enums\ServerResourceType::Time) }})
+                </span>
+            </h2>
             <div class="end-0" x-on:click.stop>
                 <div class="flex-1 dark:bg-gray-800 dark:text-white rounded-b-lg overflow-hidden p-1">
                     <x-filament-tables::actions
@@ -17,13 +29,6 @@
                     />
                 </div>
             </div>
-
-            <h2 class="text-xl font-bold">
-                {{ $server->name }}
-                <span class="dark:text-gray-400">
-                    ({{ $server->formatResource('uptime', type: \App\Enums\ServerResourceType::Time) }})
-                </span>
-            </h2>
         </div>
 
         <div class="flex justify-between text-center items-center gap-4">