diff --git a/frontend/src/components/CustomActions.vue b/frontend/src/components/CustomActions.vue
index a28c2385..68cfa545 100644
--- a/frontend/src/components/CustomActions.vue
+++ b/frontend/src/components/CustomActions.vue
@@ -9,11 +9,7 @@
     </template>
   </Button>
   <Dropdown v-if="groupedActions.length" :options="groupedActions">
-    <Button>
-      <template #icon>
-        <FeatherIcon name="more-horizontal" class="h-4 w-4" />
-      </template>
-    </Button>
+    <Button icon="more-horizontal" />
   </Dropdown>
 </template>
 
diff --git a/frontend/src/components/ListViews/CallLogsListView.vue b/frontend/src/components/ListViews/CallLogsListView.vue
index b8302a50..d4381818 100644
--- a/frontend/src/components/ListViews/CallLogsListView.vue
+++ b/frontend/src/components/ListViews/CallLogsListView.vue
@@ -81,11 +81,7 @@
     <ListSelectBanner>
       <template #actions="{ selections, unselectAll }">
         <Dropdown :options="bulkActions(selections, unselectAll)">
-          <Button variant="ghost">
-            <template #icon>
-              <FeatherIcon name="more-horizontal" class="h-4 w-4" />
-            </template>
-          </Button>
+          <Button icon="more-horizontal" variant="ghost" />
         </Dropdown>
       </template>
     </ListSelectBanner>
diff --git a/frontend/src/components/ListViews/ContactsListView.vue b/frontend/src/components/ListViews/ContactsListView.vue
index 4e5d33f5..e4fdda12 100644
--- a/frontend/src/components/ListViews/ContactsListView.vue
+++ b/frontend/src/components/ListViews/ContactsListView.vue
@@ -83,11 +83,7 @@
     <ListSelectBanner>
       <template #actions="{ selections, unselectAll }">
         <Dropdown :options="bulkActions(selections, unselectAll)">
-          <Button variant="ghost">
-            <template #icon>
-              <FeatherIcon name="more-horizontal" class="h-4 w-4" />
-            </template>
-          </Button>
+          <Button icon="more-horizontal" variant="ghost" />
         </Dropdown>
       </template>
     </ListSelectBanner>
diff --git a/frontend/src/components/ListViews/DealsListView.vue b/frontend/src/components/ListViews/DealsListView.vue
index 73d421ec..40a0c934 100644
--- a/frontend/src/components/ListViews/DealsListView.vue
+++ b/frontend/src/components/ListViews/DealsListView.vue
@@ -115,11 +115,7 @@
     <ListSelectBanner>
       <template #actions="{ selections, unselectAll }">
         <Dropdown :options="bulkActions(selections, unselectAll)">
-          <Button variant="ghost">
-            <template #icon>
-              <FeatherIcon name="more-horizontal" class="h-4 w-4" />
-            </template>
-          </Button>
+          <Button icon="more-horizontal" variant="ghost" />
         </Dropdown>
       </template>
     </ListSelectBanner>
