diff --git a/packages/react/src/components/Avatar/Avatar.tsx b/packages/react/src/components/Avatar/Avatar.tsx
index 533fca95..c7a1f7d7 100644
--- a/packages/react/src/components/Avatar/Avatar.tsx
+++ b/packages/react/src/components/Avatar/Avatar.tsx
@@ -85,10 +85,13 @@ const Avatar: OverridableComponent<AvatarTypeMap<AvatarProps>> = forwardRef(
 
     const {color} = usePastelColorGenerator(colorRandomizer);
 
-    const classes: string = clsx('oxygen-avatar', className);
-
     return (
-      <MuiAvatar ref={ref} className={classes} sx={{bgcolor: randomBackgroundColor ? color : undefined}} {...rest}>
+      <MuiAvatar
+        ref={ref}
+        className={clsx('oxygen-avatar', 'OxygenAvatar-root', className)}
+        sx={{bgcolor: randomBackgroundColor ? color : undefined}}
+        {...rest}
+      >
         {children}
       </MuiAvatar>
     );
diff --git a/packages/react/src/components/Avatar/avatar.scss b/packages/react/src/components/Avatar/avatar.scss
index 9b44724e..0873f929 100644
--- a/packages/react/src/components/Avatar/avatar.scss
+++ b/packages/react/src/components/Avatar/avatar.scss
@@ -16,6 +16,14 @@
  * under the License.
  */
 
+/**
+ * This class is deprecated (https://github.com/wso2/oxygen-ui/issues/274).
+ * Use OxygenAvatar-root instead.
+ */
 .oxygen-avatar {
   /* Add Styles */
 }
+
+.OxygenAvatar-root {
+  text-transform: capitalize;
+}
diff --git a/packages/react/src/components/Header/header.scss b/packages/react/src/components/Header/header.scss
index 34ff7e22..120fbd60 100644
--- a/packages/react/src/components/Header/header.scss
+++ b/packages/react/src/components/Header/header.scss
@@ -92,7 +92,6 @@
     .image {
       width: 2.2rem;
       height: 2.2rem;
-      text-transform: capitalize;
     }
   }