Update Stock Egg Images (#1973)

Co-authored-by: Boy132 <mail@boy132.de>

app/Console/Commands/Egg/CheckEggUpdatesCommand.php

@@ -7,6 +7,7 @@ use App\Models\Egg;
 use App\Services\Eggs\Sharing\EggExporterService;
 use Exception;
 use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Http;
 use JsonException;
 use Symfony\Component\Yaml\Yaml;
 
@@ -44,9 +45,7 @@ class CheckEggUpdatesCommand extends Command
             ? Yaml::parse($exporterService->handle($egg->id, EggFormat::YAML))
             : json_decode($exporterService->handle($egg->id, EggFormat::JSON), true);
 
-        $remote = file_get_contents($egg->update_url);
-        assert($remote !== false);
-
+        $remote = Http::timeout(5)->connectTimeout(1)->get($egg->update_url)->throw()->body();
         $remote = $isYaml ? Yaml::parse($remote) : json_decode($remote, true);
 
         unset($local['exported_at'], $remote['exported_at']);

app/Console/Commands/Egg/UpdateEggIndexCommand.php

@@ -4,6 +4,7 @@ namespace App\Console\Commands\Egg;
 
 use Exception;
 use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Http;
 
 class UpdateEggIndexCommand extends Command
 {
@@ -12,8 +13,7 @@ class UpdateEggIndexCommand extends Command
     public function handle(): int
     {
         try {
-            $data = file_get_contents('https://raw.githubusercontent.com/pelican-eggs/pelican-eggs.github.io/refs/heads/main/content/pelican.json');
-            $data = json_decode($data, true, 512, JSON_THROW_ON_ERROR);
+            $data = Http::timeout(5)->connectTimeout(1)->get('https://raw.githubusercontent.com/pelican-eggs/pelican-eggs.github.io/refs/heads/main/content/pelican.json')->throw()->json();
         } catch (Exception $exception) {
             $this->error($exception->getMessage());
 

app/Console/Commands/UpgradeCommand.php

@@ -1,196 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-use App\Console\Kernel;
-use Closure;
-use Exception;
-use Illuminate\Console\Command;
-use Illuminate\Foundation\Application;
-use Symfony\Component\Console\Helper\ProgressBar;
-use Symfony\Component\Process\Process;
-
-class UpgradeCommand extends Command
-{
-    protected const DEFAULT_URL = 'https://github.com/pelican-dev/panel/releases/%s/panel.tar.gz';
-
-    protected $signature = 'p:upgrade
-        {--user= : The user that PHP runs under. All files will be owned by this user.}
-        {--group= : The group that PHP runs under. All files will be owned by this group.}
-        {--url= : The specific archive to download.}
-        {--release= : A specific version to download from GitHub. Leave blank to use latest.}
-        {--skip-download : If set no archive will be downloaded.}';
-
-    protected $description = 'Downloads a new archive from GitHub and then executes the normal upgrade commands.';
-
-    /**
-     * Executes an upgrade command which will run through all of our standard
-     * Panel commands and enable users to basically just download
-     * the archive and execute this and be done.
-     *
-     * This places the application in maintenance mode as well while the commands
-     * are being executed.
-     *
-     * @throws Exception
-     */
-    public function handle(): void
-    {
-        $skipDownload = $this->option('skip-download');
-        if (!$skipDownload) {
-            $this->output->warning(trans('commands.upgrade.integrity'));
-            $this->output->comment(trans('commands.upgrade.source_url'));
-            $this->line($this->getUrl());
-        }
-
-        $user = 'www-data';
-        $group = 'www-data';
-        if ($this->input->isInteractive()) {
-            if (!$skipDownload) {
-                $skipDownload = !$this->confirm(trans('commands.upgrade.skipDownload'), true);
-            }
-
-            if (is_null($this->option('user'))) {
-                $userDetails = function_exists('posix_getpwuid') ? posix_getpwuid(fileowner('public')) : [];
-                $user = $userDetails['name'] ?? 'www-data';
-
-                $message = trans('commands.upgrade.webserver_user', ['user' => $user]);
-                if (!$this->confirm($message, true)) {
-                    $user = $this->anticipate(
-                        trans('commands.upgrade.name_webserver'),
-                        [
-                            'www-data',
-                            'nginx',
-                            'apache',
-                        ]
-                    );
-                }
-            }
-
-            if (is_null($this->option('group'))) {
-                $groupDetails = function_exists('posix_getgrgid') ? posix_getgrgid(filegroup('public')) : [];
-                $group = $groupDetails['name'] ?? 'www-data';
-
-                $message = trans('commands.upgrade.group_webserver', ['group' => $user]);
-                if (!$this->confirm($message, true)) {
-                    $group = $this->anticipate(
-                        trans('commands.upgrade.group_webserver_question'),
-                        [
-                            'www-data',
-                            'nginx',
-                            'apache',
-                        ]
-                    );
-                }
-            }
-
-            if (!$this->confirm(trans('commands.upgrade.are_your_sure'))) {
-                $this->warn(trans('commands.upgrade.terminated'));
-
-                return;
-            }
-        }
-
-        ini_set('output_buffering', '0');
-        $bar = $this->output->createProgressBar($skipDownload ? 9 : 10);
-        $bar->start();
-
-        if (!$skipDownload) {
-            $this->withProgress($bar, function () {
-                $this->line("\$upgrader> curl -L \"{$this->getUrl()}\" | tar -xzv");
-                $process = Process::fromShellCommandline("curl -L \"{$this->getUrl()}\" | tar -xzv");
-                $process->run(function ($type, $buffer) {
-                    $this->{$type === Process::ERR ? 'error' : 'line'}($buffer);
-                });
-            });
-        }
-
-        $this->withProgress($bar, function () {
-            $this->line('$upgrader> php artisan down');
-            $this->call('down');
-        });
-
-        $this->withProgress($bar, function () {
-            $this->line('$upgrader> chmod -R 755 storage bootstrap/cache');
-            $process = new Process(['chmod', '-R', '755', 'storage', 'bootstrap/cache']);
-            $process->run(function ($type, $buffer) {
-                $this->{$type === Process::ERR ? 'error' : 'line'}($buffer);
-            });
-        });
-
-        $this->withProgress($bar, function () {
-            $command = ['composer', 'install', '--no-ansi'];
-            if (config('app.env') === 'production' && !config('app.debug')) {
-                $command[] = '--optimize-autoloader';
-                $command[] = '--no-dev';
-            }
-
-            $this->line('$upgrader> ' . implode(' ', $command));
-            $process = new Process($command);
-            $process->setTimeout(10 * 60);
-            $process->run(function ($type, $buffer) {
-                $this->line($buffer);
-            });
-        });
-
-        /** @var Application $app */
-        $app = require __DIR__ . '/../../../bootstrap/app.php';
-        /** @var Kernel $kernel */
-        $kernel = $app->make(Kernel::class);
-        $kernel->bootstrap();
-        $this->setLaravel($app);
-
-        $this->withProgress($bar, function () {
-            $this->line('$upgrader> php artisan view:clear');
-            $this->call('view:clear');
-        });
-
-        $this->withProgress($bar, function () {
-            $this->line('$upgrader> php artisan config:clear');
-            $this->call('config:clear');
-        });
-
-        $this->withProgress($bar, function () {
-            $this->line('$upgrader> php artisan migrate --force --seed');
-            $this->call('migrate', ['--force' => true, '--seed' => true]);
-        });
-
-        $this->withProgress($bar, function () use ($user, $group) {
-            $this->line("\$upgrader> chown -R {$user}:{$group} *");
-            $process = Process::fromShellCommandline("chown -R {$user}:{$group} *", $this->getLaravel()->basePath());
-            $process->setTimeout(10 * 60);
-            $process->run(function ($type, $buffer) {
-                $this->{$type === Process::ERR ? 'error' : 'line'}($buffer);
-            });
-        });
-
-        $this->withProgress($bar, function () {
-            $this->line('$upgrader> php artisan queue:restart');
-            $this->call('queue:restart');
-        });
-
-        $this->withProgress($bar, function () {
-            $this->line('$upgrader> php artisan up');
-            $this->call('up');
-        });
-
-        $this->newLine(2);
-        $this->info(trans('commands.upgrade.success'));
-    }
-
-    protected function withProgress(ProgressBar $bar, Closure $callback): void
-    {
-        $bar->clear();
-        $callback();
-        $bar->advance();
-        $bar->display();
-    }
-
-    protected function getUrl(): string
-    {
-        if ($this->option('url')) {
-            return $this->option('url');
-        }
-
-        return sprintf(self::DEFAULT_URL, $this->option('release') ? 'download/v' . $this->option('release') : 'latest/download');
-    }
-}

app/Enums/CustomRenderHooks.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace App\Enums;
+
+enum CustomRenderHooks: string
+{
+    case FooterStart = 'pelican::footer.start';
+    case FooterEnd = 'pelican::footer.end';
+}

app/Exceptions/Http/TwoFactorAuthRequiredException.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Exceptions\Http;
+
+use Illuminate\Http\Response;
+use Symfony\Component\HttpKernel\Exception\HttpException;
+use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
+
+class TwoFactorAuthRequiredException extends HttpException implements HttpExceptionInterface
+{
+    /**
+     * TwoFactorAuthRequiredException constructor.
+     */
+    public function __construct(?\Throwable $previous = null)
+    {
+        parent::__construct(Response::HTTP_BAD_REQUEST, 'Two-factor authentication is required on this account in order to access this endpoint.', $previous);
+    }
+}

app/Extensions/Tasks/Schemas/CreateBackupSchema.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Extensions\Tasks\Schemas;
+
+use App\Models\Schedule;
+use App\Models\Task;
+use App\Services\Backups\InitiateBackupService;
+
+final class CreateBackupSchema extends TaskSchema
+{
+    public function __construct(private InitiateBackupService $backupService) {}
+
+    public function getId(): string
+    {
+        return 'backup';
+    }
+
+    public function runTask(Task $task): void
+    {
+        $this->backupService->setIgnoredFiles(explode(PHP_EOL, $task->payload))->handle($task->server, null, true);
+    }
+
+    public function canCreate(Schedule $schedule): bool
+    {
+        return $schedule->server->backup_limit > 0;
+    }
+
+    public function getPayloadLabel(): string
+    {
+        return trans('server/schedule.tasks.actions.backup.files_to_ignore');
+    }
+}

app/Extensions/Tasks/Schemas/DeleteFilesSchema.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Extensions\Tasks\Schemas;
+
+use App\Models\Task;
+use App\Services\Files\DeleteFilesService;
+
+final class DeleteFilesSchema extends TaskSchema
+{
+    public function __construct(private DeleteFilesService $deleteFilesService) {}
+
+    public function getId(): string
+    {
+        return 'delete_files';
+    }
+
+    public function runTask(Task $task): void
+    {
+        $this->deleteFilesService->handle($task->server, explode(PHP_EOL, $task->payload));
+    }
+
+    public function getPayloadLabel(): string
+    {
+        return trans('server/schedule.tasks.actions.delete_files.files_to_delete');
+    }
+}

app/Extensions/Tasks/Schemas/PowerActionSchema.php

@@ -0,0 +1,57 @@
+<?php
+
+namespace App\Extensions\Tasks\Schemas;
+
+use App\Models\Task;
+use App\Repositories\Daemon\DaemonServerRepository;
+use Filament\Forms\Components\Select;
+use Filament\Schemas\Components\Component;
+use Illuminate\Support\Str;
+
+final class PowerActionSchema extends TaskSchema
+{
+    public function __construct(private DaemonServerRepository $serverRepository) {}
+
+    public function getId(): string
+    {
+        return 'power';
+    }
+
+    public function runTask(Task $task): void
+    {
+        $this->serverRepository->setServer($task->server)->power($task->payload);
+    }
+
+    public function getDefaultPayload(): string
+    {
+        return 'restart';
+    }
+
+    public function getPayloadLabel(): string
+    {
+        return trans('server/schedule.tasks.actions.power.action');
+    }
+
+    public function formatPayload(string $payload): string
+    {
+        return Str::ucfirst($payload);
+    }
+
+    /** @return Component[] */
+    public function getPayloadForm(): array
+    {
+        return [
+            Select::make('payload')
+                ->label($this->getPayloadLabel())
+                ->required()
+                ->options([
+                    'start' => trans('server/schedule.tasks.actions.power.start'),
+                    'restart' => trans('server/schedule.tasks.actions.power.restart'),
+                    'stop' => trans('server/schedule.tasks.actions.power.stop'),
+                    'kill' => trans('server/schedule.tasks.actions.power.kill'),
+                ])
+                ->selectablePlaceholder(false)
+                ->default($this->getDefaultPayload()),
+        ];
+    }
+}

app/Extensions/Tasks/Schemas/SendCommandSchema.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Extensions\Tasks\Schemas;
+
+use App\Models\Task;
+use Filament\Forms\Components\TextInput;
+use Filament\Schemas\Components\Component;
+
+final class SendCommandSchema extends TaskSchema
+{
+    public function getId(): string
+    {
+        return 'command';
+    }
+
+    public function runTask(Task $task): void
+    {
+        $task->server->send($task->payload);
+    }
+
+    public function getPayloadLabel(): string
+    {
+        return trans('server/schedule.tasks.actions.command.command');
+    }
+
+    /** @return Component[] */
+    public function getPayloadForm(): array
+    {
+        return [
+            TextInput::make('payload')
+                ->required()
+                ->label($this->getPayloadLabel())
+                ->default($this->getDefaultPayload()),
+        ];
+    }
+}

app/Extensions/Tasks/Schemas/TaskSchema.php

@@ -0,0 +1,52 @@
+<?php
+
+namespace App\Extensions\Tasks\Schemas;
+
+use App\Extensions\Tasks\TaskSchemaInterface;
+use App\Models\Schedule;
+use Filament\Forms\Components\Textarea;
+use Filament\Schemas\Components\Component;
+
+abstract class TaskSchema implements TaskSchemaInterface
+{
+    public function getName(): string
+    {
+        return trans('server/schedule.tasks.actions.' . $this->getId() . '.title');
+    }
+
+    public function canCreate(Schedule $schedule): bool
+    {
+        return true;
+    }
+
+    public function getDefaultPayload(): ?string
+    {
+        return null;
+    }
+
+    public function getPayloadLabel(): ?string
+    {
+        return null;
+    }
+
+    /** @return null|string|string[] */
+    public function formatPayload(string $payload): null|string|array
+    {
+        if (empty($payload)) {
+            return null;
+        }
+
+        return explode(PHP_EOL, $payload);
+    }
+
+    /** @return Component[] */
+    public function getPayloadForm(): array
+    {
+        return [
+            Textarea::make('payload')
+                ->label($this->getPayloadLabel() ?? trans('server/schedule.tasks.payload'))
+                ->default($this->getDefaultPayload())
+                ->autosize(),
+        ];
+    }
+}

app/Extensions/Tasks/TaskSchemaInterface.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Extensions\Tasks;
+
+use App\Models\Schedule;
+use App\Models\Task;
+use Filament\Schemas\Components\Component;
+
+interface TaskSchemaInterface
+{
+    public function getId(): string;
+
+    public function getName(): string;
+
+    public function runTask(Task $task): void;
+
+    public function canCreate(Schedule $schedule): bool;
+
+    public function getDefaultPayload(): ?string;
+
+    public function getPayloadLabel(): ?string;
+
+    /** @return null|string|string[] */
+    public function formatPayload(string $payload): null|string|array;
+
+    /** @return Component[] */
+    public function getPayloadForm(): array;
+}

app/Extensions/Tasks/TaskService.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace App\Extensions\Tasks;
+
+class TaskService
+{
+    /** @var array<string, TaskSchemaInterface> */
+    private array $schemas = [];
+
+    /**
+     * @return TaskSchemaInterface[]
+     */
+    public function getAll(): array
+    {
+        return $this->schemas;
+    }
+
+    public function get(string $id): ?TaskSchemaInterface
+    {
+        return array_get($this->schemas, $id);
+    }
+
+    public function register(TaskSchemaInterface $schema): void
+    {
+        if (array_key_exists($schema->getId(), $this->schemas)) {
+            return;
+        }
+
+        $this->schemas[$schema->getId()] = $schema;
+    }
+
+    /** @return array<string, string> */
+    public function getMappings(): array
+    {
+        return collect($this->schemas)->mapWithKeys(fn ($schema) => [$schema->getId() => $schema->getName()])->all();
+    }
+}

app/Filament/Admin/Pages/Health.php

@@ -6,6 +6,7 @@ use Carbon\Carbon;
 use Filament\Actions\Action;
 use Filament\Notifications\Notification;
 use Filament\Pages\Page;
+use Filament\Support\Enums\IconSize;
 use Illuminate\Support\Facades\Artisan;
 use Spatie\Health\Commands\RunHealthChecksCommand;
 use Spatie\Health\Enums\Status;
@@ -47,7 +48,8 @@ class Health extends Page
         return [
             Action::make('refresh')
                 ->label(trans('admin/health.refresh'))
-                ->button()
+                ->iconButton()->iconSize(IconSize::ExtraLarge)
+                ->icon('tabler-refresh')
                 ->action('refresh'),
         ];
     }

app/Filament/Admin/Pages/ListLogs.php

@@ -46,13 +46,12 @@ class ListLogs extends BaseListLogs
             ])
             ->recordActions([
                 ViewLogAction::make()
-                    ->icon('tabler-file-description')->iconSize(IconSize::Medium),
+                    ->icon('tabler-file-description')->iconSize(IconSize::Large)->iconButton(),
                 DownloadAction::make()
-                    ->icon('tabler-file-download')->iconSize(IconSize::Medium),
+                    ->icon('tabler-file-download')->iconSize(IconSize::Large)->iconButton(),
                 Action::make('uploadLogs')
-                    ->button()
                     ->hiddenLabel()
-                    ->icon('tabler-world-upload')->iconSize(IconSize::Medium)
+                    ->icon('tabler-world-upload')->iconSize(IconSize::Large)->iconButton()
                     ->requiresConfirmation()
                     ->modalHeading(trans('admin/log.actions.upload_logs'))
                     ->modalDescription(fn ($record) => trans('admin/log.actions.upload_logs_description', ['file' => $record['date'], 'url' => 'https://logs.pelican.dev']))
@@ -124,7 +123,7 @@ class ListLogs extends BaseListLogs
                         }
                     }),
                 DeleteAction::make()
-                    ->icon('tabler-trash')->iconSize(IconSize::Medium),
+                    ->icon('tabler-trash')->iconSize(IconSize::Medium)->iconButton(),
             ]);
     }
 }

app/Filament/Admin/Pages/Settings.php

@@ -36,6 +36,7 @@ use Filament\Schemas\Components\Utilities\Get;
 use Filament\Schemas\Components\Utilities\Set;
 use Filament\Schemas\Contracts\HasSchemas;
 use Filament\Schemas\Schema;
+use Filament\Support\Enums\IconSize;
 use Filament\Support\Enums\Width;
 use Illuminate\Http\Client\Factory;
 use Illuminate\Support\Arr;
@@ -296,11 +297,13 @@ class Settings extends Page implements HasSchemas
                     Actions::make([
                         Action::make("disable_captcha_$id")
                             ->visible(fn (Get $get) => $get("CAPTCHA_{$id}_ENABLED"))
+                            ->disabled(fn () => !user()?->can('update settings'))
                             ->label(trans('admin/setting.captcha.disable'))
                             ->color('danger')
                             ->action(fn (Set $set) => $set("CAPTCHA_{$id}_ENABLED", false)),
                         Action::make("enable_captcha_$id")
                             ->visible(fn (Get $get) => !$get("CAPTCHA_{$id}_ENABLED"))
+                            ->disabled(fn () => !user()?->can('update settings'))
                             ->label(trans('admin/setting.captcha.enable'))
                             ->color('success')
                             ->action(fn (Set $set) => $set("CAPTCHA_{$id}_ENABLED", true)),
@@ -567,11 +570,13 @@ class Settings extends Page implements HasSchemas
                     Actions::make([
                         Action::make("disable_oauth_$id")
                             ->visible(fn (Get $get) => $get($key))
+                            ->disabled(fn () => !user()?->can('update settings'))
                             ->label(trans('admin/setting.oauth.disable'))
                             ->color('danger')
                             ->action(fn (Set $set) => $set($key, false)),
                         Action::make("enable_oauth_$id")
                             ->visible(fn (Get $get) => !$get($key))
+                            ->disabled(fn () => !user()?->can('update settings'))
                             ->label(trans('admin/setting.oauth.enable'))
                             ->color('success')
                             ->steps($schema->getSetupSteps())
@@ -622,6 +627,18 @@ class Settings extends Page implements HasSchemas
                         ->columnSpanFull()
                         ->stateCast(new BooleanStateCast(false))
                         ->default(env('PANEL_CLIENT_ALLOCATIONS_ENABLED', config('panel.client_features.allocations.enabled'))),
+                    Toggle::make('PANEL_CLIENT_ALLOCATIONS_CREATE_NEW')
+                        ->label(trans('admin/setting.misc.auto_allocation.create_new'))
+                        ->helperText(trans('admin/setting.misc.auto_allocation.create_new_help'))
+                        ->onIcon('tabler-check')
+                        ->offIcon('tabler-x')
+                        ->onColor('success')
+                        ->offColor('danger')
+                        ->live()
+                        ->columnSpanFull()
+                        ->visible(fn (Get $get) => $get('PANEL_CLIENT_ALLOCATIONS_ENABLED'))
+                        ->stateCast(new BooleanStateCast(false))
+                        ->default(env('PANEL_CLIENT_ALLOCATIONS_CREATE_NEW', config('panel.client_features.allocations.create_new'))),
                     TextInput::make('PANEL_CLIENT_ALLOCATIONS_RANGE_START')
                         ->label(trans('admin/setting.misc.auto_allocation.start'))
                         ->required()
@@ -756,6 +773,7 @@ class Settings extends Page implements HasSchemas
                         ->hint(trans('admin/setting.misc.server.console_font_hint'))
                         ->label(trans('admin/setting.misc.server.console_font_upload'))
                         ->directory('fonts')
+                        ->disk('public')
                         ->columnSpan(1)
                         ->maxFiles(1)
                         ->preserveFilenames(),
@@ -828,6 +846,8 @@ class Settings extends Page implements HasSchemas
     {
         return [
             Action::make('save')
+                ->iconButton()->iconSize(IconSize::ExtraLarge)
+                ->icon('tabler-device-floppy')
                 ->action('save')
                 ->authorize(fn () => user()?->can('update settings'))
                 ->keyBindings(['mod+s']),

app/Filament/Admin/Pages/ViewLogs.php

@@ -19,14 +19,15 @@ class ViewLogs extends BaseViewLog
     public function getHeaderActions(): array
     {
         return [
+            BackAction::make()
+                ->icon('tabler-arrow-left')->iconSize(IconSize::ExtraLarge)->iconButton(),
             DeleteAction::make(withTooltip: true)
-                ->icon('tabler-trash')->iconSize(IconSize::Medium),
+                ->icon('tabler-trash')->iconSize(IconSize::ExtraLarge)->iconButton(),
             DownloadAction::make(withTooltip: true)
-                ->icon('tabler-file-download')->iconSize(IconSize::Medium),
+                ->icon('tabler-file-download')->iconSize(IconSize::ExtraLarge)->iconButton(),
             Action::make('uploadLogs')
-                ->button()
                 ->hiddenLabel()
-                ->icon('tabler-world-upload')->iconSize(IconSize::Medium)
+                ->icon('tabler-world-upload')->iconSize(IconSize::ExtraLarge)->iconButton()
                 ->requiresConfirmation()
                 ->tooltip(trans('admin/log.actions.upload_tooltip', ['url' => 'logs.pelican.dev']))
                 ->modalHeading(trans('admin/log.actions.upload_logs'))
@@ -98,8 +99,6 @@ class ViewLogs extends BaseViewLog
                         return;
                     }
                 }),
-            BackAction::make()
-                ->icon('tabler-arrow-left')->iconSize(IconSize::Medium),
         ];
     }
 }

app/Filament/Admin/Resources/ApiKeys/ApiKeyResource.php

@@ -12,7 +12,6 @@ use App\Traits\Filament\CanCustomizeRelations;
 use App\Traits\Filament\CanModifyForm;
 use App\Traits\Filament\CanModifyTable;
 use Exception;
-use Filament\Actions\CreateAction;
 use Filament\Actions\DeleteAction;
 use Filament\Forms\Components\TagsInput;
 use Filament\Forms\Components\Textarea;
@@ -21,6 +20,7 @@ use Filament\Resources\Pages\PageRegistration;
 use Filament\Resources\Resource;
 use Filament\Schemas\Components\Fieldset;
 use Filament\Schemas\Schema;
+use Filament\Support\Enums\IconSize;
 use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Table;
 use Illuminate\Database\Eloquent\Builder;
@@ -96,14 +96,12 @@ class ApiKeyResource extends Resource
                     ->url(fn (ApiKey $apiKey) => user()?->can('update', $apiKey->user) ? EditUser::getUrl(['record' => $apiKey->user]) : null),
             ])
             ->recordActions([
-                DeleteAction::make(),
+                DeleteAction::make()
+                    ->iconButton()->iconSize(IconSize::ExtraLarge),
             ])
             ->emptyStateIcon('tabler-key')
             ->emptyStateDescription('')
-            ->emptyStateHeading(trans('admin/apikey.empty'))
-            ->emptyStateActions([
-                CreateAction::make(),
-            ]);
+            ->emptyStateHeading(trans('admin/apikey.empty'));
     }
 
     /**

app/Filament/Admin/Resources/ApiKeys/Pages/CreateApiKey.php

@@ -9,6 +9,7 @@ use App\Traits\Filament\CanCustomizeHeaderWidgets;
 use Filament\Actions\Action;
 use Filament\Actions\ActionGroup;
 use Filament\Resources\Pages\CreateRecord;
+use Filament\Support\Enums\IconSize;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Str;
 
@@ -25,7 +26,9 @@ class CreateApiKey extends CreateRecord
     protected function getDefaultHeaderActions(): array
     {
         return [
-            $this->getCreateFormAction()->formId('form'),
+            $this->getCreateFormAction()->formId('form')
+                ->iconButton()->iconSize(IconSize::ExtraLarge)
+                ->icon('tabler-file-plus'),
         ];
     }
 

app/Filament/Admin/Resources/ApiKeys/Pages/ListApiKeys.php

@@ -3,13 +3,13 @@
 namespace App\Filament\Admin\Resources\ApiKeys\Pages;
 
 use App\Filament\Admin\Resources\ApiKeys\ApiKeyResource;
-use App\Models\ApiKey;
 use App\Traits\Filament\CanCustomizeHeaderActions;
 use App\Traits\Filament\CanCustomizeHeaderWidgets;
 use Filament\Actions\Action;
 use Filament\Actions\ActionGroup;
 use Filament\Actions\CreateAction;
 use Filament\Resources\Pages\ListRecords;
+use Filament\Support\Enums\IconSize;
 
 class ListApiKeys extends ListRecords
 {
@@ -23,7 +23,8 @@ class ListApiKeys extends ListRecords
     {
         return [
             CreateAction::make()
-                ->hidden(fn () => ApiKey::where('key_type', ApiKey::TYPE_APPLICATION)->count() <= 0),
+                ->iconButton()->iconSize(IconSize::ExtraLarge)
+                ->icon('tabler-file-plus'),
         ];
     }
 }

app/Filament/Admin/Resources/DatabaseHosts/DatabaseHostResource.php

@@ -13,7 +13,6 @@ use App\Traits\Filament\CanCustomizeRelations;
 use App\Traits\Filament\CanModifyForm;
 use App\Traits\Filament\CanModifyTable;
 use Exception;
-use Filament\Actions\CreateAction;
 use Filament\Actions\DeleteBulkAction;
 use Filament\Actions\EditAction;
 use Filament\Actions\ViewAction;
@@ -92,7 +91,7 @@ class DatabaseHostResource extends Resource
             ->checkIfRecordIsSelectableUsing(fn (DatabaseHost $databaseHost) => !$databaseHost->databases_count)
             ->recordActions([
                 ViewAction::make()
-                    ->hidden(fn ($record) => static::canEdit($record)),
+                    ->hidden(fn ($record) => static::getEditAuthorizationResponse($record)->allowed()),
                 EditAction::make(),
             ])
             ->groupedBulkActions([
@@ -100,10 +99,7 @@ class DatabaseHostResource extends Resource
             ])
             ->emptyStateIcon('tabler-database')
             ->emptyStateDescription('')
-            ->emptyStateHeading(trans('admin/databasehost.no_database_hosts'))
-            ->emptyStateActions([
-                CreateAction::make(),
-            ]);
+            ->emptyStateHeading(trans('admin/databasehost.no_database_hosts'));
     }
 
     /**

app/Filament/Admin/Resources/DatabaseHosts/Pages/EditDatabaseHost.php

@@ -12,6 +12,7 @@ use Filament\Actions\ActionGroup;
 use Filament\Actions\DeleteAction;
 use Filament\Notifications\Notification;
 use Filament\Resources\Pages\EditRecord;
+use Filament\Support\Enums\IconSize;
 use Filament\Support\Exceptions\Halt;
 use Illuminate\Database\Eloquent\Model;
 use PDOException;
@@ -36,8 +37,11 @@ class EditDatabaseHost extends EditRecord
         return [
             DeleteAction::make()
                 ->label(fn (DatabaseHost $databaseHost) => $databaseHost->databases()->count() > 0 ? trans('admin/databasehost.delete_help') : trans('filament-actions::delete.single.modal.actions.delete.label'))
-                ->disabled(fn (DatabaseHost $databaseHost) => $databaseHost->databases()->count() > 0),
-            $this->getSaveFormAction()->formId('form'),
+                ->disabled(fn (DatabaseHost $databaseHost) => $databaseHost->databases()->count() > 0)
+                ->iconButton()->iconSize(IconSize::ExtraLarge),
+            $this->getSaveFormAction()->formId('form')
+                ->iconButton()->iconSize(IconSize::ExtraLarge)
+                ->icon('tabler-device-floppy'),
         ];
     }
 

app/Filament/Admin/Resources/DatabaseHosts/Pages/ListDatabaseHosts.php

@@ -3,13 +3,13 @@
 namespace App\Filament\Admin\Resources\DatabaseHosts\Pages;
 
 use App\Filament\Admin\Resources\DatabaseHosts\DatabaseHostResource;
-use App\Models\DatabaseHost;
 use App\Traits\Filament\CanCustomizeHeaderActions;
 use App\Traits\Filament\CanCustomizeHeaderWidgets;
 use Filament\Actions\Action;
 use Filament\Actions\ActionGroup;
 use Filament\Actions\CreateAction;
 use Filament\Resources\Pages\ListRecords;
+use Filament\Support\Enums\IconSize;
 
 class ListDatabaseHosts extends ListRecords
 {
@@ -23,7 +23,8 @@ class ListDatabaseHosts extends ListRecords
     {
         return [
             CreateAction::make()
-                ->hidden(fn () => DatabaseHost::count() <= 0),
+                ->iconButton()->iconSize(IconSize::ExtraLarge)
+                ->icon('tabler-file-plus'),
         ];
     }
 }

app/Filament/Admin/Resources/DatabaseHosts/Pages/ViewDatabaseHost.php

@@ -9,6 +9,7 @@ use Filament\Actions\Action;
 use Filament\Actions\ActionGroup;
 use Filament\Actions\EditAction;
 use Filament\Resources\Pages\ViewRecord;
+use Filament\Support\Enums\IconSize;
 
 class ViewDatabaseHost extends ViewRecord
 {
@@ -21,7 +22,8 @@ class ViewDatabaseHost extends ViewRecord
     protected function getDefaultHeaderActions(): array
     {
         return [
-            EditAction::make(),
+            EditAction::make()
+                ->iconButton()->iconSize(IconSize::ExtraLarge),
         ];
     }
 }

app/Filament/Admin/Resources/DatabaseHosts/RelationManagers/DatabasesRelationManager.php

@@ -10,6 +10,7 @@ use Filament\Actions\ViewAction;
 use Filament\Forms\Components\TextInput;
 use Filament\Resources\RelationManagers\RelationManager;
 use Filament\Schemas\Schema;
+use Filament\Support\Enums\IconSize;
 use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Table;
 
@@ -69,7 +70,8 @@ class DatabasesRelationManager extends RelationManager
             ->recordActions([
                 ViewAction::make()
                     ->color('primary'),
-                DeleteAction::make(),
+                DeleteAction::make()
+                    ->iconButton()->iconSize(IconSize::ExtraLarge),
             ]);
     }
 }

app/Filament/Admin/Resources/Eggs/Pages/CreateEgg.php

@@ -27,6 +27,7 @@ use Filament\Schemas\Components\Tabs\Tab;
 use Filament\Schemas\Components\Utilities\Get;
 use Filament\Schemas\Components\Utilities\Set;
 use Filament\Schemas\Schema;
+use Filament\Support\Enums\IconSize;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Str;
 use Illuminate\Validation\Rules\Unique;
@@ -44,7 +45,9 @@ class CreateEgg extends CreateRecord
     protected function getDefaultHeaderActions(): array
     {
         return [
-            $this->getCreateFormAction()->formId('form'),
+            $this->getCreateFormAction()->formId('form')
+                ->iconButton()->iconSize(IconSize::ExtraLarge)
+                ->icon('tabler-file-plus'),
         ];
     }
 
@@ -124,7 +127,7 @@ class CreateEgg extends CreateRecord
                                 ->keyLabel(trans('admin/egg.docker_name'))
                                 ->keyPlaceholder('Java 21')
                                 ->valueLabel(trans('admin/egg.docker_uri'))
-                                ->valuePlaceholder('ghcr.io/parkervcp/yolks:java_21')
+                                ->valuePlaceholder('ghcr.io/pelican-eggs/yolks:java_21')
                                 ->helperText(trans('admin/egg.docker_help')),
                         ]),
 

app/Filament/Admin/Resources/Eggs/Pages/EditEgg.php

@@ -451,11 +451,14 @@ class EditEgg extends EditRecord
         return [
             DeleteAction::make()
                 ->disabled(fn (Egg $egg): bool => $egg->servers()->count() > 0)
-                ->label(fn (Egg $egg): string => $egg->servers()->count() <= 0 ? trans('filament-actions::delete.single.label') : trans('admin/egg.in_use')),
+                ->label(fn (Egg $egg): string => $egg->servers()->count() <= 0 ? trans('filament-actions::delete.single.label') : trans('admin/egg.in_use'))
+                ->iconButton()->iconSize(IconSize::ExtraLarge),
             ExportEggAction::make(),
             ImportEggAction::make()
                 ->multiple(false),
-            $this->getSaveFormAction()->formId('form'),
+            $this->getSaveFormAction()->formId('form')
+                ->iconButton()->iconSize(IconSize::ExtraLarge)
+                ->icon('tabler-device-floppy'),
         ];
     }
 

app/Filament/Admin/Resources/Eggs/Pages/ListEggs.php

@@ -19,6 +19,7 @@ use Filament\Actions\DeleteBulkAction;
 use Filament\Actions\EditAction;
 use Filament\Actions\ReplicateAction;
 use Filament\Resources\Pages\ListRecords;
+use Filament\Support\Enums\IconSize;
 use Filament\Tables\Columns\ImageColumn;
 use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Table;
@@ -63,16 +64,18 @@ class ListEggs extends ListRecords
             ->recordActions([
                 EditAction::make()
                     ->iconButton()
-                    ->tooltip(trans('filament-actions::edit.single.label')),
+                    ->tooltip(trans('filament-actions::edit.single.label'))
+                    ->iconSize(IconSize::Large),
                 ExportEggAction::make()
-                    ->iconButton()
-                    ->tooltip(trans('filament-actions::export.modal.actions.export.label')),
+                    ->tooltip(trans('filament-actions::export.modal.actions.export.label'))
+                    ->iconSize(IconSize::Large),
                 UpdateEggAction::make()
-                    ->iconButton()
-                    ->tooltip(trans_choice('admin/egg.update', 1)),
+                    ->tooltip(trans_choice('admin/egg.update', 1))
+                    ->iconSize(IconSize::Large),
                 ReplicateAction::make()
                     ->iconButton()
                     ->tooltip(trans('filament-actions::replicate.single.label'))
+                    ->iconSize(IconSize::Large)
                     ->modal(false)
                     ->excludeAttributes(['author', 'uuid', 'update_url', 'servers_count', 'created_at', 'updated_at'])
                     ->beforeReplicaSaved(function (Egg $replica) {
@@ -98,11 +101,6 @@ class ListEggs extends ListRecords
             ->emptyStateIcon('tabler-eggs')
             ->emptyStateDescription('')
             ->emptyStateHeading(trans('admin/egg.no_eggs'))
-            ->emptyStateActions([
-                CreateAction::make(),
-                ImportEggAction::make()
-                    ->multiple(),
-            ])
             ->filters([
                 TagsFilter::make()
                     ->model(Egg::class),
@@ -117,7 +115,9 @@ class ListEggs extends ListRecords
         return [
             ImportEggAction::make()
                 ->multiple(),
-            CreateAction::make(),
+            CreateAction::make()
+                ->icon('tabler-file-plus')
+                ->iconButton()->iconSize(IconSize::ExtraLarge),
         ];
     }
 }

app/Filament/Admin/Resources/Mounts/MountResource.php

@@ -12,7 +12,6 @@ use App\Traits\Filament\CanCustomizeRelations;
 use App\Traits\Filament\CanModifyForm;
 use App\Traits\Filament\CanModifyTable;
 use Exception;
-use Filament\Actions\CreateAction;
 use Filament\Actions\DeleteBulkAction;
 use Filament\Actions\EditAction;
 use Filament\Actions\ViewAction;
@@ -96,7 +95,7 @@ class MountResource extends Resource
             ])
             ->recordActions([
                 ViewAction::make()
-                    ->hidden(fn ($record) => static::canEdit($record)),
+                    ->hidden(fn ($record) => static::getEditAuthorizationResponse($record)->allowed()),
                 EditAction::make(),
             ])
             ->groupedBulkActions([
@@ -104,10 +103,7 @@ class MountResource extends Resource
             ])
             ->emptyStateIcon('tabler-layers-linked')
             ->emptyStateDescription('')
-            ->emptyStateHeading(trans('admin/mount.no_mounts'))
-            ->emptyStateActions([
-                CreateAction::make(),
-            ]);
+            ->emptyStateHeading(trans('admin/mount.no_mounts'));
     }
 
     /**

app/Filament/Admin/Resources/Mounts/Pages/CreateMount.php

@@ -8,6 +8,7 @@ use App\Traits\Filament\CanCustomizeHeaderWidgets;
 use Filament\Actions\Action;
 use Filament\Actions\ActionGroup;
 use Filament\Resources\Pages\CreateRecord;
+use Filament\Support\Enums\IconSize;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Str;
 
@@ -24,7 +25,9 @@ class CreateMount extends CreateRecord
     protected function getDefaultHeaderActions(): array
     {
         return [
-            $this->getCreateFormAction()->formId('form'),
+            $this->getCreateFormAction()->formId('form')
+                ->iconButton()->iconSize(IconSize::ExtraLarge)
+                ->icon('tabler-file-plus'),
         ];
     }
 

app/Filament/Admin/Resources/Mounts/Pages/EditMount.php

@@ -9,6 +9,7 @@ use Filament\Actions\Action;
 use Filament\Actions\ActionGroup;
 use Filament\Actions\DeleteAction;
 use Filament\Resources\Pages\EditRecord;
+use Filament\Support\Enums\IconSize;
 
 class EditMount extends EditRecord
 {
@@ -21,8 +22,11 @@ class EditMount extends EditRecord
     protected function getDefaultHeaderActions(): array
     {
         return [
-            DeleteAction::make(),
-            $this->getSaveFormAction()->formId('form'),
+            DeleteAction::make()
+                ->iconButton()->iconSize(IconSize::ExtraLarge),
+            $this->getSaveFormAction()->formId('form')
+                ->iconButton()->iconSize(IconSize::ExtraLarge)
+                ->icon('tabler-device-floppy'),
         ];
     }
 

app/Filament/Admin/Resources/Mounts/Pages/ListMounts.php

@@ -3,13 +3,13 @@
 namespace App\Filament\Admin\Resources\Mounts\Pages;
 
 use App\Filament\Admin\Resources\Mounts\MountResource;
-use App\Models\Mount;
 use App\Traits\Filament\CanCustomizeHeaderActions;
 use App\Traits\Filament\CanCustomizeHeaderWidgets;
 use Filament\Actions\Action;
 use Filament\Actions\ActionGroup;
 use Filament\Actions\CreateAction;
 use Filament\Resources\Pages\ListRecords;
+use Filament\Support\Enums\IconSize;
 
 class ListMounts extends ListRecords
 {
@@ -23,7 +23,8 @@ class ListMounts extends ListRecords
     {
         return [
             CreateAction::make()
-                ->hidden(fn () => Mount::count() <= 0),
+                ->iconButton()->iconSize(IconSize::ExtraLarge)
+                ->icon('tabler-file-plus'),
         ];
     }
 }

app/Filament/Admin/Resources/Mounts/Pages/ViewMount.php

@@ -9,6 +9,7 @@ use Filament\Actions\Action;
 use Filament\Actions\ActionGroup;
 use Filament\Actions\EditAction;
 use Filament\Resources\Pages\ViewRecord;
+use Filament\Support\Enums\IconSize;
 
 class ViewMount extends ViewRecord
 {
@@ -21,7 +22,9 @@ class ViewMount extends ViewRecord
     protected function getDefaultHeaderActions(): array
     {
         return [
-            EditAction::make(),
+            EditAction::make()
+                ->iconSize(IconSize::ExtraLarge)
+                ->iconButton(),
         ];
     }
 }

app/Filament/Admin/Resources/Nodes/NodeResource.php

@@ -7,7 +7,7 @@ use App\Filament\Admin\Resources\Nodes\Pages\CreateNode;
 use App\Filament\Admin\Resources\Nodes\Pages\EditNode;
 use App\Filament\Admin\Resources\Nodes\Pages\ListNodes;
 use App\Filament\Admin\Resources\Nodes\RelationManagers\AllocationsRelationManager;
-use App\Filament\Admin\Resources\Nodes\RelationManagers\NodesRelationManager;
+use App\Filament\Admin\Resources\Nodes\RelationManagers\ServersRelationManager;
 use App\Models\Node;
 use App\Traits\Filament\CanCustomizePages;
 use App\Traits\Filament\CanCustomizeRelations;
@@ -57,7 +57,7 @@ class NodeResource extends Resource
     {
         return [
             AllocationsRelationManager::class,
-            NodesRelationManager::class,
+            ServersRelationManager::class,
         ];
     }
 

app/Filament/Admin/Resources/Nodes/Pages/CreateNode.php

@@ -19,6 +19,7 @@ use Filament\Schemas\Components\Utilities\Set;
 use Filament\Schemas\Components\Wizard;
 use Filament\Schemas\Components\Wizard\Step;
 use Filament\Schemas\Schema;
+use Filament\Support\Enums\IconSize;
 use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\HtmlString;
 
@@ -400,14 +401,16 @@ class CreateNode extends CreateRecord
                                 ]),
                         ]),
                 ])->columnSpanFull()
-                    ->nextAction(fn (Action $action) => $action->label(trans('admin/node.next_step')))
+                    ->nextAction(fn (Action $action) => $action->label(trans('admin/node.next_step'))->iconButton()->iconSize(IconSize::ExtraLarge)->icon('tabler-arrow-right'))
+                    ->previousAction(fn (Action $action) => $action->iconButton()->iconSize(IconSize::ExtraLarge)->icon('tabler-arrow-left'))
                     ->submitAction(new HtmlString(Blade::render(<<<'BLADE'
-                                        <x-filament::button
+                                        <x-filament::icon-button
                                                 type="submit"
-                                                size="sm"
+                                                iconSize="xl"
+                                                icon="tabler-file-plus"
                                             >
                                                 {{ trans('admin/node.create') }}
-                                            </x-filament::button>
+                                            </x-filament::icon-button>
                                         BLADE))),
             ]);
     }

app/Filament/Admin/Resources/Nodes/Pages/EditNode.php

@@ -810,8 +810,11 @@ class EditNode extends EditRecord
         return [
             DeleteAction::make()
                 ->disabled(fn (Node $node) => $node->servers()->count() > 0)
-                ->label(fn (Node $node) => $node->servers()->count() > 0 ? trans('admin/node.node_has_servers') : trans('filament-actions::delete.single.label')),
-            $this->getSaveFormAction()->formId('form'),
+                ->label(fn (Node $node) => $node->servers()->count() > 0 ? trans('admin/node.node_has_servers') : trans('filament-actions::delete.single.label'))
+                ->iconButton()->iconSize(IconSize::ExtraLarge),
+            $this->getSaveFormAction()->formId('form')
+                ->iconButton()->iconSize(IconSize::ExtraLarge)
+                ->icon('tabler-device-floppy'),
         ];
     }
 

app/Filament/Admin/Resources/Nodes/Pages/ListNodes.php

@@ -13,6 +13,7 @@ use Filament\Actions\ActionGroup;
 use Filament\Actions\CreateAction;
 use Filament\Actions\EditAction;
 use Filament\Resources\Pages\ListRecords;
+use Filament\Support\Enums\IconSize;
 use Filament\Tables\Columns\IconColumn;
 use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Table;
@@ -67,9 +68,6 @@ class ListNodes extends ListRecords
             ->emptyStateIcon('tabler-server-2')
             ->emptyStateDescription('')
             ->emptyStateHeading(trans('admin/node.no_nodes'))
-            ->emptyStateActions([
-                CreateAction::make(),
-            ])
             ->filters([
                 TagsFilter::make()
                     ->model(Node::class),
@@ -81,7 +79,8 @@ class ListNodes extends ListRecords
     {
         return [
             CreateAction::make()
-                ->hidden(fn () => Node::count() <= 0),
+                ->iconButton()->iconSize(IconSize::ExtraLarge)
+                ->icon('tabler-file-plus'),
         ];
     }
 }

app/Filament/Admin/Resources/Nodes/RelationManagers/AllocationsRelationManager.php

@@ -16,6 +16,7 @@ use Filament\Forms\Components\TextInput;
 use Filament\Resources\RelationManagers\RelationManager;
 use Filament\Schemas\Components\Utilities\Get;
 use Filament\Schemas\Components\Utilities\Set;
+use Filament\Support\Enums\IconSize;
 use Filament\Tables\Columns\SelectColumn;
 use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Columns\TextInputColumn;
@@ -86,6 +87,8 @@ class AllocationsRelationManager extends RelationManager
                     ->authorize(fn () => user()?->can('update', $this->getOwnerRecord())),
                 Action::make('create new allocation')
                     ->label(trans('admin/node.create_allocation'))
+                    ->icon('tabler-world-plus')
+                    ->iconButton()->iconSize(IconSize::ExtraLarge)
                     ->schema(fn () => [
                         Select::make('allocation_ip')
                             ->options(fn () => collect($this->getOwnerRecord()->ipAddresses())->mapWithKeys(fn (string $ip) => [$ip => $ip]))

app/Filament/Admin/Resources/Nodes/RelationManagers/ServersRelationManager.php

@@ -2,13 +2,14 @@
 
 namespace App\Filament\Admin\Resources\Nodes\RelationManagers;
 
+use App\Enums\ServerResourceType;
 use App\Models\Server;
 use Filament\Resources\RelationManagers\RelationManager;
 use Filament\Tables\Columns\SelectColumn;
 use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Table;
 
-class NodesRelationManager extends RelationManager
+class ServersRelationManager extends RelationManager
 {
     protected static string $relationship = 'servers';
 
@@ -42,11 +43,18 @@ class NodesRelationManager extends RelationManager
                     ->label(trans('admin/node.primary_allocation'))
                     ->disabled(fn (Server $server) => $server->allocations->count() <= 1)
                     ->options(fn (Server $server) => $server->allocations->take(1)->mapWithKeys(fn ($allocation) => [$allocation->id => $allocation->address]))
-                    ->selectablePlaceholder(fn (SelectColumn $select) => !$select->isDisabled())
-                    ->placeholder(trans('admin/node.none'))
+                    ->selectablePlaceholder(fn (Server $server) => $server->allocations->count() <= 1)
+                    ->placeholder(trans('admin/server.none'))
                     ->sortable(),
-                TextColumn::make('memory')->label(trans('admin/node.memory')),
-                TextColumn::make('cpu')->label(trans('admin/node.cpu')),
+                TextColumn::make('cpu')
+                    ->label(trans('admin/node.cpu'))
+                    ->state(fn (Server $server) => $server->formatResource(ServerResourceType::CPULimit)),
+                TextColumn::make('memory')
+                    ->label(trans('admin/node.memory'))
+                    ->state(fn (Server $server) => $server->formatResource(ServerResourceType::MemoryLimit)),
+                TextColumn::make('disk')
+                    ->label(trans('admin/node.disk'))
+                    ->state(fn (Server $server) => $server->formatResource(ServerResourceType::DiskLimit)),
                 TextColumn::make('databases_count')
                     ->counts('databases')
                     ->label(trans('admin/node.databases'))

app/Filament/Admin/Resources/Roles/Pages/CreateRole.php

@@ -9,6 +9,7 @@ use App\Traits\Filament\CanCustomizeHeaderWidgets;
 use Filament\Actions\Action;
 use Filament\Actions\ActionGroup;
 use Filament\Resources\Pages\CreateRecord;
+use Filament\Support\Enums\IconSize;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
 use Spatie\Permission\Models\Permission;
@@ -31,7 +32,9 @@ class CreateRole extends CreateRecord
     protected function getDefaultHeaderActions(): array
     {
         return [
-            $this->getCreateFormAction()->formId('form'),
+            $this->getCreateFormAction()->formId('form')
+                ->iconButton()->iconSize(IconSize::ExtraLarge)
+                ->icon('tabler-plus'),
         ];
     }
 

app/Filament/Admin/Resources/Roles/Pages/EditRole.php

@@ -10,6 +10,7 @@ use Filament\Actions\Action;
 use Filament\Actions\ActionGroup;
 use Filament\Actions\DeleteAction;
 use Filament\Resources\Pages\EditRecord;
+use Filament\Support\Enums\IconSize;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
 use Spatie\Permission\Models\Permission;
@@ -57,8 +58,12 @@ class EditRole extends EditRecord
     {
         return [
             DeleteAction::make()
+                ->label(fn (Role $role) => $role->isRootAdmin() ? trans('admin/role.root_admin_delete') : ($role->users_count >= 1 ? trans('admin/role.in_use') : trans('filament-actions::delete.single.label')))
                 ->disabled(fn (Role $role) => $role->isRootAdmin() || $role->users_count >= 1)
-                ->label(fn (Role $role) => $role->isRootAdmin() ? trans('admin/role.root_admin_delete') : ($role->users_count >= 1 ? trans('admin/role.in_use') : trans('filament-actions::delete.single.label'))),            $this->getSaveFormAction()->formId('form'),
+                ->iconButton()->iconSize(IconSize::ExtraLarge),
+            $this->getSaveFormAction()->formId('form')
+                ->iconButton()->iconSize(IconSize::ExtraLarge)
+                ->icon('tabler-device-floppy'),
         ];
     }
 

app/Filament/Admin/Resources/Roles/Pages/ListRoles.php

@@ -9,6 +9,7 @@ use Filament\Actions\Action;
 use Filament\Actions\ActionGroup;
 use Filament\Actions\CreateAction;
 use Filament\Resources\Pages\ListRecords;
+use Filament\Support\Enums\IconSize;
 
 class ListRoles extends ListRecords
 {
@@ -21,7 +22,9 @@ class ListRoles extends ListRecords
     protected function getDefaultHeaderActions(): array
     {
         return [
-            CreateAction::make(),
+            CreateAction::make()
+                ->icon('tabler-file-plus')
+                ->iconButton()->iconSize(IconSize::ExtraLarge),
         ];
     }
 }

app/Filament/Admin/Resources/Roles/Pages/ViewRole.php

@@ -9,6 +9,7 @@ use Filament\Actions\Action;
 use Filament\Actions\ActionGroup;
 use Filament\Actions\EditAction;
 use Filament\Resources\Pages\ViewRecord;
+use Filament\Support\Enums\IconSize;
 
 class ViewRole extends ViewRecord
 {
@@ -21,7 +22,8 @@ class ViewRole extends ViewRecord
     protected function getDefaultHeaderActions(): array
     {
         return [
-            EditAction::make(),
+            EditAction::make()
+                ->iconButton()->iconSize(IconSize::ExtraLarge),
         ];
     }
 }

app/Filament/Admin/Resources/Roles/RoleResource.php

@@ -15,7 +15,6 @@ use App\Traits\Filament\CanModifyTable;
 use BackedEnum;
 use Exception;
 use Filament\Actions\Action;
-use Filament\Actions\CreateAction;
 use Filament\Actions\DeleteBulkAction;
 use Filament\Actions\EditAction;
 use Filament\Actions\ViewAction;
@@ -98,18 +97,12 @@ class RoleResource extends Resource
             ])
             ->recordActions([
                 ViewAction::make()
-                    ->hidden(fn ($record) => static::canEdit($record)),
+                    ->hidden(fn ($record) => static::getEditAuthorizationResponse($record)->allowed()),
                 EditAction::make(),
             ])
             ->checkIfRecordIsSelectableUsing(fn (Role $role) => !$role->isRootAdmin() && $role->users_count <= 0)
             ->groupedBulkActions([
                 DeleteBulkAction::make(),
-            ])
-            ->emptyStateIcon('tabler-users-group')
-            ->emptyStateDescription('')
-            ->emptyStateHeading(trans('admin/role.no_roles'))
-            ->emptyStateActions([
-                CreateAction::make(),
             ]);
     }
 
@@ -124,7 +117,7 @@ class RoleResource extends Resource
             $options = [];
 
             foreach ($permissions as $permission) {
-                $options[$permission . ' ' . strtolower($model)] = Str::headline($permission);
+                $options[$permission . ' ' . $model] = Str::headline($permission);
             }
 
             $permissionSections[] = self::makeSection($model, $options);
@@ -167,23 +160,11 @@ class RoleResource extends Resource
      */
     private static function makeSection(string $model, array $options): Section
     {
-        $model = ucwords($model);
-
-        $icon = null;
-
-        if (class_exists('\App\Filament\Admin\Resources\\' . $model . 'Resource')) {
-            $icon = ('\App\Filament\Admin\Resources\\' . $model . 'Resource')::getNavigationIcon();
-        } elseif (class_exists('\App\Filament\Admin\Pages\\' . $model)) {
-            $icon = ('\App\Filament\Admin\Pages\\' . $model)::getNavigationIcon();
-        } elseif (class_exists('\App\Filament\Server\Resources\\' . $model . 'Resource')) {
-            $icon = ('\App\Filament\Server\Resources\\' . $model . 'Resource')::getNavigationIcon();
-        }
-
         return Section::make(Str::headline($model))
             ->columnSpan(1)
             ->collapsible()
             ->collapsed()
-            ->icon($icon)
+            ->icon(Role::getModelIcon($model))
             ->headerActions([
                 Action::make('count')
                     ->label(fn (Get $get) => count($get(strtolower($model) . '_list')))

app/Filament/Admin/Resources/Servers/Pages/CreateServer.php

@@ -413,6 +413,7 @@ class CreateServer extends CreateRecord
                             Select::make('select_startup')
                                 ->label(trans('admin/server.startup_cmd'))
                                 ->hidden(fn (Get $get) => $get('egg_id') === null)
+                                ->required()
                                 ->live()
                                 ->afterStateUpdated(fn (Set $set, $state) => $set('startup', $state))
                                 ->options(function ($state, Get $get, Set $set) {
@@ -426,7 +427,7 @@ class CreateServer extends CreateRecord
                                         $set('select_startup', $currentStartup);
                                     }
 
-                                    return array_flip($startups) + ['' => 'Custom Startup'];
+                                    return array_flip($startups) + ['custom' => 'Custom Startup'];
                                 })
                                 ->selectablePlaceholder(false)
                                 ->columnSpanFull(),
@@ -444,7 +445,7 @@ class CreateServer extends CreateRecord
                                     if (in_array($state, $startups)) {
                                         $set('select_startup', $state);
                                     } else {
-                                        $set('select_startup', '');
+                                        $set('select_startup', 'custom');
                                     }
                                 })
                                 ->placeholder(trans('admin/server.startup_placeholder'))

