diff --git a/frontend/src/components/common/IconButton.vue b/frontend/src/components/common/IconButton.vue
index 81df265..79d4ba7 100644
--- a/frontend/src/components/common/IconButton.vue
+++ b/frontend/src/components/common/IconButton.vue
@@ -20,6 +20,7 @@ const props = defineProps({
         type: [Number, String],
         default: 3,
     },
+    loading: Boolean,
     border: Boolean,
     disabled: Boolean,
 })
@@ -30,20 +31,35 @@ const hasTooltip = computed(() => {
 </script>
 
 <template>
-    <n-tooltip v-if="hasTooltip">
+    <n-tooltip v-if="hasTooltip" :show-arrow="false">
         <template #trigger>
-            <n-button :disabled="disabled" :text="!border" :focusable="false" @click.prevent="emit('click')">
-                <n-icon :color="props.color" :size="props.size">
-                    <component :is="props.icon" :stroke-width="props.strokeWidth" />
-                </n-icon>
+            <n-button
+                :disabled="disabled"
+                :focusable="false"
+                :loading="loading"
+                :text="!border"
+                @click.prevent="emit('click')">
+                <template #icon>
+                    <n-icon :color="props.color" :size="props.size">
+                        <component :is="props.icon" :stroke-width="props.strokeWidth" />
+                    </n-icon>
+                </template>
             </n-button>
         </template>
         {{ props.tTooltip ? $t(props.tTooltip) : props.tooltip }}
     </n-tooltip>
-    <n-button v-else :disabled="disabled" :text="!border" :focusable="false" @click.prevent="emit('click')">
-        <n-icon :color="props.color" :size="props.size">
-            <component :is="props.icon" :stroke-width="props.strokeWidth" />
-        </n-icon>
+    <n-button
+        v-else
+        :disabled="disabled"
+        :focusable="false"
+        :loading="loading"
+        :text="!border"
+        @click.prevent="emit('click')">
+        <template #icon>
+            <n-icon :color="props.color" :size="props.size">
+                <component :is="props.icon" :stroke-width="props.strokeWidth" />
+            </n-icon>
+        </template>
     </n-button>
 </template>