notify about completed backups

.github/workflows/ci.yaml

@@ -26,7 +26,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [8.3, 8.4, 8.5]
+        php: [8.2, 8.3, 8.4, 8.5]
     env:
       DB_CONNECTION: sqlite
       DB_DATABASE: testing.sqlite
@@ -61,17 +61,14 @@ jobs:
       - name: Create SQLite file
         run: touch database/testing.sqlite
 
-      - name: Run Migrations
-        run: php artisan migrate --force --seed
-
       - name: Unit tests
-        run: vendor/bin/pest tests/Unit --parallel
+        run: vendor/bin/pest tests/Unit
         env:
           DB_HOST: UNIT_NO_DB
           SKIP_MIGRATIONS: true
 
       - name: Integration tests
-        run: vendor/bin/pest tests/Integration --parallel
+        run: vendor/bin/pest tests/Integration
 
   mysql:
     name: MySQL
@@ -79,8 +76,8 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [8.5]
-        database: ["mysql:8.4", "mysql:9.6"]
+        php: [8.2, 8.3, 8.4, 8.5]
+        database: ["mysql:8"]
     services:
       database:
         image: ${{ matrix.database }}
@@ -123,20 +120,14 @@ jobs:
       - name: Install dependencies
         run: composer install --no-interaction --no-suggest --no-progress --no-scripts
 
-      - name: Run Migrations
-        run: php artisan migrate --force --seed
-        env:
-          DB_PORT: ${{ job.services.database.ports[3306] }}
-          DB_USERNAME: root
-
       - name: Unit tests
-        run: vendor/bin/pest tests/Unit --parallel
+        run: vendor/bin/pest tests/Unit
         env:
           DB_HOST: UNIT_NO_DB
           SKIP_MIGRATIONS: true
 
       - name: Integration tests
-        run: vendor/bin/pest tests/Integration --parallel
+        run: vendor/bin/pest tests/Integration
         env:
           DB_PORT: ${{ job.services.database.ports[3306] }}
           DB_USERNAME: root
@@ -147,8 +138,8 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [8.5]
-        database: ["mariadb:10.11", "mariadb:11.4"]
+        php: [8.2, 8.3, 8.4, 8.5]
+        database: ["mariadb:10.6", "mariadb:10.11", "mariadb:11.4"]
     services:
       database:
         image: ${{ matrix.database }}
@@ -191,20 +182,14 @@ jobs:
       - name: Install dependencies
         run: composer install --no-interaction --no-suggest --no-progress --no-scripts
 
-      - name: Run Migrations
-        run: php artisan migrate --force --seed
-        env:
-          DB_PORT: ${{ job.services.database.ports[3306] }}
-          DB_USERNAME: root
-
       - name: Unit tests
-        run: vendor/bin/pest tests/Unit --parallel
+        run: vendor/bin/pest tests/Unit
         env:
           DB_HOST: UNIT_NO_DB
           SKIP_MIGRATIONS: true
 
       - name: Integration tests
-        run: vendor/bin/pest tests/Integration --parallel
+        run: vendor/bin/pest tests/Integration
         env:
           DB_PORT: ${{ job.services.database.ports[3306] }}
           DB_USERNAME: root
@@ -215,8 +200,8 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [8.5]
-        database: ["postgres:17", "postgres:18"]
+        php: [8.2, 8.3, 8.4, 8.5]
+        database: ["postgres:14"]
     services:
       database:
         image: ${{ matrix.database }}
@@ -253,7 +238,6 @@ jobs:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ matrix.php }}-${{ hashFiles('**/composer.lock') }}
           restore-keys: |
-            ${{ runner.os }}-composer-${{ matrix.php }}-
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -266,14 +250,11 @@ jobs:
       - name: Install dependencies
         run: composer install --no-interaction --no-suggest --no-progress --no-scripts
 
-      - name: Run Migrations
-        run: php artisan migrate --force --seed
-
       - name: Unit tests
-        run: vendor/bin/pest tests/Unit --parallel
+        run: vendor/bin/pest tests/Unit
         env:
           DB_HOST: UNIT_NO_DB
           SKIP_MIGRATIONS: true
 
       - name: Integration tests
-        run: vendor/bin/pest tests/Integration --parallel
+        run: vendor/bin/pest tests/Integration

Dockerfile

@@ -38,7 +38,7 @@ RUN yarn config set network-timeout 300000 \
 FROM --platform=$TARGETOS/$TARGETARCH composer AS composerbuild
 
 # Copy full code to optimize autoload
-COPY --exclude=docker/ . ./
+COPY --exclude=Caddyfile --exclude=docker/ . ./
 
 RUN composer dump-autoload --optimize
 
@@ -50,7 +50,7 @@ FROM --platform=$TARGETOS/$TARGETARCH yarn AS yarnbuild
 WORKDIR /build
 
 # Copy full code
-COPY --exclude=docker/ . ./
+COPY --exclude=Caddyfile --exclude=docker/ . ./
 COPY --from=composer /build .
 
 RUN yarn run build
@@ -62,36 +62,38 @@ FROM --platform=$TARGETOS/$TARGETARCH localhost:5000/base-php:$TARGETARCH AS fin
 
 WORKDIR /var/www/html
 
+# Install additional required libraries
 RUN apk add --no-cache \
-    # packages for running the panel
-    caddy ca-certificates supervisor supercronic fcgi \
-    # required for installing plugins. Pulled from https://github.com/pelican-dev/panel/pull/2034
-    zip unzip 7zip bzip2-dev yarn git
+    caddy ca-certificates supervisor supercronic fcgi
 
-# Copy composer binary for runtime plugin dependency management
-COPY --from=composer /usr/local/bin/composer /usr/local/bin/composer    
+COPY --chown=root:www-data --chmod=640 --from=composerbuild /build .
+COPY --chown=root:www-data --chmod=640 --from=yarnbuild /build/public ./public
 
-COPY --chown=root:www-data --chmod=770 --from=composerbuild /build .
-COPY --chown=root:www-data --chmod=770 --from=yarnbuild /build/public ./public
+# Set permissions
+# First ensure all files are owned by root and restrict www-data to read access
+RUN chown root:www-data ./ \
+    && chmod 750 ./ \
+    # Files should not have execute set, but directories need it
+    && find ./ -type d -exec chmod 750 {} \; \
+    # Create necessary directories
+    && mkdir -p /pelican-data/storage /pelican-data/plugins /var/www/html/storage/app/public /var/run/supervisord /etc/supercronic \
+    # Symlinks for env, database, storage, and plugins
+    && ln -s /pelican-data/.env ./.env \
+    && ln -s /pelican-data/database/database.sqlite ./database/database.sqlite \
+    && ln -sf /var/www/html/storage/app/public /var/www/html/public/storage \
+    && ln -s  /pelican-data/storage/avatars /var/www/html/storage/app/public/avatars \
+    && ln -s  /pelican-data/storage/fonts /var/www/html/storage/app/public/fonts \
+    && ln -s  /pelican-data/plugins /var/www/html/plugins \
+    # Allow www-data write permissions where necessary
+    && chown -R www-data:www-data /pelican-data ./storage ./bootstrap/cache /var/run/supervisord /var/www/html/public/storage \
+    && chmod -R u+rwX,g+rwX,o-rwx /pelican-data ./storage ./bootstrap/cache /var/run/supervisord \
+    && chown -R www-data: /usr/local/etc/php/
 
-# Create and remove directories
-RUN mkdir -p /pelican-data/storage /pelican-data/plugins /var/run/supervisord \
-    && rm -rf /var/www/html/plugins \
-# Symlinks for env, database, storage, and plugins
-    && ln -s  /pelican-data/.env /var/www/html/.env \
-    && ln -s  /pelican-data/database/database.sqlite ./database/database.sqlite \
-    && ln -s  /pelican-data/storage /var/www/html/public/storage \
-    && ln -s  /pelican-data/storage /var/www/html/storage/app/public \
-    && ln -s  /pelican-data/plugins /var/www/html \
-# Allow www-data write permissions where necessary
-    && chown -R www-data: /pelican-data .env ./storage ./plugins ./bootstrap/cache /var/run/supervisord /var/www/html/public/storage \
-    && chmod -R 770 /pelican-data ./storage ./bootstrap/cache /var/run/supervisord \
-    && chown -R www-data: /usr/local/etc/php/ /usr/local/etc/php-fpm.d/ /var/www/html/composer.json /var/www/html/composer.lock
 # Configure Supervisor
 COPY docker/supervisord.conf /etc/supervisord.conf
 COPY docker/Caddyfile /etc/caddy/Caddyfile
 # Add Laravel scheduler to crontab
-COPY docker/crontab /etc/crontabs/crontab
+COPY docker/crontab /etc/supercronic/crontab
 
 COPY docker/entrypoint.sh /entrypoint.sh
 COPY docker/healthcheck.sh /healthcheck.sh

Dockerfile.base

@@ -5,6 +5,6 @@ FROM --platform=$TARGETOS/$TARGETARCH php:8.4-fpm-alpine
 
 ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
 
-RUN install-php-extensions bcmath gd intl zip pcntl pdo_mysql pdo_pgsql bz2
+RUN install-php-extensions bcmath gd intl zip opcache pcntl posix pdo_mysql pdo_pgsql
 
 RUN rm /usr/local/bin/install-php-extensions

Dockerfile.dev

@@ -5,7 +5,7 @@ FROM --platform=$TARGETOS/$TARGETARCH php:8.4-fpm-alpine AS base
 
 ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
 
-RUN install-php-extensions bcmath gd intl zip pcntl pdo_mysql pdo_pgsql bz2
+RUN install-php-extensions bcmath gd intl zip opcache pcntl posix pdo_mysql pdo_pgsql
 
 RUN rm /usr/local/bin/install-php-extensions
 
@@ -42,7 +42,7 @@ RUN yarn config set network-timeout 300000 \
 FROM --platform=$TARGETOS/$TARGETARCH composer AS composerbuild
 
 # Copy full code to optimize autoload
-COPY --exclude=docker/ . ./
+COPY --exclude=Caddyfile --exclude=docker/ . ./
 
 RUN composer dump-autoload --optimize
 
@@ -54,7 +54,7 @@ FROM --platform=$TARGETOS/$TARGETARCH yarn AS yarnbuild
 WORKDIR /build
 
 # Copy full code
-COPY --exclude=docker/ . ./
+COPY --exclude=Caddyfile --exclude=docker/ . ./
 COPY --from=composer /build .
 
 RUN yarn run build
@@ -68,36 +68,36 @@ WORKDIR /var/www/html
 
 # Install additional required libraries
 RUN apk add --no-cache \
-    # packages for running the panel
-    caddy ca-certificates supervisor supercronic fcgi coreutils \
-    # required for installing plugins. Pulled from https://github.com/pelican-dev/panel/pull/2034
-    zip unzip 7zip bzip2-dev yarn git
+    caddy ca-certificates supervisor supercronic fcgi coreutils
 
-# Copy composer binary for runtime plugin dependency management
-COPY --from=composer /usr/local/bin/composer /usr/local/bin/composer    
+COPY --chown=root:www-data --chmod=640 --from=composerbuild /build .
+COPY --chown=root:www-data --chmod=640 --from=yarnbuild /build/public ./public
 
-COPY --chown=root:www-data --chmod=770 --from=composerbuild /build .
-COPY --chown=root:www-data --chmod=770 --from=yarnbuild /build/public ./public
-
-# Create and remove directories
-RUN mkdir -p /pelican-data/storage /pelican-data/plugins /var/run/supervisord \
-    && rm -rf /var/www/html/plugins \
-# Symlinks for env, database, storage, and plugins
-    && ln -s  /pelican-data/.env /var/www/html/.env \
-    && ln -s  /pelican-data/database/database.sqlite ./database/database.sqlite \
-    && ln -s  /pelican-data/storage /var/www/html/public/storage \
-    && ln -s  /pelican-data/storage /var/www/html/storage/app/public \
-    && ln -s  /pelican-data/plugins /var/www/html \
-# Allow www-data write permissions where necessary
-    && chown -R www-data: /pelican-data .env ./storage ./plugins ./bootstrap/cache /var/run/supervisord /var/www/html/public/storage \
-    && chmod -R 770 /pelican-data ./storage ./bootstrap/cache /var/run/supervisord \
-    && chown -R www-data: /usr/local/etc/php/ /usr/local/etc/php-fpm.d/ /var/www/html/composer.json /var/www/html/composer.lock
+# Set permissions
+# First ensure all files are owned by root and restrict www-data to read access
+RUN chown root:www-data ./ \
+    && chmod 750 ./ \
+    # Files should not have execute set, but directories need it
+    && find ./ -type d -exec chmod 750 {} \; \
+    # Create necessary directories
+    && mkdir -p /pelican-data/storage /pelican-data/plugins /var/www/html/storage/app/public /var/run/supervisord /etc/supercronic \
+    # Symlinks for env, database, storage, and plugins
+    && ln -s /pelican-data/.env ./.env \
+    && ln -s /pelican-data/database/database.sqlite ./database/database.sqlite \
+    && ln -sf /var/www/html/storage/app/public /var/www/html/public/storage \
+    && ln -s  /pelican-data/storage/avatars /var/www/html/storage/app/public/avatars \
+    && ln -s  /pelican-data/storage/fonts /var/www/html/storage/app/public/fonts \
+    && ln -s  /pelican-data/plugins /var/www/html/plugins \
+    # Allow www-data write permissions where necessary
+    && chown -R www-data:www-data /pelican-data ./storage ./bootstrap/cache /var/run/supervisord /var/www/html/public/storage \
+    && chmod -R u+rwX,g+rwX,o-rwx /pelican-data ./storage ./bootstrap/cache /var/run/supervisord \
+    && chown -R www-data: /usr/local/etc/php/
 
 # Configure Supervisor
 COPY docker/supervisord.conf /etc/supervisord.conf
 COPY docker/Caddyfile /etc/caddy/Caddyfile
 # Add Laravel scheduler to crontab
-COPY docker/crontab /etc/crontabs/crontab
+COPY docker/crontab /etc/supercronic/crontab
 
 COPY docker/entrypoint.sh /entrypoint.sh
 COPY docker/healthcheck.sh /healthcheck.sh

app/Console/Commands/Dev/GenerateTablerIconsEnum.php

@@ -1,48 +0,0 @@
-<?php
-
-namespace App\Console\Commands\Dev;
-
-use Illuminate\Console\Command;
-use Illuminate\Support\Facades\File;
-
-class GenerateTablerIconsEnum extends Command
-{
-    protected $signature = 'dev:generate-tabler-icons-enum';
-
-    protected $description = 'Generate an enum for tabler icons based on the secondnetwork/blade-tabler-icons svgs';
-
-    public function handle(): void
-    {
-        $files = File::files(base_path('vendor/secondnetwork/blade-tabler-icons/resources/svg'));
-        $files = array_filter($files, fn ($file) => $file->getExtension() === 'svg');
-
-        $enumContent = "<?php\n\n";
-        $enumContent .= "namespace App\\Enums;\n\n";
-        $enumContent .= "enum TablerIcon: string\n{\n";
-
-        foreach ($files as $file) {
-            $filename = pathinfo($file->getFilename(), PATHINFO_FILENAME);
-
-            // Letter V is duplicate, as "letter-v" and "letter-letter-v"
-            if (str($filename)->contains('letter-letter')) {
-                continue;
-            }
-
-            // Filled icons exist with "-f" and "-filled", we only want the later
-            if (str($filename)->endsWith('-f') && file_exists(base_path("vendor/secondnetwork/blade-tabler-icons/resources/svg/{$filename}illed.svg"))) {
-                continue;
-            }
-
-            $caseName = str($filename)->title()->replace('-', '');
-            $value = str($filename)->slug()->prepend('tabler-');
-
-            $enumContent .= "    case $caseName = '$value';\n";
-        }
-
-        $enumContent .= "}\n";
-
-        File::put(base_path('app/Enums/TablerIcon.php'), $enumContent);
-
-        $this->info('Enum generated');
-    }
-}

app/Enums/BackupStatus.php

@@ -2,7 +2,6 @@
 
 namespace App\Enums;
 
-use BackedEnum;
 use Filament\Support\Contracts\HasColor;
 use Filament\Support\Contracts\HasIcon;
 use Filament\Support\Contracts\HasLabel;
@@ -13,12 +12,12 @@ enum BackupStatus: string implements HasColor, HasIcon, HasLabel
     case Successful = 'successful';
     case Failed = 'failed';
 
-    public function getIcon(): BackedEnum
+    public function getIcon(): string
     {
         return match ($this) {
-            self::InProgress => TablerIcon::CircleDashed,
-            self::Successful => TablerIcon::CircleCheck,
-            self::Failed => TablerIcon::CircleX,
+            self::InProgress => 'tabler-circle-dashed',
+            self::Successful => 'tabler-circle-check',
+            self::Failed => 'tabler-circle-x',
         };
     }
 

app/Enums/ContainerStatus.php

@@ -2,7 +2,6 @@
 
 namespace App\Enums;
 
-use BackedEnum;
 use Filament\Support\Contracts\HasColor;
 use Filament\Support\Contracts\HasIcon;
 use Filament\Support\Contracts\HasLabel;
@@ -24,20 +23,20 @@ enum ContainerStatus: string implements HasColor, HasIcon, HasLabel
     // HTTP Based
     case Missing = 'missing';
 
-    public function getIcon(): BackedEnum
+    public function getIcon(): string
     {
         return match ($this) {
 
-            self::Created => TablerIcon::HeartPlus,
-            self::Starting => TablerIcon::HeartUp,
-            self::Running => TablerIcon::Heartbeat,
-            self::Restarting => TablerIcon::HeartBolt,
-            self::Exited => TablerIcon::HeartExclamation,
-            self::Paused => TablerIcon::HeartPause,
-            self::Dead, self::Offline => TablerIcon::HeartX,
-            self::Removing => TablerIcon::HeartDown,
-            self::Missing => TablerIcon::HeartSearch,
-            self::Stopping => TablerIcon::HeartMinus,
+            self::Created => 'tabler-heart-plus',
+            self::Starting => 'tabler-heart-up',
+            self::Running => 'tabler-heartbeat',
+            self::Restarting => 'tabler-heart-bolt',
+            self::Exited => 'tabler-heart-exclamation',
+            self::Paused => 'tabler-heart-pause',
+            self::Dead, self::Offline => 'tabler-heart-x',
+            self::Removing => 'tabler-heart-down',
+            self::Missing => 'tabler-heart-search',
+            self::Stopping => 'tabler-heart-minus',
         };
     }
 

app/Enums/CustomizationKey.php

@@ -11,9 +11,6 @@ enum CustomizationKey: string
     case TopNavigation = 'top_navigation';
     case DashboardLayout = 'dashboard_layout';
 
-    case ButtonStyle = 'button_style';
-    case RedirectToAdmin = 'redirect_to_admin';
-
     public function getDefaultValue(): string|int|bool
     {
         return match ($this) {
@@ -23,8 +20,6 @@ enum CustomizationKey: string
             self::ConsoleGraphPeriod => 30,
             self::TopNavigation => config('panel.filament.default-navigation', 'sidebar'),
             self::DashboardLayout => 'grid',
-            self::ButtonStyle => true,
-            self::RedirectToAdmin => false,
         };
     }
 

app/Enums/PluginCategory.php

@@ -2,7 +2,6 @@
 
 namespace App\Enums;
 
-use BackedEnum;
 use Filament\Support\Contracts\HasIcon;
 use Filament\Support\Contracts\HasLabel;
 
@@ -12,12 +11,12 @@ enum PluginCategory: string implements HasIcon, HasLabel
     case Theme = 'theme';
     case Language = 'language';
 
-    public function getIcon(): BackedEnum
+    public function getIcon(): string
     {
         return match ($this) {
-            self::Plugin => TablerIcon::Package,
-            self::Theme => TablerIcon::Palette,
-            self::Language => TablerIcon::Language,
+            self::Plugin => 'tabler-package',
+            self::Theme => 'tabler-palette',
+            self::Language => 'tabler-language',
         };
     }
 

app/Enums/PluginStatus.php

@@ -2,7 +2,6 @@
 
 namespace App\Enums;
 
-use BackedEnum;
 use Filament\Support\Contracts\HasColor;
 use Filament\Support\Contracts\HasIcon;
 use Filament\Support\Contracts\HasLabel;
@@ -15,14 +14,14 @@ enum PluginStatus: string implements HasColor, HasIcon, HasLabel
     case Errored = 'errored';
     case Incompatible = 'incompatible';
 
-    public function getIcon(): BackedEnum
+    public function getIcon(): string
     {
         return match ($this) {
-            self::NotInstalled => TablerIcon::HeartOff,
-            self::Disabled => TablerIcon::HeartX,
-            self::Enabled => TablerIcon::HeartCheck,
-            self::Errored => TablerIcon::HeartBroken,
-            self::Incompatible => TablerIcon::HeartCancel,
+            self::NotInstalled => 'tabler-heart-off',
+            self::Disabled => 'tabler-heart-x',
+            self::Enabled => 'tabler-heart-check',
+            self::Errored => 'tabler-heart-broken',
+            self::Incompatible => 'tabler-heart-cancel',
         };
     }
 

app/Enums/RolePermissionModels.php

@@ -5,7 +5,6 @@ namespace App\Enums;
 enum RolePermissionModels: string
 {
     case ApiKey = 'apiKey';
-    case Allocation = 'allocation';
     case DatabaseHost = 'databaseHost';
     case Database = 'database';
     case Egg = 'egg';
@@ -35,9 +34,4 @@ enum RolePermissionModels: string
     {
         return RolePermissionPrefixes::Update->value . ' ' . $this->value;
     }
-
-    public function delete(): string
-    {
-        return RolePermissionPrefixes::Delete->value . ' ' . $this->value;
-    }
 }

app/Enums/ServerState.php

@@ -2,7 +2,6 @@
 
 namespace App\Enums;
 
-use BackedEnum;
 use Filament\Support\Contracts\HasColor;
 use Filament\Support\Contracts\HasIcon;
 use Filament\Support\Contracts\HasLabel;
@@ -15,13 +14,14 @@ enum ServerState: string implements HasColor, HasIcon, HasLabel
     case Suspended = 'suspended';
     case RestoringBackup = 'restoring_backup';
 
-    public function getIcon(): BackedEnum
+    public function getIcon(): string
     {
         return match ($this) {
-            self::Installing => TablerIcon::HeartBolt,
-            self::InstallFailed, self::ReinstallFailed => TablerIcon::HeartX,
-            self::Suspended => TablerIcon::HeartCancel,
-            self::RestoringBackup => TablerIcon::HeartUp,
+            self::Installing => 'tabler-heart-bolt',
+            self::InstallFailed => 'tabler-heart-x',
+            self::ReinstallFailed => 'tabler-heart-x',
+            self::Suspended => 'tabler-heart-cancel',
+            self::RestoringBackup => 'tabler-heart-up',
         };
     }
 

app/Enums/StepPosition.php

@@ -1,9 +0,0 @@
-<?php
-
-namespace App\Enums;
-
-enum StepPosition: string
-{
-    case Before = 'before';
-    case After = 'after';
-}

app/Enums/SubuserPermission.php

@@ -2,8 +2,6 @@
 
 namespace App\Enums;
 
-use BackedEnum;
-
 enum SubuserPermission: string
 {
     case WebsocketConnect = 'websocket.connect';
@@ -69,21 +67,21 @@ enum SubuserPermission: string
         return $this === self::WebsocketConnect;
     }
 
-    public function getIcon(): ?BackedEnum
+    public function getIcon(): ?string
     {
         [$group, $permission] = $this->split();
 
         return match ($group) {
-            'control' => TablerIcon::Terminal2,
-            'user' => TablerIcon::Users,
-            'file' => TablerIcon::Files,
-            'backup' => TablerIcon::FileZip,
-            'allocation' => TablerIcon::Network,
-            'startup' => TablerIcon::PlayerPlay,
-            'database' => TablerIcon::Database,
-            'schedule' => TablerIcon::Clock,
-            'settings' => TablerIcon::Settings,
-            'activity' => TablerIcon::Stack,
+            'control' => 'tabler-terminal-2',
+            'user' => 'tabler-users',
+            'file' => 'tabler-files',
+            'backup' => 'tabler-file-zip',
+            'allocation' => 'tabler-network',
+            'startup' => 'tabler-player-play',
+            'database' => 'tabler-database',
+            'schedule' => 'tabler-clock',
+            'settings' => 'tabler-settings',
+            'activity' => 'tabler-stack',
             default => null,
         };
     }

app/Enums/TabPosition.php

@@ -1,9 +0,0 @@
-<?php
-
-namespace App\Enums;
-
-enum TabPosition: string
-{
-    case Before = 'before';
-    case After = 'after';
-}

app/Enums/WebhookType.php

@@ -2,7 +2,6 @@
 
 namespace App\Enums;
 
-use BackedEnum;
 use Filament\Support\Contracts\HasColor;
 use Filament\Support\Contracts\HasIcon;
 use Filament\Support\Contracts\HasLabel;
@@ -25,11 +24,11 @@ enum WebhookType: string implements HasColor, HasIcon, HasLabel
         };
     }
 
-    public function getIcon(): BackedEnum
+    public function getIcon(): string
     {
         return match ($this) {
-            self::Regular => TablerIcon::WorldWww,
-            self::Discord => TablerIcon::BrandDiscord,
+            self::Regular => 'tabler-world-www',
+            self::Discord => 'tabler-brand-discord',
         };
     }
 }

app/Events/Backup/BackupCompleted.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Events\Backup;
+
+use App\Events\Event;
+use App\Models\Backup;
+use App\Models\Server;
+use App\Models\User;
+use Illuminate\Queue\SerializesModels;
+
+class BackupCompleted extends Event
+{
+    use SerializesModels;
+
+    /**
+     * Create a new event instance.
+     */
+    public function __construct(public Backup $backup, public Server $server, public User $owner) {}
+}

app/Extensions/Captcha/Schemas/CaptchaSchemaInterface.php

@@ -2,7 +2,6 @@
 
 namespace App\Extensions\Captcha\Schemas;
 
-use BackedEnum;
 use Filament\Schemas\Components\Component;
 
 interface CaptchaSchemaInterface
@@ -25,7 +24,7 @@ interface CaptchaSchemaInterface
      */
     public function getSettingsForm(): array;
 
-    public function getIcon(): null|string|BackedEnum;
+    public function getIcon(): ?string;
 
     public function validateResponse(?string $captchaResponse = null): void;
 }

app/Extensions/Captcha/Schemas/Turnstile/TurnstileSchema.php

@@ -2,10 +2,8 @@
 
 namespace App\Extensions\Captcha\Schemas\Turnstile;
 
-use App\Enums\TablerIcon;
 use App\Extensions\Captcha\Schemas\BaseSchema;
 use App\Extensions\Captcha\Schemas\CaptchaSchemaInterface;
-use BackedEnum;
 use Exception;
 use Filament\Forms\Components\Toggle;
 use Filament\Infolists\Components\TextEntry;
@@ -51,8 +49,8 @@ class TurnstileSchema extends BaseSchema implements CaptchaSchemaInterface
                 ->label(trans('admin/setting.captcha.verify'))
                 ->columnSpan(2)
                 ->inline(false)
-                ->onIcon(TablerIcon::Check)
-                ->offIcon(TablerIcon::X)
+                ->onIcon('tabler-check')
+                ->offIcon('tabler-x')
                 ->onColor('success')
                 ->offColor('danger')
                 ->default(env('CAPTCHA_TURNSTILE_VERIFY_DOMAIN', true)),
@@ -63,9 +61,9 @@ class TurnstileSchema extends BaseSchema implements CaptchaSchemaInterface
         ]);
     }
 
-    public function getIcon(): BackedEnum
+    public function getIcon(): ?string
     {
-        return TablerIcon::BrandCloudflare;
+        return 'tabler-brand-cloudflare';
     }
 
     /**

app/Extensions/Features/Schemas/GSLTokenSchema.php

@@ -3,7 +3,6 @@
 namespace App\Extensions\Features\Schemas;
 
 use App\Enums\SubuserPermission;
-use App\Enums\TablerIcon;
 use App\Extensions\Features\FeatureSchemaInterface;
 use App\Facades\Activity;
 use App\Models\Server;
@@ -74,7 +73,7 @@ class GSLTokenSchema implements FeatureSchemaInterface
                             }
                         },
                     ])
-                    ->hintIcon(TablerIcon::Code, fn () => implode('|', $serverVariable->variable->rules))
+                    ->hintIcon('tabler-code', fn () => implode('|', $serverVariable->variable->rules))
                     ->label(fn () => $serverVariable->variable->name)
                     ->prefix(fn () => '{{' . $serverVariable->variable->env_variable . '}}')
                     ->helperText(fn () => empty($serverVariable->variable->description) ? '—' : $serverVariable->variable->description),

app/Extensions/Features/Schemas/PIDLimitSchema.php

@@ -2,7 +2,6 @@
 
 namespace App\Extensions\Features\Schemas;
 
-use App\Enums\TablerIcon;
 use App\Extensions\Features\FeatureSchemaInterface;
 use Filament\Actions\Action;
 use Illuminate\Support\Facades\Blade;
@@ -32,7 +31,7 @@ class PIDLimitSchema implements FeatureSchemaInterface
     {
         return Action::make($this->getId())
             ->requiresConfirmation()
-            ->icon(TablerIcon::AlertTriangle)
+            ->icon('tabler-alert-triangle')
             ->modalHeading(fn () => user()?->isAdmin() ? 'Memory or process limit reached...' : 'Possible resource limit reached...')
             ->modalDescription(new HtmlString(Blade::render(
                 user()?->isAdmin() ? <<<'HTML'

app/Extensions/OAuth/OAuthSchemaInterface.php

@@ -3,7 +3,6 @@
 namespace App\Extensions\OAuth;
 
 use App\Models\User;
-use BackedEnum;
 use Filament\Schemas\Components\Component;
 use Filament\Schemas\Components\Wizard\Step;
 use Laravel\Socialite\Contracts\User as OAuthUser;
@@ -30,7 +29,7 @@ interface OAuthSchemaInterface
     /** @return Step[] */
     public function getSetupSteps(): array;
 
-    public function getIcon(): null|string|BackedEnum;
+    public function getIcon(): ?string;
 
     public function getHexColor(): ?string;
 

app/Extensions/OAuth/Schemas/BitbucketSchema.php

@@ -2,8 +2,6 @@
 
 namespace App\Extensions\OAuth\Schemas;
 
-use App\Enums\TablerIcon;
-use BackedEnum;
 use Filament\Forms\Components\TextInput;
 use Filament\Infolists\Components\TextEntry;
 use Filament\Schemas\Components\Wizard\Step;
@@ -35,9 +33,9 @@ final class BitbucketSchema extends OAuthSchema
         ], parent::getSetupSteps());
     }
 
-    public function getIcon(): BackedEnum
+    public function getIcon(): string
     {
-        return TablerIcon::BrandBitbucketFilled;
+        return 'tabler-brand-bitbucket-f';
     }
 
     public function getHexColor(): string

app/Extensions/OAuth/Schemas/CommonSchema.php

@@ -2,15 +2,13 @@
 
 namespace App\Extensions\OAuth\Schemas;
 
-use BackedEnum;
-
 final class CommonSchema extends OAuthSchema
 {
     public function __construct(
         private readonly string $id,
         private readonly ?string $name = null,
         private readonly ?string $configName = null,
-        private readonly null|string|BackedEnum $icon = null,
+        private readonly ?string $icon = null,
         private readonly ?string $hexColor = null,
     ) {}
 
@@ -29,7 +27,7 @@ final class CommonSchema extends OAuthSchema
         return $this->configName ?? parent::getConfigKey();
     }
 
-    public function getIcon(): null|string|BackedEnum
+    public function getIcon(): ?string
     {
         return $this->icon;
     }

app/Extensions/OAuth/Schemas/DiscordSchema.php

@@ -2,8 +2,6 @@
 
 namespace App\Extensions\OAuth\Schemas;
 
-use App\Enums\TablerIcon;
-use BackedEnum;
 use Filament\Forms\Components\TextInput;
 use Filament\Infolists\Components\TextEntry;
 use Filament\Schemas\Components\Wizard\Step;
@@ -44,9 +42,9 @@ final class DiscordSchema extends OAuthSchema
         ], parent::getSetupSteps());
     }
 
-    public function getIcon(): BackedEnum
+    public function getIcon(): string
     {
-        return TablerIcon::BrandDiscordFilled;
+        return 'tabler-brand-discord-f';
     }
 
     public function getHexColor(): string

app/Extensions/OAuth/Schemas/FacebookSchema.php

@@ -2,8 +2,6 @@
 
 namespace App\Extensions\OAuth\Schemas;
 
