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 b2b58745c..c16f4193e 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
@@ -282,7 +282,7 @@ class TransferCallFragment : GenericCallFragment() {
             model
         )
 
-        model.cancelEvent.observe(viewLifecycleOwner) {
+        model.dismissEvent.observe(viewLifecycleOwner) {
             it.consume {
                 Log.i("$TAG Attended transfer was cancelled by user")
                 dialog.dismiss()
@@ -321,7 +321,7 @@ class TransferCallFragment : GenericCallFragment() {
             model
         )
 
-        model.cancelEvent.observe(viewLifecycleOwner) {
+        model.dismissEvent.observe(viewLifecycleOwner) {
             it.consume {
                 Log.i("$TAG Blind transfer was cancelled by user")
                 dialog.dismiss()
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 80b334fdd..d908c1f14 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
@@ -181,12 +181,6 @@ class ConversationDocumentsListFragment : SlidingPaneChildFragment() {
             }
         }
 
-        model.cancelEvent.observe(viewLifecycleOwner) {
-            it.consume {
-                dialog.dismiss()
-            }
-        }
-
         model.confirmEvent.observe(viewLifecycleOwner) {
             it.consume {
                 sharedViewModel.displayFileEvent.value = Event(bundle)
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 85b6caea0..f0c2d5bd3 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
@@ -1466,7 +1466,7 @@ open class ConversationFragment : SlidingPaneChildFragment() {
             }
         }
 
-        model.cancelEvent.observe(viewLifecycleOwner) {
+        model.alternativeChoiceEvent.observe(viewLifecycleOwner) {
             it.consume {
                 openFileInAnotherApp(path, mime, bundle)
                 dialog.dismiss()
@@ -1534,12 +1534,6 @@ open class ConversationFragment : SlidingPaneChildFragment() {
             }
         }
 
-        model.cancelEvent.observe(viewLifecycleOwner) {
-            it.consume {
-                dialog.dismiss()
-            }
-        }
-
         model.confirmEvent.observe(viewLifecycleOwner) {
             it.consume {
                 sharedViewModel.displayFileEvent.value = Event(bundle)
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 12a7bc163..7d5a0473d 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
@@ -297,12 +297,6 @@ class MeetingFragment : SlidingPaneChildFragment() {
             }
         }
 
-        model.cancelEvent.observe(viewLifecycleOwner) {
-            it.consume {
-                dialog.dismiss()
-            }
-        }
-
         model.confirmEvent.observe(viewLifecycleOwner) {
             it.consume {
                 viewModel.cancel()
@@ -324,12 +318,6 @@ class MeetingFragment : SlidingPaneChildFragment() {
             }
         }
 
-        model.cancelEvent.observe(viewLifecycleOwner) {
-            it.consume {
-                dialog.dismiss()
-            }
-        }
-
         model.confirmEvent.observe(viewLifecycleOwner) {
             it.consume {
                 viewModel.delete()
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 2b59e0da0..b96d9513f 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
@@ -333,12 +333,6 @@ class MeetingsListFragment : AbstractMainFragment() {
             }
         }
 
-        model.cancelEvent.observe(viewLifecycleOwner) {
-            it.consume {
-                dialog.dismiss()
-            }
-        }
-
         model.confirmEvent.observe(viewLifecycleOwner) {
             it.consume {
                 Log.i("$TAG Cancelling meeting [${meetingModel.id}]")
@@ -363,12 +357,6 @@ class MeetingsListFragment : AbstractMainFragment() {
             }
         }
 
-        model.cancelEvent.observe(viewLifecycleOwner) {
-            it.consume {
-                dialog.dismiss()
-            }
-        }
-
         model.confirmEvent.observe(viewLifecycleOwner) {
             it.consume {
                 Log.i("$TAG Deleting meeting [${meetingModel.id}]")
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 071adca75..fa915e656 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
@@ -376,7 +376,7 @@ class SettingsFragment : GenericMainFragment() {
             model
         )
 
-        model.cancelEvent.observe(viewLifecycleOwner) {
+        model.dismissEvent.observe(viewLifecycleOwner) {
             it.consume {
                 viewModel.isVfsEnabled.value = false
                 dialog.dismiss()
diff --git a/app/src/main/java/org/linphone/utils/ConfirmationDialogModel.kt b/app/src/main/java/org/linphone/utils/ConfirmationDialogModel.kt
index 30e9c119b..57c5d2cc3 100644
--- a/app/src/main/java/org/linphone/utils/ConfirmationDialogModel.kt
+++ b/app/src/main/java/org/linphone/utils/ConfirmationDialogModel.kt
@@ -31,7 +31,7 @@ class ConfirmationDialogModel
 
     val dismissEvent = MutableLiveData<Event<Boolean>>()
 
-    val cancelEvent = MutableLiveData<Event<Boolean>>()
+    val alternativeChoiceEvent = MutableLiveData<Event<Boolean>>()
 
     val confirmEvent = MutableLiveData<Event<Boolean>>()
 
@@ -45,8 +45,8 @@ class ConfirmationDialogModel
     }
 
     @UiThread
-    fun cancel() {
-        cancelEvent.value = Event(true)
+    fun alternativeChoice() {
+        alternativeChoiceEvent.value = Event(true)
     }
 
     @UiThread
diff --git a/app/src/main/res/layout-land/dialog_zrtp_sas_validation.xml b/app/src/main/res/layout-land/dialog_zrtp_sas_validation.xml
index c0e819ce3..2d4c11e8e 100644
--- a/app/src/main/res/layout-land/dialog_zrtp_sas_validation.xml
+++ b/app/src/main/res/layout-land/dialog_zrtp_sas_validation.xml
@@ -236,23 +236,24 @@
                 android:onClick="@{() -> viewModel.notFound()}"
                 style="@style/default_text_style_600"
                 android:id="@+id/nothing_matches"
-                android:layout_width="0dp"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:paddingStart="15dp"
+                android:paddingEnd="15dp"
                 android:layout_marginTop="15dp"
                 android:layout_marginBottom="15dp"
-                android:layout_marginStart="30dp"
-                android:layout_marginEnd="30dp"
+                android:layout_marginEnd="16dp"
                 android:paddingBottom="@dimen/primary_secondary_buttons_label_padding"
                 android:paddingTop="@dimen/primary_secondary_buttons_label_padding"
                 android:gravity="center"
                 android:background="@drawable/shape_red_outlined_button_background"
                 android:text="@string/call_dialog_zrtp_validate_trust_letters_do_not_match"
-                android:textSize="18sp"
+                android:textSize="13sp"
                 android:textColor="?attr/color_danger_500"
                 android:maxLines="1"
                 android:ellipsize="end"
+                app:layout_constrainedWidth="true"
                 app:layout_constraintWidth_max="@dimen/button_max_width"
-                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/remote_tokens"
                 app:layout_constraintBottom_toBottomOf="parent"/>
diff --git a/app/src/main/res/layout-land/dialog_zrtp_security_alert.xml b/app/src/main/res/layout-land/dialog_zrtp_security_alert.xml
index c8ba7cf0a..76a072f1d 100644
--- a/app/src/main/res/layout-land/dialog_zrtp_security_alert.xml
+++ b/app/src/main/res/layout-land/dialog_zrtp_security_alert.xml
@@ -112,23 +112,24 @@
                 style="@style/default_text_style_600"
                 android:id="@+id/hang_up"
                 android:onClick="@{() -> viewModel.hangUp()}"
-                android:layout_width="0dp"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:paddingStart="15dp"
+                android:paddingEnd="15dp"
                 android:layout_marginTop="15dp"
                 android:layout_marginBottom="15dp"
-                android:layout_marginStart="30dp"
-                android:layout_marginEnd="30dp"
+                android:layout_marginEnd="16dp"
                 android:paddingBottom="@dimen/primary_secondary_buttons_label_padding"
                 android:paddingTop="@dimen/primary_secondary_buttons_label_padding"
                 android:gravity="center"
                 android:background="@drawable/shape_red_button_background"
                 android:text="@string/call_action_hang_up"
-                android:textSize="18sp"
+                android:textSize="13sp"
                 android:textColor="@color/bc_white"
                 android:maxLines="1"
                 android:ellipsize="end"
+                app:layout_constrainedWidth="true"
                 app:layout_constraintWidth_max="@dimen/button_max_width"
-                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/try_again"
                 app:layout_constraintBottom_toBottomOf="parent"/>
diff --git a/app/src/main/res/layout/dialog_assistant_accept_conditions_and_policy.xml b/app/src/main/res/layout/dialog_assistant_accept_conditions_and_policy.xml
index a4963a940..2c68e0bc6 100644
--- a/app/src/main/res/layout/dialog_assistant_accept_conditions_and_policy.xml
+++ b/app/src/main/res/layout/dialog_assistant_accept_conditions_and_policy.xml
@@ -62,41 +62,44 @@
             app:layout_constraintEnd_toEndOf="@id/dialog_background"
             app:layout_constraintTop_toBottomOf="@id/title" />
 
+        <androidx.appcompat.widget.AppCompatTextView
+            android:onClick="@{() -> viewModel.acceptConditions()}"
+            style="@style/primary_dialog_button_label_style"
+            android:id="@+id/confirm"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="15dp"
+            android:layout_marginEnd="15dp"
+            android:text="@string/dialog_accept"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintHorizontal_bias="1"
+            app:layout_constraintHorizontal_chainStyle="packed"
+            app:layout_constraintStart_toStartOf="@id/dialog_background"
+            app:layout_constraintEnd_toStartOf="@id/cancel"
+            app:layout_constraintTop_toTopOf="@id/cancel"
+            app:layout_constraintBottom_toBottomOf="@id/cancel"/>
+
         <androidx.appcompat.widget.AppCompatTextView
             android:onClick="@{() -> viewModel.dismiss()}"
-            style="@style/secondary_button_label_style"
+            style="@style/secondary_dialog_button_label_style"
             android:id="@+id/cancel"
-            android:layout_width="0dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="32dp"
             android:layout_marginStart="15dp"
             android:layout_marginEnd="15dp"
             android:text="@string/dialog_deny"
-            app:layout_constraintStart_toStartOf="@id/dialog_background"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintStart_toEndOf="@id/confirm"
             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.acceptConditions()}"
-            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_accept"
-            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_constraintTop_toBottomOf="@id/cancel"
             app:layout_constraintStart_toStartOf="@id/dialog_background"
             app:layout_constraintEnd_toEndOf="@id/dialog_background"
             app:layout_constraintBottom_toBottomOf="parent"/>
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 ef0df9768..ad59fff4f 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
@@ -59,41 +59,44 @@
             app:layout_constraintEnd_toEndOf="@id/dialog_background"
             app:layout_constraintTop_toBottomOf="@id/title" />
 
+        <androidx.appcompat.widget.AppCompatTextView
+            android:onClick="@{() -> viewModel.confirm()}"
+            style="@style/primary_dialog_button_label_style"
+            android:id="@+id/confirm"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="15dp"
+            android:layout_marginEnd="15dp"
+            android:text="@string/dialog_continue"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintHorizontal_bias="1"
+            app:layout_constraintHorizontal_chainStyle="packed"
+            app:layout_constraintStart_toStartOf="@id/dialog_background"
+            app:layout_constraintEnd_toStartOf="@id/cancel"
+            app:layout_constraintTop_toTopOf="@id/cancel"
+            app:layout_constraintBottom_toBottomOf="@id/cancel"/>
+
         <androidx.appcompat.widget.AppCompatTextView
             android:onClick="@{() -> viewModel.dismiss()}"
-            style="@style/secondary_button_label_style"
+            style="@style/secondary_dialog_button_label_style"
             android:id="@+id/cancel"
-            android:layout_width="0dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="32dp"
             android:layout_marginStart="15dp"
             android:layout_marginEnd="15dp"
             android:text="@string/dialog_cancel"
-            app:layout_constraintStart_toStartOf="@id/dialog_background"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintStart_toEndOf="@id/confirm"
             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_continue"
-            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_constraintTop_toBottomOf="@id/cancel"
             app:layout_constraintStart_toStartOf="@id/dialog_background"
             app:layout_constraintEnd_toEndOf="@id/dialog_background"
             app:layout_constraintBottom_toBottomOf="parent"/>
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 2faa4f119..877f30dd7 100644
--- a/app/src/main/res/layout/dialog_call_confirm_transfer.xml
+++ b/app/src/main/res/layout/dialog_call_confirm_transfer.xml
@@ -11,7 +11,7 @@
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:onClick="@{() -> viewModel.cancel()}"
+        android:onClick="@{() -> viewModel.dismiss()}"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
@@ -60,40 +60,43 @@
             app:layout_constraintTop_toBottomOf="@id/title" />
 
         <androidx.appcompat.widget.AppCompatTextView
-            android:onClick="@{() -> viewModel.cancel()}"
-            style="@style/secondary_button_label_style"
+            android:onClick="@{() -> viewModel.confirm()}"
+            style="@style/primary_dialog_button_label_style"
+            android:id="@+id/confirm"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="15dp"
+            android:layout_marginEnd="15dp"
+            android:text="@string/dialog_confirm"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintHorizontal_bias="1"
+            app:layout_constraintHorizontal_chainStyle="packed"
+            app:layout_constraintStart_toStartOf="@id/dialog_background"
+            app:layout_constraintEnd_toStartOf="@id/cancel"
+            app:layout_constraintTop_toTopOf="@id/cancel"
+            app:layout_constraintBottom_toBottomOf="@id/cancel"/>
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:onClick="@{() -> viewModel.dismiss()}"
+            style="@style/secondary_dialog_button_label_style"
             android:id="@+id/cancel"
-            android:layout_width="0dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="32dp"
             android:layout_marginStart="15dp"
             android:layout_marginEnd="15dp"
             android:text="@string/dialog_cancel"
-            app:layout_constraintStart_toStartOf="@id/dialog_background"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintStart_toEndOf="@id/confirm"
             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_confirm"
-            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_constraintTop_toBottomOf="@id/cancel"
             app:layout_constraintStart_toStartOf="@id/dialog_background"
             app:layout_constraintEnd_toEndOf="@id/dialog_background"
             app:layout_constraintBottom_toBottomOf="parent"/>
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 47c5b7754..42693bc63 100644
--- a/app/src/main/res/layout/dialog_cancel_contact_changes.xml
+++ b/app/src/main/res/layout/dialog_cancel_contact_changes.xml
@@ -59,41 +59,44 @@
             app:layout_constraintEnd_toEndOf="@id/dialog_background"
             app:layout_constraintTop_toBottomOf="@id/title" />
 
+        <androidx.appcompat.widget.AppCompatTextView
+            android:onClick="@{() -> viewModel.confirm()}"
+            style="@style/primary_dialog_button_label_style"
+            android:id="@+id/confirm"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="15dp"
+            android:layout_marginEnd="15dp"
+            android:text="@string/dialog_continue"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintHorizontal_bias="1"
+            app:layout_constraintHorizontal_chainStyle="packed"
+            app:layout_constraintStart_toStartOf="@id/dialog_background"
+            app:layout_constraintEnd_toStartOf="@id/cancel"
+            app:layout_constraintTop_toTopOf="@id/cancel"
+            app:layout_constraintBottom_toBottomOf="@id/cancel"/>
+
         <androidx.appcompat.widget.AppCompatTextView
             android:onClick="@{() -> viewModel.dismiss()}"
-            style="@style/secondary_button_label_style"
+            style="@style/secondary_dialog_button_label_style"
             android:id="@+id/cancel"
-            android:layout_width="0dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="32dp"
             android:layout_marginStart="15dp"
             android:layout_marginEnd="15dp"
             android:text="@string/dialog_cancel"
-            app:layout_constraintStart_toStartOf="@id/dialog_background"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintStart_toEndOf="@id/confirm"
             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_ok"
-            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_constraintTop_toBottomOf="@id/cancel"
             app:layout_constraintStart_toStartOf="@id/dialog_background"
             app:layout_constraintEnd_toEndOf="@id/dialog_background"
             app:layout_constraintBottom_toBottomOf="parent"/>
diff --git a/app/src/main/res/layout/dialog_cancel_meeting.xml b/app/src/main/res/layout/dialog_cancel_meeting.xml
index 289c90956..9f78b8cc5 100644
--- a/app/src/main/res/layout/dialog_cancel_meeting.xml
+++ b/app/src/main/res/layout/dialog_cancel_meeting.xml
@@ -60,40 +60,43 @@
             app:layout_constraintTop_toBottomOf="@id/title" />
 
         <androidx.appcompat.widget.AppCompatTextView
-            android:onClick="@{() -> viewModel.cancel()}"
-            style="@style/secondary_button_label_style"
+            android:onClick="@{() -> viewModel.confirm()}"
+            style="@style/primary_dialog_button_label_style"
+            android:id="@+id/confirm"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="15dp"
+            android:layout_marginEnd="15dp"
+            android:text="@string/dialog_yes"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintHorizontal_bias="1"
+            app:layout_constraintHorizontal_chainStyle="packed"
+            app:layout_constraintStart_toStartOf="@id/dialog_background"
+            app:layout_constraintEnd_toStartOf="@id/cancel"
+            app:layout_constraintTop_toTopOf="@id/cancel"
+            app:layout_constraintBottom_toBottomOf="@id/cancel"/>
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:onClick="@{() -> viewModel.dismiss()}"
+            style="@style/secondary_dialog_button_label_style"
             android:id="@+id/cancel"
-            android:layout_width="0dp"
+            android:layout_width="wrap_content"
             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"
+            android:text="@string/dialog_no"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintStart_toEndOf="@id/confirm"
             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_constraintTop_toBottomOf="@id/cancel"
             app:layout_constraintStart_toStartOf="@id/dialog_background"
             app:layout_constraintEnd_toEndOf="@id/dialog_background"
             app:layout_constraintBottom_toBottomOf="parent"/>
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 133663db0..b6421cdbe 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
@@ -11,7 +11,7 @@
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:onClick="@{() -> viewModel.cancel()}"
+        android:onClick="@{() -> viewModel.dismiss()}"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
@@ -60,40 +60,43 @@
             app:layout_constraintTop_toBottomOf="@id/title" />
 
         <androidx.appcompat.widget.AppCompatTextView
-            android:onClick="@{() -> viewModel.cancel()}"
-            style="@style/secondary_button_label_style"
+            android:onClick="@{() -> viewModel.confirm()}"
+            style="@style/primary_dialog_button_label_style"
+            android:id="@+id/confirm"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="15dp"
+            android:layout_marginEnd="15dp"
+            android:text="@string/dialog_confirm"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintHorizontal_bias="1"
+            app:layout_constraintHorizontal_chainStyle="packed"
+            app:layout_constraintStart_toStartOf="@id/dialog_background"
+            app:layout_constraintEnd_toStartOf="@id/cancel"
+            app:layout_constraintTop_toTopOf="@id/cancel"
+            app:layout_constraintBottom_toBottomOf="@id/cancel"/>
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:onClick="@{() -> viewModel.dismiss()}"
+            style="@style/secondary_dialog_button_label_style"
             android:id="@+id/cancel"
-            android:layout_width="0dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="32dp"
             android:layout_marginStart="15dp"
             android:layout_marginEnd="15dp"
             android:text="@string/dialog_cancel"
-            app:layout_constraintStart_toStartOf="@id/dialog_background"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintStart_toEndOf="@id/confirm"
             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_confirm"
-            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_constraintTop_toBottomOf="@id/cancel"
             app:layout_constraintStart_toStartOf="@id/dialog_background"
             app:layout_constraintEnd_toEndOf="@id/dialog_background"
             app:layout_constraintBottom_toBottomOf="parent"/>
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 6ceab24e0..57ea83392 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
@@ -59,34 +59,37 @@
             app:layout_constraintEnd_toEndOf="@id/dialog_background"
             app:layout_constraintTop_toBottomOf="@id/title" />
 
+        <androidx.appcompat.widget.AppCompatTextView
+            android:onClick="@{() -> viewModel.confirm()}"
+            style="@style/primary_dialog_button_label_style"
+            android:id="@+id/confirm"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="15dp"
+            android:layout_marginEnd="15dp"
+            android:text="@string/dialog_call"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintHorizontal_bias="1"
+            app:layout_constraintHorizontal_chainStyle="packed"
+            app:layout_constraintStart_toStartOf="@id/dialog_background"
+            app:layout_constraintEnd_toStartOf="@id/cancel"
+            app:layout_constraintTop_toTopOf="@id/cancel"
+            app:layout_constraintBottom_toBottomOf="@id/cancel"/>
+
         <androidx.appcompat.widget.AppCompatTextView
             android:onClick="@{() -> viewModel.dismiss()}"
-            style="@style/secondary_button_label_style"
+            style="@style/secondary_dialog_button_label_style"
             android:id="@+id/cancel"
-            android:layout_width="0dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="32dp"
             android:layout_marginStart="15dp"
             android:layout_marginEnd="15dp"
             android:text="@string/dialog_cancel"
-            app:layout_constraintStart_toStartOf="@id/dialog_background"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintStart_toEndOf="@id/confirm"
             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_call"
-            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/do_not_show_anymore"/>
 
         <androidx.appcompat.widget.AppCompatCheckBox
@@ -103,7 +106,7 @@
             app:buttonTint="?attr/color_main1_500"
             app:layout_constraintStart_toStartOf="@id/dialog_background"
             app:layout_constraintEnd_toEndOf="@id/dialog_background"
-            app:layout_constraintTop_toBottomOf="@id/confirm"
+            app:layout_constraintTop_toBottomOf="@id/cancel"
             app:layout_constraintBottom_toTopOf="@id/anchor" />
 
         <View
diff --git a/app/src/main/res/layout/dialog_contact_trust_process.xml b/app/src/main/res/layout/dialog_contact_trust_process.xml
index dfc782618..5b6c5bce3 100644
--- a/app/src/main/res/layout/dialog_contact_trust_process.xml
+++ b/app/src/main/res/layout/dialog_contact_trust_process.xml
@@ -106,15 +106,14 @@
 
         <androidx.appcompat.widget.AppCompatTextView
             android:onClick="@{dismissClickListener}"
-            style="@style/primary_button_label_style"
+            style="@style/primary_dialog_button_label_style"
             android:id="@+id/confirm"
-            android:layout_width="0dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="32dp"
             android:layout_marginStart="15dp"
             android:layout_marginEnd="15dp"
-            android:text="@string/dialog_ok"
-            app:layout_constraintStart_toStartOf="@id/dialog_background"
+            android:text="@string/dialog_understood"
             app:layout_constraintEnd_toEndOf="@id/dialog_background"
             app:layout_constraintTop_toBottomOf="@id/image1"
             app:layout_constraintBottom_toTopOf="@id/anchor"/>
diff --git a/app/src/main/res/layout/dialog_delete_contact.xml b/app/src/main/res/layout/dialog_delete_contact.xml
index 9c711e26e..2daece143 100644
--- a/app/src/main/res/layout/dialog_delete_contact.xml
+++ b/app/src/main/res/layout/dialog_delete_contact.xml
@@ -59,41 +59,44 @@
             app:layout_constraintEnd_toEndOf="@id/dialog_background"
             app:layout_constraintTop_toBottomOf="@id/title" />
 
+        <androidx.appcompat.widget.AppCompatTextView
+            android:onClick="@{() -> viewModel.confirm()}"
+            style="@style/primary_dialog_button_label_style"
+            android:id="@+id/confirm"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="15dp"
+            android:layout_marginEnd="15dp"
+            android:text="@string/dialog_delete"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintHorizontal_bias="1"
+            app:layout_constraintHorizontal_chainStyle="packed"
+            app:layout_constraintStart_toStartOf="@id/dialog_background"
+            app:layout_constraintEnd_toStartOf="@id/cancel"
+            app:layout_constraintTop_toTopOf="@id/cancel"
+            app:layout_constraintBottom_toBottomOf="@id/cancel"/>
+
         <androidx.appcompat.widget.AppCompatTextView
             android:onClick="@{() -> viewModel.dismiss()}"
-            style="@style/secondary_button_label_style"
+            style="@style/secondary_dialog_button_label_style"
             android:id="@+id/cancel"
-            android:layout_width="0dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="32dp"
             android:layout_marginStart="15dp"
             android:layout_marginEnd="15dp"
             android:text="@string/dialog_cancel"
-            app:layout_constraintStart_toStartOf="@id/dialog_background"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintStart_toEndOf="@id/confirm"
             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_delete"
-            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_constraintTop_toBottomOf="@id/cancel"
             app:layout_constraintStart_toStartOf="@id/dialog_background"
             app:layout_constraintEnd_toEndOf="@id/dialog_background"
             app:layout_constraintBottom_toBottomOf="parent"/>
diff --git a/app/src/main/res/layout/dialog_delete_meeting.xml b/app/src/main/res/layout/dialog_delete_meeting.xml
index 3ea8a9076..c8d20e218 100644
--- a/app/src/main/res/layout/dialog_delete_meeting.xml
+++ b/app/src/main/res/layout/dialog_delete_meeting.xml
@@ -60,40 +60,43 @@
             app:layout_constraintTop_toBottomOf="@id/title" />
 
         <androidx.appcompat.widget.AppCompatTextView
-            android:onClick="@{() -> viewModel.cancel()}"
-            style="@style/secondary_button_label_style"
+            android:onClick="@{() -> viewModel.confirm()}"
+            style="@style/primary_dialog_button_label_style"
+            android:id="@+id/confirm"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="15dp"
+            android:layout_marginEnd="15dp"
+            android:text="@string/dialog_delete"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintHorizontal_bias="1"
+            app:layout_constraintHorizontal_chainStyle="packed"
+            app:layout_constraintStart_toStartOf="@id/dialog_background"
+            app:layout_constraintEnd_toStartOf="@id/cancel"
+            app:layout_constraintTop_toTopOf="@id/cancel"
+            app:layout_constraintBottom_toBottomOf="@id/cancel"/>
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:onClick="@{() -> viewModel.dismiss()}"
+            style="@style/secondary_dialog_button_label_style"
             android:id="@+id/cancel"
-            android:layout_width="0dp"
+            android:layout_width="wrap_content"
             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"
+            android:text="@string/dialog_cancel"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintStart_toEndOf="@id/confirm"
             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_constraintTop_toBottomOf="@id/cancel"
             app:layout_constraintStart_toStartOf="@id/dialog_background"
             app:layout_constraintEnd_toEndOf="@id/dialog_background"
             app:layout_constraintBottom_toBottomOf="parent"/>
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 a92db6ba3..7c64b5411 100644
--- a/app/src/main/res/layout/dialog_kick_from_conference.xml
+++ b/app/src/main/res/layout/dialog_kick_from_conference.xml
@@ -59,41 +59,44 @@
             app:layout_constraintEnd_toEndOf="@id/dialog_background"
             app:layout_constraintTop_toBottomOf="@id/title" />
 
+        <androidx.appcompat.widget.AppCompatTextView
+            android:onClick="@{() -> viewModel.confirm()}"
+            style="@style/primary_dialog_button_label_style"
+            android:id="@+id/confirm"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="15dp"
+            android:layout_marginEnd="15dp"
+            android:text="@string/dialog_remove"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintHorizontal_bias="1"
+            app:layout_constraintHorizontal_chainStyle="packed"
+            app:layout_constraintStart_toStartOf="@id/dialog_background"
+            app:layout_constraintEnd_toStartOf="@id/cancel"
+            app:layout_constraintTop_toTopOf="@id/cancel"
+            app:layout_constraintBottom_toBottomOf="@id/cancel"/>
+
         <androidx.appcompat.widget.AppCompatTextView
             android:onClick="@{() -> viewModel.dismiss()}"
-            style="@style/secondary_button_label_style"
+            style="@style/secondary_dialog_button_label_style"
             android:id="@+id/cancel"
-            android:layout_width="0dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="32dp"
             android:layout_marginStart="15dp"
             android:layout_marginEnd="15dp"
             android:text="@string/dialog_cancel"
-            app:layout_constraintStart_toStartOf="@id/dialog_background"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintStart_toEndOf="@id/confirm"
             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_remove"
-            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_constraintTop_toBottomOf="@id/cancel"
             app:layout_constraintStart_toStartOf="@id/dialog_background"
             app:layout_constraintEnd_toEndOf="@id/dialog_background"
             app:layout_constraintBottom_toBottomOf="parent"/>
diff --git a/app/src/main/res/layout/dialog_manage_account_international_prefix_help.xml b/app/src/main/res/layout/dialog_manage_account_international_prefix_help.xml
index beeb1f250..d26949902 100644
--- a/app/src/main/res/layout/dialog_manage_account_international_prefix_help.xml
+++ b/app/src/main/res/layout/dialog_manage_account_international_prefix_help.xml
@@ -61,15 +61,14 @@
 
         <androidx.appcompat.widget.AppCompatTextView
             android:onClick="@{dismissClickListener}"
-            style="@style/primary_button_label_style"
+            style="@style/primary_dialog_button_label_style"
             android:id="@+id/confirm"
-            android:layout_width="0dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="32dp"
             android:layout_marginStart="15dp"
             android:layout_marginEnd="15dp"
-            android:text="@string/dialog_ok"
-            app:layout_constraintStart_toStartOf="@id/dialog_background"
+            android:text="@string/dialog_understood"
             app:layout_constraintEnd_toEndOf="@id/dialog_background"
             app:layout_constraintTop_toBottomOf="@id/message"
             app:layout_constraintBottom_toTopOf="@id/anchor"/>
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 505cd0070..f1e6f99c7 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
@@ -44,41 +44,44 @@
             app:layout_constraintEnd_toEndOf="@id/dialog_background"
             app:layout_constraintTop_toTopOf="parent" />
 
+        <androidx.appcompat.widget.AppCompatTextView
+            android:onClick="@{() -> viewModel.confirm()}"
+            style="@style/primary_dialog_button_label_style"
+            android:id="@+id/confirm"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="15dp"
+            android:layout_marginEnd="15dp"
+            android:text="@string/calls_list_dialog_merge_into_conference_label"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintHorizontal_bias="1"
+            app:layout_constraintHorizontal_chainStyle="packed"
+            app:layout_constraintStart_toStartOf="@id/dialog_background"
+            app:layout_constraintEnd_toStartOf="@id/cancel"
+            app:layout_constraintTop_toTopOf="@id/cancel"
+            app:layout_constraintBottom_toBottomOf="@id/cancel"/>
+
         <androidx.appcompat.widget.AppCompatTextView
             android:onClick="@{() -> viewModel.dismiss()}"
-            style="@style/secondary_button_label_style"
+            style="@style/secondary_dialog_button_label_style"
             android:id="@+id/cancel"
-            android:layout_width="0dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="32dp"
             android:layout_marginStart="15dp"
             android:layout_marginEnd="15dp"
             android:text="@string/dialog_cancel"
-            app:layout_constraintStart_toStartOf="@id/dialog_background"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintStart_toEndOf="@id/confirm"
             app:layout_constraintEnd_toEndOf="@id/dialog_background"
             app:layout_constraintTop_toBottomOf="@id/title"
-            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/calls_list_dialog_merge_into_conference_label"
-            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_constraintTop_toBottomOf="@id/cancel"
             app:layout_constraintStart_toStartOf="@id/dialog_background"
             app:layout_constraintEnd_toEndOf="@id/dialog_background"
             app:layout_constraintBottom_toBottomOf="parent"/>
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 5a156e916..a62cff38d 100644
--- a/app/src/main/res/layout/dialog_open_export_file.xml
+++ b/app/src/main/res/layout/dialog_open_export_file.xml
@@ -60,40 +60,62 @@
             app:layout_constraintTop_toBottomOf="@id/title" />
 
         <androidx.appcompat.widget.AppCompatTextView
-            android:onClick="@{() -> viewModel.cancel()}"
-            style="@style/primary_button_label_style"
-            android:id="@+id/cancel"
-            android:layout_width="0dp"
+            android:onClick="@{() -> viewModel.alternativeChoice()}"
+            style="@style/primary_dialog_button_label_style"
+            android:id="@+id/open"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="32dp"
-            android:layout_marginStart="15dp"
-            android:layout_marginEnd="15dp"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="8dp"
             android:text="@string/conversation_dialog_open_file_label"
+            android:maxLines="1"
+            android:ellipsize="end"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintHorizontal_bias="1"
+            app:layout_constraintHorizontal_chainStyle="packed"
             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"/>
+            app:layout_constraintEnd_toStartOf="@id/save"
+            app:layout_constraintTop_toTopOf="@id/cancel"
+            app:layout_constraintBottom_toBottomOf="@id/cancel"/>
 
         <androidx.appcompat.widget.AppCompatTextView
             android:onClick="@{() -> viewModel.confirm()}"
-            style="@style/primary_button_label_style"
-            android:id="@+id/confirm"
-            android:layout_width="0dp"
+            style="@style/primary_dialog_button_label_style"
+            android:id="@+id/save"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:layout_marginStart="15dp"
-            android:layout_marginEnd="15dp"
+            android:layout_marginStart="8dp"
+            android:layout_marginEnd="8dp"
             android:text="@string/conversation_dialog_export_file_label"
-            app:layout_constraintStart_toStartOf="@id/dialog_background"
+            android:maxLines="1"
+            android:ellipsize="end"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintStart_toEndOf="@id/open"
+            app:layout_constraintEnd_toStartOf="@id/cancel"
+            app:layout_constraintTop_toTopOf="@id/cancel"
+            app:layout_constraintBottom_toBottomOf="@id/cancel"/>
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:onClick="@{() -> viewModel.dismiss()}"
+            style="@style/secondary_dialog_button_label_style"
+            android:id="@+id/cancel"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="32dp"
+            android:layout_marginStart="8dp"
+            android:layout_marginEnd="16dp"
+            android:text="@string/dialog_cancel"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintStart_toEndOf="@id/save"
             app:layout_constraintEnd_toEndOf="@id/dialog_background"
-            app:layout_constraintTop_toBottomOf="@id/cancel"
+            app:layout_constraintTop_toBottomOf="@id/message"
             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_constraintTop_toBottomOf="@id/cancel"
             app:layout_constraintStart_toStartOf="@id/dialog_background"
             app:layout_constraintEnd_toEndOf="@id/dialog_background"
             app:layout_constraintBottom_toBottomOf="parent"/>
diff --git a/app/src/main/res/layout/dialog_open_plain_text.xml b/app/src/main/res/layout/dialog_open_plain_text.xml
index 51d32173d..f9538ee91 100644
--- a/app/src/main/res/layout/dialog_open_plain_text.xml
+++ b/app/src/main/res/layout/dialog_open_plain_text.xml
@@ -60,40 +60,43 @@
             app:layout_constraintTop_toBottomOf="@id/title" />
 
         <androidx.appcompat.widget.AppCompatTextView
-            android:onClick="@{() -> viewModel.cancel()}"
-            style="@style/secondary_button_label_style"
+            android:onClick="@{() -> viewModel.confirm()}"
+            style="@style/primary_dialog_button_label_style"
+            android:id="@+id/confirm"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="15dp"
+            android:layout_marginEnd="15dp"
+            android:text="@string/conversation_dialog_open_plain_text_label"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintHorizontal_bias="1"
+            app:layout_constraintHorizontal_chainStyle="packed"
+            app:layout_constraintStart_toStartOf="@id/dialog_background"
+            app:layout_constraintEnd_toStartOf="@id/cancel"
+            app:layout_constraintTop_toTopOf="@id/cancel"
+            app:layout_constraintBottom_toBottomOf="@id/cancel"/>
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:onClick="@{() -> viewModel.dismiss()}"
+            style="@style/secondary_dialog_button_label_style"
             android:id="@+id/cancel"
-            android:layout_width="0dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="32dp"
             android:layout_marginStart="15dp"
             android:layout_marginEnd="15dp"
             android:text="@string/dialog_cancel"
-            app:layout_constraintStart_toStartOf="@id/dialog_background"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintStart_toEndOf="@id/confirm"
             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/conversation_dialog_open_plain_text_label"
-            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_constraintTop_toBottomOf="@id/cancel"
             app:layout_constraintStart_toStartOf="@id/dialog_background"
             app:layout_constraintEnd_toEndOf="@id/dialog_background"
             app:layout_constraintBottom_toBottomOf="parent"/>
diff --git a/app/src/main/res/layout/dialog_remove_account.xml b/app/src/main/res/layout/dialog_remove_account.xml
index c0f5528d6..169af2979 100644
--- a/app/src/main/res/layout/dialog_remove_account.xml
+++ b/app/src/main/res/layout/dialog_remove_account.xml
@@ -61,41 +61,44 @@
             app:layout_constraintEnd_toEndOf="@id/dialog_background"
             app:layout_constraintTop_toBottomOf="@id/title" />
 
+        <androidx.appcompat.widget.AppCompatTextView
+            android:onClick="@{() -> viewModel.confirm()}"
+            style="@style/primary_dialog_button_label_style"
+            android:id="@+id/confirm"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="15dp"
+            android:layout_marginEnd="15dp"
+            android:text="@string/manage_account_delete"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintHorizontal_bias="1"
+            app:layout_constraintHorizontal_chainStyle="packed"
+            app:layout_constraintStart_toStartOf="@id/dialog_background"
+            app:layout_constraintEnd_toStartOf="@id/cancel"
+            app:layout_constraintTop_toTopOf="@id/cancel"
+            app:layout_constraintBottom_toBottomOf="@id/cancel"/>
+
         <androidx.appcompat.widget.AppCompatTextView
             android:onClick="@{() -> viewModel.dismiss()}"
-            style="@style/secondary_button_label_style"
+            style="@style/secondary_dialog_button_label_style"
             android:id="@+id/cancel"
-            android:layout_width="0dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="32dp"
             android:layout_marginStart="15dp"
             android:layout_marginEnd="15dp"
             android:text="@string/dialog_cancel"
-            app:layout_constraintStart_toStartOf="@id/dialog_background"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintStart_toEndOf="@id/confirm"
             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/manage_account_delete"
-            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_constraintTop_toBottomOf="@id/cancel"
             app:layout_constraintStart_toStartOf="@id/dialog_background"
             app:layout_constraintEnd_toEndOf="@id/dialog_background"
             app:layout_constraintBottom_toBottomOf="parent"/>
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 87446e724..76a8bed45 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
@@ -59,41 +59,44 @@
             app:layout_constraintEnd_toEndOf="@id/dialog_background"
             app:layout_constraintTop_toBottomOf="@id/title" />
 
+        <androidx.appcompat.widget.AppCompatTextView
+            android:onClick="@{() -> viewModel.confirm()}"
+            style="@style/primary_dialog_button_label_style"
+            android:id="@+id/confirm"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="15dp"
+            android:layout_marginEnd="15dp"
+            android:text="@string/dialog_delete"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintHorizontal_bias="1"
+            app:layout_constraintHorizontal_chainStyle="packed"
+            app:layout_constraintStart_toStartOf="@id/dialog_background"
+            app:layout_constraintEnd_toStartOf="@id/cancel"
+            app:layout_constraintTop_toTopOf="@id/cancel"
+            app:layout_constraintBottom_toBottomOf="@id/cancel"/>
+
         <androidx.appcompat.widget.AppCompatTextView
             android:onClick="@{() -> viewModel.dismiss()}"
-            style="@style/secondary_button_label_style"
+            style="@style/secondary_dialog_button_label_style"
             android:id="@+id/cancel"
-            android:layout_width="0dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="32dp"
             android:layout_marginStart="15dp"
             android:layout_marginEnd="15dp"
             android:text="@string/dialog_cancel"
-            app:layout_constraintStart_toStartOf="@id/dialog_background"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintStart_toEndOf="@id/confirm"
             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_delete"
-            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_constraintTop_toBottomOf="@id/cancel"
             app:layout_constraintStart_toStartOf="@id/dialog_background"
             app:layout_constraintEnd_toEndOf="@id/dialog_background"
             app:layout_constraintBottom_toBottomOf="parent"/>
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 c708ab791..547435934 100644
--- a/app/src/main/res/layout/dialog_remove_call_logs.xml
+++ b/app/src/main/res/layout/dialog_remove_call_logs.xml
@@ -59,41 +59,44 @@
             app:layout_constraintEnd_toEndOf="@id/dialog_background"
             app:layout_constraintTop_toBottomOf="@id/title" />
 
+        <androidx.appcompat.widget.AppCompatTextView
+            android:onClick="@{() -> viewModel.confirm()}"
+            style="@style/primary_dialog_button_label_style"
+            android:id="@+id/confirm"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="15dp"
+            android:layout_marginEnd="15dp"
+            android:text="@string/dialog_delete"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintHorizontal_bias="1"
+            app:layout_constraintHorizontal_chainStyle="packed"
+            app:layout_constraintStart_toStartOf="@id/dialog_background"
+            app:layout_constraintEnd_toStartOf="@id/cancel"
+            app:layout_constraintTop_toTopOf="@id/cancel"
+            app:layout_constraintBottom_toBottomOf="@id/cancel"/>
+
         <androidx.appcompat.widget.AppCompatTextView
             android:onClick="@{() -> viewModel.dismiss()}"
-            style="@style/secondary_button_label_style"
+            style="@style/secondary_dialog_button_label_style"
             android:id="@+id/cancel"
-            android:layout_width="0dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="32dp"
             android:layout_marginStart="15dp"
             android:layout_marginEnd="15dp"
             android:text="@string/dialog_cancel"
-            app:layout_constraintStart_toStartOf="@id/dialog_background"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintStart_toEndOf="@id/confirm"
             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_delete"
-            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_constraintTop_toBottomOf="@id/cancel"
             app:layout_constraintStart_toStartOf="@id/dialog_background"
             app:layout_constraintEnd_toEndOf="@id/dialog_background"
             app:layout_constraintBottom_toBottomOf="parent"/>
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 4a1d7a43e..d1e4f8b67 100644
--- a/app/src/main/res/layout/dialog_remove_conversation_history.xml
+++ b/app/src/main/res/layout/dialog_remove_conversation_history.xml
@@ -59,41 +59,44 @@
             app:layout_constraintEnd_toEndOf="@id/dialog_background"
             app:layout_constraintTop_toBottomOf="@id/title" />
 
+        <androidx.appcompat.widget.AppCompatTextView
+            android:onClick="@{() -> viewModel.confirm()}"
+            style="@style/primary_dialog_button_label_style"
+            android:id="@+id/confirm"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="15dp"
+            android:layout_marginEnd="15dp"
+            android:text="@string/dialog_delete"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintHorizontal_bias="1"
+            app:layout_constraintHorizontal_chainStyle="packed"
+            app:layout_constraintStart_toStartOf="@id/dialog_background"
+            app:layout_constraintEnd_toStartOf="@id/cancel"
+            app:layout_constraintTop_toTopOf="@id/cancel"
+            app:layout_constraintBottom_toBottomOf="@id/cancel"/>
+
         <androidx.appcompat.widget.AppCompatTextView
             android:onClick="@{() -> viewModel.dismiss()}"
-            style="@style/secondary_button_label_style"
+            style="@style/secondary_dialog_button_label_style"
             android:id="@+id/cancel"
-            android:layout_width="0dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="32dp"
             android:layout_marginStart="15dp"
             android:layout_marginEnd="15dp"
             android:text="@string/dialog_cancel"
-            app:layout_constraintStart_toStartOf="@id/dialog_background"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintStart_toEndOf="@id/confirm"
             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_delete"
-            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_constraintTop_toBottomOf="@id/cancel"
             app:layout_constraintStart_toStartOf="@id/dialog_background"
             app:layout_constraintEnd_toEndOf="@id/dialog_background"
             app:layout_constraintBottom_toBottomOf="parent"/>
diff --git a/app/src/main/res/layout/dialog_set_or_edit_group_subject.xml b/app/src/main/res/layout/dialog_set_or_edit_group_subject.xml
index 41c3d7c68..d94cc901e 100644
--- a/app/src/main/res/layout/dialog_set_or_edit_group_subject.xml
+++ b/app/src/main/res/layout/dialog_set_or_edit_group_subject.xml
@@ -88,42 +88,45 @@
             app:layout_constraintStart_toStartOf="@id/subject"
             app:layout_constraintEnd_toEndOf="@id/subject"/>
 
+        <androidx.appcompat.widget.AppCompatTextView
+            android:onClick="@{() -> viewModel.confirm()}"
+            style="@style/primary_dialog_button_label_style"
+            android:id="@+id/confirm"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="15dp"
+            android:layout_marginEnd="15dp"
+            android:text="@string/dialog_confirm"
+            android:enabled="@{!viewModel.emptySubject}"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintHorizontal_bias="1"
+            app:layout_constraintHorizontal_chainStyle="packed"
+            app:layout_constraintStart_toStartOf="@id/dialog_background"
+            app:layout_constraintEnd_toStartOf="@id/cancel"
+            app:layout_constraintTop_toTopOf="@id/cancel"
+            app:layout_constraintBottom_toBottomOf="@id/cancel"/>
+
         <androidx.appcompat.widget.AppCompatTextView
             android:onClick="@{() -> viewModel.dismiss()}"
-            style="@style/secondary_button_label_style"
+            style="@style/secondary_dialog_button_label_style"
             android:id="@+id/cancel"
-            android:layout_width="0dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="32dp"
             android:layout_marginStart="15dp"
             android:layout_marginEnd="15dp"
             android:text="@string/dialog_cancel"
-            app:layout_constraintStart_toStartOf="@id/dialog_background"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintStart_toEndOf="@id/confirm"
             app:layout_constraintEnd_toEndOf="@id/dialog_background"
             app:layout_constraintTop_toBottomOf="@id/subject"
-            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:enabled="@{!viewModel.emptySubject}"
-            android:text="@string/dialog_confirm"
-            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_constraintTop_toBottomOf="@id/cancel"
             app:layout_constraintStart_toStartOf="@id/dialog_background"
             app:layout_constraintEnd_toEndOf="@id/dialog_background"
             app:layout_constraintBottom_toBottomOf="@id/guideline"/>
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 9dd6e744f..31945ac91 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
@@ -61,41 +61,44 @@
             app:layout_constraintEnd_toEndOf="@id/dialog_background"
             app:layout_constraintTop_toBottomOf="@id/title" />
 
+        <androidx.appcompat.widget.AppCompatTextView
+            android:onClick="@{() -> viewModel.confirm()}"
+            style="@style/primary_dialog_button_label_style"
+            android:id="@+id/confirm"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="15dp"
+            android:layout_marginEnd="15dp"
+            android:text="@string/dialog_confirm"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintHorizontal_bias="1"
+            app:layout_constraintHorizontal_chainStyle="packed"
+            app:layout_constraintStart_toStartOf="@id/dialog_background"
+            app:layout_constraintEnd_toStartOf="@id/cancel"
+            app:layout_constraintTop_toTopOf="@id/cancel"
+            app:layout_constraintBottom_toBottomOf="@id/cancel"/>
+
         <androidx.appcompat.widget.AppCompatTextView
             android:onClick="@{() -> viewModel.dismiss()}"
-            style="@style/secondary_button_label_style"
+            style="@style/secondary_dialog_button_label_style"
             android:id="@+id/cancel"
-            android:layout_width="0dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="32dp"
             android:layout_marginStart="15dp"
             android:layout_marginEnd="15dp"
             android:text="@string/dialog_cancel"
-            app:layout_constraintStart_toStartOf="@id/dialog_background"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintStart_toEndOf="@id/confirm"
             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_confirm"
-            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_constraintTop_toBottomOf="@id/cancel"
             app:layout_constraintStart_toStartOf="@id/dialog_background"
             app:layout_constraintEnd_toEndOf="@id/dialog_background"
             app:layout_constraintBottom_toBottomOf="parent"/>
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 6f9fa12e8..377e20a37 100644
--- a/app/src/main/res/layout/dialog_update_account_password.xml
+++ b/app/src/main/res/layout/dialog_update_account_password.xml
@@ -83,41 +83,44 @@
             app:layout_constraintTop_toTopOf="@id/password"
             app:layout_constraintBottom_toBottomOf="@id/password" />
 
+        <androidx.appcompat.widget.AppCompatTextView
+            android:onClick="@{() -> viewModel.confirm()}"
+            style="@style/primary_dialog_button_label_style"
+            android:id="@+id/confirm"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="15dp"
+            android:layout_marginEnd="15dp"
+            android:text="@string/dialog_confirm"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintHorizontal_bias="1"
+            app:layout_constraintHorizontal_chainStyle="packed"
+            app:layout_constraintStart_toStartOf="@id/dialog_background"
+            app:layout_constraintEnd_toStartOf="@id/cancel"
+            app:layout_constraintTop_toTopOf="@id/cancel"
+            app:layout_constraintBottom_toBottomOf="@id/cancel"/>
+
         <androidx.appcompat.widget.AppCompatTextView
             android:onClick="@{() -> viewModel.dismiss()}"
-            style="@style/secondary_button_label_style"
+            style="@style/secondary_dialog_button_label_style"
             android:id="@+id/cancel"
-            android:layout_width="0dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="32dp"
             android:layout_marginStart="15dp"
             android:layout_marginEnd="15dp"
             android:text="@string/dialog_cancel"
-            app:layout_constraintStart_toStartOf="@id/dialog_background"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintStart_toEndOf="@id/confirm"
             app:layout_constraintEnd_toEndOf="@id/dialog_background"
             app:layout_constraintTop_toBottomOf="@id/password"
-            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_confirm"
-            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_constraintTop_toBottomOf="@id/cancel"
             app:layout_constraintStart_toStartOf="@id/dialog_background"
             app:layout_constraintEnd_toEndOf="@id/dialog_background"
             app:layout_constraintBottom_toBottomOf="parent"/>
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 553d7aa8f..ff6b42ed0 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
@@ -99,41 +99,44 @@
             app:layout_constraintTop_toTopOf="@id/password"
             app:layout_constraintBottom_toBottomOf="@id/password" />
 
+        <androidx.appcompat.widget.AppCompatTextView
+            android:onClick="@{() -> viewModel.confirm()}"
+            style="@style/primary_dialog_button_label_style"
+            android:id="@+id/confirm"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="15dp"
+            android:layout_marginEnd="15dp"
+            android:text="@string/dialog_confirm"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintHorizontal_bias="1"
+            app:layout_constraintHorizontal_chainStyle="packed"
+            app:layout_constraintStart_toStartOf="@id/dialog_background"
+            app:layout_constraintEnd_toStartOf="@id/cancel"
+            app:layout_constraintTop_toTopOf="@id/cancel"
+            app:layout_constraintBottom_toBottomOf="@id/cancel"/>
+
         <androidx.appcompat.widget.AppCompatTextView
             android:onClick="@{() -> viewModel.dismiss()}"
-            style="@style/secondary_button_label_style"
+            style="@style/secondary_dialog_button_label_style"
             android:id="@+id/cancel"
-            android:layout_width="0dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="32dp"
             android:layout_marginStart="15dp"
             android:layout_marginEnd="15dp"
             android:text="@string/dialog_cancel"
-            app:layout_constraintStart_toStartOf="@id/dialog_background"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintStart_toEndOf="@id/confirm"
             app:layout_constraintEnd_toEndOf="@id/dialog_background"
             app:layout_constraintTop_toBottomOf="@id/password"
-            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_confirm"
-            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_constraintTop_toBottomOf="@id/cancel"
             app:layout_constraintStart_toStartOf="@id/dialog_background"
             app:layout_constraintEnd_toEndOf="@id/dialog_background"
             app:layout_constraintBottom_toBottomOf="parent"/>
diff --git a/app/src/main/res/layout/dialog_update_available.xml b/app/src/main/res/layout/dialog_update_available.xml
index f0a323cbb..d6dc1d8b7 100644
--- a/app/src/main/res/layout/dialog_update_available.xml
+++ b/app/src/main/res/layout/dialog_update_available.xml
@@ -59,41 +59,44 @@
             app:layout_constraintEnd_toEndOf="@id/dialog_background"
             app:layout_constraintTop_toBottomOf="@id/title" />
 
+        <androidx.appcompat.widget.AppCompatTextView
+            android:onClick="@{() -> viewModel.confirm()}"
+            style="@style/primary_dialog_button_label_style"
+            android:id="@+id/confirm"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="15dp"
+            android:layout_marginEnd="15dp"
+            android:text="@string/dialog_install"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintHorizontal_bias="1"
+            app:layout_constraintHorizontal_chainStyle="packed"
+            app:layout_constraintStart_toStartOf="@id/dialog_background"
+            app:layout_constraintEnd_toStartOf="@id/cancel"
+            app:layout_constraintTop_toTopOf="@id/cancel"
+            app:layout_constraintBottom_toBottomOf="@id/cancel"/>
+
         <androidx.appcompat.widget.AppCompatTextView
             android:onClick="@{() -> viewModel.dismiss()}"
-            style="@style/secondary_button_label_style"
+            style="@style/secondary_dialog_button_label_style"
             android:id="@+id/cancel"
-            android:layout_width="0dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="32dp"
             android:layout_marginStart="15dp"
             android:layout_marginEnd="15dp"
             android:text="@string/dialog_cancel"
-            app:layout_constraintStart_toStartOf="@id/dialog_background"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintStart_toEndOf="@id/confirm"
             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_install"
-            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_constraintTop_toBottomOf="@id/cancel"
             app:layout_constraintStart_toStartOf="@id/dialog_background"
             app:layout_constraintEnd_toEndOf="@id/dialog_background"
             app:layout_constraintBottom_toBottomOf="parent"/>
diff --git a/app/src/main/res/layout/dialog_zrtp_sas_validation.xml b/app/src/main/res/layout/dialog_zrtp_sas_validation.xml
index fc5e2249c..b2c4fb8a3 100644
--- a/app/src/main/res/layout/dialog_zrtp_sas_validation.xml
+++ b/app/src/main/res/layout/dialog_zrtp_sas_validation.xml
@@ -228,23 +228,24 @@
                 android:onClick="@{() -> viewModel.notFound()}"
                 style="@style/default_text_style_600"
                 android:id="@+id/nothing_matches"
-                android:layout_width="0dp"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:paddingStart="15dp"
+                android:paddingEnd="15dp"
                 android:layout_marginTop="15dp"
                 android:layout_marginBottom="15dp"
-                android:layout_marginStart="30dp"
-                android:layout_marginEnd="30dp"
+                android:layout_marginEnd="16dp"
                 android:paddingBottom="@dimen/primary_secondary_buttons_label_padding"
                 android:paddingTop="@dimen/primary_secondary_buttons_label_padding"
                 android:gravity="center"
                 android:background="@drawable/shape_red_outlined_button_background"
                 android:text="@string/call_dialog_zrtp_validate_trust_letters_do_not_match"
-                android:textSize="18sp"
+                android:textSize="13sp"
                 android:textColor="?attr/color_danger_500"
                 android:maxLines="1"
                 android:ellipsize="end"
                 app:layout_constraintWidth_max="@dimen/button_max_width"
-                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constrainedWidth="true"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/remote_tokens"
                 app:layout_constraintBottom_toBottomOf="parent"/>
diff --git a/app/src/main/res/layout/dialog_zrtp_security_alert.xml b/app/src/main/res/layout/dialog_zrtp_security_alert.xml
index 6f2e30924..6115b7026 100644
--- a/app/src/main/res/layout/dialog_zrtp_security_alert.xml
+++ b/app/src/main/res/layout/dialog_zrtp_security_alert.xml
@@ -106,23 +106,24 @@
                 style="@style/default_text_style_600"
                 android:id="@+id/hang_up"
                 android:onClick="@{() -> viewModel.hangUp()}"
-                android:layout_width="0dp"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:paddingStart="15dp"
+                android:paddingEnd="15dp"
                 android:layout_marginTop="15dp"
                 android:layout_marginBottom="15dp"
-                android:layout_marginStart="30dp"
-                android:layout_marginEnd="30dp"
+                android:layout_marginEnd="16dp"
                 android:paddingBottom="@dimen/primary_secondary_buttons_label_padding"
                 android:paddingTop="@dimen/primary_secondary_buttons_label_padding"
                 android:gravity="center"
                 android:background="@drawable/shape_red_button_background"
                 android:text="@string/call_action_hang_up"
-                android:textSize="18sp"
+                android:textSize="13sp"
                 android:textColor="@color/bc_white"
                 android:maxLines="1"
                 android:ellipsize="end"
+                app:layout_constrainedWidth="true"
                 app:layout_constraintWidth_max="@dimen/button_max_width"
-                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/try_again"
                 app:layout_constraintBottom_toBottomOf="parent"/>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 603cbf935..c43405463 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -42,6 +42,7 @@
     <string name="dialog_yes">Oui</string>
     <string name="dialog_remove">Retirer</string>
     <string name="dialog_confirm">Confirmer</string>
+    <string name="dialog_understood">J\'ai compris</string>
 
     <!-- Related to Android notifications -->
     <string name="notification_channel_call_name">&appName; notifications d\'appels en cours</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6fc8a67a3..f27aa60d5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -82,6 +82,7 @@
     <string name="dialog_yes">Yes</string>
     <string name="dialog_remove">Remove</string>
     <string name="dialog_confirm">Confirm</string>
+    <string name="dialog_understood">Understood</string>
 
     <!-- Related to Android notifications -->
     <string name="notification_channel_call_name">&appName; active calls notifications</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index fd4c25142..e6ca83e1d 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -97,6 +97,28 @@
         <item name="android:textColor">@color/tertiary_button_label_color</item>
         <item name="android:textSize">13sp</item>
     </style>
+    <style name="primary_dialog_button_label_style">
+        <item name="android:fontFamily">@font/noto_sans_600</item>
+        <item name="android:textColor">@color/primary_button_label_color</item>
+        <item name="android:textSize">13sp</item>
+        <item name="android:gravity">center</item>
+        <item name="android:paddingStart">15dp</item>
+        <item name="android:paddingEnd">15dp</item>
+        <item name="android:background">@drawable/primary_button_background</item>
+        <item name="android:paddingTop">@dimen/primary_secondary_buttons_label_padding</item>
+        <item name="android:paddingBottom">@dimen/primary_secondary_buttons_label_padding</item>
+    </style>
+    <style name="secondary_dialog_button_label_style">
+        <item name="android:fontFamily">@font/noto_sans_600</item>
+        <item name="android:textColor">@color/secondary_button_label_color</item>
+        <item name="android:textSize">13sp</item>
+        <item name="android:gravity">center</item>
+        <item name="android:paddingStart">15dp</item>
+        <item name="android:paddingEnd">15dp</item>
+        <item name="android:background">@drawable/secondary_button_background</item>
+        <item name="android:paddingTop">@dimen/primary_secondary_buttons_label_padding</item>
+        <item name="android:paddingBottom">@dimen/primary_secondary_buttons_label_padding</item>
+    </style>
     <style name="bottom_nav_bar_label_style">
         <item name="android:fontFamily">@font/noto_sans</item>
         <item name="android:textSize">11sp</item>