diff --git a/src/components/NcAvatar/NcAvatar.vue b/src/components/NcAvatar/NcAvatar.vue
index 580c2d1a48..f3112c224c 100644
--- a/src/components/NcAvatar/NcAvatar.vue
+++ b/src/components/NcAvatar/NcAvatar.vue
@@ -765,8 +765,9 @@ export default {
 				min-width: var(--size);
 			}
 		}
-		& > :deep(.button-vue) {
-			--button-radius: calc(var(--button-size) / 2);
+		& > :deep(.button-vue),
+		& > :deep(.action-item .button-vue) {
+			--button-radius: calc(var(--size) / 2);
 		}
 	}
 
@@ -775,7 +776,7 @@ export default {
 		height: var(--size);
 		width: var(--size);
 		background-color: var(--color-main-background);
-		border-radius: 50%;
+		border-radius: calc(var(--size) / 2);
 
 		.avatardiv__initials {
 			position: absolute;
@@ -844,7 +845,7 @@ export default {
 
 .avatar-class-icon {
 	display: block;
-	border-radius: 50%;
+	border-radius: calc(var(--size) / 2);
 	background-color: var(--color-background-darker);
 	height: 100%;
 }