diff --git a/app/src/main/java/org/linphone/ui/call/fragment/CallsListFragment.kt b/app/src/main/java/org/linphone/ui/call/fragment/CallsListFragment.kt
index b15182d96..fdec459db 100644
--- a/app/src/main/java/org/linphone/ui/call/fragment/CallsListFragment.kt
+++ b/app/src/main/java/org/linphone/ui/call/fragment/CallsListFragment.kt
@@ -98,6 +98,10 @@ class CallsListFragment : GenericCallFragment() {
             findNavController().popBackStack()
         }
 
+        binding.setMergeCallsClickListener {
+            viewModel.mergeCallsIntoLocalConference()
+        }
+
         viewModel.calls.observe(viewLifecycleOwner) {
             Log.i("$TAG Calls list updated with [${it.size}] items")
             adapter.submitList(it)
diff --git a/app/src/main/java/org/linphone/ui/call/viewmodel/CallsViewModel.kt b/app/src/main/java/org/linphone/ui/call/viewmodel/CallsViewModel.kt
index 501c3c1c0..0fdbefdcf 100644
--- a/app/src/main/java/org/linphone/ui/call/viewmodel/CallsViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/call/viewmodel/CallsViewModel.kt
@@ -202,6 +202,11 @@ class CallsViewModel @UiThread constructor() : ViewModel() {
         goToCallsListEvent.value = Event(true)
     }
 
+    @UiThread
+    fun mergeCallsIntoLocalConference() {
+        // TODO FIXME: implement local conferences merge
+    }
+
     @WorkerThread
     private fun updateOtherCallsInfo() {
         val core = coreContext.core
diff --git a/app/src/main/java/org/linphone/ui/call/viewmodel/CurrentCallViewModel.kt b/app/src/main/java/org/linphone/ui/call/viewmodel/CurrentCallViewModel.kt
index f784c0992..33d406e67 100644
--- a/app/src/main/java/org/linphone/ui/call/viewmodel/CurrentCallViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/call/viewmodel/CurrentCallViewModel.kt
@@ -729,7 +729,7 @@ class CurrentCallViewModel @UiThread constructor() : ViewModel() {
                 )
                 val securityLevel = if (isDeviceTrusted) SecurityLevel.EndToEndEncryptedAndVerified else SecurityLevel.EndToEndEncrypted
                 val avatarModel = contact.value
-                if (avatarModel != null) {
+                if (avatarModel != null && currentCall.conference == null) { // Don't do it for conferences
                     avatarModel.trust.postValue(securityLevel)
                     contact.postValue(avatarModel)
 
diff --git a/app/src/main/res/layout/calls_list_fragment.xml b/app/src/main/res/layout/calls_list_fragment.xml
index 04768b88a..ac52c4314 100644
--- a/app/src/main/res/layout/calls_list_fragment.xml
+++ b/app/src/main/res/layout/calls_list_fragment.xml
@@ -7,6 +7,9 @@
         <variable
             name="backClickListener"
             type="View.OnClickListener" />
+        <variable
+            name="mergeCallsClickListener"
+            type="View.OnClickListener" />
         <variable
             name="viewModel"
             type="org.linphone.ui.call.viewmodel.CallsViewModel" />
@@ -39,10 +42,24 @@
             android:layout_marginStart="10dp"
             android:layout_marginEnd="10dp"
             android:text="@string/calls_list_title"
-            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/merge"
             app:layout_constraintStart_toEndOf="@id/back"
             app:layout_constraintTop_toTopOf="parent"/>
 
+        <ImageView
+            android:id="@+id/merge"
+            android:onClick="@{mergeCallsClickListener}"
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:padding="15dp"
+            android:adjustViewBounds="true"
+            android:src="@drawable/arrows_merge"
+            android:visibility="@{viewModel.callsCount > 1 ? View.VISIBLE : View.GONE}"
+            app:tint="?attr/color_main1_500"
+            app:layout_constraintBottom_toBottomOf="@id/title"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="@id/title"/>
+
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/calls_list"
             android:layout_width="0dp"