diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ChatroomMessageCompose.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ChatroomMessageCompose.kt
index 842ac50e8..aaac33cd0 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ChatroomMessageCompose.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ChatroomMessageCompose.kt
@@ -78,6 +78,7 @@ import com.vitorpamplona.amethyst.ui.theme.DoubleHorzSpacer
 import com.vitorpamplona.amethyst.ui.theme.Font12SP
 import com.vitorpamplona.amethyst.ui.theme.HalfTopPadding
 import com.vitorpamplona.amethyst.ui.theme.ReactionRowHeightChat
+import com.vitorpamplona.amethyst.ui.theme.RowColSpacing
 import com.vitorpamplona.amethyst.ui.theme.Size10dp
 import com.vitorpamplona.amethyst.ui.theme.Size15Modifier
 import com.vitorpamplona.amethyst.ui.theme.Size20dp
@@ -388,18 +389,21 @@ private fun MessageBubbleLines(
                 Spacer(modifier = DoubleHorzSpacer)
             },
             secondColumn = {
-                LikeReaction(baseNote, MaterialTheme.colorScheme.placeholderText, accountViewModel, nav)
-                Spacer(modifier = StdHorzSpacer)
+                Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = RowColSpacing) {
+                    LikeReaction(baseNote, MaterialTheme.colorScheme.placeholderText, accountViewModel, nav)
+                }
                 ZapReaction(baseNote, MaterialTheme.colorScheme.placeholderText, accountViewModel, nav = nav)
-                Spacer(modifier = DoubleHorzSpacer)
-                ReplyReaction(
-                    baseNote = baseNote,
-                    grayTint = MaterialTheme.colorScheme.placeholderText,
-                    accountViewModel = accountViewModel,
-                    showCounter = false,
-                    iconSizeModifier = Size15Modifier,
-                ) {
-                    onWantsToReply(baseNote)
+                Spacer(modifier = StdHorzSpacer)
+                Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = RowColSpacing) {
+                    ReplyReaction(
+                        baseNote = baseNote,
+                        grayTint = MaterialTheme.colorScheme.placeholderText,
+                        accountViewModel = accountViewModel,
+                        showCounter = false,
+                        iconSizeModifier = Size15Modifier,
+                    ) {
+                        onWantsToReply(baseNote)
+                    }
                 }
                 Spacer(modifier = StdHorzSpacer)
             },
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ReactionsRow.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ReactionsRow.kt
index 48cd16e9a..782e1c38a 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ReactionsRow.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ReactionsRow.kt
@@ -34,6 +34,7 @@ import androidx.compose.animation.slideInVertically
 import androidx.compose.animation.slideOutVertically
 import androidx.compose.animation.togetherWith
 import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.background
 import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Arrangement
@@ -786,7 +787,6 @@ fun LikeReaction(
         contentAlignment = Center,
         modifier =
             Modifier
-                .size(iconSize)
                 .combinedClickable(
                     role = Role.Button,
                     interactionSource = remember { MutableInteractionSource() },
@@ -879,8 +879,8 @@ private fun RenderReactionType(
     } else {
         when (reactionType) {
             "+" -> LikedIcon(iconSizeModifier)
-            "-" -> Text(text = "\uD83D\uDC4E", fontSize = iconFontSize)
-            else -> Text(text = reactionType, fontSize = iconFontSize)
+            "-" -> Text(text = "\uD83D\uDC4E", maxLines = 1, fontSize = iconFontSize)
+            else -> Text(text = reactionType, maxLines = 1, fontSize = iconFontSize)
         }
     }
 }