diff --git a/.gitlab-ci-files/job-android.yml b/.gitlab-ci-files/job-android.yml
index f1ede3e0f..946909ca4 100644
--- a/.gitlab-ci-files/job-android.yml
+++ b/.gitlab-ci-files/job-android.yml
@@ -24,13 +24,12 @@ job-android:
 
   artifacts:
     paths:
-      - ./app/build/outputs/apk/debug/linphone-android-debug-*.apk
       - ./app/build/outputs/apk/release/linphone-android-release-*.apk
     when: always
-    expire_in: 1 week
+    expire_in: 1 day
 
 
 .scheduled-job-android:
   extends: job-android
   only:
-    - schedules
\ No newline at end of file
+    - schedules
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4469ba211..4307142ea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,7 +11,7 @@ Group changes to describe their impact on the project, as follows:
     Security to invite users to upgrade in case of vulnerabilities.
 
 
-## [6.0.0] - 2024-??-??
+## [6.0.0] - 2025-03-11
 
 6.0.0 release is a complete rework of Linphone Android, with a fully redesigned UI, so it is impossible to list everything here.
 
@@ -20,30 +20,38 @@ Group changes to describe their impact on the project, as follows:
 - Asymmetrical video : you no longer need to send your own camera feed to receive the one from the remote end of the call, and vice versa.
 - Improved multi account: you'll only see history, conversations, meetings etc... related to currently selected account, and you can switch the default account in two clicks.
 - Call transfer: Blind & Attended call transfer have been merged into one: during a call, if you initiate a transfer action, either pick another call to do the attended transfer or select a contact from the list (you can input a SIP URI not already in the suggestions list) to start a blind transfer.
+- User can only send up to 12 files in a single chat message.
+- IMDNs are now only sent to the message sender, preventing huge traffic in large groups, and thus the delivery status icon for received messages is now hidden in groups (as it was in 1-1 conversations).
 - Settings: a lot of them are gone, the one that are still there have been reworked to increase user friendliness.
 - Default screen (between contacts, call history, conversations & meetings list) will change depending on where you were when the app was paused or killed, and you will return to that last visited screen on the next startup.
 - Gradle files have been migrated from Groovy to Kotlin DSL, and dependencies are now in a separated file (libs.versions.toml).
 - Account creation no longer allows you to use your phone number as username, but it is still required to provide it to receive activation code by SMS.
 - Minimum supported Android OS version is now 9 (API level 28).
 - Telecom Manager support is now based on androidx.core.core-telecom package.
+- Some settings have changed name and/or section in linphonerc file.
 
 ### Added
-- Contacts trust: contacts for which all devices have been validated through a ZRTP call with SAS exchange are now highlighted with a blue circle (and with a red one in case of mistrust). That trust is now handled at contact level (instead of conversation level in previous versions). 
+- Contacts trust: contacts for which all devices have been validated through a ZRTP call with SAS exchange are now highlighted with a blue circle (and with a red one in case of mistrust). That trust is now handled at contact level (instead of conversation level in previous versions).
 - Media & documents exchanged in a conversation can be easily found through a dedicated screen.
 - A brand new chat message search feature has been added to conversations.
 - You can now react to a chat message using any emoji.
 - If next message is also a voice recording, playback will automatically start after the currently playing one ends.
 - Chat while in call: a shortcut to a conversation screen with the remote.
 - Chat while in a conference: if the conference has a text stream enabled, you can chat with the other participants of the conference while it lasts. At the end, you'll find the messages history in the call history (and not in the list of conversations).
+- Auto export of media to native gallery even when auto download is enabled (but still not if VFS is enabled nor for ephemeral messages).
+- Save / export document & media from ephemeral messages will be disabled, and secure policy that prevents screenshots will be enforced in file viewer even if the setting is disabled.
+- Notification showing upload/download of files shared through chat will let user know the progress and keep the app alive during that process.
 - Screen sharing in conference: only desktop app starting with 6.0 version is able to start it, but on mobiles you'll be able to see it.
 - You can choose whatever ringtone you'd like for incoming calls (in Android notification channel settings).
 - Security focus: security & trust is more visible than ever, and unsecure conversations & calls are even more visible than before.
 - CardDAV: you can configure as many CardDAV servers you want to synchronize you contacts in Linphone (in addition or in replacement of native addressbook import).
 - OpenID: when used with a SSO compliant SIP server (such as Flexisip), we support single-sign-on login.
 - MWI support: display and allow to call your voicemail when you have new messages (if supported by your VoIP provider and properly configured in your account params).
+- CCMP support: if you configure a CCMP server URL in your accounts params, it will be used when scheduling meetings & to fetch list of meetings you've organized/been invited to.
 - Devices list: check on which device your sip.linphone.org account is connected and the last connection date & time (like on subscribe.linphone.org).
 - Protobuf dependency to allow logging native crashes stack traces at next app startup.
 - Android 15 startup listener, allowing us to log type of start (cold, warm, etc...) and some other useful info.
+- Dialer & in-call numpad show letters under the digit.
 
 ### Removed
 - Dialer: the previous home screen (dialer) has been removed, you'll find it as an input option in the new start call screen.
diff --git a/README.md b/README.md
index 99fc7f372..748fd7d8c 100644
--- a/README.md
+++ b/README.md
@@ -134,6 +134,8 @@ adb logcat -d | ndk-stack -sym ./libs-debug/`adb shell getprop ro.product.cpu.ab
 ```
 Warning: This command won't print anything until you reproduce the crash!
 
+Starting [NDK r29](https://github.com/android/ndk/wiki/Changelog-r29) you will be able to directly use the ```libs-debug.zip``` file in ```ndk-stack -sym``` argument.
+
 ## Create an APK with a different package name
 
 Simply edit the ```app/build.gradle.kts``` file and change the value of the ```packageName``` variable.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 14af2afc8..76a87511e 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -103,7 +103,7 @@ android {
         versionCode = 600000 // 6.00.000
         versionName = "6.0.0"
 
-        manifestPlaceholders["appAuthRedirectScheme"] = "org.linphone"
+        manifestPlaceholders["appAuthRedirectScheme"] = packageName
 
         ndk {
             //noinspection ChromeOsAbiSupport
@@ -155,6 +155,7 @@ android {
             }
             resValue("string", "linphone_app_version", gitVersion.trim())
             resValue("string", "linphone_app_branch", gitBranch.toString().trim())
+            resValue("string", "linphone_openid_callback_scheme", packageName)
 
             if (crashlyticsAvailable) {
                 val path = File("$sdkPath/libs-debug/").toString()
@@ -177,6 +178,7 @@ android {
             resValue("string", "file_provider", "$packageName.fileprovider")
             resValue("string", "linphone_app_version", gitVersion.trim())
             resValue("string", "linphone_app_branch", gitBranch.toString().trim())
+            resValue("string", "linphone_openid_callback_scheme", packageName)
 
             if (crashlyticsAvailable) {
                 val path = File("$sdkPath/libs-debug/").toString()
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b8543bc29..04a51f47f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -60,6 +60,7 @@
         <meta-data
             android:name="com.google.android.gms.car.application"
             android:resource="@xml/automotive_app_desc"/>
+
         <!--<meta-data
             android:name="androidx.car.app.minCarApiLevel"
             android:value="1"/>-->
@@ -122,18 +123,6 @@
 
         </activity>
 
-        <activity
-            android:name=".ui.fileviewer.MediaViewerActivity"
-            android:windowSoftInputMode="adjustResize"
-            android:launchMode="singleTask"
-            android:resizeableActivity="true" />
-
-        <activity
-            android:name=".ui.fileviewer.FileViewerActivity"
-            android:windowSoftInputMode="adjustResize"
-            android:launchMode="singleTask"
-            android:resizeableActivity="true" />
-
         <activity
             android:name=".ui.welcome.WelcomeActivity"
             android:windowSoftInputMode="adjustResize"
@@ -146,6 +135,18 @@
             android:launchMode="singleTask"
             android:resizeableActivity="true" />
 
+        <activity
+            android:name=".ui.fileviewer.MediaViewerActivity"
+            android:windowSoftInputMode="adjustResize"
+            android:launchMode="singleTask"
+            android:resizeableActivity="true" />
+
+        <activity
+            android:name=".ui.fileviewer.FileViewerActivity"
+            android:windowSoftInputMode="adjustResize"
+            android:launchMode="singleTask"
+            android:resizeableActivity="true" />
+
         <activity
             android:name=".ui.call.CallActivity"
             android:windowSoftInputMode="adjustResize"
@@ -199,7 +200,7 @@
         </service>
 
         <!--<service
-            android:name=".telecom.auto.AAService"
+            android:name=".telecom.auto.AndroidAutoService"
             android:exported="true">
             <intent-filter>
                 <action android:name="androidx.car.app.CarAppService"/>
diff --git a/app/src/main/assets/assistant_linphone_default_values b/app/src/main/assets/assistant_linphone_default_values
index e682dea1d..eacc99247 100644
--- a/app/src/main/assets/assistant_linphone_default_values
+++ b/app/src/main/assets/assistant_linphone_default_values
@@ -22,13 +22,14 @@
     <entry name="rtp_bundle" overwrite="true">1</entry>
     <entry name="lime_server_url" overwrite="true">https://lime.linphone.org/lime-server/lime-server.php</entry>
     <entry name="lime_algo" overwrite="true">c25519</entry>
+    <entry name="supported" overwrite="true"></entry>
   </section>
   <section name="nat_policy_default_values">
     <entry name="stun_server" overwrite="true">stun.linphone.org</entry>
     <entry name="protocols" overwrite="true">stun,ice</entry>
   </section>
   <section name="sip">
-    <entry name="media_encryption" overwrite="true">zrtp</entry>
+    <entry name="media_encryption" overwrite="true">srtp</entry>
     <entry name="media_encryption_mandatory">1</entry>
   </section>
 </config>
diff --git a/app/src/main/assets/assistant_third_party_default_values b/app/src/main/assets/assistant_third_party_default_values
index c0816ab3d..d19b3f504 100644
--- a/app/src/main/assets/assistant_third_party_default_values
+++ b/app/src/main/assets/assistant_third_party_default_values
@@ -22,6 +22,7 @@
     <entry name="rtp_bundle" overwrite="true">0</entry>
     <entry name="lime_server_url" overwrite="true"></entry>
     <entry name="lime_algo" overwrite="true"></entry>
+    <entry name="supported" overwrite="true">outbound</entry>
   </section>
   <section name="nat_policy_default_values">
     <entry name="stun_server" overwrite="true">stun.linphone.org</entry>
diff --git a/app/src/main/assets/linphonerc_default b/app/src/main/assets/linphonerc_default
index 94743ebf3..0b7f694fd 100644
--- a/app/src/main/assets/linphonerc_default
+++ b/app/src/main/assets/linphonerc_default
@@ -13,6 +13,7 @@ media_encryption=none
 update_presence_model_timestamp_before_publish_expires_refresh=1
 use_rfc2833=1
 use_info=1
+rls_uri=sips:rls@sip.linphone.org
 
 [net]
 #Because dynamic bitrate adaption can increase bitrate, we must allow "no limit"
diff --git a/app/src/main/assets/linphonerc_factory b/app/src/main/assets/linphonerc_factory
index e49c58aff..31d406b17 100644
--- a/app/src/main/assets/linphonerc_factory
+++ b/app/src/main/assets/linphonerc_factory
@@ -22,7 +22,6 @@ zrtp_key_agreements_suites=MS_ZRTP_KEY_AGREEMENT_K255_MLK512,MS_ZRTP_KEY_AGREEME
 chat_messages_aggregation_delay=1000
 chat_messages_aggregation=1
 update_presence_model_timestamp_before_publish_expires_refresh=1
-rls_uri=sips:rls@sip.linphone.org
 
 [sound]
 #remove this property for any application that is not Linphone public version itself
diff --git a/app/src/main/java/org/linphone/LinphoneApplication.kt b/app/src/main/java/org/linphone/LinphoneApplication.kt
index a81a4247a..524600b2c 100644
--- a/app/src/main/java/org/linphone/LinphoneApplication.kt
+++ b/app/src/main/java/org/linphone/LinphoneApplication.kt
@@ -127,6 +127,7 @@ class LinphoneApplication : Application(), SingletonImageLoader.Factory {
             .crossfade(false)
             .components {
                 add(VideoFrameDecoder.Factory())
+                // add(GifDecoder.Factory) // Do not add it, GIFs are properly rendered without it and adding it breaks resizing...
                 add(SvgDecoder.Factory())
             }
             .memoryCache {
diff --git a/app/src/main/java/org/linphone/compatibility/Api29Compatibility.kt b/app/src/main/java/org/linphone/compatibility/Api29Compatibility.kt
index d7bcd9d9a..200e8c9f6 100644
--- a/app/src/main/java/org/linphone/compatibility/Api29Compatibility.kt
+++ b/app/src/main/java/org/linphone/compatibility/Api29Compatibility.kt
@@ -27,13 +27,10 @@ import android.view.View
 import android.view.contentcapture.ContentCaptureContext
 import android.view.contentcapture.ContentCaptureSession
 import androidx.annotation.RequiresApi
-import org.linphone.utils.LinphoneUtils
 
 @RequiresApi(Build.VERSION_CODES.Q)
 class Api29Compatibility {
     companion object {
-        private const val TAG = "[API 29 Compatibility]"
-
         fun getMediaCollectionUri(isImage: Boolean, isVideo: Boolean, isAudio: Boolean): Uri {
             return when {
                 isImage -> {
@@ -59,11 +56,10 @@ class Api29Compatibility {
             return intent.getStringExtra(Intent.EXTRA_LOCUS_ID)
         }
 
-        fun setLocusIdInContentCaptureSession(root: View, localSipUri: String, remoteSipUri: String) {
+        fun setLocusIdInContentCaptureSession(root: View, conversationId: String) {
             val session: ContentCaptureSession? = root.contentCaptureSession
             if (session != null) {
-                val id = LinphoneUtils.getChatRoomId(localSipUri, remoteSipUri)
-                session.contentCaptureContext = ContentCaptureContext.forLocusId(id)
+                session.contentCaptureContext = ContentCaptureContext.forLocusId(conversationId)
             }
         }
     }
diff --git a/app/src/main/java/org/linphone/compatibility/Api33Compatibility.kt b/app/src/main/java/org/linphone/compatibility/Api33Compatibility.kt
index 0f2ee06fd..020698073 100644
--- a/app/src/main/java/org/linphone/compatibility/Api33Compatibility.kt
+++ b/app/src/main/java/org/linphone/compatibility/Api33Compatibility.kt
@@ -26,8 +26,6 @@ import androidx.annotation.RequiresApi
 @RequiresApi(Build.VERSION_CODES.TIRAMISU)
 class Api33Compatibility {
     companion object {
-        private const val TAG = "[API 33 Compatibility]"
-
         fun getAllRequiredPermissionsArray(): Array<String> {
             return arrayOf(
                 Manifest.permission.POST_NOTIFICATIONS,
diff --git a/app/src/main/java/org/linphone/compatibility/Api34Compatibility.kt b/app/src/main/java/org/linphone/compatibility/Api34Compatibility.kt
index 54bb077cf..4bcdbc661 100644
--- a/app/src/main/java/org/linphone/compatibility/Api34Compatibility.kt
+++ b/app/src/main/java/org/linphone/compatibility/Api34Compatibility.kt
@@ -24,12 +24,11 @@ import android.app.NotificationManager
 import android.app.Service
 import android.content.Context
 import android.content.Intent
-import android.net.Uri
 import android.os.Build
 import android.provider.Settings
 import androidx.annotation.RequiresApi
-import androidx.core.content.ContextCompat
 import org.linphone.core.tools.Log
+import androidx.core.net.toUri
 
 @RequiresApi(Build.VERSION_CODES.UPSIDE_DOWN_CAKE)
 class Api34Compatibility {
@@ -69,10 +68,10 @@ class Api34Compatibility {
             val intent = Intent()
             // See https://developer.android.com/reference/android/provider/Settings#ACTION_MANAGE_APP_USE_FULL_SCREEN_INTENT
             intent.action = Settings.ACTION_MANAGE_APP_USE_FULL_SCREEN_INTENT
-            intent.data = Uri.parse("package:${context.packageName}")
+            intent.data = "package:${context.packageName}".toUri()
             intent.addFlags(Intent.FLAG_ACTIVITY_NO_HISTORY)
             Log.i("$TAG Starting ACTION_MANAGE_APP_USE_FULL_SCREEN_INTENT")
-            ContextCompat.startActivity(context, intent, null)
+            context.startActivity(intent, null)
         }
     }
 }
diff --git a/app/src/main/java/org/linphone/compatibility/Compatibility.kt b/app/src/main/java/org/linphone/compatibility/Compatibility.kt
index f10ad8e00..c4cc48734 100644
--- a/app/src/main/java/org/linphone/compatibility/Compatibility.kt
+++ b/app/src/main/java/org/linphone/compatibility/Compatibility.kt
@@ -38,7 +38,6 @@ class Compatibility {
     companion object {
         private const val TAG = "[Compatibility]"
 
-        const val FOREGROUND_SERVICE_TYPE_DATA_SYNC = 1 // ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC
         const val FOREGROUND_SERVICE_TYPE_PHONE_CALL = 4 // ServiceInfo.FOREGROUND_SERVICE_TYPE_PHONE_CALL
         const val FOREGROUND_SERVICE_TYPE_CAMERA = 64 // ServiceInfo.FOREGROUND_SERVICE_TYPE_CAMERA
         const val FOREGROUND_SERVICE_TYPE_MICROPHONE = 128 // ServiceInfo.FOREGROUND_SERVICE_TYPE_MICROPHONE
@@ -159,12 +158,11 @@ class Compatibility {
             return null
         }
 
-        fun setLocusIdInContentCaptureSession(root: View, localSipUri: String, remoteSipUri: String) {
+        fun setLocusIdInContentCaptureSession(root: View, conversationId: String) {
             if (Version.sdkAboveOrEqual(Version.API29_ANDROID_10)) {
                 return Api29Compatibility.setLocusIdInContentCaptureSession(
                     root,
-                    localSipUri,
-                    remoteSipUri
+                    conversationId
                 )
             }
         }
diff --git a/app/src/main/java/org/linphone/contacts/AvatarGenerator.kt b/app/src/main/java/org/linphone/contacts/AvatarGenerator.kt
index dfeadb58f..704e5543d 100644
--- a/app/src/main/java/org/linphone/contacts/AvatarGenerator.kt
+++ b/app/src/main/java/org/linphone/contacts/AvatarGenerator.kt
@@ -33,6 +33,8 @@ import androidx.core.content.res.ResourcesCompat
 import androidx.core.graphics.drawable.IconCompat
 import org.linphone.R
 import org.linphone.utils.AppUtils
+import androidx.core.graphics.createBitmap
+import androidx.core.graphics.drawable.toDrawable
 
 class AvatarGenerator(private val context: Context) {
     private var textSize: Float = AppUtils.getDimension(R.dimen.avatar_initials_text_size)
@@ -74,7 +76,7 @@ class AvatarGenerator(private val context: Context) {
         val textPainter = getTextPainter()
         val painter = if (useTransparentBackground) getTransparentPainter() else getBackgroundPainter()
 
-        val bitmap = Bitmap.createBitmap(avatarSize, avatarSize, Bitmap.Config.ARGB_8888)
+        val bitmap = createBitmap(avatarSize, avatarSize)
         val canvas = Canvas(bitmap)
         val areaRect = Rect(0, 0, avatarSize, avatarSize)
         val bounds = RectF(areaRect)
@@ -91,7 +93,7 @@ class AvatarGenerator(private val context: Context) {
     }
 
     fun buildDrawable(): BitmapDrawable {
-        return BitmapDrawable(context.resources, buildBitmap(true))
+        return buildBitmap(true).toDrawable(context.resources)
     }
 
     fun buildIcon(): IconCompat {
diff --git a/app/src/main/java/org/linphone/contacts/ContactsManager.kt b/app/src/main/java/org/linphone/contacts/ContactsManager.kt
index aa179add7..1f9afffa1 100644
--- a/app/src/main/java/org/linphone/contacts/ContactsManager.kt
+++ b/app/src/main/java/org/linphone/contacts/ContactsManager.kt
@@ -143,6 +143,14 @@ class ContactsManager
     }
 
     private val friendListListener: FriendListListenerStub = object : FriendListListenerStub() {
+        @WorkerThread
+        override fun onPresenceReceived(friendList: FriendList, friends: Array<out Friend?>) {
+            if (friendList.isSubscriptionBodyless) {
+                Log.i("$TAG Bodyless friendlist [${friendList.displayName}] presence received")
+                notifyContactsListChanged()
+            }
+        }
+
         @WorkerThread
         override fun onNewSipAddressDiscovered(
             friendList: FriendList,
@@ -575,10 +583,12 @@ class ContactsManager
 
     @WorkerThread
     fun onCoreStarted(core: Core) {
+        Log.i("$TAG Core has been started")
         loadContactsOnlyFromDefaultDirectory = corePreferences.fetchContactsFromDefaultDirectory
 
         core.addListener(coreListener)
         for (list in core.friendsLists) {
+            Log.i("$TAG Found existing friend list [${list.displayName}]")
             list.addListener(friendListListener)
         }
 
@@ -604,6 +614,7 @@ class ContactsManager
 
     @WorkerThread
     fun onCoreStopped(core: Core) {
+        Log.w("$TAG Core has been stopped")
         coroutineScope.cancel()
 
         core.removeListener(coreListener)
diff --git a/app/src/main/java/org/linphone/core/CoreContext.kt b/app/src/main/java/org/linphone/core/CoreContext.kt
index f7bbfb102..ca69874cb 100644
--- a/app/src/main/java/org/linphone/core/CoreContext.kt
+++ b/app/src/main/java/org/linphone/core/CoreContext.kt
@@ -46,6 +46,7 @@ import org.linphone.ui.call.CallActivity
 import org.linphone.utils.ActivityMonitor
 import org.linphone.utils.AppUtils
 import org.linphone.utils.Event
+import org.linphone.utils.FileUtils
 import org.linphone.utils.LinphoneUtils
 
 class CoreContext
@@ -92,6 +93,10 @@ class CoreContext
         MutableLiveData<Event<String>>()
     }
 
+    val clearAuthenticationRequestDialogEvent: MutableLiveData<Event<Boolean>> by lazy {
+        MutableLiveData<Event<Boolean>>()
+    }
+
     val refreshMicrophoneMuteStateEvent: MutableLiveData<Event<Boolean>> by lazy {
         MutableLiveData<Event<Boolean>>()
     }
@@ -112,6 +117,11 @@ class CoreContext
         MutableLiveData<Event<Boolean>>()
     }
 
+    private var filesToExportToNativeMediaGallery = arrayListOf<String>()
+    val filesToExportToNativeMediaGalleryEvent: MutableLiveData<Event<List<String>>> by lazy {
+        MutableLiveData<Event<List<String>>>()
+    }
+
     @SuppressLint("HandlerLeak")
     private lateinit var coreThread: Handler
 
@@ -155,6 +165,42 @@ class CoreContext
     private var previousCallState = Call.State.Idle
 
     private val coreListener = object : CoreListenerStub() {
+        @WorkerThread
+        override fun onMessagesReceived(
+            core: Core,
+            chatRoom: ChatRoom,
+            messages: Array<out ChatMessage?>
+        ) {
+            if (corePreferences.makePublicMediaFilesDownloaded && core.maxSizeForAutoDownloadIncomingFiles >= 0) {
+                for (message in messages) {
+                    // Never do auto media export for ephemeral messages!
+                    if (message?.isEphemeral == true) continue
+
+                    for (content in message?.contents.orEmpty()) {
+                        if (content.isFile) {
+                            val path = content.filePath
+                            if (path.isNullOrEmpty()) continue
+
+                            val mime = "${content.type}/${content.subtype}"
+                            val mimeType = FileUtils.getMimeType(mime)
+                            when (mimeType) {
+                                FileUtils.MimeType.Image, FileUtils.MimeType.Video, FileUtils.MimeType.Audio -> {
+                                    Log.i("$TAG Added file path [$path] to the list of media to export to native media gallery")
+                                    filesToExportToNativeMediaGallery.add(path)
+                                }
+                                else -> {}
+                            }
+                        }
+                    }
+                }
+            }
+
+            if (filesToExportToNativeMediaGallery.isNotEmpty()) {
+                Log.i("$TAG Creating event with [${filesToExportToNativeMediaGallery.size}] files to export to native media gallery")
+                filesToExportToNativeMediaGalleryEvent.postValue(Event(filesToExportToNativeMediaGallery))
+            }
+        }
+
         @WorkerThread
         override fun onGlobalStateChanged(core: Core, state: GlobalState, message: String) {
             Log.i("$TAG Global state changed [$state]")
@@ -163,6 +209,8 @@ class CoreContext
                 // Wait for GlobalState.ON as some settings modification won't be saved
                 // in RC file if Core isn't ON
                 onCoreStarted()
+            } else if (state == GlobalState.Shutdown) {
+                onCoreStopped()
             }
         }
 
@@ -347,6 +395,7 @@ class CoreContext
             }
         }
 
+        @WorkerThread
         override fun onAccountAdded(core: Core, account: Account) {
             // Prevent this trigger when core is stopped/start in remote prov
             if (core.globalState == GlobalState.Off) return
@@ -368,6 +417,15 @@ class CoreContext
                 }
             }
         }
+
+        @WorkerThread
+        override fun onAccountRemoved(core: Core, account: Account) {
+            Log.i("$TAG Account [${account.params.identityAddress?.asStringUriOnly()}] removed, clearing auth request dialog if needed")
+            if (account.findAuthInfo() == digestAuthInfoPendingPasswordUpdate) {
+                Log.i("$TAG Removed account matches auth info pending password update, removing dialog")
+                clearAuthenticationRequestDialogEvent.postValue(Event(true))
+            }
+        }
     }
 
     private var logcatEnabled: Boolean = corePreferences.printLogsInLogcat
@@ -415,7 +473,9 @@ class CoreContext
         }
         Log.i("=========================================")
         Log.i("==== Linphone-android information dump ====")
-        Log.i("VERSION=${BuildConfig.VERSION_NAME} / ${BuildConfig.VERSION_CODE}")
+        val gitVersion = AppUtils.getString(org.linphone.R.string.linphone_app_version)
+        val gitBranch = AppUtils.getString(org.linphone.R.string.linphone_app_branch)
+        Log.i("VERSION=${BuildConfig.VERSION_NAME} / ${BuildConfig.VERSION_CODE} ($gitVersion from $gitBranch branch)")
         Log.i("PACKAGE=${BuildConfig.APPLICATION_ID}")
         Log.i("BUILD TYPE=${BuildConfig.BUILD_TYPE}")
         Log.i("=========================================")
@@ -498,6 +558,14 @@ class CoreContext
         Log.i("$TAG Started contacts, telecom & notifications managers")
     }
 
+    @WorkerThread
+    private fun onCoreStopped() {
+        Log.w("$TAG Core is being shut down, notifying managers so they can remove their listeners and do some cleanup if needed")
+        contactsManager.onCoreStopped(core)
+        telecomManager.onCoreStopped(core)
+        notificationsManager.onCoreStopped(core)
+    }
+
     @WorkerThread
     private fun destroyCore() {
         if (!::core.isInitialized) {
@@ -520,10 +588,6 @@ class CoreContext
 
         core.stop()
 
-        contactsManager.onCoreStopped(core)
-        telecomManager.onCoreStopped(core)
-        notificationsManager.onCoreStopped(core)
-
         // It's very unlikely the process will survive until the Core reaches GlobalStateOff sadly
         Log.w("$TAG Core has been shut down")
         exitProcess(0)
@@ -620,6 +684,11 @@ class CoreContext
         return found != null
     }
 
+    @WorkerThread
+    fun clearFilesToExportToNativeGallery() {
+        filesToExportToNativeMediaGallery.clear()
+    }
+
     @WorkerThread
     fun startAudioCall(
         address: Address,
@@ -728,7 +797,9 @@ class CoreContext
 
     @WorkerThread
     fun answerCall(call: Call) {
-        Log.i("$TAG Answering call $call")
+        Log.i(
+            "$TAG Answering call with remote address [${call.remoteAddress.asStringUriOnly()}] and to address [${call.toAddress.asStringUriOnly()}]"
+        )
         val params = core.createCallParams(call)
         if (params == null) {
             Log.w("$TAG Answering call without params!")
diff --git a/app/src/main/java/org/linphone/core/CorePreferences.kt b/app/src/main/java/org/linphone/core/CorePreferences.kt
index 1c7aecf2c..353129377 100644
--- a/app/src/main/java/org/linphone/core/CorePreferences.kt
+++ b/app/src/main/java/org/linphone/core/CorePreferences.kt
@@ -142,12 +142,29 @@ class CorePreferences
 
     // Conversation related
 
+    @get:WorkerThread @set:WorkerThread
     var markConversationAsReadWhenDismissingMessageNotification: Boolean
         get() = config.getBool("app", "mark_as_read_notif_dismissal", false)
         set(value) {
             config.setBool("app", "mark_as_read_notif_dismissal", value)
         }
 
+    var makePublicMediaFilesDownloaded: Boolean
+        // Keep old name for backward compatibility
+        get() = config.getBool("app", "make_downloaded_images_public_in_gallery", false)
+        set(value) {
+            config.setBool("app", "make_downloaded_images_public_in_gallery", value)
+        }
+
+    // Conference related
+
+    @get:WorkerThread @set:WorkerThread
+    var createEndToEndEncryptedMeetingsAndGroupCalls: Boolean
+        get() = config.getBool("app", "create_e2e_encrypted_conferences", false)
+        set(value) {
+            config.setBool("app", "create_e2e_encrypted_conferences", value)
+        }
+
     // Contacts related
 
     @get:WorkerThread @set:WorkerThread
@@ -266,6 +283,10 @@ class CorePreferences
     val hideAssistantThirdPartySipAccount: Boolean
         get() = config.getBool("ui", "assistant_hide_third_party_account", false)
 
+    @get:WorkerThread
+    val singleSignOnClientId: String
+        get() = config.getString("app", "oidc_client_id", "linphone")!!
+
     @get:WorkerThread
     val useUsernameAsSingleSignOnLoginHint: Boolean
         get() = config.getBool("ui", "use_username_as_sso_login_hint", false)
@@ -328,6 +349,10 @@ class CorePreferences
     val ssoCacheFile: String
         get() = context.filesDir.absolutePath + "/auth_state.json"
 
+    @get:AnyThread
+    val messageReceivedInVisibleConversationNotificationSound: String
+        get() = context.filesDir.absolutePath + "/share/sounds/linphone/incoming_chat.wav"
+
     @UiThread
     fun copyAssetsFromPackage() {
         copy("linphonerc_default", configPath)
diff --git a/app/src/main/java/org/linphone/core/VFS.kt b/app/src/main/java/org/linphone/core/VFS.kt
index 135aed367..4425b4857 100644
--- a/app/src/main/java/org/linphone/core/VFS.kt
+++ b/app/src/main/java/org/linphone/core/VFS.kt
@@ -27,6 +27,7 @@ import android.util.Base64
 import android.util.Pair
 import androidx.security.crypto.EncryptedSharedPreferences
 import androidx.security.crypto.MasterKey
+import org.linphone.LinphoneApplication.Companion.corePreferences
 import java.math.BigInteger
 import java.nio.charset.StandardCharsets
 import java.security.KeyStore
@@ -38,6 +39,7 @@ import javax.crypto.KeyGenerator
 import javax.crypto.SecretKey
 import javax.crypto.spec.GCMParameterSpec
 import org.linphone.core.tools.Log
+import androidx.core.content.edit
 
 class VFS {
     companion object {
@@ -72,7 +74,13 @@ class VFS {
                 return false
             }
 
-            preferences.edit().putBoolean("vfs_enabled", true).apply()
+            preferences.edit { putBoolean("vfs_enabled", true) }
+
+            if (corePreferences.makePublicMediaFilesDownloaded) {
+                Log.w("$TAG VFS is now enabled, disabling auto export of media files to native gallery")
+                corePreferences.makePublicMediaFilesDownloaded = false
+            }
+
             return true
         }
 
@@ -91,10 +99,10 @@ class VFS {
                     generateSecretKey()
                     encryptToken(generateToken()).let { data ->
                         preferences
-                            .edit()
-                            .putString(VFS_IV, data.first)
-                            .putString(VFS_KEY, data.second)
-                            .commit()
+                            .edit(commit = true) {
+                                putString(VFS_IV, data.first)
+                                    .putString(VFS_KEY, data.second)
+                            }
                     }
                 }
 
diff --git a/app/src/main/java/org/linphone/notifications/NotificationsManager.kt b/app/src/main/java/org/linphone/notifications/NotificationsManager.kt
index 0e3bd47a3..e5012898b 100644
--- a/app/src/main/java/org/linphone/notifications/NotificationsManager.kt
+++ b/app/src/main/java/org/linphone/notifications/NotificationsManager.kt
@@ -31,6 +31,7 @@ import android.content.pm.PackageManager
 import android.graphics.Bitmap
 import android.media.AudioAttributes
 import android.media.AudioManager
+import android.media.MediaPlayer
 import android.media.RingtoneManager
 import android.net.Uri
 import android.os.Bundle
@@ -71,6 +72,8 @@ import org.linphone.core.MediaDirection
 import org.linphone.core.tools.Log
 import org.linphone.ui.call.CallActivity
 import org.linphone.ui.main.MainActivity
+import org.linphone.ui.main.MainActivity.Companion.ARGUMENTS_CHAT
+import org.linphone.ui.main.MainActivity.Companion.ARGUMENTS_CONVERSATION_ID
 import org.linphone.utils.AppUtils
 import org.linphone.utils.FileUtils
 import org.linphone.utils.LinphoneUtils
@@ -122,6 +125,8 @@ class NotificationsManager
     private var currentlyDisplayedChatRoomId: String = ""
     private var currentlyDisplayedIncomingCallFragment: Boolean = false
 
+    private lateinit var mediaPlayer: MediaPlayer
+
     private val contactsListener = object : ContactsListener {
         @WorkerThread
         override fun onContactsLoaded() { }
@@ -262,11 +267,22 @@ class NotificationsManager
             Log.i("$TAG Received ${messages.size} aggregated messages")
             if (corePreferences.disableChat) return
 
-            val id = LinphoneUtils.getChatRoomId(chatRoom)
+            val id = LinphoneUtils.getConversationId(chatRoom)
             if (currentlyDisplayedChatRoomId.isNotEmpty() && id == currentlyDisplayedChatRoomId) {
                 Log.i(
-                    "$TAG Do not notify received messages for currently displayed conversation [$id]"
+                    "$TAG Do not notify received messages for currently displayed conversation [$id], but play sound if at least one message is incoming and not read"
                 )
+
+                var playSound = false
+                for (message in messages) {
+                    if (!message.isOutgoing && !message.isRead) {
+                        playSound = true
+                        break
+                    }
+                }
+                if (playSound) {
+                    playMessageReceivedSound()
+                }
                 return
             }
 
@@ -301,7 +317,7 @@ class NotificationsManager
                 "$TAG Reaction received [${reaction.body}] from [${address.asStringUriOnly()}] for message [$message]"
             )
 
-            val id = LinphoneUtils.getChatRoomId(chatRoom)
+            val id = LinphoneUtils.getConversationId(chatRoom)
             /*if (id == currentlyDisplayedChatRoomId) {
                 Log.i(
                     "$TAG Do not notify received reaction for currently displayed conversation [$id]"
@@ -340,7 +356,7 @@ class NotificationsManager
             if (corePreferences.disableChat) return
 
             if (chatRoom.muted) {
-                val id = LinphoneUtils.getChatRoomId(chatRoom)
+                val id = LinphoneUtils.getConversationId(chatRoom)
                 Log.i("$TAG Conversation $id has been muted")
                 return
             }
@@ -370,7 +386,7 @@ class NotificationsManager
                         val notification = createMessageNotification(
                             notifiable,
                             pendingIntent,
-                            LinphoneUtils.getChatRoomId(chatRoom),
+                            LinphoneUtils.getConversationId(chatRoom),
                             me
                         )
                         notify(notifiable.notificationId, notification, CHAT_TAG)
@@ -389,7 +405,7 @@ class NotificationsManager
         @WorkerThread
         override fun onChatRoomRead(core: Core, chatRoom: ChatRoom) {
             Log.i(
-                "$TAG Conversation [${LinphoneUtils.getChatRoomId(chatRoom)}] has been marked as read, removing notification if any"
+                "$TAG Conversation [${LinphoneUtils.getConversationId(chatRoom)}] has been marked as read, removing notification if any"
             )
             dismissChatNotification(chatRoom)
         }
@@ -533,6 +549,21 @@ class NotificationsManager
         core.addListener(coreListener)
 
         coreContext.contactsManager.addListener(contactsListener)
+
+        val soundPath = corePreferences.messageReceivedInVisibleConversationNotificationSound
+        mediaPlayer = MediaPlayer().apply {
+            try {
+                setAudioAttributes(
+                    AudioAttributes.Builder().setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
+                        .setUsage(AudioAttributes.USAGE_NOTIFICATION)
+                        .build()
+                )
+                setDataSource(soundPath)
+                prepare()
+            } catch (e: Exception) {
+                Log.e("$TAG Failed to prepare message received sound file [$soundPath]: $e")
+            }
+        }
     }
 
     @WorkerThread
@@ -786,7 +817,7 @@ class NotificationsManager
         val address = chatRoom.peerAddress.asStringUriOnly()
         var notifiable: Notifiable? = chatNotificationsMap[address]
         if (notifiable == null) {
-            notifiable = Notifiable(LinphoneUtils.getChatRoomId(chatRoom).hashCode())
+            notifiable = Notifiable(LinphoneUtils.getConversationId(chatRoom).hashCode())
             notifiable.myself = LinphoneUtils.getDisplayName(chatRoom.localAddress)
             notifiable.localIdentity = chatRoom.localAddress.asStringUriOnly()
             notifiable.remoteAddress = chatRoom.peerAddress.asStringUriOnly()
@@ -834,7 +865,7 @@ class NotificationsManager
             val notification = createMessageNotification(
                 notifiable,
                 pendingIntent,
-                LinphoneUtils.getChatRoomId(chatRoom),
+                LinphoneUtils.getConversationId(chatRoom),
                 me
             )
             notify(notifiable.notificationId, notification, CHAT_TAG)
@@ -899,7 +930,7 @@ class NotificationsManager
             val notification = createMessageNotification(
                 notifiable,
                 pendingIntent,
-                LinphoneUtils.getChatRoomId(chatRoom),
+                LinphoneUtils.getConversationId(chatRoom),
                 me
             )
             notify(notifiable.notificationId, notification, CHAT_TAG)
@@ -928,7 +959,7 @@ class NotificationsManager
         val notification = createMessageNotification(
             notifiable,
             pendingIntent,
-            LinphoneUtils.getChatRoomId(chatRoom),
+            LinphoneUtils.getConversationId(chatRoom),
             me
         )
         Log.i(
@@ -1103,7 +1134,7 @@ class NotificationsManager
         }
 
         Log.i(
-            "Creating notification for [${if (isIncoming) "incoming" else "outgoing"}] [${if (isConference) "conference" else "call"}] with video [${if (isVideo) "enabled" else "disabled"}] on channel [$channel]"
+            "Creating notification for ${if (isIncoming) "[incoming] " else ""}[${if (isConference) "conference" else "call"}] with video [${if (isVideo) "enabled" else "disabled"}] on channel [$channel]"
         )
 
         val builder = NotificationCompat.Builder(
@@ -1295,7 +1326,7 @@ class NotificationsManager
             return true
         } else {
             val previousNotificationId = previousChatNotifications.find { id ->
-                id == LinphoneUtils.getChatRoomId(chatRoom).hashCode()
+                id == LinphoneUtils.getConversationId(chatRoom).hashCode()
             }
             if (previousNotificationId != null) {
                 Log.i(
@@ -1362,7 +1393,7 @@ class NotificationsManager
         val notification = createMessageNotification(
             notifiable,
             pendingIntent,
-            LinphoneUtils.getChatRoomId(chatRoom),
+            LinphoneUtils.getConversationId(chatRoom),
             me
         )
         notify(notifiable.notificationId, notification, CHAT_TAG)
@@ -1551,7 +1582,7 @@ class NotificationsManager
         val id = context.getString(R.string.notification_channel_call_id)
         val name = context.getString(R.string.notification_channel_call_name)
 
-        val channel = NotificationChannel(id, name, NotificationManager.IMPORTANCE_DEFAULT).apply {
+        val channel = NotificationChannel(id, name, NotificationManager.IMPORTANCE_LOW).apply {
             description = name
             lockscreenVisibility = Notification.VISIBILITY_PUBLIC
         }
@@ -1585,9 +1616,8 @@ class NotificationsManager
     @WorkerThread
     private fun getChatRoomPendingIntent(chatRoom: ChatRoom, notificationId: Int): PendingIntent {
         val args = Bundle()
-        args.putBoolean("Chat", true)
-        args.putString("RemoteSipUri", chatRoom.peerAddress.asStringUriOnly())
-        args.putString("LocalSipUri", chatRoom.localAddress.asStringUriOnly())
+        args.putBoolean(ARGUMENTS_CHAT, true)
+        args.putString(ARGUMENTS_CONVERSATION_ID, LinphoneUtils.getConversationId(chatRoom))
 
         // Not using NavDeepLinkBuilder to prevent stacking a ConversationsListFragment above another one
         return TaskStackBuilder.create(context).run {
@@ -1605,6 +1635,17 @@ class NotificationsManager
         }
     }
 
+    @WorkerThread
+    private fun playMessageReceivedSound() {
+        if (::mediaPlayer.isInitialized) {
+            try {
+                mediaPlayer.start()
+            } catch (e: Exception) {
+                Log.e("$TAG Failed to play message received sound file: $e")
+            }
+        }
+    }
+
     class Notifiable(val notificationId: Int) {
         var myself: String? = null
 
diff --git a/app/src/main/java/org/linphone/telecom/TelecomCallControlCallback.kt b/app/src/main/java/org/linphone/telecom/TelecomCallControlCallback.kt
index 1e3f692ca..6d551839d 100644
--- a/app/src/main/java/org/linphone/telecom/TelecomCallControlCallback.kt
+++ b/app/src/main/java/org/linphone/telecom/TelecomCallControlCallback.kt
@@ -31,9 +31,11 @@ import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
 import org.linphone.LinphoneApplication.Companion.coreContext
+import org.linphone.LinphoneApplication.Companion.corePreferences
 import org.linphone.core.AudioDevice
 import org.linphone.core.Call
 import org.linphone.core.CallListenerStub
+import org.linphone.core.Reason
 import org.linphone.core.tools.Log
 import org.linphone.utils.AudioUtils
 import org.linphone.utils.Event
@@ -50,6 +52,7 @@ class TelecomCallControlCallback(
 
     private var availableEndpoints: List<CallEndpointCompat> = arrayListOf()
     private var currentEndpoint = CallEndpointCompat.TYPE_UNKNOWN
+    private var endpointUpdateRequestFromLinphone: Boolean = false
 
     private val callListener = object : CallListenerStub() {
         @WorkerThread
@@ -64,9 +67,14 @@ class TelecomCallControlCallback(
                         CallAttributesCompat.Companion.CALL_TYPE_AUDIO_CALL
                     }
                     scope.launch {
-                        Log.i("$TAG Answering ${if (isVideo) "video" else "audio"} call")
+                        Log.i("$TAG Answering [${if (isVideo) "video" else "audio"}] call")
                         callControl.answer(type)
                     }
+
+                    if (isVideo && corePreferences.routeAudioToSpeakerWhenVideoIsEnabled) {
+                        Log.i("$TAG Answering video call, routing audio to speaker")
+                        AudioUtils.routeAudioToSpeaker(call)
+                    }
                 } else {
                     scope.launch {
                         Log.i("$TAG Setting call active")
@@ -74,18 +82,39 @@ class TelecomCallControlCallback(
                     }
                 }
             } else if (state == Call.State.End) {
+                val reason = call.reason
+                val direction = call.dir
                 scope.launch {
-                    Log.i("$TAG Disconnecting call because it has ended")
-                    callControl.disconnect(DisconnectCause(DisconnectCause.LOCAL))
+                    val disconnectCause = when (reason) {
+                        Reason.NotAnswered -> DisconnectCause.REMOTE
+                        Reason.Declined -> DisconnectCause.REJECTED
+                        Reason.Busy -> {
+                            if (direction == Call.Dir.Incoming) {
+                                DisconnectCause.MISSED
+                            } else {
+                                DisconnectCause.BUSY
+                            }
+                        }
+                        else -> DisconnectCause.LOCAL
+                    }
+                    Log.i("$TAG Disconnecting [${if (direction == Call.Dir.Incoming)"incoming" else "outgoing"}] call with cause [${disconnectCauseToString(disconnectCause)}] because it has ended with reason [$reason]")
+                    try {
+                        callControl.disconnect(DisconnectCause(disconnectCause))
+                    } catch (ise: IllegalArgumentException) {
+                        Log.e("$TAG Couldn't disconnect call control with cause [${disconnectCauseToString(disconnectCause)}]: $ise")
+                    }
                 }
             } else if (state == Call.State.Error) {
+                val reason = call.reason
                 scope.launch {
-                    Log.w("$TAG Disconnecting call due to error [$message]")
+                    // For some reason DisconnectCause.ERROR or DisconnectCause.BUSY triggers an IllegalArgumentException with following message
+                    // Valid DisconnectCause codes are limited to [DisconnectCause.LOCAL, DisconnectCause.REMOTE, DisconnectCause.MISSED, or DisconnectCause.REJECTED]
+                    val disconnectCause = DisconnectCause.REJECTED
+                    Log.w("$TAG Disconnecting call with cause [${disconnectCauseToString(disconnectCause)}] due to error [$message] and reason [$reason]")
                     try {
-                        // For some reason DisconnectCause.ERROR triggers an IllegalArgumentException
-                        callControl.disconnect(DisconnectCause(DisconnectCause.REJECTED))
+                        callControl.disconnect(DisconnectCause(disconnectCause))
                     } catch (ise: IllegalArgumentException) {
-                        Log.e("$TAG Couldn't terminate call control with REJECTED cause: $ise")
+                        Log.e("$TAG Couldn't disconnect call control with cause [${disconnectCauseToString(disconnectCause)}]: $ise")
                     }
                 }
             } else if (state == Call.State.Pausing) {
@@ -134,11 +163,23 @@ class TelecomCallControlCallback(
         }.launchIn(scope)
 
         callControl.currentCallEndpoint.onEach { endpoint ->
-            Log.i("$TAG We're asked to use [${endpoint.name}] audio endpoint")
+            val type = endpoint.type
+            currentEndpoint = type
+            if (endpointUpdateRequestFromLinphone) {
+                Log.i("$TAG Linphone requests to use [${endpoint.name}] audio endpoint with type [$type]")
+            } else {
+                Log.i("$TAG Android requests us to use [${endpoint.name}] audio endpoint with type [$type]")
+            }
+
+            if (!endpointUpdateRequestFromLinphone && !coreContext.isConnectedToAndroidAuto && (type == CallEndpointCompat.Companion.TYPE_EARPIECE || type == CallEndpointCompat.Companion.TYPE_SPEAKER)) {
+                Log.w("$TAG Device isn't connected to Android Auto, do not follow system request to change audio endpoint to either earpiece or speaker")
+                return@onEach
+            }
+
             // Change audio route in SDK, this way the usual listener will trigger
             // and we'll be able to update the UI accordingly
             val route = arrayListOf<AudioDevice.Type>()
-            when (endpoint.type) {
+            when (type) {
                 CallEndpointCompat.Companion.TYPE_EARPIECE -> {
                     route.add(AudioDevice.Type.Earpiece)
                 }
@@ -154,7 +195,6 @@ class TelecomCallControlCallback(
                 }
             }
             if (route.isNotEmpty()) {
-                currentEndpoint = endpoint.type
                 coreContext.postOnCoreThread {
                     if (!AudioUtils.applyAudioRouteChangeInLinphone(call, route)) {
                         Log.w("$TAG Failed to apply audio route change, trying again in 200ms")
@@ -164,6 +204,7 @@ class TelecomCallControlCallback(
                     }
                 }
             }
+            endpointUpdateRequestFromLinphone = false
         }.launchIn(scope)
 
         callControl.isMuted.onEach { muted ->
@@ -193,6 +234,7 @@ class TelecomCallControlCallback(
     }
 
     fun applyAudioRouteToCallWithId(routes: List<AudioDevice.Type>): Boolean {
+        endpointUpdateRequestFromLinphone = true
         Log.i("$TAG Looking for audio endpoint with type [${routes.first()}]")
 
         var wiredHeadsetFound = false
@@ -260,4 +302,23 @@ class TelecomCallControlCallback(
         }
         return false
     }
+
+    private fun disconnectCauseToString(cause: Int): String {
+        return when (cause) {
+            DisconnectCause.UNKNOWN -> "UNKNOWN"
+            DisconnectCause.ERROR -> "ERROR"
+            DisconnectCause.LOCAL -> "LOCAL"
+            DisconnectCause.REMOTE -> "REMOTE"
+            DisconnectCause.CANCELED -> "CANCELED"
+            DisconnectCause.MISSED -> "MISSED"
+            DisconnectCause.REJECTED -> "REJECTED"
+            DisconnectCause.BUSY -> "BUSY"
+            DisconnectCause.RESTRICTED -> "RESTRICTED"
+            DisconnectCause.OTHER -> "OTHER"
+            DisconnectCause.CONNECTION_MANAGER_NOT_SUPPORTED -> "CONNECTION_MANAGER_NOT_SUPPORTED"
+            DisconnectCause.ANSWERED_ELSEWHERE -> "ANSWERED_ELSEWHERE"
+            DisconnectCause.CALL_PULLED -> "CALL_PULLED"
+            else -> "UNEXPECTED: $cause"
+        }
+    }
 }
diff --git a/app/src/main/java/org/linphone/telecom/TelecomManager.kt b/app/src/main/java/org/linphone/telecom/TelecomManager.kt
index 994eca22e..785d43182 100644
--- a/app/src/main/java/org/linphone/telecom/TelecomManager.kt
+++ b/app/src/main/java/org/linphone/telecom/TelecomManager.kt
@@ -20,9 +20,9 @@
 package org.linphone.telecom
 
 import android.content.Context
-import android.net.Uri
 import androidx.annotation.WorkerThread
 import androidx.core.telecom.CallAttributesCompat
+import androidx.core.telecom.CallException
 import androidx.core.telecom.CallsManager
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -35,6 +35,7 @@ import org.linphone.core.Core
 import org.linphone.core.CoreListenerStub
 import org.linphone.core.tools.Log
 import org.linphone.utils.LinphoneUtils
+import androidx.core.net.toUri
 
 class TelecomManager
     @WorkerThread
@@ -51,8 +52,15 @@ class TelecomManager
 
     private val coreListener = object : CoreListenerStub() {
         @WorkerThread
-        override fun onCallCreated(core: Core, call: Call) {
-            onCallCreated(call)
+        override fun onCallStateChanged(
+            core: Core,
+            call: Call,
+            state: Call.State?,
+            message: String
+        ) {
+            if (state == Call.State.IncomingReceived || state == Call.State.OutgoingProgress) {
+                onCallCreated(call)
+            }
         }
 
         @WorkerThread
@@ -88,10 +96,10 @@ class TelecomManager
 
     @WorkerThread
     fun onCallCreated(call: Call) {
-        Log.i("$TAG Call to [${call.remoteAddress.asStringUriOnly()}] created")
+        Log.i("$TAG Call to [${call.remoteAddress.asStringUriOnly()}] created in state [${call.state}]")
 
         val address = call.callLog.remoteAddress
-        val uri = Uri.parse(address.asStringUriOnly())
+        val uri = address.asStringUriOnly().toUri()
 
         val direction = if (call.dir == Call.Dir.Outgoing) {
             CallAttributesCompat.DIRECTION_OUTGOING
@@ -99,9 +107,9 @@ class TelecomManager
             CallAttributesCompat.DIRECTION_INCOMING
         }
 
-        val conferenceInfo = LinphoneUtils.getConferenceInfoIfAny(call)
         val capabilities = CallAttributesCompat.SUPPORTS_SET_INACTIVE or CallAttributesCompat.SUPPORTS_TRANSFER
 
+        val conferenceInfo = LinphoneUtils.getConferenceInfoIfAny(call)
         val displayName = if (call.conference != null || conferenceInfo != null) {
             conferenceInfo?.subject ?: call.conference?.subject ?: LinphoneUtils.getDisplayName(address)
         } else {
@@ -109,20 +117,24 @@ class TelecomManager
             friend?.name ?: LinphoneUtils.getDisplayName(address)
         }
 
-        // When call is created, it is ringing (incoming or outgoing, do not set video)
-        val type = CallAttributesCompat.Companion.CALL_TYPE_AUDIO_CALL
-
-        val callAttributes = CallAttributesCompat(
-            displayName,
-            uri,
-            direction,
-            type,
-            capabilities
-        )
-        Log.i("$TAG Adding call to Telecom's CallsManager with attributes [$callAttributes]")
+        val isVideo = LinphoneUtils.isVideoEnabled(call)
+        val type = if (isVideo) {
+            CallAttributesCompat.Companion.CALL_TYPE_VIDEO_CALL
+        } else {
+            CallAttributesCompat.Companion.CALL_TYPE_AUDIO_CALL
+        }
 
         scope.launch {
             try {
+                val callAttributes = CallAttributesCompat(
+                    displayName,
+                    uri,
+                    direction,
+                    type,
+                    capabilities
+                )
+                Log.i("$TAG Adding call to Telecom's CallsManager with attributes [$callAttributes]")
+
                 callsManager.addCall(
                     callAttributes,
                     { callType -> // onAnswer
@@ -160,6 +172,11 @@ class TelecomManager
                 ) {
                     val callbacks = TelecomCallControlCallback(call, this, scope)
 
+                    // We must first call setCallback on callControlScope before using it
+                    callbacks.onCallControlCallbackSet()
+                    currentlyFollowedCalls += 1
+                    Log.i("$TAG Call added to Telecom's CallsManager")
+
                     coreContext.postOnCoreThread {
                         val callId = call.callLog.callId.orEmpty()
                         if (callId.isNotEmpty()) {
@@ -167,13 +184,8 @@ class TelecomManager
                             map[callId] = callbacks
                         }
                     }
-
-                    // We must first call setCallback on callControlScope before using it
-                    callbacks.onCallControlCallbackSet()
-                    currentlyFollowedCalls += 1
-                    Log.i("$TAG Call added to Telecom's CallsManager")
                 }
-            } catch (e: Exception) {
+            } catch (e: CallException) {
                 Log.e("$TAG Failed to add call to Telecom's CallsManager: $e")
             }
         }
diff --git a/app/src/main/java/org/linphone/telecom/auto/AAScreen.kt b/app/src/main/java/org/linphone/telecom/auto/AndroidAutoScreen.kt
similarity index 98%
rename from app/src/main/java/org/linphone/telecom/auto/AAScreen.kt
rename to app/src/main/java/org/linphone/telecom/auto/AndroidAutoScreen.kt
index bdc53b6ec..04e1fd0b6 100644
--- a/app/src/main/java/org/linphone/telecom/auto/AAScreen.kt
+++ b/app/src/main/java/org/linphone/telecom/auto/AndroidAutoScreen.kt
@@ -38,7 +38,7 @@ import org.linphone.core.tools.Log
 import org.linphone.utils.AppUtils
 import org.linphone.utils.LinphoneUtils
 
-class AAScreen(context: CarContext) : Screen(context) {
+class AndroidAutoScreen(context: CarContext) : Screen(context) {
     companion object {
         private const val TAG = "[Android Auto Screen]"
     }
diff --git a/app/src/main/java/org/linphone/telecom/auto/AAService.kt b/app/src/main/java/org/linphone/telecom/auto/AndroidAutoService.kt
similarity index 96%
rename from app/src/main/java/org/linphone/telecom/auto/AAService.kt
rename to app/src/main/java/org/linphone/telecom/auto/AndroidAutoService.kt
index 81ffc6de9..dab159b52 100644
--- a/app/src/main/java/org/linphone/telecom/auto/AAService.kt
+++ b/app/src/main/java/org/linphone/telecom/auto/AndroidAutoService.kt
@@ -26,7 +26,7 @@ import androidx.car.app.validation.HostValidator
 import org.linphone.R
 import org.linphone.core.tools.Log
 
-class AAService : CarAppService() {
+class AndroidAutoService : CarAppService() {
     companion object {
         private const val TAG = "[Android Auto Service]"
     }
@@ -55,6 +55,6 @@ class AAService : CarAppService() {
 
     override fun onCreateSession(): Session {
         Log.i("$TAG Creating Session object")
-        return AASession()
+        return AndroidAutoSession()
     }
 }
diff --git a/app/src/main/java/org/linphone/telecom/auto/AASession.kt b/app/src/main/java/org/linphone/telecom/auto/AndroidAutoSession.kt
similarity index 93%
rename from app/src/main/java/org/linphone/telecom/auto/AASession.kt
rename to app/src/main/java/org/linphone/telecom/auto/AndroidAutoSession.kt
index cc3515617..8107be8fe 100644
--- a/app/src/main/java/org/linphone/telecom/auto/AASession.kt
+++ b/app/src/main/java/org/linphone/telecom/auto/AndroidAutoSession.kt
@@ -24,13 +24,13 @@ import androidx.car.app.Screen
 import androidx.car.app.Session
 import org.linphone.core.tools.Log
 
-class AASession : Session() {
+class AndroidAutoSession : Session() {
     companion object {
         private const val TAG = "[Android Auto Session]"
     }
 
     override fun onCreateScreen(intent: Intent): Screen {
         Log.i("$TAG Creating Screen object for host with API level [${carContext.carAppApiLevel}]")
-        return AAScreen(carContext)
+        return AndroidAutoScreen(carContext)
     }
 }
diff --git a/app/src/main/java/org/linphone/ui/GenericActivity.kt b/app/src/main/java/org/linphone/ui/GenericActivity.kt
index 6f82a5992..8d5930966 100644
--- a/app/src/main/java/org/linphone/ui/GenericActivity.kt
+++ b/app/src/main/java/org/linphone/ui/GenericActivity.kt
@@ -235,7 +235,7 @@ open class GenericActivity : AppCompatActivity() {
         startActivity(intent)
     }
 
-    private fun enableWindowSecureMode(enable: Boolean) {
+    protected fun enableWindowSecureMode(enable: Boolean) {
         val flags: Int = window.attributes.flags
         if ((enable && flags and WindowManager.LayoutParams.FLAG_SECURE != 0) ||
             (!enable && flags and WindowManager.LayoutParams.FLAG_SECURE == 0)
diff --git a/app/src/main/java/org/linphone/ui/GenericFragment.kt b/app/src/main/java/org/linphone/ui/GenericFragment.kt
index 324a50106..7062f1c30 100644
--- a/app/src/main/java/org/linphone/ui/GenericFragment.kt
+++ b/app/src/main/java/org/linphone/ui/GenericFragment.kt
@@ -24,10 +24,6 @@ import androidx.fragment.app.Fragment
 
 @UiThread
 abstract class GenericFragment : Fragment() {
-    companion object {
-        private const val TAG = "[Generic Fragment]"
-    }
-
     protected fun observeToastEvents(viewModel: GenericViewModel) {
         viewModel.showRedToastEvent.observe(viewLifecycleOwner) {
             it.consume { pair ->
diff --git a/app/src/main/java/org/linphone/ui/GenericViewModel.kt b/app/src/main/java/org/linphone/ui/GenericViewModel.kt
index 5ca903d01..b31e4ef38 100644
--- a/app/src/main/java/org/linphone/ui/GenericViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/GenericViewModel.kt
@@ -19,6 +19,8 @@
  */
 package org.linphone.ui
 
+import androidx.annotation.DrawableRes
+import androidx.annotation.StringRes
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import org.linphone.utils.Event
@@ -41,4 +43,20 @@ open class GenericViewModel : ViewModel() {
     val showFormattedRedToastEvent: MutableLiveData<Event<Pair<String, Int>>> by lazy {
         MutableLiveData<Event<Pair<String, Int>>>()
     }
+
+    fun showGreenToast(@StringRes message: Int, @DrawableRes icon: Int) {
+        showGreenToastEvent.postValue(Event(Pair(message, icon)))
+    }
+
+    fun showFormattedGreenToast(message: String, @DrawableRes icon: Int) {
+        showFormattedGreenToastEvent.postValue(Event(Pair(message, icon)))
+    }
+
+    fun showRedToast(@StringRes message: Int, @DrawableRes icon: Int) {
+        showRedToastEvent.postValue(Event(Pair(message, icon)))
+    }
+
+    fun showFormattedRedToast(message: String, @DrawableRes icon: Int) {
+        showFormattedRedToastEvent.postValue(Event(Pair(message, icon)))
+    }
 }
diff --git a/app/src/main/java/org/linphone/ui/NotoSansFont.kt b/app/src/main/java/org/linphone/ui/NotoSansFont.kt
index 13fc31d33..cd51e00a0 100644
--- a/app/src/main/java/org/linphone/ui/NotoSansFont.kt
+++ b/app/src/main/java/org/linphone/ui/NotoSansFont.kt
@@ -23,10 +23,10 @@ import androidx.annotation.FontRes
 import org.linphone.R
 
 enum class NotoSansFont(@FontRes val fontRes: Int) {
-    NotoSansLight(R.font.noto_sans_light), // 300
+    // NotoSansLight(R.font.noto_sans_light), // 300
     NotoSansRegular(R.font.noto_sans_regular), // 400
     NotoSansMedium(R.font.noto_sans_medium), // 500
-    NotoSansSemiBold(R.font.noto_sans_semi_bold), // 600
+    // NotoSansSemiBold(R.font.noto_sans_semi_bold), // 600
     NotoSansBold(R.font.noto_sans_bold), // 700
     NotoSansExtraBold(R.font.noto_sans_extra_bold) // 800
 }
diff --git a/app/src/main/java/org/linphone/ui/assistant/fragment/LandingFragment.kt b/app/src/main/java/org/linphone/ui/assistant/fragment/LandingFragment.kt
index cd1f14594..f61341868 100644
--- a/app/src/main/java/org/linphone/ui/assistant/fragment/LandingFragment.kt
+++ b/app/src/main/java/org/linphone/ui/assistant/fragment/LandingFragment.kt
@@ -21,7 +21,6 @@ package org.linphone.ui.assistant.fragment
 
 import android.content.Context
 import android.content.Intent
-import android.net.Uri
 import android.os.Bundle
 import android.telephony.TelephonyManager
 import android.view.LayoutInflater
@@ -44,6 +43,7 @@ import org.linphone.ui.assistant.model.AcceptConditionsAndPolicyDialogModel
 import org.linphone.ui.assistant.viewmodel.AccountLoginViewModel
 import org.linphone.utils.DialogUtils
 import org.linphone.utils.PhoneNumberUtils
+import androidx.core.net.toUri
 
 @UiThread
 class LandingFragment : GenericFragment() {
@@ -104,7 +104,7 @@ class LandingFragment : GenericFragment() {
         binding.setForgottenPasswordClickListener {
             val url = getString(R.string.web_platform_forgotten_password_url)
             try {
-                val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse(url))
+                val browserIntent = Intent(Intent.ACTION_VIEW, url.toUri())
                 startActivity(browserIntent)
             } catch (ise: IllegalStateException) {
                 Log.e(
@@ -207,7 +207,7 @@ class LandingFragment : GenericFragment() {
             it.consume {
                 val url = getString(R.string.website_privacy_policy_url)
                 try {
-                    val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse(url))
+                    val browserIntent = Intent(Intent.ACTION_VIEW, url.toUri())
                     startActivity(browserIntent)
                 } catch (ise: IllegalStateException) {
                     Log.e(
@@ -221,7 +221,7 @@ class LandingFragment : GenericFragment() {
             it.consume {
                 val url = getString(R.string.website_terms_and_conditions_url)
                 try {
-                    val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse(url))
+                    val browserIntent = Intent(Intent.ACTION_VIEW, url.toUri())
                     startActivity(browserIntent)
                 } catch (ise: IllegalStateException) {
                     Log.e(
diff --git a/app/src/main/java/org/linphone/ui/assistant/fragment/QrCodeScannerFragment.kt b/app/src/main/java/org/linphone/ui/assistant/fragment/QrCodeScannerFragment.kt
index e11e3201c..555ed81c1 100644
--- a/app/src/main/java/org/linphone/ui/assistant/fragment/QrCodeScannerFragment.kt
+++ b/app/src/main/java/org/linphone/ui/assistant/fragment/QrCodeScannerFragment.kt
@@ -38,6 +38,7 @@ import org.linphone.databinding.AssistantQrCodeScannerFragmentBinding
 import org.linphone.ui.GenericActivity
 import org.linphone.ui.GenericFragment
 import org.linphone.ui.assistant.viewmodel.QrCodeViewModel
+import org.linphone.ui.main.sso.fragment.SingleSignOnFragmentDirections
 
 @UiThread
 class QrCodeScannerFragment : GenericFragment() {
@@ -85,17 +86,37 @@ class QrCodeScannerFragment : GenericFragment() {
 
         viewModel.qrCodeFoundEvent.observe(viewLifecycleOwner) {
             it.consume { isValid ->
-                if (!isValid) {
-                    (requireActivity() as GenericActivity).showRedToast(
-                        getString(R.string.assistant_qr_code_invalid_toast),
-                        R.drawable.warning_circle
-                    )
-                } else {
+                if (isValid) {
                     requireActivity().finish()
                 }
             }
         }
 
+        viewModel.onErrorEvent.observe(viewLifecycleOwner) {
+            it.consume {
+                // Core has restarted but something went wrong, restart video capture
+                enableQrCodeVideoScanner()
+            }
+        }
+
+        coreContext.bearerAuthenticationRequestedEvent.observe(viewLifecycleOwner) {
+            it.consume { pair ->
+                val serverUrl = pair.first
+                val username = pair.second
+
+                Log.i(
+                    "$TAG Navigating to Single Sign On Fragment with server URL [$serverUrl] and username [$username]"
+                )
+                if (findNavController().currentDestination?.id == R.id.qrCodeScannerFragment) {
+                    val action = SingleSignOnFragmentDirections.actionGlobalSingleSignOnFragment(
+                        serverUrl,
+                        username
+                    )
+                    findNavController().navigate(action)
+                }
+            }
+        }
+
         if (!isCameraPermissionGranted()) {
             if (ActivityCompat.shouldShowRequestPermissionRationale(requireActivity(), Manifest.permission.CAMERA)) {
                 Log.w("$TAG CAMERA permission wasn't granted yet, asking for it now")
diff --git a/app/src/main/java/org/linphone/ui/assistant/fragment/RegisterFragment.kt b/app/src/main/java/org/linphone/ui/assistant/fragment/RegisterFragment.kt
index cdc7b1550..10f0aba41 100644
--- a/app/src/main/java/org/linphone/ui/assistant/fragment/RegisterFragment.kt
+++ b/app/src/main/java/org/linphone/ui/assistant/fragment/RegisterFragment.kt
@@ -21,7 +21,6 @@ package org.linphone.ui.assistant.fragment
 
 import android.content.Context
 import android.content.Intent
-import android.net.Uri
 import android.os.Bundle
 import android.telephony.TelephonyManager
 import android.text.Editable
@@ -49,6 +48,7 @@ import org.linphone.utils.ConfirmationDialogModel
 import org.linphone.utils.AppUtils
 import org.linphone.utils.DialogUtils
 import org.linphone.utils.PhoneNumberUtils
+import androidx.core.net.toUri
 
 @UiThread
 class RegisterFragment : GenericFragment() {
@@ -102,7 +102,7 @@ class RegisterFragment : GenericFragment() {
         binding.setOpenSubscribeWebPageClickListener {
             val url = getString(R.string.web_platform_register_email_url)
             try {
-                val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse(url))
+                val browserIntent = Intent(Intent.ACTION_VIEW, url.toUri())
                 startActivity(browserIntent)
             } catch (ise: IllegalStateException) {
                 Log.e(
diff --git a/app/src/main/java/org/linphone/ui/assistant/fragment/ThirdPartySipAccountWarningFragment.kt b/app/src/main/java/org/linphone/ui/assistant/fragment/ThirdPartySipAccountWarningFragment.kt
index e5c958320..57e7528be 100644
--- a/app/src/main/java/org/linphone/ui/assistant/fragment/ThirdPartySipAccountWarningFragment.kt
+++ b/app/src/main/java/org/linphone/ui/assistant/fragment/ThirdPartySipAccountWarningFragment.kt
@@ -20,7 +20,6 @@
 package org.linphone.ui.assistant.fragment
 
 import android.content.Intent
-import android.net.Uri
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -31,6 +30,7 @@ import org.linphone.R
 import org.linphone.core.tools.Log
 import org.linphone.databinding.AssistantThirdPartySipAccountWarningFragmentBinding
 import org.linphone.ui.GenericFragment
+import androidx.core.net.toUri
 
 @UiThread
 class ThirdPartySipAccountWarningFragment : GenericFragment() {
@@ -61,7 +61,7 @@ class ThirdPartySipAccountWarningFragment : GenericFragment() {
         binding.setContactClickListener {
             val url = getString(R.string.website_contact_url)
             try {
-                val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse(url))
+                val browserIntent = Intent(Intent.ACTION_VIEW, url.toUri())
                 startActivity(browserIntent)
             } catch (ise: IllegalStateException) {
                 Log.e(
diff --git a/app/src/main/java/org/linphone/ui/assistant/viewmodel/AccountCreationViewModel.kt b/app/src/main/java/org/linphone/ui/assistant/viewmodel/AccountCreationViewModel.kt
index c8e86ed21..db9ba778e 100644
--- a/app/src/main/java/org/linphone/ui/assistant/viewmodel/AccountCreationViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/assistant/viewmodel/AccountCreationViewModel.kt
@@ -33,6 +33,7 @@ import kotlinx.coroutines.withContext
 import org.json.JSONException
 import org.json.JSONObject
 import org.linphone.LinphoneApplication.Companion.coreContext
+import org.linphone.LinphoneApplication.Companion.corePreferences
 import org.linphone.R
 import org.linphone.core.Account
 import org.linphone.core.AccountManagerServices
@@ -82,6 +83,8 @@ class AccountCreationViewModel
 
     val showPassword = MutableLiveData<Boolean>()
 
+    val lockUsernameAndPassword = MutableLiveData<Boolean>()
+
     val createEnabled = MediatorLiveData<Boolean>()
 
     val pushNotificationsAvailable = MutableLiveData<Boolean>()
@@ -165,14 +168,7 @@ class AccountCreationViewModel
             operationInProgress.postValue(false)
 
             if (!errorMessage.isNullOrEmpty()) {
-                showFormattedRedToastEvent.postValue(
-                    Event(
-                        Pair(
-                            errorMessage,
-                            R.drawable.warning_circle
-                        )
-                    )
-                )
+                showFormattedRedToast(errorMessage, R.drawable.warning_circle)
             }
 
             for (parameter in parameterErrors?.keys.orEmpty()) {
@@ -199,12 +195,11 @@ class AccountCreationViewModel
                     if (account != null) {
                         coreContext.core.removeAccount(account)
                     }
-                    createEnabled.postValue(true)
                 }
                 else -> {
-                    createEnabled.postValue(true)
                 }
             }
+            createEnabled.postValue(true)
         }
     }
 
@@ -258,6 +253,7 @@ class AccountCreationViewModel
 
     init {
         operationInProgress.value = false
+        lockUsernameAndPassword.value = false
 
         coreContext.postOnCoreThread { core ->
             pushNotificationsAvailable.postValue(LinphoneUtils.arePushNotificationsAvailable(core))
@@ -446,9 +442,9 @@ class AccountCreationViewModel
             operationInProgress.postValue(true)
             createEnabled.postValue(false)
 
-            val usernameValue = username.value
-            val passwordValue = password.value
-            if (usernameValue.isNullOrEmpty() || passwordValue.isNullOrEmpty()) {
+            val usernameValue = username.value.orEmpty().trim()
+            val passwordValue = password.value.orEmpty().trim()
+            if (usernameValue.isEmpty() || passwordValue.isEmpty()) {
                 Log.e("$TAG Either username [$usernameValue] or password is null or empty!")
                 return
             }
@@ -469,15 +465,16 @@ class AccountCreationViewModel
 
     @WorkerThread
     private fun storeAccountInCore(identity: String) {
-        val passwordValue = password.value
-
         val core = coreContext.core
+        core.loadConfigFromXml(corePreferences.linphoneDefaultValuesPath)
+
         val sipIdentity = Factory.instance().createAddress(identity)
         if (sipIdentity == null) {
             Log.e("$TAG Failed to create address from SIP Identity [$identity]!")
             return
         }
 
+        val passwordValue = password.value
         // We need to have an AuthInfo for newly created account to authorize phone number linking request
         val authInfo = Factory.instance().createAuthInfo(
             sipIdentity.username.orEmpty(),
@@ -506,6 +503,8 @@ class AccountCreationViewModel
 
         accountCreatedAuthInfo = authInfo
         accountCreated = account
+
+        lockUsernameAndPassword.postValue(true)
     }
 
     @WorkerThread
diff --git a/app/src/main/java/org/linphone/ui/assistant/viewmodel/AccountLoginViewModel.kt b/app/src/main/java/org/linphone/ui/assistant/viewmodel/AccountLoginViewModel.kt
index 629d73df5..67b93e15b 100644
--- a/app/src/main/java/org/linphone/ui/assistant/viewmodel/AccountLoginViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/assistant/viewmodel/AccountLoginViewModel.kt
@@ -172,17 +172,12 @@ open class AccountLoginViewModel
                     "sip:$userInput@$defaultDomain"
                 }
             }
+            Log.i("$TAG Computed identity is [$identity] from user input [$userInput]")
+
             val identityAddress = Factory.instance().createAddress(identity)
             if (identityAddress == null) {
                 Log.e("$TAG Can't parse [$identity] as Address!")
-                showRedToastEvent.postValue(
-                    Event(
-                        Pair(
-                            R.string.assistant_login_cant_parse_address_toast,
-                            R.drawable.warning_circle
-                        )
-                    )
-                )
+                showRedToast(R.string.assistant_login_cant_parse_address_toast, R.drawable.warning_circle)
                 return@postOnCoreThread
             }
 
@@ -191,14 +186,7 @@ open class AccountLoginViewModel
                 Log.e(
                     "$TAG Address [${identityAddress.asStringUriOnly()}] doesn't contains an username!"
                 )
-                showRedToastEvent.postValue(
-                    Event(
-                        Pair(
-                            R.string.assistant_login_address_without_username_toast,
-                            R.drawable.warning_circle
-                        )
-                    )
-                )
+                showRedToast(R.string.assistant_login_address_without_username_toast, R.drawable.warning_circle)
                 return@postOnCoreThread
             }
 
diff --git a/app/src/main/java/org/linphone/ui/assistant/viewmodel/QrCodeViewModel.kt b/app/src/main/java/org/linphone/ui/assistant/viewmodel/QrCodeViewModel.kt
index 69146fabd..f5a0da65d 100644
--- a/app/src/main/java/org/linphone/ui/assistant/viewmodel/QrCodeViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/assistant/viewmodel/QrCodeViewModel.kt
@@ -30,6 +30,7 @@ import org.linphone.core.CoreListenerStub
 import org.linphone.core.tools.Log
 import org.linphone.ui.GenericViewModel
 import org.linphone.utils.Event
+import org.linphone.R
 
 class QrCodeViewModel
     @UiThread
@@ -40,12 +41,18 @@ class QrCodeViewModel
 
     val qrCodeFoundEvent = MutableLiveData<Event<Boolean>>()
 
+    val onErrorEvent = MutableLiveData<Event<Boolean>>()
+
     private val coreListener = object : CoreListenerStub() {
         @WorkerThread
         override fun onConfiguringStatus(core: Core, status: ConfiguringState, message: String?) {
             Log.i("$TAG Configuring state is [$status]")
             if (status == ConfiguringState.Successful) {
                 qrCodeFoundEvent.postValue(Event(true))
+            } else if (status == ConfiguringState.Failed) {
+                Log.e("$TAG Failure applying remote provisioning: $message")
+                showRedToast(R.string.remote_provisioning_config_failed_toast, R.drawable.warning_circle)
+                onErrorEvent.postValue(Event(true))
             }
         }
 
@@ -53,16 +60,20 @@ class QrCodeViewModel
         override fun onQrcodeFound(core: Core, result: String?) {
             Log.i("$TAG QR Code found: [$result]")
             if (result == null) {
-                qrCodeFoundEvent.postValue(Event(false))
+                showRedToast(R.string.assistant_qr_code_invalid_toast, R.drawable.warning_circle)
             } else {
                 val isValidUrl = Patterns.WEB_URL.matcher(result).matches()
                 if (!isValidUrl) {
                     Log.e("$TAG The content of the QR Code doesn't seem to be a valid web URL")
-                    qrCodeFoundEvent.postValue(Event(false))
+                    showRedToast(R.string.assistant_qr_code_invalid_toast, R.drawable.warning_circle)
                 } else {
                     Log.i(
                         "$TAG QR code URL set, restarting the Core to apply configuration changes"
                     )
+                    core.nativePreviewWindowId = null
+                    core.isVideoPreviewEnabled = false
+                    core.isQrcodeVideoPreviewEnabled = false
+
                     core.provisioningUri = result
                     coreContext.core.stop()
                     Log.i("$TAG Core has been stopped, restarting it")
diff --git a/app/src/main/java/org/linphone/ui/assistant/viewmodel/ThirdPartySipAccountLoginViewModel.kt b/app/src/main/java/org/linphone/ui/assistant/viewmodel/ThirdPartySipAccountLoginViewModel.kt
index 40a33b649..e1676881f 100644
--- a/app/src/main/java/org/linphone/ui/assistant/viewmodel/ThirdPartySipAccountLoginViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/assistant/viewmodel/ThirdPartySipAccountLoginViewModel.kt
@@ -181,32 +181,25 @@ class ThirdPartySipAccountLoginViewModel
 
             // Allow to enter SIP identity instead of simply username
             // in case identity domain doesn't match proxy domain
-            val user = username.value.orEmpty().trim()
-            val userId = authId.value.orEmpty().trim()
-            val identity = if (user.startsWith("sip:")) {
-                if (user.contains("@")) {
-                    user
-                } else {
-                    "$user@$domain"
-                }
-            } else {
-                if (user.contains("@")) {
-                    "sip:$user"
-                } else {
-                    "sip:$user@$domain"
-                }
+            var user = username.value.orEmpty().trim()
+            if (user.startsWith("sip:")) {
+                user = user.substring("sip:".length)
+            } else if (user.startsWith("sips:")) {
+                user = user.substring("sips:".length)
             }
+            if (user.contains("@")) {
+                user = user.split("@")[0]
+            }
+
+            val userId = authId.value.orEmpty().trim()
+
+            Log.i("$TAG Parsed username is [$user], user ID [$userId] and domain [$domain]")
+
+            val identity = "sip:$user@$domain"
             val identityAddress = Factory.instance().createAddress(identity)
             if (identityAddress == null) {
                 Log.e("$TAG Can't parse [$identity] as Address!")
-                showRedToastEvent.postValue(
-                    Event(
-                        Pair(
-                            R.string.assistant_login_cant_parse_address_toast,
-                            R.drawable.warning_circle
-                        )
-                    )
-                )
+                showRedToast(R.string.assistant_login_cant_parse_address_toast, R.drawable.warning_circle)
                 return@postOnCoreThread
             }
 
@@ -216,7 +209,7 @@ class ThirdPartySipAccountLoginViewModel
                 password.value.orEmpty().trim(),
                 null,
                 null,
-                null
+                domainValue
             )
             core.addAuthInfo(newlyCreatedAuthInfo)
 
diff --git a/app/src/main/java/org/linphone/ui/call/conference/fragment/ActiveConferenceCallFragment.kt b/app/src/main/java/org/linphone/ui/call/conference/fragment/ActiveConferenceCallFragment.kt
index 078afa3b6..342263f3a 100644
--- a/app/src/main/java/org/linphone/ui/call/conference/fragment/ActiveConferenceCallFragment.kt
+++ b/app/src/main/java/org/linphone/ui/call/conference/fragment/ActiveConferenceCallFragment.kt
@@ -125,10 +125,13 @@ class ActiveConferenceCallFragment : GenericCallFragment() {
         callViewModel = requireActivity().run {
             ViewModelProvider(this)[CurrentCallViewModel::class.java]
         }
+        observeToastEvents(callViewModel)
+        observeToastEvents(callViewModel.conferenceModel)
 
         callsViewModel = requireActivity().run {
             ViewModelProvider(this)[CallsViewModel::class.java]
         }
+        observeToastEvents(callsViewModel)
 
         binding.lifecycleOwner = viewLifecycleOwner
         binding.viewModel = callViewModel
@@ -224,17 +227,12 @@ class ActiveConferenceCallFragment : GenericCallFragment() {
         }
 
         callViewModel.conferenceModel.goToConversationEvent.observe(viewLifecycleOwner) {
-            it.consume { pair ->
+            it.consume { conversationId ->
                 if (findNavController().currentDestination?.id == R.id.activeConferenceCallFragment) {
-                    val localSipUri = pair.first
-                    val remoteSipUri = pair.second
-                    Log.i(
-                        "$TAG Display conversation with local SIP URI [$localSipUri] and remote SIP URI [$remoteSipUri]"
-                    )
+                    Log.i("$TAG Display conversation with conversation ID [$conversationId]")
                     val action =
                         ActiveConferenceCallFragmentDirections.actionActiveConferenceCallFragmentToInCallConversationFragment(
-                            localSipUri,
-                            remoteSipUri
+                            conversationId
                         )
                     findNavController().navigate(action)
                 }
diff --git a/app/src/main/java/org/linphone/ui/call/conference/fragment/ConferenceParticipantsListFragment.kt b/app/src/main/java/org/linphone/ui/call/conference/fragment/ConferenceParticipantsListFragment.kt
index 74ff2398f..cefc3b11e 100644
--- a/app/src/main/java/org/linphone/ui/call/conference/fragment/ConferenceParticipantsListFragment.kt
+++ b/app/src/main/java/org/linphone/ui/call/conference/fragment/ConferenceParticipantsListFragment.kt
@@ -30,10 +30,12 @@ import android.view.ViewGroup
 import android.view.animation.Animation
 import android.view.animation.AnimationUtils
 import android.widget.PopupWindow
+import androidx.core.view.doOnLayout
 import androidx.databinding.DataBindingUtil
 import androidx.lifecycle.ViewModelProvider
 import androidx.navigation.fragment.findNavController
 import androidx.recyclerview.widget.LinearLayoutManager
+import org.linphone.LinphoneApplication.Companion.coreContext
 import org.linphone.R
 import org.linphone.core.Participant
 import org.linphone.core.tools.Log
@@ -129,6 +131,32 @@ class ConferenceParticipantsListFragment : GenericCallFragment() {
                 showKickParticipantDialog(displayName, participant)
             }
         }
+
+        viewModel.isSendingVideo.observe(viewLifecycleOwner) { sending ->
+            coreContext.postOnCoreThread { core ->
+                core.nativePreviewWindowId = if (sending) {
+                    Log.i("$TAG We are sending video, setting capture preview surface")
+                    binding.localPreviewVideoSurface
+                } else {
+                    Log.i("$TAG We are not sending video, clearing capture preview surface")
+                    null
+                }
+            }
+        }
+    }
+
+    override fun onResume() {
+        super.onResume()
+
+        (binding.root as? ViewGroup)?.doOnLayout {
+            setupVideoPreview(binding.localPreviewVideoSurface)
+        }
+    }
+
+    override fun onPause() {
+        super.onPause()
+
+        cleanVideoPreview(binding.localPreviewVideoSurface)
     }
 
     private fun showKickParticipantDialog(displayName: String, participant: Participant) {
diff --git a/app/src/main/java/org/linphone/ui/call/conference/view/GridBoxLayout.kt b/app/src/main/java/org/linphone/ui/call/conference/view/GridBoxLayout.kt
index 2507c6d10..eb3529c6d 100644
--- a/app/src/main/java/org/linphone/ui/call/conference/view/GridBoxLayout.kt
+++ b/app/src/main/java/org/linphone/ui/call/conference/view/GridBoxLayout.kt
@@ -26,6 +26,7 @@ import android.widget.GridLayout
 import androidx.annotation.UiThread
 import androidx.core.view.children
 import org.linphone.core.tools.Log
+import androidx.core.view.isEmpty
 
 @UiThread
 class GridBoxLayout : GridLayout {
@@ -58,7 +59,7 @@ class GridBoxLayout : GridLayout {
 
     @SuppressLint("DrawAllocation")
     override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) {
-        if (childCount == 0 || (!changed && previousChildCount == childCount)) {
+        if (isEmpty() || (!changed && previousChildCount == childCount)) {
             super.onLayout(changed, left, top, right, bottom)
             // To prevent display issue the first time conference is locally paused
             children.forEach { child ->
diff --git a/app/src/main/java/org/linphone/ui/call/conference/viewmodel/ConferenceViewModel.kt b/app/src/main/java/org/linphone/ui/call/conference/viewmodel/ConferenceViewModel.kt
index 0b8ef5ecf..65d4c76e9 100644
--- a/app/src/main/java/org/linphone/ui/call/conference/viewmodel/ConferenceViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/call/conference/viewmodel/ConferenceViewModel.kt
@@ -39,6 +39,7 @@ import org.linphone.ui.call.conference.model.ConferenceParticipantModel
 import org.linphone.ui.call.conference.view.GridBoxLayout
 import org.linphone.utils.AppUtils
 import org.linphone.utils.Event
+import org.linphone.utils.LinphoneUtils
 
 class ConferenceViewModel
     @UiThread
@@ -91,8 +92,8 @@ class ConferenceViewModel
         MutableLiveData<Event<Pair<String, Participant>>>()
     }
 
-    val goToConversationEvent: MutableLiveData<Event<Pair<String, String>>> by lazy {
-        MutableLiveData<Event<Pair<String, String>>>()
+    val goToConversationEvent: MutableLiveData<Event<String>> by lazy {
+        MutableLiveData<Event<String>>()
     }
 
     private lateinit var conference: Conference
@@ -134,22 +135,36 @@ class ConferenceViewModel
         @WorkerThread
         override fun onActiveSpeakerParticipantDevice(
             conference: Conference,
-            participantDevice: ParticipantDevice
+            participantDevice: ParticipantDevice?
         ) {
             activeSpeaker.value?.isActiveSpeaker?.postValue(false)
 
-            val found = participantDevices.value.orEmpty().find {
-                it.device.address.equal(participantDevice.address)
-            }
-            if (found != null) {
-                Log.i("$TAG Newly active speaker participant is [${found.name}]")
-                found.isActiveSpeaker.postValue(true)
-                activeSpeaker.postValue(found!!)
+            if (participantDevice != null) {
+                val found = participantDevices.value.orEmpty().find {
+                    it.device.address.equal(participantDevice.address)
+                }
+                if (found != null) {
+                    Log.i("$TAG Newly active speaker participant is [${found.name}]")
+                    found.isActiveSpeaker.postValue(true)
+                    activeSpeaker.postValue(found!!)
+                } else {
+                    Log.i("$TAG Failed to find actively speaking participant...")
+                    val model = ConferenceParticipantDeviceModel(participantDevice)
+                    model.isActiveSpeaker.postValue(true)
+                    activeSpeaker.postValue(model)
+                }
             } else {
-                Log.i("$TAG Failed to find actively speaking participant...")
-                val model = ConferenceParticipantDeviceModel(participantDevice)
-                model.isActiveSpeaker.postValue(true)
-                activeSpeaker.postValue(model)
+                Log.w("$TAG Notified active speaker participant device is null, using first one that's not us")
+                val firstNotUs = participantDevices.value.orEmpty().find {
+                    it.isMe == false
+                }
+                if (firstNotUs != null) {
+                    Log.i("$TAG Newly active speaker participant is [${firstNotUs.name}]")
+                    firstNotUs.isActiveSpeaker.postValue(true)
+                    activeSpeaker.postValue(firstNotUs!!)
+                } else {
+                    Log.i("$TAG No participant device that's not us found, expected if we're alone")
+                }
             }
         }
 
@@ -355,14 +370,7 @@ class ConferenceViewModel
             Log.i("$TAG Navigating to conference's conversation")
             val chatRoom = conference.chatRoom
             if (chatRoom != null) {
-                goToConversationEvent.postValue(
-                    Event(
-                        Pair(
-                            chatRoom.localAddress.asStringUriOnly(),
-                            chatRoom.peerAddress.asStringUriOnly()
-                        )
-                    )
-                )
+                goToConversationEvent.postValue(Event(LinphoneUtils.getConversationId(chatRoom)))
             } else {
                 Log.e(
                     "$TAG No chat room available for current conference [${conference.conferenceAddress?.asStringUriOnly()}]"
@@ -396,14 +404,7 @@ class ConferenceViewModel
                     Log.e(
                         "$TAG Failed to parse SIP URI [$uri] into address, can't add it to the conference!"
                     )
-                    showRedToastEvent.postValue(
-                        Event(
-                            Pair(
-                                R.string.conference_failed_to_add_participant_invalid_address_toast,
-                                R.drawable.warning_circle
-                            )
-                        )
-                    )
+                    showRedToast(R.string.conference_failed_to_add_participant_invalid_address_toast, R.drawable.warning_circle)
                 }
             }
             val addressesArray = arrayOfNulls<Address>(addresses.size)
@@ -796,14 +797,7 @@ class ConferenceViewModel
                 "$TAG Too many participant devices for grid layout, switching to active speaker layout"
             )
             setNewLayout(ACTIVE_SPEAKER_LAYOUT)
-            showRedToastEvent.postValue(
-                Event(
-                    Pair(
-                        R.string.conference_too_many_participants_for_mosaic_layout_toast,
-                        R.drawable.warning_circle
-                    )
-                )
-            )
+            showRedToast(R.string.conference_too_many_participants_for_mosaic_layout_toast, R.drawable.warning_circle)
         }
     }
 }
diff --git a/app/src/main/java/org/linphone/ui/call/fragment/ActiveCallFragment.kt b/app/src/main/java/org/linphone/ui/call/fragment/ActiveCallFragment.kt
index 72ed16cc2..7cd1a9137 100644
--- a/app/src/main/java/org/linphone/ui/call/fragment/ActiveCallFragment.kt
+++ b/app/src/main/java/org/linphone/ui/call/fragment/ActiveCallFragment.kt
@@ -154,10 +154,12 @@ class ActiveCallFragment : GenericCallFragment() {
         callViewModel = requireActivity().run {
             ViewModelProvider(this)[CurrentCallViewModel::class.java]
         }
+        observeToastEvents(callViewModel)
 
         callsViewModel = requireActivity().run {
             ViewModelProvider(this)[CallsViewModel::class.java]
         }
+        observeToastEvents(callsViewModel)
 
         binding.lifecycleOwner = viewLifecycleOwner
         binding.viewModel = callViewModel
@@ -369,17 +371,14 @@ class ActiveCallFragment : GenericCallFragment() {
         }
 
         callViewModel.goToConversationEvent.observe(viewLifecycleOwner) {
-            it.consume { pair ->
+            it.consume { conversationId ->
                 if (findNavController().currentDestination?.id == R.id.activeCallFragment) {
-                    val localSipUri = pair.first
-                    val remoteSipUri = pair.second
                     Log.i(
-                        "$TAG Display conversation with local SIP URI [$localSipUri] and remote SIP URI [$remoteSipUri]"
+                        "$TAG Display conversation with conversation ID [$conversationId]"
                     )
                     val action =
                         ActiveCallFragmentDirections.actionActiveCallFragmentToInCallConversationFragment(
-                            localSipUri,
-                            remoteSipUri
+                            conversationId
                         )
                     findNavController().navigate(action)
                 }
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 7d3c5b621..32caa563a 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
@@ -23,14 +23,17 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.view.doOnLayout
 import androidx.lifecycle.ViewModelProvider
 import androidx.navigation.fragment.findNavController
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
+import org.linphone.LinphoneApplication.Companion.coreContext
 import org.linphone.core.tools.Log
 import org.linphone.databinding.CallsListFragmentBinding
 import org.linphone.ui.call.adapter.CallsListAdapter
 import org.linphone.ui.call.viewmodel.CallsViewModel
+import org.linphone.ui.call.viewmodel.CurrentCallViewModel
 import org.linphone.utils.ConfirmationDialogModel
 import org.linphone.utils.DialogUtils
 
@@ -43,6 +46,8 @@ class CallsListFragment : GenericCallFragment() {
 
     private lateinit var viewModel: CallsViewModel
 
+    private lateinit var callViewModel: CurrentCallViewModel
+
     private lateinit var adapter: CallsListAdapter
 
     private var bottomSheetDialog: BottomSheetDialogFragment? = null
@@ -73,6 +78,11 @@ class CallsListFragment : GenericCallFragment() {
         binding.viewModel = viewModel
         observeToastEvents(viewModel)
 
+        callViewModel = requireActivity().run {
+            ViewModelProvider(this)[CurrentCallViewModel::class.java]
+        }
+        observeToastEvents(callViewModel)
+
         binding.callsList.setHasFixedSize(true)
         binding.callsList.layoutManager = LinearLayoutManager(requireContext())
 
@@ -101,6 +111,18 @@ class CallsListFragment : GenericCallFragment() {
             showMergeCallsIntoConferenceConfirmationDialog()
         }
 
+        callViewModel.isSendingVideo.observe(viewLifecycleOwner) { sending ->
+            coreContext.postOnCoreThread { core ->
+                core.nativePreviewWindowId = if (sending) {
+                    Log.i("$TAG We are sending video, setting capture preview surface")
+                    binding.localPreviewVideoSurface
+                } else {
+                    Log.i("$TAG We are not sending video, clearing capture preview surface")
+                    null
+                }
+            }
+        }
+
         viewModel.calls.observe(viewLifecycleOwner) {
             Log.i("$TAG Calls list updated with [${it.size}] items")
             adapter.submitList(it)
@@ -113,11 +135,21 @@ class CallsListFragment : GenericCallFragment() {
         }
     }
 
+    override fun onResume() {
+        super.onResume()
+
+        (binding.root as? ViewGroup)?.doOnLayout {
+            setupVideoPreview(binding.localPreviewVideoSurface)
+        }
+    }
+
     override fun onPause() {
         super.onPause()
 
         bottomSheetDialog?.dismiss()
         bottomSheetDialog = null
+
+        cleanVideoPreview(binding.localPreviewVideoSurface)
     }
 
     private fun showMergeCallsIntoConferenceConfirmationDialog() {
diff --git a/app/src/main/java/org/linphone/ui/call/fragment/EndedCallFragment.kt b/app/src/main/java/org/linphone/ui/call/fragment/EndedCallFragment.kt
index 82f58994c..2f6baffc8 100644
--- a/app/src/main/java/org/linphone/ui/call/fragment/EndedCallFragment.kt
+++ b/app/src/main/java/org/linphone/ui/call/fragment/EndedCallFragment.kt
@@ -20,7 +20,6 @@
 package org.linphone.ui.call.fragment
 
 import android.os.Bundle
-import android.os.SystemClock
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -67,16 +66,12 @@ class EndedCallFragment : GenericCallFragment() {
         callViewModel = requireActivity().run {
             ViewModelProvider(this)[CurrentCallViewModel::class.java]
         }
+        observeToastEvents(callViewModel)
 
         binding.lifecycleOwner = viewLifecycleOwner
         binding.viewModel = callViewModel
 
         Log.i("$TAG Showing ended call fragment")
-
-        callViewModel.callDuration.observe(viewLifecycleOwner) { duration ->
-            binding.chronometer.base = SystemClock.elapsedRealtime() - (1000 * duration)
-            binding.chronometer.stop() // Do not start it and make sure it is stopped
-        }
     }
 
     override fun onResume() {
@@ -84,7 +79,7 @@ class EndedCallFragment : GenericCallFragment() {
 
         lifecycleScope.launch {
             withContext(Dispatchers.IO) {
-                if (callViewModel.terminatedByUsed) {
+                if (callViewModel.terminatedByUser) {
                     Log.i(
                         "$TAG Call terminated by user, waiting 1 second before finishing activity"
                     )
diff --git a/app/src/main/java/org/linphone/ui/call/fragment/IncomingCallFragment.kt b/app/src/main/java/org/linphone/ui/call/fragment/IncomingCallFragment.kt
index 2f9050bba..ea5f9ad57 100644
--- a/app/src/main/java/org/linphone/ui/call/fragment/IncomingCallFragment.kt
+++ b/app/src/main/java/org/linphone/ui/call/fragment/IncomingCallFragment.kt
@@ -55,6 +55,7 @@ class IncomingCallFragment : GenericCallFragment() {
         callViewModel = requireActivity().run {
             ViewModelProvider(this)[CurrentCallViewModel::class.java]
         }
+        observeToastEvents(callViewModel)
 
         binding.lifecycleOwner = viewLifecycleOwner
         binding.viewModel = callViewModel
diff --git a/app/src/main/java/org/linphone/ui/call/fragment/OutgoingCallFragment.kt b/app/src/main/java/org/linphone/ui/call/fragment/OutgoingCallFragment.kt
index 954ef7ea4..e4b0bdbd3 100644
--- a/app/src/main/java/org/linphone/ui/call/fragment/OutgoingCallFragment.kt
+++ b/app/src/main/java/org/linphone/ui/call/fragment/OutgoingCallFragment.kt
@@ -56,6 +56,7 @@ class OutgoingCallFragment : GenericCallFragment() {
         callViewModel = requireActivity().run {
             ViewModelProvider(this)[CurrentCallViewModel::class.java]
         }
+        observeToastEvents(callViewModel)
 
         binding.lifecycleOwner = viewLifecycleOwner
         binding.viewModel = callViewModel
diff --git a/app/src/main/java/org/linphone/ui/call/fragment/TransferCallFragment.kt b/app/src/main/java/org/linphone/ui/call/fragment/TransferCallFragment.kt
index 1aad00078..fa086dde0 100644
--- a/app/src/main/java/org/linphone/ui/call/fragment/TransferCallFragment.kt
+++ b/app/src/main/java/org/linphone/ui/call/fragment/TransferCallFragment.kt
@@ -41,8 +41,6 @@ import org.linphone.ui.call.model.CallModel
 import org.linphone.ui.call.viewmodel.CallsViewModel
 import org.linphone.ui.call.viewmodel.CurrentCallViewModel
 import org.linphone.ui.main.adapter.ConversationsContactsAndSuggestionsListAdapter
-import org.linphone.ui.main.contacts.model.ContactNumberOrAddressClickListener
-import org.linphone.ui.main.contacts.model.ContactNumberOrAddressModel
 import org.linphone.ui.main.history.viewmodel.StartCallViewModel
 import org.linphone.utils.ConfirmationDialogModel
 import org.linphone.ui.main.model.ConversationContactOrSuggestionModel
@@ -75,22 +73,6 @@ class TransferCallFragment : GenericCallFragment() {
 
     private var numberOrAddressPickerDialog: Dialog? = null
 
-    private val listener = object : ContactNumberOrAddressClickListener {
-        @UiThread
-        override fun onClicked(model: ContactNumberOrAddressModel) {
-            val address = model.address
-            if (address != null) {
-                coreContext.postOnCoreThread {
-                    // TODO FIXME: transfer call (blind)
-                }
-            }
-        }
-
-        @UiThread
-        override fun onLongPress(model: ContactNumberOrAddressModel) {
-        }
-    }
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
@@ -115,10 +97,12 @@ class TransferCallFragment : GenericCallFragment() {
         callViewModel = requireActivity().run {
             ViewModelProvider(this)[CurrentCallViewModel::class.java]
         }
+        observeToastEvents(callViewModel)
 
         callsViewModel = requireActivity().run {
             ViewModelProvider(this)[CallsViewModel::class.java]
         }
+        observeToastEvents(callsViewModel)
 
         binding.viewModel = viewModel
         binding.callsViewModel = callsViewModel
@@ -258,7 +242,7 @@ class TransferCallFragment : GenericCallFragment() {
 
     private fun showConfirmAttendedTransferDialog(callModel: CallModel) {
         val label = AppUtils.getFormattedString(
-            org.linphone.R.string.call_transfer_confirm_dialog_message,
+            R.string.call_transfer_confirm_dialog_message,
             callViewModel.displayedName.value.orEmpty(),
             callModel.displayName.value.orEmpty()
         )
@@ -294,7 +278,7 @@ class TransferCallFragment : GenericCallFragment() {
 
     private fun showConfirmBlindTransferDialog(contactModel: ConversationContactOrSuggestionModel) {
         val label = AppUtils.getFormattedString(
-            org.linphone.R.string.call_transfer_confirm_dialog_message,
+            R.string.call_transfer_confirm_dialog_message,
             callViewModel.displayedName.value.orEmpty(),
             contactModel.name
         )
diff --git a/app/src/main/java/org/linphone/ui/call/model/ZrtpAlertDialogModel.kt b/app/src/main/java/org/linphone/ui/call/model/ZrtpAlertDialogModel.kt
index f879fbb90..9b5bfae52 100644
--- a/app/src/main/java/org/linphone/ui/call/model/ZrtpAlertDialogModel.kt
+++ b/app/src/main/java/org/linphone/ui/call/model/ZrtpAlertDialogModel.kt
@@ -27,10 +27,6 @@ import org.linphone.utils.Event
 class ZrtpAlertDialogModel
     @UiThread
     constructor(val allowTryAgain: Boolean) : GenericViewModel() {
-    companion object {
-        private const val TAG = "[ZRTP Alert Dialog]"
-    }
-
     val tryAgainEvent = MutableLiveData<Event<Boolean>>()
 
     val hangUpEvent = MutableLiveData<Event<Boolean>>()
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 db2cd71d1..f0480543c 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
@@ -231,14 +231,7 @@ class CallsViewModel
             val conference = LinphoneUtils.createGroupCall(defaultAccount, subject)
             if (conference == null) {
                 Log.e("$TAG Failed to create conference!")
-                showRedToastEvent.postValue(
-                    Event(
-                        Pair(
-                            R.string.conference_failed_to_merge_calls_into_conference_toast,
-                            R.drawable.warning_circle
-                        )
-                    )
-                )
+                showRedToast(R.string.conference_failed_to_merge_calls_into_conference_toast, R.drawable.warning_circle)
             } else {
                 conference.addParticipants(core.calls)
             }
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 a5b7bab9d..9428233ad 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
@@ -143,7 +143,7 @@ class CurrentCallViewModel
 
     val qualityIcon = MutableLiveData<Int>()
 
-    var terminatedByUsed = false
+    var terminatedByUser = false
 
     val isRemoteRecordingEvent: MutableLiveData<Event<Pair<Boolean, String>>> by lazy {
         MutableLiveData<Event<Pair<Boolean, String>>>()
@@ -199,8 +199,8 @@ class CurrentCallViewModel
 
     val operationInProgress = MutableLiveData<Boolean>()
 
-    val goToConversationEvent: MutableLiveData<Event<Pair<String, String>>> by lazy {
-        MutableLiveData<Event<Pair<String, String>>>()
+    val goToConversationEvent: MutableLiveData<Event<String>> by lazy {
+        MutableLiveData<Event<String>>()
     }
 
     val chatRoomCreationErrorEvent: MutableLiveData<Event<Int>> by lazy {
@@ -358,7 +358,11 @@ class CurrentCallViewModel
                     videoUpdateInProgress.postValue(false)
                     updateCallDuration()
                     if (corePreferences.automaticallyStartCallRecording) {
-                        isRecording.postValue(call.params.isRecording)
+                        val recording = call.params.isRecording
+                        isRecording.postValue(recording)
+                        if (recording) {
+                            showRecordingToast()
+                        }
                     }
 
                     // MediaEncryption None & SRTP won't be notified through onEncryptionChanged callback,
@@ -390,21 +394,14 @@ class CurrentCallViewModel
             val state = chatRoom.state
             if (state == ChatRoom.State.Instantiated) return
 
-            val id = LinphoneUtils.getChatRoomId(chatRoom)
+            val id = LinphoneUtils.getConversationId(chatRoom)
             Log.i("$TAG Conversation [$id] (${chatRoom.subject}) state changed: [$state]")
 
             if (state == ChatRoom.State.Created) {
                 Log.i("$TAG Conversation [$id] successfully created")
                 chatRoom.removeListener(this)
                 operationInProgress.postValue(false)
-                goToConversationEvent.postValue(
-                    Event(
-                        Pair(
-                            chatRoom.localAddress.asStringUriOnly(),
-                            chatRoom.peerAddress.asStringUriOnly()
-                        )
-                    )
-                )
+                goToConversationEvent.postValue(Event(LinphoneUtils.getConversationId(chatRoom)))
             } else if (state == ChatRoom.State.CreationFailed) {
                 Log.e("$TAG Conversation [$id] creation has failed!")
                 chatRoom.removeListener(this)
@@ -612,7 +609,7 @@ class CurrentCallViewModel
         coreContext.postOnCoreThread {
             if (::currentCall.isInitialized) {
                 Log.i("$TAG Terminating call [${currentCall.remoteAddress.asStringUriOnly()}]")
-                terminatedByUsed = true
+                terminatedByUser = true
                 coreContext.terminateCall(currentCall)
             }
         }
@@ -706,7 +703,12 @@ class CurrentCallViewModel
         val routeAudioToSpeaker = isSpeakerEnabled.value != true
 
         coreContext.postOnCoreThread { core ->
+            var earpieceFound = false
+            var speakerFound = false
             val audioDevices = core.audioDevices
+            val currentDevice = currentCall.outputAudioDevice
+            Log.i("$TAG Currently used output audio device is [${currentDevice?.deviceName} (${currentDevice?.type}])")
+
             val list = arrayListOf<AudioDeviceModel>()
             for (device in audioDevices) {
                 // Only list output audio devices
@@ -714,9 +716,11 @@ class CurrentCallViewModel
 
                 val name = when (device.type) {
                     AudioDevice.Type.Earpiece -> {
+                        earpieceFound = true
                         AppUtils.getString(R.string.call_audio_device_type_earpiece)
                     }
                     AudioDevice.Type.Speaker -> {
+                        speakerFound = true
                         AppUtils.getString(R.string.call_audio_device_type_speaker)
                     }
                     AudioDevice.Type.Headset -> {
@@ -739,7 +743,6 @@ class CurrentCallViewModel
                     }
                     else -> device.deviceName
                 }
-                val currentDevice = currentCall.outputAudioDevice
                 val isCurrentlyInUse = device.type == currentDevice?.type && device.deviceName == currentDevice.deviceName
                 val model = AudioDeviceModel(device, name, device.type, isCurrentlyInUse, true) {
                     // onSelected
@@ -765,8 +768,8 @@ class CurrentCallViewModel
                 Log.i("$TAG Found audio device [${device.id}]")
             }
 
-            if (list.size > 2) {
-                Log.i("$TAG Found more than two devices, showing list to let user choose")
+            if (list.size > 2 || (list.size > 1 && (!earpieceFound || !speakerFound))) {
+                Log.i("$TAG Found more than two devices (or more than 1 but no earpiece or speaker), showing list to let user choose")
                 showAudioDevicesListEvent.postValue(Event(list))
             } else {
                 Log.i(
@@ -855,8 +858,12 @@ class CurrentCallViewModel
                     Log.i("$TAG Starting call recording")
                     currentCall.startRecording()
                 }
+
                 val recording = currentCall.params.isRecording
                 isRecording.postValue(recording)
+                if (recording) {
+                    showRecordingToast()
+                }
             }
         }
     }
@@ -921,17 +928,10 @@ class CurrentCallViewModel
                 if (existingConversation != null) {
                     Log.i(
                         "$TAG Found existing conversation [${
-                        LinphoneUtils.getChatRoomId(existingConversation)
+                        LinphoneUtils.getConversationId(existingConversation)
                         }], going to it"
                     )
-                    goToConversationEvent.postValue(
-                        Event(
-                            Pair(
-                                existingConversation.localAddress.asStringUriOnly(),
-                                existingConversation.peerAddress.asStringUriOnly()
-                            )
-                        )
-                    )
+                    goToConversationEvent.postValue(Event(LinphoneUtils.getConversationId(existingConversation)))
                 } else {
                     Log.i("$TAG No existing conversation was found, let's create it")
                     createCurrentCallConversation(currentCall)
@@ -1052,7 +1052,7 @@ class CurrentCallViewModel
         )
         contact.value?.destroy()
 
-        terminatedByUsed = false
+        terminatedByUser = false
         currentCall = call
         callStatsModel.update(call, call.audioStats)
         callMediaEncryptionModel.update(call)
@@ -1172,7 +1172,11 @@ class CurrentCallViewModel
         contact.postValue(model)
         displayedName.postValue(model.friend.name)
 
-        isRecording.postValue(call.params.isRecording)
+        val recording = call.params.isRecording
+        isRecording.postValue(recording)
+        if (recording) {
+            showRecordingToast()
+        }
 
         val isRemoteRecording = call.remoteParams?.isRecording == true
         if (isRemoteRecording) {
@@ -1204,6 +1208,7 @@ class CurrentCallViewModel
 
     @WorkerThread
     private fun updateOutputAudioDevice(audioDevice: AudioDevice?) {
+        Log.i("$TAG Output audio device updated to [${audioDevice?.deviceName} (${audioDevice?.type})]")
         isSpeakerEnabled.postValue(audioDevice?.type == AudioDevice.Type.Speaker)
         isHeadsetEnabled.postValue(
             audioDevice?.type == AudioDevice.Type.Headphones || audioDevice?.type == AudioDevice.Type.Headset
@@ -1346,44 +1351,29 @@ class CurrentCallViewModel
 
     @WorkerThread
     private fun createCurrentCallConversation(call: Call) {
-        val localAddress = call.callLog.localAddress
         val remoteAddress = call.remoteAddress
         val participants = arrayOf(remoteAddress)
         val core = call.core
         operationInProgress.postValue(true)
 
         val params = getChatRoomParams(call) ?: return // TODO: show error to user
-        val conversation = core.createChatRoom(params, localAddress, participants)
-        if (conversation != null) {
+        val chatRoom = core.createChatRoom(params, participants)
+        if (chatRoom != null) {
             if (params.chatParams?.backend == ChatRoom.Backend.FlexisipChat) {
-                if (conversation.state == ChatRoom.State.Created) {
-                    val id = LinphoneUtils.getChatRoomId(conversation)
+                if (chatRoom.state == ChatRoom.State.Created) {
+                    val id = LinphoneUtils.getConversationId(chatRoom)
                     Log.i("$TAG 1-1 conversation [$id] has been created")
                     operationInProgress.postValue(false)
-                    goToConversationEvent.postValue(
-                        Event(
-                            Pair(
-                                conversation.localAddress.asStringUriOnly(),
-                                conversation.peerAddress.asStringUriOnly()
-                            )
-                        )
-                    )
+                    goToConversationEvent.postValue(Event(LinphoneUtils.getConversationId(chatRoom)))
                 } else {
                     Log.i("$TAG Conversation isn't in Created state yet, wait for it")
-                    conversation.addListener(chatRoomListener)
+                    chatRoom.addListener(chatRoomListener)
                 }
             } else {
-                val id = LinphoneUtils.getChatRoomId(conversation)
+                val id = LinphoneUtils.getConversationId(chatRoom)
                 Log.i("$TAG Conversation successfully created [$id]")
                 operationInProgress.postValue(false)
-                goToConversationEvent.postValue(
-                    Event(
-                        Pair(
-                            conversation.localAddress.asStringUriOnly(),
-                            conversation.peerAddress.asStringUriOnly()
-                        )
-                    )
-                )
+                goToConversationEvent.postValue(Event(LinphoneUtils.getConversationId(chatRoom)))
             }
         } else {
             Log.e(
@@ -1407,6 +1397,8 @@ class CurrentCallViewModel
         params.isChatEnabled = true
         params.isGroupEnabled = false
         params.subject = AppUtils.getString(R.string.conversation_one_to_one_hidden_subject)
+        params.account = account
+
         val chatParams = params.chatParams ?: return null
         chatParams.ephemeralLifetime = 0 // Make sure ephemeral is disabled by default
 
@@ -1471,4 +1463,9 @@ class CurrentCallViewModel
             }
         }
     }
+
+    @AnyThread
+    private fun showRecordingToast() {
+        showGreenToast(R.string.call_is_being_recorded, R.drawable.record_fill)
+    }
 }
diff --git a/app/src/main/java/org/linphone/ui/fileviewer/FileViewerActivity.kt b/app/src/main/java/org/linphone/ui/fileviewer/FileViewerActivity.kt
index 0e95f8a0b..b490478ff 100644
--- a/app/src/main/java/org/linphone/ui/fileviewer/FileViewerActivity.kt
+++ b/app/src/main/java/org/linphone/ui/fileviewer/FileViewerActivity.kt
@@ -1,7 +1,6 @@
 package org.linphone.ui.fileviewer
 
 import android.content.Intent
-import android.net.Uri
 import android.os.Bundle
 import android.util.DisplayMetrics
 import androidx.activity.enableEdgeToEdge
@@ -23,6 +22,7 @@ import org.linphone.ui.GenericActivity
 import org.linphone.ui.fileviewer.adapter.PdfPagesListAdapter
 import org.linphone.ui.fileviewer.viewmodel.FileViewModel
 import org.linphone.utils.FileUtils
+import androidx.core.net.toUri
 
 @UiThread
 class FileViewerActivity : GenericActivity() {
@@ -73,11 +73,19 @@ class FileViewerActivity : GenericActivity() {
             return
         }
 
+        val isFromEphemeralMessage = args.getBoolean("isFromEphemeralMessage", false)
+        if (isFromEphemeralMessage) {
+            Log.i("$TAG Displayed content is from an ephemeral chat message, force secure mode to prevent screenshots")
+            // Force preventing screenshots for ephemeral messages contents
+            enableWindowSecureMode(true)
+        }
+
         val timestamp = args.getLong("timestamp", -1)
         val preLoadedContent = args.getString("content")
         Log.i(
             "$TAG Path argument is [$path], pre loaded text content is ${if (preLoadedContent.isNullOrEmpty()) "not available" else "available, using it"}"
         )
+        viewModel.isFromEphemeralMessage.value = isFromEphemeralMessage
         viewModel.loadFile(path, timestamp, preLoadedContent)
 
         binding.setBackClickListener {
@@ -178,7 +186,7 @@ class FileViewerActivity : GenericActivity() {
             val filePath = FileUtils.getProperFilePath(viewModel.getFilePath())
             val copy = FileUtils.getFilePath(
                 baseContext,
-                Uri.parse(filePath),
+                filePath.toUri(),
                 overrideExisting = false,
                 copyToCache = true
             )
diff --git a/app/src/main/java/org/linphone/ui/fileviewer/MediaViewerActivity.kt b/app/src/main/java/org/linphone/ui/fileviewer/MediaViewerActivity.kt
index 6cc4e8d55..12bb3b8fb 100644
--- a/app/src/main/java/org/linphone/ui/fileviewer/MediaViewerActivity.kt
+++ b/app/src/main/java/org/linphone/ui/fileviewer/MediaViewerActivity.kt
@@ -1,7 +1,6 @@
 package org.linphone.ui.fileviewer
 
 import android.content.Intent
-import android.net.Uri
 import android.os.Bundle
 import androidx.activity.enableEdgeToEdge
 import androidx.annotation.UiThread
@@ -17,6 +16,7 @@ import java.io.File
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import org.linphone.LinphoneApplication.Companion.corePreferences
 import org.linphone.R
 import org.linphone.core.tools.Log
 import org.linphone.databinding.FileMediaViewerActivityBinding
@@ -27,6 +27,7 @@ import org.linphone.ui.main.chat.model.FileModel
 import org.linphone.ui.main.viewmodel.SharedMainViewModel
 import org.linphone.utils.AppUtils
 import org.linphone.utils.FileUtils
+import androidx.core.net.toUri
 
 @UiThread
 class MediaViewerActivity : GenericActivity() {
@@ -51,6 +52,13 @@ class MediaViewerActivity : GenericActivity() {
                 val model = list[position]
                 viewModel.currentlyDisplayedFileName.value = model.fileName
                 viewModel.currentlyDisplayedFileDateTime.value = model.dateTime
+
+                val isFromEphemeral = model.isFromEphemeralMessage
+                viewModel.isCurrentlyDisplayedFileFromEphemeralMessage.value = isFromEphemeral
+                if (!corePreferences.enableSecureMode) {
+                    // Force preventing screenshots for ephemeral messages contents, but allow it for others
+                    enableWindowSecureMode(isFromEphemeral)
+                }
             }
         }
     }
@@ -96,17 +104,24 @@ class MediaViewerActivity : GenericActivity() {
             return
         }
 
+        val isFromEphemeralMessage = args.getBoolean("isFromEphemeralMessage", false)
+        if (isFromEphemeralMessage) {
+            Log.i("$TAG Displayed content is from an ephemeral chat message, force secure mode to prevent screenshots")
+            // Force preventing screenshots for ephemeral messages contents
+            enableWindowSecureMode(true)
+        }
+
         val timestamp = args.getLong("timestamp", -1)
         val isEncrypted = args.getBoolean("isEncrypted", false)
         val originalPath = args.getString("originalPath", "")
-        viewModel.initTempModel(path, timestamp, isEncrypted, originalPath)
+        Log.i("$TAG Path argument is [$path], timestamp [$timestamp], encrypted [$isEncrypted] and original path [$originalPath]")
+        viewModel.initTempModel(path, timestamp, isEncrypted, originalPath, isFromEphemeralMessage)
 
-        val localSipUri = args.getString("localSipUri").orEmpty()
-        val remoteSipUri = args.getString("remoteSipUri").orEmpty()
+        val conversationId = args.getString("conversationId").orEmpty()
         Log.i(
-            "$TAG Looking up for conversation with local SIP URI [$localSipUri] and remote SIP URI [$remoteSipUri] trying to display file [$path]"
+            "$TAG Looking up for conversation with conversation ID [$conversationId] trying to display file [$path]"
         )
-        viewModel.findChatRoom(null, localSipUri, remoteSipUri)
+        viewModel.findChatRoom(null, conversationId)
 
         viewModel.mediaList.observe(this) {
             updateMediaList(path, it)
@@ -232,7 +247,7 @@ class MediaViewerActivity : GenericActivity() {
                 val filePath = FileUtils.getProperFilePath(model.path)
                 val copy = FileUtils.getFilePath(
                     baseContext,
-                    Uri.parse(filePath),
+                    filePath.toUri(),
                     overrideExisting = true,
                     copyToCache = true
                 )
diff --git a/app/src/main/java/org/linphone/ui/fileviewer/view/RatioTextureView.kt b/app/src/main/java/org/linphone/ui/fileviewer/view/RatioTextureView.kt
index 256a51eaf..bd8c69ed4 100644
--- a/app/src/main/java/org/linphone/ui/fileviewer/view/RatioTextureView.kt
+++ b/app/src/main/java/org/linphone/ui/fileviewer/view/RatioTextureView.kt
@@ -24,10 +24,6 @@ import android.util.AttributeSet
 import android.view.TextureView
 
 class RatioTextureView : TextureView {
-    companion object {
-        private const val TAG = "[Ratio TextureView]"
-    }
-
     constructor(context: Context) : super(context)
 
     constructor(context: Context, attrs: AttributeSet?) : super(context, attrs)
@@ -38,13 +34,6 @@ class RatioTextureView : TextureView {
         defStyleAttr
     )
 
-    constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int, defStyleRes: Int) : super(
-        context,
-        attrs,
-        defStyleAttr,
-        defStyleRes
-    )
-
     private var ratioWidth = 0
     private var rationHeight = 0
 
diff --git a/app/src/main/java/org/linphone/ui/fileviewer/viewmodel/FileViewModel.kt b/app/src/main/java/org/linphone/ui/fileviewer/viewmodel/FileViewModel.kt
index 31e4e6266..d11a82b40 100644
--- a/app/src/main/java/org/linphone/ui/fileviewer/viewmodel/FileViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/fileviewer/viewmodel/FileViewModel.kt
@@ -19,7 +19,6 @@
  */
 package org.linphone.ui.fileviewer.viewmodel
 
-import android.graphics.Bitmap
 import android.graphics.pdf.PdfRenderer
 import android.net.Uri
 import android.os.ParcelFileDescriptor
@@ -31,7 +30,6 @@ import java.io.BufferedReader
 import java.io.File
 import java.io.FileReader
 import java.lang.IllegalStateException
-import java.lang.StringBuilder
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
@@ -41,6 +39,8 @@ import org.linphone.ui.GenericViewModel
 import org.linphone.utils.Event
 import org.linphone.utils.FileUtils
 import org.linphone.utils.TimestampUtils
+import androidx.core.net.toUri
+import androidx.core.graphics.createBitmap
 
 class FileViewModel
     @UiThread
@@ -69,6 +69,8 @@ class FileViewModel
 
     val dateTime = MutableLiveData<String>()
 
+    val isFromEphemeralMessage = MutableLiveData<Boolean>()
+
     val exportPlainTextFileEvent: MutableLiveData<Event<String>> by lazy {
         MutableLiveData<Event<String>>()
     }
@@ -178,11 +180,7 @@ class FileViewModel
                     Log.d(
                         "$TAG Page size is ${page.width}/${page.height}, screen size is $screenWidth/$screenHeight"
                     )
-                    val bm = Bitmap.createBitmap(
-                        page.width,
-                        page.height,
-                        Bitmap.Config.ARGB_8888
-                    )
+                    val bm = createBitmap(page.width, page.height)
                     page.render(bm, null, null, PdfRenderer.Page.RENDER_MODE_FOR_DISPLAY)
                     page.close()
 
@@ -230,7 +228,7 @@ class FileViewModel
 
     @UiThread
     fun copyFileToUri(dest: Uri) {
-        val source = Uri.parse(FileUtils.getProperFilePath(getFilePath()))
+        val source = FileUtils.getProperFilePath(getFilePath()).toUri()
         Log.i("$TAG Copying file URI [$source] to [$dest]")
         viewModelScope.launch {
             withContext(Dispatchers.IO) {
@@ -239,24 +237,10 @@ class FileViewModel
                     Log.i(
                         "$TAG File [$filePath] has been successfully exported to documents"
                     )
-                    showGreenToastEvent.postValue(
-                        Event(
-                            Pair(
-                                R.string.file_successfully_exported_to_documents_toast,
-                                R.drawable.check
-                            )
-                        )
-                    )
+                    showGreenToast(R.string.file_successfully_exported_to_documents_toast, R.drawable.check)
                 } else {
                     Log.e("$TAG Failed to export file [$filePath] to documents!")
-                    showRedToastEvent.postValue(
-                        Event(
-                            Pair(
-                                R.string.export_file_to_documents_error_toast,
-                                R.drawable.warning_circle
-                            )
-                        )
-                    )
+                    showRedToast(R.string.export_file_to_documents_error_toast, R.drawable.warning_circle)
                 }
             }
         }
@@ -272,24 +256,13 @@ class FileViewModel
                     Log.i(
                         "$TAG Text has been successfully exported to documents"
                     )
-                    showGreenToastEvent.postValue(
-                        Event(
-                            Pair(
+                    showGreenToast(
                                 R.string.file_successfully_exported_to_documents_toast,
                                 R.drawable.check
                             )
-                        )
-                    )
                 } else {
                     Log.e("$TAG Failed to save text to documents!")
-                    showRedToastEvent.postValue(
-                        Event(
-                            Pair(
-                                R.string.export_file_to_documents_error_toast,
-                                R.drawable.warning_circle
-                            )
-                        )
-                    )
+                    showRedToast(R.string.export_file_to_documents_error_toast, R.drawable.warning_circle)
                 }
             }
         }
@@ -337,14 +310,7 @@ class FileViewModel
                     // TODO FIXME : improve performances !
                 } catch (e: Exception) {
                     Log.e("$TAG Exception trying to read file [$filePath] as text: $e")
-                    showRedToastEvent.postValue(
-                        Event(
-                            Pair(
-                                R.string.conversation_file_cant_be_opened_error_toast,
-                                R.drawable.warning_circle
-                            )
-                        )
-                    )
+                    showRedToast(R.string.conversation_file_cant_be_opened_error_toast, R.drawable.warning_circle)
                 }
             }
         }
diff --git a/app/src/main/java/org/linphone/ui/fileviewer/viewmodel/MediaListViewModel.kt b/app/src/main/java/org/linphone/ui/fileviewer/viewmodel/MediaListViewModel.kt
index 4943e44da..505e396da 100644
--- a/app/src/main/java/org/linphone/ui/fileviewer/viewmodel/MediaListViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/fileviewer/viewmodel/MediaListViewModel.kt
@@ -41,6 +41,8 @@ class MediaListViewModel
 
     val currentlyDisplayedFileDateTime = MutableLiveData<String>()
 
+    val isCurrentlyDisplayedFileFromEphemeralMessage = MutableLiveData<Boolean>()
+
     private lateinit var temporaryModel: FileModel
 
     override fun beforeNotifyingChatRoomFound(sameOne: Boolean) {
@@ -57,9 +59,9 @@ class MediaListViewModel
     }
 
     @UiThread
-    fun initTempModel(path: String, timestamp: Long, isEncrypted: Boolean, originalPath: String) {
+    fun initTempModel(path: String, timestamp: Long, isEncrypted: Boolean, originalPath: String, isFromEphemeralMessage: Boolean) {
         val name = FileUtils.getNameFromFilePath(path)
-        val model = FileModel(path, name, 0, timestamp, isEncrypted, originalPath)
+        val model = FileModel(path, name, 0, timestamp, isEncrypted, originalPath, isFromEphemeralMessage)
         temporaryModel = model
         Log.i("$TAG Temporary model for file [$name] created, use it while other media for conversation are being loaded")
         mediaList.postValue(arrayListOf(model))
@@ -68,7 +70,7 @@ class MediaListViewModel
     @WorkerThread
     private fun loadMediaList() {
         val list = arrayListOf<FileModel>()
-        val chatRoomId = LinphoneUtils.getChatRoomId(chatRoom)
+        val chatRoomId = LinphoneUtils.getConversationId(chatRoom)
         Log.i("$TAG Loading media contents for conversation [$chatRoomId]")
 
         val media = chatRoom.mediaContents
@@ -90,20 +92,37 @@ class MediaListViewModel
                 Log.d(
                     "$TAG [VFS] Content is encrypted, requesting plain file path for file [${mediaContent.filePath}]"
                 )
-                mediaContent.exportPlainFile()
+                val exportedPath = mediaContent.exportPlainFile()
+                Log.i("$TAG Media original path is [$originalPath], newly exported plain file path is [$exportedPath]")
+                exportedPath
             } else {
                 originalPath
             }
+
             val name = mediaContent.name.orEmpty()
             val size = mediaContent.size.toLong()
             val timestamp = mediaContent.creationTimestamp
             if (path.isNotEmpty() && name.isNotEmpty()) {
-                val model = FileModel(path, name, size, timestamp, isEncrypted, originalPath)
+                val messageId = mediaContent.relatedChatMessageId
+                val ephemeral = if (messageId != null) {
+                    val chatMessage = chatRoom.findMessage(messageId)
+                    if (chatMessage == null) {
+                        Log.w("$TAG Failed to find message using ID [$messageId] related to this content, can't get real info about being related to ephemeral message")
+                    }
+                    chatMessage?.isEphemeral ?: chatRoom.isEphemeralEnabled
+                } else {
+                    Log.e("$TAG No chat message ID related to this content, can't get real info about being related to ephemeral message")
+                    chatRoom.isEphemeralEnabled
+                }
+
+                val model = FileModel(path, name, size, timestamp, isEncrypted, originalPath, ephemeral)
                 list.add(model)
+            } else {
+                Log.w("$TAG Skipping content because either name [$name] or path [$path] is empty")
             }
 
             if (tempFilePath.isNotEmpty() && !tempFileModelFound) {
-                if (path == tempFilePath) {
+                if (path == tempFilePath || (isEncrypted && originalPath == temporaryModel.originalPath)) {
                     tempFileModelFound = true
                 }
             }
diff --git a/app/src/main/java/org/linphone/ui/fileviewer/viewmodel/MediaViewModel.kt b/app/src/main/java/org/linphone/ui/fileviewer/viewmodel/MediaViewModel.kt
index d7a0a8ce5..eecc3ffe0 100644
--- a/app/src/main/java/org/linphone/ui/fileviewer/viewmodel/MediaViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/fileviewer/viewmodel/MediaViewModel.kt
@@ -34,6 +34,7 @@ import org.linphone.ui.GenericViewModel
 import org.linphone.utils.Event
 import org.linphone.utils.FileUtils
 import org.linphone.utils.TimestampUtils
+import org.linphone.R
 
 class MediaViewModel
     @UiThread
@@ -163,33 +164,40 @@ class MediaViewModel
     private fun initMediaPlayer() {
         isMediaPlaying.value = false
 
-        mediaPlayer = MediaPlayer().apply {
-            setAudioAttributes(
-                AudioAttributes.Builder().setContentType(AudioAttributes.CONTENT_TYPE_MUSIC).setUsage(
-                    AudioAttributes.USAGE_MEDIA
-                ).build()
-            )
-            setDataSource(filePath)
-            setOnCompletionListener {
-                Log.i("$TAG Media player reached the end of file")
-                isMediaPlaying.postValue(false)
-                position.postValue(0)
-                stopUpdatePlaybackPosition()
+        try {
+            mediaPlayer = MediaPlayer().apply {
+                setAudioAttributes(
+                    AudioAttributes.Builder().setContentType(AudioAttributes.CONTENT_TYPE_MUSIC)
+                        .setUsage(
+                            AudioAttributes.USAGE_MEDIA
+                        ).build()
+                )
+                setDataSource(filePath)
+                setOnCompletionListener {
+                    Log.i("$TAG Media player reached the end of file")
+                    isMediaPlaying.postValue(false)
+                    position.postValue(0)
+                    stopUpdatePlaybackPosition()
 
-                // Leave full screen when playback is done
-                fullScreenMode.postValue(false)
-                changeFullScreenModeEvent.postValue(Event(false))
-            }
-            setOnVideoSizeChangedListener { mediaPlayer, width, height ->
-                videoSizeChangedEvent.postValue(Event(Pair(width, height)))
-            }
-            try {
-                prepare()
-            } catch (e: Exception) {
-                fullScreenMode.postValue(false)
-                changeFullScreenModeEvent.postValue(Event(false))
-                Log.e("$TAG Failed to prepare video file: $e")
+                    // Leave full screen when playback is done
+                    fullScreenMode.postValue(false)
+                    changeFullScreenModeEvent.postValue(Event(false))
+                }
+                setOnVideoSizeChangedListener { mediaPlayer, width, height ->
+                    videoSizeChangedEvent.postValue(Event(Pair(width, height)))
+                }
+                try {
+                    prepare()
+                } catch (e: Exception) {
+                    fullScreenMode.postValue(false)
+                    changeFullScreenModeEvent.postValue(Event(false))
+                    Log.e("$TAG Failed to prepare video file: $e")
+                }
             }
+        } catch (e: Exception) {
+            Log.e("$TAG Failed to initialize media player for file [$filePath]: $e")
+            showRedToast(R.string.media_player_generic_error_toast, R.drawable.warning_circle)
+            return
         }
 
         val durationInMillis = mediaPlayer.duration
diff --git a/app/src/main/java/org/linphone/ui/main/MainActivity.kt b/app/src/main/java/org/linphone/ui/main/MainActivity.kt
index cdf83555f..99f96af86 100644
--- a/app/src/main/java/org/linphone/ui/main/MainActivity.kt
+++ b/app/src/main/java/org/linphone/ui/main/MainActivity.kt
@@ -52,9 +52,11 @@ import androidx.navigation.NavOptions
 import androidx.navigation.findNavController
 import kotlin.math.max
 import kotlinx.coroutines.Deferred
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import org.linphone.LinphoneApplication.Companion.coreContext
 import org.linphone.LinphoneApplication.Companion.corePreferences
 import org.linphone.R
@@ -86,6 +88,9 @@ class MainActivity : GenericActivity() {
         private const val HISTORY_FRAGMENT_ID = 2
         private const val CHAT_FRAGMENT_ID = 3
         private const val MEETINGS_FRAGMENT_ID = 4
+
+        const val ARGUMENTS_CHAT = "Chat"
+        const val ARGUMENTS_CONVERSATION_ID = "ConversationId"
     }
 
     private lateinit var binding: MainActivityBinding
@@ -279,6 +284,12 @@ class MainActivity : GenericActivity() {
             }
         }
 
+        coreContext.clearAuthenticationRequestDialogEvent.observe(this) {
+            it.consume {
+                currentlyDisplayedAuthDialog?.dismiss()
+            }
+        }
+
         coreContext.showGreenToastEvent.observe(this) {
             it.consume { pair ->
                 val message = getString(pair.first)
@@ -310,6 +321,19 @@ class MainActivity : GenericActivity() {
             }
         }
 
+        coreContext.filesToExportToNativeMediaGalleryEvent.observe(this) {
+            it.consume { files ->
+                Log.i("$TAG Found [${files.size}] files to export to native media gallery")
+                for (file in files) {
+                    exportFileToNativeMediaGallery(file)
+                }
+
+                coreContext.postOnCoreThread {
+                    coreContext.clearFilesToExportToNativeGallery()
+                }
+            }
+        }
+
         CarConnection(this).type.observe(this) {
             val asString = when (it) {
                 CarConnection.CONNECTION_TYPE_NOT_CONNECTED -> "NOT CONNECTED"
@@ -514,14 +538,9 @@ class MainActivity : GenericActivity() {
 
     private fun handleLocusOrShortcut(id: String) {
         Log.i("$TAG Found locus ID [$id]")
-        val pair = LinphoneUtils.getLocalAndPeerSipUrisFromChatRoomId(id)
-        if (pair != null) {
-            val localSipUri = pair.first
-            val remoteSipUri = pair.second
-            Log.i(
-                "$TAG Navigating to conversation with local [$localSipUri] and peer [$remoteSipUri] addresses, computed from shortcut ID"
-            )
-            sharedViewModel.showConversationEvent.value = Event(pair)
+        if (id.isNotEmpty()) {
+            Log.i("$TAG Navigating to conversation with ID [$id], computed from shortcut ID")
+            sharedViewModel.showConversationEvent.value = Event(id)
         }
     }
 
@@ -547,22 +566,18 @@ class MainActivity : GenericActivity() {
                     }
                 }
             } else {
-                if (intent.hasExtra("Chat")) {
+                if (intent.hasExtra(ARGUMENTS_CHAT)) {
                     Log.i("$TAG Intent has [Chat] extra")
                     coreContext.postOnMainThread {
                         try {
                             Log.i("$TAG Trying to go to Conversations fragment")
                             val args = intent.extras
-                            val localSipUri = args?.getString("LocalSipUri", "")
-                            val remoteSipUri = args?.getString("RemoteSipUri", "")
-                            if (remoteSipUri.isNullOrEmpty() || localSipUri.isNullOrEmpty()) {
-                                Log.w("$TAG Found [Chat] extra but no local and/or remote SIP URI!")
+                            val conversationId = args?.getString(ARGUMENTS_CONVERSATION_ID, "")
+                            if (conversationId.isNullOrEmpty()) {
+                                Log.w("$TAG Found [Chat] extra but no conversation ID!")
                             } else {
-                                Log.i(
-                                    "$TAG Found [Chat] extra with local [$localSipUri] and peer [$remoteSipUri] addresses"
-                                )
-                                val pair = Pair(localSipUri, remoteSipUri)
-                                sharedViewModel.showConversationEvent.value = Event(pair)
+                                Log.i("$TAG Found [Chat] extra with conversation ID [$conversationId]")
+                                sharedViewModel.showConversationEvent.value = Event(conversationId)
                             }
                             args?.clear()
 
@@ -665,25 +680,23 @@ class MainActivity : GenericActivity() {
                 Log.i(
                     "$TAG App is already started and in debug fragment, navigating to conversations list"
                 )
-                val pair = parseShortcutIfAny(intent)
-                if (pair != null) {
+                val conversationId = parseShortcutIfAny(intent)
+                if (conversationId != null) {
                     Log.i(
-                        "$TAG Navigating from debug to conversation with local [${pair.first}] and peer [${pair.second}] addresses, computed from shortcut ID"
+                        "$TAG Navigating from debug to conversation with ID [$conversationId], computed from shortcut ID"
                     )
-                    sharedViewModel.showConversationEvent.value = Event(pair)
+                    sharedViewModel.showConversationEvent.value = Event(conversationId)
                 }
 
                 val action = DebugFragmentDirections.actionDebugFragmentToConversationsListFragment()
                 findNavController().navigate(action)
             } else {
-                val pair = parseShortcutIfAny(intent)
-                if (pair != null) {
-                    val localSipUri = pair.first
-                    val remoteSipUri = pair.second
+                val conversationId = parseShortcutIfAny(intent)
+                if (conversationId != null) {
                     Log.i(
-                        "$TAG Navigating to conversation with local [$localSipUri] and peer [$remoteSipUri] addresses, computed from shortcut ID"
+                        "$TAG Navigating to conversation with conversation ID [$conversationId] addresses, computed from shortcut ID"
                     )
-                    sharedViewModel.showConversationEvent.value = Event(pair)
+                    sharedViewModel.showConversationEvent.value = Event(conversationId)
                 }
 
                 if (findNavController().currentDestination?.id == R.id.conversationsListFragment) {
@@ -698,11 +711,11 @@ class MainActivity : GenericActivity() {
         }
     }
 
-    private fun parseShortcutIfAny(intent: Intent): Pair<String, String>? {
+    private fun parseShortcutIfAny(intent: Intent): String? {
         val shortcutId = intent.getStringExtra("android.intent.extra.shortcut.ID") // Intent.EXTRA_SHORTCUT_ID
         if (shortcutId != null) {
             Log.i("$TAG Found shortcut ID [$shortcutId]")
-            return LinphoneUtils.getLocalAndPeerSipUrisFromChatRoomId(shortcutId)
+            return shortcutId
         } else {
             Log.i("$TAG No shortcut ID was found")
         }
@@ -785,4 +798,18 @@ class MainActivity : GenericActivity() {
         dialog.show()
         currentlyDisplayedAuthDialog = dialog
     }
+
+    private fun exportFileToNativeMediaGallery(filePath: String) {
+        lifecycleScope.launch {
+            withContext(Dispatchers.IO) {
+                Log.i("$TAG Export file [$filePath] to Android's MediaStore")
+                val mediaStorePath = FileUtils.addContentToMediaStore(filePath)
+                if (mediaStorePath.isNotEmpty()) {
+                    Log.i("$TAG File [$filePath] has been successfully exported to MediaStore")
+                } else {
+                    Log.e("$TAG Failed to export file [$filePath] to MediaStore!")
+                }
+            }
+        }
+    }
 }
diff --git a/app/src/main/java/org/linphone/ui/main/adapter/ConversationsContactsAndSuggestionsListAdapter.kt b/app/src/main/java/org/linphone/ui/main/adapter/ConversationsContactsAndSuggestionsListAdapter.kt
index f35e8ab30..356fb10bb 100644
--- a/app/src/main/java/org/linphone/ui/main/adapter/ConversationsContactsAndSuggestionsListAdapter.kt
+++ b/app/src/main/java/org/linphone/ui/main/adapter/ConversationsContactsAndSuggestionsListAdapter.kt
@@ -87,7 +87,7 @@ class ConversationsContactsAndSuggestionsListAdapter :
 
     override fun getItemViewType(position: Int): Int {
         val model = getItem(position)
-        return if (model.localAddress != null) {
+        return if (model.conversationId.isNotEmpty()) {
             CONVERSATION_TYPE
         } else if (model.friend != null) {
             if (model.starred) {
diff --git a/app/src/main/java/org/linphone/ui/main/chat/adapter/ConversationEventAdapter.kt b/app/src/main/java/org/linphone/ui/main/chat/adapter/ConversationEventAdapter.kt
index bdf282863..f53551ec7 100644
--- a/app/src/main/java/org/linphone/ui/main/chat/adapter/ConversationEventAdapter.kt
+++ b/app/src/main/java/org/linphone/ui/main/chat/adapter/ConversationEventAdapter.kt
@@ -35,7 +35,7 @@ import org.linphone.core.tools.Log
 import org.linphone.databinding.ChatBubbleIncomingBinding
 import org.linphone.databinding.ChatBubbleOutgoingBinding
 import org.linphone.databinding.ChatConversationEventBinding
-import org.linphone.databinding.ChatConversationSecuredFirstEventBinding
+import org.linphone.databinding.ChatConversationE2eEncryptedFirstEventBinding
 import org.linphone.ui.main.chat.model.EventLogModel
 import org.linphone.ui.main.chat.model.EventModel
 import org.linphone.ui.main.chat.model.MessageModel
@@ -70,13 +70,19 @@ class ConversationEventAdapter :
         MutableLiveData<Event<MessageModel>>()
     }
 
+    private var isConversationSecured: Boolean = false
+
+    fun setIsConversationSecured(secured: Boolean) {
+        isConversationSecured = secured
+    }
+
     override fun displayHeaderForPosition(position: Int): Boolean {
         // We only want to display it at top
         return position == 0
     }
 
     override fun getHeaderViewForPosition(context: Context, position: Int): View {
-        val binding = ChatConversationSecuredFirstEventBinding.inflate(LayoutInflater.from(context))
+        val binding = ChatConversationE2eEncryptedFirstEventBinding.inflate(LayoutInflater.from(context))
         return binding.root
     }
 
diff --git a/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationDialogFragment.kt b/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationDialogFragment.kt
index 1daf8b3fd..b56cb83cf 100644
--- a/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationDialogFragment.kt
+++ b/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationDialogFragment.kt
@@ -29,7 +29,7 @@ import androidx.annotation.UiThread
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
-import org.linphone.databinding.ChatLongPressMenuBinding
+import org.linphone.databinding.ChatConversationLongPressMenuBinding
 
 @UiThread
 class ConversationDialogFragment(
@@ -71,7 +71,7 @@ class ConversationDialogFragment(
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View {
-        val view = ChatLongPressMenuBinding.inflate(layoutInflater)
+        val view = ChatConversationLongPressMenuBinding.inflate(layoutInflater)
         view.isMuted = isMuted
         view.isGroup = isGroup
         view.isReadOnly = isReadOnly
diff --git a/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationDocumentsListFragment.kt b/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationDocumentsListFragment.kt
index d01a7e959..80b334fdd 100644
--- a/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationDocumentsListFragment.kt
+++ b/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationDocumentsListFragment.kt
@@ -91,13 +91,10 @@ class ConversationDocumentsListFragment : SlidingPaneChildFragment() {
         binding.viewModel = viewModel
         observeToastEvents(viewModel)
 
-        val localSipUri = args.localSipUri
-        val remoteSipUri = args.remoteSipUri
-        Log.i(
-            "$TAG Looking up for conversation with local SIP URI [$localSipUri] and remote SIP URI [$remoteSipUri]"
-        )
+        val conversationId = args.conversationId
+        Log.i("$TAG Looking up for conversation with conversation ID [$conversationId]")
         val chatRoom = sharedViewModel.displayedChatRoom
-        viewModel.findChatRoom(chatRoom, localSipUri, remoteSipUri)
+        viewModel.findChatRoom(chatRoom, conversationId)
 
         val headerItemDecoration = RecyclerViewHeaderDecoration(requireContext(), adapter)
         binding.documentsList.addItemDecoration(headerItemDecoration)
@@ -143,12 +140,12 @@ class ConversationDocumentsListFragment : SlidingPaneChildFragment() {
 
         val bundle = Bundle()
         bundle.apply {
-            putString("localSipUri", viewModel.localSipUri)
-            putString("remoteSipUri", viewModel.remoteSipUri)
+            putString("conversationId", viewModel.conversationId)
             putString("path", path)
             putBoolean("isEncrypted", fileModel.isEncrypted)
             putLong("timestamp", fileModel.fileCreationTimestamp)
             putString("originalPath", fileModel.originalPath)
+            putBoolean("isFromEphemeralMessage", fileModel.isFromEphemeralMessage)
             putBoolean("isMedia", false)
         }
         when (FileUtils.getMimeType(mime)) {
diff --git a/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationForwardMessageFragment.kt b/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationForwardMessageFragment.kt
index 71ceb7b56..09014f800 100644
--- a/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationForwardMessageFragment.kt
+++ b/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationForwardMessageFragment.kt
@@ -38,7 +38,6 @@ import org.linphone.ui.main.contacts.model.ContactNumberOrAddressModel
 import org.linphone.ui.main.contacts.model.NumberOrAddressPickerDialogModel
 import org.linphone.ui.main.fragment.SlidingPaneChildFragment
 import org.linphone.utils.DialogUtils
-import org.linphone.utils.Event
 import org.linphone.utils.RecyclerViewHeaderDecoration
 
 @UiThread
@@ -66,11 +65,7 @@ class ConversationForwardMessageFragment : SlidingPaneChildFragment() {
     override fun goBack(): Boolean {
         sharedViewModel.messageToForwardEvent.value?.consume {
             Log.w("$TAG Cancelling message forward")
-            viewModel.showRedToastEvent.postValue(
-                Event(
-                    Pair(R.string.conversation_message_forward_cancelled_toast, R.drawable.forward)
-                )
-            )
+            viewModel.showRedToast(R.string.conversation_message_forward_cancelled_toast, R.drawable.forward)
         }
 
         return findNavController().popBackStack()
@@ -125,17 +120,11 @@ class ConversationForwardMessageFragment : SlidingPaneChildFragment() {
         }
 
         viewModel.chatRoomCreatedEvent.observe(viewLifecycleOwner) {
-            it.consume { pair ->
-                Log.i(
-                    "$TAG Navigating to conversation [${pair.second}] with local address [${pair.first}]"
-                )
-
+            it.consume { conversationId ->
+                Log.i("$TAG Navigating to conversation [$conversationId]")
                 if (findNavController().currentDestination?.id == R.id.conversationForwardMessageFragment) {
-                    val localSipUri = pair.first
-                    val remoteSipUri = pair.second
                     val action = ConversationForwardMessageFragmentDirections.actionConversationForwardMessageFragmentToConversationFragment(
-                        localSipUri,
-                        remoteSipUri
+                        conversationId
                     )
                     disableConsumingEventOnPause = true
                     findNavController().navigate(action)
diff --git a/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationFragment.kt b/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationFragment.kt
index 79796012b..a9652e468 100644
--- a/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationFragment.kt
+++ b/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationFragment.kt
@@ -93,6 +93,7 @@ import org.linphone.utils.addCharacterAtPosition
 import org.linphone.utils.hideKeyboard
 import org.linphone.utils.setKeyboardInsetListener
 import org.linphone.utils.showKeyboard
+import androidx.core.net.toUri
 
 @UiThread
 open class ConversationFragment : SlidingPaneChildFragment() {
@@ -212,8 +213,11 @@ open class ConversationFragment : SlidingPaneChildFragment() {
                 .viewTreeObserver
                 .removeOnGlobalLayoutListener(this)
 
-            if (::scrollListener.isInitialized) {
-                binding.eventsList.addOnScrollListener(scrollListener)
+            binding.root.setKeyboardInsetListener { keyboardVisible ->
+                sendMessageViewModel.isKeyboardOpen.value = keyboardVisible
+                if (keyboardVisible) {
+                    sendMessageViewModel.isEmojiPickerOpen.value = false
+                }
             }
 
             val unreadCount = viewModel.unreadMessagesCount.value ?: 0
@@ -275,15 +279,21 @@ open class ConversationFragment : SlidingPaneChildFragment() {
         }
 
         override fun afterTextChanged(p0: Editable?) {
-            sendMessageViewModel.closeParticipantsList()
+            if (viewModel.isGroup.value == true) {
+                sendMessageViewModel.closeParticipantsList()
 
-            val split = p0.toString().split(" ")
-            for (part in split) {
-                if (part == "@") {
-                    Log.i("$TAG '@' found, opening participants list")
-                    sendMessageViewModel.openParticipantsList()
+                val split = p0.toString().split(" ")
+                for (part in split) {
+                    if (part == "@") {
+                        Log.i("$TAG '@' found, opening participants list")
+                        sendMessageViewModel.openParticipantsList()
+                    }
                 }
             }
+
+            if (p0.toString().isNotEmpty()) {
+                sendMessageViewModel.notifyChatMessageIsBeingComposed()
+            }
         }
     }
 
@@ -301,7 +311,9 @@ open class ConversationFragment : SlidingPaneChildFragment() {
                 if (e.action == MotionEvent.ACTION_UP) {
                     if ((rv.layoutManager as LinearLayoutManager).findFirstCompletelyVisibleItemPosition() == 0) {
                         if (e.y >= 0 && e.y <= headerItemDecoration.getDecorationHeight(0)) {
-                            showEndToEndEncryptionDetailsBottomSheet()
+                            if (viewModel.isEndToEndEncrypted.value == true) {
+                                showEndToEndEncryptionDetailsBottomSheet()
+                            }
                             return true
                         }
                     }
@@ -471,14 +483,11 @@ open class ConversationFragment : SlidingPaneChildFragment() {
         }
         RecyclerViewSwipeUtils(callbacks).attachToRecyclerView(binding.eventsList)
 
-        val localSipUri = args.localSipUri
-        val remoteSipUri = args.remoteSipUri
-        Log.i(
-            "$TAG Looking up for conversation with local SIP URI [$localSipUri] and remote SIP URI [$remoteSipUri]"
-        )
+        val conversationId = args.conversationId
+        Log.i("$TAG Looking up for conversation with conversation ID [$conversationId]")
         val chatRoom = sharedViewModel.displayedChatRoom
-        viewModel.findChatRoom(chatRoom, localSipUri, remoteSipUri)
-        Compatibility.setLocusIdInContentCaptureSession(binding.root, localSipUri, remoteSipUri)
+        viewModel.findChatRoom(chatRoom, conversationId)
+        Compatibility.setLocusIdInContentCaptureSession(binding.root, conversationId)
 
         viewModel.chatRoomFoundEvent.observe(viewLifecycleOwner) {
             it.consume { found ->
@@ -494,6 +503,7 @@ open class ConversationFragment : SlidingPaneChildFragment() {
                     }
                 } else {
                     sendMessageViewModel.configureChatRoom(viewModel.chatRoom)
+                    adapter.setIsConversationSecured(viewModel.isEndToEndEncrypted.value == true)
 
                     // Wait for chat room to be ready before trying to forward a message in it
                     sharedViewModel.messageToForwardEvent.observe(viewLifecycleOwner) { event ->
@@ -575,6 +585,8 @@ open class ConversationFragment : SlidingPaneChildFragment() {
         }
 
         viewModel.isEndToEndEncrypted.observe(viewLifecycleOwner) { encrypted ->
+            adapter.setIsConversationSecured(encrypted)
+
             if (encrypted) {
                 binding.eventsList.addItemDecoration(headerItemDecoration)
                 binding.eventsList.addOnItemTouchListener(listItemTouchListener)
@@ -690,7 +702,7 @@ open class ConversationFragment : SlidingPaneChildFragment() {
         }
 
         binding.setWarningConversationDisabledClickListener {
-            showUnsafeConversationDetailsBottomSheet()
+            showUnsafeConversationDisabledDetailsBottomSheet()
         }
 
         binding.searchField.setOnEditorActionListener { view, actionId, _ ->
@@ -767,7 +779,7 @@ open class ConversationFragment : SlidingPaneChildFragment() {
                 if (messageLongPressViewModel.visible.value == true) return@consume
                 Log.i("$TAG Requesting to open web browser on page [$url]")
                 try {
-                    val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse(url))
+                    val browserIntent = Intent(Intent.ACTION_VIEW, url.toUri())
                     startActivity(browserIntent)
                 } catch (e: Exception) {
                     Log.e(
@@ -786,13 +798,6 @@ open class ConversationFragment : SlidingPaneChildFragment() {
             }
         }
 
-        viewModel.isGroup.observe(viewLifecycleOwner) { group ->
-            if (group) {
-                Log.i("$TAG Adding text observer to message sending area")
-                binding.sendArea.messageToSend.addTextChangedListener(textObserver)
-            }
-        }
-
         viewModel.messageDeletedEvent.observe(viewLifecycleOwner) {
             it.consume {
                 val message = getString(R.string.conversation_message_deleted_toast)
@@ -939,12 +944,7 @@ open class ConversationFragment : SlidingPaneChildFragment() {
                 }
             })
 
-        binding.root.setKeyboardInsetListener { keyboardVisible ->
-            sendMessageViewModel.isKeyboardOpen.value = keyboardVisible
-            if (keyboardVisible) {
-                sendMessageViewModel.isEmojiPickerOpen.value = false
-            }
-        }
+        binding.sendArea.messageToSend.addTextChangedListener(textObserver)
 
         scrollListener = object : ConversationScrollListener(layoutManager) {
             @UiThread
@@ -985,6 +985,10 @@ open class ConversationFragment : SlidingPaneChildFragment() {
             .viewTreeObserver
             .addOnGlobalLayoutListener(globalLayoutObserver)
 
+        if (::scrollListener.isInitialized) {
+            binding.eventsList.addOnScrollListener(scrollListener)
+        }
+
         try {
             adapter.registerAdapterDataObserver(dataObserver)
         } catch (e: IllegalStateException) {
@@ -1091,8 +1095,7 @@ open class ConversationFragment : SlidingPaneChildFragment() {
         if (findNavController().currentDestination?.id == R.id.conversationFragment) {
             val action =
                 ConversationFragmentDirections.actionConversationFragmentToConversationInfoFragment(
-                    viewModel.localSipUri,
-                    viewModel.remoteSipUri
+                    viewModel.conversationId,
                 )
             findNavController().navigate(action)
         }
@@ -1112,12 +1115,12 @@ open class ConversationFragment : SlidingPaneChildFragment() {
 
         val bundle = Bundle()
         bundle.apply {
-            putString("localSipUri", viewModel.localSipUri)
-            putString("remoteSipUri", viewModel.remoteSipUri)
+            putString("conversationId", viewModel.conversationId)
             putString("path", path)
             putBoolean("isEncrypted", fileModel.isEncrypted)
             putLong("timestamp", fileModel.fileCreationTimestamp)
             putString("originalPath", fileModel.originalPath)
+            putBoolean("isFromEphemeralMessage", fileModel.isFromEphemeralMessage)
         }
         when (mimeType) {
             FileUtils.MimeType.Image, FileUtils.MimeType.Video, FileUtils.MimeType.Audio -> {
@@ -1198,8 +1201,7 @@ open class ConversationFragment : SlidingPaneChildFragment() {
             if (findNavController().currentDestination?.id == R.id.conversationFragment) {
                 val action =
                     ConversationFragmentDirections.actionConversationFragmentToConversationMediaListFragment(
-                        localSipUri = viewModel.localSipUri,
-                        remoteSipUri = viewModel.remoteSipUri
+                        viewModel.conversationId
                     )
                 findNavController().navigate(action)
             }
@@ -1210,8 +1212,7 @@ open class ConversationFragment : SlidingPaneChildFragment() {
             if (findNavController().currentDestination?.id == R.id.conversationFragment) {
                 val action =
                     ConversationFragmentDirections.actionConversationFragmentToConversationDocumentsListFragment(
-                        localSipUri = viewModel.localSipUri,
-                        remoteSipUri = viewModel.remoteSipUri
+                        viewModel.conversationId
                     )
                 findNavController().navigate(action)
             }
@@ -1420,13 +1421,13 @@ open class ConversationFragment : SlidingPaneChildFragment() {
         bottomSheetDialog = e2eEncryptionDetailsBottomSheet
     }
 
-    private fun showUnsafeConversationDetailsBottomSheet() {
-        val unsafeConversationDetailsBottomSheet = UnsafeConversationDetailsDialogFragment()
-        unsafeConversationDetailsBottomSheet.show(
+    private fun showUnsafeConversationDisabledDetailsBottomSheet() {
+        val unsafeConversationDisabledDetailsBottomSheet = UnsafeConversationDisabledDetailsDialogFragment()
+        unsafeConversationDisabledDetailsBottomSheet.show(
             requireActivity().supportFragmentManager,
-            UnsafeConversationDetailsDialogFragment.TAG
+            UnsafeConversationDisabledDetailsDialogFragment.TAG
         )
-        bottomSheetDialog = unsafeConversationDetailsBottomSheet
+        bottomSheetDialog = unsafeConversationDisabledDetailsBottomSheet
     }
 
     private fun showOpenOrExportFileDialog(path: String, mime: String, bundle: Bundle) {
diff --git a/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationInfoFragment.kt b/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationInfoFragment.kt
index 9038df390..1f3a37892 100644
--- a/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationInfoFragment.kt
+++ b/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationInfoFragment.kt
@@ -96,13 +96,10 @@ class ConversationInfoFragment : SlidingPaneChildFragment() {
         binding.viewModel = viewModel
         observeToastEvents(viewModel)
 
-        val localSipUri = args.localSipUri
-        val remoteSipUri = args.remoteSipUri
-        Log.i(
-            "$TAG Looking up for conversation with local SIP URI [$localSipUri] and remote SIP URI [$remoteSipUri]"
-        )
+        val conversationId = args.conversationId
+        Log.i("$TAG Looking up for conversation with conversation ID [$conversationId]")
         val chatRoom = sharedViewModel.displayedChatRoom
-        viewModel.findChatRoom(chatRoom, localSipUri, remoteSipUri)
+        viewModel.findChatRoom(chatRoom, conversationId)
 
         binding.participants.isNestedScrollingEnabled = false
         binding.participants.setHasFixedSize(false)
@@ -116,7 +113,7 @@ class ConversationInfoFragment : SlidingPaneChildFragment() {
             it.consume { found ->
                 if (found) {
                     Log.i(
-                        "$TAG Found matching conversation for local SIP URI [$localSipUri] and remote SIP URI [$remoteSipUri]"
+                        "$TAG Found matching conversation with conversation ID [$conversationId]"
                     )
                     startPostponedEnterTransition()
                 } else {
@@ -333,7 +330,7 @@ class ConversationInfoFragment : SlidingPaneChildFragment() {
             if (findNavController().currentDestination?.id == R.id.conversationInfoFragment) {
                 Log.i("$TAG Going to shared media fragment")
                 val action =
-                    ConversationInfoFragmentDirections.actionConversationInfoFragmentToConversationMediaListFragment(localSipUri, remoteSipUri)
+                    ConversationInfoFragmentDirections.actionConversationInfoFragmentToConversationMediaListFragment(conversationId)
                 findNavController().navigate(action)
             }
         }
@@ -342,7 +339,7 @@ class ConversationInfoFragment : SlidingPaneChildFragment() {
             if (findNavController().currentDestination?.id == R.id.conversationInfoFragment) {
                 Log.i("$TAG Going to shared documents fragment")
                 val action =
-                    ConversationInfoFragmentDirections.actionConversationInfoFragmentToConversationDocumentsListFragment(localSipUri, remoteSipUri)
+                    ConversationInfoFragmentDirections.actionConversationInfoFragmentToConversationDocumentsListFragment(conversationId)
                 findNavController().navigate(action)
             }
         }
diff --git a/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationMediaListFragment.kt b/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationMediaListFragment.kt
index e8d0d1f68..76a9c5e06 100644
--- a/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationMediaListFragment.kt
+++ b/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationMediaListFragment.kt
@@ -94,13 +94,10 @@ class ConversationMediaListFragment : SlidingPaneChildFragment() {
         binding.viewModel = viewModel
         observeToastEvents(viewModel)
 
-        val localSipUri = args.localSipUri
-        val remoteSipUri = args.remoteSipUri
-        Log.i(
-            "$TAG Looking up for conversation with local SIP URI [$localSipUri] and remote SIP URI [$remoteSipUri]"
-        )
+        val conversationId = args.conversationId
+        Log.i("$TAG Looking up for conversation with conversation ID [$conversationId]")
         val chatRoom = sharedViewModel.displayedChatRoom
-        viewModel.findChatRoom(chatRoom, localSipUri, remoteSipUri)
+        viewModel.findChatRoom(chatRoom, conversationId)
 
         val headerItemDecoration = RecyclerViewHeaderDecoration(requireContext(), adapter)
         binding.mediaList.addItemDecoration(headerItemDecoration)
@@ -172,12 +169,12 @@ class ConversationMediaListFragment : SlidingPaneChildFragment() {
 
         val bundle = Bundle()
         bundle.apply {
-            putString("localSipUri", viewModel.localSipUri)
-            putString("remoteSipUri", viewModel.remoteSipUri)
+            putString("conversationId", viewModel.conversationId)
             putString("path", path)
             putBoolean("isEncrypted", fileModel.isEncrypted)
             putLong("timestamp", fileModel.fileCreationTimestamp)
             putString("originalPath", fileModel.originalPath)
+            putBoolean("isFromEphemeralMessage", fileModel.isFromEphemeralMessage)
             putBoolean("isMedia", true)
         }
         when (FileUtils.getMimeType(mime)) {
diff --git a/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationsListFragment.kt b/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationsListFragment.kt
index 8fa661c00..1ef9a7c0e 100644
--- a/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationsListFragment.kt
+++ b/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationsListFragment.kt
@@ -39,6 +39,7 @@ import org.linphone.databinding.ChatListFragmentBinding
 import org.linphone.ui.GenericActivity
 import org.linphone.ui.fileviewer.FileViewerActivity
 import org.linphone.ui.fileviewer.MediaViewerActivity
+import org.linphone.ui.main.MainActivity.Companion.ARGUMENTS_CONVERSATION_ID
 import org.linphone.ui.main.chat.adapter.ConversationsListAdapter
 import org.linphone.ui.main.chat.viewmodel.ConversationsListViewModel
 import org.linphone.ui.main.fragment.AbstractMainFragment
@@ -162,9 +163,7 @@ class ConversationsListFragment : AbstractMainFragment() {
             it.consume { model ->
                 Log.i("$TAG Show conversation with ID [${model.id}]")
                 sharedViewModel.displayedChatRoom = model.chatRoom
-                sharedViewModel.showConversationEvent.value = Event(
-                    Pair(model.localSipUri, model.remoteSipUri)
-                )
+                sharedViewModel.showConversationEvent.value = Event(model.id)
             }
         }
 
@@ -191,16 +190,9 @@ class ConversationsListFragment : AbstractMainFragment() {
         }
 
         sharedViewModel.showConversationEvent.observe(viewLifecycleOwner) {
-            it.consume { pair ->
-                val localSipUri = pair.first
-                val remoteSipUri = pair.second
-                Log.i(
-                    "$TAG Navigating to conversation fragment with local SIP URI [$localSipUri] and remote SIP URI [$remoteSipUri]"
-                )
-                val action = ConversationFragmentDirections.actionGlobalConversationFragment(
-                    localSipUri,
-                    remoteSipUri
-                )
+            it.consume { conversationId ->
+                Log.i("$TAG Navigating to conversation fragment with ID [$conversationId]")
+                val action = ConversationFragmentDirections.actionGlobalConversationFragment(conversationId)
                 binding.chatNavContainer.findNavController().navigate(action)
             }
         }
@@ -214,6 +206,8 @@ class ConversationsListFragment : AbstractMainFragment() {
                             uri
                         )
                     findNavController().navigate(action)
+                } else {
+                    Log.e("$TAG Failed to navigate to meeting waiting room, wrong current destination (expected conversationsListFragment but was something else)")
                 }
             }
         }
@@ -328,12 +322,10 @@ class ConversationsListFragment : AbstractMainFragment() {
 
         val args = arguments
         if (args != null) {
-            val localSipUri = args.getString("LocalSipUri")
-            val remoteSipUri = args.getString("RemoteSipUri")
-            if (localSipUri != null && remoteSipUri != null) {
-                Log.i("$TAG Found local [$localSipUri] & remote [$remoteSipUri] URIs in arguments")
-                val pair = Pair(localSipUri, remoteSipUri)
-                sharedViewModel.showConversationEvent.value = Event(pair)
+            val conversationId = args.getString(ARGUMENTS_CONVERSATION_ID)
+            if (!conversationId.isNullOrEmpty()) {
+                Log.i("$TAG Found conversation ID [$conversationId] in arguments")
+                sharedViewModel.showConversationEvent.value = Event(conversationId)
                 args.clear()
             }
         }
diff --git a/app/src/main/java/org/linphone/ui/main/chat/fragment/EndToEndEncryptionDetailsDialogFragment.kt b/app/src/main/java/org/linphone/ui/main/chat/fragment/EndToEndEncryptionDetailsDialogFragment.kt
index 482491b0d..cc40b959f 100644
--- a/app/src/main/java/org/linphone/ui/main/chat/fragment/EndToEndEncryptionDetailsDialogFragment.kt
+++ b/app/src/main/java/org/linphone/ui/main/chat/fragment/EndToEndEncryptionDetailsDialogFragment.kt
@@ -29,7 +29,7 @@ import androidx.annotation.UiThread
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
-import org.linphone.databinding.ChatConversationE2eDetailsBottomSheetBinding
+import org.linphone.databinding.ChatConversationE2eEncryptedDetailsBottomSheetBinding
 
 @UiThread
 class EndToEndEncryptionDetailsDialogFragment(
@@ -62,7 +62,7 @@ class EndToEndEncryptionDetailsDialogFragment(
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View {
-        val view = ChatConversationE2eDetailsBottomSheetBinding.inflate(layoutInflater)
+        val view = ChatConversationE2eEncryptedDetailsBottomSheetBinding.inflate(layoutInflater)
         return view.root
     }
 }
diff --git a/app/src/main/java/org/linphone/ui/main/chat/fragment/StartConversationFragment.kt b/app/src/main/java/org/linphone/ui/main/chat/fragment/StartConversationFragment.kt
index 3c942984a..a0039ebe7 100644
--- a/app/src/main/java/org/linphone/ui/main/chat/fragment/StartConversationFragment.kt
+++ b/app/src/main/java/org/linphone/ui/main/chat/fragment/StartConversationFragment.kt
@@ -93,11 +93,11 @@ class StartConversationFragment : GenericAddressPickerFragment() {
         }
 
         viewModel.chatRoomCreatedEvent.observe(viewLifecycleOwner) {
-            it.consume { pair ->
+            it.consume { conversationId ->
                 Log.i(
-                    "$TAG Conversation [${pair.second}] for local address [${pair.first}] has been created, navigating to it"
+                    "$TAG Conversation [$conversationId] has been created, navigating to it"
                 )
-                sharedViewModel.showConversationEvent.value = Event(pair)
+                sharedViewModel.showConversationEvent.value = Event(conversationId)
                 goBack()
             }
         }
diff --git a/app/src/main/java/org/linphone/ui/main/chat/fragment/UnsafeConversationDetailsDialogFragment.kt b/app/src/main/java/org/linphone/ui/main/chat/fragment/UnsafeConversationDisabledDetailsDialogFragment.kt
similarity index 87%
rename from app/src/main/java/org/linphone/ui/main/chat/fragment/UnsafeConversationDetailsDialogFragment.kt
rename to app/src/main/java/org/linphone/ui/main/chat/fragment/UnsafeConversationDisabledDetailsDialogFragment.kt
index 597120f99..681cea5af 100644
--- a/app/src/main/java/org/linphone/ui/main/chat/fragment/UnsafeConversationDetailsDialogFragment.kt
+++ b/app/src/main/java/org/linphone/ui/main/chat/fragment/UnsafeConversationDisabledDetailsDialogFragment.kt
@@ -29,14 +29,14 @@ import androidx.annotation.UiThread
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
-import org.linphone.databinding.ChatConversationUnsafeDetailsBottomSheetBinding
+import org.linphone.databinding.ChatConversationUnsafeDisabledDetailsBottomSheetBinding
 
 @UiThread
-class UnsafeConversationDetailsDialogFragment(
+class UnsafeConversationDisabledDetailsDialogFragment(
     private val onDismiss: (() -> Unit)? = null
 ) : BottomSheetDialogFragment() {
     companion object {
-        const val TAG = "UnsafeConversationDetailsDialogFragment"
+        const val TAG = "UnsafeConversationDisabledDetailsDialogFragment"
     }
 
     override fun onCancel(dialog: DialogInterface) {
@@ -62,7 +62,7 @@ class UnsafeConversationDetailsDialogFragment(
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View {
-        val view = ChatConversationUnsafeDetailsBottomSheetBinding.inflate(layoutInflater)
+        val view = ChatConversationUnsafeDisabledDetailsBottomSheetBinding.inflate(layoutInflater)
         return view.root
     }
 }
diff --git a/app/src/main/java/org/linphone/ui/main/chat/model/ConversationModel.kt b/app/src/main/java/org/linphone/ui/main/chat/model/ConversationModel.kt
index 8da2b98d2..d6a09e53b 100644
--- a/app/src/main/java/org/linphone/ui/main/chat/model/ConversationModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/chat/model/ConversationModel.kt
@@ -48,11 +48,7 @@ class ConversationModel
         private const val TAG = "[Conversation Model]"
     }
 
-    val id = LinphoneUtils.getChatRoomId(chatRoom)
-
-    val localSipUri = chatRoom.localAddress.asStringUriOnly()
-
-    val remoteSipUri = chatRoom.peerAddress.asStringUriOnly()
+    val id = LinphoneUtils.getConversationId(chatRoom)
 
     val isGroup = !chatRoom.hasCapability(Capabilities.OneToOne.toInt()) && chatRoom.hasCapability(
         Capabilities.Conference.toInt()
@@ -60,6 +56,8 @@ class ConversationModel
 
     val isEncrypted = chatRoom.hasCapability(Capabilities.Encrypted.toInt())
 
+    val isEncryptionAvailable = LinphoneUtils.isEndToEndEncryptedChatAvailable(chatRoom.core)
+
     val isReadOnly = MutableLiveData<Boolean>()
 
     val subject = MutableLiveData<String>()
diff --git a/app/src/main/java/org/linphone/ui/main/chat/model/EventLogModel.kt b/app/src/main/java/org/linphone/ui/main/chat/model/EventLogModel.kt
index 948ae8de8..257c50357 100644
--- a/app/src/main/java/org/linphone/ui/main/chat/model/EventLogModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/chat/model/EventLogModel.kt
@@ -38,7 +38,8 @@ class EventLogModel
     onWebUrlClicked: ((url: String) -> Unit)? = null,
     onContactClicked: ((friendRefKey: String) -> Unit)? = null,
     onRedToastToShow: ((pair: Pair<Int, Int>) -> Unit)? = null,
-    onVoiceRecordingPlaybackEnded: ((id: String) -> Unit)? = null
+    onVoiceRecordingPlaybackEnded: ((id: String) -> Unit)? = null,
+    onFileToExportToNativeGallery: ((path: String) -> Unit)? = null
 ) {
     companion object {
         private const val TAG = "[Event Log Model]"
@@ -89,7 +90,8 @@ class EventLogModel
             onWebUrlClicked,
             onContactClicked,
             onRedToastToShow,
-            onVoiceRecordingPlaybackEnded
+            onVoiceRecordingPlaybackEnded,
+            onFileToExportToNativeGallery
         )
     }
 
diff --git a/app/src/main/java/org/linphone/ui/main/chat/model/FileModel.kt b/app/src/main/java/org/linphone/ui/main/chat/model/FileModel.kt
index c8cc3c868..101eecebe 100644
--- a/app/src/main/java/org/linphone/ui/main/chat/model/FileModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/chat/model/FileModel.kt
@@ -22,7 +22,6 @@ package org.linphone.ui.main.chat.model
 import android.media.MediaMetadataRetriever
 import android.media.MediaMetadataRetriever.METADATA_KEY_DURATION
 import android.media.ThumbnailUtils
-import android.net.Uri
 import android.provider.MediaStore
 import androidx.annotation.AnyThread
 import androidx.annotation.UiThread
@@ -35,6 +34,7 @@ import org.linphone.LinphoneApplication.Companion.coreContext
 import org.linphone.core.tools.Log
 import org.linphone.utils.FileUtils
 import org.linphone.utils.TimestampUtils
+import androidx.core.net.toUri
 
 class FileModel
     @AnyThread
@@ -45,6 +45,7 @@ class FileModel
     val fileCreationTimestamp: Long,
     val isEncrypted: Boolean,
     val originalPath: String,
+    val isFromEphemeralMessage: Boolean,
     val isWaitingToBeDownloaded: Boolean = false,
     val flexboxLayoutWrapBefore: Boolean = false,
     private val onClicked: ((model: FileModel) -> Unit)? = null
@@ -185,7 +186,7 @@ class FileModel
     private fun getDuration() {
         try {
             val retriever = MediaMetadataRetriever()
-            retriever.setDataSource(coreContext.context, Uri.parse(path))
+            retriever.setDataSource(coreContext.context, path.toUri())
             val durationInMs = retriever.extractMetadata(METADATA_KEY_DURATION)?.toInt() ?: 0
             val seconds = durationInMs / 1000
             val duration = TimestampUtils.durationToString(seconds)
diff --git a/app/src/main/java/org/linphone/ui/main/chat/model/MessageBottomSheetParticipantModel.kt b/app/src/main/java/org/linphone/ui/main/chat/model/MessageBottomSheetParticipantModel.kt
index 7983cb9cb..e8e8e158e 100644
--- a/app/src/main/java/org/linphone/ui/main/chat/model/MessageBottomSheetParticipantModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/chat/model/MessageBottomSheetParticipantModel.kt
@@ -21,7 +21,9 @@ package org.linphone.ui.main.chat.model
 
 import androidx.annotation.UiThread
 import androidx.annotation.WorkerThread
+import androidx.lifecycle.MutableLiveData
 import org.linphone.LinphoneApplication.Companion.coreContext
+import org.linphone.LinphoneApplication.Companion.corePreferences
 import org.linphone.core.Address
 
 class MessageBottomSheetParticipantModel
@@ -35,8 +37,23 @@ class MessageBottomSheetParticipantModel
 ) {
     val sipUri = address.asStringUriOnly()
 
+    val showSipUri = MutableLiveData<Boolean>()
+
     val avatarModel = coreContext.contactsManager.getContactAvatarModelForAddress(address)
 
+    init {
+        showSipUri.postValue(false)
+    }
+
+    @UiThread
+    fun toggleShowSipUri() {
+        if (!isOurOwnReaction && !corePreferences.onlyDisplaySipUriUsername) {
+            showSipUri.postValue(showSipUri.value == false)
+        } else {
+            clicked()
+        }
+    }
+
     @UiThread
     fun clicked() {
         onClick?.invoke()
diff --git a/app/src/main/java/org/linphone/ui/main/chat/model/MessageDeliveryModel.kt b/app/src/main/java/org/linphone/ui/main/chat/model/MessageDeliveryModel.kt
index afd0a7b49..0721366e9 100644
--- a/app/src/main/java/org/linphone/ui/main/chat/model/MessageDeliveryModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/chat/model/MessageDeliveryModel.kt
@@ -63,6 +63,7 @@ class MessageDeliveryModel
             message: ChatMessage,
             state: ParticipantImdnState
         ) {
+            Log.i("$TAG Participant IMDN state changed [${state.state}], updating delivery status")
             computeDeliveryStatus()
         }
     }
diff --git a/app/src/main/java/org/linphone/ui/main/chat/model/MessageModel.kt b/app/src/main/java/org/linphone/ui/main/chat/model/MessageModel.kt
index 7c0a9b5de..6f7021f0f 100644
--- a/app/src/main/java/org/linphone/ui/main/chat/model/MessageModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/chat/model/MessageModel.kt
@@ -42,6 +42,7 @@ import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import org.linphone.LinphoneApplication.Companion.coreContext
+import org.linphone.LinphoneApplication.Companion.corePreferences
 import org.linphone.R
 import org.linphone.core.Address
 import org.linphone.core.ChatMessage
@@ -82,7 +83,8 @@ class MessageModel
     private val onWebUrlClicked: ((url: String) -> Unit)? = null,
     private val onContactClicked: ((friendRefKey: String) -> Unit)? = null,
     private val onRedToastToShow: ((pair: Pair<Int, Int>) -> Unit)? = null,
-    private val onVoiceRecordingPlaybackEnded: ((id: String) -> Unit)? = null
+    private val onVoiceRecordingPlaybackEnded: ((id: String) -> Unit)? = null,
+    private val onFileToExportToNativeGallery: ((path: String) -> Unit)? = null
 ) {
     companion object {
         private const val TAG = "[Message Model]"
@@ -98,12 +100,14 @@ class MessageModel
 
     val isOutgoing = chatMessage.isOutgoing
 
-    val isInError = chatMessage.state == ChatMessage.State.NotDelivered
+    val isInError = MutableLiveData<Boolean>()
 
     val timestamp = chatMessage.time
 
     val time = TimestampUtils.toString(timestamp)
 
+    val hideDeliveryStatus = !isOutgoing && coreContext.core.imdnToEverybodyThreshold == 1
+
     val chatRoomIsReadOnly = chatMessage.chatRoom.isReadOnly ||
         (
             !chatMessage.chatRoom.hasCapability(ChatRoom.Capabilities.Encrypted.toInt()) && LinphoneUtils.getAccountForAddress(
@@ -222,6 +226,28 @@ class MessageModel
                     }
                 }
             }
+            isInError.postValue(messageState == ChatMessage.State.NotDelivered)
+        }
+
+        @WorkerThread
+        override fun onFileTransferTerminated(message: ChatMessage, content: Content) {
+            Log.i("$TAG File [${content.name}] from message [${message.messageId}] transfer terminated")
+
+            // Never do auto media export for ephemeral messages!
+            if (corePreferences.makePublicMediaFilesDownloaded && !message.isEphemeral) {
+                val path = content.filePath
+                if (path.isNullOrEmpty()) return
+
+                val mime = "${content.type}/${content.subtype}"
+                val mimeType = FileUtils.getMimeType(mime)
+                when (mimeType) {
+                    FileUtils.MimeType.Image, FileUtils.MimeType.Video, FileUtils.MimeType.Audio -> {
+                        Log.i("$TAG Exporting file path [$path] to the native media gallery")
+                        onFileToExportToNativeGallery?.invoke(path)
+                    }
+                    else -> {}
+                }
+            }
         }
 
         @WorkerThread
@@ -274,6 +300,8 @@ class MessageModel
     init {
         updateAvatarModel()
 
+        isInError.postValue(chatMessage.state == ChatMessage.State.NotDelivered)
+
         groupedWithNextMessage.postValue(isGroupedWithNextOne)
         groupedWithPreviousMessage.postValue(isGroupedWithPreviousOne)
         isPlayingVoiceRecord.postValue(false)
@@ -443,6 +471,7 @@ class MessageModel
                             timestamp,
                             isFileEncrypted,
                             originalPath,
+                            chatMessage.isEphemeral,
                             flexboxLayoutWrapBefore = wrapBefore
                         ) { model ->
                             onContentClicked?.invoke(model)
@@ -470,7 +499,8 @@ class MessageModel
                                 content.fileSize.toLong(),
                                 timestamp,
                                 isFileEncrypted,
-                                path
+                                path,
+                                chatMessage.isEphemeral
                             ) { model ->
                                 onContentClicked?.invoke(model)
                             }
@@ -482,6 +512,7 @@ class MessageModel
                                 timestamp,
                                 isFileEncrypted,
                                 name,
+                                chatMessage.isEphemeral,
                                 isWaitingToBeDownloaded = true
                             ) { model ->
                                 downloadContent(model, content)
diff --git a/app/src/main/java/org/linphone/ui/main/chat/model/ParticipantModel.kt b/app/src/main/java/org/linphone/ui/main/chat/model/ParticipantModel.kt
index 68ab1b36d..dad8d5b90 100644
--- a/app/src/main/java/org/linphone/ui/main/chat/model/ParticipantModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/chat/model/ParticipantModel.kt
@@ -22,7 +22,9 @@ package org.linphone.ui.main.chat.model
 import android.view.View
 import androidx.annotation.UiThread
 import androidx.annotation.WorkerThread
+import androidx.lifecycle.MutableLiveData
 import org.linphone.LinphoneApplication.Companion.coreContext
+import org.linphone.LinphoneApplication.Companion.corePreferences
 import org.linphone.core.Address
 import org.linphone.ui.main.contacts.model.ContactAvatarModel
 
@@ -39,6 +41,8 @@ class ParticipantModel
 ) {
     val sipUri = address.asStringUriOnly()
 
+    val showSipUri = MutableLiveData<Boolean>()
+
     val avatarModel: ContactAvatarModel = coreContext.contactsManager.getContactAvatarModelForAddress(
         address
     )
@@ -49,6 +53,19 @@ class ParticipantModel
         avatarModel.friend
     )
 
+    init {
+        showSipUri.postValue(false)
+    }
+
+    @UiThread
+    fun toggleShowSipUri() {
+        if (!corePreferences.onlyDisplaySipUriUsername) {
+            showSipUri.postValue(showSipUri.value == false)
+        } else {
+            onClicked()
+        }
+    }
+
     @UiThread
     fun onClicked() {
         onClicked?.invoke(this)
diff --git a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/AbstractConversationViewModel.kt b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/AbstractConversationViewModel.kt
index ca647937a..37759a39f 100644
--- a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/AbstractConversationViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/AbstractConversationViewModel.kt
@@ -28,8 +28,6 @@ import org.linphone.LinphoneApplication.Companion.coreContext
 import org.linphone.R
 import org.linphone.core.Address
 import org.linphone.core.ChatRoom
-import org.linphone.core.ConferenceParams
-import org.linphone.core.Factory
 import org.linphone.core.MediaDirection
 import org.linphone.core.tools.Log
 import org.linphone.ui.GenericViewModel
@@ -51,9 +49,7 @@ abstract class AbstractConversationViewModel : GenericViewModel() {
 
     lateinit var chatRoom: ChatRoom
 
-    lateinit var localSipUri: String
-
-    lateinit var remoteSipUri: String
+    lateinit var conversationId: String
 
     fun isChatRoomInitialized(): Boolean {
         return ::chatRoom.isInitialized
@@ -68,17 +64,13 @@ abstract class AbstractConversationViewModel : GenericViewModel() {
     }
 
     @UiThread
-    fun findChatRoom(room: ChatRoom?, localSipUri: String, remoteSipUri: String) {
-        this.localSipUri = localSipUri
-        this.remoteSipUri = remoteSipUri
-
+    fun findChatRoom(room: ChatRoom?, conversationId: String) {
         coreContext.postOnCoreThread { core ->
-            Log.i(
-                "$TAG Looking for conversation with local SIP URI [$localSipUri] and remote SIP URI [$remoteSipUri]"
-            )
+            Log.i("$TAG Looking for conversation with conversation ID [$conversationId]")
             if (room != null && ::chatRoom.isInitialized && chatRoom == room) {
                 Log.i("$TAG Conversation object already in memory, skipping")
 
+                this@AbstractConversationViewModel.conversationId = conversationId
                 beforeNotifyingChatRoomFound(sameOne = true)
                 chatRoomFoundEvent.postValue(Event(true))
                 afterNotifyingChatRoomFound(sameOne = true)
@@ -86,17 +78,12 @@ abstract class AbstractConversationViewModel : GenericViewModel() {
                 return@postOnCoreThread
             }
 
-            val localAddress = Factory.instance().createAddress(localSipUri)
-            val remoteAddress = Factory.instance().createAddress(remoteSipUri)
-
             if (room != null && (!::chatRoom.isInitialized || chatRoom != room)) {
-                if (localAddress?.weakEqual(room.localAddress) == true && remoteAddress?.weakEqual(
-                        room.peerAddress
-                    ) == true
-                ) {
+                if (conversationId == LinphoneUtils.getConversationId(room)) {
                     Log.i("$TAG Conversation object available in sharedViewModel, using it")
                     chatRoom = room
 
+                    this@AbstractConversationViewModel.conversationId = conversationId
                     beforeNotifyingChatRoomFound(sameOne = false)
                     chatRoomFoundEvent.postValue(Event(true))
                     afterNotifyingChatRoomFound(sameOne = false)
@@ -105,18 +92,11 @@ abstract class AbstractConversationViewModel : GenericViewModel() {
                 }
             }
 
-            if (localAddress != null && remoteAddress != null) {
+            if (conversationId.isNotEmpty()) {
                 Log.i("$TAG Searching for conversation in Core using local & peer SIP addresses")
-                val params: ConferenceParams? = null
-                val found = core.searchChatRoom(
-                    params,
-                    localAddress,
-                    remoteAddress,
-                    arrayOfNulls<Address>(
-                        0
-                    )
-                )
+                val found = core.searchChatRoomByIdentifier(conversationId)
                 if (found != null) {
+                    this@AbstractConversationViewModel.conversationId = conversationId
                     if (::chatRoom.isInitialized && chatRoom == found) {
                         Log.i("$TAG Conversation object already in memory, keeping it")
                         beforeNotifyingChatRoomFound(sameOne = true)
@@ -173,14 +153,7 @@ abstract class AbstractConversationViewModel : GenericViewModel() {
             val conference = LinphoneUtils.createGroupCall(account, chatRoom.subject.orEmpty())
             if (conference == null) {
                 Log.e("$TAG Failed to create group call!")
-                showRedToastEvent.postValue(
-                    Event(
-                        Pair(
-                            R.string.conference_failed_to_create_group_call_toast,
-                            R.drawable.warning_circle
-                        )
-                    )
-                )
+                showRedToast(R.string.conference_failed_to_create_group_call_toast, R.drawable.warning_circle)
                 return@postOnCoreThread
             }
 
@@ -199,14 +172,7 @@ abstract class AbstractConversationViewModel : GenericViewModel() {
             )
             if (conference.inviteParticipants(participants, callParams) != 0) {
                 Log.e("$TAG Failed to invite participants into group call!")
-                showRedToastEvent.postValue(
-                    Event(
-                        Pair(
-                            R.string.conference_failed_to_create_group_call_toast,
-                            R.drawable.warning_circle
-                        )
-                    )
-                )
+                showRedToast(R.string.conference_failed_to_create_group_call_toast, R.drawable.warning_circle)
             }
         }
     }
diff --git a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ChatMessageLongPressViewModel.kt b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ChatMessageLongPressViewModel.kt
index d56aa551f..32e65c0aa 100644
--- a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ChatMessageLongPressViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ChatMessageLongPressViewModel.kt
@@ -72,7 +72,6 @@ class ChatMessageLongPressViewModel : GenericViewModel() {
 
     val onDismissedEvent = MutableLiveData<Event<Boolean>>()
 
-    private lateinit var emojiBottomSheet: ChatBubbleEmojiPickerBottomSheetBinding
     private lateinit var emojiBottomSheetBehavior: BottomSheetBehavior<View>
 
     init {
@@ -91,7 +90,7 @@ class ChatMessageLongPressViewModel : GenericViewModel() {
         hideCopyTextToClipboard.value = model.text.value.isNullOrEmpty()
         isChatRoomReadOnly.value = model.chatRoomIsReadOnly
         isMessageOutgoing.value = model.isOutgoing
-        isMessageInError.value = model.isInError
+        isMessageInError.value = model.isInError.value == true
         horizontalBias.value = if (model.isOutgoing) 1f else 0f
         messageModel.value = model
 
diff --git a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationDocumentsListViewModel.kt b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationDocumentsListViewModel.kt
index 5c3710bf0..82ceaab0b 100644
--- a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationDocumentsListViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationDocumentsListViewModel.kt
@@ -42,7 +42,8 @@ class ConversationDocumentsListViewModel
         MutableLiveData<Event<FileModel>>()
     }
 
-    override fun beforeNotifyingChatRoomFound(sameOne: Boolean) {
+    @WorkerThread
+    override fun afterNotifyingChatRoomFound(sameOne: Boolean) {
         loadDocumentsList()
     }
 
@@ -58,7 +59,7 @@ class ConversationDocumentsListViewModel
 
         val list = arrayListOf<FileModel>()
         Log.i(
-            "$TAG Loading document contents for conversation [${LinphoneUtils.getChatRoomId(
+            "$TAG Loading document contents for conversation [${LinphoneUtils.getConversationId(
                 chatRoom
             )}]"
         )
@@ -79,12 +80,26 @@ class ConversationDocumentsListViewModel
             val size = documentContent.size.toLong()
             val timestamp = documentContent.creationTimestamp
             if (path.isNotEmpty() && name.isNotEmpty()) {
-                val model = FileModel(path, name, size, timestamp, isEncrypted, originalPath) {
+                val messageId = documentContent.relatedChatMessageId
+                val ephemeral = if (messageId != null) {
+                    val chatMessage = chatRoom.findMessage(messageId)
+                    if (chatMessage == null) {
+                        Log.w("$TAG Failed to find message using ID [$messageId] related to this content, can't get real info about being related to ephemeral message")
+                    }
+                    chatMessage?.isEphemeral ?: chatRoom.isEphemeralEnabled
+                } else {
+                    Log.e("$TAG No chat message ID related to this content, can't get real info about being related to ephemeral message")
+                    chatRoom.isEphemeralEnabled
+                }
+
+                val model =
+                    FileModel(path, name, size, timestamp, isEncrypted, originalPath, ephemeral) {
                     openDocumentEvent.postValue(Event(it))
                 }
                 list.add(model)
             }
         }
+
         Log.i("$TAG [${documents.size}] documents have been processed")
         documentsList.postValue(list)
         operationInProgress.postValue(false)
diff --git a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationForwardMessageViewModel.kt b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationForwardMessageViewModel.kt
index 495c3170e..569359e30 100644
--- a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationForwardMessageViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationForwardMessageViewModel.kt
@@ -48,8 +48,8 @@ class ConversationForwardMessageViewModel
 
     val operationInProgress = MutableLiveData<Boolean>()
 
-    val chatRoomCreatedEvent: MutableLiveData<Event<Pair<String, String>>> by lazy {
-        MutableLiveData<Event<Pair<String, String>>>()
+    val chatRoomCreatedEvent: MutableLiveData<Event<String>> by lazy {
+        MutableLiveData<Event<String>>()
     }
 
     val showNumberOrAddressPickerDialogEvent: MutableLiveData<Event<ArrayList<ContactNumberOrAddressModel>>> by lazy {
@@ -83,33 +83,19 @@ class ConversationForwardMessageViewModel
             val state = chatRoom.state
             if (state == ChatRoom.State.Instantiated) return
 
-            val id = LinphoneUtils.getChatRoomId(chatRoom)
+            val id = LinphoneUtils.getConversationId(chatRoom)
             Log.i("$TAG Conversation [$id] (${chatRoom.subject}) state changed: [$state]")
 
             if (state == ChatRoom.State.Created) {
                 Log.i("$TAG Conversation [$id] successfully created")
                 chatRoom.removeListener(this)
                 operationInProgress.postValue(false)
-                chatRoomCreatedEvent.postValue(
-                    Event(
-                        Pair(
-                            chatRoom.localAddress.asStringUriOnly(),
-                            chatRoom.peerAddress.asStringUriOnly()
-                        )
-                    )
-                )
+                chatRoomCreatedEvent.postValue(Event(LinphoneUtils.getConversationId(chatRoom)))
             } else if (state == ChatRoom.State.CreationFailed) {
                 Log.e("$TAG Conversation [$id] creation has failed!")
                 chatRoom.removeListener(this)
                 operationInProgress.postValue(false)
-                showRedToastEvent.postValue(
-                    Event(
-                        Pair(
-                            R.string.conversation_failed_to_create_toast,
-                            R.drawable.warning_circle
-                        )
-                    )
-                )
+                showRedToast(R.string.conversation_failed_to_create_toast, R.drawable.warning_circle)
             }
         }
     }
@@ -135,16 +121,9 @@ class ConversationForwardMessageViewModel
     @UiThread
     fun handleClickOnModel(model: ConversationContactOrSuggestionModel) {
         coreContext.postOnCoreThread { core ->
-            if (model.localAddress != null) {
+            if (model.conversationId.isNotEmpty()) {
                 Log.i("$TAG User clicked on an existing conversation")
-                chatRoomCreatedEvent.postValue(
-                    Event(
-                        Pair(
-                            model.localAddress.asStringUriOnly(),
-                            model.address.asStringUriOnly()
-                        )
-                    )
-                )
+                chatRoomCreatedEvent.postValue(Event(model.conversationId))
                 if (searchFilter.value.orEmpty().isNotEmpty()) {
                     // Clear filter after it was used
                     coreContext.postOnMainThread {
@@ -156,7 +135,7 @@ class ConversationForwardMessageViewModel
 
             val friend = model.friend
             if (friend == null) {
-                Log.i("$TAG Friend is null, using address [${model.address}]")
+                Log.i("$TAG Friend is null, using address [${model.address.asStringUriOnly()}]")
                 onAddressSelected(model.address)
                 return@postOnCoreThread
             }
@@ -195,18 +174,20 @@ class ConversationForwardMessageViewModel
         params.isChatEnabled = true
         params.isGroupEnabled = false
         params.subject = AppUtils.getString(R.string.conversation_one_to_one_hidden_subject)
+        params.account = account
+
         val chatParams = params.chatParams ?: return
         chatParams.ephemeralLifetime = 0 // Make sure ephemeral is disabled by default
 
         val sameDomain = remote.domain == corePreferences.defaultDomain && remote.domain == account.params.domain
         if (account.params.instantMessagingEncryptionMandatory && sameDomain) {
-            Log.i("$TAG Account is in secure mode & domain matches, creating a E2E conversation")
+            Log.i("$TAG Account is in secure mode & domain matches, creating an E2E encrypted conversation")
             chatParams.backend = ChatRoom.Backend.FlexisipChat
             params.securityLevel = Conference.SecurityLevel.EndToEnd
         } else if (!account.params.instantMessagingEncryptionMandatory) {
             if (LinphoneUtils.isEndToEndEncryptedChatAvailable(core)) {
                 Log.i(
-                    "$TAG Account is in interop mode but LIME is available, creating a E2E conversation"
+                    "$TAG Account is in interop mode but LIME is available, creating an E2E encrypted conversation"
                 )
                 chatParams.backend = ChatRoom.Backend.FlexisipChat
                 params.securityLevel = Conference.SecurityLevel.EndToEnd
@@ -222,14 +203,7 @@ class ConversationForwardMessageViewModel
                 "$TAG Account is in secure mode, can't chat with SIP address of different domain [${remote.asStringUriOnly()}]"
             )
             operationInProgress.postValue(false)
-            showRedToastEvent.postValue(
-                Event(
-                    Pair(
-                        R.string.conversation_invalid_participant_due_to_security_mode_toast,
-                        R.drawable.warning_circle
-                    )
-                )
-            )
+            showRedToast(R.string.conversation_invalid_participant_due_to_security_mode_toast, R.drawable.warning_circle)
             return
         }
 
@@ -240,63 +214,35 @@ class ConversationForwardMessageViewModel
             Log.i(
                 "$TAG No existing 1-1 conversation between local account [${localAddress?.asStringUriOnly()}] and remote [${remote.asStringUriOnly()}] was found for given parameters, let's create it"
             )
-            val chatRoom = core.createChatRoom(params, localAddress, participants)
+            val chatRoom = core.createChatRoom(params, participants)
             if (chatRoom != null) {
                 if (chatParams.backend == ChatRoom.Backend.FlexisipChat) {
                     if (chatRoom.state == ChatRoom.State.Created) {
-                        val id = LinphoneUtils.getChatRoomId(chatRoom)
+                        val id = LinphoneUtils.getConversationId(chatRoom)
                         Log.i("$TAG 1-1 conversation [$id] has been created")
                         operationInProgress.postValue(false)
-                        chatRoomCreatedEvent.postValue(
-                            Event(
-                                Pair(
-                                    chatRoom.localAddress.asStringUriOnly(),
-                                    chatRoom.peerAddress.asStringUriOnly()
-                                )
-                            )
-                        )
+                        chatRoomCreatedEvent.postValue(Event(LinphoneUtils.getConversationId(chatRoom)))
                     } else {
                         Log.i("$TAG Conversation isn't in Created state yet, wait for it")
                         chatRoom.addListener(chatRoomListener)
                     }
                 } else {
-                    val id = LinphoneUtils.getChatRoomId(chatRoom)
+                    val id = LinphoneUtils.getConversationId(chatRoom)
                     Log.i("$TAG Conversation successfully created [$id]")
                     operationInProgress.postValue(false)
-                    chatRoomCreatedEvent.postValue(
-                        Event(
-                            Pair(
-                                chatRoom.localAddress.asStringUriOnly(),
-                                chatRoom.peerAddress.asStringUriOnly()
-                            )
-                        )
-                    )
+                    chatRoomCreatedEvent.postValue(Event(LinphoneUtils.getConversationId(chatRoom)))
                 }
             } else {
                 Log.e("$TAG Failed to create 1-1 conversation with [${remote.asStringUriOnly()}]!")
                 operationInProgress.postValue(false)
-                showRedToastEvent.postValue(
-                    Event(
-                        Pair(
-                            R.string.conversation_failed_to_create_toast,
-                            R.drawable.warning_circle
-                        )
-                    )
-                )
+                showRedToast(R.string.conversation_failed_to_create_toast, R.drawable.warning_circle)
             }
         } else {
             Log.w(
                 "$TAG A 1-1 conversation between local account [${localAddress?.asStringUriOnly()}] and remote [${remote.asStringUriOnly()}] for given parameters already exists!"
             )
             operationInProgress.postValue(false)
-            chatRoomCreatedEvent.postValue(
-                Event(
-                    Pair(
-                        existingChatRoom.localAddress.asStringUriOnly(),
-                        existingChatRoom.peerAddress.asStringUriOnly()
-                    )
-                )
-            )
+            chatRoomCreatedEvent.postValue(Event(LinphoneUtils.getConversationId(existingChatRoom)))
         }
     }
 }
diff --git a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationInfoViewModel.kt b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationInfoViewModel.kt
index e9f1c2724..080120051 100644
--- a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationInfoViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationInfoViewModel.kt
@@ -108,7 +108,7 @@ class ConversationInfoViewModel
                 R.string.conversation_info_participant_added_to_conversation_toast,
                 getParticipant(eventLog)
             )
-            showFormattedGreenToastEvent.postValue(Event(Pair(message, R.drawable.user_circle)))
+            showFormattedGreenToast(message, R.drawable.user_circle)
 
             computeParticipantsList()
             infoChangedEvent.postValue(Event(true))
@@ -121,7 +121,7 @@ class ConversationInfoViewModel
                 R.string.conversation_info_participant_removed_from_conversation_toast,
                 getParticipant(eventLog)
             )
-            showFormattedGreenToastEvent.postValue(Event(Pair(message, R.drawable.user_circle)))
+            showFormattedGreenToast(message, R.drawable.user_circle)
 
             computeParticipantsList()
             infoChangedEvent.postValue(Event(true))
@@ -143,7 +143,7 @@ class ConversationInfoViewModel
                     getParticipant(eventLog)
                 )
             }
-            showFormattedGreenToastEvent.postValue(Event(Pair(message, R.drawable.user_circle)))
+            showFormattedGreenToast(message, R.drawable.user_circle)
 
             computeParticipantsList()
         }
@@ -151,11 +151,9 @@ class ConversationInfoViewModel
         @WorkerThread
         override fun onSubjectChanged(chatRoom: ChatRoom, eventLog: EventLog) {
             Log.i(
-                "$TAG Conversation [${LinphoneUtils.getChatRoomId(chatRoom)}] has a new subject [${chatRoom.subject}]"
-            )
-            showGreenToastEvent.postValue(
-                Event(Pair(R.string.conversation_subject_changed_toast, R.drawable.check))
+                "$TAG Conversation [${LinphoneUtils.getConversationId(chatRoom)}] has a new subject [${chatRoom.subject}]"
             )
+            showGreenToast(R.string.conversation_subject_changed_toast, R.drawable.check)
 
             subject.postValue(chatRoom.subject)
             infoChangedEvent.postValue(Event(true))
@@ -166,34 +164,13 @@ class ConversationInfoViewModel
             Log.i("$TAG Ephemeral event [${eventLog.type}]")
             when (eventLog.type) {
                 EventLog.Type.ConferenceEphemeralMessageEnabled -> {
-                    showGreenToastEvent.postValue(
-                        Event(
-                            Pair(
-                                R.string.conversation_ephemeral_messages_enabled_toast,
-                                R.drawable.clock_countdown
-                            )
-                        )
-                    )
+                    showGreenToast(R.string.conversation_ephemeral_messages_enabled_toast, R.drawable.clock_countdown)
                 }
                 EventLog.Type.ConferenceEphemeralMessageDisabled -> {
-                    showGreenToastEvent.postValue(
-                        Event(
-                            Pair(
-                                R.string.conversation_ephemeral_messages_disabled_toast,
-                                R.drawable.clock_countdown
-                            )
-                        )
-                    )
+                    showGreenToast(R.string.conversation_ephemeral_messages_disabled_toast, R.drawable.clock_countdown)
                 }
                 else -> {
-                    showGreenToastEvent.postValue(
-                        Event(
-                            Pair(
-                                R.string.conversation_ephemeral_messages_lifetime_changed_toast,
-                                R.drawable.clock_countdown
-                            )
-                        )
-                    )
+                    showGreenToast(R.string.conversation_ephemeral_messages_lifetime_changed_toast, R.drawable.clock_countdown)
                 }
             }
         }
@@ -241,7 +218,7 @@ class ConversationInfoViewModel
     fun leaveGroup() {
         coreContext.postOnCoreThread {
             if (isChatRoomInitialized()) {
-                Log.i("$TAG Leaving conversation [${LinphoneUtils.getChatRoomId(chatRoom)}]")
+                Log.i("$TAG Leaving conversation [${LinphoneUtils.getConversationId(chatRoom)}]")
                 chatRoom.leave()
             }
             groupLeftEvent.postValue(Event(true))
@@ -253,7 +230,7 @@ class ConversationInfoViewModel
         coreContext.postOnCoreThread {
             if (isChatRoomInitialized()) {
                 Log.i(
-                    "$TAG Cleaning conversation [${LinphoneUtils.getChatRoomId(chatRoom)}] history"
+                    "$TAG Cleaning conversation [${LinphoneUtils.getConversationId(chatRoom)}] history"
                 )
                 chatRoom.deleteHistory()
             }
@@ -303,7 +280,7 @@ class ConversationInfoViewModel
         coreContext.postOnCoreThread {
             val address = participantModel.address
             Log.i(
-                "$TAG Removing participant [$address] from the conversation [${LinphoneUtils.getChatRoomId(
+                "$TAG Removing participant [$address] from the conversation [${LinphoneUtils.getConversationId(
                     chatRoom
                 )}]"
             )
@@ -324,7 +301,7 @@ class ConversationInfoViewModel
         coreContext.postOnCoreThread {
             val address = participantModel.address
             Log.i(
-                "$TAG Granting admin rights to participant [$address] from the conversation [${LinphoneUtils.getChatRoomId(
+                "$TAG Granting admin rights to participant [$address] from the conversation [${LinphoneUtils.getConversationId(
                     chatRoom
                 )}]"
             )
@@ -345,7 +322,7 @@ class ConversationInfoViewModel
         coreContext.postOnCoreThread {
             val address = participantModel.address
             Log.i(
-                "$TAG Removing admin rights from participant [$address] from the conversation [${LinphoneUtils.getChatRoomId(
+                "$TAG Removing admin rights from participant [$address] from the conversation [${LinphoneUtils.getConversationId(
                     chatRoom
                 )}]"
             )
@@ -431,14 +408,7 @@ class ConversationInfoViewModel
                     val ok = chatRoom.addParticipants(toAddList.toTypedArray())
                     if (!ok) {
                         Log.w("$TAG Failed to add some/all participants to the group!")
-                        showRedToastEvent.postValue(
-                            Event(
-                                Pair(
-                                    R.string.conversation_failed_to_add_participant_to_group_conversation_toast,
-                                    R.drawable.warning_circle
-                                )
-                            )
-                        )
+                        showRedToast(R.string.conversation_failed_to_add_participant_to_group_conversation_toast, R.drawable.warning_circle)
                     }
                 }
             }
diff --git a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationMediaListViewModel.kt b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationMediaListViewModel.kt
index 1b8dea0d5..bad0ea672 100644
--- a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationMediaListViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationMediaListViewModel.kt
@@ -36,11 +36,14 @@ class ConversationMediaListViewModel
 
     val mediaList = MutableLiveData<List<FileModel>>()
 
+    val operationInProgress = MutableLiveData<Boolean>()
+
     val openMediaEvent: MutableLiveData<Event<FileModel>> by lazy {
         MutableLiveData<Event<FileModel>>()
     }
 
-    override fun beforeNotifyingChatRoomFound(sameOne: Boolean) {
+    @WorkerThread
+    override fun afterNotifyingChatRoomFound(sameOne: Boolean) {
         loadMediaList()
     }
 
@@ -52,9 +55,11 @@ class ConversationMediaListViewModel
 
     @WorkerThread
     private fun loadMediaList() {
+        operationInProgress.postValue(true)
+
         val list = arrayListOf<FileModel>()
         Log.i(
-            "$TAG Loading media contents for conversation [${LinphoneUtils.getChatRoomId(
+            "$TAG Loading media contents for conversation [${LinphoneUtils.getConversationId(
                 chatRoom
             )}]"
         )
@@ -78,13 +83,16 @@ class ConversationMediaListViewModel
             val size = mediaContent.size.toLong()
             val timestamp = mediaContent.creationTimestamp
             if (path.isNotEmpty() && name.isNotEmpty()) {
-                val model = FileModel(path, name, size, timestamp, isEncrypted, originalPath) {
+                val model =
+                    FileModel(path, name, size, timestamp, isEncrypted, originalPath, chatRoom.isEphemeralEnabled) {
                     openMediaEvent.postValue(Event(it))
                 }
                 list.add(model)
             }
         }
+
         Log.i("$TAG [${media.size}] media have been processed")
         mediaList.postValue(list)
+        operationInProgress.postValue(false)
     }
 }
diff --git a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationViewModel.kt b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationViewModel.kt
index 788346f7e..b97e7df55 100644
--- a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationViewModel.kt
@@ -48,6 +48,7 @@ import org.linphone.utils.AppUtils
 import org.linphone.utils.Event
 import org.linphone.utils.FileUtils
 import org.linphone.utils.LinphoneUtils
+import androidx.core.net.toUri
 
 class ConversationViewModel
     @UiThread
@@ -72,6 +73,8 @@ class ConversationViewModel
 
     val isEndToEndEncrypted = MutableLiveData<Boolean>()
 
+    val isEndToEndEncryptionAvailable = MutableLiveData<Boolean>()
+
     val isGroup = MutableLiveData<Boolean>()
 
     val subject = MutableLiveData<String>()
@@ -288,7 +291,7 @@ class ConversationViewModel
                 list.remove(found)
                 eventsList = list
                 updateEvents.postValue(Event(true))
-                isEmpty.postValue(eventsList.isEmpty)
+                isEmpty.postValue(eventsList.isEmpty())
             } else {
                 Log.e("$TAG Failed to find matching message in conversation events list")
             }
@@ -313,7 +316,8 @@ class ConversationViewModel
     }
 
     init {
-        coreContext.postOnCoreThread {
+        coreContext.postOnCoreThread { core ->
+            isEndToEndEncryptionAvailable.postValue(LinphoneUtils.isEndToEndEncryptedChatAvailable(core))
             coreContext.contactsManager.addListener(contactsListener)
         }
 
@@ -428,7 +432,7 @@ class ConversationViewModel
                 list.remove(found)
                 eventsList = list
                 updateEvents.postValue(Event(true))
-                isEmpty.postValue(eventsList.isEmpty)
+                isEmpty.postValue(eventsList.isEmpty())
             } else {
                 Log.e(
                     "$TAG Failed to find chat message id [${chatMessageModel.id}] in events list!"
@@ -470,7 +474,7 @@ class ConversationViewModel
     fun updateCurrentlyDisplayedConversation() {
         coreContext.postOnCoreThread {
             if (isChatRoomInitialized()) {
-                val id = LinphoneUtils.getChatRoomId(chatRoom)
+                val id = LinphoneUtils.getConversationId(chatRoom)
                 Log.i(
                     "$TAG Asking notifications manager not to notify messages for conversation [$id]"
                 )
@@ -524,7 +528,7 @@ class ConversationViewModel
                 list.addAll(eventsList)
                 eventsList = list
                 updateEvents.postValue(Event(true))
-                isEmpty.postValue(eventsList.isEmpty)
+                isEmpty.postValue(eventsList.isEmpty())
             }
         }
     }
@@ -647,7 +651,7 @@ class ConversationViewModel
         Log.i("$TAG Extracted [${list.size}] events from conversation history in database")
         eventsList = list
         updateEvents.postValue(Event(true))
-        isEmpty.postValue(eventsList.isEmpty)
+        isEmpty.postValue(eventsList.isEmpty())
     }
 
     @WorkerThread
@@ -694,7 +698,7 @@ class ConversationViewModel
         list.addAll(newList)
         eventsList = list
         updateEvents.postValue(Event(true))
-        isEmpty.postValue(eventsList.isEmpty)
+        isEmpty.postValue(eventsList.isEmpty())
     }
 
     @WorkerThread
@@ -726,7 +730,7 @@ class ConversationViewModel
         list.addAll(eventsList)
         eventsList = list
         updateEvents.postValue(Event(true))
-        isEmpty.postValue(eventsList.isEmpty)
+        isEmpty.postValue(eventsList.isEmpty())
     }
 
     @WorkerThread
@@ -761,6 +765,19 @@ class ConversationViewModel
                 },
                 { id ->
                     voiceRecordPlaybackEndedEvent.postValue(Event(id))
+                },
+                { filePath ->
+                    viewModelScope.launch {
+                        withContext(Dispatchers.IO) {
+                            Log.i("$TAG Export file [$filePath] to Android's MediaStore")
+                            val mediaStorePath = FileUtils.addContentToMediaStore(filePath)
+                            if (mediaStorePath.isNotEmpty()) {
+                                Log.i("$TAG File [$filePath] has been successfully exported to MediaStore")
+                            } else {
+                                Log.e("$TAG Failed to export file [$filePath] to MediaStore!")
+                            }
+                        }
+                    }
                 }
             )
             eventsList.add(model)
@@ -784,7 +801,7 @@ class ConversationViewModel
             eventsList.addAll(processGroupedEvents(arrayListOf(event)))
         } else {
             for (event in history) {
-                if (groupedEventLogs.isEmpty) {
+                if (groupedEventLogs.isEmpty()) {
                     groupedEventLogs.add(event)
                     continue
                 }
@@ -925,11 +942,7 @@ class ConversationViewModel
             } else {
                 R.string.conversation_search_no_more_match
             }
-            showRedToastEvent.postValue(
-                Event(
-                    Pair(message, R.drawable.magnifying_glass)
-                )
-            )
+            showRedToast(message, R.drawable.magnifying_glass)
         } else {
             Log.i(
                 "$TAG Found result [${match.chatMessage?.messageId}] while looking up for message with text [$textToSearch] in direction [$direction] starting from message [${latestMatch?.chatMessage?.messageId}]"
@@ -962,7 +975,7 @@ class ConversationViewModel
 
     @UiThread
     fun copyFileToUri(filePath: String, dest: Uri) {
-        val source = Uri.parse(FileUtils.getProperFilePath(filePath))
+        val source = FileUtils.getProperFilePath(filePath).toUri()
         Log.i("$TAG Copying file URI [$source] to [$dest]")
         viewModelScope.launch {
             withContext(Dispatchers.IO) {
@@ -971,24 +984,10 @@ class ConversationViewModel
                     Log.i(
                         "$TAG File [$filePath] has been successfully exported to documents"
                     )
-                    showGreenToastEvent.postValue(
-                        Event(
-                            Pair(
-                                R.string.file_successfully_exported_to_documents_toast,
-                                R.drawable.check
-                            )
-                        )
-                    )
+                    showGreenToast(R.string.file_successfully_exported_to_documents_toast, R.drawable.check)
                 } else {
                     Log.e("$TAG Failed to export file [$filePath] to documents!")
-                    showRedToastEvent.postValue(
-                        Event(
-                            Pair(
-                                R.string.export_file_to_documents_error_toast,
-                                R.drawable.warning_circle
-                            )
-                        )
-                    )
+                    showRedToast(R.string.export_file_to_documents_error_toast, R.drawable.warning_circle)
                 }
             }
         }
diff --git a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationsListViewModel.kt b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationsListViewModel.kt
index e5e69fb99..9da02a47c 100644
--- a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationsListViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationsListViewModel.kt
@@ -33,7 +33,6 @@ import org.linphone.core.Friend
 import org.linphone.core.tools.Log
 import org.linphone.ui.main.chat.model.ConversationModel
 import org.linphone.ui.main.viewmodel.AbstractMainViewModel
-import org.linphone.utils.Event
 import org.linphone.utils.LinphoneUtils
 
 class ConversationsListViewModel
@@ -55,7 +54,7 @@ class ConversationsListViewModel
             state: ChatRoom.State?
         ) {
             Log.i(
-                "$TAG Conversation [${LinphoneUtils.getChatRoomId(chatRoom)}] state changed [$state]"
+                "$TAG Conversation [${LinphoneUtils.getConversationId(chatRoom)}] state changed [$state]"
             )
 
             when (state) {
@@ -67,7 +66,17 @@ class ConversationsListViewModel
 
         @WorkerThread
         override fun onMessageSent(core: Core, chatRoom: ChatRoom, message: ChatMessage) {
-            reorderChatRooms()
+            val id = LinphoneUtils.getConversationId(chatRoom)
+            val found = conversations.value.orEmpty().find {
+                it.id == id
+            }
+            if (found == null) {
+                Log.i("$TAG Message sent for a conversation not yet in the list (probably was empty), adding it")
+                addChatRoom(chatRoom)
+            } else {
+                Log.i("$TAG Message sent for an existing conversation, re-order them")
+                reorderChatRooms()
+            }
         }
 
         @WorkerThread
@@ -76,7 +85,17 @@ class ConversationsListViewModel
             chatRoom: ChatRoom,
             messages: Array<out ChatMessage>
         ) {
-            reorderChatRooms()
+            val id = LinphoneUtils.getConversationId(chatRoom)
+            val found = conversations.value.orEmpty().find {
+                it.id == id
+            }
+            if (found == null) {
+                Log.i("$TAG Message(s) received for a conversation not yet in the list (probably was empty), adding it")
+                addChatRoom(chatRoom)
+            } else {
+                Log.i("$TAG Message(s) received for an existing conversation, re-order them")
+                reorderChatRooms()
+            }
         }
     }
 
@@ -170,7 +189,8 @@ class ConversationsListViewModel
         }
 
         val hideEmptyChatRooms = coreContext.core.config.getBool("misc", "hide_empty_chat_rooms", true)
-        if (hideEmptyChatRooms && chatRoom.lastMessageInHistory == null) {
+        // Hide empty chat rooms only applies to 1-1 conversations
+        if (hideEmptyChatRooms && !LinphoneUtils.isChatRoomAGroup(chatRoom) && chatRoom.lastMessageInHistory == null) {
             Log.w("$TAG Chat room with local address [${localAddress.asStringUriOnly()}] and peer address [${peerAddress.asStringUriOnly()}] is empty, not adding it to match Core setting")
             return
         }
@@ -220,11 +240,7 @@ class ConversationsListViewModel
             )
         }
 
-        showGreenToastEvent.postValue(
-            Event(
-                Pair(R.string.conversation_deleted_toast, R.drawable.chat_teardrop_text)
-            )
-        )
+        showGreenToast(R.string.conversation_deleted_toast, R.drawable.chat_teardrop_text)
     }
 
     @WorkerThread
diff --git a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/SendMessageInConversationViewModel.kt b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/SendMessageInConversationViewModel.kt
index cd9d6ccad..ecae462b5 100644
--- a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/SendMessageInConversationViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/SendMessageInConversationViewModel.kt
@@ -154,8 +154,10 @@ class SendMessageInConversationViewModel
             isFileTransferServerAvailable.postValue(!core.fileTransferServer.isNullOrEmpty())
         }
 
+        isKeyboardOpen.value = false
         isEmojiPickerOpen.value = false
         areFilePickersOpen.value = false
+        isVoiceRecording.value = false
         isPlayingVoiceRecord.value = false
         isCallConversation.value = false
         maxNumberOfAttachmentsReached.value = false
@@ -191,6 +193,7 @@ class SendMessageInConversationViewModel
 
     @UiThread
     fun configureChatRoom(room: ChatRoom) {
+        Log.i("$TAG Chat room configured")
         chatRoom = room
         coreContext.postOnCoreThread {
             chatRoom.addListener(chatRoomListener)
@@ -247,6 +250,8 @@ class SendMessageInConversationViewModel
     @UiThread
     fun sendMessage() {
         coreContext.postOnCoreThread {
+            val isBasicChatRoom: Boolean = chatRoom.hasCapability(ChatRoom.Capabilities.Basic.toInt())
+
             val messageToReplyTo = chatMessageToReplyTo
             val message = if (messageToReplyTo != null) {
                 Log.i("$TAG Sending message as reply to [${messageToReplyTo.messageId}]")
@@ -254,10 +259,12 @@ class SendMessageInConversationViewModel
             } else {
                 chatRoom.createEmptyMessage()
             }
+            var contentAdded = false
 
             val toSend = textToSend.value.orEmpty().trim()
             if (toSend.isNotEmpty()) {
                 message.addUtf8TextContent(toSend)
+                contentAdded = true
             }
 
             if (isVoiceRecording.value == true && voiceMessageRecorder.file != null) {
@@ -267,7 +274,14 @@ class SendMessageInConversationViewModel
                     Log.i(
                         "$TAG Voice recording content created, file name is ${content.name} and duration is ${content.fileDuration}"
                     )
-                    message.addContent(content)
+                    if (isBasicChatRoom && contentAdded) {
+                        val voiceMessage = chatRoom.createEmptyMessage()
+                        voiceMessage.addContent(content)
+                        voiceMessage.send()
+                    } else {
+                        message.addContent(content)
+                        contentAdded = true
+                    }
                 } else {
                     Log.e("$TAG Voice recording content couldn't be created!")
                 }
@@ -292,7 +306,14 @@ class SendMessageInConversationViewModel
                     // Let the file body handler take care of the upload
                     content.filePath = attachment.path
 
-                    message.addFileContent(content)
+                    if (isBasicChatRoom && contentAdded) {
+                        val fileMessage = chatRoom.createEmptyMessage()
+                        fileMessage.addFileContent(content)
+                        fileMessage.send()
+                    } else {
+                        message.addFileContent(content)
+                        contentAdded = true
+                    }
                 }
             }
 
@@ -318,6 +339,16 @@ class SendMessageInConversationViewModel
             attachments.postValue(attachmentsList)
 
             chatMessageToReplyTo = null
+            maxNumberOfAttachmentsReached.postValue(false)
+        }
+    }
+
+    @UiThread
+    fun notifyChatMessageIsBeingComposed() {
+        coreContext.postOnCoreThread {
+            if (::chatRoom.isInitialized) {
+                chatRoom.compose()
+            }
         }
     }
 
@@ -353,14 +384,7 @@ class SendMessageInConversationViewModel
             Log.w(
                 "$TAG Max number of attachments [$MAX_FILES_TO_ATTACH] reached, file [$file] won't be attached"
             )
-            showRedToastEvent.postValue(
-                Event(
-                    Pair(
-                        R.string.conversation_maximum_number_of_attachments_reached,
-                        R.drawable.warning_circle
-                    )
-                )
-            )
+            showRedToast(R.string.conversation_maximum_number_of_attachments_reached, R.drawable.warning_circle)
             viewModelScope.launch {
                 Log.i("$TAG Deleting temporary file [$file]")
                 FileUtils.deleteFile(file)
@@ -373,7 +397,7 @@ class SendMessageInConversationViewModel
 
         val fileName = FileUtils.getNameFromFilePath(file)
         val timestamp = System.currentTimeMillis() / 1000
-        val model = FileModel(file, fileName, 0, timestamp, false, file) { model ->
+        val model = FileModel(file, fileName, 0, timestamp, false, file, false) { model ->
             removeAttachment(model.path)
         }
 
@@ -409,7 +433,7 @@ class SendMessageInConversationViewModel
         attachments.value = list
         maxNumberOfAttachmentsReached.value = list.size >= MAX_FILES_TO_ATTACH
 
-        if (list.isEmpty) {
+        if (list.isEmpty()) {
             isFileAttachmentsListOpen.value = false
         }
     }
@@ -423,9 +447,7 @@ class SendMessageInConversationViewModel
                 Log.i("$TAG Sending forwarded message")
                 forwardedMessage.send()
 
-                showGreenToastEvent.postValue(
-                    Event(Pair(R.string.conversation_message_forwarded_toast, R.drawable.forward))
-                )
+                showGreenToast(R.string.conversation_message_forwarded_toast, R.drawable.forward)
             }
         }
     }
@@ -580,14 +602,7 @@ class SendMessageInConversationViewModel
                         "$TAG Max duration for voice recording exceeded (${maxVoiceRecordDuration}ms), stopping."
                     )
                     stopVoiceRecorder()
-                    showRedToastEvent.postValue(
-                        Event(
-                            Pair(
-                                R.string.conversation_voice_recording_max_duration_reached_toast,
-                                R.drawable.warning_circle
-                            )
-                        )
-                    )
+                    showRedToast(R.string.conversation_voice_recording_max_duration_reached_toast, R.drawable.warning_circle)
                 }
             }
         }.launchIn(viewModelScope)
@@ -652,11 +667,7 @@ class SendMessageInConversationViewModel
         val lowMediaVolume = AudioUtils.isMediaVolumeLow(context)
         if (lowMediaVolume) {
             Log.w("$TAG Media volume is low, notifying user as they may not hear voice message")
-            showRedToastEvent.postValue(
-                Event(
-                    Pair(R.string.media_playback_low_volume_warning_toast, R.drawable.speaker_slash)
-                )
-            )
+            showRedToast(R.string.media_playback_low_volume_warning_toast, R.drawable.speaker_slash)
         }
 
         if (voiceRecordAudioFocusRequest == null) {
diff --git a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/StartConversationViewModel.kt b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/StartConversationViewModel.kt
index 9ef149325..3e7c26156 100644
--- a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/StartConversationViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/StartConversationViewModel.kt
@@ -55,8 +55,8 @@ class StartConversationViewModel
         MutableLiveData<Event<Int>>()
     }
 
-    val chatRoomCreatedEvent: MutableLiveData<Event<Pair<String, String>>> by lazy {
-        MutableLiveData<Event<Pair<String, String>>>()
+    val chatRoomCreatedEvent: MutableLiveData<Event<String>> by lazy {
+        MutableLiveData<Event<String>>()
     }
 
     private val chatRoomListener = object : ChatRoomListenerStub() {
@@ -65,21 +65,14 @@ class StartConversationViewModel
             val state = chatRoom.state
             if (state == ChatRoom.State.Instantiated) return
 
-            val id = LinphoneUtils.getChatRoomId(chatRoom)
+            val id = LinphoneUtils.getConversationId(chatRoom)
             Log.i("$TAG Conversation [$id] (${chatRoom.subject}) state changed: [$state]")
 
             if (state == ChatRoom.State.Created) {
                 Log.i("$TAG Conversation [$id] successfully created")
                 chatRoom.removeListener(this)
                 operationInProgress.postValue(false)
-                chatRoomCreatedEvent.postValue(
-                    Event(
-                        Pair(
-                            chatRoom.localAddress.asStringUriOnly(),
-                            chatRoom.peerAddress.asStringUriOnly()
-                        )
-                    )
-                )
+                chatRoomCreatedEvent.postValue(Event(LinphoneUtils.getConversationId(chatRoom)))
             } else if (state == ChatRoom.State.CreationFailed) {
                 Log.e("$TAG Conversation [$id] creation has failed!")
                 chatRoom.removeListener(this)
@@ -119,6 +112,8 @@ class StartConversationViewModel
             params.isGroupEnabled = true
             params.subject = groupChatRoomSubject
             params.securityLevel = Conference.SecurityLevel.EndToEnd
+            params.account = account
+
             val chatParams = params.chatParams ?: return@postOnCoreThread
             chatParams.ephemeralLifetime = 0 // Make sure ephemeral is disabled by default
             chatParams.backend = ChatRoom.Backend.FlexisipChat
@@ -127,30 +122,18 @@ class StartConversationViewModel
             for (participant in selection.value.orEmpty()) {
                 participants.add(participant.address)
             }
-            val localAddress = account.params.identityAddress
 
             val participantsArray = arrayOf<Address>()
-            val chatRoom = core.createChatRoom(
-                params,
-                localAddress,
-                participants.toArray(participantsArray)
-            )
+            val chatRoom = core.createChatRoom(params, participants.toArray(participantsArray))
             if (chatRoom != null) {
                 if (chatParams.backend == ChatRoom.Backend.FlexisipChat) {
                     if (chatRoom.state == ChatRoom.State.Created) {
-                        val id = LinphoneUtils.getChatRoomId(chatRoom)
+                        val id = LinphoneUtils.getConversationId(chatRoom)
                         Log.i(
                             "$TAG Group conversation [$id] ($groupChatRoomSubject) has been created"
                         )
                         operationInProgress.postValue(false)
-                        chatRoomCreatedEvent.postValue(
-                            Event(
-                                Pair(
-                                    chatRoom.localAddress.asStringUriOnly(),
-                                    chatRoom.peerAddress.asStringUriOnly()
-                                )
-                            )
-                        )
+                        chatRoomCreatedEvent.postValue(Event(LinphoneUtils.getConversationId(chatRoom)))
                     } else {
                         Log.i(
                             "$TAG Conversation [$groupChatRoomSubject] isn't in Created state yet, wait for it"
@@ -158,17 +141,10 @@ class StartConversationViewModel
                         chatRoom.addListener(chatRoomListener)
                     }
                 } else {
-                    val id = LinphoneUtils.getChatRoomId(chatRoom)
+                    val id = LinphoneUtils.getConversationId(chatRoom)
                     Log.i("$TAG Conversation successfully created [$id] ($groupChatRoomSubject)")
                     operationInProgress.postValue(false)
-                    chatRoomCreatedEvent.postValue(
-                        Event(
-                            Pair(
-                                chatRoom.localAddress.asStringUriOnly(),
-                                chatRoom.peerAddress.asStringUriOnly()
-                            )
-                        )
-                    )
+                    chatRoomCreatedEvent.postValue(Event(LinphoneUtils.getConversationId(chatRoom)))
                 }
             } else {
                 Log.e("$TAG Failed to create group conversation [$groupChatRoomSubject]!")
@@ -197,18 +173,20 @@ class StartConversationViewModel
         params.isChatEnabled = true
         params.isGroupEnabled = false
         params.subject = AppUtils.getString(R.string.conversation_one_to_one_hidden_subject)
+        params.account = account
+
         val chatParams = params.chatParams ?: return
         chatParams.ephemeralLifetime = 0 // Make sure ephemeral is disabled by default
 
         val sameDomain = remote.domain == corePreferences.defaultDomain && remote.domain == account.params.domain
         if (account.params.instantMessagingEncryptionMandatory && sameDomain) {
-            Log.i("$TAG Account is in secure mode & domain matches, creating a E2E conversation")
+            Log.i("$TAG Account is in secure mode & domain matches, creating an E2E encrypted conversation")
             chatParams.backend = ChatRoom.Backend.FlexisipChat
             params.securityLevel = Conference.SecurityLevel.EndToEnd
         } else if (!account.params.instantMessagingEncryptionMandatory) {
             if (LinphoneUtils.isEndToEndEncryptedChatAvailable(core)) {
                 Log.i(
-                    "$TAG Account is in interop mode but LIME is available, creating a E2E conversation"
+                    "$TAG Account is in interop mode but LIME is available, creating an E2E encrypted conversation"
                 )
                 chatParams.backend = ChatRoom.Backend.FlexisipChat
                 params.securityLevel = Conference.SecurityLevel.EndToEnd
@@ -237,37 +215,24 @@ class StartConversationViewModel
             Log.i(
                 "$TAG No existing 1-1 conversation between local account [${localAddress?.asStringUriOnly()}] and remote [${remote.asStringUriOnly()}] was found for given parameters, let's create it"
             )
-            val chatRoom = core.createChatRoom(params, localAddress, participants)
+            val chatRoom = core.createChatRoom(params, participants)
             if (chatRoom != null) {
                 if (chatParams.backend == ChatRoom.Backend.FlexisipChat) {
-                    if (chatRoom.state == ChatRoom.State.Created) {
-                        val id = LinphoneUtils.getChatRoomId(chatRoom)
+                    val state = chatRoom.state
+                    if (state == ChatRoom.State.Created) {
+                        val id = LinphoneUtils.getConversationId(chatRoom)
                         Log.i("$TAG 1-1 conversation [$id] has been created")
                         operationInProgress.postValue(false)
-                        chatRoomCreatedEvent.postValue(
-                            Event(
-                                Pair(
-                                    chatRoom.localAddress.asStringUriOnly(),
-                                    chatRoom.peerAddress.asStringUriOnly()
-                                )
-                            )
-                        )
+                        chatRoomCreatedEvent.postValue(Event(LinphoneUtils.getConversationId(chatRoom)))
                     } else {
-                        Log.i("$TAG Conversation isn't in Created state yet, wait for it")
+                        Log.i("$TAG Conversation isn't in Created state yet (state is [$state]), wait for it")
                         chatRoom.addListener(chatRoomListener)
                     }
                 } else {
-                    val id = LinphoneUtils.getChatRoomId(chatRoom)
+                    val id = LinphoneUtils.getConversationId(chatRoom)
                     Log.i("$TAG Conversation successfully created [$id]")
                     operationInProgress.postValue(false)
-                    chatRoomCreatedEvent.postValue(
-                        Event(
-                            Pair(
-                                chatRoom.localAddress.asStringUriOnly(),
-                                chatRoom.peerAddress.asStringUriOnly()
-                            )
-                        )
-                    )
+                    chatRoomCreatedEvent.postValue(Event(LinphoneUtils.getConversationId(chatRoom)))
                 }
             } else {
                 Log.e("$TAG Failed to create 1-1 conversation with [${remote.asStringUriOnly()}]!")
@@ -281,14 +246,7 @@ class StartConversationViewModel
                 "$TAG A 1-1 conversation between local account [${localAddress?.asStringUriOnly()}] and remote [${remote.asStringUriOnly()}] for given parameters already exists!"
             )
             operationInProgress.postValue(false)
-            chatRoomCreatedEvent.postValue(
-                Event(
-                    Pair(
-                        existingChatRoom.localAddress.asStringUriOnly(),
-                        existingChatRoom.peerAddress.asStringUriOnly()
-                    )
-                )
-            )
+            chatRoomCreatedEvent.postValue(Event(LinphoneUtils.getConversationId(existingChatRoom)))
         }
     }
 
diff --git a/app/src/main/java/org/linphone/ui/main/contacts/fragment/ContactFragment.kt b/app/src/main/java/org/linphone/ui/main/contacts/fragment/ContactFragment.kt
index 0ee9a3b82..7b6901abc 100644
--- a/app/src/main/java/org/linphone/ui/main/contacts/fragment/ContactFragment.kt
+++ b/app/src/main/java/org/linphone/ui/main/contacts/fragment/ContactFragment.kt
@@ -24,7 +24,6 @@ import android.content.ClipData
 import android.content.ClipboardManager
 import android.content.Context
 import android.content.Intent
-import android.net.Uri
 import android.os.Bundle
 import android.provider.ContactsContract
 import android.view.LayoutInflater
@@ -52,6 +51,7 @@ import org.linphone.utils.AppUtils
 import org.linphone.utils.ConfirmationDialogModel
 import org.linphone.utils.DialogUtils
 import org.linphone.utils.Event
+import androidx.core.net.toUri
 
 @UiThread
 class ContactFragment : SlidingPaneChildFragment() {
@@ -171,7 +171,7 @@ class ContactFragment : SlidingPaneChildFragment() {
         viewModel.openNativeContactEditor.observe(viewLifecycleOwner) {
             it.consume { uri ->
                 val editIntent = Intent(Intent.ACTION_EDIT).apply {
-                    setDataAndType(Uri.parse(uri), ContactsContract.Contacts.CONTENT_ITEM_TYPE)
+                    setDataAndType(uri.toUri(), ContactsContract.Contacts.CONTENT_ITEM_TYPE)
                     putExtra("finishActivityOnSaveCompleted", true)
                 }
                 startActivity(editIntent)
@@ -188,9 +188,9 @@ class ContactFragment : SlidingPaneChildFragment() {
         }
 
         viewModel.goToConversationEvent.observe(viewLifecycleOwner) {
-            it.consume { pair ->
-                Log.i("$TAG Going to conversation [${pair.first}][${pair.second}]")
-                sharedViewModel.showConversationEvent.value = Event(pair)
+            it.consume { conversationId ->
+                Log.i("$TAG Going to conversation [$conversationId]")
+                sharedViewModel.showConversationEvent.value = Event(conversationId)
                 sharedViewModel.navigateToConversationsEvent.value = Event(true)
             }
         }
@@ -287,7 +287,7 @@ class ContactFragment : SlidingPaneChildFragment() {
         )
         val smsIntent: Intent = Intent().apply {
             action = Intent.ACTION_SENDTO
-            data = Uri.parse("smsto:$number")
+            data = "smsto:$number".toUri()
             putExtra("address", number)
             putExtra("sms_body", smsBody)
         }
@@ -319,7 +319,7 @@ class ContactFragment : SlidingPaneChildFragment() {
 
     private fun showConfirmTrustCallDialog(contactName: String, deviceSipUri: String) {
         val label = AppUtils.getFormattedString(
-            org.linphone.R.string.contact_dialog_increase_trust_level_message,
+            R.string.contact_dialog_increase_trust_level_message,
             contactName,
             deviceSipUri
         )
diff --git a/app/src/main/java/org/linphone/ui/main/contacts/model/ContactAvatarModel.kt b/app/src/main/java/org/linphone/ui/main/contacts/model/ContactAvatarModel.kt
index c8bba4e4a..f835624e0 100644
--- a/app/src/main/java/org/linphone/ui/main/contacts/model/ContactAvatarModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/contacts/model/ContactAvatarModel.kt
@@ -35,6 +35,7 @@ import org.linphone.core.SecurityLevel
 import org.linphone.core.tools.Log
 import org.linphone.utils.AppUtils
 import org.linphone.utils.TimestampUtils
+import androidx.core.net.toUri
 
 class ContactAvatarModel
     @WorkerThread
@@ -151,7 +152,7 @@ class ContactAvatarModel
     private fun getAvatarUri(friend: Friend): Uri? {
         val picturePath = friend.photo
         if (!picturePath.isNullOrEmpty()) {
-            return Uri.parse(picturePath)
+            return picturePath.toUri()
         }
 
         val refKey = friend.refKey
diff --git a/app/src/main/java/org/linphone/ui/main/contacts/model/ContactNumberOrAddressModel.kt b/app/src/main/java/org/linphone/ui/main/contacts/model/ContactNumberOrAddressModel.kt
index ffb1d8b80..eeb397e8f 100644
--- a/app/src/main/java/org/linphone/ui/main/contacts/model/ContactNumberOrAddressModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/contacts/model/ContactNumberOrAddressModel.kt
@@ -39,15 +39,24 @@ class ContactNumberOrAddressModel
 ) {
     val selected = MutableLiveData<Boolean>()
 
+    private var actionDoneCallback: (() -> Unit)? = null
+
+    @UiThread
+    fun setActionDoneCallback(lambda: () -> Unit) {
+        actionDoneCallback = lambda
+    }
+
     @UiThread
     fun onClicked() {
         listener.onClicked(this)
+        actionDoneCallback?.invoke()
     }
 
     @UiThread
     fun onLongPress(): Boolean {
         selected.value = true
         listener.onLongPress(this)
+        actionDoneCallback?.invoke()
         return true
     }
 }
diff --git a/app/src/main/java/org/linphone/ui/main/contacts/model/NumberOrAddressPickerDialogModel.kt b/app/src/main/java/org/linphone/ui/main/contacts/model/NumberOrAddressPickerDialogModel.kt
index cecf31c79..ff4d21558 100644
--- a/app/src/main/java/org/linphone/ui/main/contacts/model/NumberOrAddressPickerDialogModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/contacts/model/NumberOrAddressPickerDialogModel.kt
@@ -33,6 +33,11 @@ class NumberOrAddressPickerDialogModel
     val dismissEvent = MutableLiveData<Event<Boolean>>()
 
     init {
+        for (model in list) {
+            model.setActionDoneCallback {
+                dismiss()
+            }
+        }
         sipAddressesAndPhoneNumbers.value = list
     }
 
diff --git a/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactNewOrEditViewModel.kt b/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactNewOrEditViewModel.kt
index 6a82e7d5c..05aecb53a 100644
--- a/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactNewOrEditViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactNewOrEditViewModel.kt
@@ -19,7 +19,6 @@
  */
 package org.linphone.ui.main.contacts.viewmodel
 
-import android.net.Uri
 import androidx.annotation.AnyThread
 import androidx.annotation.UiThread
 import androidx.annotation.WorkerThread
@@ -42,6 +41,7 @@ import org.linphone.ui.GenericViewModel
 import org.linphone.ui.main.contacts.model.NewOrEditNumberOrAddressModel
 import org.linphone.utils.Event
 import org.linphone.utils.FileUtils
+import androidx.core.net.toUri
 
 class ContactNewOrEditViewModel
     @UiThread
@@ -145,14 +145,7 @@ class ContactNewOrEditViewModel
         val organization = company.value.orEmpty().trim()
         if (fn.isEmpty() && ln.isEmpty() && organization.isEmpty()) {
             Log.e("$TAG At least a mandatory field wasn't filled, aborting save")
-            showRedToastEvent.postValue(
-                Event(
-                    Pair(
-                        R.string.contact_editor_mandatory_field_not_filled_toast,
-                        R.drawable.warning_circle
-                    )
-                )
-            )
+            showRedToast(R.string.contact_editor_mandatory_field_not_filled_toast, R.drawable.warning_circle)
             return
         }
 
@@ -190,7 +183,7 @@ class ContactNewOrEditViewModel
                             isImage = true,
                             overrideExisting = true
                         )
-                        val oldFile = Uri.parse(FileUtils.getProperFilePath(picture))
+                        val oldFile = FileUtils.getProperFilePath(picture).toUri()
                         viewModelScope.launch {
                             FileUtils.copyFile(oldFile, newFile)
                         }
diff --git a/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactViewModel.kt b/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactViewModel.kt
index 71796e3fb..7cbb7090e 100644
--- a/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactViewModel.kt
@@ -117,8 +117,8 @@ class ContactViewModel
         MutableLiveData<Event<String>>()
     }
 
-    val goToConversationEvent: MutableLiveData<Event<Pair<String, String>>> by lazy {
-        MutableLiveData<Event<Pair<String, String>>>()
+    val goToConversationEvent: MutableLiveData<Event<String>> by lazy {
+        MutableLiveData<Event<String>>()
     }
 
     val vCardTerminatedEvent: MutableLiveData<Event<Pair<String, File>>> by lazy {
@@ -198,21 +198,14 @@ class ContactViewModel
             val state = chatRoom.state
             if (state == ChatRoom.State.Instantiated) return
 
-            val id = LinphoneUtils.getChatRoomId(chatRoom)
+            val id = LinphoneUtils.getConversationId(chatRoom)
             Log.i("$TAG Conversation [$id] (${chatRoom.subject}) state changed: [$state]")
 
             if (state == ChatRoom.State.Created) {
                 Log.i("$TAG Conversation [$id] successfully created")
                 chatRoom.removeListener(this)
                 operationInProgress.postValue(false)
-                goToConversationEvent.postValue(
-                    Event(
-                        Pair(
-                            chatRoom.localAddress.asStringUriOnly(),
-                            chatRoom.peerAddress.asStringUriOnly()
-                        )
-                    )
-                )
+                goToConversationEvent.postValue(Event(LinphoneUtils.getConversationId(chatRoom)))
             } else if (state == ChatRoom.State.CreationFailed) {
                 Log.e("$TAG Conversation [$id] creation has failed!")
                 chatRoom.removeListener(this)
@@ -506,20 +499,22 @@ class ContactViewModel
             params.isChatEnabled = true
             params.isGroupEnabled = false
             params.subject = AppUtils.getString(R.string.conversation_one_to_one_hidden_subject)
+            params.account = account
+
             val chatParams = params.chatParams ?: return
             chatParams.ephemeralLifetime = 0 // Make sure ephemeral is disabled by default
 
             val sameDomain = remote.domain == corePreferences.defaultDomain && remote.domain == account.params.domain
             if (account.params.instantMessagingEncryptionMandatory && sameDomain) {
                 Log.i(
-                    "$TAG Account is in secure mode & domain matches, creating a E2E conversation"
+                    "$TAG Account is in secure mode & domain matches, creating an E2E encrypted conversation"
                 )
                 chatParams.backend = ChatRoom.Backend.FlexisipChat
                 params.securityLevel = Conference.SecurityLevel.EndToEnd
             } else if (!account.params.instantMessagingEncryptionMandatory) {
                 if (LinphoneUtils.isEndToEndEncryptedChatAvailable(core)) {
                     Log.i(
-                        "$TAG Account is in interop mode but LIME is available, creating a E2E conversation"
+                        "$TAG Account is in interop mode but LIME is available, creating an E2E encrypted conversation"
                     )
                     chatParams.backend = ChatRoom.Backend.FlexisipChat
                     params.securityLevel = Conference.SecurityLevel.EndToEnd
@@ -543,49 +538,33 @@ class ContactViewModel
             val existingChatRoom = core.searchChatRoom(params, localAddress, null, participants)
             if (existingChatRoom != null) {
                 Log.i(
-                    "$TAG Found existing conversation [${LinphoneUtils.getChatRoomId(
+                    "$TAG Found existing conversation [${LinphoneUtils.getConversationId(
                         existingChatRoom
                     )}], going to it"
                 )
-                goToConversationEvent.postValue(
-                    Event(Pair(localSipUri, existingChatRoom.peerAddress.asStringUriOnly()))
-                )
+                goToConversationEvent.postValue(Event(LinphoneUtils.getConversationId(existingChatRoom)))
             } else {
                 Log.i(
                     "$TAG No existing conversation between [$localSipUri] and [$remoteSipUri] was found, let's create it"
                 )
                 operationInProgress.postValue(true)
-                val chatRoom = core.createChatRoom(params, localAddress, participants)
+                val chatRoom = core.createChatRoom(params, participants)
                 if (chatRoom != null) {
                     if (chatParams.backend == ChatRoom.Backend.FlexisipChat) {
                         if (chatRoom.state == ChatRoom.State.Created) {
-                            val id = LinphoneUtils.getChatRoomId(chatRoom)
+                            val id = LinphoneUtils.getConversationId(chatRoom)
                             Log.i("$TAG 1-1 conversation [$id] has been created")
                             operationInProgress.postValue(false)
-                            goToConversationEvent.postValue(
-                                Event(
-                                    Pair(
-                                        chatRoom.localAddress.asStringUriOnly(),
-                                        chatRoom.peerAddress.asStringUriOnly()
-                                    )
-                                )
-                            )
+                            goToConversationEvent.postValue(Event(LinphoneUtils.getConversationId(chatRoom)))
                         } else {
                             Log.i("$TAG Conversation isn't in Created state yet, wait for it")
                             chatRoom.addListener(chatRoomListener)
                         }
                     } else {
-                        val id = LinphoneUtils.getChatRoomId(chatRoom)
+                        val id = LinphoneUtils.getConversationId(chatRoom)
                         Log.i("$TAG Conversation successfully created [$id]")
                         operationInProgress.postValue(false)
-                        goToConversationEvent.postValue(
-                            Event(
-                                Pair(
-                                    chatRoom.localAddress.asStringUriOnly(),
-                                    chatRoom.peerAddress.asStringUriOnly()
-                                )
-                            )
-                        )
+                        goToConversationEvent.postValue(Event(LinphoneUtils.getConversationId(chatRoom)))
                     }
                 } else {
                     Log.e(
diff --git a/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactsListViewModel.kt b/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactsListViewModel.kt
index a42e96482..13b28858f 100644
--- a/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactsListViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactsListViewModel.kt
@@ -242,9 +242,7 @@ class ContactsListViewModel
             coreContext.contactsManager.contactRemoved(contactModel.friend)
             contactModel.friend.remove()
             coreContext.contactsManager.notifyContactsListChanged()
-            showGreenToastEvent.postValue(
-                Event(Pair(R.string.contact_deleted_toast, R.drawable.warning_circle))
-            )
+            showGreenToast(R.string.contact_deleted_toast, R.drawable.warning_circle)
         }
     }
 
diff --git a/app/src/main/java/org/linphone/ui/main/fragment/DrawerMenuFragment.kt b/app/src/main/java/org/linphone/ui/main/fragment/DrawerMenuFragment.kt
index 9c120afd1..067a35ea0 100644
--- a/app/src/main/java/org/linphone/ui/main/fragment/DrawerMenuFragment.kt
+++ b/app/src/main/java/org/linphone/ui/main/fragment/DrawerMenuFragment.kt
@@ -20,7 +20,6 @@
 package org.linphone.ui.main.fragment
 
 import android.content.Intent
-import android.net.Uri
 import android.os.Bundle
 import android.view.Gravity
 import android.view.LayoutInflater
@@ -46,6 +45,7 @@ import org.linphone.ui.assistant.AssistantActivity
 import org.linphone.ui.main.MainActivity
 import org.linphone.ui.main.settings.fragment.AccountProfileFragmentDirections
 import org.linphone.ui.main.viewmodel.DrawerMenuViewModel
+import androidx.core.net.toUri
 
 @UiThread
 class DrawerMenuFragment : GenericMainFragment() {
@@ -146,7 +146,7 @@ class DrawerMenuFragment : GenericMainFragment() {
         viewModel.openLinkInBrowserEvent.observe(viewLifecycleOwner) {
             it.consume { link ->
                 try {
-                    val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse(link))
+                    val browserIntent = Intent(Intent.ACTION_VIEW, link.toUri())
                     startActivity(browserIntent)
                 } catch (ise: IllegalStateException) {
                     Log.e(
diff --git a/app/src/main/java/org/linphone/ui/main/fragment/GenericAddressPickerFragment.kt b/app/src/main/java/org/linphone/ui/main/fragment/GenericAddressPickerFragment.kt
index 65bebfd45..23c599f57 100644
--- a/app/src/main/java/org/linphone/ui/main/fragment/GenericAddressPickerFragment.kt
+++ b/app/src/main/java/org/linphone/ui/main/fragment/GenericAddressPickerFragment.kt
@@ -167,7 +167,7 @@ abstract class GenericAddressPickerFragment : GenericMainFragment() {
         coreContext.postOnCoreThread { core ->
             val friend = model.friend
             if (friend == null) {
-                Log.i("$TAG Friend is null, using address [${model.address}]")
+                Log.i("$TAG Friend is null, using address [${model.address.asStringUriOnly()}]")
                 val fakeFriend = core.createFriend()
                 fakeFriend.addAddress(model.address)
                 onAddressSelected(model.address, fakeFriend)
diff --git a/app/src/main/java/org/linphone/ui/main/help/fragment/DebugFragment.kt b/app/src/main/java/org/linphone/ui/main/help/fragment/DebugFragment.kt
index 06dcf1ec3..d2c85be68 100644
--- a/app/src/main/java/org/linphone/ui/main/help/fragment/DebugFragment.kt
+++ b/app/src/main/java/org/linphone/ui/main/help/fragment/DebugFragment.kt
@@ -39,10 +39,6 @@ import org.linphone.ui.main.fragment.GenericMainFragment
 import org.linphone.ui.main.help.viewmodel.HelpViewModel
 
 class DebugFragment : GenericMainFragment() {
-    companion object {
-        private const val TAG = "[Debug Fragment]"
-    }
-
     private lateinit var binding: HelpDebugFragmentBinding
 
     val viewModel: HelpViewModel by navGraphViewModels(
diff --git a/app/src/main/java/org/linphone/ui/main/help/fragment/HelpFragment.kt b/app/src/main/java/org/linphone/ui/main/help/fragment/HelpFragment.kt
index 1477cbee4..8111b60e7 100644
--- a/app/src/main/java/org/linphone/ui/main/help/fragment/HelpFragment.kt
+++ b/app/src/main/java/org/linphone/ui/main/help/fragment/HelpFragment.kt
@@ -20,7 +20,6 @@
 package org.linphone.ui.main.help.fragment
 
 import android.content.Intent
-import android.net.Uri
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -36,6 +35,7 @@ import org.linphone.ui.main.fragment.GenericMainFragment
 import org.linphone.ui.main.help.viewmodel.HelpViewModel
 import org.linphone.utils.ConfirmationDialogModel
 import org.linphone.utils.DialogUtils
+import androidx.core.net.toUri
 
 @UiThread
 class HelpFragment : GenericMainFragment() {
@@ -78,7 +78,7 @@ class HelpFragment : GenericMainFragment() {
         binding.setPrivacyPolicyClickListener {
             val url = getString(R.string.website_privacy_policy_url)
             try {
-                val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse(url))
+                val browserIntent = Intent(Intent.ACTION_VIEW, url.toUri())
                 startActivity(browserIntent)
             } catch (ise: IllegalStateException) {
                 Log.e(
@@ -90,7 +90,7 @@ class HelpFragment : GenericMainFragment() {
         binding.setLicensesClickListener {
             val url = getString(R.string.website_open_source_licences_usage_url)
             try {
-                val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse(url))
+                val browserIntent = Intent(Intent.ACTION_VIEW, url.toUri())
                 startActivity(browserIntent)
             } catch (ise: IllegalStateException) {
                 Log.e(
@@ -102,7 +102,7 @@ class HelpFragment : GenericMainFragment() {
         binding.setTranslateClickListener {
             val url = getString(R.string.website_translate_weblate_url)
             try {
-                val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse(url))
+                val browserIntent = Intent(Intent.ACTION_VIEW, url.toUri())
                 startActivity(browserIntent)
             } catch (ise: IllegalStateException) {
                 Log.e(
@@ -157,7 +157,7 @@ class HelpFragment : GenericMainFragment() {
         model.confirmEvent.observe(viewLifecycleOwner) {
             it.consume {
                 try {
-                    val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse(url))
+                    val browserIntent = Intent(Intent.ACTION_VIEW, url.toUri())
                     startActivity(browserIntent)
                 } catch (ise: IllegalStateException) {
                     Log.e(
diff --git a/app/src/main/java/org/linphone/ui/main/history/fragment/HistoryFragment.kt b/app/src/main/java/org/linphone/ui/main/history/fragment/HistoryFragment.kt
index 2d93de4e9..f1f243516 100644
--- a/app/src/main/java/org/linphone/ui/main/history/fragment/HistoryFragment.kt
+++ b/app/src/main/java/org/linphone/ui/main/history/fragment/HistoryFragment.kt
@@ -148,23 +148,20 @@ class HistoryFragment : SlidingPaneChildFragment() {
         }
 
         viewModel.goToConversationEvent.observe(viewLifecycleOwner) {
-            it.consume { pair ->
-                Log.i("$TAG Going to conversation [${pair.first}][${pair.second}]")
-                sharedViewModel.showConversationEvent.value = Event(pair)
+            it.consume { conversationId ->
+                Log.i("$TAG Going to conversation [$conversationId]")
+                sharedViewModel.showConversationEvent.value = Event(conversationId)
                 sharedViewModel.navigateToConversationsEvent.value = Event(true)
             }
         }
 
         viewModel.goToMeetingConversationEvent.observe(viewLifecycleOwner) {
-            it.consume { pair ->
-                val localAddress = pair.first
-                val remoteAddress = pair.second
+            it.consume { conversationId ->
                 if (findNavController().currentDestination?.id == R.id.historyFragment) {
-                    Log.i("$TAG Going to meeting conversation [$localAddress][$remoteAddress]")
+                    Log.i("$TAG Going to meeting conversation [$conversationId]")
                     val action =
                         HistoryFragmentDirections.actionHistoryFragmentToConferenceConversationFragment(
-                            localAddress,
-                            remoteAddress
+                            conversationId
                         )
                     findNavController().navigate(action)
                 }
diff --git a/app/src/main/java/org/linphone/ui/main/history/fragment/StartCallFragment.kt b/app/src/main/java/org/linphone/ui/main/history/fragment/StartCallFragment.kt
index e5dffd716..c4b7b163c 100644
--- a/app/src/main/java/org/linphone/ui/main/history/fragment/StartCallFragment.kt
+++ b/app/src/main/java/org/linphone/ui/main/history/fragment/StartCallFragment.kt
@@ -120,7 +120,11 @@ class StartCallFragment : GenericAddressPickerFragment() {
 
         viewModel.leaveFragmentEvent.observe(viewLifecycleOwner) {
             it.consume {
-                goBack()
+                // Post on main thread to allow for main activity to be resumed
+                coreContext.postOnMainThread {
+                    Log.i("$TAG Going back")
+                    goBack()
+                }
             }
         }
 
diff --git a/app/src/main/java/org/linphone/ui/main/history/viewmodel/HistoryListViewModel.kt b/app/src/main/java/org/linphone/ui/main/history/viewmodel/HistoryListViewModel.kt
index 13ed58d57..c5fd7304c 100644
--- a/app/src/main/java/org/linphone/ui/main/history/viewmodel/HistoryListViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/history/viewmodel/HistoryListViewModel.kt
@@ -144,8 +144,8 @@ class HistoryListViewModel
         val account = LinphoneUtils.getDefaultAccount()
         val logs = account?.callLogs ?: coreContext.core.callLogs
         for (callLog in logs) {
-            if (callLog.remoteAddress.asStringUriOnly().contains(filter)) {
-                val model = CallLogModel(callLog)
+            val model = CallLogModel(callLog)
+            if (isCallLogMatchingFilter(model, filter)) {
                 list.add(model)
                 count += 1
             }
@@ -158,4 +158,12 @@ class HistoryListViewModel
         Log.i("$TAG Fetched [${list.size}] call log(s)")
         callLogs.postValue(list)
     }
+
+    @WorkerThread
+    private fun isCallLogMatchingFilter(model: CallLogModel, filter: String): Boolean {
+        if (filter.isEmpty()) return true
+
+        val friendName = model.avatarModel.friend.name ?: LinphoneUtils.getDisplayName(model.address)
+        return friendName.contains(filter, ignoreCase = true) || model.address.asStringUriOnly().contains(filter, ignoreCase = true)
+    }
 }
diff --git a/app/src/main/java/org/linphone/ui/main/history/viewmodel/HistoryViewModel.kt b/app/src/main/java/org/linphone/ui/main/history/viewmodel/HistoryViewModel.kt
index 2e8804040..9f51fd231 100644
--- a/app/src/main/java/org/linphone/ui/main/history/viewmodel/HistoryViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/history/viewmodel/HistoryViewModel.kt
@@ -69,12 +69,12 @@ class HistoryViewModel
         MutableLiveData<Event<Int>>()
     }
 
-    val goToMeetingConversationEvent: MutableLiveData<Event<Pair<String, String>>> by lazy {
-        MutableLiveData<Event<Pair<String, String>>>()
+    val goToMeetingConversationEvent: MutableLiveData<Event<String>> by lazy {
+        MutableLiveData<Event<String>>()
     }
 
-    val goToConversationEvent: MutableLiveData<Event<Pair<String, String>>> by lazy {
-        MutableLiveData<Event<Pair<String, String>>>()
+    val goToConversationEvent: MutableLiveData<Event<String>> by lazy {
+        MutableLiveData<Event<String>>()
     }
 
     val conferenceToJoinEvent: MutableLiveData<Event<String>> by lazy {
@@ -111,21 +111,14 @@ class HistoryViewModel
             val state = chatRoom.state
             if (state == ChatRoom.State.Instantiated) return
 
-            val id = LinphoneUtils.getChatRoomId(chatRoom)
+            val id = LinphoneUtils.getConversationId(chatRoom)
             Log.i("$TAG Conversation [$id] (${chatRoom.subject}) state changed: [$state]")
 
             if (state == ChatRoom.State.Created) {
                 Log.i("$TAG Conversation [$id] successfully created")
                 chatRoom.removeListener(this)
                 operationInProgress.postValue(false)
-                goToConversationEvent.postValue(
-                    Event(
-                        Pair(
-                            chatRoom.localAddress.asStringUriOnly(),
-                            chatRoom.peerAddress.asStringUriOnly()
-                        )
-                    )
-                )
+                goToConversationEvent.postValue(Event(LinphoneUtils.getConversationId(chatRoom)))
             } else if (state == ChatRoom.State.CreationFailed) {
                 Log.e("$TAG Conversation [$id] creation has failed!")
                 chatRoom.removeListener(this)
@@ -212,14 +205,7 @@ class HistoryViewModel
         coreContext.postOnCoreThread {
             val chatRoom = meetingChatRoom
             if (chatRoom != null) {
-                goToMeetingConversationEvent.postValue(
-                    Event(
-                        Pair(
-                            chatRoom.localAddress.asStringUriOnly(),
-                            chatRoom.peerAddress.asStringUriOnly()
-                        )
-                    )
-                )
+                goToMeetingConversationEvent.postValue(Event(LinphoneUtils.getConversationId(chatRoom)))
             } else {
                 Log.e("$TAG Failed to find chat room for current call log!")
             }
@@ -242,20 +228,22 @@ class HistoryViewModel
                 params.isChatEnabled = true
                 params.isGroupEnabled = false
                 params.subject = AppUtils.getString(R.string.conversation_one_to_one_hidden_subject)
+                params.account = account
+
                 val chatParams = params.chatParams ?: return@postOnCoreThread
                 chatParams.ephemeralLifetime = 0 // Make sure ephemeral is disabled by default
 
                 val sameDomain = remote.domain == corePreferences.defaultDomain && remote.domain == account.params.domain
                 if (account.params.instantMessagingEncryptionMandatory && sameDomain) {
                     Log.i(
-                        "$TAG Account is in secure mode & domain matches, creating a E2E conversation"
+                        "$TAG Account is in secure mode & domain matches, creating an E2E encrypted conversation"
                     )
                     chatParams.backend = ChatRoom.Backend.FlexisipChat
                     params.securityLevel = Conference.SecurityLevel.EndToEnd
                 } else if (!account.params.instantMessagingEncryptionMandatory) {
                     if (LinphoneUtils.isEndToEndEncryptedChatAvailable(core)) {
                         Log.i(
-                            "$TAG Account is in interop mode but LIME is available, creating a E2E conversation"
+                            "$TAG Account is in interop mode but LIME is available, creating an E2E encrypted conversation"
                         )
                         chatParams.backend = ChatRoom.Backend.FlexisipChat
                         params.securityLevel = Conference.SecurityLevel.EndToEnd
@@ -279,49 +267,33 @@ class HistoryViewModel
                 val existingChatRoom = core.searchChatRoom(params, localAddress, null, participants)
                 if (existingChatRoom != null) {
                     Log.i(
-                        "$TAG Found existing conversation [${LinphoneUtils.getChatRoomId(
+                        "$TAG Found existing conversation [${LinphoneUtils.getConversationId(
                             existingChatRoom
                         )}], going to it"
                     )
-                    goToConversationEvent.postValue(
-                        Event(Pair(localSipUri, existingChatRoom.peerAddress.asStringUriOnly()))
-                    )
+                    goToConversationEvent.postValue(Event(LinphoneUtils.getConversationId(existingChatRoom)))
                 } else {
                     Log.i(
                         "$TAG No existing conversation between [$localSipUri] and [$remoteSipUri] was found, let's create it"
                     )
                     operationInProgress.postValue(true)
-                    val chatRoom = core.createChatRoom(params, localAddress, participants)
+                    val chatRoom = core.createChatRoom(params, participants)
                     if (chatRoom != null) {
                         if (chatParams.backend == ChatRoom.Backend.FlexisipChat) {
                             if (chatRoom.state == ChatRoom.State.Created) {
-                                val id = LinphoneUtils.getChatRoomId(chatRoom)
+                                val id = LinphoneUtils.getConversationId(chatRoom)
                                 Log.i("$TAG 1-1 conversation [$id] has been created")
                                 operationInProgress.postValue(false)
-                                goToConversationEvent.postValue(
-                                    Event(
-                                        Pair(
-                                            chatRoom.localAddress.asStringUriOnly(),
-                                            chatRoom.peerAddress.asStringUriOnly()
-                                        )
-                                    )
-                                )
+                                goToConversationEvent.postValue(Event(LinphoneUtils.getConversationId(chatRoom)))
                             } else {
                                 Log.i("$TAG Conversation isn't in Created state yet, wait for it")
                                 chatRoom.addListener(chatRoomListener)
                             }
                         } else {
-                            val id = LinphoneUtils.getChatRoomId(chatRoom)
+                            val id = LinphoneUtils.getConversationId(chatRoom)
                             Log.i("$TAG Conversation successfully created [$id]")
                             operationInProgress.postValue(false)
-                            goToConversationEvent.postValue(
-                                Event(
-                                    Pair(
-                                        chatRoom.localAddress.asStringUriOnly(),
-                                        chatRoom.peerAddress.asStringUriOnly()
-                                    )
-                                )
-                            )
+                            goToConversationEvent.postValue(Event(LinphoneUtils.getConversationId(chatRoom)))
                         }
                     } else {
                         Log.e(
diff --git a/app/src/main/java/org/linphone/ui/main/history/viewmodel/StartCallViewModel.kt b/app/src/main/java/org/linphone/ui/main/history/viewmodel/StartCallViewModel.kt
index 8c284e7ce..b19f385ea 100644
--- a/app/src/main/java/org/linphone/ui/main/history/viewmodel/StartCallViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/history/viewmodel/StartCallViewModel.kt
@@ -84,8 +84,14 @@ class StartCallViewModel
         @WorkerThread
         override fun onStateChanged(conference: Conference, newState: Conference.State?) {
             Log.i("$TAG Conference state changed [$newState]")
-            if (newState == Conference.State.Created || newState == Conference.State.CreationFailed) {
-                operationInProgress.postValue(false)
+            when (newState) {
+                Conference.State.Created, Conference.State.CreationFailed, Conference.State.TerminationPending -> {
+                    operationInProgress.postValue(false)
+                }
+                Conference.State.Terminated -> {
+                     leaveFragmentEvent.postValue(Event(true))
+                }
+                else -> {}
             }
         }
     }
@@ -149,9 +155,9 @@ class StartCallViewModel
     @UiThread
     fun updateGroupCallButtonVisibility() {
         coreContext.postOnCoreThread { core ->
-            val hideGroupCall = corePreferences.disableMeetings || !LinphoneUtils.isRemoteConferencingAvailable(
-                core
-            )
+            val hideGroupCall = corePreferences.disableMeetings ||
+                !LinphoneUtils.isRemoteConferencingAvailable(core) ||
+                core.callsNb > 0
             hideGroupCallButton.postValue(hideGroupCall)
         }
     }
@@ -187,14 +193,7 @@ class StartCallViewModel
             val conference = LinphoneUtils.createGroupCall(account, subject.value.orEmpty())
             if (conference == null) {
                 Log.e("$TAG Failed to create group call!")
-                showRedToastEvent.postValue(
-                    Event(
-                        Pair(
-                            R.string.conference_failed_to_create_group_call_toast,
-                            R.drawable.warning_circle
-                        )
-                    )
-                )
+                showRedToast(R.string.conference_failed_to_create_group_call_toast, R.drawable.warning_circle)
                 operationInProgress.postValue(false)
                 return@postOnCoreThread
             }
@@ -215,14 +214,7 @@ class StartCallViewModel
             conference.addListener(conferenceListener)
             if (conference.inviteParticipants(participants, callParams) != 0) {
                 Log.e("$TAG Failed to invite participants into group call!")
-                showRedToastEvent.postValue(
-                    Event(
-                        Pair(
-                            R.string.conference_failed_to_create_group_call_toast,
-                            R.drawable.warning_circle
-                        )
-                    )
-                )
+                showRedToast(R.string.conference_failed_to_create_group_call_toast, R.drawable.warning_circle)
                 operationInProgress.postValue(false)
             }
         }
diff --git a/app/src/main/java/org/linphone/ui/main/meetings/fragment/MeetingFragment.kt b/app/src/main/java/org/linphone/ui/main/meetings/fragment/MeetingFragment.kt
index e254da21f..12a7bc163 100644
--- a/app/src/main/java/org/linphone/ui/main/meetings/fragment/MeetingFragment.kt
+++ b/app/src/main/java/org/linphone/ui/main/meetings/fragment/MeetingFragment.kt
@@ -198,7 +198,7 @@ class MeetingFragment : SlidingPaneChildFragment() {
 
         viewModel.conferenceCancelledEvent.observe(viewLifecycleOwner) {
             it.consume {
-                Log.i("$TAG Meeting has been cancelled successfully, deleting it")
+                Log.i("$TAG Meeting has been cancelled successfully")
                 (requireActivity() as GenericActivity).showGreenToast(
                     getString(R.string.meeting_info_cancelled_toast),
                     R.drawable.trash_simple
@@ -222,11 +222,15 @@ class MeetingFragment : SlidingPaneChildFragment() {
             true
         )
 
+        val isUserOrganizer = viewModel.isEditable.value == true && viewModel.isCancelled.value == false
+        popupView.cancelInsteadOfDelete = isUserOrganizer
         popupView.setDeleteClickListener {
-            if (viewModel.isEditable.value == true) {
+            if (isUserOrganizer) {
+                // In case we are organizer of the meeting, ask user confirmation before cancelling it
                 showCancelMeetingDialog()
             } else {
-                viewModel.delete()
+                // If we're not organizer, ask user confirmation of removing itself from participants & deleting it locally
+                showDeleteMeetingDialog()
             }
             popupWindow.dismiss()
         }
@@ -283,8 +287,7 @@ class MeetingFragment : SlidingPaneChildFragment() {
     }
 
     private fun showCancelMeetingDialog() {
-        Log.i("$TAG Meeting is editable, asking whether to cancel it or not before deleting it")
-
+        Log.i("$TAG Meeting is editable, asking whether to cancel it or not")
         val model = ConfirmationDialogModel()
         val dialog = DialogUtils.getCancelMeetingDialog(requireContext(), model)
 
@@ -296,7 +299,6 @@ class MeetingFragment : SlidingPaneChildFragment() {
 
         model.cancelEvent.observe(viewLifecycleOwner) {
             it.consume {
-                viewModel.delete()
                 dialog.dismiss()
             }
         }
@@ -310,4 +312,31 @@ class MeetingFragment : SlidingPaneChildFragment() {
 
         dialog.show()
     }
+
+    private fun showDeleteMeetingDialog() {
+        Log.i("$TAG Meeting is not editable or already cancelled, asking whether to delete it or not")
+        val model = ConfirmationDialogModel()
+        val dialog = DialogUtils.getDeleteMeetingDialog(requireContext(), model)
+
+        model.dismissEvent.observe(viewLifecycleOwner) {
+            it.consume {
+                dialog.dismiss()
+            }
+        }
+
+        model.cancelEvent.observe(viewLifecycleOwner) {
+            it.consume {
+                dialog.dismiss()
+            }
+        }
+
+        model.confirmEvent.observe(viewLifecycleOwner) {
+            it.consume {
+                viewModel.delete()
+                dialog.dismiss()
+            }
+        }
+
+        dialog.show()
+    }
 }
diff --git a/app/src/main/java/org/linphone/ui/main/meetings/fragment/MeetingsListFragment.kt b/app/src/main/java/org/linphone/ui/main/meetings/fragment/MeetingsListFragment.kt
index 294189f20..615df6227 100644
--- a/app/src/main/java/org/linphone/ui/main/meetings/fragment/MeetingsListFragment.kt
+++ b/app/src/main/java/org/linphone/ui/main/meetings/fragment/MeetingsListFragment.kt
@@ -177,6 +177,7 @@ class MeetingsListFragment : AbstractMainFragment() {
                 meetingViewModelBeingCancelled?.delete()
                 meetingViewModelBeingCancelled = null
                 listViewModel.applyFilter()
+
                 (requireActivity() as GenericActivity).showGreenToast(
                     getString(R.string.meeting_info_deleted_toast),
                     R.drawable.trash_simple
@@ -186,22 +187,25 @@ class MeetingsListFragment : AbstractMainFragment() {
 
         adapter.meetingLongClickedEvent.observe(viewLifecycleOwner) {
             it.consume { model ->
+                val isUserOrganizer = model.isOrganizer() && !model.isCancelled
                 val modalBottomSheet = MeetingsMenuDialogFragment(
+                    isUserOrganizer,
                     { // onDismiss
                         adapter.resetSelection()
                     },
                     { // onDelete
-                        if (model.isOrganizer() && !model.isCancelled) {
+                        if (isUserOrganizer) {
                             showCancelMeetingDialog(model)
                         } else {
-                            Log.i("$TAG Deleting meeting [${model.id}]")
+                            showDeleteMeetingDialog(model)
+                            /*Log.i("$TAG Deleting meeting [${model.id}]")
                             model.delete()
                             listViewModel.applyFilter()
 
                             (requireActivity() as GenericActivity).showGreenToast(
                                 getString(R.string.meeting_info_deleted_toast),
                                 R.drawable.trash_simple
-                            )
+                            )*/
                         }
                     }
                 )
@@ -303,11 +307,13 @@ class MeetingsListFragment : AbstractMainFragment() {
         }
         val index = listViewModel.meetings.value.orEmpty().indexOf(todayMeeting)
         Log.i("$TAG 'Today' is at position [$index]")
-        binding.meetingsList.smoothScrollToPosition(index) // Workaround to have header decoration visible at top
-        (binding.meetingsList.layoutManager as LinearLayoutManager).scrollToPositionWithOffset(
-            index,
-            AppUtils.getDimension(R.dimen.meeting_list_decoration_height).toInt()
-        )
+        if (index > 0) {
+            binding.meetingsList.smoothScrollToPosition(index) // Workaround to have header decoration visible at top
+            (binding.meetingsList.layoutManager as LinearLayoutManager).scrollToPositionWithOffset(
+                index,
+                AppUtils.getDimension(R.dimen.meeting_list_decoration_height).toInt()
+            )
+        }
     }
 
     private fun showCancelMeetingDialog(meetingModel: MeetingModel) {
@@ -324,15 +330,7 @@ class MeetingsListFragment : AbstractMainFragment() {
 
         model.cancelEvent.observe(viewLifecycleOwner) {
             it.consume {
-                Log.i("$TAG Deleting meeting [${meetingModel.id}]")
-                meetingModel.delete()
-                listViewModel.applyFilter()
-
                 dialog.dismiss()
-                (requireActivity() as GenericActivity).showGreenToast(
-                    getString(R.string.meeting_info_deleted_toast),
-                    R.drawable.trash_simple
-                )
             }
         }
 
@@ -347,4 +345,39 @@ class MeetingsListFragment : AbstractMainFragment() {
 
         dialog.show()
     }
+
+    private fun showDeleteMeetingDialog(meetingModel: MeetingModel) {
+        Log.i("$TAG Meeting is not editable or already cancelled, asking whether to deleting it or not")
+
+        val model = ConfirmationDialogModel()
+        val dialog = DialogUtils.getDeleteMeetingDialog(requireContext(), model)
+
+        model.dismissEvent.observe(viewLifecycleOwner) {
+            it.consume {
+                dialog.dismiss()
+            }
+        }
+
+        model.cancelEvent.observe(viewLifecycleOwner) {
+            it.consume {
+                dialog.dismiss()
+            }
+        }
+
+        model.confirmEvent.observe(viewLifecycleOwner) {
+            it.consume {
+                Log.i("$TAG Deleting meeting [${meetingModel.id}]")
+                meetingModel.delete()
+                listViewModel.applyFilter()
+
+                dialog.dismiss()
+                (requireActivity() as GenericActivity).showGreenToast(
+                    getString(R.string.meeting_info_deleted_toast),
+                    R.drawable.trash_simple
+                )
+            }
+        }
+
+        dialog.show()
+    }
 }
diff --git a/app/src/main/java/org/linphone/ui/main/meetings/fragment/MeetingsMenuDialogFragment.kt b/app/src/main/java/org/linphone/ui/main/meetings/fragment/MeetingsMenuDialogFragment.kt
index 7bd7b72fc..e5529097b 100644
--- a/app/src/main/java/org/linphone/ui/main/meetings/fragment/MeetingsMenuDialogFragment.kt
+++ b/app/src/main/java/org/linphone/ui/main/meetings/fragment/MeetingsMenuDialogFragment.kt
@@ -33,6 +33,7 @@ import org.linphone.databinding.MeetingsListLongPressMenuBinding
 
 @UiThread
 class MeetingsMenuDialogFragment(
+    private val isUserOrganizer: Boolean,
     private val onDismiss: (() -> Unit)? = null,
     private val onDeleteMeeting: (() -> Unit)? = null
 ) : BottomSheetDialogFragment() {
@@ -64,6 +65,7 @@ class MeetingsMenuDialogFragment(
         savedInstanceState: Bundle?
     ): View {
         val view = MeetingsListLongPressMenuBinding.inflate(layoutInflater)
+        view.cancelInsteadOfDelete = isUserOrganizer
 
         view.setDeleteClickListener {
             onDeleteMeeting?.invoke()
diff --git a/app/src/main/java/org/linphone/ui/main/meetings/viewmodel/MeetingWaitingRoomViewModel.kt b/app/src/main/java/org/linphone/ui/main/meetings/viewmodel/MeetingWaitingRoomViewModel.kt
index 92d612156..3a76ef481 100644
--- a/app/src/main/java/org/linphone/ui/main/meetings/viewmodel/MeetingWaitingRoomViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/meetings/viewmodel/MeetingWaitingRoomViewModel.kt
@@ -111,10 +111,12 @@ class MeetingWaitingRoomViewModel
                 when (state) {
                     Call.State.End -> {
                         Log.i("$TAG Call has ended, leaving waiting room fragment")
+                        joining.postValue(false)
                         leaveWaitingRoomEvent.postValue(Event(true))
                     }
                     Call.State.Error -> {
                         Log.w("$TAG Call has failed, leaving waiting room fragment")
+                        joining.postValue(false)
                         leaveWaitingRoomEvent.postValue(Event(true))
                     }
                     else -> {}
@@ -190,6 +192,14 @@ class MeetingWaitingRoomViewModel
                     conferenceInfoFoundEvent.postValue(Event(true))
                 } else {
                     Log.e("$TAG Conference info with SIP URI [$uri] couldn't be found!")
+                    showRedToastEvent.postValue(
+                        Event(
+                            Pair(
+                                R.string.meeting_info_not_found_toast,
+                                R.drawable.warning_circle
+                            )
+                        )
+                    )
                     conferenceInfoFoundEvent.postValue(Event(false))
                 }
             } else {
diff --git a/app/src/main/java/org/linphone/ui/main/meetings/viewmodel/ScheduleMeetingViewModel.kt b/app/src/main/java/org/linphone/ui/main/meetings/viewmodel/ScheduleMeetingViewModel.kt
index 8f1ffb02d..160ffd51a 100644
--- a/app/src/main/java/org/linphone/ui/main/meetings/viewmodel/ScheduleMeetingViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/meetings/viewmodel/ScheduleMeetingViewModel.kt
@@ -111,14 +111,7 @@ class ScheduleMeetingViewModel
             when (state) {
                 ConferenceScheduler.State.Error -> {
                     operationInProgress.postValue(false)
-                    showRedToastEvent.postValue(
-                        Event(
-                            Pair(
-                                R.string.meeting_failed_to_schedule_toast,
-                                R.drawable.warning_circle
-                            )
-                        )
-                    )
+                    showRedToast(R.string.meeting_failed_to_schedule_toast, R.drawable.warning_circle)
                 }
                 ConferenceScheduler.State.Ready -> {
                     val conferenceAddress = conferenceScheduler.info?.uri
@@ -166,28 +159,14 @@ class ScheduleMeetingViewModel
                 }
                 participants.value.orEmpty().size -> {
                     Log.e("$TAG No invitation sent!")
-                    showRedToastEvent.postValue(
-                        Event(
-                            Pair(
-                                R.string.meeting_failed_to_send_invites_toast,
-                                R.drawable.warning_circle
-                            )
-                        )
-                    )
+                    showRedToast(R.string.meeting_failed_to_send_invites_toast, R.drawable.warning_circle)
                 }
                 else -> {
                     Log.w("$TAG [$failedCount] invitations couldn't have been sent for:")
                     for (failed in failedInvitations.orEmpty()) {
                         Log.w(failed.asStringUriOnly())
                     }
-                    showRedToastEvent.postValue(
-                        Event(
-                            Pair(
-                                R.string.meeting_failed_to_send_part_of_invites_toast,
-                                R.drawable.warning_circle
-                            )
-                        )
-                    )
+                    showRedToast(R.string.meeting_failed_to_send_part_of_invites_toast, R.drawable.warning_circle)
                 }
             }
 
@@ -398,14 +377,7 @@ class ScheduleMeetingViewModel
             Log.e(
                 "$TAG Either no subject was set or no participant was selected, can't schedule meeting."
             )
-            showRedToastEvent.postValue(
-                Event(
-                    Pair(
-                        R.string.meeting_schedule_mandatory_field_not_filled_toast,
-                        R.drawable.warning_circle
-                    )
-                )
-            )
+            showRedToast(R.string.meeting_schedule_mandatory_field_not_filled_toast, R.drawable.warning_circle)
             return
         }
 
@@ -427,7 +399,7 @@ class ScheduleMeetingViewModel
             conferenceInfo.setCapability(StreamType.Text, true)
 
             // Enable end-to-end encryption if client supports it
-            conferenceInfo.securityLevel = if (LinphoneUtils.isEndToEndEncryptedChatAvailable(core)) {
+            conferenceInfo.securityLevel = if (corePreferences.createEndToEndEncryptedMeetingsAndGroupCalls) {
                 Log.i("$TAG Requesting EndToEnd security level for conference")
                 Conference.SecurityLevel.EndToEnd
             } else {
diff --git a/app/src/main/java/org/linphone/ui/main/model/AccountModel.kt b/app/src/main/java/org/linphone/ui/main/model/AccountModel.kt
index 588a49e87..1d030e215 100644
--- a/app/src/main/java/org/linphone/ui/main/model/AccountModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/model/AccountModel.kt
@@ -17,6 +17,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
+@file:Suppress("SameReturnValue")
+
 package org.linphone.ui.main.model
 
 import android.view.View
diff --git a/app/src/main/java/org/linphone/ui/main/model/ConversationContactOrSuggestionModel.kt b/app/src/main/java/org/linphone/ui/main/model/ConversationContactOrSuggestionModel.kt
index 8953b7c24..1c53b546e 100644
--- a/app/src/main/java/org/linphone/ui/main/model/ConversationContactOrSuggestionModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/model/ConversationContactOrSuggestionModel.kt
@@ -32,7 +32,7 @@ class ConversationContactOrSuggestionModel
     @WorkerThread
     constructor(
     val address: Address,
-    val localAddress: Address? = null,
+    val conversationId: String = "",
     conversationSubject: String? = null,
     val friend: Friend? = null,
     private val onClicked: ((Address) -> Unit)? = null
diff --git a/app/src/main/java/org/linphone/ui/main/model/SelectedAddressModel.kt b/app/src/main/java/org/linphone/ui/main/model/SelectedAddressModel.kt
index 2c8562076..8868bb8ca 100644
--- a/app/src/main/java/org/linphone/ui/main/model/SelectedAddressModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/model/SelectedAddressModel.kt
@@ -31,10 +31,6 @@ class SelectedAddressModel
     val avatarModel: ContactAvatarModel?,
     private val onRemovedFromSelection: ((model: SelectedAddressModel) -> Unit)? = null
 ) {
-    companion object {
-        private const val TAG = "[Selected Address Model]"
-    }
-
     @UiThread
     fun removeFromSelection() {
         onRemovedFromSelection?.invoke(this)
diff --git a/app/src/main/java/org/linphone/ui/main/recordings/viewmodel/RecordingMediaPlayerViewModel.kt b/app/src/main/java/org/linphone/ui/main/recordings/viewmodel/RecordingMediaPlayerViewModel.kt
index 9d1a017ee..f070e668b 100644
--- a/app/src/main/java/org/linphone/ui/main/recordings/viewmodel/RecordingMediaPlayerViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/recordings/viewmodel/RecordingMediaPlayerViewModel.kt
@@ -38,7 +38,6 @@ import org.linphone.core.tools.Log
 import org.linphone.ui.GenericViewModel
 import org.linphone.ui.main.recordings.model.RecordingModel
 import org.linphone.utils.AudioUtils
-import org.linphone.utils.Event
 
 class RecordingMediaPlayerViewModel
     @UiThread
@@ -122,11 +121,7 @@ class RecordingMediaPlayerViewModel
         val lowMediaVolume = AudioUtils.isMediaVolumeLow(coreContext.context)
         if (lowMediaVolume) {
             Log.w("$TAG Media volume is low, notifying user as they may not hear voice message")
-            showRedToastEvent.postValue(
-                Event(
-                    Pair(R.string.media_playback_low_volume_warning_toast, R.drawable.speaker_slash)
-                )
-            )
+            showRedToast(R.string.media_playback_low_volume_warning_toast, R.drawable.speaker_slash)
         }
 
         if (player.state == Player.State.Closed) {
diff --git a/app/src/main/java/org/linphone/ui/main/settings/fragment/SettingsAdvancedFragment.kt b/app/src/main/java/org/linphone/ui/main/settings/fragment/SettingsAdvancedFragment.kt
index 92a310759..9c92dbd74 100644
--- a/app/src/main/java/org/linphone/ui/main/settings/fragment/SettingsAdvancedFragment.kt
+++ b/app/src/main/java/org/linphone/ui/main/settings/fragment/SettingsAdvancedFragment.kt
@@ -35,10 +35,6 @@ import org.linphone.ui.main.settings.viewmodel.SettingsViewModel
 
 @UiThread
 class SettingsAdvancedFragment : GenericMainFragment() {
-    companion object {
-        private const val TAG = "[Advanced Settings Fragment]"
-    }
-
     private lateinit var binding: SettingsAdvancedFragmentBinding
 
     private lateinit var viewModel: SettingsViewModel
diff --git a/app/src/main/java/org/linphone/ui/main/settings/fragment/SettingsFragment.kt b/app/src/main/java/org/linphone/ui/main/settings/fragment/SettingsFragment.kt
index 8dd7e95df..1f58890f7 100644
--- a/app/src/main/java/org/linphone/ui/main/settings/fragment/SettingsFragment.kt
+++ b/app/src/main/java/org/linphone/ui/main/settings/fragment/SettingsFragment.kt
@@ -307,7 +307,6 @@ class SettingsFragment : GenericMainFragment() {
                 viewModel.enableVfs()
 
                 dialog.dismiss()
-                findNavController().popBackStack()
             }
         }
 
diff --git a/app/src/main/java/org/linphone/ui/main/settings/viewmodel/AccountProfileViewModel.kt b/app/src/main/java/org/linphone/ui/main/settings/viewmodel/AccountProfileViewModel.kt
index becd320b7..617e82747 100644
--- a/app/src/main/java/org/linphone/ui/main/settings/viewmodel/AccountProfileViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/settings/viewmodel/AccountProfileViewModel.kt
@@ -156,14 +156,7 @@ class AccountProfileViewModel
             if (!errorMessage.isNullOrEmpty()) {
                 when (request.type) {
                     AccountManagerServicesRequest.Type.GetDevicesList, AccountManagerServicesRequest.Type.DeleteDevice -> {
-                        showFormattedRedToastEvent.postValue(
-                            Event(
-                                Pair(
-                                    errorMessage,
-                                    R.drawable.warning_circle
-                                )
-                            )
-                        )
+                        showFormattedRedToast(errorMessage, R.drawable.warning_circle)
                         devicesFetchInProgress.postValue(false)
                     }
                     else -> {}
diff --git a/app/src/main/java/org/linphone/ui/main/settings/viewmodel/CardDavViewModel.kt b/app/src/main/java/org/linphone/ui/main/settings/viewmodel/CardDavViewModel.kt
index 7ed1f7eb7..c4c26bdd8 100644
--- a/app/src/main/java/org/linphone/ui/main/settings/viewmodel/CardDavViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/settings/viewmodel/CardDavViewModel.kt
@@ -81,14 +81,7 @@ class CardDavViewModel
             when (status) {
                 FriendList.SyncStatus.Successful -> {
                     syncInProgress.postValue(false)
-                    showGreenToastEvent.postValue(
-                        Event(
-                            Pair(
-                                R.string.settings_contacts_carddav_sync_successful_toast,
-                                R.drawable.check
-                            )
-                        )
-                    )
+                    showGreenToast(R.string.settings_contacts_carddav_sync_successful_toast, R.drawable.check)
 
                     Log.i("$TAG Notifying contacts manager that contacts have changed")
                     coreContext.contactsManager.notifyContactsListChanged()
@@ -97,14 +90,7 @@ class CardDavViewModel
                 }
                 FriendList.SyncStatus.Failure -> {
                     syncInProgress.postValue(false)
-                    showRedToastEvent.postValue(
-                        Event(
-                            Pair(
-                                R.string.settings_contacts_carddav_sync_error_toast,
-                                R.drawable.warning_circle
-                            )
-                        )
-                    )
+                    showRedToast(R.string.settings_contacts_carddav_sync_error_toast, R.drawable.warning_circle)
                     if (isEdit.value == false) {
                         Log.e("$TAG Synchronization failed, removing Friend list from Core")
                         friendList.removeListener(this)
@@ -166,14 +152,7 @@ class CardDavViewModel
                 }
                 core.removeFriendList(friendList)
                 Log.i("$TAG Removed friends list with display name [$name]")
-                showGreenToastEvent.postValue(
-                    Event(
-                        Pair(
-                            R.string.settings_contacts_carddav_deleted_toast,
-                            R.drawable.trash_simple
-                        )
-                    )
-                )
+                showGreenToast(R.string.settings_contacts_carddav_deleted_toast, R.drawable.trash_simple)
 
                 Log.i("$TAG Notifying contacts manager that contacts have changed")
                 coreContext.contactsManager.notifyContactsListChanged()
@@ -193,14 +172,7 @@ class CardDavViewModel
         val name = displayName.value.orEmpty().trim()
         val server = serverUrl.value.orEmpty().trim()
         if (name.isEmpty() || server.isEmpty()) {
-            showRedToastEvent.postValue(
-                Event(
-                    Pair(
-                        R.string.settings_contacts_carddav_mandatory_field_not_filled_toast,
-                        R.drawable.warning_circle
-                    )
-                )
-            )
+            showRedToast(R.string.settings_contacts_carddav_mandatory_field_not_filled_toast, R.drawable.warning_circle)
             return
         }
 
diff --git a/app/src/main/java/org/linphone/ui/main/settings/viewmodel/LdapViewModel.kt b/app/src/main/java/org/linphone/ui/main/settings/viewmodel/LdapViewModel.kt
index dbfe0395c..45034be08 100644
--- a/app/src/main/java/org/linphone/ui/main/settings/viewmodel/LdapViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/settings/viewmodel/LdapViewModel.kt
@@ -139,14 +139,7 @@ class LdapViewModel : GenericViewModel() {
                 val server = serverUrl.value.orEmpty().trim()
                 if (server.isEmpty()) {
                     Log.e("$TAG Server field can't be empty!")
-                    showRedToastEvent.postValue(
-                        Event(
-                            Pair(
-                                R.string.settings_contacts_ldap_empty_server_error_toast,
-                                R.drawable.warning_circle
-                            )
-                        )
-                    )
+                    showRedToast(R.string.settings_contacts_ldap_empty_server_error_toast, R.drawable.warning_circle)
                     return@postOnCoreThread
                 }
 
@@ -181,11 +174,7 @@ class LdapViewModel : GenericViewModel() {
                 ldapServerOperationSuccessfulEvent.postValue(Event(true))
             } catch (e: Exception) {
                 Log.e("$TAG Exception while creating LDAP: $e")
-                showRedToastEvent.postValue(
-                    Event(
-                        Pair(R.string.settings_contacts_ldap_error_toast, R.drawable.warning_circle)
-                    )
-                )
+                showRedToast(R.string.settings_contacts_ldap_error_toast, R.drawable.warning_circle)
             }
         }
     }
diff --git a/app/src/main/java/org/linphone/ui/main/settings/viewmodel/SettingsViewModel.kt b/app/src/main/java/org/linphone/ui/main/settings/viewmodel/SettingsViewModel.kt
index ddee54845..62a36d08b 100644
--- a/app/src/main/java/org/linphone/ui/main/settings/viewmodel/SettingsViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/settings/viewmodel/SettingsViewModel.kt
@@ -90,6 +90,8 @@ class SettingsViewModel
 
     val autoDownloadEnabled = MutableLiveData<Boolean>()
 
+    val autoExportMediaToNativeGallery = MutableLiveData<Boolean>()
+
     val markAsReadWhenDismissingNotification = MutableLiveData<Boolean>()
 
     // Contacts settings
@@ -187,6 +189,7 @@ class SettingsViewModel
     val mediaEncryptionLabels = arrayListOf<String>()
     private val mediaEncryptionValues = arrayListOf<MediaEncryption>()
     val mediaEncryptionMandatory = MutableLiveData<Boolean>()
+    val createEndToEndEncryptedConferences = MutableLiveData<Boolean>()
     val acceptEarlyMedia = MutableLiveData<Boolean>()
     val allowOutgoingEarlyMedia = MutableLiveData<Boolean>()
 
@@ -245,7 +248,8 @@ class SettingsViewModel
         expandAudioCodecs.value = false
         expandVideoCodecs.value = false
 
-        isVfsEnabled.value = VFS.isEnabled(coreContext.context)
+        val vfsEnabled = VFS.isEnabled(coreContext.context)
+        isVfsEnabled.value = vfsEnabled
 
         val vibrator = coreContext.context.getSystemService(Vibrator::class.java)
         isVibrationAvailable.value = vibrator.hasVibrator()
@@ -284,6 +288,7 @@ class SettingsViewModel
             allowIpv6.postValue(core.isIpv6Enabled)
 
             autoDownloadEnabled.postValue(core.maxSizeForAutoDownloadIncomingFiles == 0)
+            autoExportMediaToNativeGallery.postValue(corePreferences.makePublicMediaFilesDownloaded && !vfsEnabled)
             markAsReadWhenDismissingNotification.postValue(
                 corePreferences.markConversationAsReadWhenDismissingMessageNotification
             )
@@ -330,11 +335,12 @@ class SettingsViewModel
             isVfsEnabled.postValue(enabled)
             if (enabled) {
                 Log.i("$TAG VFS has been enabled")
+                showGreenToast(R.string.settings_security_enable_vfs_success_toast, R.drawable.lock_key)
             }
         } else {
-            showRedToastEvent.postValue(Event(Pair(R.string.settings_security_enable_vfs_failure_toast, R.drawable.warning_circle)))
-            isVfsEnabled.postValue(false)
             Log.e("$TAG Failed to enable VFS!")
+            isVfsEnabled.postValue(false)
+            showRedToast(R.string.settings_security_enable_vfs_failure_toast, R.drawable.warning_circle)
         }
     }
 
@@ -438,6 +444,15 @@ class SettingsViewModel
         }
     }
 
+    @UiThread
+    fun toggleAutoExportMediaFilesToNativeGallery() {
+        val newValue = autoExportMediaToNativeGallery.value == false
+        coreContext.postOnCoreThread { core ->
+            corePreferences.makePublicMediaFilesDownloaded = newValue
+            autoExportMediaToNativeGallery.postValue(newValue)
+        }
+    }
+
     @UiThread
     fun toggleMarkConversationAsReadWhenDismissingNotification() {
         val newValue = markAsReadWhenDismissingNotification.value == false
@@ -675,6 +690,7 @@ class SettingsViewModel
         }
 
         mediaEncryptionMandatory.postValue(core.isMediaEncryptionMandatory)
+        createEndToEndEncryptedConferences.postValue(corePreferences.createEndToEndEncryptedMeetingsAndGroupCalls)
         acceptEarlyMedia.postValue(corePreferences.acceptEarlyMedia)
         allowOutgoingEarlyMedia.postValue(corePreferences.allowOutgoingEarlyMedia)
     }
@@ -702,6 +718,16 @@ class SettingsViewModel
         }
     }
 
+    @UiThread
+    fun toggleConferencesEndToEndEncryption() {
+        val newValue = createEndToEndEncryptedConferences.value == false
+
+        coreContext.postOnCoreThread { core ->
+            corePreferences.createEndToEndEncryptedMeetingsAndGroupCalls = newValue
+            createEndToEndEncryptedConferences.postValue(newValue)
+        }
+    }
+
     @UiThread
     fun toggleAcceptEarlyMedia() {
         val newValue = acceptEarlyMedia.value == false
diff --git a/app/src/main/java/org/linphone/ui/main/sso/viewmodel/SingleSignOnViewModel.kt b/app/src/main/java/org/linphone/ui/main/sso/viewmodel/SingleSignOnViewModel.kt
index c6e22f804..a0fe73c77 100644
--- a/app/src/main/java/org/linphone/ui/main/sso/viewmodel/SingleSignOnViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/sso/viewmodel/SingleSignOnViewModel.kt
@@ -20,7 +20,6 @@
 package org.linphone.ui.main.sso.viewmodel
 
 import android.content.Intent
-import android.net.Uri
 import androidx.annotation.UiThread
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.viewModelScope
@@ -36,23 +35,27 @@ import net.openid.appauth.ResponseTypeValues
 import org.json.JSONObject
 import org.linphone.LinphoneApplication.Companion.coreContext
 import org.linphone.LinphoneApplication.Companion.corePreferences
+import org.linphone.R
 import org.linphone.core.Factory
 import org.linphone.core.tools.Log
 import org.linphone.ui.GenericViewModel
 import org.linphone.utils.Event
 import org.linphone.utils.FileUtils
 import org.linphone.utils.TimestampUtils
+import androidx.core.net.toUri
 
-class SingleSignOnViewModel : GenericViewModel() {
+class SingleSignOnViewModel
+    @UiThread
+    constructor() : GenericViewModel() {
     companion object {
         private const val TAG = "[Single Sign On ViewModel]"
-
-        private const val CLIENT_ID = "linphone"
-        private const val REDIRECT_URI = "org.linphone:/openidcallback"
     }
 
     val singleSignOnProcessCompletedEvent = MutableLiveData<Event<Boolean>>()
 
+    private var clientId: String
+    private val redirectUri: String
+
     private var singleSignOnUrl = ""
 
     private var username: String = ""
@@ -68,14 +71,37 @@ class SingleSignOnViewModel : GenericViewModel() {
     private lateinit var authState: AuthState
     private lateinit var authService: AuthorizationService
 
+    init {
+        clientId = corePreferences.singleSignOnClientId
+
+        val openIdCallbackScheme = coreContext.context.getString(R.string.linphone_openid_callback_scheme)
+        redirectUri = "$openIdCallbackScheme:/openidcallback"
+
+        Log.i("$TAG Using client ID [$clientId] and redirect URI [$redirectUri]")
+    }
+
     @UiThread
     fun setUp(ssoUrl: String, user: String = "") {
         viewModelScope.launch {
             singleSignOnUrl = ssoUrl
             username = user
 
+            try {
+                val parsedUrl = ssoUrl.toUri()
+                val urlClientId = parsedUrl.getQueryParameter("client_id")
+                if (urlClientId.isNullOrEmpty()) {
+                    Log.i("$TAG No client_id query parameter in URL, using value from config [$clientId]")
+                } else {
+                    Log.w("$TAG client_id query parameter found in URL, overriding value from config [$clientId] to [$urlClientId]")
+                    clientId = urlClientId
+                }
+
+            } catch (e: Exception) {
+                Log.e("$TAG Failed to parse SSO URL [$singleSignOnUrl]: $e")
+            }
+
             Log.i(
-                "$TAG Setting up SSO environment for username [$username] and URL [$singleSignOnUrl], redirect URI is [$REDIRECT_URI]"
+                "$TAG Setting up SSO environment for username [$username] and URL [$singleSignOnUrl]"
             )
             authState = getAuthState()
             updateTokenInfo()
@@ -102,7 +128,7 @@ class SingleSignOnViewModel : GenericViewModel() {
     private fun singleSignOn() {
         Log.i("$TAG Fetch from issuer [$singleSignOnUrl]")
         AuthorizationServiceConfiguration.fetchFromIssuer(
-            Uri.parse(singleSignOnUrl),
+            singleSignOnUrl.toUri(),
             AuthorizationServiceConfiguration.RetrieveConfigurationCallback { serviceConfiguration, ex ->
                 if (ex != null) {
                     Log.e(
@@ -128,9 +154,9 @@ class SingleSignOnViewModel : GenericViewModel() {
 
                 val authRequestBuilder = AuthorizationRequest.Builder(
                     serviceConfiguration, // the authorization service configuration
-                    CLIENT_ID, // the client ID, typically pre-registered and static
+                    clientId, // the client ID, typically pre-registered and static
                     ResponseTypeValues.CODE, // the response_type value: we want a code
-                    Uri.parse(REDIRECT_URI) // the redirect URI to which the auth response is sent
+                    redirectUri.toUri() // the redirect URI to which the auth response is sent
                 )
 
                 // Needed for SDK to be able to refresh the token, otherwise it will return
@@ -346,7 +372,7 @@ class SingleSignOnViewModel : GenericViewModel() {
                     )
                 }
 
-                authInfo.clientId = CLIENT_ID
+                authInfo.clientId = clientId
                 core.addAuthInfo(authInfo)
 
                 Log.i(
diff --git a/app/src/main/java/org/linphone/ui/main/viewmodel/AbstractMainViewModel.kt b/app/src/main/java/org/linphone/ui/main/viewmodel/AbstractMainViewModel.kt
index 4706be783..1b3b82b5c 100644
--- a/app/src/main/java/org/linphone/ui/main/viewmodel/AbstractMainViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/viewmodel/AbstractMainViewModel.kt
@@ -28,9 +28,9 @@ import org.linphone.core.Account
 import org.linphone.core.Call
 import org.linphone.core.ChatMessage
 import org.linphone.core.ChatRoom
-import org.linphone.core.ConfiguringState
 import org.linphone.core.Core
 import org.linphone.core.CoreListenerStub
+import org.linphone.core.GlobalState
 import org.linphone.core.tools.Log
 import org.linphone.ui.GenericViewModel
 import org.linphone.ui.main.model.AccountModel
@@ -113,6 +113,17 @@ open class AbstractMainViewModel
             }
         }
 
+        @WorkerThread
+        override fun onChatRoomStateChanged(
+            core: Core,
+            chatRoom: ChatRoom,
+            state: ChatRoom.State?
+        ) {
+            if (state == ChatRoom.State.Deleted) {
+                computeUnreadMessagesCount()
+            }
+        }
+
         @WorkerThread
         override fun onMessagesReceived(
             core: Core,
@@ -128,18 +139,10 @@ open class AbstractMainViewModel
         }
 
         @WorkerThread
-        override fun onConfiguringStatus(core: Core, status: ConfiguringState?, message: String?) {
-            if (status != ConfiguringState.Skipped) {
-                account.value?.destroy()
-
-                val defaultAccount = core.defaultAccount
-                if (defaultAccount != null) {
-                    Log.i("$TAG Configuring status is [$status], reload default account")
-                    account.postValue(AccountModel(defaultAccount))
-                    defaultAccountChangedEvent.postValue(Event(true))
-                } else {
-                    Log.w("$TAG Configuring status is [$status] but no default account was found!")
-                }
+        override fun onGlobalStateChanged(core: Core, state: GlobalState?, message: String) {
+            if (core.globalState == GlobalState.On) {
+                Log.i("$TAG Global state is [${core.globalState}], reload account info")
+                configure()
             }
         }
 
diff --git a/app/src/main/java/org/linphone/ui/main/viewmodel/AddressSelectionViewModel.kt b/app/src/main/java/org/linphone/ui/main/viewmodel/AddressSelectionViewModel.kt
index 00eae160b..fae45f014 100644
--- a/app/src/main/java/org/linphone/ui/main/viewmodel/AddressSelectionViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/viewmodel/AddressSelectionViewModel.kt
@@ -328,7 +328,7 @@ abstract class AddressSelectionViewModel
         list.addAll(contactsList)
         list.addAll(suggestionsList)
         modelsList.postValue(list)
-        isEmpty.postValue(list.isEmpty)
+        isEmpty.postValue(list.isEmpty())
         Log.i(
             "$TAG Processed [${results.size}] results: [${conversationsList.size}] conversations, [${favoritesList.size}] favorites, [${contactsList.size}] contacts and [${suggestionsList.size}] suggestions"
         )
@@ -343,6 +343,7 @@ abstract class AddressSelectionViewModel
             if (chatRoom.isReadOnly || (!isBasic && chatRoom.participants.isEmpty())) continue
 
             val isOneToOne = chatRoom.hasCapability(ChatRoom.Capabilities.OneToOne.toInt())
+            val conversationId = LinphoneUtils.getConversationId(chatRoom)
             val remoteAddress = chatRoom.peerAddress
             val matchesFilter: Any? = if (filter.isEmpty()) {
                 null
@@ -383,7 +384,6 @@ abstract class AddressSelectionViewModel
                 }
             }
             if (filter.isEmpty() || matchesFilter != null) {
-                val localAddress = chatRoom.localAddress
                 val friend = if (isBasic) {
                     coreContext.contactsManager.findContactByAddress(remoteAddress)
                 } else {
@@ -410,7 +410,7 @@ abstract class AddressSelectionViewModel
                 }
                 val model = ConversationContactOrSuggestionModel(
                     remoteAddress,
-                    localAddress,
+                    conversationId,
                     subject,
                     friend
                 )
diff --git a/app/src/main/java/org/linphone/ui/main/viewmodel/DefaultAccountChangedViewModel.kt b/app/src/main/java/org/linphone/ui/main/viewmodel/DefaultAccountChangedViewModel.kt
index 82f579b18..9862d7139 100644
--- a/app/src/main/java/org/linphone/ui/main/viewmodel/DefaultAccountChangedViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/viewmodel/DefaultAccountChangedViewModel.kt
@@ -25,10 +25,16 @@ import org.linphone.LinphoneApplication.Companion.coreContext
 import org.linphone.core.Account
 import org.linphone.core.Core
 import org.linphone.core.CoreListenerStub
+import org.linphone.core.GlobalState
+import org.linphone.core.tools.Log
 import org.linphone.ui.GenericViewModel
 import org.linphone.utils.Event
 
 open class DefaultAccountChangedViewModel : GenericViewModel() {
+    companion object {
+        private const val TAG = "[Default Account Changed ViewModel]"
+    }
+
     val defaultAccountChangedEvent: MutableLiveData<Event<Boolean>> by lazy {
         MutableLiveData<Event<Boolean>>()
     }
@@ -38,6 +44,14 @@ open class DefaultAccountChangedViewModel : GenericViewModel() {
         override fun onDefaultAccountChanged(core: Core, account: Account?) {
             defaultAccountChangedEvent.postValue(Event(true))
         }
+
+        @WorkerThread
+        override fun onGlobalStateChanged(core: Core, state: GlobalState?, message: String) {
+            if (core.globalState == GlobalState.On) {
+                Log.i("$TAG Global state is [${core.globalState}], reload default account")
+                defaultAccountChangedEvent.postValue(Event(true))
+            }
+        }
     }
 
     init {
diff --git a/app/src/main/java/org/linphone/ui/main/viewmodel/DrawerMenuViewModel.kt b/app/src/main/java/org/linphone/ui/main/viewmodel/DrawerMenuViewModel.kt
index fef062b8c..54cd3452f 100644
--- a/app/src/main/java/org/linphone/ui/main/viewmodel/DrawerMenuViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/viewmodel/DrawerMenuViewModel.kt
@@ -26,9 +26,9 @@ import androidx.lifecycle.MutableLiveData
 import org.linphone.LinphoneApplication.Companion.coreContext
 import org.linphone.LinphoneApplication.Companion.corePreferences
 import org.linphone.core.Account
-import org.linphone.core.ConfiguringState
 import org.linphone.core.Core
 import org.linphone.core.CoreListenerStub
+import org.linphone.core.GlobalState
 import org.linphone.core.tools.Log
 import org.linphone.ui.GenericViewModel
 import org.linphone.ui.main.model.AccountModel
@@ -109,11 +109,11 @@ class DrawerMenuViewModel
         }
 
         @WorkerThread
-        override fun onConfiguringStatus(core: Core, status: ConfiguringState?, message: String?) {
-            if (status != ConfiguringState.Skipped) {
+        override fun onGlobalStateChanged(core: Core, state: GlobalState?, message: String) {
+            if (core.globalState == GlobalState.On) {
                 accounts.value.orEmpty().forEach(AccountModel::destroy)
 
-                Log.i("$TAG Configuring status is [$status], reload accounts & shortcuts")
+                Log.i("$TAG Global state is [${core.globalState}], reload accounts & shortcuts")
                 computeAccountsList()
                 computeShortcuts()
             }
@@ -180,6 +180,12 @@ class DrawerMenuViewModel
                 showAccountPopupMenuEvent.postValue(Event(Pair(view, account)))
             }
             list.add(model)
+
+            if (account == coreContext.core.defaultAccount) {
+                defaultAccountChangedEvent.postValue(
+                    Event(account.params.identityAddress?.asStringUriOnly() ?: "")
+                )
+            }
         }
         accounts.postValue(list)
 
diff --git a/app/src/main/java/org/linphone/ui/main/viewmodel/SharedMainViewModel.kt b/app/src/main/java/org/linphone/ui/main/viewmodel/SharedMainViewModel.kt
index 55ef4469b..10643b305 100644
--- a/app/src/main/java/org/linphone/ui/main/viewmodel/SharedMainViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/viewmodel/SharedMainViewModel.kt
@@ -118,8 +118,9 @@ class SharedMainViewModel
     }
 
     var displayedChatRoom: ChatRoom? = null // Prevents the need to go look for the chat room
-    val showConversationEvent: MutableLiveData<Event<Pair<String, String>>> by lazy {
-        MutableLiveData<Event<Pair<String, String>>>()
+
+    val showConversationEvent: MutableLiveData<Event<String>> by lazy {
+        MutableLiveData<Event<String>>()
     }
 
     val hideConversationEvent: MutableLiveData<Event<Boolean>> by lazy {
diff --git a/app/src/main/java/org/linphone/utils/DataBindingUtils.kt b/app/src/main/java/org/linphone/utils/DataBindingUtils.kt
index 18904df0d..fff752750 100644
--- a/app/src/main/java/org/linphone/utils/DataBindingUtils.kt
+++ b/app/src/main/java/org/linphone/utils/DataBindingUtils.kt
@@ -179,9 +179,9 @@ fun AppCompatEditText.removeCharacterAtPosition() {
 
 @UiThread
 fun AppCompatEditText.addCharacterAtPosition(character: String) {
-    val newValue = "${text}$character"
-    setText(newValue)
-    setSelection(newValue.length)
+    val start = selectionStart
+    text?.insert(start, character)
+    setSelection(start + character.length)
 }
 
 @UiThread
@@ -227,12 +227,6 @@ fun ImageView.setSourceImageResource(resource: Int) {
     this.setImageResource(resource)
 }
 
-@UiThread
-@BindingAdapter("android:textStyle")
-fun AppCompatTextView.setTypeface(typeface: Int) {
-    this.setTypeface(null, typeface)
-}
-
 @UiThread
 @BindingAdapter("android:drawableTint")
 fun AppCompatTextView.setDrawableTint(@ColorInt color: Int) {
@@ -575,6 +569,13 @@ fun RoundCornersTextureView.setRoundCornersRadius(radius: Float) {
     setRadius(radius)
 }
 
+@BindingAdapter("passwordInputType")
+fun setInputTypeAndFont(editText: EditText, type: Int) {
+    editText.inputType = type
+    // Typeface must be set again...
+    editText.typeface = ResourcesCompat.getFont(editText.context, R.font.noto_sans)
+}
+
 @BindingAdapter("focusNextOnInput")
 fun focusNextOnInput(editText: EditText, enabled: Boolean) {
     if (!enabled) return
diff --git a/app/src/main/java/org/linphone/utils/DialogUtils.kt b/app/src/main/java/org/linphone/utils/DialogUtils.kt
index 4dc0843cb..0b7b1bb87 100644
--- a/app/src/main/java/org/linphone/utils/DialogUtils.kt
+++ b/app/src/main/java/org/linphone/utils/DialogUtils.kt
@@ -21,7 +21,6 @@ package org.linphone.utils
 
 import android.app.Dialog
 import android.content.Context
-import android.graphics.drawable.ColorDrawable
 import android.graphics.drawable.Drawable
 import android.text.method.LinkMovementMethod
 import android.view.LayoutInflater
@@ -43,6 +42,7 @@ import org.linphone.databinding.DialogConfirmTurningOnVfsBinding
 import org.linphone.databinding.DialogContactConfirmTrustCallBinding
 import org.linphone.databinding.DialogContactTrustProcessBinding
 import org.linphone.databinding.DialogDeleteContactBinding
+import org.linphone.databinding.DialogDeleteMeetingBinding
 import org.linphone.databinding.DialogKickFromConferenceBinding
 import org.linphone.databinding.DialogManageAccountInternationalPrefixHelpBinding
 import org.linphone.databinding.DialogMergeCallsIntoConferenceBinding
@@ -66,6 +66,7 @@ import org.linphone.ui.call.model.ZrtpSasConfirmationDialogModel
 import org.linphone.ui.main.contacts.model.ContactTrustDialogModel
 import org.linphone.ui.main.contacts.model.NumberOrAddressPickerDialogModel
 import org.linphone.ui.main.model.GroupSetOrEditSubjectDialogModel
+import androidx.core.graphics.drawable.toDrawable
 
 class DialogUtils {
     companion object {
@@ -513,6 +514,22 @@ class DialogUtils {
             return getDialog(context, binding)
         }
 
+        @UiThread
+        fun getDeleteMeetingDialog(
+            context: Context,
+            viewModel: ConfirmationDialogModel
+        ): Dialog {
+            val binding: DialogDeleteMeetingBinding = DataBindingUtil.inflate(
+                LayoutInflater.from(context),
+                R.layout.dialog_delete_meeting,
+                null,
+                false
+            )
+            binding.viewModel = viewModel
+
+            return getDialog(context, binding)
+        }
+
         @UiThread
         private fun getDialog(context: Context, binding: ViewDataBinding): Dialog {
             val dialog = Dialog(context, R.style.Theme_LinphoneDialog)
@@ -526,9 +543,7 @@ class DialogUtils {
                 )
                 setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE)
 
-                val d: Drawable = ColorDrawable(
-                    context.getColor(R.color.bc_black)
-                )
+                val d: Drawable = context.getColor(R.color.bc_black).toDrawable()
                 d.alpha = 153 // 60% opacity
                 setBackgroundDrawable(d)
             }
diff --git a/app/src/main/java/org/linphone/utils/Event.kt b/app/src/main/java/org/linphone/utils/Event.kt
index 90ee17d40..07c3f3182 100644
--- a/app/src/main/java/org/linphone/utils/Event.kt
+++ b/app/src/main/java/org/linphone/utils/Event.kt
@@ -39,9 +39,4 @@ open class Event<out T>
             handleContent(content)
         }
     }
-
-    @UiThread
-    fun consumed(): Boolean {
-        return handled.get()
-    }
 }
diff --git a/app/src/main/java/org/linphone/utils/FileUtils.kt b/app/src/main/java/org/linphone/utils/FileUtils.kt
index 79c9796ea..32770117f 100644
--- a/app/src/main/java/org/linphone/utils/FileUtils.kt
+++ b/app/src/main/java/org/linphone/utils/FileUtils.kt
@@ -48,6 +48,7 @@ import org.linphone.LinphoneApplication.Companion.coreContext
 import org.linphone.R
 import org.linphone.compatibility.Compatibility
 import org.linphone.core.tools.Log
+import androidx.core.net.toUri
 
 class FileUtils {
     enum class MimeType {
@@ -193,7 +194,7 @@ class FileUtils {
                     )
                 }
                 path.startsWith("content://") -> {
-                    contentUri = Uri.parse(path)
+                    contentUri = path.toUri()
                 }
                 else -> {
                     val file = File(path)
@@ -209,7 +210,7 @@ class FileUtils {
                                 R.string.file_provider
                             )}: $e"
                         )
-                        Uri.parse(path)
+                        path.toUri()
                     }
                 }
             }
diff --git a/app/src/main/java/org/linphone/utils/ImageUtils.kt b/app/src/main/java/org/linphone/utils/ImageUtils.kt
index ad89f3b4f..52144be88 100644
--- a/app/src/main/java/org/linphone/utils/ImageUtils.kt
+++ b/app/src/main/java/org/linphone/utils/ImageUtils.kt
@@ -28,12 +28,13 @@ import android.graphics.PorterDuff
 import android.graphics.PorterDuffXfermode
 import android.graphics.Rect
 import android.graphics.drawable.BitmapDrawable
-import android.net.Uri
 import androidx.annotation.AnyThread
 import androidx.annotation.WorkerThread
 import java.io.FileNotFoundException
 import org.linphone.contacts.AvatarGenerator
 import org.linphone.core.tools.Log
+import androidx.core.net.toUri
+import androidx.core.graphics.createBitmap
 
 class ImageUtils {
     companion object {
@@ -63,12 +64,7 @@ class ImageUtils {
             Log.d("$TAG Trying to create Bitmap from path [$path]")
             if (path != null) {
                 try {
-                    val fromPictureUri = Uri.parse(path)
-                    if (fromPictureUri == null) {
-                        Log.e("$TAG Failed to parse path [$path] as URI")
-                        return null
-                    }
-
+                    val fromPictureUri = path.toUri()
                     // We make a copy to ensure Bitmap will be Software and not Hardware, required for shortcuts
                     val bitmap = ImageDecoder.decodeBitmap(
                         ImageDecoder.createSource(context.contentResolver, fromPictureUri)
@@ -96,8 +92,7 @@ class ImageUtils {
 
         @AnyThread
         private fun getRoundBitmap(bitmap: Bitmap): Bitmap {
-            val output =
-                Bitmap.createBitmap(bitmap.width, bitmap.height, Bitmap.Config.ARGB_8888)
+            val output = createBitmap(bitmap.width, bitmap.height)
             val canvas = Canvas(output)
             val color = -0xbdbdbe
             val paint = Paint()
diff --git a/app/src/main/java/org/linphone/utils/LinphoneUtils.kt b/app/src/main/java/org/linphone/utils/LinphoneUtils.kt
index 7e77a3d4d..fe594e7fd 100644
--- a/app/src/main/java/org/linphone/utils/LinphoneUtils.kt
+++ b/app/src/main/java/org/linphone/utils/LinphoneUtils.kt
@@ -63,8 +63,6 @@ class LinphoneUtils {
         const val RECORDING_FILE_NAME_URI_TIMESTAMP_SEPARATOR = "_on_"
         const val RECORDING_FILE_EXTENSION = ".smff"
 
-        private const val CHAT_ROOM_ID_SEPARATOR = "#~#"
-
         @WorkerThread
         fun getDefaultAccount(): Account? {
             return coreContext.core.defaultAccount ?: coreContext.core.accountList.firstOrNull()
@@ -96,7 +94,9 @@ class LinphoneUtils {
         @WorkerThread
         fun getDisplayName(address: Address?): String {
             if (address == null) return "[null]"
-            if (address.displayName == null) {
+
+            val displayName = address.displayName
+            if (displayName.isNullOrEmpty()) {
                 val account = coreContext.core.accountList.find { account ->
                     account.params.identityAddress?.asStringUriOnly() == address.asStringUriOnly()
                 }
@@ -106,8 +106,13 @@ class LinphoneUtils {
                     return localDisplayName
                 }
             }
+
             // Do not return an empty display name
-            return address.displayName ?: address.username ?: address.asString()
+            return if (displayName.isNullOrEmpty()) {
+                address.username ?: address.asString()
+            } else {
+                displayName
+            }
         }
 
         @WorkerThread
@@ -226,7 +231,7 @@ class LinphoneUtils {
             val isIncoming = isCallIncoming(call.state)
             return if (isConference || getConferenceInfoIfAny(call) != null) {
                 true
-            } else if (isIncoming) {
+            } else if (isIncoming || call.state == Call.State.Connected) { // In connected state call.currentParams.isVideoEnabled will return false...
                 call.remoteParams?.isVideoEnabled == true && call.remoteParams?.videoDirection != MediaDirection.Inactive
             } else {
                 call.currentParams.isVideoEnabled && call.currentParams.videoDirection != MediaDirection.Inactive
@@ -272,7 +277,7 @@ class LinphoneUtils {
             conferenceParams.subject = subject
 
             // Enable end-to-end encryption if client supports it
-            conferenceParams.securityLevel = if (isEndToEndEncryptedChatAvailable(core)) {
+            conferenceParams.securityLevel = if (corePreferences.createEndToEndEncryptedMeetingsAndGroupCalls) {
                 Log.i("$TAG Requesting EndToEnd security level for conference")
                 Conference.SecurityLevel.EndToEnd
             } else {
@@ -397,6 +402,9 @@ class LinphoneUtils {
                 ChatMessage.State.InProgress, ChatMessage.State.FileTransferInProgress -> {
                     R.drawable.animated_in_progress
                 }
+                ChatMessage.State.PendingDelivery -> {
+                    R.drawable.hourglass
+                }
                 else -> {
                     R.drawable.animated_in_progress
                 }
@@ -429,40 +437,8 @@ class LinphoneUtils {
         }
 
         @WorkerThread
-        fun getChatRoomId(room: ChatRoom): String {
-            return getChatRoomId(room.localAddress, room.peerAddress)
-        }
-
-        @WorkerThread
-        fun getChatRoomId(localAddress: Address, remoteAddress: Address): String {
-            val localSipUri = localAddress.clone()
-            localSipUri.clean()
-            val remoteSipUri = remoteAddress.clone()
-            remoteSipUri.clean()
-            return getChatRoomId(localSipUri.asStringUriOnly(), remoteSipUri.asStringUriOnly())
-        }
-
-        @AnyThread
-        fun getChatRoomId(localSipUri: String, remoteSipUri: String): String {
-            return "$localSipUri$CHAT_ROOM_ID_SEPARATOR$remoteSipUri"
-        }
-
-        @AnyThread
-        fun getLocalAndPeerSipUrisFromChatRoomId(id: String): Pair<String, String>? {
-            val split = id.split(CHAT_ROOM_ID_SEPARATOR)
-            if (split.size == 2) {
-                val localAddress = split[0]
-                val peerAddress = split[1]
-                Log.i(
-                    "$TAG Got local [$localAddress] and peer [$peerAddress] SIP URIs from conversation id [$id]"
-                )
-                return Pair(localAddress, peerAddress)
-            } else {
-                Log.e(
-                    "$TAG Failed to parse conversation id [$id] with separator [$CHAT_ROOM_ID_SEPARATOR]"
-                )
-            }
-            return null
+        fun getConversationId(chatRoom: ChatRoom): String {
+            return chatRoom.identifier ?: ""
         }
 
         @WorkerThread
diff --git a/app/src/main/java/org/linphone/utils/RecyclerViewHeaderDecoration.kt b/app/src/main/java/org/linphone/utils/RecyclerViewHeaderDecoration.kt
index 429fa1416..6ce5e53d2 100644
--- a/app/src/main/java/org/linphone/utils/RecyclerViewHeaderDecoration.kt
+++ b/app/src/main/java/org/linphone/utils/RecyclerViewHeaderDecoration.kt
@@ -26,6 +26,7 @@ import android.util.SparseArray
 import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
+import androidx.core.graphics.withSave
 
 class RecyclerViewHeaderDecoration(
     private val context: Context,
@@ -90,16 +91,17 @@ class RecyclerViewHeaderDecoration(
             // Maps the visible view position to the item index in the adapter
             val position = parent.getChildAdapterPosition(child)
             if (position != RecyclerView.NO_POSITION && adapter.displayHeaderForPosition(position)) {
-                canvas.save()
-                val headerView: View = headers.get(position) ?: adapter.getHeaderViewForPosition(
-                    context,
-                    position
-                )
-                if (position != 0 || child.y < headerView.height) {
-                    canvas.translate(0f, child.y - headerView.height)
+                canvas.withSave {
+                    val headerView: View =
+                        headers.get(position) ?: adapter.getHeaderViewForPosition(
+                            context,
+                            position
+                        )
+                    if (position != 0 || child.y < headerView.height) {
+                        translate(0f, child.y - headerView.height)
+                    }
+                    headerView.draw(this)
                 }
-                headerView.draw(canvas)
-                canvas.restore()
             }
         }
     }
@@ -114,20 +116,21 @@ class RecyclerViewHeaderDecoration(
             val child = parent.getChildAt(index)
             val position = parent.getChildAdapterPosition(child)
             if (position != RecyclerView.NO_POSITION && adapter.displayHeaderForPosition(position)) {
-                canvas.save()
-                val headerView: View = headers.get(position) ?: adapter.getHeaderViewForPosition(
-                    context,
-                    position
-                )
+                canvas.withSave {
+                    val headerView: View =
+                        headers.get(position) ?: adapter.getHeaderViewForPosition(
+                            context,
+                            position
+                        )
 
-                val top = child.y - headerView.height
-                if (top >= 0) { // don't move the first header
-                    canvas.translate(0f, top)
+                    val top = child.y - headerView.height
+                    if (top >= 0) { // don't move the first header
+                        translate(0f, top)
+                    }
+
+                    headerView.draw(this)
                 }
 
-                headerView.draw(canvas)
-                canvas.restore()
-
                 latestPositionHeaderFound = position
                 nextHeaderTopPosition = child.y
             }
@@ -140,20 +143,21 @@ class RecyclerViewHeaderDecoration(
             val topVisibleChildPosition = parent.getChildAdapterPosition(topVisibleChild)
             for (position in topVisibleChildPosition downTo 0) {
                 if (adapter.displayHeaderForPosition(position)) {
-                    canvas.save()
-                    val headerView: View = headers.get(position) ?: adapter.getHeaderViewForPosition(
-                        context,
-                        position
-                    )
+                    canvas.withSave {
+                        val headerView: View =
+                            headers.get(position) ?: adapter.getHeaderViewForPosition(
+                                context,
+                                position
+                            )
 
-                    // Do not translate it as we want it sticky to the top unless in contact with next header
-                    if (nextHeaderTopPosition > 0 && nextHeaderTopPosition <= (headerView.height * 2)) {
-                        val top = nextHeaderTopPosition - (headerView.height * 2)
-                        canvas.translate(0f, top)
+                        // Do not translate it as we want it sticky to the top unless in contact with next header
+                        if (nextHeaderTopPosition > 0 && nextHeaderTopPosition <= (headerView.height * 2)) {
+                            val top = nextHeaderTopPosition - (headerView.height * 2)
+                            translate(0f, top)
+                        }
+
+                        headerView.draw(this)
                     }
-
-                    headerView.draw(canvas)
-                    canvas.restore()
                     break
                 }
             }
diff --git a/app/src/main/java/org/linphone/utils/ShortcutUtils.kt b/app/src/main/java/org/linphone/utils/ShortcutUtils.kt
index a70a1c2bb..381a1baef 100644
--- a/app/src/main/java/org/linphone/utils/ShortcutUtils.kt
+++ b/app/src/main/java/org/linphone/utils/ShortcutUtils.kt
@@ -37,6 +37,8 @@ import org.linphone.core.ChatRoom
 import org.linphone.core.tools.Log
 import org.linphone.mediastream.Version
 import org.linphone.ui.main.MainActivity
+import org.linphone.ui.main.MainActivity.Companion.ARGUMENTS_CHAT
+import org.linphone.ui.main.MainActivity.Companion.ARGUMENTS_CONVERSATION_ID
 
 class ShortcutUtils {
     companion object {
@@ -44,7 +46,7 @@ class ShortcutUtils {
 
         @WorkerThread
         fun removeShortcutToChatRoom(chatRoom: ChatRoom) {
-            val id = LinphoneUtils.getChatRoomId(chatRoom)
+            val id = LinphoneUtils.getConversationId(chatRoom)
             Log.i("$TAG Removing shortcut to conversation [$id]")
             ShortcutManagerCompat.removeLongLivedShortcuts(coreContext.context, arrayListOf(id))
         }
@@ -65,9 +67,11 @@ class ShortcutUtils {
 
             var count = 0
             for (chatRoom in defaultAccount.chatRooms) {
-                if (defaultAccount.params.instantMessagingEncryptionMandatory && !chatRoom.currentParams.isEncryptionEnabled) {
+                if (defaultAccount.params.instantMessagingEncryptionMandatory &&
+                    !chatRoom.hasCapability(ChatRoom.Capabilities.Encrypted.toInt())
+                ) {
                     Log.w(
-                        "$TAG Account is in secure mode, skipping not encrypted conversation [${LinphoneUtils.getChatRoomId(
+                        "$TAG Account is in secure mode, skipping not encrypted conversation [${LinphoneUtils.getConversationId(
                             chatRoom
                         )}]"
                     )
@@ -99,9 +103,8 @@ class ShortcutUtils {
 
         @WorkerThread
         private fun createChatRoomShortcut(context: Context, chatRoom: ChatRoom): ShortcutInfoCompat? {
-            val localAddress = chatRoom.localAddress
             val peerAddress = chatRoom.peerAddress
-            val id = LinphoneUtils.getChatRoomId(localAddress, peerAddress)
+            val id = LinphoneUtils.getConversationId(chatRoom)
 
             try {
                 val categories: ArraySet<String> = ArraySet()
@@ -145,19 +148,14 @@ class ShortcutUtils {
                 val persons = arrayOfNulls<Person>(personsList.size)
                 personsList.toArray(persons)
 
-                val localSipUri = localAddress.asStringUriOnly()
-                val peerSipUri = peerAddress.asStringUriOnly()
-
                 val args = Bundle()
-                args.putString("RemoteSipUri", peerSipUri)
-                args.putString("LocalSipUri", localSipUri)
+                args.putString(ARGUMENTS_CONVERSATION_ID, id)
 
                 val intent = Intent(Intent.ACTION_MAIN)
                 intent.setClass(context, MainActivity::class.java)
                 intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK)
-                intent.putExtra("Chat", true)
-                intent.putExtra("RemoteSipUri", peerSipUri)
-                intent.putExtra("LocalSipUri", localSipUri)
+                intent.putExtra(ARGUMENTS_CHAT, true)
+                intent.putExtra(ARGUMENTS_CONVERSATION_ID, id)
 
                 return ShortcutInfoCompat.Builder(context, id)
                     .setShortLabel(subject)
@@ -177,7 +175,7 @@ class ShortcutUtils {
 
         @WorkerThread
         fun isShortcutToChatRoomAlreadyCreated(context: Context, chatRoom: ChatRoom): Boolean {
-            val id = LinphoneUtils.getChatRoomId(chatRoom)
+            val id = LinphoneUtils.getConversationId(chatRoom)
             val found = ShortcutManagerCompat.getDynamicShortcuts(context).find {
                 it.id == id
             }
diff --git a/app/src/main/java/org/linphone/utils/TimestampUtils.kt b/app/src/main/java/org/linphone/utils/TimestampUtils.kt
index 3564e94de..098300030 100644
--- a/app/src/main/java/org/linphone/utils/TimestampUtils.kt
+++ b/app/src/main/java/org/linphone/utils/TimestampUtils.kt
@@ -31,8 +31,6 @@ import org.linphone.R
 
 class TimestampUtils {
     companion object {
-        private const val TAG = "[Timestamp Utils]"
-
         @AnyThread
         fun isToday(timestamp: Long, timestampInSecs: Boolean = true): Boolean {
             val cal = getCalendar()
diff --git a/app/src/main/res/color/primary_color_selector.xml b/app/src/main/res/color/primary_color_selector.xml
deleted file mode 100644
index ef163e8da..000000000
--- a/app/src/main/res/color/primary_color_selector.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="false" android:color="?attr/color_main1_100"/>
-    <item android:color="?attr/color_main1_500"/>
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/action_background.xml b/app/src/main/res/drawable/action_background.xml
deleted file mode 100644
index 7c5b2c70e..000000000
--- a/app/src/main/res/drawable/action_background.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_selected="true"
-        android:drawable="@drawable/shape_rectangle_gray_background" />
-    <item android:state_pressed="true"
-        android:drawable="@drawable/shape_rectangle_gray_background" />
-    <item
-        android:drawable="@color/transparent_color" />
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/assistant_logo.xml b/app/src/main/res/drawable/assistant_logo.xml
new file mode 100644
index 000000000..f0112e52a
--- /dev/null
+++ b/app/src/main/res/drawable/assistant_logo.xml
@@ -0,0 +1,297 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="395dp"
+    android:height="350dp"
+    android:viewportWidth="395"
+    android:viewportHeight="350">
+  <group>
+    <clip-path
+        android:pathData="M0,0h395v350h-395z"/>
+    <path
+        android:pathData="M57.85,320.37C134.98,359.88 260.02,359.88 337.15,320.37C414.28,280.86 414.28,216.81 337.15,177.3C260.02,137.79 134.98,137.79 57.85,177.3C-19.28,216.81 -19.28,280.86 57.85,320.37Z"
+        android:strokeAlpha="0.8"
+        android:fillColor="#F9F9F9"
+        android:fillAlpha="0.8"/>
+    <path
+        android:pathData="M310.09,257.25C314.32,259.7 322.62,258.85 328.64,255.37L363.35,235.18C369.37,231.7 370.82,226.89 366.58,224.43C362.35,221.99 354.04,222.82 348.02,226.31L313.34,246.51C307.32,249.99 305.87,254.8 310.1,257.24L310.09,257.25Z"
+        android:strokeAlpha="0.8"
+        android:fillColor="#EDEDED"
+        android:fillAlpha="0.8"/>
+    <path
+        android:pathData="M101.18,275.87L65.87,255.46L101.17,235.03L101.18,275.87Z"
+        android:strokeAlpha="0.8"
+        android:fillColor="#EDEDED"
+        android:fillAlpha="0.8"/>
+    <path
+        android:pathData="M200.93,288.09L144.04,255.16L200.95,222.29L200.93,288.09Z"
+        android:strokeAlpha="0.8"
+        android:fillColor="#EDEDED"
+        android:fillAlpha="0.8"/>
+    <path
+        android:pathData="M50.31,263.65C49.33,263.65 48.74,262.83 48.74,261.46V115.01L227.74,11.48V157.34C227.74,159.57 226.17,162.31 224.23,163.42L51.74,263.2C51.23,263.5 50.74,263.65 50.31,263.65Z"
+        android:strokeAlpha="0.8"
+        android:fillColor="#FAFAFA"
+        android:fillAlpha="0.8"/>
+    <path
+        android:pathData="M227.23,12.35V157.33C227.23,159.37 225.74,161.96 223.98,162.99L51.49,262.77C51.06,263.01 50.65,263.14 50.31,263.14C49.35,263.14 49.24,261.98 49.24,261.47V115.32L227.23,12.35ZM228.24,10.59L48.23,114.72V261.47C48.23,263.18 49.08,264.16 50.31,264.16C50.82,264.16 51.39,264 51.99,263.65L224.48,163.86C226.56,162.66 228.24,159.74 228.24,157.33V10.59Z"
+        android:strokeAlpha="0.8"
+        android:fillColor="#E0E0E0"
+        android:fillAlpha="0.8"/>
+    <path
+        android:pathData="M48.23,114.72V139.23L228.24,35.1V10.59L48.23,114.72Z"
+        android:strokeAlpha="0.8"
+        android:fillColor="#FE5E00"
+        android:fillAlpha="0.8"/>
+    <path
+        android:pathData="M62.35,116.03V119.55C62.35,120.26 62.86,120.56 63.48,120.2L118.82,88.19V82.06L63.48,114.07C62.86,114.43 62.35,115.32 62.35,116.03Z"
+        android:strokeAlpha="0.8"
+        android:fillColor="#FAFAFA"
+        android:fillAlpha="0.8"/>
+    <path
+        android:pathData="M124.75,78.63C125.38,78.27 125.88,78.56 125.88,79.28V82.8C125.88,83.52 125.38,84.4 124.75,84.76L118.81,88.19V82.06L124.75,78.63Z"
+        android:strokeAlpha="0.8"
+        android:fillColor="#22334D"
+        android:fillAlpha="0.8"/>
+    <path
+        android:pathData="M48.23,106.83C48.23,104.43 49.91,101.5 51.99,100.3L224.48,0.51C226.56,-0.69 228.24,0.29 228.24,2.69V10.59L48.23,114.72V106.83Z"
+        android:strokeAlpha="0.8"
+        android:fillColor="#22334D"
+        android:fillAlpha="0.8"/>
+    <path
+        android:pathData="M208.24,14.01C207.27,14.57 206.48,15.94 206.48,17.07C206.48,18.21 207.27,18.66 208.24,18.09C209.21,17.53 210.01,16.16 210.01,15.03C210.01,13.9 209.21,13.44 208.24,14.01Z"
+        android:strokeAlpha="0.8"
+        android:fillColor="#4FAE80"
+        android:fillAlpha="0.8"/>
+    <path
+        android:pathData="M213.83,10.77C212.85,11.34 212.06,12.7 212.06,13.83C212.06,14.97 212.85,15.42 213.83,14.85C214.8,14.29 215.59,12.92 215.59,11.79C215.59,10.66 214.8,10.2 213.83,10.77Z"
+        android:strokeAlpha="0.8"
+        android:fillColor="#FFDC2E"
+        android:fillAlpha="0.8"/>
+    <path
+        android:pathData="M219.42,7.53C218.45,8.1 217.66,9.46 217.66,10.6C217.66,11.73 218.45,12.18 219.42,11.61C220.4,11.05 221.19,9.68 221.19,8.55C221.19,7.42 220.4,6.97 219.42,7.53Z"
+        android:strokeAlpha="0.8"
+        android:fillColor="#DD5F5F"
+        android:fillAlpha="0.8"/>
+    <path
+        android:pathData="M171.77,51.05C169.64,52.28 167.91,55.28 167.91,57.74C167.91,60.21 169.64,61.21 171.77,59.97C173.9,58.73 175.63,55.74 175.63,53.27C175.63,50.81 173.9,49.81 171.77,51.05Z"
+        android:strokeAlpha="0.1"
+        android:fillColor="#000000"
+        android:fillAlpha="0.1"/>
+    <path
+        android:pathData="M154.12,61.26C151.99,62.5 150.26,65.49 150.26,67.95C150.26,70.42 151.99,71.42 154.12,70.18C156.25,68.95 157.98,65.95 157.98,63.49C157.98,61.02 156.25,60.02 154.12,61.26Z"
+        android:strokeAlpha="0.1"
+        android:fillColor="#000000"
+        android:fillAlpha="0.1"/>
+    <path
+        android:pathData="M189.42,40.84C187.29,42.08 185.56,45.07 185.56,47.54C185.56,50 187.29,51 189.42,49.77C191.55,48.53 193.28,45.53 193.28,43.07C193.28,40.61 191.55,39.61 189.42,40.84Z"
+        android:strokeAlpha="0.1"
+        android:fillColor="#000000"
+        android:fillAlpha="0.1"/>
+    <path
+        android:pathData="M207.07,30.61C204.94,31.85 203.21,34.84 203.21,37.31C203.21,39.77 204.94,40.77 207.07,39.54C209.2,38.3 210.93,35.3 210.93,32.84C210.93,30.38 209.2,29.38 207.07,30.61Z"
+        android:strokeAlpha="0.1"
+        android:fillColor="#000000"
+        android:fillAlpha="0.1"/>
+    <path
+        android:pathData="M66.11,141.13L108,116.9C110.08,115.7 111.77,116.68 111.77,119.08V159.38C111.77,161.78 110.08,164.71 108,165.91L66.11,190.14C64.03,191.34 62.35,190.37 62.35,187.96V147.66C62.35,145.26 64.03,142.33 66.11,141.13Z"
+        android:strokeAlpha="0.8"
+        android:fillColor="#C0D1D9"
+        android:fillAlpha="0.8"/>
+    <path
+        android:pathData="M126.11,106.43L213.89,55.65C215.97,54.45 217.65,55.43 217.65,57.83V98.13C217.65,100.53 215.97,103.46 213.89,104.66L126.11,155.44C124.04,156.64 122.35,155.66 122.35,153.26V112.96C122.35,110.56 124.04,107.63 126.11,106.43Z"
+        android:strokeAlpha="0.8"
+        android:fillColor="#C0D1D9"
+        android:fillAlpha="0.8"/>
+    <path
+        android:pathData="M66.11,202.39L132.71,163.86C134.79,162.66 136.47,163.52 136.47,165.77C136.47,168.03 134.79,170.83 132.71,172.03L66.11,210.56C64.03,211.76 62.35,210.9 62.35,208.65C62.35,206.4 64.03,203.59 66.11,202.39Z"
+        android:strokeAlpha="0.8"
+        android:fillColor="#C0D1D9"
+        android:fillAlpha="0.8"/>
+    <path
+        android:pathData="M66.11,216.69L132.71,178.16C134.79,176.96 136.47,177.81 136.47,180.07C136.47,182.32 134.79,185.13 132.71,186.33L66.11,224.85C64.03,226.05 62.35,225.2 62.35,222.95C62.35,220.69 64.03,217.89 66.11,216.69Z"
+        android:strokeAlpha="0.8"
+        android:fillColor="#C0D1D9"
+        android:fillAlpha="0.8"/>
+    <path
+        android:pathData="M97.65,182.51C97.65,181.07 98.65,179.32 99.91,178.6L215.4,111.78C216.64,111.06 218.67,111.06 219.92,111.78L222.47,113.25C223.71,113.98 224.73,115.73 224.73,117.17V205.87C224.73,207.31 223.71,209.07 222.47,209.79L106.97,276.6C105.73,277.32 103.69,277.32 102.45,276.6L99.91,275.13C98.66,274.42 97.65,272.65 97.65,271.21V182.51Z"
+        android:strokeAlpha="0.8"
+        android:fillColor="#FE5E00"
+        android:fillAlpha="0.8"/>
+    <path
+        android:pathData="M98.3,180.28L104.7,183.99L224.05,114.94C223.64,114.24 223.07,113.62 222.46,113.25L219.9,111.79C218.66,111.06 216.63,111.06 215.39,111.79L99.9,178.6C99.26,178.96 98.7,179.58 98.3,180.28Z"
+        android:strokeAlpha="0.4"
+        android:fillColor="#ffffff"
+        android:fillAlpha="0.4"/>
+    <path
+        android:pathData="M97.64,182.51V271.21C97.64,272.66 98.65,274.41 99.91,275.13L102.45,276.61C102.64,276.72 102.84,276.81 103.07,276.89C103.36,276.99 103.67,277.07 104,277.11C104.59,277.19 105.21,277.16 105.78,277.05C105.93,277.01 106.07,276.97 106.21,276.93C106.31,276.89 106.4,276.87 106.48,276.82C106.07,276.97 105.7,276.95 105.41,276.8C104.98,276.58 104.71,276.07 104.71,275.32V186.61C104.71,185.68 105.18,184.98 105.88,184.69L104.71,184L98.31,180.3C97.9,181.01 97.65,181.81 97.65,182.53L97.64,182.51Z"
+        android:strokeAlpha="0.1"
+        android:fillColor="#000000"
+        android:fillAlpha="0.1"/>
+    <path
+        android:pathData="M104.71,183.99L158.2,204.01C162.01,205.43 166.29,204.02 168.51,200.6L177.1,187.42L224.47,114.7L178.81,187.92L224.71,205.92C224.7,206.65 224.43,207.46 224,208.17L178.69,188.12L168.7,204.12C166.41,207.8 161.77,209.23 157.82,207.48L150.71,204.33L105.41,276.79C104.98,276.56 104.71,276.05 104.71,275.3V273.82L150.5,204.24L104.71,183.99Z"
+        android:strokeAlpha="0.2"
+        android:fillColor="#000000"
+        android:fillAlpha="0.2"/>
+    <path
+        android:pathData="M200.01,82.15V285.8C200.01,288.2 201.7,289.18 203.77,287.98L295.08,235.15C297.16,233.95 298.85,231.03 298.85,228.62V24.99C298.85,22.58 297.16,21.61 295.08,22.81L203.77,75.63C201.7,76.83 200.01,79.76 200.01,82.16V82.15Z"
+        android:strokeAlpha="0.8"
+        android:strokeWidth="1.17"
+        android:fillColor="#FAFAFA"
+        android:strokeColor="#E0E0E0"
+        android:fillAlpha="0.8"/>
+    <path
+        android:pathData="M205.3,85.95C205.3,85.38 205.74,84.68 206.29,84.37L216.69,78.35C217.23,78.04 217.67,78.24 217.67,78.8C217.67,79.36 217.23,80.07 216.69,80.39L206.29,86.4C205.75,86.72 205.3,86.51 205.3,85.95Z"
+        android:strokeAlpha="0.8"
+        android:fillColor="#22334D"
+        android:fillAlpha="0.8"/>
+    <path
+        android:pathData="M205.3,90.01C205.3,89.44 205.74,88.74 206.29,88.42L216.69,82.41C217.23,82.09 217.67,82.3 217.67,82.86C217.67,83.42 217.23,84.13 216.69,84.44L206.29,90.46C205.75,90.77 205.3,90.56 205.3,90.01Z"
+        android:strokeAlpha="0.8"
+        android:fillColor="#22334D"
+        android:fillAlpha="0.8"/>
+    <path
+        android:pathData="M205.3,94.06C205.3,93.5 205.74,92.79 206.29,92.48L216.69,86.46C217.23,86.15 217.67,86.36 217.67,86.92C217.67,87.47 217.23,88.19 216.69,88.5L206.29,94.52C205.75,94.83 205.3,94.62 205.3,94.06Z"
+        android:strokeAlpha="0.8"
+        android:fillColor="#22334D"
+        android:fillAlpha="0.8"/>
+    <path
+        android:pathData="M291.78,41.84V40.22C291.78,40.12 291.71,40.08 291.63,40.11L290.38,40.68C290.29,40.72 290.19,40.68 290.17,40.58C290.1,40.35 290,40.15 289.89,39.96C289.84,39.88 289.83,39.74 289.87,39.66L290.71,37.97C290.75,37.88 290.71,37.77 290.63,37.72L289.72,37.2C289.64,37.15 289.53,37.18 289.47,37.26L288.43,38.83C288.38,38.91 288.26,38.97 288.16,38.97C287.94,38.97 287.72,38.99 287.48,39.04C287.39,39.06 287.31,39 287.29,38.91L287.15,37.54C287.14,37.45 287.07,37.4 286.99,37.46L285.58,38.26C285.49,38.32 285.42,38.43 285.41,38.53L285.27,40.09C285.27,40.19 285.2,40.32 285.13,40.39C284.86,40.64 284.59,40.92 284.35,41.22C284.28,41.29 284.16,41.33 284.07,41.29L283.16,40.98C283.07,40.95 282.95,40.99 282.91,41.08L281.88,42.87C281.83,42.96 281.85,43.07 281.92,43.14L282.64,43.77C282.71,43.83 282.75,43.96 282.71,44.05C282.58,44.41 282.47,44.78 282.39,45.13C282.37,45.23 282.29,45.35 282.21,45.4L280.92,46.31C280.84,46.36 280.77,46.49 280.77,46.59V48.22C280.77,48.31 280.84,48.36 280.93,48.32L282.18,47.75C282.27,47.71 282.36,47.75 282.39,47.85C282.46,48.08 282.55,48.29 282.67,48.47C282.72,48.56 282.73,48.69 282.68,48.77L281.85,50.45C281.81,50.54 281.84,50.65 281.93,50.7L282.83,51.22C282.92,51.27 283.02,51.25 283.08,51.16L284.13,49.59C284.18,49.51 284.3,49.45 284.4,49.45C284.61,49.45 284.84,49.44 285.08,49.38C285.17,49.37 285.25,49.42 285.27,49.51L285.4,50.88C285.41,50.98 285.49,51.02 285.57,50.97L286.98,50.16C287.07,50.11 287.14,49.99 287.14,49.9L287.28,48.33C287.29,48.23 287.36,48.1 287.43,48.03C287.7,47.78 287.97,47.5 288.21,47.21C288.27,47.13 288.39,47.09 288.49,47.13L289.39,47.44C289.49,47.48 289.6,47.43 289.65,47.35L290.68,45.55C290.73,45.47 290.71,45.35 290.64,45.28L289.92,44.66C289.85,44.59 289.81,44.46 289.85,44.38C289.98,44.01 290.09,43.65 290.17,43.29C290.18,43.19 290.27,43.07 290.35,43.02L291.64,42.11C291.71,42.06 291.78,41.93 291.78,41.83V41.84ZM286.28,46.95C284.97,47.71 283.91,47.09 283.91,45.58C283.91,44.06 284.97,42.22 286.28,41.46C287.6,40.7 288.65,41.32 288.65,42.84C288.65,44.35 287.6,46.2 286.28,46.95Z"
+        android:strokeAlpha="0.8"
+        android:fillColor="#22334D"
+        android:fillAlpha="0.8"/>
+    <path
+        android:pathData="M249.43,81.98C260.1,75.81 268.75,80.81 268.75,93.15C268.75,105.49 260.1,120.51 249.43,126.67C238.76,132.84 230.11,127.84 230.11,115.49C230.11,103.15 238.76,88.14 249.43,81.97V81.98Z"
+        android:strokeAlpha="0.8"
+        android:fillColor="#EDEDED"
+        android:fillAlpha="0.8"/>
+    <path
+        android:pathData="M249.29,91.7C252.75,89.69 255.56,91.31 255.56,95.32C255.56,99.32 252.75,104.19 249.29,106.19C245.83,108.19 243.02,106.58 243.02,102.57C243.02,98.57 245.83,93.7 249.29,91.7Z"
+        android:strokeAlpha="0.8"
+        android:fillColor="#FE5E00"
+        android:fillAlpha="0.8"/>
+    <path
+        android:pathData="M261.64,113.04C261.64,106.46 257.02,103.8 251.34,107.09L247.79,109.14C242.1,112.43 237.49,120.44 237.49,127.01V128.8C238.51,129.14 239.63,129.32 240.81,129.32C243.4,129.32 246.33,128.46 249.42,126.67C254.05,123.99 258.31,119.64 261.64,114.56V113.04V113.04Z"
+        android:strokeAlpha="0.8"
+        android:fillColor="#FE5E00"
+        android:fillAlpha="0.8"/>
+    <path
+        android:pathData="M231.99,145.04L266.86,124.87C267.9,124.27 268.75,124.69 268.75,125.83C268.75,126.96 267.9,128.35 266.86,128.96L231.99,149.13C230.95,149.73 230.1,149.31 230.1,148.18C230.1,147.04 230.95,145.65 231.99,145.04Z"
+        android:strokeAlpha="0.8"
+        android:fillColor="#FE5E00"
+        android:fillAlpha="0.8"/>
+    <path
+        android:pathData="M228.24,159.47L270.6,134.94C271.64,134.34 272.48,134.77 272.48,135.9C272.48,137.03 271.64,138.42 270.6,139.03L228.24,163.56C227.2,164.16 226.36,163.73 226.36,162.6C226.36,161.47 227.2,160.08 228.24,159.47Z"
+        android:strokeAlpha="0.8"
+        android:fillColor="#22334D"
+        android:fillAlpha="0.8"/>
+    <path
+        android:pathData="M214.36,196.74L284.48,156.18C286.56,154.98 288.25,155.83 288.25,158.08C288.25,160.34 286.56,163.14 284.48,164.34L214.36,204.91C212.28,206.11 210.6,205.26 210.6,203C210.6,200.74 212.28,197.94 214.36,196.74Z"
+        android:strokeAlpha="0.8"
+        android:fillColor="#C0D1D9"
+        android:fillAlpha="0.8"/>
+    <path
+        android:pathData="M214.36,213.07L284.48,172.51C286.56,171.31 288.25,172.16 288.25,174.42C288.25,176.67 286.56,179.48 284.48,180.68L214.36,221.24C212.28,222.44 210.6,221.59 210.6,219.33C210.6,217.08 212.28,214.27 214.36,213.07Z"
+        android:strokeAlpha="0.8"
+        android:fillColor="#C0D1D9"
+        android:fillAlpha="0.8"/>
+    <path
+        android:pathData="M237.19,220.29L261.67,206.13C262.71,205.53 263.55,206.02 263.55,207.22V215.12C263.55,216.32 262.71,217.78 261.67,218.38L237.19,232.54C236.14,233.14 235.3,232.65 235.3,231.45V223.56C235.3,222.35 236.14,220.89 237.18,220.29H237.19Z"
+        android:strokeAlpha="0.8"
+        android:fillColor="#FE5E00"
+        android:fillAlpha="0.8"/>
+    <path
+        android:pathData="M215.9,197.94C214.92,198.51 214.13,199.87 214.13,201.01C214.13,202.14 214.92,202.59 215.9,202.02C216.87,201.46 217.66,200.09 217.66,198.96C217.66,197.83 216.87,197.38 215.9,197.94Z"
+        android:strokeAlpha="0.8"
+        android:fillColor="#FAFAFA"
+        android:fillAlpha="0.8"/>
+    <path
+        android:pathData="M221.48,194.7C220.51,195.27 219.72,196.63 219.72,197.77C219.72,198.9 220.51,199.35 221.48,198.79C222.46,198.22 223.25,196.85 223.25,195.72C223.25,194.59 222.46,194.14 221.48,194.7Z"
+        android:strokeAlpha="0.8"
+        android:fillColor="#FAFAFA"
+        android:fillAlpha="0.8"/>
+    <path
+        android:pathData="M227.07,191.46C226.1,192.03 225.31,193.4 225.31,194.53C225.31,195.66 226.1,196.11 227.07,195.55C228.04,194.98 228.84,193.61 228.84,192.48C228.84,191.35 228.04,190.9 227.07,191.46Z"
+        android:strokeAlpha="0.8"
+        android:fillColor="#FAFAFA"
+        android:fillAlpha="0.8"/>
+    <path
+        android:pathData="M232.67,188.23C231.69,188.79 230.9,190.16 230.9,191.29C230.9,192.42 231.69,192.87 232.67,192.31C233.64,191.74 234.43,190.38 234.43,189.24C234.43,188.11 233.64,187.66 232.67,188.23Z"
+        android:strokeAlpha="0.8"
+        android:fillColor="#FAFAFA"
+        android:fillAlpha="0.8"/>
+    <path
+        android:pathData="M238.26,184.99C237.28,185.55 236.49,186.92 236.49,188.05C236.49,189.18 237.28,189.64 238.26,189.07C239.23,188.5 240.02,187.14 240.02,186.01C240.02,184.87 239.23,184.42 238.26,184.99Z"
+        android:strokeAlpha="0.8"
+        android:fillColor="#FAFAFA"
+        android:fillAlpha="0.8"/>
+    <path
+        android:pathData="M243.85,181.75C242.88,182.31 242.09,183.68 242.09,184.81C242.09,185.94 242.88,186.4 243.85,185.83C244.82,185.26 245.62,183.9 245.62,182.77C245.62,181.63 244.82,181.18 243.85,181.75Z"
+        android:strokeAlpha="0.8"
+        android:fillColor="#FAFAFA"
+        android:fillAlpha="0.8"/>
+    <path
+        android:pathData="M249.44,178.51C248.46,179.07 247.68,180.44 247.68,181.57C247.68,182.71 248.46,183.16 249.44,182.59C250.41,182.03 251.2,180.66 251.2,179.53C251.2,178.4 250.41,177.94 249.44,178.51Z"
+        android:strokeAlpha="0.8"
+        android:fillColor="#FAFAFA"
+        android:fillAlpha="0.8"/>
+    <path
+        android:pathData="M215.9,214.29C214.92,214.86 214.13,216.23 214.13,217.36C214.13,218.49 214.92,218.94 215.9,218.38C216.87,217.81 217.66,216.44 217.66,215.31C217.66,214.18 216.87,213.73 215.9,214.29Z"
+        android:strokeAlpha="0.8"
+        android:fillColor="#FAFAFA"
+        android:fillAlpha="0.8"/>
+    <path
+        android:pathData="M221.48,211.05C220.51,211.62 219.72,212.99 219.72,214.12C219.72,215.25 220.51,215.7 221.48,215.14C222.46,214.57 223.25,213.2 223.25,212.07C223.25,210.94 222.46,210.49 221.48,211.05Z"
+        android:strokeAlpha="0.8"
+        android:fillColor="#FAFAFA"
+        android:fillAlpha="0.8"/>
+    <path
+        android:pathData="M227.07,207.82C226.1,208.38 225.31,209.75 225.31,210.88C225.31,212.01 226.1,212.46 227.07,211.9C228.04,211.33 228.84,209.96 228.84,208.83C228.84,207.7 228.04,207.25 227.07,207.82Z"
+        android:strokeAlpha="0.8"
+        android:fillColor="#FAFAFA"
+        android:fillAlpha="0.8"/>
+    <path
+        android:pathData="M232.67,204.58C231.69,205.14 230.9,206.51 230.9,207.64C230.9,208.77 231.69,209.23 232.67,208.66C233.64,208.09 234.43,206.73 234.43,205.59C234.43,204.46 233.64,204.01 232.67,204.58Z"
+        android:strokeAlpha="0.8"
+        android:fillColor="#FAFAFA"
+        android:fillAlpha="0.8"/>
+    <path
+        android:pathData="M238.26,201.34C237.28,201.9 236.49,203.27 236.49,204.4C236.49,205.53 237.28,205.99 238.26,205.42C239.23,204.85 240.02,203.49 240.02,202.36C240.02,201.22 239.23,200.77 238.26,201.34Z"
+        android:strokeAlpha="0.8"
+        android:fillColor="#FAFAFA"
+        android:fillAlpha="0.8"/>
+    <path
+        android:pathData="M243.85,198.1C242.88,198.66 242.09,200.03 242.09,201.16C242.09,202.29 242.88,202.75 243.85,202.18C244.82,201.62 245.62,200.25 245.62,199.12C245.62,197.99 244.82,197.53 243.85,198.1Z"
+        android:strokeAlpha="0.8"
+        android:fillColor="#FAFAFA"
+        android:fillAlpha="0.8"/>
+    <path
+        android:pathData="M249.44,194.86C248.46,195.43 247.68,196.79 247.68,197.92C247.68,199.06 248.46,199.51 249.44,198.94C250.41,198.38 251.2,197.01 251.2,195.88C251.2,194.75 250.41,194.29 249.44,194.86Z"
+        android:strokeAlpha="0.8"
+        android:fillColor="#FAFAFA"
+        android:fillAlpha="0.8"/>
+    <path
+        android:pathData="M327.86,247.34C324.81,247.34 321.93,246.59 319.3,245.08C313.04,241.46 309.45,233.87 309.45,224.28C309.45,207.4 320.15,187.99 333.82,180.09C341.18,175.83 348.49,175.37 354.4,178.79C360.67,182.41 364.26,189.99 364.26,199.59C364.26,216.46 353.55,235.88 339.88,243.78C335.78,246.15 331.7,247.34 327.86,247.34ZM345.82,188.68C343.63,188.68 341.31,189.78 339.88,190.6C329.96,196.34 321.57,211.77 321.57,224.28C321.57,229.35 322.99,233.18 325.36,234.56C328.06,236.13 331.82,234.42 333.82,233.26C343.74,227.53 352.13,212.1 352.13,199.59C352.13,194.52 350.71,190.68 348.34,189.3C347.56,188.85 346.69,188.68 345.82,188.68Z"
+        android:strokeAlpha="0.8"
+        android:fillColor="#364860"
+        android:fillAlpha="0.8"/>
+    <path
+        android:pathData="M354.3,202.29C354.3,192.8 348.34,189.3 348.34,189.3C350.71,190.68 352.13,194.52 352.13,199.59C352.13,212.1 343.74,227.52 333.82,233.26C331.82,234.42 328.06,236.13 325.36,234.56C325.36,234.56 330.39,237.69 337.33,233.89C347.4,228.39 354.29,214.81 354.29,202.29L354.3,202.29Z"
+        android:strokeAlpha="0.8"
+        android:fillColor="#22334D"
+        android:fillAlpha="0.8"/>
+    <path
+        android:pathData="M344.74,83.8C344.74,80.33 341.93,77.52 338.47,77.52C335.02,77.52 332.21,80.33 332.21,83.8C332.21,83.8 332.21,83.81 332.21,83.82V183.69C332.21,184.62 332.82,185.54 334.04,186.25C336.49,187.67 340.45,187.67 342.9,186.25C344.13,185.54 344.74,184.61 344.74,183.69V83.82C344.74,83.82 344.74,83.81 344.74,83.8Z"
+        android:strokeAlpha="0.8"
+        android:fillColor="#22334D"
+        android:fillAlpha="0.8"/>
+    <path
+        android:pathData="M339.73,106.11C339.73,103.8 338.12,100.99 336.11,99.84C335.09,99.25 334.18,99.21 333.52,99.61L318.05,108.54L317.68,108.76C317.63,108.79 317.58,108.81 317.53,108.85C317.26,109.03 317.02,109.23 316.79,109.46C315.85,110.39 315.28,111.68 315.28,113.1C315.28,115.05 316.36,116.74 317.95,117.62C318.68,118.01 319.5,118.23 320.4,118.23C321.29,118.23 322.12,118.01 322.84,117.62C322.94,117.56 323.04,117.5 323.14,117.45L338.7,108.46C339.34,108.08 339.74,107.27 339.74,106.12L339.73,106.11Z"
+        android:strokeAlpha="0.8"
+        android:fillColor="#364860"
+        android:fillAlpha="0.8"/>
+    <path
+        android:pathData="M339.73,131.13C339.73,128.81 338.12,126 336.11,124.85C335.09,124.26 334.18,124.22 333.52,124.62L315.39,135.05L315.02,135.27C314.97,135.3 314.92,135.32 314.87,135.36C314.6,135.53 314.36,135.74 314.13,135.97C313.2,136.9 312.62,138.19 312.62,139.61C312.62,141.56 313.7,143.25 315.29,144.13C316.02,144.52 316.85,144.74 317.74,144.74C318.64,144.74 319.46,144.52 320.18,144.13C320.28,144.07 320.38,144.01 320.48,143.96L338.7,133.48C339.34,133.1 339.74,132.29 339.74,131.14L339.73,131.13Z"
+        android:strokeAlpha="0.8"
+        android:fillColor="#364860"
+        android:fillAlpha="0.8"/>
+  </group>
+</vector>
diff --git a/app/src/main/res/drawable/color_main2_500.xml b/app/src/main/res/drawable/color_main2_500.xml
deleted file mode 100644
index 41f327408..000000000
--- a/app/src/main/res/drawable/color_main2_500.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <solid android:color="?attr/color_main2_500" />
-</shape>
diff --git a/app/src/main/res/drawable/confirm_sms_code_logo.xml b/app/src/main/res/drawable/confirm_sms_code_logo.xml
new file mode 100644
index 000000000..b42354299
--- /dev/null
+++ b/app/src/main/res/drawable/confirm_sms_code_logo.xml
@@ -0,0 +1,201 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="477dp"
+    android:height="346dp"
+    android:viewportWidth="477"
+    android:viewportHeight="346">
+  <path
+      android:pathData="M64.24,41.43C64.14,40.9 64.03,40.27 64.03,39.74C64.03,38.99 63.93,38.36 63.82,37.61C63.71,36.66 63.5,35.7 63.29,34.85C62.65,32.31 61.7,29.86 60.42,27.63C58.72,24.66 56.39,22.01 53.74,19.99C50.44,17.44 46.73,15.64 42.59,14.79C37.92,13.83 33.14,14.15 28.58,15.64C26.14,16.49 23.91,17.66 21.78,19.14C20.72,19.89 19.66,20.73 18.71,21.58C17.75,22.54 16.9,23.49 16.05,24.56C8.94,33.69 8.62,46.42 15.31,55.87C16.05,57.04 16.9,58.1 17.86,59.06C18.81,60.01 19.77,60.86 20.83,61.71C22.85,63.3 25.07,64.58 27.41,65.53C39.3,70.2 52.78,65.74 59.68,55.02C61.06,52.9 62.23,50.46 62.97,48.02C63.29,47.06 63.5,46.21 63.61,45.26C63.71,44.62 63.93,43.88 63.93,43.24C64.03,42.6 64.14,41.96 64.24,41.43C64.35,41.96 64.35,42.6 64.24,43.13C64.24,43.88 64.14,44.51 64.03,45.26C63.93,46.21 63.71,47.17 63.5,48.12C62.86,50.67 61.8,53.22 60.42,55.45C56.28,62.24 49.38,66.91 41.53,68.18C36.65,69.03 31.55,68.5 26.88,66.7C24.33,65.74 22,64.36 19.87,62.77C18.81,61.92 17.75,60.97 16.8,60.01C15.84,58.95 14.99,57.89 14.14,56.72C7.14,46.74 7.45,33.37 14.99,23.71C15.84,22.54 16.8,21.48 17.86,20.52C18.92,19.57 19.98,18.72 21.15,17.87C23.38,16.28 25.71,15.11 28.37,14.26C37.39,11.29 47.26,13.09 54.58,19.04C57.34,21.27 59.57,24.03 61.38,27.1C62.65,29.44 63.61,31.88 64.14,34.53C64.35,35.49 64.46,36.44 64.56,37.4C64.67,38.14 64.67,38.78 64.67,39.52C64.35,40.27 64.35,40.8 64.24,41.43Z"
+      android:strokeAlpha="0.8"
+      android:fillColor="#EBEBEB"
+      android:fillAlpha="0.8"/>
+  <path
+      android:pathData="M58.83,24.45C58.83,24.56 58.41,24.98 57.45,25.62L55.75,26.89C55.43,27.1 55.01,27.42 54.69,27.63L53.31,28.38C48.43,31.14 42.91,32.52 37.28,32.41L34.84,32.31L32.51,31.99C32.08,31.88 31.76,31.88 31.34,31.77L30.28,31.46C29.53,31.24 28.9,31.14 28.15,30.82C25.82,30.08 23.48,29.01 21.36,27.74C17.75,25.51 15.95,23.5 16.05,23.39C16.16,23.28 18.17,24.87 21.89,26.79C24.01,27.85 26.35,28.8 28.58,29.55C29.21,29.76 29.85,29.86 30.59,30.08L31.66,30.29L32.72,30.5L34.95,30.82L37.28,30.93C42.7,31.03 48,29.86 52.78,27.42L54.16,26.89C54.58,26.68 55.01,26.47 55.33,26.25L57.24,25.19C58.19,24.66 58.72,24.34 58.83,24.45Z"
+      android:strokeAlpha="0.8"
+      android:fillColor="#EBEBEB"
+      android:fillAlpha="0.8"/>
+  <path
+      android:pathData="M15.31,57.57C15.2,57.46 15.73,57.04 16.69,56.4L18.49,55.13C18.81,54.92 19.24,54.6 19.55,54.38L20.93,53.64C25.82,50.88 31.34,49.5 36.96,49.61L39.41,49.71L41.74,50.14C42.17,50.25 42.48,50.25 42.91,50.35L43.97,50.67C44.71,50.88 45.35,50.99 46.09,51.2C48.43,52.05 50.76,53.11 52.89,54.38C56.5,56.61 58.3,58.63 58.19,58.74C58.09,58.84 56.07,57.25 52.36,55.34C50.23,54.28 48,53.32 45.67,52.58C45.03,52.37 44.29,52.26 43.65,52.05L42.59,51.84L41.53,51.63L39.3,51.31L36.96,51.2C31.55,51.09 26.24,52.26 21.47,54.7L20.09,55.34C19.66,55.55 19.34,55.76 18.92,55.98L17.01,57.04C15.95,57.36 15.31,57.57 15.31,57.57Z"
+      android:strokeAlpha="0.8"
+      android:fillColor="#EBEBEB"
+      android:fillAlpha="0.8"/>
+  <path
+      android:pathData="M64.24,42.07C64.24,42.5 52.04,42.5 37.07,42.18C22.1,41.86 9.9,41.22 9.9,40.8C9.9,40.37 22.1,40.37 37.07,40.69C52.04,41.01 64.24,41.65 64.24,42.07Z"
+      android:strokeAlpha="0.8"
+      android:fillColor="#EBEBEB"
+      android:fillAlpha="0.8"/>
+  <path
+      android:pathData="M35.8,67.97C35.37,67.97 35.37,55.76 35.69,40.69C36.01,25.62 36.65,13.52 37.07,13.52C37.49,13.62 37.49,25.72 37.18,40.8C36.86,55.87 36.22,67.97 35.8,67.97Z"
+      android:strokeAlpha="0.8"
+      android:fillColor="#EBEBEB"
+      android:fillAlpha="0.8"/>
+  <path
+      android:pathData="M35.8,67.97C35.69,68.08 32.72,66.06 29.21,61.5C27.2,58.74 25.61,55.77 24.33,52.69C22.85,48.76 22.1,44.62 22.21,40.48C22.31,36.34 23.27,32.2 24.97,28.38C26.35,25.3 28.15,22.43 30.28,19.78C33.99,15.32 36.96,13.41 37.07,13.52C37.18,13.62 34.42,15.96 31.13,20.42C29.21,23.07 27.52,25.94 26.24,28.91C24.65,32.52 23.8,36.45 23.69,40.48C23.59,44.41 24.23,48.44 25.61,52.16C26.67,55.23 28.15,58.1 30.06,60.86C33.25,65.53 35.9,67.76 35.8,67.97Z"
+      android:strokeAlpha="0.8"
+      android:fillColor="#EBEBEB"
+      android:fillAlpha="0.8"/>
+  <path
+      android:pathData="M37.71,13.62C37.81,13.52 40.78,15.53 44.29,20.1C46.3,22.75 47.9,25.72 49.17,28.91C50.66,32.84 51.4,36.98 51.29,41.12C51.19,45.26 50.23,49.4 48.53,53.22C47.15,56.3 45.35,59.16 43.23,61.82C39.51,66.27 36.54,68.18 36.43,68.08C36.33,67.97 38.98,65.64 42.38,61.18C44.39,58.53 45.99,55.66 47.26,52.69C48.85,49.08 49.7,45.15 49.81,41.12C49.91,37.19 49.28,33.15 47.9,29.44C46.84,26.36 45.24,23.5 43.44,20.74C40.25,16.06 37.6,13.73 37.71,13.62Z"
+      android:strokeAlpha="0.8"
+      android:fillColor="#EBEBEB"
+      android:fillAlpha="0.8"/>
+  <path
+      android:pathData="M476.54,249.17C476.43,248.64 476.32,248.01 476.32,247.47C476.32,246.73 476.22,246.09 476.11,245.35C476.01,244.4 475.79,243.44 475.58,242.59C474.94,240.04 473.99,237.6 472.71,235.37C471.02,232.4 468.68,229.75 466.03,227.73C462.74,225.18 459.02,223.38 454.88,222.53C450.21,221.57 445.43,221.89 440.87,223.38C438.43,224.23 436.2,225.4 434.08,226.88C433.01,227.62 431.95,228.47 431,229.32C430.04,230.28 429.19,231.23 428.34,232.29C421.23,241.42 420.91,254.16 427.6,263.61C428.34,264.78 429.19,265.84 430.15,266.79C431.1,267.75 432.06,268.6 433.12,269.45C435.14,271.04 437.37,272.31 439.7,273.27C451.59,277.94 465.07,273.48 471.97,262.76C473.35,260.64 474.52,258.2 475.26,255.75C475.58,254.8 475.79,253.95 475.9,252.99C476.01,252.36 476.22,251.61 476.22,250.98C476.32,250.34 476.43,249.7 476.54,249.17C476.64,249.7 476.64,250.34 476.54,250.87C476.54,251.61 476.43,252.25 476.32,252.99C476.22,253.95 476.01,254.9 475.79,255.86C475.16,258.41 474.1,260.95 472.71,263.18C468.58,269.98 461.67,274.65 453.82,275.92C448.94,276.77 443.84,276.24 439.17,274.44C436.62,273.48 434.29,272.1 432.17,270.51C431.1,269.66 430.04,268.7 429.09,267.75C428.13,266.69 427.28,265.63 426.43,264.46C419.43,254.48 419.74,241.1 427.28,231.45C428.13,230.28 429.09,229.22 430.15,228.26C431.21,227.3 432.27,226.46 433.44,225.61C435.67,224.01 438,222.85 440.66,222C449.68,219.02 459.55,220.83 466.88,226.77C469.64,229 471.86,231.76 473.67,234.84C474.94,237.18 475.9,239.62 476.43,242.27C476.64,243.23 476.75,244.18 476.86,245.14C476.96,245.88 476.96,246.52 476.96,247.26C476.75,248.01 476.64,248.54 476.54,249.17Z"
+      android:strokeAlpha="0.8"
+      android:fillColor="#EBEBEB"
+      android:fillAlpha="0.8"/>
+  <path
+      android:pathData="M471.12,232.19C471.12,232.29 470.7,232.72 469.74,233.36L468.04,234.63C467.73,234.84 467.3,235.16 466.98,235.37L465.6,236.12C460.72,238.88 455.2,240.26 449.57,240.15L447.13,240.04L444.8,239.62C444.37,239.51 444.05,239.51 443.63,239.41L442.57,239.09C441.83,238.88 441.19,238.77 440.45,238.56C438.11,237.82 435.77,236.75 433.65,235.48C430.04,233.25 428.24,231.23 428.34,231.13C428.45,231.02 430.47,232.61 434.18,234.52C436.3,235.59 438.64,236.54 440.87,237.28C441.51,237.5 442.14,237.6 442.89,237.82L443.95,238.03L445.01,238.13L447.24,238.45L449.57,238.56C454.99,238.66 460.3,237.5 465.07,235.05L466.45,234.52C466.88,234.31 467.3,234.1 467.62,233.89L469.53,232.82C470.49,232.4 471.02,232.08 471.12,232.19Z"
+      android:strokeAlpha="0.8"
+      android:fillColor="#EBEBEB"
+      android:fillAlpha="0.8"/>
+  <path
+      android:pathData="M427.6,265.31C427.49,265.2 428.02,264.78 428.98,264.14L430.79,262.87C431.1,262.65 431.53,262.34 431.85,262.12L433.23,261.38C438.11,258.62 443.63,257.24 449.26,257.35L451.7,257.45L454.03,257.88C454.46,257.98 454.78,257.98 455.2,258.09L456.26,258.41C457.01,258.62 457.64,258.73 458.39,258.94C460.72,259.79 463.05,260.85 465.18,262.12C468.79,264.35 470.59,266.37 470.49,266.48C470.38,266.58 468.36,264.99 464.65,263.08C462.52,262.02 460.3,261.06 457.96,260.32C457.32,260.11 456.58,260 455.94,259.79L454.88,259.58L453.82,259.47L451.59,259.15L449.26,259.05C443.84,258.94 438.53,260.11 433.76,262.55L432.38,263.08C431.95,263.29 431.64,263.5 431.21,263.72L429.3,264.78C428.24,265.1 427.6,265.41 427.6,265.31Z"
+      android:strokeAlpha="0.8"
+      android:fillColor="#EBEBEB"
+      android:fillAlpha="0.8"/>
+  <path
+      android:pathData="M476.54,249.81C476.54,250.23 464.33,250.23 449.36,249.91C434.39,249.49 422.19,248.96 422.19,248.54C422.19,248.11 434.39,248.11 449.36,248.43C464.43,248.75 476.54,249.38 476.54,249.81Z"
+      android:strokeAlpha="0.8"
+      android:fillColor="#EBEBEB"
+      android:fillAlpha="0.8"/>
+  <path
+      android:pathData="M448.09,275.71C447.66,275.71 447.66,263.5 447.98,248.54C448.3,233.57 448.94,221.36 449.36,221.36C449.79,221.36 449.79,233.57 449.47,248.54C449.15,263.5 448.51,275.71 448.09,275.71Z"
+      android:strokeAlpha="0.8"
+      android:fillColor="#EBEBEB"
+      android:fillAlpha="0.8"/>
+  <path
+      android:pathData="M448.09,275.71C447.98,275.82 445.01,273.8 441.51,269.24C439.49,266.48 437.9,263.5 436.62,260.42C435.14,256.5 434.39,252.36 434.5,248.22C434.61,244.08 435.56,239.94 437.26,236.12C438.64,233.04 440.45,230.17 442.57,227.52C446.28,223.06 449.26,221.15 449.36,221.26C449.47,221.36 446.71,223.7 443.42,228.15C441.51,230.81 439.81,233.68 438.53,236.65C436.94,240.26 436.09,244.18 435.99,248.22C435.88,252.15 436.52,256.18 437.9,259.89C438.96,262.97 440.45,265.84 442.36,268.6C445.54,273.27 448.19,275.5 448.09,275.71Z"
+      android:strokeAlpha="0.8"
+      android:fillColor="#EBEBEB"
+      android:fillAlpha="0.8"/>
+  <path
+      android:pathData="M450,221.36C450.11,221.25 453.08,223.27 456.58,227.84C458.6,230.49 460.19,233.46 461.46,236.65C462.95,240.57 463.69,244.71 463.59,248.85C463.48,252.99 462.52,257.13 460.83,260.95C459.45,264.03 457.64,266.9 455.52,269.55C451.8,274.01 448.83,275.92 448.73,275.82C448.62,275.71 451.27,273.38 454.67,268.92C456.69,266.26 458.28,263.4 459.55,260.42C461.14,256.82 461.99,252.89 462.1,248.85C462.21,244.93 461.57,240.89 460.19,237.18C459.13,234.1 457.54,231.23 455.73,228.47C452.55,223.8 449.89,221.47 450,221.36Z"
+      android:strokeAlpha="0.8"
+      android:fillColor="#EBEBEB"
+      android:fillAlpha="0.8"/>
+  <path
+      android:pathData="M35.27,236.86L36.65,233.89C38.98,228.47 36.54,222.1 31.13,219.77C25.71,217.43 19.34,219.88 17.01,225.29L15.63,228.37C12.76,227.62 9.79,229 8.52,231.76L0.66,249.49C-0.61,252.57 0.77,256.07 3.74,257.45L22.21,265.41C25.29,266.69 28.79,265.31 30.17,262.33L37.92,244.61C39.09,241.64 38.03,238.35 35.27,236.86ZM19.87,252.57L15.1,250.45L17.33,247.26C16.37,245.78 16.69,243.87 18.17,242.8C19.66,241.85 21.57,242.17 22.63,243.65C23.59,245.14 23.27,247.05 21.78,248.11C21.36,248.32 20.93,248.54 20.51,248.64C20.3,250.13 19.87,252.57 19.87,252.57ZM33.14,235.9L17.64,229.11L19.02,226.14C21.04,221.89 26.03,220.09 30.28,222C34.31,223.91 36.22,228.68 34.52,232.82L33.14,235.9Z"
+      android:strokeAlpha="0.8"
+      android:fillColor="#EBEBEB"
+      android:fillAlpha="0.8"/>
+  <path
+      android:pathData="M445.86,17.98L447.24,15C449.57,9.59 447.13,3.22 441.72,0.88C436.3,-1.45 429.94,0.99 427.6,6.4L426.22,9.48C423.36,8.74 420.38,10.12 419.11,12.88L411.47,30.61C410.19,33.69 411.57,37.19 414.54,38.57L433.01,46.53C436.09,47.8 439.6,46.42 440.98,43.45L448.73,25.72C449.79,22.86 448.62,19.46 445.86,17.98ZM430.57,33.69L425.8,31.56L428.02,28.38C427.07,26.89 427.39,24.98 428.87,23.92C430.36,22.86 432.27,23.28 433.33,24.77C434.29,26.25 433.97,28.17 432.48,29.23C432.06,29.44 431.63,29.65 431.21,29.76C430.89,31.24 430.57,33.69 430.57,33.69ZM443.74,17.02L428.24,10.33L429.62,7.36C431.63,3.11 436.62,1.31 440.87,3.22C444.9,5.13 446.81,9.91 445.12,14.05L443.74,17.02Z"
+      android:strokeAlpha="0.8"
+      android:fillColor="#EBEBEB"
+      android:fillAlpha="0.8"/>
+  <path
+      android:pathData="M392.25,47.06C392.36,47.17 379.09,58.1 362.74,71.48C346.29,84.85 332.91,95.57 332.91,95.47C332.91,95.36 346.08,84.43 362.42,71.05C378.77,57.68 392.15,46.95 392.25,47.06Z"
+      android:strokeAlpha="0.8"
+      android:fillColor="#6C7A87"
+      android:fillAlpha="0.8"/>
+  <path
+      android:pathData="M414.01,225.29C414.01,225.39 396.82,219.34 375.8,211.6C354.78,203.95 337.69,197.58 337.8,197.37C337.9,197.26 354.99,203.32 376.01,211.06C397.03,218.81 414.12,225.18 414.01,225.29Z"
+      android:strokeAlpha="0.8"
+      android:fillColor="#6C7A87"
+      android:fillAlpha="0.8"/>
+  <path
+      android:pathData="M59.79,78.27C59.89,78.16 78.26,87.82 100.97,100.03C123.69,112.24 141.95,122.11 141.84,122.22C141.74,122.32 123.37,112.66 100.65,100.46C77.94,88.25 59.68,78.38 59.79,78.27Z"
+      android:strokeAlpha="0.8"
+      android:fillColor="#6C7A87"
+      android:fillAlpha="0.8"/>
+  <path
+      android:pathData="M66.37,235.8C66.37,235.69 81.44,229.85 100.23,222.85C119.02,215.84 134.2,210.22 134.2,210.32C134.2,210.43 119.13,216.27 100.34,223.27C81.55,230.28 66.47,236.01 66.37,235.8Z"
+      android:strokeAlpha="0.8"
+      android:fillColor="#6C7A87"
+      android:fillAlpha="0.8"/>
+  <path
+      android:pathData="M246.08,267.75C195.24,267.75 153.94,226.46 153.94,175.61C153.94,124.76 195.24,83.47 246.08,83.47C296.93,83.47 338.22,124.76 338.22,175.61C338.11,226.46 296.93,267.64 246.08,267.75ZM246.08,84.53C195.77,84.53 155,125.29 155,175.61C155,225.93 195.77,266.69 246.08,266.69C296.4,266.69 337.16,225.93 337.16,175.61C337.05,125.29 296.4,84.53 246.08,84.53Z"
+      android:strokeAlpha="0.8"
+      android:fillColor="#FE5E00"
+      android:fillAlpha="0.8"/>
+  <path
+      android:pathData="M362.53,174.23C362.53,174.23 362.53,173.59 362.42,172.32C362.42,171.68 362.42,170.94 362.32,169.98C362.21,169.03 362.32,167.97 362.21,166.8C362.11,165.63 362,164.25 361.89,162.77C361.79,161.28 361.47,159.69 361.26,157.88C360.73,154.38 359.98,150.35 358.92,145.78C357.65,140.79 356.05,135.91 354.14,131.13C351.92,125.51 349.15,119.99 346.08,114.79C338.43,102.05 328.35,90.79 316.46,81.77C309.56,76.57 302.13,72.11 294.27,68.5C285.78,64.58 276.76,61.71 267.52,60.01C252.45,57.25 236.95,57.36 221.99,60.54C216.68,61.71 211.48,63.2 206.49,65C184.83,72.86 166.04,86.97 152.46,105.55C148.95,110.43 145.77,115.53 143.01,120.84C142.37,122.22 141.63,123.49 140.99,124.87L139.08,129.01C137.91,131.88 136.85,134.63 135.9,137.61C133.88,143.55 132.39,149.5 131.44,155.65C130.48,161.81 129.95,168.07 129.95,174.34C129.95,180.6 130.48,186.86 131.44,193.02C132.39,199.18 133.88,205.12 135.9,210.96C136.85,213.93 138.02,216.69 139.08,219.56L140.99,223.7C141.63,225.08 142.37,226.46 143.01,227.73C145.77,233.04 148.95,238.13 152.46,243.02C166.04,261.59 184.83,275.71 206.49,283.57C211.58,285.37 216.78,286.86 222.09,287.92C237.06,291 252.56,291.21 267.63,288.45C285.36,285.16 302.13,277.62 316.57,266.69C328.45,257.67 338.43,246.41 346.08,233.68C349.26,228.47 351.92,222.95 354.14,217.33C356.05,212.55 357.65,207.67 358.92,202.68C359.98,198.22 360.83,194.19 361.26,190.58C361.47,188.77 361.68,187.18 361.89,185.69C362.11,184.21 362.11,182.83 362.21,181.66C362.32,180.49 362.32,179.43 362.32,178.48C362.32,177.52 362.32,176.78 362.42,176.14C362.42,174.97 362.53,174.34 362.53,174.23C362.53,174.23 362.53,174.87 362.53,176.14C362.53,176.78 362.53,177.52 362.53,178.48C362.53,179.43 362.53,180.49 362.42,181.66C362.32,182.83 362.21,184.21 362.11,185.69C362,187.18 361.68,188.88 361.58,190.58C361.04,194.08 360.3,198.11 359.24,202.68C357.97,207.67 356.37,212.55 354.46,217.33C352.23,223.06 349.47,228.58 346.39,233.78C338.75,246.63 328.67,257.88 316.78,267.01C302.34,278.05 285.46,285.58 267.63,288.87C257.76,290.78 247.57,291.32 237.48,290.57C232.18,290.25 226.98,289.51 221.88,288.45C216.57,287.28 211.37,285.8 206.27,283.99C184.51,276.14 165.62,261.91 151.93,243.33C148.32,238.45 145.13,233.36 142.37,228.05C141.74,226.67 140.89,225.4 140.35,223.91C139.82,222.42 139.08,221.15 138.45,219.77C137.28,216.9 136.11,214.04 135.26,211.17C133.24,205.33 131.76,199.28 130.8,193.13C128.79,180.71 128.79,167.97 130.8,155.55C131.76,149.39 133.24,143.34 135.26,137.5C136.21,134.53 137.38,131.77 138.45,128.9C139.08,127.52 139.72,126.14 140.35,124.76C140.99,123.38 141.74,122 142.37,120.62C145.13,115.32 148.32,110.11 151.93,105.34C165.62,86.66 184.51,72.54 206.27,64.68C211.37,62.88 216.57,61.28 221.88,60.22C236.95,57.15 252.45,56.93 267.63,59.69C276.87,61.39 285.89,64.26 294.49,68.18C302.45,71.79 309.88,76.25 316.78,81.56C328.67,90.69 338.75,101.94 346.39,114.79C349.58,120.09 352.23,125.51 354.46,131.24C356.37,136.01 357.97,140.9 359.24,145.89C360.3,150.35 361.04,154.49 361.58,157.99C361.79,159.79 362,161.39 362.11,162.87C362.21,164.36 362.32,165.74 362.42,167.01C362.53,168.29 362.53,169.24 362.53,170.2C362.53,171.15 362.53,171.9 362.53,172.53C362.53,173.59 362.53,174.23 362.53,174.23Z"
+      android:strokeAlpha="0.8"
+      android:fillColor="#6C7A87"
+      android:fillAlpha="0.8"/>
+  <path
+      android:pathData="M247.46,306.71V305.64C321.55,305.64 381.53,245.56 381.53,171.47C381.53,97.38 321.45,37.4 247.36,37.4C173.26,37.4 113.29,97.48 113.29,171.47H112.22C112.22,96.95 172.84,36.34 247.36,36.34C321.98,36.98 381.96,98.01 381.32,172.74C380.79,246.52 321.13,306.07 247.46,306.71Z"
+      android:strokeAlpha="0.8"
+      android:fillColor="#FE5E00"
+      android:fillAlpha="0.8"/>
+  <path
+      android:pathData="M246.08,293.44V288.13C308.92,288.13 359.88,237.18 359.88,174.34C359.88,111.5 308.92,60.54 246.08,60.54V55.23C311.9,55.23 365.18,108.52 365.29,174.34C365.4,240.15 311.9,293.44 246.08,293.44Z"
+      android:strokeAlpha="0.8"
+      android:fillColor="#FE5E00"
+      android:fillAlpha="0.8"/>
+  <path
+      android:pathData="M384.71,171.58H379.41C378.77,98.65 319.11,40.16 246.29,40.8C174.32,41.43 116.15,99.61 115.52,171.58H110.21C110.21,95.89 171.78,34.32 247.46,34.32C323.25,34.43 384.61,95.78 384.71,171.58Z"
+      android:strokeAlpha="0.8"
+      android:fillColor="#FE5E00"
+      android:fillAlpha="0.8"/>
+  <path
+      android:pathData="M248.42,327.19C164.03,327.19 95.45,258.62 95.45,174.23C95.45,89.84 164.13,21.27 248.42,21.27V26.57C167,26.57 100.76,92.81 100.76,174.23C100.76,255.65 167,321.89 248.42,321.89C329.83,321.89 396.07,255.65 396.07,174.23H401.38C401.38,258.51 332.81,327.19 248.42,327.19Z"
+      android:strokeAlpha="0.8"
+      android:fillColor="#FE5E00"
+      android:fillAlpha="0.8"/>
+  <path
+      android:pathData="M246.08,345.13H243.43V344.07H246.08V345.13Z"
+      android:strokeAlpha="0.8"
+      android:fillColor="#FE5E00"
+      android:fillAlpha="0.8"/>
+  <path
+      android:pathData="M232.6,344.5C230.8,344.39 228.99,344.18 227.29,343.97L227.4,342.9C229.2,343.12 231.01,343.22 232.71,343.43L232.6,344.5ZM216.68,342.59C214.87,342.27 213.07,341.95 211.37,341.52L211.58,340.46C213.28,340.78 215.09,341.21 216.78,341.52L216.68,342.59ZM200.97,338.98C199.27,338.55 197.57,338.02 195.77,337.49L196.09,336.43C197.78,336.96 199.48,337.49 201.18,337.92L200.97,338.98ZM185.58,333.99C183.88,333.35 182.18,332.71 180.59,331.97L181.01,331.02C182.6,331.65 184.3,332.4 186,333.03L185.58,333.99ZM170.71,327.51C169.12,326.66 167.53,325.92 165.94,325.07L166.47,324.12C168.06,324.96 169.65,325.81 171.24,326.56L170.71,327.51ZM156.7,319.66C155.22,318.7 153.62,317.75 152.14,316.79L152.77,315.94C154.26,316.9 155.75,317.96 157.23,318.81L156.7,319.66ZM143.33,310.53C141.95,309.47 140.46,308.3 139.08,307.24L139.72,306.39C141.1,307.45 142.48,308.62 143.86,309.68L143.33,310.53ZM131.01,300.13C129.74,298.96 128.36,297.68 127.09,296.41L127.83,295.67C129.1,296.94 130.38,298.11 131.65,299.38L131.01,300.13ZM119.66,288.55C118.49,287.17 117.32,285.9 116.15,284.52L117,283.88C118.17,285.26 119.34,286.64 120.5,287.92L119.66,288.55ZM109.57,276.14C108.51,274.65 107.45,273.16 106.49,271.78L107.34,271.15C108.3,272.63 109.36,274.01 110.42,275.5L109.57,276.14ZM100.55,262.65C99.59,261.17 98.74,259.58 97.89,257.98L98.85,257.45C99.7,259.05 100.65,260.53 101.5,262.12L100.55,262.65ZM93.01,248.43C92.27,246.84 91.53,245.14 90.78,243.55L91.74,243.12C92.48,244.71 93.22,246.41 93.97,248.01L93.01,248.43ZM86.75,233.57C86.11,231.87 85.58,230.17 84.94,228.47L86.01,228.15C86.54,229.85 87.17,231.55 87.81,233.25L86.75,233.57ZM81.97,218.18C81.55,216.48 81.12,214.67 80.7,212.98L81.76,212.76C82.18,214.46 82.61,216.27 83.03,217.96L81.97,218.18ZM78.68,202.47C78.36,200.77 78.15,198.96 77.94,197.16L79,197.05C79.21,198.86 79.42,200.56 79.74,202.36L78.68,202.47ZM76.88,186.33C76.77,184.53 76.66,182.72 76.66,180.92H77.73C77.73,182.72 77.83,184.53 77.94,186.23L76.88,186.33ZM77.62,170.3H76.56C76.66,168.5 76.66,166.69 76.77,164.89L77.83,164.99C77.83,166.69 77.73,168.5 77.62,170.3ZM78.89,154.38L77.83,154.27C78.04,152.47 78.26,150.66 78.57,148.97L79.64,149.18C79.42,150.77 79.11,152.57 78.89,154.38ZM81.65,138.56L80.59,138.35C81.02,136.65 81.44,134.85 81.87,133.15L82.93,133.36C82.5,135.06 82.08,136.87 81.65,138.56ZM85.9,123.07L84.94,122.75C85.47,121.05 86.11,119.35 86.75,117.65L87.7,117.97C87.07,119.67 86.54,121.37 85.9,123.07ZM91.63,108.1L90.68,107.67C91.42,106.08 92.16,104.38 92.91,102.79L93.86,103.21C93.12,104.81 92.37,106.51 91.63,108.1ZM98.74,93.66L97.79,93.13C98.64,91.54 99.59,90.05 100.44,88.46L101.29,88.99C100.55,90.58 99.7,92.18 98.74,93.66ZM107.24,80.07L106.39,79.44C107.45,77.95 108.51,76.46 109.46,75.08L110.31,75.72C109.36,77.21 108.3,78.59 107.24,80.07ZM117,67.34L116.15,66.59C117.32,65.21 118.49,63.83 119.66,62.56L120.4,63.3C119.34,64.58 118.17,65.96 117,67.34ZM127.83,55.55L127.09,54.81C128.36,53.54 129.63,52.26 131.01,51.09L131.76,51.84C130.38,53.11 129.1,54.28 127.83,55.55ZM139.82,44.83L139.19,43.98C140.57,42.81 141.95,41.75 143.43,40.69L144.07,41.54C142.58,42.6 141.2,43.77 139.82,44.83ZM152.67,35.28L152.03,34.43C153.52,33.47 155,32.52 156.49,31.56L157.02,32.41C155.64,33.37 154.15,34.32 152.67,35.28ZM166.47,27.1L165.94,26.15C167.53,25.3 169.12,24.45 170.71,23.71L171.14,24.66C169.55,25.41 167.95,26.26 166.47,27.1ZM180.9,20.2L180.48,19.25C182.18,18.51 183.77,17.87 185.47,17.23L185.89,18.19C184.2,18.82 182.5,19.57 180.9,20.2ZM195.87,14.79L195.55,13.84C197.25,13.3 198.95,12.77 200.76,12.35L201.07,13.41C199.38,13.73 197.57,14.15 195.87,14.79ZM211.37,10.65L211.16,9.59C212.86,9.27 214.66,8.85 216.47,8.53L216.68,9.59C214.98,10.01 213.18,10.33 211.37,10.65ZM227.19,8.21L227.08,7.15C228.88,6.94 230.69,6.83 232.39,6.62L232.49,7.68C230.8,7.78 228.99,8 227.19,8.21Z"
+      android:strokeAlpha="0.8"
+      android:fillColor="#FE5E00"
+      android:fillAlpha="0.8"/>
+  <path
+      android:pathData="M243.43,7.15V6.09H246.08V7.15H243.43Z"
+      android:strokeAlpha="0.8"
+      android:fillColor="#FE5E00"
+      android:fillAlpha="0.8"/>
+  <path
+      android:pathData="M186.53,165.42L290.24,123.91C297.03,121.15 304.78,124.55 307.44,131.34L339.39,211.38C342.15,218.18 338.75,225.93 331.96,228.58L228.25,270.08C221.46,272.84 213.71,269.45 211.05,262.65L179.1,182.62C176.45,175.93 179.74,168.18 186.53,165.42Z"
+      android:strokeAlpha="0.8"
+      android:fillColor="#FE5E00"
+      android:fillAlpha="0.8"/>
+  <path
+      android:pathData="M297.57,174.97L283.87,180.39L254.15,106.08C247.14,88.57 227.29,79.97 209.78,86.97C192.26,93.98 183.66,113.83 190.67,131.35L220.39,205.65L206.7,211.07L176.98,136.76C167,111.71 179.21,83.26 204.26,73.28C229.31,63.3 257.76,75.51 267.74,100.56L297.57,174.97Z"
+      android:strokeAlpha="0.8"
+      android:fillColor="#E0E0E0"
+      android:fillAlpha="0.8"/>
+  <path
+      android:pathData="M186.96,165.31L289.71,124.23C296.72,121.37 304.78,124.87 307.54,131.88L339.18,210.96C342.04,217.96 338.54,226.03 331.53,228.79L228.78,269.87C221.77,272.74 213.71,269.24 210.95,262.23L179.31,183.15C176.55,176.14 179.95,168.07 186.96,165.31Z"
+      android:strokeAlpha="0.3"
+      android:fillColor="#000000"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M180.59,167.86L275.17,130.07C281.96,127.42 289.6,130.71 292.36,137.4L324.42,217.43C327.08,224.23 323.79,231.87 317.1,234.63L222.52,272.42C215.72,275.07 208.08,271.78 205.32,265.1L173.26,185.06C170.61,178.16 173.9,170.51 180.59,167.86Z"
+      android:strokeAlpha="0.8"
+      android:fillColor="#FE5E00"
+      android:fillAlpha="0.8"/>
+  <path
+      android:pathData="M261.15,139.31C261.26,139.52 245.34,146.21 225.7,154.38C206.06,162.55 190.03,169.03 190.03,168.82C190.03,168.6 205.85,161.92 225.49,153.74C245.13,145.57 261.05,139.1 261.15,139.31Z"
+      android:strokeAlpha="0.8"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.8"/>
+  <path
+      android:pathData="M261.69,185.38C258.5,177.31 249.37,173.38 241.3,176.57C233.24,179.75 229.31,188.88 232.49,196.95C235.04,203.53 241.73,207.56 248.74,206.82L255.85,224.65C256.7,226.88 259.24,227.94 261.47,226.99C263.7,226.14 264.76,223.59 263.92,221.47L256.8,203.63C262.22,199.39 264.23,191.96 261.69,185.38Z"
+      android:strokeAlpha="0.3"
+      android:fillColor="#000000"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M260.52,205.12C262,203.63 263.17,201.94 264.23,200.13C265.3,198.12 266.04,195.99 266.36,193.76C267.31,188.24 265.51,182.72 261.58,178.79C259.99,177.2 258.18,175.82 256.17,174.87C254.26,174.02 252.24,173.38 250.22,172.96C250.75,172.96 251.39,172.96 251.92,173.06C253.41,173.27 254.89,173.7 256.38,174.34C258.5,175.29 260.41,176.67 262,178.26C266.14,182.3 268.05,188.14 266.99,193.87C266.67,196.1 265.83,198.33 264.66,200.34C263.92,201.72 262.96,202.89 261.79,203.95C261.47,204.48 261.05,204.8 260.52,205.12Z"
+      android:strokeAlpha="0.8"
+      android:fillColor="#6C7A87"
+      android:fillAlpha="0.8"/>
+  <path
+      android:pathData="M235.15,205.12C234.83,204.91 234.51,204.7 234.19,204.49C233.34,203.74 232.6,203 231.96,202.15C227.4,196.42 226.87,188.46 230.69,182.09C231.22,181.13 231.86,180.28 232.6,179.54C232.81,179.22 233.13,179.01 233.45,178.8C233.56,178.9 232.39,180.07 231.11,182.4C227.72,188.56 228.14,196.21 232.39,201.94C233.87,203.95 235.15,205.01 235.15,205.12Z"
+      android:strokeAlpha="0.8"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.8"/>
+  <path
+      android:pathData="M243.64,209.69C243.64,209.9 242.58,209.9 241.41,209.69C240.24,209.47 239.29,209.15 239.29,208.94C239.29,208.73 240.35,208.73 241.52,208.94C242.68,209.15 243.64,209.58 243.64,209.69Z"
+      android:strokeAlpha="0.8"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.8"/>
+  <path
+      android:pathData="M190.67,74.66C189.93,75.19 189.18,75.62 188.34,75.93C186.21,77.1 184.2,78.48 182.39,80.07C167.74,92.07 162.75,112.24 169.87,129.75C170.5,131.35 170.93,132.19 170.82,132.19C170.71,131.98 170.61,131.77 170.5,131.56C170.29,131.13 169.97,130.6 169.65,129.75C168.59,127.52 167.85,125.19 167.21,122.85C163.07,106.72 168.91,89.73 182.07,79.54C183.98,78.06 186,76.68 188.23,75.62C188.97,75.19 189.61,74.98 190.03,74.77C190.25,74.77 190.46,74.66 190.67,74.66Z"
+      android:strokeAlpha="0.8"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.8"/>
+</vector>
diff --git a/app/src/main/res/drawable/hourglass.xml b/app/src/main/res/drawable/hourglass.xml
new file mode 100644
index 000000000..8761682e1
--- /dev/null
+++ b/app/src/main/res/drawable/hourglass.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="256"
+    android:viewportHeight="256">
+  <path
+      android:pathData="M200,75.64V40a16,16 0,0 0,-16 -16H72A16,16 0,0 0,56 40V76a16.07,16.07 0,0 0,6.4 12.8L114.67,128 62.4,167.2A16.07,16.07 0,0 0,56 180v36a16,16 0,0 0,16 16H184a16,16 0,0 0,16 -16V180.36a16.08,16.08 0,0 0,-6.35 -12.76L141.27,128l52.38,-39.6A16.05,16.05 0,0 0,200 75.64ZM178.23,176H77.33L128,138ZM72,216V192H184v24ZM184,75.64 L128,118 72,76V40H184Z"
+      android:fillColor="#4e6074"/>
+</vector>
diff --git a/app/src/main/res/drawable/image_square.xml b/app/src/main/res/drawable/image_square.xml
deleted file mode 100644
index 104b4f3f1..000000000
--- a/app/src/main/res/drawable/image_square.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="88dp"
-    android:height="88dp"
-    android:viewportWidth="256"
-    android:viewportHeight="256">
-  <path
-      android:pathData="M208,32L48,32A16,16 0,0 0,32 48L32,208a16,16 0,0 0,16 16L208,224a16,16 0,0 0,16 -16L224,48A16,16 0,0 0,208 32ZM48,48L208,48v77.38l-24.69,-24.7a16,16 0,0 0,-22.62 0L53.37,208L48,208ZM208,208L76,208l96,-96 36,36v60ZM96,120A24,24 0,1 0,72 96,24 24,0 0,0 96,120ZM96,88a8,8 0,1 1,-8 8A8,8 0,0 1,96 88Z"
-      android:fillColor="#4e6074"/>
-</vector>
diff --git a/app/src/main/res/drawable/plus.xml b/app/src/main/res/drawable/plus.xml
deleted file mode 100644
index 71b33fefc..000000000
--- a/app/src/main/res/drawable/plus.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="20dp"
-    android:height="20dp"
-    android:viewportWidth="256"
-    android:viewportHeight="256">
-  <path
-      android:pathData="M224,128a8,8 0,0 1,-8 8H136v80a8,8 0,0 1,-16 0V136H40a8,8 0,0 1,0 -16h80V40a8,8 0,0 1,16 0v80h80A8,8 0,0 1,224 128Z"
-      android:fillColor="#4e6074"/>
-</vector>
diff --git a/app/src/main/res/layout-land/call_ended_fragment.xml b/app/src/main/res/layout-land/call_ended_fragment.xml
index a3229a2eb..2a8e0554a 100644
--- a/app/src/main/res/layout-land/call_ended_fragment.xml
+++ b/app/src/main/res/layout-land/call_ended_fragment.xml
@@ -15,60 +15,26 @@
         android:layout_height="match_parent"
         android:background="@color/gray_900">
 
-        <ImageView
-            android:id="@+id/back"
-            android:layout_width="wrap_content"
-            android:layout_height="@dimen/top_bar_height"
-            android:adjustViewBounds="true"
-            android:padding="15dp"
-            android:src="@drawable/caret_left"
-            android:contentDescription="@string/content_description_go_back_icon"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:tint="@color/bc_white" />
-
         <androidx.appcompat.widget.AppCompatTextView
             style="@style/call_header_style"
             android:id="@+id/call_direction_label"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="10dp"
-            android:text="@string/call_ended"
-            app:layout_constraintStart_toEndOf="@id/back"
-            app:layout_constraintTop_toTopOf="@id/back"
-            app:layout_constraintBottom_toBottomOf="@id/back"/>
-
-        <androidx.appcompat.widget.AppCompatTextView
-            style="@style/call_header_style"
-            android:id="@+id/separator"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="5dp"
-            android:text="@string/vertical_separator"
-            app:layout_constraintStart_toEndOf="@id/call_direction_label"
-            app:layout_constraintTop_toTopOf="@id/call_direction_label"
-            app:layout_constraintBottom_toBottomOf="@id/call_direction_label"/>
-
-        <Chronometer
-            style="@style/call_header_style"
-            android:id="@+id/chronometer"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="5dp"
-            android:visibility="@{viewModel.isPaused || viewModel.isPausedByRemote ? View.GONE : View.VISIBLE}"
-            app:layout_constraintStart_toEndOf="@id/separator"
-            app:layout_constraintTop_toTopOf="@id/call_direction_label"
-            app:layout_constraintBottom_toBottomOf="@id/call_direction_label"/>
+            android:layout_marginTop="10dp"
+            android:text="@{viewModel.terminatedByUser ? @string/call_locally_ended : @string/call_remotely_ended, default=@string/call_locally_ended}"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"/>
 
         <include
             android:id="@+id/call_media_encryption_info"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:visibility="@{viewModel.callDuration > 0 ? View.VISIBLE : View.GONE, default=gone}"
+            android:visibility="@{viewModel.callDuration > 0 ? View.VISIBLE : View.GONE}"
             layout="@layout/call_media_encryption_info"
             bind:viewModel="@{viewModel}"
             app:layout_constraintTop_toBottomOf="@id/call_direction_label"
-            app:layout_constraintStart_toEndOf="@id/back"
+            app:layout_constraintStart_toStartOf="@id/call_direction_label"
             app:layout_constraintEnd_toEndOf="parent"/>
 
         <include
diff --git a/app/src/main/res/layout-land/call_media_encryption_stats_bottom_sheet.xml b/app/src/main/res/layout-land/call_media_encryption_stats_bottom_sheet.xml
index e82584286..ec5cc2e90 100644
--- a/app/src/main/res/layout-land/call_media_encryption_stats_bottom_sheet.xml
+++ b/app/src/main/res/layout-land/call_media_encryption_stats_bottom_sheet.xml
@@ -16,6 +16,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@drawable/shape_call_bottom_sheet_background"
+        android:clickable="true"
+        android:focusable="true"
         android:visibility="@{viewModel.fullScreenMode || viewModel.pipMode ? View.INVISIBLE : View.VISIBLE}"
         app:behavior_hideable="true"
         app:behavior_peekHeight="0dp"
diff --git a/app/src/main/res/layout-land/call_outgoing_fragment.xml b/app/src/main/res/layout-land/call_outgoing_fragment.xml
index 81f9c0de9..2f9c0292f 100644
--- a/app/src/main/res/layout-land/call_outgoing_fragment.xml
+++ b/app/src/main/res/layout-land/call_outgoing_fragment.xml
@@ -15,19 +15,6 @@
         android:layout_height="match_parent"
         android:background="@color/gray_900">
 
-        <ImageView
-            android:id="@+id/back"
-            android:layout_width="wrap_content"
-            android:layout_height="@dimen/top_bar_height"
-            android:adjustViewBounds="true"
-            android:padding="15dp"
-            android:src="@drawable/caret_left"
-            android:contentDescription="@string/content_description_go_back_icon"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            android:visibility="invisible"
-            app:tint="@color/bc_white" />
-
         <ImageView
             android:id="@+id/call_direction_icon"
             android:layout_width="12dp"
@@ -50,8 +37,7 @@
             android:layout_marginBottom="10dp"
             android:text="@string/call_outgoing"
             app:layout_constraintStart_toEndOf="@id/call_direction_icon"
-            app:layout_constraintTop_toTopOf="@id/back"
-            app:layout_constraintBottom_toBottomOf="@id/back"/>
+            app:layout_constraintTop_toTopOf="parent"/>
 
         <include
             android:id="@+id/avatar"
diff --git a/app/src/main/res/layout-land/welcome_activity.xml b/app/src/main/res/layout-land/welcome_activity.xml
new file mode 100644
index 000000000..e6daa7030
--- /dev/null
+++ b/app/src/main/res/layout-land/welcome_activity.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+        <import type="android.view.View" />
+        <variable
+            name="skipClickListener"
+            type="View.OnClickListener" />
+        <variable
+            name="nextClickListener"
+            type="View.OnClickListener" />
+    </data>
+
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        tools:context=".ui.welcome.WelcomeActivity">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:onClick="@{skipClickListener}"
+                style="@style/default_text_style_600"
+                android:id="@+id/skip"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="16dp"
+                android:paddingTop="13dp"
+                android:paddingBottom="13dp"
+                android:paddingStart="20dp"
+                android:paddingEnd="20dp"
+                android:text="@string/welcome_carousel_skip"
+                android:textSize="13sp"
+                android:textColor="?attr/color_text"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintEnd_toEndOf="parent" />
+
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/default_text_style_800"
+                android:id="@+id/title_first_line"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="65dp"
+                android:text="@string/welcome_page_title"
+                android:textColor="?attr/color_text"
+                android:textSize="36sp"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintStart_toStartOf="parent"/>
+
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/default_text_style_800"
+                android:id="@+id/title_second_line"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="10dp"
+                android:text="@string/welcome_page_subtitle"
+                android:textColor="?attr/color_text"
+                android:textSize="26sp"
+                app:layout_constraintBottom_toBottomOf="@id/title_first_line"
+                app:layout_constraintStart_toEndOf="@id/title_first_line"/>
+
+            <androidx.viewpager2.widget.ViewPager2
+                android:id="@+id/pager"
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:layout_marginBottom="20dp"
+                app:layout_constraintTop_toBottomOf="@id/title_second_line"
+                app:layout_constraintBottom_toTopOf="@id/dots_indicator"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"/>
+
+            <com.tbuonomo.viewpagerdotsindicator.DotsIndicator
+                android:id="@+id/dots_indicator"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="20dp"
+                app:dotsColor="?attr/color_main2_200"
+                app:dotsCornerRadius="8dp"
+                app:dotsSize="13dp"
+                app:dotsSpacing="5dp"
+                app:dotsWidthFactor="2.5"
+                app:selectedDotColor="?attr/color_main1_500"
+                app:progressMode="false"
+                app:layout_constraintTop_toBottomOf="@id/pager"
+                app:layout_constraintBottom_toTopOf="@id/next"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent" />
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:onClick="@{nextClickListener}"
+                style="@style/primary_button_label_style"
+                android:id="@+id/next"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp"
+                android:layout_marginBottom="16dp"
+                android:paddingStart="20dp"
+                android:paddingEnd="20dp"
+                android:text="@string/next"
+                app:layout_constraintWidth_max="@dimen/button_max_width"
+                app:layout_constraintTop_toBottomOf="@id/dots_indicator"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
+
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/welcome_page_1.xml b/app/src/main/res/layout-land/welcome_page_1.xml
index 89f90e205..9686448f6 100644
--- a/app/src/main/res/layout-land/welcome_page_1.xml
+++ b/app/src/main/res/layout-land/welcome_page_1.xml
@@ -9,83 +9,48 @@
         android:layout_height="wrap_content"
         android:layout_width="match_parent">
 
-        <ImageView
-            android:id="@+id/header"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:src="@drawable/mountains"
-            android:contentDescription="@null"
-            android:adjustViewBounds="true"
-            android:scaleType="centerCrop"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="@id/title_second_line"
-            app:tint="?attr/color_main1_500"/>
-
-        <androidx.appcompat.widget.AppCompatTextView
-            style="@style/default_text_style_800"
-            android:id="@+id/title_first_line"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="65dp"
-            android:text="@string/welcome_page_title"
-            android:textColor="?attr/color_on_main"
-            android:textSize="36sp"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintStart_toStartOf="parent"/>
-
-        <androidx.appcompat.widget.AppCompatTextView
-            style="@style/default_text_style_800"
-            android:id="@+id/title_second_line"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="15dp"
-            android:text="@string/welcome_page_subtitle"
-            android:textColor="?attr/color_on_main"
-            android:textSize="26sp"
-            app:layout_constraintBottom_toBottomOf="@id/title_first_line"
-            app:layout_constraintStart_toEndOf="@id/title_first_line"/>
-
         <ImageView
             android:id="@+id/image"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="@dimen/welcome_icon_size"
             android:layout_marginStart="32dp"
             android:src="@drawable/welcome_linphone_logo"
             android:contentDescription="@null"
+            app:layout_constraintHorizontal_chainStyle="packed"
             app:layout_constraintDimensionRatio="1:1"
-            app:layout_constraintTop_toBottomOf="@id/title_second_line"
+            app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent" />
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/message"/>
 
         <androidx.appcompat.widget.AppCompatTextView
             style="@style/default_text_style_800"
             android:id="@+id/page_title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="55dp"
             android:layout_marginStart="55dp"
             android:text="@string/app_name"
-            android:textColor="@color/gray_main2_600"
-            android:textSize="20sp"
+            android:textColor="?attr/color_text"
+            android:textSize="40sp"
             android:gravity="center"
-            app:layout_constraintTop_toBottomOf="@id/title_second_line"
+            app:layout_constraintTop_toTopOf="@id/image"
             app:layout_constraintStart_toEndOf="@id/image"/>
 
         <androidx.appcompat.widget.AppCompatTextView
             style="@style/default_text_style"
             android:id="@+id/message"
-            android:layout_width="0dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="32dp"
             android:layout_marginTop="16dp"
+            android:layout_marginStart="55dp"
             android:text="@string/welcome_page_1_message"
-            android:textColor="@color/gray_main2_600"
-            android:textSize="14sp"
+            android:textColor="?attr/color_text"
+            android:textSize="20sp"
             android:gravity="start"
+            android:maxLines="6"
             app:layout_constraintTop_toBottomOf="@id/page_title"
-            app:layout_constraintStart_toStartOf="@id/page_title"
+            app:layout_constraintStart_toEndOf="@id/image"
             app:layout_constraintEnd_toEndOf="parent"/>
 
     </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout-land/welcome_page_2.xml b/app/src/main/res/layout-land/welcome_page_2.xml
index aef298efa..88abf58c4 100644
--- a/app/src/main/res/layout-land/welcome_page_2.xml
+++ b/app/src/main/res/layout-land/welcome_page_2.xml
@@ -9,83 +9,48 @@
         android:layout_height="wrap_content"
         android:layout_width="match_parent">
 
-        <ImageView
-            android:id="@+id/header"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:src="@drawable/mountains"
-            android:contentDescription="@null"
-            android:adjustViewBounds="true"
-            android:scaleType="centerCrop"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="@id/title_second_line"
-            app:tint="?attr/color_main1_500"/>
-
-        <androidx.appcompat.widget.AppCompatTextView
-            style="@style/default_text_style_800"
-            android:id="@+id/title_first_line"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="65dp"
-            android:text="@string/welcome_page_title"
-            android:textColor="?attr/color_on_main"
-            android:textSize="36sp"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintStart_toStartOf="parent"/>
-
-        <androidx.appcompat.widget.AppCompatTextView
-            style="@style/default_text_style_800"
-            android:id="@+id/title_second_line"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="15dp"
-            android:text="@string/welcome_page_subtitle"
-            android:textColor="?attr/color_on_main"
-            android:textSize="26sp"
-            app:layout_constraintBottom_toBottomOf="@id/title_first_line"
-            app:layout_constraintStart_toEndOf="@id/title_first_line"/>
-
         <ImageView
             android:id="@+id/image"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="@dimen/welcome_icon_size"
             android:layout_marginStart="32dp"
             android:src="@drawable/welcome_secured_logo"
             android:contentDescription="@null"
+            app:layout_constraintHorizontal_chainStyle="packed"
             app:layout_constraintDimensionRatio="1:1"
-            app:layout_constraintTop_toBottomOf="@id/title_second_line"
+            app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent" />
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/message"/>
 
         <androidx.appcompat.widget.AppCompatTextView
             style="@style/default_text_style_800"
             android:id="@+id/page_title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="55dp"
             android:layout_marginStart="55dp"
             android:text="@string/welcome_page_2_title"
-            android:textColor="@color/gray_main2_600"
-            android:textSize="20sp"
+            android:textColor="?attr/color_text"
+            android:textSize="40sp"
             android:gravity="center"
-            app:layout_constraintTop_toBottomOf="@id/title_second_line"
+            app:layout_constraintTop_toTopOf="@id/image"
             app:layout_constraintStart_toEndOf="@id/image"/>
 
         <androidx.appcompat.widget.AppCompatTextView
             style="@style/default_text_style"
             android:id="@+id/message"
-            android:layout_width="0dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="32dp"
             android:layout_marginTop="16dp"
+            android:layout_marginStart="55dp"
             android:text="@string/welcome_page_2_message"
-            android:textColor="@color/gray_main2_600"
-            android:textSize="14sp"
+            android:textColor="?attr/color_text"
+            android:textSize="20sp"
             android:gravity="start"
+            android:maxLines="6"
             app:layout_constraintTop_toBottomOf="@id/page_title"
-            app:layout_constraintStart_toStartOf="@id/page_title"
+            app:layout_constraintStart_toEndOf="@id/image"
             app:layout_constraintEnd_toEndOf="parent"/>
 
     </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout-land/welcome_page_3.xml b/app/src/main/res/layout-land/welcome_page_3.xml
index 056eec701..f680b344e 100644
--- a/app/src/main/res/layout-land/welcome_page_3.xml
+++ b/app/src/main/res/layout-land/welcome_page_3.xml
@@ -9,83 +9,48 @@
         android:layout_height="wrap_content"
         android:layout_width="match_parent">
 
-        <ImageView
-            android:id="@+id/header"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:src="@drawable/mountains"
-            android:contentDescription="@null"
-            android:adjustViewBounds="true"
-            android:scaleType="centerCrop"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="@id/title_second_line"
-            app:tint="?attr/color_main1_500"/>
-
-        <androidx.appcompat.widget.AppCompatTextView
-            style="@style/default_text_style_800"
-            android:id="@+id/title_first_line"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="65dp"
-            android:text="@string/welcome_page_title"
-            android:textColor="?attr/color_on_main"
-            android:textSize="36sp"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintStart_toStartOf="parent"/>
-
-        <androidx.appcompat.widget.AppCompatTextView
-            style="@style/default_text_style_800"
-            android:id="@+id/title_second_line"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="15dp"
-            android:text="@string/welcome_page_subtitle"
-            android:textColor="?attr/color_on_main"
-            android:textSize="26sp"
-            app:layout_constraintBottom_toBottomOf="@id/title_first_line"
-            app:layout_constraintStart_toEndOf="@id/title_first_line"/>
-
         <ImageView
             android:id="@+id/image"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="@dimen/welcome_icon_size"
             android:layout_marginStart="32dp"
             android:src="@drawable/welcome_open_source_logo"
             android:contentDescription="@null"
+            app:layout_constraintHorizontal_chainStyle="packed"
             app:layout_constraintDimensionRatio="1:1"
-            app:layout_constraintTop_toBottomOf="@id/title_second_line"
+            app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent" />
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/message"/>
 
         <androidx.appcompat.widget.AppCompatTextView
             style="@style/default_text_style_800"
             android:id="@+id/page_title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="55dp"
             android:layout_marginStart="55dp"
             android:text="@string/welcome_page_3_title"
-            android:textColor="@color/gray_main2_600"
-            android:textSize="20sp"
+            android:textColor="?attr/color_text"
+            android:textSize="40sp"
             android:gravity="center"
-            app:layout_constraintTop_toBottomOf="@id/title_second_line"
+            app:layout_constraintTop_toTopOf="@id/image"
             app:layout_constraintStart_toEndOf="@id/image"/>
 
         <androidx.appcompat.widget.AppCompatTextView
             style="@style/default_text_style"
             android:id="@+id/message"
-            android:layout_width="0dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="32dp"
             android:layout_marginTop="16dp"
+            android:layout_marginStart="55dp"
             android:text="@string/welcome_page_3_message"
-            android:textColor="@color/gray_main2_600"
-            android:textSize="14sp"
+            android:textColor="?attr/color_text"
+            android:textSize="20sp"
             android:gravity="start"
+            android:maxLines="6"
             app:layout_constraintTop_toBottomOf="@id/page_title"
-            app:layout_constraintStart_toStartOf="@id/page_title"
+            app:layout_constraintStart_toEndOf="@id/image"
             app:layout_constraintEnd_toEndOf="parent"/>
 
     </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout-sw600dp/assistant_landing_fragment.xml b/app/src/main/res/layout-sw600dp/assistant_landing_fragment.xml
new file mode 100644
index 000000000..9021d47a6
--- /dev/null
+++ b/app/src/main/res/layout-sw600dp/assistant_landing_fragment.xml
@@ -0,0 +1,288 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+        <import type="android.view.View" />
+        <import type="android.text.InputType" />
+        <variable
+            name="backClickListener"
+            type="View.OnClickListener" />
+        <variable
+            name="forgottenPasswordClickListener"
+            type="View.OnClickListener" />
+        <variable
+            name="registerClickListener"
+            type="View.OnClickListener" />
+        <variable
+            name="thirdPartySipAccountLoginClickListener"
+            type="View.OnClickListener" />
+        <variable
+            name="qrCodeClickListener"
+            type="View.OnClickListener" />
+        <variable
+            name="viewModel"
+            type="org.linphone.ui.assistant.viewmodel.AccountLoginViewModel" />
+    </data>
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:fillViewport="true"
+        android:background="?attr/color_main2_000">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <ImageView
+                android:id="@+id/logo"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:adjustViewBounds="true"
+                android:scaleType="centerCrop"
+                android:contentDescription="@null"
+                android:src="@drawable/assistant_logo"
+                app:layout_constraintStart_toEndOf="@id/title"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintBottom_toTopOf="@id/header"
+                app:layout_constraintTop_toBottomOf="@id/register" />
+
+            <ImageView
+                android:id="@+id/back"
+                android:onClick="@{backClickListener}"
+                android:layout_width="@dimen/top_bar_height"
+                android:layout_height="@dimen/top_bar_height"
+                android:layout_marginStart="40dp"
+                android:padding="15dp"
+                android:src="@drawable/caret_left"
+                android:contentDescription="@string/content_description_go_back_icon"
+                android:visibility="@{viewModel.showBackButton ? View.VISIBLE : View.INVISIBLE, default=invisible}"
+                app:tint="?attr/color_main2_500"
+                app:layout_constraintTop_toTopOf="@id/title"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toStartOf="@id/title"/>
+    
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/assistant_page_title_style"
+                android:id="@+id/title"
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/top_bar_height"
+                android:layout_marginStart="10dp"
+                android:layout_marginTop="@dimen/assistant_title_top_margin"
+                android:text="@string/assistant_account_login"
+                android:textColor="?attr/color_text"
+                android:textSize="28sp"
+                android:drawableStart="@drawable/user_circle"
+                android:drawablePadding="10dp"
+                app:layout_constraintWidth_min="@dimen/button_max_width"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintStart_toEndOf="@id/back"/>
+
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/default_text_style"
+                android:id="@+id/no_account_yet"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="10dp"
+                android:layout_marginEnd="20dp"
+                android:text="@string/assistant_no_account_yet"
+                android:textSize="14sp"
+                android:textColor="?attr/color_main2_700"
+                android:visibility="@{viewModel.hideCreateAccount ? View.GONE : View.VISIBLE}"
+                app:layout_constraintHorizontal_chainStyle="packed"
+                app:layout_constraintEnd_toStartOf="@id/register"
+                app:layout_constraintTop_toTopOf="@id/register"
+                app:layout_constraintBottom_toBottomOf="@id/register"/>
+
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/primary_button_label_style"
+                android:id="@+id/register"
+                android:onClick="@{registerClickListener}"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="40dp"
+                android:paddingStart="20dp"
+                android:paddingEnd="20dp"
+                android:text="@string/assistant_account_register"
+                android:visibility="@{viewModel.hideCreateAccount ? View.GONE : View.VISIBLE}"
+                app:layout_constraintVertical_bias="1"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="@id/title"
+                app:layout_constraintBottom_toBottomOf="@id/title"/>
+
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/header_style"
+                android:id="@+id/sip_identity_label"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="16dp"
+                android:layout_marginTop="16dp"
+                android:text="@{@string/username + `*`, default=`Username*`}"
+                app:layout_constraintVertical_chainStyle="packed"
+                app:layout_constraintTop_toBottomOf="@id/title"
+                app:layout_constraintStart_toStartOf="@id/sip_identity"
+                app:layout_constraintBottom_toTopOf="@id/sip_identity"/>
+
+            <androidx.appcompat.widget.AppCompatEditText
+                style="@style/default_text_style"
+                android:id="@+id/sip_identity"
+                android:layout_width="0dp"
+                android:layout_height="50dp"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp"
+                android:paddingStart="20dp"
+                android:paddingEnd="20dp"
+                android:text="@={viewModel.sipIdentity, default=`johndoe`}"
+                android:textSize="14sp"
+                android:textColor="?attr/color_main2_600"
+                android:background="@drawable/edit_text_background"
+                android:inputType="text|textNoSuggestions"
+                android:hint="@string/username"
+                app:layout_constraintWidth_max="@dimen/text_input_max_width"
+                app:layout_constraintStart_toStartOf="@id/title"
+                app:layout_constraintEnd_toEndOf="@id/title"
+                app:layout_constraintTop_toBottomOf="@id/sip_identity_label"
+                app:layout_constraintBottom_toTopOf="@id/password_label"/>
+
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/header_style"
+                android:id="@+id/password_label"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="16dp"
+                android:layout_marginTop="16dp"
+                android:text="@{@string/password + `*`, default=`Password*`}"
+                app:layout_constraintWidth_max="@dimen/text_input_max_width"
+                app:layout_constraintTop_toBottomOf="@id/sip_identity"
+                app:layout_constraintStart_toStartOf="@id/password"
+                app:layout_constraintBottom_toTopOf="@id/password"/>
+
+            <androidx.appcompat.widget.AppCompatEditText
+                style="@style/default_text_style"
+                android:id="@+id/password"
+                android:layout_width="0dp"
+                android:layout_height="50dp"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp"
+                android:paddingStart="20dp"
+                android:paddingEnd="20dp"
+                android:text="@={viewModel.password, default=`johndoe`}"
+                android:textSize="14sp"
+                android:textColor="?attr/color_main2_600"
+                android:background="@drawable/edit_text_background"
+                android:hint="@string/password"
+                passwordInputType="@{viewModel.showPassword ? InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD : InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD, default=textPassword}"
+                app:layout_constraintWidth_max="@dimen/text_input_max_width"
+                app:layout_constraintStart_toStartOf="@id/title"
+                app:layout_constraintEnd_toEndOf="@id/title"
+                app:layout_constraintTop_toBottomOf="@id/password_label"
+                app:layout_constraintBottom_toTopOf="@id/login"/>
+
+            <ImageView
+                android:id="@+id/eye"
+                android:onClick="@{() -> viewModel.toggleShowPassword()}"
+                android:layout_width="@dimen/icon_size"
+                android:layout_height="0dp"
+                android:padding="4dp"
+                android:layout_marginEnd="20dp"
+                android:contentDescription="@string/content_description_toggle_password_visibility"
+                android:src="@{viewModel.showPassword ? @drawable/eye_slash : @drawable/eye, default=@drawable/eye}"
+                app:tint="?attr/color_main2_500"
+                app:layout_constraintEnd_toEndOf="@id/password"
+                app:layout_constraintTop_toTopOf="@id/password"
+                app:layout_constraintBottom_toBottomOf="@id/password" />
+
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/primary_button_label_style"
+                android:id="@+id/login"
+                android:onClick="@{() -> viewModel.login()}"
+                android:enabled="@{viewModel.loginEnabled &amp;&amp; !viewModel.registrationInProgress, default=false}"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="32dp"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp"
+                android:paddingStart="20dp"
+                android:paddingEnd="20dp"
+                android:text="@string/assistant_account_login"
+                app:layout_constraintWidth_max="@dimen/button_max_width"
+                app:layout_constraintTop_toBottomOf="@id/password"
+                app:layout_constraintStart_toStartOf="@id/title"
+                app:layout_constraintBottom_toTopOf="@id/scan_qr_code"/>
+
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/default_text_style_600"
+                android:id="@+id/forgotten_password"
+                android:onClick="@{forgottenPasswordClickListener}"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="20dp"
+                android:paddingTop="13dp"
+                android:paddingBottom="13dp"
+                android:paddingStart="20dp"
+                android:paddingEnd="20dp"
+                android:text="@string/assistant_forgotten_password"
+                android:textSize="13sp"
+                android:textColor="?attr/color_main2_500"
+                app:layout_constraintStart_toEndOf="@id/login"
+                app:layout_constraintTop_toTopOf="@id/login"
+                app:layout_constraintBottom_toBottomOf="@id/login"/>
+
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/secondary_button_label_style"
+                android:id="@+id/scan_qr_code"
+                android:onClick="@{qrCodeClickListener}"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="32dp"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp"
+                android:paddingStart="20dp"
+                android:paddingEnd="20dp"
+                android:text="@string/assistant_scan_qr_code"
+                android:drawableStart="@drawable/qr_code"
+                android:drawablePadding="8dp"
+                android:visibility="@{viewModel.hideScanQrCode ? View.GONE : View.VISIBLE}"
+                app:drawableTint="@color/secondary_button_label_color"
+                app:layout_constraintStart_toStartOf="@id/title"
+                app:layout_constraintEnd_toEndOf="@id/title"
+                app:layout_constraintTop_toBottomOf="@id/login"
+                app:layout_constraintBottom_toTopOf="@id/third_party_sip_account" />
+
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/secondary_button_label_style"
+                android:id="@+id/third_party_sip_account"
+                android:onClick="@{thirdPartySipAccountLoginClickListener}"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp"
+                android:paddingStart="20dp"
+                android:paddingEnd="20dp"
+                android:text="@string/assistant_login_third_party_sip_account"
+                android:visibility="@{viewModel.hideThirdPartyAccount ? View.GONE : View.VISIBLE}"
+                app:layout_constraintStart_toStartOf="@id/title"
+                app:layout_constraintEnd_toEndOf="@id/title"
+                app:layout_constraintTop_toBottomOf="@id/scan_qr_code"
+                app:layout_constraintBottom_toTopOf="@id/mountains"/>
+
+            <ImageView
+                android:id="@+id/mountains"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:src="@drawable/mountains"
+                android:adjustViewBounds="true"
+                android:scaleType="centerCrop"
+                android:contentDescription="@null"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:tint="?attr/color_main1_500" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </ScrollView>
+
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-sw600dp/assistant_permissions_fragment.xml b/app/src/main/res/layout-sw600dp/assistant_permissions_fragment.xml
new file mode 100644
index 000000000..87e0400c7
--- /dev/null
+++ b/app/src/main/res/layout-sw600dp/assistant_permissions_fragment.xml
@@ -0,0 +1,261 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+        <import type="android.view.View" />
+        <import type="android.text.InputType" />
+        <variable
+            name="backClickListener"
+            type="View.OnClickListener" />
+        <variable
+            name="grantReadContactsClickListener"
+            type="View.OnClickListener" />
+        <variable
+            name="grantPostNotificationsClickListener"
+            type="View.OnClickListener" />
+        <variable
+            name="grantRecordAudioClickListener"
+            type="View.OnClickListener" />
+        <variable
+            name="grantAccessCameraClickListener"
+            type="View.OnClickListener" />
+        <variable
+            name="skipClickListener"
+            type="View.OnClickListener" />
+        <variable
+            name="grantAllClickListener"
+            type="View.OnClickListener" />
+    </data>
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:fillViewport="true"
+        android:background="?attr/color_main2_000">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <ImageView
+                android:id="@+id/back"
+                android:onClick="@{backClickListener}"
+                android:layout_width="@dimen/top_bar_height"
+                android:layout_height="@dimen/top_bar_height"
+                android:layout_marginStart="40dp"
+                android:padding="15dp"
+                android:src="@drawable/caret_left"
+                android:contentDescription="@string/content_description_go_back_icon"
+                app:tint="?attr/color_main2_500"
+                app:layout_constraintTop_toTopOf="@id/title"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toStartOf="@id/title"/>
+
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/assistant_page_title_style"
+                android:id="@+id/title"
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/top_bar_height"
+                android:layout_marginStart="10dp"
+                android:layout_marginTop="@dimen/assistant_title_top_margin"
+                android:text="@string/assistant_permissions_title"
+                android:textColor="?attr/color_text"
+                android:textSize="28sp"
+                android:drawableStart="@drawable/user_circle"
+                android:drawablePadding="10dp"
+                app:layout_constraintWidth_min="@dimen/button_max_width"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintStart_toEndOf="@id/back"/>
+
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/default_text_style"
+                android:id="@+id/subtitle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp"
+                android:layout_marginTop="16dp"
+                android:text="@string/assistant_permissions_subtitle"
+                android:gravity="center"
+                app:layout_constraintVertical_chainStyle="packed"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/title"
+                app:layout_constraintBottom_toTopOf="@id/post_notifications_icon"/>
+
+            <ImageView
+                android:id="@+id/post_notifications_icon"
+                android:layout_width="56dp"
+                android:layout_height="56dp"
+                android:layout_marginTop="32dp"
+                android:layout_marginStart="16dp"
+                android:background="@drawable/circle_light_blue_button_background"
+                android:padding="12dp"
+                android:src="@drawable/bell_ringing"
+                android:contentDescription="@null"
+                app:tint="?attr/color_main2_500"
+                app:layout_constraintTop_toBottomOf="@id/subtitle"
+                app:layout_constraintBottom_toTopOf="@id/read_contacts_icon"
+                app:layout_constraintStart_toStartOf="@id/subtitle"/>
+
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/default_text_style"
+                android:id="@+id/post_notifications_title"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp"
+                android:text="@string/assistant_permissions_post_notifications_title"
+                android:maxLines="2"
+                android:ellipsize="end"
+                app:layout_constraintTop_toTopOf="@id/post_notifications_icon"
+                app:layout_constraintStart_toEndOf="@id/post_notifications_icon"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintBottom_toBottomOf="@id/post_notifications_icon"/>
+
+            <ImageView
+                android:id="@+id/read_contacts_icon"
+                android:layout_width="56dp"
+                android:layout_height="56dp"
+                android:layout_marginTop="16dp"
+                android:layout_marginStart="16dp"
+                android:background="@drawable/circle_light_blue_button_background"
+                android:padding="12dp"
+                android:src="@drawable/address_book"
+                android:contentDescription="@null"
+                app:tint="?attr/color_main2_500"
+                app:layout_constraintTop_toBottomOf="@id/post_notifications_icon"
+                app:layout_constraintBottom_toTopOf="@id/record_audio_icon"
+                app:layout_constraintStart_toStartOf="@id/subtitle"/>
+
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/default_text_style"
+                android:id="@+id/read_contacts_title"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp"
+                android:text="@string/assistant_permissions_read_contacts_title"
+                android:maxLines="2"
+                android:ellipsize="end"
+                app:layout_constraintTop_toTopOf="@id/read_contacts_icon"
+                app:layout_constraintStart_toEndOf="@id/read_contacts_icon"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintBottom_toBottomOf="@id/read_contacts_icon"/>
+
+            <ImageView
+                android:id="@+id/record_audio_icon"
+                android:layout_width="56dp"
+                android:layout_height="56dp"
+                android:layout_marginTop="16dp"
+                android:layout_marginStart="16dp"
+                android:background="@drawable/circle_light_blue_button_background"
+                android:padding="12dp"
+                android:src="@drawable/microphone"
+                android:contentDescription="@null"
+                app:tint="?attr/color_main2_500"
+                app:layout_constraintTop_toBottomOf="@id/read_contacts_icon"
+                app:layout_constraintBottom_toTopOf="@id/access_camera_icon"
+                app:layout_constraintStart_toStartOf="@id/subtitle"/>
+
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/default_text_style"
+                android:id="@+id/record_audio_title"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp"
+                android:text="@string/assistant_permissions_record_audio_title"
+                android:maxLines="2"
+                android:ellipsize="end"
+                app:layout_constraintTop_toTopOf="@id/record_audio_icon"
+                app:layout_constraintStart_toEndOf="@id/record_audio_icon"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintBottom_toBottomOf="@id/record_audio_icon"/>
+
+            <ImageView
+                android:id="@+id/access_camera_icon"
+                android:layout_width="56dp"
+                android:layout_height="56dp"
+                android:layout_marginTop="16dp"
+                android:layout_marginStart="16dp"
+                android:background="@drawable/circle_light_blue_button_background"
+                android:padding="12dp"
+                android:src="@drawable/video_camera"
+                android:contentDescription="@null"
+                app:tint="?attr/color_main2_500"
+                app:layout_constraintTop_toBottomOf="@id/record_audio_icon"
+                app:layout_constraintBottom_toTopOf="@id/skip"
+                app:layout_constraintStart_toStartOf="@id/subtitle"/>
+
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/default_text_style"
+                android:id="@+id/access_camera_title"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp"
+                android:text="@string/assistant_permissions_access_camera_title"
+                android:maxLines="2"
+                android:ellipsize="end"
+                app:layout_constraintTop_toTopOf="@id/access_camera_icon"
+                app:layout_constraintStart_toEndOf="@id/access_camera_icon"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintBottom_toBottomOf="@id/access_camera_icon"/>
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:onClick="@{skipClickListener}"
+                style="@style/secondary_button_label_style"
+                android:id="@+id/skip"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp"
+                android:layout_marginTop="32dp"
+                android:paddingStart="20dp"
+                android:paddingEnd="20dp"
+                android:text="@string/assistant_permissions_skip_permissions"
+                app:layout_constraintWidth_max="@dimen/button_max_width"
+                app:layout_constraintVertical_bias="1"
+                app:layout_constraintTop_toBottomOf="@id/access_camera_icon"
+                app:layout_constraintBottom_toTopOf="@id/grant_all_permissions"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent" />
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:onClick="@{grantAllClickListener}"
+                style="@style/primary_button_label_style"
+                android:id="@+id/grant_all_permissions"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp"
+                android:layout_marginTop="16dp"
+                android:paddingStart="20dp"
+                android:paddingEnd="20dp"
+                android:text="@string/assistant_permissions_grant_all_of_them"
+                app:layout_constraintWidth_max="@dimen/button_max_width"
+                app:layout_constraintTop_toBottomOf="@id/skip"
+                app:layout_constraintBottom_toTopOf="@id/mountains"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent" />
+
+            <ImageView
+                android:id="@+id/mountains"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:src="@drawable/mountains"
+                android:adjustViewBounds="true"
+                android:scaleType="centerCrop"
+                android:contentDescription="@null"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:tint="?attr/color_main1_500" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </ScrollView>
+
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-sw600dp/assistant_register_confirm_sms_code_fragment.xml b/app/src/main/res/layout-sw600dp/assistant_register_confirm_sms_code_fragment.xml
new file mode 100644
index 000000000..6f3941395
--- /dev/null
+++ b/app/src/main/res/layout-sw600dp/assistant_register_confirm_sms_code_fragment.xml
@@ -0,0 +1,217 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:bind="http://schemas.android.com/tools">
+
+    <data>
+        <import type="android.view.View" />
+        <import type="android.text.InputType" />
+        <variable
+            name="backClickListener"
+            type="View.OnClickListener" />
+        <variable
+            name="viewModel"
+            type="org.linphone.ui.assistant.viewmodel.AccountCreationViewModel" />
+    </data>
+
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <ImageView
+                android:id="@+id/logo"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:adjustViewBounds="true"
+                android:scaleType="centerCrop"
+                android:contentDescription="@null"
+                android:src="@drawable/confirm_sms_code_logo"
+                app:layout_constraintStart_toEndOf="@id/message"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintBottom_toTopOf="@id/mountains"
+                app:layout_constraintTop_toBottomOf="@id/title" />
+
+            <ImageView
+                android:id="@+id/back"
+                android:onClick="@{backClickListener}"
+                android:layout_width="@dimen/top_bar_height"
+                android:layout_height="@dimen/top_bar_height"
+                android:layout_marginStart="40dp"
+                android:padding="15dp"
+                android:src="@drawable/caret_left"
+                android:contentDescription="@string/content_description_go_back_icon"
+                android:visibility="invisible"
+                app:tint="?attr/color_main2_500"
+                app:layout_constraintTop_toTopOf="@id/title"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toStartOf="@id/title"/>
+
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/assistant_page_title_style"
+                android:id="@+id/title"
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/top_bar_height"
+                android:layout_marginStart="10dp"
+                android:layout_marginTop="@dimen/assistant_title_top_margin"
+                android:text="@string/assistant_account_creation_sms_confirmation_title"
+                android:textColor="?attr/color_text"
+                android:textSize="28sp"
+                android:drawableStart="@drawable/user_circle"
+                android:drawablePadding="10dp"
+                app:layout_constraintWidth_min="@dimen/button_max_width"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintStart_toEndOf="@id/back"/>
+
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/default_text_style"
+                android:id="@+id/message"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp"
+                android:layout_marginTop="16dp"
+                android:text="@{viewModel.confirmationMessage, default=@string/assistant_account_creation_sms_confirmation_explanation}"
+                android:textSize="14sp"
+                android:textColor="?attr/color_main2_600"
+                app:layout_constraintVertical_chainStyle="packed"
+                app:layout_constraintTop_toBottomOf="@id/title"
+                app:layout_constraintBottom_toTopOf="@id/code_first_digit"
+                app:layout_constraintStart_toStartOf="@id/title"
+                app:layout_constraintEnd_toEndOf="@id/title"/>
+
+            <androidx.appcompat.widget.AppCompatEditText
+                focusNextOnInput="@{true}"
+                style="@style/default_text_style_300"
+                android:id="@+id/code_first_digit"
+                android:layout_width="wrap_content"
+                android:layout_height="0dp"
+                android:layout_marginTop="32dp"
+                android:background="@drawable/shape_assistant_sms_code_confirmation"
+                android:text="@={viewModel.smsCodeFirstDigit, default=`1`}"
+                android:maxLength="1"
+                android:textColor="@color/assistant_sms_confirmation_code_color"
+                android:textSize="50sp"
+                android:textCursorDrawable="@color/transparent_color"
+                android:gravity="center"
+                android:inputType="number"
+                android:imeOptions="actionNext"
+                android:nextFocusDown="@id/code_second_digit"
+                app:layout_constraintDimensionRatio="1:1"
+                app:layout_constraintHorizontal_chainStyle="spread_inside"
+                app:layout_constraintTop_toBottomOf="@id/message"
+                app:layout_constraintBottom_toTopOf="@id/wrong_number"
+                app:layout_constraintStart_toStartOf="@id/title"
+                app:layout_constraintEnd_toStartOf="@id/code_second_digit" />
+
+            <androidx.appcompat.widget.AppCompatEditText
+                focusNextOnInput="@{true}"
+                style="@style/default_text_style_300"
+                android:id="@+id/code_second_digit"
+                android:layout_width="wrap_content"
+                android:layout_height="0dp"
+                android:background="@drawable/shape_assistant_sms_code_confirmation"
+                android:text="@={viewModel.smsCodeSecondDigit, default=`2`}"
+                android:maxLength="1"
+                android:textColor="@color/assistant_sms_confirmation_code_color"
+                android:textSize="50sp"
+                android:textCursorDrawable="@color/transparent_color"
+                android:gravity="center"
+                android:inputType="number"
+                android:imeOptions="actionNext"
+                android:nextFocusDown="@id/code_third_digit"
+                app:layout_constraintDimensionRatio="1:1"
+                app:layout_constraintTop_toTopOf="@id/code_first_digit"
+                app:layout_constraintBottom_toBottomOf="@id/code_first_digit"
+                app:layout_constraintStart_toEndOf="@id/code_first_digit"
+                app:layout_constraintEnd_toStartOf="@id/code_third_digit" />
+
+            <androidx.appcompat.widget.AppCompatEditText
+                focusNextOnInput="@{true}"
+                style="@style/default_text_style_300"
+                android:id="@+id/code_third_digit"
+                android:layout_width="wrap_content"
+                android:layout_height="0dp"
+                android:background="@drawable/shape_assistant_sms_code_confirmation"
+                android:text="@={viewModel.smsCodeThirdDigit, default=`3`}"
+                android:maxLength="1"
+                android:textColor="@color/assistant_sms_confirmation_code_color"
+                android:textSize="50sp"
+                android:textCursorDrawable="@color/transparent_color"
+                android:gravity="center"
+                android:inputType="number"
+                android:imeOptions="actionNext"
+                android:nextFocusDown="@id/code_last_digit"
+                app:layout_constraintDimensionRatio="1:1"
+                app:layout_constraintTop_toTopOf="@id/code_first_digit"
+                app:layout_constraintBottom_toBottomOf="@id/code_first_digit"
+                app:layout_constraintStart_toEndOf="@id/code_second_digit"
+                app:layout_constraintEnd_toStartOf="@id/code_last_digit" />
+
+            <androidx.appcompat.widget.AppCompatEditText
+                validateOnInput="@{() -> viewModel.validateCode()}"
+                style="@style/default_text_style_300"
+                android:id="@+id/code_last_digit"
+                android:layout_width="wrap_content"
+                android:layout_height="0dp"
+                android:background="@drawable/shape_assistant_sms_code_confirmation"
+                android:text="@={viewModel.smsCodeLastDigit, default=`4`}"
+                android:maxLength="1"
+                android:textColor="@color/assistant_sms_confirmation_code_color"
+                android:textSize="50sp"
+                android:textCursorDrawable="@color/transparent_color"
+                android:gravity="center"
+                android:inputType="number"
+                android:imeOptions="actionDone"
+                app:layout_constraintDimensionRatio="1:1"
+                app:layout_constraintTop_toTopOf="@id/code_first_digit"
+                app:layout_constraintBottom_toBottomOf="@id/code_first_digit"
+                app:layout_constraintStart_toEndOf="@id/code_third_digit"
+                app:layout_constraintEnd_toEndOf="@id/title" />
+
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/default_text_style_600"
+                android:id="@+id/wrong_number"
+                android:onClick="@{backClickListener}"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="32dp"
+                android:paddingTop="6dp"
+                android:paddingBottom="6dp"
+                android:paddingStart="12dp"
+                android:paddingEnd="12dp"
+                android:text="@string/assistant_account_creation_wrong_phone_number"
+                android:textSize="13sp"
+                android:textColor="@color/secondary_button_label_color"
+                android:gravity="center"
+                android:background="@drawable/secondary_button_background"
+                app:layout_constraintStart_toStartOf="@id/title"
+                app:layout_constraintEnd_toEndOf="@id/title"
+                app:layout_constraintTop_toBottomOf="@id/code_first_digit"
+                app:layout_constraintBottom_toTopOf="@id/mountains"/>
+
+            <ImageView
+                android:id="@+id/mountains"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:src="@drawable/mountains"
+                android:adjustViewBounds="true"
+                android:scaleType="centerCrop"
+                android:contentDescription="@null"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:tint="?attr/color_main1_500" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <include
+        layout="@layout/operation_in_progress"
+        bind:visibility="@{viewModel.operationInProgress}" />
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
+
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-sw600dp/assistant_register_fragment.xml b/app/src/main/res/layout-sw600dp/assistant_register_fragment.xml
new file mode 100644
index 000000000..75fc8a3b8
--- /dev/null
+++ b/app/src/main/res/layout-sw600dp/assistant_register_fragment.xml
@@ -0,0 +1,390 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:bind="http://schemas.android.com/tools">
+
+    <data>
+        <import type="android.view.View" />
+        <import type="android.text.InputType" />
+        <variable
+            name="backClickListener"
+            type="View.OnClickListener" />
+        <variable
+            name="createAccountClickListener"
+            type="View.OnClickListener" />
+        <variable
+            name="openSubscribeWebPageClickListener"
+            type="View.OnClickListener" />
+        <variable
+            name="loginClickListener"
+            type="View.OnClickListener" />
+        <variable
+            name="viewModel"
+            type="org.linphone.ui.assistant.viewmodel.AccountCreationViewModel" />
+    </data>
+
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="?attr/color_main2_000">
+
+        <ScrollView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:fillViewport="true">
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <ImageView
+                    android:id="@+id/logo"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:adjustViewBounds="true"
+                    android:scaleType="centerCrop"
+                    android:contentDescription="@null"
+                    android:src="@drawable/assistant_logo"
+                    app:layout_constraintStart_toEndOf="@id/title"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintBottom_toTopOf="@id/mountains"
+                    app:layout_constraintTop_toBottomOf="@id/login" />
+
+                <ImageView
+                    android:id="@+id/back"
+                    android:onClick="@{backClickListener}"
+                    android:layout_width="@dimen/top_bar_height"
+                    android:layout_height="@dimen/top_bar_height"
+                    android:layout_marginStart="40dp"
+                    android:padding="15dp"
+                    android:src="@drawable/caret_left"
+                    android:contentDescription="@string/content_description_go_back_icon"
+                    app:tint="?attr/color_main2_500"
+                    app:layout_constraintTop_toTopOf="@id/title"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toStartOf="@id/title"/>
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/assistant_page_title_style"
+                    android:id="@+id/title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="@dimen/top_bar_height"
+                    android:layout_marginStart="10dp"
+                    android:layout_marginTop="@dimen/assistant_title_top_margin"
+                    android:text="@string/assistant_account_register"
+                    android:textColor="?attr/color_text"
+                    android:textSize="28sp"
+                    android:drawableStart="@drawable/user_circle"
+                    android:drawablePadding="10dp"
+                    app:layout_constraintWidth_min="@dimen/button_max_width"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintStart_toEndOf="@id/back"/>
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/header_style"
+                    android:id="@+id/username_label"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="16dp"
+                    android:layout_marginTop="16dp"
+                    android:text="@{@string/username + `*`}"
+                    app:layout_constraintVertical_chainStyle="packed"
+                    app:layout_constraintTop_toBottomOf="@id/title"
+                    app:layout_constraintBottom_toTopOf="@id/username"
+                    app:layout_constraintStart_toStartOf="@id/username"/>
+
+                <androidx.appcompat.widget.AppCompatEditText
+                    style="@style/default_text_style"
+                    android:id="@+id/username"
+                    android:enabled="@{viewModel.pushNotificationsAvailable &amp;&amp; !viewModel.lockUsernameAndPassword}"
+                    android:layout_width="0dp"
+                    android:layout_height="50dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:paddingStart="20dp"
+                    android:paddingEnd="20dp"
+                    android:text="@={viewModel.username, default=`johndoe`}"
+                    android:textSize="14sp"
+                    android:textColor="?attr/color_main2_600"
+                    android:background="@{viewModel.usernameError.length() > 0 ? @drawable/shape_edit_text_error_background : @drawable/edit_text_background, default=@drawable/edit_text_background}"
+                    android:inputType="text"
+                    android:hint="@string/username"
+                    app:layout_constraintWidth_max="@dimen/text_input_max_width"
+                    app:layout_constraintTop_toBottomOf="@id/username_label"
+                    app:layout_constraintBottom_toTopOf="@id/username_error"
+                    app:layout_constraintStart_toStartOf="@id/title"
+                    app:layout_constraintEnd_toEndOf="@id/title"/>
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/default_text_style_600"
+                    android:visibility="@{viewModel.usernameError.length() == 0 ? View.GONE : View.VISIBLE, default=gone}"
+                    android:id="@+id/username_error"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:text="@{viewModel.usernameError, default=`Error`}"
+                    android:textSize="13sp"
+                    android:textColor="?attr/color_danger_500"
+                    app:layout_constraintTop_toBottomOf="@id/username"
+                    app:layout_constraintBottom_toTopOf="@id/phone_number_label"
+                    app:layout_constraintStart_toStartOf="@id/username"
+                    app:layout_constraintEnd_toEndOf="@id/username"/>
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/header_style"
+                    android:id="@+id/phone_number_label"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="16dp"
+                    android:layout_marginTop="16dp"
+                    android:text="@{@string/phone_number + `*`}"
+                    app:layout_constraintTop_toBottomOf="@id/username_error"
+                    app:layout_constraintBottom_toTopOf="@id/phone_number"
+                    app:layout_constraintStart_toStartOf="@id/prefix"/>
+
+                <ImageView
+                    android:id="@+id/phone_number_background"
+                    android:layout_width="0dp"
+                    android:layout_height="0dp"
+                    android:src="@{viewModel.phoneNumberError.length() > 0 ? @drawable/shape_edit_text_error_background : @drawable/edit_text_background, default=@drawable/edit_text_background}"
+                    android:contentDescription="@null"
+                    app:layout_constraintStart_toStartOf="@id/prefix"
+                    app:layout_constraintEnd_toEndOf="@id/phone_number"
+                    app:layout_constraintTop_toTopOf="@id/prefix"
+                    app:layout_constraintBottom_toBottomOf="@id/prefix" />
+
+                <androidx.appcompat.widget.AppCompatSpinner
+                    style="@style/default_text_style"
+                    android:id="@+id/prefix"
+                    android:enabled="@{viewModel.pushNotificationsAvailable}"
+                    android:layout_width="wrap_content"
+                    android:layout_height="0dp"
+                    android:paddingStart="20dp"
+                    android:paddingEnd="25dp"
+                    android:textSize="14sp"
+                    android:textColor="?attr/color_main2_600"
+                    android:gravity="center_vertical"
+                    android:overlapAnchor="false"
+                    android:dropDownVerticalOffset="25dp"
+                    android:spinnerMode="dropdown"
+                    android:popupBackground="@drawable/shape_squircle_white_background"
+                    android:background="@color/transparent_color"
+                    app:layout_constraintTop_toTopOf="@id/phone_number"
+                    app:layout_constraintBottom_toBottomOf="@id/phone_number"
+                    app:layout_constraintStart_toStartOf="@id/username" />
+
+                <ImageView
+                    android:id="@+id/prefix_caret"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/caret_down"
+                    android:contentDescription="@null"
+                    app:tint="?attr/color_main2_600"
+                    app:layout_constraintTop_toTopOf="@id/prefix"
+                    app:layout_constraintBottom_toBottomOf="@id/prefix"
+                    app:layout_constraintEnd_toEndOf="@id/prefix"/>
+
+                <androidx.appcompat.widget.AppCompatEditText
+                    style="@style/default_text_style"
+                    android:id="@+id/phone_number"
+                    android:enabled="@{viewModel.pushNotificationsAvailable}"
+                    android:layout_width="0dp"
+                    android:layout_height="50dp"
+                    android:layout_marginStart="5dp"
+                    android:paddingEnd="20dp"
+                    android:text="@={viewModel.phoneNumber, default=`6 01 02 03 04 05`}"
+                    android:textSize="14sp"
+                    android:textColor="?attr/color_main2_600"
+                    android:inputType="phone"
+                    android:drawableStart="@drawable/separator"
+                    android:drawablePadding="10dp"
+                    android:hint="@string/phone_number"
+                    android:background="@color/transparent_color"
+                    app:layout_constraintWidth_max="@dimen/text_input_max_width"
+                    app:layout_constraintTop_toBottomOf="@id/phone_number_label"
+                    app:layout_constraintBottom_toTopOf="@id/phone_number_error"
+                    app:layout_constraintStart_toEndOf="@id/prefix_caret"
+                    app:layout_constraintEnd_toEndOf="@id/username"
+                    bind:ignore="RtlSymmetry" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/default_text_style_600"
+                    android:visibility="@{viewModel.phoneNumberError.length() == 0 ? View.GONE : View.VISIBLE, default=gone}"
+                    android:id="@+id/phone_number_error"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:text="@{viewModel.phoneNumberError, default=`Error`}"
+                    android:textSize="13sp"
+                    android:textColor="?attr/color_danger_500"
+                    app:layout_constraintTop_toBottomOf="@id/phone_number"
+                    app:layout_constraintBottom_toTopOf="@id/password_label"
+                    app:layout_constraintStart_toStartOf="@id/prefix"
+                    app:layout_constraintEnd_toEndOf="@id/phone_number"/>
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/header_style"
+                    android:id="@+id/password_label"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="16dp"
+                    android:layout_marginTop="16dp"
+                    android:text="@{@string/password + `*`}"
+                    app:layout_constraintTop_toBottomOf="@id/phone_number_error"
+                    app:layout_constraintBottom_toTopOf="@id/password"
+                    app:layout_constraintStart_toStartOf="@id/password"/>
+
+                <androidx.appcompat.widget.AppCompatEditText
+                    style="@style/default_text_style"
+                    android:id="@+id/password"
+                    android:enabled="@{viewModel.pushNotificationsAvailable &amp;&amp; !viewModel.lockUsernameAndPassword}"
+                    android:layout_width="0dp"
+                    android:layout_height="50dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:paddingStart="20dp"
+                    android:paddingEnd="20dp"
+                    android:text="@={viewModel.password, default=`johndoe`}"
+                    android:textSize="14sp"
+                    android:textColor="?attr/color_main2_600"
+                    android:background="@drawable/edit_text_background"
+                    android:hint="@string/password"
+                    passwordInputType="@{viewModel.showPassword ? InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD : InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD, default=textPassword}"
+                    app:layout_constraintWidth_max="@dimen/text_input_max_width"
+                    app:layout_constraintTop_toBottomOf="@id/password_label"
+                    app:layout_constraintBottom_toTopOf="@id/password_error"
+                    app:layout_constraintStart_toStartOf="@id/title"
+                    app:layout_constraintEnd_toEndOf="@id/title"/>
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/default_text_style_600"
+                    android:visibility="@{viewModel.passwordError.length() == 0 ? View.GONE : View.VISIBLE, default=gone}"
+                    android:id="@+id/password_error"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:text="@{viewModel.passwordError, default=`Error`}"
+                    android:textSize="13sp"
+                    android:textColor="?attr/color_danger_500"
+                    app:layout_constraintTop_toBottomOf="@id/password"
+                    app:layout_constraintBottom_toTopOf="@id/create"
+                    app:layout_constraintStart_toStartOf="@id/password"
+                    app:layout_constraintEnd_toEndOf="@id/password"/>
+
+                <ImageView
+                    android:onClick="@{() -> viewModel.toggleShowPassword()}"
+                    android:id="@+id/eye"
+                    android:layout_width="@dimen/icon_size"
+                    android:layout_height="0dp"
+                    android:padding="4dp"
+                    android:layout_marginEnd="20dp"
+                    android:contentDescription="@string/content_description_toggle_password_visibility"
+                    android:src="@{viewModel.showPassword ? @drawable/eye_slash : @drawable/eye, default=@drawable/eye}"
+                    app:tint="?attr/color_main2_500"
+                    app:layout_constraintEnd_toEndOf="@id/password"
+                    app:layout_constraintTop_toTopOf="@id/password"
+                    app:layout_constraintBottom_toBottomOf="@id/password" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:onClick="@{() -> viewModel.phoneNumberConfirmedByUser()}"
+                    android:enabled="@{viewModel.createEnabled &amp;&amp; viewModel.pushNotificationsAvailable &amp;&amp; !viewModel.operationInProgress, default=false}"
+                    style="@style/primary_button_label_style"
+                    android:id="@+id/create"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="32dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:text="@string/assistant_account_create"
+                    app:layout_constraintWidth_max="@dimen/button_max_width"
+                    app:layout_constraintTop_toBottomOf="@id/password_error"
+                    app:layout_constraintBottom_toTopOf="@id/create_email_account"
+                    app:layout_constraintStart_toStartOf="@id/title"
+                    app:layout_constraintEnd_toEndOf="@id/title" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/default_text_style"
+                    android:id="@+id/create_email_account_label"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:text="@string/assistant_create_account_using_email_on_our_web_platform"
+                    android:textSize="14sp"
+                    android:textColor="?attr/color_main2_700"
+                    app:layout_constraintTop_toTopOf="@id/create_email_account"
+                    app:layout_constraintBottom_toBottomOf="@id/create_email_account"
+                    app:layout_constraintStart_toStartOf="@id/title"
+                    app:layout_constraintEnd_toStartOf="@id/create_email_account"/>
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:onClick="@{openSubscribeWebPageClickListener}"
+                    style="@style/default_text_style_600"
+                    android:id="@+id/create_email_account"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="20dp"
+                    android:layout_marginTop="32dp"
+                    android:paddingTop="6dp"
+                    android:paddingBottom="6dp"
+                    android:paddingStart="12dp"
+                    android:paddingEnd="12dp"
+                    android:text="@string/assistant_web_platform_link"
+                    android:textSize="13sp"
+                    android:textColor="@color/secondary_button_label_color"
+                    android:gravity="center"
+                    android:background="@drawable/secondary_button_background"
+                    app:layout_constraintStart_toEndOf="@id/create_email_account_label"
+                    app:layout_constraintTop_toBottomOf="@id/create"
+                    app:layout_constraintBottom_toTopOf="@id/mountains" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/default_text_style"
+                    android:id="@+id/already_an_account"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="10dp"
+                    android:layout_marginEnd="20dp"
+                    android:text="@string/assistant_already_have_an_account"
+                    android:textSize="14sp"
+                    android:textColor="?attr/color_main2_700"
+                    app:layout_constraintHorizontal_chainStyle="packed"
+                    app:layout_constraintEnd_toStartOf="@id/login"
+                    app:layout_constraintTop_toTopOf="@id/login"
+                    app:layout_constraintBottom_toBottomOf="@id/login"/>
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:onClick="@{loginClickListener}"
+                    style="@style/primary_button_label_style"
+                    android:id="@+id/login"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="40dp"
+                    android:paddingStart="20dp"
+                    android:paddingEnd="20dp"
+                    android:text="@string/assistant_account_login"
+                    app:layout_constraintVertical_bias="1"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="@id/title"
+                    app:layout_constraintBottom_toBottomOf="@id/title"/>
+
+                <ImageView
+                    android:id="@+id/mountains"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/mountains"
+                    android:adjustViewBounds="true"
+                    android:scaleType="centerCrop"
+                    android:contentDescription="@null"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:tint="?attr/color_main1_500" />
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+        </ScrollView>
+
+        <include
+            layout="@layout/operation_in_progress"
+            bind:visibility="@{viewModel.operationInProgress}" />
+
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
+
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-sw600dp/assistant_third_party_sip_account_login_fragment.xml b/app/src/main/res/layout-sw600dp/assistant_third_party_sip_account_login_fragment.xml
new file mode 100644
index 000000000..19598da8d
--- /dev/null
+++ b/app/src/main/res/layout-sw600dp/assistant_third_party_sip_account_login_fragment.xml
@@ -0,0 +1,388 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+        <import type="android.view.View" />
+        <import type="android.text.InputType" />
+        <variable
+            name="backClickListener"
+            type="View.OnClickListener" />
+        <variable
+            name="viewModel"
+            type="org.linphone.ui.assistant.viewmodel.ThirdPartySipAccountLoginViewModel" />
+    </data>
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:fillViewport="true"
+        android:background="?attr/color_main2_000">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <ImageView
+                android:id="@+id/logo"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:adjustViewBounds="true"
+                android:scaleType="centerCrop"
+                android:contentDescription="@null"
+                android:src="@drawable/assistant_logo"
+                app:layout_constraintStart_toEndOf="@id/advanced_settings"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintBottom_toTopOf="@id/mountains"
+                app:layout_constraintTop_toBottomOf="@id/title" />
+
+            <ImageView
+                android:id="@+id/back"
+                android:onClick="@{backClickListener}"
+                android:layout_width="@dimen/top_bar_height"
+                android:layout_height="@dimen/top_bar_height"
+                android:layout_marginStart="40dp"
+                android:padding="15dp"
+                android:src="@drawable/caret_left"
+                android:contentDescription="@string/content_description_go_back_icon"
+                app:tint="?attr/color_main2_500"
+                app:layout_constraintTop_toTopOf="@id/title"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toStartOf="@id/title"/>
+
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/assistant_page_title_style"
+                android:id="@+id/title"
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/top_bar_height"
+                android:layout_marginStart="10dp"
+                android:layout_marginTop="@dimen/assistant_title_top_margin"
+                android:text="@string/assistant_login_third_party_sip_account_title"
+                android:textColor="?attr/color_text"
+                android:textSize="28sp"
+                android:drawableStart="@drawable/user_circle"
+                android:drawablePadding="10dp"
+                app:layout_constraintWidth_min="@dimen/button_max_width"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintStart_toEndOf="@id/back"/>
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/username_label"
+                style="@style/header_style"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp"
+                android:layout_marginTop="16dp"
+                android:text="@{@string/username + `*`}"
+                app:layout_constraintVertical_chainStyle="packed"
+                app:layout_constraintTop_toBottomOf="@id/title"
+                app:layout_constraintBottom_toTopOf="@id/username"
+                app:layout_constraintStart_toStartOf="@id/username"/>
+
+            <androidx.appcompat.widget.AppCompatEditText
+                style="@style/default_text_style"
+                android:id="@+id/username"
+                android:layout_width="0dp"
+                android:layout_height="50dp"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp"
+                android:paddingStart="20dp"
+                android:paddingEnd="20dp"
+                android:text="@={viewModel.username, default=`johndoe`}"
+                android:textSize="14sp"
+                android:textColor="?attr/color_main2_600"
+                android:background="@drawable/edit_text_background"
+                android:inputType="text"
+                android:hint="@string/username"
+                app:layout_constraintWidth_max="@dimen/button_max_width"
+                app:layout_constraintTop_toBottomOf="@id/username_label"
+                app:layout_constraintBottom_toTopOf="@id/password_label"
+                app:layout_constraintStart_toStartOf="@id/title"
+                app:layout_constraintEnd_toEndOf="@id/title"/>
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/password_label"
+                style="@style/header_style"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp"
+                android:layout_marginTop="16dp"
+                android:text="@{@string/password + `*`}"
+                app:layout_constraintTop_toBottomOf="@id/username"
+                app:layout_constraintBottom_toTopOf="@id/password"
+                app:layout_constraintStart_toStartOf="@id/password"/>
+
+            <androidx.appcompat.widget.AppCompatEditText
+                style="@style/default_text_style"
+                android:id="@+id/password"
+                android:layout_width="0dp"
+                android:layout_height="50dp"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp"
+                android:paddingStart="20dp"
+                android:paddingEnd="20dp"
+                android:text="@={viewModel.password, default=`johndoe`}"
+                android:textSize="14sp"
+                android:textColor="?attr/color_main2_600"
+                android:background="@drawable/edit_text_background"
+                android:hint="@string/password"
+                passwordInputType="@{viewModel.showPassword ? InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD : InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD, default=textPassword}"
+                app:layout_constraintWidth_max="@dimen/text_input_max_width"
+                app:layout_constraintTop_toBottomOf="@id/password_label"
+                app:layout_constraintBottom_toTopOf="@id/domain_label"
+                app:layout_constraintStart_toStartOf="@id/title"
+                app:layout_constraintEnd_toEndOf="@id/title"/>
+
+            <ImageView
+                android:onClick="@{() -> viewModel.toggleShowPassword()}"
+                android:id="@+id/eye"
+                android:layout_width="@dimen/icon_size"
+                android:layout_height="0dp"
+                android:layout_marginEnd="20dp"
+                android:padding="4dp"
+                android:contentDescription="@string/content_description_toggle_password_visibility"
+                android:src="@{viewModel.showPassword ? @drawable/eye_slash : @drawable/eye, default=@drawable/eye}"
+                app:tint="?attr/color_main2_500"
+                app:layout_constraintEnd_toEndOf="@id/password"
+                app:layout_constraintTop_toTopOf="@id/password"
+                app:layout_constraintBottom_toBottomOf="@id/password" />
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/domain_label"
+                style="@style/header_style"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="18dp"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp"
+                android:text="@{@string/sip_address_domain + `*`, default=`Domain*`}"
+                app:layout_constraintTop_toBottomOf="@id/password"
+                app:layout_constraintBottom_toTopOf="@id/domain"
+                app:layout_constraintStart_toStartOf="@id/domain"/>
+
+            <androidx.appcompat.widget.AppCompatEditText
+                style="@style/default_text_style"
+                android:id="@+id/domain"
+                android:layout_width="0dp"
+                android:layout_height="50dp"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp"
+                android:paddingStart="20dp"
+                android:paddingEnd="20dp"
+                android:text="@={viewModel.domain, default=`sip.example.net`}"
+                android:textSize="14sp"
+                android:textColor="?attr/color_main2_600"
+                android:background="@drawable/edit_text_background"
+                android:inputType="text|textUri"
+                android:hint="@string/sip_address_domain"
+                app:layout_constraintWidth_max="@dimen/text_input_max_width"
+                app:layout_constraintTop_toBottomOf="@id/domain_label"
+                app:layout_constraintBottom_toTopOf="@id/display_name_label"
+                app:layout_constraintStart_toStartOf="@id/title"
+                app:layout_constraintEnd_toEndOf="@id/title"/>
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/display_name_label"
+                style="@style/header_style"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="18dp"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp"
+                android:text="@string/sip_address_display_name"
+                app:layout_constraintTop_toBottomOf="@id/domain"
+                app:layout_constraintBottom_toTopOf="@id/display_name"
+                app:layout_constraintStart_toStartOf="@id/display_name"/>
+
+            <androidx.appcompat.widget.AppCompatEditText
+                style="@style/default_text_style"
+                android:id="@+id/display_name"
+                android:layout_width="0dp"
+                android:layout_height="50dp"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp"
+                android:paddingStart="20dp"
+                android:paddingEnd="20dp"
+                android:text="@={viewModel.displayName, default=`John Doe`}"
+                android:textSize="14sp"
+                android:textColor="?attr/color_main2_600"
+                android:background="@drawable/edit_text_background"
+                android:inputType="text|textPersonName|textCapSentences"
+                android:hint="@string/sip_address_display_name"
+                app:layout_constraintWidth_max="@dimen/text_input_max_width"
+                app:layout_constraintTop_toBottomOf="@id/display_name_label"
+                app:layout_constraintBottom_toTopOf="@id/transport_label"
+                app:layout_constraintStart_toStartOf="@id/title"
+                app:layout_constraintEnd_toEndOf="@id/title"/>
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/transport_label"
+                style="@style/header_style"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="18dp"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp"
+                android:text="@string/assistant_sip_account_transport_protocol"
+                app:layout_constraintTop_toBottomOf="@id/display_name"
+                app:layout_constraintBottom_toTopOf="@id/transport"
+                app:layout_constraintStart_toStartOf="@id/transport"/>
+
+            <androidx.appcompat.widget.AppCompatSpinner
+                android:id="@+id/transport"
+                android:layout_width="0dp"
+                android:layout_height="50dp"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp"
+                android:paddingStart="20dp"
+                android:paddingEnd="20dp"
+                android:background="@drawable/edit_text_background"
+                android:overlapAnchor="false"
+                android:spinnerMode="dropdown"
+                android:popupBackground="@drawable/shape_squircle_white_background"
+                app:layout_constraintWidth_max="@dimen/text_input_max_width"
+                app:layout_constraintTop_toBottomOf="@id/transport_label"
+                app:layout_constraintBottom_toTopOf="@id/login"
+                app:layout_constraintStart_toStartOf="@id/title"
+                app:layout_constraintEnd_toEndOf="@id/title"/>
+
+            <ImageView
+                android:id="@+id/transport_caret"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="20dp"
+                android:src="@drawable/caret_down"
+                android:contentDescription="@null"
+                app:tint="?attr/color_main2_600"
+                app:layout_constraintTop_toTopOf="@id/transport"
+                app:layout_constraintBottom_toBottomOf="@id/transport"
+                app:layout_constraintEnd_toEndOf="@id/transport"/>
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:onClick="@{() -> viewModel.login()}"
+                android:enabled="@{viewModel.loginEnabled &amp;&amp; !viewModel.registrationInProgress, default=false}"
+                style="@style/primary_button_label_style"
+                android:id="@+id/login"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="32dp"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp"
+                android:layout_marginBottom="@dimen/screen_bottom_margin"
+                android:paddingStart="20dp"
+                android:paddingEnd="20dp"
+                android:text="@string/assistant_account_login"
+                app:layout_constraintWidth_max="@dimen/button_max_width"
+                app:layout_constraintTop_toBottomOf="@id/transport"
+                app:layout_constraintBottom_toTopOf="@id/mountains"
+                app:layout_constraintStart_toStartOf="@id/title" />
+
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/section_header_style"
+                android:onClick="@{() -> viewModel.toggleAdvancedSettingsExpand()}"
+                android:id="@+id/advanced_settings"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="32dp"
+                android:layout_marginTop="35dp"
+                android:padding="5dp"
+                android:text="@string/settings_advanced_title"
+                android:drawableEnd="@{viewModel.expandAdvancedSettings ? @drawable/caret_up : @drawable/caret_down, default=@drawable/caret_up}"
+                android:drawableTint="?attr/color_main2_600"
+                android:drawablePadding="10dp"
+                app:layout_constraintWidth_max="@dimen/button_max_width"
+                app:layout_constraintStart_toEndOf="@id/title"
+                app:layout_constraintEnd_toStartOf="@id/logo"
+                app:layout_constraintTop_toBottomOf="@id/title" />
+
+            <androidx.constraintlayout.widget.Group
+                android:id="@+id/advanced_settings_group"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:constraint_referenced_ids="authentication_id_label, authentication_id, outbound_proxy_label, outbound_proxy"
+                android:visibility="@{viewModel.expandAdvancedSettings ? View.VISIBLE : View.GONE, default=gone}" />
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/authentication_id_label"
+                style="@style/header_style"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp"
+                android:text="@string/authentication_id"
+                app:layout_constraintTop_toBottomOf="@id/advanced_settings"
+                app:layout_constraintStart_toStartOf="@id/authentication_id"/>
+
+            <androidx.appcompat.widget.AppCompatEditText
+                style="@style/default_text_style"
+                android:id="@+id/authentication_id"
+                android:layout_width="0dp"
+                android:layout_height="50dp"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp"
+                android:paddingStart="20dp"
+                android:paddingEnd="20dp"
+                android:text="@={viewModel.authId}"
+                android:textSize="14sp"
+                android:textColor="?attr/color_main2_600"
+                android:background="@drawable/edit_text_background"
+                android:inputType="text"
+                android:hint="@string/authentication_id"
+                app:layout_constraintWidth_max="@dimen/text_input_max_width"
+                app:layout_constraintTop_toBottomOf="@id/authentication_id_label"
+                app:layout_constraintStart_toStartOf="@id/advanced_settings"
+                app:layout_constraintEnd_toEndOf="@id/advanced_settings"/>
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/outbound_proxy_label"
+                style="@style/header_style"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="18dp"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp"
+                android:text="@string/account_settings_sip_proxy_url_title"
+                app:layout_constraintTop_toBottomOf="@id/authentication_id"
+                app:layout_constraintStart_toStartOf="@id/outbound_proxy"/>
+
+            <androidx.appcompat.widget.AppCompatEditText
+                style="@style/default_text_style"
+                android:id="@+id/outbound_proxy"
+                android:layout_width="0dp"
+                android:layout_height="50dp"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp"
+                android:paddingStart="20dp"
+                android:paddingEnd="20dp"
+                android:text="@={viewModel.outboundProxy, default=`sip12.example.net`}"
+                android:textSize="14sp"
+                android:textColor="?attr/color_main2_600"
+                android:background="@drawable/edit_text_background"
+                android:inputType="text|textUri"
+                android:hint="@string/account_settings_sip_proxy_url_title"
+                app:layout_constraintWidth_max="@dimen/text_input_max_width"
+                app:layout_constraintTop_toBottomOf="@id/outbound_proxy_label"
+                app:layout_constraintStart_toStartOf="@id/advanced_settings"
+                app:layout_constraintEnd_toEndOf="@id/advanced_settings"/>
+
+            <ImageView
+                android:id="@+id/mountains"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:src="@drawable/mountains"
+                android:adjustViewBounds="true"
+                android:scaleType="centerCrop"
+                android:contentDescription="@null"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:tint="?attr/color_main1_500" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </ScrollView>
+
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-sw600dp/assistant_third_party_sip_account_warning_fragment.xml b/app/src/main/res/layout-sw600dp/assistant_third_party_sip_account_warning_fragment.xml
new file mode 100644
index 000000000..49a4d619a
--- /dev/null
+++ b/app/src/main/res/layout-sw600dp/assistant_third_party_sip_account_warning_fragment.xml
@@ -0,0 +1,195 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+        <import type="android.view.View" />
+        <import type="android.text.InputType" />
+        <variable
+            name="backClickListener"
+            type="View.OnClickListener" />
+        <variable
+            name="contactClickListener"
+            type="View.OnClickListener" />
+        <variable
+            name="createAccountClickListener"
+            type="View.OnClickListener" />
+        <variable
+            name="loginClickListener"
+            type="View.OnClickListener" />
+    </data>
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:fillViewport="true"
+        android:background="?attr/color_main2_000">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <ImageView
+                android:id="@+id/logo"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:adjustViewBounds="true"
+                android:scaleType="centerCrop"
+                android:contentDescription="@null"
+                android:src="@drawable/assistant_logo"
+                app:layout_constraintStart_toEndOf="@id/message"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintBottom_toTopOf="@id/mountains"
+                app:layout_constraintTop_toBottomOf="@id/title" />
+
+            <ImageView
+                android:id="@+id/back"
+                android:onClick="@{backClickListener}"
+                android:layout_width="@dimen/top_bar_height"
+                android:layout_height="@dimen/top_bar_height"
+                android:layout_marginStart="40dp"
+                android:padding="15dp"
+                android:src="@drawable/caret_left"
+                android:contentDescription="@string/content_description_go_back_icon"
+                app:tint="?attr/color_main2_500"
+                app:layout_constraintTop_toTopOf="@id/title"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toStartOf="@id/title"/>
+
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/assistant_page_title_style"
+                android:id="@+id/title"
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/top_bar_height"
+                android:layout_marginStart="10dp"
+                android:layout_marginTop="@dimen/assistant_title_top_margin"
+                android:text="@string/assistant_login_third_party_sip_account_title"
+                android:textColor="?attr/color_text"
+                android:textSize="28sp"
+                android:drawableStart="@drawable/user_circle"
+                android:drawablePadding="10dp"
+                app:layout_constraintWidth_min="@dimen/button_max_width"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintStart_toEndOf="@id/back"/>
+
+            <ImageView
+                android:id="@+id/no_chat"
+                android:layout_width="56dp"
+                android:layout_height="56dp"
+                android:layout_marginEnd="30dp"
+                android:layout_marginTop="16dp"
+                android:background="@drawable/circle_light_blue_button_background"
+                android:padding="16dp"
+                android:src="@drawable/chat_teardrop_slash"
+                android:contentDescription="@null"
+                app:tint="?attr/color_main2_500"
+                app:layout_constraintHorizontal_chainStyle="packed"
+                app:layout_constraintVertical_chainStyle="packed"
+                app:layout_constraintStart_toStartOf="@id/title"
+                app:layout_constraintEnd_toStartOf="@id/no_video"
+                app:layout_constraintTop_toBottomOf="@id/title"
+                app:layout_constraintBottom_toTopOf="@id/message"/>
+
+            <ImageView
+                android:id="@+id/no_video"
+                android:layout_width="56dp"
+                android:layout_height="56dp"
+                android:background="@drawable/circle_light_blue_button_background"
+                android:padding="16dp"
+                android:src="@drawable/video_camera_slash"
+                android:contentDescription="@null"
+                app:tint="?attr/color_main2_500"
+                app:layout_constraintStart_toEndOf="@id/no_chat"
+                app:layout_constraintEnd_toEndOf="@id/message"
+                app:layout_constraintTop_toTopOf="@id/no_chat"/>
+
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/default_text_style"
+                android:id="@+id/message"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:text="@string/assistant_third_party_sip_account_warning_explanation"
+                android:textSize="14sp"
+                android:gravity="start"
+                app:layout_constraintWidth_max="@dimen/button_max_width"
+                app:layout_constraintStart_toStartOf="@id/title"
+                app:layout_constraintTop_toBottomOf="@id/no_chat"
+                app:layout_constraintBottom_toTopOf="@id/contact"/>
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:onClick="@{contactClickListener}"
+                style="@style/default_text_style_600"
+                android:id="@+id/contact"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:paddingTop="6dp"
+                android:paddingBottom="6dp"
+                android:paddingStart="12dp"
+                android:paddingEnd="12dp"
+                android:text="@string/assistant_linphone_contact_us_link"
+                android:textSize="13sp"
+                android:textColor="@color/secondary_button_label_color"
+                android:gravity="center"
+                android:background="@drawable/secondary_button_background"
+                app:layout_constraintStart_toStartOf="@id/message"
+                app:layout_constraintEnd_toEndOf="@id/message"
+                app:layout_constraintTop_toBottomOf="@id/message"
+                app:layout_constraintBottom_toTopOf="@id/create_linphone_account"/>
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:onClick="@{createAccountClickListener}"
+                style="@style/secondary_button_label_style"
+                android:id="@+id/create_linphone_account"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="32dp"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp"
+                android:paddingStart="20dp"
+                android:paddingEnd="20dp"
+                android:text="@string/assistant_third_party_sip_account_create_linphone_account"
+                app:layout_constraintWidth_max="@dimen/button_max_width"
+                app:layout_constraintVertical_bias="1"
+                app:layout_constraintStart_toStartOf="@id/title"
+                app:layout_constraintEnd_toEndOf="@id/message"
+                app:layout_constraintTop_toBottomOf="@id/contact"
+                app:layout_constraintBottom_toTopOf="@id/continue_third_party_account_login" />
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:onClick="@{loginClickListener}"
+                style="@style/primary_button_label_style"
+                android:id="@+id/continue_third_party_account_login"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp"
+                android:paddingStart="20dp"
+                android:paddingEnd="20dp"
+                android:text="@string/assistant_third_party_sip_account_warning_ok"
+                app:layout_constraintWidth_max="@dimen/button_max_width"
+                app:layout_constraintTop_toBottomOf="@id/create_linphone_account"
+                app:layout_constraintBottom_toTopOf="@id/mountains"
+                app:layout_constraintStart_toStartOf="@id/title"
+                app:layout_constraintEnd_toEndOf="@id/message" />
+
+            <ImageView
+                android:id="@+id/mountains"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:src="@drawable/mountains"
+                android:adjustViewBounds="true"
+                android:scaleType="centerCrop"
+                android:contentDescription="@null"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:tint="?attr/color_main1_500" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </ScrollView>
+
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-sw600dp/welcome_activity.xml b/app/src/main/res/layout-sw600dp/welcome_activity.xml
new file mode 100644
index 000000000..4ae60e388
--- /dev/null
+++ b/app/src/main/res/layout-sw600dp/welcome_activity.xml
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+        <import type="android.view.View" />
+        <variable
+            name="skipClickListener"
+            type="View.OnClickListener" />
+        <variable
+            name="nextClickListener"
+            type="View.OnClickListener" />
+    </data>
+
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        tools:context=".ui.welcome.WelcomeActivity">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:onClick="@{skipClickListener}"
+                style="@style/default_text_style_600"
+                android:id="@+id/skip"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:layout_marginEnd="16dp"
+                android:paddingTop="13dp"
+                android:paddingBottom="13dp"
+                android:paddingStart="20dp"
+                android:paddingEnd="20dp"
+                android:text="@string/welcome_carousel_skip"
+                android:textSize="13sp"
+                android:textColor="?attr/color_text"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintEnd_toEndOf="parent" />
+
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/default_text_style_800"
+                android:id="@+id/title_first_line"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="65dp"
+                android:text="@string/welcome_page_title"
+                android:textColor="?attr/color_text"
+                android:textSize="90sp"
+                app:layout_constraintTop_toBottomOf="@id/skip"
+                app:layout_constraintStart_toStartOf="parent"/>
+
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/default_text_style_800"
+                android:id="@+id/title_second_line"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="15dp"
+                android:text="@string/welcome_page_subtitle"
+                android:textColor="?attr/color_text"
+                android:textSize="50sp"
+                app:layout_constraintBottom_toBottomOf="@id/title_first_line"
+                app:layout_constraintStart_toEndOf="@id/title_first_line"/>
+
+            <androidx.viewpager2.widget.ViewPager2
+                android:id="@+id/pager"
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:layout_marginTop="10dp"
+                android:layout_marginBottom="20dp"
+                app:layout_constraintTop_toBottomOf="@id/title_second_line"
+                app:layout_constraintBottom_toTopOf="@id/dots_indicator"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"/>
+
+            <com.tbuonomo.viewpagerdotsindicator.DotsIndicator
+                android:id="@+id/dots_indicator"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="20dp"
+                app:dotsColor="?attr/color_main2_200"
+                app:dotsCornerRadius="8dp"
+                app:dotsSize="13dp"
+                app:dotsSpacing="5dp"
+                app:dotsWidthFactor="2.5"
+                app:selectedDotColor="?attr/color_main1_500"
+                app:progressMode="false"
+                app:layout_constraintTop_toBottomOf="@id/pager"
+                app:layout_constraintBottom_toTopOf="@id/next"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent" />
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:onClick="@{nextClickListener}"
+                style="@style/primary_button_label_style"
+                android:id="@+id/next"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp"
+                android:layout_marginBottom="16dp"
+                android:paddingStart="20dp"
+                android:paddingEnd="20dp"
+                android:text="@string/next"
+                app:layout_constraintWidth_max="@dimen/button_max_width"
+                app:layout_constraintTop_toBottomOf="@id/dots_indicator"
+                app:layout_constraintBottom_toTopOf="@id/mountains"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent" />
+
+            <ImageView
+                android:id="@+id/mountains"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:src="@drawable/mountains"
+                android:contentDescription="@null"
+                android:adjustViewBounds="true"
+                android:scaleType="centerCrop"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:tint="?attr/color_main1_500"/>
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
+
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-sw600dp/welcome_page_1.xml b/app/src/main/res/layout-sw600dp/welcome_page_1.xml
new file mode 100644
index 000000000..9686448f6
--- /dev/null
+++ b/app/src/main/res/layout-sw600dp/welcome_page_1.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_height="match_parent"
+    android:layout_width="match_parent"
+    android:fillViewport="true">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent">
+
+        <ImageView
+            android:id="@+id/image"
+            android:layout_width="0dp"
+            android:layout_height="@dimen/welcome_icon_size"
+            android:layout_marginStart="32dp"
+            android:src="@drawable/welcome_linphone_logo"
+            android:contentDescription="@null"
+            app:layout_constraintHorizontal_chainStyle="packed"
+            app:layout_constraintDimensionRatio="1:1"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/message"/>
+
+        <androidx.appcompat.widget.AppCompatTextView
+            style="@style/default_text_style_800"
+            android:id="@+id/page_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="55dp"
+            android:text="@string/app_name"
+            android:textColor="?attr/color_text"
+            android:textSize="40sp"
+            android:gravity="center"
+            app:layout_constraintTop_toTopOf="@id/image"
+            app:layout_constraintStart_toEndOf="@id/image"/>
+
+        <androidx.appcompat.widget.AppCompatTextView
+            style="@style/default_text_style"
+            android:id="@+id/message"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="32dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginStart="55dp"
+            android:text="@string/welcome_page_1_message"
+            android:textColor="?attr/color_text"
+            android:textSize="20sp"
+            android:gravity="start"
+            android:maxLines="6"
+            app:layout_constraintTop_toBottomOf="@id/page_title"
+            app:layout_constraintStart_toEndOf="@id/image"
+            app:layout_constraintEnd_toEndOf="parent"/>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout-sw600dp/welcome_page_2.xml b/app/src/main/res/layout-sw600dp/welcome_page_2.xml
new file mode 100644
index 000000000..88abf58c4
--- /dev/null
+++ b/app/src/main/res/layout-sw600dp/welcome_page_2.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_height="match_parent"
+    android:layout_width="match_parent"
+    android:fillViewport="true">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent">
+
+        <ImageView
+            android:id="@+id/image"
+            android:layout_width="0dp"
+            android:layout_height="@dimen/welcome_icon_size"
+            android:layout_marginStart="32dp"
+            android:src="@drawable/welcome_secured_logo"
+            android:contentDescription="@null"
+            app:layout_constraintHorizontal_chainStyle="packed"
+            app:layout_constraintDimensionRatio="1:1"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/message"/>
+
+        <androidx.appcompat.widget.AppCompatTextView
+            style="@style/default_text_style_800"
+            android:id="@+id/page_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="55dp"
+            android:text="@string/welcome_page_2_title"
+            android:textColor="?attr/color_text"
+            android:textSize="40sp"
+            android:gravity="center"
+            app:layout_constraintTop_toTopOf="@id/image"
+            app:layout_constraintStart_toEndOf="@id/image"/>
+
+        <androidx.appcompat.widget.AppCompatTextView
+            style="@style/default_text_style"
+            android:id="@+id/message"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="32dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginStart="55dp"
+            android:text="@string/welcome_page_2_message"
+            android:textColor="?attr/color_text"
+            android:textSize="20sp"
+            android:gravity="start"
+            android:maxLines="6"
+            app:layout_constraintTop_toBottomOf="@id/page_title"
+            app:layout_constraintStart_toEndOf="@id/image"
+            app:layout_constraintEnd_toEndOf="parent"/>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout-sw600dp/welcome_page_3.xml b/app/src/main/res/layout-sw600dp/welcome_page_3.xml
new file mode 100644
index 000000000..f680b344e
--- /dev/null
+++ b/app/src/main/res/layout-sw600dp/welcome_page_3.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_height="match_parent"
+    android:layout_width="match_parent"
+    android:fillViewport="true">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent">
+
+        <ImageView
+            android:id="@+id/image"
+            android:layout_width="0dp"
+            android:layout_height="@dimen/welcome_icon_size"
+            android:layout_marginStart="32dp"
+            android:src="@drawable/welcome_open_source_logo"
+            android:contentDescription="@null"
+            app:layout_constraintHorizontal_chainStyle="packed"
+            app:layout_constraintDimensionRatio="1:1"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/message"/>
+
+        <androidx.appcompat.widget.AppCompatTextView
+            style="@style/default_text_style_800"
+            android:id="@+id/page_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="55dp"
+            android:text="@string/welcome_page_3_title"
+            android:textColor="?attr/color_text"
+            android:textSize="40sp"
+            android:gravity="center"
+            app:layout_constraintTop_toTopOf="@id/image"
+            app:layout_constraintStart_toEndOf="@id/image"/>
+
+        <androidx.appcompat.widget.AppCompatTextView
+            style="@style/default_text_style"
+            android:id="@+id/message"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="32dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginStart="55dp"
+            android:text="@string/welcome_page_3_message"
+            android:textColor="?attr/color_text"
+            android:textSize="20sp"
+            android:gravity="start"
+            android:maxLines="6"
+            app:layout_constraintTop_toBottomOf="@id/page_title"
+            app:layout_constraintStart_toEndOf="@id/image"
+            app:layout_constraintEnd_toEndOf="parent"/>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/assistant_landing_fragment.xml b/app/src/main/res/layout/assistant_landing_fragment.xml
index bf838b03c..fad8a01ed 100644
--- a/app/src/main/res/layout/assistant_landing_fragment.xml
+++ b/app/src/main/res/layout/assistant_landing_fragment.xml
@@ -47,31 +47,16 @@
                 app:tint="?attr/color_main2_500"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintStart_toStartOf="parent"/>
-
-            <ImageView
-                android:id="@+id/header"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:layout_marginTop="19dp"
-                android:src="@drawable/mountains"
-                android:adjustViewBounds="true"
-                android:scaleType="centerCrop"
-                android:contentDescription="@null"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/back"
-                app:layout_constraintBottom_toBottomOf="@id/title"
-                app:tint="?attr/color_main1_500" />
     
             <androidx.appcompat.widget.AppCompatTextView
                 style="@style/assistant_page_title_style"
                 android:id="@+id/title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="100dp"
-                android:paddingBottom="27dp"
                 android:text="@string/assistant_account_login"
-                app:layout_constraintTop_toTopOf="parent"
+                android:textColor="?attr/color_text"
+                app:layout_constraintTop_toTopOf="@id/back"
+                app:layout_constraintBottom_toBottomOf="@id/back"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"/>
 
@@ -82,7 +67,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="18dp"
                 android:layout_marginEnd="16dp"
-                android:text="@{@string/sip_address + `*`, default=`SIP Address*`}"
+                android:text="@{@string/username + `*`, default=`Username*`}"
                 app:layout_constraintTop_toBottomOf="@id/title"
                 app:layout_constraintStart_toStartOf="@id/sip_identity"/>
 
@@ -95,12 +80,12 @@
                 android:layout_marginEnd="16dp"
                 android:paddingStart="20dp"
                 android:paddingEnd="20dp"
-                android:text="@={viewModel.sipIdentity, default=`sip:johndoe@sip.linphone.org`}"
+                android:text="@={viewModel.sipIdentity, default=`johndoe`}"
                 android:textSize="14sp"
                 android:textColor="?attr/color_main2_600"
                 android:background="@drawable/edit_text_background"
                 android:inputType="text|textNoSuggestions"
-                android:hint="@string/sip_address_hint"
+                android:hint="@string/username"
                 app:layout_constraintWidth_max="@dimen/text_input_max_width"
                 app:layout_constraintTop_toBottomOf="@id/sip_identity_label"
                 app:layout_constraintStart_toStartOf="parent"
@@ -132,7 +117,7 @@
                 android:textColor="?attr/color_main2_600"
                 android:background="@drawable/edit_text_background"
                 android:hint="@string/password"
-                android:inputType="@{viewModel.showPassword ? InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD : InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD, default=textPassword}"
+                passwordInputType="@{viewModel.showPassword ? InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD : InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD, default=textPassword}"
                 app:layout_constraintWidth_max="@dimen/text_input_max_width"
                 app:layout_constraintTop_toBottomOf="@id/password_label"
                 app:layout_constraintStart_toStartOf="parent"
@@ -296,7 +281,20 @@
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toEndOf="@id/no_account_yet"
                 app:layout_constraintTop_toBottomOf="@id/third_party_sip_account"
-                app:layout_constraintBottom_toBottomOf="parent"/>
+                app:layout_constraintBottom_toTopOf="@id/mountains"/>
+
+            <ImageView
+                android:id="@+id/mountains"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:src="@drawable/mountains"
+                android:adjustViewBounds="true"
+                android:scaleType="centerCrop"
+                android:contentDescription="@null"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:tint="?attr/color_main1_500" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layout/assistant_permissions_fragment.xml b/app/src/main/res/layout/assistant_permissions_fragment.xml
index d8af6a7d8..af5d54c6d 100644
--- a/app/src/main/res/layout/assistant_permissions_fragment.xml
+++ b/app/src/main/res/layout/assistant_permissions_fragment.xml
@@ -49,31 +49,16 @@
                 app:tint="?attr/color_main2_500"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintStart_toStartOf="parent"/>
-
-            <ImageView
-                android:id="@+id/header"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:layout_marginTop="19dp"
-                android:src="@drawable/mountains"
-                android:adjustViewBounds="true"
-                android:scaleType="centerCrop"
-                android:contentDescription="@null"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/back"
-                app:layout_constraintBottom_toBottomOf="@id/title"
-                app:tint="?attr/color_main1_500"/>
     
             <androidx.appcompat.widget.AppCompatTextView
                 style="@style/assistant_page_title_style"
                 android:id="@+id/title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="100dp"
-                android:paddingBottom="27dp"
                 android:text="@string/assistant_permissions_title"
-                app:layout_constraintTop_toTopOf="parent"
+                android:textColor="?attr/color_text"
+                app:layout_constraintTop_toTopOf="@id/back"
+                app:layout_constraintBottom_toBottomOf="@id/back"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"/>
 
@@ -89,7 +74,7 @@
                 android:gravity="center"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/title" />
+                app:layout_constraintTop_toBottomOf="@id/back" />
 
             <ImageView
                 android:id="@+id/post_notifications_icon"
@@ -222,6 +207,7 @@
                 android:text="@string/assistant_permissions_skip_permissions"
                 app:layout_constraintWidth_max="@dimen/button_max_width"
                 app:layout_constraintVertical_bias="1"
+                app:layout_constraintVertical_chainStyle="packed"
                 app:layout_constraintTop_toBottomOf="@id/access_camera_title"
                 app:layout_constraintBottom_toTopOf="@id/grant_all_permissions"
                 app:layout_constraintStart_toStartOf="parent"
@@ -233,7 +219,6 @@
                 android:id="@+id/grant_all_permissions"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="32dp"
                 android:layout_marginStart="16dp"
                 android:layout_marginEnd="16dp"
                 android:layout_marginBottom="@dimen/screen_bottom_margin"
@@ -241,10 +226,24 @@
                 android:paddingEnd="20dp"
                 android:text="@string/assistant_permissions_grant_all_of_them"
                 app:layout_constraintWidth_max="@dimen/button_max_width"
-                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/skip"
+                app:layout_constraintBottom_toTopOf="@id/mountains"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent" />
 
+            <ImageView
+                android:id="@+id/mountains"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:src="@drawable/mountains"
+                android:adjustViewBounds="true"
+                android:scaleType="centerCrop"
+                android:contentDescription="@null"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:tint="?attr/color_main1_500" />
+
         </androidx.constraintlayout.widget.ConstraintLayout>
 
     </ScrollView>
diff --git a/app/src/main/res/layout/assistant_register_confirm_sms_code_fragment.xml b/app/src/main/res/layout/assistant_register_confirm_sms_code_fragment.xml
index 92f349c41..1f50cc150 100644
--- a/app/src/main/res/layout/assistant_register_confirm_sms_code_fragment.xml
+++ b/app/src/main/res/layout/assistant_register_confirm_sms_code_fragment.xml
@@ -34,29 +34,15 @@
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintStart_toStartOf="parent"/>
 
-            <ImageView
-                android:id="@+id/image"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:src="@drawable/mountains"
-                android:adjustViewBounds="true"
-                android:scaleType="centerCrop"
-                android:contentDescription="@null"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/back"
-                app:layout_constraintBottom_toBottomOf="@id/title"
-                app:tint="?attr/color_main1_500"/>
-
             <androidx.appcompat.widget.AppCompatTextView
                 style="@style/assistant_page_title_style"
                 android:id="@+id/title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="100dp"
-                android:paddingBottom="30dp"
-                android:text="@string/assistant_account_register"
-                app:layout_constraintTop_toTopOf="parent"
+                android:text="@string/assistant_account_creation_sms_confirmation_title"
+                android:textColor="?attr/color_text"
+                app:layout_constraintTop_toTopOf="@id/back"
+                app:layout_constraintBottom_toBottomOf="@id/back"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"/>
 
@@ -195,6 +181,19 @@
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/code_first_digit" />
 
+            <ImageView
+                android:id="@+id/mountains"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:src="@drawable/mountains"
+                android:adjustViewBounds="true"
+                android:scaleType="centerCrop"
+                android:contentDescription="@null"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:tint="?attr/color_main1_500" />
+
         </androidx.constraintlayout.widget.ConstraintLayout>
 
     <include
diff --git a/app/src/main/res/layout/assistant_register_fragment.xml b/app/src/main/res/layout/assistant_register_fragment.xml
index f240a5bdf..ac64d813d 100644
--- a/app/src/main/res/layout/assistant_register_fragment.xml
+++ b/app/src/main/res/layout/assistant_register_fragment.xml
@@ -49,30 +49,15 @@
                     app:layout_constraintTop_toTopOf="parent"
                     app:layout_constraintStart_toStartOf="parent"/>
 
-                <ImageView
-                    android:id="@+id/header"
-                    android:layout_width="0dp"
-                    android:layout_height="0dp"
-                    android:layout_marginTop="19dp"
-                    android:src="@drawable/mountains"
-                    android:adjustViewBounds="true"
-                    android:scaleType="centerCrop"
-                    android:contentDescription="@null"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/back"
-                    app:layout_constraintBottom_toBottomOf="@id/title"
-                    app:tint="?attr/color_main1_500"/>
-
                 <androidx.appcompat.widget.AppCompatTextView
                     style="@style/assistant_page_title_style"
                     android:id="@+id/title"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="100dp"
-                    android:paddingBottom="27dp"
                     android:text="@string/assistant_account_register"
-                    app:layout_constraintTop_toTopOf="parent"
+                    android:textColor="?attr/color_text"
+                    app:layout_constraintTop_toTopOf="@id/back"
+                    app:layout_constraintBottom_toBottomOf="@id/back"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"/>
 
@@ -90,7 +75,7 @@
                 <androidx.appcompat.widget.AppCompatEditText
                     style="@style/default_text_style"
                     android:id="@+id/username"
-                    android:enabled="@{viewModel.pushNotificationsAvailable}"
+                    android:enabled="@{viewModel.pushNotificationsAvailable &amp;&amp; !viewModel.lockUsernameAndPassword}"
                     android:layout_width="0dp"
                     android:layout_height="50dp"
                     android:layout_marginStart="16dp"
@@ -223,7 +208,7 @@
                 <androidx.appcompat.widget.AppCompatEditText
                     style="@style/default_text_style"
                     android:id="@+id/password"
-                    android:enabled="@{viewModel.pushNotificationsAvailable}"
+                    android:enabled="@{viewModel.pushNotificationsAvailable &amp;&amp; !viewModel.lockUsernameAndPassword}"
                     android:layout_width="0dp"
                     android:layout_height="50dp"
                     android:layout_marginStart="16dp"
@@ -235,7 +220,7 @@
                     android:textColor="?attr/color_main2_600"
                     android:background="@drawable/edit_text_background"
                     android:hint="@string/password"
-                    android:inputType="@{viewModel.showPassword ? InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD : InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD, default=textPassword}"
+                    passwordInputType="@{viewModel.showPassword ? InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD : InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD, default=textPassword}"
                     app:layout_constraintWidth_max="@dimen/text_input_max_width"
                     app:layout_constraintTop_toBottomOf="@id/password_label"
                     app:layout_constraintStart_toStartOf="parent"
@@ -350,7 +335,20 @@
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toEndOf="@id/already_an_account"
                     app:layout_constraintTop_toBottomOf="@id/create_email_account"
-                    app:layout_constraintBottom_toBottomOf="parent"/>
+                    app:layout_constraintBottom_toTopOf="@id/mountains"/>
+
+                <ImageView
+                    android:id="@+id/mountains"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/mountains"
+                    android:adjustViewBounds="true"
+                    android:scaleType="centerCrop"
+                    android:contentDescription="@null"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:tint="?attr/color_main1_500" />
 
             </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layout/assistant_third_party_sip_account_login_fragment.xml b/app/src/main/res/layout/assistant_third_party_sip_account_login_fragment.xml
index e34911793..224bb3f38 100644
--- a/app/src/main/res/layout/assistant_third_party_sip_account_login_fragment.xml
+++ b/app/src/main/res/layout/assistant_third_party_sip_account_login_fragment.xml
@@ -35,30 +35,15 @@
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintStart_toStartOf="parent"/>
 
-            <ImageView
-                android:id="@+id/header"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:layout_marginTop="19dp"
-                android:src="@drawable/mountains"
-                android:adjustViewBounds="true"
-                android:scaleType="centerCrop"
-                android:contentDescription="@null"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/back"
-                app:layout_constraintBottom_toBottomOf="@id/title"
-                app:tint="?attr/color_main1_500"/>
-
             <androidx.appcompat.widget.AppCompatTextView
                 style="@style/assistant_page_title_style"
                 android:id="@+id/title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="100dp"
-                android:paddingBottom="27dp"
-                android:text="@string/assistant_login_third_party_sip_account"
-                app:layout_constraintTop_toTopOf="parent"
+                android:text="@string/assistant_login_third_party_sip_account_title"
+                android:textColor="?attr/color_text"
+                app:layout_constraintTop_toTopOf="@id/back"
+                app:layout_constraintBottom_toBottomOf="@id/back"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"/>
 
@@ -70,7 +55,7 @@
                 android:layout_marginTop="38dp"
                 android:layout_marginStart="16dp"
                 android:layout_marginEnd="16dp"
-                android:text="@string/assistant_third_party_sip_account_username_or_identity"
+                android:text="@{@string/username + `*`}"
                 app:layout_constraintTop_toBottomOf="@id/title"
                 app:layout_constraintStart_toStartOf="@id/username"/>
 
@@ -102,7 +87,7 @@
                 android:layout_marginStart="16dp"
                 android:layout_marginEnd="16dp"
                 android:layout_marginTop="16dp"
-                android:text="@string/password"
+                android:text="@{@string/password + `*`}"
                 app:layout_constraintTop_toBottomOf="@id/username"
                 app:layout_constraintStart_toStartOf="@id/password"/>
 
@@ -120,7 +105,7 @@
                 android:textColor="?attr/color_main2_600"
                 android:background="@drawable/edit_text_background"
                 android:hint="@string/password"
-                android:inputType="@{viewModel.showPassword ? InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD : InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD, default=textPassword}"
+                passwordInputType="@{viewModel.showPassword ? InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD : InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD, default=textPassword}"
                 app:layout_constraintWidth_max="@dimen/text_input_max_width"
                 app:layout_constraintTop_toBottomOf="@id/password_label"
                 app:layout_constraintStart_toStartOf="parent"
@@ -350,10 +335,23 @@
                 app:layout_constraintWidth_max="@dimen/button_max_width"
                 app:layout_constraintVertical_bias="1"
                 app:layout_constraintTop_toBottomOf="@id/outbound_proxy"
-                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintBottom_toTopOf="@id/mountains"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent" />
 
+            <ImageView
+                android:id="@+id/mountains"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:src="@drawable/mountains"
+                android:adjustViewBounds="true"
+                android:scaleType="centerCrop"
+                android:contentDescription="@null"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:tint="?attr/color_main1_500" />
+
         </androidx.constraintlayout.widget.ConstraintLayout>
 
     </ScrollView>
diff --git a/app/src/main/res/layout/assistant_third_party_sip_account_warning_fragment.xml b/app/src/main/res/layout/assistant_third_party_sip_account_warning_fragment.xml
index 7279bb41f..1ea97fe99 100644
--- a/app/src/main/res/layout/assistant_third_party_sip_account_warning_fragment.xml
+++ b/app/src/main/res/layout/assistant_third_party_sip_account_warning_fragment.xml
@@ -46,10 +46,10 @@
                 android:id="@+id/title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="100dp"
-                android:text="@string/assistant_login_third_party_sip_account"
-                android:textColor="?attr/color_main2_600"
-                app:layout_constraintTop_toTopOf="parent"
+                android:text="@string/assistant_login_third_party_sip_account_title"
+                android:textColor="?attr/color_text"
+                app:layout_constraintTop_toTopOf="@id/back"
+                app:layout_constraintBottom_toBottomOf="@id/back"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"/>
 
@@ -134,6 +134,7 @@
                 android:text="@string/assistant_third_party_sip_account_create_linphone_account"
                 app:layout_constraintWidth_max="@dimen/button_max_width"
                 app:layout_constraintVertical_bias="1"
+                app:layout_constraintVertical_chainStyle="packed"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/contact"
@@ -145,7 +146,6 @@
                 android:id="@+id/continue_third_party_account_login"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="32dp"
                 android:layout_marginStart="16dp"
                 android:layout_marginEnd="16dp"
                 android:layout_marginBottom="@dimen/screen_bottom_margin"
@@ -153,10 +153,24 @@
                 android:paddingEnd="20dp"
                 android:text="@string/assistant_third_party_sip_account_warning_ok"
                 app:layout_constraintWidth_max="@dimen/button_max_width"
-                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/create_linphone_account"
+                app:layout_constraintBottom_toTopOf="@id/mountains"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent" />
 
+            <ImageView
+                android:id="@+id/mountains"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:src="@drawable/mountains"
+                android:adjustViewBounds="true"
+                android:scaleType="centerCrop"
+                android:contentDescription="@null"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:tint="?attr/color_main1_500" />
+
         </androidx.constraintlayout.widget.ConstraintLayout>
 
     </ScrollView>
diff --git a/app/src/main/res/layout/call_audio_devices_bottom_sheet.xml b/app/src/main/res/layout/call_audio_devices_bottom_sheet.xml
index 40604b974..d110b9aed 100644
--- a/app/src/main/res/layout/call_audio_devices_bottom_sheet.xml
+++ b/app/src/main/res/layout/call_audio_devices_bottom_sheet.xml
@@ -12,6 +12,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
+        android:clickable="true"
+        android:focusable="true"
         android:background="@drawable/shape_squircle_gray_600_top_call_background"
         entries="@{devices}"
         layout="@{@layout/call_audio_device_list_cell}">
diff --git a/app/src/main/res/layout/call_conference_active_speaker_cell.xml b/app/src/main/res/layout/call_conference_active_speaker_cell.xml
index 99fdeeb11..146a27b12 100644
--- a/app/src/main/res/layout/call_conference_active_speaker_cell.xml
+++ b/app/src/main/res/layout/call_conference_active_speaker_cell.xml
@@ -60,21 +60,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toTopOf="@id/joining_label" />
-
-        <androidx.appcompat.widget.AppCompatTextView
-            style="@style/default_text_style"
-            android:id="@+id/joining_label"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/conference_participant_joining_text"
-            android:textColor="@color/bc_white"
-            android:textSize="11sp"
-            android:visibility="@{model.isJoining ? View.VISIBLE : View.GONE, default=gone}"
-            app:layout_constraintTop_toBottomOf="@id/joining"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent" />
+            app:layout_constraintBottom_toBottomOf="parent" />
 
         <ImageView
             android:id="@+id/paused"
@@ -98,6 +84,8 @@
             android:text="@string/conference_participant_paused_text"
             android:textColor="@color/bc_white"
             android:textSize="11sp"
+            android:maxLines="1"
+            android:ellipsize="end"
             android:visibility="@{!model.isInConference &amp;&amp; !model.isJoining ? View.VISIBLE : View.GONE, default=gone}"
             app:layout_constraintTop_toBottomOf="@id/paused"
             app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/call_conference_grid_cell.xml b/app/src/main/res/layout/call_conference_grid_cell.xml
index ad95d0711..75204edc2 100644
--- a/app/src/main/res/layout/call_conference_grid_cell.xml
+++ b/app/src/main/res/layout/call_conference_grid_cell.xml
@@ -70,6 +70,8 @@
             android:text="@string/conference_participant_joining_text"
             android:textColor="@color/bc_white"
             android:textSize="16sp"
+            android:maxLines="1"
+            android:ellipsize="end"
             android:visibility="@{model.isJoining ? View.VISIBLE : View.GONE, default=gone}"
             app:layout_constraintTop_toBottomOf="@id/joining"
             app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/call_conference_layout_bottom_sheet.xml b/app/src/main/res/layout/call_conference_layout_bottom_sheet.xml
index 337e428a1..2473181b3 100644
--- a/app/src/main/res/layout/call_conference_layout_bottom_sheet.xml
+++ b/app/src/main/res/layout/call_conference_layout_bottom_sheet.xml
@@ -23,6 +23,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
+        android:clickable="true"
+        android:focusable="true"
         android:background="@drawable/shape_squircle_gray_600_top_call_background">
 
         <com.google.android.material.radiobutton.MaterialRadioButton
diff --git a/app/src/main/res/layout/call_conference_participants_list_fragment.xml b/app/src/main/res/layout/call_conference_participants_list_fragment.xml
index 5242d263e..bd4736758 100644
--- a/app/src/main/res/layout/call_conference_participants_list_fragment.xml
+++ b/app/src/main/res/layout/call_conference_participants_list_fragment.xml
@@ -82,6 +82,19 @@
             app:layout_constraintTop_toBottomOf="@id/title"
             app:layout_constraintBottom_toBottomOf="parent"/>
 
+        <org.linphone.ui.call.view.RoundCornersTextureView
+            android:id="@+id/local_preview_video_surface"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="10dp"
+            app:alignTopRight="true"
+            app:displayMode="black_bars"
+            roundCornersRadius="@dimen/call_round_corners_texture_view_radius"
+            app:layout_constraintBottom_toTopOf="@id/add_participants"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHeight_max="@dimen/call_video_preview_max_size"
+            app:layout_constraintWidth_max="@dimen/call_video_preview_max_size" />
+
         <com.google.android.material.floatingactionbutton.FloatingActionButton
             android:id="@+id/add_participants"
             android:onClick="@{addParticipantsClickListener}"
diff --git a/app/src/main/res/layout/call_ended_fragment.xml b/app/src/main/res/layout/call_ended_fragment.xml
index 3b1aa3bcf..dfc8431d6 100644
--- a/app/src/main/res/layout/call_ended_fragment.xml
+++ b/app/src/main/res/layout/call_ended_fragment.xml
@@ -15,60 +15,26 @@
         android:layout_height="match_parent"
         android:background="@color/gray_900">
 
-        <ImageView
-            android:id="@+id/back"
-            android:layout_width="wrap_content"
-            android:layout_height="@dimen/top_bar_height"
-            android:adjustViewBounds="true"
-            android:padding="15dp"
-            android:src="@drawable/caret_left"
-            android:contentDescription="@string/content_description_go_back_icon"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:tint="@color/bc_white" />
-
         <androidx.appcompat.widget.AppCompatTextView
             style="@style/call_header_style"
             android:id="@+id/call_direction_label"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="10dp"
-            android:text="@string/call_ended"
-            app:layout_constraintStart_toEndOf="@id/back"
-            app:layout_constraintTop_toTopOf="@id/back"
-            app:layout_constraintBottom_toBottomOf="@id/back"/>
-
-        <androidx.appcompat.widget.AppCompatTextView
-            style="@style/call_header_style"
-            android:id="@+id/separator"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="5dp"
-            android:text="@string/vertical_separator"
-            app:layout_constraintStart_toEndOf="@id/call_direction_label"
-            app:layout_constraintTop_toTopOf="@id/call_direction_label"
-            app:layout_constraintBottom_toBottomOf="@id/call_direction_label"/>
-
-        <Chronometer
-            style="@style/call_header_style"
-            android:id="@+id/chronometer"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="5dp"
-            android:visibility="@{viewModel.isPaused || viewModel.isPausedByRemote ? View.GONE : View.VISIBLE}"
-            app:layout_constraintStart_toEndOf="@id/separator"
-            app:layout_constraintTop_toTopOf="@id/call_direction_label"
-            app:layout_constraintBottom_toBottomOf="@id/call_direction_label"/>
+            android:layout_marginTop="10dp"
+            android:text="@{viewModel.terminatedByUser ? @string/call_locally_ended : @string/call_remotely_ended, default=@string/call_locally_ended}"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"/>
 
         <include
             android:id="@+id/call_media_encryption_info"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:visibility="@{viewModel.callDuration > 0 ? View.VISIBLE : View.GONE, default=gone}"
+            android:visibility="@{viewModel.callDuration > 0 ? View.VISIBLE : View.GONE}"
             layout="@layout/call_media_encryption_info"
             bind:viewModel="@{viewModel}"
             app:layout_constraintTop_toBottomOf="@id/call_direction_label"
-            app:layout_constraintStart_toEndOf="@id/back"
+            app:layout_constraintStart_toStartOf="@id/call_direction_label"
             app:layout_constraintEnd_toEndOf="parent"/>
 
         <include
diff --git a/app/src/main/res/layout/call_media_encryption_stats_bottom_sheet.xml b/app/src/main/res/layout/call_media_encryption_stats_bottom_sheet.xml
index b26034f85..b841202dd 100644
--- a/app/src/main/res/layout/call_media_encryption_stats_bottom_sheet.xml
+++ b/app/src/main/res/layout/call_media_encryption_stats_bottom_sheet.xml
@@ -16,6 +16,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@drawable/shape_call_bottom_sheet_background"
+        android:clickable="true"
+        android:focusable="true"
         android:visibility="@{viewModel.fullScreenMode || viewModel.pipMode ? View.INVISIBLE : View.VISIBLE}"
         app:behavior_hideable="true"
         app:behavior_peekHeight="0dp"
diff --git a/app/src/main/res/layout/call_numpad_digit.xml b/app/src/main/res/layout/call_numpad_digit.xml
index 9dc680600..36761d722 100644
--- a/app/src/main/res/layout/call_numpad_digit.xml
+++ b/app/src/main/res/layout/call_numpad_digit.xml
@@ -14,8 +14,18 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:onClick="@{() -> model.onDigitClicked(digit)}"
         android:layout_width="@dimen/call_dtmf_button_size"
-        android:layout_height="@dimen/call_dtmf_button_size"
-        android:background="@drawable/in_call_button_background_red">
+        android:layout_height="@dimen/call_dtmf_button_size">
+
+        <ImageView
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:contentDescription="@null"
+            android:src="@drawable/in_call_button_background_red"
+            app:layout_constraintDimensionRatio="1:1"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent" />
 
         <androidx.appcompat.widget.AppCompatTextView
             style="@style/default_text_style"
diff --git a/app/src/main/res/layout/call_numpad_digit_with_letters.xml b/app/src/main/res/layout/call_numpad_digit_with_letters.xml
index 8bba443ee..e72ea7533 100644
--- a/app/src/main/res/layout/call_numpad_digit_with_letters.xml
+++ b/app/src/main/res/layout/call_numpad_digit_with_letters.xml
@@ -19,8 +19,18 @@
         android:onClick="@{() -> model.onDigitClicked(digit)}"
         android:onLongClick="@{() -> model.onDigitLongClicked(digit)}"
         android:layout_width="@dimen/call_dtmf_button_size"
-        android:layout_height="@dimen/call_dtmf_button_size"
-        android:background="@drawable/in_call_button_background_red">
+        android:layout_height="@dimen/call_dtmf_button_size">
+
+        <ImageView
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:contentDescription="@null"
+            android:src="@drawable/in_call_button_background_red"
+            app:layout_constraintDimensionRatio="1:1"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent" />
 
         <androidx.appcompat.widget.AppCompatTextView
             style="@style/default_text_style"
diff --git a/app/src/main/res/layout/call_numpad_digit_with_plus.xml b/app/src/main/res/layout/call_numpad_digit_with_plus.xml
index 52b47a44c..e0548ff46 100644
--- a/app/src/main/res/layout/call_numpad_digit_with_plus.xml
+++ b/app/src/main/res/layout/call_numpad_digit_with_plus.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
+<layout xmlns:tools="http://schemas.android.com/tools"
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <data>
@@ -16,8 +17,18 @@
         android:onClick="@{() -> model.onDigitClicked(digit)}"
         android:onLongClick="@{() -> model.onDigitLongClicked(digit)}"
         android:layout_width="@dimen/call_dtmf_button_size"
-        android:layout_height="@dimen/call_dtmf_button_size"
-        android:background="@drawable/in_call_button_background_red">
+        android:layout_height="@dimen/call_dtmf_button_size">
+
+        <ImageView
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:contentDescription="@null"
+            android:src="@drawable/in_call_button_background_red"
+            app:layout_constraintDimensionRatio="1:1"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent" />
 
         <androidx.appcompat.widget.AppCompatTextView
             style="@style/default_text_style"
@@ -46,7 +57,8 @@
             app:layout_constraintTop_toBottomOf="@id/digit_label"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent" />
+            app:layout_constraintEnd_toEndOf="parent"
+            tools:ignore="HardcodedText" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layout/call_numpad_digit_with_voicemail.xml b/app/src/main/res/layout/call_numpad_digit_with_voicemail.xml
index 5224814d6..1ad9112da 100644
--- a/app/src/main/res/layout/call_numpad_digit_with_voicemail.xml
+++ b/app/src/main/res/layout/call_numpad_digit_with_voicemail.xml
@@ -19,8 +19,18 @@
         android:onClick="@{() -> model.onDigitClicked(digit)}"
         android:onLongClick="@{() -> model.onVoicemailLongClicked()}"
         android:layout_width="@dimen/call_dtmf_button_size"
-        android:layout_height="@dimen/call_dtmf_button_size"
-        android:background="@drawable/in_call_button_background_red">
+        android:layout_height="@dimen/call_dtmf_button_size">
+
+        <ImageView
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:contentDescription="@null"
+            android:src="@drawable/in_call_button_background_red"
+            app:layout_constraintDimensionRatio="1:1"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent" />
 
         <androidx.appcompat.widget.AppCompatTextView
             style="@style/default_text_style"
@@ -42,6 +52,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:src="@drawable/voicemail"
+            android:contentDescription="@string/content_description_call_voicemail"
             android:visibility="@{model.voicemailAvailable ? View.VISIBLE : View.GONE, default=gone}"
             app:layout_constraintTop_toBottomOf="@id/digit_label"
             app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/call_outgoing_fragment.xml b/app/src/main/res/layout/call_outgoing_fragment.xml
index f36acb79f..fe69ccf88 100644
--- a/app/src/main/res/layout/call_outgoing_fragment.xml
+++ b/app/src/main/res/layout/call_outgoing_fragment.xml
@@ -34,7 +34,6 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="10dp"
             android:layout_marginTop="10dp"
-            android:layout_marginBottom="10dp"
             android:text="@string/call_outgoing"
             app:layout_constraintStart_toEndOf="@id/call_direction_icon"
             app:layout_constraintTop_toTopOf="parent"/>
diff --git a/app/src/main/res/layout/calls_list_fragment.xml b/app/src/main/res/layout/calls_list_fragment.xml
index 9e23d26e8..10a0cd0b4 100644
--- a/app/src/main/res/layout/calls_list_fragment.xml
+++ b/app/src/main/res/layout/calls_list_fragment.xml
@@ -81,6 +81,19 @@
             app:layout_constraintTop_toBottomOf="@id/title"
             app:layout_constraintBottom_toBottomOf="parent"/>
 
+        <org.linphone.ui.call.view.RoundCornersTextureView
+            android:id="@+id/local_preview_video_surface"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="10dp"
+            app:alignTopRight="true"
+            app:displayMode="black_bars"
+            roundCornersRadius="@dimen/call_round_corners_texture_view_radius"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHeight_max="@dimen/call_video_preview_max_size"
+            app:layout_constraintWidth_max="@dimen/call_video_preview_max_size" />
+
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/chat_bubble_incoming.xml b/app/src/main/res/layout/chat_bubble_incoming.xml
index c3ecabbd7..dfb663728 100644
--- a/app/src/main/res/layout/chat_bubble_incoming.xml
+++ b/app/src/main/res/layout/chat_bubble_incoming.xml
@@ -252,7 +252,7 @@
                     android:paddingTop="2dp"
                     android:contentDescription="@string/content_description_chat_bubble_delivery_status"
                     android:src="@{model.statusIcon, default=@drawable/checks}"
-                    android:visibility="@{model.isFromGroup ? View.VISIBLE : View.GONE}"
+                    android:visibility="@{model.isFromGroup &amp;&amp; !model.hideDeliveryStatus ? View.VISIBLE : View.GONE}"
                     app:tint="?attr/color_main1_500" />
 
                 <ImageView
diff --git a/app/src/main/res/layout/chat_conversation_e2e_details_bottom_sheet.xml b/app/src/main/res/layout/chat_conversation_e2e_encrypted_details_bottom_sheet.xml
similarity index 100%
rename from app/src/main/res/layout/chat_conversation_e2e_details_bottom_sheet.xml
rename to app/src/main/res/layout/chat_conversation_e2e_encrypted_details_bottom_sheet.xml
diff --git a/app/src/main/res/layout/chat_conversation_secured_first_event.xml b/app/src/main/res/layout/chat_conversation_e2e_encrypted_first_event.xml
similarity index 100%
rename from app/src/main/res/layout/chat_conversation_secured_first_event.xml
rename to app/src/main/res/layout/chat_conversation_e2e_encrypted_first_event.xml
diff --git a/app/src/main/res/layout/chat_conversation_fragment.xml b/app/src/main/res/layout/chat_conversation_fragment.xml
index e55c41f38..48a70bf0a 100644
--- a/app/src/main/res/layout/chat_conversation_fragment.xml
+++ b/app/src/main/res/layout/chat_conversation_fragment.xml
@@ -289,7 +289,7 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:visibility="@{viewModel.isEmpty &amp;&amp; viewModel.isEndToEndEncrypted ? View.VISIBLE : View.GONE}"
-                    layout="@layout/chat_conversation_secured_first_event"
+                    layout="@layout/chat_conversation_e2e_encrypted_first_event"
                     app:layout_constraintTop_toTopOf="@id/events_list"
                     app:layout_constraintStart_toStartOf="@id/events_list"
                     app:layout_constraintEnd_toEndOf="@id/events_list" />
diff --git a/app/src/main/res/layout/chat_long_press_menu.xml b/app/src/main/res/layout/chat_conversation_long_press_menu.xml
similarity index 100%
rename from app/src/main/res/layout/chat_long_press_menu.xml
rename to app/src/main/res/layout/chat_conversation_long_press_menu.xml
diff --git a/app/src/main/res/layout/chat_conversation_unsafe_details_bottom_sheet.xml b/app/src/main/res/layout/chat_conversation_unsafe_disabled_details_bottom_sheet.xml
similarity index 100%
rename from app/src/main/res/layout/chat_conversation_unsafe_details_bottom_sheet.xml
rename to app/src/main/res/layout/chat_conversation_unsafe_disabled_details_bottom_sheet.xml
diff --git a/app/src/main/res/layout/chat_list_cell.xml b/app/src/main/res/layout/chat_list_cell.xml
index 74dbd8502..77d4e4c90 100644
--- a/app/src/main/res/layout/chat_list_cell.xml
+++ b/app/src/main/res/layout/chat_list_cell.xml
@@ -206,7 +206,7 @@
             android:layout_marginEnd="10dp"
             android:src="@drawable/lock_simple_open_bold"
             android:contentDescription="@string/content_description_chat_unsecured"
-            android:visibility="@{model.isEncrypted ? View.GONE : View.VISIBLE}"
+            android:visibility="@{model.isEncrypted || !model.isEncryptionAvailable ? View.GONE : View.VISIBLE}"
             app:layout_constraintTop_toBottomOf="@id/date_time"
             app:layout_constraintBottom_toTopOf="@id/separator"
             app:layout_constraintEnd_toStartOf="@id/ephemeral"
diff --git a/app/src/main/res/layout/chat_media_fragment.xml b/app/src/main/res/layout/chat_media_fragment.xml
index e77b4e939..6afb7e345 100644
--- a/app/src/main/res/layout/chat_media_fragment.xml
+++ b/app/src/main/res/layout/chat_media_fragment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:bind="http://schemas.android.com/tools">
 
     <data>
         <import type="android.view.View" />
@@ -12,61 +13,71 @@
             type="org.linphone.ui.main.chat.viewmodel.ConversationMediaListViewModel" />
     </data>
 
-    <androidx.constraintlayout.widget.ConstraintLayout
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="?attr/color_background_contrast_in_dark_mode">
+        android:layout_height="match_parent">
 
-        <ImageView
-            android:id="@+id/back"
-            android:layout_width="wrap_content"
-            android:layout_height="0dp"
-            android:adjustViewBounds="true"
-            android:padding="15dp"
-            android:onClick="@{backClickListener}"
-            android:src="@drawable/caret_left"
-            android:contentDescription="@string/content_description_go_back_icon"
-            app:tint="?attr/color_main1_500"
-            app:layout_constraintBottom_toBottomOf="@id/title"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@id/title"/>
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="?attr/color_background_contrast_in_dark_mode">
 
-        <androidx.appcompat.widget.AppCompatTextView
-            style="@style/main_page_title_style"
-            android:id="@+id/title"
-            android:layout_width="0dp"
-            android:layout_height="@dimen/top_bar_height"
-            android:layout_marginStart="10dp"
-            android:layout_marginEnd="10dp"
-            android:text="@string/conversation_media_list_title"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/back"
-            app:layout_constraintTop_toTopOf="parent"/>
+            <ImageView
+                android:id="@+id/back"
+                android:layout_width="wrap_content"
+                android:layout_height="0dp"
+                android:adjustViewBounds="true"
+                android:padding="15dp"
+                android:onClick="@{backClickListener}"
+                android:src="@drawable/caret_left"
+                android:contentDescription="@string/content_description_go_back_icon"
+                app:tint="?attr/color_main1_500"
+                app:layout_constraintBottom_toBottomOf="@id/title"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="@id/title"/>
 
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/mediaList"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:background="?attr/color_grey_100"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/title" />
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/main_page_title_style"
+                android:id="@+id/title"
+                android:layout_width="0dp"
+                android:layout_height="@dimen/top_bar_height"
+                android:layout_marginStart="10dp"
+                android:layout_marginEnd="10dp"
+                android:text="@string/conversation_media_list_title"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@id/back"
+                app:layout_constraintTop_toTopOf="parent"/>
 
-        <androidx.appcompat.widget.AppCompatTextView
-            style="@style/default_text_style_800"
-            android:id="@+id/no_result"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/conversation_no_media_found"
-            android:textColor="?attr/color_main2_600"
-            android:textSize="16sp"
-            android:visibility="@{viewModel.mediaList.empty ? View.VISIBLE : View.GONE}"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/title"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"/>
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/mediaList"
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:background="?attr/color_grey_100"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/title" />
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/default_text_style_800"
+                android:id="@+id/no_result"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/conversation_no_media_found"
+                android:textColor="?attr/color_main2_600"
+                android:textSize="16sp"
+                android:visibility="@{viewModel.mediaList.empty ? View.VISIBLE : View.GONE}"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/title"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"/>
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <include
+        layout="@layout/operation_in_progress"
+        bind:visibility="@{viewModel.operationInProgress}" />
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
 
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/chat_message_bottom_sheet_list_cell.xml b/app/src/main/res/layout/chat_message_bottom_sheet_list_cell.xml
index ba6f89c8a..2ddf29f03 100644
--- a/app/src/main/res/layout/chat_message_bottom_sheet_list_cell.xml
+++ b/app/src/main/res/layout/chat_message_bottom_sheet_list_cell.xml
@@ -32,6 +32,7 @@
 
         <androidx.appcompat.widget.AppCompatTextView
             style="@style/default_text_style"
+            android:onClick="@{() -> model.toggleShowSipUri()}"
             android:id="@+id/name"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -42,6 +43,21 @@
             app:layout_constraintStart_toEndOf="@id/avatar"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintEnd_toStartOf="@id/date_time"
+            app:layout_constraintBottom_toTopOf="@id/sip_address"/>
+
+        <androidx.appcompat.widget.AppCompatTextView
+            style="@style/default_text_style_300"
+            android:onClick="@{() -> model.toggleShowSipUri()}"
+            android:id="@+id/sip_address"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:text="@{model.sipUri, default=`sip:johndoe@sip.linphone.org`}"
+            android:visibility="@{model.showSipUri ? View.VISIBLE : View.GONE, default=gone}"
+            android:textSize="12sp"
+            android:textColor="?attr/color_main2_500"
+            app:layout_constraintStart_toStartOf="@id/name"
+            app:layout_constraintTop_toBottomOf="@id/name"
+            app:layout_constraintEnd_toEndOf="@id/name"
             app:layout_constraintBottom_toTopOf="@id/remove_reaction"/>
 
         <androidx.appcompat.widget.AppCompatTextView
@@ -53,7 +69,7 @@
             android:textSize="12sp"
             android:textColor="?attr/color_main2_400"
             android:visibility="@{model.ourOwnReaction ? View.VISIBLE : View.GONE, default=gone}"
-            app:layout_constraintTop_toBottomOf="@id/name"
+            app:layout_constraintTop_toBottomOf="@id/sip_address"
             app:layout_constraintStart_toStartOf="@id/name"
             app:layout_constraintBottom_toBottomOf="parent"/>
 
diff --git a/app/src/main/res/layout/chat_participant_list_cell.xml b/app/src/main/res/layout/chat_participant_list_cell.xml
index 2f54bef1f..694ac930f 100644
--- a/app/src/main/res/layout/chat_participant_list_cell.xml
+++ b/app/src/main/res/layout/chat_participant_list_cell.xml
@@ -33,6 +33,7 @@
 
         <androidx.appcompat.widget.AppCompatTextView
             style="@style/default_text_style"
+            android:onClick="@{() -> model.toggleShowSipUri()}"
             android:id="@+id/name"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -44,6 +45,21 @@
             app:layout_constraintStart_toEndOf="@id/avatar"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintEnd_toStartOf="@id/participant_menu"
+            app:layout_constraintBottom_toTopOf="@id/sip_address"/>
+
+        <androidx.appcompat.widget.AppCompatTextView
+            style="@style/default_text_style_300"
+            android:onClick="@{() -> model.toggleShowSipUri()}"
+            android:id="@+id/sip_address"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:text="@{model.sipUri, default=`sip:johndoe@sip.linphone.org`}"
+            android:visibility="@{model.showSipUri ? View.VISIBLE : View.GONE, default=gone}"
+            android:textSize="12sp"
+            android:textColor="?attr/color_main2_500"
+            app:layout_constraintStart_toStartOf="@id/name"
+            app:layout_constraintTop_toBottomOf="@id/name"
+            app:layout_constraintEnd_toEndOf="@id/name"
             app:layout_constraintBottom_toTopOf="@id/admin_label"/>
 
         <androidx.appcompat.widget.AppCompatTextView
@@ -55,7 +71,7 @@
             android:textColor="?attr/color_main2_500"
             android:textSize="12sp"
             android:visibility="@{model.isParticipantAdmin ? View.VISIBLE : View.GONE}"
-            app:layout_constraintTop_toBottomOf="@id/name"
+            app:layout_constraintTop_toBottomOf="@id/sip_address"
             app:layout_constraintStart_toStartOf="@id/name"
             app:layout_constraintEnd_toEndOf="@id/name"
             app:layout_constraintBottom_toBottomOf="parent" />
diff --git a/app/src/main/res/layout/contact_number_address_list_cell.xml b/app/src/main/res/layout/contact_number_address_list_cell.xml
index be0864074..0ed2f201b 100644
--- a/app/src/main/res/layout/contact_number_address_list_cell.xml
+++ b/app/src/main/res/layout/contact_number_address_list_cell.xml
@@ -35,14 +35,16 @@
         <androidx.appcompat.widget.AppCompatTextView
             style="@style/default_text_style"
             android:id="@+id/number_or_address"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
             android:text="@{model.displayedValue, default=`sip:johndoe@sip.linphone.org`}"
             android:textSize="14sp"
             android:maxLines="1"
             android:ellipsize="end"
             app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/call"
             app:layout_constraintTop_toBottomOf="@id/header"/>
 
         <ImageView
diff --git a/app/src/main/res/layout/dialog_cancel_meeting.xml b/app/src/main/res/layout/dialog_cancel_meeting.xml
index 326e2cfe6..289c90956 100644
--- a/app/src/main/res/layout/dialog_cancel_meeting.xml
+++ b/app/src/main/res/layout/dialog_cancel_meeting.xml
@@ -68,7 +68,7 @@
             android:layout_marginTop="32dp"
             android:layout_marginStart="15dp"
             android:layout_marginEnd="15dp"
-            android:text="@string/dialog_no"
+            android:text= "@string/dialog_no"
             app:layout_constraintStart_toStartOf="@id/dialog_background"
             app:layout_constraintEnd_toEndOf="@id/dialog_background"
             app:layout_constraintTop_toBottomOf="@id/message"
diff --git a/app/src/main/res/layout/dialog_delete_meeting.xml b/app/src/main/res/layout/dialog_delete_meeting.xml
new file mode 100644
index 000000000..3ea8a9076
--- /dev/null
+++ b/app/src/main/res/layout/dialog_delete_meeting.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+        <import type="android.view.View" />
+        <variable
+            name="viewModel"
+            type="org.linphone.utils.ConfirmationDialogModel" />
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:onClick="@{() -> viewModel.dismiss()}"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <ImageView
+            android:id="@+id/dialog_background"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_marginStart="12dp"
+            android:layout_marginEnd="12dp"
+            android:layout_marginBottom="2dp"
+            android:src="@drawable/shape_dialog_background"
+            android:contentDescription="@null"
+            app:layout_constraintWidth_max="@dimen/dialog_max_width"
+            app:layout_constraintBottom_toBottomOf="@id/anchor"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="@id/title" />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            style="@style/section_header_style"
+            android:id="@+id/title"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="15dp"
+            android:paddingTop="@dimen/dialog_top_bottom_margin"
+            android:text="@string/meeting_schedule_delete_dialog_title"
+            app:layout_constraintVertical_chainStyle="packed"
+            app:layout_constraintBottom_toTopOf="@id/message"
+            app:layout_constraintStart_toStartOf="@id/dialog_background"
+            app:layout_constraintEnd_toEndOf="@id/dialog_background"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            style="@style/default_text_style"
+            android:id="@+id/message"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="15dp"
+            android:layout_marginEnd="15dp"
+            android:layout_marginTop="10dp"
+            android:text="@string/meeting_schedule_delete_dialog_message"
+            android:textSize="14sp"
+            app:layout_constraintBottom_toTopOf="@id/cancel"
+            app:layout_constraintStart_toStartOf="@id/dialog_background"
+            app:layout_constraintEnd_toEndOf="@id/dialog_background"
+            app:layout_constraintTop_toBottomOf="@id/title" />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:onClick="@{() -> viewModel.cancel()}"
+            style="@style/secondary_button_label_style"
+            android:id="@+id/cancel"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="32dp"
+            android:layout_marginStart="15dp"
+            android:layout_marginEnd="15dp"
+            android:text="@string/dialog_no"
+            app:layout_constraintStart_toStartOf="@id/dialog_background"
+            app:layout_constraintEnd_toEndOf="@id/dialog_background"
+            app:layout_constraintTop_toBottomOf="@id/message"
+            app:layout_constraintBottom_toTopOf="@id/confirm"/>
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:onClick="@{() -> viewModel.confirm()}"
+            style="@style/primary_button_label_style"
+            android:id="@+id/confirm"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:layout_marginStart="15dp"
+            android:layout_marginEnd="15dp"
+            android:text="@string/dialog_yes"
+            app:layout_constraintStart_toStartOf="@id/dialog_background"
+            app:layout_constraintEnd_toEndOf="@id/dialog_background"
+            app:layout_constraintTop_toBottomOf="@id/cancel"
+            app:layout_constraintBottom_toTopOf="@id/anchor"/>
+
+        <View
+            android:id="@+id/anchor"
+            android:layout_width="wrap_content"
+            android:layout_height="@dimen/dialog_top_bottom_margin"
+            app:layout_constraintTop_toBottomOf="@id/confirm"
+            app:layout_constraintStart_toStartOf="@id/dialog_background"
+            app:layout_constraintEnd_toEndOf="@id/dialog_background"
+            app:layout_constraintBottom_toBottomOf="parent"/>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_update_account_password.xml b/app/src/main/res/layout/dialog_update_account_password.xml
index 381a05e83..6f9fa12e8 100644
--- a/app/src/main/res/layout/dialog_update_account_password.xml
+++ b/app/src/main/res/layout/dialog_update_account_password.xml
@@ -61,7 +61,7 @@
             android:textColor="?attr/color_main2_600"
             android:maxLines="1"
             android:background="@drawable/edit_text_background"
-            android:inputType="@{viewModel.showPassword ? InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD : InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD, default=textPassword}"
+            passwordInputType="@{viewModel.showPassword ? InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD : InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD, default=textPassword}"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintWidth_max="@dimen/text_input_max_width"
             app:layout_constraintBottom_toTopOf="@id/cancel"
diff --git a/app/src/main/res/layout/dialog_update_account_password_after_register_failure.xml b/app/src/main/res/layout/dialog_update_account_password_after_register_failure.xml
index 1a175f0f7..553d7aa8f 100644
--- a/app/src/main/res/layout/dialog_update_account_password_after_register_failure.xml
+++ b/app/src/main/res/layout/dialog_update_account_password_after_register_failure.xml
@@ -77,7 +77,7 @@
             android:textColor="?attr/color_main2_600"
             android:maxLines="1"
             android:background="@drawable/edit_text_background"
-            android:inputType="@{viewModel.showPassword ? InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD : InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD, default=textPassword}"
+            passwordInputType="@{viewModel.showPassword ? InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD : InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD, default=textPassword}"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintWidth_max="@dimen/text_input_max_width"
             app:layout_constraintBottom_toTopOf="@id/cancel"
diff --git a/app/src/main/res/layout/file_media_viewer_activity.xml b/app/src/main/res/layout/file_media_viewer_activity.xml
index e02561b40..c0fde0e67 100644
--- a/app/src/main/res/layout/file_media_viewer_activity.xml
+++ b/app/src/main/res/layout/file_media_viewer_activity.xml
@@ -30,7 +30,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:visibility="@{sharedViewModel.mediaViewerFullScreenMode ? View.GONE : View.VISIBLE}"
-            app:constraint_referenced_ids="top_bar_background, back, file_name, share, save, date_time"/>
+            app:constraint_referenced_ids="top_bar_background, back, file_name, date_time"/>
 
         <androidx.constraintlayout.widget.Barrier
             android:id="@+id/top_bar_barrier"
@@ -108,6 +108,7 @@
             android:padding="15dp"
             android:src="@drawable/share_network"
             android:contentDescription="@string/content_description_share_file"
+            android:visibility="@{sharedViewModel.mediaViewerFullScreenMode || viewModel.isCurrentlyDisplayedFileFromEphemeralMessage ? View.GONE : View.VISIBLE}"
             app:tint="@color/gray_main2_500"
             app:layout_constraintEnd_toStartOf="@id/save"
             app:layout_constraintTop_toTopOf="parent" />
@@ -121,6 +122,7 @@
             android:padding="15dp"
             android:src="@drawable/download_simple"
             android:contentDescription="@string/content_description_save_file"
+            android:visibility="@{sharedViewModel.mediaViewerFullScreenMode || viewModel.isCurrentlyDisplayedFileFromEphemeralMessage ? View.GONE : View.VISIBLE}"
             app:tint="@color/gray_main2_500"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layout/file_viewer_activity.xml b/app/src/main/res/layout/file_viewer_activity.xml
index f06de0fe2..cc24247b4 100644
--- a/app/src/main/res/layout/file_viewer_activity.xml
+++ b/app/src/main/res/layout/file_viewer_activity.xml
@@ -25,7 +25,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:visibility="@{viewModel.fullScreenMode ? View.GONE : View.VISIBLE}"
-            app:constraint_referenced_ids="top_bar_background, back, file_name, share, save, date_time"/>
+            app:constraint_referenced_ids="top_bar_background, back, file_name, date_time"/>
 
         <androidx.constraintlayout.widget.Barrier
             android:id="@+id/top_bar_barrier"
@@ -146,6 +146,7 @@
             android:padding="15dp"
             android:src="@drawable/share_network"
             android:contentDescription="@string/content_description_share_file"
+            android:visibility="@{viewModel.fullScreenMode || viewModel.isFromEphemeralMessage ? View.GONE : View.VISIBLE}"
             app:tint="@color/gray_main2_500"
             app:layout_constraintEnd_toStartOf="@id/save"
             app:layout_constraintTop_toTopOf="parent" />
@@ -159,6 +160,7 @@
             android:padding="15dp"
             android:src="@drawable/download_simple"
             android:contentDescription="@string/content_description_save_file"
+            android:visibility="@{viewModel.fullScreenMode || viewModel.isFromEphemeralMessage ? View.GONE : View.VISIBLE}"
             app:tint="@color/gray_main2_500"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layout/meeting_popup_menu.xml b/app/src/main/res/layout/meeting_popup_menu.xml
index 82454e676..d94aaa109 100644
--- a/app/src/main/res/layout/meeting_popup_menu.xml
+++ b/app/src/main/res/layout/meeting_popup_menu.xml
@@ -11,6 +11,9 @@
         <variable
             name="createCalendarEventListener"
             type="View.OnClickListener" />
+        <variable
+            name="cancelInsteadOfDelete"
+            type="Boolean" />
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -49,7 +52,7 @@
             android:layout_marginBottom="20dp"
             android:layout_marginStart="20dp"
             android:layout_marginEnd="20dp"
-            android:text="@string/meeting_info_delete"
+            android:text="@{cancelInsteadOfDelete ? @string/meeting_cancel_action_label : @string/meeting_delete_action_label, default=@string/meeting_delete_action_label}"
             android:textSize="14sp"
             android:textColor="?attr/color_danger_500"
             android:drawableStart="@drawable/trash_simple"
diff --git a/app/src/main/res/layout/meeting_waiting_room_fragment.xml b/app/src/main/res/layout/meeting_waiting_room_fragment.xml
index a4149de81..f2a3c474a 100644
--- a/app/src/main/res/layout/meeting_waiting_room_fragment.xml
+++ b/app/src/main/res/layout/meeting_waiting_room_fragment.xml
@@ -196,7 +196,7 @@
             android:layout_width="0dp"
             android:layout_height="0dp"
             android:background="@color/gray_900"
-            android:visibility="@{viewModel.joining ? View.VISIBLE : View.GONE}"
+            android:visibility="@{viewModel.joining ? View.VISIBLE : View.GONE, default=gone}"
             app:layout_constraintTop_toBottomOf="@id/back"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/meetings_list_long_press_menu.xml b/app/src/main/res/layout/meetings_list_long_press_menu.xml
index 4498d4b65..529c4789d 100644
--- a/app/src/main/res/layout/meetings_list_long_press_menu.xml
+++ b/app/src/main/res/layout/meetings_list_long_press_menu.xml
@@ -7,6 +7,9 @@
         <variable
             name="deleteClickListener"
             type="View.OnClickListener" />
+        <variable
+            name="cancelInsteadOfDelete"
+            type="Boolean" />
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -19,7 +22,7 @@
             android:onClick="@{deleteClickListener}"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:text="@string/menu_delete_selected_item"
+            android:text="@{cancelInsteadOfDelete ? @string/meeting_cancel_action_label : @string/meeting_delete_action_label, default=@string/meeting_delete_action_label}"
             style="@style/context_menu_danger_action_label_style"
             android:background="@drawable/menu_item_background"
             android:layout_marginBottom="1dp"
diff --git a/app/src/main/res/layout/settings_advanced_fragment.xml b/app/src/main/res/layout/settings_advanced_fragment.xml
index a16aa76c5..db969b571 100644
--- a/app/src/main/res/layout/settings_advanced_fragment.xml
+++ b/app/src/main/res/layout/settings_advanced_fragment.xml
@@ -148,6 +148,8 @@
                     android:spinnerMode="dropdown"
                     android:popupBackground="@drawable/shape_squircle_white_background"
                     android:background="@drawable/edit_text_background"
+                    app:layout_constraintHorizontal_bias="0"
+                    app:layout_constraintWidth_max="@dimen/text_input_max_width"
                     app:layout_constraintTop_toBottomOf="@id/media_encryption_label"
                     app:layout_constraintStart_toStartOf="@id/media_encryption_label"
                     app:layout_constraintEnd_toEndOf="parent" />
@@ -192,6 +194,34 @@
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/media_encryption" />
 
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/settings_title_style"
+                    android:onClick="@{() -> viewModel.toggleConferencesEndToEndEncryption()}"
+                    android:id="@+id/e2e_encrypted_conferences_title"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="10dp"
+                    android:text="@string/settings_advanced_create_e2e_encrypted_conferences_title"
+                    android:maxLines="2"
+                    android:ellipsize="end"
+                    app:layout_constraintTop_toTopOf="@id/e2e_encrypted_conferences_switch"
+                    app:layout_constraintBottom_toBottomOf="@id/e2e_encrypted_conferences_switch"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toStartOf="@id/e2e_encrypted_conferences_switch"/>
+
+                <com.google.android.material.materialswitch.MaterialSwitch
+                    style="@style/material_switch_style"
+                    android:id="@+id/e2e_encrypted_conferences_switch"
+                    android:onClick="@{() -> viewModel.toggleConferencesEndToEndEncryption()}"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="20dp"
+                    android:layout_marginEnd="16dp"
+                    android:checked="@{viewModel.createEndToEndEncryptedConferences}"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/media_encryption_mandatory_switch" />
+
                 <androidx.appcompat.widget.AppCompatTextView
                     style="@style/settings_title_style"
                     android:onClick="@{() -> viewModel.toggleAcceptEarlyMedia()}"
@@ -218,7 +248,7 @@
                     android:layout_marginEnd="16dp"
                     android:checked="@{viewModel.acceptEarlyMedia}"
                     app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/media_encryption_mandatory_switch" />
+                    app:layout_constraintTop_toBottomOf="@id/e2e_encrypted_conferences_switch" />
 
                 <androidx.appcompat.widget.AppCompatTextView
                     style="@style/settings_title_style"
@@ -433,6 +463,8 @@
                         android:popupBackground="@drawable/shape_squircle_white_background"
                         android:background="@drawable/edit_text_background"
                         android:visibility="@{viewModel.expandAudioDevices ? View.VISIBLE : View.GONE}"
+                        app:layout_constraintHorizontal_bias="0"
+                        app:layout_constraintWidth_max="@dimen/text_input_max_width"
                         app:layout_constraintTop_toBottomOf="@id/input_audio_device_label"
                         app:layout_constraintStart_toStartOf="@id/input_audio_device_label"
                         app:layout_constraintEnd_toEndOf="parent" />
@@ -482,6 +514,8 @@
                         android:popupBackground="@drawable/shape_squircle_white_background"
                         android:background="@drawable/edit_text_background"
                         android:visibility="@{viewModel.expandAudioDevices ? View.VISIBLE : View.GONE}"
+                        app:layout_constraintHorizontal_bias="0"
+                        app:layout_constraintWidth_max="@dimen/text_input_max_width"
                         app:layout_constraintTop_toBottomOf="@id/output_audio_device_label"
                         app:layout_constraintStart_toStartOf="@id/output_audio_device_label"
                         app:layout_constraintEnd_toEndOf="parent" />
diff --git a/app/src/main/res/layout/settings_chat.xml b/app/src/main/res/layout/settings_chat.xml
index d118eada6..0e9522744 100644
--- a/app/src/main/res/layout/settings_chat.xml
+++ b/app/src/main/res/layout/settings_chat.xml
@@ -40,10 +40,39 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="20dp"
             android:layout_marginEnd="16dp"
+            android:enabled="@{!viewModel.isVfsEnabled}"
             android:checked="@{viewModel.autoDownloadEnabled}"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
+        <androidx.appcompat.widget.AppCompatTextView
+            style="@style/settings_title_style"
+            android:onClick="@{() -> viewModel.toggleAutoExportMediaFilesToNativeGallery()}"
+            android:id="@+id/auto_export_media_to_native_gallery_title"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="10dp"
+            android:text="@string/settings_conversations_auto_export_media_to_native_gallery_title"
+            android:maxLines="2"
+            android:ellipsize="end"
+            app:layout_constraintTop_toTopOf="@id/auto_export_media_to_native_gallery_switch"
+            app:layout_constraintBottom_toBottomOf="@id/auto_export_media_to_native_gallery_switch"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/auto_export_media_to_native_gallery_switch"/>
+
+        <com.google.android.material.materialswitch.MaterialSwitch
+            style="@style/material_switch_style"
+            android:id="@+id/auto_export_media_to_native_gallery_switch"
+            android:onClick="@{() -> viewModel.toggleAutoExportMediaFilesToNativeGallery()}"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
+            android:layout_marginEnd="16dp"
+            android:checked="@{viewModel.autoExportMediaToNativeGallery}"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/auto_download_switch" />
+
         <androidx.appcompat.widget.AppCompatTextView
             style="@style/settings_title_style"
             android:onClick="@{() -> viewModel.toggleMarkConversationAsReadWhenDismissingNotification()}"
@@ -70,7 +99,7 @@
             android:layout_marginEnd="16dp"
             android:checked="@{viewModel.markAsReadWhenDismissingNotification}"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/auto_download_switch" />
+            app:layout_constraintTop_toBottomOf="@id/auto_export_media_to_native_gallery_switch" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layout/settings_contacts_carddav.xml b/app/src/main/res/layout/settings_contacts_carddav.xml
index ce80ad71d..42aebb291 100644
--- a/app/src/main/res/layout/settings_contacts_carddav.xml
+++ b/app/src/main/res/layout/settings_contacts_carddav.xml
@@ -197,7 +197,7 @@
                     android:paddingEnd="20dp"
                     android:text="@={viewModel.password}"
                     android:hint="@string/password"
-                    android:inputType="@{viewModel.showPassword ? InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD : InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD, default=textPassword}"
+                    passwordInputType="@{viewModel.showPassword ? InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD : InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD, default=textPassword}"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/password_title" />
diff --git a/app/src/main/res/layout/settings_contacts_ldap.xml b/app/src/main/res/layout/settings_contacts_ldap.xml
index b0825d33a..c50098ed8 100644
--- a/app/src/main/res/layout/settings_contacts_ldap.xml
+++ b/app/src/main/res/layout/settings_contacts_ldap.xml
@@ -164,7 +164,7 @@
                     android:paddingEnd="20dp"
                     android:text="@={viewModel.password}"
                     android:hint="@string/password"
-                    android:inputType="@{viewModel.showPassword ? InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD : InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD, default=textPassword}"
+                    passwordInputType="@{viewModel.showPassword ? InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD : InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD, default=textPassword}"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/password_title" />
diff --git a/app/src/main/res/layout/settings_meetings.xml b/app/src/main/res/layout/settings_meetings.xml
index 0cfd3e216..50882d1de 100644
--- a/app/src/main/res/layout/settings_meetings.xml
+++ b/app/src/main/res/layout/settings_meetings.xml
@@ -44,6 +44,8 @@
             android:overlapAnchor="false"
             android:spinnerMode="dropdown"
             android:popupBackground="@drawable/shape_squircle_white_background"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintWidth_max="@dimen/text_input_max_width"
             app:layout_constraintTop_toBottomOf="@id/layout_title"
             app:layout_constraintStart_toStartOf="@id/layout_title"
             app:layout_constraintEnd_toEndOf="@id/layout_title" />
diff --git a/app/src/main/res/layout/settings_tunnel.xml b/app/src/main/res/layout/settings_tunnel.xml
index 114347bb8..b3a0a2766 100644
--- a/app/src/main/res/layout/settings_tunnel.xml
+++ b/app/src/main/res/layout/settings_tunnel.xml
@@ -208,6 +208,8 @@
             android:spinnerMode="dropdown"
             android:popupBackground="@drawable/shape_squircle_white_background"
             android:background="@drawable/edit_text_background"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintWidth_max="@dimen/text_input_max_width"
             app:layout_constraintTop_toBottomOf="@id/tunnel_mode_label"
             app:layout_constraintStart_toStartOf="@id/tunnel_mode_label"
             app:layout_constraintEnd_toEndOf="parent" />
diff --git a/app/src/main/res/layout/settings_user_interface.xml b/app/src/main/res/layout/settings_user_interface.xml
index ec419767b..467b78693 100644
--- a/app/src/main/res/layout/settings_user_interface.xml
+++ b/app/src/main/res/layout/settings_user_interface.xml
@@ -56,6 +56,8 @@
             android:overlapAnchor="false"
             android:spinnerMode="dropdown"
             android:popupBackground="@drawable/shape_squircle_white_background"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintWidth_max="@dimen/text_input_max_width"
             app:layout_constraintTop_toBottomOf="@id/theme_title"
             app:layout_constraintStart_toStartOf="@id/theme_title"
             app:layout_constraintEnd_toEndOf="@id/theme_title" />
@@ -100,6 +102,8 @@
             android:overlapAnchor="false"
             android:spinnerMode="dropdown"
             android:popupBackground="@drawable/shape_squircle_white_background"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintWidth_max="@dimen/text_input_max_width"
             app:layout_constraintTop_toBottomOf="@id/color_title"
             app:layout_constraintStart_toStartOf="@id/color_title"
             app:layout_constraintEnd_toEndOf="@id/color_title" />
diff --git a/app/src/main/res/layout/single_sign_on_fragment.xml b/app/src/main/res/layout/single_sign_on_fragment.xml
index 9f3b13863..c090558d3 100644
--- a/app/src/main/res/layout/single_sign_on_fragment.xml
+++ b/app/src/main/res/layout/single_sign_on_fragment.xml
@@ -30,30 +30,15 @@
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintStart_toStartOf="parent"/>
 
-            <ImageView
-                android:id="@+id/header"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:layout_marginTop="19dp"
-                android:src="@drawable/mountains"
-                android:adjustViewBounds="true"
-                android:scaleType="centerCrop"
-                android:contentDescription="@null"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/back"
-                app:layout_constraintBottom_toBottomOf="@id/title"
-                app:tint="?attr/color_main1_500"/>
-
             <androidx.appcompat.widget.AppCompatTextView
                 style="@style/assistant_page_title_style"
                 android:id="@+id/title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="100dp"
-                android:paddingBottom="27dp"
                 android:text="@string/assistant_login_using_single_sign_on"
-                app:layout_constraintTop_toTopOf="parent"
+                android:textColor="?attr/color_text"
+                app:layout_constraintTop_toTopOf="@id/back"
+                app:layout_constraintBottom_toBottomOf="@id/back"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"/>
 
@@ -65,7 +50,7 @@
                 app:indicatorColor="?attr/color_main1_500"
                 android:indeterminate="true"
                 app:layout_constraintVertical_chainStyle="packed"
-                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/title"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintBottom_toTopOf="@id/message"/>
@@ -84,7 +69,21 @@
                 app:layout_constraintTop_toBottomOf="@id/progress"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent"/>
+                app:layout_constraintBottom_toTopOf="@id/mountains"/>
+
+            <ImageView
+                android:id="@+id/mountains"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="19dp"
+                android:src="@drawable/mountains"
+                android:adjustViewBounds="true"
+                android:scaleType="centerCrop"
+                android:contentDescription="@null"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:tint="?attr/color_main1_500"/>
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layout/start_call_numpad_bottom_sheet.xml b/app/src/main/res/layout/start_call_numpad_bottom_sheet.xml
index a3fc99dd3..ee886f1d9 100644
--- a/app/src/main/res/layout/start_call_numpad_bottom_sheet.xml
+++ b/app/src/main/res/layout/start_call_numpad_bottom_sheet.xml
@@ -51,7 +51,7 @@
 
         <include
             android:id="@+id/digit_1"
-            android:layout_width="@dimen/call_dtmf_button_size"
+            android:layout_width="0dp"
             android:layout_height="@dimen/call_dtmf_button_size"
             layout="@layout/call_numpad_digit_with_voicemail"
             bind:digit="@{`1`}"
@@ -61,7 +61,7 @@
 
         <include
             android:id="@+id/digit_2"
-            android:layout_width="@dimen/call_dtmf_button_size"
+            android:layout_width="0dp"
             android:layout_height="@dimen/call_dtmf_button_size"
             layout="@layout/call_numpad_digit_with_letters"
             bind:digit="@{`2`}"
@@ -72,7 +72,7 @@
 
         <include
             android:id="@+id/digit_3"
-            android:layout_width="@dimen/call_dtmf_button_size"
+            android:layout_width="0dp"
             android:layout_height="@dimen/call_dtmf_button_size"
             layout="@layout/call_numpad_digit_with_letters"
             bind:digit="@{`3`}"
@@ -83,7 +83,7 @@
 
         <include
             android:id="@+id/digit_4"
-            android:layout_width="@dimen/call_dtmf_button_size"
+            android:layout_width="0dp"
             android:layout_height="@dimen/call_dtmf_button_size"
             layout="@layout/call_numpad_digit_with_letters"
             bind:digit="@{`4`}"
@@ -94,7 +94,7 @@
 
         <include
             android:id="@+id/digit_5"
-            android:layout_width="@dimen/call_dtmf_button_size"
+            android:layout_width="0dp"
             android:layout_height="@dimen/call_dtmf_button_size"
             layout="@layout/call_numpad_digit_with_letters"
             bind:digit="@{`5`}"
@@ -105,7 +105,7 @@
 
         <include
             android:id="@+id/digit_6"
-            android:layout_width="@dimen/call_dtmf_button_size"
+            android:layout_width="0dp"
             android:layout_height="@dimen/call_dtmf_button_size"
             layout="@layout/call_numpad_digit_with_letters"
             bind:digit="@{`6`}"
@@ -116,7 +116,7 @@
 
         <include
             android:id="@+id/digit_7"
-            android:layout_width="@dimen/call_dtmf_button_size"
+            android:layout_width="0dp"
             android:layout_height="@dimen/call_dtmf_button_size"
             layout="@layout/call_numpad_digit_with_letters"
             bind:digit="@{`7`}"
@@ -127,7 +127,7 @@
 
         <include
             android:id="@+id/digit_8"
-            android:layout_width="@dimen/call_dtmf_button_size"
+            android:layout_width="0dp"
             android:layout_height="@dimen/call_dtmf_button_size"
             layout="@layout/call_numpad_digit_with_letters"
             bind:digit="@{`8`}"
@@ -138,7 +138,7 @@
 
         <include
             android:id="@+id/digit_9"
-            android:layout_width="@dimen/call_dtmf_button_size"
+            android:layout_width="0dp"
             android:layout_height="@dimen/call_dtmf_button_size"
             layout="@layout/call_numpad_digit_with_letters"
             bind:digit="@{`9`}"
@@ -149,7 +149,7 @@
 
         <include
             android:id="@+id/digit_star"
-            android:layout_width="@dimen/call_dtmf_button_size"
+            android:layout_width="0dp"
             android:layout_height="@dimen/call_dtmf_button_size"
             layout="@layout/call_numpad_digit"
             bind:digit="@{`*`}"
@@ -159,7 +159,7 @@
 
         <include
             android:id="@+id/digit_0"
-            android:layout_width="@dimen/call_dtmf_button_size"
+            android:layout_width="0dp"
             android:layout_height="@dimen/call_dtmf_button_size"
             layout="@layout/call_numpad_digit_with_plus"
             bind:digit="@{`0`}"
@@ -169,7 +169,7 @@
 
         <include
             android:id="@+id/digit_sharp"
-            android:layout_width="@dimen/call_dtmf_button_size"
+            android:layout_width="0dp"
             android:layout_height="@dimen/call_dtmf_button_size"
             layout="@layout/call_numpad_digit"
             bind:digit="@{`#`}"
@@ -200,7 +200,7 @@
             android:id="@+id/backspace"
             android:onClick="@{() -> model.onBackspaceClicked()}"
             android:onLongClick="@{() -> model.onBackspaceLongClicked()}"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="@dimen/call_button_size"
             android:src="@drawable/backspace_fill"
             android:contentDescription="@string/content_description_erase_last_input"
diff --git a/app/src/main/res/layout/welcome_activity.xml b/app/src/main/res/layout/welcome_activity.xml
index 326cfa60c..1505e3c29 100644
--- a/app/src/main/res/layout/welcome_activity.xml
+++ b/app/src/main/res/layout/welcome_activity.xml
@@ -28,6 +28,7 @@
                 android:id="@+id/skip"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
                 android:layout_marginEnd="16dp"
                 android:paddingTop="13dp"
                 android:paddingBottom="13dp"
@@ -35,16 +36,42 @@
                 android:paddingEnd="20dp"
                 android:text="@string/welcome_carousel_skip"
                 android:textSize="13sp"
+                android:textColor="?attr/color_text"
                 app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toTopOf="@id/pager"
                 app:layout_constraintEnd_toEndOf="parent" />
 
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/default_text_style_800"
+                android:id="@+id/title_first_line"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="65dp"
+                android:layout_marginTop="16dp"
+                android:text="@string/welcome_page_title"
+                android:textColor="?attr/color_text"
+                android:textSize="36sp"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintStart_toStartOf="parent"/>
+
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/default_text_style_800"
+                android:id="@+id/title_second_line"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="65dp"
+                android:paddingBottom="16dp"
+                android:text="@string/welcome_page_subtitle"
+                android:textColor="?attr/color_text"
+                android:textSize="26sp"
+                app:layout_constraintTop_toBottomOf="@id/title_first_line"
+                app:layout_constraintEnd_toEndOf="parent"/>
+
             <androidx.viewpager2.widget.ViewPager2
                 android:id="@+id/pager"
                 android:layout_width="0dp"
                 android:layout_height="0dp"
                 android:layout_marginBottom="20dp"
-                app:layout_constraintTop_toBottomOf="@id/skip"
+                app:layout_constraintTop_toBottomOf="@id/title_second_line"
                 app:layout_constraintBottom_toTopOf="@id/dots_indicator"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"/>
@@ -80,10 +107,23 @@
                 android:text="@string/next"
                 app:layout_constraintWidth_max="@dimen/button_max_width"
                 app:layout_constraintTop_toBottomOf="@id/dots_indicator"
-                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintBottom_toTopOf="@id/mountains"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent" />
 
+            <ImageView
+                android:id="@+id/mountains"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:src="@drawable/mountains"
+                android:adjustViewBounds="true"
+                android:scaleType="centerCrop"
+                android:contentDescription="@null"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:tint="?attr/color_main1_500" />
+
         </androidx.constraintlayout.widget.ConstraintLayout>
 
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/welcome_page_1.xml b/app/src/main/res/layout/welcome_page_1.xml
index 49fd2d896..eff400451 100644
--- a/app/src/main/res/layout/welcome_page_1.xml
+++ b/app/src/main/res/layout/welcome_page_1.xml
@@ -9,56 +9,16 @@
         android:layout_height="wrap_content"
         android:layout_width="match_parent">
 
-        <ImageView
-            android:id="@+id/header"
-            android:layout_width="wrap_content"
-            android:layout_height="0dp"
-            android:src="@drawable/mountains"
-            android:contentDescription="@null"
-            android:adjustViewBounds="true"
-            android:scaleType="centerCrop"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="@id/title_second_line"
-            app:tint="?attr/color_main1_500"/>
-
-        <androidx.appcompat.widget.AppCompatTextView
-            style="@style/default_text_style_800"
-            android:id="@+id/title_first_line"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="65dp"
-            android:layout_marginTop="16dp"
-            android:text="@string/welcome_page_title"
-            android:textColor="?attr/color_on_main"
-            android:textSize="36sp"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintStart_toStartOf="parent"/>
-
-        <androidx.appcompat.widget.AppCompatTextView
-            style="@style/default_text_style_800"
-            android:id="@+id/title_second_line"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="65dp"
-            android:paddingBottom="16dp"
-            android:text="@string/welcome_page_subtitle"
-            android:textColor="?attr/color_on_main"
-            android:textSize="26sp"
-            app:layout_constraintTop_toBottomOf="@id/title_first_line"
-            app:layout_constraintEnd_toEndOf="parent"/>
-
         <ImageView
             android:id="@+id/image"
             android:layout_width="wrap_content"
             android:layout_height="@dimen/welcome_icon_size"
-            android:layout_marginTop="110dp"
+            android:layout_marginTop="80dp"
             android:src="@drawable/welcome_linphone_logo"
             android:contentDescription="@null"
             app:tint="?attr/color_main1_500"
             app:layout_constraintDimensionRatio="1:1"
-            app:layout_constraintTop_toBottomOf="@id/title_second_line"
+            app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent" />
 
diff --git a/app/src/main/res/layout/welcome_page_2.xml b/app/src/main/res/layout/welcome_page_2.xml
index 530ad6ce0..2cbe1bff6 100644
--- a/app/src/main/res/layout/welcome_page_2.xml
+++ b/app/src/main/res/layout/welcome_page_2.xml
@@ -9,56 +9,16 @@
         android:layout_height="wrap_content"
         android:layout_width="match_parent">
 
-        <ImageView
-            android:id="@+id/header"
-            android:layout_width="wrap_content"
-            android:layout_height="0dp"
-            android:src="@drawable/mountains"
-            android:contentDescription="@null"
-            android:adjustViewBounds="true"
-            android:scaleType="centerCrop"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="@id/title_second_line"
-            app:tint="?attr/color_main1_500"/>
-
-        <androidx.appcompat.widget.AppCompatTextView
-            style="@style/default_text_style_800"
-            android:id="@+id/title_first_line"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="65dp"
-            android:layout_marginTop="16dp"
-            android:text="@string/welcome_page_title"
-            android:textColor="?attr/color_on_main"
-            android:textSize="36sp"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintStart_toStartOf="parent"/>
-
-        <androidx.appcompat.widget.AppCompatTextView
-            style="@style/default_text_style_800"
-            android:id="@+id/title_second_line"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="65dp"
-            android:paddingBottom="16dp"
-            android:text="@string/welcome_page_subtitle"
-            android:textColor="?attr/color_on_main"
-            android:textSize="26sp"
-            app:layout_constraintTop_toBottomOf="@id/title_first_line"
-            app:layout_constraintEnd_toEndOf="parent"/>
-
         <ImageView
             android:id="@+id/image"
             android:layout_width="wrap_content"
             android:layout_height="@dimen/welcome_icon_size"
-            android:layout_marginTop="110dp"
+            android:layout_marginTop="80dp"
             android:src="@drawable/welcome_secured_logo"
             android:contentDescription="@null"
             app:tint="?attr/color_main1_500"
             app:layout_constraintDimensionRatio="1:1"
-            app:layout_constraintTop_toBottomOf="@id/title_second_line"
+            app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent" />
 
diff --git a/app/src/main/res/layout/welcome_page_3.xml b/app/src/main/res/layout/welcome_page_3.xml
index 0cd31d2c4..40fda8eac 100644
--- a/app/src/main/res/layout/welcome_page_3.xml
+++ b/app/src/main/res/layout/welcome_page_3.xml
@@ -9,56 +9,16 @@
         android:layout_height="wrap_content"
         android:layout_width="match_parent">
 
-        <ImageView
-            android:id="@+id/header"
-            android:layout_width="wrap_content"
-            android:layout_height="0dp"
-            android:src="@drawable/mountains"
-            android:contentDescription="@null"
-            android:adjustViewBounds="true"
-            android:scaleType="centerCrop"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="@id/title_second_line"
-            app:tint="?attr/color_main1_500"/>
-
-        <androidx.appcompat.widget.AppCompatTextView
-            style="@style/default_text_style_800"
-            android:id="@+id/title_first_line"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="65dp"
-            android:layout_marginTop="16dp"
-            android:text="@string/welcome_page_title"
-            android:textColor="?attr/color_on_main"
-            android:textSize="36sp"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintStart_toStartOf="parent"/>
-
-        <androidx.appcompat.widget.AppCompatTextView
-            style="@style/default_text_style_800"
-            android:id="@+id/title_second_line"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="65dp"
-            android:paddingBottom="16dp"
-            android:text="@string/welcome_page_subtitle"
-            android:textColor="?attr/color_on_main"
-            android:textSize="26sp"
-            app:layout_constraintTop_toBottomOf="@id/title_first_line"
-            app:layout_constraintEnd_toEndOf="parent"/>
-
         <ImageView
             android:id="@+id/image"
             android:layout_width="wrap_content"
             android:layout_height="@dimen/welcome_icon_size"
-            android:layout_marginTop="110dp"
+            android:layout_marginTop="80dp"
             android:src="@drawable/welcome_open_source_logo"
             android:contentDescription="@null"
             app:tint="?attr/color_main1_500"
             app:layout_constraintDimensionRatio="1:1"
-            app:layout_constraintTop_toBottomOf="@id/title_second_line"
+            app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent" />
 
diff --git a/app/src/main/res/navigation/call_nav_graph.xml b/app/src/main/res/navigation/call_nav_graph.xml
index f72db9565..732c7472b 100644
--- a/app/src/main/res/navigation/call_nav_graph.xml
+++ b/app/src/main/res/navigation/call_nav_graph.xml
@@ -191,10 +191,7 @@
         android:label="ConversationFragment"
         tools:layout="@layout/chat_conversation_fragment">
         <argument
-            android:name="localSipUri"
-            app:argType="string" />
-        <argument
-            android:name="remoteSipUri"
+            android:name="conversationId"
             app:argType="string" />
     </fragment>
 
diff --git a/app/src/main/res/navigation/chat_nav_graph.xml b/app/src/main/res/navigation/chat_nav_graph.xml
index 0d5b0acb8..0f72c0711 100644
--- a/app/src/main/res/navigation/chat_nav_graph.xml
+++ b/app/src/main/res/navigation/chat_nav_graph.xml
@@ -17,10 +17,7 @@
         android:label="ConversationFragment"
         tools:layout="@layout/chat_conversation_fragment">
         <argument
-            android:name="localSipUri"
-            app:argType="string" />
-        <argument
-            android:name="remoteSipUri"
+            android:name="conversationId"
             app:argType="string" />
         <action
             android:id="@+id/action_conversationFragment_to_conversationInfoFragment"
@@ -80,10 +77,7 @@
         android:label="ConversationInfoFragment"
         tools:layout="@layout/chat_info_fragment">
         <argument
-            android:name="localSipUri"
-            app:argType="string" />
-        <argument
-            android:name="remoteSipUri"
+            android:name="conversationId"
             app:argType="string" />
         <action
             android:id="@+id/action_conversationInfoFragment_to_addParticipantsFragment"
@@ -147,10 +141,7 @@
         android:label="ConversationMediaListFragment"
         tools:layout="@layout/chat_media_fragment">
         <argument
-            android:name="localSipUri"
-            app:argType="string" />
-        <argument
-            android:name="remoteSipUri"
+            android:name="conversationId"
             app:argType="string" />
     </fragment>
 
@@ -160,10 +151,7 @@
         android:label="ConversationDocumentsListFragment"
         tools:layout="@layout/chat_documents_fragment">
         <argument
-            android:name="localSipUri"
-            app:argType="string" />
-        <argument
-            android:name="remoteSipUri"
+            android:name="conversationId"
             app:argType="string" />
     </fragment>
 
diff --git a/app/src/main/res/navigation/history_nav_graph.xml b/app/src/main/res/navigation/history_nav_graph.xml
index 2f819c532..4264cef1f 100644
--- a/app/src/main/res/navigation/history_nav_graph.xml
+++ b/app/src/main/res/navigation/history_nav_graph.xml
@@ -48,10 +48,7 @@
         android:label="ConferenceConversationFragment"
         tools:layout="@layout/chat_conversation_fragment">
         <argument
-            android:name="localSipUri"
-            app:argType="string" />
-        <argument
-            android:name="remoteSipUri"
+            android:name="conversationId"
             app:argType="string" />
     </fragment>
 
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index c88fb10dc..0693326d7 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -6,7 +6,6 @@
     <!-- Common words -->
     <string name="sip_address">Adresse SIP</string>
     <string name="device_id">ID du téléphone</string>
-    <string name="sip_address_hint">utilisateur@domaine</string>
     <string name="sip_address_display_name">Nom d\'affichage</string>
     <string name="sip_address_domain">Domaine</string>
     <string name="username">Nom d\'utilisateur</string>
@@ -14,7 +13,7 @@
     <string name="password">Mot de passe</string>
     <string name="phone_number">Numéro de téléphone</string>
     <string name="or">ou</string>
-    <string name="next">suivant</string>
+    <string name="next">Suivant</string>
     <string name="start">Commencer</string>
     <string name="today">Aujourd\'hui</string>
     <string name="yesterday">Hier</string>
@@ -90,6 +89,7 @@
     <string name="media_playback_low_volume_warning_toast">Volume faible : vous risquez de ne pas entendre</string>
     <string name="remote_provisioning_config_applied_toast">Configuration appliquée</string>
     <string name="remote_provisioning_config_failed_toast">Erreur lors du chargement ou de l\'application de la configuration</string>
+    <string name="media_player_generic_error_toast">Erreur lors de la création du lecteur média</string>
 
     <!-- Assistant related string (account register / login / etc...) -->
     <string name="assistant_dialog_general_terms_and_privacy_policy_title">Conditions de service &amp; politique de confidentialité</string>
@@ -97,16 +97,18 @@
     <string name="assistant_dialog_privacy_policy_label">politique de confidentialité</string>
     <string name="assistant_dialog_general_terms_and_privacy_policy_message">En continuant, vous acceptez nos %1$s et %2$s.</string>
     <string name="assistant_dialog_confirm_phone_number_title">Confirmez votre numéro de téléphone</string>
-    <string name="assistant_dialog_confirm_phone_number_message">Êtes-vous sûr de vouloir utiliser ce numéro de téléphone ?</string>
+    <string name="assistant_dialog_confirm_phone_number_message">Êtes-vous sûr que le %s est votre numéro de téléphone ?</string>
     <string name="assistant_account_login">Connexion</string>
     <string name="assistant_scan_qr_code">Scanner un QR code</string>
     <string name="assistant_qr_code_invalid_toast">Ce QR code est invalide !</string>
     <string name="assistant_login_third_party_sip_account">J\'ai un compte SIP tiers</string>
+    <string name="assistant_login_third_party_sip_account_title">Compte SIP tiers</string>
     <string name="assistant_login_using_single_sign_on">Single sign on</string>
     <string name="assistant_login_cant_parse_address_toast">Adresse SIP invalide</string>
     <string name="assistant_login_address_without_username_toast">L\'adresse SIP ne contient pas de nom d\'utilisateur !</string>
     <string name="assistant_no_account_yet">Pas encore de compte ?</string>
     <string name="assistant_account_register">Créer un compte</string>
+    <string name="assistant_account_creation_sms_confirmation_title">Confirmez votre numéro</string>
     <string name="assistant_account_creation_sms_confirmation_explanation">On vous a envoyé un code de vérification par SMS au numéro %1$s.\n\nMerci de le saisir ci-dessous :</string>
     <string name="assistant_account_creation_wrong_phone_number">Numéro incorrect ?</string>
     <string name="assistant_account_create">Créer</string>
@@ -116,7 +118,6 @@
     <string name="assistant_third_party_sip_account_warning_explanation">Certaines fonctionnalités telles que les conversations de groupe, les vidéo-conférences, etc… nécessitent un compte &appName;.\n\nCes fonctionnalités seront masquées si vous utilisez un compte SIP tiers.\n\nPour les activer dans un projet commercial, merci de nous contacter.</string>
     <string name="assistant_third_party_sip_account_create_linphone_account">Je préfère créer un compte</string>
     <string name="assistant_third_party_sip_account_warning_ok">J\'ai compris</string>
-    <string name="assistant_third_party_sip_account_username_or_identity">Nom d\'utilisateur ou identité SIP*</string>
     <string name="assistant_account_register_unavailable_no_push_toast">Notifications push indisponible, la création de compte est donc désactivée.</string>
     <string name="assistant_account_register_push_notification_not_received_error">Notification push non reçue, merci de réessayer plus tard</string>
     <string name="assistant_account_register_unexpected_error">Un erreur inattendue est survenue, merci de réessayer plus tard</string>
@@ -180,6 +181,7 @@
     <string name="settings_security_enable_vfs_title">Chiffrer tous les fichiers</string>
     <string name="settings_security_enable_vfs_subtitle">Attention, vous ne pourrez pas revenir en arrière !</string>
     <string name="settings_security_enable_vfs_failure_toast">Échec à l\'activation du module d\'encryption</string>
+    <string name="settings_security_enable_vfs_success_toast">Module d\'encryption activé</string>
     <string name="settings_security_enable_vfs_dialog_confirmation_title">Confirmer l\'activation du chiffrement</string>
     <string name="settings_security_enable_vfs_dialog_confirmation_message">Une fois la fonctionnalité activée, toutes les données de l\'application seront chiffrées et accessibles uniquement via celle-ci.\n\nCe changement est irréversible.</string>
     <string name="settings_security_prevent_screenshots_title">Empêcher l\'interface d\'être enregistrée</string>
@@ -199,6 +201,7 @@
     <string name="settings_calls_change_ringtone_title">Changer de sonnerie</string>
     <string name="settings_conversations_title">Conversations</string>
     <string name="settings_conversations_auto_download_title">Télécharger automatiquement les fichiers</string>
+    <string name="settings_conversations_auto_export_media_to_native_gallery_title">Rendre visible dans la galerie les médias téléchargés</string>
     <string name="settings_conversations_mark_as_read_when_dismissing_notif_title">Marquer la conversation comme lue lorsqu\'une notification de message est supprimée</string>
     <string name="settings_contacts_title">Contacts</string>
     <string name="settings_contacts_add_ldap_server_title">Ajouter un serveur LDAP</string>
@@ -261,6 +264,7 @@
     <string name="settings_advanced_upload_server_url">URL du serveur de partage de fichier</string>
     <string name="settings_advanced_media_encryption_title">Chiffrement du média</string>
     <string name="settings_advanced_media_encryption_mandatory_title">Rendre le chiffrement du média obligatoire</string>
+    <string name="settings_advanced_create_e2e_encrypted_conferences_title">Créer en mode chiffré de bout en bout les réunions et les appels de groupe</string>
     <string name="settings_advanced_accept_early_media_title">Accepter l\'early media</string>
     <string name="settings_advanced_allow_outgoing_early_media_title">Autoriser l\'early media pour les appels sortants</string>
     <string name="settings_advanced_remote_provisioning_url">URL de configuration distante</string>
@@ -572,13 +576,17 @@
     <string name="meeting_schedule_send_invitations_title">Envoyer l\'invitation par message aux participants</string>
     <string name="meeting_info_join_title">Rejoindre la réunion</string>
     <string name="meeting_info_organizer_label">Organisateur</string>
-    <string name="meeting_info_delete">Supprimer la réunion</string>
     <string name="meeting_info_export_as_calendar_event">Ajouter dans le calendrier</string>
     <string name="meeting_info_deleted_toast">Réunion supprimée</string>
+    <string name="meeting_info_not_found_toast">Réunion introuvable !</string>
     <string name="meeting_schedule_description_title">Description</string>
     <string name="meeting_schedule_edit_title">Modifier la réunion</string>
     <string name="meeting_schedule_cancel_dialog_title">Annuler la réunion?</string>
     <string name="meeting_schedule_cancel_dialog_message">Voulez-vous annuler la réunion et envoyer une notification aux participants ?</string>
+    <string name="meeting_cancel_action_label">Annuler la réunion</string>
+    <string name="meeting_schedule_delete_dialog_title">Supprimer la réunion ?</string>
+    <string name="meeting_schedule_delete_dialog_message">Voulez-vous supprimer la réunion ?</string>
+    <string name="meeting_delete_action_label">Supprimer la réunion</string>
     <string name="meeting_info_created_toast">Réunion créée</string>
     <string name="meeting_info_updated_toast">Réunion mise à jour</string>
     <string name="meeting_info_cancelled_toast">Réunion annulée</string>
@@ -599,7 +607,8 @@
     <string name="call_outgoing">Appel sortant</string>
     <string name="call_audio_incoming">Appel entrant</string>
     <string name="call_video_incoming">Appel vidéo entrant</string>
-    <string name="call_ended">Appel terminé</string>
+    <string name="call_locally_ended">Vous avez terminé l\'appel</string>
+    <string name="call_remotely_ended">Votre correspondant a terminé l\'appel</string>
     <string name="call_audio_incoming_for_account">Appel entrant pour %s</string>
     <string name="call_video_incoming_for_account">Appel vidéo entrant pour %s</string>
     <string name="call_transfer_current_call_title">Transférer %s à…</string>
@@ -633,6 +642,7 @@
     <string name="call_srtp_point_to_point_encrypted">Appel chiffré de point à point</string>
     <string name="call_not_encrypted">Appel non chiffré</string>
     <string name="calls_list_title">Liste des appels</string>
+    <string name="call_is_being_recorded">L\'appel est enregistré</string>
     <string name="call_remote_is_recording">%s enregistre l\'appel</string>
     <string name="calls_count_label">%s appels</string>
     <string name="calls_paused_count_label">%s appels en pause</string>
diff --git a/app/src/main/res/values-sw600dp/dimen.xml b/app/src/main/res/values-sw600dp/dimen.xml
new file mode 100644
index 000000000..78da8b09d
--- /dev/null
+++ b/app/src/main/res/values-sw600dp/dimen.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="welcome_icon_size">150dp</dimen>
+    <dimen name="text_input_max_width">600dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimen.xml b/app/src/main/res/values/dimen.xml
index 12b62c7c6..f46aad053 100644
--- a/app/src/main/res/values/dimen.xml
+++ b/app/src/main/res/values/dimen.xml
@@ -14,6 +14,7 @@
     <dimen name="icon_size">24dp</dimen>
     <dimen name="big_icon_size">48dp</dimen>
     <dimen name="welcome_icon_size">100dp</dimen>
+    <dimen name="assistant_title_top_margin">30dp</dimen>
 
     <dimen name="avatar_bubble_size">30dp</dimen>
     <dimen name="avatar_list_cell_size">45dp</dimen>
@@ -99,8 +100,6 @@
     <dimen name="chat_bubble_emoji_picker_height">425dp</dimen>
     <dimen name="chat_bubble_max_height_long_press">340dp</dimen>
 
-    <dimen name="recycler_view_min_height">200dp</dimen>
-
     <dimen name="spinner_start_padding">15dp</dimen>
     <dimen name="spinner_end_padding">30dp</dimen>
     <dimen name="spinner_caret_end_margin">15dp</dimen>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f23abecea..cfc3398f7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -44,7 +44,6 @@
     <!-- Common words -->
     <string name="sip_address">SIP address</string>
     <string name="device_id">Device ID</string>
-    <string name="sip_address_hint">username@domain</string>
     <string name="sip_address_display_name">Display name</string>
     <string name="sip_address_domain">Domain</string>
     <string name="username">Username</string>
@@ -52,7 +51,7 @@
     <string name="password">Password</string>
     <string name="phone_number">Phone number</string>
     <string name="or">or</string>
-    <string name="next">next</string>
+    <string name="next">Next</string>
     <string name="start">Start</string>
     <string name="today">Today</string>
     <string name="yesterday">Yesterday</string>
@@ -129,6 +128,7 @@
     <string name="media_playback_low_volume_warning_toast">Media volume is low, you may not hear anything!</string>
     <string name="remote_provisioning_config_applied_toast">Configuration successfully applied</string>
     <string name="remote_provisioning_config_failed_toast">Error while trying to download and apply remote configuration</string>
+    <string name="media_player_generic_error_toast">Error trying to create media player</string>
 
     <!-- Assistant related string (account register / login / etc...) -->
     <string name="assistant_dialog_general_terms_and_privacy_policy_title">General terms &amp; privacy policy</string>
@@ -141,11 +141,13 @@
     <string name="assistant_scan_qr_code">Scan QR code</string>
     <string name="assistant_qr_code_invalid_toast">Invalid QR code!</string>
     <string name="assistant_login_third_party_sip_account">Use a third party SIP account</string>
+    <string name="assistant_login_third_party_sip_account_title">Third party SIP account</string>
     <string name="assistant_login_using_single_sign_on">Single sign on</string>
     <string name="assistant_login_cant_parse_address_toast">SIP address is invalid!</string>
     <string name="assistant_login_address_without_username_toast">SIP address doesn\'t contains a username!</string>
     <string name="assistant_no_account_yet">No account yet?</string>
     <string name="assistant_account_register">Register</string>
+    <string name="assistant_account_creation_sms_confirmation_title">Confirm your phone number</string>
     <string name="assistant_account_creation_sms_confirmation_explanation">We have sent a verification code on your phone number %1$s.\n\nPlease enter the verification code below:</string>
     <string name="assistant_account_creation_wrong_phone_number">Wrong number?</string>
     <string name="assistant_account_create">Create</string>
@@ -155,7 +157,6 @@
     <string name="assistant_third_party_sip_account_warning_explanation">Some features require a &appName; account, such as group messaging, video conferences…\n\nThese features are hidden when you register with a third party SIP account.\n\nTo enable it in a commercial project, please contact us.</string>
     <string name="assistant_third_party_sip_account_create_linphone_account">I prefer to create an account</string>
     <string name="assistant_third_party_sip_account_warning_ok">I understand</string>
-    <string name="assistant_third_party_sip_account_username_or_identity">Username or SIP identity*</string>
     <string name="assistant_account_register_unavailable_no_push_toast">Push notifications not available, account creation disabled</string>
     <string name="assistant_account_register_push_notification_not_received_error">Push notification with auth token not received in 5 seconds, please try again later</string>
     <string name="assistant_account_register_unexpected_error">Unexpected error occurred, please try again later</string>
@@ -219,6 +220,7 @@
     <string name="settings_security_enable_vfs_title">Encrypt everything</string>
     <string name="settings_security_enable_vfs_subtitle">Warning: once enabled it can\'t be disabled!</string>
     <string name="settings_security_enable_vfs_failure_toast">Failed to enable encryption module!</string>
+    <string name="settings_security_enable_vfs_success_toast">Encryption module enabled</string>
     <string name="settings_security_enable_vfs_dialog_confirmation_title">Do you really want to encrypt everything?</string>
     <string name="settings_security_enable_vfs_dialog_confirmation_message">Be careful, it can\'t be undone!</string>
     <string name="settings_security_prevent_screenshots_title">Prevent interface from being recorded</string>
@@ -238,6 +240,7 @@
     <string name="settings_calls_change_ringtone_title">Change ringtone</string>
     <string name="settings_conversations_title">Conversations</string>
     <string name="settings_conversations_auto_download_title">Auto-download files</string>
+    <string name="settings_conversations_auto_export_media_to_native_gallery_title">Make downloaded media public</string>
     <string name="settings_conversations_mark_as_read_when_dismissing_notif_title">Mark conversation as read when dismissing message notification</string>
     <string name="settings_contacts_title">Contacts</string>
     <string name="settings_contacts_add_ldap_server_title">Add LDAP server</string>
@@ -300,6 +303,7 @@
     <string name="settings_advanced_upload_server_url">File sharing server URL</string>
     <string name="settings_advanced_media_encryption_title">Media encryption</string>
     <string name="settings_advanced_media_encryption_mandatory_title">Media encryption mandatory</string>
+    <string name="settings_advanced_create_e2e_encrypted_conferences_title">Create end-to-end encrypted meetings &amp; group calls</string>
     <string name="settings_advanced_accept_early_media_title">Accept early media</string>
     <string name="settings_advanced_allow_outgoing_early_media_title">Allow outgoing early media</string>
     <string name="settings_advanced_remote_provisioning_url">Remote provisioning URL</string>
@@ -612,13 +616,17 @@
     <string name="meeting_schedule_send_invitations_title">Send invitation to participants</string>
     <string name="meeting_info_join_title">Join the meeting now</string>
     <string name="meeting_info_organizer_label">Organizer</string>
-    <string name="meeting_info_delete">Delete meeting</string>
     <string name="meeting_info_export_as_calendar_event">Create calendar event</string>
     <string name="meeting_info_deleted_toast">Meeting has been deleted</string>
+    <string name="meeting_info_not_found_toast">Meeting cannot be found!</string>
     <string name="meeting_schedule_description_title">Description</string>
     <string name="meeting_schedule_edit_title">Edit meeting</string>
     <string name="meeting_schedule_cancel_dialog_title">Cancel the meeting?</string>
     <string name="meeting_schedule_cancel_dialog_message">Do you want to cancel the meeting and send a notification to all participants?</string>
+    <string name="meeting_cancel_action_label">Cancel meeting</string>
+    <string name="meeting_schedule_delete_dialog_title">Delete the meeting?</string>
+    <string name="meeting_schedule_delete_dialog_message">Do you want to delete the meeting?</string>
+    <string name="meeting_delete_action_label">Delete meeting</string>
     <string name="meeting_info_created_toast">Meeting has been created</string>
     <string name="meeting_info_updated_toast">Meeting has been updated</string>
     <string name="meeting_info_cancelled_toast">Meeting has been cancelled</string>
@@ -639,7 +647,8 @@
     <string name="call_outgoing">Outgoing call</string>
     <string name="call_audio_incoming">Incoming call</string>
     <string name="call_video_incoming">Incoming video call</string>
-    <string name="call_ended">Call ended</string>
+    <string name="call_locally_ended">You have ended the call</string>
+    <string name="call_remotely_ended">Correspondent has ended the call</string>
     <string name="call_audio_incoming_for_account">Incoming call for %s</string>
     <string name="call_video_incoming_for_account">Incoming video call for %s</string>
     <string name="call_transfer_current_call_title">Transfer %s to…</string>
@@ -673,6 +682,7 @@
     <string name="call_srtp_point_to_point_encrypted">Point-to-point encrypted by SRTP</string>
     <string name="call_not_encrypted">Call is not encrypted</string>
     <string name="calls_list_title">Calls list</string>
+    <string name="call_is_being_recorded">Call is being recorded</string>
     <string name="call_remote_is_recording">%s is recording</string>
     <string name="calls_count_label">%s calls</string>
     <string name="calls_paused_count_label">%s paused calls</string>
@@ -911,6 +921,7 @@
     <string name="content_description_go_to_conversation">Go to conversation</string>
     <string name="content_description_copy_text_to_clipboard">Copy text to clipboard</string>
     <string name="content_description_voicemail_available">Voice message are available</string>
+    <string name="content_description_call_voicemail">Long press to dial voicemail</string>
 
     <!-- Copy of private hosts_allowlist_sample in androidx.car.app:app:1.7.0-beta01, as they recommend it -->
     <string-array name="hosts_allowlist_sample_copy" translatable="false">
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index adab3cc5b..5b54e32e7 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -149,15 +149,7 @@
         <item name="android:drawableTint">?attr/color_danger_500</item>
         <item name="android:drawablePadding">8dp</item>
     </style>
-    <style name="call_start_numpad_digits_style">
-        <item name="android:fontFamily">@font/noto_sans</item>
-        <item name="android:textColor">@color/gray_main2_600</item>
-        <item name="android:textSize">32sp</item>
-        <item name="android:gravity">center</item>
-        <item name="android:elevation">3dp</item>
-        <item name="android:paddingBottom">5dp</item>
-        <item name="android:background">@drawable/circle_white_button_background</item>
-    </style>
+
     <style name="message_reaction_style">
         <item name="android:fontFamily">@font/noto_sans</item>
         <item name="android:textColor">?attr/color_text</item>
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 3be25fcd6..d5530bb77 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,17 +1,17 @@
 [versions]
-agp = "8.8.0"
+agp = "8.9.0"
 kotlin = "2.0.21"
 gmsGoogleServices = "4.4.2"
-firebaseCrashlytics = "3.0.2"
-firebaseBomVersion = "33.7.0"
+firebaseCrashlytics = "3.0.3"
+firebaseBomVersion = "33.10.0"
 ktlint = "12.1.2"
 
 annotations = "1.9.1"
-activity = "1.10.0"
+activity = "1.10.1"
 appcompat = "1.7.0"
-constraintLayout = "2.2.0"
+constraintLayout = "2.2.1"
 coreKtx = "1.15.0"
-splashscreen = "1.2.0-alpha02"
+splashscreen = "1.2.0-beta01"
 telecom = "1.0.0-beta01"
 media = "1.7.0"
 recyclerview = "1.4.0"
@@ -19,13 +19,13 @@ slidingpanelayout = "1.2.0"
 window = "1.3.0"
 gridlayout = "1.0.0"
 securityCryptoKtx = "1.1.0-alpha06"
-navigation = "2.8.5"
+navigation = "2.8.8"
 emoji2 = "1.5.0"
 car = "1.7.0-rc01"
 flexbox = "3.0.0"
 material = "1.12.0"
 protobuf = "3.25.5"
-coil = "3.0.4"
+coil = "3.1.0"
 dotsIndicator = "5.1.0"
 photoview = "2.3.0"
 openidAppauth = "0.11.1"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 04c30cb2b..f0fad5900 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Thu Jun 22 12:11:25 CEST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists