diff --git a/src/cheogram/res/values/styles.xml b/src/cheogram/res/values/styles.xml
index cc798d3b6b48d5fdeec67c250c0fefc6f8e98ded..5ea938aa2ff1fe1e361e5bc61d8808d4484bde2c 100644
--- a/src/cheogram/res/values/styles.xml
+++ b/src/cheogram/res/values/styles.xml
@@ -2,7 +2,7 @@
 
 <style name="ShapeAppearanceOverlay.Photo" parent="ShapeAppearance.MaterialComponents.SmallComponent">
 	<item name="cornerFamily">rounded</item>
-	<item name="cornerSize">2dp</item>
+	<item name="cornerSize">@dimen/avatar_radius</item>
 </style>
 
 <style name="ShapeAppearanceOverlay.IncomingCall" parent="ShapeAppearance.MaterialComponents.SmallComponent">
diff --git a/src/main/res/drawable/message_bubble_received.xml b/src/main/res/drawable/message_bubble_received.xml
index 6207f4a30a340ac54f03919fb65689183978d315..dc12977a5c8a824b0b2069072260aaae838d39b4 100644
--- a/src/main/res/drawable/message_bubble_received.xml
+++ b/src/main/res/drawable/message_bubble_received.xml
@@ -4,10 +4,10 @@
         <shape android:shape="rectangle">
             <corners
                 android:radius="0dp"
-                android:bottomLeftRadius="2dp"
-                android:bottomRightRadius="2dp"
+                android:bottomLeftRadius="16dp"
+                android:bottomRightRadius="16dp"
                 android:topLeftRadius="0dp"
-                android:topRightRadius="2dp" />
+                android:topRightRadius="16dp" />
             <padding
                 android:bottom="0dp"
                 android:left="5dp"
@@ -29,24 +29,4 @@
                 android:fillColor="?message_bubble_received_bg"/>
         </vector>
     </item>
-    <item android:gravity="top|left" android:top="-0.5dp" android:left="1dp" android:right="-2dp">
-        <shape android:shape="rectangle">
-            <corners
-                android:radius="0dp"
-                android:bottomLeftRadius="0dp"
-                android:bottomRightRadius="0dp"
-                android:topLeftRadius="0dp"
-                android:topRightRadius="2dp" />
-            <padding
-                android:bottom="0dp"
-                android:left="0dp"
-                android:right="0dp"
-                android:top="0dp" />
-            <size android:height="1dp" />
-            <gradient
-                android:startColor="?message_bubble_shadow_dark_top"
-                android:endColor="?message_bubble_shadow_light"
-                android:angle="90"/>
-        </shape>
-    </item>
 </layer-list>
diff --git a/src/main/res/drawable/message_bubble_sent.xml b/src/main/res/drawable/message_bubble_sent.xml
index 6048f0a1d87c46288b25566de490145e30a7cdb1..b4aa8b78288dd4d705dc255453a4bbc299f0bf43 100644
--- a/src/main/res/drawable/message_bubble_sent.xml
+++ b/src/main/res/drawable/message_bubble_sent.xml
@@ -4,10 +4,10 @@
         <shape android:shape="rectangle">
             <corners
                 android:radius="0dp"
-                android:bottomLeftRadius="2dp"
+                android:bottomLeftRadius="16dp"
                 android:bottomRightRadius="0dp"
-                android:topLeftRadius="2dp"
-                android:topRightRadius="2dp" />
+                android:topLeftRadius="16dp"
+                android:topRightRadius="16dp" />
             <padding
                 android:bottom="0dp"
                 android:left="5dp"
@@ -29,24 +29,4 @@
                 android:fillColor="?message_bubble_sent_bg"/>
         </vector>
     </item>
-    <item android:gravity="left|bottom" android:bottom="-0.5dp" android:left="-3dp" android:right="1dp">
-        <shape android:shape="rectangle">
-            <corners
-                android:radius="0dp"
-                android:bottomLeftRadius="2dp"
-                android:bottomRightRadius="0dp"
-                android:topLeftRadius="0dp"
-                android:topRightRadius="0dp" />
-            <padding
-                android:bottom="0dp"
-                android:left="0dp"
-                android:right="0dp"
-                android:top="0dp" />
-            <size android:height="2dp" />
-            <gradient
-                android:startColor="?message_bubble_shadow_light"
-                android:endColor="?message_bubble_shadow_dark"
-                android:angle="90"/>
-        </shape>
-    </item>
 </layer-list>
diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml
index 9d6c436d6f9dd73a46eb78c0db1fed90ac36cd6e..d75d83d935f0bce88584573cfa528bb42de2b9cf 100644
--- a/src/main/res/layout/message_received.xml
+++ b/src/main/res/layout/message_received.xml
@@ -30,7 +30,6 @@
         android:paddingTop="5dp"
         android:paddingBottom="5dp"
         android:layout_toRightOf="@+id/message_photo"
-        android:elevation="3dp"
         android:background="?attr/message_bubble_received"
         android:longClickable="true"
         android:minHeight="53dp">
diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml
index f857501d3855f8e12d45c440aa148ebca9425775..0abf419dc1c714441f0e4f127c8c41e2e2289070 100644
--- a/src/main/res/layout/message_sent.xml
+++ b/src/main/res/layout/message_sent.xml
@@ -31,7 +31,6 @@
         android:paddingTop="5dp"
         android:paddingBottom="5dp"
         android:layout_toLeftOf="@+id/message_photo"
-        android:elevation="3dp"
         android:background="@drawable/message_bubble_sent"
         android:longClickable="true"
         android:minHeight="53dp">
diff --git a/src/main/res/values/dimens.xml b/src/main/res/values/dimens.xml
index f8b031c28392d64d25b23d63e3600b383ac33d51..419bf4adf4e7fe1579dce05a8bf6cb2292f88169 100644
--- a/src/main/res/values/dimens.xml
+++ b/src/main/res/values/dimens.xml
@@ -25,6 +25,7 @@
     <dimen name="incoming_call_radius">48dp</dimen>
     <dimen name="avatar_on_status_message">32dp</dimen>
     <dimen name="avatar">48dp</dimen>
+    <dimen name="avatar_radius">10dp</dimen>
     <dimen name="avatar_on_details_screen_size">56dp</dimen>
     <dimen name="avatar_on_conversation_overview">56dp</dimen>