diff --git a/app/src/main/java/org/linphone/ui/voip/viewmodel/CurrentCallViewModel.kt b/app/src/main/java/org/linphone/ui/voip/viewmodel/CurrentCallViewModel.kt
index a79981685..8ed2a9ecf 100644
--- a/app/src/main/java/org/linphone/ui/voip/viewmodel/CurrentCallViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/voip/viewmodel/CurrentCallViewModel.kt
@@ -344,7 +344,7 @@ class CurrentCallViewModel @UiThread constructor() : ViewModel() {
     }
 
     @WorkerThread
-    private fun updateEncryption() {
+    private fun updateEncryption(): Boolean {
         when (call.currentParams.mediaEncryption) {
             MediaEncryption.ZRTP -> {
                 val authToken = call.authenticationToken
@@ -359,12 +359,15 @@ class CurrentCallViewModel @UiThread constructor() : ViewModel() {
                     Log.i("$TAG Showing ZRTP SAS confirmation dialog")
                     showZrtpSasDialog(authToken!!.uppercase(Locale.getDefault()))
                 }
+
+                return deviceIsTrusted
             }
             MediaEncryption.SRTP, MediaEncryption.DTLS -> {
             }
             else -> {
             }
         }
+        return false
     }
 
     @WorkerThread
@@ -387,19 +390,23 @@ class CurrentCallViewModel @UiThread constructor() : ViewModel() {
         address.clean()
         displayedAddress.postValue(address.asStringUriOnly())
 
+        val isDeviceTrusted = updateEncryption()
         val friend = call.core.findFriend(address)
         if (friend != null) {
             displayedName.postValue(friend.name)
-            contact.postValue(ContactAvatarModel(friend))
+            val model = ContactAvatarModel(friend)
+            model.showTrust.postValue(isDeviceTrusted)
+            contact.postValue(model)
         } else {
             val fakeFriend = coreContext.core.createFriend()
             fakeFriend.name = LinphoneUtils.getDisplayName(address)
             fakeFriend.addAddress(address)
-            contact.postValue(ContactAvatarModel(fakeFriend))
+            val model = ContactAvatarModel(fakeFriend)
+            model.showTrust.postValue(isDeviceTrusted)
+            contact.postValue(model)
             displayedName.postValue(fakeFriend.name)
         }
 
-        updateEncryption()
         callDuration.postValue(call.duration)
     }
 
diff --git a/app/src/main/res/layout/voip_incoming_call_fragment.xml b/app/src/main/res/layout/voip_incoming_call_fragment.xml
index d3e5a1a25..7204f3269 100644
--- a/app/src/main/res/layout/voip_incoming_call_fragment.xml
+++ b/app/src/main/res/layout/voip_incoming_call_fragment.xml
@@ -32,19 +32,20 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="10dp"
-            android:layout_marginTop="7dp"
+            android:layout_marginTop="10dp"
+            android:layout_marginBottom="10dp"
             android:text="Incoming call"
             android:textColor="@color/white"
             android:textSize="16sp"
             app:layout_constraintStart_toEndOf="@id/call_direction_icon"
-            app:layout_constraintTop_toTopOf="parent"/>
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toTopOf="@id/background"/>
 
         <ImageView
             android:id="@+id/background"
             android:src="@drawable/shape_round_in_call_gray_background"
             android:layout_width="0dp"
             android:layout_height="0dp"
-            android:layout_marginTop="17dp"
             android:layout_marginStart="12dp"
             android:layout_marginEnd="12dp"
             app:layout_constraintTop_toBottomOf="@id/call_direction_label"
diff --git a/app/src/main/res/layout/voip_outgoing_call_fragment.xml b/app/src/main/res/layout/voip_outgoing_call_fragment.xml
index 19c8722e8..43bc76f7c 100644
--- a/app/src/main/res/layout/voip_outgoing_call_fragment.xml
+++ b/app/src/main/res/layout/voip_outgoing_call_fragment.xml
@@ -32,12 +32,14 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="10dp"
-            android:layout_marginTop="7dp"
+            android:layout_marginTop="10dp"
+            android:layout_marginBottom="10dp"
             android:text="Outgoing call"
             android:textColor="@color/white"
             android:textSize="16sp"
             app:layout_constraintStart_toEndOf="@id/call_direction_icon"
-            app:layout_constraintTop_toTopOf="parent"/>
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toTopOf="@id/background"/>
 
         <ImageView
             android:onClick="@{() -> viewModel.switchCamera()}"
@@ -58,7 +60,6 @@
             android:src="@drawable/shape_round_in_call_gray_background"
             android:layout_width="0dp"
             android:layout_height="0dp"
-            android:layout_marginTop="17dp"
             android:layout_marginStart="12dp"
             android:layout_marginEnd="12dp"
             app:layout_constraintTop_toBottomOf="@id/call_direction_label"