diff --git a/app/src/main/res/drawable/call_message_background.xml b/app/src/main/res/drawable/call_message_background.xml
new file mode 100644
index 0000000000..7713909167
--- /dev/null
+++ b/app/src/main/res/drawable/call_message_background.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid  android:color="?message_received_background_color" />
+
+    <corners android:radius="@dimen/message_corner_radius" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_incoming_call.xml b/app/src/main/res/drawable/ic_incoming_call.xml
index da1a78fe50..f9149818c5 100644
--- a/app/src/main/res/drawable/ic_incoming_call.xml
+++ b/app/src/main/res/drawable/ic_incoming_call.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="20dp"
-    android:height="20dp"
+    android:width="16dp"
+    android:height="16dp"
     android:viewportWidth="20"
     android:viewportHeight="20">
   <path
diff --git a/app/src/main/res/drawable/ic_missed_call.xml b/app/src/main/res/drawable/ic_missed_call.xml
index 4d3aee2a09..e63537737b 100644
--- a/app/src/main/res/drawable/ic_missed_call.xml
+++ b/app/src/main/res/drawable/ic_missed_call.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="20dp"
-    android:height="20dp"
+    android:width="16dp"
+    android:height="16dp"
     android:viewportWidth="20"
     android:viewportHeight="20">
   <path
diff --git a/app/src/main/res/drawable/ic_outgoing_call.xml b/app/src/main/res/drawable/ic_outgoing_call.xml
index ad27f18d52..26024999ee 100644
--- a/app/src/main/res/drawable/ic_outgoing_call.xml
+++ b/app/src/main/res/drawable/ic_outgoing_call.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="20dp"
-    android:height="20dp"
+    android:width="16dp"
+    android:height="16dp"
     android:viewportWidth="20"
     android:viewportHeight="20">
   <path
diff --git a/app/src/main/res/layout/view_control_message.xml b/app/src/main/res/layout/view_control_message.xml
index ec304f5adb..3cbe26048e 100644
--- a/app/src/main/res/layout/view_control_message.xml
+++ b/app/src/main/res/layout/view_control_message.xml
@@ -50,25 +50,25 @@
         android:textStyle="bold"
         tools:text="@string/MessageRecord_you_disabled_disappearing_messages" />
 
-    <LinearLayout
+    <FrameLayout
         android:id="@+id/call_view"
-        style="@style/FakeChatViewMessageBubble.Incoming"
+        style="@style/CallMessage"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal">
 
         <TextView
             android:id="@+id/call_text_view"
-            android:drawableTint="?message_received_text_color"
-            android:drawableStart="@drawable/ic_missed_call"
-            android:layout_weight="1"
+            android:textColor="?message_received_text_color"
             android:textAlignment="center"
             android:layout_gravity="center"
-            android:text="You missed a call"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"/>
+            tools:text="You missed a call"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:drawableTint="?message_received_text_color"
+            app:drawableStartCompat="@drawable/ic_missed_call" />
 
-    </LinearLayout>
+    </FrameLayout>
 
     <TextView
         android:id="@+id/followSetting"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 9fcc7441d4..72dcacf284 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -193,6 +193,17 @@
         <item name="android:maxLines">1</item>
     </style>
 
+    <style name="CallMessage">
+        <item name="android:background">@drawable/call_message_background</item>
+        <item name="android:textColor">?message_received_text_color</item>
+        <item name="android:paddingLeft">@dimen/medium_spacing</item>
+        <item name="android:paddingTop">12dp</item>
+        <item name="android:paddingRight">@dimen/medium_spacing</item>
+        <item name="android:paddingBottom">12dp</item>
+        <item name="android:textSize">15sp</item>
+        <item name="android:fontFamily">sans-serif-medium</item>
+    </style>
+
     <style name="FakeChatViewMessageBubble">
         <item name="android:paddingLeft">@dimen/medium_spacing</item>
         <item name="android:paddingTop">12dp</item>