diff --git a/app/src/main/java/org/linphone/ui/GenericActivity.kt b/app/src/main/java/org/linphone/ui/GenericActivity.kt
index 6eb20d8d0..ddcf12f1e 100644
--- a/app/src/main/java/org/linphone/ui/GenericActivity.kt
+++ b/app/src/main/java/org/linphone/ui/GenericActivity.kt
@@ -59,12 +59,15 @@ open class GenericActivity : AppCompatActivity() {
         mainColor = corePreferences.themeMainColor
         val theme = super.theme
         when (mainColor) {
-            "yellow" -> theme.applyStyle(R.style.Theme_LinphoneYellow, true)
-            "green" -> theme.applyStyle(R.style.Theme_LinphoneGreen, true)
-            "blue" -> theme.applyStyle(R.style.Theme_LinphoneBlue, true)
-            "red" -> theme.applyStyle(R.style.Theme_LinphoneRed, true)
-            "pink" -> theme.applyStyle(R.style.Theme_LinphonePink, true)
-            "purple" -> theme.applyStyle(R.style.Theme_LinphonePurple, true)
+            "terracotta" -> theme.applyStyle(R.style.Theme_LinphoneTerracotta, true)
+            "lavender" -> theme.applyStyle(R.style.Theme_LinphoneLavender, true)
+            "honey" -> theme.applyStyle(R.style.Theme_LinphoneHoney, true)
+            "burgundy" -> theme.applyStyle(R.style.Theme_LinphoneBurgundy, true)
+            "mint" -> theme.applyStyle(R.style.Theme_LinphoneMint, true)
+            "coral" -> theme.applyStyle(R.style.Theme_LinphoneCoral, true)
+            "plum" -> theme.applyStyle(R.style.Theme_LinphonePlum, true)
+            "titanium" -> theme.applyStyle(R.style.Theme_LinphoneTitanium, true)
+            "mineral_blue" -> theme.applyStyle(R.style.Theme_LinphoneMineralBlue, true)
             else -> theme.applyStyle(R.style.Theme_Linphone, true)
         }
         return theme
diff --git a/app/src/main/java/org/linphone/ui/call/CallActivity.kt b/app/src/main/java/org/linphone/ui/call/CallActivity.kt
index b5ab81ac6..befed1851 100644
--- a/app/src/main/java/org/linphone/ui/call/CallActivity.kt
+++ b/app/src/main/java/org/linphone/ui/call/CallActivity.kt
@@ -115,12 +115,15 @@ class CallActivity : GenericActivity() {
         val mainColor = corePreferences.themeMainColor
         val theme = super.getTheme()
         when (mainColor) {
-            "yellow" -> theme.applyStyle(R.style.Theme_LinphoneInCallYellow, true)
-            "green" -> theme.applyStyle(R.style.Theme_LinphoneInCallGreen, true)
-            "blue" -> theme.applyStyle(R.style.Theme_LinphoneInCallBlue, true)
-            "red" -> theme.applyStyle(R.style.Theme_LinphoneInCallRed, true)
-            "pink" -> theme.applyStyle(R.style.Theme_LinphoneInCallPink, true)
-            "purple" -> theme.applyStyle(R.style.Theme_LinphoneInCallPurple, true)
+            "terracotta" -> theme.applyStyle(R.style.Theme_LinphoneInCallTerracotta, true)
+            "lavender" -> theme.applyStyle(R.style.Theme_LinphoneInCallLavender, true)
+            "honey" -> theme.applyStyle(R.style.Theme_LinphoneInCallHoney, true)
+            "burgundy" -> theme.applyStyle(R.style.Theme_LinphoneInCallBurgundy, true)
+            "mint" -> theme.applyStyle(R.style.Theme_LinphoneInCallMint, true)
+            "coral" -> theme.applyStyle(R.style.Theme_LinphoneInCallCoral, true)
+            "plum" -> theme.applyStyle(R.style.Theme_LinphoneInCallPlum, true)
+            "titanium" -> theme.applyStyle(R.style.Theme_LinphoneInCallTitanium, true)
+            "mineral_blue" -> theme.applyStyle(R.style.Theme_LinphoneInCallMineralBlue, true)
             else -> theme.applyStyle(R.style.Theme_LinphoneInCall, true)
         }
         return theme
diff --git a/app/src/main/java/org/linphone/ui/main/settings/viewmodel/SettingsViewModel.kt b/app/src/main/java/org/linphone/ui/main/settings/viewmodel/SettingsViewModel.kt
index 4aa6cf27e..e3b81a2a9 100644
--- a/app/src/main/java/org/linphone/ui/main/settings/viewmodel/SettingsViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/settings/viewmodel/SettingsViewModel.kt
@@ -177,21 +177,27 @@ class SettingsViewModel
     val color = MutableLiveData<String>()
     val availableColorsNames = arrayListOf(
         AppUtils.getString(R.string.orange),
-        AppUtils.getString(R.string.yellow),
-        AppUtils.getString(R.string.green),
-        AppUtils.getString(R.string.blue),
-        AppUtils.getString(R.string.red),
-        AppUtils.getString(R.string.pink),
-        AppUtils.getString(R.string.purple)
+        AppUtils.getString(R.string.terracotta),
+        AppUtils.getString(R.string.lavender),
+        AppUtils.getString(R.string.honey),
+        AppUtils.getString(R.string.burgundy),
+        AppUtils.getString(R.string.mint),
+        AppUtils.getString(R.string.coral),
+        AppUtils.getString(R.string.plum),
+        AppUtils.getString(R.string.titanium),
+        AppUtils.getString(R.string.mineral_blue),
     )
     val availableColorsValues = arrayListOf(
         "orange",
-        "yellow",
-        "green",
-        "blue",
-        "red",
-        "pink",
-        "purple"
+        "terracotta",
+        "lavender",
+        "honey",
+        "burgundy",
+        "mint",
+        "coral",
+        "plum",
+        "titanium",
+        "mineral_blue"
     )
 
     // Tunnel settings
diff --git a/app/src/main/res/color/primary_button_label_color.xml b/app/src/main/res/color/primary_button_label_color.xml
index 0a60ac460..508123094 100644
--- a/app/src/main/res/color/primary_button_label_color.xml
+++ b/app/src/main/res/color/primary_button_label_color.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_enabled="false"
-        android:color="?attr/color_on_main" />
+        android:color="?attr/color_bottom_sheet_disabled_menu" />
     <item android:state_pressed="true"
-        android:color="?attr/color_on_main" />
+        android:color="?attr/color_main1_500" />
     <item android:state_hovered="true"
-        android:color="?attr/color_on_main" />
+        android:color="?attr/color_main1_500" />
     <item
         android:color="?attr/color_on_main"/>
 </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
index beeab10b4..8dc895ca9 100644
--- a/app/src/main/res/color/secondary_button_label_color.xml
+++ b/app/src/main/res/color/secondary_button_label_color.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_enabled="false"
-        android:color="?attr/color_main1_500" />
+        android:color="?attr/color_bottom_sheet_disabled_menu" />
     <item android:state_pressed="true"
-        android:color="?attr/color_main2_000" />
+        android:color="?attr/color_on_main" />
     <item android:state_hovered="true"
-        android:color="?attr/color_main2_000" />
+        android:color="?attr/color_on_main" />
     <item
         android:color="?attr/color_main1_500"/>
 </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
index 5bf48c62c..cbd4ea641 100644
--- a/app/src/main/res/color/tertiary_button_label_color.xml
+++ b/app/src/main/res/color/tertiary_button_label_color.xml
@@ -1,7 +1,7 @@
 <?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/gray_400" />
-    <item android:state_pressed="true" android:color="?attr/color_main1_500" />
-    <item android:state_hovered="true" android:color="?attr/color_main1_500" />
-    <item android:color="?attr/color_main1_500"/>
+    <item android:state_pressed="true" android:color="@color/gray_main2_600" />
+    <item android:state_hovered="true" android:color="@color/gray_main2_600" />
+    <item android:color="@color/gray_main2_600"/>
 </selector>
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
index 64e0de18a..c91ceb247 100644
--- a/app/src/main/res/drawable/shape_primary_button_disabled_background.xml
+++ b/app/src/main/res/drawable/shape_primary_button_disabled_background.xml
@@ -1,5 +1,6 @@
 <?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="?attr/color_main1_100_alpha_50"/>
+    <stroke android:color="?attr/color_grey_200" android:width="1dp" />
+    <solid android:color="?attr/color_main2_000"/>
 </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
index d6f55a8dd..00e88a9e7 100644
--- a/app/src/main/res/drawable/shape_primary_button_pressed_background.xml
+++ b/app/src/main/res/drawable/shape_primary_button_pressed_background.xml
@@ -1,5 +1,6 @@
 <?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="?attr/color_main1_700"/>
+    <stroke android:color="?attr/color_main1_500" android:width="1dp" />
+    <solid android:color="?attr/color_main2_000"/>
 </shape>
\ No newline at end of file
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
index 41e28b7e1..c91ceb247 100644
--- a/app/src/main/res/drawable/shape_secondary_button_disabled_background.xml
+++ b/app/src/main/res/drawable/shape_secondary_button_disabled_background.xml
@@ -1,5 +1,6 @@
 <?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/orange_main_100_alpha_50"/>
+    <stroke android:color="?attr/color_grey_200" android:width="1dp" />
+    <solid android:color="?attr/color_main2_000"/>
 </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
index 812b57ca4..15b76f8ab 100644
--- a/app/src/main/res/drawable/shape_tertiary_button_pressed_background.xml
+++ b/app/src/main/res/drawable/shape_tertiary_button_pressed_background.xml
@@ -1,5 +1,6 @@
 <?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="?attr/color_main1_300"/>
+    <stroke android:color="?attr/color_main1_100" android:width="1dp" />
+    <solid android:color="?attr/color_main2_000"/>
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/voice_recording_gradient_progress.xml b/app/src/main/res/drawable/voice_recording_gradient_progress.xml
index 41d9172f9..75d088561 100644
--- a/app/src/main/res/drawable/voice_recording_gradient_progress.xml
+++ b/app/src/main/res/drawable/voice_recording_gradient_progress.xml
@@ -5,7 +5,7 @@
         <shape>
             <corners android:radius="70dp"/>
             <gradient
-                android:startColor="?attr/color_main1_300"
+                android:startColor="?attr/color_main1_100"
                 android:endColor="?attr/color_main1_500"
                 />
         </shape>
diff --git a/app/src/main/res/layout-land/call_media_encryption_stats_bottom_sheet.xml b/app/src/main/res/layout-land/call_media_encryption_stats_bottom_sheet.xml
index 31004917c..ed9cfa403 100644
--- a/app/src/main/res/layout-land/call_media_encryption_stats_bottom_sheet.xml
+++ b/app/src/main/res/layout-land/call_media_encryption_stats_bottom_sheet.xml
@@ -140,8 +140,6 @@
                 android:onClick="@{() -> model.showSasValidationDialog()}"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:paddingStart="20dp"
-                android:paddingEnd="20dp"
                 android:layout_margin="15dp"
                 android:text="@string/call_do_zrtp_sas_validation_again"
                 android:visibility="@{model.isMediaEncryptionZrtp ? View.VISIBLE : View.GONE}"
diff --git a/app/src/main/res/layout-land/meeting_waiting_room_fragment.xml b/app/src/main/res/layout-land/meeting_waiting_room_fragment.xml
index d5b35db6e..0938f07ad 100644
--- a/app/src/main/res/layout-land/meeting_waiting_room_fragment.xml
+++ b/app/src/main/res/layout-land/meeting_waiting_room_fragment.xml
@@ -188,8 +188,6 @@
             android:layout_marginStart="16dp"
             android:layout_marginEnd="16dp"
             android:layout_marginBottom="@dimen/screen_bottom_margin"
-            android:paddingStart="20dp"
-            android:paddingEnd="20dp"
             android:text="@string/meeting_waiting_room_join"
             app:layout_constraintWidth_max="@dimen/button_max_width"
             app:layout_constraintBottom_toBottomOf="parent"
@@ -258,8 +256,6 @@
                 android:layout_marginStart="16dp"
                 android:layout_marginEnd="16dp"
                 android:layout_marginBottom="@dimen/screen_bottom_margin"
-                android:paddingStart="20dp"
-                android:paddingEnd="20dp"
                 android:text="@string/meeting_waiting_room_cancel"
                 app:layout_constraintWidth_max="@dimen/button_max_width"
                 app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout-land/welcome_activity.xml b/app/src/main/res/layout-land/welcome_activity.xml
index e6daa7030..4e8860346 100644
--- a/app/src/main/res/layout-land/welcome_activity.xml
+++ b/app/src/main/res/layout-land/welcome_activity.xml
@@ -99,8 +99,6 @@
                 android:layout_marginStart="16dp"
                 android:layout_marginEnd="16dp"
                 android:layout_marginBottom="16dp"
-                android:paddingStart="20dp"
-                android:paddingEnd="20dp"
                 android:text="@string/next"
                 app:layout_constraintWidth_max="@dimen/button_max_width"
                 app:layout_constraintTop_toBottomOf="@id/dots_indicator"
diff --git a/app/src/main/res/layout-sw600dp/assistant_landing_fragment.xml b/app/src/main/res/layout-sw600dp/assistant_landing_fragment.xml
index 530afcab0..8e5c02417 100644
--- a/app/src/main/res/layout-sw600dp/assistant_landing_fragment.xml
+++ b/app/src/main/res/layout-sw600dp/assistant_landing_fragment.xml
@@ -131,8 +131,6 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="40dp"
                     android:layout_marginEnd="40dp"
-                    android:paddingStart="20dp"
-                    android:paddingEnd="20dp"
                     android:text="@string/assistant_account_register"
                     android:visibility="@{viewModel.hideCreateAccount ? View.GONE : View.VISIBLE}"
                     app:layout_constraintEnd_toEndOf="parent"
@@ -232,8 +230,6 @@
                     android:layout_marginTop="32dp"
                     android:layout_marginStart="16dp"
                     android:layout_marginEnd="16dp"
-                    android:paddingStart="20dp"
-                    android:paddingEnd="20dp"
                     android:text="@string/assistant_account_login"
                     app:layout_constraintWidth_max="@dimen/button_max_width"
                     app:layout_constraintTop_toBottomOf="@id/password"
@@ -268,8 +264,6 @@
                     android:layout_marginTop="32dp"
                     android:layout_marginStart="16dp"
                     android:layout_marginEnd="16dp"
-                    android:paddingStart="20dp"
-                    android:paddingEnd="20dp"
                     android:text="@string/assistant_scan_qr_code"
                     android:drawableStart="@drawable/qr_code"
                     android:drawablePadding="8dp"
@@ -289,8 +283,6 @@
                     android:layout_marginTop="16dp"
                     android:layout_marginStart="16dp"
                     android:layout_marginEnd="16dp"
-                    android:paddingStart="20dp"
-                    android:paddingEnd="20dp"
                     android:text="@string/assistant_login_third_party_sip_account"
                     android:visibility="@{viewModel.hideThirdPartyAccount ? View.GONE : View.VISIBLE}"
                     app:layout_constraintStart_toStartOf="@id/title"
diff --git a/app/src/main/res/layout-sw600dp/assistant_permissions_fragment.xml b/app/src/main/res/layout-sw600dp/assistant_permissions_fragment.xml
index 89425630e..159807eaa 100644
--- a/app/src/main/res/layout-sw600dp/assistant_permissions_fragment.xml
+++ b/app/src/main/res/layout-sw600dp/assistant_permissions_fragment.xml
@@ -214,8 +214,6 @@
                 android:layout_marginStart="16dp"
                 android:layout_marginEnd="16dp"
                 android:layout_marginTop="32dp"
-                android:paddingStart="20dp"
-                android:paddingEnd="20dp"
                 android:text="@string/assistant_permissions_skip_permissions"
                 app:layout_constraintWidth_max="@dimen/button_max_width"
                 app:layout_constraintVertical_bias="1"
@@ -233,8 +231,6 @@
                 android:layout_marginStart="16dp"
                 android:layout_marginEnd="16dp"
                 android:layout_marginTop="16dp"
-                android:paddingStart="20dp"
-                android:paddingEnd="20dp"
                 android:text="@string/assistant_permissions_grant_all_of_them"
                 app:layout_constraintWidth_max="@dimen/button_max_width"
                 app:layout_constraintTop_toBottomOf="@id/skip"
diff --git a/app/src/main/res/layout-sw600dp/assistant_register_fragment.xml b/app/src/main/res/layout-sw600dp/assistant_register_fragment.xml
index 298f6d9ff..2bbc5fae8 100644
--- a/app/src/main/res/layout-sw600dp/assistant_register_fragment.xml
+++ b/app/src/main/res/layout-sw600dp/assistant_register_fragment.xml
@@ -424,8 +424,6 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="40dp"
-                    android:paddingStart="20dp"
-                    android:paddingEnd="20dp"
                     android:text="@string/assistant_account_login"
                     app:layout_constraintVertical_bias="1"
                     app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout-sw600dp/assistant_third_party_sip_account_login_fragment.xml b/app/src/main/res/layout-sw600dp/assistant_third_party_sip_account_login_fragment.xml
index 6a92b1ea3..812c62812 100644
--- a/app/src/main/res/layout-sw600dp/assistant_third_party_sip_account_login_fragment.xml
+++ b/app/src/main/res/layout-sw600dp/assistant_third_party_sip_account_login_fragment.xml
@@ -286,8 +286,6 @@
                     android:layout_marginStart="16dp"
                     android:layout_marginEnd="16dp"
                     android:layout_marginBottom="@dimen/screen_bottom_margin"
-                    android:paddingStart="20dp"
-                    android:paddingEnd="20dp"
                     android:text="@string/assistant_account_login"
                     app:layout_constraintWidth_max="@dimen/button_max_width"
                     app:layout_constraintTop_toBottomOf="@id/transport"
diff --git a/app/src/main/res/layout-sw600dp/assistant_third_party_sip_account_warning_fragment.xml b/app/src/main/res/layout-sw600dp/assistant_third_party_sip_account_warning_fragment.xml
index e7ee848a2..580007b65 100644
--- a/app/src/main/res/layout-sw600dp/assistant_third_party_sip_account_warning_fragment.xml
+++ b/app/src/main/res/layout-sw600dp/assistant_third_party_sip_account_warning_fragment.xml
@@ -148,8 +148,6 @@
                 android:layout_marginTop="32dp"
                 android:layout_marginStart="16dp"
                 android:layout_marginEnd="16dp"
-                android:paddingStart="20dp"
-                android:paddingEnd="20dp"
                 android:text="@string/assistant_third_party_sip_account_create_linphone_account"
                 app:layout_constraintWidth_max="@dimen/button_max_width"
                 app:layout_constraintVertical_bias="1"
@@ -167,8 +165,6 @@
                 android:layout_marginTop="16dp"
                 android:layout_marginStart="16dp"
                 android:layout_marginEnd="16dp"
-                android:paddingStart="20dp"
-                android:paddingEnd="20dp"
                 android:text="@string/assistant_third_party_sip_account_warning_ok"
                 app:layout_constraintWidth_max="@dimen/button_max_width"
                 app:layout_constraintTop_toBottomOf="@id/create_linphone_account"
diff --git a/app/src/main/res/layout-sw600dp/welcome_activity.xml b/app/src/main/res/layout-sw600dp/welcome_activity.xml
index 4ae60e388..7124a3715 100644
--- a/app/src/main/res/layout-sw600dp/welcome_activity.xml
+++ b/app/src/main/res/layout-sw600dp/welcome_activity.xml
@@ -101,8 +101,6 @@
                 android:layout_marginStart="16dp"
                 android:layout_marginEnd="16dp"
                 android:layout_marginBottom="16dp"
-                android:paddingStart="20dp"
-                android:paddingEnd="20dp"
                 android:text="@string/next"
                 app:layout_constraintWidth_max="@dimen/button_max_width"
                 app:layout_constraintTop_toBottomOf="@id/dots_indicator"
diff --git a/app/src/main/res/layout/account_profile_device_list_cell.xml b/app/src/main/res/layout/account_profile_device_list_cell.xml
index 31f157e87..72af82d8c 100644
--- a/app/src/main/res/layout/account_profile_device_list_cell.xml
+++ b/app/src/main/res/layout/account_profile_device_list_cell.xml
@@ -35,10 +35,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             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_device_remove"
             android:maxLines="1"
diff --git a/app/src/main/res/layout/account_profile_secure_mode_fragment.xml b/app/src/main/res/layout/account_profile_secure_mode_fragment.xml
index ade93a06c..cc7640827 100644
--- a/app/src/main/res/layout/account_profile_secure_mode_fragment.xml
+++ b/app/src/main/res/layout/account_profile_secure_mode_fragment.xml
@@ -196,8 +196,6 @@
                     android:layout_marginBottom="@dimen/screen_bottom_margin"
                     android:layout_marginStart="16dp"
                     android:layout_marginEnd="16dp"
-                    android:paddingStart="20dp"
-                    android:paddingEnd="20dp"
                     android:text="@string/manage_account_choose_mode_apply_label"
                     app:layout_constraintWidth_max="@dimen/button_max_width"
                     app:layout_constraintVertical_bias="1"
diff --git a/app/src/main/res/layout/assistant_landing_fragment.xml b/app/src/main/res/layout/assistant_landing_fragment.xml
index e2e015e38..5c622735a 100644
--- a/app/src/main/res/layout/assistant_landing_fragment.xml
+++ b/app/src/main/res/layout/assistant_landing_fragment.xml
@@ -176,8 +176,6 @@
                     android:layout_marginTop="32dp"
                     android:layout_marginStart="16dp"
                     android:layout_marginEnd="16dp"
-                    android:paddingStart="20dp"
-                    android:paddingEnd="20dp"
                     android:text="@string/assistant_account_login"
                     app:layout_constraintWidth_max="@dimen/button_max_width"
                     app:layout_constraintTop_toBottomOf="@id/password"
@@ -247,8 +245,6 @@
                     android:layout_marginTop="22dp"
                     android:layout_marginStart="16dp"
                     android:layout_marginEnd="16dp"
-                    android:paddingStart="20dp"
-                    android:paddingEnd="20dp"
                     android:text="@string/assistant_scan_qr_code"
                     android:drawableStart="@drawable/qr_code"
                     android:drawablePadding="8dp"
@@ -268,8 +264,6 @@
                     android:layout_marginTop="16dp"
                     android:layout_marginStart="16dp"
                     android:layout_marginEnd="16dp"
-                    android:paddingStart="20dp"
-                    android:paddingEnd="20dp"
                     android:text="@string/assistant_login_third_party_sip_account"
                     android:visibility="@{viewModel.hideThirdPartyAccount ? View.GONE : View.VISIBLE}"
                     app:layout_constraintWidth_max="@dimen/button_max_width"
@@ -303,8 +297,6 @@
                     android:layout_marginStart="20dp"
                     android:layout_marginEnd="10dp"
                     android:layout_marginBottom="@dimen/screen_bottom_margin"
-                    android:paddingStart="20dp"
-                    android:paddingEnd="20dp"
                     android:text="@string/assistant_account_register"
                     android:visibility="@{viewModel.hideCreateAccount ? View.GONE : View.VISIBLE}"
                     app:layout_constraintVertical_bias="1"
diff --git a/app/src/main/res/layout/assistant_permissions_fragment.xml b/app/src/main/res/layout/assistant_permissions_fragment.xml
index 2b7e608a9..c55297b42 100644
--- a/app/src/main/res/layout/assistant_permissions_fragment.xml
+++ b/app/src/main/res/layout/assistant_permissions_fragment.xml
@@ -213,8 +213,6 @@
                 android:layout_marginStart="16dp"
                 android:layout_marginEnd="16dp"
                 android:layout_marginBottom="20dp"
-                android:paddingStart="20dp"
-                android:paddingEnd="20dp"
                 android:text="@string/assistant_permissions_skip_permissions"
                 app:layout_constraintWidth_max="@dimen/button_max_width"
                 app:layout_constraintVertical_bias="1"
@@ -233,8 +231,6 @@
                 android:layout_marginStart="16dp"
                 android:layout_marginEnd="16dp"
                 android:layout_marginBottom="@dimen/screen_bottom_margin"
-                android:paddingStart="20dp"
-                android:paddingEnd="20dp"
                 android:text="@string/assistant_permissions_grant_all_of_them"
                 app:layout_constraintWidth_max="@dimen/button_max_width"
                 app:layout_constraintTop_toBottomOf="@id/skip"
diff --git a/app/src/main/res/layout/assistant_recover_account_fragment.xml b/app/src/main/res/layout/assistant_recover_account_fragment.xml
index f11d3fac2..99551d6bd 100644
--- a/app/src/main/res/layout/assistant_recover_account_fragment.xml
+++ b/app/src/main/res/layout/assistant_recover_account_fragment.xml
@@ -112,8 +112,6 @@
                     android:layout_marginTop="24dp"
                     android:layout_marginStart="16dp"
                     android:layout_marginEnd="16dp"
-                    android:paddingStart="20dp"
-                    android:paddingEnd="20dp"
                     android:text="@string/assistant_recover_email_account_label"
                     app:layout_constraintWidth_max="@dimen/button_max_width"
                     app:layout_constraintStart_toStartOf="parent"
@@ -130,8 +128,6 @@
                     android:layout_marginTop="24dp"
                     android:layout_marginStart="16dp"
                     android:layout_marginEnd="16dp"
-                    android:paddingStart="20dp"
-                    android:paddingEnd="20dp"
                     android:text="@string/assistant_recover_phone_number_account_label"
                     app:layout_constraintWidth_max="@dimen/button_max_width"
                     app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/assistant_register_fragment.xml b/app/src/main/res/layout/assistant_register_fragment.xml
index 726cadfdc..b5f893275 100644
--- a/app/src/main/res/layout/assistant_register_fragment.xml
+++ b/app/src/main/res/layout/assistant_register_fragment.xml
@@ -377,8 +377,6 @@
                     android:layout_marginTop="34dp"
                     android:layout_marginStart="20dp"
                     android:layout_marginBottom="@dimen/screen_bottom_margin"
-                    android:paddingStart="20dp"
-                    android:paddingEnd="20dp"
                     android:text="@string/assistant_account_login"
                     app:layout_constraintVertical_bias="1"
                     app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/assistant_third_party_sip_account_login_fragment.xml b/app/src/main/res/layout/assistant_third_party_sip_account_login_fragment.xml
index 773b37767..53a18588b 100644
--- a/app/src/main/res/layout/assistant_third_party_sip_account_login_fragment.xml
+++ b/app/src/main/res/layout/assistant_third_party_sip_account_login_fragment.xml
@@ -391,8 +391,6 @@
                     android:layout_marginStart="16dp"
                     android:layout_marginEnd="16dp"
                     android:layout_marginBottom="@dimen/screen_bottom_margin"
-                    android:paddingStart="20dp"
-                    android:paddingEnd="20dp"
                     android:text="@string/assistant_account_login"
                     app:layout_constraintWidth_max="@dimen/button_max_width"
                     app:layout_constraintVertical_bias="1"
diff --git a/app/src/main/res/layout/assistant_third_party_sip_account_warning_fragment.xml b/app/src/main/res/layout/assistant_third_party_sip_account_warning_fragment.xml
index d0cd132e2..5d382797c 100644
--- a/app/src/main/res/layout/assistant_third_party_sip_account_warning_fragment.xml
+++ b/app/src/main/res/layout/assistant_third_party_sip_account_warning_fragment.xml
@@ -129,8 +129,6 @@
                 android:layout_marginStart="16dp"
                 android:layout_marginEnd="16dp"
                 android:layout_marginBottom="20dp"
-                android:paddingStart="20dp"
-                android:paddingEnd="20dp"
                 android:text="@string/assistant_third_party_sip_account_create_linphone_account"
                 app:layout_constraintWidth_max="@dimen/button_max_width"
                 app:layout_constraintVertical_bias="1"
@@ -149,8 +147,6 @@
                 android:layout_marginStart="16dp"
                 android:layout_marginEnd="16dp"
                 android:layout_marginBottom="@dimen/screen_bottom_margin"
-                android:paddingStart="20dp"
-                android:paddingEnd="20dp"
                 android:text="@string/assistant_third_party_sip_account_warning_ok"
                 app:layout_constraintWidth_max="@dimen/button_max_width"
                 app:layout_constraintTop_toBottomOf="@id/create_linphone_account"
diff --git a/app/src/main/res/layout/call_media_encryption_stats_bottom_sheet.xml b/app/src/main/res/layout/call_media_encryption_stats_bottom_sheet.xml
index dc9321dc5..e25eb89c1 100644
--- a/app/src/main/res/layout/call_media_encryption_stats_bottom_sheet.xml
+++ b/app/src/main/res/layout/call_media_encryption_stats_bottom_sheet.xml
@@ -134,8 +134,6 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_margin="15dp"
-                android:paddingStart="20dp"
-                android:paddingEnd="20dp"
                 android:text="@string/call_do_zrtp_sas_validation_again"
                 android:layout_gravity="center_horizontal"
                 android:visibility="@{model.isMediaEncryptionZrtp ? View.VISIBLE : View.GONE}"/>
diff --git a/app/src/main/res/layout/chat_bubble_meeting_invite_content.xml b/app/src/main/res/layout/chat_bubble_meeting_invite_content.xml
index 178a57ad6..b5db66407 100644
--- a/app/src/main/res/layout/chat_bubble_meeting_invite_content.xml
+++ b/app/src/main/res/layout/chat_bubble_meeting_invite_content.xml
@@ -235,10 +235,6 @@
             android:layout_marginBottom="10dp"
             android:layout_marginTop="10dp"
             android:background="@drawable/tertiary_button_background"
-            android:paddingStart="12dp"
-            android:paddingEnd="12dp"
-            android:paddingTop="6dp"
-            android:paddingBottom="6dp"
             android:gravity="center"
             android:text="@string/meeting_waiting_room_join"
             android:maxLines="1"
diff --git a/app/src/main/res/layout/chat_info_fragment.xml b/app/src/main/res/layout/chat_info_fragment.xml
index 745d4a600..5dd2ec24f 100644
--- a/app/src/main/res/layout/chat_info_fragment.xml
+++ b/app/src/main/res/layout/chat_info_fragment.xml
@@ -397,10 +397,6 @@
                         android:gravity="center"
                         android:maxLines="1"
                         android:onClick="@{addParticipantsClickListener}"
-                        android:paddingStart="16dp"
-                        android:paddingTop="10dp"
-                        android:paddingEnd="16dp"
-                        android:paddingBottom="10dp"
                         android:text="@string/conversation_info_add_participants_label"
                         android:visibility="@{!viewModel.expandParticipants || !viewModel.isMyselfAdmin || !viewModel.isGroup || viewModel.isReadOnly ? View.GONE : View.VISIBLE, default=gone}"
                         app:drawableTint="?attr/color_main1_500"
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 97a2c9a86..c99443912 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
@@ -60,10 +60,6 @@
             android:layout_height="wrap_content"
             android:layout_marginEnd="10dp"
             android:background="@drawable/tertiary_button_background"
-            android:paddingStart="12dp"
-            android:paddingEnd="12dp"
-            android:paddingTop="6dp"
-            android:paddingBottom="6dp"
             android:gravity="center"
             android:drawableStart="@drawable/warning_circle"
             android:drawablePadding="8dp"
diff --git a/app/src/main/res/layout/drawer_menu.xml b/app/src/main/res/layout/drawer_menu.xml
index a1e8a8861..08e26d434 100644
--- a/app/src/main/res/layout/drawer_menu.xml
+++ b/app/src/main/res/layout/drawer_menu.xml
@@ -131,8 +131,6 @@
                 android:layout_marginStart="16dp"
                 android:layout_marginEnd="16dp"
                 android:layout_marginBottom="15dp"
-                android:paddingStart="20dp"
-                android:paddingEnd="20dp"
                 android:text="@string/drawer_menu_add_account"
                 android:drawableStart="@drawable/plus_circle"
                 android:drawablePadding="8dp"
diff --git a/app/src/main/res/layout/help_debug_fragment.xml b/app/src/main/res/layout/help_debug_fragment.xml
index fcff9683b..d3f54ce50 100644
--- a/app/src/main/res/layout/help_debug_fragment.xml
+++ b/app/src/main/res/layout/help_debug_fragment.xml
@@ -75,10 +75,6 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:background="@drawable/tertiary_button_background"
-                        android:paddingStart="12dp"
-                        android:paddingEnd="12dp"
-                        android:paddingTop="6dp"
-                        android:paddingBottom="6dp"
                         android:gravity="center"
                         android:text="@string/help_troubleshooting_clean_logs"
                         android:maxLines="1"
@@ -92,10 +88,6 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:background="@drawable/tertiary_button_background"
-                        android:paddingStart="12dp"
-                        android:paddingEnd="12dp"
-                        android:paddingTop="6dp"
-                        android:paddingBottom="6dp"
                         android:gravity="center"
                         android:text="@string/help_troubleshooting_share_logs"
                         android:maxLines="1"
@@ -334,10 +326,6 @@
                         android:layout_marginEnd="16dp"
                         android:layout_marginTop="20dp"
                         android:background="@drawable/tertiary_button_background"
-                        android:paddingStart="12dp"
-                        android:paddingEnd="12dp"
-                        android:paddingTop="6dp"
-                        android:paddingBottom="6dp"
                         android:gravity="center"
                         android:text="@string/help_troubleshooting_show_config_file"
                         android:maxLines="1"
diff --git a/app/src/main/res/layout/help_fragment.xml b/app/src/main/res/layout/help_fragment.xml
index 589bf8fe8..f26cb80b0 100644
--- a/app/src/main/res/layout/help_fragment.xml
+++ b/app/src/main/res/layout/help_fragment.xml
@@ -240,10 +240,6 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:background="@drawable/tertiary_button_background"
-                            android:paddingStart="12dp"
-                            android:paddingEnd="12dp"
-                            android:paddingTop="6dp"
-                            android:paddingBottom="6dp"
                             android:gravity="center"
                             android:text="@string/help_about_check_for_update"
                             android:maxLines="1"
diff --git a/app/src/main/res/layout/meeting_fragment.xml b/app/src/main/res/layout/meeting_fragment.xml
index 1fccc9f63..9ebecc928 100644
--- a/app/src/main/res/layout/meeting_fragment.xml
+++ b/app/src/main/res/layout/meeting_fragment.xml
@@ -345,8 +345,6 @@
                 android:layout_marginStart="16dp"
                 android:layout_marginEnd="16dp"
                 android:layout_marginBottom="@dimen/screen_bottom_margin"
-                android:paddingStart="20dp"
-                android:paddingEnd="20dp"
                 android:text="@string/meeting_info_join_title"
                 app:layout_constraintWidth_max="@dimen/button_max_width"
                 app:layout_constraintVertical_bias="1"
diff --git a/app/src/main/res/layout/meeting_waiting_room_fragment.xml b/app/src/main/res/layout/meeting_waiting_room_fragment.xml
index 276db70ac..3d5785ccb 100644
--- a/app/src/main/res/layout/meeting_waiting_room_fragment.xml
+++ b/app/src/main/res/layout/meeting_waiting_room_fragment.xml
@@ -184,8 +184,6 @@
             android:layout_marginStart="16dp"
             android:layout_marginEnd="16dp"
             android:layout_marginBottom="@dimen/screen_bottom_margin"
-            android:paddingStart="20dp"
-            android:paddingEnd="20dp"
             android:text="@string/meeting_waiting_room_join"
             app:layout_constraintWidth_max="@dimen/button_max_width"
             app:layout_constraintTop_toBottomOf="@id/toggle_mute_mic"
@@ -255,8 +253,6 @@
                 android:layout_marginStart="16dp"
                 android:layout_marginEnd="16dp"
                 android:layout_marginBottom="@dimen/screen_bottom_margin"
-                android:paddingStart="20dp"
-                android:paddingEnd="20dp"
                 android:text="@string/meeting_waiting_room_cancel"
                 app:layout_constraintWidth_max="@dimen/button_max_width"
                 app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/settings_advanced_fragment.xml b/app/src/main/res/layout/settings_advanced_fragment.xml
index f223468dc..4cfac67db 100644
--- a/app/src/main/res/layout/settings_advanced_fragment.xml
+++ b/app/src/main/res/layout/settings_advanced_fragment.xml
@@ -233,10 +233,6 @@
                         android:layout_marginTop="20dp"
                         android:layout_marginBottom="20dp"
                         android:background="@drawable/tertiary_button_background"
-                        android:paddingStart="12dp"
-                        android:paddingEnd="12dp"
-                        android:paddingTop="6dp"
-                        android:paddingBottom="6dp"
                         android:gravity="center"
                         android:text="@string/settings_advanced_download_apply_remote_provisioning"
                         android:maxLines="1"
diff --git a/app/src/main/res/layout/settings_developer_fragment.xml b/app/src/main/res/layout/settings_developer_fragment.xml
index 86ba8256d..bd52afe73 100644
--- a/app/src/main/res/layout/settings_developer_fragment.xml
+++ b/app/src/main/res/layout/settings_developer_fragment.xml
@@ -322,10 +322,6 @@
                         android:layout_marginEnd="16dp"
                         android:layout_marginTop="20dp"
                         android:background="@drawable/tertiary_button_background"
-                        android:paddingStart="12dp"
-                        android:paddingEnd="12dp"
-                        android:paddingTop="6dp"
-                        android:paddingBottom="6dp"
                         android:gravity="center"
                         android:text="@string/settings_developer_clear_native_friends_in_database_title"
                         android:maxLines="2"
@@ -362,12 +358,6 @@
                         android:layout_marginEnd="16dp"
                         android:layout_marginTop="20dp"
                         android:layout_marginBottom="20dp"
-                        android:background="@drawable/tertiary_button_background"
-                        android:paddingStart="12dp"
-                        android:paddingEnd="12dp"
-                        android:paddingTop="6dp"
-                        android:paddingBottom="6dp"
-                        android:gravity="center"
                         android:text="@string/settings_developer_clear_orphan_auth_info_title"
                         android:maxLines="2"
                         android:ellipsize="end"
diff --git a/app/src/main/res/layout/welcome_activity.xml b/app/src/main/res/layout/welcome_activity.xml
index 1505e3c29..9ece4c87a 100644
--- a/app/src/main/res/layout/welcome_activity.xml
+++ b/app/src/main/res/layout/welcome_activity.xml
@@ -102,8 +102,6 @@
                 android:layout_marginStart="16dp"
                 android:layout_marginEnd="16dp"
                 android:layout_marginBottom="16dp"
-                android:paddingStart="20dp"
-                android:paddingEnd="20dp"
                 android:text="@string/next"
                 app:layout_constraintWidth_max="@dimen/button_max_width"
                 app:layout_constraintTop_toBottomOf="@id/dots_indicator"
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 6512a5d77..52cc1056a 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -858,6 +858,15 @@
     <string name="red">Rouge</string>
     <string name="pink">Rose</string>
     <string name="purple">Violet</string>
+    <string name="terracotta">Terracotta</string>
+    <string name="lavender">Lavande</string>
+    <string name="honey">Miel</string>
+    <string name="burgundy">Bordeaux</string>
+    <string name="mint">Menthe</string>
+    <string name="coral">Corail</string>
+    <string name="plum">Prune</string>
+    <string name="titanium">Titane</string>
+    <string name="mineral_blue">Bleu Minéral</string>
 
     <!-- Misc -->
     <string name="list_filter_no_result_found">Aucun résultat…</string>
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index 02ca79985..4a4419f3a 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -14,10 +14,7 @@
         <item name="android:statusBarColor">?attr/color_main1_500</item>
 
         <item name="color_main1_100">@color/orange_main_100</item>
-        <item name="color_main1_100_alpha_50">@color/orange_main_100_alpha_50</item>
-        <item name="color_main1_300">@color/orange_main_300</item>
         <item name="color_main1_500">@color/orange_main_500</item>
-        <item name="color_main1_700">@color/orange_main_700</item>
 
         <item name="color_main2_000">@color/background_color_dark_mode</item>
         <item name="color_main2_100">@color/gray_main2_800</item>
@@ -86,57 +83,48 @@
         <item name="color_bottom_sheet_disabled_menu">@color/gray_500</item>
     </style>
 
-    <style name="Theme.LinphoneYellow" parent="Theme.Linphone">
-        <item name="color_main1_100">@color/yellow_main_100</item>
-        <item name="color_main1_100_alpha_50">@color/yellow_main_100_alpha_50</item>
-        <item name="color_main1_300">@color/yellow_main_300</item>
-        <item name="color_main1_500">@color/yellow_main_500</item>
-        <item name="color_main1_700">@color/yellow_main_700</item>
-        <item name="color_chat_bubble_outgoing">@color/gray_main2_700</item>
+    <style name="Theme.LinphoneTerracotta" parent="Theme.Linphone">
+        <item name="color_main1_100">@color/terracotta_main_100</item>
+        <item name="color_main1_500">@color/terracotta_main_500</item>
     </style>
 
-    <style name="Theme.LinphoneGreen" parent="Theme.Linphone">
-        <item name="color_main1_100">@color/green_main_100</item>
-        <item name="color_main1_100_alpha_50">@color/green_main_100_alpha_50</item>
-        <item name="color_main1_300">@color/green_main_300</item>
-        <item name="color_main1_500">@color/green_main_500</item>
-        <item name="color_main1_700">@color/green_main_700</item>
-        <item name="color_chat_bubble_outgoing">@color/gray_main2_700</item>
+    <style name="Theme.LinphoneLavender" parent="Theme.Linphone">
+        <item name="color_main1_100">@color/lavender_main_100</item>
+        <item name="color_main1_500">@color/lavender_main_500</item>
     </style>
 
-    <style name="Theme.LinphoneBlue" parent="Theme.Linphone">
-        <item name="color_main1_100">@color/blue_main_100</item>
-        <item name="color_main1_100_alpha_50">@color/blue_main_100_alpha_50</item>
-        <item name="color_main1_300">@color/blue_main_300</item>
-        <item name="color_main1_500">@color/blue_main_500</item>
-        <item name="color_main1_700">@color/blue_main_700</item>
-        <item name="color_chat_bubble_outgoing">@color/gray_main2_700</item>
+    <style name="Theme.LinphoneHoney" parent="Theme.Linphone">
+        <item name="color_main1_100">@color/honey_main_100</item>
+        <item name="color_main1_500">@color/honey_main_500</item>
     </style>
 
-    <style name="Theme.LinphoneRed" parent="Theme.Linphone">
-        <item name="color_main1_100">@color/red_main_100</item>
-        <item name="color_main1_100_alpha_50">@color/red_main_100_alpha_50</item>
-        <item name="color_main1_300">@color/red_main_300</item>
-        <item name="color_main1_500">@color/red_main_500</item>
-        <item name="color_main1_700">@color/red_main_700</item>
-        <item name="color_chat_bubble_outgoing">@color/gray_main2_700</item>
+    <style name="Theme.LinphoneBurgundy" parent="Theme.Linphone">
+        <item name="color_main1_100">@color/burgundy_main_100</item>
+        <item name="color_main1_500">@color/burgundy_main_500</item>
     </style>
 
-    <style name="Theme.LinphonePink" parent="Theme.Linphone">
-        <item name="color_main1_100">@color/pink_main_100</item>
-        <item name="color_main1_100_alpha_50">@color/pink_main_100_alpha_50</item>
-        <item name="color_main1_300">@color/pink_main_300</item>
-        <item name="color_main1_500">@color/pink_main_500</item>
-        <item name="color_main1_700">@color/pink_main_700</item>
-        <item name="color_chat_bubble_outgoing">@color/gray_main2_700</item>
+    <style name="Theme.LinphoneMint" parent="Theme.Linphone">
+        <item name="color_main1_100">@color/mint_main_100</item>
+        <item name="color_main1_500">@color/mint_main_500</item>
     </style>
 
-    <style name="Theme.LinphonePurple" parent="Theme.Linphone">
-        <item name="color_main1_100">@color/purple_main_100</item>
-        <item name="color_main1_100_alpha_50">@color/purple_main_100_alpha_50</item>
-        <item name="color_main1_300">@color/purple_main_300</item>
-        <item name="color_main1_500">@color/purple_main_500</item>
-        <item name="color_main1_700">@color/purple_main_700</item>
-        <item name="color_chat_bubble_outgoing">@color/gray_main2_700</item>
+    <style name="Theme.LinphoneCoral" parent="Theme.Linphone">
+        <item name="color_main1_100">@color/coral_main_100</item>
+        <item name="color_main1_500">@color/coral_main_500</item>
+    </style>
+
+    <style name="Theme.LinphonePlum" parent="Theme.Linphone">
+        <item name="color_main1_100">@color/plum_main_100</item>
+        <item name="color_main1_500">@color/plum_main_500</item>
+    </style>
+
+    <style name="Theme.LinphoneTitanium" parent="Theme.Linphone">
+        <item name="color_main1_100">@color/titanium_main_100</item>
+        <item name="color_main1_500">@color/titanium_main_500</item>
+    </style>
+
+    <style name="Theme.LinphoneMineralBlue" parent="Theme.Linphone">
+        <item name="color_main1_100">@color/mineral_blue_main_100</item>
+        <item name="color_main1_500">@color/mineral_blue_main_500</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 1d6352027..e4c801ef6 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -12,10 +12,7 @@
 
     <declare-styleable name="LinphoneAppTheme">
         <attr name="color_main1_100" format="color"/>
-        <attr name="color_main1_100_alpha_50" format="color"/>
-        <attr name="color_main1_300" format="color"/>
         <attr name="color_main1_500" format="color"/>
-        <attr name="color_main1_700" format="color"/>
 
         <attr name="color_main2_000" format="color"/>
         <attr name="color_main2_100" format="color"/>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 98036be3c..c2ae7003b 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -11,10 +11,7 @@
     <color name="background_color_alt_dark_mode">#303030</color>
 
     <color name="orange_main_100">#FFEACB</color>
-    <color name="orange_main_100_alpha_50">#80FFEACB</color>
-    <color name="orange_main_300">#FFB266</color>
     <color name="orange_main_500">#FF5E00</color>
-    <color name="orange_main_700">#B72D00</color>
 
     <color name="gray_main2_100">#EEF6F8</color>
     <color name="gray_main2_200">#DFECF2</color>
@@ -60,39 +57,31 @@
 
     <color name="gradient_progress">#80FFFFFF</color>
 
-    <color name="yellow_main_100">#FFF5D6</color>
-    <color name="yellow_main_100_alpha_50">#80FFF5D6</color>
-    <color name="yellow_main_300">#FFE799</color>
-    <color name="yellow_main_500">#F5BC00</color>
-    <color name="yellow_main_700">#A37D00</color>
+    <color name="terracotta_main_100">#F2D2C7</color>
+    <color name="terracotta_main_500">#C86B45</color>
 
-    <color name="green_main_100">#DCF9E7</color>
-    <color name="green_main_100_alpha_50">#80DCF9E7</color>
-    <color name="green_main_300">#A8F0C2</color>
-    <color name="green_main_500">#25D366</color>
-    <color name="green_main_700">#1C9C4B</color>
+    <color name="lavender_main_100">#E9E7F2</color>
+    <color name="lavender_main_500">#7F79B5</color>
 
-    <color name="blue_main_100">#D6F4FF</color>
-    <color name="blue_main_100_alpha_50">#80D6F4FF</color>
-    <color name="blue_main_300">#99E4FF</color>
-    <color name="blue_main_500">#00aff0</color>
-    <color name="blue_main_700">#0078A3</color>
+    <color name="honey_main_100">#FBFCE9</color>
+    <color name="honey_main_500">#D9A441</color>
 
-    <color name="red_main_100">#FBE1DA</color>
-    <color name="red_main_100_alpha_50">#80FBE1DA</color>
-    <color name="red_main_300">#F5B53A</color>
-    <color name="red_main_500">#E14318</color>
-    <color name="red_main_700">#A63211</color>
+    <color name="burgundy_main_100">#F6BBC3</color>
+    <color name="burgundy_main_500">#7A1E39</color>
 
-    <color name="pink_main_100">#FFD6F1</color>
-    <color name="pink_main_100_alpha_50">#80FFD6F1</color>
-    <color name="pink_main_300">#FF99DD</color>
-    <color name="pink_main_500">#FF00A9</color>
-    <color name="pink_main_700">#B8007A</color>
+    <color name="mint_main_100">#DEF2E8</color>
+    <color name="mint_main_500">#7AC9A1</color>
+
+    <color name="coral_main_100">#FFD3D6</color>
+    <color name="coral_main_500">#F26B5E</color>
+
+    <color name="plum_main_100">#DBBED9</color>
+    <color name="plum_main_500">#9B4F96</color>
+
+    <color name="titanium_main_100">#D9D9D9</color>
+    <color name="titanium_main_500">#8A939B</color>
+
+    <color name="mineral_blue_main_100">#C5E0F3</color>
+    <color name="mineral_blue_main_500">#669ED7</color>
 
-    <color name="purple_main_100">#FFD6FF</color>
-    <color name="purple_main_100_alpha_50">#80FFD6FF</color>
-    <color name="purple_main_300">#FF99FF</color>
-    <color name="purple_main_500">#800080</color>
-    <color name="purple_main_700">#520052</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimen.xml b/app/src/main/res/values/dimen.xml
index 001d3e61b..dc0eecb01 100644
--- a/app/src/main/res/values/dimen.xml
+++ b/app/src/main/res/values/dimen.xml
@@ -43,6 +43,9 @@
     <dimen name="selected_participant_cell_height">90dp</dimen>
 
     <dimen name="primary_secondary_buttons_label_padding">11dp</dimen>
+    <dimen name="primary_secondary_buttons_label_start_end_padding">20dp</dimen>
+    <dimen name="tertiary_buttons_label_top_bottom_padding">6dp</dimen>
+    <dimen name="tertiary_buttons_label_start_end_padding">12dp</dimen>
     <dimen name="dialog_top_bottom_margin">20dp</dimen>
 
     <dimen name="top_bar_rounded_corner_radius">20dp</dimen>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7348a6481..df201b613 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -901,6 +901,15 @@
     <string name="red">Red</string>
     <string name="pink">Pink</string>
     <string name="purple">Purple</string>
+    <string name="terracotta">Terracotta</string>
+    <string name="lavender">Lavender</string>
+    <string name="honey">Honey</string>
+    <string name="burgundy">Burgundy</string>
+    <string name="mint">Mint</string>
+    <string name="coral">Coral</string>
+    <string name="plum">Plum</string>
+    <string name="titanium">Titanium</string>
+    <string name="mineral_blue">Mineral Blue</string>
 
     <!-- Misc -->
     <string name="list_filter_no_result_found">No result found…</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 90fa697d8..9bcabea19 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -88,6 +88,8 @@
         <item name="android:background">@drawable/primary_button_background</item>
         <item name="android:paddingTop">@dimen/primary_secondary_buttons_label_padding</item>
         <item name="android:paddingBottom">@dimen/primary_secondary_buttons_label_padding</item>
+        <item name="android:paddingStart">@dimen/primary_secondary_buttons_label_start_end_padding</item>
+        <item name="android:paddingEnd">@dimen/primary_secondary_buttons_label_start_end_padding</item>
     </style>
     <style name="secondary_button_label_style">
         <item name="android:fontFamily">@font/noto_sans_600</item>
@@ -97,11 +99,19 @@
         <item name="android:background">@drawable/secondary_button_background</item>
         <item name="android:paddingTop">@dimen/primary_secondary_buttons_label_padding</item>
         <item name="android:paddingBottom">@dimen/primary_secondary_buttons_label_padding</item>
+        <item name="android:paddingStart">@dimen/primary_secondary_buttons_label_start_end_padding</item>
+        <item name="android:paddingEnd">@dimen/primary_secondary_buttons_label_start_end_padding</item>
     </style>
     <style name="tertiary_button_label_style">
         <item name="android:fontFamily">@font/noto_sans_600</item>
         <item name="android:textColor">@color/tertiary_button_label_color</item>
         <item name="android:textSize">13sp</item>
+        <item name="android:gravity">center</item>
+        <item name="android:background">@drawable/tertiary_button_background</item>
+        <item name="android:paddingTop">@dimen/tertiary_buttons_label_top_bottom_padding</item>
+        <item name="android:paddingBottom">@dimen/tertiary_buttons_label_top_bottom_padding</item>
+        <item name="android:paddingStart">@dimen/tertiary_buttons_label_start_end_padding</item>
+        <item name="android:paddingEnd">@dimen/tertiary_buttons_label_start_end_padding</item>
     </style>
     <style name="primary_dialog_button_label_style">
         <item name="android:fontFamily">@font/noto_sans_600</item>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 3feda80b7..05cdab3e5 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -15,10 +15,7 @@
         <item name="android:statusBarColor">?attr/color_main1_500</item>
 
         <item name="color_main1_100">@color/orange_main_100</item>
-        <item name="color_main1_100_alpha_50">@color/orange_main_100_alpha_50</item>
-        <item name="color_main1_300">@color/orange_main_300</item>
         <item name="color_main1_500">@color/orange_main_500</item>
-        <item name="color_main1_700">@color/orange_main_700</item>
 
         <item name="color_main2_000">@color/bc_white</item>
         <item name="color_main2_100">@color/gray_main2_100</item>
@@ -87,58 +84,58 @@
         <item name="color_bottom_sheet_disabled_menu">@color/gray_200</item>
     </style>
 
-    <style name="Theme.LinphoneYellow" parent="Theme.Linphone">
-        <item name="color_main1_100">@color/yellow_main_100</item>
-        <item name="color_main1_100_alpha_50">@color/yellow_main_100_alpha_50</item>
-        <item name="color_main1_300">@color/yellow_main_300</item>
-        <item name="color_main1_500">@color/yellow_main_500</item>
-        <item name="color_main1_700">@color/yellow_main_700</item>
-        <item name="color_chat_bubble_outgoing">@color/yellow_main_100</item>
+    <style name="Theme.LinphoneTerracotta" parent="Theme.Linphone">
+        <item name="color_main1_100">@color/terracotta_main_100</item>
+        <item name="color_main1_500">@color/terracotta_main_500</item>
+        <item name="color_chat_bubble_outgoing">@color/terracotta_main_100</item>
     </style>
 
-    <style name="Theme.LinphoneGreen" parent="Theme.Linphone">
-        <item name="color_main1_100">@color/green_main_100</item>
-        <item name="color_main1_100_alpha_50">@color/green_main_100_alpha_50</item>
-        <item name="color_main1_300">@color/green_main_300</item>
-        <item name="color_main1_500">@color/green_main_500</item>
-        <item name="color_main1_700">@color/green_main_700</item>
-        <item name="color_chat_bubble_outgoing">@color/green_main_100</item>
+    <style name="Theme.LinphoneLavender" parent="Theme.Linphone">
+        <item name="color_main1_100">@color/lavender_main_100</item>
+        <item name="color_main1_500">@color/lavender_main_500</item>
+        <item name="color_chat_bubble_outgoing">@color/lavender_main_100</item>
     </style>
 
-    <style name="Theme.LinphoneBlue" parent="Theme.Linphone">
-        <item name="color_main1_100">@color/blue_main_100</item>
-        <item name="color_main1_100_alpha_50">@color/blue_main_100_alpha_50</item>
-        <item name="color_main1_300">@color/blue_main_300</item>
-        <item name="color_main1_500">@color/blue_main_500</item>
-        <item name="color_main1_700">@color/blue_main_700</item>
-        <item name="color_chat_bubble_outgoing">@color/blue_main_100</item>
+    <style name="Theme.LinphoneHoney" parent="Theme.Linphone">
+        <item name="color_main1_100">@color/honey_main_100</item>
+        <item name="color_main1_500">@color/honey_main_500</item>
+        <item name="color_chat_bubble_outgoing">@color/honey_main_100</item>
     </style>
 
-    <style name="Theme.LinphoneRed" parent="Theme.Linphone">
-        <item name="color_main1_100">@color/red_main_100</item>
-        <item name="color_main1_100_alpha_50">@color/red_main_100_alpha_50</item>
-        <item name="color_main1_300">@color/red_main_300</item>
-        <item name="color_main1_500">@color/red_main_500</item>
-        <item name="color_main1_700">@color/red_main_700</item>
-        <item name="color_chat_bubble_outgoing">@color/red_main_100</item>
+    <style name="Theme.LinphoneBurgundy" parent="Theme.Linphone">
+        <item name="color_main1_100">@color/burgundy_main_100</item>
+        <item name="color_main1_500">@color/burgundy_main_500</item>
+        <item name="color_chat_bubble_outgoing">@color/burgundy_main_100</item>
     </style>
 
-    <style name="Theme.LinphonePink" parent="Theme.Linphone">
-        <item name="color_main1_100">@color/pink_main_100</item>
-        <item name="color_main1_100_alpha_50">@color/pink_main_100_alpha_50</item>
-        <item name="color_main1_300">@color/pink_main_300</item>
-        <item name="color_main1_500">@color/pink_main_500</item>
-        <item name="color_main1_700">@color/pink_main_700</item>
-        <item name="color_chat_bubble_outgoing">@color/pink_main_100</item>
+    <style name="Theme.LinphoneMint" parent="Theme.Linphone">
+        <item name="color_main1_100">@color/mint_main_100</item>
+        <item name="color_main1_500">@color/mint_main_500</item>
+        <item name="color_chat_bubble_outgoing">@color/mint_main_100</item>
     </style>
 
-    <style name="Theme.LinphonePurple" parent="Theme.Linphone">
-        <item name="color_main1_100">@color/purple_main_100</item>
-        <item name="color_main1_100_alpha_50">@color/purple_main_100_alpha_50</item>
-        <item name="color_main1_300">@color/purple_main_300</item>
-        <item name="color_main1_500">@color/purple_main_500</item>
-        <item name="color_main1_700">@color/purple_main_700</item>
-        <item name="color_chat_bubble_outgoing">@color/purple_main_100</item>
+    <style name="Theme.LinphoneCoral" parent="Theme.Linphone">
+        <item name="color_main1_100">@color/coral_main_100</item>
+        <item name="color_main1_500">@color/coral_main_500</item>
+        <item name="color_chat_bubble_outgoing">@color/coral_main_100</item>
+    </style>
+
+    <style name="Theme.LinphonePlum" parent="Theme.Linphone">
+        <item name="color_main1_100">@color/plum_main_100</item>
+        <item name="color_main1_500">@color/plum_main_500</item>
+        <item name="color_chat_bubble_outgoing">@color/plum_main_100</item>
+    </style>
+
+    <style name="Theme.LinphoneTitanium" parent="Theme.Linphone">
+        <item name="color_main1_100">@color/titanium_main_100</item>
+        <item name="color_main1_500">@color/titanium_main_500</item>
+        <item name="color_chat_bubble_outgoing">@color/titanium_main_100</item>
+    </style>
+
+    <style name="Theme.LinphoneMineralBlue" parent="Theme.Linphone">
+        <item name="color_main1_100">@color/mineral_blue_main_100</item>
+        <item name="color_main1_500">@color/mineral_blue_main_500</item>
+        <item name="color_chat_bubble_outgoing">@color/mineral_blue_main_100</item>
     </style>
 
     <!-- In-call application theme. -->
@@ -146,27 +143,39 @@
         <item name="android:windowBackground">@color/gray_600</item>
     </style>
 
-    <style name="Theme.LinphoneInCallYellow" parent="Theme.LinphoneYellow">
+    <style name="Theme.LinphoneInCallTerracotta" parent="Theme.LinphoneTerracotta">
         <item name="android:windowBackground">@color/gray_600</item>
     </style>
 
-    <style name="Theme.LinphoneInCallGreen" parent="Theme.LinphoneGreen">
+    <style name="Theme.LinphoneInCallLavender" parent="Theme.LinphoneLavender">
         <item name="android:windowBackground">@color/gray_600</item>
     </style>
 
-    <style name="Theme.LinphoneInCallBlue" parent="Theme.LinphoneBlue">
+    <style name="Theme.LinphoneInCallHoney" parent="Theme.LinphoneHoney">
         <item name="android:windowBackground">@color/gray_600</item>
     </style>
 
-    <style name="Theme.LinphoneInCallRed" parent="Theme.LinphoneRed">
+    <style name="Theme.LinphoneInCallBurgundy" parent="Theme.LinphoneBurgundy">
         <item name="android:windowBackground">@color/gray_600</item>
     </style>
 
-    <style name="Theme.LinphoneInCallPink" parent="Theme.LinphonePink">
+    <style name="Theme.LinphoneInCallMint" parent="Theme.LinphoneMint">
         <item name="android:windowBackground">@color/gray_600</item>
     </style>
 
-    <style name="Theme.LinphoneInCallPurple" parent="Theme.LinphonePurple">
+    <style name="Theme.LinphoneInCallCoral" parent="Theme.LinphoneCoral">
+        <item name="android:windowBackground">@color/gray_600</item>
+    </style>
+
+    <style name="Theme.LinphoneInCallPlum" parent="Theme.LinphonePlum">
+        <item name="android:windowBackground">@color/gray_600</item>
+    </style>
+
+    <style name="Theme.LinphoneInCallTitanium" parent="Theme.LinphoneTitanium">
+        <item name="android:windowBackground">@color/gray_600</item>
+    </style>
+
+    <style name="Theme.LinphoneInCallMineralBlue" parent="Theme.LinphoneMineralBlue">
         <item name="android:windowBackground">@color/gray_600</item>
     </style>