diff --git a/res/layout/attachment_type_selector.xml b/res/layout/attachment_type_selector.xml
index 8d84bf3680..7f96eaae2c 100644
--- a/res/layout/attachment_type_selector.xml
+++ b/res/layout/attachment_type_selector.xml
@@ -24,8 +24,8 @@
         <LinearLayout android:orientation="horizontal"
                       android:layout_width="match_parent"
                       android:layout_height="wrap_content"
-                      android:layout_marginLeft="16dp"
-                      android:layout_marginRight="16dp"
+                      android:layout_marginStart="16dp"
+                      android:layout_marginEnd="16dp"
                       android:layout_marginTop="16dp"
                       android:weightSum="4">
 
@@ -127,8 +127,8 @@
                       android:layout_width="match_parent"
                       android:layout_height="wrap_content"
                       android:layout_marginTop="16dp"
-                      android:layout_marginLeft="16dp"
-                      android:layout_marginRight="16dp"
+                      android:layout_marginStart="16dp"
+                      android:layout_marginEnd="16dp"
                       android:layout_marginBottom="16dp"
                       android:weightSum="4">
 
diff --git a/res/layout/audio_view.xml b/res/layout/audio_view.xml
index 088f420f41..79dfe4c884 100644
--- a/res/layout/audio_view.xml
+++ b/res/layout/audio_view.xml
@@ -78,7 +78,7 @@
     <TextView android:id="@+id/timestamp"
               android:layout_width="wrap_content"
               android:layout_height="wrap_content"
-              android:layout_marginLeft="76dip"
+              android:layout_marginStart="76dip"
               android:textAppearance="?android:attr/textAppearanceSmall"
               android:textColor="?conversation_item_sent_text_secondary_color"
               android:textSize="@dimen/conversation_item_date_text_size"
diff --git a/res/layout/backup_enable_dialog.xml b/res/layout/backup_enable_dialog.xml
index ccb1a29c88..b514d015e0 100644
--- a/res/layout/backup_enable_dialog.xml
+++ b/res/layout/backup_enable_dialog.xml
@@ -5,8 +5,8 @@
               android:layout_width="match_parent"
               android:layout_height="wrap_content"
               android:paddingTop="16dp"
-              android:paddingLeft="23dp"
-              android:paddingRight="23dp">
+              android:paddingStart="23dp"
+              android:paddingEnd="23dp">
 
     <TextView android:layout_width="match_parent"
               android:layout_height="wrap_content"
@@ -34,18 +34,16 @@
             <TextView android:id="@+id/code_second"
                       android:layout_width="wrap_content"
                       android:layout_height="wrap_content"
-                      android:layout_marginLeft="20dp"
+                      android:layout_marginStart="20dp"
                       style="@style/BackupPassphrase"
-                      tools:text="56944"
-                      android:layout_marginStart="20dp"/>
+                      tools:text="56944" />
 
             <TextView android:id="@+id/code_third"
                       android:layout_width="wrap_content"
                       android:layout_height="wrap_content"
-                      android:layout_marginLeft="20dp"
+                      android:layout_marginStart="20dp"
                       style="@style/BackupPassphrase"
-                      tools:text="42738"
-                      android:layout_marginStart="20dp"/>
+                      tools:text="42738" />
         </TableRow>
 
         <TableRow android:gravity="center_horizontal">
@@ -58,18 +56,16 @@
             <TextView android:id="@+id/code_fifth"
                       android:layout_width="wrap_content"
                       android:layout_height="wrap_content"
-                      android:layout_marginLeft="20dp"
+                      android:layout_marginStart="20dp"
                       style="@style/BackupPassphrase"
-                      tools:text="24922"
-                      android:layout_marginStart="20dp"/>
+                      tools:text="24922" />
 
             <TextView android:id="@+id/code_sixth"
                       android:layout_width="wrap_content"
                       android:layout_height="wrap_content"
-                      android:layout_marginLeft="20dp"
+                      android:layout_marginStart="20dp"
                       style="@style/BackupPassphrase"
-                      tools:text="58594"
-                      android:layout_marginStart="20dp"/>
+                      tools:text="58594" />
         </TableRow>
     </TableLayout>
 
@@ -82,7 +78,6 @@
         <CheckBox android:id="@+id/confirmation_check"
                   android:layout_width="wrap_content"
                   android:layout_height="wrap_content"
-                  android:layout_marginRight="10dp"
                   android:layout_marginEnd="10dp"/>
 
         <TextView android:id="@+id/confirmation_text"
diff --git a/res/layout/blocked_contact_list_item.xml b/res/layout/blocked_contact_list_item.xml
index 69c10cc10b..2a83568a18 100644
--- a/res/layout/blocked_contact_list_item.xml
+++ b/res/layout/blocked_contact_list_item.xml
@@ -4,15 +4,15 @@
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
         android:layout_height="?android:attr/listPreferredItemHeight"
-        android:paddingRight="25dip">
+        android:paddingEnd="25dip">
 
     <org.thoughtcrime.securesms.components.AvatarImageView
             android:id="@+id/contact_photo_image"
             android:layout_width="@dimen/contact_selection_photo_size"
             android:layout_height="@dimen/contact_selection_photo_size"
-            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
             android:layout_centerVertical="true"
-            android:layout_marginLeft="10dp"
+            android:layout_marginStart="10dp"
             android:cropToPadding="true"
             android:scaleType="centerCrop"
             android:contentDescription="@string/SingleContactSelectionActivity_contact_photo" />
@@ -21,12 +21,12 @@
               android:layout_width="match_parent"
               android:layout_height="match_parent"
               android:layout_alignParentTop="true"
-              android:layout_marginLeft="14dip"
+              android:layout_marginStart="14dip"
               android:checkMark="?android:attr/listChoiceIndicatorMultiple"
               android:singleLine="true"
               android:ellipsize="marquee"
-              android:layout_toRightOf="@id/contact_photo_image"
-              android:gravity="center_vertical|left"
+              android:layout_toEndOf="@id/contact_photo_image"
+              android:gravity="center_vertical|start"
               android:textAppearance="?android:attr/textAppearanceMedium" />
 
 </org.thoughtcrime.securesms.preferences.BlockedContactListItem>
diff --git a/res/layout/blocked_contacts_fragment.xml b/res/layout/blocked_contacts_fragment.xml
index 71859fcc46..49ccc82aa6 100644
--- a/res/layout/blocked_contacts_fragment.xml
+++ b/res/layout/blocked_contacts_fragment.xml
@@ -3,8 +3,8 @@
               android:layout_width="match_parent"
               android:layout_height="match_parent"
               android:orientation="vertical"
-              android:paddingLeft="16dip"
-              android:paddingRight="16dip">
+              android:paddingStart="16dip"
+              android:paddingEnd="16dip">
 
     <ListView android:id="@id/android:list"
               android:layout_width="match_parent"
diff --git a/res/layout/camera_controls_landscape.xml b/res/layout/camera_controls_landscape.xml
index 4ed346376c..0e52ece5f2 100644
--- a/res/layout/camera_controls_landscape.xml
+++ b/res/layout/camera_controls_landscape.xml
@@ -4,9 +4,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="wrap_content"
     android:layout_height="match_parent"
-    android:layout_marginRight="16dp"
     android:layout_marginEnd="16dp"
-    android:layout_gravity="right|end">
+    android:layout_gravity="end">
 
     <Button
         android:id="@+id/camera_capture_button"
diff --git a/res/layout/camera_controls_portrait.xml b/res/layout/camera_controls_portrait.xml
index c1dc8cfdf0..a7651865fe 100644
--- a/res/layout/camera_controls_portrait.xml
+++ b/res/layout/camera_controls_portrait.xml
@@ -19,9 +19,7 @@
         android:id="@+id/camera_flip_button"
         android:layout_width="48dp"
         android:layout_height="wrap_content"
-        android:layout_toLeftOf="@+id/camera_capture_button"
         android:layout_toStartOf="@+id/camera_capture_button"
-        android:layout_marginRight="40dp"
         android:layout_marginEnd="40dp"
         android:layout_centerVertical="true"
         android:src="@drawable/ic_switch_camera_36"
diff --git a/res/layout/captcha_activity.xml b/res/layout/captcha_activity.xml
index 9528904b6a..f5fcdb283a 100644
--- a/res/layout/captcha_activity.xml
+++ b/res/layout/captcha_activity.xml
@@ -13,10 +13,8 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="24dp"
-        android:layout_marginLeft="24dp"
         android:layout_marginTop="24dp"
         android:layout_marginEnd="24dp"
-        android:layout_marginRight="24dp"
         android:text="@string/RegistrationActivity_we_need_to_verify_that_youre_human"
         android:gravity="center"
         app:layout_constraintEnd_toEndOf="parent"
@@ -28,10 +26,8 @@
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:layout_marginStart="16dp"
-        android:layout_marginLeft="16dp"
         android:layout_marginTop="16dp"
         android:layout_marginEnd="16dp"
-        android:layout_marginRight="16dp"
         android:layout_marginBottom="16dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/res/layout/change_passphrase_activity.xml b/res/layout/change_passphrase_activity.xml
index 0e35197e37..ea299256db 100644
--- a/res/layout/change_passphrase_activity.xml
+++ b/res/layout/change_passphrase_activity.xml
@@ -9,8 +9,8 @@
                  android:layout_height="wrap_content"
                  android:gravity="center">
         
-        <LinearLayout android:paddingRight="16dip"
-                      android:paddingLeft="16dip"
+        <LinearLayout android:paddingEnd="16dip"
+                      android:paddingStart="16dip"
                       android:paddingTop="10dip"
                       android:layout_width="fill_parent"
                       android:layout_height="wrap_content"
@@ -61,14 +61,14 @@
             <LinearLayout android:orientation="horizontal"
                           android:layout_width="fill_parent"
                           android:layout_height="wrap_content"
-                          android:layout_marginTop="30dip">
+                          android:layout_marginTop="30dp">
 
                 <Button android:id="@+id/cancel_button"
                         android:text="@android:string/cancel"
                         android:layout_weight="1"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_marginRight="7dip"
+                        android:layout_marginEnd="7dp"
                         android:textAppearance="?android:attr/textAppearanceMedium"/>
                 
                 <Button android:id="@+id/ok_button"
diff --git a/res/layout/color_fragment.xml b/res/layout/color_fragment.xml
index 16ad3d8cf4..de2f5f2ed6 100644
--- a/res/layout/color_fragment.xml
+++ b/res/layout/color_fragment.xml
@@ -14,8 +14,8 @@
               android:textSize="@dimen/onboarding_title_size"
               android:textIsSelectable="false"
               android:gravity="center_horizontal|bottom"
-              android:paddingLeft="20dp"
-              android:paddingRight="20dp"
+              android:paddingStart="20dp"
+              android:paddingEnd="20dp"
               android:layout_marginTop="30dp"
               android:fontFamily="sans-serif-light"
               tools:text="@string/ExperienceUpgradeActivity_ready_for_your_closeup"
@@ -36,8 +36,8 @@
               android:textSize="@dimen/onboarding_subtitle_size"
               android:textIsSelectable="false"
               android:gravity="center_horizontal"
-              android:paddingLeft="20dp"
-              android:paddingRight="20dp"
+              android:paddingStart="20dp"
+              android:paddingEnd="20dp"
               android:fontFamily="sans-serif-light"
               tools:text="@string/ExperienceUpgradeActivity_now_you_can_share_a_profile_photo_and_name_with_friends_on_signal"
               android:textColor="@android:color/white" />
diff --git a/res/layout/contact_filter_toolbar.xml b/res/layout/contact_filter_toolbar.xml
index 0c1f725933..d2df675416 100644
--- a/res/layout/contact_filter_toolbar.xml
+++ b/res/layout/contact_filter_toolbar.xml
@@ -29,8 +29,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:paddingLeft="10dp"
-                android:paddingRight="10dp"
+                android:paddingStart="10dp"
+                android:paddingEnd="10dp"
                 android:gravity="center">
 
                 <ImageView android:id="@+id/search_dialpad"
diff --git a/res/layout/contact_selection_list_divider.xml b/res/layout/contact_selection_list_divider.xml
index f53da3f146..e4474b10bf 100644
--- a/res/layout/contact_selection_list_divider.xml
+++ b/res/layout/contact_selection_list_divider.xml
@@ -9,7 +9,6 @@
     <TextView android:id="@+id/label"
               android:layout_width="wrap_content"
               android:layout_height="wrap_content"
-              android:paddingLeft="16dp"
               android:paddingStart="16dp"
               android:paddingTop="10dp"
               android:paddingBottom="10dp"
diff --git a/res/layout/contact_selection_list_fragment.xml b/res/layout/contact_selection_list_fragment.xml
index db9c7fc6fe..6d6536b6a7 100644
--- a/res/layout/contact_selection_list_fragment.xml
+++ b/res/layout/contact_selection_list_fragment.xml
@@ -71,8 +71,8 @@
                   android:layout_width="wrap_content"
                   android:layout_height="wrap_content"
                   android:layout_marginTop="20dp"
-                  android:layout_marginLeft="50dp"
-                  android:layout_marginRight="50dp"
+                  android:layout_marginStart="50dp"
+                  android:layout_marginEnd="50dp"
                   android:textSize="15sp"
                   android:lineSpacingMultiplier="1.3"
                   android:gravity="center"
diff --git a/res/layout/contact_selection_list_item.xml b/res/layout/contact_selection_list_item.xml
index 521df276cc..bda73818ad 100644
--- a/res/layout/contact_selection_list_item.xml
+++ b/res/layout/contact_selection_list_item.xml
@@ -9,9 +9,7 @@
         android:gravity="center_vertical"
         android:focusable="true"
         android:background="@drawable/conversation_item_background"
-        android:paddingLeft="48dp"
         android:paddingStart="48dp"
-        android:paddingRight="24dp"
         android:paddingEnd="24dp">
 
     <org.thoughtcrime.securesms.components.AvatarImageView
@@ -26,9 +24,7 @@
     <LinearLayout android:layout_width="0dp"
                   android:layout_height="wrap_content"
                   android:layout_weight="1"
-                  android:layout_marginLeft="16dp"
                   android:layout_marginStart="16dp"
-                  android:paddingRight="16dp"
                   android:paddingEnd="16dp"
                   android:orientation="vertical">
 
@@ -62,7 +58,6 @@
             <TextView android:id="@+id/label"
                       android:layout_width="wrap_content"
                       android:layout_height="wrap_content"
-                      android:paddingLeft="10dip"
                       android:paddingStart="10dip"
                       android:ellipsize="end"
                       android:singleLine="true"
diff --git a/res/layout/conversation_activity.xml b/res/layout/conversation_activity.xml
index 7fb99cd849..4672c46636 100644
--- a/res/layout/conversation_activity.xml
+++ b/res/layout/conversation_activity.xml
@@ -91,7 +91,7 @@
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:background="?android:windowBackground"
-            android:paddingLeft="5dip"
+            android:paddingStart="5dip"
             android:text="160/160 (1)"
             android:visibility="gone" />
 
diff --git a/res/layout/conversation_activity_attachment_editor_stub.xml b/res/layout/conversation_activity_attachment_editor_stub.xml
index 61fb384620..659993e2db 100644
--- a/res/layout/conversation_activity_attachment_editor_stub.xml
+++ b/res/layout/conversation_activity_attachment_editor_stub.xml
@@ -50,8 +50,8 @@
             android:visibility="gone"
             android:paddingTop="8dp"
             android:paddingBottom="8dp"
-            android:paddingLeft="@dimen/message_bubble_horizontal_padding"
-            android:paddingRight="@dimen/message_bubble_horizontal_padding"
+            android:paddingStart="@dimen/message_bubble_horizontal_padding"
+            android:paddingEnd="@dimen/message_bubble_horizontal_padding"
             android:background="@drawable/message_bubble_background_sent_alone"
             app:doc_titleColor="?attr/conversation_item_sent_text_primary_color"
             app:doc_captionColor="?attr/conversation_item_sent_text_secondary_color"/>
diff --git a/res/layout/conversation_fragment.xml b/res/layout/conversation_fragment.xml
index 354dbebe40..43d9e6117e 100644
--- a/res/layout/conversation_fragment.xml
+++ b/res/layout/conversation_fragment.xml
@@ -20,8 +20,8 @@
               android:layout_height="wrap_content"
               android:gravity="center"
               android:layout_gravity="center_horizontal|top"
-              android:paddingLeft="12dp"
-              android:paddingRight="12dp"
+              android:paddingStart="12dp"
+              android:paddingEnd="12dp"
               android:paddingTop="4dp"
               android:paddingBottom="4dp"
               android:layout_marginTop="8dp"
@@ -47,7 +47,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="10dp"
-            android:layout_marginRight="10dp"
             android:layout_marginBottom="20dp"
             android:padding="5dp"
             android:layout_gravity="bottom|end"
diff --git a/res/layout/conversation_input_panel.xml b/res/layout/conversation_input_panel.xml
index c5d6332934..c456ba99a0 100644
--- a/res/layout/conversation_input_panel.xml
+++ b/res/layout/conversation_input_panel.xml
@@ -9,8 +9,8 @@
         android:gravity="center_vertical"
         android:orientation="horizontal"
         android:clickable="true"
-        android:paddingLeft="16dp"
-        android:paddingRight="16dp"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
         android:paddingTop="6dp"
         android:paddingBottom="6dp"
         android:clipChildren="false"
@@ -36,8 +36,8 @@
                 android:id="@+id/quote_view"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="6dp"
