diff --git a/Habitica/res/drawable/adventure_guide_menu_bg.xml b/Habitica/res/drawable/adventure_guide_menu_bg.xml
index b5877fa91..7a696951d 100644
--- a/Habitica/res/drawable/adventure_guide_menu_bg.xml
+++ b/Habitica/res/drawable/adventure_guide_menu_bg.xml
@@ -8,12 +8,12 @@
     </item>
     <item>
         <bitmap
-            android:gravity="left|top"
+            android:gravity="start|top"
             android:src="@drawable/gold_coins_left" />
     </item>
     <item>
         <bitmap
-            android:gravity="right|bottom"
+            android:gravity="end|bottom"
             android:src="@drawable/gold_coins_right" />
     </item>
 </layer-list>
\ No newline at end of file
diff --git a/Habitica/res/layout/achievement_section_header.xml b/Habitica/res/layout/achievement_section_header.xml
index a89675365..8f008a50d 100644
--- a/Habitica/res/layout/achievement_section_header.xml
+++ b/Habitica/res/layout/achievement_section_header.xml
@@ -6,8 +6,8 @@
     android:layout_height="wrap_content"
     android:gravity="center_vertical"
     android:layout_marginTop="@dimen/spacing_medium"
-    android:paddingLeft="@dimen/spacing_large"
-    android:paddingRight="@dimen/spacing_large">
+    android:paddingStart="@dimen/spacing_large"
+    android:paddingEnd="@dimen/spacing_large">
     <TextView
         android:id="@+id/title"
         android:layout_width="0dp"
diff --git a/Habitica/res/layout/activity_create_challenge.xml b/Habitica/res/layout/activity_create_challenge.xml
index 49f45a515..e51e44089 100644
--- a/Habitica/res/layout/activity_create_challenge.xml
+++ b/Habitica/res/layout/activity_create_challenge.xml
@@ -40,8 +40,8 @@
             android:layout_height="wrap_content"
             android:background="?colorPrimaryOffset"
             android:orientation="vertical"
-            android:paddingLeft="@dimen/activity_horizontal_margin"
-            android:paddingRight="@dimen/activity_horizontal_margin"
+            android:paddingStart="@dimen/activity_horizontal_margin"
+            android:paddingEnd="@dimen/activity_horizontal_margin"
             android:paddingTop="22dp">
 
 
@@ -93,8 +93,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:paddingLeft="@dimen/activity_horizontal_margin"
-            android:paddingRight="@dimen/activity_horizontal_margin">
+            android:paddingStart="@dimen/activity_horizontal_margin"
+            android:paddingEnd="@dimen/activity_horizontal_margin">
             <LinearLayout
                 android:id="@+id/challenge_creation_views"
                 android:layout_width="match_parent"
diff --git a/Habitica/res/layout/activity_fixcharacter.xml b/Habitica/res/layout/activity_fixcharacter.xml
index c0290ce6b..2acbd92a6 100644
--- a/Habitica/res/layout/activity_fixcharacter.xml
+++ b/Habitica/res/layout/activity_fixcharacter.xml
@@ -38,8 +38,8 @@
                     <FrameLayout
                         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_marginBottom="12dp" >
                     <View
                         android:id="@+id/healthIconBackgroundView"
@@ -81,8 +81,8 @@
                     <FrameLayout
                         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_marginBottom="12dp" >
                         <View
                             android:id="@+id/experienceIconBackgroundView"
@@ -123,8 +123,8 @@
                     <FrameLayout
                         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_marginBottom="12dp" >
                         <View
                             android:id="@+id/manaIconBackgroundView"
@@ -165,8 +165,8 @@
                     <FrameLayout
                         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_marginBottom="12dp" >
                         <View
                             android:id="@+id/goldIconBackgroundView"
@@ -207,8 +207,8 @@
                     <FrameLayout
                         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_marginBottom="12dp" >
                         <View
                             android:id="@+id/levelIconBackgroundView"
@@ -249,8 +249,8 @@
                     <FrameLayout
                         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_marginBottom="12dp" >
                         <View
                             android:id="@+id/streakIconBackgroundView"
diff --git a/Habitica/res/layout/activity_gift_subscription.xml b/Habitica/res/layout/activity_gift_subscription.xml
index d584d2685..2a7a98388 100644
--- a/Habitica/res/layout/activity_gift_subscription.xml
+++ b/Habitica/res/layout/activity_gift_subscription.xml
@@ -60,16 +60,16 @@
                 android:gravity="center_horizontal"
                 android:text="@string/gift_subscription_subtitle"
                 android:textColor="@color/text_quad"
-                android:layout_marginLeft="@dimen/spacing_large"
-                android:layout_marginRight="@dimen/spacing_large"/>
+                android:layout_marginStart="@dimen/spacing_large"
+                android:layout_marginEnd="@dimen/spacing_large"/>
             <LinearLayout
                 android:id="@+id/subscriptionOptions"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
                 android:layout_marginTop="24dp"
-                android:layout_marginLeft="@dimen/spacing_large"
-                android:layout_marginRight="@dimen/spacing_large"
+                android:layout_marginStart="@dimen/spacing_large"
+                android:layout_marginEnd="@dimen/spacing_large"
                 android:layout_marginBottom="@dimen/spacing_large">
 
                 <com.habitrpg.android.habitica.ui.views.subscriptions.SubscriptionOptionView
diff --git a/Habitica/res/layout/activity_group_form.xml b/Habitica/res/layout/activity_group_form.xml
index 13312a722..cf19b7a57 100644
--- a/Habitica/res/layout/activity_group_form.xml
+++ b/Habitica/res/layout/activity_group_form.xml
@@ -43,8 +43,8 @@
             android:layout_height="match_parent"
             app:hintTextAppearance="@style/TextAppearance.AppCompat"
             android:layout_marginTop="@dimen/spacing_small"
-            android:layout_marginLeft="@dimen/spacing_large"
-            android:layout_marginRight="@dimen/spacing_large"
+            android:layout_marginStart="@dimen/spacing_large"
+            android:layout_marginEnd="@dimen/spacing_large"
             android:background="@drawable/edittext"
             android:textColorHint="@color/text_primary">
             <com.habitrpg.android.habitica.ui.views.HabiticaAutocompleteTextView
@@ -69,8 +69,8 @@
                 android:layout_height="match_parent"
                 app:hintTextAppearance="@style/TextAppearance.AppCompat"
                 android:layout_marginTop="@dimen/spacing_large"
-                android:layout_marginLeft="@dimen/spacing_large"
-                android:layout_marginRight="@dimen/spacing_large"
+                android:layout_marginStart="@dimen/spacing_large"
+                android:layout_marginEnd="@dimen/spacing_large"
                 android:background="@drawable/edittext"
                 android:textColorHint="@color/text_primary">
 
@@ -97,8 +97,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/spacing_large"
-            android:layout_marginLeft="@dimen/spacing_large"
-            android:layout_marginRight="@dimen/spacing_large">
+            android:layout_marginStart="@dimen/spacing_large"
+            android:layout_marginEnd="@dimen/spacing_large">
             <TextView
                 android:layout_width="0dp"
                 android:layout_weight="1"
@@ -123,8 +123,8 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:id="@+id/privacyWrapper"
-            android:layout_marginLeft="@dimen/spacing_large"
-            android:layout_marginRight="@dimen/spacing_large"
+            android:layout_marginStart="@dimen/spacing_large"
+            android:layout_marginEnd="@dimen/spacing_large"
             tools:visibility="gone">
 
             <TextView
diff --git a/Habitica/res/layout/activity_login.xml b/Habitica/res/layout/activity_login.xml
index 1b30631d5..f70f2f177 100644
--- a/Habitica/res/layout/activity_login.xml
+++ b/Habitica/res/layout/activity_login.xml
@@ -72,8 +72,8 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:paddingTop="@dimen/spacing_large"
-            android:paddingLeft="@dimen/spacing_large"
-            android:paddingRight="@dimen/spacing_large"
+            android:paddingStart="@dimen/spacing_large"
+            android:paddingEnd="@dimen/spacing_large"
             android:orientation="vertical"
             android:background="@color/transparent"
                         >
diff --git a/Habitica/res/layout/activity_report_message.xml b/Habitica/res/layout/activity_report_message.xml
index d2d6dfaab..e9d5f836c 100644
--- a/Habitica/res/layout/activity_report_message.xml
+++ b/Habitica/res/layout/activity_report_message.xml
@@ -77,8 +77,8 @@
                 android:orientation="vertical" android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:paddingTop="16dp"
-                android:paddingLeft="24dp"
-                android:paddingRight="24dp"
+                android:paddingStart="24dp"
+                android:paddingEnd="24dp"
                 android:paddingBottom="25dp"
                 android:layout_marginBottom="0dp"
                 android:focusableInTouchMode="true">
diff --git a/Habitica/res/layout/activity_setup.xml b/Habitica/res/layout/activity_setup.xml
index 427c8a7dd..fff7eae37 100644
--- a/Habitica/res/layout/activity_setup.xml
+++ b/Habitica/res/layout/activity_setup.xml
@@ -1,57 +1,52 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent" android:layout_height="match_parent">
+    android:layout_width="match_parent" android:layout_height="match_parent">
 
     <com.habitrpg.android.habitica.ui.views.FadingViewPager
-            android:id="@+id/viewPager"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_above="@+id/bottomBar" />
+        android:id="@+id/viewPager"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@+id/bottomBar" />
 
     <RelativeLayout
-            android:id="@+id/bottomBar"
-            android:orientation="horizontal"
-            android:layout_width="match_parent"
-            android:layout_height="56dp"
-            android:layout_alignParentBottom="true"
-            android:layout_centerHorizontal="true"
-            android:layout_alignParentLeft="true"
-            android:layout_alignParentRight="true"
-            android:layout_alignParentStart="true"
-            android:layout_alignParentEnd="true"
-            android:background="@color/brand_300"
-            android:paddingLeft="@dimen/content_inset"
-            android:paddingRight="@dimen/content_inset"
-            android:gravity="center_vertical"
-            android:elevation="8dp">
-
+        android:id="@+id/bottomBar"
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="56dp"
+        android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentEnd="true"
+        android:background="@color/brand_300"
+        android:paddingStart="@dimen/content_inset"
+        android:paddingEnd="@dimen/content_inset"
+        android:gravity="center_vertical"
+        android:elevation="8dp">
         <Button
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:id="@+id/previousButton"
-                android:drawableLeft="@drawable/back_arrow_disabled"
-                android:background="@color/transparent"
-                android:drawablePadding="12dp"
-                android:textColor="@color/white"
-                android:layout_alignParentLeft="true"/>
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/previousButton"
+            android:drawableStart="@drawable/back_arrow_disabled"
+            android:background="@color/transparent"
+            android:drawablePadding="12dp"
+            android:textColor="@color/white"
+            android:layout_alignParentStart="true"/>
         <Button
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/next_button"
-                android:id="@+id/nextButton"
-                android:drawablePadding="12dp"
-                android:textColor="@color/white"
-                android:drawableRight="@drawable/forward_arrow_enabled"
-                android:background="@color/transparent"
-                android:layout_alignParentRight="true"/>
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/next_button"
+            android:id="@+id/nextButton"
+            android:drawablePadding="12dp"
+            android:textColor="@color/white"
+            android:drawableEnd="@drawable/forward_arrow_enabled"
+            android:background="@color/transparent"
+            android:layout_alignEnd="@id/previousButton"
+            android:layout_alignParentEnd="true"/>
 
         <com.viewpagerindicator.IconPageIndicator
-                android:id="@+id/view_pager_indicator"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_centerInParent="true"
-                />
-
+            android:id="@+id/view_pager_indicator"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true" />
     </RelativeLayout>
-
 </RelativeLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/activity_task_form.xml b/Habitica/res/layout/activity_task_form.xml
index 7ecb9758c..26416e524 100644
--- a/Habitica/res/layout/activity_task_form.xml
+++ b/Habitica/res/layout/activity_task_form.xml
@@ -218,7 +218,7 @@
                             android:layout_weight="1"
                             android:layout_height="wrap_content"
                             android:text="@string/strength"
-                            android:layout_marginRight="@dimen/spacing_large"/>
+                            android:layout_marginEnd="@dimen/spacing_large"/>
                         <TextView
                             android:id="@+id/stat_constitution_button"
                             style="@style/TaskFormToggle"
@@ -237,7 +237,7 @@
                             android:layout_weight="1"
                             android:layout_height="wrap_content"
                             android:text="@string/intelligence"
-                            android:layout_marginRight="@dimen/spacing_large"/>
+                            android:layout_marginEnd="@dimen/spacing_large"/>
                         <TextView
                             android:id="@+id/stat_perception_button"
                             style="@style/TaskFormToggle"
diff --git a/Habitica/res/layout/activity_verify_username.xml b/Habitica/res/layout/activity_verify_username.xml
index 0c46a739c..3be1b7ff5 100644
--- a/Habitica/res/layout/activity_verify_username.xml
+++ b/Habitica/res/layout/activity_verify_username.xml
@@ -60,9 +60,9 @@
                         <TextView
                             android:layout_height="42dp"
                             android:text="@string/display_name"
-                            android:paddingLeft="@dimen/spacing_medium"
-                            android:paddingRight="@dimen/spacing_medium"
-                            android:layout_marginLeft="1dp"
+                            android:paddingStart="@dimen/spacing_medium"
+                            android:paddingEnd="@dimen/spacing_medium"
+                            android:layout_marginStart="1dp"
                             android:background="@color/window_background"
                             android:gravity="center_vertical"
                             />
@@ -72,8 +72,8 @@
                         <EditText android:id="@+id/display_name_edit_text"
                             android:background="@color/transparent"
                             android:layout_height="42dp"
-                            android:layout_marginLeft="@dimen/spacing_large"
-                            android:layout_marginRight="@dimen/spacing_large"
+                            android:layout_marginStart="@dimen/spacing_large"
+                            android:layout_marginEnd="@dimen/spacing_large"
                             android:lines="1"/>
                     </TableRow>
                     <TableRow>
@@ -85,16 +85,16 @@
                         <TextView android:text="@string/username"
                             android:background="@color/window_background"
                             android:layout_height="41dp"
