add RTL support

41 files changed, 214 insertions, 103 deletions

diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index ec4d4c154..4eeb4c367 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -55,6 +55,7 @@
         android:label="@string/app_name"
         android:largeHeap="true"
         android:networkSecurityConfig="@xml/network_security_configuration"
+        android:supportsRtl="true"
         android:theme="@style/ConversationsTheme"
         tools:ignore="GoogleAppIndexingWarning"
         tools:replace="android:label, android:allowBackup"
diff --git a/src/main/res/layout/ab_title.xml b/src/main/res/layout/ab_title.xml
index 79c9d61f7..d34bc038e 100644
--- a/src/main/res/layout/ab_title.xml
+++ b/src/main/res/layout/ab_title.xml
@@ -1,37 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:gravity="start|center_vertical">
+    android:gravity="start|center_vertical"
+    android:orientation="vertical">
 
     <TextView
         android:id="@android:id/text1"
         style="@style/Base.TextAppearance.AppCompat.Widget.ActionBar.Title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:singleLine="true"
+        android:clickable="true"
         android:ellipsize="end"
-        android:scrollHorizontally="true"
         android:gravity="start|center_vertical"
-        android:textColor="@color/grey200"
-        android:clickable="true"
         android:onClick="onClick"
-        android:paddingTop="1dp" />
+        android:paddingTop="1dp"
+        android:scrollHorizontally="true"
+        android:singleLine="true"
+        android:textColor="@color/grey200" />
 
     <TextView
         android:id="@android:id/text2"
         style="@style/Base.TextAppearance.AppCompat.Widget.ActionBar.Subtitle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:singleLine="true"
-        android:ellipsize="end"
-        android:scrollHorizontally="true"
         android:layout_below="@android:id/text1"
-        android:textSize="12sp"
-        android:textColor="@color/grey50"
+        android:clickable="true"
+        android:ellipsize="end"
         android:gravity="start|center_vertical"
         android:onClick="onClick"
-        android:clickable="true"
-        android:paddingBottom="1dp" />
+        android:paddingBottom="1dp"
+        android:scrollHorizontally="true"
+        android:singleLine="true"
+        android:textColor="@color/grey50"
+        android:textSize="12sp" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/activity_about.xml b/src/main/res/layout/activity_about.xml
index f3bdb056f..603a9d00c 100644
--- a/src/main/res/layout/activity_about.xml
+++ b/src/main/res/layout/activity_about.xml
@@ -21,8 +21,10 @@
                 android:id="@+id/LogoLayout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/activity_horizontal_margin"
                 android:layout_marginLeft="@dimen/activity_horizontal_margin"
                 android:layout_marginTop="@dimen/activity_vertical_margin"
+                android:layout_marginEnd="@dimen/activity_horizontal_margin"
                 android:layout_marginRight="@dimen/activity_horizontal_margin"
                 android:layout_marginBottom="@dimen/activity_vertical_margin"
                 card_view:cardBackgroundColor="?attr/color_background_secondary">
@@ -42,8 +44,10 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_below="@+id/LogoLayout"
+                android:layout_marginStart="@dimen/activity_horizontal_margin"
                 android:layout_marginLeft="@dimen/activity_horizontal_margin"
                 android:layout_marginTop="@dimen/activity_vertical_margin"
+                android:layout_marginEnd="@dimen/activity_horizontal_margin"
                 android:layout_marginRight="@dimen/activity_horizontal_margin"
                 android:layout_marginBottom="@dimen/activity_vertical_margin"
                 android:orientation="vertical"
@@ -58,8 +62,10 @@
                         android:id="@+id/aboutmessage"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_marginStart="@dimen/activity_horizontal_margin"
                         android:layout_marginLeft="@dimen/activity_horizontal_margin"
                         android:layout_marginTop="@dimen/activity_vertical_margin"
+                        android:layout_marginEnd="@dimen/activity_horizontal_margin"
                         android:layout_marginRight="@dimen/activity_horizontal_margin"
                         android:autoLink="web"
                         android:fontFamily="monospace"
@@ -96,8 +102,10 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_below="@+id/aboutLayout"
+                android:layout_marginStart="@dimen/activity_horizontal_margin"
                 android:layout_marginLeft="@dimen/activity_horizontal_margin"
                 android:layout_marginTop="@dimen/activity_vertical_margin"
+                android:layout_marginEnd="@dimen/activity_horizontal_margin"
                 android:layout_marginRight="@dimen/activity_horizontal_margin"
                 android:layout_marginBottom="@dimen/activity_vertical_margin"
                 card_view:cardBackgroundColor="?attr/color_background_secondary">
@@ -106,8 +114,10 @@
                     android:id="@+id/libraries"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/activity_horizontal_margin"
                     android:layout_marginLeft="@dimen/activity_horizontal_margin"
                     android:layout_marginTop="@dimen/activity_vertical_margin"
+                    android:layout_marginEnd="@dimen/activity_horizontal_margin"
                     android:layout_marginRight="@dimen/activity_horizontal_margin"
                     android:autoLink="web"
                     android:fontFamily="monospace"
diff --git a/src/main/res/layout/activity_change_password.xml b/src/main/res/layout/activity_change_password.xml
index c16bc07be..ee2726431 100644
--- a/src/main/res/layout/activity_change_password.xml
+++ b/src/main/res/layout/activity_change_password.xml
@@ -16,8 +16,10 @@
         <android.support.v7.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/activity_horizontal_margin"
             android:layout_marginLeft="@dimen/activity_horizontal_margin"
             android:layout_marginTop="@dimen/activity_vertical_margin"
+            android:layout_marginEnd="@dimen/activity_horizontal_margin"
             android:layout_marginRight="@dimen/activity_horizontal_margin"
             android:layout_marginBottom="@dimen/activity_vertical_margin"
             android:background="?attr/color_background_tertiary">
diff --git a/src/main/res/layout/activity_contact_details.xml b/src/main/res/layout/activity_contact_details.xml
index 1aa6bd995..50dbda53d 100644
--- a/src/main/res/layout/activity_contact_details.xml
+++ b/src/main/res/layout/activity_contact_details.xml
@@ -25,8 +25,10 @@
                 <android.support.v7.widget.CardView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/activity_horizontal_margin"
                     android:layout_marginLeft="@dimen/activity_horizontal_margin"
                     android:layout_marginTop="@dimen/activity_vertical_margin"