-                android:layout_marginRight="6dp"
+                android:layout_marginStart="6dp"
+                android:layout_marginEnd="6dp"
                 android:layout_marginTop="6dp"
                 android:visibility="gone"
                 app:message_type="preview"
@@ -49,8 +49,8 @@
                 android:id="@+id/link_preview"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="6dp"
-                android:layout_marginRight="6dp"
+                android:layout_marginStart="6dp"
+                android:layout_marginEnd="6dp"
                 android:layout_marginTop="6dp"
                 android:visibility="gone"
                 app:linkpreview_type="compose" />
@@ -64,7 +64,6 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:paddingLeft="10dp"
                     android:paddingStart="10dp"
                     android:clipChildren="false"
                     android:clipToPadding="false">
@@ -74,9 +73,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="@dimen/conversation_compose_height"
                         android:layout_gravity="bottom"
-                        android:paddingLeft="4dp"
                         android:paddingStart="4dp"
-                        android:paddingRight="6dp"
                         android:paddingEnd="6dp"
                         android:background="?selectableItemBackgroundBorderless"
                         android:contentDescription="@string/conversation_activity__emoji_toggle_description" />
@@ -119,8 +116,8 @@
                                 android:layout_height="match_parent"
                                 android:layout_gravity="center_vertical"
                                 android:src="?quick_camera_icon"
-                                android:paddingLeft="6dp"
-                                android:paddingRight="6dp"
+                                android:paddingStart="6dp"
+                                android:paddingEnd="6dp"
                                 android:background="?selectableItemBackgroundBorderless"
                                 android:contentDescription="@string/conversation_activity__quick_attachment_drawer_toggle_camera_description" />
 
@@ -137,7 +134,6 @@
                                     android:layout_width="wrap_content"
                                     android:layout_height="match_parent"
                                     android:layout_gravity="center_vertical"
-                                    android:layout_marginRight="2dp"
                                     android:layout_marginEnd="2dp"
                                     android:padding="6dp"
                                     android:src="?quick_mic_icon"
@@ -195,7 +191,6 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:ellipsize="none"
-                        android:layout_marginLeft="20dp"
                         android:layout_marginStart="20dp"
                         style="@style/Signal.Text.Body"
                         android:text="00:00"
@@ -214,7 +209,6 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:gravity="left|start|center_vertical"
-                            android:drawableLeft="@drawable/ic_keyboard_arrow_left_grey600_24dp"
                             android:drawableStart="@drawable/ic_keyboard_arrow_left_grey600_24dp"
                             style="@style/Signal.Text.Caption"
                             android:text="@string/conversation_input_panel__slide_to_cancel"
@@ -222,7 +216,6 @@
                             android:textColor="@color/core_grey_60"
                             android:ellipsize="none"
                             android:visibility="gone"
-                            android:paddingRight="50dp"
                             android:paddingEnd="50dp"
                             tools:visibility="visible"/>
 
@@ -240,7 +233,6 @@
         android:id="@+id/button_toggle"
         android:layout_width="@dimen/conversation_compose_height"
         android:layout_height="@dimen/conversation_compose_height"
-        android:layout_marginLeft="12dp"
         android:layout_marginStart="12dp"
         android:background="@drawable/circle_tintable"
         android:layout_gravity="bottom">
@@ -260,9 +252,9 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:paddingTop="6dp"
-            android:paddingRight="6dp"
+            android:paddingEnd="6dp"
             android:paddingBottom="6dp"
-            android:paddingLeft="11dp"
+            android:paddingStart="11dp"
             android:scaleType="fitCenter"
             android:contentDescription="@string/conversation_activity__send"
             android:nextFocusLeft="@+id/embedded_text_editor"
diff --git a/res/layout/conversation_item_footer.xml b/res/layout/conversation_item_footer.xml
index 1a93f1834c..685d1c44dc 100644
--- a/res/layout/conversation_item_footer.xml
+++ b/res/layout/conversation_item_footer.xml
@@ -12,7 +12,6 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:layout_marginRight="6dp"
         android:layout_marginEnd="6dp"
         android:orientation="horizontal"
         android:gravity="left|start|center_vertical">
@@ -31,7 +30,6 @@
         <org.thoughtcrime.securesms.components.ExpirationTimerView
             android:id="@+id/footer_expiration_timer"
             android:layout_gravity="center_vertical|end"
-            android:layout_marginLeft="6dp"
             android:layout_marginStart="6dp"
             android:layout_width="12dp"
             android:layout_height="12dp"
@@ -45,14 +43,13 @@
         android:autoLink="none"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginRight="4dp"
         android:layout_marginEnd="4dp"
         android:maxWidth="140dp"
         android:maxLines="1"
         android:ellipsize="end"
         android:linksClickable="false"
         style="@style/Signal.Text.Caption.MessageSent"
-        android:layout_gravity="right|end|bottom"
+        android:layout_gravity="end|bottom"
         android:fontFamily="sans-serif-light"
         android:visibility="gone"
         tools:visibility="visible"
@@ -64,7 +61,7 @@
         android:layout_height="11dp"
         android:src="@drawable/ic_unlocked_white_18dp"
         android:visibility="gone"
-        android:layout_gravity="center_vertical|right|end"
+        android:layout_gravity="center_vertical|end"
         android:contentDescription="@string/conversation_item__secure_message_description"
         tools:visibility="visible"/>
 
diff --git a/res/layout/conversation_item_header.xml b/res/layout/conversation_item_header.xml
index f2716d03bf..395d27cf3a 100644
--- a/res/layout/conversation_item_header.xml
+++ b/res/layout/conversation_item_header.xml
@@ -7,8 +7,8 @@
     android:orientation="vertical"
     android:paddingTop="12dp"
     android:paddingBottom="13dp"
-    android:paddingLeft="28dp"
-    android:paddingRight="28dp">
+    android:paddingStart="28dp"
+    android:paddingEnd="28dp">
 
     <TextView
         android:id="@+id/text"
diff --git a/res/layout/conversation_item_last_seen.xml b/res/layout/conversation_item_last_seen.xml
index e36d452d7d..9a5d18dd24 100644
--- a/res/layout/conversation_item_last_seen.xml
+++ b/res/layout/conversation_item_last_seen.xml
@@ -11,8 +11,8 @@
     <View
         android:layout_width="match_parent"
         android:layout_height="4dp"
-        android:layout_marginLeft="28dp"
-        android:layout_marginRight="28dp"
+        android:layout_marginStart="28dp"
+        android:layout_marginEnd="28dp"
         android:layout_marginBottom="3dp"
         android:background="?attr/conversation_item_last_seen_line_color" />
 
diff --git a/res/layout/conversation_item_received.xml b/res/layout/conversation_item_received.xml
index f7140f8aa4..ed289e509b 100644
--- a/res/layout/conversation_item_received.xml
+++ b/res/layout/conversation_item_received.xml
@@ -18,9 +18,7 @@
         android:id="@+id/container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginRight="@dimen/conversation_individual_right_gutter"
         android:layout_marginEnd="@dimen/conversation_individual_right_gutter"
-        android:paddingLeft="8dp"
         android:paddingStart="8dp"
         android:clipToPadding="false"
         android:clipChildren="false">
@@ -29,7 +27,6 @@
             android:id="@+id/contact_photo_container"
             android:layout_width="36dp"
             android:layout_height="wrap_content"
-            android:layout_alignParentLeft="true"
             android:layout_alignParentStart="true"
             android:layout_alignParentBottom="true">
 
@@ -47,11 +44,8 @@
             android:id="@+id/body_bubble"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginRight="@dimen/message_bubble_edge_margin"
             android:layout_marginEnd="@dimen/message_bubble_edge_margin"
-            android:layout_marginLeft="8dp"
             android:layout_marginStart="8dp"
-            android:layout_toRightOf="@id/contact_photo_container"
             android:layout_toEndOf="@id/contact_photo_container"
             android:orientation="vertical"
             android:clipToPadding="false"
@@ -65,8 +59,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/message_bubble_top_padding"
                 android:layout_marginBottom="2dp"
-                android:layout_marginLeft="@dimen/message_bubble_horizontal_padding"
-                android:layout_marginRight="@dimen/message_bubble_horizontal_padding"
+                android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
+                android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
                 android:orientation="horizontal"
                 android:visibility="gone"
                 tools:visibility="visible">
@@ -75,7 +69,6 @@
                     android:id="@+id/group_message_sender"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginRight="4sp"
                     android:layout_marginEnd="4sp"
                     style="@style/Signal.Text.Preview"
                     android:fontFamily="sans-serif-medium"
@@ -89,8 +82,8 @@
                     android:id="@+id/group_message_sender_profile"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:paddingRight="4sp"
-                    android:paddingLeft="4sp"
+                    android:paddingStart="4sp"
+                    android:paddingEnd="4sp"
                     style="@style/Signal.Text.Preview"
                     android:fontFamily="sans-serif-regular"
                     android:textColor="?conversation_item_received_text_primary_color"
@@ -106,8 +99,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/message_bubble_top_padding"
-                android:layout_marginLeft="6dp"
-                android:layout_marginRight="6dp"
+                android:layout_marginStart="6dp"
+                android:layout_marginEnd="6dp"
                 android:visibility="gone"
                 app:message_type="incoming"
                 app:quote_colorPrimary="?attr/conversation_item_quote_text_color"
@@ -141,8 +134,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/message_bubble_top_padding"
                 android:layout_marginBottom="@dimen/message_bubble_collapsed_footer_padding"
-                android:layout_marginLeft="@dimen/message_bubble_horizontal_padding"
-                android:layout_marginRight="@dimen/message_bubble_horizontal_padding" />
+                android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
+                android:layout_marginEnd="@dimen/message_bubble_horizontal_padding" />
 
             <ViewStub
                 android:id="@+id/document_view_stub"
@@ -151,8 +144,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/message_bubble_top_padding"
                 android:layout_marginBottom="@dimen/message_bubble_collapsed_footer_padding"
-                android:layout_marginLeft="@dimen/message_bubble_horizontal_padding"
-                android:layout_marginRight="@dimen/message_bubble_horizontal_padding" />
+                android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
+                android:layout_marginEnd="@dimen/message_bubble_horizontal_padding" />
 
             <org.thoughtcrime.securesms.components.emoji.EmojiTextView
                 android:id="@+id/conversation_item_body"
@@ -160,8 +153,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/message_bubble_top_padding"
                 android:layout_marginBottom="@dimen/message_bubble_collapsed_footer_padding"
-                android:layout_marginLeft="@dimen/message_bubble_horizontal_padding"
-                android:layout_marginRight="@dimen/message_bubble_horizontal_padding"
+                android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
+                android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
                 style="@style/Signal.Text.Body"
                 android:textColor="?conversation_item_received_text_primary_color"
                 android:textColorLink="?conversation_item_received_text_primary_color"
@@ -175,8 +168,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="-4dp"
-                android:layout_marginLeft="@dimen/message_bubble_horizontal_padding"
-                android:layout_marginRight="@dimen/message_bubble_horizontal_padding"
+                android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
+                android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
                 android:layout_marginBottom="@dimen/message_bubble_bottom_padding"
                 android:clipChildren="false"
                 android:clipToPadding="false"
@@ -190,7 +183,7 @@
             android:id="@+id/indicators_parent"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true"
             android:orientation="vertical"
             android:gravity="center_vertical"/>
 
diff --git a/res/layout/conversation_item_sent.xml b/res/layout/conversation_item_sent.xml
index ee513b300d..f9ff329f4d 100644
--- a/res/layout/conversation_item_sent.xml
+++ b/res/layout/conversation_item_sent.xml
@@ -18,7 +18,6 @@
         android:id="@+id/container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginRight="@dimen/conversation_individual_right_gutter"
         android:layout_marginEnd="@dimen/conversation_individual_right_gutter"
         android:clipToPadding="false"
         android:clipChildren="false">
@@ -28,10 +27,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:layout_toLeftOf="@+id/indicators_parent"
             android:layout_toStartOf="@+id/indicators_parent"
             android:layout_alignWithParentIfMissing="true"
-            android:layout_marginLeft="@dimen/message_bubble_edge_margin"
             android:layout_marginStart="@dimen/message_bubble_edge_margin"
             android:clipToPadding="false"
             android:clipChildren="false"
@@ -43,8 +40,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/message_bubble_top_padding"
-                android:layout_marginLeft="6dp"
-                android:layout_marginRight="6dp"
+                android:layout_marginStart="6dp"
+                android:layout_marginEnd="6dp"
                 android:visibility="gone"
                 app:message_type="outgoing"
                 app:quote_colorPrimary="?attr/conversation_item_quote_text_color"
@@ -78,8 +75,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/message_bubble_top_padding"
                 android:layout_marginBottom="@dimen/message_bubble_collapsed_footer_padding"
-                android:layout_marginLeft="@dimen/message_bubble_horizontal_padding"
-                android:layout_marginRight="@dimen/message_bubble_horizontal_padding" />
+                android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
+                android:layout_marginEnd="@dimen/message_bubble_horizontal_padding" />
 
             <ViewStub
                 android:id="@+id/document_view_stub"
@@ -88,16 +85,16 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/message_bubble_top_padding"
                 android:layout_marginBottom="@dimen/message_bubble_collapsed_footer_padding"
-                android:layout_marginLeft="@dimen/message_bubble_horizontal_padding"
-                android:layout_marginRight="@dimen/message_bubble_horizontal_padding" />
+                android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
+                android:layout_marginEnd="@dimen/message_bubble_horizontal_padding" />
 
             <org.thoughtcrime.securesms.components.emoji.EmojiTextView
                 android:id="@+id/conversation_item_body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/message_bubble_top_padding"
-                android:layout_marginLeft="@dimen/message_bubble_horizontal_padding"
-                android:layout_marginRight="@dimen/message_bubble_horizontal_padding"
+                android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
+                android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
                 android:layout_marginBottom="@dimen/message_bubble_collapsed_footer_padding"
                 style="@style/Signal.Text.Body"
                 android:textColor="?conversation_item_sent_text_primary_color"
@@ -130,8 +127,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="-4dp"
-                android:layout_marginLeft="@dimen/message_bubble_horizontal_padding"
-                android:layout_marginRight="@dimen/message_bubble_horizontal_padding"
+                android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
+                android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
                 android:layout_marginBottom="@dimen/message_bubble_bottom_padding"
                 android:clipChildren="false"
                 android:clipToPadding="false"
@@ -146,9 +143,7 @@
             android:layout_height="wrap_content"
             android:orientation="vertical"
             android:paddingBottom="4dp"
-            android:layout_marginLeft="8dp"
             android:layout_marginStart="8dp"
-            android:layout_alignParentRight="true"
             android:layout_alignParentEnd="true"
             android:layout_alignParentBottom="true" />
 
diff --git a/res/layout/conversation_item_thumbnail.xml b/res/layout/conversation_item_thumbnail.xml
index 55bbbefa16..23544e8e68 100644
--- a/res/layout/conversation_item_thumbnail.xml
+++ b/res/layout/conversation_item_thumbnail.xml
@@ -39,8 +39,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom"
-        android:layout_marginLeft="@dimen/message_bubble_horizontal_padding"
-        android:layout_marginRight="@dimen/message_bubble_horizontal_padding"
+        android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
+        android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
         android:layout_marginBottom="@dimen/message_bubble_bottom_padding"
         app:footer_text_color="@color/core_white"
         app:footer_icon_color="@color/core_white"/>
diff --git a/res/layout/conversation_item_update.xml b/res/layout/conversation_item_update.xml
index ac40a3783f..9a2368a43a 100644
--- a/res/layout/conversation_item_update.xml
+++ b/res/layout/conversation_item_update.xml
@@ -10,8 +10,8 @@
     android:gravity="center"
     android:orientation="vertical"
     android:paddingBottom="6dp"
-    android:paddingLeft="28dp"
-    android:paddingRight="28dp"
+    android:paddingStart="28dp"
+    android:paddingEnd="28dp"
     android:paddingTop="8dp">
 
     <LinearLayout
@@ -27,7 +27,6 @@
             android:layout_height="20dp"
             android:layout_gravity="center_vertical"
             android:layout_marginEnd="6dp"
-            android:layout_marginRight="6dp"
             android:src="@drawable/ic_timer" />
 
         <TextView
diff --git a/res/layout/conversation_list_activity.xml b/res/layout/conversation_list_activity.xml
index 09f43759ed..103206d734 100644
--- a/res/layout/conversation_list_activity.xml
+++ b/res/layout/conversation_list_activity.xml
@@ -26,9 +26,7 @@
             <ImageView android:id="@+id/toolbar_icon"
                        android:layout_width="36dp"
                        android:layout_height="36dp"
-                       android:layout_marginLeft="8dp"
                        android:layout_marginStart="8dp"
-                       android:layout_alignParentLeft="true"
                        android:layout_alignParentStart="true"
                        android:layout_centerVertical="true"/>
 
@@ -38,20 +36,15 @@
                       android:textColor="@color/white"
                       android:textSize="25sp"
                       android:layout_alignParentStart="true"
-                      android:layout_alignParentLeft="true"
                       android:layout_centerVertical="true"
-                      android:layout_toLeftOf="@+id/search_action"
                       android:layout_toStartOf="@+id/search_action"
-                      android:layout_marginStart="66dp"
-                      android:layout_marginLeft="66dp"/>
+                      android:layout_marginStart="66dp"/>
 
             <ImageView android:id="@+id/search_action"
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:src="@drawable/ic_search_white_24dp"
-                       android:paddingRight="16dp"
                        android:paddingEnd="16dp"
