diff --git a/packages/ui/report.api.md b/packages/ui/report.api.md
index 1a015747a8..4a94c2fd9f 100644
--- a/packages/ui/report.api.md
+++ b/packages/ui/report.api.md
@@ -256,13 +256,27 @@ export const Avatar: ForwardRefExoticComponent<
 
 // @public
 export const AvatarDefinition: {
+  readonly styles: {
+    readonly [key: string]: string;
+  };
   readonly classNames: {
     readonly root: 'bui-AvatarRoot';
     readonly image: 'bui-AvatarImage';
     readonly fallback: 'bui-AvatarFallback';
   };
-  readonly dataAttributes: {
-    readonly size: readonly ['small', 'medium', 'large'];
+  readonly propDefs: {
+    readonly size: {
+      readonly dataAttribute: true;
+      readonly default: 'medium';
+    };
+    readonly purpose: {
+      readonly default: 'informative';
+    };
+    readonly src: {};
+    readonly name: {};
+    readonly children: {};
+    readonly className: {};
+    readonly style: {};
   };
 };
 
diff --git a/packages/ui/src/components/Avatar/Avatar.tsx b/packages/ui/src/components/Avatar/Avatar.tsx
index 920a9b127f..c36c5f02a0 100644
--- a/packages/ui/src/components/Avatar/Avatar.tsx
+++ b/packages/ui/src/components/Avatar/Avatar.tsx
@@ -15,24 +15,18 @@
  */
 
 import { forwardRef, useState, useEffect } from 'react';
-import clsx from 'clsx';
 import { AvatarProps } from './types';
-import { useStyles } from '../../hooks/useStyles';
+import { useDefinition } from '../../hooks/useDefinition';
 import { AvatarDefinition } from './definition';
-import styles from './Avatar.module.css';
 
 /** @public */
 export const Avatar = forwardRef<HTMLDivElement, AvatarProps>((props, ref) => {
-  const { classNames, dataAttributes, cleanedProps } = useStyles(
+  const { ownProps, restProps, dataAttributes } = useDefinition(
     AvatarDefinition,
-    {
-      size: 'medium',
-      purpose: 'informative',
-      ...props,
-    },
+    props,
   );
 
-  const { className, src, name, purpose, ...rest } = cleanedProps;
+  const { classes, size, src, name, purpose, style } = ownProps;
 
   const [imageStatus, setImageStatus] = useState<
     'loading' | 'loaded' | 'error'
@@ -51,9 +45,7 @@ export const Avatar = forwardRef<HTMLDivElement, AvatarProps>((props, ref) => {
     };
   }, [src]);
 
-  const initialsCount = ['x-small', 'small'].includes(cleanedProps.size)
-    ? 1
-    : 2;
+  const initialsCount = ['x-small', 'small'].includes(size) ? 1 : 2;
 
   const initials = name
     .split(' ')
@@ -68,21 +60,15 @@ export const Avatar = forwardRef<HTMLDivElement, AvatarProps>((props, ref) => {
       role="img"
       aria-label={purpose === 'informative' ? name : undefined}
       aria-hidden={purpose === 'decoration' ? true : undefined}
-      className={clsx(classNames.root, styles[classNames.root], className)}
+      className={classes.root}
+      style={style}
       {...dataAttributes}
-      {...rest}
+      {...restProps}
     >
       {imageStatus === 'loaded' ? (
-        <img
-          src={src}
-          alt=""
-          className={clsx(classNames.image, styles[classNames.image])}
-        />
+        <img src={src} alt="" className={classes.image} />
       ) : (
-        <div
-          aria-hidden="true"
-          className={clsx(classNames.fallback, styles[classNames.fallback])}
-        >
+        <div aria-hidden="true" className={classes.fallback}>
           {initials}
         </div>
       )}
diff --git a/packages/ui/src/components/Avatar/definition.ts b/packages/ui/src/components/Avatar/definition.ts
index 8ad2c31bdc..dc4127ac7e 100644
--- a/packages/ui/src/components/Avatar/definition.ts
+++ b/packages/ui/src/components/Avatar/definition.ts
@@ -14,19 +14,28 @@
  * limitations under the License.
  */
 
-import type { ComponentDefinition } from '../../types';
+import { defineComponent } from '../../hooks/useDefinition';
+import type { AvatarOwnProps } from './types';
+import styles from './Avatar.module.css';
 
 /**
  * Component definition for Avatar
  * @public
  */
-export const AvatarDefinition = {
+export const AvatarDefinition = defineComponent<AvatarOwnProps>()({
+  styles,
   classNames: {
     root: 'bui-AvatarRoot',
     image: 'bui-AvatarImage',
     fallback: 'bui-AvatarFallback',
   },
-  dataAttributes: {
-    size: ['small', 'medium', 'large'] as const,
+  propDefs: {
+    size: { dataAttribute: true, default: 'medium' },
+    purpose: { default: 'informative' },
+    src: {},
+    name: {},
+    children: {},
+    className: {},
+    style: {},
   },
-} as const satisfies ComponentDefinition;
+});
diff --git a/packages/ui/src/components/Avatar/types.ts b/packages/ui/src/components/Avatar/types.ts
index a252861ea4..08bb938535 100644
--- a/packages/ui/src/components/Avatar/types.ts
+++ b/packages/ui/src/components/Avatar/types.ts
@@ -14,6 +14,17 @@
  * limitations under the License.
  */
 
+/** @public */
+export type AvatarOwnProps = {
+  size?: AvatarProps['size'];
+  purpose?: AvatarProps['purpose'];
+  src: string;
+  name: string;
+  children?: React.ReactNode;
+  className?: string;
+  style?: React.CSSProperties;
+};
+
 /** @public */
 export interface AvatarProps extends React.ComponentPropsWithoutRef<'div'> {
   /**