-                            android:paddingLeft="@dimen/spacing_medium"
-                            android:paddingRight="@dimen/spacing_medium"
-                            android:layout_marginLeft="1dp"
+                            android:paddingStart="@dimen/spacing_medium"
+                            android:paddingEnd="@dimen/spacing_medium"
+                            android:layout_marginStart="1dp"
                             android:gravity="center_vertical"/>
                         <View android:background="@color/offset_background"
                             android:layout_width="1dp"
                             android:layout_height="42dp"/>
                         <LinearLayout
-                            android:layout_marginLeft="@dimen/spacing_large"
-                            android:layout_marginRight="@dimen/spacing_large">
+                            android:layout_marginStart="@dimen/spacing_large"
+                            android:layout_marginEnd="@dimen/spacing_large">
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="match_parent"
@@ -106,7 +106,7 @@
                                 android:layout_width="0dp"
                                 android:layout_weight="1"
                                 android:layout_height="42dp"
-                                android:layout_marginLeft="@dimen/spacing_small"
+                                android:layout_marginStart="@dimen/spacing_small"
                                 android:lines="1"/>
                         </LinearLayout>
                     </TableRow>
@@ -140,8 +140,8 @@
                     android:gravity="center"
                     android:layout_marginTop="@dimen/spacing_large"
                     android:layout_marginBottom="@dimen/spacing_medium"
-                    android:layout_marginLeft="@dimen/spacing_large"
-                    android:layout_marginRight="@dimen/spacing_large"
+                    android:layout_marginStart="@dimen/spacing_large"
+                    android:layout_marginEnd="@dimen/spacing_large"
                     android:textSize="12sp"
                     android:textColor="@color/text_ternary"/>
                 <ImageView
diff --git a/Habitica/res/layout/challenge_item.xml b/Habitica/res/layout/challenge_item.xml
index daa3e7bc5..70038156e 100644
--- a/Habitica/res/layout/challenge_item.xml
+++ b/Habitica/res/layout/challenge_item.xml
@@ -80,20 +80,19 @@
                 style="@style/ChallengeTaskDetails"
                 android:layout_width="wrap_content"
                 android:layout_height="20dp"
-                android:layout_marginLeft="4dp"
-                android:layout_marginStart="4dp"
+                android:layout_marginStart="@dimen/spacing_small"
                 android:gravity="center_vertical"
                 tools:text="12334" />
             <TextView
                 android:id="@+id/official_challenge_view"
-                android:layout_marginLeft="@dimen/spacing_small"
+                android:layout_marginStart="@dimen/spacing_small"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 style="@style/Pill.Purple"
                 android:text="@string/official"/>
             <TextView
                 android:id="@+id/is_joined_label"
-                android:layout_marginLeft="@dimen/spacing_small"
+                android:layout_marginStart="@dimen/spacing_small"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 style="@style/Pill.Selected.Green"
diff --git a/Habitica/res/layout/chat_bar_view.xml b/Habitica/res/layout/chat_bar_view.xml
index fba476f60..b42d9b977 100644
--- a/Habitica/res/layout/chat_bar_view.xml
+++ b/Habitica/res/layout/chat_bar_view.xml
@@ -7,8 +7,8 @@
             android:layout_width="match_parent"
             android:orientation="horizontal"
             android:layout_height="wrap_content"
-            android:paddingLeft="@dimen/spacing_medium"
-            android:paddingRight="@dimen/spacing_medium"
+            android:paddingStart="@dimen/spacing_medium"
+            android:paddingEnd="@dimen/spacing_medium"
             android:baselineAligned="false">
 
             <com.google.android.material.textfield.TextInputLayout
@@ -29,8 +29,8 @@
                     android:inputType="textCapSentences|textMultiLine"
                     android:lineSpacingExtra="2dp"
                     android:background="@drawable/rounded_border"
-                    android:paddingLeft="@dimen/spacing_medium"
-                    android:paddingRight="@dimen/spacing_medium"
+                    android:paddingStart="@dimen/spacing_medium"
+                    android:paddingEnd="@dimen/spacing_medium"
                     android:paddingTop="4dp"
                     android:paddingBottom="4dp"
                     tools:height="200dp"/>
diff --git a/Habitica/res/layout/chat_item.xml b/Habitica/res/layout/chat_item.xml
index a1ca54217..6aacc5fd8 100644
--- a/Habitica/res/layout/chat_item.xml
+++ b/Habitica/res/layout/chat_item.xml
@@ -6,8 +6,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="horizontal"
     android:background="@color/content_background"
-    android:paddingLeft="@dimen/chat_horizontal_inset"
-    android:paddingRight="@dimen/chat_horizontal_inset"
+    android:paddingStart="@dimen/chat_horizontal_inset"
+    android:paddingEnd="@dimen/chat_horizontal_inset"
     android:paddingTop="@dimen/spacing_small"
     android:paddingBottom="@dimen/spacing_small">
     <com.habitrpg.android.habitica.ui.RoundedFrameLayout
diff --git a/Habitica/res/layout/class_spinner_dropdown_item.xml b/Habitica/res/layout/class_spinner_dropdown_item.xml
index b3cf67212..485049104 100644
--- a/Habitica/res/layout/class_spinner_dropdown_item.xml
+++ b/Habitica/res/layout/class_spinner_dropdown_item.xml
@@ -3,8 +3,8 @@
               android:layout_width="match_parent"
               android:layout_height="match_parent"
               android:minWidth="120dp"
-              android:paddingLeft="12dp"
-              android:paddingRight="12dp"
+              android:paddingStart="12dp"
+              android:paddingEnd="12dp"
               android:paddingTop="4dp"
               android:paddingBottom="4dp"
               android:gravity="center_vertical">
@@ -12,7 +12,7 @@
         android:id="@+id/classIconView"
         android:layout_width="32dp"
         android:layout_height="32dp"
-        android:layout_marginRight="8dp"/>
+        android:layout_marginEnd="8dp"/>
     <TextView
         android:id="@+id/textView"
         android:layout_width="wrap_content"
diff --git a/Habitica/res/layout/class_spinner_dropdown_item_selected.xml b/Habitica/res/layout/class_spinner_dropdown_item_selected.xml
index c340c0f57..4c0222bb8 100644
--- a/Habitica/res/layout/class_spinner_dropdown_item_selected.xml
+++ b/Habitica/res/layout/class_spinner_dropdown_item_selected.xml
@@ -9,7 +9,7 @@
         android:id="@+id/classIconView"
         android:layout_width="32dp"
         android:layout_height="32dp"
-        android:layout_marginRight="8dp"/>
+        android:layout_marginEnd="8dp"/>
     <TextView
         android:id="@+id/textView"
         android:layout_width="wrap_content"
diff --git a/Habitica/res/layout/daily_item_card.xml b/Habitica/res/layout/daily_item_card.xml
index f66d203c3..b6e9e19eb 100644
--- a/Habitica/res/layout/daily_item_card.xml
+++ b/Habitica/res/layout/daily_item_card.xml
@@ -58,8 +58,8 @@
                     android:layout_width="20dp"
                     android:layout_height="20dp"
                     android:layout_gravity="center_vertical"
-                    android:layout_marginLeft="@dimen/spacing_small"
-                    android:layout_marginRight="@dimen/spacing_small"
+                    android:layout_marginStart="@dimen/spacing_small"
+                    android:layout_marginEnd="@dimen/spacing_small"
                     style="@style/Widget.AppCompat.ProgressBar"/>
                 <ImageButton
                     android:id="@+id/error_icon"
@@ -68,8 +68,8 @@
                     android:layout_gravity="center_vertical"
                     android:background="@color/transparent"
                     android:src="@drawable/ic_warning_black"
-                    android:layout_marginLeft="@dimen/spacing_small"
-                    android:layout_marginRight="@dimen/spacing_small"/>
+                    android:layout_marginStart="@dimen/spacing_small"
+                    android:layout_marginEnd="@dimen/spacing_small"/>
                 <include layout="@layout/checklist_indicator" />
             </LinearLayout>
             <LinearLayout
diff --git a/Habitica/res/layout/dialog_achievement_details.xml b/Habitica/res/layout/dialog_achievement_details.xml
index 6769dfc17..cd0ff78f4 100644
--- a/Habitica/res/layout/dialog_achievement_details.xml
+++ b/Habitica/res/layout/dialog_achievement_details.xml
@@ -4,9 +4,9 @@
     android:layout_height="match_parent"
     xmlns:tools="http://schemas.android.com/tools"
     android:orientation="vertical"
-    android:paddingLeft="24dip"
+    android:paddingStart="24dip"
     android:paddingTop="24dip"
-    android:paddingRight="24dip">
+    android:paddingEnd="24dip">
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/Habitica/res/layout/dialog_challenge_detail_daily.xml b/Habitica/res/layout/dialog_challenge_detail_daily.xml
index 39422ee17..4c0c2d924 100644
--- a/Habitica/res/layout/dialog_challenge_detail_daily.xml
+++ b/Habitica/res/layout/dialog_challenge_detail_daily.xml
@@ -13,7 +13,7 @@
         android:id="@+id/lock_icon_background"
         android:layout_width="48dp"
         android:layout_height="match_parent"
-        android:layout_marginRight="@dimen/spacing_large"
+        android:layout_marginEnd="@dimen/spacing_large"
         android:layout_marginTop="0.5dp"
         android:layout_marginBottom="0.5dp">
         <ImageView
diff --git a/Habitica/res/layout/dialog_challenge_detail_habit.xml b/Habitica/res/layout/dialog_challenge_detail_habit.xml
index 827a98de6..5e8c2ef11 100644
--- a/Habitica/res/layout/dialog_challenge_detail_habit.xml
+++ b/Habitica/res/layout/dialog_challenge_detail_habit.xml
@@ -14,7 +14,7 @@
         android:layout_width="48dp"
         android:layout_height="match_parent"
         android:background="@color/window_background"
-        android:layout_marginRight="@dimen/spacing_large"
+        android:layout_marginEnd="@dimen/spacing_large"
         android:layout_marginTop="0.5dp"
         android:layout_marginBottom="0.5dp">
         <ImageView
@@ -49,7 +49,7 @@
         android:layout_width="48dp"
         android:layout_height="match_parent"
         android:background="@color/window_background"
-        android:layout_marginLeft="@dimen/spacing_large"
+        android:layout_marginStart="@dimen/spacing_large"
         android:layout_marginTop="0.5dp"
         android:layout_marginBottom="0.5dp">
         <ImageView
diff --git a/Habitica/res/layout/dialog_challenge_detail_task_group.xml b/Habitica/res/layout/dialog_challenge_detail_task_group.xml
index 2bc551fda..b5c59ba51 100644
--- a/Habitica/res/layout/dialog_challenge_detail_task_group.xml
+++ b/Habitica/res/layout/dialog_challenge_detail_task_group.xml
@@ -8,7 +8,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center_vertical"
-        android:layout_marginLeft="@dimen/spacing_large"
+        android:layout_marginStart="@dimen/spacing_large"
         android:layout_marginTop="24dp"
         android:layout_marginBottom="@dimen/spacing_large"
         >
@@ -23,7 +23,7 @@
             android:id="@+id/task_count_view"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/spacing_medium"
+            android:layout_marginStart="@dimen/spacing_medium"
             style="@style/Pill.Content"
             android:textColor="@color/text_dimmed"
             tools:text="2"/>
diff --git a/Habitica/res/layout/dialog_challenge_detail_todo.xml b/Habitica/res/layout/dialog_challenge_detail_todo.xml
index 790a38b4c..5435d1ff5 100644
--- a/Habitica/res/layout/dialog_challenge_detail_todo.xml
+++ b/Habitica/res/layout/dialog_challenge_detail_todo.xml
@@ -13,7 +13,7 @@
         android:id="@+id/lock_icon_background"
         android:layout_width="48dp"
         android:layout_height="match_parent"
-        android:layout_marginRight="@dimen/spacing_large"
+        android:layout_marginEnd="@dimen/spacing_large"
         android:layout_marginTop="0.5dp"
         android:layout_marginBottom="0.5dp">
         <ImageView
diff --git a/Habitica/res/layout/dialog_challenge_filter.xml b/Habitica/res/layout/dialog_challenge_filter.xml
index 6a4d6ecf2..c4ede3eec 100644
--- a/Habitica/res/layout/dialog_challenge_filter.xml
+++ b/Habitica/res/layout/dialog_challenge_filter.xml
@@ -15,8 +15,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_marginEnd="@dimen/dialog_marginLeftRight"
-        android:layout_marginLeft="@dimen/dialog_marginLeftRight"
-        android:layout_marginRight="@dimen/dialog_marginLeftRight"
         android:layout_marginStart="@dimen/dialog_marginLeftRight"
         android:layout_marginTop="16dp"
 
@@ -44,7 +42,7 @@
                 style="@style/Body1_Button"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:gravity="right|center_vertical"
+                android:gravity="end|center_vertical"
                 android:text="@string/all"
                 android:textColor="#6133b4"
                 android:textSize="16sp"
@@ -55,7 +53,7 @@
                 style="@style/Body1_Button"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:gravity="right|center_vertical"
+                android:gravity="end|center_vertical"
                 android:text="@string/none"
                 android:textColor="#6133b4"
                 android:textSize="16sp"
@@ -86,7 +84,7 @@
                 android:checked="true"
                 android:text="@string/owned"
                 android:textColor="@color/textColorLight"
-                android:paddingLeft="8dp" />
+                android:paddingStart="8dp" />
 
             <CheckBox
                 style="@style/Subheader2"
@@ -96,6 +94,6 @@
                 android:checked="true"
                 android:text="@string/not_owned"
                 android:textColor="@color/textColorLight"
-                android:paddingLeft="8dp"/>
+                android:paddingStart="8dp"/>
     </LinearLayout>
 </com.habitrpg.android.habitica.ui.MaxHeightLinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/dialog_choose_message_recipient.xml b/Habitica/res/layout/dialog_choose_message_recipient.xml
index bdb0cfc52..5c3e394c9 100644
--- a/Habitica/res/layout/dialog_choose_message_recipient.xml
+++ b/Habitica/res/layout/dialog_choose_message_recipient.xml
@@ -4,8 +4,8 @@
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingLeft="20dp"
-    android:paddingRight="20dp"
+    android:paddingStart="20dp"
+    android:paddingEnd="20dp"
     android:gravity="center_horizontal">
 
     <TextView
