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 13e3def7e..cdc7b1550 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
@@ -44,8 +44,9 @@ import org.linphone.core.tools.Log
 import org.linphone.databinding.AssistantRegisterFragmentBinding
 import org.linphone.ui.GenericActivity
 import org.linphone.ui.GenericFragment
-import org.linphone.ui.assistant.model.ConfirmPhoneNumberDialogModel
 import org.linphone.ui.assistant.viewmodel.AccountCreationViewModel
+import org.linphone.utils.ConfirmationDialogModel
+import org.linphone.utils.AppUtils
 import org.linphone.utils.DialogUtils
 import org.linphone.utils.PhoneNumberUtils
 
@@ -210,7 +211,8 @@ class RegisterFragment : GenericFragment() {
     }
 
     private fun showPhoneNumberConfirmationDialog(number: String) {
-        val model = ConfirmPhoneNumberDialogModel(number)
+        val label  = AppUtils.getFormattedString(R.string.assistant_dialog_confirm_phone_number_message, number)
+        val model = ConfirmationDialogModel(label)
         val dialog = DialogUtils.getAccountCreationPhoneNumberConfirmationDialog(
             requireActivity(),
             model
@@ -222,7 +224,7 @@ class RegisterFragment : GenericFragment() {
             }
         }
 
-        model.confirmPhoneNumberEvent.observe(viewLifecycleOwner) {
+        model.confirmEvent.observe(viewLifecycleOwner) {
             it.consume {
                 viewModel.startAccountCreation()
                 dialog.dismiss()
diff --git a/app/src/main/java/org/linphone/ui/assistant/model/ConfirmPhoneNumberDialogModel.kt b/app/src/main/java/org/linphone/ui/assistant/model/ConfirmPhoneNumberDialogModel.kt
deleted file mode 100644
index 2d5e4925f..000000000
--- a/app/src/main/java/org/linphone/ui/assistant/model/ConfirmPhoneNumberDialogModel.kt
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2010-2023 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.ui.assistant.model
-
-import androidx.annotation.UiThread
-import androidx.lifecycle.MutableLiveData
-import org.linphone.utils.AppUtils
-import org.linphone.utils.Event
-import org.linphone.R
-
-class ConfirmPhoneNumberDialogModel
-    @UiThread
-    constructor(phoneNumber: String) {
-    val message = MutableLiveData<String>()
-
-    val dismissEvent = MutableLiveData<Event<Boolean>>()
-
-    val confirmPhoneNumberEvent = MutableLiveData<Event<Boolean>>()
-
-    init {
-        message.value = AppUtils.getFormattedString(R.string.assistant_dialog_confirm_phone_number_message, phoneNumber)
-    }
-
-    @UiThread
-    fun dismiss() {
-        dismissEvent.value = Event(true)
-    }
-
-    @UiThread
-    fun confirmPhoneNumber() {
-        confirmPhoneNumberEvent.value = Event(true)
-    }
-}
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 63d9f0c4f..74ff2398f 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
@@ -43,7 +43,7 @@ import org.linphone.ui.GenericActivity
 import org.linphone.ui.call.adapter.ConferenceParticipantsListAdapter
 import org.linphone.ui.call.fragment.GenericCallFragment
 import org.linphone.ui.call.viewmodel.CurrentCallViewModel
-import org.linphone.ui.main.history.model.ConfirmationDialogModel
+import org.linphone.utils.ConfirmationDialogModel
 import org.linphone.utils.DialogUtils
 
 class ConferenceParticipantsListFragment : GenericCallFragment() {
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 2faf2b303..7d3c5b621 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
@@ -31,7 +31,7 @@ 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.main.history.model.ConfirmationDialogModel
+import org.linphone.utils.ConfirmationDialogModel
 import org.linphone.utils.DialogUtils
 
 class CallsListFragment : GenericCallFragment() {
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 1b5c23c18..1aad00078 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
@@ -38,14 +38,15 @@ import org.linphone.core.tools.Log
 import org.linphone.databinding.CallTransferFragmentBinding
 import org.linphone.ui.call.adapter.CallsListAdapter
 import org.linphone.ui.call.model.CallModel
-import org.linphone.ui.call.model.ConfirmCallTransferDialogModel
 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
+import org.linphone.utils.AppUtils
 import org.linphone.utils.DialogUtils
 import org.linphone.utils.RecyclerViewHeaderDecoration
 import org.linphone.utils.hideKeyboard
@@ -256,10 +257,12 @@ class TransferCallFragment : GenericCallFragment() {
     }
 
     private fun showConfirmAttendedTransferDialog(callModel: CallModel) {
-        val model = ConfirmCallTransferDialogModel(
+        val label = AppUtils.getFormattedString(
+            org.linphone.R.string.call_transfer_confirm_dialog_message,
             callViewModel.displayedName.value.orEmpty(),
             callModel.displayName.value.orEmpty()
         )
+        val model = ConfirmationDialogModel(label)
         val dialog = DialogUtils.getConfirmCallTransferCallDialog(
             requireActivity(),
             model
@@ -290,10 +293,12 @@ class TransferCallFragment : GenericCallFragment() {
     }
 
     private fun showConfirmBlindTransferDialog(contactModel: ConversationContactOrSuggestionModel) {
-        val model = ConfirmCallTransferDialogModel(
+        val label = AppUtils.getFormattedString(
+            org.linphone.R.string.call_transfer_confirm_dialog_message,
             callViewModel.displayedName.value.orEmpty(),
             contactModel.name
         )
+        val model = ConfirmationDialogModel(label)
         val dialog = DialogUtils.getConfirmCallTransferCallDialog(
             requireActivity(),
             model
diff --git a/app/src/main/java/org/linphone/ui/call/model/ConfirmCallTransferDialogModel.kt b/app/src/main/java/org/linphone/ui/call/model/ConfirmCallTransferDialogModel.kt
deleted file mode 100644
index 5e2c69d55..000000000
--- a/app/src/main/java/org/linphone/ui/call/model/ConfirmCallTransferDialogModel.kt
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2010-2024 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.ui.call.model
-
-import androidx.annotation.UiThread
-import androidx.lifecycle.MutableLiveData
-import org.linphone.utils.AppUtils
-import org.linphone.utils.Event
-
-class ConfirmCallTransferDialogModel
-    @UiThread
-    constructor(
-    toTransfer: String,
-    toReceiveTransfer: String
-) {
-    val cancelEvent = MutableLiveData<Event<Boolean>>()
-
-    val confirmEvent = MutableLiveData<Event<Boolean>>()
-
-    val message = MutableLiveData<String>()
-
-    init {
-        message.value = AppUtils.getFormattedString(
-            org.linphone.R.string.call_transfer_confirm_dialog_message,
-            toTransfer,
-            toReceiveTransfer
-        )
-    }
-
-    @UiThread
-    fun cancel() {
-        cancelEvent.value = Event(true)
-    }
-
-    @UiThread
-    fun confirm() {
-        confirmEvent.value = Event(true)
-    }
-}
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 222304754..0885cb902 100644
--- a/app/src/main/java/org/linphone/ui/main/MainActivity.kt
+++ b/app/src/main/java/org/linphone/ui/main/MainActivity.kt
@@ -64,11 +64,12 @@ import org.linphone.ui.GenericActivity
 import org.linphone.ui.assistant.AssistantActivity
 import org.linphone.ui.main.chat.fragment.ConversationsListFragmentDirections
 import org.linphone.ui.main.help.fragment.DebugFragmentDirections
-import org.linphone.ui.main.model.AuthRequestedDialogModel
+import org.linphone.utils.PasswordDialogModel
 import org.linphone.ui.main.sso.fragment.SingleSignOnFragmentDirections
 import org.linphone.ui.main.viewmodel.MainViewModel
 import org.linphone.ui.main.viewmodel.SharedMainViewModel
 import org.linphone.ui.welcome.WelcomeActivity
+import org.linphone.utils.AppUtils
 import org.linphone.utils.DialogUtils
 import org.linphone.utils.Event
 import org.linphone.utils.FileUtils
@@ -752,7 +753,11 @@ class MainActivity : GenericActivity() {
     private fun showAuthenticationRequestedDialog(identity: String) {
         currentlyDisplayedAuthDialog?.dismiss()
 
-        val model = AuthRequestedDialogModel(identity)
+        val label = AppUtils.getFormattedString(
+            R.string.account_settings_dialog_invalid_password_message,
+            identity
+        )
+        val model = PasswordDialogModel(label)
         val dialog = DialogUtils.getAuthRequestedDialog(this, model)
 
         model.dismissEvent.observe(this) {
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 af2ef8ac9..4007cf6cc 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
@@ -82,7 +82,7 @@ import org.linphone.ui.main.chat.viewmodel.ChatMessageLongPressViewModel
 import org.linphone.ui.main.chat.viewmodel.ConversationViewModel
 import org.linphone.ui.main.chat.viewmodel.SendMessageInConversationViewModel
 import org.linphone.ui.main.fragment.SlidingPaneChildFragment
-import org.linphone.ui.main.history.model.ConfirmationDialogModel
+import org.linphone.utils.ConfirmationDialogModel
 import org.linphone.utils.DialogUtils
 import org.linphone.utils.Event
 import org.linphone.utils.FileUtils
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 966ae0f57..9038df390 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
@@ -43,7 +43,7 @@ import org.linphone.ui.main.chat.adapter.ConversationParticipantsAdapter
 import org.linphone.ui.main.chat.model.ParticipantModel
 import org.linphone.ui.main.chat.viewmodel.ConversationInfoViewModel
 import org.linphone.ui.main.fragment.SlidingPaneChildFragment
-import org.linphone.ui.main.history.model.ConfirmationDialogModel
+import org.linphone.utils.ConfirmationDialogModel
 import org.linphone.ui.main.model.GroupSetOrEditSubjectDialogModel
 import org.linphone.utils.DialogUtils
 import org.linphone.utils.Event
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 c75728cf0..0ee9a3b82 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
@@ -46,10 +46,10 @@ import org.linphone.databinding.ContactFragmentBinding
 import org.linphone.ui.GenericActivity
 import org.linphone.ui.main.contacts.model.ContactTrustDialogModel
 import org.linphone.ui.main.contacts.model.NumberOrAddressPickerDialogModel
-import org.linphone.ui.main.contacts.model.TrustCallDialogModel
 import org.linphone.ui.main.contacts.viewmodel.ContactViewModel
 import org.linphone.ui.main.fragment.SlidingPaneChildFragment
-import org.linphone.ui.main.history.model.ConfirmationDialogModel
+import org.linphone.utils.AppUtils
+import org.linphone.utils.ConfirmationDialogModel
 import org.linphone.utils.DialogUtils
 import org.linphone.utils.Event
 
@@ -318,7 +318,12 @@ class ContactFragment : SlidingPaneChildFragment() {
     }
 
     private fun showConfirmTrustCallDialog(contactName: String, deviceSipUri: String) {
-        val model = TrustCallDialogModel(contactName, deviceSipUri)
+        val label = AppUtils.getFormattedString(
+            org.linphone.R.string.contact_dialog_increase_trust_level_message,
+            contactName,
+            deviceSipUri
+        )
+        val model = ConfirmationDialogModel(label)
         val dialog = DialogUtils.getContactTrustCallConfirmationDialog(requireActivity(), model)
 
         model.dismissEvent.observe(viewLifecycleOwner) {
@@ -327,7 +332,7 @@ class ContactFragment : SlidingPaneChildFragment() {
             }
         }
 
-        model.confirmCallEvent.observe(viewLifecycleOwner) {
+        model.confirmEvent.observe(viewLifecycleOwner) {
             it.consume {
                 coreContext.postOnCoreThread {
                     if (model.doNotShowAnymore.value == true) {
diff --git a/app/src/main/java/org/linphone/ui/main/contacts/fragment/ContactsListFragment.kt b/app/src/main/java/org/linphone/ui/main/contacts/fragment/ContactsListFragment.kt
index 06956cb00..114259e31 100644
--- a/app/src/main/java/org/linphone/ui/main/contacts/fragment/ContactsListFragment.kt
+++ b/app/src/main/java/org/linphone/ui/main/contacts/fragment/ContactsListFragment.kt
@@ -51,7 +51,7 @@ import org.linphone.ui.main.contacts.adapter.ContactsListAdapter
 import org.linphone.ui.main.contacts.model.ContactAvatarModel
 import org.linphone.ui.main.contacts.viewmodel.ContactsListViewModel
 import org.linphone.ui.main.fragment.AbstractMainFragment
-import org.linphone.ui.main.history.model.ConfirmationDialogModel
+import org.linphone.utils.ConfirmationDialogModel
 import org.linphone.utils.DialogUtils
 import org.linphone.utils.Event
 
diff --git a/app/src/main/java/org/linphone/ui/main/contacts/fragment/EditContactFragment.kt b/app/src/main/java/org/linphone/ui/main/contacts/fragment/EditContactFragment.kt
index de681b115..df4edcfc3 100644
--- a/app/src/main/java/org/linphone/ui/main/contacts/fragment/EditContactFragment.kt
+++ b/app/src/main/java/org/linphone/ui/main/contacts/fragment/EditContactFragment.kt
@@ -44,7 +44,7 @@ import org.linphone.ui.main.MainActivity
 import org.linphone.ui.main.contacts.model.NewOrEditNumberOrAddressModel
 import org.linphone.ui.main.contacts.viewmodel.ContactNewOrEditViewModel
 import org.linphone.ui.main.fragment.SlidingPaneChildFragment
-import org.linphone.ui.main.history.model.ConfirmationDialogModel
+import org.linphone.utils.ConfirmationDialogModel
 import org.linphone.utils.DialogUtils
 import org.linphone.utils.FileUtils
 
diff --git a/app/src/main/java/org/linphone/ui/main/contacts/fragment/NewContactFragment.kt b/app/src/main/java/org/linphone/ui/main/contacts/fragment/NewContactFragment.kt
index 369037da5..9209816b2 100644
--- a/app/src/main/java/org/linphone/ui/main/contacts/fragment/NewContactFragment.kt
+++ b/app/src/main/java/org/linphone/ui/main/contacts/fragment/NewContactFragment.kt
@@ -44,7 +44,7 @@ import org.linphone.ui.main.MainActivity
 import org.linphone.ui.main.contacts.model.NewOrEditNumberOrAddressModel
 import org.linphone.ui.main.contacts.viewmodel.ContactNewOrEditViewModel
 import org.linphone.ui.main.fragment.GenericMainFragment
-import org.linphone.ui.main.history.model.ConfirmationDialogModel
+import org.linphone.utils.ConfirmationDialogModel
 import org.linphone.utils.DialogUtils
 import org.linphone.utils.Event
 import org.linphone.utils.FileUtils
diff --git a/app/src/main/java/org/linphone/ui/main/contacts/model/TrustCallDialogModel.kt b/app/src/main/java/org/linphone/ui/main/contacts/model/TrustCallDialogModel.kt
deleted file mode 100644
index 47bd06491..000000000
--- a/app/src/main/java/org/linphone/ui/main/contacts/model/TrustCallDialogModel.kt
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2010-2023 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.ui.main.contacts.model
-
-import androidx.annotation.UiThread
-import androidx.lifecycle.MutableLiveData
-import org.linphone.utils.AppUtils
-import org.linphone.utils.Event
-
-class TrustCallDialogModel
-    @UiThread
-    constructor(contact: String, device: String) {
-    val message = MutableLiveData<String>()
-
-    val doNotShowAnymore = MutableLiveData<Boolean>()
-
-    val dismissEvent = MutableLiveData<Event<Boolean>>()
-
-    val confirmCallEvent = MutableLiveData<Event<Boolean>>()
-
-    init {
-        message.value = AppUtils.getFormattedString(
-            org.linphone.R.string.contact_dialog_increase_trust_level_message,
-            contact,
-            device
-        )
-    }
-
-    @UiThread
-    fun dismiss() {
-        dismissEvent.value = Event(true)
-    }
-
-    @UiThread
-    fun confirmCall() {
-        confirmCallEvent.value = Event(true)
-    }
-}
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 41daac90b..1477cbee4 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
@@ -34,7 +34,7 @@ import org.linphone.databinding.HelpFragmentBinding
 import org.linphone.ui.GenericActivity
 import org.linphone.ui.main.fragment.GenericMainFragment
 import org.linphone.ui.main.help.viewmodel.HelpViewModel
-import org.linphone.ui.main.history.model.ConfirmationDialogModel
+import org.linphone.utils.ConfirmationDialogModel
 import org.linphone.utils.DialogUtils
 
 @UiThread
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 6a77a4533..2d93de4e9 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
@@ -41,7 +41,7 @@ import org.linphone.databinding.HistoryPopupMenuBinding
 import org.linphone.ui.GenericActivity
 import org.linphone.ui.main.fragment.SlidingPaneChildFragment
 import org.linphone.ui.main.history.adapter.ContactHistoryListAdapter
-import org.linphone.ui.main.history.model.ConfirmationDialogModel
+import org.linphone.utils.ConfirmationDialogModel
 import org.linphone.ui.main.history.viewmodel.HistoryViewModel
 import org.linphone.utils.DialogUtils
 import org.linphone.utils.Event
diff --git a/app/src/main/java/org/linphone/ui/main/history/fragment/HistoryListFragment.kt b/app/src/main/java/org/linphone/ui/main/history/fragment/HistoryListFragment.kt
index 5a9b31082..c482ae0a4 100644
--- a/app/src/main/java/org/linphone/ui/main/history/fragment/HistoryListFragment.kt
+++ b/app/src/main/java/org/linphone/ui/main/history/fragment/HistoryListFragment.kt
@@ -45,7 +45,7 @@ import org.linphone.databinding.HistoryListPopupMenuBinding
 import org.linphone.ui.GenericActivity
 import org.linphone.ui.main.fragment.AbstractMainFragment
 import org.linphone.ui.main.history.adapter.HistoryListAdapter
-import org.linphone.ui.main.history.model.ConfirmationDialogModel
+import org.linphone.utils.ConfirmationDialogModel
 import org.linphone.ui.main.history.viewmodel.HistoryListViewModel
 import org.linphone.utils.DialogUtils
 import org.linphone.utils.Event
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 1e6fec22f..ab34292b8 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
@@ -44,7 +44,7 @@ import org.linphone.databinding.MeetingFragmentBinding
 import org.linphone.databinding.MeetingPopupMenuBinding
 import org.linphone.ui.GenericActivity
 import org.linphone.ui.main.fragment.SlidingPaneChildFragment
-import org.linphone.ui.main.history.model.ConfirmationDialogModel
+import org.linphone.utils.ConfirmationDialogModel
 import org.linphone.ui.main.meetings.adapter.MeetingParticipantsAdapter
 import org.linphone.ui.main.meetings.viewmodel.MeetingViewModel
 import org.linphone.utils.DialogUtils
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 f591e3637..294189f20 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
@@ -37,7 +37,7 @@ import org.linphone.core.tools.Log
 import org.linphone.databinding.MeetingsListFragmentBinding
 import org.linphone.ui.GenericActivity
 import org.linphone.ui.main.fragment.AbstractMainFragment
-import org.linphone.ui.main.history.model.ConfirmationDialogModel
+import org.linphone.utils.ConfirmationDialogModel
 import org.linphone.ui.main.meetings.adapter.MeetingsListAdapter
 import org.linphone.ui.main.meetings.model.MeetingModel
 import org.linphone.ui.main.meetings.viewmodel.MeetingsListViewModel
diff --git a/app/src/main/java/org/linphone/ui/main/model/AuthRequestedDialogModel.kt b/app/src/main/java/org/linphone/ui/main/model/AuthRequestedDialogModel.kt
deleted file mode 100644
index 2e9d87dcb..000000000
--- a/app/src/main/java/org/linphone/ui/main/model/AuthRequestedDialogModel.kt
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 2010-2023 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.ui.main.model
-
-import androidx.annotation.UiThread
-import androidx.lifecycle.MutableLiveData
-import org.linphone.R
-import org.linphone.utils.AppUtils
-import org.linphone.utils.Event
-
-class AuthRequestedDialogModel
-    @UiThread
-    constructor(identity: String) {
-    val message = MutableLiveData<String>()
-
-    val password = MutableLiveData<String>()
-
-    val showPassword = MutableLiveData<Boolean>()
-
-    val dismissEvent = MutableLiveData<Event<Boolean>>()
-
-    val confirmEvent = MutableLiveData<Event<String>>()
-
-    init {
-        showPassword.value = false
-        message.value = AppUtils.getFormattedString(
-            R.string.account_settings_dialog_invalid_password_message,
-            identity
-        )
-    }
-
-    @UiThread
-    fun toggleShowPassword() {
-        showPassword.value = showPassword.value == false
-    }
-
-    @UiThread
-    fun dismiss() {
-        dismissEvent.value = Event(true)
-    }
-
-    @UiThread
-    fun confirm() {
-        confirmEvent.value = Event(password.value.orEmpty())
-    }
-}
diff --git a/app/src/main/java/org/linphone/ui/main/settings/fragment/AccountProfileFragment.kt b/app/src/main/java/org/linphone/ui/main/settings/fragment/AccountProfileFragment.kt
index 012943494..93bd679a3 100644
--- a/app/src/main/java/org/linphone/ui/main/settings/fragment/AccountProfileFragment.kt
+++ b/app/src/main/java/org/linphone/ui/main/settings/fragment/AccountProfileFragment.kt
@@ -41,7 +41,7 @@ import org.linphone.core.tools.Log
 import org.linphone.databinding.AccountProfileFragmentBinding
 import org.linphone.ui.GenericActivity
 import org.linphone.ui.main.fragment.GenericMainFragment
-import org.linphone.ui.main.history.model.ConfirmationDialogModel
+import org.linphone.utils.ConfirmationDialogModel
 import org.linphone.ui.main.settings.viewmodel.AccountProfileViewModel
 import org.linphone.utils.DialogUtils
 import org.linphone.utils.Event
diff --git a/app/src/main/java/org/linphone/ui/main/settings/fragment/AccountSettingsFragment.kt b/app/src/main/java/org/linphone/ui/main/settings/fragment/AccountSettingsFragment.kt
index 7d5926b7e..8a9f21810 100644
--- a/app/src/main/java/org/linphone/ui/main/settings/fragment/AccountSettingsFragment.kt
+++ b/app/src/main/java/org/linphone/ui/main/settings/fragment/AccountSettingsFragment.kt
@@ -37,7 +37,7 @@ import org.linphone.core.tools.Log
 import org.linphone.databinding.AccountSettingsFragmentBinding
 import org.linphone.ui.GenericActivity
 import org.linphone.ui.main.fragment.GenericMainFragment
-import org.linphone.ui.main.settings.model.UpdatePasswordDialogModel
+import org.linphone.utils.PasswordDialogModel
 import org.linphone.ui.main.settings.viewmodel.AccountSettingsViewModel
 import org.linphone.utils.DialogUtils
 import org.linphone.utils.Event
@@ -153,7 +153,7 @@ class AccountSettingsFragment : GenericMainFragment() {
     }
 
     private fun showUpdatePasswordDialog() {
-        val model = UpdatePasswordDialogModel()
+        val model = PasswordDialogModel()
         val dialog = DialogUtils.getUpdatePasswordDialog(requireContext(), model)
 
         model.dismissEvent.observe(viewLifecycleOwner) {
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 bd0450b33..8dd7e95df 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
@@ -35,7 +35,7 @@ import org.linphone.compatibility.Compatibility
 import org.linphone.core.tools.Log
 import org.linphone.databinding.SettingsFragmentBinding
 import org.linphone.ui.main.fragment.GenericMainFragment
-import org.linphone.ui.main.settings.model.ConfirmVfsDialogModel
+import org.linphone.utils.ConfirmationDialogModel
 import org.linphone.ui.main.settings.viewmodel.SettingsViewModel
 import org.linphone.utils.DialogUtils
 
@@ -288,7 +288,7 @@ class SettingsFragment : GenericMainFragment() {
     }
 
     private fun showConfirmVfsDialog() {
-        val model = ConfirmVfsDialogModel()
+        val model = ConfirmationDialogModel()
         val dialog = DialogUtils.getConfirmTurningOnVfsDialog(
             requireActivity(),
             model
diff --git a/app/src/main/java/org/linphone/ui/main/settings/model/ConfirmVfsDialogModel.kt b/app/src/main/java/org/linphone/ui/main/settings/model/ConfirmVfsDialogModel.kt
deleted file mode 100644
index 98d9277c6..000000000
--- a/app/src/main/java/org/linphone/ui/main/settings/model/ConfirmVfsDialogModel.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2010-2025 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.ui.main.settings.model
-
-import androidx.annotation.UiThread
-import androidx.lifecycle.MutableLiveData
-import org.linphone.utils.Event
-
-class ConfirmVfsDialogModel
-    @UiThread
-    constructor() {
-    val cancelEvent = MutableLiveData<Event<Boolean>>()
-
-    val confirmEvent = MutableLiveData<Event<Boolean>>()
-
-    @UiThread
-    fun cancel() {
-        cancelEvent.value = Event(true)
-    }
-
-    @UiThread
-    fun confirm() {
-        confirmEvent.value = Event(true)
-    }
-}
diff --git a/app/src/main/java/org/linphone/ui/main/history/model/ConfirmationDialogModel.kt b/app/src/main/java/org/linphone/utils/ConfirmationDialogModel.kt
similarity index 86%
rename from app/src/main/java/org/linphone/ui/main/history/model/ConfirmationDialogModel.kt
rename to app/src/main/java/org/linphone/utils/ConfirmationDialogModel.kt
index c8258aa0d..30e9c119b 100644
--- a/app/src/main/java/org/linphone/ui/main/history/model/ConfirmationDialogModel.kt
+++ b/app/src/main/java/org/linphone/utils/ConfirmationDialogModel.kt
@@ -17,21 +17,28 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.linphone.ui.main.history.model
+package org.linphone.utils
 
 import androidx.annotation.UiThread
 import androidx.lifecycle.MutableLiveData
-import org.linphone.utils.Event
 
 class ConfirmationDialogModel
     @UiThread
-    constructor() {
+    constructor(text: String = "") {
+    val message = MutableLiveData<String>()
+
+    val doNotShowAnymore = MutableLiveData<Boolean>()
+
     val dismissEvent = MutableLiveData<Event<Boolean>>()
 
     val cancelEvent = MutableLiveData<Event<Boolean>>()
 
     val confirmEvent = MutableLiveData<Event<Boolean>>()
 
+    init {
+        message.value = text
+    }
+
     @UiThread
     fun dismiss() {
         dismissEvent.value = Event(true)
diff --git a/app/src/main/java/org/linphone/utils/DialogUtils.kt b/app/src/main/java/org/linphone/utils/DialogUtils.kt
index 83c87b66d..7e9a751d3 100644
--- a/app/src/main/java/org/linphone/utils/DialogUtils.kt
+++ b/app/src/main/java/org/linphone/utils/DialogUtils.kt
@@ -60,18 +60,11 @@ import org.linphone.databinding.DialogUpdateAvailableBinding
 import org.linphone.databinding.DialogZrtpSasValidationBinding
 import org.linphone.databinding.DialogZrtpSecurityAlertBinding
 import org.linphone.ui.assistant.model.AcceptConditionsAndPolicyDialogModel
-import org.linphone.ui.assistant.model.ConfirmPhoneNumberDialogModel
-import org.linphone.ui.call.model.ConfirmCallTransferDialogModel
 import org.linphone.ui.call.model.ZrtpAlertDialogModel
 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.contacts.model.TrustCallDialogModel
-import org.linphone.ui.main.history.model.ConfirmationDialogModel
-import org.linphone.ui.main.model.AuthRequestedDialogModel
 import org.linphone.ui.main.model.GroupSetOrEditSubjectDialogModel
-import org.linphone.ui.main.settings.model.ConfirmVfsDialogModel
-import org.linphone.ui.main.settings.model.UpdatePasswordDialogModel
 
 class DialogUtils {
     companion object {
@@ -95,7 +88,7 @@ class DialogUtils {
         @UiThread
         fun getAccountCreationPhoneNumberConfirmationDialog(
             context: Context,
-            viewModel: ConfirmPhoneNumberDialogModel
+            viewModel: ConfirmationDialogModel
         ): Dialog {
             val binding: DialogAssistantCreateAccountConfirmPhoneNumberBinding = DataBindingUtil.inflate(
                 LayoutInflater.from(context),
@@ -146,7 +139,7 @@ class DialogUtils {
         @UiThread
         fun getConfirmTurningOnVfsDialog(
             context: Context,
-            viewModel: ConfirmVfsDialogModel
+            viewModel: ConfirmationDialogModel
         ): Dialog {
             val binding: DialogConfirmTurningOnVfsBinding = DataBindingUtil.inflate(
                 LayoutInflater.from(context),
@@ -178,7 +171,7 @@ class DialogUtils {
         @UiThread
         fun getContactTrustCallConfirmationDialog(
             context: Context,
-            viewModel: TrustCallDialogModel
+            viewModel: ConfirmationDialogModel
         ): Dialog {
             val binding: DialogContactConfirmTrustCallBinding = DataBindingUtil.inflate(
                 LayoutInflater.from(context),
@@ -371,7 +364,7 @@ class DialogUtils {
         @UiThread
         fun getAuthRequestedDialog(
             context: Context,
-            viewModel: AuthRequestedDialogModel
+            viewModel: PasswordDialogModel
         ): Dialog {
             val binding: DialogUpdateAccountPasswordAfterRegisterFailureBinding = DataBindingUtil.inflate(
                 LayoutInflater.from(context),
@@ -388,7 +381,7 @@ class DialogUtils {
         @UiThread
         fun getUpdatePasswordDialog(
             context: Context,
-            viewModel: UpdatePasswordDialogModel
+            viewModel: PasswordDialogModel
         ): Dialog {
             val binding: DialogUpdateAccountPasswordBinding = DataBindingUtil.inflate(
                 LayoutInflater.from(context),
@@ -453,7 +446,7 @@ class DialogUtils {
         @UiThread
         fun getConfirmCallTransferCallDialog(
             context: Context,
-            viewModel: ConfirmCallTransferDialogModel
+            viewModel: ConfirmationDialogModel
         ): Dialog {
             val binding: DialogCallConfirmTransferBinding = DataBindingUtil.inflate(
                 LayoutInflater.from(context),
diff --git a/app/src/main/java/org/linphone/ui/main/settings/model/UpdatePasswordDialogModel.kt b/app/src/main/java/org/linphone/utils/PasswordDialogModel.kt
similarity index 85%
rename from app/src/main/java/org/linphone/ui/main/settings/model/UpdatePasswordDialogModel.kt
rename to app/src/main/java/org/linphone/utils/PasswordDialogModel.kt
index 74219d4e0..9b4be2646 100644
--- a/app/src/main/java/org/linphone/ui/main/settings/model/UpdatePasswordDialogModel.kt
+++ b/app/src/main/java/org/linphone/utils/PasswordDialogModel.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2024 Belledonne Communications SARL.
+ * Copyright (c) 2010-2023 Belledonne Communications SARL.
  *
  * This file is part of linphone-android
  * (see https://www.linphone.org).
@@ -17,14 +17,16 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.linphone.ui.main.settings.model
+package org.linphone.utils
 
 import androidx.annotation.UiThread
 import androidx.lifecycle.MutableLiveData
-import org.linphone.utils.Event
 
-@UiThread
-class UpdatePasswordDialogModel {
+class PasswordDialogModel
+    @UiThread
+    constructor(text: String = "") {
+    val message = MutableLiveData<String>()
+
     val password = MutableLiveData<String>()
 
     val showPassword = MutableLiveData<Boolean>()
@@ -35,6 +37,7 @@ class UpdatePasswordDialogModel {
 
     init {
         showPassword.value = false
+        message.value = text
     }
 
     @UiThread
diff --git a/app/src/main/res/layout/dialog_assistant_create_account_confirm_phone_number.xml b/app/src/main/res/layout/dialog_assistant_create_account_confirm_phone_number.xml
index 271737642..ef0df9768 100644
--- a/app/src/main/res/layout/dialog_assistant_create_account_confirm_phone_number.xml
+++ b/app/src/main/res/layout/dialog_assistant_create_account_confirm_phone_number.xml
@@ -7,7 +7,7 @@
         <import type="android.view.View" />
         <variable
             name="viewModel"
-            type="org.linphone.ui.assistant.model.ConfirmPhoneNumberDialogModel" />
+            type="org.linphone.utils.ConfirmationDialogModel" />
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -75,7 +75,7 @@
             app:layout_constraintBottom_toTopOf="@id/confirm"/>
 
         <androidx.appcompat.widget.AppCompatTextView
-            android:onClick="@{() -> viewModel.confirmPhoneNumber()}"
+            android:onClick="@{() -> viewModel.confirm()}"
             style="@style/primary_button_label_style"
             android:id="@+id/confirm"
             android:layout_width="0dp"
diff --git a/app/src/main/res/layout/dialog_call_confirm_transfer.xml b/app/src/main/res/layout/dialog_call_confirm_transfer.xml
index dd572708e..2faa4f119 100644
--- a/app/src/main/res/layout/dialog_call_confirm_transfer.xml
+++ b/app/src/main/res/layout/dialog_call_confirm_transfer.xml
@@ -7,7 +7,7 @@
         <import type="android.view.View" />
         <variable
             name="viewModel"
-            type="org.linphone.ui.call.model.ConfirmCallTransferDialogModel" />
+            type="org.linphone.utils.ConfirmationDialogModel" />
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
diff --git a/app/src/main/res/layout/dialog_cancel_contact_changes.xml b/app/src/main/res/layout/dialog_cancel_contact_changes.xml
index e5595b3a9..47c5b7754 100644
--- a/app/src/main/res/layout/dialog_cancel_contact_changes.xml
+++ b/app/src/main/res/layout/dialog_cancel_contact_changes.xml
@@ -7,7 +7,7 @@
         <import type="android.view.View" />
         <variable
             name="viewModel"
-            type="org.linphone.ui.main.history.model.ConfirmationDialogModel" />
+            type="org.linphone.utils.ConfirmationDialogModel" />
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
diff --git a/app/src/main/res/layout/dialog_cancel_meeting.xml b/app/src/main/res/layout/dialog_cancel_meeting.xml
index 6d37714eb..326e2cfe6 100644
--- a/app/src/main/res/layout/dialog_cancel_meeting.xml
+++ b/app/src/main/res/layout/dialog_cancel_meeting.xml
@@ -7,7 +7,7 @@
         <import type="android.view.View" />
         <variable
             name="viewModel"
-            type="org.linphone.ui.main.history.model.ConfirmationDialogModel" />
+            type="org.linphone.utils.ConfirmationDialogModel" />
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
diff --git a/app/src/main/res/layout/dialog_confirm_turning_on_vfs.xml b/app/src/main/res/layout/dialog_confirm_turning_on_vfs.xml
index ead3901c5..133663db0 100644
--- a/app/src/main/res/layout/dialog_confirm_turning_on_vfs.xml
+++ b/app/src/main/res/layout/dialog_confirm_turning_on_vfs.xml
@@ -7,7 +7,7 @@
         <import type="android.view.View" />
         <variable
             name="viewModel"
-            type="org.linphone.ui.main.settings.model.ConfirmVfsDialogModel" />
+            type="org.linphone.utils.ConfirmationDialogModel" />
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
diff --git a/app/src/main/res/layout/dialog_contact_confirm_trust_call.xml b/app/src/main/res/layout/dialog_contact_confirm_trust_call.xml
index 30350556d..6ceab24e0 100644
--- a/app/src/main/res/layout/dialog_contact_confirm_trust_call.xml
+++ b/app/src/main/res/layout/dialog_contact_confirm_trust_call.xml
@@ -7,7 +7,7 @@
         <import type="android.view.View" />
         <variable
             name="viewModel"
-            type="org.linphone.ui.main.contacts.model.TrustCallDialogModel" />
+            type="org.linphone.utils.ConfirmationDialogModel" />
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -75,7 +75,7 @@
             app:layout_constraintBottom_toTopOf="@id/confirm"/>
 
         <androidx.appcompat.widget.AppCompatTextView
-            android:onClick="@{() -> viewModel.confirmCall()}"
+            android:onClick="@{() -> viewModel.confirm()}"
             style="@style/primary_button_label_style"
             android:id="@+id/confirm"
             android:layout_width="0dp"
diff --git a/app/src/main/res/layout/dialog_delete_contact.xml b/app/src/main/res/layout/dialog_delete_contact.xml
index 724464fcc..9c711e26e 100644
--- a/app/src/main/res/layout/dialog_delete_contact.xml
+++ b/app/src/main/res/layout/dialog_delete_contact.xml
@@ -7,7 +7,7 @@
         <import type="android.view.View" />
         <variable
             name="viewModel"
-            type="org.linphone.ui.main.history.model.ConfirmationDialogModel" />
+            type="org.linphone.utils.ConfirmationDialogModel" />
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
diff --git a/app/src/main/res/layout/dialog_kick_from_conference.xml b/app/src/main/res/layout/dialog_kick_from_conference.xml
index 2c98d5d59..a92db6ba3 100644
--- a/app/src/main/res/layout/dialog_kick_from_conference.xml
+++ b/app/src/main/res/layout/dialog_kick_from_conference.xml
@@ -7,7 +7,7 @@
         <import type="android.view.View" />
         <variable
             name="viewModel"
-            type="org.linphone.ui.main.history.model.ConfirmationDialogModel" />
+            type="org.linphone.utils.ConfirmationDialogModel" />
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
diff --git a/app/src/main/res/layout/dialog_merge_calls_into_conference.xml b/app/src/main/res/layout/dialog_merge_calls_into_conference.xml
index b53d97989..505cd0070 100644
--- a/app/src/main/res/layout/dialog_merge_calls_into_conference.xml
+++ b/app/src/main/res/layout/dialog_merge_calls_into_conference.xml
@@ -7,7 +7,7 @@
         <import type="android.view.View" />
         <variable
             name="viewModel"
-            type="org.linphone.ui.main.history.model.ConfirmationDialogModel" />
+            type="org.linphone.utils.ConfirmationDialogModel" />
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
diff --git a/app/src/main/res/layout/dialog_open_export_file.xml b/app/src/main/res/layout/dialog_open_export_file.xml
index 00e75e9d4..5a156e916 100644
--- a/app/src/main/res/layout/dialog_open_export_file.xml
+++ b/app/src/main/res/layout/dialog_open_export_file.xml
@@ -7,7 +7,7 @@
         <import type="android.view.View" />
         <variable
             name="viewModel"
-            type="org.linphone.ui.main.history.model.ConfirmationDialogModel" />
+            type="org.linphone.utils.ConfirmationDialogModel" />
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
diff --git a/app/src/main/res/layout/dialog_remove_account.xml b/app/src/main/res/layout/dialog_remove_account.xml
index 66825c7b6..c0f5528d6 100644
--- a/app/src/main/res/layout/dialog_remove_account.xml
+++ b/app/src/main/res/layout/dialog_remove_account.xml
@@ -7,7 +7,7 @@
         <import type="android.view.View" />
         <variable
             name="viewModel"
-            type="org.linphone.ui.main.history.model.ConfirmationDialogModel" />
+            type="org.linphone.utils.ConfirmationDialogModel" />
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
diff --git a/app/src/main/res/layout/dialog_remove_all_call_logs.xml b/app/src/main/res/layout/dialog_remove_all_call_logs.xml
index 0b5633782..87446e724 100644
--- a/app/src/main/res/layout/dialog_remove_all_call_logs.xml
+++ b/app/src/main/res/layout/dialog_remove_all_call_logs.xml
@@ -7,7 +7,7 @@
         <import type="android.view.View" />
         <variable
             name="viewModel"
-            type="org.linphone.ui.main.history.model.ConfirmationDialogModel" />
+            type="org.linphone.utils.ConfirmationDialogModel" />
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
diff --git a/app/src/main/res/layout/dialog_remove_call_logs.xml b/app/src/main/res/layout/dialog_remove_call_logs.xml
index 20f2862fd..c708ab791 100644
--- a/app/src/main/res/layout/dialog_remove_call_logs.xml
+++ b/app/src/main/res/layout/dialog_remove_call_logs.xml
@@ -7,7 +7,7 @@
         <import type="android.view.View" />
         <variable
             name="viewModel"
-            type="org.linphone.ui.main.history.model.ConfirmationDialogModel" />
+            type="org.linphone.utils.ConfirmationDialogModel" />
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
diff --git a/app/src/main/res/layout/dialog_remove_conversation_history.xml b/app/src/main/res/layout/dialog_remove_conversation_history.xml
index a39226b96..4a1d7a43e 100644
--- a/app/src/main/res/layout/dialog_remove_conversation_history.xml
+++ b/app/src/main/res/layout/dialog_remove_conversation_history.xml
@@ -7,7 +7,7 @@
         <import type="android.view.View" />
         <variable
             name="viewModel"
-            type="org.linphone.ui.main.history.model.ConfirmationDialogModel" />
+            type="org.linphone.utils.ConfirmationDialogModel" />
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
diff --git a/app/src/main/res/layout/dialog_start_group_call_from_conversation.xml b/app/src/main/res/layout/dialog_start_group_call_from_conversation.xml
index ba50679e3..9dd6e744f 100644
--- a/app/src/main/res/layout/dialog_start_group_call_from_conversation.xml
+++ b/app/src/main/res/layout/dialog_start_group_call_from_conversation.xml
@@ -7,7 +7,7 @@
         <import type="android.view.View" />
         <variable
             name="viewModel"
-            type="org.linphone.ui.main.history.model.ConfirmationDialogModel" />
+            type="org.linphone.utils.ConfirmationDialogModel" />
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
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 66e48ed88..381a05e83 100644
--- a/app/src/main/res/layout/dialog_update_account_password.xml
+++ b/app/src/main/res/layout/dialog_update_account_password.xml
@@ -8,7 +8,7 @@
         <import type="android.text.InputType" />
         <variable
             name="viewModel"
-            type="org.linphone.ui.main.settings.model.UpdatePasswordDialogModel" />
+            type="org.linphone.utils.PasswordDialogModel" />
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
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 8b8468a4a..1a175f0f7 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
@@ -8,7 +8,7 @@
         <import type="android.text.InputType" />
         <variable
             name="viewModel"
-            type="org.linphone.ui.main.model.AuthRequestedDialogModel" />
+            type="org.linphone.utils.PasswordDialogModel" />
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
diff --git a/app/src/main/res/layout/dialog_update_available.xml b/app/src/main/res/layout/dialog_update_available.xml
index 4234674aa..f0a323cbb 100644
--- a/app/src/main/res/layout/dialog_update_available.xml
+++ b/app/src/main/res/layout/dialog_update_available.xml
@@ -7,7 +7,7 @@
         <import type="android.view.View" />
         <variable
             name="viewModel"
-            type="org.linphone.ui.main.history.model.ConfirmationDialogModel" />
+            type="org.linphone.utils.ConfirmationDialogModel" />
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout