diff --git a/app/src/main/java/org/linphone/contacts/ContactEditorFragment.java b/app/src/main/java/org/linphone/contacts/ContactEditorFragment.java
index 33d1ba01c..5bc796a0f 100644
--- a/app/src/main/java/org/linphone/contacts/ContactEditorFragment.java
+++ b/app/src/main/java/org/linphone/contacts/ContactEditorFragment.java
@@ -637,6 +637,9 @@ public class ContactEditorFragment extends Fragment {
         noa.setHint(isSip ? getString(R.string.sip_address) : getString(R.string.phone_number));
         if (!isSip) {
             noa.setInputType(InputType.TYPE_CLASS_PHONE);
+            noa.setHint(R.string.phone_number);
+        } else {
+            noa.setHint(R.string.sip_address);
         }
         noa.requestFocus();
         noa.addTextChangedListener(
diff --git a/app/src/main/res/layout-sw533dp-land/assistant_account_creation.xml b/app/src/main/res/layout-sw533dp-land/assistant_account_creation.xml
index 6109edf22..768f03447 100644
--- a/app/src/main/res/layout-sw533dp-land/assistant_account_creation.xml
+++ b/app/src/main/res/layout-sw533dp-land/assistant_account_creation.xml
@@ -28,7 +28,6 @@
             android:paddingTop="10dp"
             android:text="@string/assistant_create_account_part_1" />
 
-
         <TableLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -110,6 +109,7 @@
                                     android:inputType="phone"
                                     android:maxLines="1"
                                     android:text="+"
+                                    android:hint="@string/international_prefix"
                                     android:textColor="@color/black_color" />
 
                                 <EditText
@@ -120,6 +120,7 @@
                                     android:contentDescription="@string/content_description_phone_number_field"
                                     android:inputType="phone"
                                     android:maxLines="1"
+                                    android:hint="@string/phone_number"
                                     android:textColor="@color/black_color" />
 
                             </LinearLayout>
@@ -178,6 +179,7 @@
                         android:contentDescription="@string/content_description_username_field"
                         android:inputType="text|textNoSuggestions"
                         android:maxLines="1"
+                        android:hint="@string/username"
                         android:textColor="@color/black_color" />
 
                     <TextView
@@ -218,6 +220,7 @@
                         android:paddingLeft="10dp"
                         android:paddingRight="10dp"
                         android:textColor="@color/black_color"
+                        android:hint="@string/password"
                         android:textCursorDrawable="@null" />
 
                     <TextView
@@ -266,6 +269,7 @@
                         android:paddingLeft="10dp"
                         android:paddingRight="10dp"
                         android:textColor="@color/black_color"
+                        android:hint="@string/email"
                         android:textCursorDrawable="@null" />
 
                     <TextView
@@ -307,6 +311,7 @@
                         android:paddingLeft="10dp"
                         android:paddingRight="10dp"
                         android:textColor="@color/black_color"
+                        android:hint="@string/confirm_password"
                         android:textCursorDrawable="@null" />
 
                     <TextView
diff --git a/app/src/main/res/layout-sw533dp-land/assistant_linphone_login.xml b/app/src/main/res/layout-sw533dp-land/assistant_linphone_login.xml
index 2becbd868..6ee295e23 100644
--- a/app/src/main/res/layout-sw533dp-land/assistant_linphone_login.xml
+++ b/app/src/main/res/layout-sw533dp-land/assistant_linphone_login.xml
@@ -96,6 +96,7 @@
                             android:gravity="center"
                             android:inputType="phone"
                             android:maxLines="1"
+                            android:hint="@string/international_prefix"
                             android:text="+"
                             android:textColor="@color/black_color" />
 
@@ -107,6 +108,7 @@
                             android:contentDescription="@string/content_description_phone_number_field"
                             android:inputType="phone"
                             android:maxLines="1"
+                            android:hint="@string/phone_number"
                             android:textColor="@color/black_color" />
 
                     </LinearLayout>
@@ -154,6 +156,7 @@
                     android:contentDescription="@string/content_description_username_field"
                     android:inputType="text|textNoSuggestions"
                     android:maxLines="1"
+                    android:hint="@string/username"
                     android:textColor="@color/black_color" />
 
             </LinearLayout>
@@ -182,6 +185,7 @@
                     android:background="@drawable/resizable_textfield"
                     android:inputType="textPassword"
                     android:maxLines="1"
+                    android:hint="@string/password"
                     android:textColor="@color/black_color" />
 
                 <TextView
diff --git a/app/src/main/res/layout-sw533dp-land/assistant_login.xml b/app/src/main/res/layout-sw533dp-land/assistant_login.xml
index f0ab54b9e..1ddfafb66 100644
--- a/app/src/main/res/layout-sw533dp-land/assistant_login.xml
+++ b/app/src/main/res/layout-sw533dp-land/assistant_login.xml
@@ -57,6 +57,7 @@
                         android:contentDescription="@string/content_description_username_field"
                         android:inputType="text|textNoSuggestions"
                         android:maxLines="1"
+                        android:hint="@string/username"
                         android:textColor="@color/black_color" />
                 </LinearLayout>
 
@@ -81,8 +82,10 @@
                         android:background="@drawable/resizable_textfield"
                         android:inputType="textPassword"
                         android:maxLines="1"
+                        android:hint="@string/password"
                         android:textColor="@color/black_color" />
                 </LinearLayout>
+
             </TableRow>
 
             <TableRow
@@ -111,6 +114,7 @@
                         android:contentDescription="@string/content_description_display_field"
                         android:inputType="textPersonName"
                         android:maxLines="1"
+                        android:hint="@string/assistant_display_name_optional"
                         android:textColor="@color/black_color" />
                 </LinearLayout>
 
@@ -136,7 +140,9 @@
                         android:contentDescription="@string/content_description_domain_field"
                         android:inputType="textUri"
                         android:maxLines="1"
+                        android:hint="@string/domain"
                         android:textColor="@color/black_color" />
+
                 </LinearLayout>
 
             </TableRow>
@@ -167,6 +173,7 @@
                         android:contentDescription="@string/content_description_username_field"
                         android:inputType="text|textNoSuggestions"
                         android:maxLines="1"
+                        android:hint="@string/userid"
                         android:textColor="@color/black_color" />
 
                 </LinearLayout>
diff --git a/app/src/main/res/layout/assistant_account_creation.xml b/app/src/main/res/layout/assistant_account_creation.xml
index fc8da3557..a1535df18 100644
--- a/app/src/main/res/layout/assistant_account_creation.xml
+++ b/app/src/main/res/layout/assistant_account_creation.xml
@@ -93,6 +93,7 @@
 							android:gravity="center"
 							android:layout_width="65dp"
 							android:layout_height="42dp"
+							android:hint="@string/international_prefix"
 							android:maxLines="1"/>
 
 						<EditText
@@ -103,6 +104,7 @@
 							android:inputType="phone"
 							android:layout_width="match_parent"
 							android:layout_height="40dp"
+							android:hint="@string/phone_number"
 							android:maxLines="1"/>
 
 					</LinearLayout>
@@ -122,6 +124,7 @@
 						android:layout_height="wrap_content"/>
 
 				</LinearLayout>
+
 			</LinearLayout>
 
 			<LinearLayout
@@ -147,6 +150,7 @@
 					android:inputType="text|textNoSuggestions"
 					android:layout_width="match_parent"
 					android:layout_height="40dp"
+					android:hint="@string/username"
 					android:maxLines="1"/>
 
 				<TextView
@@ -190,6 +194,7 @@
 						android:layout_height="40dp"
 						android:paddingLeft="10dp"
 						android:paddingRight="10dp"
+						android:hint="@string/email"
 						android:maxLines="1"/>
 
 					<TextView
@@ -232,6 +237,7 @@
 							android:layout_height="40dp"
 							android:paddingLeft="10dp"
 							android:paddingRight="10dp"
+							android:hint="@string/password"
 							android:maxLines="1"/>
 
 						<TextView
@@ -269,6 +275,7 @@
 							android:layout_height="40dp"
 							android:paddingLeft="10dp"
 							android:paddingRight="10dp"
+							android:hint="@string/confirm_password"
 							android:maxLines="1"/>
 
 						<TextView
diff --git a/app/src/main/res/layout/assistant_account_creation_code_activation.xml b/app/src/main/res/layout/assistant_account_creation_code_activation.xml
index d7e78dce3..f9708bde8 100644
--- a/app/src/main/res/layout/assistant_account_creation_code_activation.xml
+++ b/app/src/main/res/layout/assistant_account_creation_code_activation.xml
@@ -53,6 +53,7 @@
 			android:gravity="center_vertical|center_horizontal"
 			android:layout_width="match_parent"
 			android:layout_height="40dp"
+			android:hint="@string/confirmation_code"
 			android:maxLines="1"/>
 
 		<Button
diff --git a/app/src/main/res/layout/assistant_country_list.xml b/app/src/main/res/layout/assistant_country_list.xml
index a795da5f3..049233c07 100644
--- a/app/src/main/res/layout/assistant_country_list.xml
+++ b/app/src/main/res/layout/assistant_country_list.xml
@@ -32,6 +32,7 @@
             android:background="@drawable/resizable_textfield"
             android:gravity="center"
             android:inputType="textPersonName"
+            android:hint="@string/assistant_choose_country"
             android:textColor="@color/black_color"
             android:textCursorDrawable="@null" />
 
diff --git a/app/src/main/res/layout/assistant_linphone_login.xml b/app/src/main/res/layout/assistant_linphone_login.xml
index 5c662237c..c2550ea5e 100644
--- a/app/src/main/res/layout/assistant_linphone_login.xml
+++ b/app/src/main/res/layout/assistant_linphone_login.xml
@@ -100,6 +100,7 @@
 								android:gravity="center"
 								android:layout_width="65dp"
 								android:layout_height="42dp"
+								android:hint="@string/international_prefix"
 								android:maxLines="1"/>
 
 							<EditText
@@ -110,6 +111,7 @@
 								android:inputType="phone"
 								android:layout_width="match_parent"
 								android:layout_height="40dp"
+								android:hint="@string/phone_number"
 								android:maxLines="1"/>
 
 						</LinearLayout>
@@ -125,6 +127,7 @@
 						android:visibility="invisible"/>
 
 				</LinearLayout>
+
 			</LinearLayout>
 
 			<LinearLayout
@@ -149,7 +152,9 @@
 					android:contentDescription="@string/content_description_username_field"
 					android:layout_width="match_parent"
 					android:layout_height="40dp"
+					android:hint="@string/username"
 					android:maxLines="1"/>
+
 			</LinearLayout>
 
 			<LinearLayout
@@ -174,6 +179,7 @@
 					android:inputType="textPassword"
 					android:layout_width="match_parent"
 					android:layout_height="40dp"
+					android:hint="@string/password"
 					android:maxLines="1"/>
 
 				<TextView
diff --git a/app/src/main/res/layout/assistant_login.xml b/app/src/main/res/layout/assistant_login.xml
index ed48343cc..7c1b5a28c 100644
--- a/app/src/main/res/layout/assistant_login.xml
+++ b/app/src/main/res/layout/assistant_login.xml
@@ -49,6 +49,7 @@
                 android:contentDescription="@string/content_description_username_field"
                 android:inputType="text|textNoSuggestions"
                 android:maxLines="1"
+                android:hint="@string/username"
                 android:textColor="@color/black_color" />
 
             <TextView
@@ -67,6 +68,7 @@
                 android:contentDescription="@string/content_description_username_field"
                 android:inputType="text|textNoSuggestions"
                 android:maxLines="1"
+                android:hint="@string/userid"
                 android:textColor="@color/black_color" />
 
             <TextView
@@ -84,6 +86,7 @@
                 android:background="@drawable/resizable_textfield"
                 android:inputType="textPassword"
                 android:maxLines="1"
+                android:hint="@string/password"
                 android:textColor="@color/black_color" />
 
             <TextView
@@ -102,6 +105,7 @@
                 android:contentDescription="@string/content_description_domain_field"
                 android:inputType="textUri"
                 android:maxLines="1"
+                android:hint="@string/domain"
                 android:textColor="@color/black_color" />
 
             <TextView
@@ -120,6 +124,7 @@
                 android:contentDescription="@string/content_description_display_field"
                 android:inputType="textPersonName"
                 android:maxLines="1"
+                android:hint="@string/assistant_display_name_optional"
                 android:textColor="@color/black_color" />
 
             <TextView
@@ -161,6 +166,7 @@
                     android:textColor="?attr/primaryTextColor"
                     android:checked="true"
                     android:text="@string/pref_transport_tls" />
+
             </RadioGroup>
 
             <Button
diff --git a/app/src/main/res/layout/assistant_remote_provisioning.xml b/app/src/main/res/layout/assistant_remote_provisioning.xml
index fa459dc88..927094fd1 100644
--- a/app/src/main/res/layout/assistant_remote_provisioning.xml
+++ b/app/src/main/res/layout/assistant_remote_provisioning.xml
@@ -46,6 +46,7 @@
 			android:contentDescription="@string/content_description_url_field"
 			android:layout_width="match_parent"
 			android:layout_height="40dp"
+			android:hint="@string/remote_provisioning_url"
 			android:maxLines="1"/>
 
 		<Button
diff --git a/app/src/main/res/layout/assistant_remote_provisioning_login.xml b/app/src/main/res/layout/assistant_remote_provisioning_login.xml
index 52cf3d70b..bb2501dd3 100644
--- a/app/src/main/res/layout/assistant_remote_provisioning_login.xml
+++ b/app/src/main/res/layout/assistant_remote_provisioning_login.xml
@@ -48,6 +48,7 @@
 			android:layout_height="40dp"
 			android:paddingLeft="10dp"
 			android:paddingRight="10dp"
+			android:hint="@string/username"
 			android:maxLines="1"/>
 
 		<TextView
@@ -68,6 +69,7 @@
 			android:layout_height="40dp"
 			android:paddingLeft="10dp"
 			android:paddingRight="10dp"
+			android:hint="@string/password"
 			android:maxLines="1"/>
 
 
@@ -90,6 +92,7 @@
 			android:layout_height="40dp"
 			android:paddingLeft="10dp"
 			android:paddingRight="10dp"
+			android:hint="@string/domain"
 			android:maxLines="1"/>
 
 		<Button
diff --git a/app/src/main/res/layout/contact_edit.xml b/app/src/main/res/layout/contact_edit.xml
index faa2e2731..0653f9c74 100644
--- a/app/src/main/res/layout/contact_edit.xml
+++ b/app/src/main/res/layout/contact_edit.xml
@@ -96,6 +96,7 @@
                     android:gravity="left"
                     android:inputType="textPersonName|textCapWords"
                     android:paddingRight="5dp"
+                    android:hint="@string/contact_last_name"
                     android:textCursorDrawable="@null" />
 
                 <TextView
@@ -117,6 +118,7 @@
                     android:gravity="left"
                     android:inputType="textPersonName|textCapWords"
                     android:paddingRight="5dp"
+                    android:hint="@string/contact_first_name"
                     android:textCursorDrawable="@null" />
 
                 <TextView
@@ -139,6 +141,7 @@
                     android:gravity="left"
                     android:inputType="textPersonName|textCapWords"
                     android:paddingRight="5dp"
+                    android:hint="@string/contact_organization"
                     android:textCursorDrawable="@null" />
 
             </LinearLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3e7863fbb..1d498460e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -27,6 +27,8 @@
     <string name="username">Username</string>
     <string name="userid">User-id (optional)</string>
     <string name="phone_number">Phone number</string>
+    <string name="confirmation_code">Confirmation code</string>
+    <string name="international_prefix">International phone number prefix</string>
     <string name="display_name">Display name</string>
     <string name="password">Password</string>
     <string name="confirm_password">Password confirmation</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 2fa9198ad..7f7c50c11 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -16,7 +16,7 @@
         <item name="accentColor">@color/primary_color</item>
         <item name="accentColorLight30">@color/primary_light_color</item>
         <item name="accentTextColor">@color/white_color</item>
-        <item name="primaryTextColor">@color/dark_grey_color</item>
+        <item name="primaryTextColor">@color/light_primary_text_color</item>
         <item name="secondaryTextColor">@color/white_color</item>
         <item name="primarySubtextDarkColor">@color/grey_color</item>
         <item name="primarySubtextLightColor">@color/light_grey_color</item>
@@ -54,7 +54,7 @@
         <item name="accentColor">@color/primary_color</item>
         <item name="accentColorLight30">@color/primary_light_color</item>
         <item name="accentTextColor">@color/white_color</item>
-        <item name="primaryTextColor">@color/white_color</item>
+        <item name="primaryTextColor">@color/dark_primary_text_color</item>
         <item name="secondaryTextColor">@color/dark_grey_color</item>
         <item name="primarySubtextDarkColor">@color/header_background_color</item>
         <item name="primarySubtextLightColor">@color/toolbar_color</item>