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 c67c7ca33..ed811f148 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
@@ -140,7 +140,9 @@
                                 android:visibility="visible" />
 
                         </LinearLayout>
+
                     </LinearLayout>
+
                 </LinearLayout>
 
             </TableRow>
@@ -185,6 +187,7 @@
                         android:layout_height="wrap_content"
                         android:text="@string/error"
                         android:visibility="invisible" />
+
                 </LinearLayout>
 
                 <LinearLayout
@@ -315,6 +318,7 @@
                         android:visibility="invisible" />
 
                 </LinearLayout>
+
             </TableRow>
 
             <TableRow
@@ -329,6 +333,7 @@
                     android:layout_height="wrap_content"
                     android:layout_column="1"
                     android:checked="false"
+                    android:paddingLeft="5dp"
                     android:button="@drawable/checkbox"
                     android:textColor="?attr/primaryTextColor"
                     android:text="@string/use_username_instead_or_phone_number"
@@ -347,6 +352,7 @@
                     android:layout_height="wrap_content"
                     android:layout_column="1"
                     android:checked="false"
+                    android:paddingLeft="5dp"
                     android:button="@drawable/checkbox"
                     android:textColor="?attr/primaryTextColor"
                     android:text="@string/use_email_for_validation"
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 eb46d09f2..47f7441e9 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
@@ -120,6 +120,7 @@
                         android:visibility="invisible" />
 
                 </LinearLayout>
+
             </LinearLayout>
 
         </TableRow>
@@ -154,6 +155,7 @@
                     android:inputType="text|textNoSuggestions"
                     android:maxLines="1"
                     android:textColor="@color/colorB" />
+
             </LinearLayout>
 
             <LinearLayout
@@ -189,6 +191,7 @@
                     android:layout_gravity="right"
                     android:maxLines="1" />
             </LinearLayout>
+
         </TableRow>
 
         <TableRow
@@ -214,10 +217,12 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:button="@drawable/checkbox"
+                android:paddingLeft="5dp"
                 android:textColor="?attr/primaryTextColor"
                 android:text="@string/login_with_username"
                 android:visibility="visible" />
         </TableRow>
+
     </TableLayout>
 
     <Button
diff --git a/app/src/main/res/layout/assistant_account_creation.xml b/app/src/main/res/layout/assistant_account_creation.xml
index b9fa923ab..33c412d23 100644
--- a/app/src/main/res/layout/assistant_account_creation.xml
+++ b/app/src/main/res/layout/assistant_account_creation.xml
@@ -201,93 +201,93 @@
 
 				</LinearLayout>
 
-			<LinearLayout
-				android:id="@+id/password_layout"
-				android:visibility="gone"
-				android:orientation="vertical"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content">
-
 				<LinearLayout
+					android:id="@+id/password_layout"
+					android:visibility="gone"
 					android:orientation="vertical"
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content">
 
-					<TextView
-						android:id="@+id/password_label"
-						style="@style/font13"
-						android:text="@string/password"
-						android:textAllCaps="true"
+					<LinearLayout
+						android:orientation="vertical"
 						android:layout_width="match_parent"
-						android:layout_height="wrap_content"/>
+						android:layout_height="wrap_content">
 
-					<EditText
-						android:id="@+id/password"
-						android:background="@drawable/resizable_textfield"
-						android:textColor="@color/colorB"
-						android:inputType="textPassword"
-						android:textCursorDrawable="@null"
-						android:layout_width="match_parent"
-						android:layout_height="40dp"
-						android:paddingLeft="10dp"
-						android:paddingRight="10dp"
-						android:maxLines="1"/>
+						<TextView
+							android:id="@+id/password_label"
+							style="@style/font13"
+							android:text="@string/password"
+							android:textAllCaps="true"
+							android:layout_width="match_parent"
+							android:layout_height="wrap_content"/>
 
-					<TextView
-						android:id="@+id/password_error"
-						android:text="@string/error"
-						style="@style/font20"
+						<EditText
+							android:id="@+id/password"
+							android:background="@drawable/resizable_textfield"
+							android:textColor="@color/colorB"
+							android:inputType="textPassword"
+							android:textCursorDrawable="@null"
+							android:layout_width="match_parent"
+							android:layout_height="40dp"
+							android:paddingLeft="10dp"
+							android:paddingRight="10dp"
+							android:maxLines="1"/>
+
+						<TextView
+							android:id="@+id/password_error"
+							android:text="@string/error"
+							style="@style/font20"
+							android:layout_width="match_parent"
+							android:layout_height="wrap_content"
+							android:visibility="invisible"/>
+
+					</LinearLayout>
+
+					<LinearLayout
+						android:id="@+id/password_confirm_layout"
+						android:orientation="vertical"
 						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:visibility="invisible"/>
