diff --git a/app/src/main/res/layout/call_numpad_digit.xml b/app/src/main/res/layout/call_numpad_digit.xml
index 9dc680600..63c5bf246 100644
--- a/app/src/main/res/layout/call_numpad_digit.xml
+++ b/app/src/main/res/layout/call_numpad_digit.xml
@@ -14,8 +14,17 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:onClick="@{() -> model.onDigitClicked(digit)}"
         android:layout_width="@dimen/call_dtmf_button_size"
-        android:layout_height="@dimen/call_dtmf_button_size"
-        android:background="@drawable/in_call_button_background_red">
+        android:layout_height="@dimen/call_dtmf_button_size">
+
+        <ImageView
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:src="@drawable/in_call_button_background_red"
+            app:layout_constraintDimensionRatio="1:1"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent" />
 
         <androidx.appcompat.widget.AppCompatTextView
             style="@style/default_text_style"
diff --git a/app/src/main/res/layout/call_numpad_digit_with_letters.xml b/app/src/main/res/layout/call_numpad_digit_with_letters.xml
index 8bba443ee..034b42a99 100644
--- a/app/src/main/res/layout/call_numpad_digit_with_letters.xml
+++ b/app/src/main/res/layout/call_numpad_digit_with_letters.xml
@@ -19,8 +19,17 @@
         android:onClick="@{() -> model.onDigitClicked(digit)}"
         android:onLongClick="@{() -> model.onDigitLongClicked(digit)}"
         android:layout_width="@dimen/call_dtmf_button_size"
-        android:layout_height="@dimen/call_dtmf_button_size"
-        android:background="@drawable/in_call_button_background_red">
+        android:layout_height="@dimen/call_dtmf_button_size">
+
+        <ImageView
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:src="@drawable/in_call_button_background_red"
+            app:layout_constraintDimensionRatio="1:1"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent" />
 
         <androidx.appcompat.widget.AppCompatTextView
             style="@style/default_text_style"
diff --git a/app/src/main/res/layout/call_numpad_digit_with_plus.xml b/app/src/main/res/layout/call_numpad_digit_with_plus.xml
index 52b47a44c..517a3f0a4 100644
--- a/app/src/main/res/layout/call_numpad_digit_with_plus.xml
+++ b/app/src/main/res/layout/call_numpad_digit_with_plus.xml
@@ -16,8 +16,17 @@
         android:onClick="@{() -> model.onDigitClicked(digit)}"
         android:onLongClick="@{() -> model.onDigitLongClicked(digit)}"
         android:layout_width="@dimen/call_dtmf_button_size"
-        android:layout_height="@dimen/call_dtmf_button_size"
-        android:background="@drawable/in_call_button_background_red">
+        android:layout_height="@dimen/call_dtmf_button_size">
+
+        <ImageView
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:src="@drawable/in_call_button_background_red"
+            app:layout_constraintDimensionRatio="1:1"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent" />
 
         <androidx.appcompat.widget.AppCompatTextView
             style="@style/default_text_style"
diff --git a/app/src/main/res/layout/call_numpad_digit_with_voicemail.xml b/app/src/main/res/layout/call_numpad_digit_with_voicemail.xml
index 5224814d6..e66479501 100644
--- a/app/src/main/res/layout/call_numpad_digit_with_voicemail.xml
+++ b/app/src/main/res/layout/call_numpad_digit_with_voicemail.xml
@@ -19,8 +19,17 @@
         android:onClick="@{() -> model.onDigitClicked(digit)}"
         android:onLongClick="@{() -> model.onVoicemailLongClicked()}"
         android:layout_width="@dimen/call_dtmf_button_size"
-        android:layout_height="@dimen/call_dtmf_button_size"
-        android:background="@drawable/in_call_button_background_red">
+        android:layout_height="@dimen/call_dtmf_button_size">
+
+        <ImageView
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:src="@drawable/in_call_button_background_red"
+            app:layout_constraintDimensionRatio="1:1"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent" />
 
         <androidx.appcompat.widget.AppCompatTextView
             style="@style/default_text_style"
diff --git a/app/src/main/res/layout/start_call_numpad_bottom_sheet.xml b/app/src/main/res/layout/start_call_numpad_bottom_sheet.xml
index a3fc99dd3..ee886f1d9 100644
--- a/app/src/main/res/layout/start_call_numpad_bottom_sheet.xml
+++ b/app/src/main/res/layout/start_call_numpad_bottom_sheet.xml
@@ -51,7 +51,7 @@
 
         <include
             android:id="@+id/digit_1"
