diff --git a/resources/views/auth/login/create.blade.php b/resources/views/auth/login/create.blade.php
index 7b0eb2802..816af196c 100644
--- a/resources/views/auth/login/create.blade.php
+++ b/resources/views/auth/login/create.blade.php
@@ -57,9 +57,9 @@
                     @stack('remember_input_end')
 
                     @stack('forgotten-password-start')
-                    <a href="{{ route('forgot') }}" class="text-black-400 hover:text-black-700 text-sm">
+                    <x-link href="{{ route('forgot') }}" class="text-black-400 hover:text-black-700 text-sm" override="class">
                         {{ trans('auth.forgot_password') }}
-                    </a>
+                    </x-link>
                     @stack('forgotten-password-end')
                 </div>
 
diff --git a/resources/views/banking/accounts/show.blade.php b/resources/views/banking/accounts/show.blade.php
index 96e1001dc..2ac288c89 100644
--- a/resources/views/banking/accounts/show.blade.php
+++ b/resources/views/banking/accounts/show.blade.php
@@ -284,9 +284,9 @@
                                                         <x-slot name="second" class="w-20 font-normal group">
                                                             @if ($item->document)
                                                             <div data-tooltip-target="tooltip-information-{{ $item->document_id }}" data-tooltip-placement="left" override="class">
-                                                                <a href="{{ route($item->route_name, $item->route_id) }}" class="font-normal truncate border-b border-black border-dashed">
+                                                                <x-link href="{{ route($item->route_name, $item->route_id) }}" class="font-normal truncate border-b border-black border-dashed" override="class">
                                                                     {{ $item->document->document_number }}
-                                                                </a>
+                                                                </x-link>
 
                                                                 <div class="w-28 absolute h-10 -ml-12 -mt-6"></div>
 
diff --git a/resources/views/banking/transactions/index.blade.php b/resources/views/banking/transactions/index.blade.php
index af3e802be..557c95a24 100644
--- a/resources/views/banking/transactions/index.blade.php
+++ b/resources/views/banking/transactions/index.blade.php
@@ -11,13 +11,13 @@
 
     <x-slot name="buttons">
         @can('create-banking-transactions')
-            <x-link href="{{ route('transactions.create', ['type' => 'income']) }}" kind="primary">
+            <<x-link href="{{ route('transactions.create', ['type' => 'income']) }}" kind="primary">
                 {{ trans('general.title.new', ['type' => trans_choice('general.incomes', 1)]) }}
-            </x-link>
+            </<x-link>
 
-            <x-link href="{{ route('transactions.create', ['type' => 'expense']) }}" kind="primary">
+            <<x-link href="{{ route('transactions.create', ['type' => 'expense']) }}" kind="primary">
                 {{ trans('general.title.new', ['type' => trans_choice('general.expenses', 1)]) }}
-            </x-link>
+            </<x-link>
         @endcan
     </x-slot>
 
@@ -166,9 +166,9 @@
                                                 <x-slot name="second" class="w-20 font-normal group">
                                                     @if ($item->document)
                                                         <div data-tooltip-target="tooltip-information-{{ $item->document_id }}" data-tooltip-placement="left" override="class">
-                                                            <a href="{{ route($item->route_name, $item->route_id) }}" class="font-normal truncate border-b border-black border-dashed">
+                                                            <x-link href="{{ route($item->route_name, $item->route_id) }}" class="font-normal truncate border-b border-black border-dashed" override="class">
                                                                 {{ $item->document->document_number }}
-                                                            </a>
+                                                            </x-link>
 
                                                             <div class="w-28 absolute h-10 -ml-12 -mt-6">
                                                             </div>
diff --git a/resources/views/common/import/create.blade.php b/resources/views/common/import/create.blade.php
index ae53b4af1..c4ab6a79b 100644
--- a/resources/views/common/import/create.blade.php
+++ b/resources/views/common/import/create.blade.php
@@ -32,13 +32,13 @@
                 <div class="mt-8">
                     <div class="sm:col-span-6 flex items-center justify-end">
                         @if (! empty($route))
-                            <a href="{{ route(\Str::replaceFirst('.import', '.index', $route)) }}" class="px-6 py-1.5 mr-2 hover:bg-gray-200 rounded-lg">
+                            <x-link href="{{ route(\Str::replaceFirst('.import', '.index', $route)) }}" class="px-6 py-1.5 mr-2 hover:bg-gray-200 rounded-lg" override="class">
                                 {{ trans('general.cancel') }}
-                            </a>
+                            </x-link>
                         @else
-                            <a href="{{ url($path) }}" class="px-6 py-1.5 hover:bg-gray-200 rounded-lg ltr:ml-2 rtl:mr-2">
+                            <x-link href="{{ url($path) }}" class="px-6 py-1.5 hover:bg-gray-200 rounded-lg ltr:ml-2 rtl:mr-2" override="class">
                                 {{ trans('general.cancel') }}
-                            </a>
+                            </x-link>
                         @endif
 
                         <x-button
diff --git a/resources/views/components/contacts/show/content.blade.php b/resources/views/components/contacts/show/content.blade.php
index b11de9a13..57fbe33aa 100644
--- a/resources/views/components/contacts/show/content.blade.php
+++ b/resources/views/components/contacts/show/content.blade.php
@@ -309,9 +309,9 @@
                                                 </x-slot>
                                                 <x-slot name="second">
                                                     @if ($item->document)
-                                                        <a href="{{ route($item->route_name, $item->route_id) }}" class="font-normal truncate border-b border-black border-dashed">
+                                                        <x-link href="{{ route($item->route_name, $item->route_id) }}" class="font-normal truncate border-b border-black border-dashed" override="class">
                                                             {{ $item->document->document_number }}
-                                                        </a>
+                                                        </x-link>
                                                     @else
                                                         <x-empty-data />
                                                     @endif
diff --git a/resources/views/components/documents/index/information.blade.php b/resources/views/components/documents/index/information.blade.php
index 20c354e4d..3d4008926 100644
--- a/resources/views/components/documents/index/information.blade.php
+++ b/resources/views/components/documents/index/information.blade.php
@@ -17,9 +17,9 @@
                 </div>
 
                 @if (! $hideShow)
-                    <a href="{{ route($showRoute, $document->contact_id) }}" class="font-medium border-b border-black">
+                    <x-link href="{{ route($showRoute, $document->contact_id) }}" class="font-medium border-b border-black" override="class">
                         {{ $document->contact_name }}
-                    </a>
+                    </x-link>
                 @else
                     <div class="font-medium border-b border-black">
                         {{ $document->contact_name }}
@@ -76,9 +76,9 @@
         @if ($document->items->count() > 2)
             <li class="ml-10 mb-10">
             @if (! $hideShow)
-                <a href="{{ route($showDocumentRoute, $document->id) }}" class="border-b">
+                <x-link href="{{ route($showDocumentRoute, $document->id) }}" class="border-b" override="class">
                     {{ trans('documents.invoice_detail.more_item', ['count' => $document->items->count() - 2]) }}
-                </a>
+                </x-link>
             @else
                 <div class="border-b">
                     {{ trans('documents.invoice_detail.more_item', ['count' => $document->items->count() - 2]) }}
diff --git a/resources/views/components/empty-page.blade.php b/resources/views/components/empty-page.blade.php
index 2f0949bf8..9327d760f 100644
--- a/resources/views/components/empty-page.blade.php
+++ b/resources/views/components/empty-page.blade.php
@@ -16,7 +16,7 @@
                 @can ($button['permission'])
                 @endif
                     <li class="border-b p-2 hover:bg-gray-100">
-                        <a href="{{ $button['url']}}" class="flex items-center justify-between text-xs">
+                        <x-link href="{{ $button['url']}}" class="flex items-center justify-between text-xs" override="class">
                             <div class="truncate">
                                 <div class="flex items-center">
                                     <h2 class="relative">
@@ -35,7 +35,7 @@
                             </div>
 
                             <span class="material-icons text-gray-500 transform rtl:rotate-180">chevron_right</span>
