diff --git a/client/src/ui/atoms/avatar/index.tsx b/client/src/ui/atoms/avatar/index.tsx
index 93111aeb3c71..6c254fe636e1 100644
--- a/client/src/ui/atoms/avatar/index.tsx
+++ b/client/src/ui/atoms/avatar/index.tsx
@@ -9,21 +9,13 @@ export const Avatar = ({ userData }: { userData: UserData }) => {
   const avatarImage = `${process.env.PUBLIC_URL || ""}/assets/avatar.png`;
 
   return (
-    <>
-      <figure
-        className={
-          userData?.isSubscriber ? "avatar-wrap is-subscriber" : "avatar-wrap"
-        }
-      >
-        <img
-          alt="Avatar"
-          className="avatar"
-          src={userData?.avatarUrl || avatarImage}
-        />
-      </figure>
-      <span className="avatar-username visually-hidden">
-        {userData?.username}
-      </span>
-    </>
+    <div
+      className={
+        userData?.isSubscriber ? "avatar-wrap is-subscriber" : "avatar-wrap"
+      }
+      aria-hidden="true"
+    >
+      <img alt="" className="avatar" src={userData?.avatarUrl || avatarImage} />
+    </div>
   );
 };
diff --git a/client/src/ui/molecules/user-menu/index.tsx b/client/src/ui/molecules/user-menu/index.tsx
index 08b0c406e9bd..d37a99060e41 100644
--- a/client/src/ui/molecules/user-menu/index.tsx
+++ b/client/src/ui/molecules/user-menu/index.tsx
@@ -88,6 +88,7 @@ export const UserMenu = () => {
       >
         {hasAnyDot && <span className="visually-hidden dot">New feature</span>}
         <Avatar userData={userData} />
+        <span className="visually-hidden">User menu</span>
         <span className="user-menu-id">{userData.email}</span>
       </Button>