diff --git a/imports/NeoChat/Component/Timeline/MessageDelegate.qml b/imports/NeoChat/Component/Timeline/MessageDelegate.qml
index 58e3abf0a..f4eab6b6a 100644
--- a/imports/NeoChat/Component/Timeline/MessageDelegate.qml
+++ b/imports/NeoChat/Component/Timeline/MessageDelegate.qml
@@ -37,6 +37,7 @@ RowLayout {
     spacing: Kirigami.Units.smallSpacing
     Layout.leftMargin: Kirigami.Units.largeSpacing
     Layout.rightMargin: Kirigami.Units.smallSpacing
+    Layout.bottomMargin: 0
     Layout.topMargin: showAuthor ? Kirigami.Units.smallSpacing : 0
 
     Kirigami.Avatar {
@@ -75,6 +76,7 @@ RowLayout {
         id: controlContainer
         Layout.fillWidth: true
         topPadding: 0
+        bottomPadding: 0
         contentItem: ColumnLayout {
             id: column
             spacing: Kirigami.Units.smallSpacing
diff --git a/imports/NeoChat/Component/Timeline/ReactionDelegate.qml b/imports/NeoChat/Component/Timeline/ReactionDelegate.qml
index 8cb16d8a0..784bd61da 100644
--- a/imports/NeoChat/Component/Timeline/ReactionDelegate.qml
+++ b/imports/NeoChat/Component/Timeline/ReactionDelegate.qml
@@ -12,7 +12,7 @@ import org.kde.kirigami 2.13 as Kirigami
 Flow {
     visible: (reaction && reaction.length > 0) ?? false
 
-    spacing: 8
+    spacing: Kirigami.Units.largeSpacing
 
     Repeater {
         model: reaction
@@ -27,13 +27,12 @@ Flow {
             contentItem: Label {
                 height: Kirigami.Units.largeSpacing * 3
                 text: modelData.reaction + (modelData.count > 1 ? " " + modelData.count : "")
-                font.family: "emoji"
                 elide: Text.ElideRight
             }
 
             background: Rectangle {
                 radius: height / 2
-                Kirigami.Theme.colorSet: Kirigami.Theme.View
+                Kirigami.Theme.colorSet: Kirigami.Theme.Window
                 color: Kirigami.Theme.backgroundColor
 
                 MouseArea {
@@ -43,7 +42,6 @@ Flow {
 
                     ToolTip {
                         visible: parent.containsMouse
-                        font.family: Kirigami.Theme.defaultFont.family + ", emoji"
                         text: {
                             var text = "";