diff --git a/app/src/main/java/org/linphone/activities/Navigation.kt b/app/src/main/java/org/linphone/activities/Navigation.kt
index 64b7e3cbd..5d6bd190a 100644
--- a/app/src/main/java/org/linphone/activities/Navigation.kt
+++ b/app/src/main/java/org/linphone/activities/Navigation.kt
@@ -318,7 +318,7 @@ internal fun DetailChatRoomFragment.navigateToEmptyChatRoom() {
     findNavController().navigate(
         R.id.action_global_emptyChatFragment,
         null,
-        popupTo(R.id.emptyChatFragment, true)
+        popupTo(R.id.detailChatRoomFragment, true)
     )
 }
 
@@ -354,7 +354,7 @@ internal fun ChatRoomCreationFragment.navigateToEmptyChatRoom() {
     findNavController().navigate(
         R.id.action_global_emptyChatFragment,
         null,
-        popupTo(R.id.emptyChatFragment, true)
+        popupTo(R.id.chatRoomCreationFragment, true)
     )
 }
 
diff --git a/app/src/main/res/layout-land/dialer_fragment.xml b/app/src/main/res/layout-land/dialer_fragment.xml
index d27f6e17c..a9cff520c 100644
--- a/app/src/main/res/layout-land/dialer_fragment.xml
+++ b/app/src/main/res/layout-land/dialer_fragment.xml
@@ -85,7 +85,7 @@
                 android:layout_weight="1"
                 android:background="@drawable/call"
                 android:padding="12dp"
-                android:src="@drawable/call_audio_start" />
+                android:src="@{viewModel.autoInitiateVideoCalls ? @drawable/call_video_start : @drawable/call_audio_start, default=@drawable/call_audio_start}" />
 
             <ImageView
                 android:onClick="@{() -> viewModel.startCall()}"
diff --git a/app/src/main/res/layout-sw533dp-land/dialer_fragment.xml b/app/src/main/res/layout-sw533dp-land/dialer_fragment.xml
index 1e3e79a4c..4eefc4ed3 100644
--- a/app/src/main/res/layout-sw533dp-land/dialer_fragment.xml
+++ b/app/src/main/res/layout-sw533dp-land/dialer_fragment.xml
@@ -126,7 +126,7 @@
                     android:layout_weight="1"
                     android:background="@drawable/call"
                     android:padding="12dp"
-                    android:src="@drawable/call_audio_start" />
+                    android:src="@{viewModel.autoInitiateVideoCalls ? @drawable/call_video_start : @drawable/call_audio_start, default=@drawable/call_audio_start}" />
 
                 <ImageView
                     android:onClick="@{() -> viewModel.startCall()}"
diff --git a/app/src/main/res/layout-sw600dp/dialer_fragment.xml b/app/src/main/res/layout-sw600dp/dialer_fragment.xml
index 102226c20..d72e57a03 100644
--- a/app/src/main/res/layout-sw600dp/dialer_fragment.xml
+++ b/app/src/main/res/layout-sw600dp/dialer_fragment.xml
@@ -126,7 +126,7 @@
                     android:layout_weight="1"
                     android:background="@drawable/call"
                     android:padding="12dp"
-                    android:src="@drawable/call_audio_start" />
+                    android:src="@{viewModel.autoInitiateVideoCalls ? @drawable/call_video_start : @drawable/call_audio_start, default=@drawable/call_audio_start}" />
 
                 <ImageView
                     android:onClick="@{() -> viewModel.startCall()}"