diff --git a/app/src/main/java/org/linphone/ui/main/MainActivity.kt b/app/src/main/java/org/linphone/ui/main/MainActivity.kt
index d88a2e0bb..3f5878096 100644
--- a/app/src/main/java/org/linphone/ui/main/MainActivity.kt
+++ b/app/src/main/java/org/linphone/ui/main/MainActivity.kt
@@ -75,13 +75,13 @@ class MainActivity : AppCompatActivity() {
         drawerMenuViewModel.startAssistantEvent.observe(this) {
             it.consume {
                 startActivity(Intent(baseContext, AssistantActivity::class.java))
-                binding.sideMenu.close()
+                binding.drawerMenu.close()
             }
         }
 
         drawerMenuViewModel.closeDrawerEvent.observe(this) {
             it.consume {
-                binding.sideMenu.close()
+                binding.drawerMenu.close()
             }
         }
     }
@@ -122,10 +122,10 @@ class MainActivity : AppCompatActivity() {
     }
 
     fun toggleDrawerMenu() {
-        if (binding.sideMenu.isDrawerOpen(Gravity.LEFT)) {
-            binding.sideMenu.closeDrawer(binding.sideMenuContent, true)
+        if (binding.drawerMenu.isDrawerOpen(Gravity.LEFT)) {
+            binding.drawerMenu.closeDrawer(binding.drawerMenuContent, true)
         } else {
-            binding.sideMenu.openDrawer(binding.sideMenuContent, true)
+            binding.drawerMenu.openDrawer(binding.drawerMenuContent, true)
         }
     }
 
diff --git a/app/src/main/java/org/linphone/ui/main/calls/model/CallLogModel.kt b/app/src/main/java/org/linphone/ui/main/calls/model/CallLogModel.kt
index e91a6a95e..698969d06 100644
--- a/app/src/main/java/org/linphone/ui/main/calls/model/CallLogModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/calls/model/CallLogModel.kt
@@ -12,6 +12,8 @@ class CallLogModel(val callLog: CallLog) {
 
     val address = if (callLog.dir == Dir.Outgoing) callLog.remoteAddress else callLog.fromAddress
 
+    val displayedAddress = address.asStringUriOnly()
+
     val avatarModel: ContactAvatarModel
 
     val isOutgoing = MutableLiveData<Boolean>()
diff --git a/app/src/main/java/org/linphone/ui/main/contacts/model/ContactDeviceModel.kt b/app/src/main/java/org/linphone/ui/main/contacts/model/ContactDeviceModel.kt
index 0e0b53047..9dcf68797 100644
--- a/app/src/main/java/org/linphone/ui/main/contacts/model/ContactDeviceModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/contacts/model/ContactDeviceModel.kt
@@ -22,4 +22,9 @@ package org.linphone.ui.main.contacts.model
 class ContactDeviceModel(
     val name: String,
     val trusted: Boolean
-)
+) {
+    fun startCallToDevice() {
+        // UI thread
+        // TODO
+    }
+}
diff --git a/app/src/main/res/color/primary_button_label_color.xml b/app/src/main/res/color/primary_button_label_color.xml
new file mode 100644
index 000000000..67ab79f0d
--- /dev/null
+++ b/app/src/main/res/color/primary_button_label_color.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false" android:color="@color/white" />
+    <item android:state_pressed="true" android:color="@color/white" />
+    <item android:color="@color/white"/>
+</selector>
diff --git a/app/src/main/res/color/secondary_button_label_color.xml b/app/src/main/res/color/secondary_button_label_color.xml
new file mode 100644
index 000000000..af19c785a
--- /dev/null
+++ b/app/src/main/res/color/secondary_button_label_color.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false" android:color="@color/primary_color" />
+    <item android:state_pressed="true" android:color="@color/white" />
+    <item android:color="@color/primary_color"/>
+</selector>
diff --git a/app/src/main/res/color/tertiary_button_label_color.xml b/app/src/main/res/color/tertiary_button_label_color.xml
new file mode 100644
index 000000000..dcd1ec9d2
--- /dev/null
+++ b/app/src/main/res/color/tertiary_button_label_color.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false" android:color="@color/primary_color" />
+    <item android:state_pressed="true" android:color="@color/primary_color" />
+    <item android:color="@color/primary_color"/>
+</selector>
diff --git a/app/src/main/res/drawable/primary_button_background.xml b/app/src/main/res/drawable/primary_button_background.xml
new file mode 100644
index 000000000..69ae79fba
--- /dev/null
+++ b/app/src/main/res/drawable/primary_button_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_enabled="false"
+        android:drawable="@drawable/shape_primary_button_disabled_background" />
+    <item android:state_pressed="true"
+        android:drawable="@drawable/shape_primary_button_pressed_background" />
+    <item
+        android:drawable="@drawable/shape_primary_button_background" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/secondary_button_background.xml b/app/src/main/res/drawable/secondary_button_background.xml
new file mode 100644
index 000000000..d002e4e5c
--- /dev/null
+++ b/app/src/main/res/drawable/secondary_button_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_enabled="false"
+        android:drawable="@drawable/shape_secondary_button_disabled_background" />
+    <item android:state_pressed="true"
+        android:drawable="@drawable/shape_secondary_button_pressed_background" />
+    <item
+        android:drawable="@drawable/shape_secondary_button_background" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_answer_button_background.xml b/app/src/main/res/drawable/shape_answer_button_background.xml
index 3b8ff1a6a..f4b346b75 100644
--- a/app/src/main/res/drawable/shape_answer_button_background.xml
+++ b/app/src/main/res/drawable/shape_answer_button_background.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <corners android:radius="71dp" />
     <solid android:color="@color/green_online"/>
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/conversation_cell_unread_count_background.xml b/app/src/main/res/drawable/shape_conversation_cell_unread_count_background.xml
similarity index 100%
rename from app/src/main/res/drawable/conversation_cell_unread_count_background.xml
rename to app/src/main/res/drawable/shape_conversation_cell_unread_count_background.xml
diff --git a/app/src/main/res/drawable/shape_orange_filled_button_background.xml b/app/src/main/res/drawable/shape_primary_button_background.xml
similarity index 100%
rename from app/src/main/res/drawable/shape_orange_filled_button_background.xml
rename to app/src/main/res/drawable/shape_primary_button_background.xml
diff --git a/app/src/main/res/drawable/shape_primary_button_disabled_background.xml b/app/src/main/res/drawable/shape_primary_button_disabled_background.xml
new file mode 100644
index 000000000..9979db9ef
--- /dev/null
+++ b/app/src/main/res/drawable/shape_primary_button_disabled_background.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <corners android:radius="48dp" />
+    <solid android:color="@color/primary_color_disabled"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_primary_button_pressed_background.xml b/app/src/main/res/drawable/shape_primary_button_pressed_background.xml
new file mode 100644
index 000000000..4d212f8c6
--- /dev/null
+++ b/app/src/main/res/drawable/shape_primary_button_pressed_background.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <corners android:radius="48dp" />
+    <solid android:color="@color/primary_color_pressed"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_orange_outlined_button_background.xml b/app/src/main/res/drawable/shape_secondary_button_background.xml
similarity index 100%
rename from app/src/main/res/drawable/shape_orange_outlined_button_background.xml
rename to app/src/main/res/drawable/shape_secondary_button_background.xml
diff --git a/app/src/main/res/drawable/shape_secondary_button_disabled_background.xml b/app/src/main/res/drawable/shape_secondary_button_disabled_background.xml
new file mode 100644
index 000000000..9979db9ef
--- /dev/null
+++ b/app/src/main/res/drawable/shape_secondary_button_disabled_background.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <corners android:radius="48dp" />
+    <solid android:color="@color/primary_color_disabled"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_secondary_button_pressed_background.xml b/app/src/main/res/drawable/shape_secondary_button_pressed_background.xml
new file mode 100644
index 000000000..d1be0cfad
--- /dev/null
+++ b/app/src/main/res/drawable/shape_secondary_button_pressed_background.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <corners android:radius="48dp" />
+    <solid android:color="@color/primary_color"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_chip_orange_background.xml b/app/src/main/res/drawable/shape_tertiary_button_background.xml
similarity index 100%
rename from app/src/main/res/drawable/shape_chip_orange_background.xml
rename to app/src/main/res/drawable/shape_tertiary_button_background.xml
diff --git a/app/src/main/res/drawable/shape_tertiary_button_disabled_background.xml b/app/src/main/res/drawable/shape_tertiary_button_disabled_background.xml
new file mode 100644
index 000000000..9979db9ef
--- /dev/null
+++ b/app/src/main/res/drawable/shape_tertiary_button_disabled_background.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <corners android:radius="48dp" />
+    <solid android:color="@color/primary_color_disabled"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_tertiary_button_pressed_background.xml b/app/src/main/res/drawable/shape_tertiary_button_pressed_background.xml
new file mode 100644
index 000000000..c05beaba3
--- /dev/null
+++ b/app/src/main/res/drawable/shape_tertiary_button_pressed_background.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <corners android:radius="48dp" />
+    <solid android:color="@color/warning_orange_pressed_background"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/tertiary_button_background.xml b/app/src/main/res/drawable/tertiary_button_background.xml
new file mode 100644
index 000000000..2c40a0d99
--- /dev/null
+++ b/app/src/main/res/drawable/tertiary_button_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_enabled="false"
+        android:drawable="@drawable/shape_tertiary_button_disabled_background" />
+    <item android:state_pressed="true"
+        android:drawable="@drawable/shape_tertiary_button_pressed_background" />
+    <item
+        android:drawable="@drawable/shape_tertiary_button_background" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/contacts_list_fragment.xml b/app/src/main/res/layout-land/contacts_list_fragment.xml
index b4c7de033..cb57ebd6e 100644
--- a/app/src/main/res/layout-land/contacts_list_fragment.xml
+++ b/app/src/main/res/layout-land/contacts_list_fragment.xml
@@ -110,7 +110,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="4dp"
             android:layout_marginEnd="4dp"
-            android:layout_marginTop="16dp"
+            android:layout_marginTop="8dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/bottom_nav_bar"
             app:layout_constraintTop_toBottomOf="@id/favourites_label" />
@@ -134,7 +134,7 @@
             android:id="@+id/contactsList"
             android:layout_width="0dp"
             android:layout_height="0dp"
-            android:layout_marginTop="20dp"
+            android:layout_marginTop="8dp"
             android:layout_marginStart="10dp"
             android:layout_marginEnd="10dp"
             app:layout_constraintStart_toEndOf="@id/bottom_nav_bar"
diff --git a/app/src/main/res/layout/assistant_login_fragment.xml b/app/src/main/res/layout/assistant_login_fragment.xml
index f931d9074..20e47a481 100644
--- a/app/src/main/res/layout/assistant_login_fragment.xml
+++ b/app/src/main/res/layout/assistant_login_fragment.xml
@@ -97,32 +97,23 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"/>
 
-            <ImageView
-                android:id="@+id/login_background"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
-                android:src="@drawable/shape_orange_filled_button_background"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="@id/login"
-                app:layout_constraintBottom_toBottomOf="@id/login" />
-
             <androidx.appcompat.widget.AppCompatTextView
                 style="@style/default_text_style_600"
                 android:id="@+id/login"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="32dp"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp"
                 android:paddingTop="13dp"
                 android:paddingBottom="13dp"
                 android:paddingStart="20dp"
                 android:paddingEnd="20dp"
                 android:text="Login"
                 android:textSize="18sp"
-                android:textColor="@color/white"
-                android:gravity="center_vertical"
+                android:textColor="@color/primary_button_label_color"
+                android:gravity="center"
+                android:background="@drawable/primary_button_background"
                 app:layout_constraintTop_toBottomOf="@id/password"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent" />
@@ -179,65 +170,47 @@
                 app:layout_constraintTop_toTopOf="@id/or"
                 app:layout_constraintBottom_toBottomOf="@id/or"/>
 
-            <ImageView
-                android:id="@+id/scan_qr_code_background"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
-                android:src="@drawable/shape_orange_outlined_button_background"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="@id/scan_qr_code"
-                app:layout_constraintBottom_toBottomOf="@id/scan_qr_code" />
-
             <androidx.appcompat.widget.AppCompatTextView
                 style="@style/default_text_style_600"
                 android:id="@+id/scan_qr_code"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="22dp"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp"
                 android:paddingTop="13dp"
                 android:paddingBottom="13dp"
                 android:paddingStart="20dp"
                 android:paddingEnd="20dp"
                 android:text="Scan QR code"
                 android:textSize="18sp"
-                android:textColor="@color/primary_color"
-                android:gravity="center_vertical"
+                android:textColor="@color/secondary_button_label_color"
+                android:gravity="center"
+                android:background="@drawable/secondary_button_background"
                 android:drawableStart="@drawable/invite"
                 android:drawablePadding="8dp"
-                app:drawableTint="@color/primary_color"
+                app:drawableTint="@color/secondary_button_label_color"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/or" />
 
-            <ImageView
-                android:id="@+id/third_party_sip_account_background"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
-                android:src="@drawable/shape_orange_outlined_button_background"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="@id/third_party_sip_account"
-                app:layout_constraintBottom_toBottomOf="@id/third_party_sip_account" />
-
             <androidx.appcompat.widget.AppCompatTextView
                 style="@style/default_text_style_600"
                 android:id="@+id/third_party_sip_account"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="16dp"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp"
                 android:paddingTop="13dp"
                 android:paddingBottom="13dp"
                 android:paddingStart="20dp"
                 android:paddingEnd="20dp"
                 android:text="Use third party SIP account"
                 android:textSize="18sp"
-                android:textColor="@color/primary_color"
-                android:gravity="center_vertical"
+                android:textColor="@color/secondary_button_label_color"
+                android:gravity="center"
+                android:background="@drawable/secondary_button_background"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/scan_qr_code" />
@@ -260,16 +233,6 @@
                 app:layout_constraintTop_toTopOf="@id/register"
                 app:layout_constraintBottom_toBottomOf="@id/register"/>
 
-            <ImageView
-                android:id="@+id/register_background"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:src="@drawable/shape_orange_outlined_button_background"
-                app:layout_constraintStart_toStartOf="@id/register"
-                app:layout_constraintEnd_toEndOf="@id/register"
-                app:layout_constraintTop_toTopOf="@id/register"
-                app:layout_constraintBottom_toBottomOf="@id/register" />
-
             <androidx.appcompat.widget.AppCompatTextView
                 android:onClick="@{registerClickListener}"
                 style="@style/default_text_style_600"
@@ -285,8 +248,9 @@
                 android:paddingEnd="20dp"
                 android:text="Register"
                 android:textSize="18sp"
-                android:textColor="@color/primary_color"
-                android:gravity="center_vertical"
+                android:textColor="@color/secondary_button_label_color"
+                android:gravity="center"
+                android:background="@drawable/secondary_button_background"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toEndOf="@id/no_account_yet"
                 app:layout_constraintTop_toBottomOf="@id/third_party_sip_account"
diff --git a/app/src/main/res/layout/assistant_register_fragment.xml b/app/src/main/res/layout/assistant_register_fragment.xml
index 0a4a0b36a..9be0c96bb 100644
--- a/app/src/main/res/layout/assistant_register_fragment.xml
+++ b/app/src/main/res/layout/assistant_register_fragment.xml
@@ -128,32 +128,21 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"/>
 
-            <ImageView
-                android:id="@+id/create_background"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
-                android:src="@drawable/shape_orange_filled_button_background"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="@id/create"
-                app:layout_constraintBottom_toBottomOf="@id/create" />
-
             <androidx.appcompat.widget.AppCompatTextView
                 style="@style/default_text_style_600"
                 android:id="@+id/create"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="32dp"
                 android:paddingTop="13dp"
                 android:paddingBottom="13dp"
-                android:paddingStart="20dp"
-                android:paddingEnd="20dp"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp"
                 android:text="Create"
                 android:textSize="18sp"
-                android:textColor="@color/white"
-                android:gravity="center_vertical"
+                android:textColor="@color/primary_button_label_color"
+                android:gravity="center"
+                android:background="@drawable/primary_button_background"
                 app:layout_constraintTop_toBottomOf="@id/password"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent" />
@@ -172,16 +161,6 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"/>
 
-            <ImageView
-                android:id="@+id/create_email_account_background"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:src="@drawable/shape_orange_outlined_button_background"
-                app:layout_constraintStart_toStartOf="@id/create_email_account"
-                app:layout_constraintEnd_toEndOf="@id/create_email_account"
-                app:layout_constraintTop_toTopOf="@id/create_email_account"
-                app:layout_constraintBottom_toBottomOf="@id/create_email_account" />
-
             <androidx.appcompat.widget.AppCompatTextView
                 style="@style/default_text_style_600"
                 android:id="@+id/create_email_account"
@@ -194,8 +173,9 @@
                 android:paddingEnd="12dp"
                 android:text="subscribe.linphone.org"
                 android:textSize="13sp"
-                android:textColor="@color/primary_color"
-                android:gravity="center_vertical"
+                android:textColor="@color/secondary_button_label_color"
+                android:gravity="center"
+                android:background="@drawable/secondary_button_background"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/create_email_account_label" />
@@ -218,16 +198,6 @@
                 app:layout_constraintTop_toTopOf="@id/login"
                 app:layout_constraintBottom_toBottomOf="@id/login"/>
 
-            <ImageView
-                android:id="@+id/login_background"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:src="@drawable/shape_orange_outlined_button_background"
-                app:layout_constraintStart_toStartOf="@id/login"
-                app:layout_constraintEnd_toEndOf="@id/login"
-                app:layout_constraintTop_toTopOf="@id/login"
-                app:layout_constraintBottom_toBottomOf="@id/login" />
-
             <androidx.appcompat.widget.AppCompatTextView
                 android:onClick="@{loginClickListener}"
                 style="@style/default_text_style_600"
@@ -243,8 +213,9 @@
                 android:paddingEnd="20dp"
                 android:text="Login"
                 android:textSize="18sp"
-                android:textColor="@color/primary_color"
-                android:gravity="center_vertical"
+                android:textColor="@color/secondary_button_label_color"
+                android:gravity="center"
+                android:background="@drawable/secondary_button_background"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toEndOf="@id/already_an_account"
                 app:layout_constraintTop_toBottomOf="@id/create_email_account"
diff --git a/app/src/main/res/layout/call_fragment.xml b/app/src/main/res/layout/call_fragment.xml
index fd749aecc..65326c6c7 100644
--- a/app/src/main/res/layout/call_fragment.xml
+++ b/app/src/main/res/layout/call_fragment.xml
@@ -99,6 +99,18 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/avatar" />
 
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/default_text_style"
+                    android:id="@+id/address"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@{viewModel.callLogModel.displayedAddress, default=`+33601020304`}"
+                    android:textColor="@color/gray_8"
+                    android:textSize="14sp"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/name" />
+
                 <androidx.appcompat.widget.AppCompatTextView
                     style="@style/default_text_style_300"
                     android:id="@+id/status"
@@ -110,7 +122,7 @@
                     android:textSize="14sp"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/name" />
+                    app:layout_constraintTop_toBottomOf="@id/address" />
 
                 <ImageView
                     android:onClick="@{() -> viewModel.startAudioCall()}"
diff --git a/app/src/main/res/layout/chat_room_list_cell.xml b/app/src/main/res/layout/chat_room_list_cell.xml
index df843a9b9..938487d0f 100644
--- a/app/src/main/res/layout/chat_room_list_cell.xml
+++ b/app/src/main/res/layout/chat_room_list_cell.xml
@@ -101,7 +101,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="10dp"
-            android:background="@drawable/conversation_cell_unread_count_background"
+            android:background="@drawable/shape_conversation_cell_unread_count_background"
             android:ellipsize="end"
             android:gravity="center"
             android:singleLine="true"
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 a8ac1a3c3..cb0911ca2 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
@@ -53,13 +53,14 @@
             app:layout_constraintEnd_toEndOf="parent" />
 
         <androidx.appcompat.widget.AppCompatTextView
+            android:onClick="@{() -> model.startCallToDevice()}"
             style="@style/default_text_style_600"
             android:id="@+id/verify_device"
             android:visibility="@{model.trusted ? View.GONE : View.VISIBLE}"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="10dp"
-            android:background="@drawable/shape_chip_orange_background"
+            android:background="@drawable/tertiary_button_background"
             android:paddingStart="12dp"
             android:paddingEnd="12dp"
             android:paddingTop="6dp"
@@ -68,10 +69,11 @@
             android:drawableStart="@drawable/warning"
             android:drawablePadding="8dp"
             android:text="Vérifier l'appareil"
-            android:textColor="@color/primary_color"
+            android:textColor="@color/tertiary_button_label_color"
             android:textSize="13sp"
             android:maxLines="1"
             android:ellipsize="end"
+            app:drawableTint="@color/tertiary_button_label_color"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"/>
diff --git a/app/src/main/res/layout/contacts_list_fragment.xml b/app/src/main/res/layout/contacts_list_fragment.xml
index 4c0e1ba94..8d95df2db 100644
--- a/app/src/main/res/layout/contacts_list_fragment.xml
+++ b/app/src/main/res/layout/contacts_list_fragment.xml
@@ -101,7 +101,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="4dp"
             android:layout_marginEnd="4dp"
-            android:layout_marginTop="5dp"
+            android:layout_marginTop="8dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/favourites_label" />
@@ -126,7 +126,7 @@
             android:id="@+id/contactsList"
             android:layout_width="0dp"
             android:layout_height="0dp"
-            android:layout_marginTop="20dp"
+            android:layout_marginTop="8dp"
             android:layout_marginStart="10dp"
             android:layout_marginEnd="10dp"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/drawer_menu.xml b/app/src/main/res/layout/drawer_menu.xml
index 4a7b12a29..3e73c7095 100644
--- a/app/src/main/res/layout/drawer_menu.xml
+++ b/app/src/main/res/layout/drawer_menu.xml
@@ -53,7 +53,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@id/brand_name"
-            app:layout_constraintBottom_toTopOf="@id/add_account_background">
+            app:layout_constraintBottom_toTopOf="@id/add_account">
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -69,25 +69,14 @@
 
         </ScrollView>
 
-        <ImageView
-            android:onClick="@{() -> viewModel.addAccount()}"
-            android:id="@+id/add_account_background"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
-            android:src="@drawable/shape_orange_outlined_button_background"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="@id/add_account"
-            app:layout_constraintBottom_toBottomOf="@id/add_account" />
-
         <androidx.appcompat.widget.AppCompatTextView
             android:onClick="@{() -> viewModel.addAccount()}"
             style="@style/default_text_style_600"
             android:id="@+id/add_account"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
             android:layout_marginBottom="30dp"
             android:paddingTop="13dp"
             android:paddingBottom="13dp"
@@ -95,11 +84,12 @@
             android:paddingEnd="20dp"
             android:text="Add an account"
             android:textSize="18sp"
-            android:textColor="@color/primary_color"
-            android:gravity="center_vertical"
+            android:textColor="@color/secondary_button_label_color"
+            android:gravity="center"
             android:drawableStart="@drawable/add"
             android:drawablePadding="8dp"
-            app:drawableTint="@color/primary_color"
+            app:drawableTint="@color/secondary_button_label_color"
+            android:background="@drawable/secondary_button_background"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintBottom_toTopOf="@id/separator" />
diff --git a/app/src/main/res/layout/main_activity.xml b/app/src/main/res/layout/main_activity.xml
index 7aa0bba7f..ea2d7a81f 100644
--- a/app/src/main/res/layout/main_activity.xml
+++ b/app/src/main/res/layout/main_activity.xml
@@ -19,7 +19,7 @@
             android:layout_height="match_parent">
 
             <androidx.drawerlayout.widget.DrawerLayout
-                android:id="@+id/side_menu"
+                android:id="@+id/drawer_menu"
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
                 app:layout_constraintTop_toTopOf="parent"
@@ -35,7 +35,7 @@
 
                     <!-- Side Menu -->
                     <RelativeLayout
-                        android:id="@+id/side_menu_content"
+                        android:id="@+id/drawer_menu_content"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
                         android:background="@color/white"
diff --git a/app/src/main/res/layout/voip_incoming_call_bottom_bar.xml b/app/src/main/res/layout/voip_incoming_call_bottom_bar.xml
index 2cd214b08..b688cf6f5 100644
--- a/app/src/main/res/layout/voip_incoming_call_bottom_bar.xml
+++ b/app/src/main/res/layout/voip_incoming_call_bottom_bar.xml
@@ -13,40 +13,41 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:background="@color/in_call_black"
         android:paddingTop="15dp"
-        android:paddingBottom="15dp"
-        android:background="@color/in_call_black">
+        android:paddingBottom="15dp">
 
         <ImageView
-            android:onClick="@{() -> viewModel.hangUp()}"
             android:id="@+id/hang_up"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="30dp"
+            android:background="@drawable/shape_hang_up_button_background"
+            android:onClick="@{() -> viewModel.hangUp()}"
             android:paddingStart="30dp"
-            android:paddingEnd="30dp"
             android:paddingTop="15dp"
+            android:paddingEnd="30dp"
             android:paddingBottom="15dp"
             android:src="@drawable/hang_up"
-            android:background="@drawable/shape_hang_up_button_background"
-            app:tint="@color/white"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent" />
+            app:layout_constraintEnd_toStartOf="@id/answer_call"
+            app:layout_constraintStart_toStartOf="parent"
+            app:tint="@color/white" />
 
         <ImageView
-            android:onClick="@{() -> viewModel.answer()}"
             android:id="@+id/answer_call"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_marginEnd="30dp"
-            android:padding="15dp"
-            android:src="@drawable/calls"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:background="@drawable/shape_answer_button_background"
-            app:tint="@color/white"
-            app:layout_constraintDimensionRatio="1:1"
-            app:layout_constraintTop_toTopOf="@id/hang_up"
-            app:layout_constraintBottom_toBottomOf="@id/hang_up"
-            app:layout_constraintEnd_toEndOf="parent" />
+            android:onClick="@{() -> viewModel.answer()}"
+            android:paddingStart="30dp"
+            android:paddingTop="15dp"
+            android:paddingEnd="30dp"
+            android:paddingBottom="15dp"
+            android:src="@drawable/calls"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@id/hang_up"
+            app:tint="@color/white" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 4c0d18b52..78a0a53be 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="primary_color">#FF5E00</color>
+    <color name="primary_color_disabled">#FFEACB</color>
+    <color name="primary_color_pressed">#B72D00</color>
 
     <color name="black">#000000</color>
     <color name="white">#FFFFFF</color>
@@ -11,6 +13,7 @@
     <color name="gray_incoming_message">#F4F4F7</color>
     <color name="trusted_blue">#4AA8FF</color>
     <color name="warning_orange_background">#FFEACB</color>
+    <color name="warning_orange_pressed_background">#FFB266</color>
     <color name="dialog_background">#22334D</color>
 
     <color name="gray_1">#6C7A87</color>