diff --git a/resources/assets/js/components/AkauntingContactCard.vue b/resources/assets/js/components/AkauntingContactCard.vue
index 47f484baf..dd494aef5 100644
--- a/resources/assets/js/components/AkauntingContactCard.vue
+++ b/resources/assets/js/components/AkauntingContactCard.vue
@@ -6,8 +6,8 @@
                     <div class="w-full h-33 bg-white hover:bg-gray-100 rounded-lg border border-light-gray disabled:bg-gray-200 mt-1 text-purple font-medium" :class="[{'border-red': error}]">
                         <div class="text-black h-full">
                             <button type="button" class="w-full h-full flex flex-col items-center justify-center" @click="onContactList">
-                                <span class="material-icons-outlined text-7xl text-black-400">person_add</span>
-                                <span class="text-add-contact"> {{ addContactText }} </span>
+                                <span class="material-icons-outlined text-7xl text-black-400 pointer-events-none">person_add</span>
+                                <span class="text-add-contact pointer-events-none"> {{ addContactText }} </span>
                             </button>
                         </div>
                     </div>
diff --git a/resources/assets/js/views/wizard/Currencies.vue b/resources/assets/js/views/wizard/Currencies.vue
index 51f0618f9..3f3b16c39 100644
--- a/resources/assets/js/views/wizard/Currencies.vue
+++ b/resources/assets/js/views/wizard/Currencies.vue
@@ -227,7 +227,7 @@
 
                         <div v-if="currencies.length && ! new_datas" class="w-full border-b hover:bg-gray-100" style="height:53px;">
                             <button type="button" class="w-full h-full flex items-center justify-center text-purple font-medium disabled:bg-gray-200" @click="onAddItem()">
-                                <span class="material-icons-outlined text-base font-bold ltr:mr-1 rtl:ml-1">add</span>
+                                <span class="material-icons-outlined text-base font-bold ltr:mr-1 rtl:ml-1 pointer-events-none">add</span>
                                 <span class="bg-no-repeat bg-0-2 bg-0-full hover:bg-full-2 bg-gradient-to-b from-transparent to-purple transition-backgroundSize">{{ translations.currencies.new_currency }}</span>
                             </button>
                         </div>
diff --git a/resources/assets/js/views/wizard/Taxes.vue b/resources/assets/js/views/wizard/Taxes.vue
index ceaf5ccb4..e94114812 100644
--- a/resources/assets/js/views/wizard/Taxes.vue
+++ b/resources/assets/js/views/wizard/Taxes.vue
@@ -101,7 +101,7 @@
 
                         <div v-if="taxes.length" class="w-full border-b hover:bg-gray-100" style="height:53px;">
                             <button type="button" class="w-full h-full flex items-center justify-center text-purple font-medium disabled:bg-gray-200" @click="onAddItem()">
-                                <span class="material-icons-outlined text-base font-bold ltr:mr-1 rtl:ml-1">add</span>
+                                <span class="material-icons-outlined text-base font-bold ltr:mr-1 rtl:ml-1 pointer-events-none">add</span>
                                     {{ translations.taxes.new_tax }}
                             </button>
                         </div>
diff --git a/resources/views/common/dashboards/show.blade.php b/resources/views/common/dashboards/show.blade.php
index 7284177b5..3ad0db193 100644
--- a/resources/views/common/dashboards/show.blade.php
+++ b/resources/views/common/dashboards/show.blade.php
@@ -108,19 +108,19 @@
                     </x-slot>
 
                     @can('create-common-widgets')
-                        <x-button
-                            type="button"
-                            id="show-more-actions-add-widget"
-                            class="w-full flex items-center text-purple px-2 h-9 leading-9 whitespace-nowrap"
-                            override="class"
-                            title="{{ trans('general.title.add', ['type' => trans_choice('general.widgets', 1)]) }}"
-                            @click="onCreateWidget()"
-                        >
-                            <span class="w-full h-full flex items-center rounded-md px-2 text-sm hover:bg-lilac-100">
+                        <div class="w-full flex items-center text-purple px-2 h-9 leading-9 whitespace-nowrap">
+                            <x-button
+                                type="button"
+                                id="show-more-actions-add-widget"
+                                class="w-full h-full flex items-center rounded-md px-2 text-sm hover:bg-lilac-100"
+                                override="class"
+                                title="{{ trans('general.title.add', ['type' => trans_choice('general.widgets', 1)]) }}"
+                                @click="onCreateWidget()"
+                            >
                                 {{ trans('general.title.add', ['type' => trans_choice('general.widgets', 1)]) }}
-                            </span>
-                        </x-button>
-
+                            </x-button>
+                        </div>
+                        
                         <x-dropdown.divider />
                     @endcan
 