-use App\Enums\TablerIcon;
-use BackedEnum;
 use Filament\Forms\Components\TextInput;
 use Filament\Infolists\Components\TextEntry;
 use Filament\Schemas\Components\Wizard\Step;
@@ -38,9 +36,9 @@ final class FacebookSchema extends OAuthSchema
         ], parent::getSetupSteps());
     }
 
-    public function getIcon(): BackedEnum
+    public function getIcon(): string
     {
-        return TablerIcon::BrandFacebookFilled;
+        return 'tabler-brand-facebook-f';
     }
 
     public function getHexColor(): string

app/Extensions/OAuth/Schemas/GithubSchema.php

@@ -2,8 +2,6 @@
 
 namespace App\Extensions\OAuth\Schemas;
 
-use App\Enums\TablerIcon;
-use BackedEnum;
 use Filament\Forms\Components\TextInput;
 use Filament\Infolists\Components\TextEntry;
 use Filament\Schemas\Components\Wizard\Step;
@@ -44,9 +42,9 @@ final class GithubSchema extends OAuthSchema
         ], parent::getSetupSteps());
     }
 
-    public function getIcon(): BackedEnum
+    public function getIcon(): string
     {
-        return TablerIcon::BrandGithubFilled;
+        return 'tabler-brand-github-f';
     }
 
     public function getHexColor(): string

app/Extensions/OAuth/Schemas/GitlabSchema.php

@@ -2,8 +2,6 @@
 
 namespace App\Extensions\OAuth\Schemas;
 
-use App\Enums\TablerIcon;
-use BackedEnum;
 use Filament\Forms\Components\TextInput;
 use Filament\Infolists\Components\TextEntry;
 use Filament\Schemas\Components\Wizard\Step;
@@ -55,9 +53,9 @@ final class GitlabSchema extends OAuthSchema
         ], parent::getSetupSteps());
     }
 
-    public function getIcon(): BackedEnum
+    public function getIcon(): string
     {
-        return TablerIcon::BrandGitlab;
+        return 'tabler-brand-gitlab';
     }
 
     public function getHexColor(): string

app/Extensions/OAuth/Schemas/GoogleSchema.php

@@ -2,8 +2,6 @@
 
 namespace App\Extensions\OAuth\Schemas;
 
-use App\Enums\TablerIcon;
-use BackedEnum;
 use Filament\Forms\Components\TextInput;
 use Filament\Infolists\Components\TextEntry;
 use Filament\Schemas\Components\Wizard\Step;
@@ -44,9 +42,9 @@ final class GoogleSchema extends OAuthSchema
         ], parent::getSetupSteps());
     }
 
-    public function getIcon(): BackedEnum
+    public function getIcon(): string
     {
-        return TablerIcon::BrandGoogleFilled;
+        return 'tabler-brand-google-f';
     }
 
     public function getHexColor(): string

app/Extensions/OAuth/Schemas/LinkedinSchema.php

@@ -2,8 +2,6 @@
 
 namespace App\Extensions\OAuth\Schemas;
 
-use App\Enums\TablerIcon;
-use BackedEnum;
 use Filament\Forms\Components\TextInput;
 use Filament\Infolists\Components\TextEntry;
 use Filament\Schemas\Components\Wizard\Step;
@@ -35,9 +33,9 @@ final class LinkedinSchema extends OAuthSchema
         ], parent::getSetupSteps());
     }
 
-    public function getIcon(): BackedEnum
+    public function getIcon(): string
     {
-        return TablerIcon::BrandLinkedinFilled;
+        return 'tabler-brand-linkedin-f';
     }
 
     public function getHexColor(): string

app/Extensions/OAuth/Schemas/OAuthSchema.php

@@ -2,10 +2,8 @@
 
 namespace App\Extensions\OAuth\Schemas;
 
-use App\Enums\TablerIcon;
 use App\Extensions\OAuth\OAuthSchemaInterface;
 use App\Models\User;
-use BackedEnum;
 use Filament\Forms\Components\TextInput;
 use Filament\Forms\Components\Toggle;
 use Filament\Schemas\Components\Component;
@@ -63,8 +61,8 @@ abstract class OAuthSchema implements OAuthSchemaInterface
                 ->label(trans('admin/setting.oauth.create_missing_users'))
                 ->columnSpan(2)
                 ->inline(false)
-                ->onIcon(TablerIcon::Check)
-                ->offIcon(TablerIcon::X)
+                ->onIcon('tabler-check')
+                ->offIcon('tabler-x')
                 ->onColor('success')
                 ->offColor('danger')
                 ->formatStateUsing(fn ($state) => (bool) $state)
@@ -74,8 +72,8 @@ abstract class OAuthSchema implements OAuthSchemaInterface
                 ->label(trans('admin/setting.oauth.link_missing_users'))
                 ->columnSpan(2)
                 ->inline(false)
-                ->onIcon(TablerIcon::Check)
-                ->offIcon(TablerIcon::X)
+                ->onIcon('tabler-check')
+                ->offIcon('tabler-x')
                 ->onColor('success')
                 ->offColor('danger')
                 ->formatStateUsing(fn ($state) => (bool) $state)
@@ -108,7 +106,7 @@ abstract class OAuthSchema implements OAuthSchemaInterface
         return "OAUTH_{$id}_ENABLED";
     }
 
-    public function getIcon(): null|string|BackedEnum
+    public function getIcon(): ?string
     {
         return null;
     }
@@ -120,7 +118,9 @@ abstract class OAuthSchema implements OAuthSchemaInterface
 
     public function isEnabled(): bool
     {
-        return env($this->getConfigKey(), false);
+        $id = Str::upper($this->getId());
+
+        return env("OAUTH_{$id}_ENABLED", false);
     }
 
     public function shouldCreateMissingUser(OAuthUser $user): bool

app/Extensions/OAuth/Schemas/SlackSchema.php

@@ -2,8 +2,6 @@
 
 namespace App\Extensions\OAuth\Schemas;
 
-use App\Enums\TablerIcon;
-use BackedEnum;
 use Filament\Forms\Components\TextInput;
 use Filament\Infolists\Components\TextEntry;
 use Filament\Schemas\Components\Wizard\Step;
@@ -35,9 +33,9 @@ final class SlackSchema extends OAuthSchema
         ], parent::getSetupSteps());
     }
 
-    public function getIcon(): BackedEnum
+    public function getIcon(): string
     {
-        return TablerIcon::BrandSlack;
+        return 'tabler-brand-slack';
     }
 
     public function getHexColor(): string

app/Extensions/OAuth/Schemas/SteamSchema.php

@@ -2,8 +2,6 @@
 
 namespace App\Extensions\OAuth\Schemas;
 
-use App\Enums\TablerIcon;
-use BackedEnum;
 use Filament\Forms\Components\TextInput;
 use Filament\Infolists\Components\TextEntry;
 use Filament\Schemas\Components\Wizard\Step;
@@ -61,9 +59,9 @@ final class SteamSchema extends OAuthSchema
         ], parent::getSetupSteps());
     }
 
-    public function getIcon(): BackedEnum
+    public function getIcon(): string
     {
-        return TablerIcon::BrandSteamFilled;
+        return 'tabler-brand-steam-f';
     }
 
     public function getHexColor(): string

app/Extensions/OAuth/Schemas/XSchema.php

@@ -2,8 +2,6 @@
 
 namespace App\Extensions\OAuth\Schemas;
 
-use App\Enums\TablerIcon;
-use BackedEnum;
 use Filament\Forms\Components\TextInput;
 use Filament\Infolists\Components\TextEntry;
 use Filament\Schemas\Components\Wizard\Step;
@@ -44,9 +42,9 @@ final class XSchema extends OAuthSchema
         ], parent::getSetupSteps());
     }
 
-    public function getIcon(): BackedEnum
+    public function getIcon(): string
     {
-        return TablerIcon::BrandX;
+        return 'tabler-brand-x';
     }
 
     public function getHexColor(): string

app/Filament/Admin/Pages/Dashboard.php

@@ -2,14 +2,12 @@
 
 namespace App\Filament\Admin\Pages;
 
-use App\Enums\TablerIcon;
 use App\Services\Helpers\SoftwareVersionService;
-use BackedEnum;
 use Filament\Pages\Dashboard as BaseDashboard;
 
 class Dashboard extends BaseDashboard
 {
-    protected static string|BackedEnum|null $navigationIcon = TablerIcon::LayoutDashboard;
+    protected static string|\BackedEnum|null $navigationIcon = 'tabler-layout-dashboard';
 
     private SoftwareVersionService $softwareVersionService;
 

app/Filament/Admin/Pages/Health.php

@@ -2,12 +2,11 @@
 
 namespace App\Filament\Admin\Pages;
 
-use App\Enums\TablerIcon;
-use BackedEnum;
 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;
@@ -15,7 +14,7 @@ use Spatie\Health\ResultStores\ResultStore;
 
 class Health extends Page
 {
-    protected static string|BackedEnum|null $navigationIcon = TablerIcon::Heart;
+    protected static string|\BackedEnum|null $navigationIcon = 'tabler-heart';
 
     protected string $view = 'filament.pages.health';
 
@@ -48,9 +47,9 @@ class Health extends Page
     {
         return [
             Action::make('refresh')
-                ->hiddenLabel()
-                ->tooltip(trans('admin/health.refresh'))
-                ->icon(TablerIcon::Refresh)
+                ->label(trans('admin/health.refresh'))
+                ->iconButton()->iconSize(IconSize::ExtraLarge)
+                ->icon('tabler-refresh')
                 ->action('refresh'),
         ];
     }
@@ -129,16 +128,16 @@ class Health extends Page
         return trans('admin/health.checks.failed', ['checks' => implode(', ', $failedNames)]);
     }
 
-    public static function getNavigationIcon(): BackedEnum
+    public static function getNavigationIcon(): string
     {
         // @phpstan-ignore myCustomRules.forbiddenGlobalFunctions
         $results = app(ResultStore::class)->latestResults();
 
         if ($results === null) {
-            return TablerIcon::HeartQuestion;
+            return 'tabler-heart-question';
         }
 
-        return $results->containsFailingCheck() ? TablerIcon::HeartExclamation : TablerIcon::HeartCheck;
+        return $results->containsFailingCheck() ? 'tabler-heart-exclamation' : 'tabler-heart-check';
     }
 
     public function backgroundColor(string $str): string
@@ -163,14 +162,14 @@ class Health extends Page
         };
     }
 
-    public function icon(string $str): BackedEnum
+    public function icon(string $str): string
     {
         return match ($str) {
-            Status::ok()->value => TablerIcon::CircleCheck,
-            Status::warning()->value => TablerIcon::ExclamationCircle,
-            Status::skipped()->value => TablerIcon::CircleChevronRight,
-            Status::failed()->value, Status::crashed()->value => TablerIcon::CircleX,
-            default => TablerIcon::HelpCircle
+            Status::ok()->value => 'tabler-circle-check',
+            Status::warning()->value => 'tabler-exclamation-circle',
+            Status::skipped()->value => 'tabler-circle-chevron-right',
+            Status::failed()->value, Status::crashed()->value => 'tabler-circle-x',
+            default => 'tabler-help-circle'
         };
     }
 }

app/Filament/Admin/Pages/ListLogs.php

@@ -2,17 +2,16 @@
 
 namespace App\Filament\Admin\Pages;
 
-use App\Enums\TablerIcon;
 use Boquizo\FilamentLogViewer\Actions\DeleteAction;
 use Boquizo\FilamentLogViewer\Actions\DownloadAction;
 use Boquizo\FilamentLogViewer\Actions\ViewLogAction;
 use Boquizo\FilamentLogViewer\Pages\ListLogs as BaseListLogs;
 use Boquizo\FilamentLogViewer\Tables\Columns\LevelColumn;
 use Boquizo\FilamentLogViewer\Tables\Columns\NameColumn;
-use Boquizo\FilamentLogViewer\UseCases\ParseDateUseCase;
 use Boquizo\FilamentLogViewer\Utils\Level;
 use Filament\Actions\Action;
 use Filament\Notifications\Notification;
+use Filament\Support\Enums\IconSize;
 use Filament\Tables\Table;
 use Illuminate\Support\Facades\Http;
 
@@ -29,7 +28,7 @@ class ListLogs extends BaseListLogs
     {
         return parent::table($table)
             ->emptyStateHeading(trans('admin/log.empty_table'))
-            ->emptyStateIcon(TablerIcon::Check)
+            ->emptyStateIcon('tabler-check')
             ->columns([
                 NameColumn::make('date'),
                 LevelColumn::make(Level::ALL)
@@ -47,14 +46,12 @@ class ListLogs extends BaseListLogs
             ])
             ->recordActions([
                 ViewLogAction::make()
-                    ->icon(TablerIcon::FileDescription)->iconButton(),
+                    ->icon('tabler-file-description')->iconSize(IconSize::Large)->iconButton(),
                 DownloadAction::make()
-                    ->tooltip(fn ($record) => trans('filament-log-viewer::log.table.actions.download.label', ['log' => ParseDateUseCase::execute($record['date'])]))
-                    ->icon(TablerIcon::FileDownload)->iconButton(),
+                    ->icon('tabler-file-download')->iconSize(IconSize::Large)->iconButton(),
                 Action::make('uploadLogs')
                     ->hiddenLabel()
-                    ->tooltip(trans('admin/log.actions.upload_tooltip', ['url' => 'logs.pelican.dev']))
-                    ->icon(TablerIcon::WorldUpload)
+                    ->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']))
@@ -103,7 +100,7 @@ class ListLogs extends BaseListLogs
                                 ->body("{$url}")
                                 ->success()
                                 ->actions([
-                                    Action::make('exclude_viewLogs')
+                                    Action::make('viewLogs')
                                         ->label(trans('admin/log.actions.view_logs'))
                                         ->url($url)
                                         ->openUrlInNewTab(true),
@@ -122,7 +119,7 @@ class ListLogs extends BaseListLogs
                         }
                     }),
                 DeleteAction::make()
-                    ->icon(TablerIcon::Trash)->iconButton(),
+                    ->iconSize(IconSize::Medium)->iconButton(),
             ]);
     }
 }

app/Filament/Admin/Pages/Settings.php

@@ -2,7 +2,6 @@
 
 namespace App\Filament\Admin\Pages;
 
-use App\Enums\TablerIcon;
 use App\Extensions\Avatar\AvatarService;
 use App\Extensions\Captcha\CaptchaService;
 use App\Extensions\OAuth\OAuthService;
@@ -11,10 +10,7 @@ use App\Notifications\MailTested;
 use App\Traits\EnvironmentWriterTrait;
 use App\Traits\Filament\CanCustomizeHeaderActions;
 use App\Traits\Filament\CanCustomizeHeaderWidgets;
-use App\Traits\Filament\CanCustomizeTabs;
 use BackedEnum;
-use BladeUI\Icons\Exceptions\SvgNotFound;
-use BladeUI\Icons\Factory as IconFactory;
 use Exception;
 use Filament\Actions\Action;
 use Filament\Actions\ActionGroup;
@@ -40,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;
@@ -56,11 +53,10 @@ class Settings extends Page implements HasSchemas
         CanCustomizeHeaderActions::getHeaderActions insteadof InteractsWithHeaderActions;
     }
     use CanCustomizeHeaderWidgets;
-    use CanCustomizeTabs;
     use EnvironmentWriterTrait;
     use InteractsWithForms;
 
-    protected static string|BackedEnum|null $navigationIcon = TablerIcon::Settings;
+    protected static string|\BackedEnum|null $navigationIcon = 'tabler-settings';
 
     protected string $view = 'filament.pages.settings';
 
@@ -70,8 +66,6 @@ class Settings extends Page implements HasSchemas
 
     protected CaptchaService $captchaService;
 
-    protected IconFactory $iconFactory;
-
     /** @var array<mixed>|null */
     public ?array $data = [];
 
@@ -80,12 +74,11 @@ class Settings extends Page implements HasSchemas
         $this->form->fill();
     }
 
-    public function boot(OAuthService $oauthService, AvatarService $avatarService, CaptchaService $captchaService, IconFactory $iconFactory): void
+    public function boot(OAuthService $oauthService, AvatarService $avatarService, CaptchaService $captchaService): void
     {
         $this->oauthService = $oauthService;
         $this->avatarService = $avatarService;
         $this->captchaService = $captchaService;
-        $this->iconFactory = $iconFactory;
     }
 
     public static function canAccess(): bool
@@ -103,7 +96,11 @@ class Settings extends Page implements HasSchemas
         return trans('admin/setting.title');
     }
 
-    /** @return array<Component> */
+    /**
+     * @return array<Component>
+     *
+     * @throws Exception
+     */
     protected function getFormSchema(): array
     {
         return [
@@ -111,44 +108,34 @@ class Settings extends Page implements HasSchemas
                 ->columns()
                 ->persistTabInQueryString()
                 ->disabled(fn () => !user()?->can('update settings'))
-                ->tabs($this->getTabs()),
-        ];
-    }
-
-    /**
-     * @return Tab[]
-     *
-     * @throws Exception
-     */
-    protected function getDefaultTabs(): array
-    {
-        return [
-            Tab::make('general')
-                ->label(trans('admin/setting.navigation.general'))
-                ->icon(TablerIcon::Home)
-                ->schema($this->generalSettings()),
-            Tab::make('captcha')
-                ->label(trans('admin/setting.navigation.captcha'))
-                ->icon(TablerIcon::Shield)
-                ->schema($this->captchaSettings())
-                ->columns(1),
-            Tab::make('mail')
-                ->label(trans('admin/setting.navigation.mail'))
-                ->icon(TablerIcon::Mail)
-                ->schema($this->mailSettings()),
-            Tab::make('backup')
-                ->label(trans('admin/setting.navigation.backup'))
-                ->icon(TablerIcon::Box)
-                ->schema($this->backupSettings()),
-            Tab::make('oauth')
-                ->label(trans('admin/setting.navigation.oauth'))
-                ->icon(TablerIcon::BrandOauth)
-                ->schema($this->oauthSettings())
-                ->columns(1),
-            Tab::make('misc')
-                ->label(trans('admin/setting.navigation.misc'))
-                ->icon(TablerIcon::Tool)
-                ->schema($this->miscSettings()),
+                ->tabs([
+                    Tab::make('general')
+                        ->label(trans('admin/setting.navigation.general'))
+                        ->icon('tabler-home')
+                        ->schema($this->generalSettings()),
+                    Tab::make('captcha')
+                        ->label(trans('admin/setting.navigation.captcha'))
+                        ->icon('tabler-shield')
+                        ->schema($this->captchaSettings())
+                        ->columns(1),
+                    Tab::make('mail')
+                        ->label(trans('admin/setting.navigation.mail'))
+                        ->icon('tabler-mail')
+                        ->schema($this->mailSettings()),
+                    Tab::make('backup')
+                        ->label(trans('admin/setting.navigation.backup'))
+                        ->icon('tabler-box')
+                        ->schema($this->backupSettings()),
+                    Tab::make('oauth')
+                        ->label(trans('admin/setting.navigation.oauth'))
+                        ->icon('tabler-brand-oauth')
+                        ->schema($this->oauthSettings())
+                        ->columns(1),
+                    Tab::make('misc')
+                        ->label(trans('admin/setting.navigation.misc'))
+                        ->icon('tabler-tool')
+                        ->schema($this->miscSettings()),
+                ]),
         ];
     }
 
