diff --git a/app/src/main/res/layout/activity_magic_call.xml b/app/src/main/res/layout/activity_magic_call.xml
index acc95508e..672b8f9bd 100644
--- a/app/src/main/res/layout/activity_magic_call.xml
+++ b/app/src/main/res/layout/activity_magic_call.xml
@@ -20,11 +20,11 @@
   -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                                                 android:layout_width="match_parent"
-                                                 android:layout_height="match_parent"
-                                                 xmlns:tools="http://schemas.android.com/tools"
-                                                 android:fitsSystemWindows="true"
-                                                 tools:context=".activities.MagicCallActivity">
+                xmlns:tools="http://schemas.android.com/tools"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:fitsSystemWindows="true"
+                tools:context=".activities.MagicCallActivity">
 
     <com.bluelinelabs.conductor.ChangeHandlerFrameLayout
         android:id="@+id/controller_container"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index c7ed90b11..235372b30 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -8,9 +8,9 @@
     tools:context=".activities.MainActivity">
 
     <android.support.design.widget.AppBarLayout
+        android:id="@+id/appBarLayout"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:id="@+id/appBarLayout">
+        android:layout_height="wrap_content">
 
         <android.support.v7.widget.Toolbar
             android:id="@+id/toolbar"
diff --git a/app/src/main/res/layout/call_item.xml b/app/src/main/res/layout/call_item.xml
index 0ef3910e9..ab700bfa7 100644
--- a/app/src/main/res/layout/call_item.xml
+++ b/app/src/main/res/layout/call_item.xml
@@ -33,9 +33,9 @@
         android:visibility="invisible"/>
 
     <ImageView
+        android:id="@+id/avatarImageView"
         android:layout_width="80dp"
         android:layout_height="80dp"
-        android:id="@+id/avatarImageView"
         android:layout_centerInParent="true"/>
 
     <ImageView
diff --git a/app/src/main/res/layout/controller_call.xml b/app/src/main/res/layout/controller_call.xml
index f00e6acd7..5a1d9cc72 100644
--- a/app/src/main/res/layout/controller_call.xml
+++ b/app/src/main/res/layout/controller_call.xml
@@ -47,6 +47,7 @@
             android:indeterminateTintMode="src_in"/>
 
         <TextView
+            android:id="@+id/connectingTextView"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@id/progress_bar"
@@ -54,8 +55,7 @@
             android:layout_margin="16dp"
             android:text="@string/nc_connecting_call"
             android:textAlignment="center"
-            android:textColor="@color/white"
-            android:id="@+id/connectingTextView"/>
+            android:textColor="@color/white"/>
 
     </RelativeLayout>
 
@@ -77,8 +77,8 @@
         <FrameLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignParentTop="true"
-            android:layout_alignParentEnd="true">
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentTop="true">
 
             <org.webrtc.SurfaceViewRenderer
                 android:id="@+id/pip_video_view"
@@ -93,8 +93,8 @@
                 android:id="@+id/call_control_switch_camera"
                 android:layout_width="40dp"
                 android:layout_height="40dp"
-                android:layout_marginBottom="20dp"
                 android:layout_gravity="center_horizontal|bottom"
+                android:layout_marginBottom="20dp"
 
                 app:checked="false"
                 app:enableInitialAnimation="false"
@@ -153,13 +153,13 @@
             android:id="@+id/callControlEnableSpeaker"
             android:layout_width="60dp"
             android:layout_height="60dp"
-            app:checked="false"
             android:visibility="gone"
+            app:animateRearImage="false"
+            app:checked="false"
             app:enableInitialAnimation="false"
             app:frontBackgroundColor="@color/colorPrimary"
-            app:animateRearImage="false"
-            app:rearBackgroundColor="@color/colorPrimaryDark"
             app:frontImage="@drawable/ic_volume_up_white_24dp"
+            app:rearBackgroundColor="@color/colorPrimaryDark"
             app:rearImage="@drawable/ic_volume_up_white_24dp"/>
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/controller_call_notification.xml b/app/src/main/res/layout/controller_call_notification.xml
index 7ee9d239f..96fa9ae36 100644
--- a/app/src/main/res/layout/controller_call_notification.xml
+++ b/app/src/main/res/layout/controller_call_notification.xml
@@ -48,12 +48,12 @@
             android:id="@+id/conversationNameTextView"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_below="@+id/incomingCallTextView"
+            android:layout_marginBottom="16dp"
             android:ellipsize="marquee"
             android:textAlignment="center"
             android:textColor="@color/white"
             android:textSize="28sp"