+                    android:layout_marginEnd="@dimen/activity_horizontal_margin"
                     android:layout_marginRight="@dimen/activity_horizontal_margin"
                     android:layout_marginBottom="@dimen/activity_vertical_margin"
                     card_view:cardBackgroundColor="?attr/color_background_secondary">
@@ -167,7 +169,7 @@
                                         android:id="@+id/details_account"
                                         android:layout_width="wrap_content"
                                         android:layout_height="wrap_content"
-                                        android:layout_gravity="right"
+                                        android:layout_gravity="end"
                                         android:layout_marginTop="24dp"
                                         android:text="@string/using_account"
                                         android:textAppearance="@style/TextAppearance.Conversations.Caption"
@@ -181,8 +183,10 @@
                 <android.support.v7.widget.CardView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/activity_horizontal_margin"
                     android:layout_marginLeft="@dimen/activity_horizontal_margin"
                     android:layout_marginTop="@dimen/activity_vertical_margin"
+                    android:layout_marginEnd="@dimen/activity_horizontal_margin"
                     android:layout_marginRight="@dimen/activity_horizontal_margin"
                     android:layout_marginBottom="@dimen/activity_vertical_margin"
                     card_view:cardBackgroundColor="?attr/color_background_secondary">
@@ -228,8 +232,10 @@
                     android:id="@+id/media_wrapper"
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/activity_horizontal_margin"
                     android:layout_marginLeft="@dimen/activity_horizontal_margin"
                     android:layout_marginTop="@dimen/activity_vertical_margin"
+                    android:layout_marginEnd="@dimen/activity_horizontal_margin"
                     android:layout_marginRight="@dimen/activity_horizontal_margin"
                     android:layout_marginBottom="@dimen/activity_vertical_margin"
                     card_view:cardBackgroundColor="?attr/color_background_secondary">
@@ -263,7 +269,9 @@
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:minWidth="0dp"
+                                android:paddingStart="16dp"
                                 android:paddingLeft="16dp"
+                                android:paddingEnd="16dp"
                                 android:paddingRight="16dp"
                                 android:text="@string/view_media"
                                 android:textColor="?attr/colorAccent" />
@@ -275,8 +283,10 @@
                     android:id="@+id/keys_wrapper"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/activity_horizontal_margin"
                     android:layout_marginLeft="@dimen/activity_horizontal_margin"
                     android:layout_marginTop="@dimen/activity_vertical_margin"
+                    android:layout_marginEnd="@dimen/activity_horizontal_margin"
                     android:layout_marginRight="@dimen/activity_horizontal_margin"
                     android:layout_marginBottom="@dimen/activity_vertical_margin"
                     card_view:cardBackgroundColor="?attr/color_background_secondary">
@@ -306,7 +316,9 @@
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:minWidth="0dp"
+                                android:paddingStart="16dp"
                                 android:paddingLeft="16dp"
+                                android:paddingEnd="16dp"
                                 android:paddingRight="16dp"
                                 android:text="@string/scan_qr_code"
                                 android:textColor="?attr/colorAccent" />
@@ -317,7 +329,9 @@
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:minWidth="0dp"
+                                android:paddingStart="16dp"
                                 android:paddingLeft="16dp"
+                                android:paddingEnd="16dp"
                                 android:paddingRight="16dp"
                                 android:text="@string/show_inactive_devices"
                                 android:textColor="?attr/colorAccent" />
diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index 163fe270a..30ae5b192 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -29,8 +29,10 @@
                     android:id="@+id/editor"
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/activity_horizontal_margin"
                     android:layout_marginLeft="@dimen/activity_horizontal_margin"
                     android:layout_marginTop="@dimen/activity_vertical_margin"
+                    android:layout_marginEnd="@dimen/activity_horizontal_margin"
                     android:layout_marginRight="@dimen/activity_horizontal_margin"
                     android:layout_marginBottom="@dimen/activity_vertical_margin"
                     android:orientation="vertical"
@@ -245,8 +247,10 @@
                     android:id="@+id/os_optimization"
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/activity_horizontal_margin"
                     android:layout_marginLeft="@dimen/activity_horizontal_margin"
                     android:layout_marginTop="@dimen/activity_vertical_margin"
+                    android:layout_marginEnd="@dimen/activity_horizontal_margin"
                     android:layout_marginRight="@dimen/activity_horizontal_margin"
                     android:layout_marginBottom="@dimen/activity_vertical_margin"
                     android:visibility="gone"
@@ -282,8 +286,8 @@
                         <LinearLayout
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_gravity="right"
-                            android:gravity="right">
+                            android:layout_gravity="end"
+                            android:gravity="end">
 
                             <Button
                                 android:id="@+id/os_optimization_disable"
@@ -291,7 +295,9 @@
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:minWidth="0dp"
+                                android:paddingStart="16dp"
                                 android:paddingLeft="16dp"
+                                android:paddingEnd="16dp"
                                 android:paddingRight="16dp"
                                 android:text="@string/disable"
                                 android:textColor="@color/accent" />
@@ -303,8 +309,10 @@
                     android:id="@+id/stats"
                     android:layout_width="fill_parent"
                     android:layout_height="fill_parent"
+                    android:layout_marginStart="@dimen/activity_horizontal_margin"
                     android:layout_marginLeft="@dimen/activity_horizontal_margin"
                     android:layout_marginTop="@dimen/activity_vertical_margin"
+                    android:layout_marginEnd="@dimen/activity_horizontal_margin"
                     android:layout_marginRight="@dimen/activity_horizontal_margin"
                     android:layout_marginBottom="@dimen/activity_vertical_margin"
                     android:background="@drawable/infocard_border"
@@ -341,7 +349,7 @@
                                     android:id="@+id/session_est"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
-                                    android:layout_gravity="right"
+                                    android:layout_gravity="end"
                                     android:paddingStart="4dp"
                                     android:paddingLeft="4dp"
                                     android:textAppearance="@style/TextAppearance.Conversations.Body1" />
@@ -373,7 +381,7 @@
                                     android:id="@+id/server_info_pep"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
-                                    android:layout_gravity="right"
+                                    android:layout_gravity="end"
                                     android:paddingStart="4dp"
                                     android:paddingLeft="4dp"
                                     android:textAppearance="@style/TextAppearance.Conversations.Body1" />
@@ -395,7 +403,7 @@
                                     android:id="@+id/server_info_blocking"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
