diff --git a/app/Providers/FeatureServiceProvider.php b/app/Providers/FeatureServiceProvider.php
index 002bd0bd..fe49ef64 100644
--- a/app/Providers/FeatureServiceProvider.php
+++ b/app/Providers/FeatureServiceProvider.php
@@ -77,7 +77,7 @@ private function getFeatures(): array
             //     'title' => 'Example Feature',
             //     'description' => 'Description of the example feature.',
             //     'group' => 'General',
-            //     'icon' => 'heroicon-o-beaker',
+            //     'icon' => 'hugeicons-test-tube-01',
             // ],
         ];
     }
diff --git a/app/View/Components/Partials/FlashMessage.php b/app/View/Components/Partials/FlashMessage.php
index ee378656..24e0087d 100644
--- a/app/View/Components/Partials/FlashMessage.php
+++ b/app/View/Components/Partials/FlashMessage.php
@@ -98,10 +98,10 @@ public function buttonClasses(): string
     public function icon(): string
     {
         return match ($this->type) {
-            'success' => 'heroicon-o-check-circle',
-            'warning' => 'heroicon-o-exclamation-triangle',
-            'error' => 'heroicon-o-x-circle',
-            default => 'heroicon-o-information-circle',
+            'success' => 'hugeicons-checkmark-circle-02',
+            'warning' => 'hugeicons-alert-02',
+            'error' => 'hugeicons-cancel-circle',
+            default => 'hugeicons-information-circle',
         };
     }
 }
diff --git a/composer.json b/composer.json
index ace30142..1732b146 100644
--- a/composer.json
+++ b/composer.json
@@ -6,7 +6,7 @@
     "license": "MIT",
     "require": {
         "php": "^8.2",
-        "blade-ui-kit/blade-heroicons": "^2.3",
+        "afatmustafa/blade-hugeicons": "^0.0.3",
         "danharrin/livewire-rate-limiting": "^1.3",
         "diglactic/laravel-breadcrumbs": "^9.0",
         "jenssegers/agent": "^2.6",
diff --git a/composer.lock b/composer.lock
index caa8555f..beb33a78 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,69 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "a43dbeed5132f6d849891006d052a382",
+    "content-hash": "bd1e55e32d50cb02370e42d9da42d745",
     "packages": [
+        {
+            "name": "afatmustafa/blade-hugeicons",
+            "version": "v0.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/afatmustafa/blade-hugeicons.git",
+                "reference": "9fc946c2d9df901a46e891074a228a16b5834e1b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/afatmustafa/blade-hugeicons/zipball/9fc946c2d9df901a46e891074a228a16b5834e1b",
+                "reference": "9fc946c2d9df901a46e891074a228a16b5834e1b",
+                "shasum": ""
+            },
+            "require": {
+                "blade-ui-kit/blade-icons": "^1.1",
+                "illuminate/support": "^10.0|^11.0",
+                "php": "^8.1"
+            },
+            "require-dev": {
+                "orchestra/testbench": "^8.0|^9.0",
+                "phpunit/phpunit": "^10.0|^11.0"
+            },
+            "type": "library",
+            "extra": {
+                "laravel": {
+                    "providers": [
+                        "Afatmustafa\\HugeIcons\\BladeHugeIconsServiceProvider"
+                    ]
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Afatmustafa\\HugeIcons\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mustafa Afat",
+                    "email": "mustafa@afat.me",
+                    "homepage": "https://afat.me",
+                    "role": "Developer"
+                }
+            ],
+            "description": "A package to easily make use of Hugeicons(Free version) in your Laravel Blade views.",
+            "homepage": "https://github.com/afatmustafa/blade-hugeicons",
+            "keywords": [
+                "Hugeicons",
+                "blade",
+                "laravel"
+            ],
+            "support": {
+                "issues": "https://github.com/afatmustafa/blade-hugeicons/issues",
+                "source": "https://github.com/afatmustafa/blade-hugeicons/tree/v0.0.3"
+            },
+            "time": "2024-05-31T06:37:08+00:00"
+        },
         {
             "name": "aws/aws-crt-php",
             "version": "v1.2.6",
@@ -212,75 +273,6 @@
             },
             "time": "2024-04-18T11:16:25+00:00"
         },
