diff --git a/stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/components/avatar/ChannelAvatar.kt b/stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/components/avatar/ChannelAvatar.kt
index b32c424c038..3d9eb4b631e 100644
--- a/stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/components/avatar/ChannelAvatar.kt
+++ b/stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/components/avatar/ChannelAvatar.kt
@@ -264,8 +264,8 @@ private fun BoxWithConstraintsScope.resolveStackedAvatarDimensions(): StackedGro
 private data class StackedGroupAvatarDimensions(val avatarSize: Dp, val badgeSize: CountBadgeSize) {
     companion object {
         val XXL = StackedGroupAvatarDimensions(avatarSize = AvatarSize.ExtraLarge, badgeSize = CountBadgeSize.Large)
-        val XL = StackedGroupAvatarDimensions(avatarSize = AvatarSize.Medium, badgeSize = CountBadgeSize.Medium)
-        val L = StackedGroupAvatarDimensions(avatarSize = AvatarSize.Small, badgeSize = CountBadgeSize.Small)
+        val XL = StackedGroupAvatarDimensions(avatarSize = AvatarSize.Medium, badgeSize = CountBadgeSize.Small)
+        val L = StackedGroupAvatarDimensions(avatarSize = AvatarSize.Small, badgeSize = CountBadgeSize.ExtraSmall)
     }
 }
 
diff --git a/stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/components/common/CountBadge.kt b/stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/components/common/CountBadge.kt
index 5cb9df007a1..074b00ea35d 100644
--- a/stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/components/common/CountBadge.kt
+++ b/stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/components/common/CountBadge.kt
@@ -75,20 +75,25 @@ internal data class CountBadgeSize(
     companion object {
         val Large = CountBadgeSize(
             minSize = 40.dp,
-            spacing = StreamTokens.spacing2xs,
-            textStyle = StreamDesign.Typography::numericLarge,
+            spacing = StreamTokens.spacingSm,
+            textStyle = StreamDesign.Typography::numericExtraLarge,
         )
         val Medium = CountBadgeSize(
             minSize = 32.dp,
             spacing = StreamTokens.spacingXs,
-            textStyle = StreamDesign.Typography::numericLarge,
+            textStyle = StreamDesign.Typography::numericExtraLarge,
         )
         val Small = CountBadgeSize(
             minSize = 24.dp,
-            spacing = StreamTokens.spacingSm,
+            spacing = StreamTokens.spacingXs,
+            textStyle = StreamDesign.Typography::numericExtraLarge,
+        )
+        val ExtraSmall = CountBadgeSize(
+            minSize = 20.dp,
+            spacing = StreamTokens.spacing2xs,
             textStyle = StreamDesign.Typography::numericMedium,
         )
-        val entries = listOf(Large, Medium, Small)
+        val entries = listOf(Large, Medium, Small, ExtraSmall)
     }
 }
 
diff --git a/stream-chat-android-compose/src/test/snapshots/images/io.getstream.chat.android.compose.ui.channels_ChannelListTest_loaded_channels.png b/stream-chat-android-compose/src/test/snapshots/images/io.getstream.chat.android.compose.ui.channels_ChannelListTest_loaded_channels.png
index 47109a26005..c5c53653408 100644
Binary files a/stream-chat-android-compose/src/test/snapshots/images/io.getstream.chat.android.compose.ui.channels_ChannelListTest_loaded_channels.png and b/stream-chat-android-compose/src/test/snapshots/images/io.getstream.chat.android.compose.ui.channels_ChannelListTest_loaded_channels.png differ
diff --git a/stream-chat-android-compose/src/test/snapshots/images/io.getstream.chat.android.compose.ui.channels_ChannelListTest_loading_more_channels.png b/stream-chat-android-compose/src/test/snapshots/images/io.getstream.chat.android.compose.ui.channels_ChannelListTest_loading_more_channels.png
index 732a5ecac0a..024b2e6eeea 100644
Binary files a/stream-chat-android-compose/src/test/snapshots/images/io.getstream.chat.android.compose.ui.channels_ChannelListTest_loading_more_channels.png and b/stream-chat-android-compose/src/test/snapshots/images/io.getstream.chat.android.compose.ui.channels_ChannelListTest_loading_more_channels.png differ
diff --git a/stream-chat-android-compose/src/test/snapshots/images/io.getstream.chat.android.compose.ui.channels_SelectedChannelMenuTest_selected_channel.png b/stream-chat-android-compose/src/test/snapshots/images/io.getstream.chat.android.compose.ui.channels_SelectedChannelMenuTest_selected_channel.png
index fd1b4b7b6f4..62347a0eb5f 100644
Binary files a/stream-chat-android-compose/src/test/snapshots/images/io.getstream.chat.android.compose.ui.channels_SelectedChannelMenuTest_selected_channel.png and b/stream-chat-android-compose/src/test/snapshots/images/io.getstream.chat.android.compose.ui.channels_SelectedChannelMenuTest_selected_channel.png differ
diff --git a/stream-chat-android-compose/src/test/snapshots/images/io.getstream.chat.android.compose.ui.channels_SelectedChannelMenuTest_selected_channel_in_dark_mode.png b/stream-chat-android-compose/src/test/snapshots/images/io.getstream.chat.android.compose.ui.channels_SelectedChannelMenuTest_selected_channel_in_dark_mode.png
index d4241e82d95..eb4c15e571d 100644
Binary files a/stream-chat-android-compose/src/test/snapshots/images/io.getstream.chat.android.compose.ui.channels_SelectedChannelMenuTest_selected_channel_in_dark_mode.png and b/stream-chat-android-compose/src/test/snapshots/images/io.getstream.chat.android.compose.ui.channels_SelectedChannelMenuTest_selected_channel_in_dark_mode.png differ