diff --git a/generate_bubbles.sh b/generate_bubbles.sh
index eee32febde..e722f720e4 100755
--- a/generate_bubbles.sh
+++ b/generate_bubbles.sh
@@ -67,6 +67,7 @@ function create_msg_bubble() {
         mised 's|<!-- Filled for tail -->.*\(<!-- Filled for no tail -->\)|\1|' "$out_bubble"
         mised 's|<!-- Tail -->.*<!-- Tail end -->||' "$out_bubble"
         mised 's|<!-- Outer radius -->.*\(<!-- Inner radius -->\)|\1|' "$out_bubble"
+        sed -i 's|sc_bubble_radius_in_tail|sc_bubble_radius|g' "$out_bubble"
     fi
     # Modify fill
     if !((is_notice)); then
diff --git a/vector/src/main/res/drawable-ldrtl/msg_bubble_notice_incoming.xml b/vector/src/main/res/drawable-ldrtl/msg_bubble_notice_incoming.xml
index 4d8c3978e7..60f4027e61 100644
--- a/vector/src/main/res/drawable-ldrtl/msg_bubble_notice_incoming.xml
+++ b/vector/src/main/res/drawable-ldrtl/msg_bubble_notice_incoming.xml
@@ -14,8 +14,6 @@ Note also that most of the comments should not be changed without checking their
 
             <solid android:color="?sc_notice_bg_incoming" />
 
-            <corners android:radius="@dimen/sc_bubble_radius" />
-
             <corners android:bottomRightRadius="@dimen/sc_bubble_radius"
                 android:bottomLeftRadius="@dimen/sc_bubble_radius"
                 android:topLeftRadius="@dimen/sc_bubble_radius" />
diff --git a/vector/src/main/res/drawable-ldrtl/msg_bubble_notice_incoming_notail.xml b/vector/src/main/res/drawable-ldrtl/msg_bubble_notice_incoming_notail.xml
index 53711e56ae..05a5833191 100644
--- a/vector/src/main/res/drawable-ldrtl/msg_bubble_notice_incoming_notail.xml
+++ b/vector/src/main/res/drawable-ldrtl/msg_bubble_notice_incoming_notail.xml
@@ -31,7 +31,7 @@ Note also that most of the comments should not be changed without checking their
             <corners android:bottomRightRadius="@dimen/sc_bubble_radius"
                 android:bottomLeftRadius="@dimen/sc_bubble_radius"
                 android:topLeftRadius="@dimen/sc_bubble_radius"
-                android:topRightRadius="@dimen/sc_bubble_radius_in_tail" />
+                android:topRightRadius="@dimen/sc_bubble_radius" />
 
         </shape>
     </item>
diff --git a/vector/src/main/res/drawable-ldrtl/msg_bubble_notice_outgoing.xml b/vector/src/main/res/drawable-ldrtl/msg_bubble_notice_outgoing.xml
index a907b1afd2..3f5c7172a0 100644
--- a/vector/src/main/res/drawable-ldrtl/msg_bubble_notice_outgoing.xml
+++ b/vector/src/main/res/drawable-ldrtl/msg_bubble_notice_outgoing.xml
@@ -14,8 +14,6 @@ Note also that most of the comments should not be changed without checking their
 
             <solid android:color="?sc_notice_bg_outgoing" />
 
-            <corners android:radius="@dimen/sc_bubble_radius" />
-
             <corners android:bottomLeftRadius="@dimen/sc_bubble_radius"
                 android:bottomRightRadius="@dimen/sc_bubble_radius"
                 android:topRightRadius="@dimen/sc_bubble_radius" />
diff --git a/vector/src/main/res/drawable-ldrtl/msg_bubble_notice_outgoing_notail.xml b/vector/src/main/res/drawable-ldrtl/msg_bubble_notice_outgoing_notail.xml
index 856154ff7b..69cfe2f90d 100644
--- a/vector/src/main/res/drawable-ldrtl/msg_bubble_notice_outgoing_notail.xml
+++ b/vector/src/main/res/drawable-ldrtl/msg_bubble_notice_outgoing_notail.xml
@@ -31,7 +31,7 @@ Note also that most of the comments should not be changed without checking their
             <corners android:bottomLeftRadius="@dimen/sc_bubble_radius"
                 android:bottomRightRadius="@dimen/sc_bubble_radius"
                 android:topRightRadius="@dimen/sc_bubble_radius"
-                android:topLeftRadius="@dimen/sc_bubble_radius_in_tail" />
+                android:topLeftRadius="@dimen/sc_bubble_radius" />
 
         </shape>
     </item>
diff --git a/vector/src/main/res/drawable-ldrtl/msg_bubble_text_incoming.xml b/vector/src/main/res/drawable-ldrtl/msg_bubble_text_incoming.xml
index 24c473c806..552930b67a 100644
--- a/vector/src/main/res/drawable-ldrtl/msg_bubble_text_incoming.xml
+++ b/vector/src/main/res/drawable-ldrtl/msg_bubble_text_incoming.xml
@@ -14,8 +14,6 @@ Note also that most of the comments should not be changed without checking their
 
             <solid android:color="?sc_message_bg_incoming" />
 
-            <corners android:radius="@dimen/sc_bubble_radius" />
-
             <corners android:bottomRightRadius="@dimen/sc_bubble_radius"
                 android:bottomLeftRadius="@dimen/sc_bubble_radius"
                 android:topLeftRadius="@dimen/sc_bubble_radius" />
diff --git a/vector/src/main/res/drawable-ldrtl/msg_bubble_text_outgoing.xml b/vector/src/main/res/drawable-ldrtl/msg_bubble_text_outgoing.xml
index 18becd117a..47e407cd7d 100644
--- a/vector/src/main/res/drawable-ldrtl/msg_bubble_text_outgoing.xml
+++ b/vector/src/main/res/drawable-ldrtl/msg_bubble_text_outgoing.xml
@@ -14,8 +14,6 @@ Note also that most of the comments should not be changed without checking their
 
             <solid android:color="?sc_message_bg_outgoing" />
 
-            <corners android:radius="@dimen/sc_bubble_radius" />
-
             <corners android:bottomLeftRadius="@dimen/sc_bubble_radius"
                 android:bottomRightRadius="@dimen/sc_bubble_radius"
                 android:topRightRadius="@dimen/sc_bubble_radius" />
diff --git a/vector/src/main/res/drawable/msg_bubble_notice_incoming.xml b/vector/src/main/res/drawable/msg_bubble_notice_incoming.xml
index 9d5e739537..4ff4b46b73 100644
--- a/vector/src/main/res/drawable/msg_bubble_notice_incoming.xml
+++ b/vector/src/main/res/drawable/msg_bubble_notice_incoming.xml
@@ -14,8 +14,6 @@ Note also that most of the comments should not be changed without checking their
 
             <solid android:color="?sc_notice_bg_incoming" />
 
-            <corners android:radius="@dimen/sc_bubble_radius" />
-
             <corners android:bottomLeftRadius="@dimen/sc_bubble_radius"
                 android:bottomRightRadius="@dimen/sc_bubble_radius"
                 android:topRightRadius="@dimen/sc_bubble_radius" />
diff --git a/vector/src/main/res/drawable/msg_bubble_notice_incoming_notail.xml b/vector/src/main/res/drawable/msg_bubble_notice_incoming_notail.xml
index 04a58c7f89..9ca6ac6014 100644
--- a/vector/src/main/res/drawable/msg_bubble_notice_incoming_notail.xml
+++ b/vector/src/main/res/drawable/msg_bubble_notice_incoming_notail.xml
@@ -31,7 +31,7 @@ Note also that most of the comments should not be changed without checking their
             <corners android:bottomLeftRadius="@dimen/sc_bubble_radius"
                 android:bottomRightRadius="@dimen/sc_bubble_radius"
                 android:topRightRadius="@dimen/sc_bubble_radius"
-                android:topLeftRadius="@dimen/sc_bubble_radius_in_tail" />
+                android:topLeftRadius="@dimen/sc_bubble_radius" />
 
         </shape>
     </item>
diff --git a/vector/src/main/res/drawable/msg_bubble_notice_outgoing.xml b/vector/src/main/res/drawable/msg_bubble_notice_outgoing.xml
index ade72e6fe3..78692bfbd6 100644
--- a/vector/src/main/res/drawable/msg_bubble_notice_outgoing.xml
+++ b/vector/src/main/res/drawable/msg_bubble_notice_outgoing.xml
@@ -14,8 +14,6 @@ Note also that most of the comments should not be changed without checking their
 
             <solid android:color="?sc_notice_bg_outgoing" />
 
-            <corners android:radius="@dimen/sc_bubble_radius" />
-
             <corners android:bottomRightRadius="@dimen/sc_bubble_radius"
                 android:bottomLeftRadius="@dimen/sc_bubble_radius"
                 android:topLeftRadius="@dimen/sc_bubble_radius" />
diff --git a/vector/src/main/res/drawable/msg_bubble_notice_outgoing_notail.xml b/vector/src/main/res/drawable/msg_bubble_notice_outgoing_notail.xml
index b19ed434cd..71bf1132c1 100644
--- a/vector/src/main/res/drawable/msg_bubble_notice_outgoing_notail.xml
+++ b/vector/src/main/res/drawable/msg_bubble_notice_outgoing_notail.xml
@@ -31,7 +31,7 @@ Note also that most of the comments should not be changed without checking their
             <corners android:bottomRightRadius="@dimen/sc_bubble_radius"
                 android:bottomLeftRadius="@dimen/sc_bubble_radius"
                 android:topLeftRadius="@dimen/sc_bubble_radius"
-                android:topRightRadius="@dimen/sc_bubble_radius_in_tail" />
+                android:topRightRadius="@dimen/sc_bubble_radius" />
 
         </shape>
     </item>
diff --git a/vector/src/main/res/drawable/msg_bubble_text_incoming.xml b/vector/src/main/res/drawable/msg_bubble_text_incoming.xml
index 0540f1e864..8a2e0f12b3 100644
--- a/vector/src/main/res/drawable/msg_bubble_text_incoming.xml
+++ b/vector/src/main/res/drawable/msg_bubble_text_incoming.xml
@@ -14,8 +14,6 @@ Note also that most of the comments should not be changed without checking their
 
             <solid android:color="?sc_message_bg_incoming" />
 
-            <corners android:radius="@dimen/sc_bubble_radius" />
-
             <corners android:bottomLeftRadius="@dimen/sc_bubble_radius"
                 android:bottomRightRadius="@dimen/sc_bubble_radius"
                 android:topRightRadius="@dimen/sc_bubble_radius" />
diff --git a/vector/src/main/res/drawable/msg_bubble_text_outgoing.xml b/vector/src/main/res/drawable/msg_bubble_text_outgoing.xml
index 0ebcfa6d2d..980dc7be38 100644
--- a/vector/src/main/res/drawable/msg_bubble_text_outgoing.xml
+++ b/vector/src/main/res/drawable/msg_bubble_text_outgoing.xml
@@ -14,8 +14,6 @@ Note also that most of the comments should not be changed without checking their
 
             <solid android:color="?sc_message_bg_outgoing" />
 
-            <corners android:radius="@dimen/sc_bubble_radius" />
-
             <corners android:bottomRightRadius="@dimen/sc_bubble_radius"
                 android:bottomLeftRadius="@dimen/sc_bubble_radius"
                 android:topLeftRadius="@dimen/sc_bubble_radius" />
diff --git a/vector/src/main/res/drawable/msg_godbubble.xml b/vector/src/main/res/drawable/msg_godbubble.xml
index cdfb115d17..2ce813b138 100644
--- a/vector/src/main/res/drawable/msg_godbubble.xml
+++ b/vector/src/main/res/drawable/msg_godbubble.xml
@@ -14,8 +14,6 @@ Note also that most of the comments should not be changed without checking their
 
             <solid android:color="?sc_notice_bg_incoming" />
 
-            <corners android:radius="@dimen/sc_bubble_radius" />
-
             <corners android:bottomLeftRadius="@dimen/sc_bubble_radius"
                 android:bottomRightRadius="@dimen/sc_bubble_radius"
                 android:topRightRadius="@dimen/sc_bubble_radius" />