diff --git a/Habitica/res/layout/dialog_completed_quest_content.xml b/Habitica/res/layout/dialog_completed_quest_content.xml
index 3c2cd58f2..4ed9d410c 100644
--- a/Habitica/res/layout/dialog_completed_quest_content.xml
+++ b/Habitica/res/layout/dialog_completed_quest_content.xml
@@ -4,8 +4,8 @@
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingLeft="@dimen/shopitem_dialog_content_inset"
-    android:paddingRight="@dimen/shopitem_dialog_content_inset"
+    android:paddingStart="@dimen/shopitem_dialog_content_inset"
+    android:paddingEnd="@dimen/shopitem_dialog_content_inset"
     android:gravity="center_horizontal"
     tools:parentTag="LinearLayout"
     tools:orientation="vertical">
diff --git a/Habitica/res/layout/dialog_faint.xml b/Habitica/res/layout/dialog_faint.xml
index 35db018ca..c294131b2 100644
--- a/Habitica/res/layout/dialog_faint.xml
+++ b/Habitica/res/layout/dialog_faint.xml
@@ -3,15 +3,10 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical" android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingLeft="24dip"
     android:paddingEnd="24dip"
-    android:paddingStart="24dip"
-    android:paddingRight="24dip">
-
-
+    android:paddingStart="24dip">
     <com.habitrpg.android.habitica.ui.views.ValueBar
         android:id="@+id/hpBar"
-        layout="@layout/value_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/header_bar_spacing"
@@ -38,5 +33,4 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/faint_penalty_body" />
-
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/dialog_login_incentive.xml b/Habitica/res/layout/dialog_login_incentive.xml
index c99bdd280..7f4c374c8 100644
--- a/Habitica/res/layout/dialog_login_incentive.xml
+++ b/Habitica/res/layout/dialog_login_incentive.xml
@@ -16,8 +16,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="20dp"
-        android:layout_marginLeft="25dp"
-        android:layout_marginRight="25dp"
+        android:layout_marginStart="25dp"
+        android:layout_marginEnd="25dp"
         android:id="@+id/you_earned_message"
         tools:text="You unlocked something"
         android:gravity="center_horizontal"
diff --git a/Habitica/res/layout/dialog_purchase_content_gear.xml b/Habitica/res/layout/dialog_purchase_content_gear.xml
index a09a1e971..35c5ef1f4 100644
--- a/Habitica/res/layout/dialog_purchase_content_gear.xml
+++ b/Habitica/res/layout/dialog_purchase_content_gear.xml
@@ -4,8 +4,8 @@
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingLeft="@dimen/shopitem_dialog_content_inset"
-    android:paddingRight="@dimen/shopitem_dialog_content_inset"
+    android:paddingStart="@dimen/shopitem_dialog_content_inset"
+    android:paddingEnd="@dimen/shopitem_dialog_content_inset"
     android:gravity="center_horizontal"
     tools:parentTag="LinearLayout"
     tools:orientation="vertical">
diff --git a/Habitica/res/layout/dialog_purchase_content_item.xml b/Habitica/res/layout/dialog_purchase_content_item.xml
index 8187ecda8..5ea517fa4 100644
--- a/Habitica/res/layout/dialog_purchase_content_item.xml
+++ b/Habitica/res/layout/dialog_purchase_content_item.xml
@@ -5,8 +5,8 @@
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingLeft="@dimen/shopitem_dialog_content_inset"
-    android:paddingRight="@dimen/shopitem_dialog_content_inset"
+    android:paddingStart="@dimen/shopitem_dialog_content_inset"
+    android:paddingEnd="@dimen/shopitem_dialog_content_inset"
     android:gravity="center_horizontal"
     tools:parentTag="LinearLayout"
     tools:orientation="vertical">
diff --git a/Habitica/res/layout/dialog_purchase_content_quest.xml b/Habitica/res/layout/dialog_purchase_content_quest.xml
index b6c71e056..0674ffabe 100644
--- a/Habitica/res/layout/dialog_purchase_content_quest.xml
+++ b/Habitica/res/layout/dialog_purchase_content_quest.xml
@@ -4,8 +4,8 @@
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingLeft="@dimen/shopitem_dialog_content_inset"
-    android:paddingRight="@dimen/shopitem_dialog_content_inset"
+    android:paddingStart="@dimen/shopitem_dialog_content_inset"
+    android:paddingEnd="@dimen/shopitem_dialog_content_inset"
     android:gravity="center_horizontal"
     tools:parentTag="LinearLayout"
     tools:orientation="vertical">
@@ -61,8 +61,8 @@
                 android:layout_height="wrap_content"
                 style="@style/Body2"
                 android:textColor="@color/white"
-                android:layout_marginLeft="16dp"
-                android:layout_marginRight="16dp"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp"
                 android:layout_marginTop="8dp"
                 android:layout_marginBottom="8dp"/>
             <TextView
@@ -87,8 +87,8 @@
                 android:layout_height="wrap_content"
                 style="@style/Body2"
                 android:textColor="@color/white"
-                android:layout_marginLeft="16dp"
-                android:layout_marginRight="16dp"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp"
                 android:layout_marginTop="8dp"
                 android:layout_marginBottom="8dp"/>
             <TextView
@@ -110,8 +110,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 style="@style/Body2"
-                android:layout_marginLeft="16dp"
-                android:layout_marginRight="16dp"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp"
                 android:layout_marginTop="8dp"
                 android:layout_marginBottom="8dp"/>
             <LinearLayout
@@ -137,15 +137,15 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     style="@style/Pill"
-                    android:gravity="right"
+                    android:gravity="end"
                     android:paddingBottom="2dp"
-                    android:paddingLeft="8dp"
-                    android:paddingRight="8dp"
+                    android:paddingStart="8dp"
+                    android:paddingEnd="8dp"
                     android:paddingTop="2dp"
                     android:text="@string/rage_meter"
                     android:visibility="gone"
                     tools:visibility="visible"
-                    android:layout_marginRight="8dp"/>
+                    android:layout_marginEnd="8dp"/>
             </LinearLayout>
         </TableRow>
     </TableLayout>
diff --git a/Habitica/res/layout/dialog_purchase_gems.xml b/Habitica/res/layout/dialog_purchase_gems.xml
index e54927633..0d92b8301 100644
--- a/Habitica/res/layout/dialog_purchase_gems.xml
+++ b/Habitica/res/layout/dialog_purchase_gems.xml
@@ -5,8 +5,8 @@
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingLeft="@dimen/shopitem_dialog_content_inset"
-    android:paddingRight="@dimen/shopitem_dialog_content_inset"
+    android:paddingStart="@dimen/shopitem_dialog_content_inset"
+    android:paddingEnd="@dimen/shopitem_dialog_content_inset"
     android:gravity="center_horizontal"
     tools:parentTag="LinearLayout"
     tools:background="?attr/colorContentBackground"
diff --git a/Habitica/res/layout/dialog_purchase_shopitem_button.xml b/Habitica/res/layout/dialog_purchase_shopitem_button.xml
index 69ef0af4a..06b572f86 100644
--- a/Habitica/res/layout/dialog_purchase_shopitem_button.xml
+++ b/Habitica/res/layout/dialog_purchase_shopitem_button.xml
@@ -7,8 +7,8 @@
     android:layout_height="40dp"
     android:gravity="center"
     android:background="@drawable/layout_rounded_bg_window"
-    android:paddingLeft="16dp"
-    android:paddingRight="16dp">
+    android:paddingStart="16dp"
+    android:paddingEnd="16dp">
     <TextView
         android:id="@+id/buy_label"
         android:layout_width="wrap_content"
diff --git a/Habitica/res/layout/dialog_purchase_shopitem_header.xml b/Habitica/res/layout/dialog_purchase_shopitem_header.xml
index 0c8e49c09..03a9d8c89 100644
--- a/Habitica/res/layout/dialog_purchase_shopitem_header.xml
+++ b/Habitica/res/layout/dialog_purchase_shopitem_header.xml
@@ -10,8 +10,8 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingLeft="12dp"
-        android:paddingRight="12dp"
+        android:paddingStart="12dp"
+        android:paddingEnd="12dp"
         android:background="@color/window_background"
         android:gravity="center_vertical">
         <LinearLayout
diff --git a/Habitica/res/layout/dialog_task_filter.xml b/Habitica/res/layout/dialog_task_filter.xml
index a28e3263d..62be5a5c1 100644
--- a/Habitica/res/layout/dialog_task_filter.xml
+++ b/Habitica/res/layout/dialog_task_filter.xml
@@ -37,8 +37,8 @@
                 android:layout_height="wrap_content"
                 android:text="@string/weak"
                 style="@style/TaskFilterRadioButton"
-                android:layout_marginLeft="8dp"
-                android:layout_marginRight="8dp" />
+                android:layout_marginStart="8dp"
+                android:layout_marginEnd="8dp" />
             <RadioButton
                 android:id="@+id/third_task_filter"
                 android:layout_width="wrap_content"
diff --git a/Habitica/res/layout/drawer_main_item.xml b/Habitica/res/layout/drawer_main_item.xml
index 231703746..9396c4a82 100644
--- a/Habitica/res/layout/drawer_main_item.xml
+++ b/Habitica/res/layout/drawer_main_item.xml
@@ -4,8 +4,8 @@
     android:orientation="horizontal"
     android:layout_width="match_parent"
     android:layout_height="48dp"
-    android:paddingLeft="@dimen/drawer_padding"
-    android:paddingRight="@dimen/drawer_padding"
+    android:paddingStart="@dimen/drawer_padding"
+    android:paddingEnd="@dimen/drawer_padding"
     android:gravity="center_vertical">
     <LinearLayout
         android:layout_width="0dp"
diff --git a/Habitica/res/layout/drawer_main_section_header.xml b/Habitica/res/layout/drawer_main_section_header.xml
index 3409fe581..da8bbd038 100644
--- a/Habitica/res/layout/drawer_main_section_header.xml
+++ b/Habitica/res/layout/drawer_main_section_header.xml
@@ -5,8 +5,8 @@
     android:layout_width="match_parent"
     android:layout_height="22dp"
     android:gravity="center_vertical"
-    android:paddingLeft="@dimen/drawer_padding"
-    android:paddingRight="@dimen/drawer_padding"
+    android:paddingStart="@dimen/drawer_padding"
+    android:paddingEnd="@dimen/drawer_padding"
     android:textAllCaps="true"
     android:textColor="@color/white"
     android:textSize="12sp"
diff --git a/Habitica/res/layout/edit_tag_item.xml b/Habitica/res/layout/edit_tag_item.xml
index 406269da6..3cf81763b 100644
--- a/Habitica/res/layout/edit_tag_item.xml
+++ b/Habitica/res/layout/edit_tag_item.xml
@@ -10,15 +10,15 @@
         android:layout_width="45dp"
         android:layout_height="wrap_content"
         android:padding="0dp"
-        android:drawableLeft="@drawable/ic_close_purple_300_36dp"
+        android:drawableStart="@drawable/ic_close_purple_300_36dp"
         style="@style/Base.Widget.AppCompat.Button.Borderless"/>
     <EditText
         android:id="@+id/edit_text"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:layout_marginLeft="8dp"
-        android:drawableRight="@drawable/ic_create_grey_400_18dp"
+        android:layout_marginStart="8dp"
+        android:drawableEnd="@drawable/ic_create_grey_400_18dp"
         tools:text="hello"
         style="@style/TagEditTextTheme"
         android:paddingBottom="14dp"
diff --git a/Habitica/res/layout/filter_menu_item.xml b/Habitica/res/layout/filter_menu_item.xml
index 2456ec557..f98d8e745 100644
--- a/Habitica/res/layout/filter_menu_item.xml
+++ b/Habitica/res/layout/filter_menu_item.xml
@@ -3,7 +3,7 @@
                 android:layout_width="48dp"
                 android:layout_height="48dp"
                 xmlns:tools="http://schemas.android.com/tools"
-                android:layout_gravity="right|end"
+                android:layout_gravity="end"
         tools:background="?colorPrimary"
                 android:clickable="true">
 
@@ -17,7 +17,7 @@
             android:id="@+id/badge_textview"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true"
             android:padding="4dp"
             tools:text="99"
             android:textColor="@color/white"
diff --git a/Habitica/res/layout/fragment_avatar_overview.xml b/Habitica/res/layout/fragment_avatar_overview.xml
index bd28cfe8f..f7fd6fdf5 100644
--- a/Habitica/res/layout/fragment_avatar_overview.xml
+++ b/Habitica/res/layout/fragment_avatar_overview.xml
@@ -41,10 +41,8 @@
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
-                        android:layout_marginStart="8dp"
-                        android:layout_marginLeft="8dp"
-                        android:layout_marginEnd="8dp"
-                        android:layout_marginRight="8dp"
+                        android:layout_marginStart="@dimen/spacing_medium"
+                        android:layout_marginEnd="@dimen/spacing_medium"
                         android:text="@string/avatar_size"
                         android:gravity="center_vertical"
                         android:textStyle="bold" />
diff --git a/Habitica/res/layout/fragment_challenge_detail.xml b/Habitica/res/layout/fragment_challenge_detail.xml
index 2fabe98b8..1bb240dbe 100644
--- a/Habitica/res/layout/fragment_challenge_detail.xml
+++ b/Habitica/res/layout/fragment_challenge_detail.xml
@@ -18,8 +18,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:paddingLeft="16dp"
-            android:paddingRight="16dp">
+            android:paddingStart="16dp"
+            android:paddingEnd="16dp">
             <com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
                 android:id="@+id/challenge_name"
                 android:layout_width="match_parent"
@@ -110,8 +110,8 @@
             android:id="@+id/join_button_wrapper"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingLeft="@dimen/spacing_large"
-            android:paddingRight="@dimen/spacing_large"
+            android:paddingStart="@dimen/spacing_large"
+            android:paddingEnd="@dimen/spacing_large"
             android:paddingTop="@dimen/spacing_medium"
             android:paddingBottom="@dimen/spacing_medium"
             android:background="?attr/colorContentBackground">
@@ -126,8 +126,8 @@
             android:id="@+id/challenge_creator_wrapper"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingLeft="@dimen/spacing_large"