-                       android:layout_alignParentRight="true"
                        android:layout_alignParentEnd="true"
                        android:layout_centerVertical="true"/>
 
diff --git a/res/layout/conversation_list_fragment.xml b/res/layout/conversation_list_fragment.xml
index d865cb5503..536041924a 100644
--- a/res/layout/conversation_list_fragment.xml
+++ b/res/layout/conversation_list_fragment.xml
@@ -36,8 +36,8 @@
 
         <TextView android:layout_width="match_parent"
                   android:layout_height="wrap_content"
-                  android:layout_marginLeft="32dp"
-                  android:layout_marginRight="32dp"
+                  android:layout_marginStart="32dp"
+                  android:layout_marginEnd="32dp"
                   android:layout_marginTop="20dp"
                   android:layout_marginBottom="20dp"
                   style="@style/Signal.Text.Body"
diff --git a/res/layout/conversation_list_item_view.xml b/res/layout/conversation_list_item_view.xml
index f27bb644d1..75dde68581 100644
--- a/res/layout/conversation_list_item_view.xml
+++ b/res/layout/conversation_list_item_view.xml
@@ -9,17 +9,15 @@
         android:nextFocusRight="@+id/fab"
         android:nextFocusLeft="@+id/container"
         android:layout_height="72dp"
-        android:paddingLeft="16dp"
-        android:paddingRight="16dp">
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp">
 
     <FrameLayout
         android:id="@+id/avatar_container"
         android:layout_width="54dp"
         android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
         android:layout_centerVertical="true"
-        android:layout_marginRight="6dp"
         android:layout_marginEnd="6dp">
 
         <org.thoughtcrime.securesms.components.AvatarImageView
@@ -34,7 +32,7 @@
             android:id="@+id/unread_indicator"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="right|end|top"
+            android:layout_gravity="end|top"
             style="@style/Signal.Text.Caption"
             android:fontFamily="sans-serif-medium"
             android:minWidth="@dimen/unread_count_bubble_diameter"
@@ -48,10 +46,8 @@
 
     <RelativeLayout android:layout_width="match_parent"
                   android:layout_height="wrap_content"
-                  android:layout_marginLeft="4dp"
                   android:layout_marginStart="4dp"
                   android:layout_centerVertical="true"
-                  android:layout_toRightOf="@id/avatar_container"
                   android:layout_toEndOf="@id/avatar_container"
                   android:weightSum="1"
                   android:orientation="horizontal">
@@ -61,9 +57,7 @@
                   android:layout_width="match_parent"
                   android:layout_height="wrap_content"
                   android:layout_alignParentTop="true"
-                  android:layout_alignParentLeft="true"
                   android:layout_alignParentStart="true"
-                  android:layout_toLeftOf="@+id/thumbnail"
                   android:layout_toStartOf="@+id/thumbnail"
                   style="@style/Signal.Text.Body"
                   android:fontFamily="sans-serif-medium"
@@ -79,9 +73,7 @@
                 android:layout_width="18dp"
                 android:layout_height="18dp"
                 android:paddingTop="2dp"
-                android:layout_marginRight="2dp"
                 android:layout_marginEnd="2dp"
-                android:layout_alignParentLeft="true"
                 android:layout_alignParentStart="true"
                 android:layout_below="@id/from"
                 app:useSmallIcon="true"
@@ -92,11 +84,9 @@
             android:id="@+id/subject_container"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingRight="1dp"
+            android:paddingEnd="1dp"
             android:layout_below="@id/from"
-            android:layout_toRightOf="@id/indicators_parent"
             android:layout_toEndOf="@id/indicators_parent"
-            android:layout_toLeftOf="@+id/status"
             android:layout_toStartOf="@+id/status">
 
             <org.thoughtcrime.securesms.components.emoji.EmojiTextView
@@ -124,9 +114,8 @@
                 android:layout_width="40dp"
                 android:layout_height="40dp"
                 android:layout_gravity="center_horizontal"
-                android:layout_marginRight="5dp"
-                android:layout_marginLeft="5dp"
-                android:layout_toLeftOf="@+id/date"
+                android:layout_marginEnd="5dp"
+                android:layout_marginStart="5dp"
                 android:layout_toStartOf="@+id/date"
                 android:layout_alignParentTop="true"
                 android:layout_marginTop="5dp"
@@ -136,14 +125,11 @@
                 tools:visibility="visible" />
 
         <TextView android:id="@id/date"
-                  android:layout_marginLeft="3dp"
                   android:layout_marginStart="3dp"
                   android:layout_height="wrap_content"
                   android:layout_width="wrap_content"
-                  android:layout_alignParentRight="true"
                   android:layout_alignParentEnd="true"
                   android:layout_alignBaseline="@+id/from"
-                  android:layout_above="@id/subject"
                   style="@style/Signal.Text.Caption"
                   android:textColor="?attr/conversation_list_item_date_color"
                   android:textAllCaps="true"
@@ -154,13 +140,10 @@
                   android:layout_width="wrap_content"
                   android:layout_height="wrap_content"
                   android:layout_below="@id/date"
-                  android:layout_alignParentRight="true"
                   android:layout_alignParentEnd="true"
-                  android:layout_alignBaseline="@id/subject"
-                  android:layout_marginLeft="5dp"
                   android:layout_marginStart="5dp"
-                  android:paddingLeft="6dp"
-                  android:paddingRight="6dp"
+                  android:paddingStart="6dp"
+                  android:paddingEnd="6dp"
                   android:paddingTop="2dp"
                   android:paddingBottom="2dp"
                   style="@style/Signal.Text.Caption"
@@ -175,7 +158,6 @@
                      android:layout_height="wrap_content"
                      android:layout_marginTop="4dp"
                      android:layout_below="@id/date"
-                     android:layout_toLeftOf="@id/archived"
                      android:layout_toStartOf="@id/archived"
                      android:layout_alignWithParentIfMissing="true">
 
diff --git a/res/layout/conversation_search_nav.xml b/res/layout/conversation_search_nav.xml
index c461926d71..529a3be282 100644
--- a/res/layout/conversation_search_nav.xml
+++ b/res/layout/conversation_search_nav.xml
@@ -18,7 +18,6 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
         android:layout_marginEnd="16dp"
-        android:layout_marginRight="16dp"
         android:layout_marginBottom="8dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/conversation_search_up"
@@ -31,7 +30,6 @@
         android:layout_height="40dp"
         android:layout_marginTop="8dp"
         android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
         android:layout_marginBottom="8dp"
         android:background="?selectableItemBackgroundBorderless"
         android:padding="8dp"
@@ -47,7 +45,6 @@
         android:layout_height="40dp"
         android:layout_marginTop="8dp"
         android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
         android:layout_marginBottom="8dp"
         android:background="?selectableItemBackgroundBorderless"
         android:padding="8dp"
diff --git a/res/layout/conversation_title_view.xml b/res/layout/conversation_title_view.xml
index 69efe6dfab..f16882db49 100644
--- a/res/layout/conversation_title_view.xml
+++ b/res/layout/conversation_title_view.xml
@@ -13,11 +13,8 @@
                android:layout_height="wrap_content"
                android:src="@drawable/ic_arrow_back_white_24dp"
                android:clickable="true"
-               android:paddingRight="12dp"
                android:paddingEnd="12dp"
-               android:layout_marginRight="12dp"
                android:layout_marginEnd="12dp"
-               android:layout_alignParentLeft="true"
                android:layout_alignParentStart="true"
                android:layout_centerVertical="true"
                android:background="?selectableItemBackgroundBorderless"
@@ -28,10 +25,8 @@
             android:foreground="@drawable/contact_photo_background"
             android:layout_width="40dp"
             android:layout_height="40dp"
-            android:layout_toRightOf="@id/up_button"
             android:layout_toEndOf="@id/up_button"
             android:layout_centerVertical="true"
-            android:layout_marginRight="10dp"
             android:layout_marginEnd="10dp"
             android:cropToPadding="true"
             android:transitionName="contact_photo"
@@ -45,7 +40,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:layout_toRightOf="@id/contact_photo_image"
         android:layout_toEndOf="@id/contact_photo_image"
         android:layout_centerVertical="true">
 
@@ -74,7 +68,6 @@
                 android:src="@drawable/ic_check_circle_white_18dp"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginRight="3dp"
                 android:layout_marginEnd="3dp"
                 android:layout_gravity="bottom"
                 android:alpha="0.7"
diff --git a/res/layout/conversation_typing_view.xml b/res/layout/conversation_typing_view.xml
index 2901ab1af4..8938b83668 100644
--- a/res/layout/conversation_typing_view.xml
+++ b/res/layout/conversation_typing_view.xml
@@ -4,8 +4,8 @@
     android:orientation="horizontal"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingLeft="8dp"
-    android:paddingRight="8dp"
+    android:paddingStart="8dp"
+    android:paddingEnd="8dp"
     android:paddingTop="2dp"
     android:gravity="center_vertical">
 
@@ -21,7 +21,6 @@
         android:id="@+id/typing_bubble"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="8dp"
         android:layout_marginStart="8dp"
         android:padding="12dp"
         android:background="@drawable/message_bubble_background">
diff --git a/res/layout/country_code_text.xml b/res/layout/country_code_text.xml
index 5d3f183ee6..f006d08498 100644
--- a/res/layout/country_code_text.xml
+++ b/res/layout/country_code_text.xml
@@ -7,8 +7,8 @@
     android:layout_height="wrap_content"
     android:gravity="center_vertical"
     android:orientation="horizontal"
-    android:paddingLeft="11dp"
-    android:paddingRight="11dp">
+    android:paddingStart="11dp"
+    android:paddingEnd="11dp">
 
     <ImageView
         android:layout_width="wrap_content"
diff --git a/res/layout/country_list_item.xml b/res/layout/country_list_item.xml
index d4ed941c1d..3aff0de3f1 100644
--- a/res/layout/country_list_item.xml
+++ b/res/layout/country_list_item.xml
@@ -20,8 +20,8 @@
               android:textStyle="bold"
               android:textColor="#7b7b7b"
               android:gravity="right|center"
-              android:layout_marginLeft="4dip"
-              android:layout_marginRight="5dip"
+              android:layout_marginStart="4dp"
+              android:layout_marginEnd="5dp"
               android:layout_gravity="right|center"/>
 
 </LinearLayout>
diff --git a/res/layout/country_selection_fragment.xml b/res/layout/country_selection_fragment.xml
index 4a5962a511..e17bae87fa 100644
--- a/res/layout/country_selection_fragment.xml
+++ b/res/layout/country_selection_fragment.xml
@@ -8,7 +8,7 @@
     <EditText android:id="@+id/country_search"
               android:layout_width="fill_parent"
               android:layout_height="wrap_content"
-              android:drawableLeft="@drawable/ic_menu_search_holo_light"
+              android:drawableStart="@drawable/ic_menu_search_holo_light"
               android:hint="@string/country_selection_fragment__search" />
 
     <ListView android:id="@android:id/list"
diff --git a/res/layout/custom_default_preference_dialog.xml b/res/layout/custom_default_preference_dialog.xml
index e9497ee6f7..8b02be4382 100644
--- a/res/layout/custom_default_preference_dialog.xml
+++ b/res/layout/custom_default_preference_dialog.xml
@@ -9,23 +9,21 @@
              android:layout_height="wrap_content"
              android:entries="@array/default_or_custom_entries"
              android:entryValues="@array/default_or_custom_values"
-             android:layout_marginStart="16dip"
-             android:layout_marginLeft="16dip"
+             android:layout_marginStart="16dp"
              android:spinnerMode="dropdown"/>
 
     <TextView android:id="@+id/default_label"
-              android:layout_marginLeft="18dip"
-              android:layout_marginRight="16dip"
-              android:layout_marginTop="16dip"
-              android:layout_marginBottom="16dip"
+              android:layout_marginEnd="16dp"
+              android:layout_marginTop="16dp"
+              android:layout_marginBottom="16dp"
               android:layout_width="match_parent"
               android:layout_height="match_parent"/>
 
     <EditText android:id="@+id/custom_edit"
-              android:layout_marginLeft="16dip"
-              android:layout_marginRight="16dip"
-              android:layout_marginTop="16dip"
-              android:layout_marginBottom="16dip"
+              android:layout_marginStart="16dp"
+              android:layout_marginEnd="16dp"
+              android:layout_marginTop="16dp"
+              android:layout_marginBottom="16dp"
               android:visibility="gone"
               android:layout_width="match_parent"
               android:layout_height="match_parent"/>
diff --git a/res/layout/database_migration_activity.xml b/res/layout/database_migration_activity.xml
index 87bc8ebe03..3c3fc36213 100644
--- a/res/layout/database_migration_activity.xml
+++ b/res/layout/database_migration_activity.xml
@@ -12,8 +12,8 @@
         android:gravity="center" >
         
         <LinearLayout android:id="@+id/prompt_layout"
-                      android:paddingRight="16dip"
-                      android:paddingLeft="16dip"
+                      android:paddingEnd="16dip"
+                      android:paddingStart="16dip"
                       android:paddingTop="10dip"
                       android:layout_width="fill_parent"
                       android:layout_height="wrap_content"
@@ -48,7 +48,7 @@
                         android:layout_weight="1"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_marginRight="7dip"
+                        android:layout_marginEnd="7dip"
                         android:textAppearance="?android:attr/textAppearanceMedium"/>
                 
                 <Button android:id="@+id/import_button"
@@ -61,8 +61,8 @@
         </LinearLayout>
         
         <LinearLayout android:id="@+id/progress_layout"
-                      android:paddingRight="16dip"
-                      android:paddingLeft="16dip"
+                      android:paddingEnd="16dip"
+                      android:paddingStart="16dip"
                       android:paddingTop="10dip"
                       android:layout_width="fill_parent"
                       android:layout_height="wrap_content"
@@ -93,7 +93,7 @@
                     style="@style/Registration.Constant"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentRight="true"
+                    android:layout_alignParentEnd="true"
                     android:text="0/100"
                     android:textSize="12.0sp" />
 
@@ -101,7 +101,7 @@
                     style="@style/Registration.Constant"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentLeft="true"
+                    android:layout_alignParentStart="true"
                     android:text="@string/database_migration_activity__importing"
                     android:textAllCaps="true"
                     android:textSize="12.0sp"
diff --git a/res/layout/database_upgrade_activity.xml b/res/layout/database_upgrade_activity.xml
index 8f797c9b20..56fc4575ac 100644
--- a/res/layout/database_upgrade_activity.xml
+++ b/res/layout/database_upgrade_activity.xml
@@ -11,8 +11,8 @@
             android:layout_height="fill_parent"
             android:gravity="center" >
 
-        <LinearLayout android:paddingRight="16dip"
-                      android:paddingLeft="16dip"
+        <LinearLayout android:paddingEnd="16dip"
+                      android:paddingStart="16dip"
                       android:paddingTop="10dip"
                       android:layout_width="fill_parent"
                       android:layout_height="wrap_content"
diff --git a/res/layout/delivery_status_view.xml b/res/layout/delivery_status_view.xml
index 4a1433f19b..f38532a108 100644
--- a/res/layout/delivery_status_view.xml
+++ b/res/layout/delivery_status_view.xml
@@ -6,7 +6,7 @@
         android:id="@+id/pending_indicator"
         android:layout_width="12dp"
         android:layout_height="12dp"
-        android:layout_marginRight="2dp"
+        android:layout_marginEnd="2dp"
         android:layout_gravity="center_vertical|end"
         android:src="@drawable/ic_delivery_status_sending"
         android:visibility="gone" />
@@ -16,7 +16,7 @@
                android:layout_height="wrap_content"
                android:layout_gravity="center_vertical|end"
                android:src="@drawable/ic_delivery_status_sent"
-               android:paddingLeft="2dp"
+               android:paddingStart="2dp"
                android:visibility="gone"
                android:contentDescription="@string/conversation_item_sent__delivered_description" />
 
@@ -25,7 +25,7 @@
                android:layout_height="wrap_content"
                android:layout_gravity="center_vertical|end"
                android:src="@drawable/ic_delivery_status_delivered"
-               android:paddingLeft="2dp"
+               android:paddingStart="2dp"
                android:visibility="gone"
                android:contentDescription="@string/conversation_item_sent__delivered_description"
                tools:visibility="gone"/>
@@ -35,7 +35,7 @@
                android:layout_height="wrap_content"
                android:layout_gravity="center_vertical|end"
                android:src="@drawable/ic_delivery_status_read"
-               android:paddingLeft="2dp"
+               android:paddingStart="2dp"
                android:visibility="gone"
                android:contentDescription="@string/conversation_item_sent__message_read"
                android:tint="@color/core_blue"
diff --git a/res/layout/device_add_fragment.xml b/res/layout/device_add_fragment.xml
index eb9369d622..83eaa847e0 100644
--- a/res/layout/device_add_fragment.xml
+++ b/res/layout/device_add_fragment.xml
@@ -28,8 +28,8 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_weight="1"
-            android:paddingLeft="16dp"
-            android:paddingRight="16dp"
+            android:paddingStart="16dp"
+            android:paddingEnd="16dp"
             android:background="?android:windowBackground"
             android:gravity="center">
 
diff --git a/res/layout/device_link_fragment.xml b/res/layout/device_link_fragment.xml
index e3cdc7672d..57353c8fde 100644
--- a/res/layout/device_link_fragment.xml
+++ b/res/layout/device_link_fragment.xml
@@ -17,8 +17,8 @@
     <android.support.v7.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="25dp"
