diff --git a/src/components/Properties/PropertyDateTime.vue b/src/components/Properties/PropertyDateTime.vue
index 0f70cd7e4..8e2597e37 100644
--- a/src/components/Properties/PropertyDateTime.vue
+++ b/src/components/Properties/PropertyDateTime.vue
@@ -4,7 +4,7 @@
 -->
 
 <template>
-	<div v-if="propModel" class="property">
+	<div v-if="propModel" class="property" role="group">
 		<!-- title if first element -->
 		<PropertyTitle v-if="isFirstProperty && propModel.icon"
 			:property="property"
@@ -14,8 +14,8 @@
 			:icon="propModel.icon"
 			:readable-name="propModel.readableName" />
 
-		<div class="property__row">
-			<div class="property__label">
+		<div class="property__row" role="rowgroup">
+			<div class="property__label" role="rowheader">
 				<!-- type selector -->
 				<NcSelect v-if="propModel.options"
 					v-model="localType"
@@ -38,7 +38,7 @@
 				</span>
 			</div>
 
-			<div class="property__value">
+			<div class="property__value" role="cell">
 				<!-- Real input where the picker shows -->
 				<DateTimePicker v-if="!isReadOnly"
 					:value="vcardTimeLocalValue.toJSDate()"
@@ -57,7 +57,7 @@
 			</div>
 
 			<!-- props actions -->
-			<div class="property__actions">
+			<div class="property__actions" role="cell">
 				<PropertyActions v-if="!isReadOnly"
 					:actions="actions"
 					:property-component="this"
diff --git a/src/components/Properties/PropertyGroups.vue b/src/components/Properties/PropertyGroups.vue
index 1f36c07d4..2515d3e0e 100644
--- a/src/components/Properties/PropertyGroups.vue
+++ b/src/components/Properties/PropertyGroups.vue
@@ -4,18 +4,18 @@
 -->
 
 <template>
-	<div v-if="propModel && showProperty" class="property">
+	<div v-if="propModel && showProperty" class="property" role="group">
 		<PropertyTitle icon="icon-contacts-dark"
 			:readable-name="t('contacts', 'Contact groups')"
 			:is-read-only="isReadOnly" />
 
-		<div class="property__row">
+		<div class="property__row" role="rowgroup">
 			<div class="property__label">
 				<span>{{ propModel.readableName }}</span>
 			</div>
 
 			<!-- multiselect taggable groups -->
-			<div class="property__value">
+			<div class="property__value" role="cell">
 				<NcSelect v-if="!isReadOnly"
 					v-model="localValue"
 					:options="groups"
diff --git a/src/components/Properties/PropertyMultipleText.vue b/src/components/Properties/PropertyMultipleText.vue
index 9dc9db52c..2963cac3a 100644
--- a/src/components/Properties/PropertyMultipleText.vue
+++ b/src/components/Properties/PropertyMultipleText.vue
@@ -4,7 +4,7 @@
 -->
 
 <template>
-	<div v-if="propModel" class="property property--multiple-text">
+	<div v-if="propModel" class="property property--multiple-text" role="group">
 		<!-- title if first element -->
 		<PropertyTitle v-if="isFirstProperty && propModel.icon"
 			:property="property"
@@ -23,8 +23,8 @@
 			</template>
 		</PropertyTitle>
 
-		<div v-if="showActionsInFirstRow" class="property__row">
-			<div class="property__label">
+		<div v-if="showActionsInFirstRow" class="property__row" role="rowgroup">
+			<div class="property__label" role="rowheader">
 				<!-- read-only type because NcMultiselect can't be styled properly -->
 				<span v-if="isReadOnly && propModel.options">
 					{{ (localType && localType.name) || '' }}
@@ -54,7 +54,7 @@
 				</span>
 			</div>
 
-			<div class="property__value">
+			<div class="property__value" role="cell">
 				<!-- show the first input if not a structured value -->
 				<input v-if="!property.isStructuredValue"
 					v-model.trim="localValue[0]"
@@ -64,7 +64,7 @@
 			</div>
 
 			<!-- props actions -->
-			<div class="property__actions">
+			<div class="property__actions" role="cell">
 				<PropertyActions v-if="showActionsInFirstRow && !isReadOnly"
 					:actions="actions"
 					:property-component="this"
@@ -76,12 +76,12 @@
 		<template v-if="propModel.displayOrder && propModel.readableValues">
 			<div v-for="index in propModel.displayOrder"
 				:key="index"
-				class="property__row">
+				class="property__row" role="rowgroup">
 				<template v-if="(isReadOnly && localValue[index]) || !isReadOnly">
-					<div class="property__label">
+					<div class="property__label" role="rowheader">
 						<span>{{ propModel.readableValues[index] }}</span>
 					</div>
-					<div class="property__value">
+					<div class="property__value" role="cell">
 						<NcTextField :value.sync="localValue[index]"
 							:readonly="isReadOnly"
 							type="text"