app/Filament/Admin/Resources/Servers/Pages/EditServer.php

@@ -12,7 +12,6 @@ use App\Filament\Components\StateCasts\ServerConditionStateCast;
 use App\Filament\Server\Pages\Console;
 use App\Models\Allocation;
 use App\Models\Egg;
-use App\Models\Node;
 use App\Models\Server;
 use App\Models\User;
 use App\Repositories\Daemon\DaemonServerRepository;
@@ -29,6 +28,7 @@ use Exception;
 use Filament\Actions\Action;
 use Filament\Actions\ActionGroup;
 use Filament\Forms\Components\CodeEditor;
+use Filament\Forms\Components\FileUpload;
 use Filament\Forms\Components\Hidden;
 use Filament\Forms\Components\KeyValue;
 use Filament\Forms\Components\Repeater;
@@ -38,12 +38,14 @@ use Filament\Forms\Components\Textarea;
 use Filament\Forms\Components\TextInput;
 use Filament\Forms\Components\Toggle;
 use Filament\Forms\Components\ToggleButtons;
+use Filament\Infolists\Components\TextEntry;
 use Filament\Notifications\Notification;
 use Filament\Resources\Pages\EditRecord;
 use Filament\Schemas\Components\Actions;
 use Filament\Schemas\Components\Component;
 use Filament\Schemas\Components\Fieldset;
 use Filament\Schemas\Components\Grid;
+use Filament\Schemas\Components\Image;
 use Filament\Schemas\Components\StateCasts\BooleanStateCast;
 use Filament\Schemas\Components\Tabs;
 use Filament\Schemas\Components\Tabs\Tab;
@@ -51,6 +53,7 @@ use Filament\Schemas\Components\Utilities\Get;
 use Filament\Schemas\Components\Utilities\Set;
 use Filament\Schemas\Schema;
 use Filament\Support\Enums\Alignment;
+use Filament\Support\Enums\IconSize;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Http\Client\ConnectionException;
 use Illuminate\Support\Arr;