-            android:layout_marginRight="25dp">
+            android:layout_marginStart="25dp"
+            android:layout_marginEnd="25dp">
 
         <LinearLayout android:layout_width="match_parent"
                       android:layout_height="match_parent"
@@ -65,7 +65,7 @@
                 <ImageView android:id="@+id/check"
                            android:layout_width="wrap_content"
                            android:layout_height="wrap_content"
-                           android:layout_marginRight="16dp"
+                           android:layout_marginEnd="16dp"
                            android:src="@drawable/ic_check_white_24dp"
                            android:tint="@color/blue_400"
                            android:clickable="false"/>
diff --git a/res/layout/device_list_fragment.xml b/res/layout/device_list_fragment.xml
index 7b73e96b13..163b1b5865 100644
--- a/res/layout/device_list_fragment.xml
+++ b/res/layout/device_list_fragment.xml
@@ -28,8 +28,8 @@
               android:textSize="20sp"
               android:visibility="gone"
               android:text="@string/device_list_fragment__no_devices_linked"
-              android:paddingLeft="16dip"
-              android:paddingRight="16dip"
+              android:paddingStart="16dip"
+              android:paddingEnd="16dip"
               android:layout_weight="1"
               tools:visibility="visible"/>
 
@@ -38,8 +38,8 @@
               android:layout_height="match_parent"
               android:layout_weight="1"
               android:drawSelectorOnTop="false"
-              android:paddingLeft="16dip"
-              android:paddingRight="16dip"
+              android:paddingStart="16dip"
+              android:paddingEnd="16dip"
               tools:visibility="gone"/>
 
     <com.melnykov.fab.FloatingActionButton
diff --git a/res/layout/device_list_item_view.xml b/res/layout/device_list_item_view.xml
index d62de7fbc6..c6919fb7d5 100644
--- a/res/layout/device_list_item_view.xml
+++ b/res/layout/device_list_item_view.xml
@@ -3,8 +3,8 @@
                                            android:orientation="vertical"
                                            android:layout_width="match_parent"
                                            android:layout_height="match_parent"
-                                           android:layout_marginLeft="16dp"
-                                           android:layout_marginRight="16dp">
+                                           android:layout_marginStart="16dp"
+                                           android:layout_marginEnd="16dp">
 
     <TextView android:id="@+id/name"
               android:textAppearance="?android:attr/textAppearanceMedium"
diff --git a/res/layout/document_view.xml b/res/layout/document_view.xml
index fda0411886..0178e3882c 100644
--- a/res/layout/document_view.xml
+++ b/res/layout/document_view.xml
@@ -38,7 +38,6 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
-                        android:layout_marginLeft="-4dp"
                         android:layout_marginStart="-4dp"
                         android:gravity="center"
                         android:visibility="visible"
@@ -83,7 +82,6 @@
 
             <LinearLayout android:layout_width="match_parent"
                           android:layout_height="wrap_content"
-                          android:layout_marginLeft="2dp"
                           android:layout_marginStart="2dp"
                           android:orientation="vertical"
                           android:focusable="false"
diff --git a/res/layout/emoji_display_item.xml b/res/layout/emoji_display_item.xml
index f6104f66fb..92c766ac6a 100644
--- a/res/layout/emoji_display_item.xml
+++ b/res/layout/emoji_display_item.xml
@@ -13,8 +13,8 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:paddingTop="6dp"
-        android:paddingRight="6dp"
-        android:paddingLeft="6dp"
+        android:paddingEnd="6dp"
+        android:paddingStart="6dp"
         android:adjustViewBounds="true"
         android:scaleType="fitCenter" />
 
@@ -23,8 +23,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingTop="6dp"
-        android:paddingRight="6dp"
-        android:paddingLeft="6dp"
+        android:paddingEnd="6dp"
+        android:paddingStart="6dp"
         android:visibility="gone"/>
 
     <ImageView
diff --git a/res/layout/emoji_drawer.xml b/res/layout/emoji_drawer.xml
index 131c62f7e4..8a461832e2 100644
--- a/res/layout/emoji_drawer.xml
+++ b/res/layout/emoji_drawer.xml
@@ -29,8 +29,8 @@
                 android:id="@+id/backspace"
                 android:background="?emoji_tab_strip_background"
                 android:src="@drawable/ic_backspace_grey600_24dp"
-                android:paddingLeft="10dp"
-                android:paddingRight="10dp"
+                android:paddingStart="10dp"
+                android:paddingEnd="10dp"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent" />
 
diff --git a/res/layout/experience_upgrade_activity.xml b/res/layout/experience_upgrade_activity.xml
index 6845721651..651e2aafed 100644
--- a/res/layout/experience_upgrade_activity.xml
+++ b/res/layout/experience_upgrade_activity.xml
@@ -23,7 +23,7 @@
         android:id="@+id/fab"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="bottom|right"
+        android:layout_gravity="bottom|end"
         android:layout_margin="25dp"
         android:src="@drawable/ic_arrow_forward_white_24dp"
         android:focusable="true"
diff --git a/res/layout/experience_upgrade_link_previews_fragment.xml b/res/layout/experience_upgrade_link_previews_fragment.xml
index 689cc5a934..7c1abf0cf7 100644
--- a/res/layout/experience_upgrade_link_previews_fragment.xml
+++ b/res/layout/experience_upgrade_link_previews_fragment.xml
@@ -12,14 +12,12 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
-        android:layout_marginLeft="8dp"
         android:layout_marginTop="24dp"
         android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
         android:fontFamily="sans-serif-light"
         android:gravity="center_horizontal"
-        android:paddingLeft="20dp"
-        android:paddingRight="20dp"
+        android:paddingStart="20dp"
+        android:paddingEnd="20dp"
         android:text="@string/ExperienceUpgradeActivity_introducing_link_previews"
         android:textAppearance="?android:attr/textAppearanceMedium"
         android:textColor="@android:color/white"
@@ -35,10 +33,8 @@
         android:layout_height="0dp"
         android:layout_gravity="center"
         android:layout_marginStart="24dp"
-        android:layout_marginLeft="24dp"
         android:layout_marginTop="16dp"
         android:layout_marginEnd="24dp"
-        android:layout_marginRight="24dp"
         android:layout_marginBottom="16dp"
         android:src="@drawable/link_preview_splash"
         app:layout_constraintBottom_toTopOf="@+id/linearLayout"
@@ -54,9 +50,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="24dp"
-        android:layout_marginLeft="24dp"
         android:layout_marginEnd="24dp"
-        android:layout_marginRight="24dp"
         android:layout_marginBottom="16dp"
         android:orientation="vertical"
         app:layout_constraintBottom_toTopOf="@+id/experience_ok_button"
@@ -80,8 +74,8 @@
             android:layout_height="wrap_content"
             android:fontFamily="sans-serif-light"
             android:gravity="center_horizontal"
-            android:paddingLeft="20dp"
-            android:paddingRight="20dp"
+            android:paddingStart="20dp"
+            android:paddingEnd="20dp"
             android:text="@string/ExperienceUpgradeActivity_you_can_disable_or_enable_this_feature_link_previews"
             android:textColor="@color/core_white"
             android:textIsSelectable="false"
@@ -95,9 +89,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
         android:layout_marginStart="24dp"
-        android:layout_marginLeft="24dp"
         android:layout_marginEnd="24dp"
-        android:layout_marginRight="24dp"
         android:layout_marginBottom="24dp"
         android:text="@string/ExperienceUpgradeActivity_got_it"
         android:textColor="@color/core_blue"
diff --git a/res/layout/experience_upgrade_preference_fragment.xml b/res/layout/experience_upgrade_preference_fragment.xml
index 28669bd0f5..a70f0e53dc 100644
--- a/res/layout/experience_upgrade_preference_fragment.xml
+++ b/res/layout/experience_upgrade_preference_fragment.xml
@@ -14,8 +14,8 @@
                   android:textSize="@dimen/onboarding_title_size"
                   android:textIsSelectable="false"
                   android:gravity="center_horizontal"
-                  android:paddingLeft="20dp"
-                  android:paddingRight="20dp"
+                  android:paddingStart="20dp"
+                  android:paddingEnd="20dp"
                   android:fontFamily="sans-serif-light"
                   android:text="@string/experience_upgrade_preference_fragment__read_receipts_are_here"
                   android:layout_marginTop="20dp"
@@ -44,8 +44,8 @@
                   android:textSize="@dimen/onboarding_subtitle_size"
                   android:textIsSelectable="false"
                   android:gravity="center_horizontal"
-                  android:paddingLeft="20dp"
-                  android:paddingRight="20dp"
+                  android:paddingStart="20dp"
+                  android:paddingEnd="20dp"
                   android:fontFamily="sans-serif-light"
                   android:text="@string/experience_upgrade_preference_fragment__optionally_see_and_share_when_messages_have_been_read"
                   android:textColor="@android:color/white" />
diff --git a/res/layout/experience_upgrade_typing_indicators_fragment.xml b/res/layout/experience_upgrade_typing_indicators_fragment.xml
index ecfeb6d14e..da2be6f5a4 100644
--- a/res/layout/experience_upgrade_typing_indicators_fragment.xml
+++ b/res/layout/experience_upgrade_typing_indicators_fragment.xml
@@ -19,8 +19,8 @@
             android:layout_marginTop="20dp"
             android:fontFamily="sans-serif-light"
             android:gravity="center_horizontal"
-            android:paddingLeft="20dp"
-            android:paddingRight="20dp"
+            android:paddingStart="20dp"
+            android:paddingEnd="20dp"
             android:text="@string/ExperienceUpgradeActivity_introducing_typing_indicators"
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:textColor="@android:color/white"
@@ -63,8 +63,8 @@
             android:layout_height="wrap_content"
             android:fontFamily="sans-serif-light"
             android:gravity="center_horizontal"
-            android:paddingLeft="20dp"
-            android:paddingRight="20dp"
+            android:paddingStart="20dp"
+            android:paddingEnd="20dp"
             android:text="@string/ExperienceUpgradeActivity_now_you_can_optionally_see_and_share_when_messages_are_being_typed"
             android:textColor="@color/core_white"
             android:textIsSelectable="false"
@@ -76,8 +76,8 @@
             android:layout_marginTop="16dp"
             android:fontFamily="sans-serif-light"
             android:gravity="center_horizontal"
-            android:paddingLeft="20dp"
-            android:paddingRight="20dp"
+            android:paddingStart="20dp"
+            android:paddingEnd="20dp"
             android:text="@string/ExperienceUpgradeActivity_would_you_like_to_enable_them_now"
             android:textColor="@color/core_white"
             android:textIsSelectable="false"
diff --git a/res/layout/fragment_submit_log.xml b/res/layout/fragment_submit_log.xml
index 0e7e493605..2ae828dfa0 100644
--- a/res/layout/fragment_submit_log.xml
+++ b/res/layout/fragment_submit_log.xml
@@ -30,8 +30,8 @@
               android:layout_height="wrap_content"
               android:textSize="15sp"
               android:text="@string/log_submit_activity__this_log_will_be_posted_online"
-              android:paddingLeft="15dp"
-              android:paddingRight="15dp"
+              android:paddingStart="15dp"
+              android:paddingEnd="15dp"
               android:paddingTop="10dp"
               android:paddingBottom="10dp"
               android:background="@color/logsubmit_confirmation_background"
@@ -55,7 +55,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="10dp"
-            android:layout_marginRight="10dp"
             android:layout_marginBottom="10dp"
             android:padding="5dp"
             android:layout_gravity="bottom|end"
diff --git a/res/layout/giphy_activity_toolbar.xml b/res/layout/giphy_activity_toolbar.xml
index 4f34a05486..f7e8995007 100644
--- a/res/layout/giphy_activity_toolbar.xml
+++ b/res/layout/giphy_activity_toolbar.xml
@@ -23,7 +23,6 @@
                       android:layout_height="wrap_content"
                       android:layout_width="0px"
                       android:layout_weight="1"
-                      android:layout_marginLeft="5dp"
                       android:layout_marginStart="5dp"
                       android:hint="@string/giphy_activity_toolbar__search_gifs_and_stickers"
                       android:textColor="@color/white"
@@ -53,8 +52,8 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
-                    android:paddingLeft="10dp"
-                    android:paddingRight="10dp"
+                    android:paddingStart="10dp"
+                    android:paddingEnd="10dp"
                     android:gravity="center">
 
                 <ImageView android:id="@+id/view_grid"
diff --git a/res/layout/group_create_activity.xml b/res/layout/group_create_activity.xml
index ea4ec96641..9ac6b33bd0 100644
--- a/res/layout/group_create_activity.xml
+++ b/res/layout/group_create_activity.xml
@@ -15,8 +15,8 @@
         <LinearLayout android:id="@+id/group_details_layout"
             android:layout_width="fill_parent"
             android:layout_height="106dp"
-            android:paddingLeft="14dp"
-            android:paddingRight="18dp"
+            android:paddingStart="14dp"
+            android:paddingEnd="18dp"
             android:paddingTop="14dp"
             android:orientation="horizontal"
             android:gravity="center_vertical">
@@ -25,7 +25,7 @@
                 android:layout_width="70dp"
                 android:layout_height="70dp"
                 position="bottom_right"
-                android:layout_marginRight="10dp"
+                android:layout_marginEnd="10dp"
                 android:contentDescription="@string/GroupCreateActivity_avatar_content_description" />
 
             <org.thoughtcrime.securesms.components.emoji.EmojiEditText
@@ -43,8 +43,8 @@
         <LinearLayout android:id="@+id/creating_group_layout"
             android:layout_width="fill_parent"
             android:layout_height="106dp"
-            android:paddingLeft="18dp"
-            android:paddingRight="18dp"
+            android:paddingStart="18dp"
+            android:paddingEnd="18dp"
             android:paddingTop="18dp"
             android:orientation="horizontal"
             android:gravity="center_vertical"
@@ -53,7 +53,7 @@
             <ProgressBar android:id="@+id/creating_progress_bar"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginRight="10dp"
+                android:layout_marginEnd="10dp"
                 style="@android:style/Widget.ProgressBar"
                 android:indeterminate="true" />
 
@@ -92,8 +92,8 @@
     <org.thoughtcrime.securesms.components.PushRecipientsPanel android:id="@+id/recipients"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:paddingLeft="15dp"
-        android:paddingRight="15dp" />
+        android:paddingStart="15dp"
+        android:paddingEnd="15dp" />
 
     <ListView android:id="@+id/selected_contacts_list"
         android:layout_width="match_parent"
diff --git a/res/layout/invite_activity.xml b/res/layout/invite_activity.xml
index c9f4b0c16c..f3949c7506 100644
--- a/res/layout/invite_activity.xml
+++ b/res/layout/invite_activity.xml
@@ -32,7 +32,6 @@
                       android:layout_marginBottom="30dp"
                       android:layout_marginTop="18dp"
                       android:fontFamily="sans-serif-light"
-                      android:paddingLeft="10dp"
                       android:paddingStart="10dp"/>
 
             <EditText android:id="@+id/invite_text"
@@ -43,8 +42,8 @@
                       android:background="@drawable/message_bubble_background"
                       android:paddingTop="10dp"
                       android:paddingBottom="10dp"
-                      android:paddingLeft="10dp"
-                      android:paddingRight="20dp"
+                      android:paddingStart="10dp"
+                      android:paddingEnd="20dp"
                       android:gravity="top"
                       android:inputType="textShortMessage|textMultiLine"
                       android:textColor="#ff333333"/>
@@ -57,7 +56,6 @@
 
                 <Button android:id="@+id/share_button"
                         android:drawablePadding="10dp"
-                        android:drawableLeft="@drawable/ic_share_black_18dp"
                         android:drawableStart="@drawable/ic_share_black_18dp"
                         android:text="@string/InviteActivity_share"
                         android:layout_width="wrap_content"
@@ -65,7 +63,6 @@
                         tools:ignore="ButtonStyle" />
 
                 <Button android:id="@+id/sms_button"
-                        android:drawableLeft="@drawable/ic_message_black_18dp"
                         android:drawableStart="@drawable/ic_message_black_18dp"
                         android:drawablePadding="10dp"
                         android:text="@string/InviteActivity_choose_contacts"
diff --git a/res/layout/item_editable_contact.xml b/res/layout/item_editable_contact.xml
index 08bf496a04..2acb3def16 100644
--- a/res/layout/item_editable_contact.xml
+++ b/res/layout/item_editable_contact.xml
@@ -16,7 +16,6 @@
             android:id="@+id/editable_contact_name"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="12dp"
             android:layout_marginStart="12dp"
             android:layout_weight="1"
             android:textSize="20sp"
diff --git a/res/layout/item_log_preview.xml b/res/layout/item_log_preview.xml
index 5c183aa13f..4f0fd38517 100644
--- a/res/layout/item_log_preview.xml
+++ b/res/layout/item_log_preview.xml
@@ -4,8 +4,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingLeft="10dp"
-    android:paddingRight="10dp"
+    android:paddingStart="10dp"
+    android:paddingEnd="10dp"
     android:typeface="monospace"
     android:textSize="10sp"
     android:background="@null"
diff --git a/res/layout/key_caching_notification.xml b/res/layout/key_caching_notification.xml
index f5d62019d3..6bae90dde6 100644
--- a/res/layout/key_caching_notification.xml
+++ b/res/layout/key_caching_notification.xml
@@ -5,10 +5,10 @@
 
     <LinearLayout android:layout_width="wrap_content"
                   android:layout_height="wrap_content"