@@ -167,12 +154,12 @@ class Settings extends Page implements HasSchemas
                 ->schema([
                     TextInput::make('APP_LOGO')
                         ->label(trans('admin/setting.general.app_logo'))
-                        ->hintIcon(TablerIcon::QuestionMark, trans('admin/setting.general.app_logo_help'))
+                        ->hintIcon('tabler-question-mark', trans('admin/setting.general.app_logo_help'))
                         ->default(env('APP_LOGO'))
                         ->placeholder('/pelican.svg'),
                     TextInput::make('APP_FAVICON')
                         ->label(trans('admin/setting.general.app_favicon'))
-                        ->hintIcon(TablerIcon::QuestionMark, trans('admin/setting.general.app_favicon_help'))
+                        ->hintIcon('tabler-question-mark', trans('admin/setting.general.app_favicon_help'))
                         ->required()
                         ->default(env('APP_FAVICON', '/pelican.ico'))
                         ->placeholder('/pelican.ico'),
@@ -183,8 +170,8 @@ class Settings extends Page implements HasSchemas
                     Toggle::make('APP_DEBUG')
                         ->label(trans('admin/setting.general.debug_mode'))
                         ->inline(false)
-                        ->onIcon(TablerIcon::Check)
-                        ->offIcon(TablerIcon::X)
+                        ->onIcon('tabler-check')
+                        ->offIcon('tabler-x')
                         ->onColor('success')
                         ->offColor('danger')
                         ->stateCast(new BooleanStateCast(false))
@@ -201,8 +188,8 @@ class Settings extends Page implements HasSchemas
                     Toggle::make('FILAMENT_UPLOADABLE_AVATARS')
                         ->label(trans('admin/setting.general.uploadable_avatars'))
                         ->inline(false)
-                        ->onIcon(TablerIcon::Check)
-                        ->offIcon(TablerIcon::X)
+                        ->onIcon('tabler-check')
+                        ->offIcon('tabler-x')
                         ->onColor('success')
                         ->offColor('danger')
                         ->stateCast(new BooleanStateCast(false))
@@ -249,16 +236,16 @@ class Settings extends Page implements HasSchemas
                 ->placeholder(trans('admin/setting.general.trusted_proxies_help'))
                 ->default(env('TRUSTED_PROXIES', implode(',', Arr::wrap(config('trustedproxy.proxies')))))
                 ->hintActions([
-                    Action::make('hint_clear')
+                    Action::make('clear')
                         ->label(trans('admin/setting.general.clear'))
                         ->color('danger')
-                        ->icon(TablerIcon::Trash)
+                        ->icon('tabler-trash')
                         ->requiresConfirmation()
                         ->authorize(fn () => user()?->can('update settings'))
                         ->action(fn (Set $set) => $set('TRUSTED_PROXIES', [])),
-                    Action::make('hint_cloudflare')
+                    Action::make('cloudflare')
                         ->label(trans('admin/setting.general.set_to_cf'))
-                        ->icon(TablerIcon::BrandCloudflare)
+                        ->icon('tabler-brand-cloudflare')
                         ->authorize(fn () => user()?->can('update settings'))
                         ->action(function (Factory $client, Set $set) {
                             $ips = collect();
@@ -300,7 +287,7 @@ class Settings extends Page implements HasSchemas
 
             $formFields[] = Section::make($schema->getName())
                 ->columns(5)
-                ->icon($schema->getIcon() ?? TablerIcon::Shield)
+                ->icon($schema->getIcon() ?? 'tabler-shield')
                 ->collapsed(fn () => !$schema->isEnabled())
                 ->collapsible()
                 ->schema([
@@ -354,9 +341,9 @@ class Settings extends Page implements HasSchemas
                 ->live()
                 ->default(env('MAIL_MAILER', config('mail.default')))
                 ->hintAction(
-                    Action::make('hint_test')
+                    Action::make('test')
                         ->label(trans('admin/setting.mail.test_mail'))
-                        ->icon(TablerIcon::Send)
+                        ->icon('tabler-send')
                         ->hidden(fn (Get $get) => $get('MAIL_MAILER') === 'log')
                         ->authorize(fn () => user()?->can('update settings'))
                         ->action(function (Get $get) {
@@ -546,8 +533,8 @@ class Settings extends Page implements HasSchemas
                     Toggle::make('AWS_USE_PATH_STYLE_ENDPOINT')
                         ->label(trans('admin/setting.backup.s3.use_path_style_endpoint'))
                         ->inline(false)
-                        ->onIcon(TablerIcon::Check)
-                        ->offIcon(TablerIcon::X)
+                        ->onIcon('tabler-check')
+                        ->offIcon('tabler-x')
                         ->onColor('success')
                         ->offColor('danger')
                         ->live()
@@ -568,34 +555,26 @@ class Settings extends Page implements HasSchemas
 
         $oauthSchemas = $this->oauthService->getAll();
         foreach ($oauthSchemas as $schema) {
+            $id = Str::upper($schema->getId());
             $key = $schema->getConfigKey();
 
-            $icon = $schema->getIcon();
-            if (is_string($icon)) {
-                try {
-                    $this->iconFactory->svg($icon);
-                } catch (SvgNotFound) {
-                    $icon = null;
-                }
-            }
-
             $formFields[] = Section::make($schema->getName())
                 ->columns(5)
-                ->icon($icon ?? TablerIcon::BrandOauth)
-                ->collapsed(fn () => !$schema->isEnabled())
+                ->icon($schema->getIcon() ?? 'tabler-brand-oauth')
+                ->collapsed(fn () => !env($key, false))
                 ->collapsible()
                 ->schema([
                     Hidden::make($key)
                         ->live()
-                        ->default($schema->isEnabled()),
+                        ->default(env($key)),
                     Actions::make([
-                        Action::make('disable_oauth_' . $schema->getId())
+                        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_'  . $schema->getId())
+                        Action::make("enable_oauth_$id")
                             ->visible(fn (Get $get) => !$get($key))
                             ->disabled(fn () => !user()?->can('update settings'))
                             ->label(trans('admin/setting.oauth.enable'))
@@ -640,8 +619,8 @@ class Settings extends Page implements HasSchemas
                 ->schema([
                     Toggle::make('PANEL_CLIENT_ALLOCATIONS_ENABLED')
                         ->label(trans('admin/setting.misc.auto_allocation.question'))
-                        ->onIcon(TablerIcon::Check)
-                        ->offIcon(TablerIcon::X)
+                        ->onIcon('tabler-check')
+                        ->offIcon('tabler-x')
                         ->onColor('success')
                         ->offColor('danger')
                         ->live()
@@ -651,8 +630,8 @@ class Settings extends Page implements HasSchemas
                     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(TablerIcon::Check)
-                        ->offIcon(TablerIcon::X)
+                        ->onIcon('tabler-check')
+                        ->offIcon('tabler-x')
                         ->onColor('success')
                         ->offColor('danger')
                         ->live()
@@ -685,8 +664,8 @@ class Settings extends Page implements HasSchemas
                 ->schema([
                     Toggle::make('PANEL_SEND_INSTALL_NOTIFICATION')
                         ->label(trans('admin/setting.misc.mail_notifications.server_installed'))
-                        ->onIcon(TablerIcon::Check)
-                        ->offIcon(TablerIcon::X)
+                        ->onIcon('tabler-check')
+                        ->offIcon('tabler-x')
                         ->onColor('success')
                         ->offColor('danger')
                         ->live()
@@ -695,8 +674,8 @@ class Settings extends Page implements HasSchemas
                         ->default(env('PANEL_SEND_INSTALL_NOTIFICATION', config('panel.email.send_install_notification'))),
                     Toggle::make('PANEL_SEND_REINSTALL_NOTIFICATION')
                         ->label(trans('admin/setting.misc.mail_notifications.server_reinstalled'))
-                        ->onIcon(TablerIcon::Check)
-                        ->offIcon(TablerIcon::X)
+                        ->onIcon('tabler-check')
+                        ->offIcon('tabler-x')
                         ->onColor('success')
                         ->offColor('danger')
                         ->live()
@@ -744,8 +723,8 @@ class Settings extends Page implements HasSchemas
                     Toggle::make('APP_ACTIVITY_HIDE_ADMIN')
                         ->label(trans('admin/setting.misc.activity_log.log_admin'))
                         ->inline(false)
-                        ->onIcon(TablerIcon::Check)
-                        ->offIcon(TablerIcon::X)
+                        ->onIcon('tabler-check')
+                        ->offIcon('tabler-x')
                         ->onColor('success')
                         ->offColor('danger')
                         ->live()
@@ -781,8 +760,8 @@ class Settings extends Page implements HasSchemas
                 ->schema([
                     Toggle::make('PANEL_EDITABLE_SERVER_DESCRIPTIONS')
                         ->label(trans('admin/setting.misc.server.edit_server_desc'))
-                        ->onIcon(TablerIcon::Check)
-                        ->offIcon(TablerIcon::X)
+                        ->onIcon('tabler-check')
+                        ->offIcon('tabler-x')
                         ->onColor('success')
                         ->offColor('danger')
                         ->live()
@@ -866,10 +845,9 @@ class Settings extends Page implements HasSchemas
     {
         return [
             Action::make('save')
-                ->hiddenLabel()
-                ->icon(TablerIcon::DeviceFloppy)
+                ->iconButton()->iconSize(IconSize::ExtraLarge)
+                ->icon('tabler-device-floppy')
                 ->action('save')
-                ->tooltip(trans('filament-panels::resources/pages/edit-record.form.actions.save.label'))
                 ->authorize(fn () => user()?->can('update settings'))
                 ->keyBindings(['mod+s']),
         ];

app/Filament/Admin/Pages/ViewLogs.php

@@ -2,7 +2,6 @@
 
 namespace App\Filament\Admin\Pages;
 
-use App\Enums\TablerIcon;
 use App\Traits\ResolvesRecordDate;
 use Boquizo\FilamentLogViewer\Actions\BackAction;
 use Boquizo\FilamentLogViewer\Actions\DeleteAction;
@@ -10,6 +9,7 @@ use Boquizo\FilamentLogViewer\Actions\DownloadAction;
 use Boquizo\FilamentLogViewer\Pages\ViewLog as BaseViewLog;
 use Filament\Actions\Action;
 use Filament\Notifications\Notification;
+use Filament\Support\Enums\IconSize;
 use Illuminate\Support\Facades\Http;
 
 class ViewLogs extends BaseViewLog
@@ -20,15 +20,14 @@ class ViewLogs extends BaseViewLog
     {
         return [
             BackAction::make()
-                ->tooltip(trans('filament-log-viewer::log.table.actions.close.label'))
-                ->icon(TablerIcon::ArrowLeft)->iconButton(),
+                ->icon('tabler-arrow-left')->iconSize(IconSize::ExtraLarge)->iconButton(),
             DeleteAction::make(withTooltip: true)
-                ->icon(TablerIcon::Trash)->iconButton(),
+                ->iconSize(IconSize::ExtraLarge)->iconButton(),
             DownloadAction::make(withTooltip: true)
-                ->icon(TablerIcon::FileDownload)->iconButton(),
+                ->icon('tabler-file-download')->iconSize(IconSize::ExtraLarge)->iconButton(),
             Action::make('uploadLogs')
                 ->hiddenLabel()
-                ->icon(TablerIcon::WorldUpload)
+                ->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'))
@@ -78,7 +77,7 @@ class ViewLogs extends BaseViewLog
                             ->body("{$url}")
                             ->success()
                             ->actions([
-                                Action::make('exclude_viewLogs')
+                                Action::make('viewLogs')
                                     ->label(trans('admin/log.actions.view_logs'))
                                     ->url($url)
                                     ->openUrlInNewTab(true),

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

@@ -2,7 +2,6 @@
 
 namespace App\Filament\Admin\Resources\ApiKeys;
 
-use App\Enums\TablerIcon;
 use App\Filament\Admin\Resources\ApiKeys\Pages\CreateApiKey;
 use App\Filament\Admin\Resources\ApiKeys\Pages\ListApiKeys;
 use App\Filament\Admin\Resources\Users\Pages\EditUser;
@@ -12,9 +11,7 @@ use App\Traits\Filament\CanCustomizePages;
 use App\Traits\Filament\CanCustomizeRelations;
 use App\Traits\Filament\CanModifyForm;
 use App\Traits\Filament\CanModifyTable;
-use BackedEnum;
 use Exception;
-use Filament\Actions\CreateAction;
 use Filament\Actions\DeleteAction;
 use Filament\Forms\Components\TagsInput;
 use Filament\Forms\Components\Textarea;
@@ -22,8 +19,8 @@ use Filament\Forms\Components\ToggleButtons;
 use Filament\Resources\Pages\PageRegistration;
 use Filament\Resources\Resource;
 use Filament\Schemas\Components\Fieldset;
-use Filament\Schemas\Components\Section;
 use Filament\Schemas\Schema;
+use Filament\Support\Enums\IconSize;
 use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Table;
 use Illuminate\Database\Eloquent\Builder;
@@ -37,7 +34,7 @@ class ApiKeyResource extends Resource
 
     protected static ?string $model = ApiKey::class;
 
-    protected static string|BackedEnum|null $navigationIcon = TablerIcon::Key;
+    protected static string|\BackedEnum|null $navigationIcon = 'tabler-key';
 
     public static function getNavigationLabel(): string
     {
@@ -80,7 +77,7 @@ class ApiKeyResource extends Resource
             ->columns([
                 TextColumn::make('key')
                     ->label(trans('admin/apikey.table.key'))
-                    ->icon(TablerIcon::ClipboardText)
+                    ->icon('tabler-clipboard-text')
                     ->state(fn (ApiKey $key) => $key->identifier . $key->token)
                     ->copyable(),
                 TextColumn::make('memo')
@@ -99,12 +96,10 @@ 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),
             ])
-            ->toolbarActions([
-                CreateAction::make(),
-            ])
-            ->emptyStateIcon(TablerIcon::Key)
+            ->emptyStateIcon('tabler-key')
             ->emptyStateDescription('')
             ->emptyStateHeading(trans('admin/apikey.empty'));
     }
@@ -114,44 +109,12 @@ class ApiKeyResource extends Resource
      */
     public static function defaultForm(Schema $schema): Schema
     {
-        $permissionList = ApiKey::getPermissionList();
-
         return $schema
             ->components([
-                Section::make(trans('admin/apikey.permissions.all'))
-                    ->description(trans('admin/apikey.permissions.all_description'))
-                    ->columnSpanFull()
-                    ->schema([
-                        ToggleButtons::make('permissions_all')
-                            ->hiddenLabel()
-                            ->inline()
-                            ->options([
-                                0 => trans('admin/apikey.permissions.none'),
-                                1 => trans('admin/apikey.permissions.read'),
-                                3 => trans('admin/apikey.permissions.read_write'),
-                            ])
-                            ->icons([
-                                0 => TablerIcon::BookOff,
-                                1 => TablerIcon::Book,
-                                3 => TablerIcon::Writing,
-                            ])
-                            ->colors([
-                                0 => 'success',
-                                1 => 'warning',
-                                3 => 'danger',
-                            ])
-                            ->live()
-                            ->afterStateUpdated(function ($state, callable $set) use ($permissionList) {
-                                foreach ($permissionList as $resource) {
-                                    $set('permissions_' . $resource, $state);
-                                }
-                            })
-                            ->default(0),
-                    ]),
                 Fieldset::make('Permissions')
                     ->columnSpanFull()
                     ->schema(
-                        collect($permissionList)->map(fn ($resource) => ToggleButtons::make('permissions_' . $resource)
+                        collect(ApiKey::getPermissionList())->map(fn ($resource) => ToggleButtons::make('permissions_' . $resource)
                             ->label(str($resource)->replace('_', ' ')->title())->inline()
                             ->options([
                                 0 => trans('admin/apikey.permissions.none'),
@@ -159,9 +122,9 @@ class ApiKeyResource extends Resource
                                 3 => trans('admin/apikey.permissions.read_write'),
                             ])
                             ->icons([
-                                0 => TablerIcon::BookOff,
-                                1 => TablerIcon::Book,
-                                3 => TablerIcon::Writing,
+                                0 => 'tabler-book-off',
+                                1 => 'tabler-book',
+                                3 => 'tabler-writing',
                             ])
                             ->colors([
                                 0 => 'success',

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

@@ -2,7 +2,6 @@
 
 namespace App\Filament\Admin\Resources\ApiKeys\Pages;
 
-use App\Enums\TablerIcon;
 use App\Filament\Admin\Resources\ApiKeys\ApiKeyResource;
 use App\Models\ApiKey;
 use App\Traits\Filament\CanCustomizeHeaderActions;
@@ -10,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;
 
@@ -26,12 +26,9 @@ class CreateApiKey extends CreateRecord
     protected function getDefaultHeaderActions(): array
     {
         return [
-            Action::make('create')
-                ->hiddenLabel()
-                ->action('create')
-                ->keyBindings(['mod+s'])
-                ->tooltip(trans('filament-panels::resources/pages/create-record.form.actions.create.label'))
-                ->icon(TablerIcon::FilePlus),
+            $this->getCreateFormAction()->formId('form')
+                ->iconButton()->iconSize(IconSize::ExtraLarge)
+                ->icon('tabler-file-plus'),
         ];
     }
 

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

@@ -5,7 +5,11 @@ namespace App\Filament\Admin\Resources\ApiKeys\Pages;
 use App\Filament\Admin\Resources\ApiKeys\ApiKeyResource;
 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
 {
@@ -13,4 +17,14 @@ class ListApiKeys extends ListRecords
     use CanCustomizeHeaderWidgets;
 
     protected static string $resource = ApiKeyResource::class;
+
+    /** @return array<Action|ActionGroup> */
+    protected function getDefaultHeaderActions(): array
+    {
+        return [
+            CreateAction::make()
+                ->iconButton()->iconSize(IconSize::ExtraLarge)
+                ->icon('tabler-file-plus'),
+        ];
+    }
 }

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

@@ -2,7 +2,6 @@
 
 namespace App\Filament\Admin\Resources\DatabaseHosts;
 
-use App\Enums\TablerIcon;
 use App\Filament\Admin\Resources\DatabaseHosts\Pages\CreateDatabaseHost;
 use App\Filament\Admin\Resources\DatabaseHosts\Pages\EditDatabaseHost;
 use App\Filament\Admin\Resources\DatabaseHosts\Pages\ListDatabaseHosts;
@@ -13,10 +12,7 @@ use App\Traits\Filament\CanCustomizePages;
 use App\Traits\Filament\CanCustomizeRelations;
 use App\Traits\Filament\CanModifyForm;
 use App\Traits\Filament\CanModifyTable;
-use BackedEnum;
 use Exception;
-use Filament\Actions\BulkActionGroup;
-use Filament\Actions\CreateAction;
 use Filament\Actions\DeleteBulkAction;
 use Filament\Actions\EditAction;
 use Filament\Actions\ViewAction;
@@ -41,7 +37,7 @@ class DatabaseHostResource extends Resource
 
     protected static ?string $model = DatabaseHost::class;
 
-    protected static string|BackedEnum|null $navigationIcon = TablerIcon::Database;
+    protected static string|\BackedEnum|null $navigationIcon = 'tabler-database';
 
     protected static ?string $recordTitleAttribute = 'name';
 
@@ -98,13 +94,10 @@ class DatabaseHostResource extends Resource
                     ->hidden(fn ($record) => static::getEditAuthorizationResponse($record)->allowed()),
                 EditAction::make(),
             ])
-            ->toolbarActions([
-                CreateAction::make(),
-                BulkActionGroup::make([
-                    DeleteBulkAction::make(),
-                ]),
+            ->groupedBulkActions([
+                DeleteBulkAction::make(),
             ])
-            ->emptyStateIcon(TablerIcon::Database)
+            ->emptyStateIcon('tabler-database')
             ->emptyStateDescription('')
             ->emptyStateHeading(trans('admin/databasehost.no_database_hosts'));
     }

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

@@ -2,13 +2,11 @@
 
 namespace App\Filament\Admin\Resources\DatabaseHosts\Pages;
 
-use App\Enums\TablerIcon;
 use App\Filament\Admin\Resources\DatabaseHosts\DatabaseHostResource;
 use App\Services\Databases\Hosts\HostCreationService;
 use App\Traits\Filament\CanCustomizeHeaderActions;
 use App\Traits\Filament\CanCustomizeHeaderWidgets;
 use Exception;
-use Filament\Actions\Action;
 use Filament\Forms\Components\Hidden;
 use Filament\Forms\Components\Select;
 use Filament\Forms\Components\TextInput;
@@ -46,17 +44,6 @@ class CreateDatabaseHost extends CreateRecord
         $this->service = $service;
     }
 
-    protected function getCreateFormAction(): Action
-    {
-        $hasFormWrapper = $this->hasFormWrapper();
-
-        return Action::make('exclude_create')
-            ->label(trans('filament-panels::resources/pages/create-record.form.actions.create.label'))
-            ->submit($hasFormWrapper ? $this->getSubmitFormLivewireMethodName() : null)
-            ->action($hasFormWrapper ? null : $this->getSubmitFormLivewireMethodName())
-            ->keyBindings(['mod+s']);
-    }
-
     /** @return Step[]
      * @throws Exception
      */
@@ -188,7 +175,7 @@ class CreateDatabaseHost extends CreateRecord
                 ->title(trans('admin/databasehost.error'))
                 ->body($exception->getMessage())
                 ->color('danger')
-                ->icon(TablerIcon::Database)
+                ->icon('tabler-database')
                 ->danger()
                 ->send();
 

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

@@ -2,7 +2,6 @@
 
 namespace App\Filament\Admin\Resources\DatabaseHosts\Pages;
 
-use App\Enums\TablerIcon;
 use App\Filament\Admin\Resources\DatabaseHosts\DatabaseHostResource;
 use App\Models\DatabaseHost;
 use App\Services\Databases\Hosts\HostUpdateService;
@@ -13,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,14 +36,12 @@ class EditDatabaseHost extends EditRecord
     {
         return [
             DeleteAction::make()
-                ->tooltip(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),
-            Action::make('save')
-                ->hiddenLabel()
-                ->action('save')
-                ->keyBindings(['mod+s'])
-                ->tooltip(trans('filament-panels::resources/pages/edit-record.form.actions.save.label'))
-                ->icon(TablerIcon::DeviceFloppy),
+                ->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)
+                ->iconButton()->iconSize(IconSize::ExtraLarge),
+            $this->getSaveFormAction()->formId('form')
+                ->iconButton()->iconSize(IconSize::ExtraLarge)
+                ->icon('tabler-device-floppy'),
         ];
     }
 
@@ -65,7 +63,7 @@ class EditDatabaseHost extends EditRecord
                 ->title(trans('admin/databasehost.error'))
                 ->body($exception->getMessage())
                 ->color('danger')
-                ->icon(TablerIcon::Database)
+                ->icon('tabler-database')
                 ->danger()
                 ->send();
 

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

@@ -5,7 +5,11 @@ namespace App\Filament\Admin\Resources\DatabaseHosts\Pages;
 use App\Filament\Admin\Resources\DatabaseHosts\DatabaseHostResource;
 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
 {
@@ -13,4 +17,14 @@ class ListDatabaseHosts extends ListRecords
     use CanCustomizeHeaderWidgets;
 
     protected static string $resource = DatabaseHostResource::class;
+
+    /** @return array<Action|ActionGroup> */
+    protected function getDefaultHeaderActions(): array
+    {
+        return [
+            CreateAction::make()
+                ->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/EggResource.php

@@ -3,7 +3,6 @@
 namespace App\Filament\Admin\Resources\Eggs;
 
 use App\Enums\CustomizationKey;
-use App\Enums\TablerIcon;
 use App\Filament\Admin\Resources\Eggs\Pages\CreateEgg;
 use App\Filament\Admin\Resources\Eggs\Pages\EditEgg;
 use App\Filament\Admin\Resources\Eggs\Pages\ListEggs;
@@ -11,7 +10,6 @@ use App\Filament\Admin\Resources\Eggs\RelationManagers\ServersRelationManager;
 use App\Models\Egg;
 use App\Traits\Filament\CanCustomizePages;
 use App\Traits\Filament\CanCustomizeRelations;
-use BackedEnum;
 use Filament\Resources\Pages\PageRegistration;
 use Filament\Resources\RelationManagers\RelationManager;
 use Filament\Resources\Resource;
@@ -23,7 +21,7 @@ class EggResource extends Resource
 
     protected static ?string $model = Egg::class;
 
-    protected static string|BackedEnum|null $navigationIcon = TablerIcon::Eggs;
+    protected static string|\BackedEnum|null $navigationIcon = 'tabler-eggs';
 
     protected static ?string $recordTitleAttribute = 'name';
 

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

@@ -3,14 +3,13 @@
 namespace App\Filament\Admin\Resources\Eggs\Pages;
 
 use App\Enums\EditorLanguages;
-use App\Enums\TablerIcon;
 use App\Filament\Admin\Resources\Eggs\EggResource;
 use App\Filament\Components\Forms\Fields\CopyFrom;
 use App\Filament\Components\Forms\Fields\MonacoEditor;
 use App\Models\EggVariable;
 use App\Traits\Filament\CanCustomizeHeaderActions;
 use App\Traits\Filament\CanCustomizeHeaderWidgets;
-use App\Traits\Filament\CanCustomizeTabs;
+use Exception;
 use Filament\Actions\Action;
 use Filament\Actions\ActionGroup;
 use Filament\Forms\Components\Checkbox;
@@ -29,6 +28,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;
@@ -37,7 +37,6 @@ class CreateEgg extends CreateRecord
 {
     use CanCustomizeHeaderActions;
     use CanCustomizeHeaderWidgets;
-    use CanCustomizeTabs;
 
     protected static string $resource = EggResource::class;
 
@@ -47,12 +46,9 @@ class CreateEgg extends CreateRecord
     protected function getDefaultHeaderActions(): array
     {
         return [
-            Action::make('create')
-                ->hiddenLabel()
-                ->action('create')
-                ->keyBindings(['mod+s'])
-                ->tooltip(trans('filament-panels::resources/pages/create-record.form.actions.create.label'))
-                ->icon(TablerIcon::FilePlus),
+            $this->getCreateFormAction()->formId('form')
+                ->iconButton()->iconSize(IconSize::ExtraLarge)
+                ->icon('tabler-file-plus'),
         ];
     }
 
@@ -61,231 +57,227 @@ class CreateEgg extends CreateRecord
         return [];
     }
 
+    /**
+     * @throws Exception
+     */
     public function form(Schema $schema): Schema
     {
         return $schema
             ->components([
-                Tabs::make()
-                    ->tabs($this->getTabs())
-                    ->columnSpanFull()
-                    ->persistTabInQueryString(),
-            ]);
-    }
-
-    /** @return Tab[] */
-    protected function getDefaultTabs(): array
-    {
-        return [
-            Tab::make('configuration')
-                ->label(trans('admin/egg.tabs.configuration'))
-                ->columns(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 4])
-                ->schema([
-                    TextInput::make('name')
-                        ->label(trans('admin/egg.name'))
-                        ->required()
-                        ->maxLength(255)
-                        ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 2])
-                        ->helperText(trans('admin/egg.name_help')),
-                    TextInput::make('author')
-                        ->label(trans('admin/egg.author'))
-                        ->maxLength(255)
-                        ->required()
-                        ->email()
-                        ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 2])
-                        ->helperText(trans('admin/egg.author_help')),
-                    Textarea::make('description')
-                        ->label(trans('admin/egg.description'))
-                        ->rows(2)
-                        ->columnSpanFull()
-                        ->helperText(trans('admin/egg.description_help')),
-                    KeyValue::make('startup_commands')
-                        ->label(trans('admin/egg.startup_commands'))
-                        ->live()
-                        ->columnSpanFull()
-                        ->required()
-                        ->addActionLabel(trans('admin/egg.add_startup'))
-                        ->keyLabel(trans('admin/egg.startup_name'))
-                        ->keyPlaceholder('Default')
-                        ->valueLabel(trans('admin/egg.startup_command'))
-                        ->valuePlaceholder('java -Xms128M -XX:MaxRAMPercentage=95.0 -jar {{SERVER_JARFILE}}')
-                        ->helperText(trans('admin/egg.startup_help')),
-                    TagsInput::make('file_denylist')
-                        ->label(trans('admin/egg.file_denylist'))
-                        ->placeholder('denied-file.txt')
-                        ->helperText(trans('admin/egg.file_denylist_help'))
-                        ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 2]),
-                    TagsInput::make('features')
-                        ->label(trans('admin/egg.features'))
-                        ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 1, 'lg' => 1]),
-                    Toggle::make('force_outgoing_ip')
-                        ->label(trans('admin/egg.force_ip'))
-                        ->hintIcon(TablerIcon::QuestionMark, trans('admin/egg.force_ip_help')),
-                    Hidden::make('script_is_privileged')
-                        ->default(1),
-                    TagsInput::make('tags')
-                        ->label(trans('admin/egg.tags'))
-                        ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 2]),
-                    TextInput::make('update_url')
-                        ->label(trans('admin/egg.update_url'))
-                        ->hintIcon(TablerIcon::QuestionMark, trans('admin/egg.update_url_help'))
-                        ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 2])
-                        ->url(),
-                    KeyValue::make('docker_images')
-                        ->label(trans('admin/egg.docker_images'))
-                        ->live()
-                        ->columnSpanFull()
-                        ->required()
-                        ->addActionLabel(trans('admin/egg.add_image'))
-                        ->keyLabel(trans('admin/egg.docker_name'))
-                        ->keyPlaceholder('Java 21')
-                        ->valueLabel(trans('admin/egg.docker_uri'))
-                        ->valuePlaceholder('ghcr.io/pelican-eggs/yolks:java_21')
-                        ->helperText(trans('admin/egg.docker_help')),
-                ]),
-            Tab::make('process_management')
-                ->label(trans('admin/egg.tabs.process_management'))
-                ->columns()
-                ->schema([
-                    CopyFrom::make('copy_process_from')
-                        ->process(),
-                    TextInput::make('config_stop')
-                        ->label(trans('admin/egg.stop_command'))
-                        ->required()
-                        ->maxLength(255)
-                        ->helperText(trans('admin/egg.stop_command_help')),
-                    Textarea::make('config_startup')->rows(10)->json()
-                        ->label(trans('admin/egg.start_config'))
-                        ->default('{}')
-                        ->helperText(trans('admin/egg.start_config_help')),
-                    Textarea::make('config_files')->rows(10)->json()
-                        ->label(trans('admin/egg.config_files'))
-                        ->default('{}')
-                        ->helperText(trans('admin/egg.config_files_help')),
-                    Textarea::make('config_logs')->rows(10)->json()
-                        ->label(trans('admin/egg.log_config'))
-                        ->default('{}')
-                        ->helperText(trans('admin/egg.log_config_help')),
-                ]),
-            Tab::make('egg_variables')
-                ->label(trans('admin/egg.tabs.egg_variables'))
-                ->columnSpanFull()
-                ->schema([
-                    Repeater::make('variables')
-                        ->hiddenLabel()
-                        ->addActionLabel(trans('admin/egg.add_new_variable'))
-                        ->grid()
-                        ->relationship('variables')
-                        ->reorderable()->orderColumn()
-                        ->collapsible()->collapsed()
-                        ->columnSpan(2)
-                        ->defaultItems(0)
-                        ->itemLabel(fn (array $state) => $state['name'])
-                        ->mutateRelationshipDataBeforeCreateUsing(function (array $data): array {
-                            $data['default_value'] ??= '';
-                            $data['description'] ??= '';
-                            $data['rules'] ??= [];
-                            $data['user_viewable'] ??= '';
-                            $data['user_editable'] ??= '';
-
-                            return $data;
-                        })
-                        ->mutateRelationshipDataBeforeSaveUsing(function (array $data): array {
-                            $data['default_value'] ??= '';
-                            $data['description'] ??= '';
-                            $data['rules'] ??= [];
-                            $data['user_viewable'] ??= '';
-                            $data['user_editable'] ??= '';
-
-                            return $data;
-                        })
+                Tabs::make()->tabs([
+                    Tab::make('configuration')
+                        ->label(trans('admin/egg.tabs.configuration'))
+                        ->columns(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 4])
                         ->schema([
                             TextInput::make('name')
                                 ->label(trans('admin/egg.name'))
+                                ->required()
+                                ->maxLength(255)
+                                ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 2])
+                                ->helperText(trans('admin/egg.name_help')),
+                            TextInput::make('author')
+                                ->label(trans('admin/egg.author'))
+                                ->maxLength(255)
+                                ->required()
+                                ->email()
+                                ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 2])
+                                ->helperText(trans('admin/egg.author_help')),
+                            Textarea::make('description')
+                                ->label(trans('admin/egg.description'))
+                                ->rows(2)
+                                ->columnSpanFull()
+                                ->helperText(trans('admin/egg.description_help')),
+                            KeyValue::make('startup_commands')
+                                ->label(trans('admin/egg.startup_commands'))
                                 ->live()
-                                ->debounce(750)
-                                ->maxLength(255)
                                 ->columnSpanFull()
-                                ->afterStateUpdated(fn (Set $set, $state) => $set('env_variable', str($state)->trim()->snake()->upper()->toString()))
-                                ->unique(modifyRuleUsing: fn (Unique $rule, Get $get) => $rule->where('egg_id', $get('../../id')))
-                                ->validationMessages([
-                                    'unique' => trans('admin/egg.error_unique'),
-                                ])
-                                ->required(),
-                            Textarea::make('description')->label(trans('admin/egg.description'))->columnSpanFull(),
-                            TextInput::make('env_variable')
-                                ->label(trans('admin/egg.environment_variable'))
+                                ->required()
+                                ->addActionLabel(trans('admin/egg.add_startup'))
+                                ->keyLabel(trans('admin/egg.startup_name'))
+                                ->keyPlaceholder('Default')
+                                ->valueLabel(trans('admin/egg.startup_command'))
+                                ->valuePlaceholder('java -Xms128M -XX:MaxRAMPercentage=95.0 -jar {{SERVER_JARFILE}}')
+                                ->helperText(trans('admin/egg.startup_help')),
+                            TagsInput::make('file_denylist')
+                                ->label(trans('admin/egg.file_denylist'))
+                                ->placeholder('denied-file.txt')
+                                ->helperText(trans('admin/egg.file_denylist_help'))
+                                ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 2]),
+                            TagsInput::make('features')
+                                ->label(trans('admin/egg.features'))
+                                ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 1, 'lg' => 1]),
+                            Toggle::make('force_outgoing_ip')
+                                ->label(trans('admin/egg.force_ip'))
+                                ->hintIcon('tabler-question-mark', trans('admin/egg.force_ip_help')),
+                            Hidden::make('script_is_privileged')
+                                ->default(1),
+                            TagsInput::make('tags')
+                                ->label(trans('admin/egg.tags'))
+                                ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 2]),
+                            TextInput::make('update_url')
+                                ->label(trans('admin/egg.update_url'))
+                                ->hintIcon('tabler-question-mark', trans('admin/egg.update_url_help'))
+                                ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 2])
+                                ->url(),
+                            KeyValue::make('docker_images')
+                                ->label(trans('admin/egg.docker_images'))
+                                ->live()
+                                ->columnSpanFull()
+                                ->required()
+                                ->addActionLabel(trans('admin/egg.add_image'))
+                                ->keyLabel(trans('admin/egg.docker_name'))
+                                ->keyPlaceholder('Java 21')
+                                ->valueLabel(trans('admin/egg.docker_uri'))
+                                ->valuePlaceholder('ghcr.io/pelican-eggs/yolks:java_21')
+                                ->helperText(trans('admin/egg.docker_help')),
+                        ]),
+
+                    Tab::make('process_management')
+                        ->label(trans('admin/egg.tabs.process_management'))
+                        ->columns()
+                        ->schema([
+                            CopyFrom::make('copy_process_from')
+                                ->process(),
+                            TextInput::make('config_stop')
+                                ->label(trans('admin/egg.stop_command'))
+                                ->required()
                                 ->maxLength(255)
-                                ->prefix('{{')
-                                ->suffix('}}')
-                                ->hintIcon(TablerIcon::Code, fn ($state) => "{{{$state}}}")
-                                ->unique(modifyRuleUsing: fn (Unique $rule, Get $get) => $rule->where('egg_id', $get('../../id')))
-                                ->rules(EggVariable::getRulesForField('env_variable'))
-                                ->validationMessages([
-                                    'unique' => trans('admin/egg.error_unique'),
-                                    'required' => trans('admin/egg.error_required'),
-                                    '*' => trans('admin/egg.error_reserved'),
-                                ])
-                                ->required(),
-                            TextInput::make('default_value')->label(trans('admin/egg.default_value')),
-                            Fieldset::make(trans('admin/egg.user_permissions'))
+                                ->helperText(trans('admin/egg.stop_command_help')),
+                            Textarea::make('config_startup')->rows(10)->json()
+                                ->label(trans('admin/egg.start_config'))
+                                ->default('{}')
+                                ->helperText(trans('admin/egg.start_config_help')),
+                            Textarea::make('config_files')->rows(10)->json()
+                                ->label(trans('admin/egg.config_files'))
+                                ->default('{}')
+                                ->helperText(trans('admin/egg.config_files_help')),
+                            Textarea::make('config_logs')->rows(10)->json()
+                                ->label(trans('admin/egg.log_config'))
+                                ->default('{}')
+                                ->helperText(trans('admin/egg.log_config_help')),
+                        ]),
+                    Tab::make('egg_variables')
+                        ->label(trans('admin/egg.tabs.egg_variables'))
+                        ->columnSpanFull()
+                        ->schema([
+                            Repeater::make('variables')
+                                ->hiddenLabel()
+                                ->addActionLabel(trans('admin/egg.add_new_variable'))
+                                ->grid()
+                                ->relationship('variables')
+                                ->reorderable()->orderColumn()
+                                ->collapsible()->collapsed()
+                                ->columnSpan(2)
+                                ->defaultItems(0)
+                                ->itemLabel(fn (array $state) => $state['name'])
+                                ->mutateRelationshipDataBeforeCreateUsing(function (array $data): array {
+                                    $data['default_value'] ??= '';
+                                    $data['description'] ??= '';
+                                    $data['rules'] ??= [];
+                                    $data['user_viewable'] ??= '';
+                                    $data['user_editable'] ??= '';
+
+                                    return $data;
+                                })
+                                ->mutateRelationshipDataBeforeSaveUsing(function (array $data): array {
+                                    $data['default_value'] ??= '';
+                                    $data['description'] ??= '';
+                                    $data['rules'] ??= [];
+                                    $data['user_viewable'] ??= '';
+                                    $data['user_editable'] ??= '';
+
+                                    return $data;
+                                })
                                 ->schema([
-                                    Checkbox::make('user_viewable')->label(trans('admin/egg.viewable')),
-                                    Checkbox::make('user_editable')->label(trans('admin/egg.editable')),
-                                ]),
-                            TagsInput::make('rules')
-                                ->label(trans('admin/egg.rules'))
-                                ->columnSpanFull()
-                                ->reorderable()
-                                ->suggestions([
-                                    'required',
-                                    'nullable',
-                                    'string',
-                                    'integer',
-                                    'numeric',
-                                    'boolean',
-                                    'alpha',
-                                    'alpha_dash',
-                                    'alpha_num',
-                                    'url',
-                                    'email',
-                                    'regex:',
-                                    'min:',
-                                    'max:',
-                                    'between:',
-                                    'between:1024,65535',
-                                    'in:',
-                                    'in:true,false',
+                                    TextInput::make('name')
+                                        ->label(trans('admin/egg.name'))
+                                        ->live()
+                                        ->debounce(750)
+                                        ->maxLength(255)
+                                        ->columnSpanFull()
+                                        ->afterStateUpdated(fn (Set $set, $state) => $set('env_variable', str($state)->trim()->snake()->upper()->toString()))
+                                        ->unique(modifyRuleUsing: fn (Unique $rule, Get $get) => $rule->where('egg_id', $get('../../id')))
+                                        ->validationMessages([
+                                            'unique' => trans('admin/egg.error_unique'),
+                                        ])
+                                        ->required(),
+                                    Textarea::make('description')->label(trans('admin/egg.description'))->columnSpanFull(),
+                                    TextInput::make('env_variable')
+                                        ->label(trans('admin/egg.environment_variable'))
+                                        ->maxLength(255)
+                                        ->prefix('{{')
+                                        ->suffix('}}')
+                                        ->hintIcon('tabler-code', fn ($state) => "{{{$state}}}")
+                                        ->unique(modifyRuleUsing: fn (Unique $rule, Get $get) => $rule->where('egg_id', $get('../../id')))
+                                        ->rules(EggVariable::getRulesForField('env_variable'))
+                                        ->validationMessages([
+                                            'unique' => trans('admin/egg.error_unique'),
+                                            'required' => trans('admin/egg.error_required'),
+                                            '*' => trans('admin/egg.error_reserved'),
+                                        ])
+                                        ->required(),
+                                    TextInput::make('default_value')->label(trans('admin/egg.default_value')),
+                                    Fieldset::make(trans('admin/egg.user_permissions'))
+                                        ->schema([
+                                            Checkbox::make('user_viewable')->label(trans('admin/egg.viewable')),
+                                            Checkbox::make('user_editable')->label(trans('admin/egg.editable')),
+                                        ]),
+                                    TagsInput::make('rules')
+                                        ->label(trans('admin/egg.rules'))
+                                        ->columnSpanFull()
+                                        ->reorderable()
+                                        ->suggestions([
+                                            'required',
+                                            'nullable',
+                                            'string',
+                                            'integer',
+                                            'numeric',
+                                            'boolean',
+                                            'alpha',
+                                            'alpha_dash',
+                                            'alpha_num',
+                                            'url',
+                                            'email',
+                                            'regex:',
+                                            'min:',
+                                            'max:',
+                                            'between:',
+                                            'between:1024,65535',
+                                            'in:',
+                                            'in:true,false',
+                                        ]),
                                 ]),
                         ]),
-                ]),
-            Tab::make('install_script')
-                ->label(trans('admin/egg.tabs.install_script'))
-                ->columns(3)
-                ->schema([
-                    CopyFrom::make('copy_script_from')
-                        ->script(),
-                    TextInput::make('script_container')
-                        ->label(trans('admin/egg.script_container'))
-                        ->required()
-                        ->maxLength(255)
-                        ->default('ghcr.io/pelican-eggs/installers:debian'),
-                    Select::make('script_entry')
-                        ->label(trans('admin/egg.script_entry'))
-                        ->selectablePlaceholder(false)
-                        ->default('bash')
-                        ->options([
-                            'bash' => 'bash',
-                            'ash' => 'ash',
-                            '/bin/bash' => '/bin/bash',
-                        ])
-                        ->required(),
-                    MonacoEditor::make('script_install')
-                        ->label(trans('admin/egg.script_install'))
-                        ->language(EditorLanguages::shell)
-                        ->columnSpanFull()
-                        ->lazy(),
-                ]),
-        ];
+                    Tab::make('install_script')
+                        ->label(trans('admin/egg.tabs.install_script'))
+                        ->columns(3)
+                        ->schema([
+                            CopyFrom::make('copy_script_from')
+                                ->script(),
+                            TextInput::make('script_container')
+                                ->label(trans('admin/egg.script_container'))
+                                ->required()
+                                ->maxLength(255)
+                                ->default('ghcr.io/pelican-eggs/installers:debian'),
+                            Select::make('script_entry')
+                                ->label(trans('admin/egg.script_entry'))
+                                ->selectablePlaceholder(false)
+                                ->default('bash')
+                                ->options([
+                                    'bash' => 'bash',
+                                    'ash' => 'ash',
+                                    '/bin/bash' => '/bin/bash',
+                                ])
+                                ->required(),
+                            MonacoEditor::make('script_install')
+                                ->label(trans('admin/egg.script_install'))
+                                ->language(EditorLanguages::shell)
+                                ->columnSpanFull()
+                                ->lazy(),
+                        ]),
+
+                ])->columnSpanFull()->persistTabInQueryString(),
+            ]);
     }
 
     protected function handleRecordCreation(array $data): Model

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

@@ -3,7 +3,6 @@
 namespace App\Filament\Admin\Resources\Eggs\Pages;
 
 use App\Enums\EditorLanguages;
-use App\Enums\TablerIcon;
 use App\Filament\Admin\Resources\Eggs\EggResource;
 use App\Filament\Components\Actions\ExportEggAction;
 use App\Filament\Components\Actions\ImportEggAction;
@@ -13,7 +12,6 @@ use App\Models\Egg;
 use App\Models\EggVariable;
 use App\Traits\Filament\CanCustomizeHeaderActions;
 use App\Traits\Filament\CanCustomizeHeaderWidgets;
-use App\Traits\Filament\CanCustomizeTabs;
 use Exception;
 use Filament\Actions\Action;
 use Filament\Actions\ActionGroup;
@@ -49,400 +47,391 @@ class EditEgg extends EditRecord
 {
     use CanCustomizeHeaderActions;
     use CanCustomizeHeaderWidgets;
-    use CanCustomizeTabs;
 
     protected static string $resource = EggResource::class;
 
+    /**
+     * @throws Exception
+     */
     public function form(Schema $schema): Schema
     {
         return $schema
             ->components([
-                Tabs::make()
-                    ->tabs($this->getTabs())
-                    ->columnSpanFull()
-                    ->persistTabInQueryString(),
-            ]);
-    }
-
-    /** @return Tab[] */
-    protected function getDefaultTabs(): array
-    {
-        return [
-            Tab::make('configuration')
-                ->label(trans('admin/egg.tabs.configuration'))
-                ->columns(['default' => 2, 'sm' => 2, 'md' => 4, 'lg' => 6])
-                ->icon(TablerIcon::Egg)
-                ->schema([
-                    Grid::make(2)
-                        ->columnSpan(1)
+                Tabs::make()->tabs([
+                    Tab::make('configuration')
+                        ->label(trans('admin/egg.tabs.configuration'))
+                        ->columns(['default' => 2, 'sm' => 2, 'md' => 4, 'lg' => 6])
+                        ->icon('tabler-egg')
                         ->schema([
-                            Image::make('', '')
-                                ->hidden(fn ($record) => !$record->image)
-                                ->url(fn ($record) => $record->image)
-                                ->alt('')
-                                ->alignJustify()
-                                ->imageSize(150)
-                                ->columnSpanFull(),
-                            Flex::make([
-                                Action::make('uploadImage')
-                                    ->hiddenLabel()
-                                    ->tooltip(trans('admin/egg.import.import_image'))
-                                    ->iconSize(IconSize::Large)
-                                    ->icon(TablerIcon::PhotoUp)
-                                    ->modal()
-                                    ->modalHeading('')
-                                    ->modalSubmitActionLabel(trans('admin/egg.import.import_image'))
-                                    ->schema([
-                                        Tabs::make()
-                                            ->contained(false)
-                                            ->tabs([
-                                                Tab::make(trans('admin/egg.import.url'))
-                                                    ->schema([
-                                                        Hidden::make('imageUrl'),
-                                                        Hidden::make('imageExtension'),
-                                                        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);
-                                                                    $set('imageUrl', null);
-                                                                    $set('imageExtension', null);
+                            Grid::make(2)
+                                ->columnSpan(1)
+                                ->schema([
+                                    Image::make('', '')
+                                        ->hidden(fn ($record) => !$record->image)
+                                        ->url(fn ($record) => $record->image)
+                                        ->alt('')
+                                        ->alignJustify()
+                                        ->imageSize(150)
+                                        ->columnSpanFull(),
+                                    Flex::make([
+                                        Action::make('uploadImage')
+                                            ->iconButton()
+                                            ->iconSize(IconSize::Large)
+                                            ->icon('tabler-photo-up')
+                                            ->modal()
+                                            ->modalHeading('')
+                                            ->modalSubmitActionLabel(trans('admin/egg.import.import_image'))
+                                            ->schema([
+                                                Tabs::make()
+                                                    ->contained(false)
+                                                    ->tabs([
+                                                        Tab::make(trans('admin/egg.import.url'))
+                                                            ->schema([
+                                                                Hidden::make('imageUrl'),
+                                                                Hidden::make('imageExtension'),
+                                                                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);
+                                                                            $set('imageUrl', null);
+                                                                            $set('imageExtension', null);
 
-                                                                    return;
-                                                                }
+                                                                            return;
+                                                                        }
 
-                                                                try {
-                                                                    if (!filter_var($state, FILTER_VALIDATE_URL)) {
-                                                                        throw new Exception(trans('admin/egg.import.invalid_url'));
-                                                                    }
+                                                                        try {
+                                                                            if (!filter_var($state, FILTER_VALIDATE_URL)) {
+                                                                                throw new Exception(trans('admin/egg.import.invalid_url'));
+                                                                            }
 
-                                                                    $extension = strtolower(pathinfo(parse_url($state, PHP_URL_PATH), PATHINFO_EXTENSION));
+                                                                            $extension = strtolower(pathinfo(parse_url($state, PHP_URL_PATH), PATHINFO_EXTENSION));
 
-                                                                    if (!array_key_exists($extension, Egg::IMAGE_FORMATS)) {
-                                                                        throw new Exception(trans('admin/egg.import.unsupported_format', ['format' => implode(', ', array_keys(Egg::IMAGE_FORMATS))]));
-                                                                    }
+                                                                            if (!array_key_exists($extension, Egg::IMAGE_FORMATS)) {
+                                                                                throw new Exception(trans('admin/egg.import.unsupported_format', ['format' => implode(', ', array_keys(Egg::IMAGE_FORMATS))]));
+                                                                            }
 
-                                                                    $host = parse_url($state, PHP_URL_HOST);
-                                                                    $ip = gethostbyname($host);
+                                                                            $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'));
-                                                                    }
+                                                                            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'));
+                                                                            }
 
-                                                                    $set('imageUrl', $state);
-                                                                    $set('imageExtension', $extension);
-                                                                    $set('image_url_error', null);
+                                                                            $set('imageUrl', $state);
+                                                                            $set('imageExtension', $extension);
+                                                                            $set('image_url_error', null);
 
-                                                                } catch (Exception $e) {
-                                                                    $set('image_url_error', $e->getMessage());
-                                                                    $set('imageUrl', null);
-                                                                    $set('imageExtension', null);
-                                                                }
-                                                            }),
-                                                        TextEntry::make('image_url_error')
-                                                            ->hiddenLabel()
-                                                            ->visible(fn ($get) => $get('image_url_error') !== null)
-                                                            ->afterStateHydrated(fn ($set, $get) => $get('image_url_error')),
-                                                        Image::make(fn (Get $get) => $get('image_url'), '')
-                                                            ->imageSize(150)
-                                                            ->visible(fn ($get) => $get('image_url') && !$get('image_url_error'))
-                                                            ->alignCenter(),
+                                                                        } catch (Exception $e) {
+                                                                            $set('image_url_error', $e->getMessage());
+                                                                            $set('imageUrl', null);
+                                                                            $set('imageExtension', null);
+                                                                        }
+                                                                    }),
+                                                                TextEntry::make('image_url_error')
+                                                                    ->hiddenLabel()
+                                                                    ->visible(fn ($get) => $get('image_url_error') !== null)
+                                                                    ->afterStateHydrated(fn ($set, $get) => $get('image_url_error')),
+                                                                Image::make(fn (Get $get) => $get('image_url'), '')
+                                                                    ->imageSize(150)
+                                                                    ->visible(fn ($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()
+                                                                    ->disk('public')
+                                                                    ->directory(Egg::ICON_STORAGE_PATH)
+                                                                    ->acceptedFileTypes([
+                                                                        'image/png',
+                                                                        'image/jpeg',
+                                                                        'image/webp',
+                                                                        'image/svg+xml',
+                                                                    ])
+                                                                    ->getUploadedFileNameForStorageUsing(function (TemporaryUploadedFile $file, $record) {
+                                                                        return $record->uuid . '.' . $file->getClientOriginalExtension();
+                                                                    }),
+                                                            ]),
                                                     ]),
-                                                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()
-                                                            ->disk('public')
-                                                            ->directory(Egg::ICON_STORAGE_PATH)
-                                                            ->acceptedFileTypes([
-                                                                'image/png',
-                                                                'image/jpeg',
-                                                                'image/webp',
-                                                                'image/svg+xml',
-                                                            ])
-                                                            ->getUploadedFileNameForStorageUsing(function (TemporaryUploadedFile $file, $record) {
-                                                                return $record->uuid . '.' . $file->getClientOriginalExtension();
-                                                            }),
-                                                    ]),
-                                            ]),
-                                    ])
-                                    ->action(function (array $data, $record): void {
-                                        if (!empty($data['imageUrl']) && !empty($data['imageExtension'])) {
-                                            $this->saveImageFromUrl($data['imageUrl'], $data['imageExtension'], $record);
+                                            ])
+                                            ->action(function (array $data, $record): void {
+                                                if (!empty($data['imageUrl']) && !empty($data['imageExtension'])) {
+                                                    $this->saveImageFromUrl($data['imageUrl'], $data['imageExtension'], $record);
 
-                                            Notification::make()
-                                                ->title(trans('admin/egg.import.image_updated'))
-                                                ->success()
-                                                ->send();
+                                                    Notification::make()
+                                                        ->title(trans('admin/egg.import.image_updated'))
+                                                        ->success()
+                                                        ->send();
 
-                                            return;
-                                        }
+                                                    return;
+                                                }
 
-                                        if (!empty($data['image'])) {
-                                            Notification::make()
-                                                ->title(trans('admin/egg.import.image_updated'))
-                                                ->success()
-                                                ->send();
+                                                if (!empty($data['image'])) {
+                                                    Notification::make()
+                                                        ->title(trans('admin/egg.import.image_updated'))
+                                                        ->success()
+                                                        ->send();
 
-                                            return;
-                                        }
+                                                    return;
+                                                }
 
-                                        if (empty($data['imageUrl']) && empty($data['image'])) {
-                                            Notification::make()
-                                                ->title(trans('admin/egg.import.no_image'))
-                                                ->warning()
-                                                ->send();
-                                        }
-                                    }),
-                                Action::make('delete_image')
-                                    ->visible(fn ($record) => $record->image)
-                                    ->hiddenLabel()
-                                    ->tooltip(trans('admin/egg.import.delete_image'))
-                                    ->icon(TablerIcon::Trash)
-                                    ->iconSize(IconSize::Large)
-                                    ->color('danger')
-                                    ->action(function ($record) {
-                                        foreach (array_keys(Egg::IMAGE_FORMATS) as $ext) {
-                                            $path = Egg::ICON_STORAGE_PATH . "/$record->uuid.$ext";
-                                            if (Storage::disk('public')->exists($path)) {
-                                                Storage::disk('public')->delete($path);
-                                            }
-                                        }
+                                                if (empty($data['imageUrl']) && empty($data['image'])) {
+                                                    Notification::make()
+                                                        ->title(trans('admin/egg.import.no_image'))
+                                                        ->warning()
+                                                        ->send();
+                                                }
+                                            }),
+                                        Action::make('delete_image')
+                                            ->visible(fn ($record) => $record->image)
+                                            ->hiddenLabel()
+                                            ->icon('tabler-trash')
+                                            ->iconButton()
+                                            ->iconSize(IconSize::Large)
+                                            ->color('danger')
+                                            ->action(function ($record) {
+                                                foreach (array_keys(Egg::IMAGE_FORMATS) as $ext) {
+                                                    $path = Egg::ICON_STORAGE_PATH . "/$record->uuid.$ext";
+                                                    if (Storage::disk('public')->exists($path)) {
+                                                        Storage::disk('public')->delete($path);
+                                                    }
+                                                }
 
-                                        Notification::make()
-                                            ->title(trans('admin/egg.import.image_deleted'))
-                                            ->success()
-                                            ->send();
+                                                Notification::make()
+                                                    ->title(trans('admin/egg.import.image_deleted'))
+                                                    ->success()
+                                                    ->send();
 
-                                        $record->refresh();
-                                    }),
-                            ]),
-                        ]),
-                    TextInput::make('name')
-                        ->label(trans('admin/egg.name'))
-                        ->required()
-                        ->maxLength(255)
-                        ->columnSpan(['default' => 2, 'sm' => 2, 'md' => 3, 'lg' => 2])
-                        ->helperText(trans('admin/egg.name_help')),
-                    Textarea::make('description')
-                        ->label(trans('admin/egg.description'))
-                        ->rows(3)
-                        ->columnSpan(['default' => 2, 'sm' => 2, 'md' => 4, 'lg' => 3])
-                        ->helperText(trans('admin/egg.description_help')),
-                    TextInput::make('id')
-                        ->label(trans('admin/egg.egg_id'))
-                        ->columnSpan(1)
-                        ->disabled(),
-                    TextInput::make('uuid')
-                        ->label(trans('admin/egg.egg_uuid'))
-                        ->disabled()
-                        ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 1, 'lg' => 2])
-                        ->helperText(trans('admin/egg.uuid_help')),
-                    TextInput::make('author')
-                        ->label(trans('admin/egg.author'))
-                        ->required()
-                        ->maxLength(255)
-                        ->email()
-                        ->disabled()
-                        ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 1, 'lg' => 2])
-                        ->helperText(trans('admin/egg.author_help_edit')),
-                    Toggle::make('force_outgoing_ip')
-                        ->inline(false)
-                        ->label(trans('admin/egg.force_ip'))
-                        ->columnSpan(1)
-                        ->hintIcon(TablerIcon::QuestionMark, trans('admin/egg.force_ip_help')),
-                    KeyValue::make('startup_commands')
-                        ->label(trans('admin/egg.startup_commands'))
-                        ->live()
-                        ->columnSpanFull()
-                        ->required()
-                        ->addActionLabel(trans('admin/egg.add_startup'))
-                        ->keyLabel(trans('admin/egg.startup_name'))
-                        ->valueLabel(trans('admin/egg.startup_command'))
-                        ->helperText(trans('admin/egg.startup_help')),
-                    TagsInput::make('file_denylist')
-                        ->label(trans('admin/egg.file_denylist'))
-                        ->placeholder('denied-file.txt')
-                        ->helperText(trans('admin/egg.file_denylist_help'))
-                        ->columnSpan(['default' => 2, 'sm' => 2, 'md' => 2, 'lg' => 3]),
-                    TextInput::make('update_url')
-                        ->label(trans('admin/egg.update_url'))
-                        ->url()
-                        ->hintIcon(TablerIcon::QuestionMark, trans('admin/egg.update_url_help'))
-                        ->columnSpan(['default' => 2, 'sm' => 2, 'md' => 2, 'lg' => 3]),
-                    TagsInput::make('features')
-                        ->label(trans('admin/egg.features'))
-                        ->columnSpan(['default' => 2, 'sm' => 2, 'md' => 2, 'lg' => 3]),
-                    Hidden::make('script_is_privileged')
-                        ->helperText('The docker images available to servers using this egg.'),
-                    TagsInput::make('tags')
-                        ->label(trans('admin/egg.tags'))
-                        ->columnSpan(['default' => 2, 'sm' => 2, 'md' => 2, 'lg' => 3]),
-                    KeyValue::make('docker_images')
-                        ->label(trans('admin/egg.docker_images'))
-                        ->live()
-                        ->columnSpanFull()
-                        ->required()
-                        ->addActionLabel(trans('admin/egg.add_image'))
-                        ->keyLabel(trans('admin/egg.docker_name'))
-                        ->valueLabel(trans('admin/egg.docker_uri'))
-                        ->helperText(trans('admin/egg.docker_help')),
-                ]),
-            Tab::make('process_management')
-                ->label(trans('admin/egg.tabs.process_management'))
-                ->columns()
-                ->icon(TablerIcon::ServerCog)
-                ->schema([
-                    CopyFrom::make('copy_process_from')
-                        ->process(),
-                    TextInput::make('config_stop')
-                        ->label(trans('admin/egg.stop_command'))
-                        ->maxLength(255)
-                        ->helperText(trans('admin/egg.stop_command_help')),
-                    Textarea::make('config_startup')->rows(10)->json()
-                        ->label(trans('admin/egg.start_config'))
-                        ->helperText(trans('admin/egg.start_config_help')),
-                    Textarea::make('config_files')->rows(10)->json()
-                        ->label(trans('admin/egg.config_files'))
-                        ->dehydrateStateUsing(fn ($state) => blank($state) ? '{}' : $state)
-                        ->helperText(trans('admin/egg.config_files_help')),
-                    Textarea::make('config_logs')->rows(10)->json()
-                        ->label(trans('admin/egg.log_config'))
-                        ->helperText(trans('admin/egg.log_config_help')),
-                ]),
-            Tab::make('egg_variables')
-                ->label(trans('admin/egg.tabs.egg_variables'))
-                ->columnSpanFull()
-                ->icon(TablerIcon::Variable)
-                ->schema([
-                    Repeater::make('variables')
-                        ->hiddenLabel()
-                        ->grid()
-                        ->relationship('variables')
-                        ->reorderable()
-                        ->collapsible()->collapsed()
-                        ->orderColumn()
-                        ->addActionLabel(trans('admin/egg.add_new_variable'))
-                        ->itemLabel(fn (array $state) => $state['name'])
-                        ->mutateRelationshipDataBeforeCreateUsing(function (array $data): array {
-                            $data['default_value'] ??= '';
-                            $data['description'] ??= '';
-                            $data['rules'] ??= [];
-                            $data['user_viewable'] ??= '';
-                            $data['user_editable'] ??= '';
-
-                            return $data;
-                        })
-                        ->mutateRelationshipDataBeforeSaveUsing(function (array $data): array {
-                            $data['default_value'] ??= '';
-                            $data['description'] ??= '';
-                            $data['rules'] ??= [];
-                            $data['user_viewable'] ??= '';
-                            $data['user_editable'] ??= '';
-
-                            return $data;
-                        })
-                        ->schema([
+                                                $record->refresh();
+                                            }),
+                                    ]),
+                                ]),
                             TextInput::make('name')
                                 ->label(trans('admin/egg.name'))
+                                ->required()
+                                ->maxLength(255)
+                                ->columnSpan(['default' => 2, 'sm' => 2, 'md' => 3, 'lg' => 2])
+                                ->helperText(trans('admin/egg.name_help')),
+                            Textarea::make('description')
+                                ->label(trans('admin/egg.description'))
+                                ->rows(3)
+                                ->columnSpan(['default' => 2, 'sm' => 2, 'md' => 4, 'lg' => 3])
+                                ->helperText(trans('admin/egg.description_help')),
+                            TextInput::make('id')
+                                ->label(trans('admin/egg.egg_id'))
+                                ->columnSpan(1)
+                                ->disabled(),
+                            TextInput::make('uuid')
+                                ->label(trans('admin/egg.egg_uuid'))
+                                ->disabled()
+                                ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 1, 'lg' => 2])
+                                ->helperText(trans('admin/egg.uuid_help')),
+                            TextInput::make('author')
+                                ->label(trans('admin/egg.author'))
+                                ->required()
+                                ->maxLength(255)
+                                ->email()
+                                ->disabled()
+                                ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 1, 'lg' => 2])
+                                ->helperText(trans('admin/egg.author_help_edit')),
+                            Toggle::make('force_outgoing_ip')
+                                ->inline(false)
+                                ->label(trans('admin/egg.force_ip'))
+                                ->columnSpan(1)
+                                ->hintIcon('tabler-question-mark', trans('admin/egg.force_ip_help')),
+                            KeyValue::make('startup_commands')
+                                ->label(trans('admin/egg.startup_commands'))
                                 ->live()