@@ -94,88 +97,265 @@ class EditServer extends EditRecord
                             ->label(trans('admin/server.tabs.information'))
                             ->icon('tabler-info-circle')
                             ->schema([
-                                TextInput::make('name')
-                                    ->prefixIcon('tabler-server')
-                                    ->label(trans('admin/server.name'))
-                                    ->suffixAction(Action::make('random')
-                                        ->icon('tabler-dice-' . random_int(1, 6))
-                                        ->action(function (Set $set, Get $get) {
-                                            $egg = Egg::find($get('egg_id'));
-                                            $prefix = $egg ? str($egg->name)->lower()->kebab() . '-' : '';
-
-                                            $word = (new RandomWordService())->word();
-
-                                            $set('name', $prefix . $word);
-                                        }))
-                                    ->columnSpan([
-                                        'default' => 2,
-                                        'sm' => 1,
-                                        'md' => 2,
-                                        'lg' => 3,
-                                    ])
-                                    ->required()
-                                    ->maxLength(255),
-                                Select::make('owner_id')
-                                    ->prefixIcon('tabler-user')
-                                    ->label(trans('admin/server.owner'))
-                                    ->columnSpan([
-                                        'default' => 2,
-                                        'sm' => 1,
-                                        'md' => 2,
-                                        'lg' => 2,
-                                    ])
-                                    ->relationship('user', 'username')
-                                    ->searchable(['username', 'email'])
-                                    ->getOptionLabelFromRecordUsing(fn (User $user) => "$user->username ($user->email)")
-                                    ->preload()
-                                    ->required(),
-                                ToggleButtons::make('condition')
-                                    ->label(trans('admin/server.server_status'))
-                                    ->formatStateUsing(fn (Server $server) => $server->condition)
-                                    ->options(fn ($state) => [$state->value => $state->getLabel()])
-                                    ->colors(fn ($state) => [$state->value => $state->getColor()])
-                                    ->icons(fn ($state) => [$state->value => $state->getIcon()])
-                                    ->stateCast(new ServerConditionStateCast())
-                                    ->columnSpan([
-                                        'default' => 2,
-                                        'sm' => 1,
-                                        'md' => 1,
-                                        'lg' => 1,
-                                    ])
-                                    ->hintAction(
-                                        Action::make('view_install_log')
-                                            ->label(trans('admin/server.view_install_log'))
-                                            //->visible(fn (Server $server) => $server->isFailedInstall())
-                                            ->modalHeading('')
-                                            ->modalSubmitAction(false)
-                                            ->modalFooterActionsAlignment(Alignment::Right)
-                                            ->modalCancelActionLabel(trans('filament::components/modal.actions.close.label'))
+                                Grid::make()
+                                    ->columns(2)
+                                    ->columnStart(1)
+                                    ->schema([
+                                        Image::make('', 'icon')
+                                            ->hidden(fn ($record) => !$record->icon && !$record->egg->image)
+                                            ->url(fn ($record) => $record->icon ?: $record->egg->image)
+                                            ->tooltip(fn ($record) => $record->icon ? '' : trans('server/setting.server_info.icon.tooltip'))
+                                            ->columnSpan(2)
+                                            ->alignJustify(),
+                                        Action::make('uploadIcon')
+                                            ->iconButton()->iconSize(IconSize::Large)
+                                            ->icon('tabler-photo-up')
+                                            ->modal()
+                                            ->modalSubmitActionLabel(trans('server/setting.server_info.icon.upload'))
                                             ->schema([
-                                                CodeEditor::make('logs')
-                                                    ->hiddenLabel()
-                                                    ->formatStateUsing(function (Server $server, DaemonServerRepository $serverRepository) {
-                                                        try {
-                                                            return $serverRepository->setServer($server)->getInstallLogs();
-                                                        } catch (ConnectionException) {
-                                                            Notification::make()
-                                                                ->title(trans('admin/server.notifications.error_connecting', ['node' => $server->node->name]))
-                                                                ->body(trans('admin/server.notifications.log_failed'))
-                                                                ->color('warning')
-                                                                ->warning()
-                                                                ->send();
-                                                        } catch (Exception) {
-                                                            return '';
-                                                        }
+                                                Tabs::make()->tabs([
+                                                    Tab::make(trans('admin/egg.import.url'))
+                                                        ->schema([
+                                                            Hidden::make('base64Image'),
+                                                            TextInput::make('image_url')
+                                                                ->label(trans('admin/egg.import.image_url'))
+                                                                ->reactive()
+                                                                ->autocomplete(false)
+                                                                ->debounce(500)
+                                                                ->afterStateUpdated(function ($state, Set $set) {
+                                                                    if (!$state) {
+                                                                        $set('image_url_error', null);
 
-                                                        return '';
-                                                    }),
+                                                                        return;
+                                                                    }
+
+                                                                    try {
+                                                                        if (!in_array(parse_url($state, PHP_URL_SCHEME), ['http', 'https'], true)) {
+                                                                            throw new \Exception(trans('admin/egg.import.invalid_url'));
+                                                                        }
+
+                                                                        if (!filter_var($state, FILTER_VALIDATE_URL)) {
+                                                                            throw new \Exception(trans('admin/egg.import.invalid_url'));
+                                                                        }
+
+                                                                        $allowedExtensions = [
+                                                                            'png' => 'image/png',
+                                                                            'jpg' => 'image/jpeg',
+                                                                            'jpeg' => 'image/jpeg',
+                                                                            'gif' => 'image/gif',
+                                                                            'webp' => 'image/webp',
+                                                                            'svg' => 'image/svg+xml',
+                                                                        ];
+
+                                                                        $extension = strtolower(pathinfo(parse_url($state, PHP_URL_PATH), PATHINFO_EXTENSION));
+
+                                                                        if (!array_key_exists($extension, $allowedExtensions)) {
+                                                                            throw new \Exception(trans('admin/egg.import.unsupported_format', ['format' => implode(', ', array_keys($allowedExtensions))]));
+                                                                        }
+
+                                                                        $host = parse_url($state, PHP_URL_HOST);
+                                                                        $ip = gethostbyname($host);
+
+                                                                        if (
+                                                                            filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE) === false
+                                                                        ) {
+                                                                            throw new \Exception(trans('admin/egg.import.no_local_ip'));
+                                                                        }
+
+                                                                        $context = stream_context_create([
+                                                                            'http' => ['timeout' => 3],
+                                                                            'https' => [
+                                                                                'timeout' => 3,
+                                                                                'verify_peer' => true,
+                                                                                'verify_peer_name' => true,
+                                                                            ],
+                                                                        ]);
+
+                                                                        $imageContent = @file_get_contents($state, false, $context, 0, 262144); //256KB
+
+                                                                        if (!$imageContent) {
+                                                                            throw new \Exception(trans('admin/egg.import.image_error'));
+                                                                        }
+
+                                                                        $mimeType = $allowedExtensions[$extension];
+                                                                        $base64 = 'data:' . $mimeType . ';base64,' . base64_encode($imageContent);
+
+                                                                        $set('base64Image', $base64);
+                                                                        $set('image_url_error', null);
+
+                                                                    } catch (\Exception $e) {
+                                                                        $set('image_url_error', $e->getMessage());
+                                                                        $set('base64Image', null);
+                                                                    }
+                                                                }),
+                                                            TextEntry::make('image_url_error')
+                                                                ->hiddenLabel()
+                                                                ->visible(fn (Get $get) => $get('image_url_error') !== null)
+                                                                ->afterStateHydrated(fn (Get $get) => $get('image_url_error')),
+                                                            Image::make(fn (Get $get) => $get('image_url'), '')
+                                                                ->imageSize(150)
+                                                                ->visible(fn (Get $get) => $get('image_url') && !$get('image_url_error'))
+                                                                ->alignCenter(),
+                                                        ]),
+                                                    Tab::make(trans('admin/egg.import.file'))
+                                                        ->schema([
+                                                            FileUpload::make('image')
+                                                                ->hiddenLabel()
+                                                                ->previewable()
+                                                                ->openable(false)
+                                                                ->downloadable(false)
+                                                                ->maxSize(256)
+                                                                ->maxFiles(1)
+                                                                ->columnSpanFull()
+                                                                ->alignCenter()
+                                                                ->imageEditor()
+                                                                ->image()
+                                                                ->saveUploadedFileUsing(function ($file, Set $set) {
+                                                                    $base64 = "data:{$file->getMimeType()};base64,". base64_encode(file_get_contents($file->getRealPath()));
+                                                                    $set('base64Image', $base64);
+
+                                                                    return $base64;
+                                                                }),
+                                                        ]),
+                                                ]),
                                             ])
-                                    ),
+                                            ->action(function (array $data, $record): void {
+                                                $base64 = $data['base64Image'] ?? null;
 
+                                                if (empty($base64) && !empty($data['image'])) {
+                                                    $base64 = $data['image'];
+                                                }
+
+                                                if (!empty($base64)) {
+                                                    $record->update([
+                                                        'icon' => $base64,
+                                                    ]);
+
+                                                    Notification::make()
+                                                        ->title(trans('server/setting.server_info.icon.updated'))
+                                                        ->success()
+                                                        ->send();
+
+                                                    $record->refresh();
+                                                } else {
+                                                    Notification::make()
+                                                        ->title(trans('admin/egg.import.no_image'))
+                                                        ->warning()
+                                                        ->send();
+                                                }
+                                            }),
+                                        Action::make('deleteIcon')
+                                            ->visible(fn ($record) => $record->icon)
+                                            ->label('')
+                                            ->icon('tabler-trash')
+                                            ->iconButton()->iconSize(IconSize::Large)
+                                            ->color('danger')
+                                            ->action(function ($record) {
+                                                $record->update([
+                                                    'icon' => null,
+                                                ]);
+
+                                                Notification::make()
+                                                    ->title(trans('server/setting.server_info.icon.deleted'))
+                                                    ->success()
+                                                    ->send();
+
+                                                $record->refresh();
+                                            }),
+                                    ]),
+                                Grid::make()
+                                    ->columns(3)
+                                    ->columnStart(2)
+                                    ->columnSpan([
+                                        'default' => 2,
+                                        'sm' => 2,
+                                        'md' => 3,
+                                        'lg' => 5,
+                                    ])
+                                    ->schema([
+                                        TextInput::make('name')
+                                            ->prefixIcon('tabler-server')
+                                            ->label(trans('admin/server.name'))
+                                            ->suffixAction(Action::make('random')
+                                                ->icon('tabler-dice-' . random_int(1, 6))
+                                                ->action(function (Set $set, Get $get) {
+                                                    $egg = Egg::find($get('egg_id'));
+                                                    $prefix = $egg ? str($egg->name)->lower()->kebab() . '-' : '';
+
+                                                    $word = (new RandomWordService())->word();
+
+                                                    $set('name', $prefix . $word);
+                                                }))
+                                            ->columnSpan([
+                                                'default' => 2,
+                                                'sm' => 1,
+                                                'md' => 2,
+                                                'lg' => 3,
+                                            ])
+                                            ->required()
+                                            ->maxLength(255),
+                                        Select::make('owner_id')
+                                            ->prefixIcon('tabler-user')
+                                            ->label(trans('admin/server.owner'))
+                                            ->columnSpan([
+                                                'default' => 2,
+                                                'sm' => 1,
+                                                'md' => 2,
+                                                'lg' => 2,
+                                            ])
+                                            ->relationship('user', 'username')
+                                            ->searchable(['username', 'email'])
+                                            ->getOptionLabelFromRecordUsing(fn (User $user) => "$user->username ($user->email)")
+                                            ->preload()
+                                            ->required(),
+                                        ToggleButtons::make('condition')
+                                            ->label(trans('admin/server.server_status'))
+                                            ->formatStateUsing(fn (Server $server) => $server->condition)
+                                            ->options(fn ($state) => [$state->value => $state->getLabel()])
+                                            ->colors(fn ($state) => [$state->value => $state->getColor()])
+                                            ->icons(fn ($state) => [$state->value => $state->getIcon()])
+                                            ->stateCast(new ServerConditionStateCast())
+                                            ->columnSpan([
+                                                'default' => 2,
+                                                'sm' => 1,
+                                                'md' => 1,
+                                                'lg' => 1,
+                                            ])
+                                            ->hintAction(
+                                                Action::make('view_install_log')
+                                                    ->label(trans('admin/server.view_install_log'))
+                                                    //->visible(fn (Server $server) => $server->isFailedInstall())
+                                                    ->modalHeading('')
+                                                    ->modalSubmitAction(false)
+                                                    ->modalFooterActionsAlignment(Alignment::Right)
+                                                    ->modalCancelActionLabel(trans('filament::components/modal.actions.close.label'))
+                                                    ->schema([
+                                                        CodeEditor::make('logs')
+                                                            ->hiddenLabel()
+                                                            ->formatStateUsing(function (Server $server, DaemonServerRepository $serverRepository) {
+                                                                try {
+                                                                    $logs = $serverRepository->setServer($server)->getInstallLogs();
+
+                                                                    return mb_convert_encoding($logs, 'UTF-8', ['UTF-8', 'UTF-16', 'ISO-8859-1', 'Windows-1252', 'ASCII']);
+                                                                } catch (ConnectionException) {
+                                                                    Notification::make()
+                                                                        ->title(trans('admin/server.notifications.error_connecting', ['node' => $server->node->name]))
+                                                                        ->body(trans('admin/server.notifications.log_failed'))
+                                                                        ->color('warning')
+                                                                        ->warning()
+                                                                        ->send();
+                                                                } catch (Exception) {
+                                                                    return '';
+                                                                }
+
+                                                                return '';
+                                                            }),
+                                                    ])
+                                            ),
+                                    ]),
                                 Textarea::make('description')
                                     ->label(trans('admin/server.description'))
                                     ->columnSpanFull(),
-
                                 TextInput::make('uuid')
                                     ->label(trans('admin/server.uuid'))
                                     ->copyable()
@@ -616,6 +796,7 @@ class EditServer extends EditRecord
 
                                 Select::make('select_startup')
                                     ->label(trans('admin/server.startup_cmd'))
+                                    ->required()
                                     ->live()
                                     ->afterStateUpdated(function (Set $set, $state) {
                                         $set('startup', $state);
@@ -632,7 +813,22 @@ class EditServer extends EditRecord
                                             $set('select_startup', $currentStartup);
                                         }
 
-                                        return array_flip($startups) + ['' => 'Custom Startup'];
+                                        return array_flip($startups) + ['custom' => 'Custom Startup'];
+                                    })
+                                    ->formatStateUsing(function (Server $server) {
+                                        $startups = $server->egg->startup_commands;
+
+                                        $currentStartup = $server->startup;
+                                        $matchingStartup = collect($startups)
+                                            ->filter(fn ($value, $key) => $value === $currentStartup)
+                                            ->keys()
+                                            ->first();
+
+                                        if (!$matchingStartup) {
+                                            return 'custom';
+                                        }
+
+                                        return $matchingStartup;
                                     })
                                     ->selectablePlaceholder(false)
                                     ->columnSpanFull()
@@ -650,7 +846,7 @@ class EditServer extends EditRecord
                                         if (in_array($state, $startups)) {
                                             $set('select_startup', $state);
                                         } else {
-                                            $set('select_startup', '');
+                                            $set('select_startup', 'custom');
                                         }
                                     })
                                     ->placeholder(trans('admin/server.startup_placeholder'))
@@ -811,7 +1007,7 @@ class EditServer extends EditRecord
                                                 Actions::make([
                                                     Action::make('transfer')
                                                         ->label(trans('admin/server.transfer'))
-                                                        ->disabled(fn (Server $server) => Node::count() <= 1 || $server->isInConflictState())
+                                                        ->disabled(fn (Server $server) => user()?->accessibleNodes()->count() <= 1 || $server->isInConflictState())
                                                         ->modalHeading(trans('admin/server.transfer'))
                                                         ->schema($this->transferServer())
                                                         ->action(function (TransferServerService $transfer, Server $server, $data) {
@@ -883,10 +1079,10 @@ class EditServer extends EditRecord
                 ->label(trans('admin/server.node'))
                 ->prefixIcon('tabler-server-2')
                 ->selectablePlaceholder(false)
-                ->default(fn (Server $server) => Node::whereNot('id', $server->node->id)->first()?->id)
+                ->default(fn (Server $server) => user()?->accessibleNodes()->whereNot('id', $server->node->id)->first()?->id)
                 ->required()
                 ->live()
-                ->options(fn (Server $server) => Node::whereNot('id', $server->node->id)->pluck('name', 'id')->all()),
+                ->options(fn (Server $server) => user()?->accessibleNodes()->whereNot('id', $server->node->id)->pluck('name', 'id')->all()),
             Select::make('allocation_id')
                 ->label(trans('admin/server.primary_allocation'))
                 ->disabled(fn (Get $get, Server $server) => !$get('node_id') || !$server->allocation_id)
@@ -942,7 +1138,9 @@ class EditServer extends EditRecord
                     }
                 })
                 ->hidden(fn () => $canForceDelete)
-                ->authorize(fn (Server $server) => user()?->can('delete server', $server)),
+                ->authorize(fn (Server $server) => user()?->can('delete server', $server))
+                ->icon('tabler-trash')
+                ->iconButton()->iconSize(IconSize::ExtraLarge),
             Action::make('ForceDelete')
                 ->color('danger')
                 ->label(trans('filament-actions::force-delete.single.label'))
@@ -963,8 +1161,11 @@ class EditServer extends EditRecord
             Action::make('console')
                 ->label(trans('admin/server.console'))
                 ->icon('tabler-terminal')
+                ->iconButton()->iconSize(IconSize::ExtraLarge)
                 ->url(fn (Server $server) => Console::getUrl(panel: 'server', tenant: $server)),
-            $this->getSaveFormAction()->formId('form'),
+            $this->getSaveFormAction()->formId('form')
+                ->iconButton()->iconSize(IconSize::ExtraLarge)
+                ->icon('tabler-device-floppy'),
         ];
 
     }

app/Filament/Admin/Resources/Servers/Pages/ListServers.php

@@ -12,6 +12,7 @@ use Filament\Actions\ActionGroup;
 use Filament\Actions\CreateAction;
 use Filament\Actions\EditAction;
 use Filament\Resources\Pages\ListRecords;
+use Filament\Support\Enums\IconSize;
 use Filament\Tables\Columns\SelectColumn;
 use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Grouping\Group;
@@ -92,6 +93,9 @@ class ListServers extends ListRecords
             ->recordActions([
                 Action::make('View')
                     ->label(trans('admin/server.view'))
+                    ->iconButton()
+                    ->icon('tabler-terminal')
+                    ->iconSize(IconSize::Large)
                     ->url(fn (Server $server) => Console::getUrl(panel: 'server', tenant: $server))
                     ->authorize(fn (Server $server) => user()?->canAccessTenant($server)),
                 EditAction::make(),
@@ -99,10 +103,7 @@ class ListServers extends ListRecords
             ->emptyStateIcon('tabler-brand-docker')
             ->searchable()
             ->emptyStateDescription('')
-            ->emptyStateHeading(trans('admin/server.no_servers'))
-            ->emptyStateActions([
-                CreateAction::make(),
-            ]);
+            ->emptyStateHeading(trans('admin/server.no_servers'));
     }
 
     /** @return array<Action|ActionGroup> */
@@ -110,7 +111,8 @@ class ListServers extends ListRecords
     {
         return [
             CreateAction::make()
-                ->hidden(fn () => Server::count() <= 0),
+                ->iconButton()->iconSize(IconSize::ExtraLarge)
+                ->icon('tabler-file-plus'),
         ];
     }
 }

app/Filament/Admin/Resources/Servers/RelationManagers/AllocationsRelationManager.php

@@ -18,6 +18,7 @@ use Filament\Forms\Components\TextInput;
 use Filament\Resources\RelationManagers\RelationManager;
 use Filament\Schemas\Components\Utilities\Get;
 use Filament\Schemas\Components\Utilities\Set;
+use Filament\Support\Enums\IconSize;
 use Filament\Tables\Columns\IconColumn;
 use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Columns\TextInputColumn;
@@ -33,11 +34,11 @@ class AllocationsRelationManager extends RelationManager
     public function table(Table $table): Table
     {
         return $table
+            ->heading('')
             ->selectCurrentPageOnly()
             ->recordTitleAttribute('address')
             ->recordTitle(fn (Allocation $allocation) => $allocation->address)
             ->inverseRelationship('server')
-            ->heading(trans('admin/server.allocations'))
             ->columns([
                 TextColumn::make('ip')
                     ->label(trans('admin/server.ip_address')),
@@ -92,8 +93,22 @@ class AllocationsRelationManager extends RelationManager
                         }
                     }),
             ])
-            ->headerActions([
-                CreateAction::make()->label(trans('admin/server.create_allocation'))
+            ->toolbarActions([
+                DissociateBulkAction::make()
+                    ->after(function () {
+                        Allocation::whereNull('server_id')->update([
+                            'notes' => null,
+                            'is_locked' => false,
+                        ]);
+
+                        if (!$this->getOwnerRecord()->allocation_id) {
+                            $this->getOwnerRecord()->update(['allocation_id' => $this->getOwnerRecord()->allocations()->first()?->id]);
+                        }
+                    }),
+                CreateAction::make()
+                    ->label(trans('admin/server.create_allocation'))
+                    ->icon('tabler-network')
+                    ->iconButton()->iconSize(IconSize::ExtraLarge)
                     ->createAnother(false)
                     ->schema(fn () => [
                         Select::make('allocation_ip')
@@ -132,6 +147,8 @@ class AllocationsRelationManager extends RelationManager
                     ])
                     ->action(fn (array $data, AssignmentService $service) => $service->handle($this->getOwnerRecord()->node, $data, $this->getOwnerRecord())),
                 AssociateAction::make()
+                    ->icon('tabler-file-plus')
+                    ->iconButton()->iconSize(IconSize::ExtraLarge)
                     ->multiple()
                     ->associateAnother(false)
                     ->preloadRecordSelect()
@@ -145,19 +162,6 @@ class AllocationsRelationManager extends RelationManager
                             $this->getOwnerRecord()->update(['allocation_id' => $data['recordId'][0]]);
                         }
                     }),
-            ])
-            ->groupedBulkActions([
-                DissociateBulkAction::make()
-                    ->after(function () {
-                        Allocation::whereNull('server_id')->update([
-                            'notes' => null,
-                            'is_locked' => false,
-                        ]);
-
-                        if (!$this->getOwnerRecord()->allocation_id) {
-                            $this->getOwnerRecord()->update(['allocation_id' => $this->getOwnerRecord()->allocations()->first()?->id]);
-                        }
-                    }),
             ]);
     }
 }

app/Filament/Admin/Resources/Servers/RelationManagers/DatabasesRelationManager.php

@@ -18,6 +18,7 @@ use Filament\Forms\Components\TextInput;
 use Filament\Notifications\Notification;
 use Filament\Resources\RelationManagers\RelationManager;
 use Filament\Schemas\Schema;
+use Filament\Support\Enums\IconSize;
 use Filament\Support\Exceptions\Halt;
 use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Table;
