diff --git a/packages/terra-avatar/CHANGELOG.md b/packages/terra-avatar/CHANGELOG.md
index 4462174c7ef..2a347212c8b 100644
--- a/packages/terra-avatar/CHANGELOG.md
+++ b/packages/terra-avatar/CHANGELOG.md
@@ -4,6 +4,7 @@ ChangeLog
 Unreleased
 ----------
 ### Breaking Changes
+* Changed the fallback behavior of Avatar. Such that if the image fails to load, the avatar falls back to the initials display instead of default user icon.
 * To Make all User avatars available in same variant `generic` subcomponent has been added.
 * `generic` subcomponent replaces the `sharedUser` subcomponent.
 * `generic` subcomponent contains a `variant` prop that toggles between `single-user`, `shared-user`, and `provider` user avatar.
diff --git a/packages/terra-avatar/src/common/AvatarUtils.jsx b/packages/terra-avatar/src/common/AvatarUtils.jsx
index 8d2080b7c4d..9476c1fad22 100644
--- a/packages/terra-avatar/src/common/AvatarUtils.jsx
+++ b/packages/terra-avatar/src/common/AvatarUtils.jsx
@@ -60,17 +60,33 @@ const getColorVariant = (hashValue) => {
 /**
  * Render placeholder.
  */
-const generateImagePlaceholder = (alt, isAriaHidden, variant) => {
+const generateImagePlaceholder = (avatarParams) => {
+  const {
+    alt, variant, isAriaHidden,
+  } = avatarParams;
   const avatarIconClassNames = cx(['icon', variant]);
-
   return <span className={avatarIconClassNames} role="img" aria-label={alt} alt={alt} aria-hidden={isAriaHidden} />;
 };
 
+/**
+ * Render placeholder.
+ */
+const generateInitials = (avatarParams) => {
+  const {
+    alt, initials, isAriaHidden,
+  } = avatarParams;
+  const avatarTextClassNames = cx('initials');
+  return <span className={avatarTextClassNames} role="img" alt={alt} aria-label={alt} aria-hidden={isAriaHidden}>{initials.toUpperCase()}</span>;
+};
+
 /**
  * Render image with placeholder.
  */
-const generateImage = (image, alt, isAriaHidden, variant, handleFallback) => {
-  const icon = generateImagePlaceholder(alt, isAriaHidden, variant);
+const generateImage = (avatarParams) => {
+  const {
+    alt, image, variant, handleFallback,
+  } = avatarParams;
+  const icon = (variant === AVATAR_VARIANTS.USER) ? generateInitials(avatarParams) : generateImagePlaceholder(avatarParams);
   return <TerraImage className={cx('image')} src={image} placeholder={icon} alt={alt} onError={handleFallback} fit="cover" />;
 };
 
@@ -110,6 +126,7 @@ export {
   getColorVariant,
   generateImagePlaceholder,
   generateImage,
+  generateInitials,
   validateColor,
   setColor,
 };
diff --git a/packages/terra-avatar/src/terra-dev-site/doc/avatar/Avatar.2.doc.mdx b/packages/terra-avatar/src/terra-dev-site/doc/avatar/Avatar.2.doc.mdx
index cc819bc1517..67d8b54ec88 100644
--- a/packages/terra-avatar/src/terra-dev-site/doc/avatar/Avatar.2.doc.mdx
+++ b/packages/terra-avatar/src/terra-dev-site/doc/avatar/Avatar.2.doc.mdx
@@ -14,7 +14,7 @@ import AvatarPropsTable from 'terra-avatar/src/variants/Avatar?dev-site-props-ta
 
 # Terra Avatar
 
-The `Avatar` variant represents a person - it displays an image or initials in a circular frame. If neither are provided, a fallback user icon displays. This is the default export of the `terra-avatar` package.
+The `Avatar` variant represents a person - it displays an image or initials in a circular frame. If a valid image is not provided then the avatar falls back to displaying initials. This is the default export of the `terra-avatar` package.
 
 ## Getting Started
 
diff --git a/packages/terra-avatar/src/terra-dev-site/doc/avatar/UpgradeGuide.5.doc.mdx b/packages/terra-avatar/src/terra-dev-site/doc/avatar/UpgradeGuide.5.doc.mdx
index a9db3d41a55..75a4734f564 100644
--- a/packages/terra-avatar/src/terra-dev-site/doc/avatar/UpgradeGuide.5.doc.mdx
+++ b/packages/terra-avatar/src/terra-dev-site/doc/avatar/UpgradeGuide.5.doc.mdx
@@ -8,14 +8,17 @@ import { Badge } from 'terra-avatar/package.json?dev-site-package';
 ### Reason for upgrade
 * To group all user avatars in single variant `shared-user` has been replaced with `generic` sub-component
 * To keep adding new user avatars like `provider` easier new `generic` sub-component has been added with all user avatars as variants. 
+* Providing more standard fallbacks
 
 ### Removed
 * `Shared User` subcomponent From Avatar
+* Default `user` icon as fallback icon for Avatar
 
 ### Added
 * The `generic` subcomponent that replaces the `sharedUser` subcomponent with a new `variant` prop that can be `single-user`, `shared-user`, or `provider`.
 * `variant` prop will take values for sub-variants `single-user`, `shared-user` and `provider`.
 * `user` avatar has been moved into `generic` sub-comopnent with varaint name `single-user`.
+* the `initials` as fallback display for Avatar when image fails to load.
 
 ### Steps to uplift to V3
 1. Use a named export for Generic variant.
diff --git a/packages/terra-avatar/src/terra-dev-site/doc/example/avatar/AvatarColorVariants.jsx b/packages/terra-avatar/src/terra-dev-site/doc/example/avatar/AvatarColorVariants.jsx
index 6313d7e261c..f5202823967 100644
--- a/packages/terra-avatar/src/terra-dev-site/doc/example/avatar/AvatarColorVariants.jsx
+++ b/packages/terra-avatar/src/terra-dev-site/doc/example/avatar/AvatarColorVariants.jsx
@@ -8,7 +8,7 @@ const propTypes = { color: PropTypes.string };
 const AvatarColorVariants = ({
   ...props
 }) => (
-  <Avatar alt="User" color={props.color} />
+  <Avatar alt="Joe Shane" initials="JS" color={props.color} />
 );
 
 AvatarColorVariants.propTypes = propTypes;
diff --git a/packages/terra-avatar/src/terra-dev-site/doc/example/avatar/AvatarImage.jsx b/packages/terra-avatar/src/terra-dev-site/doc/example/avatar/AvatarImage.jsx
index e97b50fac11..e2cc8550f7d 100644
--- a/packages/terra-avatar/src/terra-dev-site/doc/example/avatar/AvatarImage.jsx
+++ b/packages/terra-avatar/src/terra-dev-site/doc/example/avatar/AvatarImage.jsx
@@ -3,7 +3,7 @@ import Avatar from 'terra-avatar';
 import exampleAvatarImage from '../../../assets/150x150.jpg';
 
 const AvatarImage = () => (
-  <Avatar image={exampleAvatarImage} alt="Deep Space" />
+  <Avatar image={exampleAvatarImage} initials="JS" alt="Deep Space" />
 );
 
 export default AvatarImage;
diff --git a/packages/terra-avatar/src/terra-dev-site/doc/example/avatar/AvatarIsDeceased.jsx b/packages/terra-avatar/src/terra-dev-site/doc/example/avatar/AvatarIsDeceased.jsx
index 75653b248f2..bf75ad39fcf 100644
--- a/packages/terra-avatar/src/terra-dev-site/doc/example/avatar/AvatarIsDeceased.jsx
+++ b/packages/terra-avatar/src/terra-dev-site/doc/example/avatar/AvatarIsDeceased.jsx
@@ -2,7 +2,7 @@ import React from 'react';
 import Avatar from 'terra-avatar';
 
 const AvatarImage = () => (
-  <Avatar alt="Patient #1" isDeceased />
+  <Avatar alt="Patient #1" isDeceased initials="JS" />
 );
 
 export default AvatarImage;
diff --git a/packages/terra-avatar/src/terra-dev-site/doc/example/avatar/AvatarSize.jsx b/packages/terra-avatar/src/terra-dev-site/doc/example/avatar/AvatarSize.jsx
index 40fc0284206..8a4f7dfdcc7 100644
--- a/packages/terra-avatar/src/terra-dev-site/doc/example/avatar/AvatarSize.jsx
+++ b/packages/terra-avatar/src/terra-dev-site/doc/example/avatar/AvatarSize.jsx
@@ -3,7 +3,7 @@ import Avatar from 'terra-avatar';
 import exampleAvatarImage from '../../../assets/150x150.jpg';
 
 const AvatarSize = () => (
-  <Avatar alt="User" image={exampleAvatarImage} size="2em" />
+  <Avatar alt="User" image={exampleAvatarImage} size="2em" initials="JS" />
 );
 
 export default AvatarSize;
diff --git a/packages/terra-avatar/src/terra-dev-site/doc/example/avatar/AvatarUser.jsx b/packages/terra-avatar/src/terra-dev-site/doc/example/avatar/AvatarUser.jsx
index c0633b8d86c..d764f82d0c3 100644
--- a/packages/terra-avatar/src/terra-dev-site/doc/example/avatar/AvatarUser.jsx
+++ b/packages/terra-avatar/src/terra-dev-site/doc/example/avatar/AvatarUser.jsx
@@ -2,7 +2,7 @@ import React from 'react';
 import Avatar from 'terra-avatar';
 
 const AvatarUser = () => (
-  <Avatar alt="The Last Airbender" />
+  <Avatar alt="The Last Airbender" initials="JS" />
 );
 
 export default AvatarUser;
diff --git a/packages/terra-avatar/src/terra-dev-site/test/avatar/avatar/ImageAvatar.test.jsx b/packages/terra-avatar/src/terra-dev-site/test/avatar/avatar/ImageAvatar.test.jsx
index 688bb1d46a0..1e654d6857f 100644
--- a/packages/terra-avatar/src/terra-dev-site/test/avatar/avatar/ImageAvatar.test.jsx
+++ b/packages/terra-avatar/src/terra-dev-site/test/avatar/avatar/ImageAvatar.test.jsx
@@ -2,4 +2,4 @@ import React from 'react';
 import Avatar from '../../../../index';
 import exampleAvatarImage from '../../../assets/150x150.jpg';
 
-export default () => <Avatar image={exampleAvatarImage} alt="User" id="image-avatar" />;
+export default () => <Avatar image={exampleAvatarImage} alt="User" id="image-avatar" initials="JS" />;
diff --git a/packages/terra-avatar/src/terra-dev-site/test/avatar/avatar/ImageAvatarShortAndWide.test.jsx b/packages/terra-avatar/src/terra-dev-site/test/avatar/avatar/ImageAvatarShortAndWide.test.jsx
index 6b30dfbf3a9..022d08abf28 100644
--- a/packages/terra-avatar/src/terra-dev-site/test/avatar/avatar/ImageAvatarShortAndWide.test.jsx
+++ b/packages/terra-avatar/src/terra-dev-site/test/avatar/avatar/ImageAvatarShortAndWide.test.jsx
@@ -2,4 +2,4 @@ import React from 'react';
 import Avatar from '../../../../index';
 import exampleAvatarImage from '../../../assets/200x133.jpg';
 
-export default () => <Avatar image={exampleAvatarImage} alt="User" id="image-avatar" />;
+export default () => <Avatar image={exampleAvatarImage} alt="User" id="image-avatar" initials="JS" />;
diff --git a/packages/terra-avatar/src/terra-dev-site/test/avatar/avatar/ImageAvatarTallAndNarrow.test.jsx b/packages/terra-avatar/src/terra-dev-site/test/avatar/avatar/ImageAvatarTallAndNarrow.test.jsx
index a07211513ea..3c3bc988f42 100644
--- a/packages/terra-avatar/src/terra-dev-site/test/avatar/avatar/ImageAvatarTallAndNarrow.test.jsx
+++ b/packages/terra-avatar/src/terra-dev-site/test/avatar/avatar/ImageAvatarTallAndNarrow.test.jsx
@@ -2,4 +2,4 @@ import React from 'react';
 import Avatar from '../../../../index';
 import exampleAvatarImage from '../../../assets/170x251.jpg';
 
-export default () => <Avatar image={exampleAvatarImage} alt="User" id="image-avatar" />;
+export default () => <Avatar image={exampleAvatarImage} alt="User" id="image-avatar" initials="JS" />;
diff --git a/packages/terra-avatar/src/terra-dev-site/test/avatar/avatar/ImageGap.test.jsx b/packages/terra-avatar/src/terra-dev-site/test/avatar/avatar/ImageGap.test.jsx
index c36b2db2cdb..bbdfd11570c 100644
--- a/packages/terra-avatar/src/terra-dev-site/test/avatar/avatar/ImageGap.test.jsx
+++ b/packages/terra-avatar/src/terra-dev-site/test/avatar/avatar/ImageGap.test.jsx
@@ -9,7 +9,7 @@ const cx = classNames.bind(styles);
 export default () => (
   <div>
     <div className={cx('avatar-wrapper')}>
-      <Avatar id="image-avatar" image={exampleAvatarImage} alt="placeholder" />
+      <Avatar id="image-avatar" image={exampleAvatarImage} alt="placeholder" initials="JS" />
     </div>
     <div className={cx('avatar-wrapper')}>
       <Facility id="facility-avatar" alt="facility" />
diff --git a/packages/terra-avatar/src/terra-dev-site/test/avatar/avatar/InvalidImageAvatar.test.jsx b/packages/terra-avatar/src/terra-dev-site/test/avatar/avatar/InvalidImageAvatar.test.jsx
deleted file mode 100644
index 41b5c6d01f5..00000000000
--- a/packages/terra-avatar/src/terra-dev-site/test/avatar/avatar/InvalidImageAvatar.test.jsx
+++ /dev/null
@@ -1,4 +0,0 @@
-import React from 'react';
-import Avatar from '../../../../index';
-
-export default () => <Avatar image="invalid-image-url" alt="User" id="invalid-image-avatar" />;
diff --git a/packages/terra-avatar/src/terra-dev-site/test/avatar/avatar/InvalidImageAvatarWithInitials.test.jsx b/packages/terra-avatar/src/terra-dev-site/test/avatar/avatar/InvalidImageAvatarWithInitials.test.jsx
new file mode 100644
index 00000000000..9f35722dfae
--- /dev/null
+++ b/packages/terra-avatar/src/terra-dev-site/test/avatar/avatar/InvalidImageAvatarWithInitials.test.jsx
@@ -0,0 +1,4 @@
+import React from 'react';
+import Avatar from '../../../../index';
+
+export default () => <Avatar image="invalid-image-url" initials="JD" alt="John Doe" id="invalid-image-avatar" />;
diff --git a/packages/terra-avatar/src/terra-dev-site/test/avatar/avatar/IsDeceasedAvatar.test.jsx b/packages/terra-avatar/src/terra-dev-site/test/avatar/avatar/IsDeceasedAvatar.test.jsx
index 43f1db4f6fe..ffcdc904e4d 100644
--- a/packages/terra-avatar/src/terra-dev-site/test/avatar/avatar/IsDeceasedAvatar.test.jsx
+++ b/packages/terra-avatar/src/terra-dev-site/test/avatar/avatar/IsDeceasedAvatar.test.jsx
@@ -1,4 +1,4 @@
 import React from 'react';
 import Avatar from '../../../../index';
 
-export default () => <Avatar id="is-deceased-avatar" alt="user" isDeceased />;
+export default () => <Avatar id="is-deceased-avatar" alt="user" isDeceased initials="JS" />;
diff --git a/packages/terra-avatar/src/terra-dev-site/test/avatar/avatar/IsDeceasedImageAvatar.test.jsx b/packages/terra-avatar/src/terra-dev-site/test/avatar/avatar/IsDeceasedImageAvatar.test.jsx
index f9191cad428..47037f2ad6a 100644
--- a/packages/terra-avatar/src/terra-dev-site/test/avatar/avatar/IsDeceasedImageAvatar.test.jsx
+++ b/packages/terra-avatar/src/terra-dev-site/test/avatar/avatar/IsDeceasedImageAvatar.test.jsx
@@ -2,4 +2,4 @@ import React from 'react';
 import Avatar from '../../../../index';
 import exampleAvatarImage from '../../../assets/150x150.jpg';
 
-export default () => <Avatar id="is-deceased-image-avatar" alt="user" image={exampleAvatarImage} isDeceased />;
+export default () => <Avatar id="is-deceased-image-avatar" alt="user" image={exampleAvatarImage} isDeceased initials="JS" />;
diff --git a/packages/terra-avatar/src/terra-dev-site/test/avatar/avatar/OneInitialAvatar.test.jsx b/packages/terra-avatar/src/terra-dev-site/test/avatar/avatar/OneInitialAvatar.test.jsx
index 125722dfad1..a57d41d89cd 100644
--- a/packages/terra-avatar/src/terra-dev-site/test/avatar/avatar/OneInitialAvatar.test.jsx
+++ b/packages/terra-avatar/src/terra-dev-site/test/avatar/avatar/OneInitialAvatar.test.jsx
@@ -1,4 +1,4 @@
 import React from 'react';
 import Avatar from '../../../../index';
 
-export default () => <Avatar id="one-initial-avatar" initials="J" alt="user" />;
+export default () => <Avatar id="one-initial-avatar" initials="J" alt="John" />;
diff --git a/packages/terra-avatar/src/terra-dev-site/test/avatar/avatar/TwoInitialsAvatar.test.jsx b/packages/terra-avatar/src/terra-dev-site/test/avatar/avatar/TwoInitialsAvatar.test.jsx
index e1f8b95f0dc..aeba06a2e34 100644
--- a/packages/terra-avatar/src/terra-dev-site/test/avatar/avatar/TwoInitialsAvatar.test.jsx
+++ b/packages/terra-avatar/src/terra-dev-site/test/avatar/avatar/TwoInitialsAvatar.test.jsx
@@ -1,4 +1,4 @@
 import React from 'react';
 import Avatar from '../../../../index';
 
-export default () => <Avatar id="two-initials-avatar" initials="JS" alt="user" color="two" />;
+export default () => <Avatar id="two-initials-avatar" initials="JSS" alt="Joe S Shane" color="two" />;
diff --git a/packages/terra-avatar/src/terra-dev-site/test/avatar/avatar/UserAvatar.test.jsx b/packages/terra-avatar/src/terra-dev-site/test/avatar/avatar/UserAvatar.test.jsx
deleted file mode 100644
index 7332758ffa8..00000000000
--- a/packages/terra-avatar/src/terra-dev-site/test/avatar/avatar/UserAvatar.test.jsx
+++ /dev/null
@@ -1,4 +0,0 @@
-import React from 'react';
-import Avatar from '../../../../index';
-
-export default () => <Avatar id="user-avatar" alt="user" color="one" />;
diff --git a/packages/terra-avatar/src/variants/Avatar.jsx b/packages/terra-avatar/src/variants/Avatar.jsx
index 6bad5a3fd11..7288f2d4eae 100644
--- a/packages/terra-avatar/src/variants/Avatar.jsx
+++ b/packages/terra-avatar/src/variants/Avatar.jsx
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import classNames from 'classnames/bind';
 import styles from '../common/Avatar.module.scss';
 import {
-  AVATAR_VARIANTS, generateImagePlaceholder, generateImage, setColor,
+  AVATAR_VARIANTS, generateInitials, generateImage, setColor,
 } from '../common/AvatarUtils';
 
 const cx = classNames.bind(styles);
@@ -30,7 +30,7 @@ const propTypes = {
   /**
    * One or two letters to display.
    */
-  initials: PropTypes.string,
+  initials: PropTypes.string.isRequired,
   /**
    * Whether to hide avatar from the accessibility tree.
    */
@@ -49,7 +49,6 @@ const defaultProps = {
   color: 'auto',
   hashValue: undefined,
   image: undefined,
-  initials: undefined,
   isAriaHidden: false,
   isDeceased: false,
   size: undefined,
@@ -84,14 +83,19 @@ class Avatar extends React.Component {
     } = this.props;
 
     let avatarContent;
+    const avatarParams = {
+      image,
+      alt,
+      isAriaHidden,
+      variant: AVATAR_VARIANTS.USER,
+      handleFallback: this.handleFallback,
+      initials: (initials.length > 2) ? initials.slice(0, 2) : initials,
+    };
 
     if (image) {
-      avatarContent = generateImage(image, alt, isAriaHidden, AVATAR_VARIANTS.USER, this.handleFallback);
-    } else if (initials && (initials.length === 1 || initials.length === 2)) {
-      const avatarTextClassNames = cx('initials');
-      avatarContent = <span className={avatarTextClassNames} alt={alt} aria-label={alt} aria-hidden={isAriaHidden}>{initials.toUpperCase()}</span>;
+      avatarContent = generateImage(avatarParams);
     } else {
-      avatarContent = generateImagePlaceholder(alt, isAriaHidden, AVATAR_VARIANTS.USER);
+      avatarContent = generateInitials(avatarParams);
     }
 
     const attributes = { ...customProps };
diff --git a/packages/terra-avatar/src/variants/Facility.jsx b/packages/terra-avatar/src/variants/Facility.jsx
index 32c982981ec..2cbc116d6d7 100644
--- a/packages/terra-avatar/src/variants/Facility.jsx
+++ b/packages/terra-avatar/src/variants/Facility.jsx
@@ -73,10 +73,18 @@ class Facility extends React.Component {
 
     let facilityContent;
 
+    const facilityParams = {
+      image,
+      alt,
+      isAriaHidden,
+      variant: AVATAR_VARIANTS.FACILITY,
+      handleFallback: this.handleFallback,
+    };
+
     if (image) {
-      facilityContent = generateImage(image, alt, isAriaHidden, AVATAR_VARIANTS.FACILITY, this.handleFallback);
+      facilityContent = generateImage(facilityParams);
     } else {
-      facilityContent = generateImagePlaceholder(alt, isAriaHidden, AVATAR_VARIANTS.FACILITY);
+      facilityContent = generateImagePlaceholder(facilityParams);
     }
     const attributes = { ...customProps };
     const customStyles = size ? ({ fontSize: size, ...attributes.style }) : attributes.style;
diff --git a/packages/terra-avatar/tests/jest/Avatar.test.jsx b/packages/terra-avatar/tests/jest/Avatar.test.jsx
index e57a993c73d..042c4e8f00b 100644
--- a/packages/terra-avatar/tests/jest/Avatar.test.jsx
+++ b/packages/terra-avatar/tests/jest/Avatar.test.jsx
@@ -5,7 +5,7 @@ import exampleProfilePhoto from '../../src/terra-dev-site/assets/150x150.jpg';
 describe('Avatar', () => {
   // Snapshot Tests
   it('should render a default avatar', () => {
-    const avatar = <Avatar alt="user" />;
+    const avatar = <Avatar initials="JS" alt="user" />;
     const wrapper = render(avatar);
     expect(wrapper).toMatchSnapshot();
   });
@@ -22,26 +22,26 @@ describe('Avatar', () => {
     expect(wrapper).toMatchSnapshot();
   });
 
-  it('should render fallback user avatar when more than two initials are passed in', () => {
+  it('should render two initials avatar when more than two initials are passed in', () => {
     const avatar = <Avatar initials="JJJ" alt="user" />;
     const wrapper = render(avatar);
     expect(wrapper).toMatchSnapshot();
   });
 
   it('should render image avatar when image is passed in', () => {
-    const avatar = <Avatar image={exampleProfilePhoto} alt="placeholder" />;
+    const avatar = <Avatar image={exampleProfilePhoto} alt="placeholder" initials="JS" />;
     const wrapper = render(avatar);
     expect(wrapper).toMatchSnapshot();
   });
 
-  it('should render fallback user avatar when invalid image is passed in', () => {
-    const avatar = <Avatar image="https://path/to/invalid_image.jpg" alt="placeholder" />;
+  it('should render fallback initials when invalid image is passed in with initials', () => {
+    const avatar = <Avatar image="https://path/to/invalid_image.jpg" initials="JD" alt="placeholder" />;
     const wrapper = render(avatar);
     expect(wrapper).toMatchSnapshot();
   });
 
   it('should render an avatar with provided size', () => {
-    const avatar = <Avatar alt="user" size="5em" />;
+    const avatar = <Avatar alt="user" size="5em" initials="JS" />;
     const wrapper = render(avatar);
     expect(wrapper).toMatchSnapshot();
   });
@@ -53,31 +53,31 @@ describe('Avatar', () => {
   });
 
   it('should render an avatar with color variant one', () => {
-    const avatar = <Avatar alt="user" color="one" />;
+    const avatar = <Avatar alt="user" color="one" initials="JS" />;
     const wrapper = render(avatar);
     expect(wrapper).toMatchSnapshot();
   });
 
   it('should render an avatar with color variant netural', () => {
-    const avatar = <Avatar alt="user" color="neutral" />;
+    const avatar = <Avatar alt="user" color="neutral" initials="JS" />;
     const wrapper = render(avatar);
     expect(wrapper).toMatchSnapshot();
   });
 
   it('should render an avatar with an automated color variant, based on a hashValue', () => {
-    const avatar = <Avatar alt="user" hashValue="alternative hash" />;
+    const avatar = <Avatar alt="user" hashValue="alternative hash" initials="JS" />;
     const wrapper = render(avatar);
     expect(wrapper).toMatchSnapshot();
   });
 
   it('should render an isDeceased avatar', () => {
-    const avatar = <Avatar alt="user" isDeceased />;
+    const avatar = <Avatar alt="user" isDeceased initials="JS" />;
     const wrapper = render(avatar);
     expect(wrapper).toMatchSnapshot();
   });
 
   it('should render an avatar with custom props', () => {
-    const avatar = <Avatar alt="user" id="custom props avatar" />;
+    const avatar = <Avatar alt="user" id="custom props avatar" initials="JS" />;
     const wrapper = render(avatar);
     expect(wrapper).toMatchSnapshot();
   });
diff --git a/packages/terra-avatar/tests/jest/__snapshots__/Avatar.test.jsx.snap b/packages/terra-avatar/tests/jest/__snapshots__/Avatar.test.jsx.snap
index 609db4b7409..a69b0de6d9e 100644
--- a/packages/terra-avatar/tests/jest/__snapshots__/Avatar.test.jsx.snap
+++ b/packages/terra-avatar/tests/jest/__snapshots__/Avatar.test.jsx.snap
@@ -8,9 +8,11 @@ exports[`Avatar should render a default avatar 1`] = `
     alt="user"
     aria-hidden="false"
     aria-label="user"
-    class="icon user"
+    class="initials"
     role="img"
-  />
+  >
+    JS
+  </span>
 </div>
 `;
 
@@ -22,9 +24,11 @@ exports[`Avatar should render an avatar with an automated color variant, based o
     alt="user"
     aria-hidden="false"
     aria-label="user"
-    class="icon user"
+    class="initials"
     role="img"
-  />
+  >
+    JS
+  </span>
 </div>
 `;
 
@@ -36,9 +40,11 @@ exports[`Avatar should render an avatar with color variant netural 1`] = `
     alt="user"
     aria-hidden="false"
     aria-label="user"
-    class="icon user"
+    class="initials"
     role="img"
-  />
+  >
+    JS
+  </span>
 </div>
 `;
 
@@ -50,9 +56,11 @@ exports[`Avatar should render an avatar with color variant one 1`] = `
     alt="user"
     aria-hidden="false"
     aria-label="user"
-    class="icon user"
+    class="initials"
     role="img"
-  />
+  >
+    JS
+  </span>
 </div>
 `;
 
@@ -65,9 +73,11 @@ exports[`Avatar should render an avatar with custom props 1`] = `
     alt="user"
     aria-hidden="false"
     aria-label="user"
-    class="icon user"
+    class="initials"
     role="img"
-  />
+  >
+    JS
+  </span>
 </div>
 `;
 
@@ -80,6 +90,7 @@ exports[`Avatar should render an avatar with initials and aria hidden 1`] = `
     aria-hidden="true"
     aria-label="user"
     class="initials"
+    role="img"
   >
     JJ
   </span>
@@ -95,9 +106,11 @@ exports[`Avatar should render an avatar with provided size 1`] = `
     alt="user"
     aria-hidden="false"
     aria-label="user"
-    class="icon user"
+    class="initials"
     role="img"
-  />
+  >
+    JS
+  </span>
 </div>
 `;
 
@@ -109,13 +122,15 @@ exports[`Avatar should render an isDeceased avatar 1`] = `
     alt="user"
     aria-hidden="false"
     aria-label="user"
-    class="icon user"
+    class="initials"
     role="img"
-  />
+  >
+    JS
+  </span>
 </div>
 `;
 
-exports[`Avatar should render fallback user avatar when invalid image is passed in 1`] = `
+exports[`Avatar should render fallback initials when invalid image is passed in with initials 1`] = `
 <div
   class="avatar five image"
 >
@@ -128,23 +143,11 @@ exports[`Avatar should render fallback user avatar when invalid image is passed
     alt="placeholder"
     aria-hidden="false"
     aria-label="placeholder"
-    class="icon user"
-    role="img"
-  />
-</div>
-`;
-
-exports[`Avatar should render fallback user avatar when more than two initials are passed in 1`] = `
-<div
-  class="avatar one"
->
-  <span
-    alt="user"
-    aria-hidden="false"
-    aria-label="user"
-    class="icon user"
+    class="initials"
     role="img"
-  />
+  >
+    JD
+  </span>
 </div>
 `;
 
@@ -161,9 +164,11 @@ exports[`Avatar should render image avatar when image is passed in 1`] = `
     alt="placeholder"
     aria-hidden="false"
     aria-label="placeholder"
-    class="icon user"
+    class="initials"
     role="img"
-  />
+  >
+    JS
+  </span>
 </div>
 `;
 
@@ -176,12 +181,29 @@ exports[`Avatar should render one initial avatar when one initial is passed in 1
     aria-hidden="false"
     aria-label="user"
     class="initials"
+    role="img"
   >
     J
   </span>
 </div>
 `;
 
+exports[`Avatar should render two initials avatar when more than two initials are passed in 1`] = `
+<div
+  class="avatar one"
+>
+  <span
+    alt="user"
+    aria-hidden="false"
+    aria-label="user"
+    class="initials"
+    role="img"
+  >
+    JJ
+  </span>
+</div>
+`;
+
 exports[`Avatar should render two initials avatar when two initials are passed in 1`] = `
 <div
   class="avatar one"
@@ -191,6 +213,7 @@ exports[`Avatar should render two initials avatar when two initials are passed i
     aria-hidden="false"
     aria-label="user"
     class="initials"
+    role="img"
   >
     JS
   </span>
diff --git a/packages/terra-avatar/tests/wdio/__snapshots__/reference/en/chrome_huge/avatar-common-spec/Deceased_Avatar[default].png b/packages/terra-avatar/tests/wdio/__snapshots__/reference/en/chrome_huge/avatar-common-spec/Deceased_Avatar[default].png
index 5739e8478fc..426bbf4d9b4 100644
Binary files a/packages/terra-avatar/tests/wdio/__snapshots__/reference/en/chrome_huge/avatar-common-spec/Deceased_Avatar[default].png and b/packages/terra-avatar/tests/wdio/__snapshots__/reference/en/chrome_huge/avatar-common-spec/Deceased_Avatar[default].png differ
diff --git a/packages/terra-avatar/tests/wdio/__snapshots__/reference/en/chrome_huge/avatar-common-spec/Icon_Avatar[default].png b/packages/terra-avatar/tests/wdio/__snapshots__/reference/en/chrome_huge/avatar-common-spec/Icon_Avatar[default].png
deleted file mode 100644
index aba1b9f1345..00000000000
Binary files a/packages/terra-avatar/tests/wdio/__snapshots__/reference/en/chrome_huge/avatar-common-spec/Icon_Avatar[default].png and /dev/null differ
diff --git a/packages/terra-avatar/tests/wdio/__snapshots__/reference/en/chrome_huge/avatar-common-spec/Invalid_Image_Avatar[default].png b/packages/terra-avatar/tests/wdio/__snapshots__/reference/en/chrome_huge/avatar-common-spec/Invalid_Image_Avatar[default].png
deleted file mode 100644
index 9958adc3c64..00000000000
Binary files a/packages/terra-avatar/tests/wdio/__snapshots__/reference/en/chrome_huge/avatar-common-spec/Invalid_Image_Avatar[default].png and /dev/null differ
diff --git a/packages/terra-avatar/tests/wdio/__snapshots__/reference/en/chrome_huge/avatar-common-spec/Invalid_Image_Avatar_With_Initials[default].png b/packages/terra-avatar/tests/wdio/__snapshots__/reference/en/chrome_huge/avatar-common-spec/Invalid_Image_Avatar_With_Initials[default].png
new file mode 100644
index 00000000000..5e44d489855
Binary files /dev/null and b/packages/terra-avatar/tests/wdio/__snapshots__/reference/en/chrome_huge/avatar-common-spec/Invalid_Image_Avatar_With_Initials[default].png differ
diff --git a/packages/terra-avatar/tests/wdio/__snapshots__/reference/orion-fusion-theme/en/chrome_huge/avatar-common-spec/Deceased_Avatar[default].png b/packages/terra-avatar/tests/wdio/__snapshots__/reference/orion-fusion-theme/en/chrome_huge/avatar-common-spec/Deceased_Avatar[default].png
index 5a779615adc..a2cb654bbb4 100644
Binary files a/packages/terra-avatar/tests/wdio/__snapshots__/reference/orion-fusion-theme/en/chrome_huge/avatar-common-spec/Deceased_Avatar[default].png and b/packages/terra-avatar/tests/wdio/__snapshots__/reference/orion-fusion-theme/en/chrome_huge/avatar-common-spec/Deceased_Avatar[default].png differ
diff --git a/packages/terra-avatar/tests/wdio/__snapshots__/reference/orion-fusion-theme/en/chrome_huge/avatar-common-spec/Invalid_Image_Avatar_With_Initials[default].png b/packages/terra-avatar/tests/wdio/__snapshots__/reference/orion-fusion-theme/en/chrome_huge/avatar-common-spec/Invalid_Image_Avatar_With_Initials[default].png
new file mode 100644
index 00000000000..04269f75747
Binary files /dev/null and b/packages/terra-avatar/tests/wdio/__snapshots__/reference/orion-fusion-theme/en/chrome_huge/avatar-common-spec/Invalid_Image_Avatar_With_Initials[default].png differ
diff --git a/packages/terra-avatar/tests/wdio/avatar-common-spec.js b/packages/terra-avatar/tests/wdio/avatar-common-spec.js
index 47fa52df23b..bc20f3db524 100644
--- a/packages/terra-avatar/tests/wdio/avatar-common-spec.js
+++ b/packages/terra-avatar/tests/wdio/avatar-common-spec.js
@@ -1,10 +1,4 @@
 Terra.describeViewports('Avatar', ['huge'], () => {
-  describe('Icon Avatar', () => {
-    before(() => browser.url('/#/raw/tests/terra-avatar/avatar/avatar/user-avatar'));
-
-    Terra.it.validatesElement({ selector: '#user-avatar' });
-  });
-
   describe('Image Avatar', () => {
     before(() => browser.url('/#/raw/tests/terra-avatar/avatar/avatar/image-avatar'));
 
@@ -25,8 +19,8 @@ Terra.describeViewports('Avatar', ['huge'], () => {
     Terra.it.matchesScreenshot({ selector: '#image-avatar' });
   });
 
-  describe('Invalid Image Avatar', () => {
-    before(() => browser.url('/#/raw/tests/terra-avatar/avatar/avatar/invalid-image-avatar'));
+  describe('Invalid Image Avatar With Initials', () => {
+    before(() => browser.url('/#/raw/tests/terra-avatar/avatar/avatar/invalid-image-avatar-with-initials'));
 
     Terra.it.validatesElement({ selector: '#invalid-image-avatar' });
   });