-                        </a>
+                        </x-link>
                     </li>
                 @if ($checkPermissionCreate)
                 @endcan
@@ -44,7 +44,7 @@
 
             @if (! empty($suggestion))
                 <li class="border-b p-2  hover:bg-gray-100">
-                    <a href="{{ url($suggestion->action_url) . '?' . http_build_query((array) $suggestion->action_parameters) }}" class="flex items-center justify-between text-xs">
+                    <x-link href="{{ url($suggestion->action_url) . '?' . http_build_query((array) $suggestion->action_parameters) }}" class="flex items-center justify-between text-xs" override="class">
                         <div class="truncate">
                             <h2>
                                 {{ $suggestion->name }}
@@ -56,7 +56,7 @@
                         </div>
 
                         <span class="material-icons text-gray-500">chevron_right</span>
-                    </a>
+                    </x-link>
                 </li>
             @endif
         </ul>
diff --git a/resources/views/components/index/summary.blade.php b/resources/views/components/index/summary.blade.php
index 67d38408f..7c88c71da 100644
--- a/resources/views/components/index/summary.blade.php
+++ b/resources/views/components/index/summary.blade.php
@@ -6,7 +6,7 @@
             <div @class(['w-1/2 sm:w-1/3 text-center'])>
                 @if (! empty($item['tooltip']))
                     <x-tooltip id="tooltip-summary-first" placement="top" message="{!! $first->attributes->get('tooltip') !!}">
-                        <a href="{{ $item['href'] }}" class="group">
+                        <x-link href="{{ $item['href'] }}" class="group" override="class">
                             @php $text_color = (! empty($item['text_color'])) ? $item['text_color'] : 'text-purple group-hover:text-purple-700'; @endphp
                             <div @class(['relative text-xl sm:text-6xl', $text_color, 'mb-2'])>
                                 {!! $item['amount'] !!}
@@ -16,10 +16,10 @@
                             <span class="font-light mt-3">
                                 {!! $item['title'] !!}
                             </span>
-                        </a>
+                        </x-link>
                     </x-tooltip>
                 @else
-                    <a href="{{ $item['href'] }}" class="group">
+                    <x-link href="{{ $item['href'] }}" class="group" override="class">
                         @php $text_color = (! empty($item['text_color'])) ? $item['text_color'] : 'text-purple group-hover:text-purple-700'; @endphp
                         <div @class(['relative text-xl sm:text-6xl', $text_color, 'mb-2'])>
                             {!! $item['amount'] !!}
@@ -29,7 +29,7 @@
                         <span class="font-light mt-3">
                             {!! $item['title'] !!}
                         </span>
-                    </a>
+                    </x-link>
                 @endif
             </div>
         @endforeach
@@ -42,7 +42,7 @@
                     <x-tooltip id="tooltip-summary-first" placement="top" message="{!! $first->attributes->get('tooltip') !!}">
                     
                         @if ($first->attributes->has('href'))
-                        <a href="{{ $first->attributes->get('href') }}" class="group">
+                        <x-link href="{{ $first->attributes->get('href') }}" class="group" override="class">
                         @endif
                             @php $text_color = $first->attributes->has('text-color') ? $first->attributes->get('text-color') : 'text-purple group-hover:text-purple-700'; @endphp
                             <div @class(['relative text-xl sm:text-6xl', $text_color, 'mb-2', $first->attributes->get('class')])>
@@ -54,13 +54,13 @@
                                 {!! $first->attributes->get('title') !!}
                             </span>
                         @if ($first->attributes->has('href'))
-                        </a>
+                        </x-link>
                         @endif
 
                     </x-tooltip>
                 @else
                     @if ($first->attributes->has('href'))
-                    <a href="{{ $first->attributes->get('href') }}" class="group">
+                    <x-link href="{{ $first->attributes->get('href') }}" class="group" override="class">
                     @endif
                         @php $text_color = $first->attributes->has('text-color') ? $first->attributes->get('text-color') : 'text-purple group-hover:text-purple-700'; @endphp
                         <div @class(['relative text-xl sm:text-6xl', $text_color, 'mb-2', $first->attributes->get('class')])>
@@ -72,7 +72,7 @@
                             {!! $first->attributes->get('title') !!}
                         </span>
                     @if ($first->attributes->has('href'))
-                    </a>
+                    </x-link>
                     @endif
                 @endif
             </div>
@@ -92,7 +92,7 @@
                     <x-tooltip id="tooltip-summary-second" placement="top" message="{!! $second->attributes->get('tooltip') !!}">
 
                         @if ($second->attributes->has('href'))
-                        <a href="{{ $second->attributes->get('href') }}" class="group">
+                        <x-link href="{{ $second->attributes->get('href') }}" class="group" override="class">
                         @endif
                             @php $text_color = $second->attributes->has('text-color') ? $second->attributes->get('text-color') : 'text-purple group-hover:text-purple-700'; @endphp
                             <div @class(['relative text-xl sm:text-6xl', $text_color, 'mb-2', $second->attributes->get('class')])>
@@ -105,13 +105,13 @@
                             </span>
 
                         @if ($second->attributes->has('href'))
-                        </a>
+                        </x-link>
                         @endif
 
                     </x-tooltip>
                 @else
                     @if ($second->attributes->has('href'))
-                    <a href="{{ $second->attributes->get('href') }}" class="group">
+                    <x-link href="{{ $second->attributes->get('href') }}" class="group" override="class">
                     @endif
                         @php $text_color = $second->attributes->has('text-color') ? $second->attributes->get('text-color') : 'text-purple group-hover:text-purple-700'; @endphp
                         <div @class(['relative text-xl sm:text-6xl', $text_color, 'mb-2', $second->attributes->get('class')])>
@@ -124,7 +124,7 @@
                         </span>
 
                     @if ($second->attributes->has('href'))
-                    </a>
+                    </x-link>
                     @endif
                 @endif
             </div>
@@ -144,7 +144,7 @@
                     <x-tooltip id="tooltip-summary-third" placement="top" message="{!! $third->attributes->get('tooltip') !!}">
 
                         @if ($third->attributes->has('href'))
-                        <a href="{{ $third->attributes->get('href') }}" class="group">
+                        <x-link href="{{ $third->attributes->get('href') }}" class="group" override="class">
                         @endif
                             @php $text_color = $third->attributes->has('text-color') ? $third->attributes->get('text-color') : 'text-purple group-hover:text-purple-700'; @endphp
                             <div @class(['relative text-xl sm:text-6xl', $text_color, 'mb-2', $third->attributes->get('class')])>
@@ -156,13 +156,13 @@
                                 {!! $third->attributes->get('title') !!}
                             </span>
                         @if ($third->attributes->has('href'))
-                        </a>
+                        </x-link>
                         @endif
 
                     </x-tooltip>
                 @else
                     @if ($third->attributes->has('href'))
-                    <a href="{{ $third->attributes->get('href') }}" class="group">
+                    <x-link href="{{ $third->attributes->get('href') }}" class="group" override="class">
                     @endif
                         @php $text_color = $third->attributes->has('text-color') ? $third->attributes->get('text-color') : 'text-purple group-hover:text-purple-700'; @endphp
                         <div @class(['relative text-xl sm:text-6xl', $text_color, 'mb-2', $third->attributes->get('class')])>
@@ -174,7 +174,7 @@
                             {!! $third->attributes->get('title') !!}
                         </span>
                     @if ($third->attributes->has('href'))
-                    </a>
+                    </x-link>
                     @endif
                 @endif
             </div>
diff --git a/resources/views/components/layouts/admin/footer.blade.php b/resources/views/components/layouts/admin/footer.blade.php
index 66b3c5e0f..4ccdcdc2f 100644
--- a/resources/views/components/layouts/admin/footer.blade.php
+++ b/resources/views/components/layouts/admin/footer.blade.php
@@ -3,7 +3,7 @@
         <div class="flex flex-col sm:flex-row items-center justify-between mt-10 lg:mt-20 py-7 text-sm font-light">
             <div>
                 {{ trans('footer.powered') }}:
-                <a href="{{ trans('footer.link') }}" target="_blank">{{ trans('footer.software') }}</a>
+                <x-link href="{{ trans('footer.link') }}" target="_blank" override="class">{{ trans('footer.software') }}</x-link>
                 &nbsp;<span class="material-icons align-middle text-black-300">code</span>&nbsp;
                 {{ trans('footer.version') }} {{ version('short') }}
             </div>
diff --git a/resources/views/components/layouts/admin/menu.blade.php b/resources/views/components/layouts/admin/menu.blade.php
index f621d9248..ce6f61bcd 100644
--- a/resources/views/components/layouts/admin/menu.blade.php
+++ b/resources/views/components/layouts/admin/menu.blade.php
@@ -95,9 +95,9 @@
             </x-tooltip>
 
             <x-tooltip id="tooltip-support" placement="right" message="{{ trans('general.help') }}">
-                <a href="{{ url(trans('header.support_link')) }}" target="_blank" class="flex items-center justify-center w-8 h-8 mb-2.5 cursor-pointer js-menu-toggles">
+                <x-link href="{{ url(trans('header.support_link')) }}" target="_blank" class="flex items-center justify-center w-8 h-8 mb-2.5 cursor-pointer js-menu-toggles" override="class">
                     <span id="menu-support-icon" class="material-icons-outlined text-purple text-2xl">support</span>
-                </a>
+                </x-link>
             </x-tooltip>
         </div>
 
@@ -131,23 +131,23 @@
             @can('read-common-companies')
                 <div id="dropdown-menu-company" class="absolute right-0 mt-3 pt-2 bg-white rounded-md shadow-xl z-20 hidden" style="left: auto; min-width: 10rem;">
                     @foreach($companies as $com)
-                        <a href="{{ route('companies.switch', $com->id) }}" id="$com->id" class="h-9 leading-9 flex items-center text-sm px-2" role="menuitem" tabindex="-1">
+                        <x-link href="{{ route('companies.switch', $com->id) }}" id="$com->id" class="h-9 leading-9 flex items-center text-sm px-2" override="class" role="menuitem" tabindex="-1">
                             <div class="w-full h-full flex items-center rounded-md px-2 hover:bg-lilac-100">
                                 <span class="material-icons-outlined text-purple text-xl">business</span>
                                 <span class="ltr:pl-2 rtl:pr-2 text-purple text-xs truncate">{{ Str::limit($com->name, 18) }}</span>
                             </div>
-                        </a>
+                        </x-link>
                     @endforeach
 
                     @can('update-common-companies')
-                        <a href="{{ route('companies.index') }}" class="h-9 leading-9 flex items-center text-sm px-2 mt-2 border-t rounded-bl rounded-br group hover:bg-purple">
+                        <x-link href="{{ route('companies.index') }}" class="h-9 leading-9 flex items-center text-sm px-2 mt-2 border-t rounded-bl rounded-br group hover:bg-purple" override="class">
                             <div class="w-full h-full flex items-center rounded-md px-2">
                                 <span class="material-icons-outlined text-purple text-xl group-hover:text-white">settings</span>
                                 <span class="ltr:pl-2 rtl:pr-2 text-purple text-xs truncate group-hover:text-white">
                                     {{ trans('general.title.manage', ['type' => trans_choice('general.companies', 2)]) }}
                                 </span>
                             </div>
-                        </a>
+                        </x-link>
                     @endcan
                 </div>
             @endcan
diff --git a/resources/views/components/layouts/auth/footer.blade.php b/resources/views/components/layouts/auth/footer.blade.php
index 0ea62bb74..55f3338c5 100644
--- a/resources/views/components/layouts/auth/footer.blade.php
+++ b/resources/views/components/layouts/auth/footer.blade.php
@@ -1,7 +1,7 @@
 @stack('footer_start')
 <footer class="footer">
     <div class="lg:absolute bottom-10 right-6 lg:right-24 flex flex-col sm:flex-row items-center justify-end text-sm font-light">
-        {{ trans('footer.powered') }}: <a href="{{ trans('footer.link') }}" target="_blank">{{ trans('footer.software') }}</a>
+        {{ trans('footer.powered') }}: <x-link href="{{ trans('footer.link') }}" target="_blank" override="class">{{ trans('footer.software') }}</x-link>
     </div>
 </footer>
 @stack('footer_end')
diff --git a/resources/views/components/layouts/install/content.blade.php b/resources/views/components/layouts/install/content.blade.php
index 1039109a3..837cbb5a0 100644
--- a/resources/views/components/layouts/install/content.blade.php
+++ b/resources/views/components/layouts/install/content.blade.php
@@ -18,9 +18,9 @@
         <div class="card-footer">
             <div class="float-right">
                 @if (Request::is('install/requirements'))
-                    <a href="{{ route('install.requirements') }}" class="btn btn-success">
+                    <x-link href="{{ route('install.requirements') }}" class="btn btn-success" override="class">
                         {{ trans('install.refresh') }}
-                    </a>
+                    </x-link>
                 @else
                     <x-button
                         type="submit"
diff --git a/resources/views/components/layouts/modules/bar.blade.php b/resources/views/components/layouts/modules/bar.blade.php
index 3e880a0c3..126afca6b 100644
--- a/resources/views/components/layouts/modules/bar.blade.php
+++ b/resources/views/components/layouts/modules/bar.blade.php
@@ -31,7 +31,7 @@
                         <div class="flex flex-col gap-4">
                             @foreach ($popular->data as $item)
                                 <div class="hover:shadow-2xl rounded-lg">
-                                    <a href="{{ route('apps.app.show', $item->slug) }}" class="flex items-center p-2">
+                                    <x-link href="{{ route('apps.app.show', $item->slug) }}" class="flex items-center p-2" override="class">
                                         @foreach ($item->files as $file)
                                             @if (($file->media_type == 'image') && ($file->pivot->zone == 'thumbnail'))
                                                 <img src="{{ $file->path_string }}" alt="{{ $item->name }}" class="w-28 h-20 rounded-md object-cover ltr:mr-3 rtl:ml-3" />
@@ -49,7 +49,7 @@
                                                 </p>
                                             </div>
                                         </div>
-                                    </a>
+                                    </x-link>
                                 </div>
                             @endforeach
                         </div>
diff --git a/resources/views/components/layouts/modules/item.blade.php b/resources/views/components/layouts/modules/item.blade.php
index 20e21ecb5..e86c18fb5 100644
--- a/resources/views/components/layouts/modules/item.blade.php
+++ b/resources/views/components/layouts/modules/item.blade.php
@@ -1,20 +1,20 @@
 <div>
     <div>
         @foreach ($module->files as $file)
-            <a href="{{ route('apps.app.show', $module->slug) }}">
+            <x-link href="{{ route('apps.app.show', $module->slug) }}" override="class">
                 @if (($file->media_type == 'image') && ($file->pivot->zone == 'thumbnail'))
                     <img src="{{ $file->path_string }}" alt="{{ $module->name }}" class="rounded-md" />
                 @endif
-            </a>
+            </x-link>
         @endforeach
     </div>
 
     <div class="flex flex-col py-2 justify-between align-bottom">
         <div class="flex items-baseline justify-between">
             <h4 class="w-32 truncate">
-                <a href="{{ route('apps.app.show', $module->slug) }}">
+                <x-link href="{{ route('apps.app.show', $module->slug) }}" override="class">
                     {{ $module->name }}
-                </a>
+                </x-link>
             </h4>
 
             <div class="text-xs">
diff --git a/resources/views/components/layouts/modules/my_apps_item.blade.php b/resources/views/components/layouts/modules/my_apps_item.blade.php
index f8ba411bb..b07466e48 100644
--- a/resources/views/components/layouts/modules/my_apps_item.blade.php
+++ b/resources/views/components/layouts/modules/my_apps_item.blade.php
@@ -21,20 +21,20 @@
 
     <div>
         @foreach ($module->files as $file)