-                                    android:layout_gravity="right"
+                                    android:layout_gravity="end"
                                     android:paddingStart="4dp"
                                     android:paddingLeft="4dp"
                                     android:textAppearance="@style/TextAppearance.Conversations.Body1" />
@@ -417,7 +425,7 @@
                                     android:id="@+id/server_info_sm"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
-                                    android:layout_gravity="right"
+                                    android:layout_gravity="end"
                                     android:paddingStart="4dp"
                                     android:paddingLeft="4dp"
                                     android:textAppearance="@style/TextAppearance.Conversations.Body1" />
@@ -439,7 +447,7 @@
                                     android:id="@+id/server_info_roster_version"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
-                                    android:layout_gravity="right"
+                                    android:layout_gravity="end"
                                     android:paddingStart="4dp"
                                     android:paddingLeft="4dp"
                                     android:textAppearance="@style/TextAppearance.Conversations.Body1" />
@@ -461,7 +469,7 @@
                                     android:id="@+id/server_info_carbons"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
-                                    android:layout_gravity="right"
+                                    android:layout_gravity="end"
                                     android:paddingStart="4dp"
                                     android:paddingLeft="4dp"
                                     android:textAppearance="@style/TextAppearance.Conversations.Body1" />
@@ -483,7 +491,7 @@
                                     android:id="@+id/server_info_mam"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
-                                    android:layout_gravity="right"
+                                    android:layout_gravity="end"
                                     android:paddingStart="4dp"
                                     android:paddingLeft="4dp"
                                     android:textAppearance="@style/TextAppearance.Conversations.Body1" />
@@ -505,7 +513,7 @@
                                     android:id="@+id/server_info_csi"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
-                                    android:layout_gravity="right"
+                                    android:layout_gravity="end"
                                     android:paddingStart="4dp"
                                     android:paddingLeft="4dp"
                                     android:textAppearance="@style/TextAppearance.Conversations.Body1" />
@@ -528,7 +536,7 @@
                                     android:id="@+id/server_info_push"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
-                                    android:layout_gravity="right"
+                                    android:layout_gravity="end"
                                     android:paddingStart="4dp"
                                     android:paddingLeft="4dp"
                                     android:textAppearance="@style/TextAppearance.Conversations.Body1" />
@@ -551,7 +559,7 @@
                                     android:id="@+id/server_info_http_upload"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
-                                    android:layout_gravity="right"
+                                    android:layout_gravity="end"
                                     android:paddingStart="4dp"
                                     android:paddingLeft="4dp"
                                     android:textAppearance="@style/TextAppearance.Conversations.Body1" />
@@ -725,8 +733,10 @@
                     android:id="@+id/other_device_keys_card"
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/activity_horizontal_margin"
                     android:layout_marginLeft="@dimen/activity_horizontal_margin"
                     android:layout_marginTop="@dimen/activity_vertical_margin"
+                    android:layout_marginEnd="@dimen/activity_horizontal_margin"
                     android:layout_marginRight="@dimen/activity_horizontal_margin"
                     android:layout_marginBottom="@dimen/activity_vertical_margin"
                     android:visibility="gone"
diff --git a/src/main/res/layout/activity_magic_create.xml b/src/main/res/layout/activity_magic_create.xml
index 25b82205a..dbff620b4 100644
--- a/src/main/res/layout/activity_magic_create.xml
+++ b/src/main/res/layout/activity_magic_create.xml
@@ -22,12 +22,14 @@
                 android:id="@+id/linearLayout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_alignParentBottom="true"
-                android:layout_alignParentLeft="true"
                 android:layout_alignParentStart="true"
+                android:layout_alignParentLeft="true"
+                android:layout_alignParentBottom="true"
                 android:minHeight="256dp"
                 android:orientation="vertical"
-                android:paddingBottom="8dp"
+                android:paddingStart="16dp"
+                android:paddingEnd="16dp"
+                android:paddingBottom="8dp">
                 android:paddingLeft="16dp"
                 android:paddingRight="16dp">
 
@@ -96,7 +98,7 @@
                     style="@style/Widget.Conversations.Button.Borderless"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="right"
+                    android:layout_gravity="end"
                     android:text="@string/next"
                     android:textColor="?attr/colorAccent" />
             </LinearLayout>
@@ -105,8 +107,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_above="@+id/linearLayout"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true">
+                android:layout_alignParentStart="true"
+                android:layout_alignParentLeft="true">
 
                 <ImageView
                     android:layout_width="wrap_content"
diff --git a/src/main/res/layout/activity_media_viewer.xml b/src/main/res/layout/activity_media_viewer.xml
index 33f6a1059..42db37b86 100644
--- a/src/main/res/layout/activity_media_viewer.xml
+++ b/src/main/res/layout/activity_media_viewer.xml
@@ -9,9 +9,9 @@
         android:id="@+id/frameLayout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:layout_alignParentTop="true"
         android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentTop="true">
+        android:layout_alignParentRight="true">
 
         <com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView
             android:id="@id/message_image_view"
diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml
index d93d737e6..c29d78c26 100644
--- a/src/main/res/layout/activity_muc_details.xml
+++ b/src/main/res/layout/activity_muc_details.xml
@@ -26,8 +26,10 @@
                 <android.support.v7.widget.CardView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/activity_horizontal_margin"
                     android:layout_marginLeft="@dimen/activity_horizontal_margin"
                     android:layout_marginTop="@dimen/activity_vertical_margin"
+                    android:layout_marginEnd="@dimen/activity_horizontal_margin"
                     android:layout_marginRight="@dimen/activity_horizontal_margin"
                     android:layout_marginBottom="@dimen/activity_vertical_margin"
                     card_view:cardBackgroundColor="?attr/color_background_secondary">
@@ -294,7 +296,7 @@
                                 android:id="@+id/details_account"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:layout_gravity="right"
+                                android:layout_gravity="end"
                                 android:layout_marginTop="24dp"
                                 android:text="@string/using_account"
                                 android:textAppearance="@style/TextAppearance.Conversations.Caption"
@@ -307,8 +309,10 @@
                     android:id="@+id/media_wrapper"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/activity_horizontal_margin"
                     android:layout_marginLeft="@dimen/activity_horizontal_margin"
                     android:layout_marginTop="@dimen/activity_vertical_margin"
+                    android:layout_marginEnd="@dimen/activity_horizontal_margin"
                     android:layout_marginRight="@dimen/activity_horizontal_margin"
                     android:layout_marginBottom="@dimen/activity_vertical_margin"
                     card_view:cardBackgroundColor="?attr/color_background_secondary">
@@ -342,7 +346,9 @@
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:minWidth="0dp"
+                                android:paddingStart="16dp"
                                 android:paddingLeft="16dp"
+                                android:paddingEnd="16dp"
                                 android:paddingRight="16dp"
                                 android:text="@string/view_media"
                                 android:textColor="?attr/colorAccent" />
@@ -353,8 +359,10 @@
                 <android.support.v7.widget.CardView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/activity_horizontal_margin"
                     android:layout_marginLeft="@dimen/activity_horizontal_margin"
                     android:layout_marginTop="@dimen/activity_vertical_margin"
+                    android:layout_marginEnd="@dimen/activity_horizontal_margin"
                     android:layout_marginRight="@dimen/activity_horizontal_margin"
                     android:layout_marginBottom="@dimen/activity_vertical_margin"
                     card_view:cardBackgroundColor="?attr/color_background_secondary">
@@ -458,8 +466,10 @@
                     android:id="@+id/muc_more_details"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/activity_horizontal_margin"
                     android:layout_marginLeft="@dimen/activity_horizontal_margin"
                     android:layout_marginTop="@dimen/activity_vertical_margin"
+                    android:layout_marginEnd="@dimen/activity_horizontal_margin"
                     android:layout_marginRight="@dimen/activity_horizontal_margin"
                     android:layout_marginBottom="@dimen/activity_vertical_margin"
                     card_view:cardBackgroundColor="?attr/color_background_secondary">
diff --git a/src/main/res/layout/activity_publish_profile_picture.xml b/src/main/res/layout/activity_publish_profile_picture.xml
index efb28411b..11ffac7c1 100644
--- a/src/main/res/layout/activity_publish_profile_picture.xml
+++ b/src/main/res/layout/activity_publish_profile_picture.xml
@@ -22,8 +22,10 @@
             <android.support.v7.widget.CardView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/activity_horizontal_margin"
                 android:layout_marginLeft="@dimen/activity_horizontal_margin"
                 android:layout_marginTop="@dimen/activity_vertical_margin"
+                android:layout_marginEnd="@dimen/activity_horizontal_margin"
                 android:layout_marginRight="@dimen/activity_horizontal_margin"
                 android:layout_marginBottom="@dimen/activity_vertical_margin"
                 card_view:cardBackgroundColor="?attr/color_background_secondary">
diff --git a/src/main/res/layout/activity_show_locaction.xml b/src/main/res/layout/activity_show_locaction.xml
index 6b560c2a7..ffd62fe91 100644
--- a/src/main/res/layout/activity_show_locaction.xml
+++ b/src/main/res/layout/activity_show_locaction.xml
@@ -25,9 +25,9 @@
         android:id="@+id/fab"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
         android:layout_alignParentEnd="true"
         android:layout_alignParentRight="true"
+        android:layout_alignParentBottom="true"
         android:layout_margin="16dp"
         android:src="@drawable/ic_navigation_white_24dp" />
 
diff --git a/src/main/res/layout/activity_start_conversation.xml b/src/main/res/layout/activity_start_conversation.xml
index 7adb8714a..7681cbc9b 100644
--- a/src/main/res/layout/activity_start_conversation.xml
+++ b/src/main/res/layout/activity_start_conversation.xml
@@ -35,9 +35,9 @@
             android:id="@+id/fab"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
             android:layout_alignParentEnd="true"
             android:layout_alignParentRight="true"
+            android:layout_alignParentBottom="true"
             android:layout_margin="16dp"
             android:src="?attr/icon_add_person" />
     </RelativeLayout>
diff --git a/src/main/res/layout/activity_start_ui.xml b/src/main/res/layout/activity_start_ui.xml
index 974307e5f..8db66bb3e 100644
--- a/src/main/res/layout/activity_start_ui.xml
+++ b/src/main/res/layout/activity_start_ui.xml
@@ -4,11 +4,11 @@
     android:layout_height="match_parent">
 
     <ProgressBar
+        android:id="@+id/progressBar"
         style="?android:attr/progressBarStyleLarge"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:id="@+id/progressBar"
-        android:layout_centerVertical="true"
-        android:layout_centerHorizontal="true" />
+        android:layout_centerHorizontal="true"
+        android:layout_centerVertical="true" />
 
 </RelativeLayout>
diff --git a/src/main/res/layout/activity_trust_keys.xml b/src/main/res/layout/activity_trust_keys.xml
index 7b6ee2fda..fb00f6611 100644
--- a/src/main/res/layout/activity_trust_keys.xml
+++ b/src/main/res/layout/activity_trust_keys.xml
@@ -26,10 +26,12 @@
                     android:id="@+id/key_error_message_card"
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginBottom="@dimen/activity_vertical_margin"
+                    android:layout_marginStart="@dimen/activity_horizontal_margin"
                     android:layout_marginLeft="@dimen/activity_horizontal_margin"
-                    android:layout_marginRight="@dimen/activity_horizontal_margin"
                     android:layout_marginTop="@dimen/activity_vertical_margin"
+                    android:layout_marginEnd="@dimen/activity_horizontal_margin"
+                    android:layout_marginRight="@dimen/activity_horizontal_margin"
+                    android:layout_marginBottom="@dimen/activity_vertical_margin"
                     android:visibility="gone"
                     card_view:cardBackgroundColor="?attr/color_background_secondary">
 
@@ -76,8 +78,8 @@
                         <LinearLayout
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_gravity="right"
-                            android:gravity="right">
+                            android:layout_gravity="end"
+                            android:gravity="end">
 
                             <Button
                                 android:id="@+id/disable_button"
@@ -85,7 +87,9 @@
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:minWidth="0dp"
+                                android:paddingStart="16dp"
                                 android:paddingLeft="16dp"
+                                android:paddingEnd="16dp"
                                 android:paddingRight="16dp"
                                 android:text="@string/disable_encryption"
                                 android:textColor="@color/accent" />
@@ -98,10 +102,12 @@
                     android:id="@+id/own_keys_card"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginBottom="@dimen/activity_vertical_margin"
+                    android:layout_marginStart="@dimen/activity_horizontal_margin"
                     android:layout_marginLeft="@dimen/activity_horizontal_margin"
