diff --git a/app/src/main/java/org/linphone/ui/main/chat/model/ChatMessageDeliveryModel.kt b/app/src/main/java/org/linphone/ui/main/chat/model/ChatMessageDeliveryModel.kt
index a39217ad3..3ab90d6e7 100644
--- a/app/src/main/java/org/linphone/ui/main/chat/model/ChatMessageDeliveryModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/chat/model/ChatMessageDeliveryModel.kt
@@ -85,7 +85,7 @@ class ChatMessageDeliveryModel @WorkerThread constructor(
             displayedModels.add(
                 ChatMessageBottomSheetParticipantModel(
                     participant.participant.address,
-                    TimestampUtils.timeToString(participant.stateChangeTime)
+                    TimestampUtils.toString(participant.stateChangeTime)
                 )
             )
         }
@@ -94,7 +94,7 @@ class ChatMessageDeliveryModel @WorkerThread constructor(
             displayedModels.add(
                 ChatMessageBottomSheetParticipantModel(
                     chatMessage.localAddress,
-                    TimestampUtils.timeToString(chatMessage.time)
+                    TimestampUtils.toString(chatMessage.time)
                 )
             )
         }
@@ -110,7 +110,7 @@ class ChatMessageDeliveryModel @WorkerThread constructor(
             deliveredModels.add(
                 ChatMessageBottomSheetParticipantModel(
                     participant.participant.address,
-                    TimestampUtils.timeToString(participant.stateChangeTime)
+                    TimestampUtils.toString(participant.stateChangeTime)
                 )
             )
         }
@@ -126,7 +126,7 @@ class ChatMessageDeliveryModel @WorkerThread constructor(
             sentModels.add(
                 ChatMessageBottomSheetParticipantModel(
                     participant.participant.address,
-                    TimestampUtils.timeToString(participant.stateChangeTime)
+                    TimestampUtils.toString(participant.stateChangeTime)
                 )
             )
         }
@@ -142,7 +142,7 @@ class ChatMessageDeliveryModel @WorkerThread constructor(
             errorModels.add(
                 ChatMessageBottomSheetParticipantModel(
                     participant.participant.address,
-                    TimestampUtils.timeToString(participant.stateChangeTime)
+                    TimestampUtils.toString(participant.stateChangeTime)
                 )
             )
         }
diff --git a/app/src/main/res/layout/chat_bubble_incoming.xml b/app/src/main/res/layout/chat_bubble_incoming.xml
index 532d0be00..843879259 100644
--- a/app/src/main/res/layout/chat_bubble_incoming.xml
+++ b/app/src/main/res/layout/chat_bubble_incoming.xml
@@ -220,6 +220,7 @@
                     android:layout_width="@dimen/small_icon_size"
                     android:layout_height="@dimen/small_icon_size"
                     android:layout_marginStart="5dp"
+                    android:layout_marginTop="2dp"
                     android:src="@{model.statusIcon, default=@drawable/checks}"
                     android:visibility="@{model.isGroupedWithNextOne ? View.VISIBLE : View.GONE}"
                     app:tint="@color/orange_main_500" />
diff --git a/app/src/main/res/layout/chat_bubble_outgoing.xml b/app/src/main/res/layout/chat_bubble_outgoing.xml
index c53c6c3ef..79c675eb1 100644
--- a/app/src/main/res/layout/chat_bubble_outgoing.xml
+++ b/app/src/main/res/layout/chat_bubble_outgoing.xml
@@ -99,6 +99,7 @@
             android:layout_height="wrap_content"
             android:padding="10dp"
             android:orientation="vertical"
+            android:gravity="end"
             android:background="@{model.isGroupedWithPreviousOne ? @drawable/shape_chat_bubble_outgoing_full : @drawable/shape_chat_bubble_outgoing_first, default=@drawable/shape_chat_bubble_outgoing_first}"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintWidth_max="@dimen/chat_bubble_max_width"
@@ -158,10 +159,10 @@
                 android:visibility="@{model.text.length() > 0 ? View.VISIBLE : View.GONE}"/>
 
             <LinearLayout
-                android:layout_width="match_parent"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="5dp"
-                android:gravity="center_vertical|end"
+                android:gravity="center_vertical"
                 android:orientation="horizontal">
 
                 <androidx.appcompat.widget.AppCompatTextView
@@ -181,6 +182,7 @@
                     android:layout_width="@dimen/small_icon_size"
                     android:layout_height="@dimen/small_icon_size"
                     android:layout_marginStart="5dp"
+                    android:layout_marginTop="2dp"
                     android:src="@{model.statusIcon, default=@drawable/checks}"
                     android:visibility="@{model.isGroupedWithNextOne ? View.VISIBLE : View.GONE}"
                     app:tint="@color/orange_main_500" />
diff --git a/app/src/main/res/layout/chat_bubble_voice_record_content.xml b/app/src/main/res/layout/chat_bubble_voice_record_content.xml
index 3c470b3e1..99af40bf9 100644
--- a/app/src/main/res/layout/chat_bubble_voice_record_content.xml
+++ b/app/src/main/res/layout/chat_bubble_voice_record_content.xml
@@ -20,8 +20,6 @@
             android:id="@+id/voice_record_progress"
             android:layout_width="0dp"
             android:layout_height="48dp"
-            android:layout_marginStart="10dp"
-            android:layout_marginEnd="10dp"
             android:progressDrawable="@drawable/voice_recording_gradient_progress"
             android:progress="@{model.voiceRecordPlayerPosition}"
             android:max="@{model.voiceRecordingDuration}"