-            <a href="{{ route('apps.app.show', $module->slug) }}">
+            <x-link href="{{ route('apps.app.show', $module->slug) }}" override="class">
                 @if (($file->media_type == 'image') && ($file->pivot->zone == 'thumbnail'))
                     <img src="{{ $file->path_string }}" alt="{{ $module->name }}" class="rounded-md" />
                 @endif
-            </a>
+            </x-link>
         @endforeach
     </div>
 
     <div class="flex py-2 justify-between items-center">
         <div class="py-2">
             <h4 class="truncate font-bold text-sm">
-                <a href="{{ route('apps.app.show', $module->slug) }}">
+                <x-link href="{{ route('apps.app.show', $module->slug) }}" override="class">
                     {{ $module->name }}
-                </a>
+                </x-link>
             </h4>
         </div>
 
diff --git a/resources/views/components/layouts/modules/show/information.blade.php b/resources/views/components/layouts/modules/show/information.blade.php
index 984ab4c8d..d8c460fea 100644
--- a/resources/views/components/layouts/modules/show/information.blade.php
+++ b/resources/views/components/layouts/modules/show/information.blade.php
@@ -13,7 +13,7 @@
 
     <div x-show="price_type == false" class="text-center text-sm mt-3 mb--2">
         <span style="font-size: 12px;">
-            <span class="text-red">*</span> <a href="https://akaunting.com/features/why-akaunting-cloud?utm_source=software&utm_medium=app_show&utm_campaign={{ str_replace('-', '_', $module->slug) }}" target="_blank">{!! trans('modules.information_monthly') !!}</a>
+            <span class="text-red">*</span> <x-link href="https://akaunting.com/features/why-akaunting-cloud?utm_source=software&utm_medium=app_show&utm_campaign={{ str_replace('-', '_', $module->slug) }}" target="_blank" override="class">{!! trans('modules.information_monthly') !!}</x-link>
         </span>
     </div>
 @else
diff --git a/resources/views/components/layouts/portal/finish/content.blade.php b/resources/views/components/layouts/portal/finish/content.blade.php
index 5a7fbd70b..a3fe90a2c 100644
--- a/resources/views/components/layouts/portal/finish/content.blade.php
+++ b/resources/views/components/layouts/portal/finish/content.blade.php
@@ -7,9 +7,9 @@
         </div>
 
         <div class="my-10">
-            <a href="https://akaunting.com/lp/accounting-software?utm_source=software&utm_medium=invoice_payment&utm_campaign=plg" class="bg-purple text-white px-3 py-1.5 mb-3 sm:mb-0 rounded-xl text-sm font-medium leading-6 hover:bg-purple-700">
+            <x-link href="https://akaunting.com/lp/accounting-software?utm_source=software&utm_medium=invoice_payment&utm_campaign=plg" class="bg-purple text-white px-3 py-1.5 mb-3 sm:mb-0 rounded-xl text-sm font-medium leading-6 hover:bg-purple-700" override="class">
                 {{ trans('portal.get_started') }}
-            </a>
+            </x-link>
         </div>
 
         <div class="my-10">
diff --git a/resources/views/components/layouts/portal/menu.blade.php b/resources/views/components/layouts/portal/menu.blade.php
index 9e1c9615a..fc9c5d660 100644
--- a/resources/views/components/layouts/portal/menu.blade.php
+++ b/resources/views/components/layouts/portal/menu.blade.php
@@ -66,9 +66,9 @@
             </x-tooltip>
             
             <x-tooltip id="tooltip-support" placement="right" message="{{ trans('general.help') }}">
-                <a href="{{ url(trans('header.support_link')) }}" target="_blank" class="flex items-center justify-center w-8 h-8 mb-2.5 cursor-pointer js-menu-toggles">
+                <x-link href="{{ url(trans('header.support_link')) }}" target="_blank" class="flex items-center justify-center w-8 h-8 mb-2.5 cursor-pointer js-menu-toggles" override="class">
                     <span class="material-icons-outlined text-purple text-2xl">support</span>
-                </a>
+                </x-link>
             </x-tooltip>
         </div>
 
@@ -102,23 +102,23 @@
             @can('read-common-companies')
                 <div id="dropdown-menu-company" class="absolute right-0 mt-3 py-2 bg-white rounded-md shadow-xl z-20 hidden" style="left: auto; min-width: 10rem;">
                     @foreach($companies as $com)
-                        <a href="{{ route('companies.switch', $com->id) }}" id="$com->id" class="h-9 leading-9 flex items-center text-sm px-2" role="menuitem" tabindex="-1">
+                        <x-link href="{{ route('companies.switch', $com->id) }}" id="$com->id" class="h-9 leading-9 flex items-center text-sm px-2" override="class" role="menuitem" tabindex="-1">
                             <div class="w-full h-full flex items-center rounded-md px-2 hover:bg-lilac-100">
                                 <span class="material-icons-outlined text-purple text-xl">business</span>
                                 <span class="ltr:pl-2 rtl:pr-2 text-purple text-xs truncate">{{ Str::limit($com->name, 18) }}</span>
                             </div>
-                        </a>
+                        </x-link>
                     @endforeach
 
                     @can('update-common-companies')
-                        <a href="{{ route('companies.index') }}" class="h-9 leading-9 flex items-center text-sm px-2 border-t rounded-bl rounded-br group hover:bg-purple">
+                        <x-link href="{{ route('companies.index') }}" class="h-9 leading-9 flex items-center text-sm px-2 border-t rounded-bl rounded-br group hover:bg-purple" override="class">
                             <div class="w-full h-full flex items-center rounded-md px-2 ">
                                 <span class="material-icons-outlined text-purple text-xl group-hover:text-white">settings</span>
                                 <span class="ltr:pl-2 rtl:pr-2 text-purple text-xs truncate group-hover:text-white">
                                     {{ trans('general.title.manage', ['type' => trans_choice('general.companies', 2)]) }}
                                 </span>
                             </div>
-                        </a>
+                        </x-link>
                     @endcan
                 </div>
             @endcan
diff --git a/resources/views/components/layouts/preview.blade.php b/resources/views/components/layouts/preview.blade.php
index 303393f56..4d6bbd2a2 100644
--- a/resources/views/components/layouts/preview.blade.php
+++ b/resources/views/components/layouts/preview.blade.php
@@ -22,9 +22,9 @@
                         </span>
                     </div>
 
-                    <a href="{!! !empty($sticky->attributes->has('url')) ? $sticky->attributes->get('url') : route('dashboard') !!}" class="px-3 py-1.5 rounded-xl text-sm font-medium leading-6 bg-purple hover:bg-purple-700 text-white disabled:bg-purple-100">
+                    <x-link href="{!! !empty($sticky->attributes->has('url')) ? $sticky->attributes->get('url') : route('dashboard') !!}" class="px-3 py-1.5 rounded-xl text-sm font-medium leading-6 bg-purple hover:bg-purple-700 text-white disabled:bg-purple-100" override="class">
                         {{ trans('general.go_back', ['type' => company()->name]) }}
-                    </a>
+                    </x-link>
                 </div>
             </header>
 
diff --git a/resources/views/components/layouts/preview/footer.blade.php b/resources/views/components/layouts/preview/footer.blade.php
index 724ec38d2..1fa36fb37 100644
--- a/resources/views/components/layouts/preview/footer.blade.php
+++ b/resources/views/components/layouts/preview/footer.blade.php
@@ -4,7 +4,7 @@
         <div class="flex flex-col sm:flex-row items-center justify-between mt-10 lg:mt-20 py-7 text-sm font-light">
             <div>
                 {{ trans('footer.powered') }}:
-                <a href="{{ trans('footer.link') }}" target="_blank">{{ trans('footer.software') }}</a>
+                <x-link href="{{ trans('footer.link') }}" target="_blank" override="class">{{ trans('footer.software') }}</x-link>
                 &nbsp;<span class="material-icons align-middle text-black-300">code</span>&nbsp;
                 {{ trans('footer.version') }} {{ version('short') }}
             </div>