-                    android:layout_marginRight="@dimen/activity_horizontal_margin"
                     android:layout_marginTop="@dimen/activity_vertical_margin"
+                    android:layout_marginEnd="@dimen/activity_horizontal_margin"
+                    android:layout_marginRight="@dimen/activity_horizontal_margin"
+                    android:layout_marginBottom="@dimen/activity_vertical_margin"
                     android:visibility="gone"
                     card_view:cardBackgroundColor="?attr/color_background_secondary">
 
@@ -143,11 +149,11 @@
             android:id="@+id/button_bar"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:layout_alignParentEnd="true"
+            android:layout_alignParentStart="true"
             android:layout_alignParentLeft="true"
+            android:layout_alignParentEnd="true"
             android:layout_alignParentRight="true"
-            android:layout_alignParentStart="true">
+            android:layout_alignParentBottom="true">
 
             <Button
                 android:id="@+id/cancel_button"
@@ -160,8 +166,8 @@
             <View
                 android:layout_width="1dp"
                 android:layout_height="fill_parent"
-                android:layout_marginBottom="7dp"
                 android:layout_marginTop="7dp"
+                android:layout_marginBottom="7dp"
                 android:background="?attr/divider" />
 
             <Button
diff --git a/src/main/res/layout/activity_updater.xml b/src/main/res/layout/activity_updater.xml
index 5079bb605..37624ea7f 100644
--- a/src/main/res/layout/activity_updater.xml
+++ b/src/main/res/layout/activity_updater.xml
@@ -14,8 +14,8 @@
         android:id="@+id/updater"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentTop="false"
         android:layout_below="@id/toolbar"
+        android:layout_alignParentTop="false"
         android:layout_centerHorizontal="true"
         android:padding="@dimen/card_padding_regular"
         android:textAppearance="@style/TextAppearance.Conversations.Body1"
diff --git a/src/main/res/layout/activity_verify_otr.xml b/src/main/res/layout/activity_verify_otr.xml
index 222195261..119a3117c 100644
--- a/src/main/res/layout/activity_verify_otr.xml
+++ b/src/main/res/layout/activity_verify_otr.xml
@@ -12,8 +12,10 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:layout_marginStart="@dimen/activity_horizontal_margin"
             android:layout_marginLeft="@dimen/activity_horizontal_margin"
             android:layout_marginTop="@dimen/activity_vertical_margin"
+            android:layout_marginEnd="@dimen/activity_horizontal_margin"
             android:layout_marginRight="@dimen/activity_horizontal_margin"
             android:layout_marginBottom="@dimen/activity_vertical_margin"
             android:orientation="vertical">
diff --git a/src/main/res/layout/choose_account_dialog.xml b/src/main/res/layout/choose_account_dialog.xml
index da747fbf4..ac9cd1a2f 100644
--- a/src/main/res/layout/choose_account_dialog.xml
+++ b/src/main/res/layout/choose_account_dialog.xml
@@ -8,10 +8,12 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical"
-        android:paddingBottom="?attr/dialog_vertical_padding"
+        android:paddingStart="?attr/dialog_horizontal_padding"
         android:paddingLeft="?attr/dialog_horizontal_padding"
+        android:paddingTop="?attr/dialog_vertical_padding"
+        android:paddingEnd="?attr/dialog_horizontal_padding"
         android:paddingRight="?attr/dialog_horizontal_padding"
-        android:paddingTop="?attr/dialog_vertical_padding">
+        android:paddingBottom="?attr/dialog_vertical_padding">
 
         <Spinner
             android:id="@+id/account"
diff --git a/src/main/res/layout/conversation_list_row.xml b/src/main/res/layout/conversation_list_row.xml
index ef39138fb..23ba4ac9d 100644
--- a/src/main/res/layout/conversation_list_row.xml
+++ b/src/main/res/layout/conversation_list_row.xml
@@ -153,7 +153,9 @@
                     android:layout_margin="1dp"
                     android:layout_toStartOf="@+id/conversation_lastupdate"
                     android:layout_toLeftOf="@+id/conversation_lastupdate"
+                    android:paddingStart="4dp"
                     android:paddingLeft="4dp"
+                    android:paddingEnd="4dp"
                     android:paddingRight="4dp"
                     android:paddingBottom="2dp"
                     android:visibility="gone"
@@ -166,7 +168,9 @@
                     android:layout_margin="1dp"
                     android:layout_toStartOf="@+id/conversation_unread"
                     android:layout_toLeftOf="@+id/conversation_unread"
+                    android:paddingStart="4dp"
                     android:paddingLeft="4dp"
+                    android:paddingEnd="4dp"
                     android:paddingRight="4dp"
                     android:paddingBottom="2dp"
                     android:visibility="gone"
@@ -179,7 +183,7 @@
                     android:layout_alignBaseline="@+id/conversation_name"
                     android:layout_alignParentEnd="true"
                     android:layout_alignParentRight="true"
-                    android:gravity="right"
+                    android:gravity="end"
                     android:paddingStart="4dp"
                     android:paddingLeft="4dp"
                     android:textAppearance="@style/TextAppearance.Conversations.Caption" />
diff --git a/src/main/res/layout/create_conference_dialog.xml b/src/main/res/layout/create_conference_dialog.xml
index 384baa7ca..3496b17f5 100644
--- a/src/main/res/layout/create_conference_dialog.xml
+++ b/src/main/res/layout/create_conference_dialog.xml
@@ -6,10 +6,12 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical"
-        android:paddingBottom="?attr/dialog_vertical_padding"
+        android:paddingStart="?attr/dialog_horizontal_padding"
         android:paddingLeft="?attr/dialog_horizontal_padding"
+        android:paddingTop="?attr/dialog_vertical_padding"
+        android:paddingEnd="?attr/dialog_horizontal_padding"
         android:paddingRight="?attr/dialog_horizontal_padding"
-        android:paddingTop="?attr/dialog_vertical_padding">
+        android:paddingBottom="?attr/dialog_vertical_padding">
 
         <TextView
             android:id="@+id/your_account"
@@ -36,7 +38,7 @@
                 style="@style/Widget.Conversations.EditText"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:hint="@string/create_dialog_group_chat_name"/>
+                android:hint="@string/create_dialog_group_chat_name" />
         </android.support.design.widget.TextInputLayout>
     </LinearLayout>
 </layout>
