diff --git a/src/cheogram/res/values/styles.xml b/src/cheogram/res/values/styles.xml
index e3d57d75892217486f5d9abe0b9a5324e091a846..6faa3aaa936bde3fc03593a2b659a1f87b47a782 100644
--- a/src/cheogram/res/values/styles.xml
+++ b/src/cheogram/res/values/styles.xml
@@ -8,15 +8,15 @@
 <style name="ShapeAppearanceOverlay.MessageImageIn" parent="ShapeAppearance.MaterialComponents.SmallComponent">
 	<item name="cornerFamily">rounded</item>
 	<item name="cornerSizeTopLeft">0dp</item>
-	<item name="cornerSizeTopRight">16dp</item>
+	<item name="cornerSizeTopRight">@dimen/bubble_radius</item>
 	<item name="cornerSizeBottomLeft">0dp</item>
 	<item name="cornerSizeBottomRight">0dp</item>
 </style>
 
 <style name="ShapeAppearanceOverlay.MessageImageOut" parent="ShapeAppearance.MaterialComponents.SmallComponent">
 	<item name="cornerFamily">rounded</item>
-	<item name="cornerSizeTopLeft">16dp</item>
-	<item name="cornerSizeTopRight">16dp</item>
+	<item name="cornerSizeTopLeft">@dimen/bubble_radius</item>
+	<item name="cornerSizeTopRight">@dimen/bubble_radius</item>
 	<item name="cornerSizeBottomLeft">0dp</item>
 	<item name="cornerSizeBottomRight">0dp</item>
 </style>
diff --git a/src/main/res/drawable/message_bubble_received.xml b/src/main/res/drawable/message_bubble_received.xml
index dc12977a5c8a824b0b2069072260aaae838d39b4..da7c0ed0d83d4f400059339e175fda82f586f044 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="16dp"
-                android:bottomRightRadius="16dp"
+                android:bottomLeftRadius="@dimen/bubble_radius"
+                android:bottomRightRadius="@dimen/bubble_radius"
                 android:topLeftRadius="0dp"
-                android:topRightRadius="16dp" />
+                android:topRightRadius="@dimen/bubble_radius" />
             <padding
                 android:bottom="0dp"
                 android:left="5dp"
diff --git a/src/main/res/drawable/message_bubble_sent.xml b/src/main/res/drawable/message_bubble_sent.xml
index b4aa8b78288dd4d705dc255453a4bbc299f0bf43..2d2e113095e0d18a005bbaa03bd3e6d749e2ab82 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="16dp"
+                android:bottomLeftRadius="@dimen/bubble_radius"
                 android:bottomRightRadius="0dp"
-                android:topLeftRadius="16dp"
-                android:topRightRadius="16dp" />
+                android:topLeftRadius="@dimen/bubble_radius"
+                android:topRightRadius="@dimen/bubble_radius" />
             <padding
                 android:bottom="0dp"
                 android:left="5dp"
diff --git a/src/main/res/values/dimens.xml b/src/main/res/values/dimens.xml
index 419bf4adf4e7fe1579dce05a8bf6cb2292f88169..344ad5ed7bc9a142f51fd92fdaef39ecbef9de0c 100644
--- a/src/main/res/values/dimens.xml
+++ b/src/main/res/values/dimens.xml
@@ -26,6 +26,7 @@
     <dimen name="avatar_on_status_message">32dp</dimen>
     <dimen name="avatar">48dp</dimen>
     <dimen name="avatar_radius">10dp</dimen>
+    <dimen name="bubble_radius">10dp</dimen>
     <dimen name="avatar_on_details_screen_size">56dp</dimen>
     <dimen name="avatar_on_conversation_overview">56dp</dimen>