-                  android:layout_alignParentLeft="true"
+                  android:layout_alignParentStart="true"
                   android:layout_centerVertical="true"
                   android:orientation="vertical"
-                  android:layout_marginLeft="10dip">
+                  android:layout_marginStart="10dip">
 	<TextView android:id="@+id/title"
         android:textAppearance="@style/NotificationTitle"
         android:layout_width="wrap_content"
@@ -38,7 +38,7 @@
         android:layout_height="64dp"
         android:background="@drawable/notify_panel_notification_icon_bg_tile"
         android:scaleType="center" 
-        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
         />
 	    
 </RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/labeled_edit_text.xml b/res/layout/labeled_edit_text.xml
index adbf110963..eaf409849f 100644
--- a/res/layout/labeled_edit_text.xml
+++ b/res/layout/labeled_edit_text.xml
@@ -24,9 +24,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="12dp"
-            android:layout_marginLeft="12dp"
-            android:paddingLeft="4dp"
-            android:paddingRight="4dp"
+            android:paddingStart="4dp"
+            android:paddingEnd="4dp"
             android:background="@color/white"
             android:textColor="@color/signal_primary"
             style="@style/Signal.Text.Caption"
diff --git a/res/layout/labeled_edit_text_default.xml b/res/layout/labeled_edit_text_default.xml
index 95d1a8886a..435f2459dc 100644
--- a/res/layout/labeled_edit_text_default.xml
+++ b/res/layout/labeled_edit_text_default.xml
@@ -7,8 +7,8 @@
     android:layout_height="wrap_content"
     android:paddingTop="7dp"
     android:paddingBottom="16dp"
-    android:paddingLeft="16dp"
-    android:paddingRight="16dp"
+    android:paddingStart="16dp"
+    android:paddingEnd="16dp"
     android:background="@color/transparent"
     android:singleLine="true"
     tools:text="Peter Parker"/>
diff --git a/res/layout/led_color_preference_widget.xml b/res/layout/led_color_preference_widget.xml
index c575131e5a..a310159d71 100644
--- a/res/layout/led_color_preference_widget.xml
+++ b/res/layout/led_color_preference_widget.xml
@@ -2,7 +2,7 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
              android:layout_width="wrap_content"
              android:layout_height="wrap_content"
-             android:layout_marginRight="3dp">
+             android:layout_marginEnd="3dp">
 
     <ImageView
             android:id="@+id/color_view"
diff --git a/res/layout/link_preview.xml b/res/layout/link_preview.xml
index fedd559de6..fa63b8c252 100644
--- a/res/layout/link_preview.xml
+++ b/res/layout/link_preview.xml
@@ -30,9 +30,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
-            android:layout_marginLeft="8dp"
             android:layout_marginEnd="8dp"
-            android:layout_marginRight="8dp"
             android:ellipsize="end"
             android:fontFamily="sans-serif-medium"
             android:maxLines="2"
@@ -49,7 +47,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
-            android:layout_marginLeft="8dp"
             android:layout_marginTop="2dp"
             android:textAllCaps="true"
             android:textColor="?linkpreview_secondary_text_color"
@@ -62,7 +59,6 @@
             android:layout_width="0dp"
             android:layout_height="1dp"
             android:layout_marginStart="8dp"
-            android:layout_marginLeft="8dp"
             android:layout_marginTop="6dp"
             android:background="?linkpreview_divider_color"
             android:visibility="gone"
@@ -77,7 +73,6 @@
             android:id="@+id/linkpreview_close"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginRight="6dp"
             android:layout_marginEnd="6dp"
             android:layout_marginTop="4dp"
             android:src="@drawable/ic_close_white_18dp"
diff --git a/res/layout/load_more_header.xml b/res/layout/load_more_header.xml
index 1785c28d76..7b591b3d48 100644
--- a/res/layout/load_more_header.xml
+++ b/res/layout/load_more_header.xml
@@ -40,7 +40,6 @@
             android:layout_height="20dp"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="11dp"
-            android:layout_marginLeft="11dp"
             wheel:matProg_progressIndeterminate="true"
             tools:ignore="RtlSymmetry" />
 
diff --git a/res/layout/longmessage_bubble_received.xml b/res/layout/longmessage_bubble_received.xml
index 3bfebc6ae6..49d7ca4dad 100644
--- a/res/layout/longmessage_bubble_received.xml
+++ b/res/layout/longmessage_bubble_received.xml
@@ -15,8 +15,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/message_bubble_top_padding"
-        android:layout_marginLeft="@dimen/message_bubble_horizontal_padding"
-        android:layout_marginRight="@dimen/message_bubble_horizontal_padding"
+        android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
+        android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
         android:layout_marginBottom="@dimen/message_bubble_collapsed_footer_padding"
         style="@style/Signal.Text.Body"
         android:textColor="?conversation_item_received_text_primary_color"
@@ -30,8 +30,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="-4dp"
-        android:layout_marginLeft="@dimen/message_bubble_horizontal_padding"
-        android:layout_marginRight="@dimen/message_bubble_horizontal_padding"
+        android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
+        android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
         android:layout_marginBottom="@dimen/message_bubble_bottom_padding"
         android:clipChildren="false"
         android:clipToPadding="false"
diff --git a/res/layout/longmessage_bubble_sent.xml b/res/layout/longmessage_bubble_sent.xml
index a98c7876d6..780a80ec33 100644
--- a/res/layout/longmessage_bubble_sent.xml
+++ b/res/layout/longmessage_bubble_sent.xml
@@ -15,8 +15,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/message_bubble_top_padding"
-        android:layout_marginLeft="@dimen/message_bubble_horizontal_padding"
-        android:layout_marginRight="@dimen/message_bubble_horizontal_padding"
+        android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
+        android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
         android:layout_marginBottom="@dimen/message_bubble_collapsed_footer_padding"
         style="@style/Signal.Text.Body"
         android:textColor="?conversation_item_sent_text_primary_color"
@@ -30,8 +30,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="-4dp"
-        android:layout_marginLeft="@dimen/message_bubble_horizontal_padding"
-        android:layout_marginRight="@dimen/message_bubble_horizontal_padding"
+        android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
+        android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
         android:layout_marginBottom="@dimen/message_bubble_bottom_padding"
         android:clipChildren="false"
         android:clipToPadding="false"
diff --git a/res/layout/media_preview_activity.xml b/res/layout/media_preview_activity.xml
index 34b8e1af3e..662572b06f 100644
--- a/res/layout/media_preview_activity.xml
+++ b/res/layout/media_preview_activity.xml
@@ -37,8 +37,8 @@
                 android:id="@+id/media_preview_caption"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingLeft="16dp"
-                android:paddingRight="16dp"
+                android:paddingStart="16dp"
+                android:paddingEnd="16dp"
                 android:paddingBottom="8dp"
                 style="@style/Signal.Text.Body"
                 android:textColor="@color/core_white"
@@ -52,8 +52,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
-            android:layout_marginLeft="12dp"
-            android:layout_marginRight="12dp"
+            android:layout_marginStart="12dp"
+            android:layout_marginEnd="12dp"
             tools:layout_height="64dp"/>
 
         <FrameLayout
diff --git a/res/layout/media_view_remove_button.xml b/res/layout/media_view_remove_button.xml
index e5d1b1a9f9..44bf070aaa 100644
--- a/res/layout/media_view_remove_button.xml
+++ b/res/layout/media_view_remove_button.xml
@@ -3,6 +3,6 @@
            android:id="@+id/remove_image_button"
            android:layout_width="@dimen/media_bubble_remove_button_size"
            android:layout_height="@dimen/media_bubble_remove_button_size"
-           android:layout_gravity="top|right"
+           android:layout_gravity="top|end"
            android:src="@drawable/conversation_attachment_close_circle"
            android:visibility="gone"/>
diff --git a/res/layout/mediapicker_folder_fragment.xml b/res/layout/mediapicker_folder_fragment.xml
index d51123309f..321fd0e642 100644
--- a/res/layout/mediapicker_folder_fragment.xml
+++ b/res/layout/mediapicker_folder_fragment.xml
@@ -18,7 +18,7 @@
         android:id="@+id/mediapicker_folder_list"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginLeft="2dp"
+        android:layout_marginStart="2dp"
         android:layout_marginTop="2dp" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/mediapicker_folder_item.xml b/res/layout/mediapicker_folder_item.xml
index fd7b292533..9d1d729ebe 100644
--- a/res/layout/mediapicker_folder_item.xml
+++ b/res/layout/mediapicker_folder_item.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginRight="2dp"
+    android:layout_marginEnd="2dp"
     android:layout_marginBottom="2dp">
 
     <org.thoughtcrime.securesms.components.SquareImageView
@@ -32,7 +32,6 @@
             android:id="@+id/mediapicker_folder_item_icon"
             android:layout_width="20dp"
             android:layout_height="20dp"
-            android:layout_marginRight="6dp"
             android:layout_marginEnd="6dp"
             android:src="@drawable/ic_folder_white_48dp"/>
 
@@ -41,7 +40,6 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:layout_marginRight="6dp"
             android:layout_marginEnd="6dp"
             android:maxLines="1"
             android:ellipsize="end"
diff --git a/res/layout/mediapicker_item_fragment.xml b/res/layout/mediapicker_item_fragment.xml
index cba46a512e..58f09437af 100644
--- a/res/layout/mediapicker_item_fragment.xml
+++ b/res/layout/mediapicker_item_fragment.xml
@@ -18,7 +18,7 @@
         android:id="@+id/mediapicker_item_list"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginLeft="2dp"
+        android:layout_marginStart="2dp"
         android:layout_marginTop="2dp" />
 
 </LinearLayout>
diff --git a/res/layout/mediapicker_media_item.xml b/res/layout/mediapicker_media_item.xml
index 74bb160d00..18714dbbcc 100644
--- a/res/layout/mediapicker_media_item.xml
+++ b/res/layout/mediapicker_media_item.xml
@@ -5,7 +5,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginRight="2dp"
+    android:layout_marginEnd="2dp"
     android:layout_marginBottom="2dp"
     android:animateLayoutChanges="true">
 
@@ -36,7 +36,7 @@
             android:layout_width="15dp"
             android:layout_height="18dp"
             android:layout_gravity="center"
-            android:layout_marginLeft="2dp"
+            android:layout_marginStart="2dp"
             android:tint="@color/core_blue"
             android:scaleType="fitXY"
             app:srcCompat="@drawable/triangle_right" />
diff --git a/res/layout/mediarail_media_item.xml b/res/layout/mediarail_media_item.xml
index dd24845a57..58fc47ad25 100644
--- a/res/layout/mediarail_media_item.xml
+++ b/res/layout/mediarail_media_item.xml
@@ -35,8 +35,7 @@
         android:id="@+id/rail_item_caption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="left|start|top"
-        android:layout_marginLeft="2dp"
+        android:layout_gravity="start|top"
         android:layout_marginStart="2dp"
         android:src="@drawable/ic_caption_28"
         android:visibility="gone"
@@ -46,7 +45,7 @@
         android:id="@+id/rail_item_delete"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="right|end|top"
+        android:layout_gravity="end|top"
         android:layout_margin="1dp"
         android:src="@drawable/ic_x_28"
         android:visibility="gone"
diff --git a/res/layout/mediasend_activity.xml b/res/layout/mediasend_activity.xml
index b2f44fb488..8285e94b4e 100644
--- a/res/layout/mediasend_activity.xml
+++ b/res/layout/mediasend_activity.xml
@@ -16,8 +16,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginBottom="32dp"
-        android:layout_marginRight="32dp"
-        android:layout_gravity="bottom|right|end"
+        android:layout_marginEnd="32dp"
+        android:layout_gravity="bottom|end"
         android:padding="8dp"
         android:gravity="center"
         android:orientation="horizontal"
@@ -31,8 +31,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:minWidth="28dp"
-            android:paddingLeft="7dp"
-            android:paddingRight="7dp"
+            android:paddingStart="7dp"
+            android:paddingEnd="7dp"
             android:paddingTop="2dp"
             android:paddingBottom="2dp"
             android:gravity="center"
@@ -45,7 +45,6 @@
         <ImageView
             android:layout_width="wrap_content"
             android:layout_height="20dp"
-            android:layout_marginLeft="2dp"
             android:layout_marginStart="2dp"
             android:src="@drawable/ic_arrow_right"
             android:tint="@color/core_white"/>
@@ -57,9 +56,8 @@
         android:layout_width="44dp"
         android:layout_height="44dp"
         android:layout_marginBottom="32dp"
-        android:layout_marginLeft="32dp"
         android:layout_marginStart="32dp"
-        android:layout_gravity="bottom|left|start"
+        android:layout_gravity="bottom|start"
         android:padding="12dp"
         android:src="@drawable/ic_camera_filled_24"
         android:tint="@color/core_grey_60"
diff --git a/res/layout/mediasend_fragment.xml b/res/layout/mediasend_fragment.xml
index acd59f951d..d8d95529e6 100644
--- a/res/layout/mediasend_fragment.xml
+++ b/res/layout/mediasend_fragment.xml
@@ -35,8 +35,8 @@
                 android:id="@+id/mediasend_caption"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="16dp"
-                android:layout_marginRight="16dp"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp"
                 android:paddingTop="6dp"
                 android:paddingBottom="6dp"
                 style="@style/Signal.Text.Body"
@@ -52,8 +52,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="2dp"
-                android:layout_marginLeft="2dp"
-                android:layout_marginRight="2dp"
+                android:layout_marginStart="2dp"
+                android:layout_marginEnd="2dp"
                 tools:layout_height="64dp"/>
 
             <LinearLayout
@@ -61,8 +61,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="12dp"
-                android:layout_marginLeft="16dp"
-                android:layout_marginRight="16dp"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp"
                 android:layout_marginBottom="12dp"
                 android:orientation="horizontal">
 
@@ -70,8 +70,8 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:paddingLeft="8dp"
-                    android:paddingRight="8dp"
+                    android:paddingStart="8dp"
+                    android:paddingEnd="8dp"
                     android:orientation="horizontal"
                     android:background="@drawable/compose_background_camera">
 
@@ -80,9 +80,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="@dimen/conversation_compose_height"
                         android:layout_gravity="bottom"
-                        android:paddingLeft="4dp"
                         android:paddingStart="4dp"
-                        android:paddingRight="6dp"
                         android:paddingEnd="6dp"
                         android:background="?selectableItemBackgroundBorderless"
                         android:contentDescription="@string/conversation_activity__emoji_toggle_description" />
@@ -110,7 +108,6 @@
                     android:id="@+id/mediasend_send_button_bkg"
                     android:layout_width="@dimen/conversation_compose_height"
                     android:layout_height="@dimen/conversation_compose_height"
-                    android:layout_marginLeft="12dp"
                     android:layout_marginStart="12dp"
                     android:layout_gravity="bottom"
                     android:background="@drawable/circle_tintable"
@@ -121,9 +118,9 @@
                         android:layout_width="wrap_content"
                         android:layout_height="match_parent"
                         android:paddingTop="6dp"
-                        android:paddingRight="6dp"
+                        android:paddingEnd="6dp"
                         android:paddingBottom="6dp"
-                        android:paddingLeft="11dp"
+                        android:paddingStart="11dp"
                         android:scaleType="fitCenter"
                         android:contentDescription="@string/conversation_activity__send"
                         android:src="?conversation_transport_sms_indicator"
@@ -137,8 +134,8 @@
                 android:id="@+id/mediasend_characters_left"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="16dp"
-                android:layout_marginRight="16dp"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp"
                 android:paddingBottom="12dp"
                 android:visibility="gone"
                 tools:visibility="visible"
diff --git a/res/layout/message_details_header.xml b/res/layout/message_details_header.xml
index 286b70917a..4bef2e26d1 100644
--- a/res/layout/message_details_header.xml
+++ b/res/layout/message_details_header.xml
@@ -17,8 +17,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:paddingLeft="10dp"
-        android:paddingRight="10dp">
+        android:paddingStart="10dp"
+        android:paddingEnd="10dp">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -33,7 +33,6 @@
                       android:padding="5dp"
                       tools:visibility="visible"
                       android:text="@string/message_details_header__issues_need_your_attention"
-                      android:drawableLeft="@drawable/ic_info_outline_light"
                       android:drawableStart="@drawable/ic_info_outline_light"
                       android:gravity="center_vertical" />
 
@@ -42,12 +41,12 @@
                 android:layout_width="wrap_content"
                 android:layout_height="38sp"
                 style="@style/InfoButton"
-                android:paddingLeft="10dp"
-                android:paddingRight="10dp"
+                android:paddingStart="10dp"
+                android:paddingEnd="10dp"
                 android:paddingTop="5dp"
                 android:paddingBottom="5dp"
                 android:layout_gravity="center_vertical"
-                android:drawableLeft="@drawable/ic_refresh_white_18dp"
+                android:drawableStart="@drawable/ic_refresh_white_18dp"
                 android:text="@string/message_recipients_list_item__resend"
                 android:visibility="gone"
                 tools:visibility="visible" />
@@ -67,13 +66,13 @@
                 <TextView android:layout_width="wrap_content"
                           android:layout_height="wrap_content"
                           android:text="@string/message_details_header__sent"
-                          android:gravity="right"
+                          android:gravity="end"
                           android:textStyle="bold" />
 
                 <TextView android:id="@+id/sent_time"
                           android:layout_width="wrap_content"
                           android:layout_height="wrap_content"