diff --git a/resources/views/components/layouts/signed/footer.blade.php b/resources/views/components/layouts/signed/footer.blade.php
index 724ec38d2..1fa36fb37 100644
--- a/resources/views/components/layouts/signed/footer.blade.php
+++ b/resources/views/components/layouts/signed/footer.blade.php
@@ -4,7 +4,7 @@
         <div class="flex flex-col sm:flex-row items-center justify-between mt-10 lg:mt-20 py-7 text-sm font-light">
             <div>
                 {{ trans('footer.powered') }}:
-                <a href="{{ trans('footer.link') }}" target="_blank">{{ trans('footer.software') }}</a>
+                <x-link href="{{ trans('footer.link') }}" target="_blank" override="class">{{ trans('footer.software') }}</x-link>
                 &nbsp;<span class="material-icons align-middle text-black-300">code</span>&nbsp;
                 {{ trans('footer.version') }} {{ version('short') }}
             </div>
diff --git a/resources/views/components/media/file.blade.php b/resources/views/components/media/file.blade.php
index b08809a32..e9372b836 100644
--- a/resources/views/components/media/file.blade.php
+++ b/resources/views/components/media/file.blade.php
@@ -12,17 +12,17 @@
     </div>  
     <div class="flex flex-row lg:flex-col gap-x-1">
         @can('delete-common-uploads')
-            <a href="javascript:void();" id="remove-{{ $column_name }}" @click="onDeleteFile('{{ $file->id }}', '{{ route('uploads.destroy', $file->id) }}', '{{ trans('general.title.delete', ['type' => $column_name]) }}', '{{ trans('general.delete_confirm', ['name' => $file->basename, 'type' => $column_name]) }} ', '{{ trans('general.cancel') }}', '{{ trans('general.delete') }}')" type="button" class="group">
+            <x-link href="javascript:void();" id="remove-{{ $column_name }}" @click="onDeleteFile('{{ $file->id }}', '{{ route('uploads.destroy', $file->id) }}', '{{ trans('general.title.delete', ['type' => $column_name]) }}', '{{ trans('general.delete_confirm', ['name' => $file->basename, 'type' => $column_name]) }} ', '{{ trans('general.cancel') }}', '{{ trans('general.delete') }}')" type="button" class="group" override="class">
                 <span class="material-icons text-base text-red px-1.5 py-1 rounded-lg group-hover:bg-gray-100">delete</span>
-            </a>    
+            </x-link>    
             @if ($options)
                 <input type="hidden" name="page_{{ $file->id}}" id="file-page-{{ $file->id}}" value="{{ $options['page'] }}" />
                 <input type="hidden" name="key_{{ $file->id}}" id="file-key-{{ $file->id}}" value="{{ $options['key'] }}" />
                 <input type="hidden" name="value_{{ $file->id}}" id="file-value-{{ $file->id}}" value="{{ $file->id }}" />
             @endif  
-            <a href="{{ route('uploads.download', $file->id) }}" type="button" class="group">
+            <x-link href="{{ route('uploads.download', $file->id) }}" type="button" class="group" override="class">
                 <span class="material-icons text-base text-purple px-1.5 py-1 rounded-lg group-hover:bg-gray-100">download</span>
-            </a>
+            </x-link>
         @endcan
     </div>
 </div>
diff --git a/resources/views/components/modules/banners.blade.php b/resources/views/components/modules/banners.blade.php
index 0be97c958..0ba2a014a 100644
--- a/resources/views/components/modules/banners.blade.php
+++ b/resources/views/components/modules/banners.blade.php
@@ -23,9 +23,9 @@
                 <h1 class="text-lg lg:text-7xl font-semibold text-white" x-text="text"></h1>
             </div>
 
-            <a href="https://akaunting.com/plans" class="text-white transition-all hover:underline">
+            <x-link href="https://akaunting.com/plans" class="text-white transition-all hover:underline" override="class">
                 {{ trans('modules.learn_more') }}
-            </a>
+            </x-link>
         </div>
 
         <div class="hidden lg:block">
diff --git a/resources/views/components/modules/item.blade.php b/resources/views/components/modules/item.blade.php
index 339dee922..a788b0fae 100644
--- a/resources/views/components/modules/item.blade.php
+++ b/resources/views/components/modules/item.blade.php
@@ -1,20 +1,20 @@
 <div>
     <div class="overflow-hidden rounded-md">
         @foreach ($module->files as $file)
-            <a href="{{ route('apps.app.show', $module->slug) }}">
+            <x-link href="{{ route('apps.app.show', $module->slug) }}" override="class">
                 @if (($file->media_type == 'image') && ($file->pivot->zone == 'thumbnail'))
                     <img src="{{ $file->path_string }}" alt="{{ $module->name }}" class="rounded-md transform transition-all hover:scale-125" />
                 @endif
-            </a>
+            </x-link>
         @endforeach
     </div>
 
     <div class="flex flex-col py-2 justify-between align-bottom">
         <div class="flex items-baseline justify-between">
             <h4 class="w-32 truncate">
-                <a href="{{ route('apps.app.show', $module->slug) }}">
+                <x-link href="{{ route('apps.app.show', $module->slug) }}" override="class">
                     {!! $module->name !!}
-                </a>
+                </x-link>
             </h4>
 
             @if (! empty($module->subscription_type))
diff --git a/resources/views/components/modules/no_apps.blade.php b/resources/views/components/modules/no_apps.blade.php
index 4d73fb4de..6a1fe7c89 100644
--- a/resources/views/components/modules/no_apps.blade.php
+++ b/resources/views/components/modules/no_apps.blade.php
@@ -11,9 +11,9 @@
                 {{ trans('modules.no_apps') }}
             </p>
 
-            <a href="{{ route('apps.home.index') }}" class="px-3 py-1 bg-green rounded-md text-white">
+            <x-link href="{{ route('apps.home.index') }}" class="px-3 py-1 bg-green rounded-md text-white" override="class">
                 {{ trans('modules.see_all') }}
-            </a>
+            </x-link>
         </div>
     </div>
 
diff --git a/resources/views/components/pagination.blade.php b/resources/views/components/pagination.blade.php
index 4e8c42fe5..9825ada19 100644
--- a/resources/views/components/pagination.blade.php
+++ b/resources/views/components/pagination.blade.php
@@ -11,13 +11,14 @@
                         </x-slot>
 
                         @foreach($limits as $item)
-                            <a href="javascript:;" @click="onChangePaginationLimit($event)" value="{{ $item }}"
+                            <x-link href="javascript:;" @click="onChangePaginationLimit($event)" value="{{ $item }}"
                                 class="w-full flex items-center text-purple px-2 h-9 leading-9 whitespace-nowrap"
+                                override="class"
                             >
                                 <span class="w-full h-full flex items-center rounded-md px-2 text-sm hover:bg-lilac-100" value="{{ $item }}">
                                     {{ $item }}
                                 </span>
-                            </a>
+                            </x-link>
                         @endforeach
                     </x-dropdown>
 
diff --git a/resources/views/components/show/summary/right.blade.php b/resources/views/components/show/summary/right.blade.php
index 4f64facf3..b6c6a8c96 100644
--- a/resources/views/components/show/summary/right.blade.php
+++ b/resources/views/components/show/summary/right.blade.php
@@ -6,7 +6,7 @@
             <div @class(['w-1/2 sm:w-1/3 text-center'])>
                 @if (! empty($item['tooltip']))
                     <x-tooltip id="tooltip-summary-first" placement="top" message="{!! $first->attributes->get('tooltip') !!}">
-                        <a href="{{ $item['href'] }}" class="group">
+                        <x-link href="{{ $item['href'] }}" class="group" override="class">
                             @php $text_color = (! empty($item['text_color'])) ? $item['text_color'] : 'text-purple group-hover:text-purple-700'; @endphp
                             <div @class(['relative text-xl sm:text-6xl', $text_color, 'mb-2'])>
                                 {!! $item['amount'] !!}
@@ -16,10 +16,10 @@
                             <span class="font-light mt-3">
                                 {!! $item['title'] !!}
                             </span>