-            android:paddingRight="@dimen/spacing_large"
+            android:paddingStart="@dimen/spacing_large"
+            android:paddingEnd="@dimen/spacing_large"
             android:paddingTop="@dimen/spacing_medium"
             android:paddingBottom="@dimen/spacing_medium"
             android:background="?attr/colorContentBackground"
@@ -136,7 +136,6 @@
                 android:layout_width="@dimen/avatar_chat_size"
                 android:layout_height="@dimen/avatar_chat_size"
                 android:clipChildren="true"
-                android:layout_marginRight="@dimen/spacing_medium"
                 android:layout_marginEnd="@dimen/spacing_medium"
                 android:background="@drawable/rounded_avatar_bg">
                 <com.habitrpg.android.habitica.ui.AvatarView
@@ -195,8 +194,8 @@
             android:id="@+id/leave_button_wrapper"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingLeft="@dimen/spacing_large"
-            android:paddingRight="@dimen/spacing_large"
+            android:paddingStart="@dimen/spacing_large"
+            android:paddingEnd="@dimen/spacing_large"
             android:paddingTop="@dimen/spacing_medium"
             android:paddingBottom="@dimen/spacing_large">
             <Button
diff --git a/Habitica/res/layout/fragment_challengeslist.xml b/Habitica/res/layout/fragment_challengeslist.xml
index 06763f8db..4f0cc63cb 100644
--- a/Habitica/res/layout/fragment_challengeslist.xml
+++ b/Habitica/res/layout/fragment_challengeslist.xml
@@ -16,8 +16,8 @@
             android:id="@+id/emptyView"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="48dp"
-            android:layout_marginRight="48dp"
+            android:layout_marginStart="48dp"
+            android:layout_marginEnd="48dp"
             android:layout_marginTop="32dp"
             android:orientation="vertical">
 
diff --git a/Habitica/res/layout/fragment_gem_purchase.xml b/Habitica/res/layout/fragment_gem_purchase.xml
index 6cf4ecb35..6aa011713 100644
--- a/Habitica/res/layout/fragment_gem_purchase.xml
+++ b/Habitica/res/layout/fragment_gem_purchase.xml
@@ -40,8 +40,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/gift_one_get_one_description"
-                android:layout_marginLeft="60dp"
-                android:layout_marginRight="60dp"
+                android:layout_marginStart="60dp"
+                android:layout_marginEnd="60dp"
                 android:gravity="center_horizontal"
                 android:textColor="@color/white"
                 android:textSize="16sp"
@@ -96,8 +96,8 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="60dp"
-                android:layout_marginRight="60dp"
+                android:layout_marginStart="60dp"
+                android:layout_marginEnd="60dp"
                 android:gravity="center_horizontal"
                 android:textColor="@color/white"
                 android:textSize="16sp"
@@ -187,8 +187,7 @@
                         android:layout_weight="1"
                         app:gemAmount="4"
                         app:gemDrawable="@drawable/gems_4"
-                        android:layout_marginRight="16dp"
-                        android:layout_marginEnd="16dp"
+                        android:layout_marginEnd="@dimen/spacing_large"
                         />
                     <com.habitrpg.android.habitica.ui.GemPurchaseOptionsView
                         android:id="@+id/gems_21_view"
@@ -212,8 +211,7 @@
                         android:layout_weight="1"
                         app:gemAmount="42"
                         app:gemDrawable="@drawable/gems_42"
-                        android:layout_marginRight="16dp"
-                        android:layout_marginEnd="16dp" />
+                        android:layout_marginEnd="@dimen/spacing_large" />
                     <com.habitrpg.android.habitica.ui.GemPurchaseOptionsView
                         android:id="@+id/gems_84_view"
                         android:layout_width="0dp"
@@ -237,8 +235,8 @@
                 android:textColor="@color/text_quad"
                 android:text="@string/gems_gift_description"
                 android:gravity="center_horizontal"
-                android:layout_marginLeft="@dimen/spacing_large"
-                android:layout_marginRight="@dimen/spacing_large"/>
+                android:layout_marginStart="@dimen/spacing_large"
+                android:layout_marginEnd="@dimen/spacing_large"/>
             <Button
                 android:id="@+id/gift_gems_button"
                 android:layout_width="match_parent"
@@ -252,8 +250,8 @@
         <TextView android:id="@+id/supportTextView"
             android:layout_height="wrap_content"
             android:layout_width="wrap_content"
-            android:paddingLeft="41dp"
-            android:paddingRight="41dp"
+            android:paddingStart="41dp"
+            android:paddingEnd="41dp"
             android:paddingBottom="20dp"
             android:paddingTop="20dp"
             android:text="@string/gem_purchase_title"
diff --git a/Habitica/res/layout/fragment_gift_gem_balance.xml b/Habitica/res/layout/fragment_gift_gem_balance.xml
index a32848233..1bc91a3c7 100644
--- a/Habitica/res/layout/fragment_gift_gem_balance.xml
+++ b/Habitica/res/layout/fragment_gift_gem_balance.xml
@@ -39,8 +39,8 @@
             android:gravity="center_horizontal"
             android:text="@string/gift_gems_balance_subtitle"
             android:textColor="@color/text_quad"
-            android:layout_marginLeft="@dimen/spacing_large"
-            android:layout_marginRight="@dimen/spacing_large"
+            android:layout_marginStart="@dimen/spacing_large"
+            android:layout_marginEnd="@dimen/spacing_large"
             android:layout_marginBottom="@dimen/spacing_large"/>
         <com.google.android.material.textfield.TextInputLayout
             android:layout_width="match_parent"
diff --git a/Habitica/res/layout/fragment_gift_gem_purchase.xml b/Habitica/res/layout/fragment_gift_gem_purchase.xml
index 15750d859..3f2db96f0 100644
--- a/Habitica/res/layout/fragment_gift_gem_purchase.xml
+++ b/Habitica/res/layout/fragment_gift_gem_purchase.xml
@@ -39,8 +39,8 @@
             android:gravity="center_horizontal"
             android:text="@string/gift_gems_subtitle"
             android:textColor="@color/text_quad"
-            android:layout_marginLeft="@dimen/spacing_large"
-            android:layout_marginRight="@dimen/spacing_large"
+            android:layout_marginStart="@dimen/spacing_large"
+            android:layout_marginEnd="@dimen/spacing_large"
             android:layout_marginBottom="@dimen/spacing_large"/>
         <LinearLayout
             android:layout_width="match_parent"
diff --git a/Habitica/res/layout/fragment_guild_detail.xml b/Habitica/res/layout/fragment_guild_detail.xml
index a17f79d4b..ca853b8c8 100644
--- a/Habitica/res/layout/fragment_guild_detail.xml
+++ b/Habitica/res/layout/fragment_guild_detail.xml
@@ -35,11 +35,11 @@
                     android:layout_weight="1"
                     android:layout_height="60dp"
                     android:background="@drawable/layout_rounded_bg_window"
-                    android:layout_marginRight="@dimen/spacing_large"
+                    android:layout_marginEnd="@dimen/spacing_large"
                     android:paddingTop="@dimen/spacing_small"
                     android:paddingBottom="@dimen/spacing_small"
-                    android:paddingLeft="@dimen/spacing_medium"
-                    android:paddingRight="@dimen/spacing_medium"
+                    android:paddingStart="@dimen/spacing_medium"
+                    android:paddingEnd="@dimen/spacing_medium"
                     android:orientation="vertical"
                     android:gravity="center">
                     <LinearLayout
@@ -50,7 +50,7 @@
                             android:id="@+id/guild_members_icon"
                             android:layout_width="23dp"
                             android:layout_height="23dp"
-                            android:layout_marginRight="@dimen/spacing_medium"/>
+                            android:layout_marginEnd="@dimen/spacing_medium"/>
                         <TextView
                             android:id="@+id/guild_members_text"
                             android:layout_width="wrap_content"
@@ -71,8 +71,8 @@
                     android:background="@drawable/layout_rounded_bg_window"
                     android:paddingTop="@dimen/spacing_small"
                     android:paddingBottom="@dimen/spacing_small"
-                    android:paddingLeft="@dimen/spacing_medium"
-                    android:paddingRight="@dimen/spacing_medium"
+                    android:paddingStart="@dimen/spacing_medium"
+                    android:paddingEnd="@dimen/spacing_medium"
                     android:orientation="vertical"
                     android:gravity="center">
                     <LinearLayout
@@ -83,7 +83,7 @@
                             android:id="@+id/guild_bank_icon"
                             android:layout_width="23dp"
                             android:layout_height="23dp"
-                            android:layout_marginRight="@dimen/spacing_medium"/>
+                            android:layout_marginEnd="@dimen/spacing_medium"/>
                         <TextView
                             android:id="@+id/guild_bank_text"
                             android:layout_width="wrap_content"
@@ -148,7 +148,7 @@
                         android:layout_width="40dp"
                         android:layout_height="40dp"
                         android:clipChildren="true"
-                        android:layout_marginRight="@dimen/spacing_large"
+                        android:layout_marginEnd="@dimen/spacing_large"
                         android:background="@drawable/rounded_avatar_bg">
                         <com.habitrpg.android.habitica.ui.AvatarView
                             android:id="@+id/leader_avatar_view"
diff --git a/Habitica/res/layout/fragment_no_party.xml b/Habitica/res/layout/fragment_no_party.xml
index ddd189e77..0b8b3bef9 100644
--- a/Habitica/res/layout/fragment_no_party.xml
+++ b/Habitica/res/layout/fragment_no_party.xml
@@ -75,8 +75,8 @@
                         android:text="@string/no_party_description"
                         android:textColor="@color/text_quad"
                         android:gravity="center"
-                        android:layout_marginLeft="@dimen/spacing_large"
-                        android:layout_marginRight="@dimen/spacing_large"/>
+                        android:layout_marginStart="@dimen/spacing_large"
+                        android:layout_marginEnd="@dimen/spacing_large"/>
                     <Button
                         android:id="@+id/createPartyButton"
                         android:layout_width="match_parent"
@@ -107,8 +107,8 @@
                         android:text="@string/join_party_description"
                         android:textColor="@color/text_quad"
                         android:gravity="center"
-                        android:layout_marginLeft="@dimen/spacing_large"
-                        android:layout_marginRight="@dimen/spacing_large"/>
+                        android:layout_marginStart="@dimen/spacing_large"
+                        android:layout_marginEnd="@dimen/spacing_large"/>
 
                     <Button
                         android:id="@+id/username_textview"
diff --git a/Habitica/res/layout/fragment_party_invite.xml b/Habitica/res/layout/fragment_party_invite.xml
index b178867f4..a0db51860 100644
--- a/Habitica/res/layout/fragment_party_invite.xml
+++ b/Habitica/res/layout/fragment_party_invite.xml
@@ -19,14 +19,14 @@
         android:layout_height="wrap_content"
         android:orientation="vertical"
         android:clickable="false"
-        android:layout_marginLeft="@dimen/row_padding"
-        android:layout_marginRight="@dimen/row_padding" />
+        android:layout_marginStart="@dimen/row_padding"
+        android:layout_marginEnd="@dimen/row_padding" />
 
     <Button
         android:id="@+id/addInviteButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="right"
+        android:layout_gravity="end"
         android:text="@string/add_invites"
         android:layout_margin="@dimen/row_padding" />
 </LinearLayout>
diff --git a/Habitica/res/layout/fragment_promo_info.xml b/Habitica/res/layout/fragment_promo_info.xml
index 9c774442c..e6921d4a1 100644
--- a/Habitica/res/layout/fragment_promo_info.xml
+++ b/Habitica/res/layout/fragment_promo_info.xml
@@ -60,8 +60,8 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="60dp"
-                android:layout_marginRight="60dp"
+                android:layout_marginStart="60dp"
+                android:layout_marginEnd="60dp"
                 android:gravity="center_horizontal"
                 android:textColor="@color/white"
                 android:textSize="16sp"
diff --git a/Habitica/res/layout/fragment_quest_detail.xml b/Habitica/res/layout/fragment_quest_detail.xml
index 750a4de51..cb551814a 100644
--- a/Habitica/res/layout/fragment_quest_detail.xml
+++ b/Habitica/res/layout/fragment_quest_detail.xml
@@ -13,8 +13,8 @@
             android:background="@color/content_background"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingLeft="@dimen/content_border"
-            android:paddingRight="@dimen/content_border"
+            android:paddingStart="@dimen/content_border"
+            android:paddingEnd="@dimen/content_border"
             android:paddingTop="12dp"
             android:paddingBottom="12dp"
             >
@@ -55,8 +55,8 @@
             android:layout_height="wrap_content"
             android:orientation="vertical"
             android:paddingTop="12dp"
-            android:paddingLeft="@dimen/content_border"
-            android:paddingRight="@dimen/content_border"
+            android:paddingStart="@dimen/content_border"
+            android:paddingEnd="@dimen/content_border"
             android:paddingBottom="12dp">
             <TextView
                 android:layout_width="match_parent"
@@ -88,7 +88,7 @@
                     style="@style/Body1"
                     tools:text="3"
                     android:textColor="@color/text_quad"
-                    android:layout_marginLeft="6dp"/>
+                    android:layout_marginStart="6dp"/>
             </LinearLayout>
             <LinearLayout
                 android:id="@+id/quest_participant_list"
@@ -115,7 +115,7 @@
                 android:layout_height="wrap_content"
                 android:text="@string/quest_accept"
                 style="@style/HabiticaButton.Green"
-                android:layout_marginRight="16dp" />
+                android:layout_marginEnd="16dp" />
 
             <Button
                 android:id="@+id/quest_reject_button"
@@ -139,7 +139,7 @@
                 android:layout_height="wrap_content"
                 android:text="@string/quest_begin"
                 style="@style/HabiticaButton.Yellow"
-                android:layout_marginRight="16dp" />
+                android:layout_marginEnd="16dp" />
 
             <Button
                 android:id="@+id/quest_cancel_button"
diff --git a/Habitica/res/layout/fragment_setup_avatar.xml b/Habitica/res/layout/fragment_setup_avatar.xml
index 3a8f8d8d0..718f1d1c1 100644
--- a/Habitica/res/layout/fragment_setup_avatar.xml
+++ b/Habitica/res/layout/fragment_setup_avatar.xml
@@ -46,8 +46,8 @@
         android:layout_height="wrap_content"
         app:namePlate="Justin"
         app:npcDrawable="@drawable/justin_textbox"
