From 62cb1fb3f1c30868f36c88e0d7816f0e59eef42c Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 14 Sep 2023 11:45:01 +0200
Subject: [PATCH] Added confirmation dialog for account removal

---
 .../fragment/AccountProfileFragment.kt        |  27 +-
 .../java/org/linphone/utils/DialogUtils.kt    |  30 +-
 .../account_profile_secure_mode_fragment.xml  | 467 ++++++++--------
 .../main/res/layout/dialog_remove_account.xml | 126 +++++
 app/src/main/res/layout/help_fragment.xml     | 511 +++++++++---------
 app/src/main/res/values/strings.xml           |   2 +
 6 files changed, 677 insertions(+), 486 deletions(-)
 create mode 100644 app/src/main/res/layout/dialog_remove_account.xml

diff --git a/app/src/main/java/org/linphone/ui/main/settings/fragment/AccountProfileFragment.kt b/app/src/main/java/org/linphone/ui/main/settings/fragment/AccountProfileFragment.kt
index ff8233b93..5828ca719 100644
--- a/app/src/main/java/org/linphone/ui/main/settings/fragment/AccountProfileFragment.kt
+++ b/app/src/main/java/org/linphone/ui/main/settings/fragment/AccountProfileFragment.kt
@@ -16,8 +16,10 @@ import kotlinx.coroutines.launch
 import org.linphone.R
 import org.linphone.core.tools.Log
 import org.linphone.databinding.AccountProfileFragmentBinding
+import org.linphone.ui.main.calls.model.ConfirmationDialogModel
 import org.linphone.ui.main.fragment.GenericFragment
 import org.linphone.ui.main.settings.viewmodel.AccountProfileViewModel
+import org.linphone.utils.DialogUtils
 import org.linphone.utils.Event
 import org.linphone.utils.FileUtils
 