\ No newline at end of file
diff --git a/src/main/res/layout/dialog_block_contact.xml b/src/main/res/layout/dialog_block_contact.xml
index 097d00bfb..7973d7003 100644
--- a/src/main/res/layout/dialog_block_contact.xml
+++ b/src/main/res/layout/dialog_block_contact.xml
@@ -5,10 +5,12 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical"
-        android:paddingBottom="?attr/dialog_vertical_padding"
+        android:paddingStart="?attr/dialog_horizontal_padding"
         android:paddingLeft="?attr/dialog_horizontal_padding"
+        android:paddingTop="?attr/dialog_vertical_padding"
+        android:paddingEnd="?attr/dialog_horizontal_padding"
         android:paddingRight="?attr/dialog_horizontal_padding"
-        android:paddingTop="?attr/dialog_vertical_padding">
+        android:paddingBottom="?attr/dialog_vertical_padding">
 
         <TextView
             android:id="@+id/text"
diff --git a/src/main/res/layout/dialog_clear_history.xml b/src/main/res/layout/dialog_clear_history.xml
index 9f3f6d436..d82f89caf 100644
--- a/src/main/res/layout/dialog_clear_history.xml
+++ b/src/main/res/layout/dialog_clear_history.xml
@@ -3,10 +3,12 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:paddingBottom="?attr/dialog_vertical_padding"
+    android:paddingStart="?attr/dialog_horizontal_padding"
     android:paddingLeft="?attr/dialog_horizontal_padding"
+    android:paddingTop="?attr/dialog_vertical_padding"
+    android:paddingEnd="?attr/dialog_horizontal_padding"
     android:paddingRight="?attr/dialog_horizontal_padding"
-    android:paddingTop="?attr/dialog_vertical_padding">
+    android:paddingBottom="?attr/dialog_vertical_padding">
 
     <TextView
         android:layout_width="wrap_content"
diff --git a/src/main/res/layout/dialog_join_conference.xml b/src/main/res/layout/dialog_join_conference.xml
index 1a35a81e6..15017d5c1 100644
--- a/src/main/res/layout/dialog_join_conference.xml
+++ b/src/main/res/layout/dialog_join_conference.xml
@@ -6,10 +6,12 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical"
-        android:paddingBottom="8dp"
+        android:paddingStart="24dp"
         android:paddingLeft="24dp"
+        android:paddingTop="16dp"
+        android:paddingEnd="24dp"
         android:paddingRight="24dp"
-        android:paddingTop="16dp">
+        android:paddingBottom="8dp">
 
         <TextView
             android:id="@+id/your_account"
diff --git a/src/main/res/layout/dialog_presence.xml b/src/main/res/layout/dialog_presence.xml
index 72abb9305..4eff08a37 100644
--- a/src/main/res/layout/dialog_presence.xml
+++ b/src/main/res/layout/dialog_presence.xml
@@ -6,10 +6,12 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical"
-        android:paddingBottom="?attr/dialog_vertical_padding"
+        android:paddingStart="?attr/dialog_horizontal_padding"
         android:paddingLeft="?attr/dialog_horizontal_padding"
+        android:paddingTop="?attr/dialog_vertical_padding"
+        android:paddingEnd="?attr/dialog_horizontal_padding"
         android:paddingRight="?attr/dialog_horizontal_padding"
-        android:paddingTop="?attr/dialog_vertical_padding">
+        android:paddingBottom="?attr/dialog_vertical_padding">
 
         <RadioGroup
             android:id="@+id/show"
diff --git a/src/main/res/layout/dialog_quickedit.xml b/src/main/res/layout/dialog_quickedit.xml
index 9ab308af8..4ce88b2ba 100644
--- a/src/main/res/layout/dialog_quickedit.xml
+++ b/src/main/res/layout/dialog_quickedit.xml
@@ -6,9 +6,11 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical"
+        android:paddingStart="?attr/dialog_horizontal_padding"
         android:paddingLeft="?attr/dialog_horizontal_padding"
-        android:paddingRight="?attr/dialog_horizontal_padding"
-        android:paddingTop="?attr/dialog_vertical_padding">
+        android:paddingTop="?attr/dialog_vertical_padding"
+        android:paddingEnd="?attr/dialog_horizontal_padding"
+        android:paddingRight="?attr/dialog_horizontal_padding">
 
         <android.support.design.widget.TextInputLayout
             android:id="@+id/input_layout"
diff --git a/src/main/res/layout/dialog_show_password.xml b/src/main/res/layout/dialog_show_password.xml
index 116a3e05b..db470cd6c 100644
--- a/src/main/res/layout/dialog_show_password.xml
+++ b/src/main/res/layout/dialog_show_password.xml
@@ -3,10 +3,12 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:paddingBottom="?attr/dialog_vertical_padding"
+    android:paddingStart="?attr/dialog_horizontal_padding"
     android:paddingLeft="?attr/dialog_horizontal_padding"
+    android:paddingTop="?attr/dialog_vertical_padding"
+    android:paddingEnd="?attr/dialog_horizontal_padding"
     android:paddingRight="?attr/dialog_horizontal_padding"
-    android:paddingTop="?attr/dialog_vertical_padding">
+    android:paddingBottom="?attr/dialog_vertical_padding">
 
     <TextView
         android:id="@+id/password"
diff --git a/src/main/res/layout/dialog_verify_fingerprints.xml b/src/main/res/layout/dialog_verify_fingerprints.xml
index ce2be3dae..fd0e1828f 100644
--- a/src/main/res/layout/dialog_verify_fingerprints.xml
+++ b/src/main/res/layout/dialog_verify_fingerprints.xml
@@ -3,10 +3,12 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:paddingBottom="?attr/dialog_vertical_padding"
+    android:paddingStart="?attr/dialog_horizontal_padding"
     android:paddingLeft="?attr/dialog_horizontal_padding"
+    android:paddingTop="?attr/dialog_vertical_padding"
+    android:paddingEnd="?attr/dialog_horizontal_padding"
     android:paddingRight="?attr/dialog_horizontal_padding"
-    android:paddingTop="?attr/dialog_vertical_padding">
+    android:paddingBottom="?attr/dialog_vertical_padding">
 
     <TextView
         android:id="@+id/warning"