-                                ->debounce(750)
-                                ->maxLength(255)
                                 ->columnSpanFull()
-                                ->afterStateUpdated(fn (Set $set, $state) => $set('env_variable', str($state)->trim()->snake()->upper()->toString()))
-                                ->unique(modifyRuleUsing: fn (Unique $rule, Get $get) => $rule->where('egg_id', $get('../../id')))
-                                ->validationMessages([
-                                    'unique' => trans('admin/egg.error_unique'),
-                                ])
-                                ->required(),
-                            Textarea::make('description')->label(trans('admin/egg.description'))->columnSpanFull(),
-                            TextInput::make('env_variable')
-                                ->label(trans('admin/egg.environment_variable'))
-                                ->maxLength(255)
-                                ->prefix('{{')
-                                ->suffix('}}')
-                                ->hintIcon(TablerIcon::Code, fn ($state) => "{{{$state}}}")
-                                ->unique(modifyRuleUsing: fn (Unique $rule, Get $get) => $rule->where('egg_id', $get('../../id')))
-                                ->rules(EggVariable::getRulesForField('env_variable'))
-                                ->validationMessages([
-                                    'unique' => trans('admin/egg.error_unique'),
-                                    'required' => trans('admin/egg.error_required'),
-                                    '*' => trans('admin/egg.error_reserved'),
-                                ])
-                                ->required(),
-                            TextInput::make('default_value')->label(trans('admin/egg.default_value')),
-                            Fieldset::make(trans('admin/egg.user_permissions'))
-                                ->schema([
-                                    Checkbox::make('user_viewable')->label(trans('admin/egg.viewable')),
-                                    Checkbox::make('user_editable')->label(trans('admin/egg.editable')),
-                                ]),
-                            TagsInput::make('rules')
-                                ->label(trans('admin/egg.rules'))
+                                ->required()
+                                ->addActionLabel(trans('admin/egg.add_startup'))
+                                ->keyLabel(trans('admin/egg.startup_name'))
+                                ->valueLabel(trans('admin/egg.startup_command'))
+                                ->helperText(trans('admin/egg.startup_help')),
+                            TagsInput::make('file_denylist')
+                                ->label(trans('admin/egg.file_denylist'))
+                                ->placeholder('denied-file.txt')
+                                ->helperText(trans('admin/egg.file_denylist_help'))
+                                ->columnSpan(['default' => 2, 'sm' => 2, 'md' => 2, 'lg' => 3]),
+                            TextInput::make('update_url')
+                                ->label(trans('admin/egg.update_url'))
+                                ->url()
+                                ->hintIcon('tabler-question-mark', trans('admin/egg.update_url_help'))
+                                ->columnSpan(['default' => 2, 'sm' => 2, 'md' => 2, 'lg' => 3]),
+                            TagsInput::make('features')
+                                ->label(trans('admin/egg.features'))
+                                ->columnSpan(['default' => 2, 'sm' => 2, 'md' => 2, 'lg' => 3]),
+                            Hidden::make('script_is_privileged')
+                                ->helperText('The docker images available to servers using this egg.'),
+                            TagsInput::make('tags')
+                                ->label(trans('admin/egg.tags'))
+                                ->columnSpan(['default' => 2, 'sm' => 2, 'md' => 2, 'lg' => 3]),
+                            KeyValue::make('docker_images')
+                                ->label(trans('admin/egg.docker_images'))
+                                ->live()
                                 ->columnSpanFull()
+                                ->required()
+                                ->addActionLabel(trans('admin/egg.add_image'))
+                                ->keyLabel(trans('admin/egg.docker_name'))
+                                ->valueLabel(trans('admin/egg.docker_uri'))
+                                ->helperText(trans('admin/egg.docker_help')),
+                        ]),
+                    Tab::make('process_management')
+                        ->label(trans('admin/egg.tabs.process_management'))
+                        ->columns()
+                        ->icon('tabler-server-cog')
+                        ->schema([
+                            CopyFrom::make('copy_process_from')
+                                ->process(),
+                            TextInput::make('config_stop')
+                                ->label(trans('admin/egg.stop_command'))
+                                ->maxLength(255)
+                                ->helperText(trans('admin/egg.stop_command_help')),
+                            Textarea::make('config_startup')->rows(10)->json()
+                                ->label(trans('admin/egg.start_config'))
+                                ->helperText(trans('admin/egg.start_config_help')),
+                            Textarea::make('config_files')->rows(10)->json()
+                                ->label(trans('admin/egg.config_files'))
+                                ->helperText(trans('admin/egg.config_files_help')),
+                            Textarea::make('config_logs')->rows(10)->json()
+                                ->label(trans('admin/egg.log_config'))
+                                ->helperText(trans('admin/egg.log_config_help')),
+                        ]),
+                    Tab::make('egg_variables')
+                        ->label(trans('admin/egg.tabs.egg_variables'))
+                        ->columnSpanFull()
+                        ->icon('tabler-variable')
+                        ->schema([
+                            Repeater::make('variables')
+                                ->hiddenLabel()
+                                ->grid()
+                                ->relationship('variables')
                                 ->reorderable()
-                                ->suggestions([
-                                    'required',
-                                    'nullable',
-                                    'string',
-                                    'integer',
-                                    'numeric',
-                                    'boolean',
-                                    'alpha',
-                                    'alpha_dash',
-                                    'alpha_num',
-                                    'url',
-                                    'email',
-                                    'regex:',
-                                    'min:',
-                                    'max:',
-                                    'between:',
-                                    'between:1024,65535',
-                                    'in:',
-                                    'in:true,false',
+                                ->collapsible()->collapsed()
+                                ->orderColumn()
+                                ->addActionLabel(trans('admin/egg.add_new_variable'))
+                                ->itemLabel(fn (array $state) => $state['name'])
+                                ->mutateRelationshipDataBeforeCreateUsing(function (array $data): array {
+                                    $data['default_value'] ??= '';
+                                    $data['description'] ??= '';
+                                    $data['rules'] ??= [];
+                                    $data['user_viewable'] ??= '';
+                                    $data['user_editable'] ??= '';
+
+                                    return $data;
+                                })
+                                ->mutateRelationshipDataBeforeSaveUsing(function (array $data): array {
+                                    $data['default_value'] ??= '';
+                                    $data['description'] ??= '';
+                                    $data['rules'] ??= [];
+                                    $data['user_viewable'] ??= '';
+                                    $data['user_editable'] ??= '';
+
+                                    return $data;
+                                })
+                                ->schema([
+                                    TextInput::make('name')
+                                        ->label(trans('admin/egg.name'))
+                                        ->live()
+                                        ->debounce(750)
+                                        ->maxLength(255)
+                                        ->columnSpanFull()
+                                        ->afterStateUpdated(fn (Set $set, $state) => $set('env_variable', str($state)->trim()->snake()->upper()->toString()))
+                                        ->unique(modifyRuleUsing: fn (Unique $rule, Get $get) => $rule->where('egg_id', $get('../../id')))
+                                        ->validationMessages([
+                                            'unique' => trans('admin/egg.error_unique'),
+                                        ])
+                                        ->required(),
+                                    Textarea::make('description')->label(trans('admin/egg.description'))->columnSpanFull(),
+                                    TextInput::make('env_variable')
+                                        ->label(trans('admin/egg.environment_variable'))
+                                        ->maxLength(255)
+                                        ->prefix('{{')
+                                        ->suffix('}}')
+                                        ->hintIcon('tabler-code', fn ($state) => "{{{$state}}}")
+                                        ->unique(modifyRuleUsing: fn (Unique $rule, Get $get) => $rule->where('egg_id', $get('../../id')))
+                                        ->rules(EggVariable::getRulesForField('env_variable'))
+                                        ->validationMessages([
+                                            'unique' => trans('admin/egg.error_unique'),
+                                            'required' => trans('admin/egg.error_required'),
+                                            '*' => trans('admin/egg.error_reserved'),
+                                        ])
+                                        ->required(),
+                                    TextInput::make('default_value')->label(trans('admin/egg.default_value')),
+                                    Fieldset::make(trans('admin/egg.user_permissions'))
+                                        ->schema([
+                                            Checkbox::make('user_viewable')->label(trans('admin/egg.viewable')),
+                                            Checkbox::make('user_editable')->label(trans('admin/egg.editable')),
+                                        ]),
+                                    TagsInput::make('rules')
+                                        ->label(trans('admin/egg.rules'))
+                                        ->columnSpanFull()
+                                        ->reorderable()
+                                        ->suggestions([
+                                            'required',
+                                            'nullable',
+                                            'string',
+                                            'integer',
+                                            'numeric',
+                                            'boolean',
+                                            'alpha',
+                                            'alpha_dash',
+                                            'alpha_num',
+                                            'url',
+                                            'email',
+                                            'regex:',
+                                            'min:',
+                                            'max:',
+                                            'between:',
+                                            'between:1024,65535',
+                                            'in:',
+                                            'in:true,false',
+                                        ]),
                                 ]),
                         ]),
-                ]),
-            Tab::make('install_script')
-                ->label(trans('admin/egg.tabs.install_script'))
-                ->columns(3)
-                ->icon(TablerIcon::FileDownload)
-                ->schema([
-                    CopyFrom::make('copy_script_from')
-                        ->script(),
-                    TextInput::make('script_container')
-                        ->label(trans('admin/egg.script_container'))
-                        ->required()
-                        ->maxLength(255)
-                        ->placeholder('ghcr.io/pelican-eggs/installers:debian'),
-                    Select::make('script_entry')
-                        ->label(trans('admin/egg.script_entry'))
-                        ->selectablePlaceholder(false)
-                        ->options([
-                            'bash' => 'bash',
-                            'ash' => 'ash',
-                            '/bin/bash' => '/bin/bash',
-                        ])
-                        ->required(),
-                    MonacoEditor::make('script_install')
-                        ->hiddenLabel()
-                        ->language(EditorLanguages::shell)
-                        ->columnSpanFull(),
-                ]),
-        ];
+                    Tab::make('install_script')
+                        ->label(trans('admin/egg.tabs.install_script'))
+                        ->columns(3)
+                        ->icon('tabler-file-download')
+                        ->schema([
+                            CopyFrom::make('copy_script_from')
+                                ->script(),
+                            TextInput::make('script_container')
+                                ->label(trans('admin/egg.script_container'))
+                                ->required()
+                                ->maxLength(255)
+                                ->placeholder('ghcr.io/pelican-eggs/installers:debian'),
+                            Select::make('script_entry')
+                                ->label(trans('admin/egg.script_entry'))
+                                ->selectablePlaceholder(false)
+                                ->options([
+                                    'bash' => 'bash',
+                                    'ash' => 'ash',
+                                    '/bin/bash' => '/bin/bash',
+                                ])
+                                ->required(),
+                            MonacoEditor::make('script_install')
+                                ->hiddenLabel()
+                                ->language(EditorLanguages::shell)
+                                ->columnSpanFull(),
+                        ]),
+                ])->columnSpanFull()->persistTabInQueryString(),
+            ]);
     }
 
     /** @return array<Action|ActionGroup> */
@@ -451,16 +440,14 @@ class EditEgg extends EditRecord
         return [
             DeleteAction::make()
                 ->disabled(fn (Egg $egg): bool => $egg->servers()->count() > 0)
-                ->tooltip(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),
-            Action::make('save')
-                ->hiddenLabel()
-                ->action('save')
-                ->keyBindings(['mod+s'])
-                ->tooltip(trans('filament-panels::resources/pages/edit-record.form.actions.save.label'))
-                ->icon(TablerIcon::DeviceFloppy),
+            $this->getSaveFormAction()->formId('form')
+                ->iconButton()->iconSize(IconSize::ExtraLarge)
+                ->icon('tabler-device-floppy'),
         ];
     }
 

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

@@ -2,7 +2,6 @@
 
 namespace App\Filament\Admin\Resources\Eggs\Pages;
 
-use App\Enums\TablerIcon;
 use App\Filament\Admin\Resources\Eggs\EggResource;
 use App\Filament\Components\Actions\ExportEggAction;
 use App\Filament\Components\Actions\ImportEggAction;
@@ -13,17 +12,17 @@ use App\Models\Egg;
 use App\Traits\Filament\CanCustomizeHeaderActions;
 use App\Traits\Filament\CanCustomizeHeaderWidgets;
 use Exception;
-use Filament\Actions\BulkActionGroup;
+use Filament\Actions\Action;
+use Filament\Actions\ActionGroup;
 use Filament\Actions\CreateAction;
 use Filament\Actions\DeleteBulkAction;
 use Filament\Actions\EditAction;
 use Filament\Actions\ReplicateAction;
-use Filament\Notifications\Notification;
 use Filament\Resources\Pages\ListRecords;
+use Filament\Support\Enums\IconSize;
 use Filament\Tables\Columns\ImageColumn;
 use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Table;
-use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
 
 class ListEggs extends ListRecords
@@ -64,13 +63,19 @@ class ListEggs extends ListRecords
             ])
             ->recordActions([
                 EditAction::make()
-                    ->tooltip(trans('filament-actions::edit.single.label')),
+                    ->iconButton()
+                    ->tooltip(trans('filament-actions::edit.single.label'))
+                    ->iconSize(IconSize::Large),
                 ExportEggAction::make()
-                    ->tooltip(trans('filament-actions::export.modal.actions.export.label')),
+                    ->tooltip(trans('filament-actions::export.modal.actions.export.label'))
+                    ->iconSize(IconSize::Large),
                 UpdateEggAction::make()
-                    ->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) {
@@ -81,54 +86,19 @@ class ListEggs extends ListRecords
                     ->after(fn (Egg $record, Egg $replica) => $record->variables->each(fn ($variable) => $variable->replicate()->fill(['egg_id' => $replica->id])->save()))
                     ->successRedirectUrl(fn (Egg $replica) => EditEgg::getUrl(['record' => $replica])),
             ])