-        android:layout_marginLeft="@dimen/content_inset"
-        android:layout_marginRight="@dimen/content_inset"
+        android:layout_marginStart="@dimen/content_inset"
+        android:layout_marginEnd="@dimen/content_inset"
         android:layout_marginBottom="12dp"/>
 
     <com.habitrpg.android.habitica.ui.views.setup.AvatarCustomizationDrawer
diff --git a/Habitica/res/layout/fragment_setup_tasks.xml b/Habitica/res/layout/fragment_setup_tasks.xml
index 682141211..9d09bae62 100644
--- a/Habitica/res/layout/fragment_setup_tasks.xml
+++ b/Habitica/res/layout/fragment_setup_tasks.xml
@@ -45,8 +45,8 @@
         android:layout_height="wrap_content"
         app:namePlate="Justin"
         app:npcDrawable="@drawable/justin_textbox"
-        android:layout_marginLeft="@dimen/content_inset"
-        android:layout_marginRight="@dimen/content_inset"
+        android:layout_marginStart="@dimen/content_inset"
+        android:layout_marginEnd="@dimen/content_inset"
         android:layout_marginBottom="12dp"/>
     <androidx.recyclerview.widget.RecyclerView
             android:layout_width="match_parent"
diff --git a/Habitica/res/layout/fragment_stats.xml b/Habitica/res/layout/fragment_stats.xml
index 40d8f33f2..d8d7bc6f9 100644
--- a/Habitica/res/layout/fragment_stats.xml
+++ b/Habitica/res/layout/fragment_stats.xml
@@ -31,8 +31,8 @@
                 android:id="@+id/numberOfPointsTextView"
                 android:layout_width="wrap_content"
                 android:layout_height="36dp"
-                android:layout_marginLeft="12dp"
-                android:layout_marginRight="12dp"
+                android:layout_marginStart="12dp"
+                android:layout_marginEnd="12dp"
                 android:gravity="center"/>
             <ImageView
                 android:id="@+id/rightSparklesView"
@@ -86,15 +86,15 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/auto_allocate_points"
-            android:layout_marginLeft="@dimen/content_border"
-            android:layout_marginRight="@dimen/content_border"
+            android:layout_marginStart="@dimen/content_border"
+            android:layout_marginEnd="@dimen/content_border"
             android:layout_marginBottom="20dp"/>
         <LinearLayout
             android:id="@+id/autoAllocationModeWrapper"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingLeft="@dimen/content_border"
-            android:paddingRight="@dimen/content_border"
+            android:paddingStart="@dimen/content_border"
+            android:paddingEnd="@dimen/content_border"
             android:background="@color/window_background"
             android:paddingTop="16dp"
             android:paddingBottom="16dp"
@@ -158,8 +158,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/content_border"
-            android:layout_marginRight="@dimen/content_border"
+            android:layout_marginStart="@dimen/content_border"
+            android:layout_marginEnd="@dimen/content_border"
             android:orientation="vertical">
             <TextView
                 android:layout_width="match_parent"
diff --git a/Habitica/res/layout/fragment_subscription.xml b/Habitica/res/layout/fragment_subscription.xml
index 723b4eb5d..3ee16e3ab 100644
--- a/Habitica/res/layout/fragment_subscription.xml
+++ b/Habitica/res/layout/fragment_subscription.xml
@@ -47,8 +47,8 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/gift_one_get_one_description"
-                    android:layout_marginLeft="60dp"
-                    android:layout_marginRight="60dp"
+                    android:layout_marginStart="60dp"
+                    android:layout_marginEnd="60dp"
                     android:gravity="center_horizontal"
                     android:textColor="@color/white"
                     android:textSize="16sp"
@@ -342,8 +342,8 @@
                 android:textColor="@color/text_quad"
                 android:text="@string/subscribe_gift_description"
                 android:gravity="center_horizontal"
-                android:layout_marginLeft="@dimen/spacing_large"
-                android:layout_marginRight="@dimen/spacing_large"/>
+                android:layout_marginStart="@dimen/spacing_large"
+                android:layout_marginEnd="@dimen/spacing_large"/>
             <Button
                 android:id="@+id/gift_subscription_button"
                 android:layout_width="match_parent"
@@ -360,8 +360,8 @@
             <TextView android:id="@+id/supportTextView"
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content"
-                android:paddingLeft="16dp"
-                android:paddingRight="16dp"
+                android:paddingStart="16dp"
+                android:paddingEnd="16dp"
                 android:paddingTop="16dp"
                 android:paddingBottom="16dp"
                 android:text="@string/subscribe_title"
diff --git a/Habitica/res/layout/fragment_support_bug_fix.xml b/Habitica/res/layout/fragment_support_bug_fix.xml
index fd64224b6..f4e2ef640 100644
--- a/Habitica/res/layout/fragment_support_bug_fix.xml
+++ b/Habitica/res/layout/fragment_support_bug_fix.xml
@@ -24,8 +24,8 @@
         android:padding="19dp"
         android:orientation="vertical"
         android:background="@drawable/layout_rounded_bg_window"
-        android:layout_marginLeft="@dimen/spacing_medium"
-        android:layout_marginRight="@dimen/spacing_medium"
+        android:layout_marginStart="@dimen/spacing_medium"
+        android:layout_marginEnd="@dimen/spacing_medium"
         android:layout_marginBottom="@dimen/spacing_medium">
         <TextView
             android:layout_width="wrap_content"
@@ -46,8 +46,8 @@
         android:padding="19dp"
         android:orientation="vertical"
         android:background="@drawable/layout_rounded_bg_window"
-        android:layout_marginLeft="@dimen/spacing_medium"
-        android:layout_marginRight="@dimen/spacing_medium"
+        android:layout_marginStart="@dimen/spacing_medium"
+        android:layout_marginEnd="@dimen/spacing_medium"
         android:layout_marginBottom="@dimen/spacing_medium">
         <TextView
             android:layout_width="wrap_content"
@@ -68,8 +68,8 @@
         android:padding="19dp"
         android:orientation="vertical"
         android:background="@drawable/layout_rounded_bg_window"
-        android:layout_marginLeft="@dimen/spacing_medium"
-        android:layout_marginRight="@dimen/spacing_medium"
+        android:layout_marginStart="@dimen/spacing_medium"
+        android:layout_marginEnd="@dimen/spacing_medium"
         android:layout_marginBottom="@dimen/spacing_medium">
         <TextView
             android:layout_width="wrap_content"
diff --git a/Habitica/res/layout/fragment_welcome.xml b/Habitica/res/layout/fragment_welcome.xml
index ced1c5a45..d10f6ce08 100644
--- a/Habitica/res/layout/fragment_welcome.xml
+++ b/Habitica/res/layout/fragment_welcome.xml
@@ -10,8 +10,8 @@
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingLeft="@dimen/spacing_large"
-    android:paddingRight="@dimen/spacing_large"
+    android:paddingStart="@dimen/spacing_large"
+    android:paddingEnd="@dimen/spacing_large"
     android:paddingTop="32dp"
     android:paddingBottom="16dp">
 
@@ -42,9 +42,9 @@
             <TextView
                 android:layout_height="42dp"
                 android:text="@string/display_name"
-                android:paddingLeft="@dimen/spacing_medium"
-                android:paddingRight="@dimen/spacing_medium"
-                android:layout_marginLeft="1dp"
+                android:paddingStart="@dimen/spacing_medium"
+                android:paddingEnd="@dimen/spacing_medium"
+                android:layout_marginStart="1dp"
                 android:background="@color/setup_label_background"
                 android:gravity="center_vertical"
                 android:textSize="14sp"
@@ -55,8 +55,8 @@
             <EditText android:id="@+id/display_name_edit_text"
                 android:background="@color/transparent"
                 android:layout_height="42dp"
-                android:layout_marginLeft="@dimen/spacing_large"
-                android:layout_marginRight="@dimen/spacing_large"
+                android:layout_marginStart="@dimen/spacing_large"
+                android:layout_marginEnd="@dimen/spacing_large"
                 android:textSize="14sp"
                 android:lines="1"/>
         </TableRow>
@@ -69,17 +69,17 @@
             <TextView android:text="@string/username"
                 android:background="@color/setup_label_background"
                 android:layout_height="41dp"
-                android:paddingLeft="@dimen/spacing_medium"
-                android:paddingRight="@dimen/spacing_medium"
-                android:layout_marginLeft="1dp"
+                android:paddingStart="@dimen/spacing_medium"
+                android:paddingEnd="@dimen/spacing_medium"
+                android:layout_marginStart="1dp"
                 android:gravity="center_vertical"
                 android:textSize="14sp"/>
             <View android:background="@color/offset_background"
                 android:layout_width="1dp"
                 android:layout_height="42dp"/>
             <LinearLayout
-                android:layout_marginLeft="@dimen/spacing_large"
-                android:layout_marginRight="@dimen/spacing_large">
+                android:layout_marginStart="@dimen/spacing_large"
+                android:layout_marginEnd="@dimen/spacing_large">
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
@@ -92,7 +92,7 @@
                     android:layout_width="0dp"
                     android:layout_weight="1"
                     android:layout_height="42dp"
-                    android:layout_marginLeft="@dimen/spacing_small"
+                    android:layout_marginStart="@dimen/spacing_small"
                     android:lines="1"
                     android:textSize="14sp"/>
             </LinearLayout>
diff --git a/Habitica/res/layout/gear_list_item.xml b/Habitica/res/layout/gear_list_item.xml
index 9970ac65d..dd246d56e 100644
--- a/Habitica/res/layout/gear_list_item.xml
+++ b/Habitica/res/layout/gear_list_item.xml
@@ -12,7 +12,7 @@
         android:id="@+id/gear_icon_background_view"
         android:layout_width="80dp"
         android:layout_height="80dp"
-        android:layout_marginRight="@dimen/row_padding">
+        android:layout_marginEnd="@dimen/row_padding">
         <com.facebook.drawee.view.SimpleDraweeView
             android:layout_width="@dimen/gear_image_size"
             android:layout_height="@dimen/gear_image_size"
@@ -62,13 +62,13 @@
                 android:text="@string/equipment_str"
                 android:textSize="14sp"
                 android:textColor="@color/text_ternary"
-                android:layout_marginRight="5dp"/>
+                android:layout_marginEnd="5dp"/>
             <TextView
                 android:id="@+id/str_value"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 tools:text="+1"
-                android:layout_marginRight="10dp"
+                android:layout_marginEnd="10dp"
                 android:textColor="@color/green_50"/>
             <TextView
                 android:id="@+id/con_label"
@@ -77,13 +77,13 @@
                 android:text="@string/equipment_con"
                 android:textSize="14sp"
                 android:textColor="@color/text_ternary"
-                android:layout_marginRight="5dp"/>
+                android:layout_marginEnd="5dp"/>
             <TextView
                 android:id="@+id/con_value"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 tools:text="+1"
-                android:layout_marginRight="10dp"
+                android:layout_marginEnd="10dp"
                 android:textColor="@color/green_50"/>
             <TextView
                 android:id="@+id/int_label"
@@ -92,13 +92,13 @@
                 android:text="@string/equipment_int"
                 android:textSize="14sp"
                 android:textColor="@color/text_ternary"
-                android:layout_marginRight="5dp"/>
+                android:layout_marginEnd="5dp"/>
             <TextView
                 android:id="@+id/int_value"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 tools:text="+1"
-                android:layout_marginRight="10dp"
+                android:layout_marginEnd="10dp"
                 android:textColor="@color/green_50"/>
             <TextView
                 android:id="@+id/per_label"
@@ -107,13 +107,13 @@
                 android:text="@string/equipment_per"
                 android:textSize="14sp"
                 android:textColor="@color/text_ternary"
-                android:layout_marginRight="5dp"/>
+                android:layout_marginEnd="5dp"/>
             <TextView
                 android:id="@+id/per_value"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 tools:text="+1"
-                android:layout_marginRight="10dp"
+                android:layout_marginEnd="10dp"
                 android:textColor="@color/green_50"/>
         </com.nex3z.flowlayout.FlowLayout>
     </LinearLayout>
diff --git a/Habitica/res/layout/habit_item_card.xml b/Habitica/res/layout/habit_item_card.xml
index bf8e89f7c..cad719f37 100644
--- a/Habitica/res/layout/habit_item_card.xml
+++ b/Habitica/res/layout/habit_item_card.xml
@@ -48,8 +48,8 @@
             android:layout_width="20dp"
             android:layout_height="20dp"
             android:layout_gravity="center_vertical"
-            android:layout_marginLeft="@dimen/spacing_small"
-            android:layout_marginRight="@dimen/spacing_small"
+            android:layout_marginStart="@dimen/spacing_small"
+            android:layout_marginEnd="@dimen/spacing_small"
             style="@style/Widget.AppCompat.ProgressBar"/>
         <ImageButton
             android:id="@+id/error_icon"
@@ -58,8 +58,8 @@
             android:layout_gravity="center_vertical"
             android:background="@color/transparent"
             android:src="@drawable/ic_warning_black"
-            android:layout_marginLeft="@dimen/spacing_small"
-            android:layout_marginRight="@dimen/spacing_small"/>
+            android:layout_marginStart="@dimen/spacing_small"
+            android:layout_marginEnd="@dimen/spacing_small"/>
         <FrameLayout
             android:id="@+id/btnMinusWrapper"
             android:layout_width="@dimen/button_width"
diff --git a/Habitica/res/layout/help_header.xml b/Habitica/res/layout/help_header.xml
index f23b645c4..322510273 100644
--- a/Habitica/res/layout/help_header.xml
+++ b/Habitica/res/layout/help_header.xml
@@ -7,8 +7,8 @@
     android:background="@color/window_background"
     android:paddingTop="@dimen/spacing_large"
     android:paddingBottom="@dimen/spacing_large"