+						android:layout_height="wrap_content">
+
+						<TextView
+							android:id="@+id/confirm_password_label"
+							android:text="@string/confirm_password"
+							style="@style/font13"
+							android:textAllCaps="true"
+							android:layout_width="match_parent"
+							android:layout_height="wrap_content"/>
+
+						<EditText
+							android:id="@+id/confirm_password"
+							android:background="@drawable/resizable_textfield"
+							android:textColor="@color/colorB"
+							android:inputType="textPassword"
+							android:contentDescription="@string/content_description_confirm_password_field"
+							android:textCursorDrawable="@null"
+							android:layout_width="match_parent"
+							android:layout_height="40dp"
+							android:paddingLeft="10dp"
+							android:paddingRight="10dp"
+							android:maxLines="1"/>
+
+						<TextView
+							android:id="@+id/confirm_password_error"
+							android:text="@string/error"
+							style="@style/font20"
+							android:layout_width="match_parent"
+							android:layout_height="wrap_content"
+							android:visibility="invisible"/>
+
+					</LinearLayout>
 
 				</LinearLayout>
 
-				<LinearLayout
-					android:id="@+id/password_confirm_layout"
-					android:orientation="vertical"
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content">
-
-					<TextView
-						android:id="@+id/confirm_password_label"
-						android:text="@string/confirm_password"
-						style="@style/font13"
-						android:textAllCaps="true"
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"/>
-
-					<EditText
-						android:id="@+id/confirm_password"
-						android:background="@drawable/resizable_textfield"
-						android:textColor="@color/colorB"
-						android:inputType="textPassword"
-						android:contentDescription="@string/content_description_confirm_password_field"
-						android:textCursorDrawable="@null"
-						android:layout_width="match_parent"
-						android:layout_height="40dp"
-						android:paddingLeft="10dp"
-						android:paddingRight="10dp"
-						android:maxLines="1"/>
-
-					<TextView
-						android:id="@+id/confirm_password_error"
-						android:text="@string/error"
-						style="@style/font20"
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:visibility="invisible"/>
-
-				</LinearLayout>
-
-
-			</LinearLayout>
-
 			</LinearLayout>
 
 			<CheckBox
 				android:id="@+id/use_username"
 				android:visibility="gone"
+				android:paddingLeft="5dp"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
                 android:button="@drawable/checkbox"
@@ -297,6 +297,7 @@
 			<CheckBox
 				android:id="@+id/use_email"
 				android:visibility="gone"
+				android:paddingLeft="5dp"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
                 android:button="@drawable/checkbox"
diff --git a/app/src/main/res/layout/assistant_linphone_login.xml b/app/src/main/res/layout/assistant_linphone_login.xml
index a1154ee8f..c0af92a12 100644
--- a/app/src/main/res/layout/assistant_linphone_login.xml
+++ b/app/src/main/res/layout/assistant_linphone_login.xml
@@ -189,6 +189,7 @@
 				android:id="@+id/use_username"
 				android:visibility="visible"
 				android:layout_marginTop="20dp"
+				android:paddingLeft="5dp"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:button="@drawable/checkbox"
diff --git a/app/src/main/res/layout/chat_create.xml b/app/src/main/res/layout/chat_create.xml
index 1997555dd..9be61f31a 100644
--- a/app/src/main/res/layout/chat_create.xml
+++ b/app/src/main/res/layout/chat_create.xml
@@ -83,6 +83,7 @@
                     android:layout_height="5dp"
                     android:layout_alignParentBottom="true"
                     android:background="?attr/accentColor" />
+
             </RelativeLayout>
 
             <RelativeLayout
diff --git a/app/src/main/res/layout/dialog.xml b/app/src/main/res/layout/dialog.xml
index 881830b26..a594f43e6 100644
--- a/app/src/main/res/layout/dialog.xml
+++ b/app/src/main/res/layout/dialog.xml
@@ -116,7 +116,7 @@
             android:id="@+id/doNotAskAgain"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:buttonTint="?attr/accentColor" />
+            android:button="@drawable/checkbox" />
 
         <TextView
             android:id="@+id/doNotAskAgainLabel"