-            ->toolbarActions([
-                ImportEggAction::make()
-                    ->multiple(),
-                CreateAction::make(),
-                BulkActionGroup::make([
-                    DeleteBulkAction::make()
-                        ->before(function (Collection &$records) {
-                            $eggsWithServers = $records->filter(fn (Egg $egg) => $egg->servers_count > 0);
-
-                            if ($eggsWithServers->isNotEmpty()) {
-                                $eggNames = $eggsWithServers->map(fn (Egg $egg) => sprintf('%s (%d server%s)', $egg->name, $egg->servers_count, $egg->servers_count > 1 ? 's' : ''))
-                                    ->join(', ');
-                                Notification::make()
-                                    ->danger()
-                                    ->title(trans('admin/egg.cannot_delete', ['count' => $eggsWithServers->count()]))
-                                    ->body(trans('admin/egg.eggs_have_servers', ['eggs' => $eggNames]))
-                                    ->send();
-                            }
-
-                            $records = $records->filter(fn (Egg $egg) => $egg->servers_count <= 0);
-
-                            if ($records->isEmpty()) {
-                                $this->halt();
-                            }
-                        }),
-                    UpdateEggBulkAction::make()
-                        ->before(function (Collection &$records) {
-                            $eggsWithoutUpdateUrl = $records->filter(fn (Egg $egg) => $egg->update_url === null);
-
-                            if ($eggsWithoutUpdateUrl->isNotEmpty()) {
-                                $eggNames = $eggsWithoutUpdateUrl->pluck('name')->join(', ');
-
-                                Notification::make()
-                                    ->warning()
-                                    ->title(trans('admin/egg.cannot_update', ['count' => $eggsWithoutUpdateUrl->count()]))
-                                    ->body(trans('admin/egg.no_update_url', ['eggs' => $eggNames]))
-                                    ->send();
-                            }
-
-                            $records = $records->filter(fn (Egg $egg) => $egg->update_url !== null);
-
-                            if ($records->isEmpty()) {
-                                $this->halt();
-                            }
-                        }),
-                ]),
+            ->groupedBulkActions([
+                DeleteBulkAction::make()
+                    ->before(fn (&$records) => $records = $records->filter(function ($egg) {
+                        /** @var Egg $egg */
+                        return $egg->servers_count <= 0;
+                    })),
+                UpdateEggBulkAction::make()
+                    ->before(fn (&$records) => $records = $records->filter(function ($egg) {
+                        /** @var Egg $egg */
+                        return cache()->get("eggs.$egg->uuid.update", false);
+                    })),
             ])
-            ->emptyStateIcon(TablerIcon::Eggs)
+            ->emptyStateIcon('tabler-eggs')
             ->emptyStateDescription('')
             ->emptyStateHeading(trans('admin/egg.no_eggs'))
             ->filters([
@@ -136,4 +106,18 @@ class ListEggs extends ListRecords
                     ->model(Egg::class),
             ]);
     }
+
+    /** @return array<Action|ActionGroup>
+     * @throws Exception
+     */
+    protected function getDefaultHeaderActions(): array
+    {
+        return [
+            ImportEggAction::make()
+                ->multiple(),
+            CreateAction::make()
+                ->icon('tabler-file-plus')
+                ->iconButton()->iconSize(IconSize::ExtraLarge),
+        ];
+    }
 }

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

@@ -2,7 +2,6 @@
 
 namespace App\Filament\Admin\Resources\Mounts;
 
-use App\Enums\TablerIcon;
 use App\Filament\Admin\Resources\Mounts\Pages\CreateMount;
 use App\Filament\Admin\Resources\Mounts\Pages\EditMount;
 use App\Filament\Admin\Resources\Mounts\Pages\ListMounts;
@@ -12,10 +11,7 @@ use App\Traits\Filament\CanCustomizePages;
 use App\Traits\Filament\CanCustomizeRelations;
 use App\Traits\Filament\CanModifyForm;
 use App\Traits\Filament\CanModifyTable;
-use BackedEnum;
 use Exception;
-use Filament\Actions\BulkActionGroup;
-use Filament\Actions\CreateAction;
 use Filament\Actions\DeleteBulkAction;
 use Filament\Actions\EditAction;
 use Filament\Actions\ViewAction;
@@ -25,6 +21,7 @@ use Filament\Forms\Components\TextInput;
 use Filament\Forms\Components\ToggleButtons;
 use Filament\Resources\Pages\PageRegistration;
 use Filament\Resources\Resource;
+use Filament\Schemas\Components\Group;
 use Filament\Schemas\Components\Section;
 use Filament\Schemas\Components\StateCasts\BooleanStateCast;
 use Filament\Schemas\Schema;
@@ -41,7 +38,7 @@ class MountResource extends Resource
 
     protected static ?string $model = Mount::class;
 
-    protected static string|BackedEnum|null $navigationIcon = TablerIcon::LayersLinked;
+    protected static string|\BackedEnum|null $navigationIcon = 'tabler-layers-linked';
 
     protected static ?string $recordTitleAttribute = 'name';
 
@@ -92,7 +89,7 @@ class MountResource extends Resource
                 TextColumn::make('read_only')
                     ->label(trans('admin/mount.table.read_only'))
                     ->badge()
-                    ->icon(fn ($state) => $state ? TablerIcon::WritingOff : TablerIcon::Writing)
+                    ->icon(fn ($state) => $state ? 'tabler-writing-off' : 'tabler-writing')
                     ->color(fn ($state) => $state ? 'success' : 'warning')
                     ->formatStateUsing(fn ($state) => $state ? trans('admin/mount.toggles.read_only') : trans('admin/mount.toggles.writable')),
             ])
@@ -101,13 +98,10 @@ class MountResource extends Resource
                     ->hidden(fn ($record) => static::getEditAuthorizationResponse($record)->allowed()),
                 EditAction::make(),
             ])
-            ->toolbarActions([
-                CreateAction::make(),
-                BulkActionGroup::make([
-                    DeleteBulkAction::make(),
-                ]),
+            ->groupedBulkActions([
+                DeleteBulkAction::make(),
             ])
-            ->emptyStateIcon(TablerIcon::LayersLinked)
+            ->emptyStateIcon('tabler-layers-linked')
             ->emptyStateDescription('')
             ->emptyStateHeading(trans('admin/mount.no_mounts'));
     }
@@ -134,8 +128,8 @@ class MountResource extends Resource
                             true => trans('admin/mount.toggles.read_only'),
                         ])
                         ->icons([
-                            false => TablerIcon::Writing,
-                            true => TablerIcon::WritingOff,
+                            false => 'tabler-writing',
+                            true => 'tabler-writing-off',
                         ])
                         ->colors([
                             false => 'warning',
@@ -157,32 +151,30 @@ class MountResource extends Resource
                         ->label(trans('admin/mount.description'))
                         ->helperText(trans('admin/mount.description_help'))
                         ->columnSpanFull(),
-                ])
-                    ->columnSpan([
-                        'default' => 1,
-                        'lg' => 2,
-                    ])
-                    ->columns([
-                        'default' => 1,
-                        'xl' => 2,
+                ])->columnSpan(1)->columns([
+                    'default' => 1,
+                    'lg' => 2,
+                ]),
+                Group::make()->schema([
+                    Section::make()->schema([
+                        Select::make('eggs')->multiple()
+                            ->label(trans('admin/mount.eggs'))
+                            // Selecting only non-json fields to prevent Postgres from choking on DISTINCT JSON columns
+                            ->relationship('eggs', 'name', fn (Builder $query) => $query->select(['eggs.id', 'eggs.name']))
+                            ->preload(),
+                        Select::make('nodes')->multiple()
+                            ->label(trans('admin/mount.nodes'))
+                            ->relationship('nodes', 'name', fn (Builder $query) => $query->whereIn('nodes.id', user()?->accessibleNodes()->pluck('id')))
+                            ->searchable(['name', 'fqdn'])
+                            ->preload(),
                     ]),
-                Section::make()->schema([
-                    Select::make('eggs')
-                        ->multiple()
-                        ->label(trans('admin/mount.eggs'))
-                        // Selecting only non-json fields to prevent Postgres from choking on DISTINCT JSON columns
-                        ->relationship('eggs', 'name', fn (Builder $query) => $query->select(['eggs.id', 'eggs.name']))
-                        ->preload(),
-                    Select::make('nodes')
-                        ->multiple()
-                        ->label(trans('admin/mount.nodes'))
-                        ->relationship('nodes', 'name', fn (Builder $query) => $query->whereIn('nodes.id', user()?->accessibleNodes()->pluck('id')))
-                        ->searchable(['name', 'fqdn'])
-                        ->preload(),
+                ])->columns([
+                    'default' => 1,
+                    'lg' => 2,
                 ]),
             ])->columns([
                 'default' => 1,
-                'lg' => 3,
+                'lg' => 2,
             ]);
     }
 

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

@@ -2,13 +2,13 @@
 
 namespace App\Filament\Admin\Resources\Mounts\Pages;
 
-use App\Enums\TablerIcon;
 use App\Filament\Admin\Resources\Mounts\MountResource;
 use App\Traits\Filament\CanCustomizeHeaderActions;
 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,12 +25,9 @@ class CreateMount extends CreateRecord
     protected function getDefaultHeaderActions(): array
     {
         return [
-            Action::make('create')
-                ->hiddenLabel()
-                ->action('create')
-                ->keyBindings(['mod+s'])
-                ->tooltip(trans('filament-panels::resources/pages/create-record.form.actions.create.label'))
-                ->icon(TablerIcon::FilePlus),
+            $this->getCreateFormAction()->formId('form')
+                ->iconButton()->iconSize(IconSize::ExtraLarge)
+                ->icon('tabler-file-plus'),
         ];
     }
 

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

@@ -2,7 +2,6 @@
 
 namespace App\Filament\Admin\Resources\Mounts\Pages;
 
-use App\Enums\TablerIcon;
 use App\Filament\Admin\Resources\Mounts\MountResource;
 use App\Traits\Filament\CanCustomizeHeaderActions;
 use App\Traits\Filament\CanCustomizeHeaderWidgets;
@@ -10,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
 {
@@ -22,13 +22,11 @@ class EditMount extends EditRecord
     protected function getDefaultHeaderActions(): array
     {
         return [
-            DeleteAction::make(),
-            Action::make('save')
-                ->hiddenLabel()
-                ->action('save')
-                ->keyBindings(['mod+s'])
-                ->tooltip(trans('filament-panels::resources/pages/edit-record.form.actions.save.label'))
-                ->icon(TablerIcon::DeviceFloppy),
+            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

@@ -5,7 +5,11 @@ namespace App\Filament\Admin\Resources\Mounts\Pages;
 use App\Filament\Admin\Resources\Mounts\MountResource;
 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
 {
@@ -13,4 +17,14 @@ class ListMounts extends ListRecords
     use CanCustomizeHeaderWidgets;
 
     protected static string $resource = MountResource::class;
+
+    /** @return array<Action|ActionGroup> */
+    protected function getDefaultHeaderActions(): array
+    {
+        return [
+            CreateAction::make()
+                ->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

@@ -3,7 +3,6 @@
 namespace App\Filament\Admin\Resources\Nodes;
 
 use App\Enums\CustomizationKey;
-use App\Enums\TablerIcon;
 use App\Filament\Admin\Resources\Nodes\Pages\CreateNode;
 use App\Filament\Admin\Resources\Nodes\Pages\EditNode;
 use App\Filament\Admin\Resources\Nodes\Pages\ListNodes;
@@ -12,7 +11,6 @@ use App\Filament\Admin\Resources\Nodes\RelationManagers\ServersRelationManager;
 use App\Models\Node;
 use App\Traits\Filament\CanCustomizePages;
 use App\Traits\Filament\CanCustomizeRelations;
-use BackedEnum;
 use Filament\Resources\Pages\PageRegistration;
 use Filament\Resources\RelationManagers\RelationManager;
 use Filament\Resources\Resource;
@@ -25,7 +23,7 @@ class NodeResource extends Resource
 
     protected static ?string $model = Node::class;
 
-    protected static string|BackedEnum|null $navigationIcon = TablerIcon::Server2;
+    protected static string|\BackedEnum|null $navigationIcon = 'tabler-server-2';
 
     protected static ?string $recordTitleAttribute = 'name';
 

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

@@ -2,12 +2,11 @@
 
 namespace App\Filament\Admin\Resources\Nodes\Pages;
 
-use App\Enums\TablerIcon;
 use App\Filament\Admin\Resources\Nodes\NodeResource;
 use App\Models\Node;
 use App\Traits\Filament\CanCustomizeHeaderActions;
 use App\Traits\Filament\CanCustomizeHeaderWidgets;
-use App\Traits\Filament\CanCustomizeSteps;
+use Exception;
 use Filament\Actions\Action;
 use Filament\Forms\Components\Hidden;
 use Filament\Forms\Components\TagsInput;
@@ -28,406 +27,392 @@ class CreateNode extends CreateRecord
 {
     use CanCustomizeHeaderActions;
     use CanCustomizeHeaderWidgets;
-    use CanCustomizeSteps;
 
     protected static string $resource = NodeResource::class;
 
     protected static bool $canCreateAnother = false;
 
+    /**
+     * @throws Exception
+     */
     public function form(Schema $schema): Schema
     {
         return $schema
             ->components([
-                Wizard::make($this->getSteps())
-                    ->columnSpanFull()
-                    ->nextAction(fn (Action $action) => $action->tooltip(fn () => $action->getLabel())->iconButton()->iconSize(IconSize::ExtraLarge)->icon(TablerIcon::ArrowRight))
-                    ->previousAction(fn (Action $action) => $action->tooltip(fn () => $action->getLabel())->iconButton()->iconSize(IconSize::ExtraLarge)->icon(TablerIcon::ArrowLeft))
+                Wizard::make([
+                    Step::make('basic')
+                        ->label(trans('admin/node.tabs.basic_settings'))
+                        ->icon('tabler-server')
+                        ->columnSpanFull()
+                        ->columns([
+                            'default' => 2,
+                            'sm' => 3,
+                            'md' => 3,
+                            'lg' => 4,
+                        ])
+                        ->schema([
+                            TextInput::make('fqdn')
+                                ->columnSpan(2)
+                                ->required()
+                                ->autofocus()
+                                ->live(debounce: 1500)
+                                ->rules(Node::getRulesForField('fqdn'))
+                                ->prohibited(fn ($state) => is_ip($state) && request()->isSecure())
+                                ->label(fn ($state) => is_ip($state) ? trans('admin/node.ip_address') : trans('admin/node.domain'))
+                                ->placeholder(fn ($state) => is_ip($state) ? '192.168.1.1' : 'node.example.com')
+                                ->helperText(function ($state) {
+                                    if (is_ip($state)) {
+                                        if (request()->isSecure()) {
+                                            return trans('admin/node.fqdn_help');
+                                        }
+
+                                        return '';
+                                    }
+
+                                    return trans('admin/node.error');
+                                })
+                                ->hintColor('danger')
+                                ->hint(function ($state) {
+                                    if (is_ip($state) && request()->isSecure()) {
+                                        return trans('admin/node.ssl_ip');
+                                    }
+
+                                    return '';
+                                })
+                                ->afterStateUpdated(function (Set $set, ?string $state) {
+                                    $set('dns', null);
+                                    $set('ip', null);
+
+                                    [$subdomain] = str($state)->explode('.', 2);
+                                    if (!is_numeric($subdomain)) {
+                                        $set('name', $subdomain);
+                                    }
+
+                                    if (!$state || is_ip($state)) {
+                                        $set('dns', null);
+
+                                        return;
+                                    }
+
+                                    $ip = get_ip_from_hostname($state);
+                                    if ($ip) {
+                                        $set('dns', true);
+
+                                        $set('ip', $ip);
+                                    } else {
+                                        $set('dns', false);
+                                    }
+                                })
+                                ->maxLength(255),
+
+                            TextInput::make('ip')
+                                ->disabled()
+                                ->hidden(),
+
+                            ToggleButtons::make('dns')
+                                ->label(trans('admin/node.dns'))
+                                ->helperText(trans('admin/node.dns_help'))
+                                ->disabled()
+                                ->inline()
+                                ->default(null)
+                                ->hint(fn (Get $get) => $get('ip'))
+                                ->hintColor('success')
+                                ->options([
+                                    true => trans('admin/node.valid'),
+                                    false => trans('admin/node.invalid'),
+                                ])
+                                ->colors([
+                                    true => 'success',
+                                    false => 'danger',
+                                ])
+                                ->columnSpan([
+                                    'default' => 1,
+                                    'sm' => 1,
+                                    'md' => 1,
+                                    'lg' => 1,
+                                ]),
+
+                            TextInput::make('daemon_connect')
+                                ->columnSpan(1)
+                                ->label(fn (Get $get) => $get('connection') === 'https_proxy' ? trans('admin/node.connect_port') : trans('admin/node.port'))
+                                ->helperText(fn (Get $get) => $get('connection') === 'https_proxy' ? trans('admin/node.connect_port_help') : trans('admin/node.port_help'))
+                                ->minValue(1)
+                                ->maxValue(65535)
+                                ->default(8080)
+                                ->required()
+                                ->integer(),
+
+                            TextInput::make('name')
+                                ->label(trans('admin/node.display_name'))
+                                ->columnSpan([
+                                    'default' => 1,
+                                    'sm' => 1,
+                                    'md' => 1,
+                                    'lg' => 2,
+                                ])
+                                ->required()
+                                ->maxLength(100),
+
+                            Hidden::make('scheme')
+                                ->default(fn () => request()->isSecure() ? 'https' : 'http'),
+
+                            Hidden::make('behind_proxy')
+                                ->default(false),
+
+                            ToggleButtons::make('connection')
+                                ->label(trans('admin/node.ssl'))
+                                ->columnSpan(1)
+                                ->inline()
+                                ->helperText(function (Get $get) {
+                                    if (request()->isSecure()) {
+                                        return new HtmlString(trans('admin/node.panel_on_ssl'));
+                                    }
+
+                                    if (is_ip($get('fqdn'))) {
+                                        return trans('admin/node.ssl_help');
+                                    }
+
+                                    return '';
+                                })
+                                ->disableOptionWhen(fn (string $value) => $value === 'http' && request()->isSecure())
+                                ->options([
+                                    'http' => 'HTTP',
+                                    'https' => 'HTTPS (SSL)',
+                                    'https_proxy' => 'HTTPS with (reverse) proxy',
+                                ])
+                                ->colors([
+                                    'http' => 'warning',
+                                    'https' => 'success',
+                                    'https_proxy' => 'success',
+                                ])
+                                ->icons([
+                                    'http' => 'tabler-lock-open-off',
+                                    'https' => 'tabler-lock',
+                                    'https_proxy' => 'tabler-shield-lock',
+                                ])
+                                ->default(fn () => request()->isSecure() ? 'https' : 'http')
+                                ->live()
+                                ->dehydrated(false)
+                                ->afterStateUpdated(function ($state, Set $set) {
+                                    $set('scheme', $state === 'http' ? 'http' : 'https');
+                                    $set('behind_proxy', $state === 'https_proxy');
+
+                                    $set('daemon_connect', $state === 'https_proxy' ? 443 : 8080);
+                                    $set('daemon_listen', 8080);
+                                }),
+
+                            TextInput::make('daemon_listen')
+                                ->columnSpan(1)
+                                ->label(trans('admin/node.listen_port'))
+                                ->helperText(trans('admin/node.listen_port_help'))
+                                ->minValue(1)
+                                ->maxValue(65535)
+                                ->default(8080)
+                                ->required()
+                                ->integer()
+                                ->visible(fn (Get $get) => $get('connection') === 'https_proxy'),
+                        ]),
+                    Step::make('advanced')
+                        ->label(trans('admin/node.tabs.advanced_settings'))
+                        ->icon('tabler-server-cog')
+                        ->columnSpanFull()
+                        ->columns([
+                            'default' => 2,
+                            'sm' => 3,
+                            'md' => 3,
+                            'lg' => 4,
+                        ])
+                        ->schema([
+                            ToggleButtons::make('maintenance_mode')
+                                ->label(trans('admin/node.maintenance_mode'))->inline()
+                                ->columnSpan(1)
+                                ->default(false)
+                                ->hintIcon('tabler-question-mark', trans('admin/node.maintenance_mode_help'))
+                                ->options([
+                                    true => trans('admin/node.enabled'),
+                                    false => trans('admin/node.disabled'),
+                                ])
+                                ->colors([
+                                    true => 'danger',
+                                    false => 'success',
+                                ]),
+                            ToggleButtons::make('public')
+                                ->default(true)
+                                ->columnSpan(1)
+                                ->label(trans('admin/node.use_for_deploy'))->inline()
+                                ->options([
+                                    true => trans('admin/node.yes'),
+                                    false => trans('admin/node.no'),
+                                ])
+                                ->colors([
+                                    true => 'success',
+                                    false => 'danger',
+                                ]),
+                            TagsInput::make('tags')
+                                ->label(trans('admin/node.tags'))
+                                ->columnSpan(2),
+                            TextInput::make('upload_size')
+                                ->label(trans('admin/node.upload_limit'))
+                                ->hintIcon('tabler-question-mark', trans('admin/node.upload_limit_help'))
+                                ->columnSpan(1)
+                                ->numeric()->required()
+                                ->default(256)
+                                ->minValue(1)
+                                ->suffix(config('panel.use_binary_prefix') ? 'MiB' : 'MB'),
+                            TextInput::make('daemon_sftp')
+                                ->columnSpan(1)
+                                ->label(trans('admin/node.sftp_port'))
+                                ->minValue(1)
+                                ->maxValue(65535)
+                                ->default(2022)
+                                ->required()
+                                ->integer(),
+                            TextInput::make('daemon_sftp_alias')
+                                ->columnSpan(2)
+                                ->label(trans('admin/node.sftp_alias'))
+                                ->helperText(trans('admin/node.sftp_alias_help')),
+                            Grid::make()
+                                ->columns(6)
+                                ->columnSpanFull()
+                                ->schema([
+                                    ToggleButtons::make('unlimited_mem')
+                                        ->dehydrated()
+                                        ->label(trans('admin/node.memory'))->inlineLabel()->inline()
+                                        ->afterStateUpdated(fn (Set $set) => $set('memory', 0))
+                                        ->afterStateUpdated(fn (Set $set) => $set('memory_overallocate', 0))
+                                        ->formatStateUsing(fn (Get $get) => $get('memory') == 0)
+                                        ->live()
+                                        ->options([
+                                            true => trans('admin/node.unlimited'),
+                                            false => trans('admin/node.limited'),
+                                        ])
+                                        ->colors([
+                                            true => 'primary',
+                                            false => 'warning',
+                                        ])
+                                        ->columnSpan(2),
+                                    TextInput::make('memory')
+                                        ->dehydratedWhenHidden()
+                                        ->hidden(fn (Get $get) => $get('unlimited_mem'))
+                                        ->label(trans('admin/node.memory_limit'))->inlineLabel()
+                                        ->suffix(config('panel.use_binary_prefix') ? 'MiB' : 'MB')
+                                        ->columnSpan(2)
+                                        ->numeric()
+                                        ->minValue(0)
+                                        ->default(0)
+                                        ->required(),
+                                    TextInput::make('memory_overallocate')
+                                        ->dehydratedWhenHidden()
+                                        ->label(trans('admin/node.overallocate'))->inlineLabel()
+                                        ->hidden(fn (Get $get) => $get('unlimited_mem'))
+                                        ->columnSpan(2)
+                                        ->numeric()
+                                        ->minValue(-1)
+                                        ->maxValue(100)
+                                        ->default(0)
+                                        ->suffix('%')
+                                        ->required(),
+                                ]),
+                            Grid::make()
+                                ->columns(6)
+                                ->columnSpanFull()
+                                ->schema([
+                                    ToggleButtons::make('unlimited_disk')
+                                        ->dehydrated()
+                                        ->label(trans('admin/node.disk'))->inlineLabel()->inline()
+                                        ->live()
+                                        ->afterStateUpdated(fn (Set $set) => $set('disk', 0))
+                                        ->afterStateUpdated(fn (Set $set) => $set('disk_overallocate', 0))
+                                        ->formatStateUsing(fn (Get $get) => $get('disk') == 0)
+                                        ->options([
+                                            true => trans('admin/node.unlimited'),
+                                            false => trans('admin/node.limited'),
+                                        ])
+                                        ->colors([
+                                            true => 'primary',
+                                            false => 'warning',
+                                        ])
+                                        ->columnSpan(2),
+                                    TextInput::make('disk')
+                                        ->dehydratedWhenHidden()
+                                        ->hidden(fn (Get $get) => $get('unlimited_disk'))
+                                        ->label(trans('admin/node.disk_limit'))->inlineLabel()
+                                        ->suffix(config('panel.use_binary_prefix') ? 'MiB' : 'MB')
+                                        ->columnSpan(2)
+                                        ->numeric()
+                                        ->minValue(0)
+                                        ->default(0)
+                                        ->required(),
+                                    TextInput::make('disk_overallocate')
+                                        ->dehydratedWhenHidden()
+                                        ->hidden(fn (Get $get) => $get('unlimited_disk'))
+                                        ->label(trans('admin/node.overallocate'))->inlineLabel()
+                                        ->columnSpan(2)
+                                        ->numeric()
+                                        ->minValue(-1)
+                                        ->maxValue(100)
+                                        ->default(0)
+                                        ->suffix('%')
+                                        ->required(),
+                                ]),
+                            Grid::make()
+                                ->columns(6)
+                                ->columnSpanFull()
+                                ->schema([
+                                    ToggleButtons::make('unlimited_cpu')
+                                        ->dehydrated()
+                                        ->label(trans('admin/node.cpu'))->inlineLabel()->inline()
+                                        ->live()
+                                        ->afterStateUpdated(fn (Set $set) => $set('cpu', 0))
+                                        ->afterStateUpdated(fn (Set $set) => $set('cpu_overallocate', 0))
+                                        ->formatStateUsing(fn (Get $get) => $get('cpu') == 0)
+                                        ->options([
+                                            true => trans('admin/node.unlimited'),
+                                            false => trans('admin/node.limited'),
+                                        ])
+                                        ->colors([
+                                            true => 'primary',
+                                            false => 'warning',
+                                        ])
+                                        ->columnSpan(2),
+                                    TextInput::make('cpu')
+                                        ->dehydratedWhenHidden()
+                                        ->hidden(fn (Get $get) => $get('unlimited_cpu'))
+                                        ->label(trans('admin/node.cpu_limit'))->inlineLabel()
+                                        ->suffix('%')
+                                        ->columnSpan(2)
+                                        ->numeric()
+                                        ->default(0)
+                                        ->minValue(0)
+                                        ->required(),
+                                    TextInput::make('cpu_overallocate')
+                                        ->dehydratedWhenHidden()
+                                        ->hidden(fn (Get $get) => $get('unlimited_cpu'))
+                                        ->label(trans('admin/node.overallocate'))->inlineLabel()
+                                        ->columnSpan(2)
+                                        ->numeric()
+                                        ->default(0)
+                                        ->minValue(-1)
+                                        ->maxValue(100)
+                                        ->suffix('%')
+                                        ->required(),
+                                ]),
+                        ]),
+                ])->columnSpanFull()
+                    ->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::icon-button
-                            type="submit"
-                            iconSize="xl"
-                            icon="tabler-plus"
-                            tooltip="{{ trans('admin/node.create') }}"
-                        >
-                            {{ trans('admin/node.create') }}
-                        </x-filament::icon-button>
-                    BLADE))),
+                                        <x-filament::icon-button
+                                                type="submit"
+                                                iconSize="xl"
+                                                icon="tabler-file-plus"
+                                            >
+                                                {{ trans('admin/node.create') }}
+                                            </x-filament::icon-button>
+                                        BLADE))),
             ]);
     }
 
-    /** @return Step[] */
-    protected function getDefaultSteps(): array
-    {
-        return [
-            Step::make('basic')
-                ->label(trans('admin/node.tabs.basic_settings'))
-                ->icon(TablerIcon::Server)
-                ->columnSpanFull()
-                ->columns([
-                    'default' => 2,
-                    'sm' => 3,
-                    'md' => 3,
-                    'lg' => 4,
-                ])
-                ->schema([
-                    TextInput::make('fqdn')
-                        ->columnSpan(2)
-                        ->required()
-                        ->autofocus()
-                        ->live(debounce: 1500)
-                        ->rules(Node::getRulesForField('fqdn'))
-                        ->prohibited(fn ($state) => is_ip($state) && request()->isSecure())
-                        ->label(fn ($state) => is_ip($state) ? trans('admin/node.ip_address') : trans('admin/node.domain'))
-                        ->placeholder(fn ($state) => is_ip($state) ? '192.168.1.1' : 'node.example.com')
-                        ->helperText(function ($state) {
-                            if (is_ip($state)) {
-                                if (request()->isSecure()) {
-                                    return trans('admin/node.fqdn_help');
-                                }
-
-                                return '';
-                            }
-
-                            return trans('admin/node.error');
-                        })
-                        ->hintColor('danger')
-                        ->hint(function ($state) {
-                            if (is_ip($state) && request()->isSecure()) {
-                                return trans('admin/node.ssl_ip');
-                            }
-
-                            return '';
-                        })
-                        ->afterStateUpdated(function (Set $set, ?string $state) {
-                            $set('dns', null);
-                            $set('ip', null);
-
-                            [$subdomain] = str($state)->explode('.', 2);
-                            if (!is_numeric($subdomain)) {
-                                $set('name', $subdomain);
-                            }
-
-                            if (!$state || is_ip($state)) {
-                                $set('dns', null);
-
-                                return;
-                            }
-
-                            $ip = get_ip_from_hostname($state);
-                            if ($ip) {
-                                $set('dns', true);
-
-                                $set('ip', $ip);
-                            } else {
-                                $set('dns', false);
-                            }
-                        })
-                        ->maxLength(255),
-
-                    TextInput::make('ip')
-                        ->disabled()
-                        ->hidden(),
-
-                    ToggleButtons::make('dns')
-                        ->label(trans('admin/node.dns'))
-                        ->helperText(trans('admin/node.dns_help'))
-                        ->disabled()
-                        ->inline()
-                        ->default(null)
-                        ->hint(fn (Get $get) => $get('ip'))
-                        ->hintColor('success')
-                        ->options([
-                            true => trans('admin/node.valid'),
-                            false => trans('admin/node.invalid'),
-                        ])
-                        ->colors([
-                            true => 'success',
-                            false => 'danger',
-                        ])
-                        ->columnSpan([
-                            'default' => 1,
-                            'sm' => 1,
-                            'md' => 1,
-                            'lg' => 1,
-                        ]),
-
-                    TextInput::make('daemon_connect')
-                        ->columnSpan(1)
-                        ->label(fn (Get $get) => $get('connection') === 'https_proxy' ? trans('admin/node.connect_port') : trans('admin/node.port'))
-                        ->helperText(fn (Get $get) => $get('connection') === 'https_proxy' ? trans('admin/node.connect_port_help') : trans('admin/node.port_help'))
-                        ->minValue(1)
-                        ->maxValue(65535)
-                        ->default(8080)
-                        ->required()
-                        ->integer(),
-
-                    TextInput::make('name')
-                        ->label(trans('admin/node.display_name'))
-                        ->columnSpan([
-                            'default' => 1,
-                            'sm' => 1,
-                            'md' => 1,
-                            'lg' => 2,
-                        ])
-                        ->required()
-                        ->maxLength(100),
-
-                    Hidden::make('scheme')
-                        ->default(fn () => request()->isSecure() ? 'https' : 'http'),
-
-                    Hidden::make('behind_proxy')
-                        ->default(false),
-
-                    ToggleButtons::make('connection')
-                        ->label(trans('admin/node.ssl'))
-                        ->columnSpan(1)
-                        ->inline()
-                        ->helperText(function (Get $get) {
-                            if (request()->isSecure()) {
-                                return new HtmlString(trans('admin/node.panel_on_ssl'));
-                            }
-
-                            if (is_ip($get('fqdn'))) {
-                                return trans('admin/node.ssl_help');
-                            }
-
-                            return '';
-                        })
-                        ->disableOptionWhen(fn (string $value) => $value === 'http' && request()->isSecure())
-                        ->options([
-                            'http' => 'HTTP',
-                            'https' => 'HTTPS (SSL)',
-                            'https_proxy' => 'HTTPS with (reverse) proxy',
-                        ])
-                        ->colors([
-                            'http' => 'warning',
-                            'https' => 'success',
-                            'https_proxy' => 'success',
-                        ])
-                        ->icons([
-                            'http' => TablerIcon::LockOpenOff,
-                            'https' => TablerIcon::Lock,
-                            'https_proxy' => TablerIcon::ShieldLock,
-                        ])
-                        ->default(fn () => request()->isSecure() ? 'https' : 'http')
-                        ->live()
-                        ->dehydrated(false)
-                        ->afterStateUpdated(function ($state, Set $set) {
-                            $set('scheme', $state === 'http' ? 'http' : 'https');
-                            $set('behind_proxy', $state === 'https_proxy');
-
-                            $set('daemon_connect', $state === 'https_proxy' ? 443 : 8080);
-                            $set('daemon_listen', 8080);
-                        }),
-
-                    TextInput::make('daemon_listen')
-                        ->columnSpan(1)
-                        ->label(trans('admin/node.listen_port'))
-                        ->helperText(trans('admin/node.listen_port_help'))
-                        ->minValue(1)
-                        ->maxValue(65535)
-                        ->default(8080)
-                        ->required()
-                        ->integer()
-                        ->visible(fn (Get $get) => $get('connection') === 'https_proxy'),
-                ]),
-            Step::make('advanced')
-                ->label(trans('admin/node.tabs.advanced_settings'))
-                ->icon(TablerIcon::ServerCog)
-                ->columnSpanFull()
-                ->columns([
-                    'default' => 2,
-                    'sm' => 3,
-                    'md' => 3,
-                    'lg' => 4,
-                ])
-                ->schema([
-                    ToggleButtons::make('maintenance_mode')
-                        ->label(trans('admin/node.maintenance_mode'))->inline()
-                        ->columnSpan(1)
-                        ->default(false)
-                        ->hintIcon(TablerIcon::QuestionMark, trans('admin/node.maintenance_mode_help'))
-                        ->options([
-                            true => trans('admin/node.enabled'),
-                            false => trans('admin/node.disabled'),
-                        ])
-                        ->colors([
-                            true => 'danger',
-                            false => 'success',
-                        ]),
-                    ToggleButtons::make('public')
-                        ->default(true)
-                        ->columnSpan(1)
-                        ->label(trans('admin/node.use_for_deploy'))->inline()
-                        ->options([
-                            true => trans('admin/node.yes'),
-                            false => trans('admin/node.no'),
-                        ])
-                        ->colors([
-                            true => 'success',
-                            false => 'danger',
-                        ]),
-                    TagsInput::make('tags')
-                        ->label(trans('admin/node.tags'))
-                        ->columnSpan(2),
-                    TextInput::make('upload_size')
-                        ->label(trans('admin/node.upload_limit'))
-                        ->hintIcon(TablerIcon::QuestionMark, trans('admin/node.upload_limit_help'))
-                        ->columnSpan(1)
-                        ->numeric()->required()
-                        ->default(256)
-                        ->minValue(1)
-                        ->suffix(config('panel.use_binary_prefix') ? 'MiB' : 'MB'),
-                    TextInput::make('daemon_base')
-                        ->label(trans('admin/node.daemon_base'))
-                        ->placeholder('/var/lib/pelican/volumes')
-                        ->hintIcon(TablerIcon::QuestionMark, trans('admin/node.daemon_base_help'))
-                        ->columnSpan(1)
-                        ->required()
-                        ->default('/var/lib/pelican/volumes')
-                        ->rule('regex:/^([\/][\d\w.\-\/]+)$/'),
-                    TextInput::make('daemon_sftp')
-                        ->columnSpan(1)
-                        ->label(trans('admin/node.sftp_port'))
-                        ->minValue(1)
-                        ->maxValue(65535)
-                        ->default(2022)
-                        ->required()
-                        ->integer(),
-                    TextInput::make('daemon_sftp_alias')
-                        ->columnSpan(1)
-                        ->label(trans('admin/node.sftp_alias'))
-                        ->helperText(trans('admin/node.sftp_alias_help')),
-                    Grid::make()
-                        ->columns(6)
-                        ->columnSpanFull()
-                        ->schema([
-                            ToggleButtons::make('unlimited_mem')
-                                ->dehydrated()
-                                ->label(trans('admin/node.memory'))->inlineLabel()->inline()
-                                ->afterStateUpdated(fn (Set $set) => $set('memory', 0))
-                                ->afterStateUpdated(fn (Set $set) => $set('memory_overallocate', 0))
-                                ->formatStateUsing(fn (Get $get) => $get('memory') == 0)
-                                ->live()
-                                ->options([
-                                    true => trans('admin/node.unlimited'),
-                                    false => trans('admin/node.limited'),
-                                ])
-                                ->colors([
-                                    true => 'primary',
-                                    false => 'warning',
-                                ])
-                                ->columnSpan(2),
-                            TextInput::make('memory')
-                                ->dehydratedWhenHidden()
-                                ->hidden(fn (Get $get) => $get('unlimited_mem'))
-                                ->label(trans('admin/node.memory_limit'))->inlineLabel()
-                                ->suffix(config('panel.use_binary_prefix') ? 'MiB' : 'MB')
-                                ->columnSpan(2)
-                                ->numeric()
-                                ->minValue(0)
-                                ->default(0)
-                                ->required(),
-                            TextInput::make('memory_overallocate')
-                                ->dehydratedWhenHidden()
-                                ->label(trans('admin/node.overallocate'))->inlineLabel()
-                                ->hidden(fn (Get $get) => $get('unlimited_mem'))
-                                ->columnSpan(2)
-                                ->numeric()
-                                ->minValue(-1)
-                                ->maxValue(100)
-                                ->default(0)
-                                ->suffix('%')
-                                ->required(),
-                        ]),
-                    Grid::make()
-                        ->columns(6)
-                        ->columnSpanFull()
-                        ->schema([
-                            ToggleButtons::make('unlimited_disk')
-                                ->dehydrated()
-                                ->label(trans('admin/node.disk'))->inlineLabel()->inline()
-                                ->live()
-                                ->afterStateUpdated(fn (Set $set) => $set('disk', 0))
-                                ->afterStateUpdated(fn (Set $set) => $set('disk_overallocate', 0))
-                                ->formatStateUsing(fn (Get $get) => $get('disk') == 0)
-                                ->options([
-                                    true => trans('admin/node.unlimited'),
-                                    false => trans('admin/node.limited'),
-                                ])
-                                ->colors([
-                                    true => 'primary',
-                                    false => 'warning',
-                                ])
-                                ->columnSpan(2),
-                            TextInput::make('disk')
-                                ->dehydratedWhenHidden()
-                                ->hidden(fn (Get $get) => $get('unlimited_disk'))
-                                ->label(trans('admin/node.disk_limit'))->inlineLabel()
-                                ->suffix(config('panel.use_binary_prefix') ? 'MiB' : 'MB')
-                                ->columnSpan(2)
-                                ->numeric()
-                                ->minValue(0)
-                                ->default(0)
-                                ->required(),
-                            TextInput::make('disk_overallocate')
-                                ->dehydratedWhenHidden()
-                                ->hidden(fn (Get $get) => $get('unlimited_disk'))
-                                ->label(trans('admin/node.overallocate'))->inlineLabel()
-                                ->columnSpan(2)
-                                ->numeric()
-                                ->minValue(-1)
-                                ->maxValue(100)
-                                ->default(0)
-                                ->suffix('%')
-                                ->required(),
-                        ]),
-                    Grid::make()
-                        ->columns(6)
-                        ->columnSpanFull()
-                        ->schema([
-                            ToggleButtons::make('unlimited_cpu')
-                                ->dehydrated()
-                                ->label(trans('admin/node.cpu'))->inlineLabel()->inline()
-                                ->live()
-                                ->afterStateUpdated(fn (Set $set) => $set('cpu', 0))
-                                ->afterStateUpdated(fn (Set $set) => $set('cpu_overallocate', 0))
-                                ->formatStateUsing(fn (Get $get) => $get('cpu') == 0)
-                                ->options([
-                                    true => trans('admin/node.unlimited'),
-                                    false => trans('admin/node.limited'),
-                                ])
-                                ->colors([
-                                    true => 'primary',
-                                    false => 'warning',
-                                ])
-                                ->columnSpan(2),
-                            TextInput::make('cpu')
-                                ->dehydratedWhenHidden()
-                                ->hidden(fn (Get $get) => $get('unlimited_cpu'))
-                                ->label(trans('admin/node.cpu_limit'))->inlineLabel()
-                                ->suffix('%')
-                                ->columnSpan(2)
-                                ->numeric()
-                                ->default(0)
-                                ->minValue(0)
-                                ->required(),
-                            TextInput::make('cpu_overallocate')
-                                ->dehydratedWhenHidden()
-                                ->hidden(fn (Get $get) => $get('unlimited_cpu'))
-                                ->label(trans('admin/node.overallocate'))->inlineLabel()
-                                ->columnSpan(2)
-                                ->numeric()
-                                ->default(0)
-                                ->minValue(-1)
-                                ->maxValue(100)
-                                ->suffix('%')
-                                ->required(),
-                        ]),
-                ]),
-        ];
-    }
-
     protected function getRedirectUrlParameters(): array
     {
         return [

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

@@ -2,17 +2,18 @@
 
 namespace App\Filament\Admin\Resources\Nodes\Pages;
 
-use App\Enums\TablerIcon;
 use App\Filament\Admin\Resources\Nodes\NodeResource;
-use App\Filament\Components\Tables\Columns\NodeClientHealthColumn;
 use App\Filament\Components\Tables\Columns\NodeHealthColumn;
 use App\Filament\Components\Tables\Filters\TagsFilter;
 use App\Models\Node;
 use App\Traits\Filament\CanCustomizeHeaderActions;
 use App\Traits\Filament\CanCustomizeHeaderWidgets;
+use Filament\Actions\Action;
+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;
@@ -35,7 +36,6 @@ class ListNodes extends ListRecords
                     ->searchable()
                     ->hidden(),
                 NodeHealthColumn::make('health'),
-                NodeClientHealthColumn::make('reachable'),
                 TextColumn::make('name')
                     ->label(trans('admin/node.table.name'))
                     ->sortable()
@@ -48,14 +48,14 @@ class ListNodes extends ListRecords
                 IconColumn::make('scheme')
                     ->visibleFrom('xl')
                     ->label('SSL')
-                    ->trueIcon(TablerIcon::Lock)
-                    ->falseIcon(TablerIcon::LockOpenOff)
+                    ->trueIcon('tabler-lock')
+                    ->falseIcon('tabler-lock-open-off')
                     ->state(fn (Node $node) => $node->scheme === 'https'),
                 IconColumn::make('public')
                     ->label(trans('admin/node.table.public'))
                     ->visibleFrom('lg')
-                    ->trueIcon(TablerIcon::EyeCheck)
-                    ->falseIcon(TablerIcon::EyeCancel),
+                    ->trueIcon('tabler-eye-check')
+                    ->falseIcon('tabler-eye-cancel'),
                 TextColumn::make('servers_count')
                     ->visibleFrom('sm')
                     ->counts('servers')
@@ -65,10 +65,7 @@ class ListNodes extends ListRecords
             ->recordActions([
                 EditAction::make(),
             ])
-            ->toolbarActions([
-                CreateAction::make(),
-            ])
-            ->emptyStateIcon(TablerIcon::Server2)
+            ->emptyStateIcon('tabler-server-2')
             ->emptyStateDescription('')
             ->emptyStateHeading(trans('admin/node.no_nodes'))
             ->filters([
@@ -76,4 +73,14 @@ class ListNodes extends ListRecords
                     ->model(Node::class),
             ]);
     }
+
+    /** @return array<Action|ActionGroup> */
+    protected function getDefaultHeaderActions(): array
+    {
+        return [
+            CreateAction::make()
+                ->iconButton()->iconSize(IconSize::ExtraLarge)
+                ->icon('tabler-file-plus'),
+        ];
+    }
 }

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

@@ -2,13 +2,11 @@
 
 namespace App\Filament\Admin\Resources\Nodes\RelationManagers;
 
-use App\Enums\TablerIcon;
 use App\Filament\Admin\Resources\Servers\Pages\CreateServer;
 use App\Filament\Components\Actions\UpdateNodeAllocations;
 use App\Models\Allocation;
 use App\Models\Node;
 use App\Services\Allocations\AssignmentService;
-use BackedEnum;
 use Exception;
 use Filament\Actions\Action;
 use Filament\Actions\DeleteBulkAction;
@@ -18,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;
@@ -30,7 +29,7 @@ class AllocationsRelationManager extends RelationManager
 {
     protected static string $relationship = 'allocations';
 
-    protected static string|BackedEnum|null $icon = TablerIcon::PlugConnected;
+    protected static string|\BackedEnum|null $icon = 'tabler-plug-connected';
 
     public function setTitle(): string
     {
@@ -58,7 +57,7 @@ class AllocationsRelationManager extends RelationManager
                     ->label(trans('admin/node.ports')),
                 TextColumn::make('server.name')
                     ->label(trans('admin/node.table.servers'))
-                    ->icon(TablerIcon::BrandDocker)
+                    ->icon('tabler-brand-docker')
                     ->visibleFrom('md')
                     ->searchable()
                     ->url(fn (Allocation $allocation): string => $allocation->server ? route('filament.admin.resources.servers.edit', ['record' => $allocation->server]) : ''),
@@ -87,14 +86,12 @@ class AllocationsRelationManager extends RelationManager
                 DeleteBulkAction::make()
                     ->authorize(fn () => user()?->can('update', $this->getOwnerRecord())),
                 Action::make('create new allocation')
-                    ->tooltip(trans('admin/node.create_allocation'))
-                    ->icon(TablerIcon::WorldPlus)
+                    ->label(trans('admin/node.create_allocation'))
+                    ->icon('tabler-world-plus')
+                    ->iconButton()->iconSize(IconSize::ExtraLarge)
                     ->schema(fn () => [
                         Select::make('allocation_ip')
-                            ->options(fn (Get $get) => collect($this->getOwnerRecord()->ipAddresses())
-                                ->when($get('allocation_ip'), fn ($ips, $current) => $ips->push($current))
-                                ->unique()
-                                ->mapWithKeys(fn (string $ip) => [$ip => $ip]))
+                            ->options(fn () => collect($this->getOwnerRecord()->ipAddresses())->mapWithKeys(fn (string $ip) => [$ip => $ip]))
                             ->label(trans('admin/node.ip_address'))
                             ->inlineLabel()
                             ->ip()
@@ -102,25 +99,14 @@ class AllocationsRelationManager extends RelationManager
                             ->afterStateUpdated(fn (Set $set) => $set('allocation_ports', []))
                             ->live()
                             ->hintAction(
-                                Action::make('hint_refresh')
-                                    ->icon(TablerIcon::Refresh)
+                                Action::make('refresh')
+                                    ->iconButton()
+                                    ->icon('tabler-refresh')
                                     ->tooltip(trans('admin/node.refresh'))
                                     ->action(function () {
                                         cache()->forget("nodes.{$this->getOwnerRecord()->id}.ips");
                                     })
                             )
-                            ->suffixAction(
-                                Action::make('custom_ip')
-                                    ->icon(TablerIcon::Keyboard)
-                                    ->tooltip(trans('admin/node.custom_ip'))
-                                    ->schema([
-                                        TextInput::make('custom_ip')
-                                            ->label(trans('admin/node.ip_address'))
-                                            ->ip()
-                                            ->required(),
-                                    ])
-                                    ->action(fn (array $data, Set $set) => $set('allocation_ip', $data['custom_ip']))
-                            )
                             ->required(),
                         TextInput::make('allocation_alias')
                             ->label(trans('admin/node.table.alias'))

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

@@ -3,9 +3,7 @@
 namespace App\Filament\Admin\Resources\Nodes\RelationManagers;
 
 use App\Enums\ServerResourceType;
-use App\Enums\TablerIcon;
 use App\Models\Server;
-use BackedEnum;
 use Filament\Resources\RelationManagers\RelationManager;
 use Filament\Tables\Columns\SelectColumn;
 use Filament\Tables\Columns\TextColumn;
@@ -15,7 +13,7 @@ class ServersRelationManager extends RelationManager
 {
     protected static string $relationship = 'servers';
 
-    protected static string|BackedEnum|null $icon = TablerIcon::BrandDocker;
+    protected static string|\BackedEnum|null $icon = 'tabler-brand-docker';
 
     public function setTitle(): string
     {

app/Filament/Admin/Resources/Plugins/PluginResource.php

@@ -3,11 +3,9 @@
 namespace App\Filament\Admin\Resources\Plugins;
 
 use App\Enums\PluginStatus;
-use App\Enums\TablerIcon;
 use App\Filament\Admin\Resources\Plugins\Pages\ListPlugins;
 use App\Models\Plugin;
 use App\Services\Helpers\PluginService;
-use BackedEnum;
 use Exception;
 use Filament\Actions\Action;
 use Filament\Actions\ActionGroup;
@@ -16,6 +14,7 @@ use Filament\Forms\Components\TextInput;
 use Filament\Infolists\Components\TextEntry;
 use Filament\Notifications\Notification;
 use Filament\Resources\Resource;
+use Filament\Support\Enums\IconSize;
 use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Table;
 use Illuminate\Http\UploadedFile;
@@ -24,7 +23,7 @@ class PluginResource extends Resource
 {
     protected static ?string $model = Plugin::class;
 
-    protected static string|BackedEnum|null $navigationIcon = TablerIcon::Packages;
+    protected static string|\BackedEnum|null $navigationIcon = 'tabler-packages';
 
     protected static ?string $recordTitleAttribute = 'name';
 
@@ -60,7 +59,7 @@ class PluginResource extends Resource
                 TextColumn::make('name')
                     ->label(trans('admin/plugin.name'))
                     ->description(fn (Plugin $plugin) => (strlen($plugin->description) > 80) ? substr($plugin->description, 0, 80).'...' : $plugin->description)
-                    ->icon(fn (Plugin $plugin) => $plugin->isUpdateAvailable() ? TablerIcon::VersionsOff : TablerIcon::Versions)
+                    ->icon(fn (Plugin $plugin) => $plugin->isUpdateAvailable() ? 'tabler-versions-off' : 'tabler-versions')
                     ->iconColor(fn (Plugin $plugin) => $plugin->isUpdateAvailable() ? 'danger' : 'success')
                     ->tooltip(fn (Plugin $plugin) => $plugin->isUpdateAvailable() ? trans('admin/plugin.update_available') : null)
                     ->sortable()
@@ -83,15 +82,15 @@ class PluginResource extends Resource
                     ->sortable(),
             ])
             ->recordActions([
-                Action::make('exclude_view')
+                Action::make('view')
                     ->label(trans('filament-actions::view.single.label'))
-                    ->icon(fn (Plugin $plugin) => $plugin->getReadme() ? TablerIcon::Eye : TablerIcon::EyeShare)
+                    ->icon(fn (Plugin $plugin) => $plugin->getReadme() ? 'tabler-eye' : 'tabler-eye-share')
                     ->color('gray')
                     ->visible(fn (Plugin $plugin) => $plugin->getReadme() || $plugin->url)
                     ->url(fn (Plugin $plugin) => !$plugin->getReadme() ? $plugin->url : null, true)
                     ->slideOver(true)
                     ->modalHeading('Readme')
-                    ->modalSubmitAction(fn (Plugin $plugin) => Action::make('exclude_visit_website')
+                    ->modalSubmitAction(fn (Plugin $plugin) => Action::make('visit_website')
                         ->label(trans('admin/plugin.visit_website'))
                         ->visible(!is_null($plugin->url))
                         ->url($plugin->url, true)
@@ -103,20 +102,20 @@ class PluginResource extends Resource
                             ->markdown()
                             ->state(fn (Plugin $plugin) => $plugin->getReadme()),
                     ] : null),
-                Action::make('exclude_settings')
+                Action::make('settings')
                     ->label(trans('admin/plugin.settings'))
                     ->authorize(fn (Plugin $plugin) => user()?->can('update', $plugin))
-                    ->icon(TablerIcon::Settings)
+                    ->icon('tabler-settings')
                     ->color('primary')
                     ->visible(fn (Plugin $plugin) => $plugin->status === PluginStatus::Enabled && $plugin->hasSettings())
                     ->schema(fn (Plugin $plugin) => $plugin->getSettingsForm())
                     ->action(fn (array $data, Plugin $plugin) => $plugin->saveSettings($data))
                     ->slideOver(),
                 ActionGroup::make([
-                    Action::make('exclude_install')
+                    Action::make('install')
                         ->label(trans('admin/plugin.install'))
                         ->authorize(fn (Plugin $plugin) => user()?->can('update', $plugin))
-                        ->icon(TablerIcon::Terminal)
+                        ->icon('tabler-terminal')
                         ->color('success')
                         ->hidden(fn (Plugin $plugin) => $plugin->status !== PluginStatus::NotInstalled)
                         ->action(function (Plugin $plugin, $livewire, PluginService $pluginService) {
@@ -137,10 +136,10 @@ class PluginResource extends Resource
                                     ->send();
                             }
                         }),
-                    Action::make('exclude_update')
+                    Action::make('update')
                         ->label(trans('admin/plugin.update'))
                         ->authorize(fn (Plugin $plugin) => user()?->can('update', $plugin))
-                        ->icon(TablerIcon::Download)
+                        ->icon('tabler-download')
                         ->color('success')
                         ->visible(fn (Plugin $plugin) => $plugin->status !== PluginStatus::NotInstalled && $plugin->isUpdateAvailable())
                         ->action(function (Plugin $plugin, $livewire, PluginService $pluginService) {
@@ -161,10 +160,10 @@ class PluginResource extends Resource
                                     ->send();
                             }
                         }),
-                    Action::make('exclude_enable')
+                    Action::make('enable')
                         ->label(trans('admin/plugin.enable'))
                         ->authorize(fn (Plugin $plugin) => user()?->can('update', $plugin))
-                        ->icon(TablerIcon::Check)
+                        ->icon('tabler-check')
                         ->color('success')
                         ->visible(fn (Plugin $plugin) => $plugin->canEnable())
                         ->requiresConfirmation(fn (Plugin $plugin, PluginService $pluginService) => $plugin->isTheme() && $pluginService->hasThemePluginEnabled())
@@ -180,10 +179,10 @@ class PluginResource extends Resource
                                 ->title(trans('admin/plugin.notifications.enabled'))
                                 ->send();
                         }),
-                    Action::make('exclude_disable')
+                    Action::make('disable')
                         ->label(trans('admin/plugin.disable'))
                         ->authorize(fn (Plugin $plugin) => user()?->can('update', $plugin))
-                        ->icon(TablerIcon::X)
+                        ->icon('tabler-x')
                         ->color('warning')
                         ->visible(fn (Plugin $plugin) => $plugin->canDisable())
                         ->action(function (Plugin $plugin, $livewire, PluginService $pluginService) {
@@ -196,10 +195,10 @@ class PluginResource extends Resource
                                 ->title(trans('admin/plugin.notifications.disabled'))
                                 ->send();
                         }),
-                    Action::make('exclude_delete')
+                    Action::make('delete')
                         ->label(trans('filament-actions::delete.single.label'))
                         ->authorize(fn (Plugin $plugin) => user()?->can('delete', $plugin))
-                        ->icon(TablerIcon::Trash)
+                        ->icon('tabler-trash')
                         ->color('danger')
                         ->requiresConfirmation()
                         ->visible(fn (Plugin $plugin) => $plugin->status === PluginStatus::NotInstalled)
@@ -213,10 +212,10 @@ class PluginResource extends Resource
                                 ->title(trans('admin/plugin.notifications.deleted'))
                                 ->send();
                         }),
-                    Action::make('exclude_uninstall')
+                    Action::make('uninstall')
                         ->label(trans('admin/plugin.uninstall'))
                         ->authorize(fn (Plugin $plugin) => user()?->can('update', $plugin))
-                        ->icon(TablerIcon::Terminal)
+                        ->icon('tabler-terminal')
                         ->color('danger')
                         ->requiresConfirmation()
                         ->hidden(fn (Plugin $plugin) => $plugin->status === PluginStatus::NotInstalled || $plugin->status === PluginStatus::Errored)
@@ -242,10 +241,11 @@ class PluginResource extends Resource
             ])
             ->headerActions([
                 Action::make('import_from_file')
-                    ->hiddenLabel()
-                    ->tooltip(trans('admin/plugin.import_from_file'))
+                    ->label(trans('admin/plugin.import_from_file'))
                     ->authorize(fn () => user()?->can('create', Plugin::class))
-                    ->icon(TablerIcon::FileDownload)
+                    ->icon('tabler-file-download')
+                    ->iconButton()
+                    ->iconSize(IconSize::ExtraLarge)
                     ->schema([
                         // TODO: switch to new file upload
                         FileUpload::make('file')
@@ -285,10 +285,11 @@ class PluginResource extends Resource
                         }
                     }),
                 Action::make('import_from_url')
-                    ->hiddenLabel()
-                    ->tooltip(trans('admin/plugin.import_from_url'))
+                    ->label(trans('admin/plugin.import_from_url'))
                     ->authorize(fn () => user()?->can('create', Plugin::class))
-                    ->icon(TablerIcon::WorldDownload)
+                    ->icon('tabler-world-download')
+                    ->iconButton()
+                    ->iconSize(IconSize::ExtraLarge)
                     ->schema([
                         TextInput::make('url')
                             ->required()
@@ -322,7 +323,7 @@ class PluginResource extends Resource
                         }
                     }),
             ])