@@ -61,6 +62,7 @@ class DatabasesRelationManager extends RelationManager
     public function table(Table $table): Table
     {
         return $table
+            ->heading('')
             ->recordTitleAttribute('database')
             ->columns([
                 TextColumn::make('database'),
@@ -81,6 +83,7 @@ class DatabasesRelationManager extends RelationManager
                 ViewAction::make()
                     ->color('primary'),
                 DeleteAction::make()
+                    ->iconButton()->iconSize(IconSize::ExtraLarge)
                     ->successNotificationTitle(null)
                     ->using(function (Database $database, DatabaseManagementService $service) {
                         try {
@@ -100,11 +103,13 @@ class DatabasesRelationManager extends RelationManager
                         }
                     }),
             ])
-            ->headerActions([
+            ->toolbarActions([
                 CreateAction::make()
                     ->disabled(fn () => DatabaseHost::count() < 1)
                     ->label(fn () => DatabaseHost::count() < 1 ? trans('admin/server.no_db_hosts') : trans('admin/server.create_database'))
                     ->color(fn () => DatabaseHost::count() < 1 ? 'danger' : 'primary')
+                    ->icon(fn () => DatabaseHost::count() < 1 ? 'tabler-database-x' : 'tabler-database-plus')
+                    ->iconButton()->iconSize(IconSize::ExtraLarge)
                     ->createAnother(false)
                     ->action(function (array $data, DatabaseManagementService $service, RandomWordService $randomWordService) {
                         $data['database'] ??= $randomWordService->word() . random_int(1, 420);

app/Filament/Admin/Resources/Users/Pages/CreateUser.php

@@ -10,6 +10,7 @@ use App\Traits\Filament\CanCustomizeHeaderWidgets;
 use Filament\Actions\Action;
 use Filament\Actions\ActionGroup;
 use Filament\Resources\Pages\CreateRecord;
+use Filament\Support\Enums\IconSize;
 use Illuminate\Database\Eloquent\Model;
 
 class CreateUser extends CreateRecord
@@ -32,7 +33,9 @@ class CreateUser extends CreateRecord
     protected function getDefaultHeaderActions(): array
     {
         return [
-            $this->getCreateFormAction()->formId('form'),
+            $this->getCreateFormAction()->formId('form')
+                ->iconButton()->iconSize(IconSize::ExtraLarge)
+                ->icon('tabler-user-plus'),
         ];
     }
 

app/Filament/Admin/Resources/Users/Pages/EditUser.php

@@ -11,6 +11,7 @@ use Filament\Actions\Action;
 use Filament\Actions\ActionGroup;
 use Filament\Actions\DeleteAction;
 use Filament\Resources\Pages\EditRecord;
+use Filament\Support\Enums\IconSize;
 use Illuminate\Database\Eloquent\Model;
 
 class EditUser extends EditRecord
@@ -33,8 +34,11 @@ class EditUser extends EditRecord
         return [
             DeleteAction::make()
                 ->label(fn (User $user) => user()?->id === $user->id ? trans('admin/user.self_delete') : ($user->servers()->count() > 0 ? trans('admin/user.has_servers') : trans('filament-actions::delete.single.modal.actions.delete.label')))
-                ->disabled(fn (User $user) => user()?->id === $user->id || $user->servers()->count() > 0),
-            $this->getSaveFormAction()->formId('form'),
+                ->disabled(fn (User $user) => user()?->id === $user->id || $user->servers()->count() > 0)
+                ->iconButton()->iconSize(IconSize::ExtraLarge),
+            $this->getSaveFormAction()->formId('form')
+                ->iconButton()->iconSize(IconSize::ExtraLarge)
+                ->icon('tabler-device-floppy'),
         ];
     }
 

app/Filament/Admin/Resources/Users/Pages/ListUsers.php

@@ -9,6 +9,7 @@ use Filament\Actions\Action;
 use Filament\Actions\ActionGroup;
 use Filament\Actions\CreateAction;
 use Filament\Resources\Pages\ListRecords;
+use Filament\Support\Enums\IconSize;
 
 class ListUsers extends ListRecords
 {
@@ -21,7 +22,9 @@ class ListUsers extends ListRecords
     protected function getDefaultHeaderActions(): array
     {
         return [
-            CreateAction::make(),
+            CreateAction::make()
+                ->iconButton()->iconSize(IconSize::ExtraLarge)
+                ->icon('tabler-user-plus'),
         ];
     }
 }

app/Filament/Admin/Resources/Users/Pages/ViewUser.php

@@ -9,6 +9,7 @@ use Filament\Actions\Action;
 use Filament\Actions\ActionGroup;
 use Filament\Actions\EditAction;
 use Filament\Resources\Pages\ViewRecord;
+use Filament\Support\Enums\IconSize;
 
 class ViewUser extends ViewRecord
 {
@@ -21,7 +22,8 @@ class ViewUser extends ViewRecord
     protected function getDefaultHeaderActions(): array
     {
         return [
-            EditAction::make(),
+            EditAction::make()
+                ->iconButton()->iconSize(IconSize::ExtraLarge),
         ];
     }
 }

app/Filament/Admin/Resources/Users/UserResource.php

@@ -130,7 +130,7 @@ class UserResource extends Resource
             ])
             ->recordActions([
                 ViewAction::make()
-                    ->hidden(fn ($record) => static::canEdit($record)),
+                    ->hidden(fn ($record) => static::getEditAuthorizationResponse($record)->allowed()),
                 EditAction::make(),
             ])
             ->checkIfRecordIsSelectableUsing(fn (User $user) => user()?->id !== $user->id && !$user->servers_count)

app/Filament/Admin/Resources/Webhooks/Pages/CreateWebhookConfiguration.php

@@ -9,6 +9,7 @@ use App\Traits\Filament\CanCustomizeHeaderWidgets;
 use Filament\Actions\Action;
 use Filament\Actions\ActionGroup;
 use Filament\Resources\Pages\CreateRecord;
+use Filament\Support\Enums\IconSize;
 
 class CreateWebhookConfiguration extends CreateRecord
 {
@@ -23,8 +24,10 @@ class CreateWebhookConfiguration extends CreateRecord
     protected function getDefaultHeaderActions(): array
     {
         return [
-            $this->getCancelFormAction()->formId('form'),
-            $this->getCreateFormAction()->formId('form'),
+            $this->getCancelFormAction()->formId('form')
+                ->iconButton()->iconSize(IconSize::ExtraLarge),
+            $this->getCreateFormAction()->formId('form')
+                ->iconButton()->iconSize(IconSize::ExtraLarge),
         ];
     }
 

app/Filament/Admin/Resources/Webhooks/Pages/EditWebhookConfiguration.php

@@ -11,6 +11,7 @@ use Filament\Actions\Action;
 use Filament\Actions\ActionGroup;
 use Filament\Actions\DeleteAction;
 use Filament\Resources\Pages\EditRecord;
+use Filament\Support\Enums\IconSize;
 
 class EditWebhookConfiguration extends EditRecord
 {
@@ -23,14 +24,17 @@ class EditWebhookConfiguration extends EditRecord
     protected function getDefaultHeaderActions(): array
     {
         return [
-            DeleteAction::make(),
+            DeleteAction::make()
+                ->iconButton()->iconSize(IconSize::ExtraLarge),
             Action::make('test_now')
                 ->label(trans('admin/webhook.test_now'))
                 ->color('primary')
                 ->disabled(fn (WebhookConfiguration $webhookConfiguration) => count($webhookConfiguration->events) === 0)
                 ->action(fn (WebhookConfiguration $webhookConfiguration) => $webhookConfiguration->run())
                 ->tooltip(trans('admin/webhook.test_now_help')),
-            $this->getSaveFormAction()->formId('form'),
+            $this->getSaveFormAction()->formId('form')
+                ->iconButton()->iconSize(IconSize::ExtraLarge)
+                ->icon('tabler-device-floppy'),
         ];
     }
 

app/Filament/Admin/Resources/Webhooks/Pages/ListWebhookConfigurations.php

@@ -3,13 +3,13 @@
 namespace App\Filament\Admin\Resources\Webhooks\Pages;
 
 use App\Filament\Admin\Resources\Webhooks\WebhookResource;
-use App\Models\WebhookConfiguration;
 use App\Traits\Filament\CanCustomizeHeaderActions;
 use App\Traits\Filament\CanCustomizeHeaderWidgets;
 use Filament\Actions\Action;
 use Filament\Actions\ActionGroup;
 use Filament\Actions\CreateAction;
 use Filament\Resources\Pages\ListRecords;
+use Filament\Support\Enums\IconSize;
 
 class ListWebhookConfigurations extends ListRecords
 {
@@ -23,7 +23,8 @@ class ListWebhookConfigurations extends ListRecords
     {
         return [
             CreateAction::make()
-                ->hidden(fn () => WebhookConfiguration::count() <= 0),
+                ->iconButton()->iconSize(IconSize::ExtraLarge)
+                ->icon('tabler-file-plus'),
         ];
     }
 }

app/Filament/Admin/Resources/Webhooks/Pages/ViewWebhookConfiguration.php

@@ -9,6 +9,7 @@ use Filament\Actions\Action;
 use Filament\Actions\ActionGroup;
 use Filament\Actions\EditAction;
 use Filament\Resources\Pages\ViewRecord;
+use Filament\Support\Enums\IconSize;
 
 class ViewWebhookConfiguration extends ViewRecord
 {
@@ -21,7 +22,8 @@ class ViewWebhookConfiguration extends ViewRecord
     protected function getDefaultHeaderActions(): array
     {
         return [
-            EditAction::make(),
+            EditAction::make()
+                ->iconButton()->iconSize(IconSize::ExtraLarge),
         ];
     }
 }

app/Filament/Admin/Resources/Webhooks/WebhookResource.php

@@ -15,7 +15,6 @@ use App\Traits\Filament\CanModifyForm;
 use App\Traits\Filament\CanModifyTable;
 use Exception;
 use Filament\Actions\Action;
-use Filament\Actions\CreateAction;
 use Filament\Actions\DeleteBulkAction;
 use Filament\Actions\EditAction;
 use Filament\Actions\ReplicateAction;
@@ -98,7 +97,7 @@ class WebhookResource extends Resource
             ])
             ->recordActions([
                 ViewAction::make()
-                    ->hidden(fn (WebhookConfiguration $record) => static::canEdit($record)),
+                    ->hidden(fn (WebhookConfiguration $record) => static::getEditAuthorizationResponse($record)->allowed()),
                 EditAction::make(),
                 ReplicateAction::make()
                     ->iconButton()
@@ -114,9 +113,6 @@ class WebhookResource extends Resource
             ->emptyStateIcon('tabler-webhook')
             ->emptyStateDescription('')
             ->emptyStateHeading(trans('admin/webhook.no_webhooks'))
-            ->emptyStateActions([
-                CreateAction::make(),
-            ])
             ->persistFiltersInSession()
             ->filters([
                 SelectFilter::make('type')

app/Filament/App/Resources/Servers/Pages/ListServers.php

@@ -5,6 +5,7 @@ namespace App\Filament\App\Resources\Servers\Pages;
 use App\Enums\CustomizationKey;
 use App\Enums\ServerResourceType;
 use App\Filament\App\Resources\Servers\ServerResource;
+use App\Filament\Components\Tables\Columns\ProgressBarColumn;
 use App\Filament\Components\Tables\Columns\ServerEntryColumn;
 use App\Filament\Server\Pages\Console;
 use App\Models\Permission;
@@ -20,6 +21,7 @@ use Filament\Schemas\Components\Tabs\Tab;
 use Filament\Support\Enums\Alignment;
 use Filament\Support\Enums\IconSize;
 use Filament\Tables\Columns\Column;
+use Filament\Tables\Columns\ImageColumn;
 use Filament\Tables\Columns\Layout\Stack;
 use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Filters\SelectFilter;
@@ -33,11 +35,11 @@ class ListServers extends ListRecords
     use CanCustomizeHeaderActions;
     use CanCustomizeHeaderWidgets;
 
-    protected static string $resource = ServerResource::class;
+    public const WARNING_THRESHOLD = 0.7;
 
     public const DANGER_THRESHOLD = 0.9;
 
-    public const WARNING_THRESHOLD = 0.7;
+    protected static string $resource = ServerResource::class;
 
     private DaemonServerRepository $daemonServerRepository;
 
@@ -53,6 +55,8 @@ class ListServers extends ListRecords
         return [
             Stack::make([
                 ServerEntryColumn::make('server_entry')
+                    ->warningThresholdPercent(static::WARNING_THRESHOLD)
+                    ->dangerThresholdPercent(static::DANGER_THRESHOLD)
                     ->searchable(['name']),
             ]),
         ];
@@ -62,10 +66,14 @@ class ListServers extends ListRecords
     protected function tableColumns(): array
     {
         return [
+            ImageColumn::make('icon')
+                ->label('')
+                ->imageSize(46)
+                ->state(fn (Server $server) => $server->icon ?: $server->egg->image),
             TextColumn::make('condition')
                 ->label(trans('server/dashboard.status'))
                 ->badge()
-                ->tooltip(fn (Server $server) => $server->formatResource(ServerResourceType::Uptime))
+                ->tooltip(fn (Server $server) => $server->formatResource(ServerResourceType::Uptime, 2))
                 ->icon(fn (Server $server) => $server->condition->getIcon())
                 ->color(fn (Server $server) => $server->condition->getColor()),
             TextColumn::make('name')
@@ -79,24 +87,27 @@ class ListServers extends ListRecords
                 ->visibleFrom('md')
                 ->copyable()
                 ->state(fn (Server $server) => $server->allocation->address ?? 'None'),
-            TextColumn::make('cpuUsage')
-                ->label(trans('server/dashboard.resources'))
-                ->icon('tabler-cpu')
-                ->tooltip(fn (Server $server) => trans('server/dashboard.usage_limit', ['resource' => $server->formatResource(ServerResourceType::CPULimit)]))
-                ->state(fn (Server $server) => $server->formatResource(ServerResourceType::CPU))
-                ->color(fn (Server $server) => $this->getResourceColor($server, 'cpu')),
-            TextColumn::make('memoryUsage')
+            ProgressBarColumn::make('cpuUsage')
                 ->label('')
-                ->icon('tabler-device-desktop-analytics')
-                ->tooltip(fn (Server $server) => trans('server/dashboard.usage_limit', ['resource' => $server->formatResource(ServerResourceType::MemoryLimit)]))
-                ->state(fn (Server $server) => $server->formatResource(ServerResourceType::Memory))
-                ->color(fn (Server $server) => $this->getResourceColor($server, 'memory')),
-            TextColumn::make('diskUsage')
+                ->warningThresholdPercent(static::WARNING_THRESHOLD)
+                ->dangerThresholdPercent(static::DANGER_THRESHOLD)
+                ->maxValue(fn (Server $server) => ServerResourceType::CPULimit->getResourceAmount($server) === 0 ? ($server->node->systemInformation()['cpu_count'] ?? 0 * 100) : ServerResourceType::CPULimit->getResourceAmount($server))
+                ->state(fn (Server $server) => $server->retrieveResources()['cpu_absolute'] ?? 0)
+                ->helperLabel(fn (Server $server) => $server->formatResource(ServerResourceType::CPU, 0) . ' / ' . $server->formatResource(ServerResourceType::CPULimit, 0)),
+            ProgressBarColumn::make('memoryUsage')
                 ->label('')
-                ->icon('tabler-device-sd-card')
-                ->tooltip(fn (Server $server) => trans('server/dashboard.usage_limit', ['resource' => $server->formatResource(ServerResourceType::DiskLimit)]))
-                ->state(fn (Server $server) => $server->formatResource(ServerResourceType::Disk))
-                ->color(fn (Server $server) => $this->getResourceColor($server, 'disk')),
+                ->warningThresholdPercent(static::WARNING_THRESHOLD)
+                ->dangerThresholdPercent(static::DANGER_THRESHOLD)
+                ->maxValue(fn (Server $server) => ServerResourceType::MemoryLimit->getResourceAmount($server) === 0 ? $server->node->statistics()['memory_total'] : ServerResourceType::MemoryLimit->getResourceAmount($server))
+                ->state(fn (Server $server) => $server->retrieveResources()['memory_bytes'] ?? 0)
+                ->helperLabel(fn (Server $server) => $server->formatResource(ServerResourceType::Memory) . ' / ' . $server->formatResource(ServerResourceType::MemoryLimit)),
+            ProgressBarColumn::make('diskUsage')
+                ->label('')
+                ->warningThresholdPercent(static::WARNING_THRESHOLD)
+                ->dangerThresholdPercent(static::DANGER_THRESHOLD)
+                ->maxValue(fn (Server $server) => ServerResourceType::DiskLimit->getResourceAmount($server) === 0 ? $server->node->statistics()['disk_total'] : ServerResourceType::DiskLimit->getResourceAmount($server))
+                ->state(fn (Server $server) => $server->retrieveResources()['disk_bytes'] ?? 0)
+                ->helperLabel(fn (Server $server) => $server->formatResource(ServerResourceType::Disk) . ' / ' . $server->formatResource(ServerResourceType::DiskLimit)),
         ];
     }
 
@@ -107,7 +118,8 @@ class ListServers extends ListRecords
         $usingGrid = user()?->getCustomization(CustomizationKey::DashboardLayout) === 'grid';
 
         return $table
-            ->paginated(false)
+            ->paginated($usingGrid ? [10, 20, 30, 40] : [10, 20, 50, 100])
+            ->defaultPaginationPageOption($usingGrid ? 10 : 20)
             ->query(fn () => $baseQuery)
             ->poll('15s')
             ->columns($usingGrid ? $this->gridColumns() : $this->tableColumns())

app/Filament/Components/Actions/ExportEggAction.php

@@ -7,6 +7,7 @@ use App\Models\Egg;
 use Filament\Actions\Action;
 use Filament\Infolists\Components\TextEntry;
 use Filament\Support\Enums\Alignment;
+use Filament\Support\Enums\IconSize;
 
 class ExportEggAction extends Action
 {
@@ -21,8 +22,14 @@ class ExportEggAction extends Action
 
         $this->label(trans('filament-actions::export.modal.actions.export.label'));
 
+        $this->iconButton();
+
+        $this->icon('tabler-file-export');
+
         $this->tableIcon('tabler-download');
 
+        $this->iconSize(IconSize::ExtraLarge);
+
         $this->authorize(fn () => user()?->can('export egg'));
 
         $this->modalHeading(fn (Egg $egg) => trans('filament-actions::export.modal.actions.export.label') . '  ' . $egg->name);

app/Filament/Components/Actions/ExportScheduleAction.php

@@ -8,6 +8,7 @@ use App\Models\Server;
 use App\Services\Schedules\Sharing\ScheduleExporterService;
 use Filament\Actions\Action;
 use Filament\Facades\Filament;
+use Filament\Support\Enums\IconSize;
 
 class ExportScheduleAction extends Action
 {
@@ -20,6 +21,16 @@ class ExportScheduleAction extends Action
     {
         parent::setUp();
 
+        $this->hiddenLabel();
+
+        $this->iconButton();
+
+        $this->iconSize(IconSize::ExtraLarge);
+
+        $this->icon('tabler-download');
+
+        $this->tooltip(trans('server/schedule.export'));
+
         /** @var Server $server */
         $server = Filament::getTenant();
 

app/Filament/Components/Actions/ImportEggAction.php

@@ -17,6 +17,7 @@ use Filament\Schemas\Components\Tabs;
 use Filament\Schemas\Components\Tabs\Tab;
 use Filament\Schemas\Components\Utilities\Get;
 use Filament\Schemas\Components\Utilities\Set;
+use Filament\Support\Enums\IconSize;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Str;
@@ -35,6 +36,12 @@ class ImportEggAction extends Action
 
         $this->label(trans('filament-actions::import.modal.actions.import.label'));
 
+        $this->iconButton();
+
+        $this->icon('tabler-file-import');
+
+        $this->iconSize(IconSize::ExtraLarge);
+
         $this->authorize(fn () => user()?->can('import egg'));
 
         $this->action(function (array $data, EggImporterService $eggImportService): void {

app/Filament/Components/Actions/UpdateEggAction.php

@@ -7,6 +7,7 @@ use App\Services\Eggs\Sharing\EggImporterService;
 use Exception;
 use Filament\Actions\Action;
 use Filament\Notifications\Notification;
+use Filament\Support\Enums\IconSize;
 
 class UpdateEggAction extends Action
 {
@@ -21,8 +22,12 @@ class UpdateEggAction extends Action
 
         $this->label(trans_choice('admin/egg.update', 1));
 
+        $this->iconButton();
+
         $this->icon('tabler-cloud-download');
 
+        $this->iconSize(IconSize::ExtraLarge);
+
         $this->color('success');
 
         $this->requiresConfirmation();

app/Filament/Components/Actions/UpdateEggBulkAction.php

@@ -49,9 +49,15 @@ class UpdateEggBulkAction extends BulkAction
 
             $success = 0;
             $failed = 0;
+            $skipped = 0;
 
             /** @var Egg $egg */
             foreach ($records as $egg) {
+                if ($egg->update_url === null) {
+                    $skipped++;
+
+                    continue;
+                }
                 try {
                     $eggImporterService->fromUrl($egg->update_url, $egg);
 
@@ -67,7 +73,12 @@ class UpdateEggBulkAction extends BulkAction
 
             Notification::make()
                 ->title(trans_choice('admin/egg.updated', 2, ['count' => $success, 'total' => $records->count()]))
-                ->body($failed > 0 ? trans('admin/egg.updated_failed', ['count' => $failed]) : null)
+                ->body(
+                    collect([
+                        $failed > 0 ? trans('admin/egg.updated_failed', ['count' => $failed]) : null,
+                        $skipped > 0 ? trans('admin/egg.updated_skipped', ['count' => $skipped]) : null,
+                    ])->filter()->join(' ')
+                )
                 ->status($failed > 0 ? 'warning' : 'success')
                 ->persistent()
                 ->send();

app/Filament/Components/Actions/UpdateNodeAllocations.php

@@ -8,6 +8,7 @@ use Exception;
 use Filament\Actions\Action;
 use Filament\Forms\Components\Select;
 use Filament\Notifications\Notification;
+use Filament\Support\Enums\IconSize;
 
 class UpdateNodeAllocations extends Action
 {
@@ -23,6 +24,8 @@ class UpdateNodeAllocations extends Action
         $this->label(trans('admin/node.bulk_update_ip'));
 
         $this->icon('tabler-replace');
+        $this->iconSize(IconSize::ExtraLarge);
+        $this->iconButton();
 
         $this->color('warning');
 

app/Filament/Components/Forms/Fields/CopyFrom.php

@@ -28,7 +28,7 @@ class CopyFrom extends Select
     {
         $this->helperText(trans('admin/egg.copy_from_help'));
 
-        $this->relationship('configFrom', 'name');
+        $this->relationship('configFrom', 'name', ignoreRecord: true);
 
         $this->afterStateUpdated(function ($state, Set $set) {
             $set('copy_script_from', $state);
@@ -52,7 +52,7 @@ class CopyFrom extends Select
 
     public function script(): static
     {
-        $this->relationship('scriptFrom', 'name');
+        $this->relationship('scriptFrom', 'name', ignoreRecord: true);
 
         $this->afterStateUpdated(function ($state, Set $set, Component $livewire) {
             if ($state === null) {

app/Filament/Components/Tables/Columns/Concerns/HasProgress.php

@@ -0,0 +1,136 @@
+<?php
+
+namespace App\Filament\Components\Tables\Columns\Concerns;
+
+use Closure;
+use Filament\Support\Colors\Color;
+
+/**
+ * Trait extracted for progress-related shared functionality between columns.
+ *
+ * @method mixed evaluate(mixed $value, array<string,mixed> $context = [])
+ */
+trait HasProgress
+{
+    protected float|Closure|null $warningThresholdPercent = null;
+
+    protected float|Closure|null $dangerThresholdPercent = null;
+
+    /**
+     * @var string|array<int|string,string>|Closure|Color|null
+     */
+    protected string|array|Closure|Color|null $dangerColor = null;
+
+    /**
+     * @var string|array<int|string,string>|Closure|Color|null
+     */
+    protected string|array|Closure|Color|null $warningColor = null;
+
+    /**
+     * @var string|array<int|string,string>|Closure|Color|null
+     */
+    protected string|array|Closure|Color|null $color = null;
+
+    public function warningThresholdPercent(float|Closure $value): static
+    {
+        $this->warningThresholdPercent = $value;
+
+        return $this;
+    }
+
+    public function getWarningThresholdPercent(): ?float
+    {
+        return $this->evaluate($this->warningThresholdPercent);
+    }
+
+    public function dangerThresholdPercent(float|Closure $value): static
+    {
+        $this->dangerThresholdPercent = $value;
+
+        return $this;
+    }
+
+    public function getDangerThresholdPercent(): ?float
+    {
+        return $this->evaluate($this->dangerThresholdPercent);
+    }
+
+    /**
+     * @param  string|array<int|string,string>|Closure|Color  $color
+     */
+    public function dangerColor(string|array|Closure|Color $color): static
+    {
+        $this->dangerColor = $color;
+
+        return $this;
+    }
+
+    /**
+     * @return string|array<int|string,string>|Color|null
+     */
+    public function getDangerColor(): string|array|Color|null
+    {
+        return $this->evaluate($this->dangerColor);
+    }
+
+    /**
+     * @param  string|array<int|string,string>|Closure|Color  $color
+     */
+    public function warningColor(string|array|Closure|Color $color): static
+    {
+        $this->warningColor = $color;
+
+        return $this;
+    }
+
+    /**
+     * @return string|array<int|string,string>|Color|null
+     */
+    public function getWarningColor(): string|array|Color|null
+    {
+        return $this->evaluate($this->warningColor);
+    }
+
+    /**
+     * @param  string|array<int|string,string>|Closure|Color  $color
+     */
+    public function color(string|array|Closure|Color $color): static
+    {
+        $this->color = $color;
+
+        return $this;
+    }
+
+    /**
+     * @return string|array<int|string,string>|Color|null
+     */
+    public function getColor(): string|array|Color|null
+    {
+        return $this->evaluate($this->color);
+    }
+
+    /**
+     * Resolve a progress color for a given status string ('danger','warning','success').
+     *
+     * @return string|array<int|string,string>|Color
+     */
+    public function getProgressColorForStatus(string $status): string|array|Color
+    {
+        $color = match ($status) {
+            'danger' => $this->getDangerColor(),
+            'warning' => $this->getWarningColor(),
+            'success' => $this->getColor(),
+            default => $this->getColor(),
+        };
+
+        if ($color === null) {
+            $color = $this->getColor();
+        }
+
+        if ($color === null) {
+            return 'gray';
+        }
+
+        return $color;
+    }
+}

app/Filament/Components/Tables/Columns/ProgressBarColumn.php

@@ -0,0 +1,162 @@
+<?php
+
+namespace App\Filament\Components\Tables\Columns;
+
+use App\Filament\Components\Tables\Columns\Concerns\HasProgress;
+use Closure;
+use Filament\Support\Facades\FilamentColor;
+use Filament\Tables\Columns\Column;
+
+class ProgressBarColumn extends Column
+{
+    use HasProgress;
+
+    protected string $view = 'livewire.columns.progress-bar-column';
+
+    protected int|float|Closure|null $maxValue = null;
+
+    protected string|Closure|null $helperLabel = null;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->dangerColor = FilamentColor::getColor('danger');
+        $this->warningColor = FilamentColor::getColor('warning');
+        $this->color = FilamentColor::getColor('primary');
+
+        $this->helperLabel = fn ($state) => $state !== null ? (string) $state : '0';
+    }
+
+    public function maxValue(int|float|Closure $value): static
+    {
+        $this->maxValue = $value;
+
+        return $this;
+    }
+
+    public function getMaxValue(): ?float
+    {
+        return $this->evaluate($this->maxValue);
+    }
+
+    public function helperLabel(string|Closure $label): static
+    {
+        $this->helperLabel = $label;
+
+        return $this;
+    }
+
+    public function getHelperLabel(mixed $currentValue = null): string
+    {
+        $result = $this->evaluate($this->helperLabel, [
+            'state' => $currentValue,
+            'percentage' => $this->getProgressPercentage(),
+        ]);
+
+        return $result !== null ? (string) $result : '';
+    }
+
+    public function getProgressPercentage(): float
+    {
+        $currentValue = $this->getState();
+        $maxValue = $this->getMaxValue();
+
+        if ($currentValue === null || $maxValue === null || $maxValue <= 0) {
+            return 0;
+        }
+
+        return min(100, max(0, ($currentValue / $maxValue) * 100));
+    }
+
+    public function getProgressStatus(): string
+    {
+        $percentage = $this->getProgressPercentage();
+
+        $dangerPercent = $this->getDangerThresholdPercent();
+        $warningPercent = $this->getWarningThresholdPercent();
+
+        $dangerThreshold = ($dangerPercent !== null ? $dangerPercent : 0.9) * 100;
+        $warningThreshold = ($warningPercent !== null ? $warningPercent : 0.7) * 100;
+
+        if ($percentage >= $dangerThreshold) {
+            return 'danger';
+        }
+
+        if ($percentage >= $warningThreshold) {
+            return 'warning';
+        }
+
+        return 'success';
+    }
+
+    public function getProgressLabel(): string
+    {
+        $currentValue = $this->getState();
+
+        $label = $this->getHelperLabel($currentValue);
+
+        if ($label !== '') {
+            return $label;
+        }
+
+        return sprintf('%d%%', (int) round($this->getProgressPercentage()));
+    }
+
+    /**
+     * @return string|array<int|string,string>
+     */
+    public function getProgressColor(): string|array
+    {
+        $status = $this->getProgressStatus();
+
+        $color = match ($status) {
+            'danger' => $this->getDangerColor(),
+            'warning' => $this->getWarningColor(),
+            'success' => $this->getColor(),
+            default => $this->getColor(),
+        };
+
+        if ($color === null) {
+            $color = $this->getColor();
+        }
+
+        if ($color === null) {
+            return 'gray';
+        }
+
+        return $color;
+    }
+
+    public static function resolveColor(mixed $color): ?string
+    {
+        $resolvedColor = null;
+
+        if (is_object($color)) {
+            if (method_exists($color, 'toCss')) {
+                $resolvedColor = $color->toCss();
+            } elseif (method_exists($color, 'toRgb')) {
+                $resolvedColor = $color->toRgb();
+            } elseif (method_exists($color, 'toHex')) {
+                $resolvedColor = $color->toHex();
+            } else {
+                $resolvedColor = $color;
+            }
+        } elseif (is_array($color)) {
+            $resolvedColor = $color[500] ?? reset($color) ?? null;
+        } else {
+            $resolvedColor = (string) $color;
+        }
+
+        if (is_string($resolvedColor)) {
+            return $resolvedColor;
+        }
+
+        return null;
+    }
+
+    public function getResolvedProgressColor(): ?string
+    {
+        return self::resolveColor($this->getProgressColor());
+    }
+}

app/Filament/Components/Tables/Columns/ServerEntryColumn.php

@@ -2,9 +2,22 @@
 
 namespace App\Filament\Components\Tables\Columns;
 
+use App\Filament\Components\Tables\Columns\Concerns\HasProgress;
+use Filament\Support\Facades\FilamentColor;
 use Filament\Tables\Columns\Column;
 
 class ServerEntryColumn extends Column
 {
+    use HasProgress;
+
     protected string $view = 'livewire.columns.server-entry-column';
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->dangerColor = FilamentColor::getColor('danger');
+        $this->warningColor = FilamentColor::getColor('warning');
+        $this->color = FilamentColor::getColor('primary');
+    }
 }

app/Filament/Pages/Auth/EditProfile.php

@@ -37,9 +37,9 @@ use Filament\Schemas\Components\Section;
 use Filament\Schemas\Components\Tabs;
 use Filament\Schemas\Components\Tabs\Tab;
 use Filament\Schemas\Components\Utilities\Get;
-use Filament\Schemas\Components\Utilities\Set;
 use Filament\Schemas\Schema;
 use Filament\Support\Colors\Color;
+use Filament\Support\Enums\IconSize;
 use Filament\Support\Enums\Width;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Facades\Hash;
@@ -455,6 +455,7 @@ class EditProfile extends BaseEditProfile
                                             ->minValue(1)
                                             ->numeric()
                                             ->required()
+                                            ->live()
                                             ->default(14),
                                         Select::make('console_font')
                                             ->label(trans('profile.font'))
@@ -479,9 +480,8 @@ class EditProfile extends BaseEditProfile
 
                                                 return $fonts;
                                             })
-                                            ->reactive()
-                                            ->default('monospace')
-                                            ->afterStateUpdated(fn ($state, Set $set) => $set('font_preview', $state)),
+                                            ->live()
+                                            ->default('monospace'),
                                         TextEntry::make('font_preview')
                                             ->label(trans('profile.font_preview'))
                                             ->columnSpan(2)
@@ -551,8 +551,12 @@ class EditProfile extends BaseEditProfile
     protected function getDefaultHeaderActions(): array
     {
         return [
-            $this->getSaveFormAction()->formId('form'),
-            $this->getCancelFormAction()->formId('form'),
+            $this->getCancelFormAction()->formId('form')
+                ->iconButton()->iconSize(IconSize::ExtraLarge)
+                ->icon('tabler-arrow-left'),
+            $this->getSaveFormAction()->formId('form')
+                ->iconButton()->iconSize(IconSize::ExtraLarge)
+                ->icon('tabler-device-floppy'),
         ];
 
     }

app/Filament/Server/Pages/Settings.php

@@ -8,14 +8,23 @@ use App\Models\Server;
 use App\Services\Servers\ReinstallServerService;
 use Exception;
 use Filament\Actions\Action;
+use Filament\Forms\Components\FileUpload;
+use Filament\Forms\Components\Hidden;
 use Filament\Forms\Components\Textarea;
 use Filament\Forms\Components\TextInput;
 use Filament\Infolists\Components\TextEntry;
 use Filament\Notifications\Notification;
 use Filament\Schemas\Components\Fieldset;
+use Filament\Schemas\Components\Grid;
+use Filament\Schemas\Components\Image;
 use Filament\Schemas\Components\Section;
+use Filament\Schemas\Components\Tabs;
+use Filament\Schemas\Components\Tabs\Tab;
+use Filament\Schemas\Components\Utilities\Get;
+use Filament\Schemas\Components\Utilities\Set;
 use Filament\Schemas\Schema;
 use Filament\Support\Enums\Alignment;
+use Filament\Support\Enums\IconSize;
 
 class Settings extends ServerFormPage
 {
@@ -29,51 +38,208 @@ class Settings extends ServerFormPage
     public function form(Schema $schema): Schema
     {
         return parent::form($schema)
-            ->columns(4)
             ->components([
                 Section::make(trans('server/setting.server_info.title'))
                     ->columnSpanFull()
                     ->columns([
                         'default' => 1,
-                        'sm' => 2,
+                        'sm' => 1,
                         'md' => 4,
                         'lg' => 6,
                     ])
                     ->schema([
                         Fieldset::make()
                             ->label(trans('server/setting.server_info.information'))
-                            ->columnSpan([
-                                'default' => 1,
-                                'sm' => 2,
-                                'md' => 2,
-                                'lg' => 6,
-                            ])
+                            ->columnSpanFull()
                             ->schema([
-                                TextInput::make('name')
-                                    ->label(trans('server/setting.server_info.name'))
-                                    ->disabled(fn (Server $server) => !user()?->can(Permission::ACTION_SETTINGS_RENAME, $server))
-                                    ->required()
-                                    ->columnSpan([
-                                        'default' => 1,
-                                        'sm' => 2,
-                                        'md' => 2,
-                                        'lg' => 6,
-                                    ])
-                                    ->live(onBlur: true)
-                                    ->afterStateUpdated(fn ($state, Server $server) => $this->updateName($state, $server)),
-                                Textarea::make('description')
-                                    ->label(trans('server/setting.server_info.description'))
-                                    ->hidden(!config('panel.editable_server_descriptions'))
-                                    ->disabled(fn (Server $server) => !user()?->can(Permission::ACTION_SETTINGS_RENAME, $server))
-                                    ->columnSpan([
-                                        'default' => 1,
-                                        'sm' => 2,
-                                        'md' => 2,
-                                        'lg' => 6,
-                                    ])
-                                    ->autosize()
-                                    ->live(onBlur: true)
-                                    ->afterStateUpdated(fn ($state, Server $server) => $this->updateDescription($state ?? '', $server)),
+                                Grid::make()
+                                    ->columns(2)
+                                    ->columnSpan(5)
+                                    ->schema([
+                                        TextInput::make('name')
+                                            ->columnStart(1)
+                                            ->columnSpanFull()
+                                            ->label(trans('server/setting.server_info.name'))
+                                            ->disabled(fn (Server $server) => !user()?->can(Permission::ACTION_SETTINGS_RENAME, $server))
+                                            ->required()
+                                            ->live(onBlur: true)
+                                            ->afterStateUpdated(fn ($state, Server $server) => $this->updateName($state, $server)),
+                                        Textarea::make('description')
+                                            ->columnStart(1)
+                                            ->columnSpanFull()
+                                            ->label(trans('server/setting.server_info.description'))
+                                            ->hidden(!config('panel.editable_server_descriptions'))
+                                            ->disabled(fn (Server $server) => !user()?->can(Permission::ACTION_SETTINGS_DESCRIPTION, $server))
+                                            ->autosize()
+                                            ->live(onBlur: true)
+                                            ->afterStateUpdated(fn ($state, Server $server) => $this->updateDescription($state ?? '', $server)),
+                                    ]),
+                                Grid::make()
+                                    ->columns(2)
+                                    ->columnStart(6)
+                                    ->schema([
+                                        Image::make('', 'icon')
+                                            ->hidden(fn ($record) => !$record->icon && !$record->egg->image)
+                                            ->url(fn ($record) => $record->icon ?: $record->egg->image)
+                                            ->tooltip(fn ($record) => $record->icon ? '' : trans('server/setting.server_info.icon.tooltip'))
+                                            ->columnSpan(2)
+                                            ->alignJustify(),
+                                        Action::make('uploadIcon')
+                                            ->iconButton()->iconSize(IconSize::Large)
+                                            ->icon('tabler-photo-up')
+                                            ->modal()
+                                            ->modalSubmitActionLabel(trans('server/setting.server_info.icon.upload'))
+                                            ->schema([
+                                                Tabs::make()->tabs([
+                                                    Tab::make(trans('admin/egg.import.url'))
+                                                        ->schema([
+                                                            Hidden::make('base64Image'),
+                                                            TextInput::make('image_url')
+                                                                ->label(trans('admin/egg.import.image_url'))
+                                                                ->reactive()
+                                                                ->autocomplete(false)
+                                                                ->debounce(500)
+                                                                ->afterStateUpdated(function ($state, Set $set) {
+                                                                    if (!$state) {
+                                                                        $set('image_url_error', null);
+
+                                                                        return;
+                                                                    }
+
+                                                                    try {
+                                                                        if (!in_array(parse_url($state, PHP_URL_SCHEME), ['http', 'https'], true)) {
+                                                                            throw new \Exception(trans('admin/egg.import.invalid_url'));
+                                                                        }
+
+                                                                        if (!filter_var($state, FILTER_VALIDATE_URL)) {
+                                                                            throw new \Exception(trans('admin/egg.import.invalid_url'));
+                                                                        }
+
+                                                                        $allowedExtensions = [
+                                                                            'png' => 'image/png',
+                                                                            'jpg' => 'image/jpeg',
+                                                                            'jpeg' => 'image/jpeg',
+                                                                            'gif' => 'image/gif',
+                                                                            'webp' => 'image/webp',
+                                                                            'svg' => 'image/svg+xml',
+                                                                        ];
+
+                                                                        $extension = strtolower(pathinfo(parse_url($state, PHP_URL_PATH), PATHINFO_EXTENSION));
+
+                                                                        if (!array_key_exists($extension, $allowedExtensions)) {
+                                                                            throw new \Exception(trans('admin/egg.import.unsupported_format', ['format' => implode(', ', array_keys($allowedExtensions))]));
+                                                                        }
+
+                                                                        $host = parse_url($state, PHP_URL_HOST);
+                                                                        $ip = gethostbyname($host);
+
+                                                                        if (
+                                                                            filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE) === false
+                                                                        ) {
+                                                                            throw new \Exception(trans('admin/egg.import.no_local_ip'));
+                                                                        }
+
+                                                                        $context = stream_context_create([
+                                                                            'http' => ['timeout' => 3],
+                                                                            'https' => [
+                                                                                'timeout' => 3,
+                                                                                'verify_peer' => true,
+                                                                                'verify_peer_name' => true,
+                                                                            ],
+                                                                        ]);
+
+                                                                        $imageContent = @file_get_contents($state, false, $context, 0, 262144); //256KB
+
+                                                                        if (!$imageContent) {
+                                                                            throw new \Exception(trans('admin/egg.import.image_error'));
+                                                                        }
+
+                                                                        $mimeType = $allowedExtensions[$extension];
+                                                                        $base64 = 'data:' . $mimeType . ';base64,' . base64_encode($imageContent);
+
+                                                                        $set('base64Image', $base64);
+                                                                        $set('image_url_error', null);
+
+                                                                    } catch (\Exception $e) {
+                                                                        $set('image_url_error', $e->getMessage());
+                                                                        $set('base64Image', null);
+                                                                    }
+                                                                }),
+                                                            TextEntry::make('image_url_error')
+                                                                ->hiddenLabel()
+                                                                ->visible(fn (Get $get) => $get('image_url_error') !== null)
+                                                                ->afterStateHydrated(fn (Get $get) => $get('image_url_error')),
+                                                            Image::make(fn (Get $get) => $get('image_url'), '')
+                                                                ->imageSize(150)
+                                                                ->visible(fn (Get $get) => $get('image_url') && !$get('image_url_error'))
+                                                                ->alignCenter(),
+                                                        ]),
+                                                    Tab::make(trans('admin/egg.import.file'))
+                                                        ->schema([
+                                                            FileUpload::make('image')
+                                                                ->hiddenLabel()
+                                                                ->previewable()
+                                                                ->openable(false)
+                                                                ->downloadable(false)
+                                                                ->maxSize(256)
+                                                                ->maxFiles(1)
+                                                                ->columnSpanFull()
+                                                                ->alignCenter()
+                                                                ->imageEditor()
+                                                                ->image()
+                                                                ->saveUploadedFileUsing(function ($file, Set $set) {
+                                                                    $base64 = "data:{$file->getMimeType()};base64,". base64_encode(file_get_contents($file->getRealPath()));
+                                                                    $set('base64Image', $base64);
+
+                                                                    return $base64;
+                                                                }),
+                                                        ]),
+                                                ]),
+                                            ])
+                                            ->action(function (array $data, $record): void {
+                                                $base64 = $data['base64Image'] ?? null;
+
+                                                if (empty($base64) && !empty($data['image'])) {
+                                                    $base64 = $data['image'];
+                                                }
+
+                                                if (!empty($base64)) {
+                                                    $record->update([
+                                                        'icon' => $base64,
+                                                    ]);
+
+                                                    Notification::make()
+                                                        ->title(trans('server/setting.server_info.icon.updated'))
+                                                        ->success()
+                                                        ->send();
+
+                                                    $record->refresh();
+                                                } else {
+                                                    Notification::make()
+                                                        ->title(trans('admin/egg.import.no_image'))
+                                                        ->warning()
+                                                        ->send();
+                                                }
+                                            }),
+                                        Action::make('deleteIcon')
+                                            ->visible(fn ($record) => $record->icon)
+                                            ->label('')
+                                            ->icon('tabler-trash')
+                                            ->iconButton()->iconSize(IconSize::Large)
+                                            ->color('danger')
+                                            ->action(function ($record) {
+                                                $record->update([
+                                                    'icon' => null,
+                                                ]);
+
+                                                Notification::make()
+                                                    ->title(trans('server/setting.server_info.icon.deleted'))
+                                                    ->success()
+                                                    ->send();
+
+                                                $record->refresh();
+                                            }),
+                                    ]),
                                 TextInput::make('uuid')
                                     ->label(trans('server/setting.server_info.uuid'))
                                     ->columnSpan([
@@ -97,14 +263,14 @@ class Settings extends ServerFormPage
                             ->label(trans('server/setting.server_info.limits.title'))
                             ->columnSpan([
                                 'default' => 1,
-                                'sm' => 2,
-                                'md' => 2,
+                                'sm' => 1,
+                                'md' => 4,
                                 'lg' => 6,
                             ])
                             ->columns([
                                 'default' => 1,
                                 'sm' => 1,
-                                'md' => 1,
+                                'md' => 2,
                                 'lg' => 3,
                             ])
                             ->schema([
@@ -277,7 +443,7 @@ class Settings extends ServerFormPage
 
     public function updateDescription(string $description, Server $server): void
     {
-        abort_unless(user()?->can(Permission::ACTION_SETTINGS_RENAME, $server) && config('panel.editable_server_descriptions'), 403);
+        abort_unless(user()?->can(Permission::ACTION_SETTINGS_DESCRIPTION, $server) && config('panel.editable_server_descriptions'), 403);
 
         $original = $server->description;
 

app/Filament/Server/Resources/Activities/ActivityResource.php

@@ -6,7 +6,6 @@ use App\Filament\Admin\Resources\Users\Pages\EditUser;
 use App\Filament\Components\Tables\Columns\DateTimeColumn;
 use App\Filament\Server\Resources\Activities\Pages\ListActivities;
 use App\Models\ActivityLog;
-use App\Models\Permission;
 use App\Models\Role;
 use App\Models\Server;
 use App\Models\User;
@@ -164,11 +163,6 @@ class ActivityResource extends Resource
             });
     }
 
-    public static function canViewAny(): bool
-    {
-        return user()?->can(Permission::ACTION_ACTIVITY_READ, Filament::getTenant());
-    }
-
     /** @return array<string, PageRegistration> */
     public static function getDefaultPages(): array
     {

app/Filament/Server/Resources/Allocations/AllocationResource.php

@@ -23,7 +23,6 @@ use Filament\Tables\Columns\IconColumn;
 use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Columns\TextInputColumn;
 use Filament\Tables\Table;
-use Illuminate\Database\Eloquent\Model;
 
 class AllocationResource extends Resource
 {
@@ -84,7 +83,6 @@ class AllocationResource extends Resource
                     ->visible(fn (Allocation $allocation) => !$allocation->is_locked || user()?->can('update', $allocation->node))
                     ->authorize(fn () => user()?->can(Permission::ACTION_ALLOCATION_DELETE, $server))
                     ->label(trans('server/network.delete'))
-                    ->icon('tabler-trash')
                     ->action(function (Allocation $allocation) {
                         Allocation::where('id', $allocation->id)->update([
                             'notes' => null,
@@ -123,26 +121,6 @@ class AllocationResource extends Resource
             ]);
     }
 
-    public static function canViewAny(): bool
-    {
-        return user()?->can(Permission::ACTION_ALLOCATION_READ, Filament::getTenant());
-    }
-
-    public static function canCreate(): bool
-    {
-        return user()?->can(Permission::ACTION_ALLOCATION_CREATE, Filament::getTenant());
-    }
-
-    public static function canEdit(Model $record): bool
-    {
-        return user()?->can(Permission::ACTION_ALLOCATION_UPDATE, Filament::getTenant());
-    }
-
-    public static function canDelete(Model $record): bool
-    {
-        return user()?->can(Permission::ACTION_ALLOCATION_DELETE, Filament::getTenant());
-    }
-
     /** @return array<string, PageRegistration> */
     public static function getDefaultPages(): array
     {

app/Filament/Server/Resources/Backups/BackupResource.php

@@ -40,7 +40,6 @@ use Filament\Support\Enums\IconSize;
 use Filament\Tables\Columns\IconColumn;
 use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Table;
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Http\Client\ConnectionException;
 use Illuminate\Http\Request;
 use Symfony\Component\HttpKernel\Exception\HttpException;
@@ -298,21 +297,6 @@ class BackupResource extends Resource
             ]);
     }
 
-    public static function canViewAny(): bool
-    {
-        return user()?->can(Permission::ACTION_BACKUP_READ, Filament::getTenant());
-    }
-
-    public static function canCreate(): bool
-    {
-        return user()?->can(Permission::ACTION_BACKUP_CREATE, Filament::getTenant());
-    }
-
-    public static function canDelete(Model $record): bool
-    {
-        return user()?->can(Permission::ACTION_BACKUP_DELETE, Filament::getTenant());
-    }
-
     /** @return array<string, PageRegistration> */
     public static function getDefaultPages(): array
     {

app/Filament/Server/Resources/Databases/DatabaseResource.php

@@ -31,7 +31,6 @@ use Filament\Schemas\Schema;
 use Filament\Support\Enums\IconSize;
 use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Table;
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Str;
 
 class DatabaseResource extends Resource
@@ -210,31 +209,6 @@ class DatabaseResource extends Resource
             ]);
     }
 
-    public static function canViewAny(): bool
-    {
-        return user()?->can(Permission::ACTION_DATABASE_READ, Filament::getTenant());
-    }
-
-    public static function canView(Model $record): bool
-    {
-        return user()?->can(Permission::ACTION_DATABASE_READ, Filament::getTenant());
-    }
-
-    public static function canCreate(): bool
-    {
-        return user()?->can(Permission::ACTION_DATABASE_CREATE, Filament::getTenant());
-    }
-
-    public static function canEdit(Model $record): bool
-    {
-        return user()?->can(Permission::ACTION_DATABASE_UPDATE, Filament::getTenant());
-    }
-
-    public static function canDelete(Model $record): bool
-    {
-        return user()?->can(Permission::ACTION_DATABASE_DELETE, Filament::getTenant());
-    }
-
     /** @return array<string, PageRegistration> */
     public static function getDefaultPages(): array
     {

app/Filament/Server/Resources/Files/FileResource.php

@@ -7,14 +7,11 @@ use App\Filament\Server\Resources\Files\Pages\EditFiles;
 use App\Filament\Server\Resources\Files\Pages\ListFiles;
 use App\Filament\Server\Resources\Files\Pages\SearchFiles;
 use App\Models\File;
-use App\Models\Permission;
 use App\Traits\Filament\BlockAccessInConflict;
 use App\Traits\Filament\CanCustomizePages;
 use App\Traits\Filament\CanCustomizeRelations;
-use Filament\Facades\Filament;
 use Filament\Resources\Pages\PageRegistration;
 use Filament\Resources\Resource;
-use Illuminate\Database\Eloquent\Model;
 
 class FileResource extends Resource
 {
@@ -30,26 +27,6 @@ class FileResource extends Resource
 
     protected static bool $isScopedToTenant = false;
 
-    public static function canViewAny(): bool
-    {
-        return user()?->can(Permission::ACTION_FILE_READ, Filament::getTenant());
-    }
-
-    public static function canCreate(): bool
-    {
-        return user()?->can(Permission::ACTION_FILE_CREATE, Filament::getTenant());
-    }
-
-    public static function canEdit(Model $record): bool
-    {
-        return user()?->can(Permission::ACTION_FILE_UPDATE, Filament::getTenant());
-    }
-
-    public static function canDelete(Model $record): bool
-    {
-        return user()?->can(Permission::ACTION_FILE_DELETE, Filament::getTenant());
-    }
-
     /** @return array<string, PageRegistration> */
     public static function getDefaultPages(): array
     {

app/Filament/Server/Resources/Files/Pages/EditFiles.php

@@ -171,7 +171,9 @@ class EditFiles extends Page
                             ->language(fn (Get $get) => $get('lang'))
                             ->default(function () {
                                 try {
-                                    return $this->getDaemonFileRepository()->getContent($this->path, config('panel.files.max_edit_size'));
+                                    $contents = $this->getDaemonFileRepository()->getContent($this->path, config('panel.files.max_edit_size'));
+
+                                    return mb_convert_encoding($contents, 'UTF-8', ['UTF-8', 'UTF-16', 'ISO-8859-1', 'Windows-1252', 'ASCII']);
                                 } catch (FileSizeTooLargeException) {
                                     AlertBanner::make('file_too_large')
                                         ->title(trans('server/file.alerts.file_too_large.title', ['name' => basename($this->path)]))
@@ -265,7 +267,7 @@ class EditFiles extends Page
         $previousParts = '';
         foreach (explode('/', $this->path) as $part) {
             $previousParts = $previousParts . '/' . $part;
-            $breadcrumbs[self::getUrl(['path' => ltrim($previousParts, '/')])] = $part;
+            $breadcrumbs[ListFiles::getUrl(['path' => ltrim($previousParts, '/')])] = $part;
         }
 
         return $breadcrumbs;

app/Filament/Server/Resources/Files/Pages/ListFiles.php

@@ -137,7 +137,6 @@ class ListFiles extends ListRecords
                     ->url(fn (File $file) => self::getUrl(['path' => encode_path(join_paths($this->path, $file->name))])),
                 EditAction::make('edit')
                     ->authorize(fn () => user()?->can(Permission::ACTION_FILE_READ_CONTENT, $server))
-                    ->icon('tabler-edit')
                     ->visible(fn (File $file) => $file->canEdit())
                     ->url(fn (File $file) => EditFiles::getUrl(['path' => encode_path(join_paths($this->path, $file->name))])),
                 ActionGroup::make([
@@ -359,7 +358,7 @@ class ListFiles extends ListRecords
                 DeleteAction::make()
                     ->authorize(fn () => user()?->can(Permission::ACTION_FILE_DELETE, $server))
                     ->hiddenLabel()
-                    ->icon('tabler-trash')->iconSize(IconSize::Large)
+                    ->iconSize(IconSize::Large)
                     ->requiresConfirmation()
                     ->modalHeading(fn (File $file) => trans('filament-actions::delete.single.modal.heading', ['label' => $file->name . ' ' . ($file->is_directory ? 'folder' : 'file')]))
                     ->action(function (File $file) {
@@ -446,6 +445,7 @@ class ListFiles extends ListRecords
                             $this->refreshPage();
                         }),
                     DeleteBulkAction::make()
+                        ->successNotificationTitle(null)
                         ->authorize(fn () => user()?->can(Permission::ACTION_FILE_DELETE, $server))
                         ->action(function (Collection $files) {
                             $files = $files->map(fn ($file) => $file['name'])->toArray();

app/Filament/Server/Resources/Schedules/Pages/EditSchedule.php

@@ -50,24 +50,20 @@ class EditSchedule extends EditRecord
         return [
             DeleteAction::make()
                 ->hiddenLabel()->iconButton()->iconSize(IconSize::ExtraLarge)
-                ->icon('tabler-trash')
                 ->tooltip(trans('server/schedule.delete'))
                 ->after(function ($record) {
                     Activity::event('server:schedule.delete')
                         ->property('name', $record->name)
                         ->log();
                 }),
-            ExportScheduleAction::make()
-                ->hiddenLabel()->iconButton()->iconSize(IconSize::ExtraLarge)
-                ->icon('tabler-download')
-                ->tooltip(trans('server/schedule.export')),
+            ExportScheduleAction::make(),
             $this->getSaveFormAction()->formId('form')
                 ->hiddenLabel()->iconButton()->iconSize(IconSize::ExtraLarge)
                 ->icon('tabler-device-floppy')
                 ->tooltip(trans('server/schedule.save')),
             $this->getCancelFormAction()->formId('form')
                 ->hiddenLabel()->iconButton()->iconSize(IconSize::ExtraLarge)
-                ->icon('tabler-cancel')
+                ->icon('tabler-arrow-left')
                 ->tooltip(trans('server/schedule.cancel')),
         ];
     }

app/Filament/Server/Resources/Schedules/RelationManagers/TasksRelationManager.php

@@ -2,6 +2,7 @@
 
 namespace App\Filament\Server\Resources\Schedules\RelationManagers;
 
+use App\Extensions\Tasks\TaskService;
 use App\Facades\Activity;
 use App\Models\Schedule;
 use App\Models\Task;
@@ -9,12 +10,12 @@ use Exception;
 use Filament\Actions\CreateAction;
 use Filament\Actions\DeleteAction;
 use Filament\Actions\EditAction;
-use Filament\Forms\Components\Field;
 use Filament\Forms\Components\Select;
-use Filament\Forms\Components\Textarea;
 use Filament\Forms\Components\TextInput;
 use Filament\Forms\Components\Toggle;
 use Filament\Resources\RelationManagers\RelationManager;
+use Filament\Schemas\Components\Component;
+use Filament\Schemas\Components\Group;
 use Filament\Schemas\Components\Utilities\Get;
 use Filament\Schemas\Components\Utilities\Set;
 use Filament\Tables\Columns\IconColumn;
@@ -26,53 +27,31 @@ class TasksRelationManager extends RelationManager
     protected static string $relationship = 'tasks';
 
     /**
-     * @return array<array-key, string>
-     */
-    private function getActionOptions(bool $full = true): array
-    {
-        return [
-            Task::ACTION_POWER => $full ? trans('server/schedule.tasks.actions.power.title') : trans('server/schedule.tasks.actions.power.action'),
-            Task::ACTION_COMMAND => $full ? trans('server/schedule.tasks.actions.command.title') : trans('server/schedule.tasks.actions.command.command'),
-            Task::ACTION_BACKUP => $full ? trans('server/schedule.tasks.actions.backup.title') : trans('server/schedule.tasks.actions.backup.files_to_ignore'),
-            Task::ACTION_DELETE_FILES => $full ? trans('server/schedule.tasks.actions.delete.title') : trans('server/schedule.tasks.actions.delete.files_to_delete'),
-        ];
-    }
-
-    /**
-     * @return array<Field>
+     * @return Component[]
      *
      * @throws Exception
      */
     private function getTaskForm(Schedule $schedule): array
     {
+        /** @var TaskService $taskService */
+        $taskService = app(TaskService::class); // @phpstan-ignore myCustomRules.forbiddenGlobalFunctions
+
+        $tasks = $taskService->getAll();
+
         return [
             Select::make('action')
                 ->label(trans('server/schedule.tasks.actions.title'))
                 ->required()
                 ->live()
-                ->disableOptionWhen(fn (string $value) => $value === Task::ACTION_BACKUP && $schedule->server->backup_limit === 0)
-                ->options($this->getActionOptions())
+                ->disableOptionWhen(fn (string $value) => !$tasks[$value]->canCreate($schedule))
+                ->options($taskService->getMappings())
                 ->selectablePlaceholder(false)
-                ->default(Task::ACTION_POWER)
-                ->afterStateUpdated(fn ($state, Set $set) => $set('payload', $state === Task::ACTION_POWER ? 'restart' : null)),
-            Textarea::make('payload')
-                ->hidden(fn (Get $get) => $get('action') === Task::ACTION_POWER)
-                ->label(fn (Get $get) => $this->getActionOptions(false)[$get('action')] ?? trans('server/schedule.tasks.payload')),
-            Select::make('payload')
-                ->visible(fn (Get $get) => $get('action') === Task::ACTION_POWER)
-                ->label(trans('server/schedule.tasks.actions.power.action'))
-                ->required()
-                ->options([
-                    'start' => trans('server/schedule.tasks.actions.power.start'),
-                    'restart' => trans('server/schedule.tasks.actions.power.restart'),
-                    'stop' => trans('server/schedule.tasks.actions.power.stop'),
-                    'kill' => trans('server/schedule.tasks.actions.power.kill'),
-                ])
-                ->selectablePlaceholder(false)
-                ->default('restart'),
+                ->default(array_key_first($tasks))
+                ->afterStateUpdated(fn ($state, Set $set) => $set('payload', $tasks[$state]->getDefaultPayload())),
+            Group::make(fn (Get $get) => array_key_exists($get('action'), $tasks) ? $tasks[$get('action')]->getPayloadForm() : []),
             TextInput::make('time_offset')
                 ->label(trans('server/schedule.tasks.time_offset'))
-                ->hidden(fn (Get $get) => config('queue.default') === 'sync' || $get('sequence_id') === 1 || $schedule->tasks->isEmpty())
+                ->hidden(fn (Get $get, ?Task $task) => config('queue.default') === 'sync' || $schedule->tasks->isEmpty() || $task?->isFirst())
                 ->default(0)
                 ->numeric()
                 ->minValue(0)
@@ -97,19 +76,18 @@ class TasksRelationManager extends RelationManager
             ->columns([
                 TextColumn::make('action')
                     ->label(trans('server/schedule.tasks.actions.title'))
-                    ->state(fn (Task $task) => $this->getActionOptions()[$task->action] ?? $task->action),
+                    ->state(fn (Task $task) => $task->getSchema()?->getName() ?? $task->action),
                 TextColumn::make('payload')
                     ->label(trans('server/schedule.tasks.payload'))
-                    ->state(fn (Task $task) => match ($task->payload) {
-                        'start', 'restart', 'stop', 'kill' => mb_ucfirst($task->payload),
-                        default => explode(PHP_EOL, $task->payload)
-                    })
+                    ->state(fn (Task $task) => $task->getSchema()?->formatPayload($task->payload) ?? $task->payload)
+                    ->tooltip(fn (Task $task) => $task->getSchema()?->getPayloadLabel())
+                    ->placeholder(trans('server/schedule.tasks.no_payload'))
                     ->badge(),
                 TextColumn::make('time_offset')
                     ->label(trans('server/schedule.tasks.time_offset'))
                     ->hidden(fn () => config('queue.default') === 'sync')
-                    ->suffix(fn (Task $task) => $task->sequence_id > 1 ? ' '. trans_choice('server/schedule.tasks.seconds', $task->time_offset) : null)
-                    ->state(fn (Task $task) => $task->sequence_id === 1 ? null : $task->time_offset)
+                    ->state(fn (Task $task) => $task->isFirst() ? null : $task->time_offset)
+                    ->suffix(fn ($state) => ' ' . trans_choice('server/schedule.tasks.seconds', $state))
                     ->placeholder(trans('server/schedule.tasks.first_task')),
                 IconColumn::make('continue_on_failure')
                     ->label(trans('server/schedule.tasks.continue_on_failure'))

app/Filament/Server/Resources/Schedules/ScheduleResource.php

@@ -13,7 +13,6 @@ use App\Filament\Server\Resources\Schedules\Pages\ListSchedules;
 use App\Filament\Server\Resources\Schedules\Pages\ViewSchedule;
 use App\Filament\Server\Resources\Schedules\RelationManagers\TasksRelationManager;
 use App\Helpers\Utilities;
-use App\Models\Permission;
 use App\Models\Schedule;
 use App\Traits\Filament\BlockAccessInConflict;
 use App\Traits\Filament\CanCustomizePages;
@@ -26,7 +25,6 @@ use Filament\Actions\CreateAction;
 use Filament\Actions\DeleteAction;
 use Filament\Actions\EditAction;
 use Filament\Actions\ViewAction;
-use Filament\Facades\Filament;
 use Filament\Forms\Components\Select;
 use Filament\Forms\Components\TextInput;
 use Filament\Forms\Components\Toggle;
@@ -46,7 +44,6 @@ use Filament\Support\Exceptions\Halt;
 use Filament\Tables\Columns\IconColumn;
 use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Table;
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\HtmlString;
 use Throwable;
 
@@ -64,26 +61,6 @@ class ScheduleResource extends Resource
 
     protected static string|\BackedEnum|null $navigationIcon = 'tabler-clock';
 
-    public static function canViewAny(): bool
-    {
-        return user()?->can(Permission::ACTION_SCHEDULE_READ, Filament::getTenant());
-    }
-
-    public static function canCreate(): bool
-    {
-        return user()?->can(Permission::ACTION_SCHEDULE_CREATE, Filament::getTenant());
-    }
-
-    public static function canEdit(Model $record): bool
-    {
-        return user()?->can(Permission::ACTION_SCHEDULE_UPDATE, Filament::getTenant());
-    }
-
-    public static function canDelete(Model $record): bool
-    {
-        return user()?->can(Permission::ACTION_SCHEDULE_DELETE, Filament::getTenant());
-    }
-
     /**
      * @throws Exception
      */
@@ -357,7 +334,8 @@ class ScheduleResource extends Resource
                     ->state(fn (Schedule $schedule) => $schedule->status === ScheduleStatus::Active ? $schedule->next_run_at : null),
             ])
             ->recordActions([
-                ViewAction::make(),
+                ViewAction::make()
+                    ->hidden(fn ($record) => static::getEditAuthorizationResponse($record)->allowed()),
                 EditAction::make(),
                 DeleteAction::make()
                     ->after(function (Schedule $schedule) {

app/Filament/Server/Resources/Users/UserResource.php

@@ -37,7 +37,6 @@ use Filament\Support\Enums\IconSize;
 use Filament\Tables\Columns\ImageColumn;
 use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Table;
-use Illuminate\Database\Eloquent\Model;
 
 class UserResource extends Resource
 {
@@ -63,26 +62,6 @@ class UserResource extends Resource
         return $server->subusers->count();
     }
 
-    public static function canViewAny(): bool
-    {
-        return user()?->can(Permission::ACTION_USER_READ, Filament::getTenant());
-    }
-
-    public static function canCreate(): bool
-    {
-        return user()?->can(Permission::ACTION_USER_CREATE, Filament::getTenant());
-    }
-
-    public static function canEdit(Model $record): bool
-    {
-        return user()?->can(Permission::ACTION_USER_UPDATE, Filament::getTenant());
-    }
-
-    public static function canDelete(Model $record): bool
-    {
-        return user()?->can(Permission::ACTION_USER_DELETE, Filament::getTenant());
-    }
-
     public static function defaultTable(Table $table): Table
     {
         /** @var Server $server */

app/Http/Controllers/Api/Application/Servers/ServerManagementController.php

@@ -34,7 +34,7 @@ class ServerManagementController extends ApplicationApiController
     }
 
     /**
-     * Suspsend
+     * Suspend
      *
      * Suspend a server on the Panel.
      *

app/Http/Controllers/Api/Client/SSHKeyController.php

@@ -55,23 +55,19 @@ class SSHKeyController extends ClientApiController
      *
      * Deletes an SSH key from the user's account.
      */
-    public function delete(ClientApiRequest $request): JsonResponse
+    public function delete(ClientApiRequest $request, string $fingerprint): JsonResponse
     {
-        $request->validate(['fingerprint' => ['required', 'string']]);
-
-        /** @var ?UserSSHKey $key */
+        /** @var UserSSHKey $key */
         $key = $request->user()->sshKeys()
-            ->where('fingerprint', $request->input('fingerprint'))
-            ->first();
+            ->where('fingerprint', $fingerprint)
+            ->firstOrFail();
 
-        if (!is_null($key)) {
-            $key->delete();
+        Activity::event('user:ssh-key.delete')
+            ->subject($key)
+            ->property('fingerprint', $key->fingerprint)
+            ->log();
 
-            Activity::event('user:ssh-key.delete')
-                ->subject($key)
-                ->property('fingerprint', $key->fingerprint)
-                ->log();
-        }
+        $key->delete();
 
         return new JsonResponse([], JsonResponse::HTTP_NO_CONTENT);
     }

app/Http/Controllers/Api/Client/Servers/ScheduleTaskController.php

@@ -170,7 +170,7 @@ class ScheduleTaskController extends ClientApiController
             throw new NotFoundHttpException();
         }
 
-        if (!$request->user()->can(Permission::ACTION_SCHEDULE_UPDATE, $server)) {
+        if (!$request->user()->can(Permission::ACTION_SCHEDULE_DELETE, $server)) {
             throw new HttpForbiddenException('You do not have permission to perform this action.');
         }
 

app/Http/Middleware/RequireTwoFactorAuthentication.php

@@ -0,0 +1,64 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use App\Exceptions\Http\TwoFactorAuthRequiredException;
+use App\Filament\Pages\Auth\EditProfile;
+use App\Livewire\AlertBanner;
+use App\Models\User;
+use Illuminate\Http\Request;
+use Illuminate\Support\Str;
+
+class RequireTwoFactorAuthentication
+{
+    public const LEVEL_NONE = 0;
+
+    public const LEVEL_ADMIN = 1;
+
+    public const LEVEL_ALL = 2;
+
+    /**
+     * Check the user state on the incoming request to determine if they should be allowed to
+     * proceed or not. This checks if the Panel is configured to require 2FA on an account in
+     * order to perform actions. If so, we check the level at which it is required (all users
+     * or just admins) and then check if the user has enabled it for their account.
+     *
+     * @throws \App\Exceptions\Http\TwoFactorAuthRequiredException
+     */
+    public function handle(Request $request, \Closure $next): mixed
+    {
+        /** @var ?User $user */
+        $user = $request->user();
+
+        // Auth and profile endpoints should always be available
+        if (!$user || $request->routeIs('*auth.*')) {
+            return $next($request);
+        }
+
+        $level = (int) config('panel.auth.2fa_required');
+
+        $has2fa = $user->hasEmailAuthentication() || filled($user->getAppAuthenticationSecret());
+        if ($level === self::LEVEL_NONE || $has2fa) {
+            // If this setting is not configured, or the user is already using 2FA then we can just send them right through, nothing else needs to be checked.
+            return $next($request);
+        }
+
+        if ($level === self::LEVEL_ADMIN && !$user->isAdmin()) {
+            // If the level is set as admin and the user is not an admin, pass them through as well.
+            return $next($request);
+        }
+
+        // For API calls return an exception which gets rendered nicely in the API response...
+        if ($request->isJson() || Str::startsWith($request->path(), '/api')) {
+            throw new TwoFactorAuthRequiredException();
+        }
+
+        // ... otherwise display banner and redirect to profile
+        AlertBanner::make('2fa_must_be_enabled')
+            ->body(trans('auth.2fa_must_be_enabled'))
+            ->warning()
+            ->send();
+
+        return redirect(EditProfile::getUrl(['tab' => '2fa::data::tab'], panel: 'app'));
+    }
+}

app/Jobs/Schedule/RunTaskJob.php

@@ -2,11 +2,9 @@
 
 namespace App\Jobs\Schedule;
 
+use App\Extensions\Tasks\TaskService;
 use App\Jobs\Job;
 use App\Models\Task;
-use App\Repositories\Daemon\DaemonServerRepository;
-use App\Services\Backups\InitiateBackupService;
-use App\Services\Files\DeleteFilesService;
 use Carbon\CarbonImmutable;
 use Exception;
 use Illuminate\Contracts\Queue\ShouldQueue;
@@ -31,11 +29,8 @@ class RunTaskJob extends Job implements ShouldQueue
      *
      * @throws Throwable
      */
-    public function handle(
-        InitiateBackupService $backupService,
-        DaemonServerRepository $serverRepository,
-        DeleteFilesService $deleteFilesService
-    ): void {
+    public function handle(TaskService $taskService): void
+    {
         // Do not process a task that is not set to active, unless it's been manually triggered.
         if (!$this->task->schedule->is_active && !$this->manualRun) {
             $this->markTaskNotQueued();
@@ -57,22 +52,13 @@ class RunTaskJob extends Job implements ShouldQueue
 
         // Perform the provided task against the daemon.
         try {
-            switch ($this->task->action) {
-                case Task::ACTION_POWER:
-                    $serverRepository->setServer($server)->power($this->task->payload);
-                    break;
-                case Task::ACTION_COMMAND:
-                    $server->send($this->task->payload);
-                    break;
-                case Task::ACTION_BACKUP:
-                    $backupService->setIgnoredFiles(explode(PHP_EOL, $this->task->payload))->handle($server, null, true);
-                    break;
-                case Task::ACTION_DELETE_FILES:
-                    $deleteFilesService->handle($server, explode(PHP_EOL, $this->task->payload));
-                    break;
-                default:
-                    throw new InvalidArgumentException('Invalid task action provided: ' . $this->task->action);
+            $taskSchema = $taskService->get($this->task->action);
+
+            if (!$taskSchema) {
+                throw new InvalidArgumentException('Invalid task action provided: ' . $this->task->action);
             }
+
+            $taskSchema->runTask($this->task);
         } catch (Exception $exception) {
             // If this isn't a ConnectionException on a task that allows for failures
             // throw the exception back up the chain so that the task is stopped.

app/Livewire/ServerEntry.php

@@ -2,7 +2,9 @@
 
 namespace App\Livewire;
 
+use App\Filament\Server\Pages\Console;
 use App\Models\Server;
+use Filament\Support\Facades\FilamentView;
 use Illuminate\View\View;
 use Livewire\Component;
 
@@ -12,68 +14,23 @@ class ServerEntry extends Component
 
     public function render(): View
     {
-        return view('livewire.server-entry');
+        return view('livewire.server-entry', ['component' => $this]);
     }
 
-    public function placeholder(): string
+    public function placeholder(): View
     {
-        return <<<'HTML'
-        <div class="relative cursor-pointer" x-on:click="window.location.href = '{{ \App\Filament\Server\Pages\Console::getUrl(panel: 'server', tenant: $server) }}'">
-            <div
-                class="absolute left-0 top-1 bottom-0 w-1 rounded-lg"
-                style="background-color: #D97706;">
-            </div>
+        return view('livewire.server-entry-placeholder', ['server' => $this->server, 'component' => $this]);
+    }
 
-            <div class="flex-1 dark:bg-gray-800 dark:text-white rounded-lg overflow-hidden p-3">
-                @if($server->egg->image)
-                    <div style="
-                        position: absolute;
-                        inset: 0;
-                        background: url('{{ $server->egg->image }}') right no-repeat;
-                        background-size: contain;
-                        opacity: 0.20;
-                        max-width: 680px;
-                        max-height: 140px;
-                    "></div>
-                @endif
+    public function redirectUrl(?bool $shouldOpenUrlInNewTab = false): string
+    {
+        $url = Console::getUrl(panel: 'server', tenant: $this->server);
+        $target = $shouldOpenUrlInNewTab ? '_blank' : '_self';
 
-                <div class="flex items-center mb-5 gap-2">
-                    <x-filament::loading-indicator class="h-6 w-6" />
-                    <h2 class="text-xl font-bold">
-                        {{ $server->name }}
-                        <span class="dark:text-gray-400">
-                        ({{ trans('server/dashboard.loading') }})
-                        </span>
-                    </h2>
-                </div>
+        if (!$shouldOpenUrlInNewTab && FilamentView::hasSpaMode($url)) {
+            return sprintf("Livewire.navigate('%s')", $url);
+        }
 
-                <div class="flex justify-between text-center items-center gap-4">
-                    <div>
-                        <p class="text-sm dark:text-gray-400">{{ trans('server/dashboard.cpu') }}</p>
-                        <p class="text-md font-semibold">{{ format_number(0, precision: 2) . '%' }}</p>
-                        <hr class="p-0.5">
-                        <p class="text-xs dark:text-gray-400">{{ $server->formatResource(\App\Enums\ServerResourceType::CPULimit) }}</p>
-                    </div>
-                    <div>
-                        <p class="text-sm dark:text-gray-400">{{ trans('server/dashboard.memory') }}</p>
-                        <p class="text-md font-semibold">{{ convert_bytes_to_readable(0, decimals: 2) }}</p>
-                        <hr class="p-0.5">
-                        <p class="text-xs dark:text-gray-400">{{ $server->formatResource(\App\Enums\ServerResourceType::MemoryLimit) }}</p>
-                    </div>
-                    <div>
-                        <p class="text-sm dark:text-gray-400">{{ trans('server/dashboard.disk') }}</p>
-                        <p class="text-md font-semibold">{{ convert_bytes_to_readable(0, decimals: 2) }}</p>
-                        <hr class="p-0.5">
-                        <p class="text-xs dark:text-gray-400">{{ $server->formatResource(\App\Enums\ServerResourceType::DiskLimit) }}</p>
-                    </div>
-                    <div class="hidden sm:block">
-                        <p class="text-sm dark:text-gray-400">{{ trans('server/dashboard.network') }}</p>
-                        <hr class="p-0.5">
-                        <p class="text-md font-semibold">{{ $server->allocation?->address ?? trans('server/dashboard.none') }} </p>
-                    </div>
-                </div>
-            </div>
-        </div>
-        HTML;
+        return sprintf("window.open('%s', '%s')", $url, $target);
     }
 }

app/Models/DatabaseHost.php

@@ -60,7 +60,7 @@ class DatabaseHost extends Model implements Validatable
         'username' => ['required', 'string', 'max:32'],
         'password' => ['nullable', 'string'],
         'node_ids' => ['nullable', 'array'],
-        'node_ids.*' => ['required', 'integer,exists:nodes,id'],
+        'node_ids.*' => ['required', 'integer', 'exists:nodes,id'],
     ];
 
     protected function casts(): array

app/Models/File.php

@@ -123,7 +123,7 @@ class File extends Model
             return false;
         }
 
-        return $this->is_file && !in_array($this->mime_type, ['application/jar', 'application/octet-stream', 'inode/directory']);
+        return $this->is_file && !in_array($this->mime_type, ['application/java-archive', 'application/octet-stream', 'inode/directory']);
     }
 
     public function server(): Server
@@ -202,7 +202,7 @@ class File extends Model
                     'is_directory' => $file['directory'],
                     'is_file' => $file['file'],
                     'is_symlink' => $file['symlink'],
-                    'mime_type' => $file['file'] && str($file['name'])->lower()->endsWith('.jar') && in_array($file['mime'], self::ARCHIVE_MIMES) ? 'application/jar' : $file['mime'],
+                    'mime_type' => $file['file'] && str($file['name'])->lower()->endsWith('.jar') && in_array($file['mime'], self::ARCHIVE_MIMES) ? 'application/java-archive' : $file['mime'],
                 ];
             }, $contents);
 

app/Models/Node.php

@@ -314,7 +314,7 @@ class Node extends Model implements Validatable
     /** @return array<mixed> */
     public function systemInformation(): array
     {
-        return once(function () {
+        return cache()->remember("nodes.$this->id.system_information", now()->addSeconds(360), function () {
             try {
                 return (new DaemonSystemRepository())
                     ->setNode($this)
@@ -358,21 +358,23 @@ class Node extends Model implements Validatable
             'disk_used' => 0,
         ];
 
-        try {
+        return cache()->remember("nodes.$this->id.statistics", now()->addSeconds(360), function () use ($default) {
+            try {
 
-            $data = Http::daemon($this)
-                ->connectTimeout(1)
-                ->timeout(1)
-                ->get('/api/system/utilization')
-                ->json();
+                $data = Http::daemon($this)
+                    ->connectTimeout(1)
+                    ->timeout(1)
+                    ->get('/api/system/utilization')
+                    ->json();
 
-            if ($data['memory_total']) {
-                return $data;
+                if (!empty($data['memory_total'])) {
+                    return $data;
+                }
+            } catch (Exception) {
             }
-        } catch (Exception) {
-        }
 
-        return $default;
+            return $default;
+        });
     }
 
     /** @return string[] */

app/Models/Role.php

@@ -54,6 +54,12 @@ class Role extends BaseRole
         ],
     ];
 
+    public const MODEL_ICONS = [
+        'health' => 'tabler-heart',
+        'activityLog' => 'tabler-stack',
+        'panelLog' => 'tabler-file-info',
+    ];
+
     /** @var array<string, array<string>> */
     protected static array $customPermissions = [];
 
@@ -79,6 +85,14 @@ class Role extends BaseRole
         ]);
     }
 
+    /** @var array<string, string> */
+    protected static array $customModelIcons = [];
+
+    public static function registerCustomModelIcon(string $model, string $icon): void
+    {
+        static::$customModelIcons[$model] = $icon;
+    }
+
     /** @return array<string, array<string>> */
     public static function getPermissionList(): array
     {
@@ -124,6 +138,31 @@ class Role extends BaseRole
         return $allPermissions;
     }
 
+    public static function getModelIcon(string $model): ?string
+    {
+        $customModels = array_merge(static::MODEL_ICONS, static::$customModelIcons);
+
+        if (array_key_exists($model, $customModels)) {
+            return $customModels[$model];
+        }
+
+        $model = ucwords($model);
+
+        if (class_exists($class = '\\App\\Filament\\Admin\\Resources\\' . $model . 's\\' . $model . 'Resource')) {
+            return $class::getNavigationIcon();
+        }
+
+        if (class_exists($class = '\\App\\Filament\\Admin\\Pages\\' . $model)) {
+            return $class::getNavigationIcon();
+        }
+
+        if (class_exists($class = '\\App\\Filament\\Server\\Resources\\' . $model . 's\\' . $model . 'Resource')) {
+            return $class::getNavigationIcon();
+        }
+
+        return null;
+    }
+
     public function isRootAdmin(): bool
     {
         return $this->name === self::ROOT_ADMIN;

app/Models/Schedule.php

@@ -142,4 +142,12 @@ class Schedule extends Model implements Validatable
     {
         return $this->belongsTo(Server::class);
     }
+
+    public function firstTask(): ?Task
+    {
+        /** @var ?Task $task */
+        $task = $this->tasks()->orderBy('sequence_id')->first();
+
+        return $task;
+    }
 }

app/Models/Server.php

@@ -12,6 +12,7 @@ use App\Services\Subusers\SubuserDeletionService;
 use App\Traits\HasValidation;
 use Carbon\CarbonInterface;
 use Database\Factories\ServerFactory;
+use Filament\Models\Contracts\HasAvatar;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Collection;
@@ -55,6 +56,7 @@ use Psr\Http\Message\ResponseInterface;
  * @property int $egg_id
  * @property string $startup
  * @property string $image
+ * @property string|null $icon
  * @property int|null $allocation_limit
  * @property int|null $database_limit
  * @property int|null $backup_limit
@@ -70,7 +72,7 @@ use Psr\Http\Message\ResponseInterface;
  * @property int|null $backups_count
  * @property Collection|Database[] $databases
  * @property int|null $databases_count
- * @property Egg|null $egg
+ * @property Egg $egg
  * @property Collection|Mount[] $mounts
  * @property int|null $mounts_count
  * @property Node $node
@@ -129,7 +131,7 @@ use Psr\Http\Message\ResponseInterface;
  * @method static Builder|Server wherePorts($value)
  * @method static Builder|Server whereUuidShort($value)
  */
-class Server extends Model implements Validatable
+class Server extends Model implements HasAvatar, Validatable
 {
     use HasFactory;
     use HasValidation;
@@ -181,6 +183,7 @@ class Server extends Model implements Validatable
         'startup' => ['required', 'string'],
         'skip_scripts' => ['sometimes', 'boolean'],
         'image' => ['required', 'string', 'max:255'],
+        'icon' => ['sometimes', 'nullable', 'string'],
         'database_limit' => ['present', 'nullable', 'integer', 'min:0'],
         'allocation_limit' => ['sometimes', 'nullable', 'integer', 'min:0'],
         'backup_limit' => ['present', 'nullable', 'integer', 'min:0'],
@@ -479,7 +482,7 @@ class Server extends Model implements Validatable
         });
     }
 
-    public function formatResource(ServerResourceType $resourceType): string
+    public function formatResource(ServerResourceType $resourceType, int $precision = 2): string
     {
         $resourceAmount = $resourceType->getResourceAmount($this);
 
@@ -501,10 +504,10 @@ class Server extends Model implements Validatable
         }
 
         if ($resourceType->isPercentage()) {
-            return format_number($resourceAmount, precision: 2) . '%';
+            return format_number($resourceAmount, precision: $precision) . '%';
         }
 
-        return convert_bytes_to_readable($resourceAmount, base: 3);
+        return convert_bytes_to_readable($resourceAmount, decimals: $precision, base: 3);
     }
 
     public function condition(): Attribute
@@ -513,4 +516,10 @@ class Server extends Model implements Validatable
             get: fn () => $this->status ?? $this->retrieveStatus(),
         );
     }
+
+    public function getFilamentAvatarUrl(): ?string
+    {
+        return $this->icon ?? $this->egg->image;
+
+    }
 }

app/Models/Task.php

@@ -3,6 +3,8 @@
 namespace App\Models;
 
 use App\Contracts\Validatable;
+use App\Extensions\Tasks\TaskSchemaInterface;
+use App\Extensions\Tasks\TaskService;
 use App\Traits\HasValidation;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
@@ -35,17 +37,6 @@ class Task extends Model implements Validatable
      */
     public const RESOURCE_NAME = 'schedule_task';
 
-    /**
-     * The default actions that can exist for a task
-     */
-    public const ACTION_POWER = 'power';
-
-    public const ACTION_COMMAND = 'command';
-
-    public const ACTION_BACKUP = 'backup';
-
-    public const ACTION_DELETE_FILES = 'delete_files';
-
     /**
      * Relationships to be updated when this model is updated.
      *
@@ -120,4 +111,17 @@ class Task extends Model implements Validatable
             'server_id' // schedules.server_id
         );
     }
+
+    public function isFirst(): bool
+    {
+        return $this->schedule->firstTask()?->id === $this->id;
+    }
+
+    public function getSchema(): ?TaskSchemaInterface
+    {
+        /** @var TaskService $taskService */
+        $taskService = app(TaskService::class); // @phpstan-ignore myCustomRules.forbiddenGlobalFunctions
+
+        return $taskService->get($this->action);
+    }
 }

app/Models/User.php

@@ -291,6 +291,7 @@ class User extends Model implements AuthenticatableContract, AuthorizableContrac
             ->distinct('servers.id');
     }
 
+    /** @return Builder<Node> */
     public function accessibleNodes(): Builder
     {
         // Root admins can access all nodes
@@ -342,9 +343,7 @@ class User extends Model implements AuthenticatableContract, AuthorizableContrac
             return false;
         }
 
-        $check = in_array($permission, $subuser->permissions);
-
-        return $check;
+        return in_array($permission, $subuser->permissions);
     }
 
     /**

app/Models/WebhookConfiguration.php

@@ -221,7 +221,7 @@ class WebhookConfiguration extends Model
             'created_at' => '2025-09-05T01:15:43.000000Z',
             'updated_at' => '2025-09-11T22:45:14.000000Z',
             'allocation_id' => 4,
-            'image' => 'ghcr.io/parkervcp/yolks:java_21',
+            'image' => 'ghcr.io/pelican-eggs/yolks:java_21',
             'description' => 'This is an example server description.',
             'skip_scripts' => false,
             'external_id' => null,

app/Policies/Admin/ApiKeyPolicy.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Policies\Admin;
+
+class ApiKeyPolicy
+{
+    use DefaultPolicies;
+
+    protected string $modelName = 'apiKey';
+}

app/Policies/Admin/DatabaseHostPolicy.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Policies;
+namespace App\Policies\Admin;
 
 use App\Models\DatabaseHost;
 use App\Models\User;
@@ -9,7 +9,7 @@ class DatabaseHostPolicy
 {
     use DefaultPolicies;
 
-    protected string $modelName = 'databasehost';
+    protected string $modelName = 'databaseHost';
 
     public function before(User $user, string $ability, string|DatabaseHost $databaseHost): ?bool
     {

app/Policies/Admin/DefaultPolicies.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Policies;
+namespace App\Policies\Admin;
 
 use App\Models\User;
 use Illuminate\Database\Eloquent\Model;