diff --git a/app/src/main/res/layout/contact_search_item.xml b/app/src/main/res/layout/contact_search_item.xml
index b37a477e5b..4f9e56eb78 100644
--- a/app/src/main/res/layout/contact_search_item.xml
+++ b/app/src/main/res/layout/contact_search_item.xml
@@ -61,7 +61,7 @@
         android:textAppearance="@style/TextAppearance.Signal.Body1"
         android:textColor="@color/signal_text_primary"
         app:layout_constraintBottom_toTopOf="@id/number"
-        app:layout_constraintEnd_toStartOf="@id/start_audio"
+        app:layout_constraintEnd_toStartOf="@id/button_barrier"
         app:layout_constraintStart_toEndOf="@id/contact_photo_image"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_chainStyle="packed"
@@ -120,17 +120,24 @@
         app:layout_goneMarginEnd="0dp"
         tools:visibility="visible" />
 
+    <androidx.constraintlayout.widget.Barrier
+        android:id="@+id/button_barrier"
+        app:constraint_referenced_ids="start_audio,start_video,sms_tag"
+        app:barrierDirection="start"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
     <ImageView
         android:id="@+id/start_video"
         android:layout_width="48dp"
         android:layout_height="48dp"
-        android:layout_marginEnd="8dp"
+        android:layout_marginEnd="-12dp"
         android:importantForAccessibility="no"
         android:src="@drawable/ic_video_call_24"
         android:visibility="gone"
         android:padding="12dp"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@id/sms_tag"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:tint="@color/signal_colorOnSurface"
         tools:visibility="visible" />