diff --git a/src/components/AppNavigation/Settings/SettingsImportContacts.vue b/src/components/AppNavigation/Settings/SettingsImportContacts.vue
index e69934ec1..26ca8b052 100644
--- a/src/components/AppNavigation/Settings/SettingsImportContacts.vue
+++ b/src/components/AppNavigation/Settings/SettingsImportContacts.vue
@@ -29,6 +29,7 @@
 						:options="options"
 						:disabled="isSingleAddressbook || isImporting"
 						:placeholder="t('contacts', 'Contacts')"
+						:aria-label-combobox="t('contacts', 'Pick an address book')"
 						label="displayName"
 						class="import-contact__modal-addressbook__select">
 						<template #selected-option="{ displayName }">
diff --git a/src/components/AppNavigation/Settings/SettingsNewAddressbook.vue b/src/components/AppNavigation/Settings/SettingsNewAddressbook.vue
index 205afd2db..6965fe788 100644
--- a/src/components/AppNavigation/Settings/SettingsNewAddressbook.vue
+++ b/src/components/AppNavigation/Settings/SettingsNewAddressbook.vue
@@ -13,34 +13,28 @@
 		</NcButton>
 		<IconLoading v-if="loading" :size="20" />
 
-		<NcModal v-if="modalOpen" size="small" @close="onModalCancel">
-			<div class="new-addressbook-modal">
-				<NcInputField
-					v-model:model-value="displayName"
-					class="new-addressbook"
-					:disabled="loading"
-					:label="t('contacts', 'Add new address book')"
-					type="text"
-					autocomplete="off"
-					autocorrect="off"
-					spellcheck="false" />
-
-				<div class="new-addressbook-modal__buttons">
-					<NcButton variant="tertiary" :disabled="loading" @click="onModalCancel">
-						{{ t('contacts', 'Cancel') }}
-					</NcButton>
-					<NcButton variant="primary" :disabled="loading || inputErrorState" @click="onModalSubmit">
-						{{ t('contacts', 'Add') }}
-					</NcButton>
-				</div>
-			</div>
-		</NcModal>
+		<NcDialog
+			v-if="modalOpen"
+			size="small"
+			:name="t('contacts', 'Add new address book')"
+			:buttons="buttons"
+			@close="onModalCancel">
+			<NcInputField
+				v-model:model-value="displayName"
+				class="new-addressbook"
+				:disabled="loading"
+				:label="t('contacts', 'Name of new address book')"
+				type="text"
+				autocomplete="off"
+				autocorrect="off"
+				spellcheck="false" />
+		</NcDialog>
 	</div>
 </template>
 
 <script>
 import { showError } from '@nextcloud/dialogs'
-import { NcButton, NcInputField, NcModal } from '@nextcloud/vue'
+import { NcButton, NcDialog, NcInputField } from '@nextcloud/vue'
 import IconLoading from 'vue-material-design-icons/Loading.vue'
 import IconAdd from 'vue-material-design-icons/Plus.vue'
 import logger from '../../../services/logger.js'
@@ -52,7 +46,7 @@ export default {
 		IconAdd,
 		IconLoading,
 		NcButton,
-		NcModal,
+		NcDialog,
 	},
 
 	props: {
@@ -71,6 +65,23 @@ export default {
 	},
 
 	computed: {
+		buttons() {
+			return [
+				{
+					variant: 'tertiary',
+					disabled: this.loading,
+					callback: this.onModalCancel,
+					label: t('contacts', 'Cancel'),
+				},
+				{
+					variant: 'primary',
+					disabled: this.loading || this.inputErrorState,
+					callback: this.onModalSubmit,
+					label: t('contacts', 'Add'),
+				},
+			]
+		},
+
 		inputErrorState() {
 			if (this.displayName === '') {
 				return false
@@ -100,52 +111,24 @@ export default {
 		/**
 		 * Add a new address book
 		 */
-		addAddressbook() {
+		async addAddressbook() {
 			if (this.displayName === '') {
 				return
 			}
 
 			this.loading = true
-			this.$store.dispatch('appendAddressbook', { displayName: this.displayName })
+
+			await this.$store.dispatch('appendAddressbook', { displayName: this.displayName })
 				.then(() => {
 					this.displayName = ''
-					this.loading = false
 				})
 				.catch((error) => {
 					logger.error(error)
 					showError(t('contacts', 'An error occurred, unable to create the address book'))
-					this.loading = false
 				})
+
+			this.loading = false
 		},
 	},
 }
 </script>
-
-<style lang="scss" scoped>
-
-.new-addressbook-entry {
-	display: flex;
-	width: 100%;
-	justify-content: stretch;
-	margin-top: calc(var(--default-grid-baseline) * 2);
-
-	> * {
-		flex-grow: 1;
-	}
-}
-
-.new-addressbook-modal {
-	padding: calc(var(--default-grid-baseline) * 4);
-	padding-top: calc(var(--default-grid-baseline) * 8);
-	> * {
-		width: 100%;
-	}
-
-	&__buttons {
-		display: flex;
-		justify-content: end;
-		gap: calc(var(--default-grid-baseline) * 2);
-		margin-top: calc(var(--default-grid-baseline) * 2);
-	}
-}
-</style>
diff --git a/src/components/AppNavigation/Settings/SettingsSortContacts.vue b/src/components/AppNavigation/Settings/SettingsSortContacts.vue
index 097bb4c15..0a26196df 100644
--- a/src/components/AppNavigation/Settings/SettingsSortContacts.vue
+++ b/src/components/AppNavigation/Settings/SettingsSortContacts.vue
@@ -5,19 +5,15 @@
 
 <template>
 	<NcFormBox>
-		<div class="sort-contacts">
-			<label for="sort-by" class="sort-contacts__label">
-				{{ t('contacts', 'Sort contacts by') }}
-			</label>
-			<NcSelect
-				id="sort-by"
-				v-model="selected"
-				:searchable="false"
-				:allow-empty="false"
-				:options="options"
-				label="label"
-				@update:model-value="sortContacts" />
-		</div>
+		<NcSelect
+			id="sort-by"
+			v-model="selected"
+			:searchable="false"
+			:allow-empty="false"
+			:options="options"
+			:input-label="t('contacts', 'Sort contacts by')"
+			label="label"
+			@update:model-value="sortContacts" />
 	</NcFormBox>
 </template>
 
@@ -84,11 +80,3 @@ export default {
 	},
 }
 </script>
-
-<style lang="scss" scoped>
-.sort-contacts {
-	display: flex;
-	flex-direction: column;
-	gap: calc(var(--default-grid-baseline) * 2);
-}
-</style>
diff --git a/src/components/Properties/PropertyGroups.vue b/src/components/Properties/PropertyGroups.vue
index 810c9ec29..1e2080f1a 100644
--- a/src/components/Properties/PropertyGroups.vue
+++ b/src/components/Properties/PropertyGroups.vue
@@ -23,6 +23,7 @@
 					:options="groups"
 					:no-wrap="true"
 					:placeholder="t('contacts', 'Add contact in group')"
+					:aria-label-combobox="t('contacts', 'Add contact in group')"
 					:multiple="true"
 					:keep-open="true"
 					:clearable="true"
diff --git a/src/components/Properties/PropertyMultipleText.vue b/src/components/Properties/PropertyMultipleText.vue
index 93d110877..906c3f8b9 100644
--- a/src/components/Properties/PropertyMultipleText.vue
+++ b/src/components/Properties/PropertyMultipleText.vue
@@ -38,6 +38,7 @@
 					v-model="localType"
 					:options="options"
 					:placeholder="t('contacts', 'Select type')"
+					:aria-label-combobox="t('contacts', 'Select type')"
 					:taggable="true"
 					tag-placeholder="create"
 					label="name"
diff --git a/src/components/Properties/PropertySelect.vue b/src/components/Properties/PropertySelect.vue
index 2d111cfd4..deb01bbd2 100644
--- a/src/components/Properties/PropertySelect.vue
+++ b/src/components/Properties/PropertySelect.vue
@@ -35,6 +35,7 @@
 					:options="selectableOptions"
 					:no-wrap="true"
 					:placeholder="t('contacts', 'Select option')"
+					:aria-label-combobox="t('contacts', 'Select option')"
 					:disabled="isSingleOption || isReadOnly"
 					label="name"
 					@update:model-value="updateValue" />
diff --git a/src/components/Properties/PropertyText.vue b/src/components/Properties/PropertyText.vue
index f183c4a40..c40639268 100644
--- a/src/components/Properties/PropertyText.vue
+++ b/src/components/Properties/PropertyText.vue
@@ -28,6 +28,7 @@
 					v-model="localType"
 					:options="options"
 					:placeholder="t('contacts', 'Select type')"
+					:aria-label-combobox="t('contacts', 'Select type')"
 					:taggable="true"
 					tag-placeholder="create"
 					:disabled="isReadOnly"