diff --git a/app/src/main/java/org/linphone/activities/voip/viewmodels/CallsViewModel.kt b/app/src/main/java/org/linphone/activities/voip/viewmodels/CallsViewModel.kt
index f3ec001a1..cebb81413 100644
--- a/app/src/main/java/org/linphone/activities/voip/viewmodels/CallsViewModel.kt
+++ b/app/src/main/java/org/linphone/activities/voip/viewmodels/CallsViewModel.kt
@@ -105,6 +105,8 @@ class CallsViewModel : ViewModel() {
             if (currentCall != null && currentCallData.value?.call != currentCall) {
                 updateCurrentCallData(currentCall)
             } else if (currentCall == null && core.callsNb > 0) {
+                updateCurrentCallData(null)
+            } else if (currentCallData.value == null) {
                 updateCurrentCallData(currentCall)
             }
 
diff --git a/app/src/main/res/layout/voip_single_call_fragment.xml b/app/src/main/res/layout/voip_single_call_fragment.xml
index f10958685..e2e9aed64 100644
--- a/app/src/main/res/layout/voip_single_call_fragment.xml
+++ b/app/src/main/res/layout/voip_single_call_fragment.xml
@@ -116,8 +116,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 app:barrierDirection="bottom"
-                app:barrierMargin="20dp"
-                app:constraint_referenced_ids="remote_address,remotely_recorded" />
+                app:constraint_referenced_ids="remote_address,remotely_recorded,top_barrier" />
 
             <androidx.constraintlayout.widget.Barrier
                 android:id="@+id/bottom_barrier"
@@ -135,7 +134,7 @@
                 app:layout_constraintBottom_toTopOf="@id/bottom_barrier"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/top_barrier" />
+                app:layout_constraintTop_toBottomOf="@id/call_header_barrier" />
 
             <ImageView
                 android:id="@+id/avatar"
@@ -178,6 +177,7 @@
                 android:layout_width="40dp"
                 android:layout_height="40dp"
                 android:layout_marginStart="10dp"
+                android:layout_marginTop="10dp"
                 android:background="@drawable/button_toggle_background"
                 android:contentDescription="@string/content_description_toggle_recording"
                 android:onClick="@{() -> callsViewModel.currentCallData.toggleRecording()}"
@@ -187,7 +187,7 @@
                 android:src="@drawable/icon_call_record"
                 android:visibility="@{controlsViewModel.fullScreenMode || controlsViewModel.pipMode ? View.GONE : View.VISIBLE}"
                 app:layout_constraintStart_toStartOf="@id/background"
-                app:layout_constraintTop_toBottomOf="@id/call_header_barrier" />
+                app:layout_constraintTop_toTopOf="@id/background" />
 
             <ImageView
                 android:id="@+id/take_snapshot"
@@ -208,6 +208,7 @@
                 android:layout_width="40dp"
                 android:layout_height="40dp"
                 android:layout_marginEnd="10dp"
+                android:layout_marginTop="10dp"
                 android:background="@drawable/button_toggle_background"
                 android:contentDescription="@string/content_description_pause_call"
                 android:enabled="@{callsViewModel.currentCallData.isPaused || callsViewModel.currentCallData.canBePaused}"
@@ -217,7 +218,7 @@
                 android:src="@drawable/icon_pause"
                 android:visibility="@{controlsViewModel.fullScreenMode || controlsViewModel.pipMode ? View.GONE : View.VISIBLE}"
                 app:layout_constraintEnd_toEndOf="@id/background"
-                app:layout_constraintTop_toBottomOf="@id/call_header_barrier" />
+                app:layout_constraintTop_toTopOf="@id/background" />
 
             <androidx.constraintlayout.widget.Group
                 android:id="@+id/video_preview_group"