diff --git a/resources/views/components/delete-link.blade.php b/resources/views/components/delete-link.blade.php
index f935ae829..ed6b8c0f8 100644
--- a/resources/views/components/delete-link.blade.php
+++ b/resources/views/components/delete-link.blade.php
@@ -1,26 +1,27 @@
-<x-button
-    type="button"
-    class="{{ $class }}"
-    @click="onDeleteViaConfirmation('delete-{{ $modelTable }}-{{ $id }}')"
-    override="class"
-    {{ $attributes }}
->
-    <span class="{{ $textClass }}">
+<div class="{{ $class }}">
+    <x-button
+        type="button"
+        class="{{ $textClass }}"
+        @click="onDeleteViaConfirmation('delete-{{ $modelTable }}-{{ $id }}')"
+        override="class"
+        {{ $attributes }}
+    >
+       
         @if ($slot->isNotEmpty())
             {!! $slot !!}
         @else
             {!! $label !!}
         @endif
-    </span>
-
-    <x-form.input.hidden
-        name="delete-{{ $modelTable }}-{{ $id }}"
-        id="delete-{{ $modelTable }}-{{ $id }}"
-        data-field="delete"
-        data-action="{{ $action }}"
-        data-title="{!! $title !!}"
-        data-message="{!! $message !!}"
-        data-cancel="{!! $cancelText !!}"
-        data-delete="{!! $deleteText !!}"
-    />
-</x-button>
+        
+        <x-form.input.hidden
+            name="delete-{{ $modelTable }}-{{ $id }}"
+            id="delete-{{ $modelTable }}-{{ $id }}"
+            data-field="delete"
+            data-action="{{ $action }}"
+            data-title="{!! $title !!}"
+            data-message="{!! $message !!}"
+            data-cancel="{!! $cancelText !!}"
+            data-delete="{!! $deleteText !!}"
+        />
+    </x-button>
+</div>
diff --git a/resources/views/components/dropdown/button.blade.php b/resources/views/components/dropdown/button.blade.php
index 1147f5d64..e66692610 100644
--- a/resources/views/components/dropdown/button.blade.php
+++ b/resources/views/components/dropdown/button.blade.php
@@ -1,5 +1,5 @@
-<button type="button" class="w-full flex items-center text-purple px-2 h-9 leading-9 whitespace-nowrap" {{ $attributes }}>
-    <span class="w-full h-full flex items-center rounded-md px-2 text-sm font-normal hover:bg-lilac-100">
+<div class="w-full flex items-center text-purple px-2 h-9 leading-9 whitespace-nowrap" {{ $attributes }}>
+    <button type="button" class="w-full h-full flex items-center rounded-md px-2 text-sm font-normal hover:bg-lilac-100">
         {!! $slot !!}
-    </span>
-</button>
+    </button>
+</div>
diff --git a/resources/views/components/dropdown/link.blade.php b/resources/views/components/dropdown/link.blade.php
index d49b96e5f..ccb3a1aa5 100644
--- a/resources/views/components/dropdown/link.blade.php
+++ b/resources/views/components/dropdown/link.blade.php
@@ -1,5 +1,5 @@
-<a href="{!! $href !!}" class="w-full flex items-center text-purple px-2 h-9 leading-9 whitespace-nowrap" {{ $attributes }}>
-    <span class="w-full h-full flex items-center rounded-md px-2 text-sm font-normal hover:bg-lilac-100">
+<div class="w-full flex items-center text-purple px-2 h-9 leading-9 whitespace-nowrap" {{ $attributes }}>
+    <a href="{!! $href !!}" class="w-full h-full flex items-center rounded-md px-2 text-sm font-normal hover:bg-lilac-100">
         {!! $slot !!}
-    </span>
-</a>
+    </a>
+</div>
diff --git a/resources/views/components/table/actions.blade.php b/resources/views/components/table/actions.blade.php
index 575cb32e8..f294c58fc 100644
--- a/resources/views/components/table/actions.blade.php
+++ b/resources/views/components/table/actions.blade.php
@@ -91,11 +91,11 @@
                         @case('button')
                             @php $divider = false; @endphp
 
-                            <button type="button" class="w-full flex items-center text-purple px-2 h-9 leading-9 whitespace-nowrap" {!! $action['attributes'] ?? null !!}>
-                                <span class="w-full h-full flex items-center rounded-md px-2 text-sm hover:bg-lilac-100">
+                            <div class="w-full flex items-center text-purple px-2 h-9 leading-9 whitespace-nowrap" {!! $action['attributes'] ?? null !!}>
+                                <button type="button" class="w-full h-full flex items-center rounded-md px-2 text-sm hover:bg-lilac-100">
                                     {{ $action['title'] }}
-                                </span>
-                            </button>
+                                </button>
+                            </div>
                             @break
 
                         @case('delete')
@@ -121,11 +121,11 @@
                         @default
                             @php $divider = false; @endphp
 
