diff --git a/components/lib/avatar/Avatar.vue b/components/lib/avatar/Avatar.vue
index b65ad1cfb..83254d6fc 100644
--- a/components/lib/avatar/Avatar.vue
+++ b/components/lib/avatar/Avatar.vue
@@ -3,7 +3,7 @@
         <slot>
             <span v-if="label" :class="cx('label')" v-bind="ptm('label')">{{ label }}</span>
             <component v-else-if="$slots.icon" :is="$slots.icon" :class="cx('icon')" v-bind="ptm('icon')" />
-            <span v-else-if="icon" :class="cx('icon')" v-bind="ptm('icon')" />
+            <span v-else-if="icon" :class="[cx('icon'), icon]" v-bind="ptm('icon')" />
             <img v-else-if="image" :src="image" :alt="ariaLabel" @error="onError" v-bind="ptm('image')" />
         </slot>
     </div>
diff --git a/components/lib/avatar/BaseAvatar.vue b/components/lib/avatar/BaseAvatar.vue
index 23e3a136a..17b5ca12e 100644
--- a/components/lib/avatar/BaseAvatar.vue
+++ b/components/lib/avatar/BaseAvatar.vue
@@ -45,7 +45,7 @@ const classes = {
         }
     ],
     label: 'p-avatar-text',
-    icon: ({ props }) => ['p-avatar-icon', props.icon]
+    icon: 'p-avatar-icon'
 };
 
 const { load: loadStyle } = useStyle(styles, { id: 'primevue_avatar_style', manual: true });