diff --git a/package-lock.json b/package-lock.json
index 26bea194a2..d943f86cb5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,6 +9,7 @@
       "version": "8.3.11",
       "license": "AGPL-3.0",
       "dependencies": {
+        "@mdi/js": "^7.4.47",
         "@nextcloud/auth": "^2.5.1",
         "@nextcloud/axios": "^2.5.0",
         "@nextcloud/dialogs": "^7.0.0-rc.1",
diff --git a/package.json b/package.json
index 41b9f75aa3..dce9013b27 100644
--- a/package.json
+++ b/package.json
@@ -31,6 +31,7 @@
     "extends @nextcloud/browserslist-config"
   ],
   "dependencies": {
+    "@mdi/js": "^7.4.47",
     "@nextcloud/auth": "^2.5.1",
     "@nextcloud/axios": "^2.5.0",
     "@nextcloud/dialogs": "^7.0.0-rc.1",
diff --git a/src/components/User/UserItem.vue b/src/components/User/UserItem.vue
index 481b1e38ba..c95054c5c6 100644
--- a/src/components/User/UserItem.vue
+++ b/src/components/User/UserItem.vue
@@ -15,9 +15,9 @@ import LinkIcon from 'vue-material-design-icons/LinkVariant.vue'
 import ContactIcon from 'vue-material-design-icons/CardAccountDetails.vue'
 import EmailIcon from 'vue-material-design-icons/Email.vue'
 import ShareIcon from 'vue-material-design-icons/ShareVariant.vue'
-import ContactGroupIcon from 'vue-material-design-icons/AccountGroupOutline.vue'
+import ContactGroupIcon from 'vue-material-design-icons/AccountMultipleOutline.vue'
 import GroupIcon from 'vue-material-design-icons/AccountMultiple.vue'
-import CircleIcon from 'vue-material-design-icons/GoogleCirclesExtended.vue'
+import CircleIcon from 'vue-material-design-icons/AccountGroup.vue'
 import DeletedUserIcon from 'vue-material-design-icons/AccountOff.vue'
 import AnoymousIcon from 'vue-material-design-icons/Incognito.vue'
 import PollGroupIcon from 'vue-material-design-icons/CodeBraces.vue'
diff --git a/src/components/User/UserSearch.vue b/src/components/User/UserSearch.vue
index eb87ba7a06..12ca542de4 100644
--- a/src/components/User/UserSearch.vue
+++ b/src/components/User/UserSearch.vue
@@ -4,15 +4,24 @@
 -->
 
 <script setup lang="ts">
-import { ref } from 'vue'
+import { computed, ref } from 'vue'
 import debounce from 'lodash/debounce'
 import { t } from '@nextcloud/l10n'
+import {
+	mdiAccount,
+	mdiAccountGroup,
+	mdiAccountMultiple,
+	mdiAccountMultipleOutline,
+	mdiCardAccountDetails,
+	mdiEmail,
+	mdiShareVariant,
+} from '@mdi/js'
 
 import NcSelectUsers from '@nextcloud/vue/components/NcSelectUsers'
 
 import { AppSettingsAPI } from '../../Api'
 import { Logger } from '../../helpers'
-import { ISearchType, User } from '../../Types'
+import { ISearchType, User, UserType } from '../../Types'
 import type { AxiosError } from '@nextcloud/axios'
 
 interface Props {
@@ -36,6 +45,72 @@ const {
 const users = ref<User[]>([])
 const isLoading = ref(false)
 
+// Same icons as core (`icon-user`, `icon-teams`), calendar and contacts:
+// account = Account, group = AccountMultiple, team = AccountGroup,
+// contact group = AccountMultipleOutline
+const typeDecoration: Partial<Record<UserType, { path: string; name: string }>> = {
+	user: { path: mdiAccount, name: t('polls', 'Account') },
+	admin: { path: mdiAccount, name: t('polls', 'Account') },
+	group: { path: mdiAccountMultiple, name: t('polls', 'Group') },
+	contactGroup: {
+		path: mdiAccountMultipleOutline,
+		name: t('polls', 'Contact group'),
+	},
+	circle: { path: mdiAccountGroup, name: t('polls', 'Team') },
+	contact: { path: mdiCardAccountDetails, name: t('polls', 'Contact') },
+	email: { path: mdiEmail, name: t('polls', 'Email') },
+	external: { path: mdiShareVariant, name: t('polls', 'External') },
+}
+
+type UserOption = {
+	id: string
+	displayName: string
+	user?: string
+	isNoUser: boolean
+	subname: string
+	iconSvg?: string
+	iconName?: string
+	source: User
+}
+
+/**
+ * Shape a search result for NcSelectUsers/NcListItemIcon like files_sharing does:
+ * real avatar for accounts, a subname and a trailing type icon for every type,
+ * so accounts without an avatar picture are not mistaken for initials-only entries.
+ *
+ * @param user search result
+ */
+function toOption(user: User): UserOption {
+	const decoration = typeDecoration[user.type]
+	const isAccount = user.type === 'user' || user.type === 'admin'
+	return {
+		// groups and accounts may share the same id
+		id: `${user.type}:${user.id}`,
+		displayName: user.displayName,
+		user: isAccount ? user.id : undefined,
+		isNoUser: !isAccount,
+		subname:
+			user.emailAddress && user.emailAddress !== user.displayName
+				? user.emailAddress
+				: (decoration?.name ?? ''),
+		iconSvg: decoration
+			? `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="${decoration.path}"/></svg>`
+			: undefined,
+		iconName: decoration?.name,
+		source: user,
+	}
+}
+
+const options = computed(() => users.value.map(toOption))
+
+// consumers get the untouched search result, the option is for display only
+const selected = computed({
+	get: () => (model.value ? toOption(model.value) : undefined),
+	set: (option: UserOption | undefined) => {
+		model.value = option?.source
+	},
+})
+
 const loadUsersAsync = debounce(async function (query: string) {
 	if (!query) {
 		users.value = []
@@ -57,8 +132,8 @@ const loadUsersAsync = debounce(async function (query: string) {
 	}
 }, 250)
 
-async function optionSelected(user: User) {
-	emit('userSelected', user)
+function optionSelected(option: UserOption) {
+	emit('userSelected', option.source)
 }
 
 const selectProps = {
@@ -79,9 +154,9 @@ const selectProps = {
 <template>
 	<NcSelectUsers
 		id="ajax"
-		v-model="model"
+		v-model="selected"
 		v-bind="selectProps"
-		:options="users"
+		:options="options"
 		@option:selected="optionSelected"
 		@search="loadUsersAsync">
 		<template #selection="{ values, isOpen }">