diff --git a/frontend/components/task/TaskCard.vue b/frontend/components/task/TaskCard.vue
index 0476ffc..0a5f57b 100644
--- a/frontend/components/task/TaskCard.vue
+++ b/frontend/components/task/TaskCard.vue
@@ -78,11 +78,17 @@
                 class="text-blue-500"
                 size="14"
             />
+            <Icon
+                v-if="task.collaborators?.length"
+                name="mdi:account-group"
+                class="ml-auto h-4 w-4 text-neutral-400"
+                :title="task.collaborators.map(c => c.username).join(', ')"
+            />
             <UserAvatar
                 v-if="task.assignee"
                 :user="task.assignee"
                 size="xs"
-                class="ml-auto"
+                :class="task.collaborators?.length ? '' : 'ml-auto'"
             />
             <span
                 v-else
diff --git a/frontend/components/task/TaskListItem.vue b/frontend/components/task/TaskListItem.vue
index 945b505..e2f5d5f 100644
--- a/frontend/components/task/TaskListItem.vue
+++ b/frontend/components/task/TaskListItem.vue
@@ -86,17 +86,25 @@
                 :button-class="isTimerOnTask ? 'shrink-0 text-[#F18619] hover:text-[#d97314]' : 'shrink-0 text-neutral-400 hover:text-primary-500'"
                 @click.stop="isTimerOnTask ? timerStore.stop() : timerStore.startFromTask(task)"
             />
-            <UserAvatar
-                v-if="task.assignee"
-                :user="task.assignee"
-                size="xs"
-            />
-            <span
-                v-else
-                class="flex h-5 w-5 items-center justify-center rounded-full bg-neutral-200 text-neutral-400"
-            >
-                <Icon name="mdi:account-outline" size="14" />
-            </span>
+            <div class="flex items-center gap-1">
+                <Icon
+                    v-if="task.collaborators?.length"
+                    name="mdi:account-group"
+                    class="h-4 w-4 text-neutral-400"
+                    :title="task.collaborators.map(c => c.username).join(', ')"
+                />
+                <UserAvatar
+                    v-if="task.assignee"
+                    :user="task.assignee"
+                    size="xs"
+                />
+                <span
+                    v-else
+                    class="flex h-5 w-5 items-center justify-center rounded-full bg-neutral-200 text-neutral-400"
+                >
+                    <Icon name="mdi:account-outline" size="14" />
+                </span>
+            </div>
         </div>
     </div>
 </template>