-            ->emptyStateIcon(TablerIcon::Packages)
+            ->emptyStateIcon('tabler-packages')
             ->emptyStateDescription('')
             ->emptyStateHeading(trans('admin/plugin.no_plugins'));
     }

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

@@ -2,7 +2,6 @@
 
 namespace App\Filament\Admin\Resources\Roles\Pages;
 
-use App\Enums\TablerIcon;
 use App\Filament\Admin\Resources\Roles\RoleResource;
 use App\Models\Role;
 use App\Traits\Filament\CanCustomizeHeaderActions;
@@ -10,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;
@@ -32,12 +32,9 @@ class CreateRole extends CreateRecord
     protected function getDefaultHeaderActions(): array
     {
         return [
-            Action::make('create')
-                ->hiddenLabel()
-                ->action('create')
-                ->keyBindings(['mod+s'])
-                ->tooltip(trans('filament-panels::resources/pages/create-record.form.actions.create.label'))
-                ->icon(TablerIcon::FilePlus),
+            $this->getCreateFormAction()->formId('form')
+                ->iconButton()->iconSize(IconSize::ExtraLarge)
+                ->icon('tabler-plus'),
         ];
     }
 

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

@@ -2,7 +2,6 @@
 
 namespace App\Filament\Admin\Resources\Roles\Pages;
 
-use App\Enums\TablerIcon;
 use App\Filament\Admin\Resources\Roles\RoleResource;
 use App\Models\Role;
 use App\Traits\Filament\CanCustomizeHeaderActions;
@@ -11,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;
@@ -58,14 +58,12 @@ class EditRole extends EditRecord
     {
         return [
             DeleteAction::make()
-                ->tooltip(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),
-            Action::make('save')
-                ->hiddenLabel()
-                ->action('save')
-                ->keyBindings(['mod+s'])
-                ->tooltip(trans('filament-panels::resources/pages/edit-record.form.actions.save.label'))
-                ->icon(TablerIcon::DeviceFloppy),
+                ->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)
+                ->iconButton()->iconSize(IconSize::ExtraLarge),
+            $this->getSaveFormAction()->formId('form')
+                ->iconButton()->iconSize(IconSize::ExtraLarge)
+                ->icon('tabler-device-floppy'),
         ];
     }
 

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

@@ -5,7 +5,11 @@ namespace App\Filament\Admin\Resources\Roles\Pages;
 use App\Filament\Admin\Resources\Roles\RoleResource;
 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 ListRoles extends ListRecords
 {
@@ -13,4 +17,14 @@ class ListRoles extends ListRecords
     use CanCustomizeHeaderWidgets;
 
     protected static string $resource = RoleResource::class;
+
+    /** @return array<Action|ActionGroup> */
+    protected function getDefaultHeaderActions(): array
+    {
+        return [
+            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

@@ -3,7 +3,6 @@
 namespace App\Filament\Admin\Resources\Roles;
 
 use App\Enums\CustomizationKey;
-use App\Enums\TablerIcon;
 use App\Filament\Admin\Resources\Roles\Pages\CreateRole;
 use App\Filament\Admin\Resources\Roles\Pages\EditRole;
 use App\Filament\Admin\Resources\Roles\Pages\ListRoles;
@@ -16,8 +15,6 @@ use App\Traits\Filament\CanModifyTable;
 use BackedEnum;
 use Exception;
 use Filament\Actions\Action;
-use Filament\Actions\BulkActionGroup;
-use Filament\Actions\CreateAction;
 use Filament\Actions\DeleteBulkAction;
 use Filament\Actions\EditAction;
 use Filament\Actions\ViewAction;
@@ -46,7 +43,7 @@ class RoleResource extends Resource
 
     protected static ?string $model = Role::class;
 
-    protected static string|BackedEnum|null $navigationIcon = TablerIcon::UsersGroup;
+    protected static string|\BackedEnum|null $navigationIcon = 'tabler-users-group';
 
     protected static ?string $recordTitleAttribute = 'name';
 
@@ -103,13 +100,10 @@ class RoleResource extends Resource
                     ->hidden(fn ($record) => static::getEditAuthorizationResponse($record)->allowed()),
                 EditAction::make(),
             ])
-            ->toolbarActions([
-                CreateAction::make(),
-                BulkActionGroup::make([
-                    DeleteBulkAction::make(),
-                ]),
-            ])
-            ->checkIfRecordIsSelectableUsing(fn (Role $role) => !$role->isRootAdmin() && $role->users_count <= 0);
+            ->checkIfRecordIsSelectableUsing(fn (Role $role) => !$role->isRootAdmin() && $role->users_count <= 0)
+            ->groupedBulkActions([
+                DeleteBulkAction::make(),
+            ]);
     }
 
     /**

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

@@ -2,16 +2,17 @@
 
 namespace App\Filament\Admin\Resources\Servers\Pages;
 
-use App\Enums\TablerIcon;
 use App\Filament\Admin\Resources\Servers\ServerResource;
 use App\Filament\Server\Pages\Console;
 use App\Models\Server;
 use App\Traits\Filament\CanCustomizeHeaderActions;
 use App\Traits\Filament\CanCustomizeHeaderWidgets;
 use Filament\Actions\Action;
+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;
@@ -90,19 +91,28 @@ class ListServers extends ListRecords
                     ->sortable(),
             ])
             ->recordActions([
-                Action::make('view')
-                    ->tooltip(trans('admin/server.view'))
-                    ->icon(TablerIcon::Terminal)
+                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(),
             ])
-            ->toolbarActions([
-                CreateAction::make(),
-            ])
+            ->emptyStateIcon('tabler-brand-docker')
             ->searchable()
-            ->emptyStateIcon(TablerIcon::BrandDocker)
             ->emptyStateDescription('')
             ->emptyStateHeading(trans('admin/server.no_servers'));
     }
+
+    /** @return array<Action|ActionGroup> */
+    protected function getDefaultHeaderActions(): array
+    {
+        return [
+            CreateAction::make()
+                ->iconButton()->iconSize(IconSize::ExtraLarge)
+                ->icon('tabler-file-plus'),
+        ];
+    }
 }

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

@@ -2,7 +2,6 @@
 
 namespace App\Filament\Admin\Resources\Servers\RelationManagers;
 
-use App\Enums\TablerIcon;
 use App\Filament\Admin\Resources\Servers\Pages\CreateServer;
 use App\Models\Allocation;
 use App\Models\Server;
@@ -52,8 +51,8 @@ class AllocationsRelationManager extends RelationManager
                     ->placeholder(trans('admin/server.no_notes')),
                 IconColumn::make('primary')
                     ->icon(fn ($state) => match ($state) {
-                        true => TablerIcon::StarFilled,
-                        default => TablerIcon::Star,
+                        true => 'tabler-star-filled',
+                        default => 'tabler-star',
                     })
                     ->color(fn ($state) => match ($state) {
                         true => 'warning',
@@ -66,8 +65,8 @@ class AllocationsRelationManager extends RelationManager
                 IconColumn::make('is_locked')
                     ->label(trans('admin/server.locked'))
                     ->tooltip(trans('admin/server.locked_helper'))
-                    ->trueIcon(TablerIcon::Lock)
-                    ->falseIcon(TablerIcon::LockOpen),
+                    ->trueIcon('tabler-lock')
+                    ->falseIcon('tabler-lock-open'),
             ])
             ->recordActions([
                 Action::make('make-primary')
@@ -107,40 +106,26 @@ class AllocationsRelationManager extends RelationManager
                         }
                     }),
                 CreateAction::make()
-                    ->hiddenLabel()
-                    ->tooltip(trans('admin/server.create_allocation'))
-                    ->icon(TablerIcon::Network)
+                    ->label(trans('admin/server.create_allocation'))
+                    ->icon('tabler-network')
+                    ->iconButton()->iconSize(IconSize::ExtraLarge)
                     ->createAnother(false)
                     ->schema(fn () => [
                         Select::make('allocation_ip')
-                            ->options(fn (Get $get) => collect($this->getOwnerRecord()->node->ipAddresses())
-                                ->when($get('allocation_ip'), fn ($ips, $current) => $ips->push($current))
-                                ->unique()
-                                ->mapWithKeys(fn (string $ip) => [$ip => $ip]))
+                            ->options(fn () => collect($this->getOwnerRecord()->node->ipAddresses())->mapWithKeys(fn (string $ip) => [$ip => $ip]))
                             ->label(trans('admin/server.ip_address'))
                             ->inlineLabel()
                             ->ip()
                             ->live()
                             ->hintAction(
                                 Action::make('refresh')
-                                    ->icon(TablerIcon::Refresh)
+                                    ->iconButton()
+                                    ->icon('tabler-refresh')
                                     ->tooltip(trans('admin/node.refresh'))
                                     ->action(function () {
                                         cache()->forget("nodes.{$this->getOwnerRecord()->node->id}.ips");
                                     })
                             )
-                            ->suffixAction(
-                                Action::make('custom_ip')
-                                    ->icon(TablerIcon::Keyboard)
-                                    ->tooltip(trans('admin/node.custom_ip'))
-                                    ->schema([
-                                        TextInput::make('custom_ip')
-                                            ->label(trans('admin/node.ip_address'))
-                                            ->ip()
-                                            ->required(),
-                                    ])
-                                    ->action(fn (array $data, Set $set) => $set('allocation_ip', $data['custom_ip']))
-                            )
                             ->afterStateUpdated(fn (Set $set) => $set('allocation_ports', []))
                             ->required(),
                         TextInput::make('allocation_alias')
@@ -162,14 +147,14 @@ class AllocationsRelationManager extends RelationManager
                     ])
                     ->action(fn (array $data, AssignmentService $service) => $service->handle($this->getOwnerRecord()->node, $data, $this->getOwnerRecord())),
                 AssociateAction::make()