-                        </a>
+                        </x-link>
                     </x-tooltip>
                 @else
-                    <a href="{{ $item['href'] }}" class="group">
+                    <x-link href="{{ $item['href'] }}" class="group" override="class">
                         @php $text_color = (! empty($item['text_color'])) ? $item['text_color'] : 'text-purple group-hover:text-purple-700'; @endphp
                         <div @class(['relative text-xl sm:text-6xl', $text_color, 'mb-2'])>
                             {!! $item['amount'] !!}
@@ -29,7 +29,7 @@
                         <span class="font-light mt-3">
                             {!! $item['title'] !!}
                         </span>
-                    </a>
+                    </x-link>
                 @endif
             </div>
         @endforeach
@@ -42,7 +42,7 @@
                     <x-tooltip id="tooltip-summary-first" placement="top" message="{!! $first->attributes->get('tooltip') !!}">
 
                         @if ($first->attributes->has('href'))
-                        <a href="{{ $first->attributes->get('hef') }}" class="group">
+                        <x-link href="{{ $first->attributes->get('hef') }}" class="group" override="class">
                         @endif
                             @php $text_color = $first->attributes->has('text-color') ? $first->attributes->get('text-color') : 'text-purple group-hover:text-purple-700'; @endphp
                             <div @class(['relative text-xl sm:text-6xl', $text_color, 'mb-2'])>
@@ -54,13 +54,13 @@
                                 {!! $first->attributes->get('title') !!}
                             </span>
                         @if ($first->attributes->has('href'))
-                        </a>
+                        </x-link>
                         @endif
 
                     </x-tooltip>
                 @else
                     @if ($first->attributes->has('href'))
-                    <a href="{{ $first->attributes->get('hef') }}" class="group">
+                    <x-link href="{{ $first->attributes->get('hef') }}" class="group" override="class">
                     @endif
                         @php $text_color = $first->attributes->has('text-color') ? $first->attributes->get('text-color') : 'text-purple group-hover:text-purple-700'; @endphp
                         <div @class(['relative text-xl sm:text-6xl', $text_color, 'mb-2'])>
@@ -72,7 +72,7 @@
                             {!! $first->attributes->get('title') !!}
                         </span>
                     @if ($first->attributes->has('href'))
-                    </a>
+                    </x-link>
                     @endif
                 @endif
             </div>
@@ -92,7 +92,7 @@
                     <x-tooltip id="tooltip-summary-second" placement="top" message="{!! $second->attributes->get('tooltip') !!}">
 
                         @if ($second->attributes->has('href'))
-                        <a href="{{ $second->attributes->get('hef') }}" class="group">
+                        <x-link href="{{ $second->attributes->get('hef') }}" class="group" override="class">
                         @endif
                             @php $text_color = $second->attributes->has('text-color') ? $second->attributes->get('text-color') : 'text-purple group-hover:text-purple-700'; @endphp
                             <div @class(['relative text-xl sm:text-6xl', $text_color, 'mb-2'])>
@@ -104,13 +104,13 @@
                                 {!! $second->attributes->get('title') !!}
                             </span>
                         @if ($second->attributes->has('href'))
-                        </a>
+                        </x-link>
                         @endif
 
                     </x-tooltip>
                 @else
                     @if ($second->attributes->has('href'))
-                    <a href="{{ $second->attributes->get('hef') }}" class="group">
+                    <x-link href="{{ $second->attributes->get('hef') }}" class="group" override="class">
                     @endif
                         @php $text_color = $second->attributes->has('text-color') ? $second->attributes->get('text-color') : 'text-purple group-hover:text-purple-700'; @endphp
                         <div @class(['relative text-xl sm:text-6xl', $text_color, 'mb-2'])>
@@ -122,7 +122,7 @@
                             {!! $second->attributes->get('title') !!}
                         </span>
                     @if ($second->attributes->has('href'))
-                    </a>
+                    </x-link>
                     @endif
                 @endif
             </div>
@@ -141,7 +141,7 @@
                 @if ($third->attributes->has('tooltip'))
                     <x-tooltip id="tooltip-summary-third" placement="top" message="{!! $third->attributes->get('tooltip') !!}">
                         @if ($third->attributes->has('href'))
-                        <a href="{{ $third->attributes->get('hef') }}" class="group">
+                        <x-link href="{{ $third->attributes->get('hef') }}" class="group" override="class">
                         @endif
                             @php $text_color = $third->attributes->has('text-color') ? $third->attributes->get('text-color') : 'text-purple group-hover:text-purple-700'; @endphp
                             <div @class(['relative text-xl sm:text-6xl', $text_color, 'mb-2'])>
@@ -153,12 +153,12 @@
                                 {!! $third->attributes->get('title') !!}
                             </span>
                         @if ($third->attributes->has('href'))
-                        </a>
+                        </x-link>
                         @endif
                     </x-tooltip>
                 @else
                     @if ($third->attributes->has('href'))
-                    <a href="{{ $third->attributes->get('hef') }}" class="group">
+                    <x-link href="{{ $third->attributes->get('hef') }}" class="group" override="class">
                     @endif
                         @php $text_color = $third->attributes->has('text-color') ? $third->attributes->get('text-color') : 'text-purple group-hover:text-purple-700'; @endphp
                         <div @class(['relative text-xl sm:text-6xl', $text_color, 'mb-2'])>
@@ -170,7 +170,7 @@
                             {!! $third->attributes->get('title') !!}
                         </span>
                     @if ($third->attributes->has('href'))
-                    </a>
+                    </x-link>
                     @endif
                 @endif
             </div>
diff --git a/resources/views/components/transactions/show/children.blade.php b/resources/views/components/transactions/show/children.blade.php
index 09142108f..b83de8de8 100644
--- a/resources/views/components/transactions/show/children.blade.php
+++ b/resources/views/components/transactions/show/children.blade.php
@@ -23,7 +23,7 @@
     >
         @if ($transaction->children()->count())
             @foreach ($transaction->children()->get() as $child)
-                @php $url = '<a href="' . route('transactions.show', $child->id) . '" class="text-purple">' . $child->number . '</a>' @endphp
+                @php $url = '<x-link href="' . route('transactions.show', $child->id) . '" class="text-purple" override="class">' . $child->number . '</x-link>' @endphp
 
                 <div class="my-2">
                     {!! trans('recurring.child', ['url' => $url, 'date' => company_date($child->paid_at)]) !!}
diff --git a/resources/views/components/transactions/show/content.blade.php b/resources/views/components/transactions/show/content.blade.php
index 7000ada98..833255af9 100644
--- a/resources/views/components/transactions/show/content.blade.php
+++ b/resources/views/components/transactions/show/content.blade.php
@@ -18,7 +18,7 @@
                 @php
                     $recurring_message = trans('recurring.message_parent', [
                         'type' => mb_strtolower(trans_choice($textRecurringType, 1)),
-                        'link' => '<a href="' . route(config('type.transaction.' . $transaction->parent->type . '.route.prefix') . '.show', $parent->id) . '"><u>' . $parent->number . '</u></a>'
+                        'link' => '<x-link href="' . route(config('type.transaction.' . $transaction->parent->type . '.route.prefix') . '.show', $parent->id) . '" override="class"><u>' . $parent->number . '</u></x-link>'
                     ]);
                 @endphp
 
diff --git a/resources/views/components/transactions/show/create.blade.php b/resources/views/components/transactions/show/create.blade.php
index 035bb417f..117e1a159 100644
--- a/resources/views/components/transactions/show/create.blade.php
+++ b/resources/views/components/transactions/show/create.blade.php
@@ -26,9 +26,13 @@
         x-bind:class="create == 1 ? 'h-auto ' : 'scale-y-0 h-0'"
     >
         <div class="flex my-3 space-x-2 rtl:space-x-reverse">
