diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcCallView.java b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcCallView.java
index a044e2d6e5..30da868690 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcCallView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcCallView.java
@@ -15,6 +15,7 @@ import androidx.annotation.Nullable;
 import androidx.appcompat.content.res.AppCompatResources;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.constraintlayout.widget.ConstraintSet;
+import androidx.constraintlayout.widget.Guideline;
 import androidx.core.util.Consumer;
 import androidx.transition.AutoTransition;
 import androidx.transition.Transition;
@@ -117,12 +118,13 @@ public class WebRtcCallView extends FrameLayout {
     answerWithAudioLabel      = findViewById(R.id.call_screen_answer_with_audio_label);
     ongoingFooterGradient     = findViewById(R.id.call_screen_ongoing_footer_gradient);
 
-    View topGradient            = findViewById(R.id.call_screen_header_gradient);
-    View downCaret              = findViewById(R.id.call_screen_down_arrow);
-    View decline                = findViewById(R.id.call_screen_decline_call);
-    View answerLabel            = findViewById(R.id.call_screen_answer_call_label);
-    View declineLabel           = findViewById(R.id.call_screen_decline_call_label);
-    View incomingFooterGradient = findViewById(R.id.call_screen_incoming_footer_gradient);
+    View      topGradient            = findViewById(R.id.call_screen_header_gradient);
+    View      downCaret              = findViewById(R.id.call_screen_down_arrow);
+    View      decline                = findViewById(R.id.call_screen_decline_call);
+    View      answerLabel            = findViewById(R.id.call_screen_answer_call_label);
+    View      declineLabel           = findViewById(R.id.call_screen_decline_call_label);
+    View      incomingFooterGradient = findViewById(R.id.call_screen_incoming_footer_gradient);
+    Guideline statusBarGuideline     = findViewById(R.id.call_screen_status_bar_guideline);
 
     topViews.add(status);
     topViews.add(topGradient);
@@ -166,11 +168,8 @@ public class WebRtcCallView extends FrameLayout {
 
     pictureInPictureGestureHelper = PictureInPictureGestureHelper.applyTo(localRenderPipFrame);
 
-    int                statusBarHeight = ViewUtil.getStatusBarHeight(this);
-    MarginLayoutParams params          = (MarginLayoutParams) parent.getLayoutParams();
-
-    params.topMargin = statusBarHeight;
-    parent.setLayoutParams(params);
+    int statusBarHeight = ViewUtil.getStatusBarHeight(this);
+    statusBarGuideline.setGuidelineBegin(statusBarHeight);
   }
 
   @Override
diff --git a/app/src/main/res/layout/webrtc_call_view.xml b/app/src/main/res/layout/webrtc_call_view.xml
index eed074533c..9551337a74 100644
--- a/app/src/main/res/layout/webrtc_call_view.xml
+++ b/app/src/main/res/layout/webrtc_call_view.xml
@@ -27,34 +27,36 @@
         android:id="@+id/call_screen_remote_renderer_holder"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        android:visibility="gone" />
 
     <FrameLayout
         android:id="@+id/call_screen_large_local_renderer_holder"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/black"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <View
-        android:id="@+id/call_screen_header_gradient"
-        android:layout_width="match_parent"
-        android:layout_height="160dp"
-        android:background="@drawable/webrtc_call_screen_header_gradient" />
+        android:visibility="gone" />
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/call_screen"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
+        <androidx.constraintlayout.widget.Guideline
+            android:id="@+id/call_screen_status_bar_guideline"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            tools:layout_constraintGuide_begin="48dp" />
+
+        <View
+            android:id="@+id/call_screen_header_gradient"
+            android:layout_width="0dp"
+            android:layout_height="160dp"
+            android:background="@drawable/webrtc_call_screen_header_gradient"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
         <View
             android:id="@+id/call_screen_ongoing_footer_gradient"
             android:layout_width="match_parent"
@@ -83,7 +85,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="1"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintTop_toTopOf="@id/call_screen_status_bar_guideline"
             app:layout_constraintVertical_bias="0">
 
             <androidx.cardview.widget.CardView
@@ -129,7 +131,7 @@
             android:textColor="@color/core_white"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintTop_toTopOf="@id/call_screen_status_bar_guideline"
             tools:text="Kiera Thompson" />
 
         <TextView