-                    ->icon(TablerIcon::FilePlus)
+                    ->icon('tabler-file-plus')
                     ->iconButton()->iconSize(IconSize::ExtraLarge)
                     ->multiple()
                     ->associateAnother(false)
                     ->preloadRecordSelect()
                     ->recordSelectOptionsQuery(fn ($query) => $query->whereBelongsTo($this->getOwnerRecord()->node)->whereNull('server_id'))
                     ->recordSelectSearchColumns(['ip', 'port'])
-                    ->tooltip(trans('admin/server.add_allocation'))
+                    ->label(trans('admin/server.add_allocation'))
                     ->after(function (array $data) {
                         Allocation::whereIn('id', array_values(array_unique($data['recordId'])))->update(['is_locked' => true]);
 

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

@@ -2,7 +2,6 @@
 
 namespace App\Filament\Admin\Resources\Servers\RelationManagers;
 
-use App\Enums\TablerIcon;
 use App\Filament\Components\Actions\RotateDatabasePasswordAction;
 use App\Filament\Components\Tables\Columns\DateTimeColumn;
 use App\Models\Database;
@@ -19,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;
@@ -83,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 {
@@ -104,11 +105,11 @@ class DatabasesRelationManager extends RelationManager
             ])
             ->toolbarActions([
                 CreateAction::make()
-                    ->hiddenLabel()
                     ->disabled(fn () => DatabaseHost::count() < 1)
-                    ->tooltip(fn () => DatabaseHost::count() < 1 ? trans('admin/server.no_db_hosts') : trans('admin/server.create_database'))
+                    ->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 ? TablerIcon::DatabaseX : TablerIcon::DatabasePlus)
+                    ->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);
@@ -142,13 +143,13 @@ class DatabasesRelationManager extends RelationManager
                             ->label(trans('admin/server.name'))
                             ->alphaDash()
                             ->prefix(fn () => 's' . $this->getOwnerRecord()->id . '_')
-                            ->hintIcon(TablerIcon::QuestionMark, trans('admin/databasehost.table.name_helper')),
+                            ->hintIcon('tabler-question-mark', trans('admin/databasehost.table.name_helper')),
                         TextInput::make('remote')
                             ->columnSpan(1)
                             ->regex('/^[\w\-\/.%:]+$/')
                             ->label(trans('admin/databasehost.table.remote'))
                             ->default('%')
-                            ->hintIcon(TablerIcon::QuestionMark, trans('admin/databasehost.table.remote_helper')),
+                            ->hintIcon('tabler-question-mark', trans('admin/databasehost.table.remote_helper')),
                     ]),
             ]);
     }

app/Filament/Admin/Resources/Servers/ServerResource.php

@@ -3,7 +3,6 @@
 namespace App\Filament\Admin\Resources\Servers;
 
 use App\Enums\CustomizationKey;
-use App\Enums\TablerIcon;
 use App\Filament\Admin\Resources\Servers\Pages\CreateServer;
 use App\Filament\Admin\Resources\Servers\Pages\EditServer;
 use App\Filament\Admin\Resources\Servers\Pages\ListServers;
@@ -13,7 +12,6 @@ use App\Models\Mount;
 use App\Models\Server;
 use App\Traits\Filament\CanCustomizePages;
 use App\Traits\Filament\CanCustomizeRelations;
-use BackedEnum;
 use Exception;
 use Filament\Forms\Components\CheckboxList;
 use Filament\Resources\Pages\PageRegistration;
@@ -29,7 +27,7 @@ class ServerResource extends Resource
 
     protected static ?string $model = Server::class;
 
-    protected static string|BackedEnum|null $navigationIcon = TablerIcon::BrandDocker;
+    protected static string|\BackedEnum|null $navigationIcon = 'tabler-brand-docker';
 
     protected static ?string $recordTitleAttribute = 'name';
 

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

@@ -2,7 +2,6 @@
 
 namespace App\Filament\Admin\Resources\Users\Pages;
 
-use App\Enums\TablerIcon;
 use App\Filament\Admin\Resources\Users\UserResource;
 use App\Models\Role;
 use App\Services\Users\UserCreationService;
@@ -11,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
@@ -33,12 +33,9 @@ class CreateUser extends CreateRecord
     protected function getDefaultHeaderActions(): array
     {
         return [
-            Action::make('create')
-                ->hiddenLabel()
-                ->action('create')
-                ->keyBindings(['mod+s'])
-                ->tooltip(trans('filament-panels::resources/pages/create-record.form.actions.create.label'))
-                ->icon(TablerIcon::UserPlus),
+            $this->getCreateFormAction()->formId('form')
+                ->iconButton()->iconSize(IconSize::ExtraLarge)
+                ->icon('tabler-user-plus'),
         ];
     }
 

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

@@ -2,7 +2,6 @@
 
 namespace App\Filament\Admin\Resources\Users\Pages;
 
-use App\Enums\TablerIcon;
 use App\Filament\Admin\Resources\Users\UserResource;
 use App\Models\User;
 use App\Services\Users\UserUpdateService;
@@ -12,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,14 +33,12 @@ class EditUser extends EditRecord
     {
         return [
             DeleteAction::make()
-                ->tooltip(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),
-            Action::make('save')
-                ->hiddenLabel()
-                ->action('save')
-                ->keyBindings(['mod+s'])
-                ->tooltip(trans('filament-panels::resources/pages/edit-record.form.actions.save.label'))
-                ->icon(TablerIcon::DeviceFloppy),
+                ->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)
+                ->iconButton()->iconSize(IconSize::ExtraLarge),
+            $this->getSaveFormAction()->formId('form')
+                ->iconButton()->iconSize(IconSize::ExtraLarge)
+                ->icon('tabler-device-floppy'),
         ];
     }
 

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

@@ -5,7 +5,11 @@ namespace App\Filament\Admin\Resources\Users\Pages;
 use App\Filament\Admin\Resources\Users\UserResource;
 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 ListUsers extends ListRecords
 {
@@ -13,4 +17,14 @@ class ListUsers extends ListRecords
     use CanCustomizeHeaderWidgets;
 
     protected static string $resource = UserResource::class;
+
+    /** @return array<Action|ActionGroup> */
+    protected function getDefaultHeaderActions(): array
+    {
+        return [
+            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

@@ -3,7 +3,6 @@
 namespace App\Filament\Admin\Resources\Users;
 
 use App\Enums\CustomizationKey;
-use App\Enums\TablerIcon;
 use App\Extensions\OAuth\OAuthService;
 use App\Facades\Activity;
 use App\Filament\Admin\Resources\Users\Pages\CreateUser;
@@ -19,15 +18,11 @@ use App\Models\UserSSHKey;
 use App\Services\Helpers\LanguageService;
 use App\Traits\Filament\CanCustomizePages;
 use App\Traits\Filament\CanCustomizeRelations;
-use App\Traits\Filament\CanCustomizeStaticTabs;
 use App\Traits\Filament\CanModifyForm;
 use App\Traits\Filament\CanModifyTable;
-use BackedEnum;
 use DateTimeZone;
 use Exception;
 use Filament\Actions\Action;
-use Filament\Actions\BulkActionGroup;
-use Filament\Actions\CreateAction;
 use Filament\Actions\DeleteBulkAction;
 use Filament\Actions\EditAction;
 use Filament\Actions\ViewAction;
@@ -64,13 +59,12 @@ class UserResource extends Resource
 {
     use CanCustomizePages;
     use CanCustomizeRelations;
-    use CanCustomizeStaticTabs;
     use CanModifyForm;
     use CanModifyTable;
 
     protected static ?string $model = User::class;
 
-    protected static string|BackedEnum|null $navigationIcon = TablerIcon::Users;
+    protected static string|\BackedEnum|null $navigationIcon = 'tabler-users';
 
     protected static ?string $recordTitleAttribute = 'username';
 
@@ -121,7 +115,7 @@ class UserResource extends Resource
                 IconColumn::make('mfa_email_enabled')
                     ->label(trans('profile.tabs.2fa'))
                     ->visibleFrom('lg')
-                    ->icon(fn (User $user) => filled($user->mfa_app_secret) ? TablerIcon::Qrcode : ($user->mfa_email_enabled ? TablerIcon::Mail : TablerIcon::LockOpenOff))
+                    ->icon(fn (User $user) => filled($user->mfa_app_secret) ? 'tabler-qrcode' : ($user->mfa_email_enabled ? 'tabler-mail' : 'tabler-lock-open-off'))
                     ->tooltip(fn (User $user) => filled($user->mfa_app_secret) ? 'App' : ($user->mfa_email_enabled ? 'E-Mail' : 'None')),
                 TextColumn::make('roles.name')
                     ->label(trans('admin/user.roles'))
@@ -140,15 +134,10 @@ class UserResource extends Resource
                     ->hidden(fn ($record) => static::getEditAuthorizationResponse($record)->allowed()),
                 EditAction::make(),
             ])
-            ->toolbarActions([
-                BulkActionGroup::make([
-                    DeleteBulkAction::make('exclude_bulk_delete'),
-                ]),
-                CreateAction::make()
-                    ->hiddenLabel()
-                    ->icon(TablerIcon::UserPlus),
-            ])
-            ->checkIfRecordIsSelectableUsing(fn (User $user) => user()?->id !== $user->id && !$user->servers_count);
+            ->checkIfRecordIsSelectableUsing(fn (User $user) => user()?->id !== $user->id && !$user->servers_count)
+            ->groupedBulkActions([
+                DeleteBulkAction::make(),
+            ]);
     }
 
     public static function defaultForm(Schema $schema): Schema
@@ -157,339 +146,332 @@ class UserResource extends Resource
             ->columns(['default' => 1, 'lg' => 3, 'md' => 2])
             ->components([
                 Tabs::make()
-                    ->schema(static::getTabs())
-                    ->columnSpanFull(),
-            ]);
-    }
+                    ->schema([
+                        Tab::make('account')
+                            ->label(trans('profile.tabs.account'))
+                            ->icon('tabler-user-cog')
+                            ->columns([
+                                'default' => 1,
+                                'md' => 3,
+                                'lg' => 3,
+                            ])
+                            ->schema([
+                                TextInput::make('username')
+                                    ->label(trans('admin/user.username'))
+                                    ->columnSpan([
+                                        'default' => 1,
+                                        'md' => 1,
+                                        'lg' => 1,
+                                    ])
+                                    ->required()
+                                    ->unique()
+                                    ->maxLength(255),
+                                TextInput::make('email')
+                                    ->label(trans('admin/user.email'))
+                                    ->columnSpan([
+                                        'default' => 1,
+                                        'md' => 1,
+                                        'lg' => 1,
+                                    ])
+                                    ->email()
+                                    ->required()
+                                    ->unique()
+                                    ->maxLength(255),
+                                TextInput::make('password')
+                                    ->label(trans('admin/user.password'))
+                                    ->columnSpan([
+                                        'default' => 1,
+                                        'md' => 1,
+                                        'lg' => 1,
+                                    ])
+                                    ->hintIcon(fn ($operation) => $operation === 'create' ? 'tabler-question-mark' : null, fn ($operation) => $operation === 'create' ? trans('admin/user.password_help') : null)
+                                    ->password()
+                                    ->hintAction(
+                                        Action::make('password_reset')
+                                            ->label(trans('admin/user.password_reset'))
+                                            ->hidden(fn (string $operation) => $operation === 'create' || config('mail.default', 'log') === 'log')
+                                            ->icon('tabler-send')
+                                            ->action(function (User $user) {
+                                                $status = Password::broker(Filament::getPanel('app')->getAuthPasswordBroker())->sendResetLink([
+                                                    'email' => $user->email,
+                                                ],
+                                                    function (User $user, string $token) {
+                                                        $notification = new ResetPassword($token);
+                                                        $notification->url = Filament::getPanel('app')->getResetPasswordUrl($token, $user);
 
-    /** @return Tab[] */
-    protected static function getDefaultTabs(): array
-    {
-        return [
-            Tab::make('account')
-                ->label(trans('profile.tabs.account'))
-                ->icon(TablerIcon::UserCog)
-                ->columns([
-                    'default' => 1,
-                    'md' => 3,
-                    'lg' => 3,
-                ])
-                ->schema([
-                    TextInput::make('username')
-                        ->label(trans('admin/user.username'))
-                        ->columnSpan([
-                            'default' => 1,
-                            'md' => 1,
-                            'lg' => 1,
-                        ])
-                        ->required()
-                        ->unique()
-                        ->maxLength(255),
-                    TextInput::make('email')
-                        ->label(trans('admin/user.email'))
-                        ->columnSpan([
-                            'default' => 1,
-                            'md' => 1,
-                            'lg' => 1,
-                        ])
-                        ->email()
-                        ->required()
-                        ->unique()
-                        ->maxLength(255),
-                    TextInput::make('password')
-                        ->label(trans('admin/user.password'))
-                        ->columnSpan([
-                            'default' => 1,
-                            'md' => 1,
-                            'lg' => 1,
-                        ])
-                        ->hintIcon(fn ($operation) => $operation === 'create' ? TablerIcon::QuestionMark : null, fn ($operation) => $operation === 'create' ? trans('admin/user.password_help') : null)
-                        ->password()
-                        ->hintAction(
-                            Action::make('hint_password_reset')
-                                ->label(trans('admin/user.password_reset'))
-                                ->hidden(fn (string $operation) => $operation === 'create' || config('mail.default', 'log') === 'log')
-                                ->icon(TablerIcon::Send)
-                                ->action(function (User $user) {
-                                    $status = Password::broker(Filament::getPanel('app')->getAuthPasswordBroker())->sendResetLink([
-                                        'email' => $user->email,
-                                    ],
-                                        function (User $user, string $token) {
-                                            $notification = new ResetPassword($token);
-                                            $notification->url = Filament::getPanel('app')->getResetPasswordUrl($token, $user);
+                                                        $user->notify($notification);
 
-                                            $user->notify($notification);
+                                                        event(new PasswordResetLinkSent($user));
+                                                    },
+                                                );
 
-                                            event(new PasswordResetLinkSent($user));
-                                        },
-                                    );
+                                                if ($status === Password::RESET_LINK_SENT) {
+                                                    Notification::make()
+                                                        ->title(trans('admin/user.password_reset_sent'))
+                                                        ->success()
+                                                        ->send();
+                                                } else {
+                                                    Notification::make()
+                                                        ->title(trans('admin/user.password_reset_failed'))
+                                                        ->body($status)
+                                                        ->danger()
+                                                        ->send();
+                                                }
+                                            })),
+                                TextInput::make('external_id')
+                                    ->label(trans('admin/user.external_id'))
+                                    ->columnSpan([
+                                        'default' => 1,
+                                        'md' => 1,
+                                        'lg' => 1,
+                                    ]),
+                                Toggle::make('is_managed_externally')
+                                    ->label(trans('admin/user.is_managed_externally'))
+                                    ->hintIcon('tabler-question-mark', trans('admin/user.is_managed_externally_helper'))
+                                    ->inline(false)
+                                    ->columnSpan([
+                                        'default' => 1,
+                                        'md' => 1,
+                                        'lg' => 1,
+                                    ]),
+                                Section::make(trans('profile.tabs.customization'))
+                                    ->collapsible()
+                                    ->columnSpanFull()
+                                    ->columns(2)
+                                    ->schema([
+                                        Select::make('timezone')
+                                            ->label(trans('profile.timezone'))
+                                            ->required()
+                                            ->prefixIcon('tabler-clock-pin')
+                                            ->default(fn () => config('app.timezone', 'UTC'))
+                                            ->selectablePlaceholder(false)
+                                            ->options(fn () => collect(DateTimeZone::listIdentifiers())->mapWithKeys(fn ($tz) => [$tz => $tz]))
+                                            ->searchable(),
+                                        Select::make('language')
+                                            ->label(trans('profile.language'))
+                                            ->required()
+                                            ->prefixIcon('tabler-flag')
+                                            ->live()
+                                            ->default('en')
+                                            ->searchable()
+                                            ->selectablePlaceholder(false)
+                                            ->options(fn (LanguageService $languageService) => $languageService->getAvailableLanguages()),
+                                        FileUpload::make('avatar')
+                                            ->visible(fn (?User $user, FileUpload $fileUpload) => $user ? $fileUpload->getDisk()->exists($fileUpload->getDirectory() . '/' . $user->id . '.png') : false)
+                                            ->columnSpanFull()
+                                            ->avatar()
+                                            ->directory('avatars')
+                                            ->disk('public')
+                                            ->formatStateUsing(function (FileUpload $fileUpload, ?User $user) {
+                                                if (!$user) {
+                                                    return null;
+                                                }
+                                                $path = $fileUpload->getDirectory() . '/' . $user->id . '.png';
+                                                if ($fileUpload->getDisk()->exists($path)) {
+                                                    return $path;
+                                                }
+                                            })
+                                            ->deleteUploadedFileUsing(function (FileUpload $fileUpload, $file) {
+                                                if ($file instanceof TemporaryUploadedFile) {
+                                                    return $file->delete();
+                                                }
 
-                                    if ($status === Password::RESET_LINK_SENT) {
-                                        Notification::make()
-                                            ->title(trans('admin/user.password_reset_sent'))
-                                            ->success()
-                                            ->send();
-                                    } else {
-                                        Notification::make()
-                                            ->title(trans('admin/user.password_reset_failed'))
-                                            ->body($status)
-                                            ->danger()
-                                            ->send();
-                                    }
-                                })),
-                    TextInput::make('external_id')
-                        ->label(trans('admin/user.external_id'))
-                        ->columnSpan([
-                            'default' => 1,
-                            'md' => 1,
-                            'lg' => 1,
-                        ]),
-                    Toggle::make('is_managed_externally')
-                        ->label(trans('admin/user.is_managed_externally'))
-                        ->hintIcon(TablerIcon::QuestionMark, trans('admin/user.is_managed_externally_helper'))
-                        ->inline(false)
-                        ->columnSpan([
-                            'default' => 1,
-                            'md' => 1,
-                            'lg' => 1,
-                        ]),
-                    Section::make(trans('profile.tabs.customization'))
-                        ->collapsible()
-                        ->columnSpanFull()
-                        ->columns(2)
-                        ->schema([
-                            Select::make('timezone')
-                                ->label(trans('profile.timezone'))
-                                ->required()
-                                ->prefixIcon(TablerIcon::ClockPin)
-                                ->default(fn () => config('app.timezone', 'UTC'))
-                                ->selectablePlaceholder(false)
-                                ->options(fn () => collect(DateTimeZone::listIdentifiers())->mapWithKeys(fn ($tz) => [$tz => $tz]))
-                                ->searchable(),
-                            Select::make('language')
-                                ->label(trans('profile.language'))
-                                ->required()
-                                ->prefixIcon(TablerIcon::Flag)
-                                ->live()
-                                ->default('en')
-                                ->searchable()
-                                ->selectablePlaceholder(false)
-                                ->options(fn (LanguageService $languageService) => $languageService->getAvailableLanguages()),
-                            FileUpload::make('avatar')
-                                ->visible(fn (?User $user, FileUpload $fileUpload) => $user ? $fileUpload->getDisk()->exists($fileUpload->getDirectory() . '/' . $user->id . '.png') : false)
-                                ->columnSpanFull()
-                                ->avatar()
-                                ->directory('avatars')
-                                ->disk('public')
-                                ->formatStateUsing(function (FileUpload $fileUpload, ?User $user) {
-                                    if (!$user) {
-                                        return null;
-                                    }
-                                    $path = $fileUpload->getDirectory() . '/' . $user->id . '.png';
-                                    if ($fileUpload->getDisk()->exists($path)) {
-                                        return $path;
-                                    }
-                                })
-                                ->deleteUploadedFileUsing(function (FileUpload $fileUpload, $file) {
-                                    if ($file instanceof TemporaryUploadedFile) {
-                                        return $file->delete();
-                                    }
+                                                if ($fileUpload->getDisk()->exists($file)) {
+                                                    return $fileUpload->getDisk()->delete($file);
+                                                }
+                                            }),
+                                    ]),
+                                Section::make(trans('profile.tabs.oauth'))
+                                    ->visible(fn (?User $user) => $user)
+                                    ->collapsible()
+                                    ->columnSpanFull()
+                                    ->schema(function (OAuthService $oauthService, ?User $user) {
+                                        if (!$user) {
+                                            return;
+                                        }
 
-                                    if ($fileUpload->getDisk()->exists($file)) {
-                                        return $fileUpload->getDisk()->delete($file);
-                                    }
-                                }),
-                        ]),
-                    Section::make(trans('profile.tabs.oauth'))
-                        ->visible(fn (?User $user) => $user)
-                        ->collapsible()
-                        ->columnSpanFull()
-                        ->schema(function (OAuthService $oauthService, ?User $user) {
-                            if (!$user) {
-                                return;
-                            }
-
-                            $actions = [];
-                            foreach ($user->oauth ?? [] as $schema => $_) {
-                                $schema = $oauthService->get($schema);
-                                if (!$schema) {
-                                    return;
-                                }
-
-                                $id = $schema->getId();
-                                $name = $schema->getName();
-
-                                $color = $schema->getHexColor();
-                                $color = is_string($color) ? Color::hex($color) : null;
-
-                                $actions[] = Action::make("oauth_$id")
-                                    ->label(trans('profile.unlink', ['name' => $name]))
-                                    ->icon(TablerIcon::Unlink)
-                                    ->requiresConfirmation()
-                                    ->color($color)
-                                    ->action(function ($livewire) use ($oauthService, $user, $name, $schema) {
-                                        $oauthService->unlinkUser($user, $schema);
-                                        $livewire->form->fill($user->attributesToArray());
-                                        Notification::make()
-                                            ->title(trans('profile.unlinked', ['name' => $name]))
-                                            ->success()
-                                            ->send();
-                                    });
-                            }
-
-                            if (!$actions) {
-                                return [
-                                    TextEntry::make('no_oauth')
-                                        ->state(trans('profile.no_oauth'))
-                                        ->hiddenLabel(),
-                                ];
-                            }
-
-                            return [Actions::make($actions)];
-                        }),
-                ]),
-            Tab::make('roles')
-                ->label(trans('admin/user.roles'))
-                ->icon(TablerIcon::UsersGroup)
-                ->schema([
-                    CheckboxList::make('roles')
-                        ->hidden(fn (?User $user) => $user && $user->isRootAdmin())
-                        ->relationship('roles', 'name', fn (Builder $query) => $query->whereNot('id', Role::getRootAdmin()->id))
-                        ->saveRelationshipsUsing(fn (User $user, array $state) => $user->syncRoles(collect($state)->map(fn ($role) => Role::findById($role))))
-                        ->dehydrated()
-                        ->label(trans('admin/user.admin_roles'))
-                        ->columnSpanFull()
-                        ->bulkToggleable(false),
-                    CheckboxList::make('root_admin_role')
-                        ->visible(fn (?User $user) => $user && $user->isRootAdmin())
-                        ->disabled()
-                        ->options([
-                            'root_admin' => Role::ROOT_ADMIN,
-                        ])
-                        ->descriptions([
-                            'root_admin' => trans('admin/role.root_admin', ['role' => Role::ROOT_ADMIN]),
-                        ])
-                        ->formatStateUsing(fn () => ['root_admin'])
-                        ->dehydrated(false)
-                        ->label(trans('admin/user.admin_roles'))
-                        ->columnSpanFull(),
-                ]),
-            Tab::make('keys')
-                ->visible(fn (?User $user) => $user)
-                ->label(trans('profile.tabs.keys'))
-                ->icon(TablerIcon::Key)
-                ->schema([
-                    Section::make(trans('profile.api_keys'))
-                        ->columnSpan(2)
-                        ->schema([
-                            Repeater::make('api_keys')
-                                ->hiddenLabel()
-                                ->inlineLabel(false)
-                                ->relationship('apiKeys')
-                                ->addable(false)
-                                ->itemLabel(fn ($state) => $state['identifier'])
-                                ->deleteAction(function (Action $action) {
-                                    $action->requiresConfirmation()->action(function (array $arguments, Repeater $component, ?User $user) {
-                                        $items = $component->getState();
-                                        $key = $items[$arguments['item']] ?? null;
-
-                                        if ($key) {
-                                            $apiKey = ApiKey::find($key['id']);
-                                            if ($apiKey?->exists()) {
-                                                $apiKey->delete();
-
-                                                Activity::event('user:api-key.delete')
-                                                    ->actor(user())
-                                                    ->subject($user)
-                                                    ->subject($apiKey)
-                                                    ->property('identifier', $apiKey->identifier)
-                                                    ->log();
+                                        $actions = [];
+                                        foreach ($user->oauth ?? [] as $schema => $_) {
+                                            $schema = $oauthService->get($schema);
+                                            if (!$schema) {
+                                                return;
                                             }
 
-                                            unset($items[$arguments['item']]);
-                                            $component->state($items);
-                                            $component->callAfterStateUpdated();
-                                        }
-                                    });
-                                })
-                                ->schema([
-                                    TextEntry::make('memo')
-                                        ->hiddenLabel()
-                                        ->state(fn (ApiKey $key) => $key->memo),
-                                ])
-                                ->visible(fn (User $user) => $user->apiKeys()->exists()),
+                                            $id = $schema->getId();
+                                            $name = $schema->getName();
 
-                            TextEntry::make('no_api_keys')
-                                ->state(trans('profile.no_api_keys'))
-                                ->hiddenLabel()
-                                ->visible(fn (User $user) => !$user->apiKeys()->exists()),
-                        ]),
-                    Section::make(trans('profile.ssh_keys'))->columnSpan(2)
-                        ->schema([
-                            Repeater::make('ssh_keys')
-                                ->hiddenLabel()
-                                ->inlineLabel(false)
-                                ->relationship('sshKeys')
-                                ->addable(false)
-                                ->itemLabel(fn ($state) => $state['name'])
-                                ->deleteAction(function (Action $action) {
-                                    $action->requiresConfirmation()->action(function (array $arguments, Repeater $component, User $user) {
-                                        $items = $component->getState();
-                                        $key = $items[$arguments['item']];
+                                            $color = $schema->getHexColor();
+                                            $color = is_string($color) ? Color::hex($color) : null;
 
-                                        $sshKey = UserSSHKey::find($key['id'] ?? null);
-                                        if ($sshKey->exists()) {
-                                            $sshKey->delete();
-
-                                            Activity::event('user:ssh-key.delete')
-                                                ->actor(user())
-                                                ->subject($user)
-                                                ->subject($sshKey)
-                                                ->property('fingerprint', $sshKey->fingerprint)
-                                                ->log();
+                                            $actions[] = Action::make("oauth_$id")
+                                                ->label(trans('profile.unlink', ['name' => $name]))
+                                                ->icon('tabler-unlink')
+                                                ->requiresConfirmation()
+                                                ->color($color)
+                                                ->action(function ($livewire) use ($oauthService, $user, $name, $schema) {
+                                                    $oauthService->unlinkUser($user, $schema);
+                                                    $livewire->form->fill($user->attributesToArray());
+                                                    Notification::make()
+                                                        ->title(trans('profile.unlinked', ['name' => $name]))
+                                                        ->success()
+                                                        ->send();
+                                                });
                                         }
 
-                                        unset($items[$arguments['item']]);
+                                        if (!$actions) {
+                                            return [
+                                                TextEntry::make('no_oauth')
+                                                    ->state(trans('profile.no_oauth'))
+                                                    ->hiddenLabel(),
+                                            ];
+                                        }
 
-                                        $component->state($items);
+                                        return [Actions::make($actions)];
+                                    }),
+                            ]),
+                        Tab::make('roles')
+                            ->label(trans('admin/user.roles'))
+                            ->icon('tabler-users-group')
+                            ->components([
+                                CheckboxList::make('roles')
+                                    ->hidden(fn (?User $user) => $user && $user->isRootAdmin())
+                                    ->relationship('roles', 'name', fn (Builder $query) => $query->whereNot('id', Role::getRootAdmin()->id))
+                                    ->saveRelationshipsUsing(fn (User $user, array $state) => $user->syncRoles(collect($state)->map(fn ($role) => Role::findById($role))))
+                                    ->dehydrated()
+                                    ->label(trans('admin/user.admin_roles'))
+                                    ->columnSpanFull()
+                                    ->bulkToggleable(false),
+                                CheckboxList::make('root_admin_role')
+                                    ->visible(fn (?User $user) => $user && $user->isRootAdmin())
+                                    ->disabled()
+                                    ->options([
+                                        'root_admin' => Role::ROOT_ADMIN,
+                                    ])
+                                    ->descriptions([
+                                        'root_admin' => trans('admin/role.root_admin', ['role' => Role::ROOT_ADMIN]),
+                                    ])
+                                    ->formatStateUsing(fn () => ['root_admin'])
+                                    ->dehydrated(false)
+                                    ->label(trans('admin/user.admin_roles'))
+                                    ->columnSpanFull(),
+                            ]),
+                        Tab::make('keys')
+                            ->visible(fn (?User $user) => $user)
+                            ->label(trans('profile.tabs.keys'))
+                            ->icon('tabler-key')
+                            ->schema([
+                                Section::make(trans('profile.api_keys'))
+                                    ->columnSpan(2)
+                                    ->schema([
+                                        Repeater::make('api_keys')
+                                            ->hiddenLabel()
+                                            ->inlineLabel(false)
+                                            ->relationship('apiKeys')
+                                            ->addable(false)
+                                            ->itemLabel(fn ($state) => $state['identifier'])
+                                            ->deleteAction(function (Action $action) {
+                                                $action->requiresConfirmation()->action(function (array $arguments, Repeater $component, ?User $user) {
+                                                    $items = $component->getState();
+                                                    $key = $items[$arguments['item']] ?? null;
 
-                                        $component->callAfterStateUpdated();
-                                    });
-                                })
-                                ->schema(fn () => [
-                                    TextEntry::make('fingerprint')
-                                        ->hiddenLabel()
-                                        ->state(fn (UserSSHKey $key) => "SHA256:{$key->fingerprint}"),
-                                ])
-                                ->visible(fn (User $user) => $user->sshKeys()->exists()),
+                                                    if ($key) {
+                                                        $apiKey = ApiKey::find($key['id']);
+                                                        if ($apiKey?->exists()) {
+                                                            $apiKey->delete();
 
-                            TextEntry::make('no_ssh_keys')
-                                ->state(trans('profile.no_ssh_keys'))
-                                ->hiddenLabel()
-                                ->visible(fn (User $user) => !$user->sshKeys()->exists()),
-                        ]),
-                ]),
-            Tab::make('activity')
-                ->visible(fn (?User $user) => $user)
-                ->disabledOn('create')
-                ->label(trans('profile.tabs.activity'))
-                ->icon(TablerIcon::History)
-                ->schema([
-                    Repeater::make('activity')
-                        ->hiddenLabel()
-                        ->inlineLabel(false)
-                        ->deletable(false)
-                        ->addable(false)
-                        ->relationship(null, function (Builder $query) {
-                            $query->orderBy('timestamp', 'desc');
-                        })
-                        ->schema([
-                            TextEntry::make('log')
-                                ->hiddenLabel()
-                                ->state(fn (ActivityLog $log) => new HtmlString($log->htmlable())),
-                        ]),
-                ]),
-        ];
+                                                            Activity::event('user:api-key.delete')
+                                                                ->actor(user())
+                                                                ->subject($user)
+                                                                ->subject($apiKey)
+                                                                ->property('identifier', $apiKey->identifier)
+                                                                ->log();
+                                                        }
+
+                                                        unset($items[$arguments['item']]);
+                                                        $component->state($items);
+                                                        $component->callAfterStateUpdated();
+                                                    }
+                                                });
+                                            })
+                                            ->schema([
+                                                TextEntry::make('memo')
+                                                    ->hiddenLabel()
+                                                    ->state(fn (ApiKey $key) => $key->memo),
+                                            ])
+                                            ->visible(fn (User $user) => $user->apiKeys()->exists()),
+
+                                        TextEntry::make('no_api_keys')
+                                            ->state(trans('profile.no_api_keys'))
+                                            ->hiddenLabel()
+                                            ->visible(fn (User $user) => !$user->apiKeys()->exists()),
+                                    ]),
+                                Section::make(trans('profile.ssh_keys'))->columnSpan(2)
+                                    ->schema([
+                                        Repeater::make('ssh_keys')
+                                            ->hiddenLabel()
+                                            ->inlineLabel(false)
+                                            ->relationship('sshKeys')
+                                            ->addable(false)
+                                            ->itemLabel(fn ($state) => $state['name'])
+                                            ->deleteAction(function (Action $action) {
+                                                $action->requiresConfirmation()->action(function (array $arguments, Repeater $component, User $user) {
+                                                    $items = $component->getState();
+                                                    $key = $items[$arguments['item']];
+
+                                                    $sshKey = UserSSHKey::find($key['id'] ?? null);
+                                                    if ($sshKey->exists()) {
+                                                        $sshKey->delete();
+
+                                                        Activity::event('user:ssh-key.delete')
+                                                            ->actor(user())
+                                                            ->subject($user)
+                                                            ->subject($sshKey)
+                                                            ->property('fingerprint', $sshKey->fingerprint)
+                                                            ->log();
+                                                    }
+
+                                                    unset($items[$arguments['item']]);
+
+                                                    $component->state($items);
+
+                                                    $component->callAfterStateUpdated();
+                                                });
+                                            })
+                                            ->schema(fn () => [
+                                                TextEntry::make('fingerprint')
+                                                    ->hiddenLabel()
+                                                    ->state(fn (UserSSHKey $key) => "SHA256:{$key->fingerprint}"),
+                                            ])
+                                            ->visible(fn (User $user) => $user->sshKeys()->exists()),
+
+                                        TextEntry::make('no_ssh_keys')
+                                            ->state(trans('profile.no_ssh_keys'))
+                                            ->hiddenLabel()
+                                            ->visible(fn (User $user) => !$user->sshKeys()->exists()),
+                                    ]),
+                            ]),
+                        Tab::make('activity')
+                            ->visible(fn (?User $user) => $user)
+                            ->disabledOn('create')
+                            ->label(trans('profile.tabs.activity'))
+                            ->icon('tabler-history')
+                            ->schema([
+                                Repeater::make('activity')
+                                    ->hiddenLabel()
+                                    ->inlineLabel(false)
+                                    ->deletable(false)
+                                    ->addable(false)
+                                    ->relationship(null, function (Builder $query) {
+                                        $query->orderBy('timestamp', 'desc');
+                                    })
+                                    ->schema([
+                                        TextEntry::make('log')
+                                            ->hiddenLabel()
+                                            ->state(fn (ActivityLog $log) => new HtmlString($log->htmlable())),
+                                    ]),
+                            ]),
+                    ])->columnSpanFull(),
+            ]);
     }
 
     /** @return class-string<RelationManager>[] */

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

