diff --git a/app/View/Components/Heroicon.php b/app/View/Components/Heroicon.php
new file mode 100644
index 0000000..9bd0861
--- /dev/null
+++ b/app/View/Components/Heroicon.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace App\View\Components;
+
+use Closure;
+use Illuminate\Contracts\View\View;
+use Illuminate\View\Component;
+
+class Heroicon extends Component
+{
+    /**
+     * Create a new component instance.
+     */
+    public function __construct(public string $name)
+    {
+        //
+    }
+
+    /**
+     * Get the view / contents that represent the component.
+     */
+    public function render(): View|Closure|string
+    {
+        return view('components.heroicons.'.$this->name);
+    }
+}
diff --git a/composer.json b/composer.json
index 11a9c07..efc49e9 100644
--- a/composer.json
+++ b/composer.json
@@ -11,7 +11,6 @@
         "php": "^8.2",
         "ext-ftp": "*",
         "aws/aws-sdk-php": "^3.158",
-        "blade-ui-kit/blade-heroicons": "^2.2",
         "guzzlehttp/guzzle": "^7.2",
         "laravel/fortify": "^1.17",
         "laravel/framework": "^10.0",
diff --git a/composer.lock b/composer.lock
index 5b40b0d..41de990 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "b6cdd41bcbee6c7e396c589e033eb880",
+    "content-hash": "322884779fcb49239f685d3c86a2ded2",
     "packages": [
         {
             "name": "aws/aws-crt-php",
@@ -209,156 +209,6 @@
             },
             "time": "2022-12-07T17:46:57+00:00"
         },
