diff --git a/stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/components/messages/PollMessageContent.kt b/stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/components/messages/PollMessageContent.kt
index 05c162dcb67..e8a1e864cfe 100644
--- a/stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/components/messages/PollMessageContent.kt
+++ b/stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/components/messages/PollMessageContent.kt
@@ -150,7 +150,7 @@ public fun PollMessageContent(
         Box(modifier = modifier) {
             ChatTheme.componentFactory.MessageBubble(
                 params = MessageBubbleParams(
-                    modifier = Modifier.padding(end = 12.dp),
+                    modifier = Modifier.padding(end = StreamTokens.spacingXs),
                     message = message,
                     shape = messageBubbleShape,
                     color = messageBubbleColor,
@@ -171,8 +171,9 @@ public fun PollMessageContent(
             ChatTheme.componentFactory.MessageFailedIcon(
                 params = MessageFailedIconParams(
                     modifier = Modifier
-                        .size(24.dp)
-                        .align(Alignment.BottomEnd),
+                        .padding(vertical = StreamTokens.spacingXs)
+                        .size(20.dp)
+                        .align(Alignment.TopEnd),
                     message = message,
                 ),
             )
diff --git a/stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/messages/list/MessageContainer.kt b/stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/messages/list/MessageContainer.kt
index 20c4579f78f..8cdfc9151f1 100644
--- a/stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/messages/list/MessageContainer.kt
+++ b/stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/messages/list/MessageContainer.kt
@@ -718,8 +718,9 @@ public fun EmojiMessageContent(
             ChatTheme.componentFactory.MessageFailedIcon(
                 params = MessageFailedIconParams(
                     modifier = Modifier
-                        .size(24.dp)
-                        .align(Alignment.BottomEnd),
+                        .padding(vertical = StreamTokens.spacingXs)
+                        .size(20.dp)
+                        .align(Alignment.TopEnd),
                     message = message,
                 ),
             )
@@ -782,7 +783,7 @@ public fun RegularMessageContent(
         Box(modifier = modifier) {
             ChatTheme.componentFactory.MessageBubble(
                 params = MessageBubbleParams(
-                    modifier = Modifier.padding(end = 12.dp),
+                    modifier = Modifier.padding(end = StreamTokens.spacingXs),
                     message = message,
                     shape = messageBubbleShape,
                     color = messageBubbleColor,
@@ -793,8 +794,9 @@ public fun RegularMessageContent(
             ChatTheme.componentFactory.MessageFailedIcon(
                 params = MessageFailedIconParams(
                     modifier = Modifier
-                        .size(24.dp)
-                        .align(Alignment.BottomEnd)
+                        .padding(vertical = StreamTokens.spacingXs)
+                        .size(20.dp)
+                        .align(Alignment.TopEnd)
                         .testTag("Stream_MessageFailedIcon"),
                     message = message,
                 ),
diff --git a/stream-chat-android-compose/src/test/snapshots/images/io.getstream.chat.android.compose.ui.components.messages_PollMessageContentTest_error_poll_content.png b/stream-chat-android-compose/src/test/snapshots/images/io.getstream.chat.android.compose.ui.components.messages_PollMessageContentTest_error_poll_content.png
index 3c51bc0d327..018c7ac5844 100644
Binary files a/stream-chat-android-compose/src/test/snapshots/images/io.getstream.chat.android.compose.ui.components.messages_PollMessageContentTest_error_poll_content.png and b/stream-chat-android-compose/src/test/snapshots/images/io.getstream.chat.android.compose.ui.components.messages_PollMessageContentTest_error_poll_content.png differ
diff --git a/stream-chat-android-compose/src/test/snapshots/images/io.getstream.chat.android.compose.ui.messages.list_EmojiMessageContentTest_error_emoji_content.png b/stream-chat-android-compose/src/test/snapshots/images/io.getstream.chat.android.compose.ui.messages.list_EmojiMessageContentTest_error_emoji_content.png
index 9712c81ce81..e32b5ce4802 100644
Binary files a/stream-chat-android-compose/src/test/snapshots/images/io.getstream.chat.android.compose.ui.messages.list_EmojiMessageContentTest_error_emoji_content.png and b/stream-chat-android-compose/src/test/snapshots/images/io.getstream.chat.android.compose.ui.messages.list_EmojiMessageContentTest_error_emoji_content.png differ
diff --git a/stream-chat-android-compose/src/test/snapshots/images/io.getstream.chat.android.compose.ui.messages.list_RegularMessageContentTest_error_own_regular_content.png b/stream-chat-android-compose/src/test/snapshots/images/io.getstream.chat.android.compose.ui.messages.list_RegularMessageContentTest_error_own_regular_content.png
index 0b0a98ab658..c3d402ce9b0 100644
Binary files a/stream-chat-android-compose/src/test/snapshots/images/io.getstream.chat.android.compose.ui.messages.list_RegularMessageContentTest_error_own_regular_content.png and b/stream-chat-android-compose/src/test/snapshots/images/io.getstream.chat.android.compose.ui.messages.list_RegularMessageContentTest_error_own_regular_content.png differ
diff --git a/stream-chat-android-compose/src/test/snapshots/images/io.getstream.chat.android.compose.ui.messages_MessageListTest_loaded_messages.png b/stream-chat-android-compose/src/test/snapshots/images/io.getstream.chat.android.compose.ui.messages_MessageListTest_loaded_messages.png
index 64c0145c64e..81fbc0d6349 100644
Binary files a/stream-chat-android-compose/src/test/snapshots/images/io.getstream.chat.android.compose.ui.messages_MessageListTest_loaded_messages.png and b/stream-chat-android-compose/src/test/snapshots/images/io.getstream.chat.android.compose.ui.messages_MessageListTest_loaded_messages.png differ
diff --git a/stream-chat-android-compose/src/test/snapshots/images/io.getstream.chat.android.compose.ui.messages_MessageListTest_loaded_messages_in_dark_mode.png b/stream-chat-android-compose/src/test/snapshots/images/io.getstream.chat.android.compose.ui.messages_MessageListTest_loaded_messages_in_dark_mode.png
index 50eb24557d9..353e1462292 100644
Binary files a/stream-chat-android-compose/src/test/snapshots/images/io.getstream.chat.android.compose.ui.messages_MessageListTest_loaded_messages_in_dark_mode.png and b/stream-chat-android-compose/src/test/snapshots/images/io.getstream.chat.android.compose.ui.messages_MessageListTest_loaded_messages_in_dark_mode.png differ