diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/Reaction.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/Reaction.kt
index 3d2e0e8f5..19ddb50eb 100644
--- a/app/src/main/java/com/nextcloud/talk/adapters/messages/Reaction.kt
+++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/Reaction.kt
@@ -24,6 +24,7 @@
 package com.nextcloud.talk.adapters.messages
 
 import android.content.Context
+import android.view.View
 import android.view.ViewGroup
 import android.widget.LinearLayout
 import android.widget.TextView
@@ -87,6 +88,8 @@ class Reaction {
                     break
                 }
             }
+        } else {
+            binding.reactionsEmojiWrapper.visibility = View.GONE
         }
     }
 
diff --git a/app/src/main/res/drawable/shape_incoming_message.xml b/app/src/main/res/drawable/shape_incoming_message.xml
index b7b2b8f58..69f37ed3a 100644
--- a/app/src/main/res/drawable/shape_incoming_message.xml
+++ b/app/src/main/res/drawable/shape_incoming_message.xml
@@ -23,7 +23,7 @@
        android:shape="rectangle">
 
     <corners
-        android:topLeftRadius="0dp"
+        android:topLeftRadius="2dp"
         android:bottomRightRadius="@dimen/message_bubble_corners_radius"
         android:bottomLeftRadius="@dimen/message_bubble_corners_radius"
         android:topRightRadius="@dimen/message_bubble_corners_radius" />
diff --git a/app/src/main/res/drawable/shape_outcoming_message.xml b/app/src/main/res/drawable/shape_outcoming_message.xml
index 574cb08aa..2cc20acf6 100644
--- a/app/src/main/res/drawable/shape_outcoming_message.xml
+++ b/app/src/main/res/drawable/shape_outcoming_message.xml
@@ -24,7 +24,7 @@
 
     <corners
         android:bottomLeftRadius="@dimen/message_bubble_corners_radius"
-        android:topRightRadius="0dp"
+        android:topRightRadius="2dp"
         android:topLeftRadius="@dimen/message_bubble_corners_radius"
         android:bottomRightRadius="@dimen/message_bubble_corners_radius" />
 
diff --git a/app/src/main/res/layout/controller_chat.xml b/app/src/main/res/layout/controller_chat.xml
index 1e42b0657..724e238b6 100644
--- a/app/src/main/res/layout/controller_chat.xml
+++ b/app/src/main/res/layout/controller_chat.xml
@@ -64,10 +64,10 @@
             android:paddingBottom="0dp"
             android:visibility="gone"
             app:dateHeaderTextSize="13sp"
-            app:incomingBubblePaddingBottom="@dimen/message_bubble_corners_padding"
-            app:incomingBubblePaddingLeft="@dimen/message_bubble_corners_padding"
-            app:incomingBubblePaddingRight="@dimen/message_bubble_corners_padding"
-            app:incomingBubblePaddingTop="@dimen/message_bubble_corners_padding"
+            app:incomingBubblePaddingBottom="@dimen/message_bubble_corners_vertical_padding"
+            app:incomingBubblePaddingLeft="@dimen/message_bubble_corners_horizontal_padding"
+            app:incomingBubblePaddingRight="@dimen/message_bubble_corners_horizontal_padding"
+            app:incomingBubblePaddingTop="@dimen/message_bubble_corners_vertical_padding"
             app:incomingDefaultBubbleColor="@color/bg_message_list_incoming_bubble"
             app:incomingDefaultBubblePressedColor="@color/bg_message_list_incoming_bubble"
             app:incomingDefaultBubbleSelectedColor="@color/transparent"
@@ -77,10 +77,10 @@
             app:incomingTimeTextColor="@color/no_emphasis_text"
             app:incomingTextSize="@dimen/chat_text_size"
             app:incomingTimeTextSize="12sp"