-            android:layout_marginBottom="16dp"
-            android:layout_below="@+id/incomingCallTextView"
             tools:text="Victor Gregorius Magnus"/>
 
     </RelativeLayout>
diff --git a/app/src/main/res/layout/controller_contacts_rv.xml b/app/src/main/res/layout/controller_contacts_rv.xml
index 2e388d84a..5f8bfb01e 100644
--- a/app/src/main/res/layout/controller_contacts_rv.xml
+++ b/app/src/main/res/layout/controller_contacts_rv.xml
@@ -19,11 +19,11 @@
   ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical">
 
     <include layout="@layout/rv_item_call_header"/>
 
-    <include layout="@layout/controller_generic_rv" />
+    <include layout="@layout/controller_generic_rv"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/controller_generic_rv.xml b/app/src/main/res/layout/controller_generic_rv.xml
index c3c7bbdfb..d82190989 100644
--- a/app/src/main/res/layout/controller_generic_rv.xml
+++ b/app/src/main/res/layout/controller_generic_rv.xml
@@ -20,11 +20,11 @@
   -->
 
 <android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/generic_rv_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/nc_white_color">
+                                                 xmlns:tools="http://schemas.android.com/tools"
+                                                 android:id="@+id/generic_rv_layout"
+                                                 android:layout_width="match_parent"
+                                                 android:layout_height="match_parent"
+                                                 android:background="@color/nc_white_color">
 
     <android.support.v4.widget.SwipeRefreshLayout
         android:id="@+id/swipe_refresh_layout"
diff --git a/app/src/main/res/layout/library_fast_scroller_layout.xml b/app/src/main/res/layout/library_fast_scroller_layout.xml
index 20c74bc4e..c4df6bede 100644
--- a/app/src/main/res/layout/library_fast_scroller_layout.xml
+++ b/app/src/main/res/layout/library_fast_scroller_layout.xml
@@ -21,25 +21,25 @@
             android:layout_height="wrap_content"
             android:layout_gravity="end"
             android:layout_marginEnd="0dp"
-            android:paddingLeft="16dp"
-            android:paddingRight="16dp"
             android:layout_toStartOf="@+id/fast_scroller_handle"
             android:background="@drawable/fast_scroller_bubble"
             android:gravity="center"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp"
             android:textColor="?android:attr/textColorPrimaryInverse"
             android:textSize="38sp"
             android:visibility="gone"
-            tools:visibility="visible"
-            tools:text="A" />
+            tools:text="A"
+            tools:visibility="visible"/>
 
         <ImageView
             android:id="@+id/fast_scroller_handle"
-            android:alpha="0.5"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentEnd="true"
-            android:paddingStart="6dp"
+            android:alpha="0.5"
             android:contentDescription="@null"
+            android:paddingStart="6dp"
             android:src="@drawable/fast_scroller_handle"/>
 
     </RelativeLayout>
diff --git a/app/src/main/res/layout/rv_item_app.xml b/app/src/main/res/layout/rv_item_app.xml
index 9c8613e35..e290a1037 100644
--- a/app/src/main/res/layout/rv_item_app.xml
+++ b/app/src/main/res/layout/rv_item_app.xml
@@ -20,12 +20,12 @@
   -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@color/white"
-    android:paddingBottom="16dp"
-    android:paddingTop="16dp">
+                xmlns:tools="http://schemas.android.com/tools"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@color/white"
+                android:paddingBottom="16dp"
+                android:paddingTop="16dp">
 
     <ImageView
         android:id="@+id/icon_image_view"
@@ -47,8 +47,8 @@
         android:layout_toEndOf="@id/icon_image_view"
         android:focusable="false"
         android:focusableInTouchMode="false"
-        android:textSize="16sp"
         android:textColor="@color/black"
+        android:textSize="16sp"
         tools:text="Start a new conversation"/>
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/rv_item_call_header.xml b/app/src/main/res/layout/rv_item_call_header.xml
index 990f5dd5c..e2b83cec2 100644
--- a/app/src/main/res/layout/rv_item_call_header.xml
+++ b/app/src/main/res/layout/rv_item_call_header.xml
@@ -20,11 +20,11 @@
   -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/call_header_layout"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
+                xmlns:tools="http://schemas.android.com/tools"
+                android:id="@+id/call_header_layout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
 
     <RelativeLayout
         android:id="@+id/initial_relative_layout"
@@ -40,7 +40,7 @@
             android:layout_marginStart="@dimen/activity_horizontal_margin"
             android:contentDescription="@null"
             android:src="@drawable/ic_group_black_24px"
-            android:tint="@color/colorPrimary" />
+            android:tint="@color/colorPrimary"/>
 
         <TextView
             android:id="@+id/description_text"