-    android:paddingLeft="@dimen/spacing_large"
-    android:paddingRight="@dimen/spacing_large">
+    android:paddingStart="@dimen/spacing_large"
+    android:paddingEnd="@dimen/spacing_large">
 <TextView
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/Habitica/res/layout/item_inbox_overview.xml b/Habitica/res/layout/item_inbox_overview.xml
index 9b2ff5d01..16864d5ff 100644
--- a/Habitica/res/layout/item_inbox_overview.xml
+++ b/Habitica/res/layout/item_inbox_overview.xml
@@ -10,7 +10,6 @@
         android:layout_width="@dimen/avatar_chat_size"
         android:layout_height="@dimen/avatar_chat_size"
         android:clipChildren="true"
-        android:layout_marginRight="@dimen/spacing_medium"
         android:layout_marginEnd="@dimen/spacing_medium"
         android:background="@drawable/rounded_avatar_bg">
         <com.habitrpg.android.habitica.ui.AvatarView
@@ -26,7 +25,7 @@
         android:layout_weight="1"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:paddingLeft="@dimen/spacing_medium">
+        android:paddingStart="@dimen/spacing_medium">
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/Habitica/res/layout/item_item.xml b/Habitica/res/layout/item_item.xml
index 6a24a14f3..a237ebeae 100644
--- a/Habitica/res/layout/item_item.xml
+++ b/Habitica/res/layout/item_item.xml
@@ -11,7 +11,7 @@
         android:layout_width="@dimen/gear_image_size"
         android:layout_height="@dimen/gear_image_size"
         bind:actualImageScaleType="fitCenter"
-        android:layout_marginRight="@dimen/row_padding"/>
+        android:layout_marginEnd="@dimen/row_padding"/>
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/Habitica/res/layout/no_notifications.xml b/Habitica/res/layout/no_notifications.xml
index 13ec53a0e..1e43abf54 100644
--- a/Habitica/res/layout/no_notifications.xml
+++ b/Habitica/res/layout/no_notifications.xml
@@ -5,9 +5,9 @@
     android:layout_height="wrap_content"
     android:layout_weight="1"
     android:orientation="vertical"
-    android:paddingLeft="@dimen/spacing_medium"
+    android:paddingStart="@dimen/spacing_medium"
     android:paddingTop="44dp"
-    android:paddingRight="@dimen/spacing_medium">
+    android:paddingEnd="@dimen/spacing_medium">
         <ImageView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -20,9 +20,9 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:paddingLeft="40dp"
+            android:paddingStart="40dp"
             android:paddingTop="26dp"
-            android:paddingRight="40dp">
+            android:paddingEnd="40dp">
 
             <TextView
                 style="@style/SectionTitle"
diff --git a/Habitica/res/layout/notification_item.xml b/Habitica/res/layout/notification_item.xml
index e66f0ff02..ed380b90a 100644
--- a/Habitica/res/layout/notification_item.xml
+++ b/Habitica/res/layout/notification_item.xml
@@ -5,16 +5,16 @@
     android:layout_height="wrap_content"
     android:background="?attr/colorContentBackground"
     android:orientation="horizontal"
-    android:paddingLeft="20dp"
+    android:paddingStart="20dp"
     android:paddingTop="10dp"
-    android:paddingRight="20dp"
+    android:paddingEnd="20dp"
     android:paddingBottom="10dp">
 
     <ImageView
         android:id="@+id/notification_image"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginRight="20dp"
+        android:layout_marginEnd="20dp"
         android:background="@color/transparent"
         android:visibility="gone" />
 
@@ -32,7 +32,7 @@
         android:id="@+id/dismiss_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="10dp"
+        android:layout_marginStart="10dp"
         android:background="@color/transparent"
         android:clickable="true"
         android:focusable="true"
diff --git a/Habitica/res/layout/notification_item_actionable.xml b/Habitica/res/layout/notification_item_actionable.xml
index 37bb9c8f8..fbb2bc48e 100644
--- a/Habitica/res/layout/notification_item_actionable.xml
+++ b/Habitica/res/layout/notification_item_actionable.xml
@@ -6,9 +6,9 @@
     android:layout_height="wrap_content"
     android:background="@color/content_background"
     android:orientation="vertical"
-    android:paddingLeft="20dp"
+    android:paddingStart="20dp"
     android:paddingTop="10dp"
-    android:paddingRight="20dp"
+    android:paddingEnd="20dp"
     android:paddingBottom="10dp">
 
     <TextView
@@ -41,7 +41,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="4dp"
-                android:layout_marginRight="8dp"
+                android:layout_marginEnd="8dp"
                 android:layout_marginBottom="4dp"
                 android:textStyle="bold"
                 tools:text="Collect:" />
@@ -65,7 +65,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="4dp"
-                android:layout_marginRight="8dp"
+                android:layout_marginEnd="8dp"
                 android:layout_marginBottom="4dp"
                 android:textStyle="bold"
                 tools:text="Difficulty:" />
@@ -100,7 +100,7 @@
             style="@style/HabiticaButton.Red.Small"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginRight="16dp"
+            android:layout_marginEnd="16dp"
             android:layout_weight="1"
             android:text="@string/quest_reject" />
 
diff --git a/Habitica/res/layout/notifications_header.xml b/Habitica/res/layout/notifications_header.xml
index 4c620d31f..07095b0f6 100644
--- a/Habitica/res/layout/notifications_header.xml
+++ b/Habitica/res/layout/notifications_header.xml
@@ -5,9 +5,9 @@
     android:layout_height="wrap_content"
     android:background="?attr/colorContentBackground"
     android:orientation="horizontal"
-    android:paddingLeft="20dp"
+    android:paddingStart="20dp"
     android:paddingTop="10dp"
-    android:paddingRight="20dp">
+    android:paddingEnd="20dp">
 
     <LinearLayout
         android:layout_width="0dp"
diff --git a/Habitica/res/layout/overlay_tutorial.xml b/Habitica/res/layout/overlay_tutorial.xml
index 54cd2972b..3105a033c 100644
--- a/Habitica/res/layout/overlay_tutorial.xml
+++ b/Habitica/res/layout/overlay_tutorial.xml
@@ -12,8 +12,8 @@
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingLeft="16dp"
-        android:paddingRight="16dp"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
         android:paddingBottom="24dp"
         android:layout_alignParentBottom="true"
                 android:layout_marginBottom="?actionBarSize">
diff --git a/Habitica/res/layout/party_member.xml b/Habitica/res/layout/party_member.xml
index 6b96bfc89..d97cd3f45 100644
--- a/Habitica/res/layout/party_member.xml
+++ b/Habitica/res/layout/party_member.xml
@@ -39,7 +39,7 @@
                 android:background="@color/transparent"
                 android:layout_width="30dp"
                 android:layout_height="20dp"
-                android:layout_gravity="right"/>
+                android:layout_gravity="end"/>
         </LinearLayout>
         <TableLayout
             android:layout_width="match_parent"
diff --git a/Habitica/res/layout/preference_category.xml b/Habitica/res/layout/preference_category.xml
index 5805c6e47..fdc32e531 100644
--- a/Habitica/res/layout/preference_category.xml
+++ b/Habitica/res/layout/preference_category.xml
@@ -22,7 +22,7 @@
     android:textSize="12sp"
     android:background="@color/transparent"
     android:textColor="@color/text_quad"
-    android:paddingLeft="32dip"
-    android:paddingRight="32dip"
+    android:paddingStart="32dip"
+    android:paddingEnd="32dip"
     android:paddingTop="16dip"
     tools:text="Title" />
\ No newline at end of file
diff --git a/Habitica/res/layout/preference_child_summary.xml b/Habitica/res/layout/preference_child_summary.xml
index b4467e44c..316de8c53 100644
--- a/Habitica/res/layout/preference_child_summary.xml
+++ b/Habitica/res/layout/preference_child_summary.xml
@@ -8,16 +8,16 @@
     android:baselineAligned="false"
     android:gravity="center_vertical"
     android:minHeight="?android:attr/listPreferredItemHeight"
-    android:paddingRight="16dip"
-    android:paddingLeft="16dip"
+    android:paddingEnd="16dip"
+    android:paddingStart="16dip"
     android:orientation="horizontal">
 
 <RelativeLayout
     android:layout_width="0dip"
     android:layout_height="wrap_content"
     android:layout_marginBottom="6dip"
-    android:layout_marginLeft="16dip"
-    android:layout_marginRight="6dip"
+    android:layout_marginStart="16dip"
+    android:layout_marginEnd="6dip"
     android:layout_marginTop="6dip"
     android:layout_weight="1" >
 
@@ -47,5 +47,5 @@
         android:layout_height="match_parent"
         android:gravity="center_vertical"
         android:orientation="vertical"
-        android:paddingLeft="16dp" />
+        android:paddingStart="16dp" />
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/preference_child_summary_error.xml b/Habitica/res/layout/preference_child_summary_error.xml
index 2d67c295a..ded60fe4e 100644
--- a/Habitica/res/layout/preference_child_summary_error.xml
+++ b/Habitica/res/layout/preference_child_summary_error.xml
@@ -7,16 +7,16 @@
     android:baselineAligned="false"
     android:gravity="center_vertical"
     android:minHeight="?android:attr/listPreferredItemHeight"
-    android:paddingRight="16dip"
-    android:paddingLeft="16dip"
+    android:paddingEnd="16dip"
+    android:paddingStart="16dip"
     android:orientation="horizontal">
 
     <RelativeLayout
         android:layout_width="0dip"
         android:layout_height="wrap_content"
         android:layout_marginBottom="6dip"
-        android:layout_marginLeft="15dip"
-        android:layout_marginRight="6dip"
+        android:layout_marginStart="15dip"
+        android:layout_marginEnd="6dip"
         android:layout_marginTop="6dip"
         android:layout_weight="1" >
 
@@ -45,5 +45,5 @@
         android:layout_height="match_parent"
         android:gravity="center_vertical"
         android:orientation="vertical"
-        android:paddingLeft="16dp" />
+        android:paddingStart="16dp" />
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/profile_achievement_category.xml b/Habitica/res/layout/profile_achievement_category.xml
index 375dea27c..e1f9948f2 100644
--- a/Habitica/res/layout/profile_achievement_category.xml
+++ b/Habitica/res/layout/profile_achievement_category.xml
@@ -9,8 +9,8 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom"
-        android:layout_marginLeft="@dimen/section_leftright_padding"
-        android:layout_marginRight="@dimen/section_leftright_padding"
+        android:layout_marginStart="@dimen/section_leftright_padding"
+        android:layout_marginEnd="@dimen/section_leftright_padding"
         android:layout_weight="1"
         android:textAppearance="?android:attr/textAppearanceMedium" />
 
diff --git a/Habitica/res/layout/profile_achievement_item.xml b/Habitica/res/layout/profile_achievement_item.xml
index 084378710..79597d434 100644
--- a/Habitica/res/layout/profile_achievement_item.xml
+++ b/Habitica/res/layout/profile_achievement_item.xml
@@ -26,8 +26,8 @@
             android:layout_gravity="bottom|end"
             tools:text="2"
             android:background="@drawable/layout_rounded_bg_primary"
-            android:paddingLeft="2dp"
-            android:paddingRight="2dp"
+            android:paddingStart="2dp"
+            android:paddingEnd="2dp"
             android:textSize="12sp"
             android:textColor="@color/white" />
     </FrameLayout>
diff --git a/Habitica/res/layout/quest_menu_view.xml b/Habitica/res/layout/quest_menu_view.xml
index 0a48c5ebc..ff35b61e5 100644
--- a/Habitica/res/layout/quest_menu_view.xml
+++ b/Habitica/res/layout/quest_menu_view.xml
@@ -11,7 +11,7 @@
         android:layout_width="wrap_content"
         android:layout_height="120dp"
         android:layout_alignParentTop="true"
-        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
         android:background="@color/red_10"
         android:layout_marginTop="-30dp"
         />
@@ -19,8 +19,8 @@
         android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentRight="true"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentEnd="true"
         android:layout_alignParentTop="true">
         <LinearLayout
             android:id="@+id/topView"
@@ -28,8 +28,8 @@
             android:layout_height="wrap_content"
             android:minHeight="40dp"
             android:orientation="vertical"
-            android:paddingLeft="@dimen/spacing_large"
-            android:paddingRight="@dimen/spacing_large"
+            android:paddingStart="@dimen/spacing_large"
+            android:paddingEnd="@dimen/spacing_large"
             android:paddingTop="@dimen/spacing_medium"
             android:paddingBottom="@dimen/spacing_medium">
             <ImageButton
@@ -39,12 +39,12 @@
                 app:srcCompat="@drawable/ic_close_white_24dp"
                 android:background="@color/transparent"
                 android:contentDescription="@string/hide_boss_art"
-                android:layout_gravity="right"/>
+                android:layout_gravity="end"/>
             <TextView
                 android:id="@+id/bossNameView"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="right"
+                android:layout_gravity="end"
                 android:textColor="@color/white"
                 android:textSize="14sp"
                 android:textStyle="bold"
@@ -55,7 +55,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/world_boss"
-                android:layout_gravity="right|center_vertical"
+                android:layout_gravity="end|center_vertical"
                 android:textColor="@color/white"
                 android:textSize="12sp"/>
         </LinearLayout>
@@ -66,13 +66,13 @@
             android:gravity="center_vertical"
             android:orientation="horizontal"
             tools:background="?colorPrimaryDark"
-            android:paddingLeft="@dimen/spacing_medium"
-            android:paddingRight="@dimen/spacing_large">
+            android:paddingStart="@dimen/spacing_medium"
+            android:paddingEnd="@dimen/spacing_large">
             <ImageView
                 android:id="@+id/heartIconView"
                 android:layout_width="@dimen/icon_size"
                 android:layout_height="@dimen/icon_size"
-                android:layout_marginRight="@dimen/spacing_small"/>
+                android:layout_marginEnd="@dimen/spacing_small"/>
             <com.habitrpg.android.habitica.ui.views.HabiticaProgressBar
                 android:id="@+id/healthBarView"
                 android:layout_width="0dp"
diff --git a/Habitica/res/layout/quest_progress.xml b/Habitica/res/layout/quest_progress.xml
index b7c9aa5a6..2b9020ccf 100644
--- a/Habitica/res/layout/quest_progress.xml
+++ b/Habitica/res/layout/quest_progress.xml
@@ -5,8 +5,8 @@
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingLeft="4dp"
-    android:paddingRight="4dp"
+    android:paddingStart="4dp"
+    android:paddingEnd="4dp"
     android:paddingTop="4dp"
     android:paddingBottom="8dp">
     <LinearLayout