@@ -92,8 +94,29 @@ class AccountProfileFragment : GenericFragment() {
 
         viewModel.accountRemovedEvent.observe(viewLifecycleOwner) {
             it.consume {
-                Log.i("$TAG Account has been removed, leaving profile")
-                findNavController().popBackStack()
+                val model = ConfirmationDialogModel()
+                val dialog = DialogUtils.getConfirmAccountRemovalDialog(
+                    requireActivity(),
+                    model,
+                    viewModel.displayName.value.orEmpty()
+                )
+
+                model.dismissEvent.observe(viewLifecycleOwner) {
+                    it.consume {
+                        dialog.dismiss()
+                    }
+                }
+
+                model.confirmRemovalEvent.observe(viewLifecycleOwner) {
+                    it.consume {
+                        Log.i("$TAG Account has been removed, leaving profile")
+                        findNavController().popBackStack()
+
+                        dialog.dismiss()
+                    }
+                }
+
+                dialog.show()
             }
         }
 
diff --git a/app/src/main/java/org/linphone/utils/DialogUtils.kt b/app/src/main/java/org/linphone/utils/DialogUtils.kt
index 06955a9e6..2fa96dd03 100644
--- a/app/src/main/java/org/linphone/utils/DialogUtils.kt
+++ b/app/src/main/java/org/linphone/utils/DialogUtils.kt
@@ -40,6 +40,7 @@ import org.linphone.databinding.DialogConfirmZrtpSasBinding
 import org.linphone.databinding.DialogContactConfirmTrustCallBinding
 import org.linphone.databinding.DialogContactTrustProcessBinding
 import org.linphone.databinding.DialogPickNumberOrAddressBinding
+import org.linphone.databinding.DialogRemoveAccountBinding
 import org.linphone.databinding.DialogRemoveAllCallLogsBinding
 import org.linphone.ui.assistant.model.AcceptConditionsAndPolicyDialogModel
 import org.linphone.ui.assistant.model.ConfirmPhoneNumberDialogModel
@@ -105,6 +106,27 @@ class DialogUtils {
             return dialog
         }
 
+        @UiThread
+        fun getConfirmAccountRemovalDialog(
+            context: Context,
+            viewModel: ConfirmationDialogModel,
+            displayName: String
+        ): Dialog {
+            val binding: DialogRemoveAccountBinding = DataBindingUtil.inflate(
+                LayoutInflater.from(context),
+                R.layout.dialog_remove_account,
+                null,
+                false
+            )
+            binding.viewModel = viewModel
+            binding.title.text = context.getString(
+                R.string.dialog_remove_account_title,
+                displayName
+            )
+
+            return getDialog(context, binding)
+        }
+
         @UiThread
         fun getNumberOrAddressPickerDialog(
             context: Context,
@@ -157,7 +179,7 @@ class DialogUtils {
         @UiThread
         fun getRemoveAllCallLogsConfirmationDialog(
             context: Context,
-            model: ConfirmationDialogModel
+            viewModel: ConfirmationDialogModel
         ): Dialog {
             val binding: DialogRemoveAllCallLogsBinding = DataBindingUtil.inflate(
                 LayoutInflater.from(context),
@@ -165,7 +187,7 @@ class DialogUtils {
                 null,
                 false
             )
-            binding.viewModel = model
+            binding.viewModel = viewModel
 
             return getDialog(context, binding)
         }
@@ -173,7 +195,7 @@ class DialogUtils {
         @UiThread
         fun getCancelContactChangesConfirmationDialog(
             context: Context,
-            model: ConfirmationDialogModel
+            viewModel: ConfirmationDialogModel
         ): Dialog {
             val binding: DialogCancelContactChangesBinding = DataBindingUtil.inflate(
                 LayoutInflater.from(context),
@@ -181,7 +203,7 @@ class DialogUtils {
                 null,
                 false
             )
-            binding.viewModel = model
+            binding.viewModel = viewModel
 
             return getDialog(context, binding)
         }
diff --git a/app/src/main/res/layout/account_profile_secure_mode_fragment.xml b/app/src/main/res/layout/account_profile_secure_mode_fragment.xml
index 8cd66f892..19a510e25 100644
--- a/app/src/main/res/layout/account_profile_secure_mode_fragment.xml
+++ b/app/src/main/res/layout/account_profile_secure_mode_fragment.xml
@@ -19,255 +19,266 @@
             type="View.OnClickListener" />
     </data>
 
-    <ScrollView
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:fillViewport="true"
         android:background="@color/white">
 
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+        <ImageView
+            android:id="@+id/back"
+            android:onClick="@{backClickListener}"
+            android:layout_width="wrap_content"
+            android:layout_height="35dp"
+            android:layout_marginStart="10dp"
+            android:adjustViewBounds="true"
+            android:padding="5dp"
+            android:src="@drawable/caret_left"
+            android:drawableTint="@color/primary_color"
+            app:layout_constraintBottom_toBottomOf="@id/title"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="@id/title" />
 
-            <ImageView
-                android:id="@+id/back"
-                android:onClick="@{backClickListener}"
-                android:layout_width="wrap_content"
-                android:layout_height="35dp"
-                android:layout_marginStart="10dp"
-                android:adjustViewBounds="true"
-                android:padding="5dp"
-                android:src="@drawable/caret_left"
-                android:drawableTint="@color/primary_color"
-                app:layout_constraintBottom_toBottomOf="@id/title"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="@id/title" />
+        <androidx.appcompat.widget.AppCompatTextView
+            style="@style/default_text_style_800"
+            android:id="@+id/title"
+            android:layout_width="0dp"
+            android:layout_height="@dimen/top_bar_height"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
+            android:gravity="center_vertical"
+            android:text="@string/manage_account_choose_mode_title"
+            android:textColor="@color/primary_color"
+            android:textSize="16sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@id/back"
+            app:layout_constraintTop_toTopOf="parent"/>
 
-            <androidx.appcompat.widget.AppCompatTextView
-                style="@style/default_text_style_800"
-                android:id="@+id/title"
-                android:layout_width="0dp"
-                android:layout_height="@dimen/top_bar_height"
-                android:layout_marginStart="10dp"
-                android:layout_marginEnd="10dp"
-                android:gravity="center_vertical"
-                android:text="@string/manage_account_choose_mode_title"
-                android:textColor="@color/primary_color"
-                android:textSize="16sp"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toEndOf="@id/back"
-                app:layout_constraintTop_toTopOf="parent"/>
+        <ScrollView
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:fillViewport="true"
+            android:background="@color/gray_7"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/title"
+            app:layout_constraintBottom_toBottomOf="parent">
 
-            <com.google.android.material.radiobutton.MaterialRadioButton
-                android:id="@+id/default_mode"
-                style="@style/default_text_style_800"
-                android:layout_width="wrap_content"
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="32dp"
-                android:layout_marginStart="16dp"
-                android:text="@string/assistant_secure_mode_default_title"
-                android:textSize="16sp"
-                android:textColor="@color/black"
-                android:checked="true"
-                app:useMaterialThemeColors="false"
-                app:buttonTint="@color/primary_color"
-                app:layout_constraintTop_toBottomOf="@id/title"
-                app:layout_constraintStart_toStartOf="parent" />
+                android:layout_marginTop="16dp">
 
-            <ImageView
-                android:id="@+id/default_mode_tooltip"
-                style="@style/default_text_style_800"
-                android:onClick="@{defaultModeTooltipClickListener}"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="8dp"
-                android:src="@drawable/info"
-                app:tint="@color/black"
-                app:layout_constraintTop_toTopOf="@id/default_mode"
-                app:layout_constraintBottom_toBottomOf="@id/default_mode"
-                app:layout_constraintStart_toEndOf="@id/default_mode" />
+                <com.google.android.material.radiobutton.MaterialRadioButton
+                    android:id="@+id/default_mode"
+                    style="@style/default_text_style_800"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="16dp"
+                    android:text="@string/assistant_secure_mode_default_title"
+                    android:textSize="16sp"
+                    android:textColor="@color/black"
+                    android:checked="true"
+                    app:useMaterialThemeColors="false"
+                    app:buttonTint="@color/primary_color"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintStart_toStartOf="parent" />
 
-            <androidx.appcompat.widget.AppCompatTextView
-                style="@style/default_text_style"
-                android:id="@+id/default_mode_summary"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
-                android:layout_marginTop="10dp"
-                android:background="@drawable/shape_squircle_gray_2_background"
-                android:paddingTop="21dp"
-                android:paddingBottom="21dp"
-                android:paddingStart="17dp"
-                android:paddingEnd="17dp"
-                android:text="@string/manage_account_secure_mode_default_summary"
-                android:textSize="14sp"
-                android:gravity="center"
-                app:layout_constraintTop_toBottomOf="@id/default_mode"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"/>
+                <ImageView
+                    android:id="@+id/default_mode_tooltip"
+                    style="@style/default_text_style_800"
+                    android:onClick="@{defaultModeTooltipClickListener}"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="8dp"
+                    android:src="@drawable/info"
+                    app:tint="@color/black"
+                    app:layout_constraintTop_toTopOf="@id/default_mode"
+                    app:layout_constraintBottom_toBottomOf="@id/default_mode"
+                    app:layout_constraintStart_toEndOf="@id/default_mode" />
 
-            <io.getstream.avatarview.AvatarView
-                android:id="@+id/image1"
-                android:layout_width="@dimen/avatar_list_cell_size"
-                android:layout_height="@dimen/avatar_list_cell_size"
-                android:adjustViewBounds="true"
-                android:layout_marginEnd="16dp"
-                android:layout_marginTop="21dp"
-                android:background="@drawable/shape_circle_light_blue_background"
-                android:src="@drawable/contact_avatar"
-                app:avatarViewPlaceholder="@drawable/contact_avatar"
-                app:avatarViewInitialsBackgroundColor="@color/blue_light"
-                app:avatarViewInitialsTextColor="@color/gray_9"
-                app:avatarViewInitialsTextSize="16sp"
-                app:avatarViewInitialsTextStyle="bold"
-                app:avatarViewShape="circle"
-                app:avatarViewInitials="JD"
-                app:avatarViewBorderWidth="0dp"
-                app:layout_constraintHorizontal_chainStyle="packed"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toStartOf="@id/arrow"
-                app:layout_constraintTop_toBottomOf="@id/default_mode_summary"/>
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/default_text_style"
+                    android:id="@+id/default_mode_summary"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:layout_marginTop="10dp"
+                    android:background="@drawable/shape_squircle_white_background"
+                    android:paddingTop="21dp"
+                    android:paddingBottom="21dp"
+                    android:paddingStart="17dp"
+                    android:paddingEnd="17dp"
+                    android:text="@string/manage_account_secure_mode_default_summary"
+                    android:textSize="14sp"
+                    android:gravity="center"
+                    app:layout_constraintTop_toBottomOf="@id/default_mode"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"/>
 
-            <ImageView
-                android:id="@+id/image1_presence_badge"
-                android:layout_width="@dimen/avatar_presence_badge_size"
-                android:layout_height="@dimen/avatar_presence_badge_size"
-                android:layout_marginEnd="@dimen/avatar_presence_badge_end_margin"
-                android:background="@drawable/led_background"
-                android:padding="@dimen/avatar_presence_badge_padding"
-                android:src="@drawable/led_online"
-                app:layout_constraintEnd_toEndOf="@id/image1"
-                app:layout_constraintBottom_toBottomOf="@id/image1"/>
+                <io.getstream.avatarview.AvatarView
+                    android:id="@+id/image1"
+                    android:layout_width="@dimen/avatar_list_cell_size"
+                    android:layout_height="@dimen/avatar_list_cell_size"
+                    android:adjustViewBounds="true"
+                    android:layout_marginEnd="16dp"
+                    android:layout_marginTop="21dp"
+                    android:background="@drawable/shape_circle_light_blue_background"
+                    android:src="@drawable/contact_avatar"
+                    app:avatarViewPlaceholder="@drawable/contact_avatar"
+                    app:avatarViewInitialsBackgroundColor="@color/blue_light"
+                    app:avatarViewInitialsTextColor="@color/gray_9"
+                    app:avatarViewInitialsTextSize="16sp"
+                    app:avatarViewInitialsTextStyle="bold"
+                    app:avatarViewShape="circle"
+                    app:avatarViewInitials="JD"
+                    app:avatarViewBorderWidth="0dp"
+                    app:layout_constraintHorizontal_chainStyle="packed"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toStartOf="@id/arrow"
+                    app:layout_constraintTop_toBottomOf="@id/default_mode_summary"/>
 
-            <ImageView
-                android:id="@+id/arrow"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="16dp"
-                android:src="@drawable/arrow_right_fill"
-                app:tint="@color/black"
-                app:layout_constraintStart_toEndOf="@id/image1"
-                app:layout_constraintEnd_toStartOf="@id/image2"
-                app:layout_constraintTop_toTopOf="@id/image1"
-                app:layout_constraintBottom_toBottomOf="@id/image1"/>
+                <ImageView
+                    android:id="@+id/image1_presence_badge"
+                    android:layout_width="@dimen/avatar_presence_badge_size"
+                    android:layout_height="@dimen/avatar_presence_badge_size"
+                    android:layout_marginEnd="@dimen/avatar_presence_badge_end_margin"
+                    android:background="@drawable/led_background"
+                    android:padding="@dimen/avatar_presence_badge_padding"
+                    android:src="@drawable/led_online"
+                    app:layout_constraintEnd_toEndOf="@id/image1"
+                    app:layout_constraintBottom_toBottomOf="@id/image1"/>
 
-            <io.getstream.avatarview.AvatarView
-                android:id="@+id/image2"
-                android:layout_width="@dimen/avatar_list_cell_size"
-                android:layout_height="@dimen/avatar_list_cell_size"
-                android:adjustViewBounds="true"
-                android:background="@drawable/shape_circle_light_blue_background"
-                android:src="@drawable/contact_avatar"
-                app:avatarViewPlaceholder="@drawable/contact_avatar"
-                app:avatarViewInitialsBackgroundColor="@color/blue_light"
-                app:avatarViewInitialsTextColor="@color/gray_9"
-                app:avatarViewInitialsTextSize="16sp"
-                app:avatarViewInitialsTextStyle="bold"
-                app:avatarViewShape="circle"
-                app:avatarViewInitials="JD"
-                app:avatarViewBorderWidth="2dp"
-                app:avatarViewBorderColor="@color/blue_trusted"
-                app:layout_constraintStart_toEndOf="@id/arrow"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="@id/image1"
-                app:layout_constraintBottom_toBottomOf="@id/image1"/>
+                <ImageView
+                    android:id="@+id/arrow"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="16dp"
+                    android:src="@drawable/arrow_right_fill"
+                    app:tint="@color/black"
+                    app:layout_constraintStart_toEndOf="@id/image1"
+                    app:layout_constraintEnd_toStartOf="@id/image2"
+                    app:layout_constraintTop_toTopOf="@id/image1"
+                    app:layout_constraintBottom_toBottomOf="@id/image1"/>
 
-            <ImageView
-                android:id="@+id/image2_trust_badge"
-                android:layout_width="@dimen/avatar_presence_badge_size"
-                android:layout_height="@dimen/avatar_presence_badge_size"
-                android:src="@drawable/trusted"
-                app:layout_constraintStart_toStartOf="@id/image2"
-                app:layout_constraintBottom_toBottomOf="@id/image2"/>
+                <io.getstream.avatarview.AvatarView
+                    android:id="@+id/image2"
+                    android:layout_width="@dimen/avatar_list_cell_size"
+                    android:layout_height="@dimen/avatar_list_cell_size"
+                    android:adjustViewBounds="true"
+                    android:background="@drawable/shape_circle_light_blue_background"
+                    android:src="@drawable/contact_avatar"
+                    app:avatarViewPlaceholder="@drawable/contact_avatar"
+                    app:avatarViewInitialsBackgroundColor="@color/blue_light"
+                    app:avatarViewInitialsTextColor="@color/gray_9"
+                    app:avatarViewInitialsTextSize="16sp"
+                    app:avatarViewInitialsTextStyle="bold"
+                    app:avatarViewShape="circle"
+                    app:avatarViewInitials="JD"
+                    app:avatarViewBorderWidth="2dp"
+                    app:avatarViewBorderColor="@color/blue_trusted"
+                    app:layout_constraintStart_toEndOf="@id/arrow"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="@id/image1"
+                    app:layout_constraintBottom_toBottomOf="@id/image1"/>
 
-            <ImageView
-                android:id="@+id/image2_presence_badge"
-                android:layout_width="@dimen/avatar_presence_badge_size"
-                android:layout_height="@dimen/avatar_presence_badge_size"
-                android:layout_marginEnd="@dimen/avatar_presence_badge_end_margin"
-                android:background="@drawable/led_background"
-                android:padding="@dimen/avatar_presence_badge_padding"
-                android:src="@drawable/led_online"
-                app:layout_constraintEnd_toEndOf="@id/image2"
-                app:layout_constraintBottom_toBottomOf="@id/image2"/>
+                <ImageView
+                    android:id="@+id/image2_trust_badge"
+                    android:layout_width="@dimen/avatar_presence_badge_size"
+                    android:layout_height="@dimen/avatar_presence_badge_size"
+                    android:src="@drawable/trusted"
+                    app:layout_constraintStart_toStartOf="@id/image2"
+                    app:layout_constraintBottom_toBottomOf="@id/image2"/>
 
-            <com.google.android.material.radiobutton.MaterialRadioButton
-                android:id="@+id/interop_mode"
-                style="@style/default_text_style_800"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="32dp"
-                android:layout_marginStart="16dp"
-                android:text="@string/assistant_secure_mode_interoperable_title"
-                android:textSize="16sp"
-                android:textColor="@color/black"
-                app:useMaterialThemeColors="false"
-                app:buttonTint="@color/primary_color"
-                app:layout_constraintTop_toBottomOf="@id/image1"
-                app:layout_constraintStart_toStartOf="parent" />
+                <ImageView
+                    android:id="@+id/image2_presence_badge"
+                    android:layout_width="@dimen/avatar_presence_badge_size"
+                    android:layout_height="@dimen/avatar_presence_badge_size"
+                    android:layout_marginEnd="@dimen/avatar_presence_badge_end_margin"
+                    android:background="@drawable/led_background"
+                    android:padding="@dimen/avatar_presence_badge_padding"
+                    android:src="@drawable/led_online"
+                    app:layout_constraintEnd_toEndOf="@id/image2"
+                    app:layout_constraintBottom_toBottomOf="@id/image2"/>
 
-            <ImageView
-                android:id="@+id/interop_mode_tooltip"
-                style="@style/default_text_style_800"
-                android:onClick="@{interopModeTooltipClickListener}"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="8dp"
-                android:src="@drawable/info"
-                app:tint="@color/black"
-                app:layout_constraintTop_toTopOf="@id/interop_mode"
-                app:layout_constraintBottom_toBottomOf="@id/interop_mode"
-                app:layout_constraintStart_toEndOf="@id/interop_mode" />
+                <com.google.android.material.radiobutton.MaterialRadioButton
+                    android:id="@+id/interop_mode"
+                    style="@style/default_text_style_800"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="32dp"
+                    android:layout_marginStart="16dp"
+                    android:text="@string/assistant_secure_mode_interoperable_title"
+                    android:textSize="16sp"
+                    android:textColor="@color/black"
+                    app:useMaterialThemeColors="false"
+                    app:buttonTint="@color/primary_color"
+                    app:layout_constraintTop_toBottomOf="@id/image1"
+                    app:layout_constraintStart_toStartOf="parent" />
 
-            <androidx.appcompat.widget.AppCompatTextView
-                style="@style/default_text_style"
-                android:id="@+id/interop_mode_summary"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
-                android:layout_marginTop="10dp"
-                android:background="@drawable/shape_squircle_gray_2_background"
-                android:paddingTop="21dp"
-                android:paddingBottom="21dp"
-                android:paddingStart="17dp"
-                android:paddingEnd="17dp"
-                android:text="@string/dialog_account_secure_mode_interoperable_summary"
-                android:textSize="14sp"
-                android:gravity="center"
-                app:layout_constraintTop_toBottomOf="@id/interop_mode"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"/>
+                <ImageView
+                    android:id="@+id/interop_mode_tooltip"
+                    style="@style/default_text_style_800"
+                    android:onClick="@{interopModeTooltipClickListener}"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="8dp"
+                    android:src="@drawable/info"
+                    app:tint="@color/black"
+                    app:layout_constraintTop_toTopOf="@id/interop_mode"
+                    app:layout_constraintBottom_toBottomOf="@id/interop_mode"
+                    app:layout_constraintStart_toEndOf="@id/interop_mode" />
 
-            <androidx.appcompat.widget.AppCompatTextView
-                style="@style/default_text_style_600"
-                android:onClick="@{continueClickListener}"
-                android:id="@+id/login"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="32dp"
-                android:layout_marginBottom="32dp"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
-                android:paddingTop="@dimen/primary_secondary_buttons_label_padding"
-                android:paddingBottom="@dimen/primary_secondary_buttons_label_padding"
-                android:paddingStart="20dp"
-                android:paddingEnd="20dp"
-                android:text="@string/manage_account_choose_mode_save_changes"
-                android:textSize="18sp"
-                android:textColor="@color/primary_button_label_color"
-                android:gravity="center"
-                android:background="@drawable/primary_button_background"
-                app:layout_constraintWidth_max="@dimen/button_max_width"
-                app:layout_constraintVertical_bias="1"
-                app:layout_constraintTop_toBottomOf="@id/interop_mode_summary"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toEndOf="parent" />
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/default_text_style"
+                    android:id="@+id/interop_mode_summary"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:layout_marginTop="10dp"
+                    android:background="@drawable/shape_squircle_white_background"
+                    android:paddingTop="21dp"
+                    android:paddingBottom="21dp"
+                    android:paddingStart="17dp"
+                    android:paddingEnd="17dp"
+                    android:text="@string/dialog_account_secure_mode_interoperable_summary"
+                    android:textSize="14sp"
+                    android:gravity="center"
+                    app:layout_constraintTop_toBottomOf="@id/interop_mode"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"/>
 
-        </androidx.constraintlayout.widget.ConstraintLayout>
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/default_text_style_600"
+                    android:onClick="@{continueClickListener}"
+                    android:id="@+id/login"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="32dp"
+                    android:layout_marginBottom="32dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:paddingTop="@dimen/primary_secondary_buttons_label_padding"
+                    android:paddingBottom="@dimen/primary_secondary_buttons_label_padding"
+                    android:paddingStart="20dp"
+                    android:paddingEnd="20dp"
+                    android:text="@string/manage_account_choose_mode_save_changes"
+                    android:textSize="18sp"
+                    android:textColor="@color/primary_button_label_color"
+                    android:gravity="center"
+                    android:background="@drawable/primary_button_background"
+                    app:layout_constraintWidth_max="@dimen/button_max_width"
+                    app:layout_constraintVertical_bias="1"
+                    app:layout_constraintTop_toBottomOf="@id/interop_mode_summary"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent" />
 
-    </ScrollView>
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+        </ScrollView>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_remove_account.xml b/app/src/main/res/layout/dialog_remove_account.xml
new file mode 100644
index 000000000..368d51793
--- /dev/null
+++ b/app/src/main/res/layout/dialog_remove_account.xml
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+        <import type="android.view.View" />
+        <import type="android.graphics.Typeface" />
+        <variable
+            name="viewModel"
+            type="org.linphone.ui.main.calls.model.ConfirmationDialogModel" />
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:onClick="@{() -> viewModel.dismiss()}"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <ImageView
+            android:id="@+id/dialog_background_shadow"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:src="@drawable/shape_squircle_primary_background"
+            app:layout_constraintBottom_toBottomOf="@id/anchor"
+            app:layout_constraintEnd_toEndOf="@id/dialog_background"
+            app:layout_constraintStart_toStartOf="@id/dialog_background"
+            app:layout_constraintTop_toTopOf="@id/dialog_background" />
+
+        <ImageView
+            android:id="@+id/dialog_background"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_marginStart="12dp"
+            android:layout_marginEnd="12dp"
+            android:layout_marginBottom="2dp"
+            android:src="@drawable/shape_squircle_white_background"
+            app:layout_constraintWidth_max="@dimen/dialog_max_width"
+            app:layout_constraintBottom_toBottomOf="@id/anchor"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="@id/title" />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            style="@style/default_text_style_800"
+            android:id="@+id/title"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="15dp"
+            android:paddingTop="@dimen/dialog_top_bottom_margin"
+            android:text="@string/dialog_remove_account_title"
+            android:textSize="16sp"
+            app:layout_constraintVertical_chainStyle="packed"
+            app:layout_constraintBottom_toTopOf="@id/message"
+            app:layout_constraintStart_toStartOf="@id/dialog_background"
+            app:layout_constraintEnd_toEndOf="@id/dialog_background"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            style="@style/default_text_style"
+            android:id="@+id/message"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="15dp"
+            android:layout_marginEnd="15dp"
+            android:layout_marginTop="10dp"
+            android:text="@string/dialog_remove_account_message"
+            android:textSize="14sp"
+            app:layout_constraintBottom_toTopOf="@id/cancel"
+            app:layout_constraintStart_toStartOf="@id/dialog_background"
+            app:layout_constraintEnd_toEndOf="@id/dialog_background"
+            app:layout_constraintTop_toBottomOf="@id/title" />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:onClick="@{() -> viewModel.dismiss()}"
+            style="@style/default_text_style_600"
+            android:id="@+id/cancel"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="32dp"
+            android:layout_marginStart="15dp"
+            android:layout_marginEnd="15dp"
+            android:paddingBottom="@dimen/primary_secondary_buttons_label_padding"
+            android:paddingTop="@dimen/primary_secondary_buttons_label_padding"
+            android:gravity="center"
+            android:background="@drawable/secondary_button_background"
+            android:text="@string/dialog_cancel"
+            android:textSize="18sp"
+            android:textColor="@color/secondary_button_label_color"
+            app:layout_constraintStart_toStartOf="@id/dialog_background"
+            app:layout_constraintEnd_toEndOf="@id/dialog_background"
+            app:layout_constraintTop_toBottomOf="@id/message"
+            app:layout_constraintBottom_toTopOf="@id/confirm"/>
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:onClick="@{() -> viewModel.confirmRemoval()}"
+            style="@style/default_text_style_600"
+            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:paddingBottom="@dimen/primary_secondary_buttons_label_padding"
+            android:paddingTop="@dimen/primary_secondary_buttons_label_padding"
+            android:gravity="center"
+            android:background="@drawable/primary_button_background"
+            android:text="@string/dialog_delete"
+            android:textSize="18sp"
+            android:textColor="@color/primary_button_label_color"
+            app:layout_constraintStart_toStartOf="@id/dialog_background"
+            app:layout_constraintEnd_toEndOf="@id/dialog_background"
+            app:layout_constraintTop_toBottomOf="@id/cancel"
+            app:layout_constraintBottom_toTopOf="@id/anchor"/>
+
+        <View
+            android:id="@+id/anchor"
+            android:layout_width="wrap_content"
+            android:layout_height="@dimen/dialog_top_bottom_margin"
+            app:layout_constraintTop_toBottomOf="@id/confirm"
+            app:layout_constraintStart_toStartOf="@id/dialog_background"
+            app:layout_constraintEnd_toEndOf="@id/dialog_background"
+            app:layout_constraintBottom_toBottomOf="parent"/>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/help_fragment.xml b/app/src/main/res/layout/help_fragment.xml
index d2113c50b..8f13c1695 100644
--- a/app/src/main/res/layout/help_fragment.xml
+++ b/app/src/main/res/layout/help_fragment.xml
@@ -25,279 +25,286 @@
             type="org.linphone.ui.main.help.viewmodel.HelpViewModel" />
     </data>
 
-    <androidx.constraintlayout.widget.ConstraintLayout
+    <ScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:fillViewport="true"
         android:background="@color/white">
 
-        <ImageView
-            android:id="@+id/back"
-            android:onClick="@{backClickListener}"
-            android:layout_width="wrap_content"
-            android:layout_height="35dp"
-            android:layout_marginStart="10dp"
-            android:adjustViewBounds="true"
-            android:padding="5dp"
-            android:src="@drawable/caret_left"
-            android:drawableTint="@color/primary_color"
-            app:layout_constraintBottom_toBottomOf="@id/title"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@id/title" />
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
 
-        <androidx.appcompat.widget.AppCompatTextView
-            style="@style/default_text_style_800"
-            android:id="@+id/title"
-            android:layout_width="0dp"
-            android:layout_height="@dimen/top_bar_height"
-            android:layout_marginStart="10dp"
-            android:layout_marginEnd="10dp"
-            android:gravity="center_vertical"
-            android:text="@string/help_title"
-            android:textColor="@color/primary_color"
-            android:textSize="16sp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/back"
-            app:layout_constraintTop_toTopOf="parent"/>
+            <ImageView
+                android:id="@+id/back"
+                android:onClick="@{backClickListener}"
+                android:layout_width="wrap_content"
+                android:layout_height="35dp"
+                android:layout_marginStart="10dp"
+                android:adjustViewBounds="true"
+                android:padding="5dp"
+                android:src="@drawable/caret_left"
+                android:drawableTint="@color/primary_color"
+                app:layout_constraintBottom_toBottomOf="@id/title"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="@id/title" />
 
-        <androidx.appcompat.widget.AppCompatTextView
-            style="@style/default_text_style_800"
-            android:id="@+id/about_title"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
-            android:layout_marginTop="32dp"
-            android:text="@string/help_about_title"
-            android:textSize="16sp"
-            android:textColor="@color/gray_9"
-            app:layout_constraintTop_toBottomOf="@id/title"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent" />
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/default_text_style_800"
+                android:id="@+id/title"
+                android:layout_width="0dp"
+                android:layout_height="@dimen/top_bar_height"
+                android:layout_marginStart="10dp"
+                android:layout_marginEnd="10dp"
+                android:gravity="center_vertical"
+                android:text="@string/help_title"
+                android:textColor="@color/primary_color"
+                android:textSize="16sp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@id/back"
+                app:layout_constraintTop_toTopOf="parent"/>
 
-        <ImageView
-            android:onClick="@{privacyPolicyClickListener}"
-            android:id="@+id/privacy_policy_icon"
-            android:layout_width="32dp"
-            android:layout_height="32dp"
-            android:layout_marginStart="16dp"
-            android:src="@drawable/file_text"
-            app:tint="@color/primary_color"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/privacy_policy_title"
-            app:layout_constraintTop_toTopOf="@id/privacy_policy_title"
-            app:layout_constraintBottom_toBottomOf="@id/privacy_policy_subtitle" />
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/default_text_style_800"
+                android:id="@+id/about_title"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp"
+                android:layout_marginTop="32dp"
+                android:text="@string/help_about_title"
+                android:textSize="16sp"
+                android:textColor="@color/gray_9"
+                app:layout_constraintTop_toBottomOf="@id/title"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent" />
 
-        <androidx.appcompat.widget.AppCompatTextView
-            style="@style/default_text_style_700"
-            android:onClick="@{privacyPolicyClickListener}"
-            android:id="@+id/privacy_policy_title"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
-            android:layout_marginTop="24dp"
-            android:text="@string/help_about_privacy_policy_title"
-            android:textSize="13sp"
-            android:textColor="@color/gray_9"
-            app:layout_constraintTop_toBottomOf="@id/about_title"
-            app:layout_constraintStart_toEndOf="@id/privacy_policy_icon"
-            app:layout_constraintEnd_toEndOf="parent"/>
+            <ImageView
+                android:onClick="@{privacyPolicyClickListener}"
+                android:id="@+id/privacy_policy_icon"
+                android:layout_width="32dp"
+                android:layout_height="32dp"
+                android:layout_marginStart="16dp"
+                android:src="@drawable/file_text"
+                app:tint="@color/primary_color"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toStartOf="@id/privacy_policy_title"
+                app:layout_constraintTop_toTopOf="@id/privacy_policy_title"
+                app:layout_constraintBottom_toBottomOf="@id/privacy_policy_subtitle" />
 
-        <androidx.appcompat.widget.AppCompatTextView
-            style="@style/default_text_style"
-            android:onClick="@{privacyPolicyClickListener}"
-            android:id="@+id/privacy_policy_subtitle"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
-            android:text="@string/help_about_privacy_policy_subtitle"
-            android:textSize="14sp"
-            android:textColor="@color/gray_9"
-            app:layout_constraintTop_toBottomOf="@id/privacy_policy_title"
-            app:layout_constraintStart_toEndOf="@id/privacy_policy_icon"
-            app:layout_constraintEnd_toEndOf="parent" />
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/default_text_style_700"
+                android:onClick="@{privacyPolicyClickListener}"
+                android:id="@+id/privacy_policy_title"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp"
+                android:layout_marginTop="24dp"
+                android:text="@string/help_about_privacy_policy_title"
+                android:textSize="13sp"
+                android:textColor="@color/gray_9"
+                app:layout_constraintTop_toBottomOf="@id/about_title"
+                app:layout_constraintStart_toEndOf="@id/privacy_policy_icon"
+                app:layout_constraintEnd_toEndOf="parent"/>
 
-        <ImageView
-            android:id="@+id/version_icon"
-            android:layout_width="32dp"
-            android:layout_height="32dp"
-            android:layout_marginStart="16dp"
-            android:src="@drawable/info"
-            app:tint="@color/primary_color"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/version_title"
-            app:layout_constraintTop_toTopOf="@id/version_title"
-            app:layout_constraintBottom_toBottomOf="@id/version_subtitle" />
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/default_text_style"
+                android:onClick="@{privacyPolicyClickListener}"
+                android:id="@+id/privacy_policy_subtitle"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp"
+                android:text="@string/help_about_privacy_policy_subtitle"
+                android:textSize="14sp"
+                android:textColor="@color/gray_9"
+                app:layout_constraintTop_toBottomOf="@id/privacy_policy_title"
+                app:layout_constraintStart_toEndOf="@id/privacy_policy_icon"
+                app:layout_constraintEnd_toEndOf="parent" />
 
-        <androidx.appcompat.widget.AppCompatTextView
-            style="@style/default_text_style_700"
-            android:id="@+id/version_title"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
-            android:layout_marginTop="24dp"
-            android:text="@string/help_about_version_title"
-            android:textSize="13sp"
-            android:textColor="@color/gray_9"
-            app:layout_constraintTop_toBottomOf="@id/privacy_policy_subtitle"
-            app:layout_constraintStart_toEndOf="@id/version_icon"
-            app:layout_constraintEnd_toStartOf="@id/check_for_update"/>
+            <ImageView
+                android:id="@+id/version_icon"
+                android:layout_width="32dp"
+                android:layout_height="32dp"
+                android:layout_marginStart="16dp"
+                android:src="@drawable/info"
+                app:tint="@color/primary_color"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toStartOf="@id/version_title"
+                app:layout_constraintTop_toTopOf="@id/version_title"
+                app:layout_constraintBottom_toBottomOf="@id/version_subtitle" />
 
-        <androidx.appcompat.widget.AppCompatTextView
-            style="@style/default_text_style"
-            android:id="@+id/version_subtitle"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
-            android:text="@{viewModel.version, default=`6.0.0`}"
-            android:textSize="14sp"
-            android:textColor="@color/gray_9"
-            app:layout_constraintTop_toBottomOf="@id/version_title"
-            app:layout_constraintStart_toEndOf="@id/version_icon"
-            app:layout_constraintEnd_toStartOf="@id/check_for_update" />
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/default_text_style_700"
+                android:id="@+id/version_title"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp"
+                android:layout_marginTop="24dp"
+                android:text="@string/help_about_version_title"
+                android:textSize="13sp"
+                android:textColor="@color/gray_9"
+                app:layout_constraintTop_toBottomOf="@id/privacy_policy_subtitle"
+                app:layout_constraintStart_toEndOf="@id/version_icon"
+                app:layout_constraintEnd_toStartOf="@id/check_for_update"/>
 
-        <androidx.appcompat.widget.AppCompatTextView
-            style="@style/default_text_style_600"
-            android:onClick="@{() -> viewModel.checkForUpdate()}"
-            android:id="@+id/check_for_update"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="17dp"
-            android:background="@drawable/tertiary_button_background"
-            android:paddingStart="12dp"
-            android:paddingEnd="12dp"
-            android:paddingTop="6dp"
-            android:paddingBottom="6dp"
-            android:gravity="center"
-            android:text="@string/help_about_check_for_update"
-            android:textColor="@color/tertiary_button_label_color"
-            android:textSize="13sp"
-            android:maxLines="1"
-            android:ellipsize="end"
-            app:layout_constraintStart_toEndOf="@id/version_title"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="@id/version_title"
-            app:layout_constraintBottom_toBottomOf="@id/version_subtitle"/>
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/default_text_style"
+                android:id="@+id/version_subtitle"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp"
+                android:text="@{viewModel.version, default=`6.0.0`}"
+                android:textSize="14sp"
+                android:textColor="@color/gray_9"
+                app:layout_constraintTop_toBottomOf="@id/version_title"
+                app:layout_constraintStart_toEndOf="@id/version_icon"
+                app:layout_constraintEnd_toStartOf="@id/check_for_update" />
 
-        <ImageView
-            android:onClick="@{licensesClickListener}"
-            android:id="@+id/open_source_licenses_icon"
-            android:layout_width="32dp"
-            android:layout_height="32dp"
-            android:layout_marginStart="16dp"
-            android:src="@drawable/file_text"
-            app:tint="@color/primary_color"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/open_source_licenses_title"
-            app:layout_constraintTop_toTopOf="@id/open_source_licenses_title"
-            app:layout_constraintBottom_toBottomOf="@id/open_source_licenses_subtitle" />
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/default_text_style_600"
+                android:onClick="@{() -> viewModel.checkForUpdate()}"
+                android:id="@+id/check_for_update"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="17dp"
+                android:background="@drawable/tertiary_button_background"
+                android:paddingStart="12dp"
+                android:paddingEnd="12dp"
+                android:paddingTop="6dp"
+                android:paddingBottom="6dp"
+                android:gravity="center"
+                android:text="@string/help_about_check_for_update"
+                android:textColor="@color/tertiary_button_label_color"
+                android:textSize="13sp"
+                android:maxLines="1"
+                android:ellipsize="end"
+                app:layout_constraintStart_toEndOf="@id/version_title"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="@id/version_title"
+                app:layout_constraintBottom_toBottomOf="@id/version_subtitle"/>
 
-        <androidx.appcompat.widget.AppCompatTextView
-            style="@style/default_text_style_700"
-            android:onClick="@{licensesClickListener}"
-            android:id="@+id/open_source_licenses_title"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
-            android:layout_marginTop="24dp"
-            android:text="@string/help_about_open_source_licenses_title"
-            android:textSize="13sp"
-            android:textColor="@color/gray_9"
-            app:layout_constraintTop_toBottomOf="@id/version_subtitle"
-            app:layout_constraintStart_toEndOf="@id/open_source_licenses_icon"
-            app:layout_constraintEnd_toEndOf="parent"/>
+            <ImageView
+                android:onClick="@{licensesClickListener}"
+                android:id="@+id/open_source_licenses_icon"
+                android:layout_width="32dp"
+                android:layout_height="32dp"
+                android:layout_marginStart="16dp"
+                android:src="@drawable/file_text"
+                app:tint="@color/primary_color"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toStartOf="@id/open_source_licenses_title"
+                app:layout_constraintTop_toTopOf="@id/open_source_licenses_title"
+                app:layout_constraintBottom_toBottomOf="@id/open_source_licenses_subtitle" />
 
-        <androidx.appcompat.widget.AppCompatTextView
-            style="@style/default_text_style"
-            android:onClick="@{licensesClickListener}"
-            android:id="@+id/open_source_licenses_subtitle"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
-            android:text="@string/help_about_open_source_licenses_subtitle"
-            android:textSize="14sp"
-            android:textColor="@color/gray_9"
-            app:layout_constraintTop_toBottomOf="@id/open_source_licenses_title"
-            app:layout_constraintStart_toEndOf="@id/open_source_licenses_icon"
-            app:layout_constraintEnd_toEndOf="parent" />
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/default_text_style_700"
+                android:onClick="@{licensesClickListener}"
+                android:id="@+id/open_source_licenses_title"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp"
+                android:layout_marginTop="24dp"
+                android:text="@string/help_about_open_source_licenses_title"
+                android:textSize="13sp"
+                android:textColor="@color/gray_9"
+                app:layout_constraintTop_toBottomOf="@id/version_subtitle"
+                app:layout_constraintStart_toEndOf="@id/open_source_licenses_icon"
+                app:layout_constraintEnd_toEndOf="parent"/>
 
-        <ImageView
-            android:onClick="@{translateClickListener}"
-            android:id="@+id/translate_icon"
-            android:layout_width="32dp"
-            android:layout_height="32dp"
-            android:layout_marginStart="16dp"
-            android:src="@drawable/globe_hemisphere_west"
-            app:tint="@color/primary_color"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/translate_title"
-            app:layout_constraintTop_toTopOf="@id/translate_title"
-            app:layout_constraintBottom_toBottomOf="@id/translate_title" />
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/default_text_style"
+                android:onClick="@{licensesClickListener}"
+                android:id="@+id/open_source_licenses_subtitle"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp"
+                android:text="@string/help_about_open_source_licenses_subtitle"
+                android:textSize="14sp"
+                android:textColor="@color/gray_9"
+                app:layout_constraintTop_toBottomOf="@id/open_source_licenses_title"
+                app:layout_constraintStart_toEndOf="@id/open_source_licenses_icon"
+                app:layout_constraintEnd_toEndOf="parent" />
 
-        <androidx.appcompat.widget.AppCompatTextView
-            style="@style/default_text_style_700"
-            android:onClick="@{translateClickListener}"
-            android:id="@+id/translate_title"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
-            android:layout_marginTop="24dp"
-            android:text="@string/help_about_contribute_translations_title"
-            android:textSize="13sp"
-            android:textColor="@color/gray_9"
-            app:layout_constraintTop_toBottomOf="@id/open_source_licenses_subtitle"
-            app:layout_constraintStart_toEndOf="@id/translate_icon"
-            app:layout_constraintEnd_toEndOf="parent"/>
+            <ImageView
+                android:onClick="@{translateClickListener}"
+                android:id="@+id/translate_icon"
+                android:layout_width="32dp"
+                android:layout_height="32dp"
+                android:layout_marginStart="16dp"
+                android:src="@drawable/globe_hemisphere_west"
+                app:tint="@color/primary_color"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toStartOf="@id/translate_title"
+                app:layout_constraintTop_toTopOf="@id/translate_title"
+                app:layout_constraintBottom_toBottomOf="@id/translate_title" />
 
-        <androidx.appcompat.widget.AppCompatTextView
-            style="@style/default_text_style_800"
-            android:id="@+id/advanced_title"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
-            android:layout_marginTop="32dp"
-            android:text="@string/help_about_advanced_title"
-            android:textSize="16sp"
-            android:textColor="@color/gray_9"
-            app:layout_constraintTop_toBottomOf="@id/translate_icon"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent" />
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/default_text_style_700"
+                android:onClick="@{translateClickListener}"
+                android:id="@+id/translate_title"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp"
+                android:layout_marginTop="24dp"
+                android:text="@string/help_about_contribute_translations_title"
+                android:textSize="13sp"
+                android:textColor="@color/gray_9"
+                app:layout_constraintTop_toBottomOf="@id/open_source_licenses_subtitle"
+                app:layout_constraintStart_toEndOf="@id/translate_icon"
+                app:layout_constraintEnd_toEndOf="parent"/>
 
-        <ImageView
-            android:id="@+id/debug_icon"
-            android:layout_width="32dp"
-            android:layout_height="32dp"
-            android:layout_marginStart="16dp"
-            android:src="@drawable/wrench"
-            app:tint="@color/primary_color"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/debug_title"
-            app:layout_constraintTop_toTopOf="@id/debug_title"
-            app:layout_constraintBottom_toBottomOf="@id/debug_title" />
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/default_text_style_800"
+                android:id="@+id/advanced_title"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp"
+                android:layout_marginTop="32dp"
+                android:text="@string/help_about_advanced_title"
+                android:textSize="16sp"
+                android:textColor="@color/gray_9"
+                app:layout_constraintTop_toBottomOf="@id/translate_icon"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent" />
 
-        <androidx.appcompat.widget.AppCompatTextView
-            style="@style/default_text_style_700"
-            android:onClick="@{debugClickListener}"
-            android:id="@+id/debug_title"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
-            android:layout_marginTop="24dp"
-            android:text="@string/help_debug_title"
-            android:textSize="13sp"
-            android:textColor="@color/gray_9"
-            app:layout_constraintTop_toBottomOf="@id/advanced_title"
-            app:layout_constraintStart_toEndOf="@id/debug_icon"
-            app:layout_constraintEnd_toEndOf="parent"/>
+            <ImageView
+                android:id="@+id/debug_icon"
+                android:layout_width="32dp"
+                android:layout_height="32dp"
+                android:layout_marginStart="16dp"
+                android:src="@drawable/wrench"
+                app:tint="@color/primary_color"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toStartOf="@id/debug_title"
+                app:layout_constraintTop_toTopOf="@id/debug_title"
+                app:layout_constraintBottom_toBottomOf="@id/debug_title" />
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/default_text_style_700"
+                android:onClick="@{debugClickListener}"
+                android:id="@+id/debug_title"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp"
+                android:layout_marginTop="24dp"
+                android:text="@string/help_debug_title"
+                android:textSize="13sp"
+                android:textColor="@color/gray_9"
+                app:layout_constraintTop_toBottomOf="@id/advanced_title"
+                app:layout_constraintStart_toEndOf="@id/debug_icon"
+                app:layout_constraintEnd_toEndOf="parent"/>
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </ScrollView>
 
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1b13e3b35..63e487a81 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -73,6 +73,8 @@
     <string name="dialog_delete_all_call_logs_message">All calls will be deleted of the history</string>
     <string name="dialog_account_secure_mode_default_message">Blah</string> <!-- TODO -->
     <string name="dialog_account_secure_mode_interoperable_message">Blah</string> <!-- TODO -->
+    <string name="dialog_remove_account_title">Delete %s?</string>
+    <string name="dialog_remove_account_message">You can reconnect at any time by clicking “Add an account”. However, all data on this phone will be deleted.</string>
 
     <string name="toast_assistant_qr_code_valid">QR code validated!</string>
     <string name="toast_assistant_qr_code_invalid">Invalid QR code!</string>