@@ -98,10 +98,10 @@
 		<template v-else>
 			<div v-for="(value, index) in filteredValue"
 				:key="index"
-				class="property__row">
+				class="property__row" rolw="rowgroup">
 				<template v-if="(isReadOnly && filteredValue[index]) || !isReadOnly">
 					<div class="property__label" />
-					<div class="property__value">
+					<div class="property__value" role="cell">
 						<NcTextField :value.sync="filteredValue[index]"
 							:readonly="isReadOnly"
 							:label-outside="true"
diff --git a/src/components/Properties/PropertyRev.vue b/src/components/Properties/PropertyRev.vue
index ed8ff7400..469f3f6fe 100644
--- a/src/components/Properties/PropertyRev.vue
+++ b/src/components/Properties/PropertyRev.vue
@@ -4,15 +4,15 @@
 -->
 
 <template>
-	<div class="property property--rev">
-		<div class="property__row">
-			<div class="property__label" />
+	<div class="property property--rev" role="group">
+		<div class="property__row" role="rowgroup">
+			<div class="property__label" role="rowheader" />
 
-			<div class="property__value">
+			<div class="property__value" role="cell">
 				{{ t('contacts', 'Last modified') }} {{ relativeDate }}
 			</div>
 
-			<div class="property__actions" />
+			<div class="property__actions" role="cell" />
 		</div>
 	</div>
 </template>
diff --git a/src/components/Properties/PropertySelect.vue b/src/components/Properties/PropertySelect.vue
index ca8d8235b..d6d72efcd 100644
--- a/src/components/Properties/PropertySelect.vue
+++ b/src/components/Properties/PropertySelect.vue
@@ -4,7 +4,7 @@
 -->
 
 <template>
-	<div v-if="propModel && showProperty && !isSingleOption" class="property">
+	<div v-if="propModel && showProperty && !isSingleOption" class="property" role="group">
 		<!-- title if first element -->
 		<PropertyTitle v-if="isFirstProperty && propModel.icon"
 			:property="property"
@@ -14,8 +14,8 @@
 			:icon="propModel.icon"
 			:readable-name="propModel.readableName" />
 
-		<div class="property__row">
-			<div class="property__label">
+		<div class="property__row" role="rowgroup">
+			<div class="property__label" role="rowheader">
 				<!-- if we do not support any type on our model but one is set anyway -->
 				<span v-if="selectType">
 					{{ selectType.name }}
@@ -27,7 +27,7 @@
 				</span>
 			</div>
 
-			<div class="property__value">
+			<div class="property__value" role="cell">
 				<NcSelect v-if="!isReadOnly"
 					v-model="matchedOptions"
 					:options="selectableOptions"
@@ -43,7 +43,7 @@
 			</div>
 
 			<!-- props actions -->
-			<div class="property__actions">
+			<div class="property__actions" role="cell">
 				<PropertyActions v-if="!isReadOnly && !hideActions"
 					:actions="actions"
 					:property-component="this"
diff --git a/src/components/Properties/PropertyText.vue b/src/components/Properties/PropertyText.vue
index aad78dcbe..2b5c45c0c 100644
--- a/src/components/Properties/PropertyText.vue
+++ b/src/components/Properties/PropertyText.vue
@@ -4,7 +4,7 @@
 -->
 
 <template>
-	<div v-if="propModel && showProperty" class="property">
+	<div v-if="propModel && showProperty" class="property" role="group">
 		<!-- title if first element -->
 		<PropertyTitle v-if="isFirstProperty && propModel.icon"
 			:property="property"
@@ -14,8 +14,8 @@
 			:icon="propModel.icon"
 			:readable-name="propModel.readableName" />
 
-		<div class="property__row">
-			<div class="property__label">
+		<div class="property__row" role="rowgroup">
+			<div class="property__label" role="rowheader">
 				<!-- read-only type -->
 				<span v-if="isReadOnly && propModel.options">
 					{{ (localType && localType.name) || '' }}
@@ -46,7 +46,7 @@
 			</div>
 
 			<!-- textarea for note -->
-			<div class="property__value">
+			<div class="property__value" role="cell">
 				<NcTextArea v-if="propName === 'note'"
 					id="textarea"
 					ref="textarea"
@@ -77,7 +77,7 @@
 			</div>
 
 			<!-- props actions -->
-			<div class="property__actions">
+			<div class="property__actions" role="cell">
 				<PropertyActions v-if="!isReadOnly"
 					:actions="actions"
 					:property-component="this"
diff --git a/src/components/Properties/PropertyTitle.vue b/src/components/Properties/PropertyTitle.vue
index 519e58e13..091128352 100644
--- a/src/components/Properties/PropertyTitle.vue
+++ b/src/components/Properties/PropertyTitle.vue
@@ -4,7 +4,7 @@
 -->
 
 <template>
-	<div class="property property--title">
+	<div class="property property--title" role="heading">
 		<div class="property__label">
 			<PropertyTitleIcon :icon="icon" />
 		</div>