diff --git a/app/src/main/java/org/linphone/ui/main/model/AccountModel.kt b/app/src/main/java/org/linphone/ui/main/model/AccountModel.kt
index aed57118b..bcb76b138 100644
--- a/app/src/main/java/org/linphone/ui/main/model/AccountModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/model/AccountModel.kt
@@ -49,6 +49,8 @@ class AccountModel @WorkerThread constructor(
 
     val registrationState = MutableLiveData<String>()
 
+    val registrationStateSummary = MutableLiveData<String>()
+
     val isConnected = MutableLiveData<Boolean>()
 
     val inError = MutableLiveData<Boolean>()
@@ -155,6 +157,23 @@ class AccountModel @WorkerThread constructor(
             else -> "${account.state}"
         }
 
+        val summary = when (account.state) {
+            RegistrationState.None, RegistrationState.Cleared -> AppUtils.getString(
+                R.string.manage_account_status_cleared_summary
+            )
+            RegistrationState.Refreshing, RegistrationState.Progress -> AppUtils.getString(
+                R.string.manage_account_status_progress_summary
+            )
+            RegistrationState.Failed -> AppUtils.getString(
+                R.string.manage_account_status_failed_summary
+            )
+            RegistrationState.Ok -> AppUtils.getString(
+                R.string.manage_account_status_connected_summary
+            )
+            else -> "${account.state}"
+        }
+        registrationStateSummary.postValue(summary)
+
         isConnected.postValue(account.state == RegistrationState.Ok)
         inError.postValue(account.state == RegistrationState.Failed)
         registrationState.postValue(state)
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 3a0f7adbf..2a1ac9ab4 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
@@ -43,7 +43,7 @@ class AccountProfileFragment : GenericFragment() {
                 if (localFileName != null) {
                     Log.i("$TAG Picture will be locally stored as [$localFileName]")
                     val path = FileUtils.getProperFilePath(localFileName)
-                    viewModel.picturePath.postValue(path)
+                    viewModel.setNewPicturePath(path)
                 } else {
                     Log.e("$TAG Failed to copy [$uri] to local storage")
                 }
diff --git a/app/src/main/java/org/linphone/ui/main/settings/viewmodel/AccountProfileViewModel.kt b/app/src/main/java/org/linphone/ui/main/settings/viewmodel/AccountProfileViewModel.kt
index f11f8645c..c1e85af3e 100644
--- a/app/src/main/java/org/linphone/ui/main/settings/viewmodel/AccountProfileViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/settings/viewmodel/AccountProfileViewModel.kt
@@ -4,8 +4,11 @@ import androidx.annotation.UiThread
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import org.linphone.LinphoneApplication.Companion.coreContext
+import org.linphone.R
 import org.linphone.core.Account
 import org.linphone.core.tools.Log
+import org.linphone.ui.main.model.AccountModel
+import org.linphone.utils.AppUtils
 import org.linphone.utils.Event
 
 class AccountProfileViewModel @UiThread constructor() : ViewModel() {
@@ -13,12 +16,16 @@ class AccountProfileViewModel @UiThread constructor() : ViewModel() {
         private const val TAG = "[Account Profile ViewModel]"
     }
 
-    val picturePath = MutableLiveData<String>()
+    val accountModel = MutableLiveData<AccountModel>()
 
     val sipAddress = MutableLiveData<String>()
 
     val displayName = MutableLiveData<String>()
 
+    val registerEnabled = MutableLiveData<Boolean>()
+
+    val currentMode = MutableLiveData<String>()
+
     val internationalPrefix = MutableLiveData<String>()
 
     val accountFoundEvent = MutableLiveData<Event<Boolean>>()
@@ -31,6 +38,15 @@ class AccountProfileViewModel @UiThread constructor() : ViewModel() {
         expandDetails.value = true
     }
 
+    @UiThread
+    override fun onCleared() {
+        super.onCleared()
+
+        coreContext.postOnCoreThread { core ->
+            accountModel.value?.destroy()
+        }
+    }
+
     @UiThread
     fun findAccountMatchingIdentity(identity: String) {
         coreContext.postOnCoreThread { core ->
@@ -40,9 +56,14 @@ class AccountProfileViewModel @UiThread constructor() : ViewModel() {
             if (found != null) {
                 Log.i("$TAG Found matching account [$found]")
                 account = found
+                accountModel.postValue(AccountModel(account))
+                currentMode.postValue(
+                    "Mode ${AppUtils.getString(R.string.assistant_secure_mode_default_title)}"
+                ) // TODO FIXME
+                registerEnabled.postValue(account.params.isRegisterEnabled)
+
                 sipAddress.postValue(account.params.identityAddress?.asStringUriOnly())
                 displayName.postValue(account.params.identityAddress?.displayName)
-                picturePath.postValue(account.params.pictureUri)
                 internationalPrefix.postValue(account.params.internationalPrefix)
 
                 accountFoundEvent.postValue(Event(true))
@@ -52,6 +73,25 @@ class AccountProfileViewModel @UiThread constructor() : ViewModel() {
         }
     }
 
+    @UiThread
+    fun setNewPicturePath(path: String) {
+        coreContext.postOnCoreThread {
+            if (::account.isInitialized) {
+                val params = account.params
+                val copy = params.clone()
+
+                if (path.isNotEmpty() && path != params.pictureUri) {
+                    Log.i("$TAG New account profile picture [$path]")
+                    copy.pictureUri = path
+                }
+
+                accountModel.value?.avatar?.postValue(path)
+                account.params = copy
+                account.refreshRegister()
+            }
+        }
+    }
+
     @UiThread
     fun saveChangesWhenLeaving() {
         coreContext.postOnCoreThread {
@@ -61,12 +101,6 @@ class AccountProfileViewModel @UiThread constructor() : ViewModel() {
 
                 copy.internationalPrefix = internationalPrefix.value.orEmpty()
 
-                val newPictureUri = picturePath.value.orEmpty().trim()
-                if (newPictureUri.isNotEmpty() && newPictureUri != params.pictureUri) {
-                    Log.i("$TAG New account profile picture [$newPictureUri]")
-                    copy.pictureUri = newPictureUri
-                }
-
                 val address = params.identityAddress?.clone()
                 if (address != null) {
                     val newValue = displayName.value.orEmpty().trim()
@@ -89,4 +123,15 @@ class AccountProfileViewModel @UiThread constructor() : ViewModel() {
     fun toggleDetailsExpand() {
         expandDetails.value = expandDetails.value == false
     }
+
+    @UiThread
+    fun toggleRegister() {
+        coreContext.postOnCoreThread {
+            val params = account.params
+            val copy = params.clone()
+            copy.isRegisterEnabled = !params.isRegisterEnabled
+            account.params = copy
+            registerEnabled.postValue(account.params.isRegisterEnabled)
+        }
+    }
 }
diff --git a/app/src/main/res/drawable/cell_background.xml b/app/src/main/res/drawable/cell_background.xml
deleted file mode 100644
index fbc9e3cc0..000000000
--- a/app/src/main/res/drawable/cell_background.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_selected="true"
-        android:drawable="@drawable/shape_rectangle_gray_background" />
-    <item android:state_pressed="true"
-        android:drawable="@drawable/shape_rectangle_gray_background" />
-    <item
-        android:drawable="@drawable/shape_rectangle_white_background" />
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/primary_cell_background.xml b/app/src/main/res/drawable/primary_cell_background.xml
new file mode 100644
index 000000000..683a126e4
--- /dev/null
+++ b/app/src/main/res/drawable/primary_cell_background.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_selected="true"
+        android:drawable="@color/gray_3" />
+    <item android:state_pressed="true"
+        android:drawable="@color/gray_3" />
+    <item
+        android:drawable="@color/white" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/secondary_cell_background.xml b/app/src/main/res/drawable/secondary_cell_background.xml
new file mode 100644
index 000000000..b0e3d17fd
--- /dev/null
+++ b/app/src/main/res/drawable/secondary_cell_background.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_selected="true"
+        android:drawable="@color/gray_3" />
+    <item android:state_pressed="true"
+        android:drawable="@color/gray_3" />
+    <item
+        android:drawable="@color/gray_2" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/account_profile_fragment.xml b/app/src/main/res/layout/account_profile_fragment.xml
index 7c3592e82..7e6b182c0 100644
--- a/app/src/main/res/layout/account_profile_fragment.xml
+++ b/app/src/main/res/layout/account_profile_fragment.xml
@@ -25,365 +25,380 @@
             type="org.linphone.ui.main.settings.viewmodel.AccountProfileViewModel" />
     </data>
 
-    <androidx.constraintlayout.widget.ConstraintLayout
+    <ScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/white">
 
-        <androidx.constraintlayout.widget.Group
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:constraint_referenced_ids="sip_address, sip_address_label, display_name, display_name_label, details_background"
-            android:visibility="@{viewModel.expandDetails ? View.VISIBLE : View.GONE}" />
+        <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" />
+            <androidx.constraintlayout.widget.Group
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:constraint_referenced_ids="sip_address, sip_address_label, display_name, display_name_label, details_background"
+                android:visibility="@{viewModel.expandDetails ? View.VISIBLE : View.GONE}" />
 
-        <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_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" />
 
-        <io.getstream.avatarview.AvatarView
-            android:onClick="@{pickImageClickListener}"
-            android:id="@+id/avatar"
-            android:layout_width="@dimen/avatar_big_size"
-            android:layout_height="@dimen/avatar_big_size"
-            android:layout_marginTop="8dp"
-            android:adjustViewBounds="true"
-            android:background="@drawable/shape_circle_light_blue_background"
-            app:avatarViewInitialsBackgroundColor="@color/blue_light"
-            app:avatarViewInitialsTextColor="@color/gray_9"
-            app:avatarViewInitialsTextSize="21sp"
-            app:avatarViewInitialsTextStyle="bold"
-            app:avatarViewPlaceholder="@drawable/contact_avatar"
-            app:avatarViewShape="circle"
-            app:avatarViewBorderWidth="0dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@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_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/overlay"
-            android:layout_width="@dimen/avatar_presence_badge_big_size"
-            android:layout_height="@dimen/avatar_presence_badge_big_size"
-            android:layout_marginEnd="@dimen/avatar_presence_badge_big_end_margin"
-            android:padding="@dimen/avatar_presence_badge_big_padding"
-            android:background="@drawable/led_background"
-            android:src="@drawable/camera"
-            app:layout_constraintEnd_toEndOf="@id/avatar"
-            app:layout_constraintBottom_toBottomOf="@id/avatar" />
+            <io.getstream.avatarview.AvatarView
+                android:onClick="@{pickImageClickListener}"
+                android:id="@+id/avatar"
+                android:layout_width="@dimen/avatar_big_size"
+                android:layout_height="@dimen/avatar_big_size"
+                android:layout_marginTop="8dp"
+                android:adjustViewBounds="true"
+                android:background="@drawable/shape_circle_light_blue_background"
+                accountAvatar="@{viewModel.accountModel}"
+                app:avatarViewInitials="JD"
+                app:avatarViewInitialsBackgroundColor="@color/blue_light"
+                app:avatarViewInitialsTextColor="@color/gray_9"
+                app:avatarViewInitialsTextSize="21sp"
+                app:avatarViewInitialsTextStyle="bold"
+                app:avatarViewPlaceholder="@drawable/contact_avatar"
+                app:avatarViewShape="circle"
+                app:avatarViewBorderWidth="0dp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/title" />
 
-        <androidx.appcompat.widget.AppCompatTextView
-            style="@style/default_text_style"
-            android:id="@+id/add_picture_label"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:text="@string/manage_account_add_picture"
-            android:textSize="14sp"
-            app:layout_constraintTop_toBottomOf="@id/avatar"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"/>
+            <ImageView
+                android:id="@+id/avatar_trust_badge"
+                android:layout_width="@dimen/avatar_presence_badge_big_size"
+                android:layout_height="@dimen/avatar_presence_badge_big_size"
+                android:src="@drawable/trusted"
+                app:layout_constraintStart_toStartOf="@id/avatar"
+                app:layout_constraintBottom_toBottomOf="@id/avatar"/>
 
-        <androidx.appcompat.widget.AppCompatTextView
-            style="@style/default_text_style_800"
-            android:onClick="@{() -> viewModel.toggleDetailsExpand()}"
-            android:id="@+id/details"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:padding="5dp"
-            android:layout_marginStart="26dp"
-            android:layout_marginEnd="26dp"
-            android:layout_marginTop="32dp"
-            android:text="@string/manage_account_details_title"
-            android:drawableEnd="@{viewModel.expandDetails ? @drawable/caret_up : @drawable/caret_down, default=@drawable/caret_up}"
-            android:drawableTint="@color/gray_9"
-            android:textSize="16sp"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/add_picture_label"/>
+            <ImageView
+                android:id="@+id/overlay"
+                android:layout_width="@dimen/avatar_presence_badge_big_size"
+                android:layout_height="@dimen/avatar_presence_badge_big_size"
+                android:layout_marginEnd="@dimen/avatar_presence_badge_big_end_margin"
+                android:padding="@dimen/avatar_presence_badge_big_padding"
+                android:background="@drawable/led_background"
+                android:src="@drawable/camera"
+                app:layout_constraintEnd_toEndOf="@id/avatar"
+                app:layout_constraintBottom_toBottomOf="@id/avatar" />
 
-        <ImageView
-            android:id="@+id/details_background"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_marginTop="16dp"
-            android:layout_marginStart="17dp"
-            android:layout_marginEnd="17dp"
-            android:src="@drawable/shape_squircle_gray_2_background"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/details"
-            app:layout_constraintBottom_toBottomOf="@id/details_bottom_anchor"/>
+            <androidx.appcompat.widget.AppCompatTextView
+                android:onClick="@{pickImageClickListener}"
+                style="@style/default_text_style"
+                android:id="@+id/add_picture_label"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:text="@{viewModel.accountModel.avatar.empty ? @string/manage_account_add_picture : @string/manage_account_edit_picture, default=@string/manage_account_add_picture}"
+                android:textSize="14sp"
+                app:layout_constraintTop_toBottomOf="@id/avatar"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"/>
 
-        <androidx.appcompat.widget.AppCompatTextView
-            style="@style/default_text_style_700"
-            android:id="@+id/sip_address_label"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="17dp"
-            android:paddingTop="8dp"
-            android:paddingBottom="8dp"
-            android:text="@string/sip_address"
-            android:textSize="13sp"
-            app:layout_constraintStart_toStartOf="@id/details_background"
-            app:layout_constraintTop_toTopOf="@id/details_background"/>
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/default_text_style_800"
+                android:onClick="@{() -> viewModel.toggleDetailsExpand()}"
+                android:id="@+id/details"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:padding="5dp"
+                android:layout_marginStart="26dp"
+                android:layout_marginEnd="26dp"
+                android:layout_marginTop="32dp"
+                android:text="@string/manage_account_details_title"
+                android:drawableEnd="@{viewModel.expandDetails ? @drawable/caret_up : @drawable/caret_down, default=@drawable/caret_up}"
+                android:drawableTint="@color/gray_9"
+                android:textSize="16sp"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/add_picture_label"/>
 
-        <androidx.appcompat.widget.AppCompatTextView
-            style="@style/default_text_style"
-            android:id="@+id/sip_address"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="5dp"
-            android:paddingTop="8dp"
-            android:paddingBottom="8dp"
-            android:text="@={viewModel.sipAddress, default=`sip:johndoe@sip.example.org`}"
-            android:textSize="14sp"
-            android:maxLines="1"
-            android:ellipsize="end"
-            app:layout_constraintStart_toEndOf="@id/sip_address_label"
-            app:layout_constraintEnd_toEndOf="@id/details_background"
-            app:layout_constraintTop_toTopOf="@id/details_background"/>
+            <ImageView
+                android:id="@+id/details_background"
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:layout_marginTop="16dp"
+                android:layout_marginStart="17dp"
+                android:layout_marginEnd="17dp"
+                android:src="@drawable/shape_squircle_gray_2_background"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/details"
+                app:layout_constraintBottom_toBottomOf="@id/details_bottom_anchor"/>
 
-        <androidx.appcompat.widget.AppCompatTextView
-            style="@style/default_text_style_700"
-            android:id="@+id/display_name_label"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="17dp"
-            android:paddingTop="8dp"
-            android:paddingBottom="8dp"
-            android:text="@string/sip_address_display_name"
-            android:textSize="13sp"
-            app:layout_constraintStart_toStartOf="@id/details_background"
-            app:layout_constraintTop_toBottomOf="@id/sip_address"/>
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/default_text_style_700"
+                android:id="@+id/sip_address_label"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="17dp"
+                android:paddingTop="8dp"
+                android:paddingBottom="8dp"
+                android:text="@string/sip_address"
+                android:textSize="13sp"
+                app:layout_constraintStart_toStartOf="@id/details_background"
+                app:layout_constraintTop_toTopOf="@id/details_background"/>
 
-        <androidx.appcompat.widget.AppCompatEditText
-            style="@style/default_text_style"
-            android:id="@+id/display_name"
-            android:layout_width="0dp"
-            android:layout_height="50dp"
-            android:layout_marginEnd="16dp"
-            android:layout_marginTop="5dp"
-            android:paddingStart="20dp"
-            android:paddingEnd="20dp"
-            android:text="@={viewModel.displayName, default=`John Doe`}"
-            android:textSize="14sp"
-            android:textColor="@color/gray_9"
-            android:maxLines="1"
-            android:background="@drawable/edit_text_background"
-            android:inputType="text|textPersonName"
-            app:layout_constraintWidth_max="@dimen/text_input_max_width"
-            app:layout_constraintTop_toBottomOf="@id/display_name_label"
-            app:layout_constraintStart_toStartOf="@id/display_name_label"
-            app:layout_constraintEnd_toEndOf="@id/details_background"/>
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/default_text_style"
+                android:id="@+id/sip_address"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="5dp"
+                android:paddingTop="8dp"
+                android:paddingBottom="8dp"
+                android:text="@={viewModel.sipAddress, default=`sip:johndoe@sip.example.org`}"
+                android:textSize="14sp"
+                android:maxLines="1"
+                android:ellipsize="end"
+                app:layout_constraintStart_toEndOf="@id/sip_address_label"
+                app:layout_constraintEnd_toEndOf="@id/details_background"
+                app:layout_constraintTop_toTopOf="@id/details_background"/>
 
-        <View
-            android:id="@+id/details_bottom_anchor"
-            android:layout_width="1dp"
-            android:layout_height="1dp"
-            android:layout_marginTop="21dp"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/display_name"/>
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/default_text_style_700"
+                android:id="@+id/display_name_label"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="17dp"
+                android:paddingTop="8dp"
+                android:paddingBottom="8dp"
+                android:text="@string/sip_address_display_name"
+                android:textSize="13sp"
+                app:layout_constraintStart_toStartOf="@id/details_background"
+                app:layout_constraintTop_toBottomOf="@id/sip_address"/>
 
-        <ImageView
-            android:id="@+id/connection_background"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_marginTop="16dp"
-            android:layout_marginStart="17dp"
-            android:layout_marginEnd="17dp"
-            android:src="@drawable/shape_squircle_gray_2_background"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/details_background"
-            app:layout_constraintBottom_toBottomOf="@id/connection_bottom_anchor"/>
+            <androidx.appcompat.widget.AppCompatEditText
+                style="@style/default_text_style"
+                android:id="@+id/display_name"
+                android:layout_width="0dp"
+                android:layout_height="50dp"
+                android:layout_marginEnd="16dp"
+                android:layout_marginTop="5dp"
+                android:paddingStart="20dp"
+                android:paddingEnd="20dp"
+                android:text="@={viewModel.displayName, default=`John Doe`}"
+                android:textSize="14sp"
+                android:textColor="@color/gray_9"
+                android:maxLines="1"
+                android:background="@drawable/edit_text_background"
+                android:inputType="text|textPersonName"
+                app:layout_constraintHorizontal_bias="0"
+                app:layout_constraintWidth_max="@dimen/text_input_max_width"
+                app:layout_constraintTop_toBottomOf="@id/display_name_label"
+                app:layout_constraintStart_toStartOf="@id/display_name_label"
+                app:layout_constraintEnd_toEndOf="@id/details_background"/>
 
-        <com.google.android.material.switchmaterial.SwitchMaterial
-            android:id="@+id/connected_switch"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="17dp"
-            android:layout_marginTop="21dp"
-            android:checked="true"
-            app:thumbTint="@color/white"
-            app:trackTint="@color/blue_trusted"
-            app:layout_constraintStart_toStartOf="@id/connection_background"
-            app:layout_constraintTop_toTopOf="@id/connection_background" />
+            <View
+                android:id="@+id/details_bottom_anchor"
+                android:layout_width="1dp"
+                android:layout_height="1dp"
+                android:layout_marginTop="21dp"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/display_name"/>
 
-        <androidx.appcompat.widget.AppCompatTextView
-            style="@style/default_text_style_700"
-            android:id="@+id/connected_label"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:text="Connected"
-            android:textSize="13sp"
-            app:layout_constraintStart_toEndOf="@id/connected_switch"
-            app:layout_constraintTop_toTopOf="@id/connected_switch"
-            app:layout_constraintBottom_toBottomOf="@id/connected_switch" />
+            <ImageView
+                android:id="@+id/connection_background"
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:layout_marginTop="16dp"
+                android:layout_marginStart="17dp"
+                android:layout_marginEnd="17dp"
+                android:src="@drawable/shape_squircle_gray_2_background"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/details_background"
+                app:layout_constraintBottom_toBottomOf="@id/connection_bottom_anchor"/>
 
-        <androidx.appcompat.widget.AppCompatTextView
-            style="@style/default_text_style"
-            android:id="@+id/connected_summary"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="17dp"
-            android:layout_marginEnd="17dp"
-            android:layout_marginTop="16dp"
-            android:textSize="14sp"
-            android:text="This account is online, everyone can call you"
-            app:layout_constraintStart_toStartOf="@id/connection_background"
-            app:layout_constraintEnd_toEndOf="@id/connection_background"
-            app:layout_constraintTop_toBottomOf="@id/connected_label" />
+            <com.google.android.material.switchmaterial.SwitchMaterial
+                android:onClick="@{() -> viewModel.toggleRegister()}"
+                android:id="@+id/connected_switch"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="17dp"
+                android:layout_marginTop="21dp"
+                android:checked="@{viewModel.registerEnabled}"
+                app:layout_constraintStart_toStartOf="@id/connection_background"
+                app:layout_constraintTop_toTopOf="@id/connection_background" />
 
-        <View
-            android:id="@+id/connection_bottom_anchor"
-            android:layout_width="1dp"
-            android:layout_height="1dp"
-            android:layout_marginTop="21dp"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/connected_summary"/>
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/default_text_style_700"
+                android:id="@+id/connected_label"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:text="@{viewModel.accountModel.registrationState, default=@string/drawer_menu_account_connection_status_connected}"
+                android:textSize="13sp"
+                app:layout_constraintStart_toEndOf="@id/connected_switch"
+                app:layout_constraintTop_toTopOf="@id/connected_switch"
+                app:layout_constraintBottom_toBottomOf="@id/connected_switch" />
 
-        <ImageView
-            android:id="@+id/mode_background"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_marginTop="16dp"
-            android:layout_marginStart="17dp"
-            android:layout_marginEnd="17dp"
-            android:src="@drawable/shape_squircle_gray_2_background"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/connection_background"
-            app:layout_constraintBottom_toBottomOf="@id/change_mode"/>
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/default_text_style"
+                android:id="@+id/connected_summary"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="17dp"
+                android:layout_marginEnd="17dp"
+                android:layout_marginTop="16dp"
+                android:textSize="14sp"
+                android:text="@{viewModel.accountModel.registrationStateSummary, default=@string/manage_account_status_connected_summary}"
+                app:layout_constraintStart_toStartOf="@id/connection_background"
+                app:layout_constraintEnd_toEndOf="@id/connection_background"
+                app:layout_constraintTop_toBottomOf="@id/connected_label" />
 
-        <androidx.appcompat.widget.AppCompatTextView
-            style="@style/default_text_style_700"
-            android:id="@+id/current_mode"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
-            android:text="Mode Interop ?"
-            android:textSize="13sp"
-            android:textColor="@color/gray_9"
-            app:layout_constraintTop_toTopOf="@id/mode_background"
-            app:layout_constraintStart_toStartOf="@id/mode_background"
-            app:layout_constraintBottom_toBottomOf="@id/mode_background"/>
+            <View
+                android:id="@+id/connection_bottom_anchor"
+                android:layout_width="1dp"
+                android:layout_height="1dp"
+                android:layout_marginTop="21dp"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/connected_summary"/>
 
-        <androidx.appcompat.widget.AppCompatTextView
-            android:onClick="@{changeModeClickListener}"
-            style="@style/default_text_style_600"
-            android:id="@+id/change_mode"
-            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/manage_account_change_mode"
-            android:textColor="@color/tertiary_button_label_color"
-            android:textSize="13sp"
-            android:maxLines="1"
-            android:ellipsize="end"
-            app:layout_constraintEnd_toEndOf="@id/mode_background"
-            app:layout_constraintTop_toTopOf="@id/mode_background"
-            app:layout_constraintBottom_toBottomOf="@id/mode_background"/>
+            <ImageView
+                android:id="@+id/mode_background"
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:layout_marginTop="16dp"
+                android:layout_marginStart="17dp"
+                android:layout_marginEnd="17dp"
+                android:src="@drawable/shape_squircle_gray_2_background"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/connection_background"
+                app:layout_constraintBottom_toBottomOf="@id/change_mode"/>
 
-        <androidx.appcompat.widget.AppCompatTextView
-            style="@style/default_text_style_800"
-            android:id="@+id/actions"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:padding="5dp"
-            android:layout_marginStart="26dp"
-            android:layout_marginEnd="26dp"
-            android:layout_marginTop="16dp"
-            android:text="@string/contact_details_actions_title"
-            android:textSize="16sp"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/mode_background"/>
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/default_text_style_700"
+                android:id="@+id/current_mode"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp"
+                android:text="@{viewModel.currentMode, default=@string/assistant_secure_mode_default_title}"
+                android:textSize="13sp"
+                android:textColor="@color/gray_9"
+                app:layout_constraintTop_toTopOf="@id/mode_background"
+                app:layout_constraintStart_toStartOf="@id/mode_background"
+                app:layout_constraintBottom_toBottomOf="@id/mode_background"/>
 
-        <ImageView
-            android:id="@+id/actions_background"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_marginTop="10dp"
-            android:layout_marginStart="17dp"
-            android:layout_marginEnd="17dp"
-            android:src="@drawable/shape_squircle_gray_2_background"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/actions"
-            app:layout_constraintBottom_toBottomOf="@id/action_delete" />
+            <androidx.appcompat.widget.AppCompatTextView
+                android:onClick="@{changeModeClickListener}"
+                style="@style/default_text_style_600"
+                android:id="@+id/change_mode"
+                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/manage_account_change_mode"
+                android:textColor="@color/tertiary_button_label_color"
+                android:textSize="13sp"
+                android:maxLines="1"
+                android:ellipsize="end"
+                app:layout_constraintEnd_toEndOf="@id/mode_background"
+                app:layout_constraintTop_toTopOf="@id/mode_background"
+                app:layout_constraintBottom_toBottomOf="@id/mode_background"/>
 
-        <androidx.appcompat.widget.AppCompatTextView
-            android:onClick="@{settingsClickListener}"
-            style="@style/context_menu_action_label_style"
-            android:id="@+id/action_settings"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="17dp"
-            android:layout_marginEnd="17dp"
-            android:background="@drawable/action_background"
-            android:text="@string/manage_account_settings"
-            android:drawableStart="@drawable/user_gear"
-            app:layout_constraintTop_toTopOf="@id/actions_background"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"/>
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/default_text_style_800"
+                android:id="@+id/actions"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:padding="5dp"
+                android:layout_marginStart="26dp"
+                android:layout_marginEnd="26dp"
+                android:layout_marginTop="16dp"
+                android:text="@string/contact_details_actions_title"
+                android:textSize="16sp"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/mode_background"/>
 
-        <View
-            android:layout_width="0dp"
-            android:layout_height="1dp"
-            android:layout_marginStart="17dp"
-            android:layout_marginEnd="17dp"
-            android:background="@color/blue_light"
-            app:layout_constraintStart_toStartOf="@id/action_settings"
-            app:layout_constraintEnd_toEndOf="@id/action_settings"
-            app:layout_constraintTop_toBottomOf="@+id/action_settings"/>
+            <ImageView
+                android:id="@+id/actions_background"
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:layout_marginTop="10dp"
+                android:layout_marginStart="17dp"
+                android:layout_marginEnd="17dp"
+                android:src="@drawable/shape_squircle_gray_2_background"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/actions"
+                app:layout_constraintBottom_toBottomOf="@id/action_delete" />
 
-        <androidx.appcompat.widget.AppCompatTextView
-            android:onClick="@{deleteClickListener}"
-            style="@style/context_menu_danger_action_label_style"
-            android:id="@+id/action_delete"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="17dp"
-            android:layout_marginEnd="17dp"
-            android:background="@drawable/action_background"
-            android:text="@string/manage_account_delete"
-            android:drawableStart="@drawable/trash_simple"
-            app:layout_constraintTop_toBottomOf="@id/action_settings"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"/>
+            <androidx.appcompat.widget.AppCompatTextView
+                android:onClick="@{settingsClickListener}"
+                style="@style/context_menu_action_label_style"
+                android:id="@+id/action_settings"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="17dp"
+                android:layout_marginEnd="17dp"
+                android:background="@drawable/action_background"
+                android:text="@string/manage_account_settings"
+                android:drawableStart="@drawable/user_gear"
+                app:layout_constraintTop_toTopOf="@id/actions_background"
+                app:layout_constraintStart_toStartOf="@id/actions_background"
+                app:layout_constraintEnd_toEndOf="@id/actions_background"/>
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1dp"
+                android:background="@color/blue_light"
+                app:layout_constraintStart_toStartOf="@id/action_settings"
+                app:layout_constraintEnd_toEndOf="@id/action_settings"
+                app:layout_constraintTop_toBottomOf="@+id/action_settings"/>
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:onClick="@{deleteClickListener}"
+                style="@style/context_menu_danger_action_label_style"
+                android:id="@+id/action_delete"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="17dp"
+                android:layout_marginEnd="17dp"
+                android:background="@drawable/action_background"
+                android:text="@string/manage_account_delete"
+                android:drawableStart="@drawable/trash_simple"
+                app:layout_constraintTop_toBottomOf="@id/action_settings"
+                app:layout_constraintStart_toStartOf="@id/actions_background"
+                app:layout_constraintEnd_toEndOf="@id/actions_background"/>
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </ScrollView>
 
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/call_list_cell.xml b/app/src/main/res/layout/call_list_cell.xml
index c673157fa..0f54880a9 100644
--- a/app/src/main/res/layout/call_list_cell.xml
+++ b/app/src/main/res/layout/call_list_cell.xml
@@ -26,7 +26,7 @@
         android:onLongClickListener="@{onLongClickListener}"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/cell_background">
+        android:background="@drawable/primary_cell_background">
 
         <io.getstream.avatarview.AvatarView
             android:id="@+id/avatar"
diff --git a/app/src/main/res/layout/call_suggestion_list_cell.xml b/app/src/main/res/layout/call_suggestion_list_cell.xml
index 56e298ffb..bb1900ec3 100644
--- a/app/src/main/res/layout/call_suggestion_list_cell.xml
+++ b/app/src/main/res/layout/call_suggestion_list_cell.xml
@@ -14,7 +14,7 @@
         android:onClick="@{() -> model.onClicked()}"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/cell_background"
+        android:background="@drawable/primary_cell_background"
         android:layout_marginStart="16dp"
         android:layout_marginEnd="16dp">
 
diff --git a/app/src/main/res/layout/contact_device_trust_list_cell.xml b/app/src/main/res/layout/contact_device_trust_list_cell.xml
index 08f0da561..0f1ad5131 100644
--- a/app/src/main/res/layout/contact_device_trust_list_cell.xml
+++ b/app/src/main/res/layout/contact_device_trust_list_cell.xml
@@ -16,7 +16,7 @@
         android:layout_height="wrap_content"
         android:paddingTop="8dp"
         android:paddingBottom="8dp"
-        android:background="@drawable/cell_background">
+        android:background="@drawable/secondary_cell_background">
 
         <androidx.constraintlayout.widget.Barrier
             android:id="@+id/end_barrier"
diff --git a/app/src/main/res/layout/contact_favourite_list_cell.xml b/app/src/main/res/layout/contact_favourite_list_cell.xml
index bf9b77344..8b4e63a38 100644
--- a/app/src/main/res/layout/contact_favourite_list_cell.xml
+++ b/app/src/main/res/layout/contact_favourite_list_cell.xml
@@ -23,7 +23,7 @@
         android:layout_width="75dp"
         android:layout_height="wrap_content"
         android:padding="5dp"
-        android:background="@drawable/cell_background">
+        android:background="@drawable/primary_cell_background">
 
         <io.getstream.avatarview.AvatarView
             android:id="@+id/avatar"
diff --git a/app/src/main/res/layout/contact_fragment.xml b/app/src/main/res/layout/contact_fragment.xml
index 3020ae533..adf66b4ce 100644
--- a/app/src/main/res/layout/contact_fragment.xml
+++ b/app/src/main/res/layout/contact_fragment.xml
@@ -486,14 +486,12 @@
                     android:drawableStart="@drawable/pencil_simple"
                     android:background="@drawable/action_background"
                     app:layout_constraintTop_toTopOf="@id/actions_background"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"/>
+                    app:layout_constraintStart_toStartOf="@id/actions_background"
+                    app:layout_constraintEnd_toEndOf="@id/actions_background"/>
 
                 <View
                     android:layout_width="0dp"
                     android:layout_height="1dp"
-                    android:layout_marginStart="17dp"
-                    android:layout_marginEnd="17dp"
                     android:background="@color/blue_light"
                     app:layout_constraintStart_toStartOf="@id/action_edit"
                     app:layout_constraintEnd_toEndOf="@id/action_edit"
@@ -512,14 +510,12 @@
                     android:drawableStart="@{viewModel.isFavourite ? @drawable/heart_fill : @drawable/heart, default=@drawable/heart_fill}"
                     android:drawableTint="@{viewModel.isFavourite ? @color/red_danger : @color/gray_1, default=@color/gray_1}"
                     app:layout_constraintTop_toBottomOf="@id/action_edit"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"/>
+                    app:layout_constraintStart_toStartOf="@id/actions_background"
+                    app:layout_constraintEnd_toEndOf="@id/actions_background"/>
 
                 <View
                     android:layout_width="0dp"
                     android:layout_height="1dp"
-                    android:layout_marginStart="17dp"
-                    android:layout_marginEnd="17dp"
                     android:background="@color/blue_light"
                     app:layout_constraintStart_toStartOf="@id/action_favorite"
                     app:layout_constraintEnd_toEndOf="@id/action_favorite"
@@ -537,14 +533,12 @@
                     android:text="@string/contact_details_share"
                     android:drawableStart="@drawable/share_network"
                     app:layout_constraintTop_toBottomOf="@id/action_favorite"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"/>
+                    app:layout_constraintStart_toStartOf="@id/actions_background"
+                    app:layout_constraintEnd_toEndOf="@id/actions_background"/>
 
                 <View
                     android:layout_width="0dp"
                     android:layout_height="1dp"
-                    android:layout_marginStart="17dp"
-                    android:layout_marginEnd="17dp"
                     android:background="@color/blue_light"
                     app:layout_constraintStart_toStartOf="@id/action_share"
                     app:layout_constraintEnd_toEndOf="@id/action_share"
@@ -562,8 +556,8 @@
                     android:text="@string/contact_details_delete"
                     android:drawableStart="@drawable/trash_simple"
                     app:layout_constraintTop_toBottomOf="@id/action_share"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"/>
+                    app:layout_constraintStart_toStartOf="@id/actions_background"
+                    app:layout_constraintEnd_toEndOf="@id/actions_background"/>
 
                 <View
                     android:id="@+id/anchor"
diff --git a/app/src/main/res/layout/contact_list_cell.xml b/app/src/main/res/layout/contact_list_cell.xml
index 7c26182bf..1539222cf 100644
--- a/app/src/main/res/layout/contact_list_cell.xml
+++ b/app/src/main/res/layout/contact_list_cell.xml
@@ -32,7 +32,7 @@
             android:layout_width="0dp"
             android:layout_height="0dp"
             android:layout_marginStart="5dp"
-            android:src="@drawable/cell_background"
+            android:src="@drawable/primary_cell_background"
             app:layout_constraintStart_toEndOf="@id/header"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
diff --git a/app/src/main/res/layout/contact_number_address_list_cell.xml b/app/src/main/res/layout/contact_number_address_list_cell.xml
index 5d7853dc6..cf978a1f4 100644
--- a/app/src/main/res/layout/contact_number_address_list_cell.xml
+++ b/app/src/main/res/layout/contact_number_address_list_cell.xml
@@ -17,7 +17,7 @@
         android:selected="@{model.selected}"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/cell_background">
+        android:background="@drawable/secondary_cell_background">
 
         <androidx.appcompat.widget.AppCompatTextView
             style="@style/default_text_style_700"
diff --git a/app/src/main/res/layout/dialog_number_address_list_cell.xml b/app/src/main/res/layout/dialog_number_address_list_cell.xml
index 81b522819..b62f6c416 100644
--- a/app/src/main/res/layout/dialog_number_address_list_cell.xml
+++ b/app/src/main/res/layout/dialog_number_address_list_cell.xml
@@ -16,7 +16,7 @@
         android:selected="@{model.selected}"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/cell_background">
+        android:background="@drawable/primary_cell_background">
 
         <androidx.appcompat.widget.AppCompatTextView
             style="@style/default_text_style_700"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 893ee8aa3..25689c64c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -108,6 +108,10 @@
     <string name="manage_account_details_title">Details</string>
     <string name="manage_account_add_picture">Add a picture</string>
     <string name="manage_account_edit_picture">Edit picture</string>
+    <string name="manage_account_status_connected_summary">This account in online, everybody can call you.</string>
+    <string name="manage_account_status_cleared_summary">Account has been disabled, you won\'t receive any call or message.</string>
+    <string name="manage_account_status_progress_summary">Account is connecting to the server, please wait…</string>
+    <string name="manage_account_status_failed_summary">Account connection failed, check your settings.</string>
     <string name="manage_account_change_mode">Change mode</string>
     <string name="manage_account_international_prefix">International Prefix</string>
     <string name="manage_account_settings">Account settings</string>