diff --git a/src/main/res/layout/enter_jid_dialog.xml b/src/main/res/layout/enter_jid_dialog.xml
index 2565e29d6..4c0214f96 100644
--- a/src/main/res/layout/enter_jid_dialog.xml
+++ b/src/main/res/layout/enter_jid_dialog.xml
@@ -6,10 +6,12 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical"
-        android:paddingBottom="?attr/dialog_vertical_padding"
+        android:paddingStart="?attr/dialog_horizontal_padding"
         android:paddingLeft="?attr/dialog_horizontal_padding"
+        android:paddingTop="?attr/dialog_vertical_padding"
+        android:paddingEnd="?attr/dialog_horizontal_padding"
         android:paddingRight="?attr/dialog_horizontal_padding"
-        android:paddingTop="?attr/dialog_vertical_padding">
+        android:paddingBottom="?attr/dialog_vertical_padding">
 
         <TextView
             android:id="@+id/your_account"
diff --git a/src/main/res/layout/form_boolean.xml b/src/main/res/layout/form_boolean.xml
index 73978f25a..3c80a9083 100644
--- a/src/main/res/layout/form_boolean.xml
+++ b/src/main/res/layout/form_boolean.xml
@@ -2,11 +2,11 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingTop="8dp"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    android:paddingTop="8dp">
 
     <CheckBox
         android:id="@+id/field"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
+        android:layout_height="wrap_content" />
 </LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/form_text.xml b/src/main/res/layout/form_text.xml
index a9a790faa..0a5292958 100644
--- a/src/main/res/layout/form_text.xml
+++ b/src/main/res/layout/form_text.xml
@@ -2,17 +2,17 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingTop="8dp"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    android:paddingTop="8dp">
 
     <TextView
         android:id="@+id/label"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textAppearance="@style/TextAppearance.Conversations.Body1"/>
+        android:textAppearance="@style/TextAppearance.Conversations.Body1" />
 
     <EditText
         android:id="@+id/field"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
+        android:layout_height="wrap_content" />
 </LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/fragment_conversation.xml b/src/main/res/layout/fragment_conversation.xml
index b38cc72a5..25ab8fbef 100644
--- a/src/main/res/layout/fragment_conversation.xml
+++ b/src/main/res/layout/fragment_conversation.xml
@@ -118,8 +118,10 @@
                     android:maxLines="6"
                     android:minHeight="48dp"
                     android:minLines="1"
+                    android:paddingStart="8dp"
                     android:paddingLeft="8dp"
                     android:paddingTop="12dp"
+                    android:paddingEnd="8dp"
                     android:paddingRight="8dp"
                     android:paddingBottom="12dp"
                     android:singleLine="false"
@@ -145,7 +147,9 @@
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:layout_above="@+id/input"
+            android:layout_marginStart="8dp"
             android:layout_marginLeft="8dp"
+            android:layout_marginEnd="8dp"
             android:layout_marginRight="8dp"
             android:layout_marginBottom="4dp"
             android:background="@drawable/snackbar"
@@ -172,8 +176,10 @@
                 android:layout_alignParentEnd="true"
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
+                android:paddingStart="24dp"
                 android:paddingLeft="24dp"
                 android:paddingTop="16dp"
+                android:paddingEnd="24dp"
                 android:paddingRight="24dp"
                 android:paddingBottom="16dp"
                 android:textAllCaps="true"
@@ -185,8 +191,10 @@
             android:id="@+id/messagehint"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
             android:layout_marginLeft="8dp"
             android:layout_marginTop="4dp"
+            android:layout_marginEnd="8dp"
             android:layout_marginRight="8dp"
             android:background="@drawable/date_bubble"
             android:minHeight="48dp"
diff --git a/src/main/res/layout/fragment_conversations_overview.xml b/src/main/res/layout/fragment_conversations_overview.xml
index cf43664ba..3085fccf7 100644
--- a/src/main/res/layout/fragment_conversations_overview.xml
+++ b/src/main/res/layout/fragment_conversations_overview.xml
@@ -7,12 +7,12 @@
 
         <android.support.v7.widget.RecyclerView
             android:id="@+id/list"
-            android:scrollbars="vertical"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="?attr/color_background_secondary"
             android:divider="@android:color/transparent"
-            android:dividerHeight="0dp" />
+            android:dividerHeight="0dp"
+            android:scrollbars="vertical" />
 
 
         <android.support.design.widget.FloatingActionButton
diff --git a/src/main/res/layout/keys_card.xml b/src/main/res/layout/keys_card.xml
index 7374c7eda..126d06b1f 100644
--- a/src/main/res/layout/keys_card.xml
+++ b/src/main/res/layout/keys_card.xml
@@ -6,10 +6,12 @@
 
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/activity_vertical_margin"
+        android:layout_marginStart="@dimen/activity_horizontal_margin"
         android:layout_marginLeft="@dimen/activity_horizontal_margin"
+        android:layout_marginTop="@dimen/activity_vertical_margin"
+        android:layout_marginEnd="@dimen/activity_horizontal_margin"
         android:layout_marginRight="@dimen/activity_horizontal_margin"
-        android:layout_marginTop="@dimen/activity_vertical_margin">
+        android:layout_marginBottom="@dimen/activity_vertical_margin">
 
         <LinearLayout
             android:layout_width="match_parent"
diff --git a/src/main/res/layout/list_item_tag.xml b/src/main/res/layout/list_item_tag.xml
index 53684df83..3488d56f9 100644
--- a/src/main/res/layout/list_item_tag.xml
+++ b/src/main/res/layout/list_item_tag.xml
@@ -4,9 +4,11 @@
     android:layout_height="wrap_content"
     android:layout_margin="2dp"
     android:maxLines="1"
-    android:paddingBottom="1dp"
+    android:paddingStart="4dp"
     android:paddingLeft="4dp"
-    android:paddingRight="4dp"
     android:paddingTop="1dp"
+    android:paddingEnd="4dp"
+    android:paddingRight="4dp"
+    android:paddingBottom="1dp"
     android:textAllCaps="true"
     android:textAppearance="@style/TextAppearance.Conversations.Tag" />
\ No newline at end of file
diff --git a/src/main/res/layout/media_preview.xml b/src/main/res/layout/media_preview.xml
index 8849e7b4a..e798f15ec 100644
--- a/src/main/res/layout/media_preview.xml
+++ b/src/main/res/layout/media_preview.xml
@@ -18,9 +18,9 @@
             android:id="@+id/delete_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_alignParentTop="true"
             android:layout_alignParentEnd="true"
             android:layout_alignParentRight="true"
