diff --git a/app/src/main/res/layout/webrtc_call_view.xml b/app/src/main/res/layout/webrtc_call_view.xml
index f9da0a4c9e..42a5f525e0 100644
--- a/app/src/main/res/layout/webrtc_call_view.xml
+++ b/app/src/main/res/layout/webrtc_call_view.xml
@@ -210,8 +210,8 @@
 
         <org.thoughtcrime.securesms.components.webrtc.WebRtcAudioOutputToggleButton
             android:id="@+id/call_screen_speaker_toggle"
-            android:layout_width="56dp"
-            android:layout_height="56dp"
+            android:layout_width="@dimen/webrtc_button_size"
+            android:layout_height="@dimen/webrtc_button_size"
             android:layout_marginStart="8dp"
             android:layout_marginEnd="8dp"
             android:layout_marginBottom="8dp"
@@ -248,8 +248,8 @@
 
         <ImageView
             android:id="@+id/call_screen_camera_direction_toggle"
-            android:layout_width="56dp"
-            android:layout_height="56dp"
+            android:layout_width="@dimen/webrtc_button_size"
+            android:layout_height="@dimen/webrtc_button_size"
             android:layout_marginStart="8dp"
             android:layout_marginEnd="8dp"
             android:layout_marginBottom="8dp"
@@ -369,8 +369,7 @@
             app:layout_constraintBottom_toTopOf="@id/call_screen_button_labels_barrier"
             app:layout_constraintEnd_toStartOf="@id/call_screen_end_call"
             app:layout_constraintHorizontal_chainStyle="packed"
-            app:layout_constraintStart_toEndOf="@id/call_screen_audio_mic_toggle"
-            tools:visibility="visible" />
+            app:layout_constraintStart_toEndOf="@id/call_screen_audio_mic_toggle" />
 
         <TextView
             android:id="@+id/call_screen_audio_ring_toggle_label"
@@ -390,13 +389,12 @@
             app:layout_constraintEnd_toEndOf="@id/call_screen_audio_ring_toggle"
             app:layout_constraintStart_toStartOf="@id/call_screen_audio_ring_toggle"
             app:layout_constraintTop_toBottomOf="@id/call_screen_audio_ring_toggle"
-            app:layout_constraintVertical_bias="0"
-            tools:visibility="visible" />
+            app:layout_constraintVertical_bias="0" />
 
         <ImageView
             android:id="@+id/call_screen_end_call"
-            android:layout_width="56dp"
-            android:layout_height="56dp"
+            android:layout_width="@dimen/webrtc_button_size"
+            android:layout_height="@dimen/webrtc_button_size"
             android:layout_marginStart="8dp"
             android:layout_marginEnd="8dp"
             android:layout_marginBottom="8dp"
diff --git a/app/src/main/res/values-sw360dp/dimens.xml b/app/src/main/res/values-sw360dp/dimens.xml
index 7efc0f0b1a..7adb505c6a 100644
--- a/app/src/main/res/values-sw360dp/dimens.xml
+++ b/app/src/main/res/values-sw360dp/dimens.xml
@@ -32,4 +32,6 @@
     <dimen name="toolbar_avatar_margin">34dp</dimen>
 
     <dimen name="verify_identity_vertical_margin">32dp</dimen>
+
+    <dimen name="webrtc_button_size">56dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index f94046d31a..f3c707d0de 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -212,4 +212,6 @@
     <dimen name="verify_identity_vertical_margin">16dp</dimen>
 
     <dimen name="signal_context_menu_corner_radius">18dp</dimen>
+
+    <dimen name="webrtc_button_size">48dp</dimen>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 62a5873d99..b6f0dbd4df 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -308,8 +308,8 @@
     </style>
 
     <style name="WebRtcCallV2CompoundButton">
-        <item name="android:layout_height">56dp</item>
-        <item name="android:layout_width">56dp</item>
+        <item name="android:layout_height">@dimen/webrtc_button_size</item>
+        <item name="android:layout_width">@dimen/webrtc_button_size</item>
         <item name="android:textOn">@null</item>
         <item name="android:textOff">@null</item>
     </style>