@@ -219,7 +215,9 @@ function editValues(selections, unselectAll) {
 function deleteValues(selections, unselectAll) {
   $dialog({
     title: __('Delete'),
-    message: __('Are you sure you want to delete {0} item(s)?', [selections.size]),
+    message: __('Are you sure you want to delete {0} item(s)?', [
+      selections.size,
+    ]),
     variant: 'danger',
     actions: [
       {
diff --git a/frontend/src/components/ListViews/EmailTemplatesListView.vue b/frontend/src/components/ListViews/EmailTemplatesListView.vue
index c965d37b..1a35aa6d 100644
--- a/frontend/src/components/ListViews/EmailTemplatesListView.vue
+++ b/frontend/src/components/ListViews/EmailTemplatesListView.vue
@@ -70,11 +70,7 @@
     <ListSelectBanner>
       <template #actions="{ selections, unselectAll }">
         <Dropdown :options="bulkActions(selections, unselectAll)">
-          <Button variant="ghost">
-            <template #icon>
-              <FeatherIcon name="more-horizontal" class="h-4 w-4" />
-            </template>
-          </Button>
+          <Button icon="more-horizontal" variant="ghost" />
         </Dropdown>
       </template>
     </ListSelectBanner>
diff --git a/frontend/src/components/ListViews/LeadsListView.vue b/frontend/src/components/ListViews/LeadsListView.vue
index 229e50ae..a7a0a005 100644
--- a/frontend/src/components/ListViews/LeadsListView.vue
+++ b/frontend/src/components/ListViews/LeadsListView.vue
@@ -124,11 +124,7 @@
     <ListSelectBanner>
       <template #actions="{ selections, unselectAll }">
         <Dropdown :options="bulkActions(selections, unselectAll)">
-          <Button variant="ghost">
-            <template #icon>
-              <FeatherIcon name="more-horizontal" class="h-4 w-4" />
-            </template>
-          </Button>
+          <Button icon="more-horizontal" variant="ghost" />
         </Dropdown>
       </template>
     </ListSelectBanner>
diff --git a/frontend/src/components/ListViews/OrganizationsListView.vue b/frontend/src/components/ListViews/OrganizationsListView.vue
index 2e23e05e..e3ed5b99 100644
--- a/frontend/src/components/ListViews/OrganizationsListView.vue
+++ b/frontend/src/components/ListViews/OrganizationsListView.vue
@@ -70,11 +70,7 @@
     <ListSelectBanner>
       <template #actions="{ selections, unselectAll }">
         <Dropdown :options="bulkActions(selections, unselectAll)">
-          <Button variant="ghost">
-            <template #icon>
-              <FeatherIcon name="more-horizontal" class="h-4 w-4" />
-            </template>
-          </Button>
+          <Button icon="more-horizontal" variant="ghost" />
         </Dropdown>
       </template>
     </ListSelectBanner>
diff --git a/frontend/src/components/ListViews/TasksListView.vue b/frontend/src/components/ListViews/TasksListView.vue
index 3152c9f2..43a945aa 100644
--- a/frontend/src/components/ListViews/TasksListView.vue
+++ b/frontend/src/components/ListViews/TasksListView.vue
@@ -83,11 +83,7 @@
     <ListSelectBanner>
       <template #actions="{ selections, unselectAll }">
         <Dropdown :options="bulkActions(selections, unselectAll)">
-          <Button variant="ghost">
-            <template #icon>
-              <FeatherIcon name="more-horizontal" class="h-4 w-4" />
-            </template>
-          </Button>
+          <Button icon="more-horizontal" variant="ghost" />
         </Dropdown>
       </template>
     </ListSelectBanner>
diff --git a/frontend/src/components/ViewControls.vue b/frontend/src/components/ViewControls.vue
index 7ad4b9e6..f83c1b39 100644
--- a/frontend/src/components/ViewControls.vue
+++ b/frontend/src/components/ViewControls.vue
@@ -18,11 +18,7 @@
       </Dropdown>
       <Dropdown :options="viewActions">
         <template #default>
-          <Button>
-            <template #icon>
-              <FeatherIcon name="more-horizontal" class="h-4 w-4" />
-            </template>
-          </Button>
+          <Button icon="more-horizontal" />
         </template>
       </Dropdown>
     </div>
@@ -71,11 +67,7 @@
           ]"
         >
           <template #default>
-            <Button>
-              <template #icon>
-                <FeatherIcon name="more-horizontal" class="h-4 w-4" />
-              </template>
-            </Button>
+            <Button icon="more-horizontal" />
           </template>
         </Dropdown>
       </div>
diff --git a/frontend/src/pages/Deal.vue b/frontend/src/pages/Deal.vue
index f4b72bf2..9d3c5df5 100644
--- a/frontend/src/pages/Deal.vue
+++ b/frontend/src/pages/Deal.vue
@@ -199,12 +199,11 @@
                           </div>
                           <div class="flex items-center">
                             <Dropdown :options="contactOptions(contact.name)">
-                              <Button variant="ghost">
-                                <FeatherIcon
-                                  name="more-horizontal"
-                                  class="h-4 text-gray-600"
-                                />
-                              </Button>
+                              <Button
+                                icon="more-horizontal"
+                                class="text-gray-600"
+                                variant="ghost"
+                              />
                             </Dropdown>
                             <Button
                               variant="ghost"