diff --git a/packages/main/src/themes/Avatar.css b/packages/main/src/themes/Avatar.css
index e60691636003..d3fc64adc44c 100644
--- a/packages/main/src/themes/Avatar.css
+++ b/packages/main/src/themes/Avatar.css
@@ -81,6 +81,7 @@
 :host .ui5-avatar-icon {
 	height: 1.5rem;
 	width: 1.5rem;
+	color: inherit;
 }
 
 :host([_size="XS"]) .ui5-avatar-icon,
@@ -172,10 +173,6 @@
 	background-color: var(--ui5-avatar-placeholder);
 }
 
-:host(:not([image])) .ui5-avatar-icon {
-	color: inherit;
-}
-
 :host([image-fit-type="Contain"]) .ui5-avatar-img {
 	background-size: contain;
 }
diff --git a/packages/main/test/pages/AvatarGroup.html b/packages/main/test/pages/AvatarGroup.html
index 90c25afc9680..7ad82c538c36 100644
--- a/packages/main/test/pages/AvatarGroup.html
+++ b/packages/main/test/pages/AvatarGroup.html
@@ -108,35 +108,35 @@ <h5>Business card</h5>
 			</div>
 		</ui5-popover>
 		<ui5-avatar-group type="Individual" avatar-size="XL" id="avatar-group-individual">
-			<ui5-avatar interactive initials="XL" id="avatar-1"></ui5-avatar> 
-			<ui5-avatar interactive initials="XL"></ui5-avatar> 
-			<ui5-avatar interactive initials="XL"></ui5-avatar> 
-			<ui5-avatar interactive initials="XL"></ui5-avatar> 
+			<ui5-avatar interactive icon="home" initials="XL" id="avatar-1"></ui5-avatar> 
 			<ui5-avatar interactive initials="XL"></ui5-avatar> 
 			<ui5-avatar interactive initials="XL"></ui5-avatar> 
 			<ui5-avatar interactive initials="XL"></ui5-avatar> 
 			<ui5-avatar interactive initials="XL"></ui5-avatar> 
 			<ui5-avatar interactive initials="XL"></ui5-avatar> 
+			<ui5-avatar interactive icon="home"></ui5-avatar> 
 			<ui5-avatar interactive initials="XL"></ui5-avatar> 
 			<ui5-avatar interactive initials="XL"></ui5-avatar> 
+			<ui5-avatar interactive icon="home"></ui5-avatar> 
+			<ui5-avatar interactive icon="home"></ui5-avatar> 
 			<ui5-avatar interactive initials="XL"></ui5-avatar> 
 		</ui5-avatar-group>
 		<br>
 		<ui5-avatar-group type="Group" avatar-size="M" id="avatar-group-group">
 			<ui5-avatar initials="M" image="./img/woman_avatar_5.png"></ui5-avatar>
 			<ui5-avatar initials="M"></ui5-avatar>
-			<ui5-avatar initials="M"></ui5-avatar>
+			<ui5-avatar icon="home"></ui5-avatar>
 			<ui5-avatar initials="M" image="./img/Lamp_avatar_01.jpg"></ui5-avatar>
+			<ui5-avatar icon="home"></ui5-avatar>
 			<ui5-avatar initials="M"></ui5-avatar>
 			<ui5-avatar initials="M"></ui5-avatar>
+			<ui5-avatar icon="home" image="./img/John_Miller.png"></ui5-avatar>
 			<ui5-avatar initials="M"></ui5-avatar>
-			<ui5-avatar initials="M" image="./img/John_Miller.png"></ui5-avatar>
-			<ui5-avatar initials="M"></ui5-avatar>
-			<ui5-avatar initials="M"></ui5-avatar>
+			<ui5-avatar icon="home"></ui5-avatar>
 			<ui5-avatar initials="M"></ui5-avatar>
 			<ui5-avatar initials="M"></ui5-avatar>
 			<ui5-avatar initials="M" image="./img/woman_avatar_5.png"></ui5-avatar>
-			<ui5-avatar initials="M"></ui5-avatar>
+			<ui5-avatar icon="home"></ui5-avatar>
 			<ui5-avatar initials="M"></ui5-avatar>
 			<ui5-avatar initials="M" image="./img/Lamp_avatar_01.jpg"></ui5-avatar>
 			<ui5-avatar initials="M"></ui5-avatar>