-                          android:layout_marginLeft="@dimen/message_details_table_row_pad"
+                          android:layout_marginStart="@dimen/message_details_table_row_pad"
                           tools:text="Jan 18, 2015, 12:29:37 AM GMT-08:00" />
 
             </TableRow>
@@ -86,13 +85,13 @@
                 <TextView android:layout_width="wrap_content"
                           android:layout_height="wrap_content"
                           android:text="@string/message_details_header__received"
-                          android:gravity="right"
+                          android:gravity="end"
                           android:textStyle="bold" />
 
                 <TextView android:id="@+id/received_time"
                           android:layout_width="wrap_content"
                           android:layout_height="wrap_content"
-                          android:layout_marginLeft="@dimen/message_details_table_row_pad"
+                          android:layout_marginStart="@dimen/message_details_table_row_pad"
                           tools:text="Jan 18, 2015, 12:31:15 AM GMT-08:00" />
 
             </TableRow>
@@ -107,13 +106,13 @@
                 <TextView android:layout_width="wrap_content"
                           android:layout_height="wrap_content"
                           android:text="@string/message_details_header__disappears"
-                          android:gravity="right"
+                          android:gravity="end"
                           android:textStyle="bold"/>
 
                 <TextView android:id="@+id/expires_in"
                           android:layout_width="wrap_content"
                           android:layout_height="wrap_content"
-                          android:layout_marginLeft="@dimen/message_details_table_row_pad"
+                          android:layout_marginStart="@dimen/message_details_table_row_pad"
                           tools:text="1 week"/>
 
             </TableRow>
@@ -125,13 +124,13 @@
                 <TextView android:layout_width="wrap_content"
                           android:layout_height="wrap_content"
                           android:text="@string/message_details_header__via"
-                          android:gravity="right"
+                          android:gravity="end"
                           android:textStyle="bold" />
 
                 <TextView android:id="@+id/transport"
                           android:layout_width="wrap_content"
                           android:layout_height="wrap_content"
-                          android:layout_marginLeft="@dimen/message_details_table_row_pad"
+                          android:layout_marginStart="@dimen/message_details_table_row_pad"
                           tools:text="Push (TextSecure)" />
 
             </TableRow>
diff --git a/res/layout/message_recipient_list_item.xml b/res/layout/message_recipient_list_item.xml
index 97fa9a9231..4f78627f38 100644
--- a/res/layout/message_recipient_list_item.xml
+++ b/res/layout/message_recipient_list_item.xml
@@ -14,10 +14,10 @@
             android:layout_width="40dp"
             android:layout_height="40dp"
             android:layout_centerVertical="true"
-            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
             android:layout_marginTop="3dp"
             android:layout_marginBottom="3dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginEnd="10dp"
             android:cropToPadding="true"
             tools:src="@drawable/ic_contact_picture"
             android:contentDescription="@string/SingleContactSelectionActivity_contact_photo" />
@@ -26,7 +26,6 @@
                   android:layout_height="wrap_content"
                   android:layout_marginTop="4dip"
                   android:layout_marginBottom="4dip"
-                  android:layout_toRightOf="@id/contact_photo_image"
                   android:layout_toEndOf="@id/contact_photo_image"
                   android:layout_centerVertical="true"
                   android:gravity="center_vertical"
@@ -70,12 +69,12 @@
                 android:layout_width="wrap_content"
                 android:layout_height="38sp"
                 style="@style/ErrorButton"
-                android:paddingLeft="10dp"
-                android:paddingRight="10dp"
+                android:paddingStart="10dp"
+                android:paddingEnd="10dp"
                 android:paddingTop="5dp"
                 android:paddingBottom="5dp"
                 android:layout_gravity="center_vertical"
-                android:drawableLeft="@drawable/ic_error_white_18dp"
+                android:drawableStart="@drawable/ic_error_white_18dp"
                 android:text="@string/message_recipients_list_item__view"
                 android:visibility="gone"
                 tools:visibility="gone" />
@@ -83,8 +82,8 @@
         <ImageView android:id="@+id/ud_indicator"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
-                   android:layout_marginLeft="4dp"
-                   android:layout_marginRight="4dp"
+                   android:layout_marginStart="4dp"
+                   android:layout_marginEnd="4dp"
                    android:src="@drawable/ic_unidentified_delivery"
                    android:tint="?attr/conversation_item_sent_text_secondary_color"/>
 
diff --git a/res/layout/permissions_rationale_dialog.xml b/res/layout/permissions_rationale_dialog.xml
index 36cb60648f..20e49d5e32 100644
--- a/res/layout/permissions_rationale_dialog.xml
+++ b/res/layout/permissions_rationale_dialog.xml
@@ -20,8 +20,8 @@
               android:layout_height="wrap_content"
               android:paddingTop="40dp"
               android:paddingBottom="40dp"
-              android:paddingLeft="20dp"
-              android:paddingRight="20dp"
+              android:paddingStart="20dp"
+              android:paddingEnd="20dp"
               android:textSize="15sp"
               android:lineSpacingMultiplier="1.3"
               tools:text="Signal needs access to your contacts and media in order to connect with friends, exchange messages, and make secure calls."/>
diff --git a/res/layout/phone_text.xml b/res/layout/phone_text.xml
index f3fc5901d9..ec2eb45abe 100644
--- a/res/layout/phone_text.xml
+++ b/res/layout/phone_text.xml
@@ -6,8 +6,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:paddingTop="7dp"
-    android:paddingLeft="16dp"
-    android:paddingRight="16dp"
+    android:paddingStart="16dp"
+    android:paddingEnd="16dp"
     android:paddingBottom="16dp"
     android:background="@color/transparent"
     android:singleLine="true"
diff --git a/res/layout/profile_create_activity.xml b/res/layout/profile_create_activity.xml
index 3514c97d19..532605c577 100644
--- a/res/layout/profile_create_activity.xml
+++ b/res/layout/profile_create_activity.xml
@@ -28,10 +28,8 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
                     android:layout_marginStart="8dp"
-                    android:layout_marginLeft="8dp"
                     android:layout_marginTop="32dp"
                     android:layout_marginEnd="8dp"
-                    android:layout_marginRight="8dp"
                     android:text="@string/CreateProfileActivity_set_up_your_profile"
                     app:layout_constraintBottom_toTopOf="@+id/name"
                     app:layout_constraintEnd_toEndOf="parent"
@@ -46,7 +44,6 @@
                     android:layout_width="80dp"
                     android:layout_height="80dp"
                     android:layout_marginStart="32dp"
-                    android:layout_marginLeft="32dp"
                     android:layout_marginTop="4dp"
                     android:src="@drawable/circle_tintable"
                     android:tint="@color/core_grey_05"
@@ -59,9 +56,7 @@
                     android:layout_width="0dp"
                     android:layout_height="0dp"
                     android:layout_marginStart="16dp"
-                    android:layout_marginLeft="16dp"
                     android:layout_marginEnd="16dp"
-                    android:layout_marginRight="16dp"
                     android:src="@drawable/ic_profile_default"
                     android:tint="@color/core_grey_60"
                     android:transitionName="avatar"
@@ -84,7 +79,6 @@
                     android:layout_width="60dp"
                     android:layout_height="60dp"
                     android:layout_marginStart="35dp"
-                    android:layout_marginLeft="35dp"
                     android:layout_marginTop="35dp"
                     android:cropToPadding="false"
                     android:src="@drawable/ic_profile_camera"
@@ -97,10 +91,8 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
                     android:layout_marginStart="16dp"
-                    android:layout_marginLeft="16dp"
                     android:layout_marginTop="24dp"
                     android:layout_marginEnd="4dp"
-                    android:layout_marginRight="4dp"
                     android:layout_weight="1"
                     android:hint="@string/profile_create_activity__your_name"
                     app:labeledEditText_background="?attr/conversation_background"
@@ -119,7 +111,6 @@
                     android:layout_gravity="center_vertical"
                     android:layout_marginTop="9dp"
                     android:layout_marginEnd="32dp"
-                    android:layout_marginRight="32dp"
                     android:background="@drawable/touch_highlight_background"
                     android:contentDescription="@string/conversation_activity__emoji_toggle_description"
                     app:layout_constraintBottom_toBottomOf="@+id/name"
@@ -132,10 +123,8 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="32dp"
-                    android:layout_marginLeft="32dp"
                     android:layout_marginTop="24dp"
                     android:layout_marginEnd="32dp"
-                    android:layout_marginRight="32dp"
                     android:layout_marginBottom="16dp"
                     android:gravity="center"
                     android:text="@string/CreateProfileActivity_signal_profiles_are_end_to_end_encrypted"
@@ -155,9 +144,7 @@
             android:layout_height="50dp"
             android:layout_gravity="center_horizontal"
             android:layout_marginStart="32dp"
-            android:layout_marginLeft="32dp"
             android:layout_marginEnd="32dp"
-            android:layout_marginRight="32dp"
             android:background="@color/signal_primary"
             android:textAllCaps="true"
             android:textColor="@color/white"
diff --git a/res/layout/profile_group_share_view.xml b/res/layout/profile_group_share_view.xml
index 67560cd7fc..38afb9630a 100644
--- a/res/layout/profile_group_share_view.xml
+++ b/res/layout/profile_group_share_view.xml
@@ -12,7 +12,6 @@
 
     <ImageView android:layout_width="wrap_content"
                android:layout_height="wrap_content"
-               android:layout_marginLeft="16dp"
                android:layout_marginStart="16dp"
                android:layout_gravity="center_vertical"
                android:src="@drawable/ic_face_white_24dp"/>
diff --git a/res/layout/profile_name_text.xml b/res/layout/profile_name_text.xml
index ea33bb90fb..c5d69b03a9 100644
--- a/res/layout/profile_name_text.xml
+++ b/res/layout/profile_name_text.xml
@@ -7,8 +7,8 @@
     android:layout_height="wrap_content"
     android:paddingTop="7dp"
     android:paddingBottom="16dp"
-    android:paddingLeft="16dp"
-    android:paddingRight="16dp"
+    android:paddingStart="16dp"
+    android:paddingEnd="16dp"
     android:background="@color/transparent"
     android:singleLine="true"
     android:inputType="textCapWords"
diff --git a/res/layout/profile_preference_view.xml b/res/layout/profile_preference_view.xml
index 006ed5ecc2..2b3868839b 100644
--- a/res/layout/profile_preference_view.xml
+++ b/res/layout/profile_preference_view.xml
@@ -15,7 +15,6 @@
     <LinearLayout android:orientation="vertical"
                   android:layout_width="match_parent"
                   android:layout_height="wrap_content"
-                  android:layout_marginLeft="10dp"
                   android:layout_marginStart="10dp">
 
         <org.thoughtcrime.securesms.components.emoji.EmojiTextView
diff --git a/res/layout/prompt_apn_activity.xml b/res/layout/prompt_apn_activity.xml
index 5590f7642d..63cd653eaf 100644
--- a/res/layout/prompt_apn_activity.xml
+++ b/res/layout/prompt_apn_activity.xml
@@ -11,8 +11,8 @@
         android:layout_height="fill_parent"
         android:gravity="center" >
         
-        <LinearLayout android:paddingRight="16dip"
-                      android:paddingLeft="16dip"
+        <LinearLayout android:paddingEnd="16dip"
+                      android:paddingStart="16dip"
                       android:paddingTop="10dip"
                       android:layout_width="fill_parent"
                       android:layout_height="wrap_content"
@@ -43,7 +43,7 @@
                         android:layout_weight="1"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_marginRight="7dip"
+                        android:layout_marginEnd="7dip"
                         android:textAppearance="?android:attr/textAppearanceMedium"/>
                 
                 <Button android:id="@+id/ok_button"
diff --git a/res/layout/prompt_passphrase_activity.xml b/res/layout/prompt_passphrase_activity.xml
index ca8b673ac2..addb8f5fd0 100644
--- a/res/layout/prompt_passphrase_activity.xml
+++ b/res/layout/prompt_passphrase_activity.xml
@@ -40,8 +40,8 @@
     <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="30dp"
-            android:layout_marginRight="30dp"
+            android:layout_marginStart="30dp"
+            android:layout_marginEnd="30dp"
             android:orientation="vertical"
             android:background="?login_floating_background"
             android:layout_centerInParent="true"
@@ -88,11 +88,11 @@
                       android:layout_width="match_parent"
                       android:layout_height="45sp"
                       android:inputType="textPassword"
-                      android:layout_marginLeft="50dp"
-                      android:layout_marginRight="50dp"
+                      android:layout_marginStart="50dp"
+                      android:layout_marginEnd="50dp"
                       android:singleLine="true"
-                      android:paddingLeft="10dp"
-                      android:paddingRight="40dp"/>
+                      android:paddingStart="10dp"
+                      android:paddingEnd="40dp"/>
 
             <org.thoughtcrime.securesms.components.AnimatingToggle
                     android:id="@+id/button_toggle"
@@ -108,8 +108,8 @@
                              android:background="@drawable/touch_highlight_background"
                              android:layout_width="wrap_content"
                              android:layout_height="wrap_content"
-                             android:paddingLeft="8dp"
-                             android:paddingRight="8dp"
+                             android:paddingStart="8dp"
+                             android:paddingEnd="8dp"
                              android:paddingTop="3dp"
                              android:paddingBottom="3dp"
                              android:layout_centerVertical="true" />
@@ -119,8 +119,8 @@
                              android:background="@drawable/touch_highlight_background"
                              android:layout_width="wrap_content"
                              android:layout_height="wrap_content"
-                             android:paddingLeft="8dp"
-                             android:paddingRight="8dp"
+                             android:paddingStart="8dp"
+                             android:paddingEnd="8dp"
                              android:paddingTop="3dp"
                              android:paddingBottom="3dp"
                              android:layout_centerVertical="true" />
@@ -134,12 +134,12 @@
                          android:text="@string/prompt_passphrase_activity__unlock"
                          android:layout_width="wrap_content"
                          android:layout_height="wrap_content"
-                         android:layout_alignParentRight="true"
+                         android:layout_alignParentEnd="true"
                          android:layout_centerVertical="true"
                          android:textAppearance="?android:attr/textAppearanceMedium"
-                         android:paddingLeft="5dp"
+                         android:paddingStart="5dp"
                          android:paddingTop="5dp"
-                         android:paddingRight="10dp"
+                         android:paddingEnd="10dp"
                          android:paddingBottom="5dp"/>
         </RelativeLayout>
 
diff --git a/res/layout/push_recipients_panel.xml b/res/layout/push_recipients_panel.xml
index 30a4df0dd5..e3cc028570 100644
--- a/res/layout/push_recipients_panel.xml
+++ b/res/layout/push_recipients_panel.xml
@@ -12,18 +12,18 @@
             android:autoText="true"
             android:singleLine="true"
             android:hint="@string/recipients_panel__to"
-            android:paddingRight="45dip"
+            android:paddingEnd="45dp"
             android:textColor="?conversation_editor_text_color"
             android:layout_width="fill_parent"/>
 
         <ImageButton android:id="@+id/contacts_button"
                      android:background="#00000000"
-                     android:layout_width="40dip"
-                     android:layout_height="35dip"
-                     android:layout_marginRight="5dip"
-                     android:layout_marginTop="4dip"
+                     android:layout_width="40dp"
+                     android:layout_height="35dp"
+                     android:layout_marginEnd="5dp"
+                     android:layout_marginTop="4dp"
                      android:src="@drawable/ic_menu_add_field_holo_light"
-                     android:layout_alignRight="@id/recipients_text"
+                     android:layout_alignEnd="@id/recipients_text"
                      android:maxWidth="32dip"
                      android:maxHeight="32dip" />
 
diff --git a/res/layout/quick_camera_controls.xml b/res/layout/quick_camera_controls.xml
index 7f9693a63c..6010107c10 100644
--- a/res/layout/quick_camera_controls.xml
+++ b/res/layout/quick_camera_controls.xml
@@ -21,7 +21,7 @@
                  android:layout_width="wrap_content"
                  android:layout_height="wrap_content"
                  android:layout_alignParentBottom="true"
-                 android:layout_alignParentRight="true"
+                 android:layout_alignParentEnd="true"
                  android:background="@drawable/circle_touch_highlight_background"
                  android:src="@drawable/quick_camera_fullscreen"
                  android:padding="20dp" />
@@ -30,7 +30,7 @@
                  android:layout_width="wrap_content"
                  android:layout_height="wrap_content"
                  android:layout_alignParentBottom="true"
-                 android:layout_alignParentLeft="true"
+                 android:layout_alignParentStart="true"
                  android:background="@drawable/circle_touch_highlight_background"
                  android:src="@drawable/quick_camera_rear"
                  android:enabled="false"
diff --git a/res/layout/quick_camera_controls_land.xml b/res/layout/quick_camera_controls_land.xml
index 48b4f21d83..cc0c684ea2 100644
--- a/res/layout/quick_camera_controls_land.xml
+++ b/res/layout/quick_camera_controls_land.xml
@@ -10,7 +10,7 @@
     <ImageButton android:id="@+id/shutter_button"
                  android:layout_width="wrap_content"
                  android:layout_height="wrap_content"
-                 android:layout_alignParentRight="true"
+                 android:layout_alignParentEnd="true"
                  android:layout_centerVertical="true"
                  android:background="@drawable/quick_camera_shutter_ring"
                  android:src="@drawable/quick_shutter_button"