@@ -15,8 +15,8 @@
         android:layout_height="wrap_content"
         android:paddingTop="@dimen/spacing_large"
         android:paddingBottom="@dimen/spacing_large"
-        android:paddingLeft="@dimen/spacing_large"
-        android:paddingRight="12dp"
+        android:paddingStart="@dimen/spacing_large"
+        android:paddingEnd="12dp"
         android:gravity="center_vertical">
         <TextView
             android:layout_width="0dp"
@@ -53,8 +53,8 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/spacing_large"
             android:paddingBottom="@dimen/spacing_large"
-            android:paddingLeft="@dimen/spacing_large"
-            android:paddingRight="@dimen/spacing_large"
+            android:paddingStart="@dimen/spacing_large"
+            android:paddingEnd="@dimen/spacing_large"
             android:layout_gravity="center_horizontal" />
         <com.habitrpg.android.habitica.ui.views.WrapContentDraweeView
             android:id="@+id/questFlourishesImageView"
@@ -62,16 +62,16 @@
             android:layout_height="219dp"
             android:layout_marginTop="@dimen/spacing_large"
             android:paddingBottom="@dimen/spacing_large"
-            android:paddingLeft="@dimen/spacing_large"
-            android:paddingRight="@dimen/spacing_large"
+            android:paddingStart="@dimen/spacing_large"
+            android:paddingEnd="@dimen/spacing_large"
             android:layout_gravity="center_horizontal" />
     </FrameLayout>
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/spacing_medium"
-        android:paddingLeft="@dimen/spacing_large"
-        android:paddingRight="@dimen/spacing_large"
+        android:paddingStart="@dimen/spacing_large"
+        android:paddingEnd="@dimen/spacing_large"
         android:layout_marginTop="@dimen/spacing_large">
         <TextView
             android:id="@+id/bossNameView"
@@ -85,7 +85,7 @@
             android:id="@+id/pendingDamageIconView"
             android:layout_width="@dimen/icon_size"
             android:layout_height="@dimen/icon_size"
-            android:layout_marginRight="@dimen/spacing_small"/>
+            android:layout_marginEnd="@dimen/spacing_small"/>
         <TextView
             android:id="@+id/pendingDamageTextView"
             android:layout_width="wrap_content"
@@ -102,16 +102,16 @@
         app:barBackgroundColor="@color/content_15_alpha"
         app:barHeight="8dp"
         app:labelSpacing="@dimen/spacing_medium"
-        android:paddingLeft="@dimen/spacing_large"
-        android:paddingRight="@dimen/spacing_large" />
+        android:paddingStart="@dimen/spacing_large"
+        android:paddingEnd="@dimen/spacing_large" />
     <LinearLayout
         android:orientation="horizontal"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/spacing_medium"
         android:layout_marginTop="@dimen/spacing_large"
-        android:paddingLeft="@dimen/spacing_large"
-        android:paddingRight="@dimen/spacing_large">
+        android:paddingStart="@dimen/spacing_large"
+        android:paddingEnd="@dimen/spacing_large">
 
         <TextView
             android:layout_width="wrap_content"
@@ -137,16 +137,16 @@
         app:barBackgroundColor="@color/content_15_alpha"
         app:barHeight="8dp"
         app:labelSpacing="@dimen/spacing_medium"
-        android:paddingLeft="@dimen/spacing_large"
-        android:paddingRight="@dimen/spacing_large"
+        android:paddingStart="@dimen/spacing_large"
+        android:paddingEnd="@dimen/spacing_large"
         android:layout_marginBottom="@dimen/spacing_large"/>
     <LinearLayout
         android:id="@+id/collectionContainer"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:paddingLeft="@dimen/spacing_large"
-        android:paddingRight="@dimen/spacing_large"/>
+        android:paddingStart="@dimen/spacing_large"
+        android:paddingEnd="@dimen/spacing_large"/>
     <TextView
         android:id="@+id/rageStrikeDescriptionView"
         android:layout_width="match_parent"
@@ -158,8 +158,8 @@
         android:paddingTop="@dimen/spacing_small"
         android:paddingBottom="@dimen/spacing_small"
         android:textColor="@color/orange_500"
-        android:layout_marginLeft="@dimen/spacing_large"
-        android:layout_marginRight="@dimen/spacing_large"/>
+        android:layout_marginStart="@dimen/spacing_large"
+        android:layout_marginEnd="@dimen/spacing_large"/>
     <LinearLayout
         android:id="@+id/rageStrikeContainer"
         android:layout_width="wrap_content"
diff --git a/Habitica/res/layout/reward_item_card.xml b/Habitica/res/layout/reward_item_card.xml
index 5540a6bc8..fd123d459 100644
--- a/Habitica/res/layout/reward_item_card.xml
+++ b/Habitica/res/layout/reward_item_card.xml
@@ -24,8 +24,8 @@
             android:layout_width="20dp"
             android:layout_height="20dp"
             android:layout_gravity="center_vertical"
-            android:layout_marginLeft="@dimen/spacing_small"
-            android:layout_marginRight="@dimen/spacing_small"
+            android:layout_marginStart="@dimen/spacing_small"
+            android:layout_marginEnd="@dimen/spacing_small"
             style="@style/Widget.AppCompat.ProgressBar"/>
         <ImageButton
             android:id="@+id/error_icon"
@@ -34,8 +34,8 @@
             android:layout_gravity="center_vertical"
             android:background="@color/transparent"
             android:src="@drawable/ic_warning_black"
-            android:layout_marginLeft="@dimen/spacing_small"
-            android:layout_marginRight="@dimen/spacing_small"/>
+            android:layout_marginStart="@dimen/spacing_small"
+            android:layout_marginEnd="@dimen/spacing_small"/>
         <LinearLayout
             android:id="@+id/buyButton"
             android:layout_width="56dp"
diff --git a/Habitica/res/layout/row_quest_reward.xml b/Habitica/res/layout/row_quest_reward.xml
index 767cadc90..23b6bad57 100644
--- a/Habitica/res/layout/row_quest_reward.xml
+++ b/Habitica/res/layout/row_quest_reward.xml
@@ -11,7 +11,7 @@
         android:id="@+id/imageView"
         android:layout_width="@dimen/shopitem_image_size"
         android:layout_height="@dimen/shopitem_image_size"
-        android:layout_marginRight="8dp"
+        android:layout_marginEnd="8dp"
         android:scaleType="center"
         app:actualImageScaleType="fitCenter"/>
 
@@ -19,5 +19,5 @@
         android:id="@+id/titleTextView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginRight="16dp"/>
+        android:layout_marginEnd="16dp"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/row_quest_reward_imageview.xml b/Habitica/res/layout/row_quest_reward_imageview.xml
index c0c924624..95c72b29f 100644
--- a/Habitica/res/layout/row_quest_reward_imageview.xml
+++ b/Habitica/res/layout/row_quest_reward_imageview.xml
@@ -11,12 +11,12 @@
         android:id="@+id/imageView"
         android:layout_width="@dimen/shopitem_image_size"
         android:layout_height="@dimen/shopitem_image_size"
-        android:layout_marginRight="8dp"
+        android:layout_marginEnd="8dp"
         android:scaleType="center" />
 
     <TextView
         android:id="@+id/titleTextView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginRight="16dp"/>
+        android:layout_marginEnd="16dp"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/setup_customization_item.xml b/Habitica/res/layout/setup_customization_item.xml
index d4a2a2be2..ea9132a66 100644
--- a/Habitica/res/layout/setup_customization_item.xml
+++ b/Habitica/res/layout/setup_customization_item.xml
@@ -4,8 +4,8 @@
               android:layout_height="match_parent"
               xmlns:tools="http://schemas.android.com/tools"
               android:gravity="center_vertical"
-              android:paddingLeft="6dp"
-              android:paddingRight="6dp"
+              android:paddingStart="6dp"
+              android:paddingEnd="6dp"
         tools:background="?colorPrimaryOffset">
     <ImageView
             android:id="@+id/imageView"
@@ -20,7 +20,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             tools:text="Slim"
-            android:layout_marginLeft="6dp"
+            android:layout_marginStart="6dp"
             android:textColor="@color/white_50_alpha"
             android:textSize="16sp"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/shop_header.xml b/Habitica/res/layout/shop_header.xml
index d89e38410..4af51548f 100644
--- a/Habitica/res/layout/shop_header.xml
+++ b/Habitica/res/layout/shop_header.xml
@@ -33,8 +33,8 @@
         android:id="@+id/descriptionView"
         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="120dp"
         android:layout_marginBottom="4dp"
         style="@style/Body1"
diff --git a/Habitica/res/layout/shop_section_header.xml b/Habitica/res/layout/shop_section_header.xml
index 7bc2d6e4d..558f280a2 100644
--- a/Habitica/res/layout/shop_section_header.xml
+++ b/Habitica/res/layout/shop_section_header.xml
@@ -22,8 +22,8 @@
             android:layout_weight="1"
             style="@style/Overline"
             tools:text="Section Header"
-            android:layout_marginLeft="16dp"
-            android:layout_marginRight="16dp" />
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp" />
         <Spinner
             android:id="@+id/classSelectionSpinner"
             android:layout_width="wrap_content"
diff --git a/Habitica/res/layout/skill_list_item.xml b/Habitica/res/layout/skill_list_item.xml
index 80186075e..6e3d86832 100644
--- a/Habitica/res/layout/skill_list_item.xml
+++ b/Habitica/res/layout/skill_list_item.xml
@@ -21,13 +21,13 @@
             android:layout_width="40dp"
             android:layout_height="40dp"
             android:layout_gravity="center_vertical"
-            android:layout_marginLeft="8dp"/>
+            android:layout_marginStart="8dp"/>
         <LinearLayout
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:layout_marginLeft="8dp"
-            android:layout_marginRight="8dp"
+            android:layout_marginStart="8dp"
+            android:layout_marginEnd="8dp"
             android:layout_weight="1"
             android:gravity="center_vertical"
             android:orientation="vertical"
diff --git a/Habitica/res/layout/skill_task_item_card.xml b/Habitica/res/layout/skill_task_item_card.xml
index 91271069f..df5d2b96f 100644
--- a/Habitica/res/layout/skill_task_item_card.xml
+++ b/Habitica/res/layout/skill_task_item_card.xml
@@ -16,9 +16,8 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
                 android:layout_centerVertical="true"
-                android:paddingLeft="16dp"
-                android:paddingRight="16dp"
-                android:paddingEnd="16dp"
+                android:paddingStart="@dimen/spacing_large"
+                android:paddingEnd="@dimen/spacing_large"
                 android:paddingBottom="20dp"
                 android:paddingTop="20dp">
                 <com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
@@ -39,7 +38,6 @@
                 android:layout_height="match_parent"
                 android:gravity="center"
                 android:layout_alignParentTop="true"
-                android:layout_alignParentRight="true"
                 android:layout_alignParentEnd="true" />
         </RelativeLayout>
     </LinearLayout>
diff --git a/Habitica/res/layout/snackbar_view.xml b/Habitica/res/layout/snackbar_view.xml
index e7d87bc7e..77132f4d2 100644
--- a/Habitica/res/layout/snackbar_view.xml
+++ b/Habitica/res/layout/snackbar_view.xml
@@ -64,8 +64,8 @@
             android:layout_height="match_parent"
             android:gravity="center_vertical"
             android:background="@drawable/snackbar_right_bg"
-            android:paddingLeft="8dp"
-            android:paddingRight="8dp"
+            android:paddingStart="8dp"
+            android:paddingEnd="8dp"
             android:layout_marginEnd="1dp"
             android:layout_marginTop="1dp"
             android:layout_marginBottom="1dp"
diff --git a/Habitica/res/layout/speechbubble.xml b/Habitica/res/layout/speechbubble.xml
index 5dedc0ffa..b8db0b087 100644
--- a/Habitica/res/layout/speechbubble.xml
+++ b/Habitica/res/layout/speechbubble.xml
@@ -11,7 +11,7 @@
             android:layout_height="wrap_content"
             tools:src="@drawable/justin_textbox"
             android:layout_gravity="right"
-            android:layout_marginRight="30dp"/>
+            android:layout_marginEnd="30dp"/>
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -20,8 +20,8 @@
         android:background="@drawable/layout_rounded_bg_content"
         android:orientation="vertical"
         android:paddingBottom="16dp"
-        android:paddingLeft="21dp"
-        android:paddingRight="21dp"
+        android:paddingStart="21dp"
+        android:paddingEnd="21dp"
         android:paddingTop="24dp"
         android:layout_marginBottom="10dp">
 
@@ -80,7 +80,7 @@
             android:background="@drawable/name_plate"
             android:gravity="center_vertical"
             android:textColor="@color/white"
-            android:layout_marginLeft="21dp"
+            android:layout_marginStart="21dp"
             android:layout_marginTop="32dp"
             android:textStyle="bold" />
 </FrameLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/stats_view.xml b/Habitica/res/layout/stats_view.xml
index 9c8bc8f5b..d8a3f2521 100644
--- a/Habitica/res/layout/stats_view.xml
+++ b/Habitica/res/layout/stats_view.xml
@@ -5,8 +5,8 @@
               android:layout_width="match_parent"
               android:layout_height="wrap_content"
               android:background="@drawable/layout_rounded_bg_window"
-              android:layout_marginLeft="16dp"
-              android:layout_marginRight="16dp">
+              android:layout_marginStart="16dp"
+              android:layout_marginEnd="16dp">
     <LinearLayout
         android:id="@+id/titleWrapper"
         android:layout_width="match_parent"
@@ -21,7 +21,7 @@
             android:gravity="center_vertical"
             style="@style/Headline"
             android:textColor="@color/white"
-            android:layout_marginLeft="12dp"/>
+            android:layout_marginStart="12dp"/>
 
         <TextView
             android:id="@+id/totalValueTextView"
@@ -32,7 +32,7 @@
             style="@style/Headline"
             android:textStyle="bold"
             android:textColor="@color/white"