-            <a href="{{ route($routeButtonEdit, [$transaction->id, 'type' => $transaction->type]) }}" class="px-3 py-1.5 mb-3 sm:mb-0 bg-gray-100 hover:bg-gray-200 rounded-xl text-purple text-xs font-bold leading-6">
+            <x-link
+                href="{{ route($routeButtonEdit, [$transaction->id, 'type' => $transaction->type]) }}"
+                class="px-3 py-1.5 mb-3 sm:mb-0 bg-gray-100 hover:bg-gray-200 rounded-xl text-purple text-xs font-bold leading-6"
+                override="class"
+            >
                 {{ trans('general.edit') }}
-            </a>
+            </x-link>
         </div>
     </div>
 </div>
diff --git a/resources/views/components/transactions/show/transfer.blade.php b/resources/views/components/transactions/show/transfer.blade.php
index 46dcc143d..c22cf4bd8 100644
--- a/resources/views/components/transactions/show/transfer.blade.php
+++ b/resources/views/components/transactions/show/transfer.blade.php
@@ -5,7 +5,7 @@
         @php
             $from_account = '<span class="font-medium">' . $transfer->expense_account->title . '</span>';
             $to_account = '<span class="font-medium">' . $transfer->income_account->title . '</span>';
-            $date = '<a href="' . route('transfers.show', $transfer->id) . '" class="text-purple">' . company_date($transaction->paid_at) . '</a>';
+            $date = '<x-link href="' . route('transfers.show', $transfer->id) . '" class="text-purple" override="class">' . company_date($transaction->paid_at) . '</x-link>';
         @endphp
     @endif
 
diff --git a/resources/views/components/transfers/show/create.blade.php b/resources/views/components/transfers/show/create.blade.php
index f142bf628..a90c0a978 100644
--- a/resources/views/components/transfers/show/create.blade.php
+++ b/resources/views/components/transfers/show/create.blade.php
@@ -21,9 +21,13 @@
         x-bind:class="create == 1 ? 'h-auto ' : 'scale-y-0 h-0'"
     >
         <div class="flex my-3 space-x-2 rtl:space-x-reverse">
-            <a href="{{ route('transfers.edit', $transfer->id) }}" class="px-3 py-1.5 mb-3 sm:mb-0 bg-gray-100 hover:bg-gray-200 rounded-xl text-purple text-xs font-bold leading-6">
+            <x-link
+                href="{{ route('transfers.edit', $transfer->id) }}"
+                class="px-3 py-1.5 mb-3 sm:mb-0 bg-gray-100 hover:bg-gray-200 rounded-xl text-purple text-xs font-bold leading-6"
+                override="class"
+            >
                 {{ trans('general.edit') }}
-            </a>
+            </x-link>
         </div>
     </div>
 </div>
diff --git a/resources/views/components/transfers/show/transactions.blade.php b/resources/views/components/transfers/show/transactions.blade.php
index dece94ce9..628d17fe2 100644
--- a/resources/views/components/transfers/show/transactions.blade.php
+++ b/resources/views/components/transfers/show/transactions.blade.php
@@ -1,7 +1,7 @@
 @php
     $link_class = 'to-black-400 hover:bg-full-2 bg-no-repeat bg-0-2 bg-0-full bg-gradient-to-b from-transparent transition-backgroundSize';
-    $expense_number = '<a href="' . route('transactions.show', $transfer->expense_transaction->id) . '" class="' . $link_class . '">' . $transfer->expense_transaction->number . '</a>';
-    $income_number = '<a href="' . route('transactions.show', $transfer->income_transaction->id) . '" class="' . $link_class . '">' . $transfer->income_transaction->number . '</a>';
+    $expense_number = '<x-link href="' . route('transactions.show', $transfer->expense_transaction->id) . '" class="' . $link_class . '" override="class">' . $transfer->expense_transaction->number . '</x-link>';
+    $income_number = '<x-link href="' . route('transactions.show', $transfer->income_transaction->id) . '" class="' . $link_class . '" override="class">' . $transfer->income_transaction->number . '</x-link>';
 @endphp
 
 <div class="border-b pb-4" x-data="{ transactions : null }">
diff --git a/resources/views/components/widgets/contact.blade.php b/resources/views/components/widgets/contact.blade.php
index 667cee312..c7bf08dcd 100644
--- a/resources/views/components/widgets/contact.blade.php
+++ b/resources/views/components/widgets/contact.blade.php
@@ -45,7 +45,7 @@
         @endif
     </div>
 
-    <a href="{{ route('portal.profile.edit', user()->id) }}" class="border-b text-sm hover:text-black">
+    <x-link href="{{ route('portal.profile.edit', user()->id) }}" class="border-b text-sm hover:text-black" override="class">
         {{ trans('portal.see_all_details') }}
-    </a>
+    </x-link>
 </div>
diff --git a/resources/views/components/widgets/invoice_history.blade.php b/resources/views/components/widgets/invoice_history.blade.php
index 27132258d..59bb2c08e 100644
--- a/resources/views/components/widgets/invoice_history.blade.php
+++ b/resources/views/components/widgets/invoice_history.blade.php
@@ -11,9 +11,9 @@
         @endforeach
 
         @if ($invoices->count() > 2)
-        <a href="{{ route('portal.invoices.index') }}" class="underline hover:text-black-700">
+        <x-link href="{{ route('portal.invoices.index') }}" class="underline hover:text-black-700" override="class">
             {{ trans('modules.see_all_type', ['type' => trans_choice('general.invoices', 2)]) }}
-        </a>
+        </x-link>
         @endif
     @else
         <span class="text-xs">
diff --git a/resources/views/components/widgets/latest_invoices.blade.php b/resources/views/components/widgets/latest_invoices.blade.php
index 30bc1f0bb..239034214 100644
--- a/resources/views/components/widgets/latest_invoices.blade.php
+++ b/resources/views/components/widgets/latest_invoices.blade.php
@@ -11,9 +11,9 @@
         @endforeach
 
         @if ($invoices->count() > 2)
-        <a href="{{ route('portal.invoices.index') }}" class="underline hover:text-black-700">
+        <x-link href="{{ route('portal.invoices.index') }}" class="underline hover:text-black-700" override="class">
             {{ trans('modules.see_all_type', ['type' => trans_choice('general.invoices', 2)]) }}
-        </a>
+        </x-link>
         @endif
     @else
         <span class="text-xs">
diff --git a/resources/views/components/widgets/outstanding_balance.blade.php b/resources/views/components/widgets/outstanding_balance.blade.php
index 17e7d237d..b2ba3e013 100644
--- a/resources/views/components/widgets/outstanding_balance.blade.php
+++ b/resources/views/components/widgets/outstanding_balance.blade.php
@@ -13,9 +13,9 @@
                 <x-money :amount="$contact->overdue" :currency="$contact->currency_code" convert />
             </span>
     
-            <a href="{{ route('portal.invoices.index') }}" class="px-2 py-1 my-3 rounded-lg text-xs leading-6 bg-green text-white hover:bg-green-700 disabled:bg-green-100">
+            <x-link href="{{ route('portal.invoices.index') }}" class="px-2 py-1 my-3 rounded-lg text-xs leading-6 bg-green text-white hover:bg-green-700 disabled:bg-green-100" override="class">
                 {{ trans('bills.make_payment') }}
-            </a>
+            </x-link>
         </div>
     @else
         <span class="text-xs">
diff --git a/resources/views/components/widgets/payment_history.blade.php b/resources/views/components/widgets/payment_history.blade.php
index c8efcd7ca..93d8c1c7a 100644
--- a/resources/views/components/widgets/payment_history.blade.php
+++ b/resources/views/components/widgets/payment_history.blade.php
@@ -15,9 +15,9 @@
         @endforeach
 
         @if ($payments->count() > 2)
-        <a href="{{ route('portal.payments.index') }}" class="underline hover:text-black-700">
+        <x-link href="{{ route('portal.payments.index') }}" class="underline hover:text-black-700" override="class">
             {{ trans('modules.see_all_type', ['type' => trans_choice('general.payments', 2)]) }}
-        </a>
+        </x-link>
         @endif
     @else
         <span class="text-xs">