@@ -21,7 +21,7 @@
                  android:layout_width="wrap_content"
                  android:layout_height="wrap_content"
                  android:layout_alignParentBottom="true"
-                 android:layout_alignParentRight="true"
+                 android:layout_alignParentEnd="true"
                  android:background="@drawable/circle_touch_highlight_background"
                  android:src="@drawable/quick_camera_fullscreen"
                  android:padding="20dp"/>
@@ -30,7 +30,7 @@
                  android:layout_width="wrap_content"
                  android:layout_height="wrap_content"
                  android:layout_alignParentTop="true"
-                 android:layout_alignParentRight="true"
+                 android:layout_alignParentEnd="true"
                  android:background="@drawable/circle_touch_highlight_background"
                  android:src="@drawable/quick_camera_rear"
                  android:enabled="false"
diff --git a/res/layout/quote_view.xml b/res/layout/quote_view.xml
index 4cadf034fc..af43d40c52 100644
--- a/res/layout/quote_view.xml
+++ b/res/layout/quote_view.xml
@@ -31,9 +31,7 @@
             <LinearLayout
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="8dp"
                 android:layout_marginStart="8dp"
-                android:layout_marginRight="8dp"
                 android:layout_marginEnd="8dp"
                 android:layout_marginTop="8dp"
                 android:layout_marginBottom="8dp"
@@ -64,9 +62,7 @@
                     <ImageView
                         android:layout_width="27dp"
                         android:layout_height="35dp"
-                        android:layout_marginRight="4dp"
                         android:layout_marginEnd="4dp"
-                        android:paddingLeft="-4dp"
                         android:paddingStart="-4dp"
                         android:src="?attr/attachment_document_icon_small" />
 
@@ -86,7 +82,7 @@
                     android:id="@+id/media_type"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginRight="8dp"
+                    android:layout_marginEnd="8dp"
                     style="@style/Signal.Text.Caption"
                     android:textColor="@color/core_grey_90"
                     android:paddingTop="4dp"
@@ -132,7 +128,6 @@
                     <ImageView
                         android:layout_width="13dp"
                         android:layout_height="16dp"
-                        android:layout_marginLeft="11dp"
                         android:layout_marginStart="11dp"
                         android:layout_marginTop="8dp"
                         android:tint="@color/core_blue"
@@ -157,7 +152,6 @@
             <ImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginRight="8dp"
                 android:layout_marginEnd="8dp"
                 android:src="@drawable/ic_broken_link"
                 android:tint="?attr/quote_missing_icon_color"/>
@@ -180,7 +174,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="6dp"
-        android:layout_marginRight="6dp"
         android:layout_marginTop="6dp"
         android:layout_gravity="top|end"
         android:background="@drawable/dismiss_background"
diff --git a/res/layout/recent_photo_view_item.xml b/res/layout/recent_photo_view_item.xml
index b59d2ab483..9db854bb03 100644
--- a/res/layout/recent_photo_view_item.xml
+++ b/res/layout/recent_photo_view_item.xml
@@ -4,7 +4,6 @@
         xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginRight="2dp"
         android:layout_marginEnd="2dp"
         app:square_height="true">
 
diff --git a/res/layout/recipient_filter_item.xml b/res/layout/recipient_filter_item.xml
index 4f5f49cd97..de6f2ecb4b 100644
--- a/res/layout/recipient_filter_item.xml
+++ b/res/layout/recipient_filter_item.xml
@@ -43,7 +43,7 @@
             android:layout_width="0dip"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:layout_marginLeft="10dip"
+            android:layout_marginStart="10dp"
             android:textColor="?android:attr/textColorSecondary"
             android:singleLine="true"
         />
diff --git a/res/layout/recipient_preference_activity.xml b/res/layout/recipient_preference_activity.xml
index ef394ee8b1..d345a3ba31 100644
--- a/res/layout/recipient_preference_activity.xml
+++ b/res/layout/recipient_preference_activity.xml
@@ -4,8 +4,8 @@
         xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginLeft="0dp"
-        android:layout_marginRight="0dp"
+        android:layout_marginStart="0dp"
+        android:layout_marginEnd="0dp"
         android:background="@color/transparent"
         xmlns:tools="http://schemas.android.com/tools">
 
diff --git a/res/layout/recipient_preference_contact_widget.xml b/res/layout/recipient_preference_contact_widget.xml
index 2114a95765..69bce52587 100644
--- a/res/layout/recipient_preference_contact_widget.xml
+++ b/res/layout/recipient_preference_contact_widget.xml
@@ -9,7 +9,6 @@
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:src="@drawable/ic_message_white_24dp"
-               android:layout_marginRight="20dp"
                android:layout_marginEnd="20dp"/>
 
     <ImageView android:id="@+id/call"
diff --git a/res/layout/recipient_preference_photo_rail.xml b/res/layout/recipient_preference_photo_rail.xml
index 92866c2056..e9a45a77c5 100644
--- a/res/layout/recipient_preference_photo_rail.xml
+++ b/res/layout/recipient_preference_photo_rail.xml
@@ -5,7 +5,6 @@
             android:id="@+id/photo_list"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:paddingLeft="16dp"
             android:paddingStart="16dp"
             android:clipToPadding="false"
             android:nestedScrollingEnabled="false"
diff --git a/res/layout/recipient_preference_photo_rail_item.xml b/res/layout/recipient_preference_photo_rail_item.xml
index 71b1d962d8..8ca166244c 100644
--- a/res/layout/recipient_preference_photo_rail_item.xml
+++ b/res/layout/recipient_preference_photo_rail_item.xml
@@ -4,7 +4,7 @@
         xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginRight="2dp"
+        android:layout_marginEnd="2dp"
         app:square_height="true">
 
     <org.thoughtcrime.securesms.components.ThumbnailView
diff --git a/res/layout/registration_activity.xml b/res/layout/registration_activity.xml
index 09679c96af..9cfc92a0ad 100644
--- a/res/layout/registration_activity.xml
+++ b/res/layout/registration_activity.xml
@@ -18,8 +18,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="40dp"
-            android:layout_marginLeft="32dp"
-            android:layout_marginRight="32dp"
+            android:layout_marginStart="32dp"
+            android:layout_marginEnd="32dp"
             android:layout_alignParentTop="true"
             android:orientation="vertical">
 
@@ -50,8 +50,8 @@
             android:layout_height="wrap_content"
             android:layout_below="@id/header"
             android:layout_marginTop="30dp"
-            android:layout_marginLeft="32dp"
-            android:layout_marginRight="32dp"
+            android:layout_marginStart="32dp"
+            android:layout_marginEnd="32dp"
             android:orientation="vertical"
             android:paddingBottom="0dp"
             android:visibility="invisible"
@@ -98,9 +98,9 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
                 android:layout_marginTop="13dp"
-                android:paddingLeft="30dp"
+                android:paddingStart="30dp"
                 android:paddingTop="10dp"
-                android:paddingRight="30dp"
+                android:paddingEnd="30dp"
                 android:paddingBottom="10dp"
                 style="@style/Button.Borderless.Registration"
                 android:text="@string/registration_activity__skip" />
@@ -112,9 +112,9 @@
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:layout_below="@id/header"
-            android:layout_marginLeft="32dp"
+            android:layout_marginStart="32dp"
             android:layout_marginTop="30dp"
-            android:layout_marginRight="32dp"
+            android:layout_marginEnd="32dp"
             android:animateLayoutChanges="true"
             android:orientation="vertical"
             android:paddingBottom="0dp"
@@ -148,7 +148,6 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:layout_marginEnd="12dp"
-                    android:layout_marginRight="12dp"
                     app:labeledEditText_background="@color/white"
                     app:labeledEditText_textLayout="@layout/country_code_text" />
 
@@ -203,10 +202,8 @@
                 android:layout_alignParentTop="true"
                 android:layout_centerHorizontal="true"
                 android:layout_marginStart="8dp"
-                android:layout_marginLeft="8dp"
                 android:layout_marginTop="24dp"
                 android:layout_marginEnd="8dp"
-                android:layout_marginRight="8dp"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
@@ -231,7 +228,6 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="32dp"
                 android:layout_toEndOf="@id/call_me_count_down"
-                android:layout_toRightOf="@id/call_me_count_down"
                 android:text="@string/RegistrationActivity_wrong_number"
                 app:layout_constraintEnd_toEndOf="@+id/code"
                 app:layout_constraintTop_toBottomOf="@+id/code" />
@@ -253,9 +249,9 @@
             android:layout_below="@id/header"
             android:animateLayoutChanges="true"
             android:orientation="vertical"
-            android:paddingLeft="16dp"
+            android:paddingStart="16dp"
             android:paddingTop="30dp"
-            android:paddingRight="16dp"
+            android:paddingEnd="16dp"
             android:paddingBottom="0dp"
             android:visibility="invisible"
             tools:visibility="gone">
@@ -264,9 +260,9 @@
                 android:id="@+id/pin_clarification_container"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="20dp"
+                android:layout_marginStart="20dp"
                 android:layout_marginTop="16dp"
-                android:layout_marginRight="20dp"
+                android:layout_marginEnd="20dp"
                 android:layout_marginBottom="16dp"
                 android:orientation="horizontal"
                 android:visibility="gone"
@@ -277,9 +273,9 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
-                    android:layout_marginLeft="5dp"
+                    android:layout_marginStart="5dp"
                     android:layout_marginTop="-2dp"
-                    android:layout_marginRight="5dp"
+                    android:layout_marginEnd="5dp"
                     android:text="@string/registration_activity__the_registration_lock_pin_is_not_the_same_as_the_sms_verification_code_you_just_received_please_enter_the_pin_you_previously_configured_in_the_application"
                     android:textColor="#73B7F0" />
             </LinearLayout>
@@ -289,8 +285,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="15dp"
-                android:paddingLeft="100dp"
-                android:paddingRight="100dp">
+                android:paddingStart="100dp"
+                android:paddingEnd="100dp">
 
                 <android.support.design.widget.TextInputEditText
                     android:id="@+id/pin"
@@ -307,9 +303,9 @@
                 android:layout_width="match_parent"
                 android:layout_height="50dp"
                 android:layout_gravity="center_horizontal"
-                android:layout_marginLeft="16dp"
+                android:layout_marginStart="16dp"
                 android:layout_marginTop="40dp"
-                android:layout_marginRight="16dp"
+                android:layout_marginEnd="16dp"
                 android:background="@color/signal_primary"
                 android:textColor="@color/white"
                 app:cpb_colorIndicator="@color/white"
diff --git a/res/layout/registration_lock_dialog_view.xml b/res/layout/registration_lock_dialog_view.xml
index eb93f6642d..14e1917ced 100644
--- a/res/layout/registration_lock_dialog_view.xml
+++ b/res/layout/registration_lock_dialog_view.xml
@@ -5,8 +5,8 @@
               android:layout_width="match_parent"
               android:layout_height="wrap_content"
               android:paddingTop="16dp"
-              android:paddingLeft="23dp"
-              android:paddingRight="23dp"
+              android:paddingStart="23dp"
+              android:paddingEnd="23dp"
               android:animateLayoutChanges="true">
 
     <TextView
diff --git a/res/layout/registration_lock_reminder_view.xml b/res/layout/registration_lock_reminder_view.xml
index 9006a95ea0..fe85b7b3b5 100644
--- a/res/layout/registration_lock_reminder_view.xml
+++ b/res/layout/registration_lock_reminder_view.xml
@@ -27,8 +27,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:paddingTop="40dp"
-            android:paddingLeft="80dp"
-            android:paddingRight="80dp">
+            android:paddingStart="80dp"
+            android:paddingEnd="80dp">
 
         <android.support.design.widget.TextInputEditText
                 android:id="@+id/pin"
@@ -44,8 +44,8 @@
               android:layout_height="wrap_content"
               android:paddingTop="40dp"
               android:paddingBottom="40dp"
-              android:paddingLeft="20dp"
-              android:paddingRight="20dp"
+              android:paddingStart="20dp"
+              android:paddingEnd="20dp"
               android:textSize="15sp"
               android:lineSpacingMultiplier="1.3"
               tools:text="Reminder: Registration Lock is enabled for your phone number. To help you memorize your Registration Lock PIN, Signal will periodically ask you to confirm it. I forgot my PIN."/>
diff --git a/res/layout/registration_welcome_activity.xml b/res/layout/registration_welcome_activity.xml
index 7e71104524..cf8036dce9 100644
--- a/res/layout/registration_welcome_activity.xml
+++ b/res/layout/registration_welcome_activity.xml
@@ -9,10 +9,8 @@
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:layout_marginStart="32dp"
-        android:layout_marginLeft="32dp"
         android:layout_marginTop="48dp"
         android:layout_marginEnd="32dp"
-        android:layout_marginRight="32dp"
         android:layout_marginBottom="16dp"
         android:src="@drawable/welcome"
         app:layout_constraintBottom_toTopOf="@+id/textView"
@@ -50,9 +48,7 @@
         android:layout_height="50dp"
         android:layout_gravity="center_horizontal"
         android:layout_marginStart="32dp"
-        android:layout_marginLeft="32dp"
         android:layout_marginEnd="32dp"
-        android:layout_marginRight="32dp"
         android:layout_marginBottom="54dp"
         android:background="@color/signal_primary"
         android:textColor="@color/white"
diff --git a/res/layout/scribble_hud.xml b/res/layout/scribble_hud.xml
index 0b2ec15d9e..9492a08748 100644
--- a/res/layout/scribble_hud.xml
+++ b/res/layout/scribble_hud.xml
@@ -19,7 +19,7 @@
             android:id="@+id/scribble_save_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="top|left|start"
+            android:layout_gravity="top|start"
             android:background="?attr/selectableItemBackgroundBorderless"
             android:padding="12dp"
             android:src="@drawable/ic_scribble_save"
@@ -31,11 +31,9 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentEnd="true"
-            android:layout_alignParentRight="true"
-            android:layout_gravity="top|right|end"
+            android:layout_gravity="top|end"
             android:layout_marginTop="8dp"
             android:layout_marginEnd="10dp"
-            android:layout_marginRight="10dp"
             android:animateLayoutChanges="true"
             android:orientation="horizontal"
             app:layout_constraintEnd_toEndOf="parent"
@@ -107,7 +105,6 @@
             android:layout_gravity="center_horizontal"
             android:layout_marginTop="32dp"
             android:layout_marginEnd="10dp"
-            android:layout_marginRight="10dp"
             app:layout_constraintEnd_toEndOf="@+id/scribble_toolbar"
             app:layout_constraintTop_toBottomOf="@+id/scribble_toolbar"
             app:pickerBorderColor="@color/white"
@@ -120,7 +117,6 @@
             android:layout_height="0dp"
             android:layout_below="@id/scribble_color_picker"
             android:layout_alignEnd="@id/scribble_color_picker"
-            android:layout_alignRight="@id/scribble_color_picker"
             android:layout_gravity="center_horizontal"
             android:layout_marginBottom="8dp"
             app:layout_constraintBottom_toBottomOf="parent"
@@ -135,8 +131,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="6dp"
-        android:paddingLeft="10dp"
-        android:paddingRight="10dp"
+        android:paddingStart="10dp"
+        android:paddingEnd="10dp"
         android:paddingBottom="6dp"
         android:visibility="gone"
         tools:visibility="visible">
@@ -145,7 +141,6 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:paddingLeft="10dp"
             android:paddingStart="10dp"
             android:orientation="horizontal"
             android:background="@drawable/compose_background_camera">
@@ -155,9 +150,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="@dimen/conversation_compose_height"
                 android:layout_gravity="bottom"
-                android:paddingLeft="4dp"
                 android:paddingStart="4dp"
-                android:paddingRight="6dp"
                 android:paddingEnd="6dp"
                 android:background="?selectableItemBackgroundBorderless"
                 android:contentDescription="@string/conversation_activity__emoji_toggle_description" />
@@ -184,7 +177,6 @@
             android:id="@+id/scribble_send_button_bkg"
             android:layout_width="@dimen/conversation_compose_height"
             android:layout_height="@dimen/conversation_compose_height"
-            android:layout_marginLeft="12dp"
             android:layout_marginStart="12dp"
             android:layout_gravity="bottom"
             android:background="@drawable/circle_tintable"
@@ -195,9 +187,9 @@
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:paddingTop="6dp"
-                android:paddingRight="6dp"
+                android:paddingEnd="6dp"
                 android:paddingBottom="6dp"
-                android:paddingLeft="11dp"
+                android:paddingStart="11dp"
                 android:scaleType="fitCenter"
                 android:contentDescription="@string/conversation_activity__send"
                 android:src="?conversation_transport_sms_indicator"
@@ -212,8 +204,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="6dp"
-        android:layout_marginLeft="10dp"
-        android:layout_marginRight="10dp"
+        android:layout_marginStart="10dp"
+        android:layout_marginEnd="10dp"
         android:paddingBottom="6dp"
         android:visibility="gone"
         tools:visibility="visible"
diff --git a/res/layout/selected_recipient_list_item.xml b/res/layout/selected_recipient_list_item.xml
index 4ef65831f9..423d93def8 100644
--- a/res/layout/selected_recipient_list_item.xml
+++ b/res/layout/selected_recipient_list_item.xml
@@ -9,7 +9,7 @@
         android:id="@+id/name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
         android:layout_alignParentTop="true"
         android:textAppearance="?android:attr/textAppearanceMedium" />
 