-            android:layout_width="@dimen/call_dtmf_button_size"
+            android:layout_width="0dp"
             android:layout_height="@dimen/call_dtmf_button_size"
             layout="@layout/call_numpad_digit_with_voicemail"
             bind:digit="@{`1`}"
@@ -61,7 +61,7 @@
 
         <include
             android:id="@+id/digit_2"
-            android:layout_width="@dimen/call_dtmf_button_size"
+            android:layout_width="0dp"
             android:layout_height="@dimen/call_dtmf_button_size"
             layout="@layout/call_numpad_digit_with_letters"
             bind:digit="@{`2`}"
@@ -72,7 +72,7 @@
 
         <include
             android:id="@+id/digit_3"
-            android:layout_width="@dimen/call_dtmf_button_size"
+            android:layout_width="0dp"
             android:layout_height="@dimen/call_dtmf_button_size"
             layout="@layout/call_numpad_digit_with_letters"
             bind:digit="@{`3`}"
@@ -83,7 +83,7 @@
 
         <include
             android:id="@+id/digit_4"
-            android:layout_width="@dimen/call_dtmf_button_size"
+            android:layout_width="0dp"
             android:layout_height="@dimen/call_dtmf_button_size"
             layout="@layout/call_numpad_digit_with_letters"
             bind:digit="@{`4`}"
@@ -94,7 +94,7 @@
 
         <include
             android:id="@+id/digit_5"
-            android:layout_width="@dimen/call_dtmf_button_size"
+            android:layout_width="0dp"
             android:layout_height="@dimen/call_dtmf_button_size"
             layout="@layout/call_numpad_digit_with_letters"
             bind:digit="@{`5`}"
@@ -105,7 +105,7 @@
 
         <include
             android:id="@+id/digit_6"
-            android:layout_width="@dimen/call_dtmf_button_size"
+            android:layout_width="0dp"
             android:layout_height="@dimen/call_dtmf_button_size"
             layout="@layout/call_numpad_digit_with_letters"
             bind:digit="@{`6`}"
@@ -116,7 +116,7 @@
 
         <include
             android:id="@+id/digit_7"
-            android:layout_width="@dimen/call_dtmf_button_size"
+            android:layout_width="0dp"
             android:layout_height="@dimen/call_dtmf_button_size"
             layout="@layout/call_numpad_digit_with_letters"
             bind:digit="@{`7`}"
@@ -127,7 +127,7 @@
 
         <include
             android:id="@+id/digit_8"
-            android:layout_width="@dimen/call_dtmf_button_size"
+            android:layout_width="0dp"
             android:layout_height="@dimen/call_dtmf_button_size"
             layout="@layout/call_numpad_digit_with_letters"
             bind:digit="@{`8`}"
@@ -138,7 +138,7 @@
 
         <include
             android:id="@+id/digit_9"
-            android:layout_width="@dimen/call_dtmf_button_size"
+            android:layout_width="0dp"
             android:layout_height="@dimen/call_dtmf_button_size"
             layout="@layout/call_numpad_digit_with_letters"
             bind:digit="@{`9`}"
@@ -149,7 +149,7 @@
 
         <include
             android:id="@+id/digit_star"
-            android:layout_width="@dimen/call_dtmf_button_size"
+            android:layout_width="0dp"
             android:layout_height="@dimen/call_dtmf_button_size"
             layout="@layout/call_numpad_digit"
             bind:digit="@{`*`}"
@@ -159,7 +159,7 @@
 
         <include
             android:id="@+id/digit_0"
-            android:layout_width="@dimen/call_dtmf_button_size"
+            android:layout_width="0dp"
             android:layout_height="@dimen/call_dtmf_button_size"
             layout="@layout/call_numpad_digit_with_plus"
             bind:digit="@{`0`}"
@@ -169,7 +169,7 @@
 
         <include
             android:id="@+id/digit_sharp"
-            android:layout_width="@dimen/call_dtmf_button_size"
+            android:layout_width="0dp"
             android:layout_height="@dimen/call_dtmf_button_size"
             layout="@layout/call_numpad_digit"
             bind:digit="@{`#`}"
@@ -200,7 +200,7 @@
             android:id="@+id/backspace"
             android:onClick="@{() -> model.onBackspaceClicked()}"
             android:onLongClick="@{() -> model.onBackspaceLongClicked()}"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="@dimen/call_button_size"
             android:src="@drawable/backspace_fill"
             android:contentDescription="@string/content_description_erase_last_input"