-            android:layout_marginRight="12dp"/>
+            android:layout_marginEnd="12dp"/>
     </LinearLayout>
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/Habitica/res/layout/support_faq_item.xml b/Habitica/res/layout/support_faq_item.xml
index 8359eed23..ff6961e59 100644
--- a/Habitica/res/layout/support_faq_item.xml
+++ b/Habitica/res/layout/support_faq_item.xml
@@ -10,8 +10,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:src="@drawable/support_faq"
-        android:layout_marginLeft="26dp"
-        android:layout_marginRight="29dp"/>
+        android:layout_marginStart="26dp"
+        android:layout_marginEnd="29dp"/>
     <TextView
         android:id="@+id/text_view"
         android:layout_width="wrap_content"
@@ -19,7 +19,7 @@
         android:textSize="14sp"
         android:textColor="@color/text_secondary"
         tools:text="Title"
-        android:layout_marginRight="@dimen/spacing_large"
+        android:layout_marginEnd="@dimen/spacing_large"
         android:layout_marginTop="@dimen/spacing_medium"
         android:layout_marginBottom="@dimen/spacing_medium"
         />
diff --git a/Habitica/res/layout/todo_item_card.xml b/Habitica/res/layout/todo_item_card.xml
index c11dc9160..b72cefa7e 100644
--- a/Habitica/res/layout/todo_item_card.xml
+++ b/Habitica/res/layout/todo_item_card.xml
@@ -58,8 +58,8 @@
                     android:layout_width="20dp"
                     android:layout_height="20dp"
                     android:layout_gravity="center_vertical"
-                    android:layout_marginLeft="@dimen/spacing_small"
-                    android:layout_marginRight="@dimen/spacing_small"
+                    android:layout_marginStart="@dimen/spacing_small"
+                    android:layout_marginEnd="@dimen/spacing_small"
                     style="@style/Widget.AppCompat.ProgressBar"/>
                 <ImageButton
                     android:id="@+id/error_icon"
@@ -68,8 +68,8 @@
                     android:layout_gravity="center_vertical"
                     android:background="@color/transparent"
                     android:src="@drawable/ic_warning_black"
-                    android:layout_marginLeft="@dimen/spacing_small"
-                    android:layout_marginRight="@dimen/spacing_small"/>
+                    android:layout_marginStart="@dimen/spacing_small"
+                    android:layout_marginEnd="@dimen/spacing_small"/>
                 <include layout="@layout/checklist_indicator" />
             </LinearLayout>
             <LinearLayout
diff --git a/Habitica/res/layout/view_collapsible_section.xml b/Habitica/res/layout/view_collapsible_section.xml
index e654fd0a3..3bf9effec 100644
--- a/Habitica/res/layout/view_collapsible_section.xml
+++ b/Habitica/res/layout/view_collapsible_section.xml
@@ -29,8 +29,8 @@
             android:layout_width="0dp"
             android:layout_weight="1"
             android:layout_height="18dp"
-            android:layout_marginLeft="@dimen/spacing_medium"
-            android:layout_marginRight="@dimen/spacing_medium">
+            android:layout_marginStart="@dimen/spacing_medium"
+            android:layout_marginEnd="@dimen/spacing_medium">
             <ImageView
                 android:id="@+id/infoIconView"
                 android:layout_width="18dp"
diff --git a/Habitica/res/layout/widget_dailies_list_row.xml b/Habitica/res/layout/widget_dailies_list_row.xml
index ddffc1a59..fcd676cf1 100644
--- a/Habitica/res/layout/widget_dailies_list_row.xml
+++ b/Habitica/res/layout/widget_dailies_list_row.xml
@@ -28,8 +28,6 @@
             android:layout_height="wrap_content"
             android:paddingBottom="@dimen/task_top_bottom_compact_padding"
             android:paddingEnd="@dimen/task_text_padding"
-            android:paddingLeft="@dimen/task_text_padding"
-            android:paddingRight="@dimen/task_text_padding"
             android:paddingStart="@dimen/task_text_padding"
             android:paddingTop="@dimen/task_top_bottom_compact_padding"
             android:textColor="@color/primary_text_light" />
diff --git a/Habitica/res/layout/widget_habit_button.xml b/Habitica/res/layout/widget_habit_button.xml
index 8bb98bf1f..c22f60cd6 100644
--- a/Habitica/res/layout/widget_habit_button.xml
+++ b/Habitica/res/layout/widget_habit_button.xml
@@ -52,8 +52,8 @@
         android:id="@+id/habit_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="12dp"
-        android:layout_marginRight="12dp"
+        android:layout_marginStart="12dp"
+        android:layout_marginEnd="12dp"
         android:layout_marginTop="6dp"
         android:layout_marginBottom="12dp"
         android:textColor="@color/white_75_alpha"
diff --git a/Habitica/res/layout/widget_task_list.xml b/Habitica/res/layout/widget_task_list.xml
index f33c97d3c..1f049fa73 100644
--- a/Habitica/res/layout/widget_task_list.xml
+++ b/Habitica/res/layout/widget_task_list.xml
@@ -14,8 +14,8 @@
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:paddingLeft="4dp"
-        android:paddingRight="4dp">
+        android:paddingStart="4dp"
+        android:paddingEnd="4dp">
     <ListView
         android:id="@+id/list_view"
         android:layout_width="match_parent"
diff --git a/Habitica/res/layout/widget_todo_list_row.xml b/Habitica/res/layout/widget_todo_list_row.xml
index b2c2a0510..623688968 100644
--- a/Habitica/res/layout/widget_todo_list_row.xml
+++ b/Habitica/res/layout/widget_todo_list_row.xml
@@ -28,8 +28,6 @@
             android:layout_height="wrap_content"
             android:paddingBottom="@dimen/task_top_bottom_compact_padding"
             android:paddingEnd="@dimen/task_text_padding"
-            android:paddingLeft="@dimen/task_text_padding"
-            android:paddingRight="@dimen/task_text_padding"
             android:paddingStart="@dimen/task_text_padding"
             android:paddingTop="@dimen/task_top_bottom_compact_padding"
             android:textColor="@color/primary_text_light" />
diff --git a/Habitica/res/layout/world_boss_description_view.xml b/Habitica/res/layout/world_boss_description_view.xml
index 202dafccb..cc4045095 100644
--- a/Habitica/res/layout/world_boss_description_view.xml
+++ b/Habitica/res/layout/world_boss_description_view.xml
@@ -4,8 +4,8 @@
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingLeft="@dimen/spacing_large"
-    android:paddingRight="@dimen/spacing_large">
+    android:paddingStart="@dimen/spacing_large"
+    android:paddingEnd="@dimen/spacing_large">
 <TextView
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/Habitica/res/values-v23/styles.xml b/Habitica/res/values-v23/styles.xml
index 865537f6b..20860cee5 100644
--- a/Habitica/res/values-v23/styles.xml
+++ b/Habitica/res/values-v23/styles.xml
@@ -9,8 +9,8 @@
         <item name="android:textColor">@color/white_75_alpha</item>
         <item name="android:textColorHint">@color/white_50_alpha</item>
         <item name="android:drawableTint">@color/white_50_alpha</item>
-        <item name="android:paddingLeft">16dp</item>
-        <item name="android:paddingRight">16dp</item>
+        <item name="android:paddingStart">16dp</item>
+        <item name="android:paddingEnd">16dp</item>
         <item name="android:paddingBottom">20dp</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/Habitica/res/values/styles.xml b/Habitica/res/values/styles.xml
index 1cee2ca09..755781a6b 100644
--- a/Habitica/res/values/styles.xml
+++ b/Habitica/res/values/styles.xml
@@ -311,7 +311,7 @@
         <item name="android:background">@drawable/border_lightgray</item>
         <item name="android:drawablePadding">4dp</item>
         <item name="android:layout_marginTop">8dp</item>
-        <item name="android:paddingLeft">4dp</item>
+        <item name="android:paddingStart">4dp</item>
         <item name="android:textAllCaps">true</item>
         <item name="android:textSize">14sp</item>
     </style>
@@ -384,8 +384,8 @@
     <style name="SectionTitle">
         <item name="android:textSize">@dimen/card_medium_text</item>
         <item name="android:textStyle">bold</item>
-        <item name="android:paddingLeft">@dimen/section_leftright_padding</item>
-        <item name="android:paddingRight">@dimen/section_leftright_padding</item>
+        <item name="android:paddingStart">@dimen/section_leftright_padding</item>
+        <item name="android:paddingEnd">@dimen/section_leftright_padding</item>
         <item name="android:paddingTop">@dimen/section_top_padding</item>
     </style>
 
@@ -420,7 +420,7 @@
         <item name="android:padding">@dimen/section_top_padding</item>
         <item name="android:gravity">center</item>
         <item name="android:layout_marginLeft">20dp</item>
-        <item name="android:layout_marginRight">20dp</item>
+        <item name="android:layout_marginEnd">20dp</item>
     </style>
 
     <style name="GemPurchaseListItem">
@@ -428,7 +428,7 @@
         <item name="nightTextColor">@color/gray_400</item>
         <item name="android:gravity">center_horizontal</item>
         <item name="android:textSize">12sp</item>
-        <item name="android:drawableLeft">@drawable/ic_check_purple</item>
+        <item name="android:drawableStart">@drawable/ic_check_purple</item>
         <item name="android:layout_gravity">center</item>
         <item name="android:drawablePadding">4dp</item>
     </style>
@@ -437,14 +437,14 @@
         <item name="android:layout_gravity">left|center_vertical</item>
         <item name="android:fontFamily" tools:targetApi="jelly_bean">@string/font_family_medium</item>
         <item name="android:textSize">14sp</item>
-        <item name="paddingEnd">32px</item>
+        <item name="paddingEnd">32dp</item>
     </style>
 
     <style name="FragmentDialogTitle">
         <item name="android:textSize">@dimen/card_medium_text</item>
         <item name="android:textStyle">bold</item>
-        <item name="android:paddingLeft">@dimen/section_leftright_padding</item>
-        <item name="android:paddingRight">@dimen/section_leftright_padding</item>
+        <item name="android:paddingStart">@dimen/section_leftright_padding</item>
+        <item name="android:paddingEnd">@dimen/section_leftright_padding</item>
         <item name="android:paddingTop">@dimen/section_top_padding</item>
         <item name="android:paddingBottom">@dimen/section_top_padding</item>
     </style>
@@ -453,7 +453,7 @@
         <item name="android:layout_gravity">center_horizontal</item>
         <item name="android:textSize">13sp</item>
         <item name="android:layout_marginLeft">8dp</item>
-        <item name="android:layout_marginRight">8dp</item>
+        <item name="android:layout_marginEnd">8dp</item>
         <item name="android:textColor">@color/subscription_description_text</item>
     </style>
 
@@ -461,8 +461,8 @@
         <item name="android:textSize">11sp</item>
         <item name="android:fontFamily">@string/font_family_medium</item>
         <item name="android:background">@drawable/pill_bg_gray</item>
-        <item name="android:paddingRight">@dimen/pill_horizontal_padding</item>
-        <item name="android:paddingLeft">@dimen/pill_horizontal_padding</item>
+        <item name="android:paddingEnd">@dimen/pill_horizontal_padding</item>
+        <item name="android:paddingStart">@dimen/pill_horizontal_padding</item>
         <item name="android:paddingTop">@dimen/pill_vertical_padding</item>
         <item name="android:paddingBottom">@dimen/pill_vertical_padding</item>
         <item name="android:textColor">@color/text_ternary</item>
@@ -501,8 +501,8 @@
         <item name="android:background">@drawable/subscription_box_bg</item>
         <item name="android:paddingTop">16dp</item>
         <item name="android:paddingBottom">16dp</item>
-        <item name="android:paddingLeft">18dp</item>
-        <item name="android:paddingRight">18dp</item>
+        <item name="android:paddingStart">18dp</item>
+        <item name="android:paddingEnd">18dp</item>
         <item name="android:layout_marginBottom">8dp</item>
     </style>
 
@@ -536,7 +536,7 @@
         <item name="android:letterSpacing" tools:targetApi="lollipop">0.035</item>
         <item name="android:lineSpacingExtra">2.0dp</item>
         <item name="android:layout_marginLeft">16dp</item>
-        <item name="android:layout_marginRight">16dp</item>
+        <item name="android:layout_marginEnd">16dp</item>
     </style>
 
     <style name="HabiticaButton.Purple" parent="HabiticaButton">
@@ -550,8 +550,8 @@
     </style>
 
     <style name="HabiticaButton.Purple.Small" parent="HabiticaButton.Purple">
-        <item name="android:paddingLeft">@dimen/button_padding_small</item>
-        <item name="android:paddingRight">@dimen/button_padding_small</item>
+        <item name="android:paddingStart">@dimen/button_padding_small</item>
+        <item name="android:paddingEnd">@dimen/button_padding_small</item>
         <item name="android:paddingTop">@dimen/button_padding_vertical_small</item>
         <item name="android:paddingBottom">@dimen/button_padding_vertical_small</item>
     </style>
@@ -563,8 +563,8 @@
         <item name="android:drawablePadding">@dimen/spacing_large</item>
         <item name="android:textColor">@color/white_75_alpha</item>
         <item name="android:textColorHint">@color/white_50_alpha</item>
-        <item name="android:paddingLeft">16dp</item>
-        <item name="android:paddingRight">16dp</item>
+        <item name="android:paddingStart">16dp</item>
+        <item name="android:paddingEnd">16dp</item>
         <item name="android:paddingBottom">20dp</item>
     </style>
 
@@ -575,15 +575,15 @@
         <item name="android:textColor">@color/white</item>
         <item name="android:layout_gravity">center_horizontal</item>
         <item name="android:textAllCaps">false</item>
-        <item name="android:paddingLeft">32dp</item>
-        <item name="android:paddingRight">32dp</item>
+        <item name="android:paddingStart">32dp</item>
+        <item name="android:paddingEnd">32dp</item>
     </style>
 
     <style name="DiamondButton" parent="@style/Widget.AppCompat.Button.Borderless">
         <item name="android:layout_height">36dp</item>
         <item name="android:background">@drawable/diamond_button</item>
-        <item name="android:paddingLeft">36dp</item>
-        <item name="android:paddingRight">36dp</item>
+        <item name="android:paddingStart">36dp</item>
+        <item name="android:paddingEnd">36dp</item>
         <item name="android:textColor">@color/white</item>
         <item name="android:textAllCaps">false</item>
         <item name="android:shadowColor">@color/transparent</item>