-            android:layout_alignParentTop="true"
             android:alpha="?attr/delete_icon_alpha"
             android:background="?attr/selectableItemBackgroundBorderless"
             android:src="?attr/icon_cancel" />
diff --git a/src/main/res/layout/message_date_bubble.xml b/src/main/res/layout/message_date_bubble.xml
index cc46a32f4..19183e0c7 100644
--- a/src/main/res/layout/message_date_bubble.xml
+++ b/src/main/res/layout/message_date_bubble.xml
@@ -3,10 +3,12 @@
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:paddingBottom="5dp"
+    android:paddingStart="8dp"
     android:paddingLeft="8dp"
+    android:paddingTop="5dp"
+    android:paddingEnd="8dp"
     android:paddingRight="8dp"
-    android:paddingTop="5dp">
+    android:paddingBottom="5dp">
 
     <LinearLayout
         android:id="@+id/message_box"
diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml
index 777da0195..6683c2332 100644
--- a/src/main/res/layout/message_received.xml
+++ b/src/main/res/layout/message_received.xml
@@ -4,8 +4,10 @@
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
+    android:paddingStart="8dp"
     android:paddingLeft="8dp"
     android:paddingTop="3dp"
+    android:paddingEnd="8dp"
     android:paddingRight="8dp"
     android:paddingBottom="3dp">
 
@@ -24,7 +26,9 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
+        android:layout_marginStart="4dp"
         android:layout_marginLeft="4dp"
+        android:layout_marginEnd="4dp"
         android:layout_marginRight="4dp"
         android:layout_toEndOf="@+id/message_photo"
         android:layout_toRightOf="@+id/message_photo"
@@ -44,7 +48,7 @@
             <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="left"
+                android:layout_gravity="start"
                 android:orientation="horizontal"
                 android:paddingBottom="2dp">
 
diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml
index 295a231b3..e11352dbb 100644
--- a/src/main/res/layout/message_sent.xml
+++ b/src/main/res/layout/message_sent.xml
@@ -4,8 +4,10 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
+    android:paddingStart="8dp"
     android:paddingLeft="8dp"
     android:paddingTop="3dp"
+    android:paddingEnd="8dp"
     android:paddingRight="8dp"
     android:paddingBottom="3dp">
 
@@ -36,7 +38,9 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
+        android:layout_marginStart="4dp"
         android:layout_marginLeft="4dp"
+        android:layout_marginEnd="4dp"
         android:layout_marginRight="4dp"
         android:layout_toStartOf="@+id/message_photo_box"
         android:layout_toLeftOf="@+id/message_photo_box"
@@ -63,7 +67,7 @@
             <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="right"
+                android:layout_gravity="end"
                 android:orientation="horizontal"
                 android:paddingBottom="2dp">
 
diff --git a/src/main/res/layout/message_status.xml b/src/main/res/layout/message_status.xml
index 34dce2d46..4bc1da3fe 100644
--- a/src/main/res/layout/message_status.xml
+++ b/src/main/res/layout/message_status.xml
@@ -4,8 +4,10 @@
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
+    android:paddingStart="8dp"
     android:paddingLeft="8dp"
     android:paddingTop="5dp"
+    android:paddingEnd="8dp"
     android:paddingRight="8dp"
     android:paddingBottom="5dp">
 
diff --git a/src/main/res/layout/password.xml b/src/main/res/layout/password.xml
index 2037f3787..ed97898c3 100644
--- a/src/main/res/layout/password.xml
+++ b/src/main/res/layout/password.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:orientation="vertical">
 
     <EditText
         android:id="@+id/password"
@@ -17,5 +17,5 @@
         android:layout_height="wrap_content"
         android:hint="@string/confirm_password"
         android:inputType="textPassword"
-        android:visibility="gone"/>
+        android:visibility="gone" />
 </LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/simple_list_item.xml b/src/main/res/layout/simple_list_item.xml
index c8e90f8ef..3d2faf15b 100644
--- a/src/main/res/layout/simple_list_item.xml
+++ b/src/main/res/layout/simple_list_item.xml
@@ -19,6 +19,8 @@
     android:layout_height="wrap_content"
     android:gravity="center_vertical"
     android:minHeight="?android:attr/listPreferredItemHeightSmall"
+    android:paddingStart="8dp"
     android:paddingLeft="8dp"
+    android:paddingEnd="8dp"
     android:paddingRight="8dp"
     android:textAppearance="@style/TextAppearance.Conversations.Body1" />
diff --git a/src/main/res/layout/welcome.xml b/src/main/res/layout/welcome.xml
index f16cc92b8..457d44b28 100644
--- a/src/main/res/layout/welcome.xml
+++ b/src/main/res/layout/welcome.xml
@@ -20,14 +20,16 @@
                 android:id="@+id/linearLayout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_alignParentBottom="true"
-                android:layout_alignParentLeft="true"
                 android:layout_alignParentStart="true"
+                android:layout_alignParentLeft="true"
+                android:layout_alignParentBottom="true"
                 android:minHeight="256dp"
                 android:orientation="vertical"
-                android:paddingBottom="8dp"
+                android:paddingStart="16dp"
                 android:paddingLeft="16dp"
-                android:paddingRight="16dp">
+                android:paddingEnd="16dp"
+                android:paddingRight="16dp"
+                android:paddingBottom="8dp">
 
                 <Space
                     android:layout_width="match_parent"
@@ -62,7 +64,7 @@
                     style="@style/Widget.Conversations.Button.Borderless"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="right"
+                    android:layout_gravity="end"
                     android:text="@string/import_database"
                     android:textColor="?attr/colorAccent"
                     android:visibility="gone" />
@@ -72,7 +74,7 @@
                     style="@style/Widget.Conversations.Button.Borderless"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="right"
+                    android:layout_gravity="end"
                     android:text="@string/create_account"
                     android:textColor="?attr/colorAccent" />
 
@@ -81,7 +83,7 @@
                     style="@style/Widget.Conversations.Button.Borderless"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="right"
+                    android:layout_gravity="end"
                     android:text="@string/welcome_advanced_mode"
                     android:textColor="?attr/colorAccent" />
             </LinearLayout>
@@ -90,8 +92,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_above="@+id/linearLayout"
-                android:layout_alignParentLeft="true"
                 android:layout_alignParentStart="true"
+                android:layout_alignParentLeft="true"
                 android:layout_alignParentTop="true">
 
                 <ImageView