diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/AudioIndicatorView.kt b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/AudioIndicatorView.kt
index 3dc9af4c31..04d530d5be 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/AudioIndicatorView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/AudioIndicatorView.kt
@@ -54,6 +54,8 @@ class AudioIndicatorView(context: Context, attrs: AttributeSet) : FrameLayout(co
   fun bind(microphoneEnabled: Boolean, level: CallParticipant.AudioLevel?) {
     setBackgroundResource(R.drawable.circle_tintable)
 
+    this.visible = !microphoneEnabled || level != null
+
     micMuted.visible = !microphoneEnabled
 
     val wasShowingAudioLevel = showAudioLevel
diff --git a/app/src/main/res/layout/call_participant_item.xml b/app/src/main/res/layout/call_participant_item.xml
index 3a55f51acc..0d744ba636 100644
--- a/app/src/main/res/layout/call_participant_item.xml
+++ b/app/src/main/res/layout/call_participant_item.xml
@@ -90,8 +90,10 @@
         android:layout_height="28dp"
         android:layout_marginStart="@dimen/webrtc_audio_indicator_margin"
         android:layout_marginBottom="@dimen/webrtc_audio_indicator_margin"
+        android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
+        app:layout_constraintStart_toStartOf="parent"
+        tools:visibility="visible" />
 
     <FrameLayout
         android:id="@+id/call_participant_switch_camera"
diff --git a/app/src/main/res/layout/webrtc_call_controls.xml b/app/src/main/res/layout/webrtc_call_controls.xml
index a2c6d93f6a..2284811bcf 100644
--- a/app/src/main/res/layout/webrtc_call_controls.xml
+++ b/app/src/main/res/layout/webrtc_call_controls.xml
@@ -81,9 +81,11 @@
             android:clickable="false"
             android:contentDescription="@string/WebRtcCallView__toggle_camera_direction"
             android:scaleType="fitXY"
+            android:visibility="gone"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            app:srcCompat="@drawable/webrtc_call_screen_camera_toggle" />
+            app:srcCompat="@drawable/webrtc_call_screen_camera_toggle"
+            tools:visibility="visible" />
 
         <androidx.constraintlayout.widget.Barrier
             android:id="@+id/call_screen_above_controls_barrier"