diff --git a/app/src/main/java/com/getcode/ui/components/Badge.kt b/app/src/main/java/com/getcode/ui/components/Badge.kt
index 3f233dfd0..eed992d2c 100644
--- a/app/src/main/java/com/getcode/ui/components/Badge.kt
+++ b/app/src/main/java/com/getcode/ui/components/Badge.kt
@@ -32,7 +32,7 @@ fun Badge(
     enterTransition: EnterTransition = scaleIn(tween(durationMillis = 300)) + fadeIn(),
     exitTransition: ExitTransition = fadeOut() + scaleOut(tween(durationMillis = 300))
 ) {
-    AnimatedVisibility(visible = count > 0, enter = enterTransition, exit = exitTransition) {
+    AnimatedVisibility(modifier = modifier, visible = count > 0, enter = enterTransition, exit = exitTransition) {
         val text = when {
             count in 1..99 -> "$count"
             else -> "99+"
@@ -42,7 +42,7 @@ fun Badge(
             text = text,
             color = contentColor,
             style = CodeTheme.typography.body1.copy(fontWeight = FontWeight.W700),
-            modifier = modifier
+            modifier = Modifier
                 .drawBehind {
                     drawCircle(
                         color = color,
diff --git a/app/src/main/java/com/getcode/ui/components/chat/ChatNode.kt b/app/src/main/java/com/getcode/ui/components/chat/ChatNode.kt
index 374002a89..da43370d5 100644
--- a/app/src/main/java/com/getcode/ui/components/chat/ChatNode.kt
+++ b/app/src/main/java/com/getcode/ui/components/chat/ChatNode.kt
@@ -26,6 +26,7 @@ import com.getcode.theme.BrandLight
 import com.getcode.theme.CodeTheme
 import com.getcode.ui.components.Badge
 import com.getcode.ui.components.chat.utils.localizedText
+import com.getcode.ui.utils.debugBounds
 import com.getcode.util.DateUtils
 import java.util.Locale
 
@@ -79,12 +80,14 @@ fun ChatNode(
             )
             if (chat.isMuted) {
                 Icon(
-                    Icons.AutoMirrored.Filled.VolumeOff,
+                    imageVector = Icons.AutoMirrored.Filled.VolumeOff,
                     contentDescription = "chat is muted",
                     tint = BrandLight
                 )
             } else {
                 Badge(
+                    Modifier
+                        .padding(end = CodeTheme.dimens.grid.x1),
                     count = chat.unreadCount,
                     color = ChatNodeDefaults.UnreadIndicator
                 )