-                            <a href="{{ $action['url'] }}" class="w-full flex items-center text-purple px-2 h-9 leading-9 whitespace-nowrap" {!! $action['attributes'] ?? null !!}>
-                                <span class="w-full h-full flex items-center rounded-md px-2 text-sm hover:bg-lilac-100">
+                            <div class="w-full flex items-center text-purple px-2 h-9 leading-9 whitespace-nowrap" {!! $action['attributes'] ?? null !!}>
+                                <a href="{{ $action['url'] }}" class="w-full h-full flex items-center rounded-md px-2 text-sm hover:bg-lilac-100">
                                     {{ $action['title'] }}
-                                </span>
-                            </a>
+                                </a>
+                            </div>
                     @endswitch
                 @endforeach
             </div>
diff --git a/resources/views/components/transactions/show/more-buttons.blade.php b/resources/views/components/transactions/show/more-buttons.blade.php
index 5a7185f61..31699d0fc 100644
--- a/resources/views/components/transactions/show/more-buttons.blade.php
+++ b/resources/views/components/transactions/show/more-buttons.blade.php
@@ -25,14 +25,16 @@
         @if ($transaction->is_splittable && empty($transaction->document_id) && empty($transaction->recurring) && $transaction->isNotTransferTransaction())
             @if (! $hideButtonConnect)
                 @can($permissionCreate)
+                <div class="w-full flex items-center text-purple px-2 h-9 leading-9 whitespace-nowrap">
                     <button
                         type="button"
                         id="show-more-actions-connect-{{ $transaction->type }}"
-                        class="w-full flex items-center text-purple px-2 h-9 leading-9 whitespace-nowrap"
+                        class="w-full h-full flex items-center rounded-md px-2 text-sm hover:bg-lilac-100"
                         title="{{ trans('general.connect') }}"
                         @click="onConnectTransactions('{{ route('transactions.dial', $transaction->id) }}')">
-                        <span class="w-full h-full flex items-center rounded-md px-2 text-sm hover:bg-lilac-100">{{ trans('general.connect') }}</span>
+                            {{ trans('general.connect') }}
                     </button>
+                </div>
                 @endcan
             @endif
         @endif
diff --git a/resources/views/components/transfers/show/more-buttons.blade.php b/resources/views/components/transfers/show/more-buttons.blade.php
index feb1d6ccb..360588533 100644
--- a/resources/views/components/transfers/show/more-buttons.blade.php
+++ b/resources/views/components/transfers/show/more-buttons.blade.php
@@ -45,11 +45,11 @@
 
     @stack('choose_button_start')
 
-    <button type="button" class="w-full flex items-center text-purple px-2 h-9 leading-9 whitespace-nowrap" @click="onTemplate">
-        <span class="w-full h-full flex items-center rounded-md px-2 text-sm hover:bg-lilac-100">
+    <div class="w-full flex items-center text-purple px-2 h-9 leading-9 whitespace-nowrap">
+        <button type="button" @click="onTemplate" class="w-full h-full flex items-center rounded-md px-2 text-sm hover:bg-lilac-100">
             {{ trans('general.form.choose', ['field' => trans_choice('general.templates', 1)]) }}
-        </span>
-    </button>
+        </button>
+    </div>
 
     @stack('choose_button_end')
 
diff --git a/resources/views/components/widgets/header.blade.php b/resources/views/components/widgets/header.blade.php
index 94307a5f4..74cae8c1c 100644
--- a/resources/views/components/widgets/header.blade.php
+++ b/resources/views/components/widgets/header.blade.php
@@ -22,18 +22,18 @@
                 </x-slot>
 
                 @can('update-common-widgets')
-                <x-button
-                    type="button"
-                    id="show-more-actions-edit-widget-{{ $class->model->id }}"
-                    class="w-full flex items-center text-purple px-2 h-9 leading-9 whitespace-nowrap"
-                    override="class"
-                    title="{{ trans('general.edit') }}"
-                    @click="onEditWidget('{{ $class->model->id }}')"
-                >
-                    <span class="w-full h-full flex items-center rounded-md px-2 text-sm hover:bg-lilac-100">
+                <div class="w-full flex items-center text-purple px-2 h-9 leading-9 whitespace-nowrap">
+                    <x-button
+                        type="button"
+                        id="show-more-actions-edit-widget-{{ $class->model->id }}"
+                        class="w-full h-full flex items-center rounded-md px-2 text-sm hover:bg-lilac-100"
+                        override="class"
+                        title="{{ trans('general.edit') }}"
+                        @click="onEditWidget('{{ $class->model->id }}')"
+                    >
                         {{ trans('general.edit') }}
-                    </span>
-                </x-button>
+                    </x-button>
+                </div>
                 @endcan
 
                 @can('delete-common-widgets')