@@ -54,7 +54,7 @@
             android:singleLine="true"
             android:text="@string/nc_public_call"
             android:textAppearance="?android:attr/textAppearanceListItem"
-            tools:text="@string/nc_public_call" />
+            tools:text="@string/nc_public_call"/>
 
     </RelativeLayout>
 
@@ -76,7 +76,7 @@
             android:text="@string/nc_public_call_explanation"
             android:textAlignment="center"
             android:textAppearance="?android:attr/textAppearanceListItem"
-            tools:text="@string/nc_public_call_explanation" />
+            tools:text="@string/nc_public_call_explanation"/>
 
     </RelativeLayout>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/rv_item_conversation.xml b/app/src/main/res/layout/rv_item_conversation.xml
index bb552ec90..b15f6d801 100644
--- a/app/src/main/res/layout/rv_item_conversation.xml
+++ b/app/src/main/res/layout/rv_item_conversation.xml
@@ -49,8 +49,8 @@
             android:layout_width="10dp"
             android:layout_height="10dp"
             android:layout_gravity="bottom|end"
-            android:layout_marginEnd="6dp"
             android:layout_marginBottom="6dp"
+            android:layout_marginEnd="6dp"
             android:src="@drawable/ic_lock_white_24px"
             android:visibility="visible"/>
 
diff --git a/app/src/main/res/layout/rv_item_mention.xml b/app/src/main/res/layout/rv_item_mention.xml
index edcd17c16..636e51793 100644
--- a/app/src/main/res/layout/rv_item_mention.xml
+++ b/app/src/main/res/layout/rv_item_mention.xml
@@ -52,8 +52,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
-        android:layout_marginStart="@dimen/margin_between_elements"
         android:layout_marginEnd="@dimen/margin_between_elements"
+        android:layout_marginStart="@dimen/margin_between_elements"
         android:layout_toEndOf="@id/frame_layout"
         android:orientation="vertical">
 
@@ -70,8 +70,8 @@
             android:id="@+id/secondary_text"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:singleLine="true"
             android:ellipsize="middle"
+            android:singleLine="true"
             android:textColor="?android:attr/textColorSecondary"
             tools:text="A week ago"/>
 
diff --git a/app/src/main/res/layout/rv_item_menu.xml b/app/src/main/res/layout/rv_item_menu.xml
index 2942ccc1f..a685a3c3c 100644
--- a/app/src/main/res/layout/rv_item_menu.xml
+++ b/app/src/main/res/layout/rv_item_menu.xml
@@ -22,10 +22,10 @@
   -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@color/white">
+                xmlns:tools="http://schemas.android.com/tools"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@color/white">
 
     <TextView
         android:id="@+id/menu_text"
@@ -35,9 +35,9 @@
         android:focusable="false"
         android:focusableInTouchMode="false"
         android:gravity="center_vertical"
-        android:textSize="16sp"
         android:textColor="@color/black"
+        android:textSize="16sp"
         tools:drawableLeft="@drawable/ic_add_grey600_24px"
         tools:drawablePadding="16dp"
-        tools:text="Start a new conversation" />
+        tools:text="Start a new conversation"/>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/rv_item_progress.xml b/app/src/main/res/layout/rv_item_progress.xml
index b47b7d298..081bb67db 100644
--- a/app/src/main/res/layout/rv_item_progress.xml
+++ b/app/src/main/res/layout/rv_item_progress.xml
@@ -21,9 +21,9 @@
 
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    xmlns:tools="http://schemas.android.com/tools"
     android:padding="8dp">
 
     <ProgressBar
@@ -37,8 +37,8 @@
         android:id="@+id/progress_message"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/nc_no_more_load_retry"
         android:layout_gravity="center"
+        android:text="@string/nc_no_more_load_retry"
         android:visibility="gone"
         tools:visibility="visible"/>
 
diff --git a/app/src/main/res/layout/rv_item_title_header.xml b/app/src/main/res/layout/rv_item_title_header.xml
index 8c78fa4e4..6d4c8ba6d 100644
--- a/app/src/main/res/layout/rv_item_title_header.xml
+++ b/app/src/main/res/layout/rv_item_title_header.xml
@@ -20,10 +20,10 @@
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
+              xmlns:tools="http://schemas.android.com/tools"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:orientation="vertical">
 
     <View
         android:layout_width="match_parent"
@@ -34,10 +34,10 @@
         android:id="@+id/title_text_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="8dp"
         android:layout_marginEnd="16dp"
         android:layout_marginStart="16dp"
         android:layout_marginTop="8dp"
-        android:layout_marginBottom="8dp"
         android:textColor="@color/colorPrimary"
         tools:text="A"/>