@@ -17,7 +17,7 @@
         android:id="@+id/phone"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
         android:layout_below="@id/name"
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:fontFamily="sans-serif-light" />
@@ -26,7 +26,7 @@
         android:id="@+id/delete"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
         android:layout_centerVertical="true"
         android:background="#00ffffff"
         android:src="@drawable/ic_menu_remove_holo_light" />
diff --git a/res/layout/share_activity.xml b/res/layout/share_activity.xml
index 3596cc7ceb..2ff05653f6 100644
--- a/res/layout/share_activity.xml
+++ b/res/layout/share_activity.xml
@@ -27,16 +27,13 @@
                       android:textColor="@color/white"
                       android:textSize="20sp"
                       android:layout_alignParentStart="true"
-                      android:layout_alignParentLeft="true"
                       android:layout_centerVertical="true"
-                      android:layout_toLeftOf="@+id/search_action"
                       android:layout_toStartOf="@+id/search_action"/>
 
             <ImageView android:id="@+id/search_action"
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:src="@drawable/ic_search_white_24dp"
-                       android:layout_alignParentRight="true"
                        android:layout_alignParentEnd="true"
                        android:layout_centerVertical="true"/>
 
diff --git a/res/layout/shared_contact_view.xml b/res/layout/shared_contact_view.xml
index 993adefa91..9834b139df 100644
--- a/res/layout/shared_contact_view.xml
+++ b/res/layout/shared_contact_view.xml
@@ -12,8 +12,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/message_bubble_horizontal_padding"
-            android:layout_marginRight="@dimen/message_bubble_horizontal_padding"
+            android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
+            android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
             android:orientation="horizontal"
             android:gravity="center_vertical">
 
@@ -21,8 +21,7 @@
                 android:id="@+id/contact_avatar"
                 android:layout_width="48dp"
                 android:layout_height="48dp"
-                android:layout_marginEnd="8dp"
-                android:layout_marginRight="8dp"/>
+                android:layout_marginEnd="8dp"/>
 
             <LinearLayout
                 android:layout_width="0dp"
@@ -60,8 +59,8 @@
             android:id="@+id/contact_footer"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/message_bubble_horizontal_padding"
-            android:layout_marginRight="@dimen/message_bubble_horizontal_padding"
+            android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
+            android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
             android:layout_marginTop="4dp"
             android:elevation="9dp"
             android:orientation="horizontal" />
diff --git a/res/layout/thumbnail_view.xml b/res/layout/thumbnail_view.xml
index 119786156e..53042951d4 100644
--- a/res/layout/thumbnail_view.xml
+++ b/res/layout/thumbnail_view.xml
@@ -35,7 +35,6 @@
         <ImageView
             android:layout_width="19dp"
             android:layout_height="24dp"
-            android:layout_marginLeft="17dp"
             android:layout_marginStart="17dp"
             android:layout_marginTop="12dp"
             android:tint="@color/core_blue"
diff --git a/res/layout/transport_selection_list_item.xml b/res/layout/transport_selection_list_item.xml
index e01323006b..5cbe10c805 100644
--- a/res/layout/transport_selection_list_item.xml
+++ b/res/layout/transport_selection_list_item.xml
@@ -6,8 +6,8 @@
               android:layout_width="@dimen/transport_selection_popup_width"
               android:layout_height="60dp"
               android:gravity="center_vertical"
-              android:paddingLeft="10dp"
-              android:paddingRight="10dp">
+              android:paddingStart="10dp"
+              android:paddingEnd="10dp">
 
     <ImageView android:id="@+id/icon"
                android:layout_width="wrap_content"
@@ -22,7 +22,7 @@
                   android:layout_width="match_parent"
                   android:layout_height="match_parent"
                   android:gravity="center_vertical"
-                  android:paddingLeft="10dp">
+                  android:paddingStart="10dp">
 
         <TextView android:id="@+id/text"
                   android:fontFamily="sans-serif-light"
diff --git a/res/layout/unidentified_delivery_learn_more.xml b/res/layout/unidentified_delivery_learn_more.xml
index 438140eb09..22d12af145 100644
--- a/res/layout/unidentified_delivery_learn_more.xml
+++ b/res/layout/unidentified_delivery_learn_more.xml
@@ -10,7 +10,6 @@
     <ImageView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginRight="16dp"
         android:layout_marginEnd="16dp"
         android:src="@drawable/ic_unidentified_delivery"
         android:tint="?conversation_item_sent_text_secondary_color"/>
diff --git a/res/layout/unknown_sender_view.xml b/res/layout/unknown_sender_view.xml
index 9756e5a2ac..30c3bda45e 100644
--- a/res/layout/unknown_sender_view.xml
+++ b/res/layout/unknown_sender_view.xml
@@ -3,8 +3,8 @@
               android:orientation="vertical"
               android:layout_width="match_parent"
               android:layout_height="wrap_content"
-              android:paddingLeft="16dp"
-              android:paddingRight="16dp"
+              android:paddingStart="16dp"
+              android:paddingEnd="16dp"
               android:layout_marginTop="20dp"
               android:background="@color/white">
 
@@ -30,8 +30,7 @@
                    android:src="@drawable/ic_block_white_24dp"
                    android:tint="@color/signal_primary"/>
 
-        <TextView android:layout_marginLeft="15dp"
-                  android:layout_marginStart="15dp"
+        <TextView android:layout_marginStart="15dp"
                   android:layout_width="match_parent"
                   android:layout_height="wrap_content"
                   android:text="@string/unknown_sender_view__block"
@@ -55,8 +54,7 @@
                    android:src="@drawable/ic_person_add_white_24dp"
                    android:tint="@color/signal_primary"/>
 
-        <TextView android:layout_marginLeft="15dp"
-                  android:layout_marginStart="15dp"
+        <TextView android:layout_marginStart="15dp"
                   android:layout_width="match_parent"
                   android:layout_height="wrap_content"
                   android:text="@string/unknown_sender_view__add_to_contacts"
@@ -80,8 +78,7 @@
                    android:src="@drawable/ic_face_white_24dp"
                    android:tint="@color/signal_primary"/>
 
-        <TextView android:layout_marginLeft="15dp"
-                  android:layout_marginStart="15dp"
+        <TextView android:layout_marginStart="15dp"
                   android:layout_width="match_parent"
                   android:layout_height="wrap_content"
                   android:text="@string/unknown_sender_view__don_t_add_but_make_my_profile_visible"
diff --git a/res/layout/unverified_banner_view.xml b/res/layout/unverified_banner_view.xml
index 846f821c6a..56d3de18a0 100644
--- a/res/layout/unverified_banner_view.xml
+++ b/res/layout/unverified_banner_view.xml
@@ -13,8 +13,7 @@
 
     <ImageView android:layout_width="wrap_content"
                android:layout_height="wrap_content"
-               android:layout_marginLeft="16dp"
-
+               android:layout_marginStart="16dp"
                android:layout_gravity="center_vertical"
                android:src="@drawable/ic_alert"/>
 
diff --git a/res/layout/verification_code_view.xml b/res/layout/verification_code_view.xml
index b4dff2228f..a496773e9b 100644
--- a/res/layout/verification_code_view.xml
+++ b/res/layout/verification_code_view.xml
@@ -26,7 +26,7 @@
         android:id="@+id/container_one"
         android:layout_width="48dp"
         android:layout_height="54dp"
-        android:layout_marginLeft="5dp"
+        android:layout_marginStart="5dp"
         android:gravity="center"
         android:orientation="vertical"
         android:background="@drawable/labeled_edit_text_background_inactive">
@@ -44,7 +44,7 @@
         android:id="@+id/container_two"
         android:layout_width="48dp"
         android:layout_height="54dp"
-        android:layout_marginLeft="5dp"
+        android:layout_marginStart="5dp"
         android:gravity="center"
         android:orientation="vertical"
         android:background="@drawable/labeled_edit_text_background_inactive">
@@ -62,7 +62,7 @@
         android:id="@+id/separator_container"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="5dp"
+        android:layout_marginStart="5dp"
         android:gravity="center_horizontal"
         android:layout_gravity="center"
         android:orientation="vertical">
@@ -80,7 +80,7 @@
         android:id="@+id/container_three"
         android:layout_width="48dp"
         android:layout_height="54dp"
-        android:layout_marginLeft="5dp"
+        android:layout_marginStart="5dp"
         android:gravity="center"
         android:orientation="vertical"
         android:background="@drawable/labeled_edit_text_background_inactive">
@@ -99,7 +99,7 @@
         android:id="@+id/container_four"
         android:layout_width="48dp"
         android:layout_height="54dp"
-        android:layout_marginLeft="5dp"
+        android:layout_marginStart="5dp"
         android:gravity="center"
         android:orientation="vertical"
         android:background="@drawable/labeled_edit_text_background_inactive">
@@ -117,7 +117,7 @@
         android:id="@+id/container_five"
         android:layout_width="48dp"
         android:layout_height="54dp"
-        android:layout_marginLeft="5dp"
+        android:layout_marginStart="5dp"
         android:gravity="center"
         android:orientation="vertical"
         android:background="@drawable/labeled_edit_text_background_inactive">
diff --git a/res/layout/verify_display_fragment.xml b/res/layout/verify_display_fragment.xml
index 2c94a73efc..72c7b78e40 100644
--- a/res/layout/verify_display_fragment.xml
+++ b/res/layout/verify_display_fragment.xml
@@ -77,21 +77,21 @@
                 <TextView android:id="@+id/code_second"
                           android:layout_width="wrap_content"
                           android:layout_height="wrap_content"
-                          android:layout_marginLeft="20dp"
+                          android:layout_marginStart="20dp"
                           style="@style/IdentityKey"
                           tools:text="56944"/>
 
                 <TextView android:id="@+id/code_third"
                           android:layout_width="wrap_content"
                           android:layout_height="wrap_content"
-                          android:layout_marginLeft="20dp"
+                          android:layout_marginStart="20dp"
                           style="@style/IdentityKey"
                           tools:text="42738"/>
 
                 <TextView android:id="@+id/code_fourth"
                           android:layout_width="wrap_content"
                           android:layout_height="wrap_content"
-                          android:layout_marginLeft="20dp"
+                          android:layout_marginStart="20dp"
                           style="@style/IdentityKey"
                           tools:text="20038"/>
             </TableRow>
@@ -106,21 +106,21 @@
                 <TextView android:id="@+id/code_sixth"
                           android:layout_width="wrap_content"
                           android:layout_height="wrap_content"
-                          android:layout_marginLeft="20dp"
+                          android:layout_marginStart="20dp"
                           style="@style/IdentityKey"
                           tools:text="24922"/>
 
                 <TextView android:id="@+id/code_seventh"
                           android:layout_width="wrap_content"
                           android:layout_height="wrap_content"
-                          android:layout_marginLeft="20dp"
+                          android:layout_marginStart="20dp"
                           style="@style/IdentityKey"
                           tools:text="58594"/>
 
                 <TextView android:id="@+id/code_eighth"
                           android:layout_width="wrap_content"
                           android:layout_height="wrap_content"
-                          android:layout_marginLeft="20dp"
+                          android:layout_marginStart="20dp"
                           style="@style/IdentityKey"
                           tools:text="24109"/>
             </TableRow>
@@ -135,21 +135,21 @@
                 <TextView android:id="@+id/code_tenth"
                           android:layout_width="wrap_content"
                           android:layout_height="wrap_content"
-                          android:layout_marginLeft="20dp"
+                          android:layout_marginStart="20dp"
                           style="@style/IdentityKey"
                           tools:text="34956"/>
 
                 <TextView android:id="@+id/code_eleventh"
                           android:layout_width="wrap_content"
                           android:layout_height="wrap_content"
-                          android:layout_marginLeft="20dp"
+                          android:layout_marginStart="20dp"
                           style="@style/IdentityKey"
                           tools:text="32440"/>
 
                 <TextView android:id="@+id/code_twelth"
                           android:layout_width="wrap_content"
                           android:layout_height="wrap_content"
-                          android:layout_marginLeft="20dp"
+                          android:layout_marginStart="20dp"
                           style="@style/IdentityKey"
                           tools:text="15774"/>
             </TableRow>
@@ -159,7 +159,7 @@
                       android:layout_width="match_parent"
                       android:layout_height="wrap_content"
                       android:layout_marginTop="10dp"
-                      android:paddingLeft="20dp">
+                      android:paddingStart="20dp">
 
             <android.support.v7.widget.SwitchCompat
                     android:id="@+id/verified_switch"
@@ -167,7 +167,7 @@
                     android:layout_height="wrap_content"/>
 
             <TextView
-                    android:layout_marginLeft="5dp"
+                    android:layout_marginStart="5dp"
                     android:textSize="17dp"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
diff --git a/res/layout/webrtc_call_controls.xml b/res/layout/webrtc_call_controls.xml
index 45615de8f8..410f488ce6 100644
--- a/res/layout/webrtc_call_controls.xml
+++ b/res/layout/webrtc_call_controls.xml
@@ -12,14 +12,14 @@
                 style="@style/WebRtcCallCompoundButton"
                 android:background="@drawable/webrtc_speaker_button"
                 tools:checked="true"
-                android:layout_marginRight="15dp"/>
+                android:layout_marginEnd="15dp"/>
 
         <org.thoughtcrime.securesms.components.AccessibleToggleButton
                 android:id="@+id/bluetoothButton"
                 style="@style/WebRtcCallCompoundButton"
                 android:background="@drawable/webrtc_bluetooth_button"
                 tools:checked="true"
-                android:layout_marginRight="15dp"
+                android:layout_marginEnd="15dp"
                 android:visibility="gone"/>
 
         <org.thoughtcrime.securesms.components.AccessibleToggleButton
@@ -27,14 +27,14 @@
                 style="@style/WebRtcCallCompoundButton"
                 android:background="@drawable/webrtc_mute_button"
                 android:contentDescription="@string/redphone_call_controls__mute"
-                android:layout_marginRight="15dp"
+                android:layout_marginEnd="15dp"
                 tools:checked="false"
                 />
 
         <org.thoughtcrime.securesms.components.AccessibleToggleButton
                 android:id="@+id/video_mute_button"
                 style="@style/WebRtcCallCompoundButton"
-                android:layout_marginRight="15dp"
+                android:layout_marginEnd="15dp"
                 android:background="@drawable/webrtc_video_mute_button"/>
 
         <org.thoughtcrime.securesms.components.AccessibleToggleButton
diff --git a/res/layout/webrtc_call_screen.xml b/res/layout/webrtc_call_screen.xml
index 6c78a9f075..6df042731d 100644
--- a/res/layout/webrtc_call_screen.xml
+++ b/res/layout/webrtc_call_screen.xml
@@ -77,7 +77,7 @@
                             android:text="@string/WebRtcCallScreen_accept"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_marginRight="10dp"/>
+                            android:layout_marginEnd="10dp"/>
 
                     <Button android:id="@+id/cancel_safety_numbers"
                             android:text="@android:string/cancel"
@@ -106,8 +106,8 @@
 
             <RelativeLayout android:id="@+id/expanded_info"
                             android:background="@color/textsecure_primary"
-                            android:paddingLeft="24dp"
-                            android:paddingRight="24dp"
+                            android:paddingStart="24dp"
+                            android:paddingEnd="24dp"
                             android:paddingTop="16dp"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
@@ -117,10 +117,10 @@
                 <!-- Name (or the phone number, if we don't have a name to display). -->
                 <TextView android:id="@+id/name"
                           android:layout_alignParentTop="true"
-                          android:layout_alignParentLeft="true"
+                          android:layout_alignParentStart="true"
                           android:layout_width="match_parent"
                           android:layout_height="wrap_content"
-                          android:paddingRight="50sp"
+                          android:paddingEnd="50sp"
                           android:textSize="40sp"
                           android:textColor="#FFFFFF"
                           android:singleLine="true"
@@ -134,7 +134,7 @@
                               android:layout_below="@id/name"
                               android:layout_width="wrap_content"
                               android:layout_height="wrap_content"
-                              android:paddingRight="50sp"
+                              android:paddingEnd="50sp"
                               android:orientation="horizontal"
                         >
                     <TextView android:id="@+id/label"
@@ -144,7 +144,7 @@
                               android:singleLine="true"
                               android:textAppearance="?android:attr/textAppearanceSmall"
                               android:text="@string/redphone_call_card__signal_call"
-                              android:layout_marginRight="10dp"
+                              android:layout_marginEnd="10dp"
                             />
                     <TextView android:id="@+id/phoneNumber"
                               android:layout_width="wrap_content"
@@ -159,7 +159,7 @@
 
                 <!-- Elapsed time indication for a call in progress. -->
                 <TextView android:id="@+id/elapsedTime"
-                          android:layout_alignParentRight="true"
+                          android:layout_alignParentEnd="true"
                           android:layout_centerVertical="true"
                           android:layout_width="wrap_content"
                           android:layout_height="wrap_content"
@@ -175,8 +175,8 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:background="@color/textsecure_primary"
-                    android:paddingLeft="24dp"
-                    android:paddingRight="24dp"
+                    android:paddingStart="24dp"
+                    android:paddingEnd="24dp"
                     android:paddingTop="16dp"
                     android:paddingBottom="20dp"
                     android:clickable="true"/>
@@ -187,7 +187,7 @@
                       android:gravity="right"
                       android:paddingTop="8dp"
                       android:paddingBottom="8dp"
-                      android:paddingRight="24dp"
+                      android:paddingEnd="24dp"
                       android:textAppearance="?android:attr/textAppearanceSmall"
                       android:textColor="#FFFFFF"
                       android:textAllCaps="true"