-            app:outcomingBubblePaddingBottom="@dimen/message_bubble_corners_padding"
-            app:outcomingBubblePaddingLeft="@dimen/message_bubble_corners_padding"
-            app:outcomingBubblePaddingRight="@dimen/message_bubble_corners_padding"
-            app:outcomingBubblePaddingTop="@dimen/message_bubble_corners_padding"
+            app:outcomingBubblePaddingBottom="@dimen/message_bubble_corners_vertical_padding"
+            app:outcomingBubblePaddingLeft="@dimen/message_bubble_corners_horizontal_padding"
+            app:outcomingBubblePaddingRight="@dimen/message_bubble_corners_horizontal_padding"
+            app:outcomingBubblePaddingTop="@dimen/message_bubble_corners_vertical_padding"
             app:outcomingDefaultBubbleColor="@color/colorPrimary"
             app:outcomingDefaultBubblePressedColor="@color/colorPrimary"
             app:outcomingDefaultBubbleSelectedColor="@color/transparent"
diff --git a/app/src/main/res/layout/item_custom_outcoming_location_message.xml b/app/src/main/res/layout/item_custom_outcoming_location_message.xml
index 4d3ccbb56..bb8ad318a 100644
--- a/app/src/main/res/layout/item_custom_outcoming_location_message.xml
+++ b/app/src/main/res/layout/item_custom_outcoming_location_message.xml
@@ -78,7 +78,7 @@
         <ImageView
             android:id="@+id/checkMark"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="@dimen/message_bubble_checkmark_height"
             android:layout_below="@id/messageTime"
             android:layout_marginStart="8dp"
             android:contentDescription="@null"
diff --git a/app/src/main/res/layout/item_custom_outcoming_poll_message.xml b/app/src/main/res/layout/item_custom_outcoming_poll_message.xml
index 6ae34a70a..7518406b2 100644
--- a/app/src/main/res/layout/item_custom_outcoming_poll_message.xml
+++ b/app/src/main/res/layout/item_custom_outcoming_poll_message.xml
@@ -90,7 +90,7 @@
         <ImageView
             android:id="@+id/checkMark"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="@dimen/message_bubble_checkmark_height"
             android:layout_below="@id/messageTime"
             android:layout_marginStart="8dp"
             android:contentDescription="@null"
diff --git a/app/src/main/res/layout/item_custom_outcoming_text_message.xml b/app/src/main/res/layout/item_custom_outcoming_text_message.xml
index 139b1b97c..fd586726f 100644
--- a/app/src/main/res/layout/item_custom_outcoming_text_message.xml
+++ b/app/src/main/res/layout/item_custom_outcoming_text_message.xml
@@ -75,7 +75,7 @@
         <ImageView
             android:id="@+id/checkMark"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="@dimen/message_bubble_checkmark_height"
             android:layout_below="@id/messageTime"
             android:layout_marginStart="8dp"
             android:contentDescription="@null"
diff --git a/app/src/main/res/layout/item_custom_outcoming_voice_message.xml b/app/src/main/res/layout/item_custom_outcoming_voice_message.xml
index 0a3223f30..8e5f08748 100644
--- a/app/src/main/res/layout/item_custom_outcoming_voice_message.xml
+++ b/app/src/main/res/layout/item_custom_outcoming_voice_message.xml
@@ -100,7 +100,7 @@
         <ImageView
             android:id="@+id/checkMark"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="@dimen/message_bubble_checkmark_height"
             android:layout_below="@id/messageTime"
             android:layout_marginStart="8dp"
             android:contentDescription="@null"
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index fa9a62401..c5d27191c 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -37,8 +37,10 @@
     <dimen name="avatar_size_big">96dp</dimen>
 
     <dimen name="chat_text_size">14sp</dimen>
-    <dimen name="message_bubble_corners_radius">@dimen/dialogBorderRadius</dimen>
-    <dimen name="message_bubble_corners_padding">16dp</dimen>
+    <dimen name="message_bubble_corners_radius">20dp</dimen>
+    <dimen name="message_bubble_corners_horizontal_padding">16dp</dimen>
+    <dimen name="message_bubble_corners_vertical_padding">12dp</dimen>
+    <dimen name="message_bubble_checkmark_height">18dp</dimen>
 
     <dimen name="geocoding_result_text_size">18sp</dimen>