diff --git a/src/main/res/drawable/message_bubble_received.xml b/src/main/res/drawable/message_bubble_received.xml
index da7c0ed0d83d4f400059339e175fda82f586f044..f494ba0a9949bd4eff29364393b6123664c5cfef 100644
--- a/src/main/res/drawable/message_bubble_received.xml
+++ b/src/main/res/drawable/message_bubble_received.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:left="15dp" android:top="1dp">
+    <item android:left="7dp" android:top="0dp">
         <shape android:shape="rectangle">
             <corners
                 android:radius="0dp"
@@ -17,7 +17,7 @@
             <solid android:color="?message_bubble_received_bg" />
         </shape>
     </item>
-    <item android:bottom="2dp" android:gravity="top|left" android:width="10dp" android:height="10dp" android:top="1dp">
+    <item android:left="-5dp" android:gravity="top|left" android:width="7dp" android:height="7dp" android:top="0dp">
         <vector
            android:width="24dp"
            android:height="24dp"
diff --git a/src/main/res/drawable/message_bubble_sent.xml b/src/main/res/drawable/message_bubble_sent.xml
index 2d2e113095e0d18a005bbaa03bd3e6d749e2ab82..07fd3f78929af20d731c65d47948101d961e2d27 100644
--- a/src/main/res/drawable/message_bubble_sent.xml
+++ b/src/main/res/drawable/message_bubble_sent.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:right="15dp" android:bottom="2dp">
+    <item android:right="7dp" android:bottom="0dp">
         <shape android:shape="rectangle">
             <corners
                 android:radius="0dp"
@@ -17,7 +17,7 @@
             <solid android:color="?message_bubble_sent_bg" />
         </shape>
     </item>
-    <item android:bottom="2dp" android:gravity="bottom|right" android:width="10dp" android:height="10dp">
+    <item android:bottom="0dp" android:right="-5dp" android:gravity="bottom|right" android:width="7dp" android:height="7dp">
         <vector
            android:width="24dp"
            android:height="24dp"
diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml
index e98dec28b1af46ac1608248835ac137637d1b051..fdec81b3a81af3fd0d5890b62291e40c0c05aea8 100644
--- a/src/main/res/layout/message_received.xml
+++ b/src/main/res/layout/message_received.xml
@@ -25,9 +25,9 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
-        android:layout_marginLeft="5dp"
+        android:layout_marginLeft="0dp"
         android:paddingTop="5dp"
-        android:paddingLeft="20dp"
+        android:paddingLeft="12dp"
         android:paddingBottom="5dp"
         android:layout_toRightOf="@+id/message_photo"
         android:background="?attr/message_bubble_received"
diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml
index 9ccda95e329498c4025713d608d1c217de2b4812..e9212547d042540c626a6704f8b9a4b5db8ad757 100644
--- a/src/main/res/layout/message_sent.xml
+++ b/src/main/res/layout/message_sent.xml
@@ -28,7 +28,7 @@
         android:layout_alignParentBottom="true"
         android:layout_marginRight="0dp"
         android:paddingTop="5dp"
-        android:paddingRight="20dp"
+        android:paddingRight="12dp"
         android:paddingBottom="5dp"
         android:layout_toLeftOf="@+id/message_photo"
         android:background="@drawable/message_bubble_sent"