-        {
-            "name": "blade-ui-kit/blade-heroicons",
-            "version": "2.4.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/blade-ui-kit/blade-heroicons.git",
-                "reference": "a7c377a4ef88cd54712e3e15cbed30446820da0b"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/blade-ui-kit/blade-heroicons/zipball/a7c377a4ef88cd54712e3e15cbed30446820da0b",
-                "reference": "a7c377a4ef88cd54712e3e15cbed30446820da0b",
-                "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.4.0"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/sponsors/driesvints",
-                    "type": "github"
-                },
-                {
-                    "url": "https://www.paypal.com/paypalme/driesvints",
-                    "type": "paypal"
-                }
-            ],
-            "time": "2024-07-16T07:00:01+00:00"
-        },
         {
             "name": "blade-ui-kit/blade-icons",
             "version": "1.7.1",
diff --git a/resources/views/account/partials/sidebar.blade.php b/resources/views/account/partials/sidebar.blade.php
index 061f08a6..04b3a7a9 100644
--- a/resources/views/account/partials/sidebar.blade.php
+++ b/resources/views/account/partials/sidebar.blade.php
@@ -7,7 +7,7 @@
         <li>
             <x-sidebar-nav-link :href="route('profile')" :active="request()->routeIs('profile')" wire:navigate>
                 <span class="flex items-center">
-                    @svg('heroicon-o-user', 'h-5 w-5 mr-2')
+                    @svg('hugeicons-user', 'h-5 w-5 mr-2')
                     <span>{{ __('My Profile') }}</span>
                 </span>
             </x-sidebar-nav-link>
@@ -15,7 +15,7 @@
         <li>
             <x-sidebar-nav-link :href="route('profile.api')" :active="request()->routeIs('profile.api*')" wire:navigate>
                 <span class="flex items-center">
-                    @svg('heroicon-o-code-bracket', 'h-5 w-5 mr-2')
+                    @svg('hugeicons-ticket-02', 'h-5 w-5 mr-2')
                     <span>{{ __('API Tokens') }}</span>
                 </span>
             </x-sidebar-nav-link>
@@ -23,7 +23,7 @@
         <li>
             <x-sidebar-nav-link :href="route('profile.connections')" :active="request()->routeIs('profile.connections*')" wire:navigate>
                 <span class="flex items-center">
-                    @svg('heroicon-o-puzzle-piece', 'h-5 w-5 mr-2')
+                    @svg('hugeicons-puzzle', 'h-5 w-5 mr-2')
                     <span>{{ __('Connections') }}</span>
                 </span>
             </x-sidebar-nav-link>
@@ -36,7 +36,7 @@
         <li>
             <x-sidebar-nav-link :href="route('profile.mfa')" :active="request()->routeIs('profile.mfa*')" wire:navigate>
                 <span class="flex items-center">
-                    @svg('heroicon-o-lock-closed', 'h-5 w-5 mr-2')
+                    @svg('hugeicons-square-lock-02', 'h-5 w-5 mr-2')
                     <span>{{ __('Two-Factor Auth') }}</span>
                 </span>
             </x-sidebar-nav-link>
@@ -45,7 +45,7 @@
             <li>
                 <x-sidebar-nav-link :href="route('profile.sessions')" :active="request()->routeIs('profile.sessions*')" wire:navigate>
                     <span class="flex items-center">
-                        @svg('heroicon-o-globe-alt', 'h-5 w-5 mr-2')
+                        @svg('hugeicons-gps-signal-01', 'h-5 w-5 mr-2')
                         <span>{{ __('Active Sessions') }}</span>
                     </span>
                 </x-sidebar-nav-link>
@@ -59,7 +59,7 @@
         <li>
             <x-sidebar-nav-link :href="route('tags.index')" :active="request()->routeIs('tags.*')" wire:navigate>
                 <span class="flex items-center">
-                    @svg('heroicon-o-tag', 'h-5 w-5 mr-2')
+                    @svg('hugeicons-tags', 'h-5 w-5 mr-2')
                     <span>{{ __('Manage Tags') }}</span>
                 </span>
             </x-sidebar-nav-link>
@@ -67,7 +67,7 @@
         <li>
             <x-sidebar-nav-link :href="route('notification-streams.index')" :active="request()->routeIs('notification-streams.*')" wire:navigate>
                 <span class="flex items-center">
-                    @svg('heroicon-o-bell', 'h-5 w-5 mr-2')
+                    @svg('hugeicons-notification-02', 'h-5 w-5 mr-2')
                     <span>{{ __('Notifications') }}</span>
                 </span>
             </x-sidebar-nav-link>
@@ -75,7 +75,7 @@
         <li>
             <x-sidebar-nav-link :href="route('profile.quiet-mode')" :active="request()->routeIs('profile.quiet-mode*')" wire:navigate>
                 <span class="flex items-center">
-                    @svg('heroicon-o-bell-snooze', 'h-5 w-5 mr-2')
+                    @svg('hugeicons-notification-snooze-02', 'h-5 w-5 mr-2')
                     <span>{{ __('Quiet Mode') }}</span>
                 </span>
             </x-sidebar-nav-link>
@@ -83,7 +83,7 @@
         <li>
             <x-sidebar-nav-link :href="route('profile.experiments')" :active="request()->routeIs('profile.experiments*')" wire:navigate>
                 <span class="flex items-center">
-                    @svg('heroicon-o-beaker', 'h-5 w-5 mr-2')
+                    @svg('hugeicons-test-tube-01', 'h-5 w-5 mr-2')
                     <span>{{ __('Experiments') }}</span>
                 </span>
             </x-sidebar-nav-link>
@@ -96,7 +96,7 @@
         <li>
             <x-sidebar-nav-link :href="route('profile.help')" :active="request()->routeIs('profile.help*')" wire:navigate>
                 <span class="flex items-center">
-                    @svg('heroicon-o-lifebuoy', 'h-5 w-5 mr-2')
+                    @svg('hugeicons-mentoring', 'h-5 w-5 mr-2')
                     <span>{{ __('Get Help') }}</span>
                 </span>
             </x-sidebar-nav-link>
@@ -104,7 +104,7 @@
         <li>
             <x-sidebar-nav-link :href="route('account.remove-account')" :active="request()->routeIs('account.remove-account')" wire:navigate>
                 <span class="flex items-center">
-                    @svg('heroicon-o-trash', 'h-5 w-5 mr-2')
+                    @svg('hugeicons-user-remove-01', 'h-5 w-5 mr-2')
                     <span>{{ __('Delete Account') }}</span>
                 </span>
             </x-sidebar-nav-link>
diff --git a/resources/views/components/auth-session-error.blade.php b/resources/views/components/auth-session-error.blade.php
index b2d07d17..e404d495 100644
--- a/resources/views/components/auth-session-error.blade.php
+++ b/resources/views/components/auth-session-error.blade.php
@@ -2,7 +2,7 @@
 
 @if ($loginError)
     <div {{ $attributes->merge(['class' => 'font-medium text-sm text-red-600 dark:text-red-400 py-2 px-2 border border-red-200 bg-red-50 rounded-lg text-center']) }}>
-        @svg('heroicon-o-exclamation-triangle', 'w-5 h-5 inline-block me-2')
+        @svg('hugeicons-alert-02', 'w-5 h-5 inline-block me-2')
         {{ $loginError }}
     </div>
 @endif
diff --git a/resources/views/components/chart-card.blade.php b/resources/views/components/chart-card.blade.php
index 2817c947..9ce71895 100644
--- a/resources/views/components/chart-card.blade.php
+++ b/resources/views/components/chart-card.blade.php
@@ -1,5 +1,5 @@
 @props([
-    'icon' => 'heroicon-o-chart-bar',
+    'icon' => 'hugeicons-presentation-bar-chart-01',
     'title',
     'description',
 ])
diff --git a/resources/views/components/form-wrapper.blade.php b/resources/views/components/form-wrapper.blade.php
index 5832051e..8f643890 100644
--- a/resources/views/components/form-wrapper.blade.php
+++ b/resources/views/components/form-wrapper.blade.php
@@ -10,7 +10,7 @@
                     @if (isset($icon))
                         <x-dynamic-component :component="$icon" :class="$iconClass" />
                     @else
-                        @svg('heroicon-o-server', ['class' => $iconClass])
+                        @svg('hugeicons-information-circle', ['class' => $iconClass])
                     @endif
                 </div>
                 <div>
diff --git a/resources/views/components/notification-stream-form.blade.php b/resources/views/components/notification-stream-form.blade.php
index c27bfc40..31f386a0 100644
--- a/resources/views/components/notification-stream-form.blade.php
+++ b/resources/views/components/notification-stream-form.blade.php
@@ -7,7 +7,7 @@
         {{ __('Add or update a Notification Stream.') }}
     </x-slot>
     <x-slot name="icon">
-        heroicon-o-bell
+        hugeicons-notification-02
     </x-slot>
     <form wire:submit.prevent="submit">
         <div class="mt-4 flex flex-col md:flex-row md:space-x-6 space-y-4 md:space-y-0">
diff --git a/resources/views/components/partials/flash-message.blade.php b/resources/views/components/partials/flash-message.blade.php
index 0b192789..399f37fb 100644
--- a/resources/views/components/partials/flash-message.blade.php
+++ b/resources/views/components/partials/flash-message.blade.php
@@ -21,7 +21,7 @@ class="border-l-4 p-4 rounded-r-lg shadow-md {{ $alertClasses() }}"
                 <div class="-mx-1.5 -my-1.5">
                     <button @click="show = false" type="button" class="inline-flex rounded-full p-1.5 hover:bg-opacity-20 focus:outline-none focus:ring-2 focus:ring-offset-2 {{ $buttonClasses() }}">
                         <span class="sr-only">Dismiss</span>
-                        @svg('heroicon-o-x-mark', 'h-5 w-5')
+                        @svg('hugeicons-cancel-01', 'h-5 w-5')
                     </button>
                 </div>
             </div>
diff --git a/resources/views/components/responsive-theme-switcher.blade.php b/resources/views/components/responsive-theme-switcher.blade.php
index 014a87ca..2d177867 100644
--- a/resources/views/components/responsive-theme-switcher.blade.php
+++ b/resources/views/components/responsive-theme-switcher.blade.php
@@ -28,7 +28,7 @@ class="px-4 py-3 border-t border-gray-700"
             :class="{'bg-primary-600': theme === 'light', 'bg-gray-600': theme !== 'light'}"
             class="flex-1 px-3 py-2 rounded-md text-sm font-medium text-white transition-colors duration-200"
         >
-            @svg('heroicon-o-sun', 'w-5 h-5 mx-auto')
+            @svg('hugeicons-sun-02', 'w-5 h-5 mx-auto')
             <span class="sr-only">{{ __('Light') }}</span>
         </button>
         <button
@@ -36,7 +36,7 @@ class="flex-1 px-3 py-2 rounded-md text-sm font-medium text-white transition-col
             :class="{'bg-primary-600': theme === 'dark', 'bg-gray-600': theme !== 'dark'}"
             class="flex-1 px-3 py-2 rounded-md text-sm font-medium text-white transition-colors duration-200"
         >
-            @svg('heroicon-o-moon', 'w-5 h-5 mx-auto')
+            @svg('hugeicons-moon-02', 'w-5 h-5 mx-auto')
             <span class="sr-only">{{ __('Dark') }}</span>
         </button>
         <button
@@ -44,7 +44,7 @@ class="flex-1 px-3 py-2 rounded-md text-sm font-medium text-white transition-col
             :class="{'bg-primary-600': theme === 'system', 'bg-gray-600': theme !== 'system'}"
             class="flex-1 px-3 py-2 rounded-md text-sm font-medium text-white transition-colors duration-200"
         >
-            @svg('heroicon-o-computer-desktop', 'w-5 h-5 mx-auto')
+            @svg('hugeicons-computer', 'w-5 h-5 mx-auto')
             <span class="sr-only">{{ __('System') }}</span>
         </button>
     </div>
diff --git a/resources/views/components/select.blade.php b/resources/views/components/select.blade.php
index c8dec878..ad21fcb2 100644
--- a/resources/views/components/select.blade.php
+++ b/resources/views/components/select.blade.php
@@ -32,7 +32,7 @@
 
     @if ($errors->has($name))
         <div class="absolute inset-y-0 right-0 pr-8 flex items-center pointer-events-none">
-            @svg('heroicon-o-exclamation-triangle', ['class' => 'w-5 h-5 text-red-600'])
+            @svg('hugeicons-alert-02', ['class' => 'w-5 h-5 text-red-600'])
         </div>
     @endif
 </div>
diff --git a/resources/views/components/stat-card.blade.php b/resources/views/components/stat-card.blade.php
index 51748b86..a1596c2f 100644
--- a/resources/views/components/stat-card.blade.php
+++ b/resources/views/components/stat-card.blade.php
@@ -1,5 +1,5 @@
 @props([
-    'icon' => 'heroicon-o-question-mark-circle',
+    'icon' => 'hugeicons-information-circle',
     'title',
     'description',
 ])
diff --git a/resources/views/components/text-input.blade.php b/resources/views/components/text-input.blade.php
index dc1c19c6..589698e2 100644
--- a/resources/views/components/text-input.blade.php
+++ b/resources/views/components/text-input.blade.php
@@ -15,7 +15,7 @@
 
     @if ($errors->has($name))
         <div class="absolute inset-y-0 {{ $errorIconClass }} flex items-center pointer-events-none">
-            @svg('heroicon-o-exclamation-triangle', ['class' => 'w-5 h-5 text-red-600'])
+            @svg('hugeicons-alert-02', ['class' => 'w-5 h-5 text-red-600'])
         </div>
     @endif
 </div>
diff --git a/resources/views/components/textarea.blade.php b/resources/views/components/textarea.blade.php
index db427275..9e357cfb 100644
--- a/resources/views/components/textarea.blade.php
+++ b/resources/views/components/textarea.blade.php
@@ -31,7 +31,7 @@
 
     @if ($hasError)
         <div class="absolute top-2 right-2 flex items-center pointer-events-none">
-            @svg('heroicon-o-exclamation-triangle', ['class' => 'w-5 h-5 text-red-600'])
+            @svg('hugeicons-alert-02', ['class' => 'w-5 h-5 text-red-600'])
         </div>
     @endif
 </div>
diff --git a/resources/views/components/theme-switcher.blade.php b/resources/views/components/theme-switcher.blade.php
index eca09886..b4184b01 100644
--- a/resources/views/components/theme-switcher.blade.php
+++ b/resources/views/components/theme-switcher.blade.php
@@ -4,15 +4,22 @@
         class="mr-2.5 flex items-center text-sm font-medium text-gray-50 hover:text-gray-100 focus:outline-none transition duration-150 ease-in-out"
     >
         <span class="sr-only">{{ __('Toggle theme') }}</span>
-        <svg x-show="theme === 'light'" class="w-5 h-5" fill="none" viewBox="0 0 24 24" stroke="currentColor">
-            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 3v1m0 16v1m9-9h-1M4 12H3m15.364 6.364l-.707-.707M6.343 6.343l-.707-.707m12.728 0l-.707.707M6.343 17.657l-.707.707M16 12a4 4 0 11-8 0 4 4 0 018 0z" />
+        <svg x-show="theme === 'light'" class="w-5 h-5" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24" fill="none">
+            <path d="M17 12C17 14.7614 14.7614 17 12 17C9.23858 17 7 14.7614 7 12C7 9.23858 9.23858 7 12 7C14.7614 7 17 9.23858 17 12Z" stroke="currentColor" stroke-width="1.5" />
+            <path d="M12 2C11.6227 2.33333 11.0945 3.2 12 4M12 20C12.3773 20.3333 12.9055 21.2 12 22M19.5 4.50271C18.9685 4.46982 17.9253 4.72293 18.0042 5.99847M5.49576 17.5C5.52865 18.0315 5.27555 19.0747 4 18.9958M5.00271 4.5C4.96979 5.03202 5.22315 6.0763 6.5 5.99729M18 17.5026C18.5315 17.4715 19.5747 17.7108 19.4958 18.9168M22 12C21.6667 11.6227 20.8 11.0945 20 12M4 11.5C3.66667 11.8773 2.8 12.4055 2 11.5" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" />
         </svg>
-        <svg x-show="theme === 'dark'" class="w-5 h-5" fill="none" viewBox="0 0 24 24" stroke="currentColor">
-            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M20.354 15.354A9 9 0 018.646 3.646 9.003 9.003 0 0012 21a9.003 9.003 0 008.354-5.646z" />
+
+        <svg x-show="theme === 'dark'" class="w-5 h-5" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24" fill="none">
+            <path d="M21.5 14.0784C20.3003 14.7189 18.9301 15.0821 17.4751 15.0821C12.7491 15.0821 8.91792 11.2509 8.91792 6.52485C8.91792 5.06986 9.28105 3.69968 9.92163 2.5C5.66765 3.49698 2.5 7.31513 2.5 11.8731C2.5 17.1899 6.8101 21.5 12.1269 21.5C16.6849 21.5 20.503 18.3324 21.5 14.0784Z" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" />
         </svg>
-        <svg x-show="theme === 'system'" class="w-5 h-5" fill="none" viewBox="0 0 24 24" stroke="currentColor">
-            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9.75 17L9 20l-1 1h8l-1-1-.75-3M3 13h18M5 17h14a2 2 0 002-2V5a2 2 0 00-2-2H5a2 2 0 00-2 2v10a2 2 0 002 2z" />
+
+        <svg x-show="theme === 'system'" class="w-5 h-5" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24" fill="none">
+            <path d="M14 2H10C6.72077 2 5.08116 2 3.91891 2.81382C3.48891 3.1149 3.1149 3.48891 2.81382 3.91891C2 5.08116 2 6.72077 2 10C2 13.2792 2 14.9188 2.81382 16.0811C3.1149 16.5111 3.48891 16.8851 3.91891 17.1862C5.08116 18 6.72077 18 10 18H14C17.2792 18 18.9188 18 20.0811 17.1862C20.5111 16.8851 20.8851 16.5111 21.1862 16.0811C22 14.9188 22 13.2792 22 10C22 6.72077 22 5.08116 21.1862 3.91891C20.8851 3.48891 20.5111 3.1149 20.0811 2.81382C18.9188 2 17.2792 2 14 2Z" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" />
+            <path d="M11 15H13" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" />
+            <path d="M14.5 22L14.1845 21.5811C13.4733 20.6369 13.2969 19.1944 13.7468 18M9.5 22L9.8155 21.5811C10.5267 20.6369 10.7031 19.1944 10.2532 18" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" />
+            <path d="M7 22H17" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" />
         </svg>
+
     </button>
 
     <x-modal name="theme-switcher" :focusable="true" maxWidth="md">
@@ -23,7 +30,7 @@ class="mr-2.5 flex items-center text-sm font-medium text-gray-50 hover:text-gray
             {{ __('Choose your visual style') }}
         </x-slot>
         <x-slot name="icon">
-            heroicon-o-swatch
+            hugeicons-swatch
         </x-slot>
         <div class="p-6 transform transition-all sm:max-w-sm sm:w-full">
             <div class="space-y-4">
@@ -89,9 +96,9 @@ function setupThemeSwitcher() {
             },
             getIconPath(icon) {
                 const paths = {
-                    sun: 'M12 3v1m0 16v1m9-9h-1M4 12H3m15.364 6.364l-.707-.707M6.343 6.343l-.707-.707m12.728 0l-.707.707M6.343 17.657l-.707.707M16 12a4 4 0 11-8 0 4 4 0 018 0z',
-                    moon: 'M20.354 15.354A9 9 0 018.646 3.646 9.003 9.003 0 0012 21a9.003 9.003 0 008.354-5.646z',
-                    'computer-desktop': 'M9.75 17L9 20l-1 1h8l-1-1-.75-3M3 13h18M5 17h14a2 2 0 002-2V5a2 2 0 00-2-2H5a2 2 0 00-2 2v10a2 2 0 002 2z'
+                    sun: 'M17 12C17 14.7614 14.7614 17 12 17C9.23858 17 7 14.7614 7 12C7 9.23858 9.23858 7 12 7C14.7614 7 17 9.23858 17 12Z M12 2C11.6227 2.33333 11.0945 3.2 12 4M12 20C12.3773 20.3333 12.9055 21.2 12 22M19.5 4.50271C18.9685 4.46982 17.9253 4.72293 18.0042 5.99847M5.49576 17.5C5.52865 18.0315 5.27555 19.0747 4 18.9958M5.00271 4.5C4.96979 5.03202 5.22315 6.0763 6.5 5.99729M18 17.5026C18.5315 17.4715 19.5747 17.7108 19.4958 18.9168M22 12C21.6667 11.6227 20.8 11.0945 20 12M4 11.5C3.66667 11.8773 2.8 12.4055 2 11.5',
+                    moon: 'M21.5 14.0784C20.3003 14.7189 18.9301 15.0821 17.4751 15.0821C12.7491 15.0821 8.91792 11.2509 8.91792 6.52485C8.91792 5.06986 9.28105 3.69968 9.92163 2.5C5.66765 3.49698 2.5 7.31513 2.5 11.8731C2.5 17.1899 6.8101 21.5 12.1269 21.5C16.6849 21.5 20.503 18.3324 21.5 14.0784Z',
+                    'computer-desktop': 'M14 2H10C6.72077 2 5.08116 2 3.91891 2.81382C3.48891 3.1149 3.1149 3.48891 2.81382 3.91891C2 5.08116 2 6.72077 2 10C2 13.2792 2 14.9188 2.81382 16.0811C3.1149 16.5111 3.48891 16.8851 3.91891 17.1862C5.08116 18 6.72077 18 10 18H14C17.2792 18 18.9188 18 20.0811 17.1862C20.5111 16.8851 20.8851 16.5111 21.1862 16.0811C22 14.9188 22 13.2792 22 10C22 6.72077 22 5.08116 21.1862 3.91891C20.8851 3.48891 20.5111 3.1149 20.0811 2.81382C18.9188 2 17.2792 2 14 2Z M11 15H13 M14.5 22L14.1845 21.5811C13.4733 20.6369 13.2969 19.1944 13.7468 18M9.5 22L9.8155 21.5811C10.5267 20.6369 10.7031 19.1944 10.2532 18 M7 22H17'
                 };
                 return paths[icon] || '';
             }
diff --git a/resources/views/dashboard.blade.php b/resources/views/dashboard.blade.php
index ed0c69bd..8efb4ae8 100644
--- a/resources/views/dashboard.blade.php
+++ b/resources/views/dashboard.blade.php
@@ -47,7 +47,7 @@ class="text-gray-600 dark:text-gray-400 mt-1">
                 <x-chart-card
                     title="{{ __('Monthly Backup Task Activity') }}"
                     description="{{ __('Overview of backup tasks performed each month') }}."
-                    icon="heroicon-o-clock"
+                    icon="hugeicons-clock-01"
                 >
                     <div
                         x-data="{ loaded: false }"
@@ -63,7 +63,7 @@ class="text-gray-600 dark:text-gray-400 mt-1">
                 <x-chart-card
                     title="{{ __('Backup Tasks Categorized by Type') }}"
                     description="{{ __('Distribution of backup tasks across different types') }}."
-                    icon="heroicon-o-document-duplicate"
+                    icon="hugeicons-file-02"
                 >
                     <div
                         x-data="{ loaded: false }"
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index 3d00a315..8d3fe5df 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -114,13 +114,13 @@
                 <div class="flex flex-wrap justify-center sm:justify-start gap-2 mb-2">
                     @if (config('app.env') === 'local')
                         <span class="inline-flex items-center px-2 py-1 text-xs font-medium text-purple-700 bg-purple-100 rounded-full dark:text-purple-300 dark:bg-purple-900">
-                            @svg('heroicon-s-beaker', ['class' => 'h-3 w-3 mr-1'])
+                            @svg('hugeicons-laptop', ['class' => 'h-3 w-3 mr-1'])
                             {{ __('Local') }}
                         </span>
                     @endif
                     @if (config('app.debug'))
                         <span class="inline-flex items-center px-2 py-1 text-xs font-medium text-red-700 bg-red-100 rounded-full dark:text-red-300 dark:bg-red-900">
-                            @svg('heroicon-s-bug-ant', ['class' => 'h-3 w-3 mr-1'])
+                            @svg('hugeicons-bug-01', ['class' => 'h-3 w-3 mr-1'])
                             {{ __('Debug') }}
                         </span>
                     @endif
@@ -131,19 +131,19 @@
                 <ul class="space-y-2">
                     <li>
                         <a href="{{ route('profile') }}" class="text-gray-600 dark:text-gray-300 hover:text-primary-600 dark:hover:text-primary-400 transition duration-150 ease-in-out flex items-center justify-center sm:justify-start">
-                            @svg('heroicon-o-user', ['class' => 'h-5 w-5 mr-2'])
+                            @svg('hugeicons-user', ['class' => 'h-5 w-5 mr-2'])
                             {{ __('My Profile') }}
                         </a>
                     </li>
                     <li>
                         <a href="{{ route('notification-streams.index') }}" class="text-gray-600 dark:text-gray-300 hover:text-primary-600 dark:hover:text-primary-400 transition duration-150 ease-in-out flex items-center justify-center sm:justify-start">
-                            @svg('heroicon-o-bell', ['class' => 'h-5 w-5 mr-2'])
+                            @svg('hugeicons-notification-01', ['class' => 'h-5 w-5 mr-2'])
                             {{ __('Notifications') }}
                         </a>
                     </li>
                     <li>
                         <a href="{{ route('statistics') }}" class="text-gray-600 dark:text-gray-300 hover:text-primary-600 dark:hover:text-primary-400 transition duration-150 ease-in-out flex items-center justify-center sm:justify-start">
-                            @svg('heroicon-o-chart-pie', ['class' => 'h-5 w-5 mr-2'])
+                            @svg('hugeicons-analytics-01', ['class' => 'h-5 w-5 mr-2'])
                             {{ __('Statistics') }}
                         </a>
                     </li>
@@ -154,19 +154,19 @@
                 <ul class="space-y-2">
                     <li>
                         <a href="https://docs.vanguardbackup.com" target="_blank" rel="noopener noreferrer" class="text-gray-600 dark:text-gray-300 hover:text-primary-600 dark:hover:text-primary-400 transition duration-150 ease-in-out flex items-center justify-center sm:justify-start">
-                            @svg('heroicon-o-book-open', ['class' => 'h-5 w-5 mr-2'])
+                            @svg('hugeicons-notebook', ['class' => 'h-5 w-5 mr-2'])
                             {{ __('Documentation') }}
                         </a>
                     </li>
                     <li>
                         <a href="https://github.com/vanguardbackup/vanguard" target="_blank" rel="noopener noreferrer" class="text-gray-600 dark:text-gray-300 hover:text-primary-600 dark:hover:text-primary-400 transition duration-150 ease-in-out flex items-center justify-center sm:justify-start">
-                            <x-icons.github class="h-5 w-5 mr-2 fill-current"/>
+                            @svg('hugeicons-github', ['class' => 'h-5 w-5 mr-2'])
                             {{ __('GitHub') }}
                         </a>
                     </li>
                     <li>
                         <a href="{{ route('profile.help') }}" class="text-gray-600 dark:text-gray-300 hover:text-primary-600 dark:hover:text-primary-400 transition duration-150 ease-in-out flex items-center justify-center sm:justify-start">
-                            @svg('heroicon-o-lifebuoy', ['class' => 'h-5 w-5 mr-2'])
+                            @svg('hugeicons-mentoring', ['class' => 'h-5 w-5 mr-2'])
                             {{ __('Help Center') }}
                         </a>
                     </li>
@@ -177,19 +177,19 @@
                 <ul class="space-y-2">
                     <li>
                         <a href="https://github.com/vanguardbackup/vanguard/discussions" target="_blank" rel="noopener noreferrer" class="text-gray-600 dark:text-gray-300 hover:text-primary-600 dark:hover:text-primary-400 transition duration-150 ease-in-out flex items-center justify-center sm:justify-start">
-                            @svg('heroicon-o-chat-bubble-left-right', ['class' => 'h-5 w-5 mr-2'])
+                            @svg('hugeicons-chatting-01', ['class' => 'h-5 w-5 mr-2'])
                             {{ __('Discussions') }}
                         </a>
                     </li>
                     <li>
                         <a href="https://github.com/vanguardbackup/vanguard/issues" target="_blank" rel="noopener noreferrer" class="text-gray-600 dark:text-gray-300 hover:text-primary-600 dark:hover:text-primary-400 transition duration-150 ease-in-out flex items-center justify-center sm:justify-start">
-                            @svg('heroicon-o-bug-ant', ['class' => 'h-5 w-5 mr-2'])
+                            @svg('hugeicons-bug-01', ['class' => 'h-5 w-5 mr-2'])
                             {{ __('Report an Issue') }}
                         </a>
                     </li>
                     <li>
                         <a href="https://github.com/vanguardbackup/vanguard/blob/main/CONTRIBUTING.md" target="_blank" rel="noopener noreferrer" class="text-gray-600 dark:text-gray-300 hover:text-primary-600 dark:hover:text-primary-400 transition duration-150 ease-in-out flex items-center justify-center sm:justify-start">
-                            @svg('heroicon-o-hand-raised', ['class' => 'h-5 w-5 mr-2'])
+                            @svg('hugeicons-agreement-01', ['class' => 'h-5 w-5 mr-2'])
                             {{ __('Contribute') }}
                         </a>
                     </li>
diff --git a/resources/views/layouts/guest.blade.php b/resources/views/layouts/guest.blade.php
index 52932166..ff9d1e9c 100644
--- a/resources/views/layouts/guest.blade.php
+++ b/resources/views/layouts/guest.blade.php
@@ -158,93 +158,57 @@ class="absolute top-1/2 left-1/2 transform -translate-x-1/2 -translate-y-1/2 w-9
                 <div class="grid grid-cols-1 md:grid-cols-2 gap-8 mb-12 stagger-animation">
                     <div class="bg-white bg-opacity-10 rounded-lg p-6 hover-lift">
                         <h3 class="text-2xl font-medium mb-4 text-white flex items-center">
-                            <svg class="w-6 h-6 mr-2 text-primary-400" fill="none" stroke="currentColor"
-                                 viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-                                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
-                                      d="M13 10V3L4 14h7v7l9-11h-7z"></path>
-                            </svg>
+                            @svg('hugeicons-zap', 'w-6 h-6 mr-2 text-primary-400')
                             Key Features
                         </h3>
                         <ul class="space-y-2 text-gray-300 font-light">
                             <li class="flex items-center">
-                                <svg class="w-5 h-5 mr-2 text-green-400" fill="none" stroke="currentColor"
-                                     viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-                                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
-                                          d="M5 13l4 4L19 7"></path>
-                                </svg>
+                                @svg('hugeicons-tick-01', 'w-5 h-5 mr-2 text-green-400')
                                 Automated backups
                             </li>
                             <li class="flex items-center">
-                                <svg class="w-5 h-5 mr-2 text-green-400" fill="none" stroke="currentColor"
-                                     viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-                                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
-                                          d="M5 13l4 4L19 7"></path>
-                                </svg>
+                                @svg('hugeicons-tick-01', 'w-5 h-5 mr-2 text-green-400')
                                 Multiple storage options
                             </li>
                             <li class="flex items-center">
-                                <svg class="w-5 h-5 mr-2 text-green-400" fill="none" stroke="currentColor"
-                                     viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-                                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
-                                          d="M5 13l4 4L19 7"></path>
-                                </svg>
+                                @svg('hugeicons-tick-01', 'w-5 h-5 mr-2 text-green-400')
                                 Support for Laravel
                             </li>
                             <li class="flex items-center">
-                                <svg class="w-5 h-5 mr-2 text-green-400" fill="none" stroke="currentColor"
-                                     viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-                                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
-                                          d="M5 13l4 4L19 7"></path>
-                                </svg>
+                                @svg('hugeicons-tick-01', 'w-5 h-5 mr-2 text-green-400')
                                 Powerful scheduling
                             </li>
                         </ul>
                     </div>
                     <div class="bg-white bg-opacity-10 rounded-lg p-6 hover-lift">
                         <h3 class="text-2xl font-medium mb-4 text-white flex items-center">
-                            <svg class="w-6 h-6 mr-2 text-primary-400" fill="none" stroke="currentColor"
-                                 viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-                                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
-                                      d="M17 20h5v-2a3 3 0 00-5.356-1.857M17 20H7m10 0v-2c0-.656-.126-1.283-.356-1.857M7 20H2v-2a3 3 0 015.356-1.857M7 20v-2c0-.656.126-1.283.356-1.857m0 0a5.002 5.002 0 019.288 0M15 7a3 3 0 11-6 0 3 3 0 016 0zm6 3a2 2 0 11-4 0 2 2 0 014 0zM7 10a2 2 0 11-4 0 2 2 0 014 0z"></path>
-                            </svg>
+                            @svg('hugeicons-user-group', 'w-6 h-6 mr-2 text-primary-400')
                             Community
                         </h3>
                         <ul class="space-y-2 text-gray-300 font-light">
                             <li class="flex items-center">
-                                <svg class="w-5 h-5 mr-2 text-white" fill="none" stroke="currentColor"
-                                     viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-                                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
-                                          d="M9 12l2 2 4-4m6 2a9 9 0 11-18 0 9 9 0 0118 0z"></path>
-                                </svg>
+                                @svg('hugeicons-user-group', 'w-5 h-5 mr-2 text-white')
                                 Active contributors
                             </li>
                             <li class="flex items-center">
-                                <svg class="w-5 h-5 mr-2 text-white" fill="none" stroke="currentColor"
-                                     viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-                                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
-                                          d="M9 12l2 2 4-4m6 2a9 9 0 11-18 0 9 9 0 0118 0z"></path>
-                                </svg>
+                                @svg('hugeicons-calendar-02', 'w-5 h-5 mr-2 text-white')
                                 Regular updates
                             </li>
                             <li class="flex items-center">
-                                <svg class="w-5 h-5 mr-2 text-white" fill="none" stroke="currentColor"
-                                     viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-                                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
-                                          d="M9 12l2 2 4-4m6 2a9 9 0 11-18 0 9 9 0 0118 0z"></path>
-                                </svg>
+                                @svg('hugeicons-github', 'w-5 h-5 mr-2 text-white')
                                 GitHub discussions
                             </li>
+                            <li class="flex items-center">
+                                @svg('hugeicons-source-code-square', 'w-5 h-5 mr-2 text-white')
+                                Official SDKs
+                            </li>
                         </ul>
                     </div>
                 </div>
 
                 <div class="mb-16 animate-rise">
                     <h3 class="text-3xl font-semibold mb-6 text-white flex items-center justify-center sm:justify-start">
-                        <svg class="w-8 h-8 mr-3 text-primary-400" fill="none" stroke="currentColor" viewBox="0 0 24 24"
-                             xmlns="http://www.w3.org/2000/svg">
-                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
-                                  d="M11 4a2 2 0 114 0v1a1 1 0 001 1h3a1 1 0 011 1v3a1 1 0 01-1 1h-1a2 2 0 100 4h1a1 1 0 011 1v3a1 1 0 01-1 1h-3a1 1 0 01-1-1v-1a2 2 0 10-4 0v1a1 1 0 01-1 1H7a1 1 0 01-1-1v-3a1 1 0 00-1-1H4a2 2 0 110-4h1a1 1 0 001-1V7a1 1 0 011-1h3a1 1 0 001-1V4z"></path>
-                        </svg>
+                       @svg('hugeicons-puzzle', 'w-8 h-8 mr-3 text-primary-400')
                         Get Involved
                     </h3>
                     <p class="mb-8 text-xl font-light text-gray-300 text-center sm:text-left">Join our open-source
@@ -252,33 +216,20 @@ class="absolute top-1/2 left-1/2 transform -translate-x-1/2 -translate-y-1/2 w-9
                     <div class="grid grid-cols-1 sm:grid-cols-3 gap-6 stagger-animation">
                         <a href="https://github.com/vanguardbackup/vanguard" target="_blank" rel="noopener noreferrer"
                            class="group bg-white text-gray-900 hover:bg-gray-100 p-6 rounded-xl transition duration-300 hover-lift flex flex-col items-center text-center">
-                            <svg class="w-12 h-12 mb-4 text-gray-700 group-hover:text-black" fill="currentColor"
-                                 viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-                                <path fill-rule="evenodd"
-                                      d="M12 2C6.477 2 2 6.484 2 12.017c0 4.425 2.865 8.18 6.839 9.504.5.092.682-.217.682-.483 0-.237-.008-.868-.013-1.703-2.782.605-3.369-1.343-3.369-1.343-.454-1.158-1.11-1.466-1.11-1.466-.908-.62.069-.608.069-.608 1.003.07 1.531 1.032 1.531 1.032.892 1.53 2.341 1.088 2.91.832.092-.647.35-1.088.636-1.338-2.22-.253-4.555-1.113-4.555-4.951 0-1.093.39-1.988 1.029-2.688-.103-.253-.446-1.272.098-2.65 0 0 .84-.27 2.75 1.026A9.564 9.564 0 0112 6.844c.85.004 1.705.115 2.504.337 1.909-1.296 2.747-1.027 2.747-1.027.546 1.379.202 2.398.1 2.651.64.7 1.028 1.595 1.028 2.688 0 3.848-2.339 4.695-4.566 4.943.359.309.678.92.678 1.855 0 1.338-.012 2.419-.012 2.747 0 .268.18.58.688.482A10.019 10.019 0 0022 12.017C22 6.484 17.522 2 12 2z"
-                                      clip-rule="evenodd"></path>
-                            </svg>
+                            @svg('hugeicons-github', 'w-12 h-12 mb-4 text-gray-700 group-hover:text-black')
                             <h4 class="text-xl font-medium mb-2">GitHub Repo</h4>
                             <p class="text-gray-600 group-hover:text-gray-800 font-light">Explore our code and
                                 contribute</p>
                         </a>
                         <a href="https://vanguardbackup.com" target="_blank"
                            class="group bg-gradient-to-br from-primary-500 to-primary-700 text-white p-6 rounded-xl transition duration-300 hover-lift flex flex-col items-center text-center">
-                            <svg class="w-12 h-12 mb-4" fill="none" stroke="currentColor" viewBox="0 0 24 24"
-                                 xmlns="http://www.w3.org/2000/svg">
-                                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
-                                      d="M21 12a9 9 0 01-9 9m9-9a9 9 0 00-9-9m9 9H3m9 9a9 9 0 01-9-9m9 9c1.657 0 3-4.03 3-9s-1.343-9-3-9m0 18c-1.657 0-3-4.03-3-9s1.343-9 3-9m-9 9a9 9 0 019-9"></path>
-                            </svg>
+                            @svg('hugeicons-global', 'w-12 h-12 mb-4')
                             <h4 class="text-xl font-medium mb-2">Website</h4>
                             <p class="text-gray-100 group-hover:text-white font-light">Learn more about Vanguard</p>
                         </a>
                         <a href="https://docs.vanguardbackup.com" target="_blank"
                            class="group bg-gradient-to-br from-primary-500 to-primary-700 text-white p-6 rounded-xl transition duration-300 hover-lift flex flex-col items-center text-center">
-                            <svg class="w-12 h-12 mb-4" fill="none" stroke="currentColor" viewBox="0 0 24 24"
-                                 xmlns="http://www.w3.org/2000/svg">
-                                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
-                                      d="M12 6.253v13m0-13C10.832 5.477 9.246 5 7.5 5S4.168 5.477 3 6.253v13C4.168 18.477 5.754 18 7.5 18s3.332.477 4.5 1.253m0-13C13.168 5.477 14.754 5 16.5 5c1.747 0 3.332.477 4.5 1.253v13C19.832 18.477 18.247 18 16.5 18c-1.746 0-3.332.477-4.5 1.253"></path>
-                            </svg>
+                            @svg('hugeicons-book-open-02', 'w-12 h-12 mb-4')
                             <h4 class="text-xl font-medium mb-2">Documentation</h4>
                             <p class="text-gray-100 group-hover:text-white font-light">Read guides and our FAQ</p>
                         </a>
diff --git a/resources/views/livewire/backup-destinations/check-connection-button.blade.php b/resources/views/livewire/backup-destinations/check-connection-button.blade.php
index 3dfd89b2..57ee9b4a 100644
--- a/resources/views/livewire/backup-destinations/check-connection-button.blade.php
+++ b/resources/views/livewire/backup-destinations/check-connection-button.blade.php
@@ -1,12 +1,12 @@
 <div>
     @if ($backupDestination->isChecking())
         <x-secondary-button iconOnly type="button" disabled class="cursor-not-allowed bg-opacity-50">
-            @svg('heroicon-o-arrow-path', 'h-4 w-4 animate-spin')
+            @svg('hugeicons-refresh', 'h-4 w-4 animate-spin')
             <span class="sr-only">{{ __('Checking Connection') }}</span>
         </x-secondary-button>
     @else
         <x-secondary-button iconOnly wire:click="checkConnection" type="button">
-            @svg('heroicon-o-arrow-path', 'h-4 w-4')
+            @svg('hugeicons-refresh', 'h-4 w-4')
             <span class="sr-only">{{ __('Check Connection') }}</span>
         </x-secondary-button>
     @endif
diff --git a/resources/views/livewire/backup-destinations/create-backup-destination-form.blade.php b/resources/views/livewire/backup-destinations/create-backup-destination-form.blade.php
index d012b8ad..9b9742ec 100644
--- a/resources/views/livewire/backup-destinations/create-backup-destination-form.blade.php
+++ b/resources/views/livewire/backup-destinations/create-backup-destination-form.blade.php
@@ -7,7 +7,7 @@
             {{ __('Create a new backup destination.') }}
         </x-slot>
         <x-slot name="icon">
-            heroicon-o-globe-europe-africa
+            hugeicons-global
         </x-slot>
         <form wire:submit="submit">
             <div class="mt-4 flex flex-col md:flex-row md:space-x-6 space-y-4 md:space-y-0">
diff --git a/resources/views/livewire/backup-destinations/delete-backup-destination-form.blade.php b/resources/views/livewire/backup-destinations/delete-backup-destination-form.blade.php
index 8c8a95be..6badb6b5 100644
--- a/resources/views/livewire/backup-destinations/delete-backup-destination-form.blade.php
+++ b/resources/views/livewire/backup-destinations/delete-backup-destination-form.blade.php
@@ -2,7 +2,7 @@
     <div class="my-3 flex justify-end">
         <a href="#" class="text-sm text-red-600 dark:text-red-400 font-medium hover:text-underline ease-in-out" x-data=""
            x-on:click.prevent="$dispatch('open-modal', 'remove-backup-destination-{{ $backupDestination->id }}')">
-            @svg('heroicon-o-x-mark', 'h-5 w-5 inline-block -mt-0.5')
+            @svg('hugeicons-delete-02', 'h-5 w-5 inline-block -mt-0.5')
             {{ __('Remove Backup Destination') }}
         </a>
     </div>
@@ -14,7 +14,7 @@
             {{ __('Please read this carefully before confirming this action.') }}
         </x-slot>
         <x-slot name="icon">
-            heroicon-o-trash
+            hugeicons-delete-02
         </x-slot>
         <div>
             <p class="text-gray-800 dark:text-gray-200 mb-3">
diff --git a/resources/views/livewire/backup-destinations/index-item.blade.php b/resources/views/livewire/backup-destinations/index-item.blade.php
index 933dd533..01864080 100644
--- a/resources/views/livewire/backup-destinations/index-item.blade.php
+++ b/resources/views/livewire/backup-destinations/index-item.blade.php
@@ -44,7 +44,7 @@
             <a href="{{ route('backup-destinations.edit', $backupDestination) }}" wire:navigate>
                 <x-secondary-button iconOnly>
                     <span class="sr-only">{{ __('Update Backup Destination') }}</span>
-                    <x-heroicon-o-pencil-square class="w-4 h-4"/>
+                    <x-hugeicons-task-edit-01 class="w-4 h-4"/>
                 </x-secondary-button>
             </a>
         </div>
diff --git a/resources/views/livewire/backup-destinations/index-table.blade.php b/resources/views/livewire/backup-destinations/index-table.blade.php
index 17b720c8..143882c3 100644
--- a/resources/views/livewire/backup-destinations/index-table.blade.php
+++ b/resources/views/livewire/backup-destinations/index-table.blade.php
@@ -2,7 +2,7 @@
     @if ($backupDestinations->isEmpty())
         <x-no-content withBackground>
             <x-slot name="icon">
-                @svg('heroicon-o-globe-alt', 'h-16 w-16 text-primary-900 dark:text-white inline')
+                @svg('hugeicons-global', 'h-16 w-16 text-primary-900 dark:text-white inline')
             </x-slot>
             <x-slot name="title">
                 {{ __("You don't have any backup destinations!") }}
@@ -24,7 +24,7 @@
             description="{{ __('A summary of configured backup destinations, where your backups will reside.') }}"
         >
             <x-slot name="icon">
-                <x-heroicon-o-globe-europe-africa class="h-6 w-6 text-primary-600 dark:text-primary-400" />
+                <x-hugeicons-global class="h-6 w-6 text-primary-600 dark:text-primary-400" />
             </x-slot>
             <x-table.table-header>
                 <div class="col-span-3">{{ __('Label') }}</div>
diff --git a/resources/views/livewire/backup-destinations/update-backup-destination-form.blade.php b/resources/views/livewire/backup-destinations/update-backup-destination-form.blade.php
index 48e79438..5cb99ca0 100644
--- a/resources/views/livewire/backup-destinations/update-backup-destination-form.blade.php
+++ b/resources/views/livewire/backup-destinations/update-backup-destination-form.blade.php
@@ -7,7 +7,7 @@
             {{ __('Update your new backup destination.') }}
         </x-slot>
         <x-slot name="icon">
-            heroicon-o-globe-europe-africa
+            hugeicons-global
         </x-slot>
         <form wire:submit="submit">
             <div class="mt-4 flex flex-col sm:flex-row sm:space-x-6 space-y-4 sm:space-y-0">
diff --git a/resources/views/livewire/backup-tasks/buttons/clear-log-button.blade.php b/resources/views/livewire/backup-tasks/buttons/clear-log-button.blade.php
index 2868f374..4dd2bac2 100644
--- a/resources/views/livewire/backup-tasks/buttons/clear-log-button.blade.php
+++ b/resources/views/livewire/backup-tasks/buttons/clear-log-button.blade.php
@@ -4,7 +4,7 @@
             <a href="#" class="text-sm text-red-600 dark:text-red-400 font-medium hover:text-underline ease-in-out"
                x-data=""
                x-on:click.prevent="$dispatch('open-modal', 'clear-all-backup-task-logs')">
-                @svg('heroicon-o-x-mark', 'h-5 w-5 inline-block -mt-0.5')
+                @svg('hugeicons-delete-02', 'h-5 w-5 inline-block -mt-0.5')
                 {{ __('Clear All Backup Task Logs') }}
             </a>
         </div>
@@ -16,7 +16,7 @@
                 {{ __('Please read this carefully before confirming this action.') }}
             </x-slot>
             <x-slot name="icon">
-                heroicon-o-trash
+                hugeicons-delete-02
             </x-slot>
             <div>
                 <p class="text-gray-800 dark:text-gray-200 mb-3">
diff --git a/resources/views/livewire/backup-tasks/buttons/delete-backup-task-log-button.blade.php b/resources/views/livewire/backup-tasks/buttons/delete-backup-task-log-button.blade.php
index 67b1ef07..3a21518b 100644
--- a/resources/views/livewire/backup-tasks/buttons/delete-backup-task-log-button.blade.php
+++ b/resources/views/livewire/backup-tasks/buttons/delete-backup-task-log-button.blade.php
@@ -7,7 +7,7 @@
             {{ __('Please read this carefully before confirming this action.') }}
         </x-slot>
         <x-slot name="icon">
-            heroicon-o-trash
+            hugeicons-delete-02
         </x-slot>
         <div>
             <p class="text-gray-800 dark:text-gray-200 mb-3">
diff --git a/resources/views/livewire/backup-tasks/buttons/run-task-button.blade.php b/resources/views/livewire/backup-tasks/buttons/run-task-button.blade.php
index 778948a6..da1b2027 100644
--- a/resources/views/livewire/backup-tasks/buttons/run-task-button.blade.php
+++ b/resources/views/livewire/backup-tasks/buttons/run-task-button.blade.php
@@ -2,27 +2,27 @@
     @if ($backupTask->isRunning())
         <x-secondary-button type="button" class="!p-2 bg-opacity-50 cursor-not-allowed" disabled title="{{ __('Task is running') }}">
             <span class="sr-only">{{ __('Task Running') }}</span>
-            @svg('heroicon-o-stop', 'w-4 h-4')
+            @svg('hugeicons-stop', 'w-4 h-4')
         </x-secondary-button>
     @elseif ($backupTask->isPaused())
         <x-secondary-button type="button" class="!p-2 cursor-not-allowed bg-opacity-50" disabled title="{{ __('Task is disabled') }}">
             <span class="sr-only">{{ __('Task Disabled') }}</span>
-            @svg('heroicon-o-play', 'w-4 h-4')
+            @svg('hugeicons-play', 'w-4 h-4')
         </x-secondary-button>
     @elseif ($backupTask->isAnotherTaskRunningOnSameRemoteServer())
         <x-secondary-button type="button" class="!p-2 cursor-not-allowed bg-opacity-50" disabled title="{{ __('Another task is running on the same remote server') }}">
             <span class="sr-only">{{ __('Another task is running on the same remote server') }}</span>
-            @svg('heroicon-o-play', 'w-4 h-4')
+            @svg('hugeicons-play', 'w-4 h-4')
         </x-secondary-button>
     @elseif ($backupTask->remoteServer->isMarkedForDeletion())
         <x-secondary-button type="button" class="!p-2 cursor-not-allowed bg-opacity-50" disabled title="{{ __('Remote server is marked for deletion') }}">
             <span class="sr-only">{{ __('Remote server is marked for deletion') }}</span>
-            @svg('heroicon-o-play', 'w-4 h-4')
+            @svg('hugeicons-play', 'w-4 h-4')
         </x-secondary-button>
     @else
         <x-secondary-button wire:click="runTask" type="button" class="!p-2" title="{{ __('Click to run this task') }}">
             <span class="sr-only">Run Task</span>
-            @svg('heroicon-o-play', 'w-4 h-4')
+            @svg('hugeicons-play', 'w-4 h-4')
         </x-secondary-button>
     @endif
 </div>
diff --git a/resources/views/livewire/backup-tasks/buttons/toggle-pause-button.blade.php b/resources/views/livewire/backup-tasks/buttons/toggle-pause-button.blade.php
index 73cf25d8..35c5013c 100644
--- a/resources/views/livewire/backup-tasks/buttons/toggle-pause-button.blade.php
+++ b/resources/views/livewire/backup-tasks/buttons/toggle-pause-button.blade.php
@@ -2,17 +2,17 @@
     @if ($backupTask->isPaused())
         <x-danger-button wire:click="togglePauseState" type="button" class="!p-2" title="{{ __('Click to enable this task') }}">
             <span class="sr-only">{{ __('Task Paused') }}</span>
-            @svg('heroicon-o-hand-raised', 'w-4 h-4')
+            @svg('hugeicons-four-finger-03', 'w-4 h-4')
         </x-danger-button>
     @elseif ($backupTask->isRunning())
         <x-secondary-button type="button" class="!p-2 bg-gray-50 cursor-not-allowed" disabled title="{{ __('Pause this task') }}">
             <span class="sr-only">{{ __('Task Not Paused') }}</span>
-            @svg('heroicon-o-hand-raised', 'w-4 h-4')
+            @svg('hugeicons-four-finger-03', 'w-4 h-4')
         </x-secondary-button>
     @else
         <x-secondary-button wire:click="togglePauseState" type="button" class="!p-2" title="{{ __('Click to disable this task') }}">
             <span class="sr-only">{{ __('Task Not Paused') }}</span>
-            @svg('heroicon-o-hand-raised', 'w-4 h-4')
+            @svg('hugeicons-four-finger-03', 'w-4 h-4')
         </x-secondary-button>
     @endif
 </div>
diff --git a/resources/views/livewire/backup-tasks/forms/create-backup-task-form.blade.php b/resources/views/livewire/backup-tasks/forms/create-backup-task-form.blade.php
index 57d520c5..05d18d01 100644
--- a/resources/views/livewire/backup-tasks/forms/create-backup-task-form.blade.php
+++ b/resources/views/livewire/backup-tasks/forms/create-backup-task-form.blade.php
@@ -13,7 +13,7 @@
                     {{ __('Create a new backup task.') }}
                 </x-slot>
                 <x-slot name="icon">
-                    heroicon-o-archive-box
+                    hugeicons-archive-02
                 </x-slot>
                 <form wire:submit.prevent="submit">
 
@@ -21,12 +21,12 @@
                     <div class="w-full py-6 px-4 sm:px-6 md:px-8">
                         @php
                             $steps = [
-                                ['label' => __('Details'), 'icon' => 'heroicon-o-document-text'],
-                                ['label' => __('Configuration'), 'icon' => 'heroicon-o-cog'],
-                                ['label' => __('Backup Info'), 'icon' => 'heroicon-o-circle-stack'],
-                                ['label' => __('Schedule'), 'icon' => 'heroicon-o-calendar'],
-                                ['label' => __('Notifications'), 'icon' => 'heroicon-o-bell'],
-                                ['label' => __('Summary'), 'icon' => 'heroicon-o-clipboard-document-list']
+                                ['label' => __('Details'), 'icon' => 'hugeicons-profile'],
+                                ['label' => __('Configuration'), 'icon' => 'hugeicons-settings-02'],
+                                ['label' => __('Backup Info'), 'icon' => 'hugeicons-database'],
+                                ['label' => __('Schedule'), 'icon' => 'hugeicons-calendar-01'],
+                                ['label' => __('Notifications'), 'icon' => 'hugeicons-notification-02'],
+                                ['label' => __('Summary'), 'icon' => 'hugeicons-profile-02']
                             ];
                         @endphp
 
@@ -38,7 +38,7 @@
                     {{ $index < $currentStep - 1 ? 'bg-green-500' : ($index === $currentStep - 1 ? 'bg-gray-950 dark:bg-gray-50' : 'bg-gray-300 dark:bg-gray-700') }}
                     transition-all duration-300 ease-in-out">
                                         @if ($index < $currentStep - 1)
-                                            @svg('heroicon-o-check-circle', 'w-5 h-5 text-white')
+                                            @svg('hugeicons-checkmark-circle-02', 'w-5 h-5 text-white')
                                         @else
                                             @svg($step['icon'], 'w-5 h-5 ' . ($index <= $currentStep - 1 ? 'text-white
                                             dark:text-gray-950' : 'text-gray-500 dark:text-gray-200'))
@@ -61,7 +61,7 @@ class="ml-3 text-sm font-medium {{ $index <= $currentStep - 1 ? 'text-gray-900 d
                         {{ $index < $currentStep - 1 ? 'bg-green-500' : ($index === $currentStep - 1 ? 'bg-gray-950 dark:bg-gray-50' : 'bg-gray-300 dark:bg-gray-700') }}
                         transition-all duration-300 ease-in-out transform hover:scale-105">
                                             @if ($index < $currentStep - 1)
-                                                @svg('heroicon-o-check-circle', 'w-6 h-6 text-white')
+                                                @svg('hugeicons-checkmark-circle-02', 'w-6 h-6 text-white')
                                             @else
                                                 @svg($step['icon'], 'w-6 h-6 ' . ($index <= $currentStep - 1 ?
                                                 'text-white dark:text-gray-950' : 'text-gray-500 dark:text-gray-200'))
@@ -318,7 +318,7 @@ class="ml-2"
                                         x-data=""
                                         x-on:click.prevent="$dispatch('open-modal', 'cron-presets')"
                                     >
-                                        @svg('heroicon-o-clock', 'w-5 h-5 mr-1')
+                                        @svg('hugeicons-clock-01', 'w-5 h-5 mr-1')
                                         {{ __('Presets') }}
                                     </x-secondary-button>
                                 </div>
@@ -371,7 +371,7 @@ class="text-sm text-gray-600 dark:text-gray-400 underline hover:text-gray-900 da
                             <div class="bg-white dark:bg-gray-800 overflow-hidden sm:rounded-lg">
                                 <div class="px-4 py-5 sm:px-6">
                                     <h3 class="text-lg leading-6 font-medium text-gray-900 dark:text-gray-100 flex items-center">
-                                        @svg('heroicon-o-clipboard-document-check', 'w-6 h-6 mr-2 text-green-500')
+                                        @svg('hugeicons-profile-02', 'w-6 h-6 mr-2 text-green-500')
                                         {{ __('Review Your Backup Task') }}
                                     </h3>
                                     <p class="mt-1 max-w-2xl text-sm text-gray-500 dark:text-gray-400">
@@ -389,52 +389,52 @@ class="relative bg-gray-50 dark:bg-gray-700 rounded-lg p-4 transition-all durati
                                                 <dt class="text-sm font-medium text-gray-500 dark:text-gray-300 mb-1 flex items-center">
                                                     @switch($key)
                                                         @case(__('Label'))
-                                                            @svg('heroicon-o-tag', 'w-5 h-5 mr-2 text-blue-500')
+                                                            @svg('hugeicons-tag-01', 'w-5 h-5 mr-2 text-blue-500')
                                                             @break
                                                         @case(__('Description'))
-                                                            @svg('heroicon-o-document-text', 'w-5 h-5 mr-2
+                                                            @svg('hugeicons-clipboard', 'w-5 h-5 mr-2
                                                             text-purple-500')
                                                             @break
                                                         @case(__('Remote Server'))
-                                                            @svg('heroicon-o-server', 'w-5 h-5 mr-2 text-green-500')
+                                                            @svg('hugeicons-cloud-server', 'w-5 h-5 mr-2 text-green-500')
                                                             @break
                                                         @case(__('Backup Type'))
-                                                            @svg('heroicon-o-archive-box', 'w-5 h-5 mr-2
+                                                            @svg('hugeicons-blockchain-01', 'w-5 h-5 mr-2
                                                             text-yellow-500')
                                                             @break
                                                         @case(__('Supplied Encryption Password'))
-                                                            @svg('heroicon-o-key', 'w-5 h-5 mr-2
+                                                            @svg('hugeicons-square-lock-02', 'w-5 h-5 mr-2
                                                             text-yellow-500')
                                                             @break
                                                         @case(__('Backup Destination'))
-                                                            @svg('heroicon-o-cloud', 'w-5 h-5 mr-2 text-indigo-500')
+                                                            @svg('hugeicons-folder-02', 'w-5 h-5 mr-2 text-indigo-500')
                                                             @break
                                                         @case(__('Maximum Backups to Keep'))
-                                                            @svg('heroicon-o-archive-box-arrow-down', 'w-5 h-5 mr-2
+                                                            @svg('hugeicons-compass', 'w-5 h-5 mr-2
                                                             text-red-500')
                                                             @break
                                                         @case(__('Source Path'))
-                                                            @svg('heroicon-o-folder', 'w-5 h-5 mr-2 text-orange-500')
+                                                            @svg('hugeicons-folder-01', 'w-5 h-5 mr-2 text-orange-500')
                                                             @break
                                                         @case(__('Database Name'))
-                                                            @svg('heroicon-o-circle-stack', 'w-5 h-5 mr-2
+                                                            @svg('hugeicons-database', 'w-5 h-5 mr-2
                                                             text-cyan-500')
                                                             @break
                                                         @case(__('Schedule'))
-                                                            @svg('heroicon-o-calendar', 'w-5 h-5 mr-2 text-pink-500')
+                                                            @svg('hugeicons-calendar-01', 'w-5 h-5 mr-2 text-pink-500')
                                                             @break
                                                         @case(__('Using Isolated Environment'))
-                                                            @svg('heroicon-o-shield-check', 'w-5 h-5 mr-2
+                                                            @svg('hugeicons-security-check', 'w-5 h-5 mr-2
                                                             text-teal-500')
                                                             @break
                                                         @case(__('Tags'))
-                                                            @svg('heroicon-o-tag', 'w-5 h-5 mr-2 text-lime-500')
+                                                            @svg('hugeicons-tags', 'w-5 h-5 mr-2 text-lime-500')
                                                             @break
                                                         @case(__('Notification Streams'))
-                                                            @svg('heroicon-o-bell', 'w-5 h-5 mr-2 text-amber-500')
+                                                            @svg('hugeicons-notification-02', 'w-5 h-5 mr-2 text-amber-500')
                                                             @break
                                                         @default
-                                                            @svg('heroicon-o-information-circle', 'w-5 h-5 mr-2
+                                                            @svg('hugeicons-information-circle', 'w-5 h-5 mr-2
                                                             text-gray-500')
                                                     @endswitch
                                                     {{ $key }}
@@ -549,13 +549,13 @@ class="text-blue-500 hover:underline focus:outline-none ml-1">
             {{ __('Select a preset to quickly set up common backup schedules. The cron expression will be automatically filled in for you.') }}
         </x-slot>
         <x-slot name="icon">
-            heroicon-o-calendar-days
+            hugeicons-calendar-02
         </x-slot>
         <div class="p-6">
             <div class="mb-4">
                 <x-input-label for="cronPresetSearch" :value="__('Search Presets')"/>
                 <div class="relative">
-                    @svg('heroicon-o-magnifying-glass', 'w-5 h-5 text-gray-400 absolute left-3 top-3')
+                    @svg('hugeicons-search-01', 'w-5 h-5 text-gray-400 absolute left-3 top-3')
                     <x-text-input
                         name="cronPresetSearch"
                         id="cronPresetSearch"
diff --git a/resources/views/livewire/backup-tasks/forms/delete-backup-task-form.blade.php b/resources/views/livewire/backup-tasks/forms/delete-backup-task-form.blade.php
index ee9f3bc8..b67a8c03 100644
--- a/resources/views/livewire/backup-tasks/forms/delete-backup-task-form.blade.php
+++ b/resources/views/livewire/backup-tasks/forms/delete-backup-task-form.blade.php
@@ -2,7 +2,7 @@
     <div class="my-3 flex justify-end">
         <a href="#" class="text-sm text-red-600 dark:text-red-400 font-medium hover:text-underline ease-in-out" x-data=""
            x-on:click.prevent="$dispatch('open-modal', 'remove-backup-task-{{ $backupTask->id }}')">
-            @svg('heroicon-o-x-mark', 'h-5 w-5 inline-block -mt-0.5')
+            @svg('hugeicons-delete-02', 'h-5 w-5 inline-block -mt-0.5')
             {{ __('Remove Backup Task') }}
         </a>
     </div>
@@ -14,7 +14,7 @@
             {{ __('Please read this carefully before confirming this action.') }}
         </x-slot>
         <x-slot name="icon">
-            heroicon-o-trash
+            hugeicons-delete-02
         </x-slot>
         <div>
             <p class="text-gray-800 dark:text-gray-200 mb-3">
diff --git a/resources/views/livewire/backup-tasks/forms/update-backup-task-form.blade.php b/resources/views/livewire/backup-tasks/forms/update-backup-task-form.blade.php
index 0bca3272..4dc647b4 100644
--- a/resources/views/livewire/backup-tasks/forms/update-backup-task-form.blade.php
+++ b/resources/views/livewire/backup-tasks/forms/update-backup-task-form.blade.php
@@ -7,7 +7,7 @@
             {{ __('Update your backup task.') }}
         </x-slot>
         <x-slot name="icon">
-            heroicon-o-archive-box
+            hugeicons-archive-02
         </x-slot>
         <form wire:submit.prevent="submit">
             <x-form-section>
diff --git a/resources/views/livewire/backup-tasks/index.blade.php b/resources/views/livewire/backup-tasks/index.blade.php
index 7f1ac0ce..c49d3649 100644
--- a/resources/views/livewire/backup-tasks/index.blade.php
+++ b/resources/views/livewire/backup-tasks/index.blade.php
@@ -7,7 +7,7 @@
         @if (!Auth::user()->backupTasks->isEmpty())
          <div class="space-x-2 flex">
              <x-secondary-button x-data="" x-on:click="$dispatch('open-modal', 'copy-backup-task')">
-                 @svg('heroicon-o-document-duplicate', 'h-5 w-5')
+                 @svg('hugeicons-copy-01', 'h-5 w-5')
              </x-secondary-button>
              <a href="{{ route('backup-tasks.create') }}" wire:navigate>
                  <x-primary-button centered>
diff --git a/resources/views/livewire/backup-tasks/modals/copy-task-modal.blade.php b/resources/views/livewire/backup-tasks/modals/copy-task-modal.blade.php
index 5c64aeef..e7096180 100644
--- a/resources/views/livewire/backup-tasks/modals/copy-task-modal.blade.php
+++ b/resources/views/livewire/backup-tasks/modals/copy-task-modal.blade.php
@@ -7,7 +7,7 @@
             {{ __('Create a new backup task by replicating an existing configuration.') }}
         </x-slot>
         <x-slot name="icon">
-            heroicon-o-document-duplicate
+            hugeicons-copy-01
         </x-slot>
         <form wire:submit.prevent="copyTask">
             <div>
diff --git a/resources/views/livewire/backup-tasks/modals/log-modal.blade.php b/resources/views/livewire/backup-tasks/modals/log-modal.blade.php
index 9a70549c..4b94fac1 100644
--- a/resources/views/livewire/backup-tasks/modals/log-modal.blade.php
+++ b/resources/views/livewire/backup-tasks/modals/log-modal.blade.php
@@ -7,7 +7,7 @@
             {{ __('Viewing a Backup Task log.') }}
         </x-slot>
         <x-slot name="icon">
-            heroicon-o-document-text
+            hugeicons-license
         </x-slot>
         <div>
             @if (app()->isLocal())
@@ -21,10 +21,10 @@ class="w-full px-4 py-2 text-left text-sm font-medium text-gray-700 dark:text-gr
                     >
                         <div class="flex items-center justify-between">
                 <span class="flex items-center">
-                    <x-heroicon-o-bug-ant class="w-5 h-5 mr-2" />
+                    <x-hugeicons-bug-02 class="w-5 h-5 mr-2" />
                     {{ __('Debug Information') }}
                 </span>
-                            <x-heroicon-o-chevron-down
+                            <x-hugeicons-arrow-right-01
                                 class="w-5 h-5 transition-transform duration-200"
                                 ::class="{ 'transform rotate-180': showDebug }"
                             />
@@ -44,11 +44,11 @@ class="px-4 py-3 bg-gray-50 dark:bg-gray-800 text-gray-700 dark:text-gray-300 te
                         <ul class="space-y-2">
                             @php
                                 $debugItems = [
-                                    ['icon' => 'identification', 'label' => 'Component ID', 'value' => $this->getId()],
-                                    ['icon' => 'clipboard-document-list', 'label' => 'Backup Task ID', 'value' => $backupTaskId],
-                                    ['icon' => 'arrow-path', 'label' => 'Is Streaming', 'value' => $isStreaming ? 'Yes' : 'No'],
-                                    ['icon' => 'clock', 'label' => 'Is Loading', 'value' => $isLoading ? 'Yes' : 'No'],
-                                    ['icon' => 'document-text', 'label' => 'Log Output Length', 'value' => strlen($logOutput)],
+                                    ['icon' => 'profile', 'label' => 'Component ID', 'value' => $this->getId()],
+                                    ['icon' => 'task-01', 'label' => 'Backup Task ID', 'value' => $backupTaskId],
+                                    ['icon' => 'refresh', 'label' => 'Is Streaming', 'value' => $isStreaming ? 'Yes' : 'No'],
+                                    ['icon' => 'clock-01', 'label' => 'Is Loading', 'value' => $isLoading ? 'Yes' : 'No'],
+                                    ['icon' => 'license', 'label' => 'Log Output Length', 'value' => strlen($logOutput)],
                                 ];
                             @endphp
 
@@ -56,7 +56,7 @@ class="px-4 py-3 bg-gray-50 dark:bg-gray-800 text-gray-700 dark:text-gray-300 te
                                 <li class="flex items-center justify-between">
                         <span class="flex items-center text-gray-600 dark:text-gray-400">
                             <x-dynamic-component
-                                :component="'heroicon-o-' . $item['icon']"
+                                :component="'hugeicons-' . $item['icon']"
                                 class="w-4 h-4 mr-2"
                             />
                             {{ $item['label'] }}:
@@ -80,7 +80,7 @@ class="w-4 h-4 mr-2"
                         </x-textarea>
                         @if ($isStreaming)
                             <div class="flex items-center text-gray-600 dark:text-gray-400 text-sm mt-2">
-                                @svg('heroicon-o-arrow-path', 'w-4 h-4 mr-2 animate-spin')
+                                @svg('hugeicons-refresh', 'w-4 h-4 mr-2 animate-spin')
                                 {{ __('Streaming live log data...') }}
                             </div>
                         @endif
diff --git a/resources/views/livewire/backup-tasks/tables/backup-task-history-table.blade.php b/resources/views/livewire/backup-tasks/tables/backup-task-history-table.blade.php
index 42d2111a..fd51ef6c 100644
--- a/resources/views/livewire/backup-tasks/tables/backup-task-history-table.blade.php
+++ b/resources/views/livewire/backup-tasks/tables/backup-task-history-table.blade.php
@@ -5,7 +5,7 @@
                 title="{{ __('Previously Executed Backup Tasks') }}"
                 description="{{ __('View your log of previously executed backup tasks.') }}">
                 <x-slot name="icon">
-                    <x-heroicon-o-archive-box class="h-6 w-6 text-primary-600 dark:text-primary-400" />
+                    <x-hugeicons-work-history class="h-6 w-6 text-primary-600 dark:text-primary-400" />
                 </x-slot>
                 <x-table.table-header>
                     <div class="col-span-2">{{ __('Label') }}</div>
@@ -27,7 +27,7 @@
 
                             <div class="col-span-12 sm:col-span-2 mt-2 sm:mt-0">
         <span class="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium {{ $backupTaskLog->backupTask->type === 'files' ? 'bg-purple-100 text-purple-800 dark:bg-purple-800 dark:text-purple-100' : 'bg-cyan-100 text-cyan-800 dark:bg-cyan-800 dark:text-cyan-100' }}">
-            @svg($backupTaskLog->backupTask->type === 'files' ? 'heroicon-o-document-duplicate' : 'heroicon-o-circle-stack', 'h-4 w-4 mr-1')
+            @svg($backupTaskLog->backupTask->type === 'files' ? 'hugeicons-file-01' : 'hugeicons-database', 'h-4 w-4 mr-1')
             {{ ucfirst($backupTaskLog->backupTask->type) }}
         </span>
                             </div>
@@ -39,7 +39,7 @@
 
                             <div class="col-span-12 sm:col-span-2 mt-2 sm:mt-0">
         <span class="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium {{ (bool) $backupTaskLog->successful_at ? 'bg-green-100 text-green-800 dark:bg-green-800 dark:text-green-100' : 'bg-red-100 text-red-800 dark:bg-red-800 dark:text-red-100' }}">
-            @svg((bool) $backupTaskLog->successful_at ? 'heroicon-o-check-circle' : 'heroicon-o-x-circle', 'h-4 w-4 mr-1')
+            @svg((bool) $backupTaskLog->successful_at ? 'hugeicons-checkmark-circle-02' : 'hugeicons-cancel-circle', 'h-4 w-4 mr-1')
             {{ (bool) $backupTaskLog->successful_at ? __('Finished') : __('Failed') }}
         </span>
                             </div>
@@ -57,7 +57,7 @@
                                     iconOnly
                                     title="{{ __('Click to view this log') }}"
                                 >
-                                    @svg('heroicon-o-document-text', 'h-4 w-4')
+                                    @svg('hugeicons-license', 'h-4 w-4')
                                     <span class="sr-only">{{ __('View Log') }}</span>
                                 </x-secondary-button>
                                 <x-secondary-button
@@ -66,7 +66,7 @@
                                     iconOnly
                                     title="{{ __('Remove this log') }}"
                                 >
-                                    @svg('heroicon-o-trash', 'h-4 w-4')
+                                    @svg('hugeicons-delete-02', 'h-4 w-4')
                                     <span class="sr-only">{{ __('Remove Log') }}</span>
                                 </x-secondary-button>
                             </div>
@@ -80,7 +80,7 @@
                                     {{ __('This log was generated :date.', ['date' => $backupTaskLog->created_at->timezone(Auth::user()->timezone ?? config('app.timezone'))->format('l, d F Y H:i')]) }}
                                 </x-slot>
                                 <x-slot name="icon">
-                                    heroicon-o-document-text
+                                    hugeicons-license
                                 </x-slot>
                                 <div class="text-center">
                                     <div class="mb-5">
diff --git a/resources/views/livewire/backup-tasks/tables/index-item.blade.php b/resources/views/livewire/backup-tasks/tables/index-item.blade.php
index 27c3bbd8..df61d71b 100644
--- a/resources/views/livewire/backup-tasks/tables/index-item.blade.php
+++ b/resources/views/livewire/backup-tasks/tables/index-item.blade.php
@@ -12,7 +12,7 @@
                                     class="absolute inset-0 bg-gradient-to-br from-purple-300 to-purple-400 dark:from-purple-600 dark:to-purple-700 rounded-lg transform rotate-3 transition-all duration-300 group-hover:rotate-6 group-hover:scale-105"></div>
                                 <div
                                     class="relative bg-white dark:bg-gray-800 rounded-lg p-2 shadow-sm transition-all duration-300 group-hover:shadow-md">
-                                    @svg('heroicon-o-document-duplicate', 'h-5 w-5 text-purple-600
+                                    @svg('hugeicons-file-01', 'h-5 w-5 text-purple-600
                                     dark:text-purple-400')
                                 </div>
                             </div>
@@ -22,7 +22,7 @@ class="relative bg-white dark:bg-gray-800 rounded-lg p-2 shadow-sm transition-al
                                     class="absolute inset-0 bg-gradient-to-br from-cyan-300 to-cyan-400 dark:from-cyan-600 dark:to-cyan-700 rounded-lg transform rotate-3 transition-all duration-300 group-hover:rotate-6 group-hover:scale-105"></div>
                                 <div
                                     class="relative bg-white dark:bg-gray-800 rounded-lg p-2 shadow-sm transition-all duration-300 group-hover:shadow-md">
-                                    @svg('heroicon-o-circle-stack', 'h-5 w-5 text-cyan-600 dark:text-cyan-400')
+                                    @svg('hugeicons-database', 'h-5 w-5 text-cyan-600 dark:text-cyan-400')
                                 </div>
                             </div>
                         @endif
@@ -35,7 +35,7 @@ class="relative bg-white dark:bg-gray-800 rounded-lg p-2 shadow-sm transition-al
                                      x-on:mouseenter="$dispatch('show-tags-tooltip', { id: {{ $backupTask->id }}, tags: '{{ $backupTask->listOfAttachedTagLabels() }}' })">
                                     <span
                                         class="inline-flex items-center px-2 py-0.5 rounded-full text-xs font-medium bg-gray-100 text-gray-800 dark:bg-gray-700 dark:text-gray-200">
-                                        @svg('heroicon-o-tag', 'h-3 w-3 mr-1 text-gray-500 dark:text-gray-400')
+                                        @svg('hugeicons-tags', 'h-3 w-3 mr-1 text-gray-500 dark:text-gray-400')
                                         {{ $backupTask->tags->count() }}
                                     </span>
                                 </div>
@@ -46,7 +46,7 @@ class="inline-flex items-center px-2 py-0.5 rounded-full text-xs font-medium bg-
                                      x-on:mouseenter="$dispatch('show-tags-tooltip', { id: {{ $backupTask->id }}, tags: '{{ $backupTask->listOfAttachedTagLabels() }}' })">
                                         <span
                                             class="inline-flex items-center px-2 py-0.5 rounded-full text-xs font-medium bg-gray-100 text-gray-800 dark:bg-gray-700 dark:text-gray-200">
-                                            @svg('heroicon-o-bell', 'h-3 w-3 mr-1 text-gray-500 dark:text-gray-400')
+                                            @svg('hugeicons-notifications-01', 'h-3 w-3 mr-1 text-gray-500 dark:text-gray-400')
                                             {{ $backupTask->notificationStreams->count() }}
                                         </span>
                                 </div>
@@ -58,16 +58,16 @@ class="inline-flex items-center px-2 py-0.5 rounded-full text-xs font-medium bg-
                     @if ($backupTask->isPaused())
                         <span
                             class="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium bg-red-100 text-red-800 dark:bg-red-800 dark:text-red-100">
-                            @svg('heroicon-o-pause', 'h-3.5 w-3.5 mr-1')
+                            @svg('hugeicons-pause', 'h-3.5 w-3.5 mr-1')
                             {{ __('Paused') }}
                         </span>
                     @else
                         <span
                             class="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium {{ $backupTask->status === 'ready' ? 'bg-green-100 text-green-800 dark:bg-green-800 dark:text-green-100' : 'bg-blue-100 text-blue-800 dark:bg-blue-800 dark:text-blue-100' }}">
                             @if ($backupTask->status === 'ready')
-                                @svg('heroicon-o-check-circle', 'h-3.5 w-3.5 mr-1')
+                                @svg('hugeicons-checkmark-circle-02', 'h-3.5 w-3.5 mr-1')
                             @else
-                                @svg('heroicon-o-arrow-path', 'h-3.5 w-3.5 mr-1 animate-spin')
+                                @svg('hugeicons-refresh', 'h-3.5 w-3.5 mr-1 animate-spin')
                             @endif
                             {{ $backupTask->status === 'ready' ? __('Ready') : __('Running') }}
                         </span>
@@ -81,10 +81,10 @@ class="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium {
                         class="text-sm text-gray-600 dark:text-gray-400 hover:text-gray-900 dark:hover:text-gray-100 focus:outline-none">
                     {{ __('Details') }}
                     <span x-show="!open">
-                        @svg('heroicon-o-chevron-down', ['class' => 'h-4 w-4 text-gray-900 dark:text-gray-50 inline'])
+                        @svg('hugeicons-arrow-down-01', ['class' => 'h-4 w-4 text-gray-900 dark:text-gray-50 inline'])
                     </span>
                     <span x-show="open">
-                         @svg('heroicon-o-chevron-up', ['class' => 'h-4 w-4 text-gray-900 dark:text-gray-50 inline'])
+                         @svg('hugeicons-arrow-up-01', ['class' => 'h-4 w-4 text-gray-900 dark:text-gray-50 inline'])
                     </span>
                 </button>
                 <div x-show="open" class="mt-2 space-y-2 text-sm">
@@ -127,7 +127,7 @@ class="!p-2"
                     :disabled="!$backupTask->logs()->exists()"
                     :title="$backupTask->logs()->exists() ? __('Click to view this log') : __('No log available')"
                 >
-                    @svg('heroicon-o-document-text', 'h-4 w-4')
+                    @svg('hugeicons-license', 'h-4 w-4')
                     <span class="sr-only">{{ __('View Log') }}</span>
                 </x-secondary-button>
 
@@ -139,7 +139,7 @@ class="!p-2"
                 <a href="{{ route('backup-tasks.edit', $backupTask) }}" wire:navigate>
                     <x-secondary-button class="!p-2">
                         <span class="sr-only">{{ __('Update Backup Task') }}</span>
-                        <x-heroicon-o-pencil-square class="w-4 h-4"/>
+                        <x-hugeicons-task-edit-01 class="w-4 h-4"/>
                     </x-secondary-button>
                 </a>
             </div>
@@ -156,7 +156,8 @@ class="!p-2"
                                 class="absolute inset-0 bg-gradient-to-br from-purple-300 to-purple-400 dark:from-purple-600 dark:to-purple-700 rounded-lg transform rotate-3 transition-all duration-300 group-hover:rotate-6 group-hover:scale-105"></div>
                             <div
                                 class="relative bg-white dark:bg-gray-800 rounded-lg p-2 shadow-sm transition-all duration-300 group-hover:shadow-md">
-                                @svg('heroicon-o-document-duplicate', 'h-5 w-5 text-purple-600 dark:text-purple-400')
+                                @svg('hugeicons-file-01', 'h-5 w-5 text-purple-600
+                                dark:text-purple-400')
                             </div>
                         </div>
                     @elseif ($backupTask->isDatabaseType())
@@ -165,7 +166,7 @@ class="relative bg-white dark:bg-gray-800 rounded-lg p-2 shadow-sm transition-al
                                 class="absolute inset-0 bg-gradient-to-br from-cyan-300 to-cyan-400 dark:from-cyan-600 dark:to-cyan-700 rounded-lg transform rotate-3 transition-all duration-300 group-hover:rotate-6 group-hover:scale-105"></div>
                             <div
                                 class="relative bg-white dark:bg-gray-800 rounded-lg p-2 shadow-sm transition-all duration-300 group-hover:shadow-md">
-                                @svg('heroicon-o-circle-stack', 'h-5 w-5 text-cyan-600 dark:text-cyan-400')
+                                @svg('hugeicons-database', 'h-5 w-5 text-cyan-600 dark:text-cyan-400')
                             </div>
                         </div>
                     @endif
@@ -178,7 +179,7 @@ class="relative bg-white dark:bg-gray-800 rounded-lg p-2 shadow-sm transition-al
                                  x-on:mouseenter="$dispatch('show-tags-tooltip', { id: {{ $backupTask->id }}, tags: '{{ $backupTask->listOfAttachedTagLabels() }}' })">
             <span
                 class="inline-flex items-center px-2 py-0.5 rounded-full text-xs font-medium bg-gray-100 text-gray-800 dark:bg-gray-700 dark:text-gray-200">
-                @svg('heroicon-o-tag', 'h-3 w-3 mr-1 text-gray-500 dark:text-gray-400')
+                @svg('hugeicons-tags', 'h-3 w-3 mr-1 text-gray-500 dark:text-gray-400')
                 {{ $backupTask->tags->count() }}
             </span>
                             </div>
@@ -189,7 +190,7 @@ class="inline-flex items-center px-2 py-0.5 rounded-full text-xs font-medium bg-
                                  x-on:mouseenter="$dispatch('show-tags-tooltip', { id: {{ $backupTask->id }}, tags: '{{ $backupTask->listOfAttachedTagLabels() }}' })">
             <span
                 class="inline-flex items-center px-2 py-0.5 rounded-full text-xs font-medium bg-gray-100 text-gray-800 dark:bg-gray-700 dark:text-gray-200">
-                @svg('heroicon-o-bell', 'h-3 w-3 mr-1 text-gray-500 dark:text-gray-400')
+                @svg('hugeicons-notification-01', 'h-3 w-3 mr-1 text-gray-500 dark:text-gray-400')
                 {{ $backupTask->notificationStreams->count() }}
             </span>
                             </div>
@@ -210,16 +211,16 @@ class="inline-flex items-center px-2 py-0.5 rounded-full text-xs font-medium bg-
                 @if ($backupTask->isPaused())
                     <span
                         class="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium bg-red-100 text-red-800 dark:bg-red-800 dark:text-red-100">
-                        @svg('heroicon-o-pause', 'h-3.5 w-3.5 mr-1')
+                        @svg('hugeicons-pause', 'h-3.5 w-3.5 mr-1')
                         {{ __('Paused') }}
                     </span>
                 @else
                     <span
                         class="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium {{ $backupTask->status === 'ready' ? 'bg-green-100 text-green-800 dark:bg-green-800 dark:text-green-100' : 'bg-blue-100 text-blue-800 dark:bg-blue-800 dark:text-blue-100' }}">
                             @if ($backupTask->status === 'ready')
-                            @svg('heroicon-o-check-circle', 'h-3.5 w-3.5 mr-1')
+                            @svg('hugeicons-checkmark-circle-02', 'h-3.5 w-3.5 mr-1')
                         @else
-                            @svg('heroicon-o-arrow-path', 'h-3.5 w-3.5 mr-1 animate-spin')
+                            @svg('hugeicons-refresh', 'h-3.5 w-3.5 mr-1 animate-spin')
                         @endif
                         {{ $backupTask->status === 'ready' ? __('Ready') : __('Running') }}
                         </span>
@@ -258,7 +259,7 @@ class="!p-2"
                     :disabled="!$backupTask->logs()->exists()"
                     :title="$backupTask->logs()->exists() ? __('Click to view this log') : __('No log available')"
                 >
-                    @svg('heroicon-o-document-text', 'h-4 w-4')
+                    @svg('hugeicons-license', 'h-4 w-4')
                     <span class="sr-only">{{ __('View Log') }}</span>
                 </x-secondary-button>
 
@@ -270,7 +271,7 @@ class="!p-2"
                 <a href="{{ route('backup-tasks.edit', $backupTask) }}" wire:navigate>
                     <x-secondary-button class="!p-2">
                         <span class="sr-only">{{ __('Update Backup Task') }}</span>
-                        <x-heroicon-o-pencil-square class="w-4 h-4"/>
+                        <x-hugeicons-task-edit-01 class="w-4 h-4"/>
                     </x-secondary-button>
                 </a>
             </div>
diff --git a/resources/views/livewire/backup-tasks/tables/index-table.blade.php b/resources/views/livewire/backup-tasks/tables/index-table.blade.php
index 5d4382f1..45dbabfa 100644
--- a/resources/views/livewire/backup-tasks/tables/index-table.blade.php
+++ b/resources/views/livewire/backup-tasks/tables/index-table.blade.php
@@ -3,7 +3,7 @@
         @if ($backupTasks->isEmpty())
             <x-no-content withBackground>
                 <x-slot name="icon">
-                    @svg('heroicon-o-cloud-arrow-up', 'h-16 w-16 text-primary-900 dark:text-white inline')
+                    @svg('hugeicons-archive-02', 'h-16 w-16 text-primary-900 dark:text-white inline')
                 </x-slot>
                 <x-slot name="title">
                     {{ __("You don't have any backup tasks!") }}
@@ -24,7 +24,7 @@
                 title="{{ __('Backup Tasks') }}"
                 description="{{ __('An overview of all configured backup tasks along with their current statuses.') }}">
                 <x-slot name="icon">
-                    <x-heroicon-o-archive-box class="h-6 w-6 text-primary-600 dark:text-primary-400" />
+                    <x-hugeicons-archive-02 class="h-6 w-6 text-primary-600 dark:text-primary-400" />
                 </x-slot>
                 <x-table.table-header>
                     <div class="col-span-12 md:col-span-3">{{ __('Task') }}</div>
diff --git a/resources/views/livewire/dashboard/upcoming-backup-tasks.blade.php b/resources/views/livewire/dashboard/upcoming-backup-tasks.blade.php
index ce35ae7b..838c8a82 100644
--- a/resources/views/livewire/dashboard/upcoming-backup-tasks.blade.php
+++ b/resources/views/livewire/dashboard/upcoming-backup-tasks.blade.php
@@ -2,7 +2,7 @@
     @if ($scheduledBackupTasks->isEmpty())
         <x-no-content withBackground>
             <x-slot name="icon">
-                @svg('heroicon-o-calendar', 'h-16 w-16 text-primary-900 dark:text-white inline')
+                @svg('hugeicons-calendar-03', 'h-16 w-16 text-primary-900 dark:text-white inline')
             </x-slot>
             <x-slot name="title">
                 {{ __('No Upcoming Backup Tasks') }}
@@ -23,7 +23,7 @@
             title="{{ __('Upcoming Backup Tasks') }}"
             description="{{ __('Scheduled backup tasks that are set to run soon.') }}">
             <x-slot name="icon">
-                <x-heroicon-o-calendar class="h-6 w-6 text-primary-600 dark:text-primary-400" />
+                <x-hugeicons-calendar-03 class="h-6 w-6 text-primary-600 dark:text-primary-400" />
             </x-slot>
             <x-table.table-header>
                 <div class="col-span-3">{{ __('Task Label') }}</div>
@@ -47,7 +47,7 @@
 
                         <div class="col-span-12 sm:col-span-3 mt-2 sm:mt-0">
                             <span class="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium {{ $scheduledBackupTask->type === __('Files') ? 'bg-purple-100 text-purple-800 dark:bg-purple-800 dark:text-purple-100' : 'bg-cyan-100 text-cyan-800 dark:bg-cyan-800 dark:text-cyan-100' }}">
-                              @svg($scheduledBackupTask->type === __('Files') ? 'heroicon-o-document-duplicate' : 'heroicon-o-circle-stack', ['class' => 'h-4 w-4 mr-1'])
+                              @svg($scheduledBackupTask->type === __('Files') ? 'hugeicons-file-01' : 'hugeicons-database', ['class' => 'h-4 w-4 mr-1'])
                                 {{ ucfirst($scheduledBackupTask->type) }}
                             </span>
                         </div>
diff --git a/resources/views/livewire/layout/navigation.blade.php b/resources/views/livewire/layout/navigation.blade.php
index da37b365..bfaa3ca9 100644
--- a/resources/views/livewire/layout/navigation.blade.php
+++ b/resources/views/livewire/layout/navigation.blade.php
@@ -42,13 +42,13 @@ public function toggleUserDropdown(): void
                 <!-- Primary Navigation Menu -->
                 <div class="hidden sm:ml-6 sm:flex sm:space-x-8">
                     <x-nav-link :href="route('overview')" :active="request()->routeIs('overview')" wire:navigate>
-                        <x-dynamic-component :component="'heroicon-o-' . (Auth::user()->backupTasks->isNotEmpty() ? 'book-open' : 'rocket-launch')" class="h-5 w-5 mr-2" />
+                        <x-dynamic-component :component="'hugeicons-' . (Auth::user()->backupTasks->isNotEmpty() ? 'book-open-01' : 'rocket-01')" class="h-5 w-5 mr-2" />
                         {{ __(Auth::user()->backupTasks->isNotEmpty() ? 'Overview' : 'Get Started') }}
                     </x-nav-link>
 
                     @if (Auth::user()->backupTasks->isNotEmpty())
                         <x-nav-link :href="route('backup-tasks.index')" :active="request()->routeIs('backup-tasks.*')" wire:navigate>
-                            <x-heroicon-o-archive-box class="h-5 w-5 mr-2" />
+                            <x-hugeicons-archive-02 class="h-5 w-5 mr-2" />
                             {{ __('Backup Tasks') }}
                         </x-nav-link>
                     @endif
@@ -60,13 +60,13 @@ public function toggleUserDropdown(): void
                 <div class="flex items-center space-x-4">
                     @if (Auth::user()->backupDestinations->isNotEmpty())
                         <x-nav-link :href="route('backup-destinations.index')" :active="request()->routeIs('backup-destinations.*')" wire:navigate>
-                            <x-heroicon-o-globe-europe-africa class="h-5 w-5 mr-2" />
+                            <x-hugeicons-global class="h-5 w-5 mr-2" />
                             {{ __('Destinations') }}
                         </x-nav-link>
                     @endif
                     @if (Auth::user()->remoteServers->isNotEmpty())
                         <x-nav-link :href="route('remote-servers.index')" :active="request()->routeIs('remote-servers.*')" wire:navigate>
-                            <x-heroicon-o-server-stack class="h-5 w-5 mr-2" />
+                            <x-hugeicons-cloud-server class="h-5 w-5 mr-2" />
                             {{ __('Servers') }}
                         </x-nav-link>
                     @endif
@@ -81,38 +81,40 @@ public function toggleUserDropdown(): void
                                     <img class="h-8 w-8 rounded-full object-cover" src="{{ Auth::user()->gravatar() }}" alt="{{ Auth::user()->name }}">
                                 </div>
                                 <span x-data="{ name: @js(auth()->user()->first_name) }" x-text="name" x-on:profile-updated.window="name = $event.detail.name"></span>
-                                <svg class="ml-2 -mr-0.5 h-4 w-4 transition-transform duration-200" :class="{ 'rotate-180': open }" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor">
-                                    <path fill-rule="evenodd" d="M5.293 7.293a1 1 0 011.414 0L10 10.586l3.293-3.293a1 1 0 111.414 1.414l-4 4a1 1 0 01-1.414 0l-4-4a1 1 0 010-1.414z" clip-rule="evenodd" />
+
+
+                                <svg class="ml-2 -mr-0.5 h-4 w-4 transition-transform duration-200" :class="{ 'rotate-180': open }" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24" fill="none">
+                                    <path d="M18 9.00005C18 9.00005 13.5811 15 12 15C10.4188 15 6 9 6 9" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" />
                                 </svg>
                             </button>
                         </x-slot>
 
                         <x-slot name="content">
                             <x-dropdown-link :href="route('profile')" wire:navigate>
-                                <x-heroicon-o-user class="w-5 h-5 mr-2 inline" />
+                                <x-hugeicons-user class="w-5 h-5 mr-2 inline" />
                                 {{ __('My Profile') }}
                             </x-dropdown-link>
                             <x-dropdown-link :href="route('notification-streams.index')" wire:navigate>
-                                <x-heroicon-o-bell class="w-5 h-5 mr-2 inline" />
+                                <x-hugeicons-notification-02 class="w-5 h-5 mr-2 inline" />
                                 {{ __('Notifications') }}
                             </x-dropdown-link>
                             <x-dropdown-link :href="route('statistics')" wire:navigate>
-                                <x-heroicon-o-chart-pie class="w-5 h-5 mr-2 inline" />
+                                <x-hugeicons-analytics-01 class="w-5 h-5 mr-2 inline" />
                                 {{ __('Statistics') }}
                             </x-dropdown-link>
                             <x-dropdown-link :href="route('profile.api')" wire:navigate>
-                                <x-heroicon-o-code-bracket class="w-5 h-5 mr-2 inline" />
+                                <x-hugeicons-ticket-02 class="w-5 h-5 mr-2 inline" />
                                 {{ __('API Tokens') }}
                             </x-dropdown-link>
 
                             <div class="border-t border-gray-200 dark:border-gray-600 my-1"></div>
 
                             <x-dropdown-link :href="route('profile.mfa')" wire:navigate>
-                                <x-heroicon-o-lock-closed class="w-5 h-5 mr-2 inline" />
+                                <x-hugeicons-square-lock-01 class="w-5 h-5 mr-2 inline" />
                                 {{ __('Security Settings') }}
                             </x-dropdown-link>
                             <x-dropdown-link :href="route('profile.help')" wire:navigate>
-                                <x-heroicon-o-lifebuoy class="w-5 h-5 mr-2 inline" />
+                                <x-hugeicons-mentoring class="w-5 h-5 mr-2 inline" />
                                 {{ __('Get Help') }}
                             </x-dropdown-link>
 
@@ -120,11 +122,11 @@ public function toggleUserDropdown(): void
                                 <div class="border-t border-gray-200 dark:border-gray-600 my-1"></div>
 
                                 <x-dropdown-link href="{{ url('/pulse') }}">
-                                    <x-heroicon-o-chart-bar class="w-5 h-5 mr-2 inline" />
+                                    <x-hugeicons-dashboard-browsing class="w-5 h-5 mr-2 inline" />
                                     {{ __('Laravel Pulse') }}
                                 </x-dropdown-link>
                                 <x-dropdown-link href="{{ url('/horizon/dashboard') }}">
-                                    <x-heroicon-o-cpu-chip class="w-5 h-5 mr-2 inline" />
+                                    <x-hugeicons-cpu class="w-5 h-5 mr-2 inline" />
                                     {{ __('Laravel Horizon') }}
                                 </x-dropdown-link>
                             @endif
@@ -133,7 +135,7 @@ public function toggleUserDropdown(): void
 
                             <button wire:click="logout" class="w-full text-start" role="menuitem">
                                 <x-dropdown-link>
-                                    @svg('heroicon-o-arrow-left-on-rectangle', 'h-5 w-5 mr-2 inline')
+                                    @svg('hugeicons-logout-03', 'h-5 w-5 mr-2 inline')
                                     {{ __('Log Out') }}
                                 </x-dropdown-link>
                             </button>
@@ -166,27 +168,27 @@ public function toggleUserDropdown(): void
     <div x-show="mobileMenuOpen" class="sm:hidden" id="mobile-menu">
         <div class="pt-2 pb-3 space-y-1">
             <x-responsive-nav-link :href="route('overview')" :active="request()->routeIs('overview')" wire:navigate>
-                <x-dynamic-component :component="'heroicon-o-' . (Auth::user()->backupTasks->isNotEmpty() ? 'book-open' : 'rocket-launch')" class="h-5 w-5 mr-2 inline" />
+                <x-dynamic-component :component="'hugeicons-' . (Auth::user()->backupTasks->isNotEmpty() ? 'book-open-01' : 'rocket-01')" class="h-5 w-5 mr-2 inline" />
                 {{ __(Auth::user()->backupTasks->isNotEmpty() ? 'Overview' : 'Get Started') }}
             </x-responsive-nav-link>
 
             @if (Auth::user()->backupTasks->isNotEmpty())
                 <x-responsive-nav-link :href="route('backup-tasks.index')" :active="request()->routeIs('backup-tasks.*')" wire:navigate>
-                    <x-heroicon-o-archive-box class="h-5 w-5 mr-2 inline" />
+                    <x-hugeicons-archive-01 class="h-5 w-5 mr-2 inline" />
                     {{ __('Backup Tasks') }}
                 </x-responsive-nav-link>
             @endif
 
             @if (Auth::user()->backupDestinations->isNotEmpty())
                 <x-responsive-nav-link :href="route('backup-destinations.index')" :active="request()->routeIs('backup-destinations.*')" wire:navigate>
-                    <x-heroicon-o-globe-europe-africa class="h-5 w-5 mr-2 inline" />
+                    <x-hugeicons-global class="h-5 w-5 mr-2 inline" />
                     {{ __('Destinations') }}
                 </x-responsive-nav-link>
             @endif
 
             @if (Auth::user()->remoteServers->isNotEmpty())
                 <x-responsive-nav-link :href="route('remote-servers.index')" :active="request()->routeIs('remote-servers.*')" wire:navigate>
-                    <x-heroicon-o-server-stack class="h-5 w-5 mr-2 inline" />
+                    <x-hugeicons-cloud-server class="h-5 w-5 mr-2 inline" />
                     {{ __('Servers') }}
                 </x-responsive-nav-link>
             @endif
@@ -205,43 +207,43 @@ public function toggleUserDropdown(): void
 
             <div class="mt-3 space-y-1">
                 <x-responsive-nav-link :href="route('profile')" wire:navigate>
-                    <x-heroicon-o-user class="w-5 h-5 mr-2 inline" />
+                    <x-hugeicons-user class="w-5 h-5 mr-2 inline" />
                     {{ __('My Profile') }}
                 </x-responsive-nav-link>
                 <x-responsive-nav-link :href="route('tags.index')" wire:navigate>
-                    <x-heroicon-o-tag class="w-5 h-5 mr-2 inline" />
+                    <x-hugeicons-tags class="w-5 h-5 mr-2 inline" />
                     {{ __('Tags') }}
                 </x-responsive-nav-link>
                 <x-responsive-nav-link :href="route('notification-streams.index')" wire:navigate>
-                    <x-heroicon-o-bell class="w-5 h-5 mr-2 inline" />
+                    <x-hugeicons-notification-02 class="w-5 h-5 mr-2 inline" />
                     {{ __('Notifications') }}
                 </x-responsive-nav-link>
                 <x-responsive-nav-link :href="route('profile.api')" wire:navigate>
-                    <x-heroicon-o-code-bracket class="w-5 h-5 mr-2 inline" />
+                    <x-hugeicons-ticket-02 class="w-5 h-5 mr-2 inline" />
                     {{ __('API Tokens') }}
                 </x-responsive-nav-link>
                 <x-responsive-nav-link :href="route('profile.mfa')" wire:navigate>
-                    <x-heroicon-o-lock-closed class="w-5 h-5 mr-2 inline" />
+                    <x-hugeicons-square-lock-01 class="w-5 h-5 mr-2 inline" />
                     {{ __('2FA Settings') }}
                 </x-responsive-nav-link>
                 <x-responsive-nav-link :href="route('statistics')" wire:navigate>
-                    <x-heroicon-o-chart-pie class="w-5 h-5 mr-2 inline" />
+                    <x-hugeicons-analytics-01 class="w-5 h-5 mr-2 inline" />
                     {{ __('Statistics') }}
                 </x-responsive-nav-link>
                 @if (Auth::user()->isAdmin())
                     <x-responsive-nav-link href="{{ url('/pulse') }}">
-                        <x-heroicon-o-chart-bar class="w-5 h-5 mr-2 inline" />
+                        <x-hugeicons-dashboard-browsing class="w-5 h-5 mr-2 inline" />
                         {{ __('Laravel Pulse') }}
                     </x-responsive-nav-link>
                     <x-responsive-nav-link href="{{ url('/horizon/dashboard') }}">
-                        <x-heroicon-o-cpu-chip class="w-5 h-5 mr-2 inline" />
+                        <x-hugeicons-cpu class="w-5 h-5 mr-2 inline" />
                         {{ __('Laravel Horizon') }}
                     </x-responsive-nav-link>
                 @endif
             </div>
             <button wire:click="logout" class="w-full text-start">
                 <x-responsive-nav-link>
-                    @svg('heroicon-o-arrow-left-on-rectangle', 'h-5 w-5 text-gray-50 mr-2 inline')
+                    @svg('hugeicons-logout-03', 'h-5 w-5 text-gray-50 mr-2 inline')
                     {{ __('Log Out') }}
                 </x-responsive-nav-link>
             </button>
diff --git a/resources/views/livewire/notification-streams/buttons/remove-notification-stream.blade.php b/resources/views/livewire/notification-streams/buttons/remove-notification-stream.blade.php
index 5a08cfd4..40694a29 100644
--- a/resources/views/livewire/notification-streams/buttons/remove-notification-stream.blade.php
+++ b/resources/views/livewire/notification-streams/buttons/remove-notification-stream.blade.php
@@ -2,7 +2,7 @@
     <div class="my-3 flex justify-end">
         <a href="#" class="text-sm text-red-600 dark:text-red-400 font-medium hover:text-underline ease-in-out" x-data=""
            x-on:click.prevent="$dispatch('open-modal', 'remove-notification-stream-{{ $notificationStream->id }}')">
-            @svg('heroicon-o-x-mark', 'h-5 w-5 inline-block -mt-0.5')
+            @svg('hugeicons-delete-02', 'h-5 w-5 inline-block -mt-0.5')
             {{ __('Remove Notification Stream') }}
         </a>
     </div>
@@ -14,7 +14,7 @@
             {{ __('Please read this carefully before confirming this action.') }}
         </x-slot>
         <x-slot name="icon">
-            heroicon-o-trash
+            hugeicons-delete-02
         </x-slot>
         <div>
             <p class="text-gray-800 dark:text-gray-200 mb-3">
diff --git a/resources/views/livewire/notification-streams/tables/index-table.blade.php b/resources/views/livewire/notification-streams/tables/index-table.blade.php
index f54d3d65..cafb2a0b 100644
--- a/resources/views/livewire/notification-streams/tables/index-table.blade.php
+++ b/resources/views/livewire/notification-streams/tables/index-table.blade.php
@@ -2,7 +2,7 @@
     @if ($notificationStreams->isEmpty())
         <x-no-content withBackground>
             <x-slot name="icon">
-                @svg('heroicon-o-bell', 'h-16 w-16 text-primary-900 dark:text-white inline')
+                @svg('hugeicons-notification-02', 'h-16 w-16 text-primary-900 dark:text-white inline')
             </x-slot>
             <x-slot name="title">
                 {{ __('No Notification Streams') }}
@@ -23,7 +23,7 @@
             title="{{ __('Notification Streams') }}"
             description="{{ __('Configured Notification streams for your backup tasks.') }}">
             <x-slot name="icon">
-                <x-heroicon-o-bell class="h-6 w-6 text-primary-600 dark:text-primary-400"/>
+                <x-hugeicons-notification-02 class="h-6 w-6 text-primary-600 dark:text-primary-400"/>
             </x-slot>
             <x-table.table-header>
                 <div class="col-span-3">{{ __('Label') }}</div>
@@ -59,7 +59,7 @@ class="col-span-12 sm:col-span-3 mt-4 sm:mt-0 flex justify-start sm:justify-cent
                             <a href="{{ route('notification-streams.edit', $notificationStream) }}" wire:navigate>
                                 <x-secondary-button iconOnly>
                                     <span class="sr-only">{{ __('Update Notification Stream') }}</span>
-                                    <x-heroicon-o-pencil-square class="w-4 h-4"/>
+                                    <x-hugeicons-task-edit-01 class="w-4 h-4"/>
                                 </x-secondary-button>
                             </a>
                         </div>
diff --git a/resources/views/livewire/other/generate-ssh-keys-button.blade.php b/resources/views/livewire/other/generate-ssh-keys-button.blade.php
index 8362e164..b5547ae2 100644
--- a/resources/views/livewire/other/generate-ssh-keys-button.blade.php
+++ b/resources/views/livewire/other/generate-ssh-keys-button.blade.php
@@ -3,7 +3,7 @@
         wire:click="generateKeys"
         class="w-full sm:w-auto bg-white/10 hover:bg-white/20 backdrop-blur-sm px-6 py-2 text-sm font-medium text-white rounded-full border border-white/25 focus:outline-none focus:ring-2 focus:ring-white/50 focus:ring-offset-2 focus:ring-offset-red-600 transition-all duration-150 ease-out hover:shadow-lg hover:-translate-y-0.5"
     >
-        @svg('heroicon-o-play', ['class' => 'h-4 w-4 inline mr-2'])
+        @svg('hugeicons-play', ['class' => 'h-4 w-4 inline mr-2'])
         {{ __('Generate SSH Keys') }}
     </button>
 </div>
diff --git a/resources/views/livewire/other/new-feature-banner.blade.php b/resources/views/livewire/other/new-feature-banner.blade.php
index 57aa8c8c..3d8f495f 100644
--- a/resources/views/livewire/other/new-feature-banner.blade.php
+++ b/resources/views/livewire/other/new-feature-banner.blade.php
@@ -32,7 +32,7 @@ class="bg-gradient-to-r from-blue-500/90 to-blue-600/90 text-white relative shad
                 <div class="flex flex-col sm:flex-row items-center justify-between">
                     <div class="flex items-center w-full sm:w-auto mb-4 sm:mb-0">
                 <span class="flex p-2 rounded-full bg-blue-700/50 backdrop-blur-sm">
-                    @svg('heroicon-o-sparkles', 'h-6 w-6 text-white')
+                    @svg('hugeicons-sparkles', 'h-6 w-6 text-white')
                 </span>
                         <p class="ml-3 font-medium text-base sm:text-lg">
                             {{ __('New Feature!') }}
@@ -50,7 +50,7 @@ class="bg-gradient-to-r from-blue-500/90 to-blue-600/90 text-white relative shad
                                 rel="noopener noreferrer"
                                 class="bg-white/10 hover:bg-white/20 backdrop-blur-sm px-3 py-1 text-sm font-medium text-white rounded-full border border-white/25 focus:outline-none focus:ring-2 focus:ring-white/50 focus:ring-offset-2 focus:ring-offset-blue-600 transition-all duration-150 ease-out hover:shadow-lg hover:-translate-y-0.5"
                             >
-                                @svg('heroicon-o-code-bracket', 'h-4 w-4 inline mr-1')
+                                @svg('hugeicons-github', 'h-4 w-4 inline mr-1')
                                 {{ __('View on GitHub') }}
                             </a>
                             <button
diff --git a/resources/views/livewire/pages/auth/confirm-password.blade.php b/resources/views/livewire/pages/auth/confirm-password.blade.php
index d904a214..93377ac5 100644
--- a/resources/views/livewire/pages/auth/confirm-password.blade.php
+++ b/resources/views/livewire/pages/auth/confirm-password.blade.php
@@ -58,7 +58,7 @@ class="mt-1 block w-full rounded-md border-gray-300 shadow-sm focus:border-prima
 
         <x-primary-button class="w-full justify-center rounded-md border border-transparent bg-primary-600 py-2 px-4 text-sm font-medium text-white shadow-sm hover:bg-primary-700 focus:outline-none focus:ring-2 focus:ring-primary-500 focus:ring-offset-2 dark:bg-primary-500 dark:hover:bg-primary-600">
             {{ __('Confirm') }}
-            @svg('heroicon-o-arrow-right', 'w-5 h-5 ms-2 inline')
+            @svg('hugeicons-arrow-right-02', 'w-5 h-5 ms-2 inline')
         </x-primary-button>
 
         <div class="text-center mt-8">
diff --git a/resources/views/livewire/pages/auth/forgot-password.blade.php b/resources/views/livewire/pages/auth/forgot-password.blade.php
index 664c69e6..3b488630 100644
--- a/resources/views/livewire/pages/auth/forgot-password.blade.php
+++ b/resources/views/livewire/pages/auth/forgot-password.blade.php
@@ -54,7 +54,7 @@ public function sendPasswordResetLink(): void
 
         <x-primary-button class="w-full justify-center rounded-md border border-transparent bg-primary-600 py-2 px-4 text-sm font-medium text-white shadow-sm hover:bg-primary-700 focus:outline-none focus:ring-2 focus:ring-primary-500 focus:ring-offset-2 dark:bg-primary-500 dark:hover:bg-primary-600">
             {{ __('Request Password Reset Email') }}
-            @svg('heroicon-o-arrow-right', 'w-5 h-5 ms-2 inline')
+            @svg('hugeicons-arrow-right-02', 'w-5 h-5 ms-2 inline')
         </x-primary-button>
 
         <div class="text-center mt-6">
diff --git a/resources/views/livewire/pages/auth/login.blade.php b/resources/views/livewire/pages/auth/login.blade.php
index 7b225a89..3217327f 100644
--- a/resources/views/livewire/pages/auth/login.blade.php
+++ b/resources/views/livewire/pages/auth/login.blade.php
@@ -76,7 +76,7 @@ public function login(): void
 
         <x-primary-button dusk="login-button" class="w-full justify-center rounded-md border border-transparent bg-primary-600 py-2 px-4 text-sm font-medium text-white shadow-sm hover:bg-primary-700 focus:outline-none focus:ring-2 focus:ring-primary-500 focus:ring-offset-2 dark:bg-primary-500 dark:hover:bg-primary-600">
             {{ __('Login') }}
-            @svg('heroicon-o-arrow-right', 'w-5 h-5 ms-2 inline')
+            @svg('hugeicons-arrow-right-02', 'w-5 h-5 ms-2 inline')
         </x-primary-button>
 
         @if (config('services.github.client_id') && config('services.github.client_secret'))
diff --git a/resources/views/livewire/pages/auth/register.blade.php b/resources/views/livewire/pages/auth/register.blade.php
index 39543dbc..8a7b8a42 100644
--- a/resources/views/livewire/pages/auth/register.blade.php
+++ b/resources/views/livewire/pages/auth/register.blade.php
@@ -92,7 +92,7 @@ class="mt-1 block w-full rounded-md border-gray-300 shadow-sm focus:border-prima
             <x-primary-button dusk="create_account_button"
                 class="w-full justify-center rounded-md border border-transparent bg-primary-600 py-2 px-4 text-sm font-medium text-white shadow-sm hover:bg-primary-700 focus:outline-none focus:ring-2 focus:ring-primary-500 focus:ring-offset-2 dark:bg-primary-500 dark:hover:bg-primary-600">
                 {{ __('Create Account') }}
-                @svg('heroicon-o-arrow-right', 'w-5 h-5 ms-2 inline')
+                @svg('hugeicons-arrow-right-02', 'w-5 h-5 ms-2 inline')
             </x-primary-button>
 
             @if (config('services.github.client_id') && config('services.github.client_secret'))
diff --git a/resources/views/livewire/pages/auth/reset-password.blade.php b/resources/views/livewire/pages/auth/reset-password.blade.php
index 1f2d9a3b..45980d71 100644
--- a/resources/views/livewire/pages/auth/reset-password.blade.php
+++ b/resources/views/livewire/pages/auth/reset-password.blade.php
@@ -93,7 +93,7 @@ function ($user) {
 
         <x-primary-button class="w-full justify-center rounded-md border border-transparent bg-primary-600 py-2 px-4 text-sm font-medium text-white shadow-sm hover:bg-primary-700 focus:outline-none focus:ring-2 focus:ring-primary-500 focus:ring-offset-2 dark:bg-primary-500 dark:hover:bg-primary-600">
             {{ __('Change Password') }}
-            @svg('heroicon-o-arrow-right', 'w-5 h-5 ms-2 inline')
+            @svg('hugeicons-arrow-right-02', 'w-5 h-5 ms-2 inline')
         </x-primary-button>
 
         <div class="text-center mt-6">
diff --git a/resources/views/livewire/pages/auth/two-factor-challenge.blade.php b/resources/views/livewire/pages/auth/two-factor-challenge.blade.php
index d57a833f..82620398 100644
--- a/resources/views/livewire/pages/auth/two-factor-challenge.blade.php
+++ b/resources/views/livewire/pages/auth/two-factor-challenge.blade.php
@@ -244,7 +244,7 @@ class="mt-1 block w-full"
                 </div>
                 <div>
                     <x-primary-button type="button" wire:click="submit" centered fat action="submit" loadingText="Verifying...">
-                        @svg('heroicon-o-finger-print', 'w-5 h-5 mr-2 inline')
+                        @svg('hugeicons-finger-print', 'w-5 h-5 mr-2 inline')
                         {{ __('Verify and Proceed') }}
                     </x-primary-button>
                 </div>
diff --git a/resources/views/livewire/pages/auth/verify-email.blade.php b/resources/views/livewire/pages/auth/verify-email.blade.php
index 02a33970..b6e7efb7 100644
--- a/resources/views/livewire/pages/auth/verify-email.blade.php
+++ b/resources/views/livewire/pages/auth/verify-email.blade.php
@@ -125,7 +125,7 @@ public function logout(Logout $logout): void
                 <a href="{{ $this->emailLink }}" target="_blank" rel="noopener noreferrer"
                    class="inline-flex items-center px-4 py-2 bg-blue-500 border border-transparent rounded-md font-semibold text-xs text-white uppercase tracking-widest hover:bg-blue-600 active:bg-blue-700 focus:outline-none focus:border-blue-700 focus:ring focus:ring-blue-300 disabled:opacity-25 transition">
                     {{ __('Open :provider Inbox', ['provider' => $this->emailProvider]) }}
-                    @svg('heroicon-o-arrow-top-right-on-square', 'w-4 h-4 ml-2')
+                    @svg('hugeicons-arrow-right-02', 'w-4 h-4 ml-2')
                 </a>
             </div>
         @else
@@ -156,7 +156,7 @@ class="w-full justify-center rounded-md border border-transparent bg-primary-600
             @else
                 {{ __('Resend Verification Email') }}
             @endif
-            @svg('heroicon-o-arrow-right', 'w-5 h-5 ms-2 inline')
+                @svg('hugeicons-arrow-right-02', 'w-5 h-5 ms-2 inline')
         </x-primary-button>
 
         <div class="text-center mt-6">
diff --git a/resources/views/livewire/profile/api-token-manager.blade.php b/resources/views/livewire/profile/api-token-manager.blade.php
index 31528c77..62f80990 100644
--- a/resources/views/livewire/profile/api-token-manager.blade.php
+++ b/resources/views/livewire/profile/api-token-manager.blade.php
@@ -490,7 +490,7 @@ class="space-y-6"
     @if ($this->tokens->isEmpty())
         <x-no-content withBackground>
             <x-slot name="icon">
-                @svg('heroicon-o-code-bracket', 'h-16 w-16 text-primary-900 dark:text-white inline')
+                @svg('hugeicons-ticket-02', 'h-16 w-16 text-primary-900 dark:text-white inline')
             </x-slot>
             <x-slot name="title">
                 {{ __('No API Tokens') }}
@@ -510,7 +510,7 @@ class="mt-4">
             title="{{ __('API Tokens') }}"
             description="{{ __('Manage your API tokens for third-party access to Vanguard.') }}">
             <x-slot name="icon">
-                <x-heroicon-o-code-bracket class="h-6 w-6 text-primary-600 dark:text-primary-400"/>
+                <x-hugeicons-ticket-02 class="h-6 w-6 text-primary-600 dark:text-primary-400"/>
             </x-slot>
             <x-slot name="actions">
                 <x-primary-button x-data="" x-on:click.prevent="$dispatch('open-modal', 'create-api-token')">
@@ -531,7 +531,7 @@ class="mt-4">
                                 {{ $token->name }}
                                 @if ($token->isMobileToken())
                                     <span class="ml-2 relative group">
-                                        @svg('heroicon-s-device-phone-mobile', 'w-4 h-4 text-cyan-600 dark:text-cyan-400 inline-block', ['aria-label' => __('Mobile Token'),'role' => 'img',])
+                                        @svg('hugeicons-smart-phone-01', 'w-4 h-4 text-cyan-600 dark:text-cyan-400 inline-block', ['aria-label' => __('Mobile Token'),'role' => 'img',])
                                         <span class="pointer-events-none absolute bottom-full left-1/2 -translate-x-1/2 w-max bg-gray-900 px-2 py-1 text-sm text-gray-100 rounded opacity-0 transition-opacity group-hover:opacity-100">
                                             {{ __('Mobile Token') }}
                                         </span>
@@ -557,11 +557,11 @@ class="mt-4">
                         <div class="col-span-12 sm:col-span-3 flex justify-start sm:justify-center space-x-2">
                             <x-secondary-button wire:click="viewTokenAbilities({{ $token->id }})" iconOnly>
                                 <span class="sr-only">{{ __('View Abilities') }}</span>
-                                @svg('heroicon-s-eye', 'w-4 h-4')
+                                @svg('hugeicons-eye', 'w-4 h-4')
                             </x-secondary-button>
                             <x-danger-button wire:click="confirmApiTokenDeletion({{ $token->id }})" iconOnly>
                                 <span class="sr-only">{{ __('Delete Token') }}</span>
-                                @svg('heroicon-s-trash', 'w-4 h-4')
+                                @svg('hugeicons-delete-02', 'w-4 h-4')
                             </x-danger-button>
                         </div>
                     </x-table.table-row>
@@ -578,7 +578,7 @@ class="mt-4">
             {{ __('Generate a new API token with specific abilities and expiration.') }}
         </x-slot>
         <x-slot name="icon">
-            heroicon-o-code-bracket
+            hugeicons-ticket-02
         </x-slot>
         <form wire:submit.prevent="createApiToken" class="space-y-6">
             <!-- Token Name -->
@@ -619,7 +619,7 @@ class="mt-1 block w-full" :min="date('Y-m-d', strtotime('+1 day'))" :max="date('
                  class="rounded-md p-4 bg-yellow-50 dark:bg-yellow-900">
                 <div class="flex">
                     <div class="flex-shrink-0">
-                        @svg('heroicon-s-exclamation-triangle', 'h-5 w-5 text-yellow-400 dark:text-yellow-300')
+                        @svg('hugeicons-alert-02', 'h-5 w-5 text-yellow-400 dark:text-yellow-300')
                     </div>
                     <div class="ml-3">
                         <h3 class="text-sm font-medium text-yellow-800 dark:text-yellow-100">
@@ -653,7 +653,7 @@ class="rounded-md p-4 bg-yellow-50 dark:bg-yellow-900">
                          class="rounded-md p-4 bg-red-50 dark:bg-red-900 mb-4">
                         <div class="flex">
                             <div class="flex-shrink-0">
-                                @svg('heroicon-s-exclamation-circle', 'h-5 w-5 text-red-400 dark:text-red-300')
+                                @svg('hugeicons-alert-02', 'h-5 w-5 text-red-400 dark:text-red-300')
                             </div>
                             <div class="ml-3">
                                 <h3 class="text-sm font-medium text-red-800 dark:text-red-100">
@@ -676,9 +676,9 @@ class="w-full px-4 py-2 text-left dark:text-gray-200 bg-gray-100 dark:bg-gray-80
                                 <span class="font-medium">{{ $group }}</span>
                                 <span class="float-right">
                                 @if ($this->expandedGroups[$group])
-                                        @svg('heroicon-s-chevron-up', 'w-5 h-5 inline')
+                                        @svg('hugeicons-arrow-up-01', 'w-5 h-5 inline')
                                     @else
-                                        @svg('heroicon-s-chevron-down', 'w-5 h-5 inline')
+                                        @svg('hugeicons-arrow-down-01', 'w-5 h-5 inline')
                                     @endif
                             </span>
                             </button>
@@ -734,7 +734,7 @@ class="w-full px-4 py-2 text-left dark:text-gray-200 bg-gray-100 dark:bg-gray-80
         </x-slot>
 
         <x-slot name="icon">
-            heroicon-o-exclamation-triangle
+            hugeicons-alert-02
         </x-slot>
 
         <div class="space-y-4 text-gray-800 dark:text-gray-200">
@@ -796,7 +796,7 @@ class="w-full justify-center"
                 {{ __('Your new API token has been generated. Please copy it now, as it won\'t be shown again.') }}
             </x-slot>
             <x-slot name="icon">
-                heroicon-o-code-bracket
+                hugeicons-ticket-02
             </x-slot>
             <div class="space-y-4">
                 <div class="bg-gray-100 dark:bg-gray-700 p-4 rounded-md">
@@ -822,7 +822,7 @@ class="w-full justify-center"
                 {{ __('View the abilities assigned to this API token.') }}
             </x-slot>
             <x-slot name="icon">
-                heroicon-o-code-bracket
+                hugeicons-ticket-02
             </x-slot>
             <div>
                 @if ($viewingTokenId)
@@ -851,9 +851,9 @@ class="w-full justify-center"
                                         @foreach ($groupAbilities as $key => $ability)
                                             <li class="flex items-center space-x-2">
                                                 @if (in_array('*', $token->abilities, true) || in_array($key, $token->abilities, true))
-                                                    @svg('heroicon-s-check-circle', 'w-5 h-5 text-green-500 flex-shrink-0')
+                                                    @svg('hugeicons-checkmark-circle-02', 'w-5 h-5 text-green-500 flex-shrink-0')
                                                 @else
-                                                    @svg('heroicon-s-x-circle', 'w-5 h-5 text-red-500 flex-shrink-0')
+                                                    @svg('hugeicons-cancel-circle', 'w-5 h-5 text-red-500 flex-shrink-0')
                                                 @endif
                                                 <span class="text-sm text-gray-700 dark:text-gray-300">{{ $ability['name'] }}</span>
                                             </li>
diff --git a/resources/views/livewire/profile/connections-page.blade.php b/resources/views/livewire/profile/connections-page.blade.php
index 5ca07805..a93172de 100644
--- a/resources/views/livewire/profile/connections-page.blade.php
+++ b/resources/views/livewire/profile/connections-page.blade.php
@@ -9,7 +9,7 @@
         <x-slot name="description">
             {{ __('Link accounts for expanded features.') }}
         </x-slot>
-        <x-slot name="icon">heroicon-o-puzzle-piece</x-slot>
+        <x-slot name="icon">hugeicons-puzzle</x-slot>
 
         <div class="space-y-6">
             @if (config('services.github.client_id') && config('services.github.client_secret'))
diff --git a/resources/views/livewire/profile/delete-user-form.blade.php b/resources/views/livewire/profile/delete-user-form.blade.php
index 38b996ab..3d7a55fc 100644
--- a/resources/views/livewire/profile/delete-user-form.blade.php
+++ b/resources/views/livewire/profile/delete-user-form.blade.php
@@ -118,11 +118,11 @@ public function deleteUser(Logout $logout): void
                 <x-slot name="description">
                     {{ __('Please review the consequences of account deletion before proceeding.') }}
                 </x-slot>
-                <x-slot name="icon">heroicon-o-exclamation-triangle</x-slot>
+                <x-slot name="icon">hugeicons-user-remove-01</x-slot>
 
                 <div class="mb-8 p-6 bg-red-50 dark:bg-red-950 rounded-lg">
                     <div class="flex items-center mb-4">
-                        @svg('heroicon-o-exclamation-circle', 'w-8 h-8 text-red-500 dark:text-red-400 mr-3')
+                        @svg('hugeicons-alert-circle', 'w-8 h-8 text-red-500 dark:text-red-400 mr-3')
                         <h3 class="text-xl font-semibold text-red-700 dark:text-red-300">{{ __('Warning: Irreversible Action') }}</h3>
                     </div>
                     <p class="text-red-700 dark:text-red-300 mb-4">
@@ -138,7 +138,7 @@ public function deleteUser(Logout $logout): void
 
                 @if (!$hasPassword)
                     <div class="mb-8 p-4 bg-yellow-100 dark:bg-yellow-900 text-yellow-700 dark:text-yellow-300 rounded-lg">
-                        @svg('heroicon-o-exclamation-triangle', 'w-6 h-6 inline-block mr-2')
+                        @svg('hugeicons-alert-02', 'w-6 h-6 inline-block mr-2')
                         {{ __('You need to set a password before you can delete your account. Please request a password reset.') }}
                     </div>
                 @endif
@@ -146,7 +146,7 @@ public function deleteUser(Logout $logout): void
                 @if ($hasPassword)
                     <div class="flex justify-end items-center">
                         <x-danger-button wire:click="proceedToEligibilityCheck" type="button">
-                            @svg('heroicon-o-arrow-right', 'w-5 h-5 mr-2 inline')
+                            @svg('hugeicons-arrow-right-03', 'w-5 h-5 mr-2 inline')
                             {{ __('Proceed to Eligibility Check') }}
                         </x-danger-button>
                     </div>
@@ -159,7 +159,7 @@ public function deleteUser(Logout $logout): void
                 <x-slot name="description">
                     {{ __('We\'ll check if your account is eligible for deletion based on your current data and services.') }}
                 </x-slot>
-                <x-slot name="icon">heroicon-o-clipboard-document-check</x-slot>
+                <x-slot name="icon">hugeicons-check-list</x-slot>
 
                 <div class="mb-8">
                     <h3 class="text-lg font-semibold text-gray-900 dark:text-gray-100 mb-4">{{ __('Account Summary') }}</h3>
@@ -178,12 +178,12 @@ public function deleteUser(Logout $logout): void
                 <div class="mb-8">
                     @if ($isEligible)
                         <div class="p-4 bg-green-100 dark:bg-green-950 text-green-700 dark:text-green-300 rounded-lg">
-                            @svg('heroicon-o-check-circle', 'w-6 h-6 inline-block mr-2')
+                            @svg('hugeicons-checkmark-circle-02', 'w-6 h-6 inline-block mr-2')
                             {{ __('Your account is eligible for deletion.') }}
                         </div>
                     @else
                         <div class="p-4 bg-red-100 dark:bg-red-950 text-red-700 dark:text-red-300 rounded-lg">
-                            @svg('heroicon-o-x-circle', 'w-6 h-6 inline-block mr-2')
+                            @svg('hugeicons-cancel-circle', 'w-6 h-6 inline-block mr-2')
                             {{ __('Your account is not eligible for deletion. Please remove all associated data and services before proceeding.') }}
                         </div>
                     @endif
@@ -191,12 +191,12 @@ public function deleteUser(Logout $logout): void
 
                 <div class="flex justify-between items-center">
                     <x-secondary-button wire:click="$set('currentView', 'notice')" type="button">
-                        @svg('heroicon-o-arrow-left', 'w-5 h-5 mr-2')
+                        @svg('hugeicons-arrow-left-03', 'w-5 h-5 mr-2')
                         {{ __('Go Back') }}
                     </x-secondary-button>
                     @if ($isEligible)
                         <x-danger-button wire:click="proceedToFinalConfirmation" type="button">
-                            @svg('heroicon-o-arrow-right', 'w-5 h-5 mr-2')
+                            @svg('hugeicons-arrow-right-03', 'w-5 h-5 mr-2 inline')
                             {{ __('Proceed to Final Confirmation') }}
                         </x-danger-button>
                     @endif
@@ -209,13 +209,13 @@ public function deleteUser(Logout $logout): void
                 <x-slot name="description">
                     {{ __('This is your last chance to reconsider. Once confirmed, your account will be deleted.') }}
                 </x-slot>
-                <x-slot name="icon">heroicon-o-shield-exclamation</x-slot>
+                <x-slot name="icon">hugeicons-user-shield-01</x-slot>
 
                 <form wire:submit.prevent="deleteUser">
                     <div class="mb-8">
                         <div class="p-6 bg-red-50 dark:bg-red-950 rounded-lg mb-6">
                             <div class="flex items-center mb-4">
-                                @svg('heroicon-o-exclamation-triangle', 'w-8 h-8 text-red-500 dark:text-red-400 mr-3')
+                                @svg('hugeicons-alert-02', 'w-8 h-8 text-red-500 dark:text-red-400 mr-3')
                                 <h3 class="text-xl font-semibold text-red-700 dark:text-red-300">{{ __('Final Warning') }}</h3>
                             </div>
                             <p class="text-red-700 dark:text-red-300 mb-4">
@@ -240,11 +240,11 @@ class="mt-1 block w-full"
 
                     <div class="flex justify-between items-center">
                         <x-secondary-button wire:click="$set('currentView', 'eligibility')" type="button">
-                            @svg('heroicon-o-arrow-left', 'w-5 h-5 mr-2')
+                            @svg('hugeicons-arrow-left-03', 'w-5 h-5 mr-2')
                             {{ __('Go Back') }}
                         </x-secondary-button>
                         <x-danger-button type="submit">
-                            @svg('heroicon-o-trash', 'w-5 h-5 mr-2')
+                            @svg('hugeicons-cancel-01', 'w-5 h-5 mr-2 inline')
                             {{ __('Permanently Delete Account') }}
                         </x-danger-button>
                     </div>
diff --git a/resources/views/livewire/profile/experiments-manager.blade.php b/resources/views/livewire/profile/experiments-manager.blade.php
index bd95f64e..4826f93e 100644
--- a/resources/views/livewire/profile/experiments-manager.blade.php
+++ b/resources/views/livewire/profile/experiments-manager.blade.php
@@ -248,7 +248,7 @@ private function getExperimentDetails(string $experiment): array
             'title' => $metadata['title'] ?? $this->getExperimentTitle($experiment),
             'description' => $metadata['description'] ?? $this->getExperimentDescription($experiment),
             'group' => $metadata['group'] ?? 'Uncategorized',
-            'icon' => $metadata['icon'] ?? 'heroicon-o-beaker',
+            'icon' => $metadata['icon'] ?? 'hugeicons-test-tube-01',
             'active' => $isActive,
             'enabled' => $isEnabled,
         ];
@@ -282,7 +282,7 @@ private function getExperimentDescription(string $experiment): string
     @if ($currentView === 'no-content')
         <x-no-content withBackground>
             <x-slot name="icon">
-                @svg('heroicon-o-beaker', 'h-16 w-16 text-primary-900 dark:text-white inline')
+                @svg('hugeicons-test-tube-01', 'h-16 w-16 text-primary-900 dark:text-white inline')
             </x-slot>
             <x-slot name="title">
                 {{ __('No Active Experiments') }}
@@ -297,11 +297,11 @@ private function getExperimentDescription(string $experiment): string
             <x-slot name="description">
                 {{ __('Explore and manage experimental features for your account.') }}
             </x-slot>
-            <x-slot name="icon">heroicon-o-beaker</x-slot>
+            <x-slot name="icon">hugeicons-test-tube-01</x-slot>
 
             <div class="mb-8 p-6 bg-blue-50 dark:bg-blue-900/50 rounded-lg shadow-sm">
                 <div class="flex items-center mb-4">
-                    @svg('heroicon-o-light-bulb', 'w-8 h-8 text-blue-500 mr-3')
+                    @svg('hugeicons-idea-01', 'w-8 h-8 text-blue-500 mr-3')
                     <h3 class="text-xl font-semibold text-blue-800 dark:text-blue-200">{{ __('About Feature Experiments') }}</h3>
                 </div>
                 <p class="text-blue-700 dark:text-blue-300 mb-4">
@@ -309,15 +309,15 @@ private function getExperimentDescription(string $experiment): string
                 </p>
                 <ul class="space-y-3">
                     <li class="flex items-start">
-                        @svg('heroicon-o-check-circle', 'w-5 h-5 text-blue-500 mr-2 mt-0.5 flex-shrink-0')
+                        @svg('hugeicons-tick-01', 'w-5 h-5 text-blue-500 mr-2 mt-0.5 flex-shrink-0')
                         <span class="text-blue-700 dark:text-blue-300">{{ __('Access new features before wide release') }}</span>
                     </li>
                     <li class="flex items-start">
-                        @svg('heroicon-o-check-circle', 'w-5 h-5 text-blue-500 mr-2 mt-0.5 flex-shrink-0')
+                        @svg('hugeicons-tick-01', 'w-5 h-5 text-blue-500 mr-2 mt-0.5 flex-shrink-0')
                         <span class="text-blue-700 dark:text-blue-300">{{ __('Provide valuable insights to enhance functionality') }}</span>
                     </li>
                     <li class="flex items-start">
-                        @svg('heroicon-o-check-circle', 'w-5 h-5 text-blue-500 mr-2 mt-0.5 flex-shrink-0')
+                        @svg('hugeicons-tick-01', 'w-5 h-5 text-blue-500 mr-2 mt-0.5 flex-shrink-0')
                         <span class="text-blue-700 dark:text-blue-300">{{ __('Tailor your experience by managing experiment participation') }}</span>
                     </li>
                 </ul>
@@ -367,7 +367,7 @@ class="mr-3"
                 {{ __('Learn more about this experiment and manage your participation.') }}
             </x-slot>
             <x-slot name="icon">
-                heroicon-o-information-circle
+                hugeicons-test-tube-01
             </x-slot>
 
             @if ($selectedExperiment)
@@ -406,7 +406,7 @@ class="mr-3"
                         wire:click="openFeedbackModal"
                         class="inline-flex items-center px-4 py-2 text-sm font-medium text-gray-700 bg-white border border-gray-300 rounded-md hover:bg-gray-50 focus:outline-none focus:ring-0"
                     >
-                        @svg('heroicon-o-chat-bubble-left-right', 'w-5 h-5 mr-2 -ml-1')
+                        @svg('hugeicons-comment-01', 'w-5 h-5 mr-2 -ml-1')
                         {{ __('Share Feedback') }}
                     </button>
                     <div class="flex space-x-3">
@@ -429,7 +429,7 @@ class="inline-flex items-center px-4 py-2 text-sm font-medium text-gray-700 bg-w
                 {{ __('Your feedback helps us improve this experimental feature.') }}
             </x-slot>
             <x-slot name="icon">
-                heroicon-o-chat-bubble-left-right
+                hugeicons-comment-01
             </x-slot>
 
             <form wire:submit.prevent="submitFeedback">
diff --git a/resources/views/livewire/profile/help-page.blade.php b/resources/views/livewire/profile/help-page.blade.php
index 75f4251c..a8c9c1f4 100644
--- a/resources/views/livewire/profile/help-page.blade.php
+++ b/resources/views/livewire/profile/help-page.blade.php
@@ -7,7 +7,7 @@
 
     <x-form-wrapper>
         <x-slot name="icon">
-            heroicon-o-lifebuoy
+            hugeicons-mentoring
         </x-slot>
 
         <x-slot name="title">
@@ -26,9 +26,9 @@
             <div class="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-4 sm:gap-6">
                 @php
                     $resources = [
-                        ['title' => 'Documentation', 'icon' => 'heroicon-o-book-open', 'url' => 'https://docs.vanguardbackup.com', 'description' => 'Comprehensive guides and API references'],
-                        ['title' => 'GitHub Discussions', 'icon' => 'heroicon-o-chat-bubble-left-right', 'url' => 'https://github.com/vanguardbackup/vanguard/discussions', 'description' => 'Community-driven Q&A and discussions'],
-                        ['title' => 'Vanguard Website', 'icon' => 'heroicon-o-globe-alt', 'url' => 'https://vanguardbackup.com', 'description' => 'Product information and latest updates'],
+                        ['title' => 'Documentation', 'icon' => 'hugeicons-book-open-01', 'url' => 'https://docs.vanguardbackup.com', 'description' => 'Comprehensive guides and API references'],
+                        ['title' => 'GitHub Discussions', 'icon' => 'hugeicons-chatting-01', 'url' => 'https://github.com/vanguardbackup/vanguard/discussions', 'description' => 'Community-driven Q&A and discussions'],
+                        ['title' => 'Vanguard Website', 'icon' => 'hugeicons-browser', 'url' => 'https://vanguardbackup.com', 'description' => 'Product information and latest updates'],
                     ];
                 @endphp
 
@@ -42,7 +42,7 @@
                             <p class="text-xs sm:text-sm text-gray-600 dark:text-gray-400 flex-grow">{{ __($resource['description']) }}</p>
                             <div class="mt-3 sm:mt-4 flex items-center text-gray-900 dark:text-white text-xs sm:text-sm font-medium underline">
                                 {{ __('Learn more') }}
-                                <x-heroicon-o-arrow-right class="ml-1 w-3 h-3 sm:w-4 sm:h-4 transition-transform duration-300 ease-in-out transform group-hover:translate-x-1" />
+                                <x-hugeicons-arrow-right-02 class="ml-1 w-3 h-3 sm:w-4 sm:h-4 transition-transform duration-300 ease-in-out transform group-hover:translate-x-1" />
                             </div>
                         </div>
                     </a>
@@ -56,13 +56,13 @@
                 </p>
                 <ul class="space-y-3 text-sm sm:text-base text-gray-700 dark:text-gray-300">
                     <li class="flex flex-wrap items-center">
-                        <x-heroicon-o-envelope class="w-5 h-5 mr-2 sm:mr-3 text-gray-600 dark:text-gray-400" />
+                        <x-hugeicons-mail-01 class="w-5 h-5 mr-2 sm:mr-3 text-gray-600 dark:text-gray-400" />
                         <span class="font-medium">{{ __('Support:') }}</span>
                         <a href="mailto:support@vanguardbackup.com" class="ml-1 sm:ml-2 text-gray-900 dark:text-white hover:underline underline">support@vanguardbackup.com</a>
                         <span class="w-full sm:w-auto sm:ml-2 mt-1 sm:mt-0 text-xs italic text-gray-500 dark:text-gray-400">({{ __('for urgent issues') }})</span>
                     </li>
                     <li class="flex items-center">
-                        <x-heroicon-o-chat-bubble-left-ellipsis class="w-5 h-5 mr-2 sm:mr-3 text-gray-600 dark:text-gray-400" />
+                        <x-hugeicons-mailbox-01 class="w-5 h-5 mr-2 sm:mr-3 text-gray-600 dark:text-gray-400" />
                         <span class="font-medium">{{ __('Feedback:') }}</span>
                         <a href="mailto:hello@vanguardbackup.com" class="ml-1 sm:ml-2 text-gray-900 dark:text-white hover:underline underline">hello@vanguardbackup.com</a>
                     </li>
diff --git a/resources/views/livewire/profile/multi-factor-authentication-manager.blade.php b/resources/views/livewire/profile/multi-factor-authentication-manager.blade.php
index 4c183ba1..b487be44 100644
--- a/resources/views/livewire/profile/multi-factor-authentication-manager.blade.php
+++ b/resources/views/livewire/profile/multi-factor-authentication-manager.blade.php
@@ -50,7 +50,7 @@ public function mfaMethods(): array
             User::TWO_FACTOR_APP => [
                 'name' => __('Authenticator App'),
                 'description' => __('Use a mobile app to generate secure, time-based codes for login.'),
-                'icon' => 'heroicon-o-device-phone-mobile',
+                'icon' => 'hugeicons-smart-phone-01',
                 'benefits' => [
                     __('Functions without internet or mobile network connection'),
                     __('Allows management of multiple accounts across various services'),
@@ -255,7 +255,7 @@ public function downloadBackupCodes(): ?StreamedResponse
                 <x-slot name="description">
                     {{ __('Enhance your account security by enabling Two-Factor Authentication.') }}
                 </x-slot>
-                <x-slot name="icon">heroicon-o-lock-closed</x-slot>
+                <x-slot name="icon">hugeicons-square-lock-02</x-slot>
 
                 <div class="space-y-6">
                     @foreach ($this->mfaMethods as $methodKey => $method)
@@ -300,7 +300,7 @@ class="px-6 py-4 bg-gray-50 dark:bg-gray-800 border-t border-gray-200 dark:borde
                                     <ul class="space-y-1">
                                         @foreach ($method['benefits'] as $benefit)
                                             <li class="flex items-start">
-                                                @svg('heroicon-o-check', 'w-5 h-5 text-green-500 mr-2 flex-shrink-0')
+                                                @svg('hugeicons-tick-01', 'w-5 h-5 text-green-500 mr-2 flex-shrink-0')
                                                 <span
                                                     class="text-sm text-gray-600 dark:text-gray-400">{{ $benefit }}</span>
                                             </li>
@@ -315,17 +315,17 @@ class="text-sm text-gray-600 dark:text-gray-400">{{ $benefit }}</span>
                 @if ($currentMethod !== 'none')
                     <div class="mt-8 p-6 bg-gray-100 dark:bg-gray-800 rounded-lg shadow-sm">
                         <div class="flex items-center mb-4">
-                            @svg('heroicon-o-key', 'w-8 h-8 text-gray-500 dark:text-gray-400 mr-3')
+                            @svg('hugeicons-security-lock', 'w-8 h-8 text-gray-500 dark:text-gray-400 mr-3')
                             <h3 class="text-xl font-semibold text-gray-900 dark:text-gray-100">{{ __('Backup and Recovery') }}</h3>
                         </div>
                         <p class="text-sm text-gray-600 dark:text-gray-400 mb-4">{{ __('Access your backup codes or generate new ones for account recovery.') }}</p>
                         <div class="flex flex-col sm:flex-row space-y-4 sm:space-y-0 sm:space-x-4">
                             <x-secondary-button wire:click="viewBackupCodes" class="justify-center">
-                                @svg('heroicon-o-eye', 'w-5 h-5 mr-2')
+                                @svg('hugeicons-eye', 'w-5 h-5 mr-2')
                                 {{ __('View Backup Codes') }}
                             </x-secondary-button>
                             <x-secondary-button wire:click="regenerateBackupCodes" class="justify-center">
-                                @svg('heroicon-o-arrow-path', 'w-5 h-5 mr-2')
+                                @svg('hugeicons-refresh', 'w-5 h-5 mr-2')
                                 {{ __('Regenerate Codes') }}
                             </x-secondary-button>
                         </div>
@@ -341,12 +341,12 @@ class="text-sm text-gray-600 dark:text-gray-400">{{ $benefit }}</span>
                     {{ __('Please review the consequences before proceeding.') }}
                 </x-slot>
                 <x-slot name="icon">
-                    heroicon-o-shield-exclamation
+                    hugeicons-square-lock-password
                 </x-slot>
 
                 <div class="mb-6">
                     <div class="flex items-center mb-4 text-yellow-600 dark:text-yellow-500">
-                        @svg('heroicon-o-exclamation-triangle', 'w-6 h-6 mr-2')
+                        @svg('hugeicons-alert-02', 'w-6 h-6 mr-2')
                         <h3 class="text-lg font-semibold">{{ __('Warning: Reduced Security') }}</h3>
                     </div>
                     <p class="text-gray-600 dark:text-gray-400 mb-4">
@@ -398,7 +398,7 @@ class="mt-1 block w-full"
                     {{ __('Please enter your password to confirm this action.') }}
                 </x-slot>
                 <x-slot name="icon">
-                    heroicon-o-lock-closed
+                    hugeicons-signature
                 </x-slot>
                 <form wire:submit="confirmPassword">
                     <div>
@@ -433,7 +433,7 @@ class="mt-1 block w-full"
                 <x-slot name="description">
                     {{ __('Secure your account using an authenticator app for two-factor authentication.') }}
                 </x-slot>
-                <x-slot name="icon">heroicon-o-device-phone-mobile</x-slot>
+                <x-slot name="icon">hugeicons-smart-phone-01</x-slot>
 
                 <div x-data="{ open: false }" class="mb-6 border-b border-gray-200 dark:border-gray-600">
                     <button @click="open = !open" class="flex justify-between items-center w-full p-6 text-left">
@@ -526,7 +526,7 @@ class="block w-full text-lg py-2 px-3"
                                     class="whitespace-nowrap justify-center inline-flex items-center px-4 py-2"
                                 >
                                     {{ __('Copy') }}
-                                    @svg('heroicon-o-clipboard', 'w-5 h-5 ml-2')
+                                    @svg('hugeicons-task-add-01', 'w-5 h-5 ml-2')
                                 </x-secondary-button>
                             </div>
                         </div>
@@ -591,7 +591,7 @@ class="whitespace-nowrap justify-center inline-flex items-center px-4 py-2"
                 <x-slot name="description">
                     {{ __('Your two-factor authentication method has been successfully enabled.') }}
                 </x-slot>
-                <x-slot name="icon">heroicon-o-check-circle</x-slot>
+                <x-slot name="icon">hugeicons-checkmark-circle-02</x-slot>
 
                 <div class="mb-8 p-6 bg-white dark:bg-gray-800 rounded-lg">
                     <div class="flex items-center mb-4">
@@ -638,11 +638,11 @@ class="text-gray-700 dark:text-gray-300">{{ __('Consider enabling 2FA on other i
 
                 <div class="flex flex-col sm:flex-row justify-center space-y-4 sm:space-y-0 sm:space-x-4">
                     <x-primary-button wire:click="viewBackupCodes" class="w-full sm:w-auto justify-center">
-                        @svg('heroicon-o-key', 'w-5 h-5 mr-2 inline')
+                        @svg('hugeicons-matrix', 'w-5 h-5 mr-2 inline')
                         {{ __('View Backup Codes') }}
                     </x-primary-button>
                     <x-secondary-button wire:click="goBackToMethodsView" class="w-full sm:w-auto justify-center">
-                        @svg('heroicon-o-arrow-left-circle', 'w-5 h-5 mr-2 inline')
+                        @svg('hugeicons-arrow-left-02', 'w-5 h-5 mr-2 inline')
                         {{ __('Back to 2FA Methods') }}
                     </x-secondary-button>
                 </div>
@@ -653,26 +653,26 @@ class="text-gray-700 dark:text-gray-300">{{ __('Consider enabling 2FA on other i
                 <x-slot name="description">
                     {{ __('Store these backup codes in a secure location. They can be used to access your account if you lose access to your primary 2FA method.') }}
                 </x-slot>
-                <x-slot name="icon">heroicon-o-key</x-slot>
+                <x-slot name="icon">hugeicons-matrix</x-slot>
 
                 <div class="mb-8 p-6">
                     <div class="flex items-center mb-4">
-                        @svg('heroicon-o-exclamation-triangle', 'w-8 h-8 text-yellow-500 mr-3')
+                        @svg('hugeicons-alert-02', 'w-8 h-8 text-yellow-500 mr-3')
                         <h3 class="text-xl font-semibold text-gray-900 dark:text-gray-100">{{ __('Important:') }}</h3>
                     </div>
                     <ul class="space-y-3">
                         <li class="flex items-start">
-                            @svg('heroicon-o-exclamation-circle', 'w-5 h-5 text-yellow-500 mr-2 mt-0.5 flex-shrink-0')
+                            @svg('hugeicons-alert-02', 'w-5 h-5 text-yellow-500 mr-2 mt-0.5 flex-shrink-0')
                             <span
                                 class="text-gray-700 dark:text-gray-300">{{ __('Each code can only be used once') }}</span>
                         </li>
                         <li class="flex items-start">
-                            @svg('heroicon-o-exclamation-circle', 'w-5 h-5 text-yellow-500 mr-2 mt-0.5 flex-shrink-0')
+                            @svg('hugeicons-alert-02', 'w-5 h-5 text-yellow-500 mr-2 mt-0.5 flex-shrink-0')
                             <span
                                 class="text-gray-700 dark:text-gray-300">{{ __('Store these codes in a secure password manager or print them') }}</span>
                         </li>
                         <li class="flex items-start">
-                            @svg('heroicon-o-exclamation-circle', 'w-5 h-5 text-yellow-500 mr-2 mt-0.5 flex-shrink-0')
+                            @svg('hugeicons-alert-02', 'w-5 h-5 text-yellow-500 mr-2 mt-0.5 flex-shrink-0')
                             <span
                                 class="text-gray-700 dark:text-gray-300">{{ __('Regenerating codes will invalidate all previous codes') }}</span>
                         </li>
@@ -700,16 +700,16 @@ class="absolute top-0 right-0 bg-red-500 text-white text-xs px-2 py-1 rounded-bl
                 <div class="flex flex-col sm:flex-row justify-between items-center space-y-4 sm:space-y-0 sm:space-x-4">
                     <div class="flex flex-col sm:flex-row space-y-4 sm:space-y-0 sm:space-x-4">
                         <x-secondary-button wire:click="downloadBackupCodes" class="w-full sm:w-auto justify-center">
-                            @svg('heroicon-o-arrow-down-tray', 'w-5 h-5 mr-2 inline')
+                            @svg('hugeicons-download-04', 'w-5 h-5 mr-2 inline')
                             {{ __('Download Codes') }}
                         </x-secondary-button>
                         <x-secondary-button wire:click="regenerateBackupCodes" class="w-full sm:w-auto justify-center">
-                            @svg('heroicon-o-arrow-path', 'w-5 h-5 mr-2 inline')
+                            @svg('hugeicons-refresh', 'w-5 h-5 mr-2 inline')
                             {{ __('Regenerate Codes') }}
                         </x-secondary-button>
                     </div>
                     <x-primary-button wire:click="confirmBackupCodes" class="w-full sm:w-auto justify-center">
-                        @svg('heroicon-o-check', 'w-5 h-5 mr-2 inline')
+                        @svg('hugeicons-checkmark-circle-02', 'w-5 h-5 mr-2 inline')
                         {{ __('I Have Saved These Codes') }}
                     </x-primary-button>
                 </div>
@@ -726,7 +726,7 @@ class="absolute top-0 right-0 bg-red-500 text-white text-xs px-2 py-1 rounded-bl
                     {{ __('You are about to regenerate your two-factor authentication (2FA) backup codes. Please review the following information:') }}
                 </x-slot>
                 <x-slot name="icon">
-                    heroicon-o-exclamation-triangle
+                    hugeicons-alert-02
                 </x-slot>
 
                 <div class="mt-4 mb-6">
diff --git a/resources/views/livewire/profile/quiet-mode-manager.blade.php b/resources/views/livewire/profile/quiet-mode-manager.blade.php
index 7cc2ce7d..1fe3e31c 100644
--- a/resources/views/livewire/profile/quiet-mode-manager.blade.php
+++ b/resources/views/livewire/profile/quiet-mode-manager.blade.php
@@ -88,7 +88,7 @@ public function toggleFaq(): void
         <x-slot name="description">
             {{ __('Manage your Quiet Mode settings to temporarily pause notifications.') }}
         </x-slot>
-        <x-slot name="icon">heroicon-o-bell-snooze</x-slot>
+        <x-slot name="icon">hugeicons-notification-snooze-02</x-slot>
 
         <div class="mb-6 p-4">
             <h4 class="text-lg font-semibold text-gray-900 dark:text-gray-100 mb-2">{{ __('What is Quiet Mode?') }}</h4>
@@ -185,9 +185,9 @@ class="flex justify-between items-center w-full text-left text-gray-900 dark:tex
                         <span class="text-lg font-semibold">{{ __('Frequently Asked Questions') }}</span>
                         <span class="ml-6 flex-shrink-0">
                             @if ($isFaqOpen)
-                                @svg('heroicon-m-chevron-up', 'h-6 w-6')
+                                @svg('hugeicons-arrow-up-01', 'h-6 w-6')
                             @else
-                                @svg('heroicon-m-chevron-down', 'h-6 w-6')
+                                @svg('hugeicons-arrow-down-01', 'h-6 w-6')
                             @endif
                         </span>
                     </button>
diff --git a/resources/views/livewire/profile/session-manager.blade.php b/resources/views/livewire/profile/session-manager.blade.php
index 06224237..5b34b72b 100644
--- a/resources/views/livewire/profile/session-manager.blade.php
+++ b/resources/views/livewire/profile/session-manager.blade.php
@@ -226,7 +226,7 @@ protected function getUserLastActivity(bool $human = false): Carbon|string
                 <x-slot name="description">
                     {{ __('Monitor and manage your active login sessions across various devices and locations.') }}
                 </x-slot>
-                <x-slot name="icon">heroicon-o-globe-alt</x-slot>
+                <x-slot name="icon">hugeicons-gps-signal-01</x-slot>
 
                 <div class="space-y-6">
                     @foreach ($this->sessions as $session)
@@ -236,13 +236,13 @@ protected function getUserLastActivity(bool $human = false): Carbon|string
                                     <div class="flex items-center mb-4 sm:mb-0">
                                         <div class="flex-shrink-0 mr-4">
                                             @if ($session->device['desktop'])
-                                                @svg('heroicon-o-computer-desktop', 'w-10 h-10 text-gray-500 dark:text-gray-400')
+                                                @svg('hugeicons-computer', 'w-10 h-10 text-gray-500 dark:text-gray-400')
                                             @elseif ($session->device['mobile'])
-                                                @svg('heroicon-o-device-phone-mobile', 'w-10 h-10 text-gray-500 dark:text-gray-400')
+                                                @svg('hugeicons-o-smart-phone-01', 'w-10 h-10 text-gray-500 dark:text-gray-400')
                                             @elseif ($session->device['tablet'])
-                                                @svg('heroicon-o-device-tablet', 'w-10 h-10 text-gray-500 dark:text-gray-400')
+                                                @svg('hugeicons-tablet-01', 'w-10 h-10 text-gray-500 dark:text-gray-400')
                                             @else
-                                                @svg('heroicon-o-globe-alt', 'w-10 h-10 text-gray-500 dark:text-gray-400')
+                                                @svg('hugeicons-global', 'w-10 h-10 text-gray-500 dark:text-gray-400')
                                             @endif
                                         </div>
                                         <div>
@@ -296,7 +296,7 @@ class="w-full sm:w-auto justify-center"
 
                 <div class="mt-8 p-6 bg-gray-100 dark:bg-gray-800 rounded-lg shadow-sm">
                     <div class="flex items-center mb-4">
-                        @svg('heroicon-o-arrow-left-on-rectangle', 'w-8 h-8 text-gray-500 dark:text-gray-400 mr-3')
+                        @svg('hugeicons-logout-circle-02', 'w-8 h-8 text-gray-500 dark:text-gray-400 mr-3')
                         <h3 class="text-xl font-semibold text-gray-900 dark:text-gray-100">{{ __('Terminate Other Sessions') }}</h3>
                     </div>
                     <p class="text-sm text-gray-600 dark:text-gray-400 mb-4">{{ __('For enhanced security, you can terminate all other active sessions across your devices. If you suspect any unauthorized access, it\'s recommended to change your password immediately after this action.') }}</p>
@@ -316,7 +316,7 @@ class="w-full sm:w-auto justify-center"
                         {{ __('Enhance your account security by terminating all sessions on other devices.') }}
                     </x-slot>
                     <x-slot name="icon">
-                        heroicon-o-arrow-left-on-rectangle
+                        hugeicons-logout-circle-02
                     </x-slot>
 
                     <form wire:submit="logoutOtherBrowserSessions">
@@ -360,7 +360,7 @@ class="mt-1 block w-full"
                         {{ __('Detailed information about the selected session.') }}
                     </x-slot>
                     <x-slot name="icon">
-                        heroicon-o-information-circle
+                        hugeicons-gps-signal-01
                     </x-slot>
 
                     @if ($selectedSession)
@@ -369,13 +369,13 @@ class="mt-1 block w-full"
                                 <div class="grid grid-cols-2 gap-4">
                                     <div class="flex items-center">
                                         @if ($selectedSession->device['desktop'])
-                                            <x-heroicon-o-computer-desktop class="w-8 h-8 mr-3 text-gray-500" />
+                                            @svg('hugeicons-computer', 'w-8 h-8 mr-3 text-gray-500')
                                         @elseif ($selectedSession->device['mobile'])
-                                            <x-heroicon-o-device-phone-mobile class="w-8 h-8 mr-3 text-gray-500" />
+                                            @svg('hugeicons-smart-phone-01', 'w-8 h-8 mr-3 text-gray-500')
                                         @elseif ($selectedSession->device['tablet'])
-                                            <x-heroicon-o-device-tablet class="w-8 h-8 mr-3 text-gray-500" />
+                                            @svg('hugeicons-tablet-01', 'w-8 h-8 mr-3 text-gray-500')
                                         @else
-                                            <x-heroicon-o-globe-alt class="w-8 h-8 mr-3 text-gray-500" />
+                                            @svg('hugeicons-global', 'w-8 h-8 mr-3 text-gray-500')
                                         @endif
                                         <div>
                                             <p class="text-sm font-medium text-gray-900 dark:text-gray-100">{{ __('Device Type') }}</p>
@@ -393,7 +393,7 @@ class="mt-1 block w-full"
                                         </div>
                                     </div>
                                     <div class="flex items-center">
-                                        <x-heroicon-o-clock class="w-8 h-8 mr-3 text-gray-500" />
+                                        <x-hugeicons-clock-01 class="w-8 h-8 mr-3 text-gray-500" />
                                         <div>
                                             <p class="text-sm font-medium text-gray-900 dark:text-gray-100">{{ __('Last Active') }}</p>
                                             <p class="text-xs text-gray-600 dark:text-gray-400">{{ $selectedSession->last_active }}</p>
diff --git a/resources/views/livewire/profile/update-password-form.blade.php b/resources/views/livewire/profile/update-password-form.blade.php
index 4546ed7d..ac56fa75 100644
--- a/resources/views/livewire/profile/update-password-form.blade.php
+++ b/resources/views/livewire/profile/update-password-form.blade.php
@@ -48,7 +48,7 @@ public function updatePassword(): void
         {{ __('Ensure your account is using a long, random password to stay secure.') }}
     </x-slot>
     <x-slot name="icon">
-        heroicon-o-key
+        hugeicons-password-validation
     </x-slot>
     <form wire:submit="updatePassword" class="mt-6 space-y-6">
         <div class="grid grid-cols-1 md:grid-cols-2 gap-6">
diff --git a/resources/views/livewire/profile/update-profile-information-form.blade.php b/resources/views/livewire/profile/update-profile-information-form.blade.php
index eae5bccc..6c3a76ce 100644
--- a/resources/views/livewire/profile/update-profile-information-form.blade.php
+++ b/resources/views/livewire/profile/update-profile-information-form.blade.php
@@ -212,7 +212,7 @@ private function formatDate(int $day): string
         {{ __('Customize your account information and preferences.') }}
     </x-slot>
     <x-slot name="icon">
-        heroicon-o-user
+        hugeicons-user
     </x-slot>
     <form wire:submit="updateProfileInformation" class="mt-6 space-y-6">
         <div class="mt-4">
diff --git a/resources/views/livewire/remote-servers/check-connection-button.blade.php b/resources/views/livewire/remote-servers/check-connection-button.blade.php
index 6df3bf5e..261a1027 100644
--- a/resources/views/livewire/remote-servers/check-connection-button.blade.php
+++ b/resources/views/livewire/remote-servers/check-connection-button.blade.php
@@ -1,12 +1,12 @@
 <div>
 @if ($remoteServer->isChecking())
         <x-secondary-button iconOnly type="button" disabled class="cursor-not-allowed bg-opacity-50">
-            @svg('heroicon-o-arrow-path', 'h-4 w-4 animate-spin')
+            @svg('hugeicons-refresh', 'h-4 w-4 animate-spin')
             <span class="sr-only">{{ __('Checking Connection') }}</span>
         </x-secondary-button>
     @else
         <x-secondary-button iconOnly wire:click="checkConnection" type="button">
-            @svg('heroicon-o-arrow-path', 'h-4 w-4')
+            @svg('hugeicons-refresh', 'h-4 w-4')
             <span class="sr-only">{{ __('Check Connection') }}</span>
         </x-secondary-button>
 @endif
diff --git a/resources/views/livewire/remote-servers/create-remote-server-form.blade.php b/resources/views/livewire/remote-servers/create-remote-server-form.blade.php
index dd1434a6..b8a06aff 100644
--- a/resources/views/livewire/remote-servers/create-remote-server-form.blade.php
+++ b/resources/views/livewire/remote-servers/create-remote-server-form.blade.php
@@ -2,7 +2,7 @@
     @if (!ssh_keys_exist())
         <x-no-content withBackground>
             <x-slot name="icon">
-                @svg('heroicon-o-exclamation-triangle', 'h-12 w-12 sm:h-16 sm:w-16 inline mr-1 text-red-600 dark:text-red-400')
+                @svg('hugeicons-alert-02', 'h-12 w-12 sm:h-16 sm:w-16 inline mr-1 text-red-600 dark:text-red-400')
             </x-slot>
             <x-slot name="title">
                 {{ __('Error! Unable to locate an SSH Key.') }}
@@ -27,7 +27,7 @@
                 {{ __('Create a new remote server.') }}
             </x-slot>
             <x-slot name="icon">
-                heroicon-o-server-stack
+                hugeicons-cloud-server
             </x-slot>
             @if (!$showingConnectionView)
                 <form wire:submit="submit">
@@ -47,10 +47,10 @@ class="p-1 rounded-md bg-white dark:bg-gray-600 text-gray-400 hover:text-gray-60
                                             :class="{ 'bg-green-100 dark:bg-green-800': copied }"
                                     >
                                         <span x-show="!copied">
-                                            @svg('heroicon-o-clipboard-document', 'h-5 w-5')
+                                            @svg('hugeicons-task-01', 'h-5 w-5')
                                         </span>
                                         <span x-show="copied" x-cloak>
-                                            @svg('heroicon-o-clipboard-document-check', 'h-5 w-5 text-green-500')
+                                            @svg('hugeicons-task-done-02', 'h-5 w-5 text-green-500')
                                         </span>
                                     </button>
                                 </div>
@@ -67,10 +67,10 @@ class="p-1 rounded-md bg-white dark:bg-gray-600 text-gray-400 hover:text-gray-60
                         </h4>
                         <div class="flex flex-col sm:flex-row space-y-2 sm:space-y-0 sm:space-x-3">
                             <x-secondary-button type="button" wire:click="usingServerProvider('ploi')" class="w-full sm:w-auto justify-center">
-                                @svg('heroicon-o-server', 'w-5 h-5 mr-2') Ploi
+                                @svg('hugeicons-cloud', 'w-5 h-5 mr-2') Ploi
                             </x-secondary-button>
                             <x-secondary-button type="button" wire:click="usingServerProvider('forge')" class="w-full sm:w-auto justify-center">
-                                @svg('heroicon-o-server', 'w-5 h-5 mr-2') Laravel Forge
+                                @svg('hugeicons-cloud', 'w-5 h-5 mr-2') Laravel Forge
                             </x-secondary-button>
                         </div>
                     </div>
@@ -110,8 +110,8 @@ class="block w-full pr-10"
                                               name="databasePassword"/>
                                 <div class="absolute inset-y-0 right-0 pr-3 flex items-center">
                                     <button @click="show = !show" type="button" class="text-gray-400 hover:text-gray-500 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500">
-                                        <span x-show="!show">@svg('heroicon-o-eye', 'h-5 w-5')</span>
-                                        <span x-show="show">@svg('heroicon-o-eye-slash', 'h-5 w-5')</span>
+                                        <span x-show="!show">@svg('hugeicons-view-off', 'h-5 w-5')</span>
+                                        <span x-show="show">@svg('hugeicons-view', 'h-5 w-5')</span>
                                     </button>
                                 </div>
                             </div>
@@ -143,7 +143,7 @@ class="block w-full pr-10"
                 </form>
             @elseif ($canConnectToRemoteServer)
                 <div class="space-y-2 text-center">
-                    @svg('heroicon-o-check-circle', 'w-12 h-12 sm:w-16 sm:h-16 text-green-500 my-3 inline')
+                    @svg('hugeicons-checkmark-circle-02', 'w-12 h-12 sm:w-16 sm:h-16 text-green-500 my-3 inline')
                     <h1 class="text-gray-900 dark:text-white text-xl sm:text-2xl font-semibold">
                         {{ __('Connection Successful') }}
                     </h1>
@@ -159,7 +159,7 @@ class="block w-full pr-10"
                 </div>
             @else
                 <div class="space-y-2 text-center">
-                    @svg('heroicon-o-x-circle', 'w-12 h-12 sm:w-16 sm:h-16 text-red-500 my-3 inline')
+                    @svg('hugeicons-cancel-circle', 'w-12 h-12 sm:w-16 sm:h-16 text-red-500 my-3 inline')
                     <h1 class="text-gray-900 dark:text-white text-xl sm:text-2xl font-semibold">
                         {{ __('Connection Failed') }}
                     </h1>
diff --git a/resources/views/livewire/remote-servers/delete-remote-server-form.blade.php b/resources/views/livewire/remote-servers/delete-remote-server-form.blade.php
index acab4c8b..c7ed4af4 100644
--- a/resources/views/livewire/remote-servers/delete-remote-server-form.blade.php
+++ b/resources/views/livewire/remote-servers/delete-remote-server-form.blade.php
@@ -2,7 +2,7 @@
     <div class="my-3 flex justify-end">
         <a href="#" class="text-sm text-red-600 dark:text-red-400 font-medium hover:text-underline ease-in-out" x-data=""
            x-on:click.prevent="$dispatch('open-modal', 'remove-remote-server-{{ $remoteServer->id }}')">
-            @svg('heroicon-o-x-mark', 'h-5 w-5 inline-block -mt-0.5')
+            @svg('hugeicons-delete-02', 'h-5 w-5 inline-block -mt-0.5')
             {{ __('Remove Remote Server') }}
         </a>
     </div>
@@ -14,7 +14,7 @@
             {{ __('Please read this carefully before confirming this action.') }}
         </x-slot>
         <x-slot name="icon">
-            heroicon-o-trash
+            hugeicons-delete-02
         </x-slot>
         <div>
             <p class="text-gray-800 dark:text-gray-200 mb-3">
diff --git a/resources/views/livewire/remote-servers/index-item.blade.php b/resources/views/livewire/remote-servers/index-item.blade.php
index a1970b47..103e4e88 100644
--- a/resources/views/livewire/remote-servers/index-item.blade.php
+++ b/resources/views/livewire/remote-servers/index-item.blade.php
@@ -37,18 +37,18 @@
             @if ($remoteServer->backupTasks->count() === 0)
                 <x-secondary-button iconOnly disabled class="cursor-not-allowed opacity-50" title="{{ __('No linked backup tasks..') }}">
                     <span class="sr-only">{{ __('View Linked Backup Tasks') }}</span>
-                    <x-heroicon-o-list-bullet class="w-4 h-4"/>
+                    <x-hugeicons-right-to-left-list-triangle class="w-4 h-4"/>
                 </x-secondary-button>
             @else
                 <x-secondary-button iconOnly x-on:click="$dispatch('open-modal', 'view-linked-backup-tasks-{{ $remoteServer->id }}')">
                     <span class="sr-only">{{ __('View Linked Backup Tasks') }}</span>
-                    <x-heroicon-o-list-bullet class="w-4 h-4"/>
+                    <x-hugeicons-right-to-left-list-triangle class="w-4 h-4"/>
                 </x-secondary-button>
             @endif
             <a href="{{ route('remote-servers.edit', $remoteServer) }}" wire:navigate>
                 <x-secondary-button iconOnly>
                     <span class="sr-only">{{ __('Update Remote Server') }}</span>
-                    <x-heroicon-o-pencil-square class="w-4 h-4"/>
+                    <x-hugeicons-task-edit-01 class="w-4 h-4"/>
                 </x-secondary-button>
             </a>
         </div>
@@ -63,7 +63,7 @@
             {{ __('Manage and monitor backup tasks associated with :server.', ['server' => $remoteServer->label]) }}
         </x-slot>
         <x-slot name="icon">
-            heroicon-o-list-bullet
+            hugeicons-right-to-left-list-triangle
         </x-slot>
         <div class="space-y-4 max-h-96 overflow-y-auto">
             @forelse ($remoteServer->backupTasks as $backupTask)
@@ -71,24 +71,24 @@
                     <div class="px-4 py-5 sm:px-6 flex justify-between items-center">
                         <h3 class="text-lg leading-6 font-medium text-gray-900 dark:text-gray-100 flex items-center space-x-2">
                             @if ($backupTask->isFilesType())
-                                @svg('heroicon-o-document-duplicate', 'h-5 w-5 text-purple-600 dark:text-purple-400')
+                                @svg('hugeicons-file-01', 'h-5 w-5 text-purple-600 dark:text-purple-400')
                             @elseif ($backupTask->isDatabaseType())
-                                @svg('heroicon-o-circle-stack', 'h-5 w-5 text-cyan-600 dark:text-cyan-400')
+                                @svg('hugeicons-database', 'h-5 w-5 text-cyan-600 dark:text-cyan-400')
                             @endif
                             <span>{{ $backupTask->label }}</span>
                         </h3>
                         <div>
                             @if ($backupTask->isPaused())
                                 <span class="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium bg-red-100 text-red-800 dark:bg-red-800 dark:text-red-100">
-                                    @svg('heroicon-o-pause', 'h-3.5 w-3.5 mr-1')
+                                    @svg('hugeicons-pause', 'h-3.5 w-3.5 mr-1')
                                     {{ __('Paused') }}
                                 </span>
                             @else
                                 <span class="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium {{ $backupTask->status === 'ready' ? 'bg-green-100 text-green-800 dark:bg-green-800 dark:text-green-100' : 'bg-blue-100 text-blue-800 dark:bg-blue-800 dark:text-blue-100' }}">
                                     @if ($backupTask->status === 'ready')
-                                        @svg('heroicon-o-check-circle', 'h-3.5 w-3.5 mr-1')
+                                        @svg('hugeicons-checkmark-circle-02', 'h-3.5 w-3.5 mr-1')
                                     @else
-                                        @svg('heroicon-o-arrow-path', 'h-3.5 w-3.5 mr-1 animate-spin')
+                                        @svg('hugeicons-refresh', 'h-3.5 w-3.5 mr-1 animate-spin')
                                     @endif
                                     {{ $backupTask->status === 'ready' ? __('Ready') : __('Running') }}
                                 </span>
diff --git a/resources/views/livewire/remote-servers/index-table.blade.php b/resources/views/livewire/remote-servers/index-table.blade.php
index 4d808a39..c694a8cc 100644
--- a/resources/views/livewire/remote-servers/index-table.blade.php
+++ b/resources/views/livewire/remote-servers/index-table.blade.php
@@ -2,7 +2,7 @@
     @if ($remoteServers->isEmpty())
         <x-no-content withBackground>
             <x-slot name="icon">
-                @svg('heroicon-o-server', 'h-16 w-16 text-primary-900 dark:text-white inline')
+                @svg('hugeicons-cloud-server', 'h-16 w-16 text-primary-900 dark:text-white inline')
             </x-slot>
             <x-slot name="title">
                 {{ __("You don't have any remote servers setup!") }}
@@ -24,7 +24,7 @@
             description="{{ __('A list of all linked remote servers, from which your data will be backed up.') }}"
         >
             <x-slot name="icon">
-                <x-heroicon-o-server-stack class="h-6 w-6 text-primary-600 dark:text-primary-400" />
+                <x-hugeicons-cloud-server class="h-6 w-6 text-primary-600 dark:text-primary-400" />
             </x-slot>
             <x-table.table-header>
                 <div class="col-span-3">{{ __('Server Label') }}</div>
diff --git a/resources/views/livewire/remote-servers/update-remote-server-form.blade.php b/resources/views/livewire/remote-servers/update-remote-server-form.blade.php
index 6d268a02..60b00a0c 100644
--- a/resources/views/livewire/remote-servers/update-remote-server-form.blade.php
+++ b/resources/views/livewire/remote-servers/update-remote-server-form.blade.php
@@ -1,13 +1,13 @@
 <div>
     <x-form-wrapper>
         <x-slot name="title">
-            {{ __('Add Remote Server') }}
+            {{ __('Update Remote Server') }}
         </x-slot>
         <x-slot name="description">
-            {{ __('Create a new remote server.') }}
+            {{ __('Update your remote server details.') }}
         </x-slot>
         <x-slot name="icon">
-            heroicon-o-server-stack
+            hugeicons-cloud-server
         </x-slot>
         <form wire:submit="submit">
             <div class="mt-4">
diff --git a/resources/views/livewire/statistics-page.blade.php b/resources/views/livewire/statistics-page.blade.php
index ce316811..d30877ee 100644
--- a/resources/views/livewire/statistics-page.blade.php
+++ b/resources/views/livewire/statistics-page.blade.php
@@ -8,7 +8,7 @@
             @if (Auth::user()->backupTasks->count() === 0)
                 <x-no-content withBackground>
                     <x-slot name="icon">
-                        @svg('heroicon-o-chart-pie', 'h-16 w-16 text-primary-900 dark:text-white inline')
+                        @svg('hugeicons-analytics-01', 'h-16 w-16 text-primary-900 dark:text-white inline')
                     </x-slot>
                     <x-slot name="title">
                         {{ __('No Data Available') }}
@@ -22,7 +22,7 @@
                      class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4 mb-8">
 
                     <x-stat-card
-                        icon="heroicon-o-server"
+                        icon="hugeicons-cloud-server"
                         title="{{ __('Backup Data Statistics') }}"
                         description="{{ __('Data backed up over different periods.') }}"
                     >
@@ -37,7 +37,7 @@ class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4 mb-8">
                     </x-stat-card>
 
                     <x-stat-card
-                        icon="heroicon-o-link"
+                        icon="hugeicons-wireless-cloud-access"
                         title="{{ __('Linked Resources') }}"
                         description="{{ __('Connected servers and destinations.') }}"
                     >
@@ -50,7 +50,7 @@ class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4 mb-8">
                     </x-stat-card>
 
                     <x-stat-card
-                        icon="heroicon-o-clipboard-document-list"
+                        icon="hugeicons-task-01"
                         title="{{ __('Backup Tasks') }}"
                         description="{{ __('Status of your backup tasks.') }}"
                     >
diff --git a/resources/views/livewire/tags/create-form.blade.php b/resources/views/livewire/tags/create-form.blade.php
index fb36ef9d..6b95bd87 100644
--- a/resources/views/livewire/tags/create-form.blade.php
+++ b/resources/views/livewire/tags/create-form.blade.php
@@ -7,7 +7,7 @@
             {{ __('Add a new tag to your account.') }}
         </x-slot>
         <x-slot name="icon">
-            heroicon-o-tag
+            hugeicons-tags
         </x-slot>
         <form wire:submit="submit">
             <div class="mt-4">
diff --git a/resources/views/livewire/tags/delete-tag-button.blade.php b/resources/views/livewire/tags/delete-tag-button.blade.php
index a788d75f..4fc8b6f7 100644
--- a/resources/views/livewire/tags/delete-tag-button.blade.php
+++ b/resources/views/livewire/tags/delete-tag-button.blade.php
@@ -2,7 +2,7 @@
     <div class="my-3 flex justify-end">
         <a href="#" class="text-sm text-red-600 dark:text-red-400 font-medium hover:text-underline ease-in-out" x-data=""
            x-on:click.prevent="$dispatch('open-modal', 'remove-tag-{{ $tag->id }}')">
-            @svg('heroicon-o-x-mark', 'h-5 w-5 inline-block -mt-0.5')
+            @svg('hugeicons-delete-02', 'h-5 w-5 inline-block -mt-0.5')
             {{ __('Remove Tag') }}
         </a>
     </div>
@@ -14,7 +14,7 @@
             {{ __('Please read this carefully before confirming this action.') }}
         </x-slot>
         <x-slot name="icon">
-            heroicon-o-trash
+            hugeicons-delete-02
         </x-slot>
         <div>
             <p class="text-gray-800 dark:text-gray-200 mb-3">
diff --git a/resources/views/livewire/tags/index-item.blade.php b/resources/views/livewire/tags/index-item.blade.php
index 2fcd8568..6009db41 100644
--- a/resources/views/livewire/tags/index-item.blade.php
+++ b/resources/views/livewire/tags/index-item.blade.php
@@ -20,7 +20,7 @@
             <a href="{{ route('tags.edit', $tag) }}" wire:navigate>
                 <x-secondary-button iconOnly>
                     <span class="sr-only">{{ __('Update Tag') }}</span>
-                    <x-heroicon-o-pencil-square class="w-4 h-4"/>
+                    <x-hugeicons-task-edit-01 class="w-4 h-4"/>
                 </x-secondary-button>
             </a>
         </div>
diff --git a/resources/views/livewire/tags/index-table.blade.php b/resources/views/livewire/tags/index-table.blade.php
index 01fe8e5b..e2b93ef3 100644
--- a/resources/views/livewire/tags/index-table.blade.php
+++ b/resources/views/livewire/tags/index-table.blade.php
@@ -9,7 +9,7 @@
     @if ($tags->isEmpty())
         <x-no-content withBackground>
             <x-slot name="icon">
-                @svg('heroicon-o-tag', 'h-16 w-16 text-primary-900 dark:text-white inline')
+                @svg('hugeicons-tags', 'h-16 w-16 text-primary-900 dark:text-white inline')
             </x-slot>
             <x-slot name="title">
                 {{ __("You don't have any tags setup!") }}
@@ -31,7 +31,7 @@
             description="{{ __('All tags used to organize and identify your backup tasks.') }}"
         >
             <x-slot name="icon">
-                <x-heroicon-o-tag class="h-6 w-6 text-primary-600 dark:text-primary-400" />
+                <x-hugeicons-tags class="h-6 w-6 text-primary-600 dark:text-primary-400" />
             </x-slot>
             <x-table.table-header>
                 <div class="col-span-3">{{ __('Label') }}</div>
diff --git a/resources/views/livewire/tags/update-form.blade.php b/resources/views/livewire/tags/update-form.blade.php
index da4e846f..9c477312 100644
--- a/resources/views/livewire/tags/update-form.blade.php
+++ b/resources/views/livewire/tags/update-form.blade.php
@@ -7,7 +7,7 @@
                 {{ __('Update a new tag that belongs to you.') }}
             </x-slot>
             <x-slot name="icon">
-                heroicon-o-tag
+                hugeicons-tags
             </x-slot>
         <form wire:submit="submit">
             <div class="mt-4">
diff --git a/resources/views/partials/breadcrumbs.blade.php b/resources/views/partials/breadcrumbs.blade.php
index a3fcbdae..1cf3c3e5 100644
--- a/resources/views/partials/breadcrumbs.blade.php
+++ b/resources/views/partials/breadcrumbs.blade.php
@@ -12,10 +12,8 @@
                     @if (!is_null($breadcrumb->url) && !$loop->last)
                         <a href="{{ $breadcrumb->url }}" wire:navigate class="{{ $defaultClasses }} group">
                             @if ($loop->first)
-                                <svg class="w-5 h-5" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
-                                    <path d="M10.707 2.293a1 1 0 00-1.414 0l-7 7a1 1 0 001.414 1.414L4 10.414V17a1 1 0 001 1h2a1 1 0 001-1v-2a1 1 0 011-1h2a1 1 0 011 1v2a1 1 0 001 1h2a1 1 0 001-1v-6.586l.293.293a1 1 0 001.414-1.414l-7-7z"></path>
-                                </svg>
                                 <span class="sr-only">Home</span>
+                                @svg('hugeicons-home-05', 'h-5 w-5')
                             @else
                                 <span class="group-hover:underline">{{ $breadcrumb->title }}</span>
                             @endif
@@ -27,9 +25,9 @@
                     @endif
 
                     @if (!$loop->last)
-                        <svg class="{{ $separatorClasses }} w-5 h-5" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
-                            <path fill-rule="evenodd" d="M7.293 14.707a1 1 0 010-1.414L10.586 10 7.293 6.707a1 1 0 011.414-1.414l4 4a1 1 0 010 1.414l-4 4a1 1 0 01-1.414 0z" clip-rule="evenodd"></path>
-                        </svg>
+                            <svg class="{{ $separatorClasses }} w-5 h-5" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24" fill="none">
+                                <path d="M9.00005 6C9.00005 6 15 10.4189 15 12C15 13.5812 9 18 9 18" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" />
+                            </svg>
                     @endif
                 </li>
             @endforeach
diff --git a/resources/views/partials/missing-keys-and-passphrase.blade.php b/resources/views/partials/missing-keys-and-passphrase.blade.php
index 1f7b84c6..a7ea6334 100644
--- a/resources/views/partials/missing-keys-and-passphrase.blade.php
+++ b/resources/views/partials/missing-keys-and-passphrase.blade.php
@@ -22,7 +22,7 @@ class="bg-gradient-to-r from-red-500/90 to-red-600/90 text-white relative shadow
             <div class="flex flex-col sm:flex-row items-center justify-between">
                 <div class="flex items-center w-full sm:w-auto mb-4 sm:mb-0">
                     <span class="flex p-2 rounded-full bg-red-700/50 backdrop-blur-sm">
-                        @svg('heroicon-o-exclamation-triangle', 'h-6 w-6 text-white')
+                        @svg('hugeicons-alert-02', 'h-6 w-6 text-white')
                     </span>
                     <p class="ml-3 font-medium text-sm sm:text-base">
                         @if (!ssh_keys_exist())
@@ -38,7 +38,7 @@ class="bg-gradient-to-r from-red-500/90 to-red-600/90 text-white relative shadow
                             @click="$dispatch('open-modal', 'ssh-key-generation')"
                             class="flex-grow sm:flex-grow-0 bg-white/10 hover:bg-white/20 backdrop-blur-sm px-6 py-2 text-sm font-medium text-white rounded-full border border-white/25 focus:outline-none focus:ring-2 focus:ring-white/50 focus:ring-offset-2 focus:ring-offset-red-600 transition-all duration-150 ease-out hover:shadow-lg hover:-translate-y-0.5"
                         >
-                            @svg('heroicon-o-command-line', ['class' => 'h-4 w-4 inline mr-2'])
+                            @svg('hugeicons-keyboard', ['class' => 'h-4 w-4 inline mr-2'])
                             {{ __('Show Command') }}
                         </button>
 
@@ -50,7 +50,7 @@ class="flex-grow sm:flex-grow-0 bg-white/10 hover:bg-white/20 backdrop-blur-sm p
                                 {{ __('Easy, straightforward instructions on how to generate your SSH keys.') }}
                             </x-slot>
                             <x-slot name="icon">
-                                heroicon-o-command-line
+                                hugeicons-keyboard
                             </x-slot>
                             <div>
                                 <div>
@@ -67,10 +67,10 @@ class="absolute top-2 right-2 p-1 rounded-md text-gray-400 hover:text-gray-600 d
                                             :aria-label="copied ? '{{ __('Copied!') }}' : '{{ __('Copy to Clipboard') }}'"
                                         >
                                             <span x-show="!copied" aria-hidden="true">
-                                                @svg('heroicon-o-clipboard-document', 'h-5 w-5')
+                                                @svg('hugeicons-task-01', 'h-5 w-5')
                                             </span>
                                             <span x-show="copied" x-cloak aria-hidden="true">
-                                                @svg('heroicon-o-clipboard-document-check', 'h-5 w-5')
+                                                @svg('hugeicons-task-done-02', 'h-5 w-5')
                                             </span>
                                         </button>
                                     </div>
@@ -92,7 +92,7 @@ class="absolute top-2 right-2 p-1 rounded-md text-gray-400 hover:text-gray-600 d
                             @click="$dispatch('open-modal', 'set-passphrase')"
                             class="flex-grow sm:flex-grow-0 bg-white/10 hover:bg-white/20 backdrop-blur-sm px-6 py-2 text-sm font-medium text-white rounded-full border border-white/25 focus:outline-none focus:ring-2 focus:ring-white/50 focus:ring-offset-2 focus:ring-offset-red-600 transition-all duration-150 ease-out hover:shadow-lg hover:-translate-y-0.5"
                         >
-                            @svg('heroicon-o-key', ['class' => 'h-4 w-4 inline mr-2'])
+                            @svg('hugeicons-license', ['class' => 'h-4 w-4 inline mr-2'])
                             {{ __('How to Set Passphrase') }}
                         </button>
 
@@ -104,7 +104,7 @@ class="flex-grow sm:flex-grow-0 bg-white/10 hover:bg-white/20 backdrop-blur-sm p
                                 {{ __('Easy, straightforward instructions on how to set your passphrase.') }}
                             </x-slot>
                             <x-slot name="icon">
-                                heroicon-o-command-line
+                                hugeicons-keyboard
                             </x-slot>
                             <div>
                                 <div>
diff --git a/resources/views/partials/quiet-mode-banner.blade.php b/resources/views/partials/quiet-mode-banner.blade.php
index fb79a812..dcc48c37 100644
--- a/resources/views/partials/quiet-mode-banner.blade.php
+++ b/resources/views/partials/quiet-mode-banner.blade.php
@@ -11,7 +11,7 @@
         <div class="max-w-6xl mx-auto">
             <div class="flex items-start">
                 <div class="flex-shrink-0 bg-blue-100 dark:bg-blue-800 rounded-full p-2 mr-4">
-                    @svg('heroicon-s-bell-snooze', 'w-6 h-6 text-blue-500 dark:text-blue-300')
+                    @svg('hugeicons-notification-snooze-02', 'w-6 h-6 text-blue-500 dark:text-blue-300')
                 </div>
                 <div class="flex-grow">
                     <div class="flex justify-between items-center mb-2">
@@ -35,7 +35,7 @@
                         @unless ($isOnQuietModePage)
                             <a href="{{ route('profile.quiet-mode') }}" wire:navigate class="inline-flex items-center ml-4 text-sm font-medium text-blue-600 dark:text-blue-400 hover:text-blue-800 dark:hover:text-blue-200 transition ease-in-out duration-150">
                                 {{ __('Manage') }}
-                                @svg('heroicon-s-arrow-right', 'w-4 h-4 ml-1')
+                                @svg('hugeicons-arrow-right-double', 'w-4 h-4 ml-1')
                             </a>
                         @endunless
                     </div>
diff --git a/resources/views/partials/steps-to-get-started/view.blade.php b/resources/views/partials/steps-to-get-started/view.blade.php
index abc26560..750a56a1 100644
--- a/resources/views/partials/steps-to-get-started/view.blade.php
+++ b/resources/views/partials/steps-to-get-started/view.blade.php
@@ -9,7 +9,7 @@
         @if (!ssh_keys_exist())
             <div class="bg-yellow-50 dark:bg-yellow-900/50 border border-yellow-200 dark:border-yellow-700 rounded-lg p-4 mb-8 text-center">
                 <div class="flex items-center justify-center text-yellow-800 dark:text-yellow-200">
-                    @svg('heroicon-o-exclamation-triangle', 'h-5 w-5 mr-2')
+                    @svg('hugeicons-alert-02', 'h-5 w-5 mr-2')
                     <span class="font-medium">{{ __('SSH Keys Required') }}</span>
                 </div>
                 <p class="mt-2 text-sm text-yellow-700 dark:text-yellow-300">
@@ -75,7 +75,7 @@
                             @if (Auth::user()->{$step['step'] == 1 ? 'remoteServers' : 'backupDestinations'}->isNotEmpty())
                                 <div class="bg-green-100 dark:bg-green-800 text-green-700 dark:text-green-200 p-3 rounded-lg text-sm">
                                     <p class="flex items-center font-medium">
-                                        @svg('heroicon-o-check-circle', 'h-5 w-5 mr-2')
+                                        @svg('hugeicons-checkmark-circle-02', 'h-5 w-5 mr-2')
                                         <span>{{ __('You have completed this step.') }}</span>
                                     </p>
                                 </div>
@@ -83,13 +83,13 @@
                                 <a href="{{ route($step['route']) }}" wire:navigate class="block w-full">
                                     <x-primary-button class="w-full justify-center bg-primary-600 hover:bg-primary-700 transition-colors duration-300">
                                         <span>{{ $step['buttonText'] }}</span>
-                                        @svg('heroicon-o-arrow-right', 'h-5 w-5 ml-2 inline-block transition-transform duration-300 group-hover:translate-x-1')
+                                        @svg('hugeicons-arrow-right-02', 'h-5 w-5 ml-2 inline-block transition-transform duration-300 group-hover:translate-x-1')
                                     </x-primary-button>
                                 </a>
                             @else
                                 <x-secondary-button class="w-full justify-center opacity-50 cursor-not-allowed" disabled>
                                     <span>{{ $step['buttonText'] }}</span>
-                                    @svg('heroicon-o-lock-closed', 'h-5 w-5 ml-2 inline-block')
+                                    @svg('hugeicons-square-lock-02', 'h-5 w-5 ml-2 inline-block')
                                 </x-secondary-button>
                             @endif
                         </div>
diff --git a/resources/views/vendor/toaster/hub.blade.php b/resources/views/vendor/toaster/hub.blade.php
index a5f6b450..9d8c7ff6 100644
--- a/resources/views/vendor/toaster/hub.blade.php
+++ b/resources/views/vendor/toaster/hub.blade.php
@@ -39,10 +39,27 @@ class="shadow-lg overflow-hidden"
             <div class="flex items-center p-4">
                 <div class="flex-shrink-0 mr-3">
                     <div class="p-2 rounded-full bg-white bg-opacity-25 dark:bg-opacity-20">
-                        <svg x-show="toast.type === 'error'" class="w-5 h-5 text-white" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12"></path></svg>
-                        <svg x-show="toast.type === 'info'" class="w-5 h-5 text-white" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M13 16h-1v-4h-1m1-4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z"></path></svg>
-                        <svg x-show="toast.type === 'success'" class="w-5 h-5 text-white" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M5 13l4 4L19 7"></path></svg>
-                        <svg x-show="toast.type === 'warning'" class="w-5 h-5 text-white" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z"></path></svg>
+                        <svg x-show="toast.type === 'error'" class="w-5 h-5 text-white" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24" color="#000000" fill="none">
+                            <path d="M14.9994 15L9 9M9.00064 15L15 9" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" />
+                            <path d="M22 12C22 6.47715 17.5228 2 12 2C6.47715 2 2 6.47715 2 12C2 17.5228 6.47715 22 12 22C17.5228 22 22 17.5228 22 12Z" stroke="currentColor" stroke-width="1.5" />
+                        </svg>
+
+                        <svg x-show="toast.type === 'info'" class="w-5 h-5 text-white" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24" color="#000000" fill="none">
+                            <path d="M22 12C22 6.47715 17.5228 2 12 2C6.47715 2 2 6.47715 2 12C2 17.5228 6.47715 22 12 22C17.5228 22 22 17.5228 22 12Z" stroke="currentColor" stroke-width="1.5" />
+                            <path d="M12.2422 17V12C12.2422 11.5286 12.2422 11.2929 12.0957 11.1464C11.9493 11 11.7136 11 11.2422 11" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" />
+                            <path d="M11.992 8H12.001" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" />
+                        </svg>
+
+                        <svg x-show="toast.type === 'success'" class="w-5 h-5 text-white" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24" color="#000000" fill="none">
+                            <path d="M5 14.5C5 14.5 6.5 14.5 8.5 18C8.5 18 14.0588 8.83333 19 7" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" />
+                        </svg>
+
+                        <svg x-show="toast.type === 'warning'" class="w-5 h-5 text-white" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24" color="#000000" fill="none">
+                            <path d="M5.32171 9.6829C7.73539 5.41196 8.94222 3.27648 10.5983 2.72678C11.5093 2.42437 12.4907 2.42437 13.4017 2.72678C15.0578 3.27648 16.2646 5.41196 18.6783 9.6829C21.092 13.9538 22.2988 16.0893 21.9368 17.8293C21.7376 18.7866 21.2469 19.6548 20.535 20.3097C19.241 21.5 16.8274 21.5 12 21.5C7.17265 21.5 4.75897 21.5 3.46496 20.3097C2.75308 19.6548 2.26239 18.7866 2.06322 17.8293C1.70119 16.0893 2.90803 13.9538 5.32171 9.6829Z" stroke="currentColor" stroke-width="1.5" />
+                            <path d="M11.992 16H12.001" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" />
+                            <path d="M12 13L12 8.99997" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" />
+                        </svg>
+
                     </div>
                 </div>
                 <div class="flex-1 pr-6">
@@ -54,8 +71,8 @@ class="text-sm font-medium text-white"></p>
                         <button @click="toast.dispose()"
                                 class="text-white text-opacity-75 hover:text-opacity-100 focus:outline-none focus:text-opacity-100 transition-opacity duration-200"
                                 aria-label="@lang('close')">
-                            <svg class="h-4 w-4" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="currentColor">
-                                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12"></path>
+                            <svg class="h-4 w-4" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24" color="#000000" fill="none">
+                                <path d="M19.0005 4.99988L5.00049 18.9999M5.00049 4.99988L19.0005 18.9999" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" />
                             </svg>
                         </button>
                     </div>