diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/AvatarImageView.java b/app/src/main/java/org/thoughtcrime/securesms/components/AvatarImageView.java
index c017e90204..a7391c1c56 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/AvatarImageView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/AvatarImageView.java
@@ -167,6 +167,10 @@ public final class AvatarImageView extends AppCompatImageView {
   }
 
   private void setAvatar(@NonNull RequestManager requestManager, @Nullable Recipient recipient, @NonNull AvatarOptions avatarOptions) {
+    if (isInEditMode()) {
+      return;
+    }
+
     if (recipient != null) {
       RecipientContactPhoto photo = (recipient.isSelf() && avatarOptions.useSelfProfileAvatar) ? new RecipientContactPhoto(recipient,
                                                                                                                            new ProfileContactPhoto(Recipient.self()))
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/CallScreen.kt b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/CallScreen.kt
index 117ca37f85..f0d2364d6d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/CallScreen.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/CallScreen.kt
@@ -49,6 +49,8 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.layout.onGloballyPositioned
 import androidx.compose.ui.layout.onSizeChanged
 import androidx.compose.ui.platform.LocalConfiguration
+import androidx.compose.ui.res.dimensionResource
+import androidx.compose.ui.tooling.preview.Devices
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.DpSize
 import androidx.compose.ui.unit.dp
@@ -58,7 +60,9 @@ import org.signal.core.ui.compose.BottomSheets
 import org.signal.core.ui.compose.Previews
 import org.signal.core.ui.compose.TriggerAlignedPopupState
 import org.signal.core.util.DimensionUnit
+import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.components.webrtc.WebRtcLocalRenderState
+import org.thoughtcrime.securesms.conversation.colors.ChatColorsPalette
 import org.thoughtcrime.securesms.events.CallParticipant
 import org.thoughtcrime.securesms.events.GroupCallReactionEvent
 import org.thoughtcrime.securesms.events.WebRtcViewModel
@@ -335,7 +339,9 @@ private fun BoxScope.Viewport(
       }
     }
 
-    Row(modifier = modifier) {
+    Row(modifier = modifier.fillMaxWidth()) {
+      val overflowSize = dimensionResource(R.dimen.call_screen_overflow_item_size)
+
       Column(
         modifier = Modifier.weight(1f)
       ) {
@@ -359,7 +365,7 @@ private fun BoxScope.Viewport(
             overflowParticipants = overflowParticipants,
             modifier = Modifier
               .padding(16.dp)
-              .height(72.dp)
+              .height(overflowSize)
               .fillMaxWidth()
           )
         }
@@ -369,8 +375,7 @@ private fun BoxScope.Viewport(
         CallParticipantsOverflow(
           overflowParticipants = overflowParticipants,
           modifier = Modifier
-            .padding(16.dp)
-            .width(72.dp)
+            .width(overflowSize + 32.dp)
             .fillMaxHeight()
         )
       }
@@ -522,15 +527,30 @@ private fun AnimatedCallStateUpdate(
 }
 
 @Preview(uiMode = Configuration.UI_MODE_NIGHT_YES)
+@Preview(uiMode = Configuration.UI_MODE_NIGHT_YES, device = Devices.FOLDABLE)
+@Preview(uiMode = Configuration.UI_MODE_NIGHT_YES, device = Devices.TABLET)
 @Composable
 private fun CallScreenPreview() {
+  val participants = remember {
+    (1..10).map {
+      CallParticipant(
+        recipient = Recipient(
+          isResolving = false,
+          chatColorsValue = ChatColorsPalette.UNKNOWN_CONTACT
+        )
+      )
+    }
+  }
+
   Previews.Preview {
     CallScreen(
       callRecipient = Recipient(systemContactName = "Test User"),
       webRtcCallState = WebRtcViewModel.State.CALL_CONNECTED,
       isRemoteVideoOffer = false,
       isInPipMode = false,
-      callScreenState = CallScreenState(),
+      callScreenState = CallScreenState(
+        callStatus = "Connecting..."
+      ),
       callControlsState = CallControlsState(
         displayMicToggle = true,
         isMicEnabled = true,
@@ -538,9 +558,17 @@ private fun CallScreenPreview() {
         displayGroupRingingToggle = true,
         displayStartCallButton = true
       ),
-      callParticipantsPagerState = CallParticipantsPagerState(),
-      localParticipant = CallParticipant(),
-      localRenderState = WebRtcLocalRenderState.LARGE,
+      callParticipantsPagerState = CallParticipantsPagerState(
+        callParticipants = participants,
+        focusedParticipant = participants.first()
+      ),
+      localParticipant = CallParticipant(
+        recipient = Recipient(
+          isResolving = false,
+          isSelf = true
+        )
+      ),
+      localRenderState = WebRtcLocalRenderState.SMALL_RECTANGLE,
       callScreenDialogType = CallScreenDialogType.NONE,
       callInfoView = {
         Text(text = "Call Info View Preview", modifier = Modifier.alpha(it))
@@ -548,7 +576,7 @@ private fun CallScreenPreview() {
       raiseHandSnackbar = {},
       onNavigationClick = {},
       onLocalPictureInPictureClicked = {},
-      overflowParticipants = emptyList(),
+      overflowParticipants = participants,
       onControlsToggled = {},
       reactions = emptyList()
     )
diff --git a/app/src/main/res/layout/webrtc_call_participant_recycler_item.xml b/app/src/main/res/layout/webrtc_call_participant_recycler_item.xml
index 4ac78f959d..6ebef7756d 100644
--- a/app/src/main/res/layout/webrtc_call_participant_recycler_item.xml
+++ b/app/src/main/res/layout/webrtc_call_participant_recycler_item.xml
@@ -16,7 +16,7 @@
     <include
         android:id="@+id/call_participant"
         layout="@layout/call_participant_item"
-        android:layout_width="72dp"
-        android:layout_height="72dp" />
+        android:layout_width="@dimen/call_screen_overflow_item_size"
+        android:layout_height="@dimen/call_screen_overflow_item_size" />
 
 </com.google.android.material.card.MaterialCardView>
diff --git a/app/src/main/res/values-sw800dp/dimens.xml b/app/src/main/res/values-sw800dp/dimens.xml
new file mode 100644
index 0000000000..cc99024ac2
--- /dev/null
+++ b/app/src/main/res/values-sw800dp/dimens.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2025 Signal Messenger, LLC
+  ~ SPDX-License-Identifier: AGPL-3.0-only
+  -->
+
+<resources>
+    <dimen name="call_screen_overflow_item_size">124dp</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 bf8b255101..f26c60b13e 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -252,4 +252,6 @@
 
     <dimen name="donation_pill_max_width">150dp</dimen>
 
+    <dimen name="call_screen_overflow_item_size">72dp</dimen>
+
 </resources>