-        {
-            "name": "blade-ui-kit/blade-heroicons",
-            "version": "2.3.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/blade-ui-kit/blade-heroicons.git",
-                "reference": "a265dbcf2a098121aad05752d0bba9f59022e4ba"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/blade-ui-kit/blade-heroicons/zipball/a265dbcf2a098121aad05752d0bba9f59022e4ba",
-                "reference": "a265dbcf2a098121aad05752d0bba9f59022e4ba",
-                "shasum": ""
-            },
-            "require": {
-                "blade-ui-kit/blade-icons": "^1.6",
-                "illuminate/support": "^9.0|^10.0|^11.0",
-                "php": "^8.0"
-            },
-            "require-dev": {
-                "orchestra/testbench": "^7.0|^8.0|^9.0",
-                "phpunit/phpunit": "^9.0|^10.5|^11.0"
-            },
-            "type": "library",
-            "extra": {
-                "laravel": {
-                    "providers": [
-                        "BladeUI\\Heroicons\\BladeHeroiconsServiceProvider"
-                    ]
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "BladeUI\\Heroicons\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Dries Vints",
-                    "homepage": "https://driesvints.com"
-                }
-            ],
-            "description": "A package to easily make use of Heroicons in your Laravel Blade views.",
-            "homepage": "https://github.com/blade-ui-kit/blade-heroicons",
-            "keywords": [
-                "Heroicons",
-                "blade",
-                "laravel"
-            ],
-            "support": {
-                "issues": "https://github.com/blade-ui-kit/blade-heroicons/issues",
-                "source": "https://github.com/blade-ui-kit/blade-heroicons/tree/2.3.0"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/sponsors/driesvints",
-                    "type": "github"
-                },
-                {
-                    "url": "https://www.paypal.com/paypalme/driesvints",
-                    "type": "paypal"
-                }
-            ],
-            "time": "2024-02-07T16:33:46+00:00"
-        },
-        {
-            "name": "blade-ui-kit/blade-icons",
-            "version": "1.6.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/blade-ui-kit/blade-icons.git",
-                "reference": "89660d93f9897d231e9113ba203cd17f4c5efade"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/blade-ui-kit/blade-icons/zipball/89660d93f9897d231e9113ba203cd17f4c5efade",
-                "reference": "89660d93f9897d231e9113ba203cd17f4c5efade",
-                "shasum": ""
-            },
-            "require": {
-                "illuminate/contracts": "^8.0|^9.0|^10.0|^11.0",
-                "illuminate/filesystem": "^8.0|^9.0|^10.0|^11.0",
-                "illuminate/support": "^8.0|^9.0|^10.0|^11.0",
-                "illuminate/view": "^8.0|^9.0|^10.0|^11.0",
-                "php": "^7.4|^8.0",
-                "symfony/console": "^5.3|^6.0|^7.0",
-                "symfony/finder": "^5.3|^6.0|^7.0"
-            },
-            "require-dev": {
-                "mockery/mockery": "^1.5.1",
-                "orchestra/testbench": "^6.0|^7.0|^8.0|^9.0",
-                "phpunit/phpunit": "^9.0|^10.5|^11.0"
-            },
-            "bin": [
-                "bin/blade-icons-generate"
-            ],
-            "type": "library",
-            "extra": {
-                "laravel": {
-                    "providers": [
-                        "BladeUI\\Icons\\BladeIconsServiceProvider"
-                    ]
-                }
-            },
-            "autoload": {
-                "files": [
-                    "src/helpers.php"
-                ],
-                "psr-4": {
-                    "BladeUI\\Icons\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Dries Vints",
-                    "homepage": "https://driesvints.com"
-                }
-            ],
-            "description": "A package to easily make use of icons in your Laravel Blade views.",
-            "homepage": "https://github.com/blade-ui-kit/blade-icons",
-            "keywords": [
-                "blade",
-                "icons",
-                "laravel",
-                "svg"
-            ],
-            "support": {
-                "issues": "https://github.com/blade-ui-kit/blade-icons/issues",
-                "source": "https://github.com/blade-ui-kit/blade-icons"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/sponsors/driesvints",
-                    "type": "github"
-                },
-                {
-                    "url": "https://www.paypal.com/paypalme/driesvints",
-                    "type": "paypal"
-                }
-            ],
-            "time": "2024-02-07T16:09:20+00:00"
-        },
         {
             "name": "brick/math",
             "version": "0.11.0",
diff --git a/resources/views/application/auto-deployment.blade.php b/resources/views/application/auto-deployment.blade.php
index 8d7eb96..797220f 100644
--- a/resources/views/application/auto-deployment.blade.php
+++ b/resources/views/application/auto-deployment.blade.php
@@ -17,7 +17,7 @@ class="cursor-pointer"
                     >
                         {{ __("Enable") }}
                         @if ($site->isAutoDeployment())
-                            <x-heroicon-o-check class="ml-1 h-5 w-5 text-green-600" />
+                            <x-heroicon name="o-check" class="ml-1 h-5 w-5 text-green-600" />
                         @endif
                     </x-dropdown-link>
                     <x-dropdown-link
@@ -28,7 +28,7 @@ class="cursor-pointer"
                     >
                         {{ __("Disable") }}
                         @if (! $site->isAutoDeployment())
-                            <x-heroicon-o-check class="ml-1 h-5 w-5 text-green-600" />
+                            <x-heroicon name="o-check" class="ml-1 h-5 w-5 text-green-600" />
                         @endif
                     </x-dropdown-link>
                 </div>
diff --git a/resources/views/application/deployments-list.blade.php b/resources/views/application/deployments-list.blade.php
index 1e87edd..aefe876 100644
--- a/resources/views/application/deployments-list.blade.php
+++ b/resources/views/application/deployments-list.blade.php
@@ -45,7 +45,7 @@ class="block max-w-[500px] truncate font-semibold text-primary-600"
                             hx-select="#show-log-content"
                             hx-swap="outerHTML"
                         >
-                            <x-heroicon-o-eye class="h-5 w-5" />
+                            <x-heroicon name="o-eye" class="h-5 w-5" />
                         </x-icon-button>
                     </x-td>
                 </tr>
diff --git a/resources/views/components/heroicons/o-arrow-path.blade.php b/resources/views/components/heroicons/o-arrow-path.blade.php
new file mode 100644
index 0000000..2291e30
--- /dev/null
+++ b/resources/views/components/heroicons/o-arrow-path.blade.php
@@ -0,0 +1,14 @@
+<svg
+    xmlns="http://www.w3.org/2000/svg"
+    fill="none"
+    viewBox="0 0 24 24"
+    stroke-width="1.5"
+    stroke="currentColor"
+    {{ $attributes }}
+>
+    <path
+        stroke-linecap="round"
+        stroke-linejoin="round"
+        d="M16.023 9.348h4.992v-.001M2.985 19.644v-4.992m0 0h4.992m-4.993 0 3.181 3.183a8.25 8.25 0 0 0 13.803-3.7M4.031 9.865a8.25 8.25 0 0 1 13.803-3.7l3.181 3.182m0-4.991v4.99"
+    />
+</svg>
diff --git a/resources/views/components/heroicons/o-check.blade.php b/resources/views/components/heroicons/o-check.blade.php
new file mode 100644
index 0000000..cb6b9c9
--- /dev/null
+++ b/resources/views/components/heroicons/o-check.blade.php
@@ -0,0 +1,10 @@
+<svg
+    xmlns="http://www.w3.org/2000/svg"
+    fill="none"
+    viewBox="0 0 24 24"
+    stroke-width="1.5"
+    stroke="currentColor"
+    {{ $attributes }}
+>
+    <path stroke-linecap="round" stroke-linejoin="round" d="m4.5 12.75 6 6 9-13.5" />
+</svg>
diff --git a/resources/views/components/heroicons/o-chevron-up-down.blade.php b/resources/views/components/heroicons/o-chevron-up-down.blade.php
new file mode 100644
index 0000000..d56ed97
--- /dev/null
+++ b/resources/views/components/heroicons/o-chevron-up-down.blade.php
@@ -0,0 +1,10 @@
+<svg
+    xmlns="http://www.w3.org/2000/svg"
+    fill="none"
+    viewBox="0 0 24 24"
+    stroke-width="1.5"
+    stroke="currentColor"
+    {{ $attributes }}
+>
+    <path stroke-linecap="round" stroke-linejoin="round" d="M8.25 15 12 18.75 15.75 15m-7.5-6L12 5.25 15.75 9" />
+</svg>
diff --git a/resources/views/components/heroicons/o-circle-stack.blade.php b/resources/views/components/heroicons/o-circle-stack.blade.php
new file mode 100644
index 0000000..6cadd8a
--- /dev/null
+++ b/resources/views/components/heroicons/o-circle-stack.blade.php
@@ -0,0 +1,14 @@
+<svg
+    xmlns="http://www.w3.org/2000/svg"
+    fill="none"
+    viewBox="0 0 24 24"
+    stroke-width="1.5"
+    stroke="currentColor"
+    {{ $attributes }}
+>
+    <path
+        stroke-linecap="round"
+        stroke-linejoin="round"
+        d="M20.25 6.375c0 2.278-3.694 4.125-8.25 4.125S3.75 8.653 3.75 6.375m16.5 0c0-2.278-3.694-4.125-8.25-4.125S3.75 4.097 3.75 6.375m16.5 0v11.25c0 2.278-3.694 4.125-8.25 4.125s-8.25-1.847-8.25-4.125V6.375m16.5 0v3.75m-16.5-3.75v3.75m16.5 0v3.75C20.25 16.153 16.556 18 12 18s-8.25-1.847-8.25-4.125v-3.75m16.5 0c0 2.278-3.694 4.125-8.25 4.125s-8.25-1.847-8.25-4.125"
+    />
+</svg>
diff --git a/resources/views/components/heroicons/o-clipboard-document-check.blade.php b/resources/views/components/heroicons/o-clipboard-document-check.blade.php
new file mode 100644
index 0000000..d34f706
--- /dev/null
+++ b/resources/views/components/heroicons/o-clipboard-document-check.blade.php
@@ -0,0 +1,14 @@
+<svg
+    xmlns="http://www.w3.org/2000/svg"
+    fill="none"
+    viewBox="0 0 24 24"
+    stroke-width="1.5"
+    stroke="currentColor"
+    {{ $attributes }}
+>
+    <path
+        stroke-linecap="round"
+        stroke-linejoin="round"
+        d="M11.35 3.836c-.065.21-.1.433-.1.664 0 .414.336.75.75.75h4.5a.75.75 0 0 0 .75-.75 2.25 2.25 0 0 0-.1-.664m-5.8 0A2.251 2.251 0 0 1 13.5 2.25H15c1.012 0 1.867.668 2.15 1.586m-5.8 0c-.376.023-.75.05-1.124.08C9.095 4.01 8.25 4.973 8.25 6.108V8.25m8.9-4.414c.376.023.75.05 1.124.08 1.131.094 1.976 1.057 1.976 2.192V16.5A2.25 2.25 0 0 1 18 18.75h-2.25m-7.5-10.5H4.875c-.621 0-1.125.504-1.125 1.125v11.25c0 .621.504 1.125 1.125 1.125h9.75c.621 0 1.125-.504 1.125-1.125V18.75m-7.5-10.5h6.375c.621 0 1.125.504 1.125 1.125v9.375m-8.25-3 1.5 1.5 3-3.75"
+    />
+</svg>
diff --git a/resources/views/components/heroicons/o-clock.blade.php b/resources/views/components/heroicons/o-clock.blade.php
new file mode 100644
index 0000000..db8129c
--- /dev/null
+++ b/resources/views/components/heroicons/o-clock.blade.php
@@ -0,0 +1,10 @@
+<svg
+    xmlns="http://www.w3.org/2000/svg"
+    fill="none"
+    viewBox="0 0 24 24"
+    stroke-width="1.5"
+    stroke="currentColor"
+    {{ $attributes }}
+>
+    <path stroke-linecap="round" stroke-linejoin="round" d="M12 6v6h4.5m4.5 0a9 9 0 1 1-18 0 9 9 0 0 1 18 0Z" />
+</svg>
diff --git a/resources/views/components/heroicons/o-code-bracket.blade.php b/resources/views/components/heroicons/o-code-bracket.blade.php
new file mode 100644
index 0000000..9a82fac
--- /dev/null
+++ b/resources/views/components/heroicons/o-code-bracket.blade.php
@@ -0,0 +1,14 @@
+<svg
+    xmlns="http://www.w3.org/2000/svg"
+    fill="none"
+    viewBox="0 0 24 24"
+    stroke-width="1.5"
+    stroke="currentColor"
+    {{ $attributes }}
+>
+    <path
+        stroke-linecap="round"
+        stroke-linejoin="round"
+        d="M17.25 6.75 22.5 12l-5.25 5.25m-10.5 0L1.5 12l5.25-5.25m7.5-3-4.5 16.5"
+    />
+</svg>
diff --git a/resources/views/components/heroicons/o-cog-6-tooth.blade.php b/resources/views/components/heroicons/o-cog-6-tooth.blade.php
new file mode 100644
index 0000000..42ec154
--- /dev/null
+++ b/resources/views/components/heroicons/o-cog-6-tooth.blade.php
@@ -0,0 +1,15 @@
+<svg
+    xmlns="http://www.w3.org/2000/svg"
+    fill="none"
+    viewBox="0 0 24 24"
+    stroke-width="1.5"
+    stroke="currentColor"
+    {{ $attributes }}
+>
+    <path
+        stroke-linecap="round"
+        stroke-linejoin="round"
+        d="M9.594 3.94c.09-.542.56-.94 1.11-.94h2.593c.55 0 1.02.398 1.11.94l.213 1.281c.063.374.313.686.645.87.074.04.147.083.22.127.325.196.72.257 1.075.124l1.217-.456a1.125 1.125 0 0 1 1.37.49l1.296 2.247a1.125 1.125 0 0 1-.26 1.431l-1.003.827c-.293.241-.438.613-.43.992a7.723 7.723 0 0 1 0 .255c-.008.378.137.75.43.991l1.004.827c.424.35.534.955.26 1.43l-1.298 2.247a1.125 1.125 0 0 1-1.369.491l-1.217-.456c-.355-.133-.75-.072-1.076.124a6.47 6.47 0 0 1-.22.128c-.331.183-.581.495-.644.869l-.213 1.281c-.09.543-.56.94-1.11.94h-2.594c-.55 0-1.019-.398-1.11-.94l-.213-1.281c-.062-.374-.312-.686-.644-.87a6.52 6.52 0 0 1-.22-.127c-.325-.196-.72-.257-1.076-.124l-1.217.456a1.125 1.125 0 0 1-1.369-.49l-1.297-2.247a1.125 1.125 0 0 1 .26-1.431l1.004-.827c.292-.24.437-.613.43-.991a6.932 6.932 0 0 1 0-.255c.007-.38-.138-.751-.43-.992l-1.004-.827a1.125 1.125 0 0 1-.26-1.43l1.297-2.247a1.125 1.125 0 0 1 1.37-.491l1.216.456c.356.133.751.072 1.076-.124.072-.044.146-.086.22-.128.332-.183.582-.495.644-.869l.214-1.28Z"
+    />
+    <path stroke-linecap="round" stroke-linejoin="round" d="M15 12a3 3 0 1 1-6 0 3 3 0 0 1 6 0Z" />
+</svg>
diff --git a/resources/views/components/heroicons/o-computer-desktop.blade.php b/resources/views/components/heroicons/o-computer-desktop.blade.php
new file mode 100644
index 0000000..e3503bc
--- /dev/null
+++ b/resources/views/components/heroicons/o-computer-desktop.blade.php
@@ -0,0 +1,14 @@
+<svg
+    xmlns="http://www.w3.org/2000/svg"
+    fill="none"
+    viewBox="0 0 24 24"
+    stroke-width="1.5"
+    stroke="currentColor"
+    {{ $attributes }}
+>
+    <path
+        stroke-linecap="round"
+        stroke-linejoin="round"
+        d="M9 17.25v1.007a3 3 0 0 1-.879 2.122L7.5 21h9l-.621-.621A3 3 0 0 1 15 18.257V17.25m6-12V15a2.25 2.25 0 0 1-2.25 2.25H5.25A2.25 2.25 0 0 1 3 15V5.25m18 0A2.25 2.25 0 0 0 18.75 3H5.25A2.25 2.25 0 0 0 3 5.25m18 0V12a2.25 2.25 0 0 1-2.25 2.25H5.25A2.25 2.25 0 0 1 3 12V5.25"
+    />
+</svg>
diff --git a/resources/views/components/heroicons/o-envelope.blade.php b/resources/views/components/heroicons/o-envelope.blade.php
new file mode 100644
index 0000000..f13a64b
--- /dev/null
+++ b/resources/views/components/heroicons/o-envelope.blade.php
@@ -0,0 +1,14 @@
+<svg
+    xmlns="http://www.w3.org/2000/svg"
+    fill="none"
+    viewBox="0 0 24 24"
+    stroke-width="1.5"
+    stroke="currentColor"
+    {{ $attributes }}
+>
+    <path
+        stroke-linecap="round"
+        stroke-linejoin="round"
+        d="M21.75 6.75v10.5a2.25 2.25 0 0 1-2.25 2.25h-15a2.25 2.25 0 0 1-2.25-2.25V6.75m19.5 0A2.25 2.25 0 0 0 19.5 4.5h-15a2.25 2.25 0 0 0-2.25 2.25m19.5 0v.243a2.25 2.25 0 0 1-1.07 1.916l-7.5 4.615a2.25 2.25 0 0 1-2.36 0L3.32 8.91a2.25 2.25 0 0 1-1.07-1.916V6.75"
+    />
+</svg>
diff --git a/resources/views/components/heroicons/o-eye.blade.php b/resources/views/components/heroicons/o-eye.blade.php
new file mode 100644
index 0000000..57d8cd4
--- /dev/null
+++ b/resources/views/components/heroicons/o-eye.blade.php
@@ -0,0 +1,15 @@
+<svg
+    xmlns="http://www.w3.org/2000/svg"
+    fill="none"
+    viewBox="0 0 24 24"
+    stroke-width="1.5"
+    stroke="currentColor"
+    {{ $attributes }}
+>
+    <path
+        stroke-linecap="round"
+        stroke-linejoin="round"
+        d="M2.036 12.322a1.012 1.012 0 0 1 0-.639C3.423 7.51 7.36 4.5 12 4.5c4.638 0 8.573 3.007 9.963 7.178.07.207.07.431 0 .639C20.577 16.49 16.64 19.5 12 19.5c-4.638 0-8.573-3.007-9.963-7.178Z"
+    />
+    <path stroke-linecap="round" stroke-linejoin="round" d="M15 12a3 3 0 1 1-6 0 3 3 0 0 1 6 0Z" />
+</svg>
diff --git a/resources/views/components/heroicons/o-fire.blade.php b/resources/views/components/heroicons/o-fire.blade.php
new file mode 100644
index 0000000..51fe555
--- /dev/null
+++ b/resources/views/components/heroicons/o-fire.blade.php
@@ -0,0 +1,19 @@
+<svg
+    xmlns="http://www.w3.org/2000/svg"
+    fill="none"
+    viewBox="0 0 24 24"
+    stroke-width="1.5"
+    stroke="currentColor"
+    {{ $attributes }}
+>
+    <path
+        stroke-linecap="round"
+        stroke-linejoin="round"
+        d="M15.362 5.214A8.252 8.252 0 0 1 12 21 8.25 8.25 0 0 1 6.038 7.047 8.287 8.287 0 0 0 9 9.601a8.983 8.983 0 0 1 3.361-6.867 8.21 8.21 0 0 0 3 2.48Z"
+    />
+    <path
+        stroke-linecap="round"
+        stroke-linejoin="round"
+        d="M12 18a3.75 3.75 0 0 0 .495-7.468 5.99 5.99 0 0 0-1.925 3.547 5.975 5.975 0 0 1-2.133-1.001A3.75 3.75 0 0 0 12 18Z"
+    />
+</svg>
diff --git a/resources/views/components/heroicons/o-globe-alt.blade.php b/resources/views/components/heroicons/o-globe-alt.blade.php
new file mode 100644
index 0000000..2a23f38
--- /dev/null
+++ b/resources/views/components/heroicons/o-globe-alt.blade.php
@@ -0,0 +1,14 @@
+<svg
+    xmlns="http://www.w3.org/2000/svg"
+    fill="none"
+    viewBox="0 0 24 24"
+    stroke-width="1.5"
+    stroke="currentColor"
+    {{ $attributes }}
+>
+    <path
+        stroke-linecap="round"
+        stroke-linejoin="round"
+        d="M12 21a9.004 9.004 0 0 0 8.716-6.747M12 21a9.004 9.004 0 0 1-8.716-6.747M12 21c2.485 0 4.5-4.03 4.5-9S14.485 3 12 3m0 18c-2.485 0-4.5-4.03-4.5-9S9.515 3 12 3m0 0a8.997 8.997 0 0 1 7.843 4.582M12 3a8.997 8.997 0 0 0-7.843 4.582m15.686 0A11.953 11.953 0 0 1 12 10.5c-2.998 0-5.74-1.1-7.843-2.918m15.686 0A8.959 8.959 0 0 1 21 12c0 .778-.099 1.533-.284 2.253m0 0A17.919 17.919 0 0 1 12 16.5c-3.162 0-6.133-.815-8.716-2.247m0 0A9.015 9.015 0 0 1 3 12c0-1.605.42-3.113 1.157-4.418"
+    />
+</svg>
diff --git a/resources/views/components/heroicons/o-home.blade.php b/resources/views/components/heroicons/o-home.blade.php
new file mode 100644
index 0000000..34f008b
--- /dev/null
+++ b/resources/views/components/heroicons/o-home.blade.php
@@ -0,0 +1,14 @@
+<svg
+    xmlns="http://www.w3.org/2000/svg"
+    fill="none"
+    viewBox="0 0 24 24"
+    stroke-width="1.5"
+    stroke="currentColor"
+    {{ $attributes }}
+>
+    <path
+        stroke-linecap="round"
+        stroke-linejoin="round"
+        d="m2.25 12 8.954-8.955c.44-.439 1.152-.439 1.591 0L21.75 12M4.5 9.75v10.125c0 .621.504 1.125 1.125 1.125H9.75v-4.875c0-.621.504-1.125 1.125-1.125h2.25c.621 0 1.125.504 1.125 1.125V21h4.125c.621 0 1.125-.504 1.125-1.125V9.75M8.25 21h8.25"
+    />
+</svg>
diff --git a/resources/views/components/heroicons/o-key.blade.php b/resources/views/components/heroicons/o-key.blade.php
new file mode 100644
index 0000000..2c6289a
--- /dev/null
+++ b/resources/views/components/heroicons/o-key.blade.php
@@ -0,0 +1,14 @@
+<svg
+    xmlns="http://www.w3.org/2000/svg"
+    fill="none"
+    viewBox="0 0 24 24"
+    stroke-width="1.5"
+    stroke="currentColor"
+    {{ $attributes }}
+>
+    <path
+        stroke-linecap="round"
+        stroke-linejoin="round"
+        d="M15.75 5.25a3 3 0 0 1 3 3m3 0a6 6 0 0 1-7.029 5.912c-.563-.097-1.159.026-1.563.43L10.5 17.25H8.25v2.25H6v2.25H2.25v-2.818c0-.597.237-1.17.659-1.591l6.499-6.499c.404-.404.527-1 .43-1.563A6 6 0 1 1 21.75 8.25Z"
+    />
+</svg>
diff --git a/resources/views/components/heroicons/o-link.blade.php b/resources/views/components/heroicons/o-link.blade.php
new file mode 100644
index 0000000..ddd9d65
--- /dev/null
+++ b/resources/views/components/heroicons/o-link.blade.php
@@ -0,0 +1,14 @@
+<svg
+    xmlns="http://www.w3.org/2000/svg"
+    fill="none"
+    viewBox="0 0 24 24"
+    stroke-width="1.5"
+    stroke="currentColor"
+    {{ $attributes }}
+>
+    <path
+        stroke-linecap="round"
+        stroke-linejoin="round"
+        d="M13.19 8.688a4.5 4.5 0 0 1 1.242 7.244l-4.5 4.5a4.5 4.5 0 0 1-6.364-6.364l1.757-1.757m13.35-.622 1.757-1.757a4.5 4.5 0 0 0-6.364-6.364l-4.5 4.5a4.5 4.5 0 0 0 1.242 7.244"
+    />
+</svg>
diff --git a/resources/views/components/heroicons/o-lock-closed.blade.php b/resources/views/components/heroicons/o-lock-closed.blade.php
new file mode 100644
index 0000000..233a16d
--- /dev/null
+++ b/resources/views/components/heroicons/o-lock-closed.blade.php
@@ -0,0 +1,14 @@
+<svg
+    xmlns="http://www.w3.org/2000/svg"
+    fill="none"
+    viewBox="0 0 24 24"
+    stroke-width="1.5"
+    stroke="currentColor"
+    {{ $attributes }}
+>
+    <path
+        stroke-linecap="round"
+        stroke-linejoin="round"
+        d="M16.5 10.5V6.75a4.5 4.5 0 1 0-9 0v3.75m-.75 11.25h10.5a2.25 2.25 0 0 0 2.25-2.25v-6.75a2.25 2.25 0 0 0-2.25-2.25H6.75a2.25 2.25 0 0 0-2.25 2.25v6.75a2.25 2.25 0 0 0 2.25 2.25Z"
+    />
+</svg>
diff --git a/resources/views/components/heroicons/o-moon.blade.php b/resources/views/components/heroicons/o-moon.blade.php
new file mode 100644
index 0000000..2f086df
--- /dev/null
+++ b/resources/views/components/heroicons/o-moon.blade.php
@@ -0,0 +1,14 @@
+<svg
+    xmlns="http://www.w3.org/2000/svg"
+    fill="none"
+    viewBox="0 0 24 24"
+    stroke-width="1.5"
+    stroke="currentColor"
+    {{ $attributes }}
+>
+    <path
+        stroke-linecap="round"
+        stroke-linejoin="round"
+        d="M21.752 15.002A9.72 9.72 0 0 1 18 15.75c-5.385 0-9.75-4.365-9.75-9.75 0-1.33.266-2.597.748-3.752A9.753 9.753 0 0 0 3 11.25C3 16.635 7.365 21 12.75 21a9.753 9.753 0 0 0 9.002-5.998Z"
+    />
+</svg>
diff --git a/resources/views/components/heroicons/o-pencil.blade.php b/resources/views/components/heroicons/o-pencil.blade.php
new file mode 100644
index 0000000..6d6a51f
--- /dev/null
+++ b/resources/views/components/heroicons/o-pencil.blade.php
@@ -0,0 +1,14 @@
+<svg
+    xmlns="http://www.w3.org/2000/svg"
+    fill="none"
+    viewBox="0 0 24 24"
+    stroke-width="1.5"
+    stroke="currentColor"
+    {{ $attributes }}
+>
+    <path
+        stroke-linecap="round"
+        stroke-linejoin="round"
+        d="m16.862 4.487 1.687-1.688a1.875 1.875 0 1 1 2.652 2.652L6.832 19.82a4.5 4.5 0 0 1-1.897 1.13l-2.685.8.8-2.685a4.5 4.5 0 0 1 1.13-1.897L16.863 4.487Zm0 0L19.5 7.125"
+    />
+</svg>
diff --git a/resources/views/components/heroicons/o-play.blade.php b/resources/views/components/heroicons/o-play.blade.php
new file mode 100644
index 0000000..41abe07
--- /dev/null
+++ b/resources/views/components/heroicons/o-play.blade.php
@@ -0,0 +1,14 @@
+<svg
+    xmlns="http://www.w3.org/2000/svg"
+    fill="none"
+    viewBox="0 0 24 24"
+    stroke-width="1.5"
+    stroke="currentColor"
+    {{ $attributes }}
+>
+    <path
+        stroke-linecap="round"
+        stroke-linejoin="round"
+        d="M5.25 5.653c0-.856.917-1.398 1.667-.986l11.54 6.347a1.125 1.125 0 0 1 0 1.972l-11.54 6.347a1.125 1.125 0 0 1-1.667-.986V5.653Z"
+    />
+</svg>
diff --git a/resources/views/components/heroicons/o-queue-list.blade.php b/resources/views/components/heroicons/o-queue-list.blade.php
new file mode 100644
index 0000000..4d25c55
--- /dev/null
+++ b/resources/views/components/heroicons/o-queue-list.blade.php
@@ -0,0 +1,14 @@
+<svg
+    xmlns="http://www.w3.org/2000/svg"
+    fill="none"
+    viewBox="0 0 24 24"
+    stroke-width="1.5"
+    stroke="currentColor"
+    {{ $attributes }}
+>
+    <path
+        stroke-linecap="round"
+        stroke-linejoin="round"
+        d="M3.75 12h16.5m-16.5 3.75h16.5M3.75 19.5h16.5M5.625 4.5h12.75a1.875 1.875 0 0 1 0 3.75H5.625a1.875 1.875 0 0 1 0-3.75Z"
+    />
+</svg>
diff --git a/resources/views/components/heroicons/o-server.blade.php b/resources/views/components/heroicons/o-server.blade.php
new file mode 100644
index 0000000..82db086
--- /dev/null
+++ b/resources/views/components/heroicons/o-server.blade.php
@@ -0,0 +1,14 @@
+<svg
+    xmlns="http://www.w3.org/2000/svg"
+    fill="none"
+    viewBox="0 0 24 24"
+    stroke-width="1.5"
+    stroke="currentColor"
+    {{ $attributes }}
+>
+    <path
+        stroke-linecap="round"
+        stroke-linejoin="round"
+        d="M21.75 17.25v-.228a4.5 4.5 0 0 0-.12-1.03l-2.268-9.64a3.375 3.375 0 0 0-3.285-2.602H7.923a3.375 3.375 0 0 0-3.285 2.602l-2.268 9.64a4.5 4.5 0 0 0-.12 1.03v.228m19.5 0a3 3 0 0 1-3 3H5.25a3 3 0 0 1-3-3m19.5 0a3 3 0 0 0-3-3H5.25a3 3 0 0 0-3 3m16.5 0h.008v.008h-.008v-.008Zm-3 0h.008v.008h-.008v-.008Z"
+    />
+</svg>
diff --git a/resources/views/components/heroicons/o-square-3-stack-3d.blade.php b/resources/views/components/heroicons/o-square-3-stack-3d.blade.php
new file mode 100644
index 0000000..9f2c20d
--- /dev/null
+++ b/resources/views/components/heroicons/o-square-3-stack-3d.blade.php
@@ -0,0 +1,14 @@
+<svg
+    xmlns="http://www.w3.org/2000/svg"
+    fill="none"
+    viewBox="0 0 24 24"
+    stroke-width="1.5"
+    stroke="currentColor"
+    {{ $attributes }}
+>
+    <path
+        stroke-linecap="round"
+        stroke-linejoin="round"
+        d="M6.429 9.75 2.25 12l4.179 2.25m0-4.5 5.571 3 5.571-3m-11.142 0L2.25 7.5 12 2.25l9.75 5.25-4.179 2.25m0 0L21.75 12l-4.179 2.25m0 0 4.179 2.25L12 21.75 2.25 16.5l4.179-2.25m11.142 0-5.571 3-5.571-3"
+    />
+</svg>
diff --git a/resources/views/components/heroicons/o-stop.blade.php b/resources/views/components/heroicons/o-stop.blade.php
new file mode 100644
index 0000000..989bf10
--- /dev/null
+++ b/resources/views/components/heroicons/o-stop.blade.php
@@ -0,0 +1,14 @@
+<svg
+    xmlns="http://www.w3.org/2000/svg"
+    fill="none"
+    viewBox="0 0 24 24"
+    stroke-width="1.5"
+    stroke="currentColor"
+    {{ $attributes }}
+>
+    <path
+        stroke-linecap="round"
+        stroke-linejoin="round"
+        d="M5.25 7.5A2.25 2.25 0 0 1 7.5 5.25h9a2.25 2.25 0 0 1 2.25 2.25v9a2.25 2.25 0 0 1-2.25 2.25h-9a2.25 2.25 0 0 1-2.25-2.25v-9Z"
+    />
+</svg>
diff --git a/resources/views/components/heroicons/o-sun.blade.php b/resources/views/components/heroicons/o-sun.blade.php
new file mode 100644
index 0000000..a5d4215
--- /dev/null
+++ b/resources/views/components/heroicons/o-sun.blade.php
@@ -0,0 +1,14 @@
+<svg
+    xmlns="http://www.w3.org/2000/svg"
+    fill="none"
+    viewBox="0 0 24 24"
+    stroke-width="1.5"
+    stroke="currentColor"
+    {{ $attributes }}
+>
+    <path
+        stroke-linecap="round"
+        stroke-linejoin="round"
+        d="M12 3v2.25m6.364.386-1.591 1.591M21 12h-2.25m-.386 6.364-1.591-1.591M12 18.75V21m-4.773-4.227-1.591 1.591M5.25 12H3m4.227-4.773L5.636 5.636M15.75 12a3.75 3.75 0 1 1-7.5 0 3.75 3.75 0 0 1 7.5 0Z"
+    />
+</svg>
diff --git a/resources/views/components/heroicons/o-trash.blade.php b/resources/views/components/heroicons/o-trash.blade.php
new file mode 100644
index 0000000..7794328
--- /dev/null
+++ b/resources/views/components/heroicons/o-trash.blade.php
@@ -0,0 +1,14 @@
+<svg
+    xmlns="http://www.w3.org/2000/svg"
+    fill="none"
+    viewBox="0 0 24 24"
+    stroke-width="1.5"
+    stroke="currentColor"
+    {{ $attributes }}
+>
+    <path
+        stroke-linecap="round"
+        stroke-linejoin="round"
+        d="m14.74 9-.346 9m-4.788 0L9.26 9m9.968-3.21c.342.052.682.107 1.022.166m-1.022-.165L18.16 19.673a2.25 2.25 0 0 1-2.244 2.077H8.084a2.25 2.25 0 0 1-2.244-2.077L4.772 5.79m14.456 0a48.108 48.108 0 0 0-3.478-.397m-12 .562c.34-.059.68-.114 1.022-.165m0 0a48.11 48.11 0 0 1 3.478-.397m7.5 0v-.916c0-1.18-.91-2.164-2.09-2.201a51.964 51.964 0 0 0-3.32 0c-1.18.037-2.09 1.022-2.09 2.201v.916m7.5 0a48.667 48.667 0 0 0-7.5 0"
+    />
+</svg>
diff --git a/resources/views/components/heroicons/o-wrench-screwdriver.blade.php b/resources/views/components/heroicons/o-wrench-screwdriver.blade.php
new file mode 100644
index 0000000..8ab7f9a
--- /dev/null
+++ b/resources/views/components/heroicons/o-wrench-screwdriver.blade.php
@@ -0,0 +1,14 @@
+<svg
+    xmlns="http://www.w3.org/2000/svg"
+    fill="none"
+    viewBox="0 0 24 24"
+    stroke-width="1.5"
+    stroke="currentColor"
+    {{ $attributes }}
+>
+    <path
+        stroke-linecap="round"
+        stroke-linejoin="round"
+        d="M11.42 15.17 17.25 21A2.652 2.652 0 0 0 21 17.25l-5.877-5.877M11.42 15.17l2.496-3.03c.317-.384.74-.626 1.208-.766M11.42 15.17l-4.655 5.653a2.548 2.548 0 1 1-3.586-3.586l6.837-5.63m5.108-.233c.55-.164 1.163-.188 1.743-.14a4.5 4.5 0 0 0 4.486-6.336l-3.276 3.277a3.004 3.004 0 0 1-2.25-2.25l3.276-3.276a4.5 4.5 0 0 0-6.336 4.486c.091 1.076-.071 2.264-.904 2.95l-.102.085m-1.745 1.437L5.909 7.5H4.5L2.25 3.75l1.5-1.5L7.5 4.5v1.409l4.26 4.26m-1.745 1.437 1.745-1.437m6.615 8.206L15.75 15.75M4.867 19.125h.008v.008h-.008v-.008Z"
+    />
+</svg>
diff --git a/resources/views/components/user-dropdown.blade.php b/resources/views/components/user-dropdown.blade.php
index ac66c54..e78559f 100644
--- a/resources/views/components/user-dropdown.blade.php
+++ b/resources/views/components/user-dropdown.blade.php
@@ -2,7 +2,7 @@
     <x-dropdown align="right" width="48">
         <x-slot name="trigger">
             <button class="flex items-center">
-                <x-heroicon-o-cog-6-tooth class="h-7 w-7" />
+                <x-heroicon name="o-cog-6-tooth" class="h-7 w-7" />
             </button>
         </x-slot>
         <x-slot name="content">
diff --git a/resources/views/cronjobs/partials/cronjobs-list.blade.php b/resources/views/cronjobs/partials/cronjobs-list.blade.php
index 7062968..8f520c5 100644
--- a/resources/views/cronjobs/partials/cronjobs-list.blade.php
+++ b/resources/views/cronjobs/partials/cronjobs-list.blade.php
@@ -27,7 +27,7 @@
                                 <x-icon-button
                                     x-on:click="deleteAction = '{{ route('servers.cronjobs.destroy', ['server' => $server, 'cronJob' => $cronjob]) }}'; $dispatch('open-modal', 'delete-cronjob')"
                                 >
-                                    <x-heroicon-o-trash class="h-5 w-5" />
+                                    <x-heroicon name="o-trash" class="h-5 w-5" />
                                 </x-icon-button>
                             </div>
                         </div>
diff --git a/resources/views/databases/partials/database-backup-files.blade.php b/resources/views/databases/partials/database-backup-files.blade.php
index 6ccb8df..c8a42a4 100644
--- a/resources/views/databases/partials/database-backup-files.blade.php
+++ b/resources/views/databases/partials/database-backup-files.blade.php
@@ -61,14 +61,14 @@ class="ml-1"
                                 <x-icon-button
                                     x-on:click="restoreAction = '{{ route('servers.databases.backups.files.restore', ['server' => $server, 'backup' => $backup, 'backupFile' => $file]) }}'; $dispatch('open-modal', 'restore-backup')"
                                 >
-                                    <x-heroicon-o-arrow-path class="h-5 w-5" />
+                                    <x-heroicon name="o-arrow-path" class="h-5 w-5" />
                                 </x-icon-button>
                             @endif
 
                             <x-icon-button
                                 x-on:click="deleteAction = '{{ route('servers.databases.backups.files.destroy', ['server' => $server, 'backup' => $backup, 'backupFile' => $file]) }}'; $dispatch('open-modal', 'delete-backup-file')"
                             >
-                                <x-heroicon-o-trash class="h-5 w-5" />
+                                <x-heroicon name="o-trash" class="h-5 w-5" />
                             </x-icon-button>
                         </x-td>
                     </tr>
diff --git a/resources/views/databases/partials/database-backups.blade.php b/resources/views/databases/partials/database-backups.blade.php
index c2c650e..44bd4b1 100644
--- a/resources/views/databases/partials/database-backups.blade.php
+++ b/resources/views/databases/partials/database-backups.blade.php
@@ -36,12 +36,12 @@
                             <x-icon-button
                                 :href="route('servers.databases.backups', ['server' => $server, 'backup' => $backup])"
                             >
-                                <x-heroicon-o-circle-stack class="h-5 w-5" />
+                                <x-heroicon name="o-circle-stack" class="h-5 w-5" />
                             </x-icon-button>
                             <x-icon-button
                                 x-on:click="deleteAction = '{{ route('servers.databases.backups.destroy', ['server' => $server, 'backup' => $backup]) }}'; $dispatch('open-modal', 'delete-backup')"
                             >
-                                <x-heroicon-o-trash class="h-5 w-5" />
+                                <x-heroicon name="o-trash" class="h-5 w-5" />
                             </x-icon-button>
                         </x-td>
                     </tr>
diff --git a/resources/views/databases/partials/database-list.blade.php b/resources/views/databases/partials/database-list.blade.php
index 08efeb5..3b1c2c7 100644
--- a/resources/views/databases/partials/database-list.blade.php
+++ b/resources/views/databases/partials/database-list.blade.php
@@ -37,7 +37,7 @@
                             <x-icon-button
                                 x-on:click="deleteAction = '{{ route('servers.databases.destroy', ['server' => $server, 'database' => $database]) }}'; $dispatch('open-modal', 'delete-database')"
                             >
-                                <x-heroicon-o-trash class="h-5 w-5" />
+                                <x-heroicon name="o-trash" class="h-5 w-5" />
                             </x-icon-button>
                         </x-td>
                     </tr>
diff --git a/resources/views/databases/partials/database-user-list.blade.php b/resources/views/databases/partials/database-user-list.blade.php
index eb40ad9..451104d 100644
--- a/resources/views/databases/partials/database-user-list.blade.php
+++ b/resources/views/databases/partials/database-user-list.blade.php
@@ -24,7 +24,7 @@
                     <x-th>{{ __("Username") }}</x-th>
                     <x-th>{{ __("Created") }}</x-th>
                     <x-th class="flex items-center">
-                        <x-heroicon-o-link class="mr-1 h-5 w-5" />
+                        <x-heroicon name="o-link" class="mr-1 h-5 w-5" />
                         {{ __("Linked Databases") }}
                     </x-th>
                     <x-th>{{ __("Status") }}</x-th>
@@ -50,17 +50,17 @@
                                 hx-select="#database-user-password-content"
                                 hx-swap="outerHTML"
                             >
-                                <x-heroicon-o-lock-closed class="h-5 w-5" />
+                                <x-heroicon name="o-lock-closed" class="h-5 w-5" />
                             </x-icon-button>
                             <x-icon-button
                                 x-on:click="linkAction = '{{ route('servers.databases.users.link', ['server' => $server, 'databaseUser' => $databaseUser]) }}';linkedDatabases = {{ json_encode($databaseUser->databases) }}; $dispatch('open-modal', 'link-database-user');"
                             >
-                                <x-heroicon-o-link class="h-5 w-5" />
+                                <x-heroicon name="o-link" class="h-5 w-5" />
                             </x-icon-button>
                             <x-icon-button
                                 x-on:click="deleteAction = '{{ route('servers.databases.users.destroy', ['server' => $server, 'databaseUser' => $databaseUser]) }}'; $dispatch('open-modal', 'delete-database-user')"
                             >
-                                <x-heroicon-o-trash class="h-5 w-5" />
+                                <x-heroicon name="o-trash" class="h-5 w-5" />
                             </x-icon-button>
                         </x-td>
                     </tr>
diff --git a/resources/views/firewall/partials/firewall-rules-list.blade.php b/resources/views/firewall/partials/firewall-rules-list.blade.php
index c9d6f21..1d17cbc 100644
--- a/resources/views/firewall/partials/firewall-rules-list.blade.php
+++ b/resources/views/firewall/partials/firewall-rules-list.blade.php
@@ -31,7 +31,7 @@
                             <x-icon-button
                                 x-on:click="deleteAction = '{{ route('servers.firewall.destroy', ['server' => $server, 'firewallRule' => $rule]) }}'; $dispatch('open-modal', 'delete-rule')"
                             >
-                                <x-heroicon-o-trash class="h-5 w-5" />
+                                <x-heroicon name="o-trash" class="h-5 w-5" />
                             </x-icon-button>
                         </div>
                     </div>
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index 5223bd3..a0d8e49 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -66,7 +66,7 @@ class="left-0 top-0 min-h-screen w-64 flex-none bg-gray-800 p-3 dark:border-r-2
                                 :href="route('servers.show', ['server' => $server])"
                                 :active="request()->routeIs('servers.show')"
                             >
-                                <x-heroicon-o-home class="h-6 w-6" />
+                                <x-heroicon name="o-home" class="h-6 w-6" />
                                 <span class="ml-2 text-gray-50">
                                     {{ __("Overview") }}
                                 </span>
@@ -76,7 +76,7 @@ class="left-0 top-0 min-h-screen w-64 flex-none bg-gray-800 p-3 dark:border-r-2
                                     :href="route('servers.sites', ['server' => $server])"
                                     :active="request()->routeIs('servers.sites') || request()->is('servers/*/sites/*')"
                                 >
-                                    <x-heroicon-o-globe-alt class="h-6 w-6" />
+                                    <x-heroicon name="o-globe-alt" class="h-6 w-6" />
                                     <span class="ml-2 text-gray-50">
                                         {{ __("Sites") }}
                                     </span>
@@ -89,7 +89,7 @@ class="left-0 top-0 min-h-screen w-64 flex-none bg-gray-800 p-3 dark:border-r-2
                                     :active="request()->routeIs('servers.databases') ||
                                     request()->routeIs('servers.databases.backups')"
                                 >
-                                    <x-heroicon-o-circle-stack class="h-6 w-6" />
+                                    <x-heroicon name="o-circle-stack" class="h-6 w-6" />
                                     <span class="ml-2 text-gray-50">
                                         {{ __("Databases") }}
                                     </span>
@@ -101,7 +101,7 @@ class="left-0 top-0 min-h-screen w-64 flex-none bg-gray-800 p-3 dark:border-r-2
                                     :href="route('servers.php', ['server' => $server])"
                                     :active="request()->routeIs('servers.php')"
                                 >
-                                    <x-heroicon-o-code-bracket class="h-6 w-6" />
+                                    <x-heroicon name="o-code-bracket" class="h-6 w-6" />
                                     <span class="ml-2 text-gray-50">
                                         {{ __("PHP") }}
                                     </span>
@@ -113,7 +113,7 @@ class="left-0 top-0 min-h-screen w-64 flex-none bg-gray-800 p-3 dark:border-r-2
                                     :href="route('servers.firewall', ['server' => $server])"
                                     :active="request()->routeIs('servers.firewall')"
                                 >
-                                    <x-heroicon-o-fire class="h-6 w-6" />
+                                    <x-heroicon name="o-fire" class="h-6 w-6" />
                                     <span class="ml-2 text-gray-50">
                                         {{ __("Firewall") }}
                                     </span>
@@ -124,7 +124,7 @@ class="left-0 top-0 min-h-screen w-64 flex-none bg-gray-800 p-3 dark:border-r-2
                                 :href="route('servers.cronjobs', ['server' => $server])"
                                 :active="request()->routeIs('servers.cronjobs')"
                             >
-                                <x-heroicon-o-clock class="h-6 w-6" />
+                                <x-heroicon name="o-clock" class="h-6 w-6" />
                                 <span class="ml-2 text-gray-50">
                                     {{ __("Cronjobs") }}
                                 </span>
@@ -133,7 +133,7 @@ class="left-0 top-0 min-h-screen w-64 flex-none bg-gray-800 p-3 dark:border-r-2
                                 :href="route('servers.ssh-keys', ['server' => $server])"
                                 :active="request()->routeIs('servers.ssh-keys')"
                             >
-                                <x-heroicon-o-key class="h-6 w-6" />
+                                <x-heroicon name="o-key" class="h-6 w-6" />
                                 <span class="ml-2 text-gray-50">
                                     {{ __("SSH Keys") }}
                                 </span>
@@ -142,7 +142,7 @@ class="left-0 top-0 min-h-screen w-64 flex-none bg-gray-800 p-3 dark:border-r-2
                                 :href="route('servers.services', ['server' => $server])"
                                 :active="request()->routeIs('servers.services')"
                             >
-                                <x-heroicon-o-cog-6-tooth class="h-6 w-6" />
+                                <x-heroicon name="o-cog-6-tooth" class="h-6 w-6" />
                                 <span class="ml-2 text-gray-50">
                                     {{ __("Services") }}
                                 </span>
@@ -152,7 +152,7 @@ class="left-0 top-0 min-h-screen w-64 flex-none bg-gray-800 p-3 dark:border-r-2
                                 :href="route('servers.settings', ['server' => $server])"
                                 :active="request()->routeIs('servers.settings')"
                             >
-                                <x-heroicon-o-wrench-screwdriver class="h-6 w-6" />
+                                <x-heroicon name="o-wrench-screwdriver" class="h-6 w-6" />
                                 <span class="ml-2 text-gray-50">
                                     {{ __("Settings") }}
                                 </span>
@@ -161,7 +161,7 @@ class="left-0 top-0 min-h-screen w-64 flex-none bg-gray-800 p-3 dark:border-r-2
                                 :href="route('servers.logs', ['server' => $server])"
                                 :active="request()->routeIs('servers.logs')"
                             >
-                                <x-heroicon-o-square-3-stack-3d class="h-6 w-6" />
+                                <x-heroicon name="o-square-3-stack-3d" class="h-6 w-6" />
                                 <span class="ml-2 text-gray-50">
                                     {{ __("Logs") }}
                                 </span>
diff --git a/resources/views/layouts/partials/color-scheme.blade.php b/resources/views/layouts/partials/color-scheme.blade.php
index 68ff9d4..cc97294 100644
--- a/resources/views/layouts/partials/color-scheme.blade.php
+++ b/resources/views/layouts/partials/color-scheme.blade.php
@@ -36,27 +36,30 @@ class="flex items-center text-gray-600 dark:text-gray-300"
             <x-dropdown>
                 <x-slot name="trigger">
                     <button type="button" class="flex items-center">
-                        <x-heroicon-o-moon x-show="isDark()" class="h-7 w-7" />
-                        <x-heroicon-o-sun x-show="!isDark()" class="h-7 w-7" />
+                        <x-heroicon name="o-moon" x-show="isDark()" class="h-7 w-7" />
+                        <x-heroicon name="o-sun" x-show="!isDark()" class="h-7 w-7" />
                     </button>
                 </x-slot>
                 <x-slot name="content">
                     <x-dropdown-link class="cursor-pointer" x-on:click="changeTheme('dark')">
-                        <x-heroicon-o-moon
+                        <x-heroicon
+                            name="o-moon"
                             class="mr-2 h-5 w-5"
                             x-bind:class="theme === 'dark' ? 'text-primary-600' : ''"
                         />
                         {{ __("Dark") }}
                     </x-dropdown-link>
                     <x-dropdown-link class="cursor-pointer" x-on:click="changeTheme('light')">
-                        <x-heroicon-o-sun
+                        <x-heroicon
+                            name="o-sun"
                             class="mr-2 h-5 w-5"
                             x-bind:class="theme === 'light' ? 'text-primary-600' : ''"
                         />
                         {{ __("Light") }}
                     </x-dropdown-link>
                     <x-dropdown-link class="cursor-pointer" x-on:click="changeTheme('system')">
-                        <x-heroicon-o-computer-desktop
+                        <x-heroicon
+                            name="o-computer-desktop"
                             class="mr-2 h-5 w-5"
                             x-bind:class="theme === 'system' ? 'text-primary-600' : ''"
                         />
diff --git a/resources/views/layouts/server.blade.php b/resources/views/layouts/server.blade.php
index b499af0..d6d3572 100644
--- a/resources/views/layouts/server.blade.php
+++ b/resources/views/layouts/server.blade.php
@@ -19,7 +19,8 @@ class="flex items-center text-sm"
                     "
                 >
                     <div x-show="copied" class="mr-1 flex items-center">
-                        <x-heroicon-o-clipboard-document-check
+                        <x-heroicon
+                            name="o-clipboard-document-check"
                             class="h-4 w-4 font-bold text-primary-600 dark:text-white"
                         />
                     </div>
diff --git a/resources/views/layouts/site.blade.php b/resources/views/layouts/site.blade.php
index a5c32b1..e5ac148 100644
--- a/resources/views/layouts/site.blade.php
+++ b/resources/views/layouts/site.blade.php
@@ -16,7 +16,7 @@
         <div class="flex items-end">
             <div class="flex h-20 flex-col items-end justify-center">
                 <div class="flex items-center">
-                    <x-heroicon-o-globe-alt class="mr-1 h-5 w-5 text-gray-500" />
+                    <x-heroicon name="o-globe-alt" class="mr-1 h-5 w-5 text-gray-500" />
                     @include("sites.partials.site-status")
                 </div>
                 <x-input-label class="mt-1 cursor-pointer" x-data="{ copied: false }">
@@ -31,7 +31,8 @@ class="flex items-center text-sm"
                         "
                     >
                         <div x-show="copied" class="mr-1 flex items-center">
-                            <x-heroicon-o-clipboard-document-check
+                            <x-heroicon
+                                name="o-clipboard-document-check"
                                 class="h-4 w-4 font-bold text-primary-600 dark:text-white"
                             />
                         </div>
@@ -42,7 +43,7 @@ class="h-4 w-4 font-bold text-primary-600 dark:text-white"
             <div class="mx-5 h-20 border-r border-gray-200 dark:border-gray-800"></div>
             <div class="flex h-20 flex-col items-end justify-center">
                 <div class="flex items-center">
-                    <x-heroicon-o-server class="mr-1 h-5 w-5 text-gray-500" />
+                    <x-heroicon name="o-server" class="mr-1 h-5 w-5 text-gray-500" />
                     @include("servers.partials.server-status", ["server" => $site->server])
                 </div>
                 <x-input-label class="mt-1 cursor-pointer" x-data="{ copied: false }">
@@ -57,7 +58,8 @@ class="flex items-center text-sm"
                         "
                     >
                         <div x-show="copied" class="mr-1 flex items-center">
-                            <x-heroicon-o-clipboard-document-check
+                            <x-heroicon
+                                name="o-clipboard-document-check"
                                 class="h-4 w-4 font-bold text-primary-600 dark:text-white"
                             />
                         </div>
@@ -79,7 +81,7 @@ class="h-4 w-4 font-bold text-primary-600 dark:text-white"
                 :href="route('servers.sites.show', ['server' => $site->server, 'site' => $site])"
                 :active="request()->routeIs('servers.sites.show')"
             >
-                <x-heroicon-o-globe-alt class="mr-2 h-5 w-5" />
+                <x-heroicon name="o-globe-alt" class="mr-2 h-5 w-5" />
                 {{ __("Application") }}
             </x-secondary-sidebar-link>
             @if ($site->hasFeature(SiteFeature::SSL))
@@ -87,7 +89,7 @@ class="h-4 w-4 font-bold text-primary-600 dark:text-white"
                     :href="route('servers.sites.ssl', ['server' => $site->server, 'site' => $site])"
                     :active="request()->routeIs('servers.sites.ssl')"
                 >
-                    <x-heroicon-o-lock-closed class="mr-2 h-5 w-5" />
+                    <x-heroicon name="o-lock-closed" class="mr-2 h-5 w-5" />
                     {{ __("SSL") }}
                 </x-secondary-sidebar-link>
             @endif
@@ -97,7 +99,7 @@ class="h-4 w-4 font-bold text-primary-600 dark:text-white"
                     :href="route('servers.sites.queues', ['server' => $site->server, 'site' => $site])"
                     :active="request()->routeIs('servers.sites.queues')"
                 >
-                    <x-heroicon-o-queue-list class="mr-2 h-5 w-5" />
+                    <x-heroicon name="o-queue-list" class="mr-2 h-5 w-5" />
                     {{ __("Queues") }}
                 </x-secondary-sidebar-link>
             @endif
@@ -106,14 +108,14 @@ class="h-4 w-4 font-bold text-primary-600 dark:text-white"
                 :href="route('servers.sites.settings', ['server' => $site->server, 'site' => $site])"
                 :active="request()->routeIs('servers.sites.settings')"
             >
-                <x-heroicon-o-cog-6-tooth class="mr-2 h-5 w-5" />
+                <x-heroicon name="o-cog-6-tooth" class="mr-2 h-5 w-5" />
                 {{ __("Settings") }}
             </x-secondary-sidebar-link>
             <x-secondary-sidebar-link
                 :href="route('servers.sites.logs', ['server' => $site->server, 'site' => $site])"
                 :active="request()->routeIs('servers.sites.logs')"
             >
-                <x-heroicon-o-square-3-stack-3d class="mr-2 h-5 w-5" />
+                <x-heroicon name="o-square-3-stack-3d" class="mr-2 h-5 w-5" />
                 {{ __("Logs") }}
             </x-secondary-sidebar-link>
         </div>
diff --git a/resources/views/php/partials/default-cli.blade.php b/resources/views/php/partials/default-cli.blade.php
index cffbb5f..57bfad0 100644
--- a/resources/views/php/partials/default-cli.blade.php
+++ b/resources/views/php/partials/default-cli.blade.php
@@ -18,7 +18,7 @@
                         <x-slot name="trigger">
                             <x-secondary-button>
                                 {{ __("Change") }}
-                                <x-heroicon-o-chevron-up-down class="ml-1 h-5 w-5" />
+                                <x-heroicon name="o-chevron-up-down" class="ml-1 h-5 w-5" />
                             </x-secondary-button>
                         </x-slot>
                         <x-slot name="content">
diff --git a/resources/views/php/partials/install-new-php.blade.php b/resources/views/php/partials/install-new-php.blade.php
index fd1b1db..88c9fe9 100644
--- a/resources/views/php/partials/install-new-php.blade.php
+++ b/resources/views/php/partials/install-new-php.blade.php
@@ -2,7 +2,7 @@
     <x-slot name="trigger">
         <x-primary-button hx-disable>
             {{ __("Install PHP") }}
-            <x-heroicon-o-chevron-up-down class="ml-1 h-5 w-5" />
+            <x-heroicon name="o-chevron-up-down" class="ml-1 h-5 w-5" />
         </x-primary-button>
     </x-slot>
 
diff --git a/resources/views/php/partials/installed-versions.blade.php b/resources/views/php/partials/installed-versions.blade.php
index 2bb3dda..824a116 100644
--- a/resources/views/php/partials/installed-versions.blade.php
+++ b/resources/views/php/partials/installed-versions.blade.php
@@ -27,7 +27,7 @@
                                         <x-slot name="trigger">
                                             <x-secondary-button>
                                                 {{ __("Actions") }}
-                                                <x-heroicon-o-chevron-up-down class="ml-1 h-5 w-5" />
+                                                <x-heroicon name="o-chevron-up-down" class="ml-1 h-5 w-5" />
                                             </x-secondary-button>
                                         </x-slot>
                                         <x-slot name="content">
diff --git a/resources/views/queues/partials/queues-list.blade.php b/resources/views/queues/partials/queues-list.blade.php
index fe5aed0..dcdcf36 100644
--- a/resources/views/queues/partials/queues-list.blade.php
+++ b/resources/views/queues/partials/queues-list.blade.php
@@ -29,7 +29,7 @@
                                     hx-select="#queue-actions-{{ $queue->id }}"
                                     data-tooltip="Stop"
                                 >
-                                    <x-heroicon-o-stop class="h-5 w-5" />
+                                    <x-heroicon name="o-stop" class="h-5 w-5" />
                                 </x-icon-button>
                                 <x-icon-button
                                     id="resume-{{ $queue->id }}"
@@ -38,7 +38,7 @@
                                     hx-select="#queue-actions-{{ $queue->id }}"
                                     data-tooltip="Start"
                                 >
-                                    <x-heroicon-o-play class="h-5 w-5" />
+                                    <x-heroicon name="o-play" class="h-5 w-5" />
                                 </x-icon-button>
                                 <x-icon-button
                                     id="restart-{{ $queue->id }}"
@@ -47,7 +47,7 @@
                                     hx-select="#queue-actions-{{ $queue->id }}"
                                     data-tooltip="Restart"
                                 >
-                                    <x-heroicon-o-arrow-path class="h-5 w-5" />
+                                    <x-heroicon name="o-arrow-path" class="h-5 w-5" />
                                 </x-icon-button>
                                 <x-icon-button
                                     id="logs-{{ $queue->id }}"
@@ -57,13 +57,13 @@
                                     hx-select="#log-content"
                                     data-tooltip="Logs"
                                 >
-                                    <x-heroicon-o-square-3-stack-3d class="h-5 w-5" />
+                                    <x-heroicon name="o-square-3-stack-3d" class="h-5 w-5" />
                                 </x-icon-button>
                                 <x-icon-button
                                     x-on:click="deleteAction = '{{ route('servers.sites.queues.destroy', ['server' => $server, 'site' => $site, 'queue' => $queue]) }}'; $dispatch('open-modal', 'delete-queue')"
                                     data-tooltip="Delete"
                                 >
-                                    <x-heroicon-o-trash class="h-5 w-5" />
+                                    <x-heroicon name="o-trash" class="h-5 w-5" />
                                 </x-icon-button>
                             </div>
                         </div>
diff --git a/resources/views/server-logs/partials/logs-list.blade.php b/resources/views/server-logs/partials/logs-list.blade.php
index bb120d6..13c5093 100644
--- a/resources/views/server-logs/partials/logs-list.blade.php
+++ b/resources/views/server-logs/partials/logs-list.blade.php
@@ -36,7 +36,7 @@
                             hx-target="#log-content"
                             hx-select="#log-content"
                         >
-                            <x-heroicon-o-eye class="h-5 w-5" />
+                            <x-heroicon name="o-eye" class="h-5 w-5" />
                         </x-icon-button>
                     </x-td>
                 </tr>
diff --git a/resources/views/server-ssh-keys/partials/server-keys-list.blade.php b/resources/views/server-ssh-keys/partials/server-keys-list.blade.php
index 9662402..3888116 100644
--- a/resources/views/server-ssh-keys/partials/server-keys-list.blade.php
+++ b/resources/views/server-ssh-keys/partials/server-keys-list.blade.php
@@ -32,7 +32,7 @@
                                 <x-icon-button
                                     x-on:click="deleteAction = '{{ route('servers.ssh-keys.destroy', ['server' => $server, 'sshKey' => $key]) }}'; $dispatch('open-modal', 'delete-key')"
                                 >
-                                    <x-heroicon-o-trash class="h-5 w-5" />
+                                    <x-heroicon name="o-trash" class="h-5 w-5" />
                                 </x-icon-button>
                             </div>
                         </div>
diff --git a/resources/views/settings/notification-channels/partials/channels-list.blade.php b/resources/views/settings/notification-channels/partials/channels-list.blade.php
index 8757474..74d995a 100644
--- a/resources/views/settings/notification-channels/partials/channels-list.blade.php
+++ b/resources/views/settings/notification-channels/partials/channels-list.blade.php
@@ -26,7 +26,7 @@
                             <x-icon-button
                                 x-on:click="deleteAction = '{{ route('notification-channels.delete', $channel->id) }}'; $dispatch('open-modal', 'delete-channel')"
                             >
-                                <x-heroicon-o-trash class="h-5 w-5" />
+                                <x-heroicon name="o-trash" class="h-5 w-5" />
                             </x-icon-button>
                         </div>
                     </div>
diff --git a/resources/views/settings/notification-channels/partials/icons/email.blade.php b/resources/views/settings/notification-channels/partials/icons/email.blade.php
index 68f6912..90d21d7 100644
--- a/resources/views/settings/notification-channels/partials/icons/email.blade.php
+++ b/resources/views/settings/notification-channels/partials/icons/email.blade.php
@@ -1 +1 @@
-<x-heroicon-o-envelope class="h-10 w-10" />
+<x-heroicon name="o-envelope" class="h-10 w-10" />
diff --git a/resources/views/settings/projects/partials/edit-project.blade.php b/resources/views/settings/projects/partials/edit-project.blade.php
index b5e99b5..8e57335 100644
--- a/resources/views/settings/projects/partials/edit-project.blade.php
+++ b/resources/views/settings/projects/partials/edit-project.blade.php
@@ -1,6 +1,6 @@
 <div>
     <x-icon-button x-data="" x-on:click.prevent="$dispatch('open-modal', 'edit-project-{{ $project->id }}')">
-        <x-heroicon-o-pencil class="h-5 w-5" />
+        <x-heroicon name="o-pencil" class="h-5 w-5" />
     </x-icon-button>
 
     <x-modal name="edit-project-{{ $project->id }}">
diff --git a/resources/views/settings/projects/partials/projects-list.blade.php b/resources/views/settings/projects/partials/projects-list.blade.php
index 730f409..4b3646e 100644
--- a/resources/views/settings/projects/partials/projects-list.blade.php
+++ b/resources/views/settings/projects/partials/projects-list.blade.php
@@ -29,7 +29,7 @@
                     <x-icon-button
                         x-on:click="deleteAction = '{{ route('projects.delete', $project) }}'; $dispatch('open-modal', 'delete-project')"
                     >
-                        <x-heroicon-o-trash class="h-5 w-5" />
+                        <x-heroicon name="o-trash" class="h-5 w-5" />
                     </x-icon-button>
                 </div>
             </x-item-card>
diff --git a/resources/views/settings/server-providers/partials/providers-list.blade.php b/resources/views/settings/server-providers/partials/providers-list.blade.php
index 5ab8fc1..09ca847 100644
--- a/resources/views/settings/server-providers/partials/providers-list.blade.php
+++ b/resources/views/settings/server-providers/partials/providers-list.blade.php
@@ -28,7 +28,7 @@ class="h-10 w-10"
                             <x-icon-button
                                 x-on:click="deleteAction = '{{ route('server-providers.delete', $provider->id) }}'; $dispatch('open-modal', 'delete-provider')"
                             >
-                                <x-heroicon-o-trash class="h-5 w-5" />
+                                <x-heroicon name="o-trash" class="h-5 w-5" />
                             </x-icon-button>
                         </div>
                     </div>
diff --git a/resources/views/settings/source-controls/partials/source-controls-list.blade.php b/resources/views/settings/source-controls/partials/source-controls-list.blade.php
index 5f01f24..8453102 100644
--- a/resources/views/settings/source-controls/partials/source-controls-list.blade.php
+++ b/resources/views/settings/source-controls/partials/source-controls-list.blade.php
@@ -24,7 +24,7 @@
                             <x-icon-button
                                 x-on:click="deleteAction = '{{ route('source-controls.delete', $sourceControl->id) }}'; $dispatch('open-modal', 'delete-source-control')"
                             >
-                                <x-heroicon-o-trash class="h-5 w-5" />
+                                <x-heroicon name="o-trash" class="h-5 w-5" />
                             </x-icon-button>
                         </div>
                     </div>
diff --git a/resources/views/settings/ssh-keys/partials/keys-list.blade.php b/resources/views/settings/ssh-keys/partials/keys-list.blade.php
index 6c219b3..c162c69 100644
--- a/resources/views/settings/ssh-keys/partials/keys-list.blade.php
+++ b/resources/views/settings/ssh-keys/partials/keys-list.blade.php
@@ -23,7 +23,7 @@
                             <x-icon-button
                                 x-on:click="deleteAction = '{{ route('ssh-keys.delete', $key->id) }}'; $dispatch('open-modal', 'delete-ssh-key')"
                             >
-                                <x-heroicon-o-trash class="h-5 w-5" />
+                                <x-heroicon name="o-trash" class="h-5 w-5" />
                             </x-icon-button>
                         </div>
                     </div>
diff --git a/resources/views/settings/storage-providers/partials/providers-list.blade.php b/resources/views/settings/storage-providers/partials/providers-list.blade.php
index e4b02a5..bb83a17 100644
--- a/resources/views/settings/storage-providers/partials/providers-list.blade.php
+++ b/resources/views/settings/storage-providers/partials/providers-list.blade.php
@@ -45,7 +45,7 @@ class="h-10 w-10"
                             <x-icon-button
                                 x-on:click="deleteAction = '{{ route('storage-providers.delete', $provider->id) }}'; $dispatch('open-modal', 'delete-provider')"
                             >
-                                <x-heroicon-o-trash class="h-5 w-5" />
+                                <x-heroicon name="o-trash" class="h-5 w-5" />
                             </x-icon-button>
                         </div>
                     </div>
diff --git a/resources/views/ssls/partials/ssls-list.blade.php b/resources/views/ssls/partials/ssls-list.blade.php
index 41d0510..04cbf07 100644
--- a/resources/views/ssls/partials/ssls-list.blade.php
+++ b/resources/views/ssls/partials/ssls-list.blade.php
@@ -34,7 +34,7 @@
                                         <x-icon-button
                                             x-on:click="deleteAction = '{{ route('servers.sites.ssl.destroy', ['server' => $server, 'site' => $site, 'ssl' => $ssl]) }}'; $dispatch('open-modal', 'delete-ssl')"
                                         >
-                                            <x-heroicon-o-trash class="h-5 w-5" />
+                                            <x-heroicon name="o-trash" class="h-5 w-5" />
                                         </x-icon-button>
                                     </div>
                                 </div>
diff --git a/update.sh b/update.sh
index 25943de..5c2649d 100755
--- a/update.sh
+++ b/update.sh
@@ -11,7 +11,6 @@ php artisan cache:clear
 php artisan view:clear
 
 php artisan config:cache
-php artisan icons:cache
 
 sudo supervisorctl restart worker:*