diff --git a/api/js/etemplate/Et2Avatar/Et2Avatar.ts b/api/js/etemplate/Et2Avatar/Et2Avatar.ts
index ef4bee7bc3..1cd4504326 100644
--- a/api/js/etemplate/Et2Avatar/Et2Avatar.ts
+++ b/api/js/etemplate/Et2Avatar/Et2Avatar.ts
@@ -101,7 +101,7 @@ export class Et2Avatar extends Et2Widget(SlotMixin(SlAvatar)) implements et2_IDe
 		this.crop = false;
 		this.size = "2.7em";
 		this.icon = "";
-		this.shape = "rounded";
+		this.shape = this.shape || "rounded";
 	}
 
 	/**
diff --git a/api/js/etemplate/Et2Avatar/Et2AvatarGroup.ts b/api/js/etemplate/Et2Avatar/Et2AvatarGroup.ts
index 932ee955c6..9a594703f6 100644
--- a/api/js/etemplate/Et2Avatar/Et2AvatarGroup.ts
+++ b/api/js/etemplate/Et2Avatar/Et2AvatarGroup.ts
@@ -17,27 +17,28 @@ export class Et2AvatarGroup extends Et2Widget(LitElement)
 			css`
 			:host {
 				display: flex;
+				flex-direction: row;
+				justify-content: flex-end;
+			}
+			et2-avatar {
+				--size: 1.5rem;
+				flex: 0 0 auto;
+				min-width: 20px;
+				transition-duration:0.1s;
+			}
+			et2-avatar:not(:first-of-type) {
+				margin-left: -0.5rem;
+			}
+			et2-avatar::part(base) {
+				border: solid 2px var(--sl-color-neutral-0);
+			}
+			et2-avatar:hover {
+				--size: 2.5rem;
+				overflow: visible;
+				z-index: 11;
+				transition-delay: 1s;
+				transition-suration:0.5s
 			}
-				et2-avatar {
-					--size: 1.5rem;
-					flex: 0 0 auto;
-					min-width: 20px;
-					transition-delay: 0s;
-					transition-duration:0.1s;
-				}
-				et2-avatar:not(:first-of-type) {
-					margin-left: -1rem;
-				}
-				et2-avatar::part(base) {
-					border: solid 2px var(--sl-color-neutral-0);
-				}
-				et2-avatar:hover {
-					--size: 2.5rem;
-					overflow: visible;
-					z-index: 11;
-					transition-delay: 1s;
-					transition-suration:0.5s
-				}
 			`
 		];
 	}
@@ -81,7 +82,7 @@ export class Et2AvatarGroup extends Et2Widget(LitElement)
                     .contactId="${contact.id}"
                     .label="${contact.label}"
                     .title="${contact.label}"
-                    ${this.shape ? html`shape="${this.shape}"` : ''}
+                    ${this.shape ? html`.shape="${this.shape}"` : ''}
                     size=""
             ></et2-avatar>`;
 	}