@@ -2,7 +2,6 @@
 
 namespace App\Filament\Admin\Resources\Webhooks\Pages;
 
-use App\Enums\TablerIcon;
 use App\Enums\WebhookType;
 use App\Filament\Admin\Resources\Webhooks\WebhookResource;
 use App\Traits\Filament\CanCustomizeHeaderActions;
@@ -10,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
 {
@@ -25,15 +25,11 @@ class CreateWebhookConfiguration extends CreateRecord
     {
         return [
             $this->getCancelFormAction()->formId('form')
-                ->hiddenLabel()
-                ->tooltip(trans('filament-panels::resources/pages/create-record.form.actions.cancel.label'))
-                ->icon(TablerIcon::ArrowLeft),
-            Action::make('create')
-                ->hiddenLabel()
-                ->action('create')
-                ->keyBindings(['mod+s'])
-                ->tooltip(trans('filament-panels::resources/pages/create-record.form.actions.create.label'))
-                ->icon(TablerIcon::Plus),
+                ->iconButton()->iconSize(IconSize::ExtraLarge)
+                ->icon('tabler-arrow-left'),
+            $this->getCreateFormAction()->formId('form')
+                ->iconButton()->iconSize(IconSize::ExtraLarge)
+                ->icon('tabler-file-plus'),
         ];
     }
 

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

@@ -2,7 +2,6 @@
 
 namespace App\Filament\Admin\Resources\Webhooks\Pages;
 
-use App\Enums\TablerIcon;
 use App\Enums\WebhookType;
 use App\Filament\Admin\Resources\Webhooks\WebhookResource;
 use App\Models\WebhookConfiguration;
@@ -12,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
 {
@@ -24,19 +24,17 @@ class EditWebhookConfiguration extends EditRecord
     protected function getDefaultHeaderActions(): array
     {
         return [
-            DeleteAction::make(),
+            DeleteAction::make()
+                ->iconButton()->iconSize(IconSize::ExtraLarge),
             Action::make('test_now')
-                ->tooltip(trans('admin/webhook.test_now'))
+                ->label(trans('admin/webhook.test_now'))
                 ->color('primary')
                 ->disabled(fn (WebhookConfiguration $webhookConfiguration) => count($webhookConfiguration->events) === 0)
                 ->action(fn (WebhookConfiguration $webhookConfiguration) => $webhookConfiguration->run())
-                ->icon(TablerIcon::TestPipe),
-            Action::make('save')
-                ->hiddenLabel()
-                ->action('save')
-                ->keyBindings(['mod+s'])
-                ->tooltip(trans('filament-panels::resources/pages/edit-record.form.actions.save.label'))
-                ->icon(TablerIcon::DeviceFloppy),
+                ->tooltip(trans('admin/webhook.test_now_help')),
+            $this->getSaveFormAction()->formId('form')
+                ->iconButton()->iconSize(IconSize::ExtraLarge)
+                ->icon('tabler-device-floppy'),
         ];
     }
 

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

@@ -5,7 +5,11 @@ namespace App\Filament\Admin\Resources\Webhooks\Pages;
 use App\Filament\Admin\Resources\Webhooks\WebhookResource;
 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
 {
@@ -13,4 +17,14 @@ class ListWebhookConfigurations extends ListRecords
     use CanCustomizeHeaderWidgets;
 
     protected static string $resource = WebhookResource::class;
+
+    /** @return array<Action|ActionGroup> */
+    protected function getDefaultHeaderActions(): array
+    {
+        return [
+            CreateAction::make()
+                ->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

@@ -2,7 +2,6 @@
 
 namespace App\Filament\Admin\Resources\Webhooks;
 
-use App\Enums\TablerIcon;
 use App\Enums\WebhookType;
 use App\Filament\Admin\Resources\Webhooks\Pages\CreateWebhookConfiguration;
 use App\Filament\Admin\Resources\Webhooks\Pages\EditWebhookConfiguration;
@@ -14,11 +13,8 @@ use App\Traits\Filament\CanCustomizePages;
 use App\Traits\Filament\CanCustomizeRelations;
 use App\Traits\Filament\CanModifyForm;
 use App\Traits\Filament\CanModifyTable;
-use BackedEnum;
 use Exception;
 use Filament\Actions\Action;
-use Filament\Actions\BulkActionGroup;
-use Filament\Actions\CreateAction;
 use Filament\Actions\DeleteBulkAction;
 use Filament\Actions\EditAction;
 use Filament\Actions\ReplicateAction;
@@ -55,7 +51,7 @@ class WebhookResource extends Resource
 
     protected static ?string $model = WebhookConfiguration::class;
 
-    protected static string|BackedEnum|null $navigationIcon = TablerIcon::Webhook;
+    protected static string|\BackedEnum|null $navigationIcon = 'tabler-webhook';
 
     protected static ?string $recordTitleAttribute = 'description';
 
@@ -111,13 +107,10 @@ class WebhookResource extends Resource
                     ->beforeReplicaSaved(fn (WebhookConfiguration $replica) => $replica->description .= ' Copy ' . now()->format('Y-m-d H:i:s'))
                     ->successRedirectUrl(fn (WebhookConfiguration $replica) => EditWebhookConfiguration::getUrl(['record' => $replica])),
             ])
-            ->toolbarActions([
-                CreateAction::make(),
-                BulkActionGroup::make([
-                    DeleteBulkAction::make(),
-                ]),
+            ->groupedBulkActions([
+                DeleteBulkAction::make(),
             ])
-            ->emptyStateIcon(TablerIcon::Webhook)
+            ->emptyStateIcon('tabler-webhook')
             ->emptyStateDescription('')
             ->emptyStateHeading(trans('admin/webhook.no_webhooks'))
             ->persistFiltersInSession()
@@ -150,9 +143,9 @@ class WebhookResource extends Resource
                     ->schema(fn () => self::getRegularFields())
                     ->headerActions([
                         Action::make('reset_headers')
-                            ->tooltip(trans('admin/webhook.reset_headers'))
+                            ->label(trans('admin/webhook.reset_headers'))
                             ->color('danger')
-                            ->icon(TablerIcon::Restore)
+                            ->icon('heroicon-o-trash')
                             ->action(fn (Get $get, Set $set) => $set('headers', [
                                 'X-Webhook-Event' => '{{event}}',
                             ])),
@@ -337,7 +330,7 @@ class WebhookResource extends Resource
         AlertBanner::make('discord_webhook_help')
             ->title(trans('admin/webhook.help'))
             ->body(trans('admin/webhook.help_text'))
-            ->icon(TablerIcon::QuestionMark)
+            ->icon('tabler-question-mark')
             ->info()
             ->send();
     }

app/Filament/Admin/Widgets/CanaryWidget.php

@@ -2,7 +2,6 @@
 
 namespace App\Filament\Admin\Widgets;
 
-use App\Enums\TablerIcon;
 use Exception;
 use Filament\Actions\Action;
 use Filament\Infolists\Components\TextEntry;
@@ -26,7 +25,7 @@ class CanaryWidget extends FormWidget
         return $schema
             ->components([
                 Section::make(trans('admin/dashboard.sections.intro-developers.heading'))
-                    ->icon(TablerIcon::Code)
+                    ->icon('tabler-code')
                     ->iconColor('primary')
                     ->collapsible()
                     ->collapsed()
@@ -40,9 +39,9 @@ class CanaryWidget extends FormWidget
                             ->state(trans('admin/dashboard.sections.intro-developers.extra_note')),
                     ])
                     ->headerActions([
-                        Action::make('db_issues')
+                        Action::make('issues')
                             ->label(trans('admin/dashboard.sections.intro-developers.button_issues'))
-                            ->icon(TablerIcon::BrandGithub)
+                            ->icon('tabler-brand-github')
                             ->url('https://github.com/pelican-dev/panel/issues', true),
                     ]),
             ]);

app/Filament/Admin/Widgets/HelpWidget.php

@@ -2,7 +2,6 @@
 
 namespace App\Filament\Admin\Widgets;
 
-use App\Enums\TablerIcon;
 use Exception;
 use Filament\Actions\Action;
 use Filament\Infolists\Components\TextEntry;
@@ -21,7 +20,7 @@ class HelpWidget extends FormWidget
         return $schema
             ->components([
                 Section::make(trans('admin/dashboard.sections.intro-help.heading'))
-                    ->icon(TablerIcon::QuestionMark)
+                    ->icon('tabler-question-mark')
                     ->iconColor('info')
                     ->collapsible()
                     ->persistCollapsed()
@@ -31,9 +30,9 @@ class HelpWidget extends FormWidget
                             ->state(trans('admin/dashboard.sections.intro-help.content')),
                     ])
                     ->headerActions([
-                        Action::make('db_docs')
+                        Action::make('docs')
                             ->label(trans('admin/dashboard.sections.intro-help.button_docs'))
-                            ->icon(TablerIcon::Speedboat)
+                            ->icon('tabler-speedboat')
                             ->url('https://pelican.dev/docs', true),
                     ]),
             ]);

app/Filament/Admin/Widgets/NoNodesWidget.php

@@ -2,7 +2,6 @@
 
 namespace App\Filament\Admin\Widgets;
 
-use App\Enums\TablerIcon;
 use App\Filament\Admin\Resources\Nodes\Pages\CreateNode;
 use App\Models\Node;
 use Exception;
@@ -28,7 +27,7 @@ class NoNodesWidget extends FormWidget
         return $schema
             ->components([
                 Section::make(trans('admin/dashboard.sections.intro-first-node.heading'))
-                    ->icon(TablerIcon::Server2)
+                    ->icon('tabler-server-2')
                     ->iconColor('primary')
                     ->collapsible()
                     ->persistCollapsed()
@@ -38,9 +37,9 @@ class NoNodesWidget extends FormWidget
                             ->state(trans('admin/dashboard.sections.intro-first-node.content')),
                     ])
                     ->headerActions([
-                        Action::make('db_create-node')
+                        Action::make('create-node')
                             ->label(trans('admin/dashboard.sections.intro-first-node.button_label'))
-                            ->icon(TablerIcon::Server2)
+                            ->icon('tabler-server-2')
                             ->url(CreateNode::getUrl()),
                     ]),
             ]);

app/Filament/Admin/Widgets/SupportWidget.php

@@ -2,7 +2,6 @@
 
 namespace App\Filament\Admin\Widgets;
 
-use App\Enums\TablerIcon;
 use Exception;
 use Filament\Actions\Action;
 use Filament\Infolists\Components\TextEntry;
@@ -21,7 +20,7 @@ class SupportWidget extends FormWidget
         return $schema
             ->components([
                 Section::make(trans('admin/dashboard.sections.intro-support.heading'))
-                    ->icon(TablerIcon::HeartFilled)
+                    ->icon('tabler-heart-filled')
                     ->iconColor('danger')
                     ->collapsible()
                     ->persistCollapsed()
@@ -34,9 +33,9 @@ class SupportWidget extends FormWidget
                             ->state(trans('admin/dashboard.sections.intro-support.extra_note')),
                     ])
                     ->headerActions([
-                        Action::make('db_donate')
+                        Action::make('donate')
                             ->label(trans('admin/dashboard.sections.intro-support.button_donate'))
-                            ->icon(TablerIcon::Cash)
+                            ->icon('tabler-cash')
                             ->url('https://pelican.dev/donate', true)
                             ->color('success'),
                     ]),

app/Filament/Admin/Widgets/UpdateWidget.php

@@ -2,7 +2,6 @@
 
 namespace App\Filament\Admin\Widgets;
 
-use App\Enums\TablerIcon;
 use App\Services\Helpers\SoftwareVersionService;
 use Exception;
 use Filament\Actions\Action;
@@ -32,7 +31,7 @@ class UpdateWidget extends FormWidget
             ->components([
                 $isLatest
                 ? Section::make(trans('admin/dashboard.sections.intro-no-update.heading'))
-                    ->icon(TablerIcon::Checkbox)
+                    ->icon('tabler-checkbox')
                     ->iconColor('success')
                     ->schema([
                         TextEntry::make('info')
@@ -40,14 +39,14 @@ class UpdateWidget extends FormWidget
                             ->state(trans('admin/dashboard.sections.intro-no-update.content', ['version' => $this->softwareVersionService->currentPanelVersion()])),
                     ])
                 : Section::make(trans('admin/dashboard.sections.intro-update-available.heading'))
-                    ->icon(TablerIcon::InfoCircle)
+                    ->icon('tabler-info-circle')
                     ->iconColor('warning')
                     ->schema([
                         TextEntry::make('info')
                             ->hiddenLabel()
                             ->state(trans('admin/dashboard.sections.intro-update-available.content', ['latestVersion' => $this->softwareVersionService->latestPanelVersion()])),
                         Section::make(trans('admin/dashboard.sections.intro-update-available.button_changelog'))
-                            ->icon(TablerIcon::Script)
+                            ->icon('tabler-script')
                             ->collapsible()
                             ->collapsed()
                             ->schema([
@@ -58,9 +57,9 @@ class UpdateWidget extends FormWidget
                             ]),
                     ])
                     ->headerActions([
-                        Action::make('db_update')
+                        Action::make('update')
                             ->label(trans('admin/dashboard.sections.intro-update-available.heading'))
-                            ->icon(TablerIcon::ClipboardText)
+                            ->icon('tabler-clipboard-text')
                             ->url('https://pelican.dev/docs/panel/update', true)
                             ->color('warning'),
                     ]),

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

@@ -5,7 +5,6 @@ namespace App\Filament\App\Resources\Servers\Pages;
 use App\Enums\CustomizationKey;
 use App\Enums\ServerResourceType;
 use App\Enums\SubuserPermission;
-use App\Enums\TablerIcon;
 use App\Filament\App\Resources\Servers\ServerResource;
 use App\Filament\Components\Tables\Columns\ProgressBarColumn;
 use App\Filament\Components\Tables\Columns\ServerEntryColumn;
@@ -128,7 +127,7 @@ class ListServers extends ListRecords
             ->recordActions(!$usingGrid ? static::getPowerActionGroup() : [])
             ->recordActionsAlignment(Alignment::Center->value)
             ->contentGrid($usingGrid ? ['default' => 1, 'md' => 2] : null)
-            ->emptyStateIcon(TablerIcon::BrandDocker)
+            ->emptyStateIcon('tabler-brand-docker')
             ->emptyStateDescription('')
             ->emptyStateHeading(fn () => $this->activeTab === 'my' ? 'You don\'t own any servers!' : 'You don\'t have access to any servers!')
             ->persistFiltersInSession()
@@ -244,34 +243,34 @@ class ListServers extends ListRecords
             Action::make('start')
                 ->label(trans('server/console.power_actions.start'))
                 ->color('primary')
-                ->icon(TablerIcon::PlayerPlayFilled)
+                ->icon('tabler-player-play-filled')
                 ->authorize(fn (Server $server) => user()?->can(SubuserPermission::ControlStart, $server))
                 ->visible(fn (Server $server) => $server->retrieveStatus()->isStartable())
                 ->dispatch('powerAction', fn (Server $server) => ['server' => $server, 'action' => 'start']),
             Action::make('restart')
                 ->label(trans('server/console.power_actions.restart'))
                 ->color('gray')
-                ->icon(TablerIcon::Reload)
+                ->icon('tabler-reload')
                 ->authorize(fn (Server $server) => user()?->can(SubuserPermission::ControlRestart, $server))
                 ->visible(fn (Server $server) => $server->retrieveStatus()->isRestartable())
                 ->dispatch('powerAction', fn (Server $server) => ['server' => $server, 'action' => 'restart']),
             Action::make('stop')
                 ->label(trans('server/console.power_actions.stop'))
                 ->color('danger')
-                ->icon(TablerIcon::PlayerStopFilled)
+                ->icon('tabler-player-stop-filled')
                 ->authorize(fn (Server $server) => user()?->can(SubuserPermission::ControlStop, $server))
                 ->visible(fn (Server $server) => $server->retrieveStatus()->isStoppable() && !$server->retrieveStatus()->isKillable())
                 ->dispatch('powerAction', fn (Server $server) => ['server' => $server, 'action' => 'stop']),
             Action::make('kill')
                 ->label(trans('server/console.power_actions.kill'))
                 ->color('danger')
-                ->icon(TablerIcon::AlertSquare)
+                ->icon('tabler-alert-square')
                 ->tooltip(trans('server/console.power_actions.kill_tooltip'))
                 ->authorize(fn (Server $server) => user()?->can(SubuserPermission::ControlStop, $server))
                 ->visible(fn (Server $server) => $server->retrieveStatus()->isKillable())
                 ->dispatch('powerAction', fn (Server $server) => ['server' => $server, 'action' => 'kill']),
         ])
-            ->icon(TablerIcon::Power)
+            ->icon('tabler-power')
             ->color('primary')
             ->tooltip(trans('server/dashboard.power_actions'))
             ->hidden(fn (Server $server) => $server->isInConflictState())

app/Filament/App/Resources/Servers/ServerResource.php

@@ -2,17 +2,15 @@
 
 namespace App\Filament\App\Resources\Servers;
 
-use App\Enums\TablerIcon;
 use App\Filament\App\Resources\Servers\Pages\ListServers;
 use App\Models\Server;
-use BackedEnum;
 use Filament\Resources\Resource;
 
 class ServerResource extends Resource
 {
     protected static ?string $model = Server::class;
 
-    protected static string|BackedEnum|null $navigationIcon = TablerIcon::BrandDocker;
+    protected static string|\BackedEnum|null $navigationIcon = 'tabler-brand-docker';
 
     protected static ?string $slug = '/';
 

app/Filament/Components/Actions/DeleteServerIcon.php

@@ -2,10 +2,10 @@
 
 namespace App\Filament\Components\Actions;
 
-use App\Enums\TablerIcon;
 use App\Models\Server;
 use Filament\Actions\Action;
 use Filament\Notifications\Notification;
+use Filament\Support\Enums\IconSize;
 use Illuminate\Support\Facades\Storage;
 
 class DeleteServerIcon extends Action
@@ -23,9 +23,11 @@ class DeleteServerIcon extends Action
 
         $this->hiddenLabel();
 
-        $this->tooltip(trans('admin/server.import_image'));
+        $this->icon('tabler-trash');
 
-        $this->icon(TablerIcon::Trash);
+        $this->iconButton();
+
+        $this->iconSize(IconSize::Large);
 
         $this->color('danger');
 

app/Filament/Components/Actions/ExportEggAction.php

@@ -3,11 +3,11 @@
 namespace App\Filament\Components\Actions;
 
 use App\Enums\EggFormat;
-use App\Enums\TablerIcon;
 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
 {
@@ -20,11 +20,15 @@ class ExportEggAction extends Action
     {
         parent::setUp();
 
-        $this->tooltip(trans('filament-actions::export.modal.actions.export.label'));
+        $this->label(trans('filament-actions::export.modal.actions.export.label'));
 
-        $this->icon(TablerIcon::Download);
+        $this->iconButton();
 
-        $this->tableIcon(TablerIcon::Download);
+        $this->icon('tabler-download');
+
+        $this->tableIcon('tabler-download');
+
+        $this->iconSize(IconSize::ExtraLarge);
 
         $this->authorize(fn () => user()?->can('export egg'));
 
@@ -41,11 +45,11 @@ class ExportEggAction extends Action
         $this->modalFooterActionsAlignment(Alignment::Center);
 
         $this->modalFooterActions([
-            Action::make('exclude_json')
+            Action::make('json')
                 ->label(trans('admin/egg.export.as', ['format' => 'json']))
                 ->url(fn (Egg $egg) => route('api.application.eggs.eggs.export', ['egg' => $egg, 'format' => EggFormat::JSON->value]), true)
                 ->close(),
-            Action::make('exclude_yaml')
+            Action::make('yaml')
                 ->label(trans('admin/egg.export.as', ['format' => 'yaml']))
                 ->url(fn (Egg $egg) => route('api.application.eggs.eggs.export', ['egg' => $egg, 'format' => EggFormat::YAML->value]), true)
                 ->close(),

app/Filament/Components/Actions/ExportScheduleAction.php

@@ -3,12 +3,12 @@
 namespace App\Filament\Components\Actions;
 
 use App\Enums\SubuserPermission;
-use App\Enums\TablerIcon;
 use App\Models\Schedule;
 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
 {
@@ -23,7 +23,11 @@ class ExportScheduleAction extends Action
 
         $this->hiddenLabel();
 
-        $this->icon(TablerIcon::Download);
+        $this->iconButton();
+
+        $this->iconSize(IconSize::ExtraLarge);
+
+        $this->icon('tabler-download');
 
         $this->tooltip(trans('server/schedule.export'));
 

app/Filament/Components/Actions/ImportEggAction.php

@@ -3,24 +3,24 @@
 namespace App\Filament\Components\Actions;
 
 use App\Console\Commands\Egg\UpdateEggIndexCommand;
-use App\Enums\TablerIcon;
-use App\Jobs\InstallEgg;
 use App\Models\Egg;
 use App\Services\Eggs\Sharing\EggImporterService;
 use Closure;
 use Exception;
 use Filament\Actions\Action;
-use Filament\Forms\Components\CheckboxList;
 use Filament\Forms\Components\FileUpload;
 use Filament\Forms\Components\Repeater;
+use Filament\Forms\Components\Select;
 use Filament\Forms\Components\TextInput;
-use Filament\Infolists\Components\TextEntry;
 use Filament\Notifications\Notification;
 use Filament\Schemas\Components\Tabs;
 use Filament\Schemas\Components\Tabs\Tab;
-use Filament\Support\Enums\Width;
+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;
 use Livewire\Features\SupportFileUploads\TemporaryUploadedFile;
 
 class ImportEggAction extends Action
@@ -34,37 +34,18 @@ class ImportEggAction extends Action
     {
         parent::setUp();
 
-        $this->tooltip(trans('filament-actions::import.modal.actions.import.label'));
+        $this->label(trans('filament-actions::import.modal.actions.import.label'));
 
-        $this->hiddenLabel();
+        $this->iconButton();
 
-        $this->icon(TablerIcon::FileImport);
+        $this->icon('tabler-file-import');
 
-        $this->modalWidth(Width::ScreenExtraLarge);
+        $this->iconSize(IconSize::ExtraLarge);
 
         $this->authorize(fn () => user()?->can('import egg'));
 
         $this->action(function (array $data, EggImporterService $eggImportService): void {
-
-            $gitHubEggs = array_get($this->data, 'eggs', []);
             $eggs = array_merge(collect($data['urls'])->flatten()->whereNotNull()->unique()->all(), Arr::wrap($data['files']));
-
-            if ($gitHubEggs) {
-                foreach ($gitHubEggs as $category => $sortedEggs) {
-                    foreach ($sortedEggs as $downloadUrl) {
-                        InstallEgg::dispatch($downloadUrl);
-                    }
-                }
-
-                Notification::make()
-                    ->title(trans('installer.egg.background_install_started'))
-                    ->body(trans('installer.egg.background_install_description', ['count' => array_sum(array_map('count', $gitHubEggs))]))
-                    ->success()
-                    ->persistent()
-                    ->send();
-
-            }
-
             if (empty($eggs)) {
                 return;
             }
@@ -108,20 +89,18 @@ class ImportEggAction extends Action
                 }
             }
 
-            $bodyParts = collect([
-                $success->isNotEmpty() ? trans('admin/egg.import.imported_eggs', ['eggs' => $success->join(', ')]) : null,
-                $failed->isNotEmpty() ? trans('admin/egg.import.failed_import_eggs', ['eggs' => $failed->join(', ')]) : null,
-            ])->filter();
-
-            if ($bodyParts->isNotEmpty()) {
+            if ($failed->count() > 0) {
                 Notification::make()
-                    ->title(trans('admin/egg.import.import_result', [
-                        'success' => $success->count(),
-                        'failed' => $failed->count(),
-                        'total' => $success->count() + $failed->count(),
-                    ]))
-                    ->body($bodyParts->join(' | '))
-                    ->status($failed->isEmpty() ? 'success' : ($success->isEmpty() ? 'danger' : 'warning'))
+                    ->title(trans('admin/egg.import.import_failed'))
+                    ->body($failed->join(', '))
+                    ->danger()
+                    ->send();
+            }
+            if ($success->count() > 0) {
+                Notification::make()
+                    ->title(trans('admin/egg.import.import_success'))
+                    ->body($success->join(', '))
+                    ->success()
                     ->send();
             }
         });
@@ -134,10 +113,9 @@ class ImportEggAction extends Action
             Tabs::make('Tabs')
                 ->contained(false)
                 ->tabs([
-                    $this->importEggsFromGitHub(),
                     Tab::make('file')
                         ->label(trans('admin/egg.import.file'))
-                        ->icon(TablerIcon::FileUpload)
+                        ->icon('tabler-file-upload')
                         ->schema([
                             FileUpload::make('files')
                                 ->label(trans('admin/egg.model_label'))
@@ -150,8 +128,32 @@ class ImportEggAction extends Action
                         ]),
                     Tab::make('url')
                         ->label(trans('admin/egg.import.url'))
-                        ->icon(TablerIcon::WorldUpload)
+                        ->icon('tabler-world-upload')
                         ->schema([
+                            Select::make('github')
+                                ->label(trans('admin/egg.import.github'))
+                                ->options(fn () => cache('eggs.index'))
+                                ->selectablePlaceholder(false)
+                                ->searchable()
+                                ->preload()
+                                ->live()
+                                ->hintAction(
+                                    Action::make('refresh')
+                                        ->iconButton()
+                                        ->icon('tabler-refresh')
+                                        ->tooltip(trans('admin/egg.import.refresh'))
+                                        ->action(function () {
+                                            Artisan::call(UpdateEggIndexCommand::class);
+                                        })
+                                )
+                                ->afterStateUpdated(function ($state, Set $set, Get $get) use ($isMultiple) {
+                                    if ($state) {
+                                        $urls = $isMultiple ? $get('urls') : [];
+                                        $urls[Str::uuid()->toString()] = ['url' => $state];
+                                        $set('urls', $urls);
+                                        $set('github', null);
+                                    }
+                                }),
                             Repeater::make('urls')
                                 ->hiddenLabel()
                                 ->itemLabel(fn (array $state) => str($state['url'])->afterLast('/egg-')->beforeLast('.')->headline())
@@ -177,49 +179,4 @@ class ImportEggAction extends Action
 
         return $this;
     }
-
-    public function importEggsFromGitHub(): Tab
-    {
-        if (!cache()->get('eggs.index')) {
-            Artisan::call(UpdateEggIndexCommand::class);
-        }
-
-        $eggs = cache()->get('eggs.index', []);
-        $categories = array_keys($eggs);
-        $tabs = array_map(function (string $label) use ($eggs) {
-            $id = str_slug($label, '_');
-            $eggCount = count($eggs[$label]);
-
-            return Tab::make($id)
-                ->label($label)
-                ->badge($eggCount)
-                ->schema([
-                    CheckboxList::make("eggs.$id")
-                        ->hiddenLabel()
-                        ->options(fn () => array_sort($eggs[$label]))
-                        ->searchable($eggCount > 0)
-                        ->bulkToggleable($eggCount > 0)
-                        ->columns(4),
-                ]);
-        }, $categories);
-
-        if (empty($tabs)) {
-            $tabs[] = Tab::make('no_eggs')
-                ->label(trans('installer.egg.no_eggs'))
-                ->schema([
-                    TextEntry::make('no_eggs')
-                        ->hiddenLabel()
-                        ->state(trans('installer.egg.exceptions.no_eggs')),
-                ]);
-        }
-
-        return Tab::make('github')
-            ->label(trans('admin/egg.import.github'))
-            ->icon(TablerIcon::BrandGithub)
-            ->columnSpanFull()
-            ->schema([
-                Tabs::make('egg_tabs')
-                    ->tabs($tabs),
-            ]);
-    }
 }

app/Filament/Components/Actions/ImportScheduleAction.php

@@ -3,7 +3,6 @@
 namespace App\Filament\Components\Actions;
 
 use App\Enums\SubuserPermission;
-use App\Enums\TablerIcon;
 use App\Models\Server;
 use App\Services\Schedules\Sharing\ScheduleImporterService;
 use Exception;
@@ -42,7 +41,7 @@ class ImportScheduleAction extends Action
                 ->tabs([
                     Tab::make('file')
                         ->label(trans('server/schedule.import_action.file'))
-                        ->icon(TablerIcon::FileUpload)
+                        ->icon('tabler-file-upload')
                         ->schema([
                             FileUpload::make('files')
                                 ->hiddenLabel()
@@ -55,7 +54,7 @@ class ImportScheduleAction extends Action
                         ]),
                     Tab::make('url')
                         ->label(trans('server/schedule.import_action.url'))
-                        ->icon(TablerIcon::WorldUpload)
+                        ->icon('tabler-world-upload')
                         ->schema([
                             Repeater::make('urls')
                                 ->hiddenLabel()

app/Filament/Components/Actions/PreviewStartupAction.php

@@ -12,7 +12,7 @@ class PreviewStartupAction extends Action
 {
     public static function getDefaultName(): ?string
     {
-        return 'hint_preview';
+        return 'preview';
     }
 
     protected function setUp(): void

app/Filament/Components/Actions/RotateDatabasePasswordAction.php

@@ -2,7 +2,6 @@
 
 namespace App\Filament\Components\Actions;
 
-use App\Enums\TablerIcon;
 use App\Facades\Activity;
 use App\Models\Database;
 use App\Services\Databases\DatabaseManagementService;
@@ -16,16 +15,16 @@ class RotateDatabasePasswordAction extends Action
 {
     public static function getDefaultName(): ?string
     {
-        return 'hint_rotate';
+        return 'rotate';
     }
 
     protected function setUp(): void
     {
         parent::setUp();
 
-        $this->tooltip(trans('admin/databasehost.rotate'));
+        $this->label(trans('admin/databasehost.rotate'));
 
-        $this->icon(TablerIcon::Refresh);
+        $this->icon('tabler-refresh');
 
         $this->authorize(fn (Database $database) => user()?->can('update', $database));