diff --git a/app/src/main/res/layout/activity_call.xml b/app/src/main/res/layout/activity_call.xml
index 616c4ae5..c527d0c3 100644
--- a/app/src/main/res/layout/activity_call.xml
+++ b/app/src/main/res/layout/activity_call.xml
@@ -204,45 +204,49 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-    <RelativeLayout
+    <LinearLayout
         android:id="@+id/dialpad_wrapper"
         android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_marginBottom="@dimen/activity_margin"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/call_status_label">
+        app:layout_constraintStart_toStartOf="parent">
 
-        <com.simplemobiletools.commons.views.MyEditText
-            android:id="@+id/dialpad_input"
+        <RelativeLayout
+            android:id="@+id/dialpad_input_holder"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_above="@+id/dialpad_include"
-            android:layout_marginStart="@dimen/dialpad_button_size"
-            android:layout_marginEnd="@dimen/medium_margin"
-            android:layout_toStartOf="@+id/dialpad_close"
-            android:gravity="center"
-            android:inputType="phone"
-            android:textCursorDrawable="@null"
-            android:textSize="@dimen/dialpad_text_size" />
+            android:layout_height="wrap_content">
 
-        <ImageView
-            android:id="@+id/dialpad_close"
-            android:layout_width="@dimen/normal_icon_size"
-            android:layout_height="@dimen/normal_icon_size"
-            android:layout_alignTop="@+id/dialpad_input"
-            android:layout_alignBottom="@+id/dialpad_input"
-            android:layout_alignParentEnd="true"
-            android:layout_centerVertical="true"
-            android:layout_marginEnd="@dimen/activity_margin"
-            android:background="?attr/selectableItemBackgroundBorderless"
-            android:padding="@dimen/medium_margin"
-            android:src="@drawable/ic_cross_vector" />
+            <com.simplemobiletools.commons.views.MyEditText
+                android:id="@+id/dialpad_input"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/dialpad_button_size"
+                android:layout_marginEnd="@dimen/medium_margin"
+                android:layout_toStartOf="@+id/dialpad_close"
+                android:gravity="center"
+                android:inputType="phone"
+                android:textCursorDrawable="@null"
+                android:textSize="@dimen/dialpad_text_size" />
+
+            <ImageView
+                android:id="@+id/dialpad_close"
+                android:layout_width="@dimen/normal_icon_size"
+                android:layout_height="@dimen/normal_icon_size"
+                android:layout_alignTop="@+id/dialpad_input"
+                android:layout_alignBottom="@+id/dialpad_input"
+                android:layout_alignParentEnd="true"
+                android:layout_centerVertical="true"
+                android:layout_marginEnd="@dimen/activity_margin"
+                android:background="?attr/selectableItemBackgroundBorderless"
+                android:padding="@dimen/medium_margin"
+                android:src="@drawable/ic_cross_vector" />
+        </RelativeLayout>
 
         <include
             android:id="@+id/dialpad_include"
             layout="@layout/dialpad" />
 
-    </RelativeLayout>
-
+    </LinearLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/dialpad.xml b/app/src/main/res/layout/dialpad.xml
index ee399157..08b9c463 100644
--- a/app/src/main/res/layout/dialpad.xml
+++ b/app/src/main/res/layout/dialpad.xml
@@ -8,7 +8,6 @@
     android:layout_alignParentBottom="true"
     android:focusableInTouchMode="true"
     android:paddingTop="@dimen/medium_margin"
-    android:paddingBottom="@dimen/activity_margin"
     tools:ignore="HardcodedText">
 
     <RelativeLayout
@@ -302,6 +301,7 @@
         android:id="@+id/dialpad_0_holder"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/activity_margin"
         android:background="?attr/selectableItemBackgroundBorderless"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/dialpad_hashtag_holder"