diff --git a/resources/views/errors/403.blade.php b/resources/views/errors/403.blade.php
index 0010199e2..48981f830 100644
--- a/resources/views/errors/403.blade.php
+++ b/resources/views/errors/403.blade.php
@@ -21,9 +21,13 @@
                 @endif
 
                 @php $landing_page = user() ? user()->getLandingPageOfUser() : route('login'); @endphp
-                <a href="{{ $landing_page }}" class="relative flex items-center justify-center bg-green hover:bg-green-700 text-white px-6 py-1.5 text-base rounded-lg disabled:bg-green-100 mt-3">
+                <x-link
+                    href="{{ $landing_page }}"
+                    class="relative flex items-center justify-center bg-green hover:bg-green-700 text-white px-6 py-1.5 text-base rounded-lg disabled:bg-green-100 mt-3"
+                    override="class"
+                >
                     {{ trans('general.go_to_dashboard') }}
-                </a>
+                </x-link>
             </div>
 
             <img src="{{ asset('public/img/errors/403.png') }}" alt="403" />
diff --git a/resources/views/errors/404.blade.php b/resources/views/errors/404.blade.php
index aa278940a..671067686 100644
--- a/resources/views/errors/404.blade.php
+++ b/resources/views/errors/404.blade.php
@@ -21,9 +21,13 @@
                 @endif
 
                 @php $landing_page = user() ? user()->getLandingPageOfUser() : route('login'); @endphp
-                <a href="{{ $landing_page }}" class="relative flex items-center justify-center bg-green hover:bg-green-700 text-white px-6 py-1.5 text-base rounded-lg disabled:bg-green-100 mt-3">
+                <x-link
+                    href="{{ $landing_page }}"
+                    class="relative flex items-center justify-center bg-green hover:bg-green-700 text-white px-6 py-1.5 text-base rounded-lg disabled:bg-green-100 mt-3"
+                    override="class"
+                >
                     {{ trans('general.go_to_dashboard') }}
-                </a>
+                </x-link>
             </div>
 
             <img src="{{ asset('public/img/errors/404.png') }}" alt="404" />
diff --git a/resources/views/errors/500.blade.php b/resources/views/errors/500.blade.php
index 12f037609..9da88b4d8 100644
--- a/resources/views/errors/500.blade.php
+++ b/resources/views/errors/500.blade.php
@@ -21,9 +21,13 @@
                 @endif
 
                 @php $landing_page = user() ? user()->getLandingPageOfUser() : route('login'); @endphp
-                <a href="{{ $landing_page }}" class="relative flex items-center justify-center bg-green hover:bg-green-700 text-white px-6 py-1.5 text-base rounded-lg disabled:bg-green-100 mt-3">
+                <x-link
+                    href="{{ $landing_page }}"
+                    class="relative flex items-center justify-center bg-green hover:bg-green-700 text-white px-6 py-1.5 text-base rounded-lg disabled:bg-green-100 mt-3"
+                    override="class"
+                >
                     {{ trans('general.go_to_dashboard') }}
-                </a>
+                </x-link>
             </div>
 
             <img src="{{ asset('public/img/errors/500.png') }}" alt="500" />
diff --git a/resources/views/livewire/menu/favorites.blade.php b/resources/views/livewire/menu/favorites.blade.php
index 575d66f9e..4fa2ae913 100644
--- a/resources/views/livewire/menu/favorites.blade.php
+++ b/resources/views/livewire/menu/favorites.blade.php
@@ -3,7 +3,7 @@
 
     @foreach ($favorites as $favorite)
         <x-tooltip id="{{ $favorite['title'] }}" placement="right" message="{{ $favorite['title'] }}">
-            <a href="{{ $favorite['url'] }}" class="w-8 h-8 flex items-center justify-center mb-2.5">
+            <x-link href="{{ $favorite['url'] }}" class="w-8 h-8 flex items-center justify-center mb-2.5" override="class">
                 <span
                     id="{{ $favorite['id'] }}"
                     @class([
@@ -14,7 +14,7 @@
                 >
                     {{ $favorite['icon'] }}
                 </span>
-            </a>
+            </x-link>
         </x-tooltip>
     @endforeach
 </div>
diff --git a/resources/views/modules/item/pre_sale.blade.php b/resources/views/modules/item/pre_sale.blade.php
index 027c39bc4..656d0c8d9 100644
--- a/resources/views/modules/item/pre_sale.blade.php
+++ b/resources/views/modules/item/pre_sale.blade.php
@@ -41,9 +41,9 @@
                         <div class="flex justify-between">
                             <span>
                                 @foreach ($module->categories as $module_category)
-                                    <a href="{{ route('apps.categories.show', $module_category->slug) }}" class="text-sm">
+                                    <x-link href="{{ route('apps.categories.show', $module_category->slug) }}" class="text-sm" override="class">
                                         {{ $module_category->name }}
-                                    </a>
+                                    </x-link>
                                 @endforeach
                             </span>
                         </div>
diff --git a/resources/views/portal/invoices/index.blade.php b/resources/views/portal/invoices/index.blade.php
index 9109732f4..6065c1f4e 100644
--- a/resources/views/portal/invoices/index.blade.php
+++ b/resources/views/portal/invoices/index.blade.php
@@ -158,9 +158,13 @@
                     </div>
 
                     <div class="my-10">
-                        <a href="https://akaunting.com/lp/accounting-software?utm_source=software&utm_medium=invoice_index&utm_campaign=plg" class="bg-purple text-white px-3 py-1.5 mb-3 sm:mb-0 rounded-xl text-sm font-medium leading-6 hover:bg-purple-700">
+                        <x-link
+                            href="https://akaunting.com/lp/accounting-software?utm_source=software&utm_medium=invoice_index&utm_campaign=plg"
+                            class="bg-purple text-white px-3 py-1.5 mb-3 sm:mb-0 rounded-xl text-sm font-medium leading-6 hover:bg-purple-700"
+                            override="class"
+                        >
                             {{ trans('portal.get_started') }}
-                        </a>
+                        </x-link>
                     </div>
 
                     <div class="my-10">
diff --git a/resources/views/portal/payments/index.blade.php b/resources/views/portal/payments/index.blade.php
index f6a59d49c..367246886 100644
--- a/resources/views/portal/payments/index.blade.php
+++ b/resources/views/portal/payments/index.blade.php
@@ -66,9 +66,13 @@
                     </div>
 
                     <div class="my-10">
-                        <a href="https://akaunting.com/lp/accounting-software?utm_source=software&utm_medium=payment_index&utm_campaign=plg" class="bg-purple text-white px-3 py-1.5 mb-3 sm:mb-0 rounded-xl text-sm font-medium leading-6 hover:bg-purple-700">
+                        <x-link
+                            href="https://akaunting.com/lp/accounting-software?utm_source=software&utm_medium=payment_index&utm_campaign=plg"
+                            class="bg-purple text-white px-3 py-1.5 mb-3 sm:mb-0 rounded-xl text-sm font-medium leading-6 hover:bg-purple-700"
+                            override="class"
+                        >
                             {{ trans('portal.get_started') }}
-                        </a>
+                        </x-link>
                     </div>
 
                     <div class="my-10">
diff --git a/resources/views/widgets/bank_feeds.blade.php b/resources/views/widgets/bank_feeds.blade.php
index 8c192e698..260f58fe4 100644
--- a/resources/views/widgets/bank_feeds.blade.php
+++ b/resources/views/widgets/bank_feeds.blade.php
@@ -11,9 +11,9 @@
 
             <span class="w-64 block mb-3 text-black-400 text-xs">{!! trans('widgets.description.bank_feeds') !!}</span>
 
-            <a href="{{ $learn_more_url }}" target="_blank" class="font-light text-xs border-b transition-all hover:font-medium">
+            <x-link href="{{ $learn_more_url }}" target="_blank" class="font-light text-xs border-b transition-all hover:font-medium" override="class">
                 {{ trans('modules.learn_more') }}
-            </a>
+            </x-link>
         </div>
 
         <div class="relative flex justify-end -mt-28">