diff --git a/src/ui/Avatar/__tests__/__snapshots__/Avatar.spec.js.snap b/src/ui/Avatar/__tests__/__snapshots__/Avatar.spec.js.snap
index 29941c75a..e8fda54dd 100644
--- a/src/ui/Avatar/__tests__/__snapshots__/Avatar.spec.js.snap
+++ b/src/ui/Avatar/__tests__/__snapshots__/Avatar.spec.js.snap
@@ -58,9 +58,18 @@ exports[`ui/Avatar should do a snapshot test of the Avatar DOM with four element
         style="width: 100%; min-width: min(400px, 56px); max-width: 400px;"
       >
         <div
-          class="sendbird-image-renderer__image"
-          style="width: 100%; min-width: min(400px, 56px); max-width: 400px; position: absolute;"
-        />
+          class="sendbird-avatar-img--default "
+          style="width: 56px; height: 56px;"
+        >
+          <div
+            class=" sendbird-icon sendbird-icon-user sendbird-icon-color--content"
+            role="button"
+            style="width: 32.199999999999996px; min-width: 32.199999999999996px; height: 32.199999999999996px; min-height: 32.199999999999996px;"
+            tabindex="0"
+          >
+            <test-file-stub />
+          </div>
+        </div>
       </div>
     </div>
   </div>
@@ -212,9 +221,18 @@ exports[`ui/Avatar should render default image if src is empty 1`] = `
       style="width: 100%; min-width: min(400px, 56px); max-width: 400px;"
     >
       <div
-        class="sendbird-image-renderer__image"
-        style="width: 100%; min-width: min(400px, 56px); max-width: 400px; position: absolute;"
-      />
+        class="sendbird-avatar-img--default "
+        style="width: 56px; height: 56px;"
+      >
+        <div
+          class=" sendbird-icon sendbird-icon-user sendbird-icon-color--content"
+          role="button"
+          style="width: 32.199999999999996px; min-width: 32.199999999999996px; height: 32.199999999999996px; min-height: 32.199999999999996px;"
+          tabindex="0"
+        >
+          <test-file-stub />
+        </div>
+      </div>
     </div>
   </div>
 </DocumentFragment>
diff --git a/src/ui/ChannelAvatar/__tests__/ChannelAvatar.spec.js b/src/ui/ChannelAvatar/__tests__/ChannelAvatar.spec.js
index bea2e96ff..dc7ed9617 100644
--- a/src/ui/ChannelAvatar/__tests__/ChannelAvatar.spec.js
+++ b/src/ui/ChannelAvatar/__tests__/ChannelAvatar.spec.js
@@ -8,7 +8,7 @@ describe('ui/ChannelAvatar', () => {
   it('should render a normal default channel avatar', function() {
     const targetClassName = "sendbird-chat-header--avatar--group-channel";
     render(<ChannelAvatar channel={{}} />);
-    expect(screen.getByRole('button').className).toContain(targetClassName);
+    expect(screen.getAllByRole('button')[0].className).toContain(targetClassName);
   });
 
   it('should render a default avatar of broadcastChannel', function() {
diff --git a/src/ui/ImageRenderer/index.tsx b/src/ui/ImageRenderer/index.tsx
index 1e4b0fbd3..973197e42 100644
--- a/src/ui/ImageRenderer/index.tsx
+++ b/src/ui/ImageRenderer/index.tsx
@@ -135,7 +135,7 @@ const ImageRenderer = ({
         }}
       >
         {placeholderVisible && renderPlaceholder()}
-        {defaultComponentVisible ? renderDefault() : renderImage()}
+        {(!internalUrl || defaultComponentVisible) ? renderDefault() : renderImage()}
         {shadeOnHover && (
           <div
             className="sendbird-multiple-files-image-renderer__image-cover"
diff --git a/src/ui/MessageContent/__tests__/__snapshots__/MessageContent.spec.js.snap b/src/ui/MessageContent/__tests__/__snapshots__/MessageContent.spec.js.snap
index f755329f1..b63657108 100644
--- a/src/ui/MessageContent/__tests__/__snapshots__/MessageContent.spec.js.snap
+++ b/src/ui/MessageContent/__tests__/__snapshots__/MessageContent.spec.js.snap
@@ -23,9 +23,18 @@ exports[`ui/MessageContent should do a snapshot test of the MessageContent DOM 1
             style="width: 100%; min-width: min(400px, 28px); max-width: 400px;"
           >
             <div
-              class="sendbird-image-renderer__image"
-              style="width: 100%; min-width: min(400px, 28px); max-width: 400px; position: absolute;"
-            />
+              class="sendbird-avatar-img--default "
+              style="width: 28px; height: 28px;"
+            >
+              <div
+                class=" sendbird-icon sendbird-icon-user sendbird-icon-color--content"
+                role="button"
+                style="width: 16.099999999999998px; min-width: 16.099999999999998px; height: 16.099999999999998px; min-height: 16.099999999999998px;"
+                tabindex="0"
+              >
+                <test-file-stub />
+              </div>
+            </div>
           </div>
         </div>
       </div>
diff --git a/src/ui/MessageContent/index.scss b/src/ui/MessageContent/index.scss
index 0fb6d9123..17040a483 100644
--- a/src/ui/MessageContent/index.scss
+++ b/src/ui/MessageContent/index.scss
@@ -99,7 +99,7 @@
     .sendbird-message-content__middle__sender-name {
       margin-bottom: 4px;
       margin-left: 12px;
-      overflow-x: hidden;
+      overflow: hidden;
       position: relative;
       text-overflow: ellipsis;
       width: 100%;
diff --git a/src/ui/OGMessageItemBody/__tests__/__snapshots__/OGMessageItemBody.spec.js.snap b/src/ui/OGMessageItemBody/__tests__/__snapshots__/OGMessageItemBody.spec.js.snap
index 116c3a9d3..4eda22239 100644
--- a/src/ui/OGMessageItemBody/__tests__/__snapshots__/OGMessageItemBody.spec.js.snap
+++ b/src/ui/OGMessageItemBody/__tests__/__snapshots__/OGMessageItemBody.spec.js.snap
@@ -24,9 +24,17 @@ exports[`ui/OGMessageItemBody should do a snapshot test of the OGMessageItemBody
         style="width: 100%; min-width: min(400px, 100%); max-width: 400px;"
       >
         <div
-          class="sendbird-image-renderer__image"
-          style="width: 100%; min-width: min(400px, 100%); max-width: 400px; position: absolute;"
-        />
+          class="sendbird-og-message-item-body__og-thumbnail__place-holder"
+        >
+          <div
+            class="sendbird-og-message-item-body__og-thumbnail__place-holder__icon sendbird-icon sendbird-icon-thumbnail-none "
+            role="button"
+            style="width: 56px; min-width: 56px; height: 56px; min-height: 56px;"
+            tabindex="0"
+          >
+            <test-file-stub />
+          </div>
+        </div>
       </div>
     </div>
     <div