diff --git a/app/src/main/res/drawable/assistant_logo.xml b/app/src/main/res/drawable/assistant_logo.xml
new file mode 100644
index 000000000..f0112e52a
--- /dev/null
+++ b/app/src/main/res/drawable/assistant_logo.xml
@@ -0,0 +1,297 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable/confirm_sms_code_logo.xml b/app/src/main/res/drawable/confirm_sms_code_logo.xml
new file mode 100644
index 000000000..b42354299
--- /dev/null
+++ b/app/src/main/res/drawable/confirm_sms_code_logo.xml
@@ -0,0 +1,201 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout-sw600dp/assistant_landing_fragment.xml b/app/src/main/res/layout-sw600dp/assistant_landing_fragment.xml
new file mode 100644
index 000000000..20dc81afb
--- /dev/null
+++ b/app/src/main/res/layout-sw600dp/assistant_landing_fragment.xml
@@ -0,0 +1,287 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout-sw600dp/assistant_register_confirm_sms_code_fragment.xml b/app/src/main/res/layout-sw600dp/assistant_register_confirm_sms_code_fragment.xml
new file mode 100644
index 000000000..5bfa7baf6
--- /dev/null
+++ b/app/src/main/res/layout-sw600dp/assistant_register_confirm_sms_code_fragment.xml
@@ -0,0 +1,216 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout-sw600dp/assistant_register_fragment.xml b/app/src/main/res/layout-sw600dp/assistant_register_fragment.xml
new file mode 100644
index 000000000..eacf7aa26
--- /dev/null
+++ b/app/src/main/res/layout-sw600dp/assistant_register_fragment.xml
@@ -0,0 +1,389 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
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
new file mode 100644
index 000000000..e064ddfd1
--- /dev/null
+++ b/app/src/main/res/layout-sw600dp/assistant_third_party_sip_account_login_fragment.xml
@@ -0,0 +1,389 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
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
new file mode 100644
index 000000000..a4b570834
--- /dev/null
+++ b/app/src/main/res/layout-sw600dp/assistant_third_party_sip_account_warning_fragment.xml
@@ -0,0 +1,194 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/assistant_register_confirm_sms_code_fragment.xml b/app/src/main/res/layout/assistant_register_confirm_sms_code_fragment.xml
index 92f349c41..629651331 100644
--- a/app/src/main/res/layout/assistant_register_confirm_sms_code_fragment.xml
+++ b/app/src/main/res/layout/assistant_register_confirm_sms_code_fragment.xml
@@ -55,7 +55,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="100dp"
android:paddingBottom="30dp"
- android:text="@string/assistant_account_register"
+ android:text="@string/assistant_account_creation_sms_confirmation_title"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
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 e34911793..db7afa09f 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
@@ -57,7 +57,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="100dp"
android:paddingBottom="27dp"
- android:text="@string/assistant_login_third_party_sip_account"
+ android:text="@string/assistant_login_third_party_sip_account_title"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
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 7279bb41f..e78d95e31 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
@@ -47,7 +47,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="100dp"
- android:text="@string/assistant_login_third_party_sip_account"
+ android:text="@string/assistant_login_third_party_sip_account_title"
android:textColor="?attr/color_main2_600"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 5d9184ea5..8c533f513 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -102,11 +102,13 @@
Scanner un QR code
Ce QR code est invalide !
J\'ai un compte SIP tiers
+ Compte SIP tiers
Single sign on
Adresse SIP invalide
L\'adresse SIP ne contient pas de nom d\'utilisateur !
Pas encore de compte ?
Créer un compte
+ Confirmez votre numéro
On vous a envoyé un code de vérification par SMS au numéro %1$s.\n\nMerci de le saisir ci-dessous :
Numéro incorrect ?
Créer
diff --git a/app/src/main/res/values/dimen.xml b/app/src/main/res/values/dimen.xml
index 12b62c7c6..6ca3ee344 100644
--- a/app/src/main/res/values/dimen.xml
+++ b/app/src/main/res/values/dimen.xml
@@ -14,6 +14,7 @@
24dp
48dp
100dp
+ 30dp
30dp
45dp
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d7ea62242..aa82e83a6 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -141,11 +141,13 @@
Scan QR code
Invalid QR code!
Use a third party SIP account
+ Third party SIP account
Single sign on
SIP address is invalid!
SIP address doesn\'t contains a username!
No account yet?
Register
+ Confirm your phone number
We have sent a verification code on your phone number %1$s.\n\nPlease enter the verification code below:
Wrong number?
Create