diff --git a/public/images/avatar/elio.png b/public/images/avatar/elio.png
new file mode 100644
index 00000000..62107502
Binary files /dev/null and b/public/images/avatar/elio.png differ
diff --git a/public/images/avatar/maya.png b/public/images/avatar/maya.png
new file mode 100644
index 00000000..3048fc0a
Binary files /dev/null and b/public/images/avatar/maya.png differ
diff --git a/public/images/avatar/nayeli.png b/public/images/avatar/nayeli.png
new file mode 100644
index 00000000..5e9ef73e
Binary files /dev/null and b/public/images/avatar/nayeli.png differ
diff --git a/public/images/chat/pic-chat-guest.png b/public/images/avatar/placeholder.png
similarity index 100%
rename from public/images/chat/pic-chat-guest.png
rename to public/images/avatar/placeholder.png
diff --git a/public/images/chat/pic-chat-elio.png b/public/images/chat/pic-chat-elio.png
deleted file mode 100644
index 1241d49f..00000000
Binary files a/public/images/chat/pic-chat-elio.png and /dev/null differ
diff --git a/src/app/_components/__tests__/tailwind-components.test.tsx b/src/app/_components/__tests__/tailwind-components.test.tsx
index 94f8829c..afd3fca7 100644
--- a/src/app/_components/__tests__/tailwind-components.test.tsx
+++ b/src/app/_components/__tests__/tailwind-components.test.tsx
@@ -56,7 +56,7 @@ describe("shared Tailwind components", () => {
     expect(html).toContain("width:48px");
     expect(html).toContain("height:48px");
     expect(html).toContain("size-full object-cover");
-    expect(html).toContain("%2Fimages%2Fchat%2Fpic-chat-elio.png");
+    expect(html).toContain("%2Fimages%2Favatar%2Felio.png");
   });
 
   it("renders UserMessageAvatar custom and fallback images", () => {
@@ -71,6 +71,6 @@ describe("shared Tailwind components", () => {
     expect(userHtml).toContain("size-full object-cover");
     expect(userHtml).toContain("%2Favatar.png");
     expect(guestHtml).toContain('aria-label="Guest avatar"');
-    expect(guestHtml).toContain("%2Fimages%2Fchat%2Fpic-chat-guest.png");
+    expect(guestHtml).toContain("%2Fimages%2Favatar%2Fplaceholder.png");
   });
 });
diff --git a/src/app/_components/character-avatar.tsx b/src/app/_components/character-avatar.tsx
index cf9bde48..533950f7 100644
--- a/src/app/_components/character-avatar.tsx
+++ b/src/app/_components/character-avatar.tsx
@@ -13,7 +13,7 @@ export interface CharacterAvatarProps {
 }
 
 export function CharacterAvatar({
-  src = "/images/chat/pic-chat-elio.png",
+  src = "/images/avatar/elio.png",
   alt = "Elio Silvestri",
   className,
   size = 43,
diff --git a/src/app/_components/user-message-avatar.tsx b/src/app/_components/user-message-avatar.tsx
index dfb28ce5..e50a1364 100644
--- a/src/app/_components/user-message-avatar.tsx
+++ b/src/app/_components/user-message-avatar.tsx
@@ -47,7 +47,7 @@ export function UserMessageAvatar({
       aria-label="Guest avatar"
     >
       <Image
-        src="/images/chat/pic-chat-guest.png"
+        src="/images/avatar/placeholder.png"
         alt="Guest"
         width={imageSize}
         height={imageSize}
diff --git a/src/app/chat/components/__tests__/tailwind-components.test.tsx b/src/app/chat/components/__tests__/tailwind-components.test.tsx
index fe3ff778..75545a3e 100644
--- a/src/app/chat/components/__tests__/tailwind-components.test.tsx
+++ b/src/app/chat/components/__tests__/tailwind-components.test.tsx
@@ -30,7 +30,7 @@ describe("chat Tailwind components", () => {
     expect(aiHtml).toContain('aria-label="AI avatar"');
     expect(aiHtml).toContain("size-(--chat-avatar-size,43px)");
     expect(aiHtml).toContain("size-full object-cover");
-    expect(aiHtml).toContain("%2Fimages%2Fchat%2Fpic-chat-elio.png");
+    expect(aiHtml).toContain("%2Fimages%2Favatar%2Felio.png");
     expect(userHtml).toContain('aria-label="User avatar"');
     expect(userHtml).toContain("%2Fuser-avatar.png");
   });
diff --git a/src/app/chat/components/message-avatar.tsx b/src/app/chat/components/message-avatar.tsx
index dd4bb651..c741b688 100644
--- a/src/app/chat/components/message-avatar.tsx
+++ b/src/app/chat/components/message-avatar.tsx
@@ -16,7 +16,7 @@ export function MessageAvatar({ isFromAI, userAvatarUrl }: MessageAvatarProps) {
     return (
       <div className={AVATAR_CLASS_NAME} aria-label="AI avatar">
         <Image
-          src="/images/chat/pic-chat-elio.png"
+          src="/images/avatar/elio.png"
           alt="Elio"
           width={43}
           height={43}
diff --git a/src/app/private-room/components/__tests__/private-album-card.test.tsx b/src/app/private-room/components/__tests__/private-album-card.test.tsx
index e6d105d2..8f36cf9e 100644
--- a/src/app/private-room/components/__tests__/private-album-card.test.tsx
+++ b/src/app/private-room/components/__tests__/private-album-card.test.tsx
@@ -33,7 +33,7 @@ function renderCard(album: PrivateAlbum): string {
     <PrivateAlbumCard
       album={album}
       displayName="Elio Silvestri"
-      avatarUrl="/images/chat/pic-chat-elio.png"
+      avatarUrl="/images/avatar/elio.png"
       index={0}
       isUnlocking={false}
       onOpenGallery={() => undefined}
diff --git a/src/app/private-room/private-room-screen.tsx b/src/app/private-room/private-room-screen.tsx
index 3e7b81f8..a6794c9f 100644
--- a/src/app/private-room/private-room-screen.tsx
+++ b/src/app/private-room/private-room-screen.tsx
@@ -36,7 +36,7 @@ import {
 
 const FALLBACK_PROFILE = {
   name: "Elio Silvestri",
-  avatar: "/images/chat/pic-chat-elio.png",
+  avatar: "/images/avatar/elio.png",
   title: "Elio Private room",
   subtitle: "Join me, unlock my private room",
 } as const;