diff --git a/app/src/main/res/layout/actions_fragment.xml b/app/src/main/res/layout/actions_fragment.xml
index e41f84726b..e5b4cc4c5a 100644
--- a/app/src/main/res/layout/actions_fragment.xml
+++ b/app/src/main/res/layout/actions_fragment.xml
@@ -47,8 +47,8 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:drawableTop="@drawable/ic_actions_profileswitch"
-                    android:paddingLeft="0dp"
-                    android:paddingRight="0dp"
+                    android:paddingStart="0dp"
+                    android:paddingEnd="0dp"
                     android:text="@string/careportal_profileswitch"
                     android:textSize="11sp"
                     app:layout_column="0"
@@ -62,8 +62,8 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:drawableTop="@drawable/ic_temptarget_high"
-                    android:paddingLeft="0dp"
-                    android:paddingRight="0dp"
+                    android:paddingStart="0dp"
+                    android:paddingEnd="0dp"
                     android:text="@string/careportal_temporarytarget"
                     android:textSize="11sp"
                     app:layout_column="1"
@@ -77,8 +77,8 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:drawableTop="@drawable/ic_actions_starttempbasal"
-                    android:paddingLeft="0dp"
-                    android:paddingRight="0dp"
+                    android:paddingStart="0dp"
+                    android:paddingEnd="0dp"
                     android:text="@string/overview_tempbasal_button"
                     android:textSize="11sp"
                     app:layout_column="0"
@@ -92,8 +92,8 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:drawableTop="@drawable/ic_cancelbasal"
-                    android:paddingLeft="0dp"
-                    android:paddingRight="0dp"
+                    android:paddingStart="0dp"
+                    android:paddingEnd="0dp"
                     android:text="@string/canceltemp"
                     android:textSize="11sp"
                     android:visibility="gone"
@@ -108,8 +108,8 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:drawableTop="@drawable/ic_actions_startextbolus"
-                    android:paddingLeft="0dp"
-                    android:paddingRight="0dp"
+                    android:paddingStart="0dp"
+                    android:paddingEnd="0dp"
                     android:text="@string/overview_extendedbolus_button"
                     android:textSize="11sp"
                     app:layout_column="1"
@@ -123,8 +123,8 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:drawableTop="@drawable/ic_actions_cancelextbolus"
-                    android:paddingLeft="0dp"
-                    android:paddingRight="0dp"
+                    android:paddingStart="0dp"
+                    android:paddingEnd="0dp"
                     android:text="@string/overview_extendedbolus_cancel_button"
                     android:textSize="11sp"
                     android:visibility="gone"
@@ -194,8 +194,8 @@
                     android:layout_width="0dp"
                     android:layout_height="fill_parent"
                     android:drawableTop="@drawable/ic_cp_bgcheck"
-                    android:paddingLeft="0dp"
-                    android:paddingRight="0dp"
+                    android:paddingStart="0dp"
+                    android:paddingEnd="0dp"
                     android:text="@string/careportal_bgcheck"
                     android:textSize="11sp"
                     app:layout_column="0"
@@ -209,8 +209,8 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:drawableTop="@drawable/ic_cp_pump_canula"
-                    android:paddingLeft="0dp"
-                    android:paddingRight="0dp"
+                    android:paddingStart="0dp"
+                    android:paddingEnd="0dp"
                     android:text="@string/primefill"
                     android:textSize="11sp"
                     app:layout_column="1"
@@ -224,8 +224,8 @@
                     android:layout_width="0dp"
                     android:layout_height="fill_parent"
                     android:drawableTop="@drawable/ic_cp_cgm_insert"
-                    android:paddingLeft="0dp"
-                    android:paddingRight="0dp"
+                    android:paddingStart="0dp"
+                    android:paddingEnd="0dp"
                     android:text="@string/careportal_cgmsensorinsert"
                     android:textSize="11sp"
                     app:layout_column="0"
@@ -239,8 +239,8 @@
                     android:layout_width="0dp"
                     android:layout_height="fill_parent"
                     android:drawableTop="@drawable/ic_cp_pump_battery"
-                    android:paddingLeft="0dp"
-                    android:paddingRight="0dp"
+                    android:paddingStart="0dp"
+                    android:paddingEnd="0dp"
                     android:text="@string/careportal_pumpbatterychange"
                     android:textSize="11sp"
                     app:layout_column="1"
@@ -254,8 +254,8 @@
                     android:layout_width="0dp"
                     android:layout_height="fill_parent"
                     android:drawableTop="@drawable/ic_cp_note"
-                    android:paddingLeft="0dp"
-                    android:paddingRight="0dp"
+                    android:paddingStart="0dp"
+                    android:paddingEnd="0dp"
                     android:text="@string/careportal_note"
                     android:textSize="11sp"
                     app:layout_column="0"
@@ -269,8 +269,8 @@
                     android:layout_width="0dp"
                     android:layout_height="fill_parent"
                     android:drawableTop="@drawable/ic_cp_exercise"
-                    android:paddingLeft="0dp"
-                    android:paddingRight="0dp"
+                    android:paddingStart="0dp"
+                    android:paddingEnd="0dp"
                     android:text="@string/careportal_exercise"
                     android:textSize="11sp"
                     app:layout_column="1"
@@ -284,8 +284,8 @@
                     android:layout_width="0dp"
                     android:layout_height="fill_parent"
                     android:drawableTop="@drawable/ic_cp_announcement"
-                    android:paddingLeft="0dp"
-                    android:paddingRight="0dp"
+                    android:paddingStart="0dp"
+                    android:paddingEnd="0dp"
                     android:text="@string/careportal_announcement"
                     android:textSize="11sp"
                     app:layout_column="0"
@@ -299,8 +299,8 @@
                     android:layout_width="0dp"
                     android:layout_height="fill_parent"
                     android:drawableTop="@drawable/ic_cp_question"
-                    android:paddingLeft="0dp"
-                    android:paddingRight="0dp"
+                    android:paddingStart="0dp"
+                    android:paddingEnd="0dp"
                     android:text="@string/careportal_question"
                     android:textSize="11sp"
                     app:layout_column="1"
@@ -347,8 +347,8 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:drawableTop="@drawable/ic_pump_history"
-                    android:paddingLeft="0dp"
-                    android:paddingRight="0dp"
+                    android:paddingStart="0dp"
+                    android:paddingEnd="0dp"
                     android:text="@string/nav_historybrowser"
                     android:textSize="11sp"
                     app:layout_column="0"
@@ -362,8 +362,8 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:drawableTop="@drawable/ic_cp_stats"
-                    android:paddingLeft="0dp"
-                    android:paddingRight="0dp"
+                    android:paddingStart="0dp"
+                    android:paddingEnd="0dp"
                     android:text="@string/tdd"
                     android:textSize="11sp"
                     app:layout_column="1"
diff --git a/app/src/main/res/layout/activity_logsetting.xml b/app/src/main/res/layout/activity_logsetting.xml
index cb1573ecf8..4236005fd8 100644
--- a/app/src/main/res/layout/activity_logsetting.xml
+++ b/app/src/main/res/layout/activity_logsetting.xml
@@ -31,8 +31,8 @@
             android:layout_height="wrap_content"
             android:layout_centerInParent="true"
             android:layout_gravity="center"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
             android:text="@string/nav_logsettings"
             android:textAlignment="center"
             android:textAppearance="?android:attr/textAppearanceLarge" />
diff --git a/app/src/main/res/layout/activity_profilehelper.xml b/app/src/main/res/layout/activity_profilehelper.xml
index 73353f3d1c..615958b310 100644
--- a/app/src/main/res/layout/activity_profilehelper.xml
+++ b/app/src/main/res/layout/activity_profilehelper.xml
@@ -25,8 +25,8 @@
                 android:layout_height="30dp"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:paddingLeft="5dp"
-                android:paddingRight="5dp"
+                android:paddingStart="5dp"
+                android:paddingEnd="5dp"
                 android:text="1"
                 tools:ignore="HardcodedText" />
 
@@ -36,8 +36,8 @@
                 android:layout_height="30dp"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:paddingLeft="5dp"
-                android:paddingRight="5dp"
+                android:paddingStart="5dp"
+                android:paddingEnd="5dp"
                 android:text="2"
                 tools:ignore="HardcodedText" />
 
diff --git a/app/src/main/res/layout/activity_setupwizard.xml b/app/src/main/res/layout/activity_setupwizard.xml
index c84e5f652d..24403b64a3 100644
--- a/app/src/main/res/layout/activity_setupwizard.xml
+++ b/app/src/main/res/layout/activity_setupwizard.xml
@@ -64,8 +64,8 @@
         android:layout_gravity="bottom|center_horizontal"
         android:background="@color/black_alpha_40"
         android:orientation="horizontal"
-        android:paddingLeft="16dp"
-        android:paddingRight="16dp">
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp">
 
         <Button
             android:id="@+id/previous_button"
diff --git a/app/src/main/res/layout/activity_smscommunicator_otp.xml b/app/src/main/res/layout/activity_smscommunicator_otp.xml
index 3150637eb0..99d1e3b68f 100644
--- a/app/src/main/res/layout/activity_smscommunicator_otp.xml
+++ b/app/src/main/res/layout/activity_smscommunicator_otp.xml
@@ -100,9 +100,9 @@
                 style="?android:attr/buttonStyle"
                 android:layout_width="fill_parent"
                 android:layout_height="match_parent"
-                android:layout_marginLeft="10dp"
+                android:layout_marginStart="10dp"
                 android:layout_marginTop="3dp"
-                android:layout_marginRight="10dp"
+                android:layout_marginEnd="10dp"
                 android:layout_marginBottom="3dp"
                 android:text="@string/smscommunicator_otp_reset_btn"
                 android:textColor="?attr/treatmentButton" />
diff --git a/app/src/main/res/layout/activity_stats.xml b/app/src/main/res/layout/activity_stats.xml
index 4ac78458af..a989177404 100644
--- a/app/src/main/res/layout/activity_stats.xml
+++ b/app/src/main/res/layout/activity_stats.xml
@@ -32,8 +32,8 @@
                 android:layout_height="wrap_content"
                 android:layout_centerInParent="true"
                 android:layout_gravity="center"
-                android:layout_marginLeft="10dp"
-                android:layout_marginRight="10dp"
+                android:layout_marginStart="10dp"
+                android:layout_marginEnd="10dp"
                 android:text="@string/statistics"
                 android:textAlignment="center"
                 android:textAppearance="?android:attr/textAppearanceLarge" />
diff --git a/app/src/main/res/layout/careportal_stats_fragment.xml b/app/src/main/res/layout/careportal_stats_fragment.xml
index e5d724cc09..df85552e4f 100644
--- a/app/src/main/res/layout/careportal_stats_fragment.xml
+++ b/app/src/main/res/layout/careportal_stats_fragment.xml
@@ -36,8 +36,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:gravity="center_vertical"
-            android:paddingLeft="2dp"
-            android:paddingRight="2dp"
+            android:paddingStart="2dp"
+            android:paddingEnd="2dp"
             android:textSize="14sp" />
 
         <TextView
@@ -69,9 +69,9 @@
         <View
             android:layout_width="fill_parent"
             android:layout_height="2dip"
-            android:layout_marginLeft="20dp"
+            android:layout_marginStart="20dp"
             android:layout_marginTop="2dp"
-            android:layout_marginRight="20dp"
+            android:layout_marginEnd="20dp"
             android:layout_marginBottom="2dp"
             android:layout_span="5"
             android:background="?android:attr/dividerHorizontal" />
@@ -108,8 +108,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:gravity="center_vertical"
-            android:paddingLeft="2dp"
-            android:paddingRight="2dp"
+            android:paddingStart="2dp"
+            android:paddingEnd="2dp"
             android:textSize="14sp" />
 
 
@@ -142,9 +142,9 @@
         <View
             android:layout_width="fill_parent"
             android:layout_height="2dip"
-            android:layout_marginLeft="20dp"
+            android:layout_marginStart="20dp"
             android:layout_marginTop="2dp"
-            android:layout_marginRight="20dp"
+            android:layout_marginEnd="20dp"
             android:layout_marginBottom="2dp"
             android:layout_span="5"
             android:background="?android:attr/dividerHorizontal" />
@@ -182,8 +182,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:gravity="center_vertical"
-            android:paddingLeft="2dp"
-            android:paddingRight="2dp"
+            android:paddingStart="2dp"
+            android:paddingEnd="2dp"
             android:textSize="14sp" />
 
         <TextView
@@ -214,9 +214,9 @@
         <View
             android:layout_width="fill_parent"
             android:layout_height="2dip"
-            android:layout_marginLeft="20dp"
+            android:layout_marginStart="20dp"
             android:layout_marginTop="2dp"
-            android:layout_marginRight="20dp"
+            android:layout_marginEnd="20dp"
             android:layout_marginBottom="2dp"
             android:layout_span="5"
             android:background="?android:attr/dividerHorizontal" />
@@ -255,8 +255,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:gravity="center_vertical"
-            android:paddingLeft="2dp"
-            android:paddingRight="2dp"
+            android:paddingStart="2dp"
+            android:paddingEnd="2dp"
             android:textSize="14sp" />
 
         <TextView
diff --git a/app/src/main/res/layout/dialog_calibration.xml b/app/src/main/res/layout/dialog_calibration.xml
index e52e675e3c..dc4fc27176 100644
--- a/app/src/main/res/layout/dialog_calibration.xml
+++ b/app/src/main/res/layout/dialog_calibration.xml
@@ -31,8 +31,8 @@
                 android:layout_height="wrap_content"
                 android:layout_centerInParent="true"
                 android:layout_gravity="center"
-                android:layout_marginLeft="10dp"
-                android:layout_marginRight="10dp"
+                android:layout_marginStart="10dp"
+                android:layout_marginEnd="10dp"
                 android:text="@string/overview_calibration"
                 android:textAlignment="center"
                 android:textAppearance="?android:attr/textAppearanceLarge" />
diff --git a/app/src/main/res/layout/dialog_carbs.xml b/app/src/main/res/layout/dialog_carbs.xml
index eb9bc9c37b..e8b9e70bf6 100644
--- a/app/src/main/res/layout/dialog_carbs.xml
+++ b/app/src/main/res/layout/dialog_carbs.xml
@@ -30,8 +30,8 @@
                 android:layout_height="wrap_content"
                 android:layout_centerInParent="true"
                 android:layout_gravity="center"
-                android:layout_marginLeft="10dp"
-                android:layout_marginRight="10dp"
+                android:layout_marginStart="10dp"
+                android:layout_marginEnd="10dp"
                 android:text="@string/carbs"
                 android:textAlignment="center"
                 android:textAppearance="?android:attr/textAppearanceLarge" />
@@ -95,8 +95,8 @@
                         android:layout_height="wrap_content"
                         android:layout_gravity="center"
                         android:width="120dp"
-                        android:paddingLeft="10dp"
-                        android:paddingRight="10dp"
+                        android:paddingStart="10dp"
+                        android:paddingEnd="10dp"
                         android:text="@string/time_offset"
                         android:gravity="center_vertical"
                         android:layout_weight="1"
@@ -183,8 +183,8 @@
                         android:layout_weight="1"
                         android:padding="10dp"
                         android:width="120dp"
-                        android:paddingLeft="10dp"
-                        android:paddingRight="10dp"
+                        android:paddingStart="10dp"
+                        android:paddingEnd="10dp"
                         android:text="@string/treatments_wizard_carbs_label"
                         android:textAppearance="@style/TextAppearance.AppCompat.Small"
                         android:textStyle="bold" />
@@ -256,8 +256,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:paddingLeft="10dp"
-                android:paddingRight="10dp"
+                android:paddingStart="10dp"
+                android:paddingEnd="10dp"
                 android:text="@string/bolus_reminder"
                 android:gravity="center_vertical"
                 android:textAppearance="@style/TextAppearance.AppCompat.Small"
diff --git a/app/src/main/res/layout/dialog_care.xml b/app/src/main/res/layout/dialog_care.xml
index 944308229b..63478f5441 100644
--- a/app/src/main/res/layout/dialog_care.xml
+++ b/app/src/main/res/layout/dialog_care.xml
@@ -32,8 +32,8 @@
                 android:layout_height="wrap_content"
                 android:layout_centerInParent="true"
                 android:layout_gravity="center"
-                android:layout_marginLeft="10dp"
-                android:layout_marginRight="10dp"
+                android:layout_marginStart="10dp"
+                android:layout_marginEnd="10dp"
                 android:text="@string/careportal_profileswitch"
                 android:textAlignment="center"
                 android:textAppearance="?android:attr/textAppearanceLarge" />
diff --git a/app/src/main/res/layout/dialog_extendedbolus.xml b/app/src/main/res/layout/dialog_extendedbolus.xml
index b26d2cfc9a..808f8d47f1 100644
--- a/app/src/main/res/layout/dialog_extendedbolus.xml
+++ b/app/src/main/res/layout/dialog_extendedbolus.xml
@@ -29,8 +29,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:layout_marginLeft="10dp"
-                android:layout_marginRight="10dp"
+                android:layout_marginStart="10dp"
+                android:layout_marginEnd="10dp"
                 android:text="@string/virtualpump_extendedbolus_label"
                 android:textAlignment="center"
                 android:textAppearance="?android:attr/textAppearanceLarge" />
@@ -73,8 +73,8 @@
                 android:layout_gravity="center_vertical"
                 android:gravity="start"
                 android:minWidth="45dp"
-                android:paddingLeft="5dp"
-                android:paddingRight="5dp"
+                android:paddingStart="5dp"
+                android:paddingEnd="5dp"
                 android:text="@string/insulin_unit_shortname"
                 android:textAppearance="?android:attr/textAppearanceSmall" />
 
@@ -108,8 +108,8 @@
                 android:layout_gravity="center_vertical"
                 android:gravity="start"
                 android:minWidth="45dp"
-                android:paddingLeft="5dp"
-                android:paddingRight="5dp"
+                android:paddingStart="5dp"
+                android:paddingEnd="5dp"
                 android:text="@string/unit_minute_short"
                 android:textAppearance="?android:attr/textAppearanceSmall" />
 
diff --git a/app/src/main/res/layout/dialog_fill.xml b/app/src/main/res/layout/dialog_fill.xml
index 38f675407d..01bd3dd1c2 100644
--- a/app/src/main/res/layout/dialog_fill.xml
+++ b/app/src/main/res/layout/dialog_fill.xml
@@ -30,8 +30,8 @@
                 android:layout_height="wrap_content"
                 android:layout_centerInParent="true"
                 android:layout_gravity="center"
-                android:layout_marginLeft="10dp"
-                android:layout_marginRight="10dp"
+                android:layout_marginStart="10dp"
+                android:layout_marginEnd="10dp"
                 android:text="@string/primefill"
                 android:textAlignment="center"
                 android:textAppearance="?android:attr/textAppearanceLarge" />
@@ -86,8 +86,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="40dp"
                 android:layout_gravity="end"
-                android:paddingLeft="5dp"
-                android:paddingRight="5dp"
+                android:paddingStart="5dp"
+                android:paddingEnd="5dp"
                 app:customContentDescription="@string/overview_insulin_label" />
 
             <TextView
diff --git a/app/src/main/res/layout/dialog_insulin.xml b/app/src/main/res/layout/dialog_insulin.xml
index d92878f9d6..0e523a391f 100644
--- a/app/src/main/res/layout/dialog_insulin.xml
+++ b/app/src/main/res/layout/dialog_insulin.xml
@@ -30,8 +30,8 @@
                 android:layout_height="wrap_content"
                 android:layout_centerInParent="true"
                 android:layout_gravity="center"
-                android:layout_marginLeft="10dp"
-                android:layout_marginRight="10dp"
+                android:layout_marginStart="10dp"
+                android:layout_marginEnd="10dp"
                 android:text="@string/overview_insulin_label"
                 android:textAlignment="center"
                 android:textAppearance="?android:attr/textAppearanceLarge" />
diff --git a/app/src/main/res/layout/dialog_loop.xml b/app/src/main/res/layout/dialog_loop.xml
index 13738c5c3e..e8024e8552 100644
--- a/app/src/main/res/layout/dialog_loop.xml
+++ b/app/src/main/res/layout/dialog_loop.xml
@@ -31,8 +31,8 @@
                 android:layout_height="wrap_content"
                 android:layout_centerInParent="true"
                 android:layout_gravity="center"
-                android:layout_marginLeft="10dp"
-                android:layout_marginRight="10dp"
+                android:layout_marginStart="10dp"
+                android:layout_marginEnd="10dp"
                 android:text="@string/loop"
                 android:textAlignment="center"
                 android:textAppearance="?android:attr/textAppearanceLarge" />
@@ -58,8 +58,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
-                android:layout_marginLeft="10dp"
-                android:layout_marginRight="10dp"
+                android:layout_marginStart="10dp"
+                android:layout_marginEnd="10dp"
                 android:text="@string/loop"
                 android:textAppearance="?android:attr/textAppearanceLarge" />
 
@@ -78,8 +78,8 @@
                     android:layout_gravity="center"
                     android:layout_marginEnd="-4dp"
                     android:layout_weight="0.5"
-                    android:paddingLeft="10dp"
-                    android:paddingRight="10dp"
+                    android:paddingStart="10dp"
+                    android:paddingEnd="10dp"
                     android:drawableTop="@drawable/ic_loop_closed"
                     android:text="@string/closedloop"
                     android:textAppearance="@style/TextAppearance.AppCompat.Medium"
@@ -94,8 +94,8 @@
                     android:layout_gravity="center"
                     android:layout_marginEnd="-4dp"
                     android:layout_weight="0.5"
-                    android:paddingLeft="10dp"
-                    android:paddingRight="10dp"
+                    android:paddingStart="10dp"
+                    android:paddingEnd="10dp"
                     android:drawableTop="@drawable/ic_loop_lgs"
                     android:text="@string/lowglucosesuspend"
                     android:textAppearance="@style/TextAppearance.AppCompat.Medium"
@@ -110,8 +110,8 @@
                     android:layout_gravity="center"
                     android:layout_marginEnd="-4dp"
                     android:layout_weight="0.5"
-                    android:paddingLeft="10dp"
-                    android:paddingRight="10dp"
+                    android:paddingStart="10dp"
+                    android:paddingEnd="10dp"
                     android:drawableTop="@drawable/ic_loop_open"
                     android:text="@string/openloop"
                     android:textAppearance="@style/TextAppearance.AppCompat.Medium"
@@ -126,8 +126,8 @@
                     android:layout_gravity="center"
                     android:layout_marginEnd="-4dp"
                     android:layout_weight="0.5"
-                    android:paddingLeft="10dp"
-                    android:paddingRight="10dp"
+                    android:paddingStart="10dp"
+                    android:paddingEnd="10dp"
                     android:drawableTop="@drawable/ic_loop_resume"
                     android:text="@string/enableloop"
                     android:textAppearance="@style/TextAppearance.AppCompat.Medium"
@@ -142,8 +142,8 @@
                     android:layout_gravity="center"
                     android:layout_marginEnd="-4dp"
                     android:layout_weight="0.5"
-                    android:paddingLeft="10dp"
-                    android:paddingRight="10dp"
+                    android:paddingStart="10dp"
+                    android:paddingEnd="10dp"
                     android:drawableTop="@drawable/ic_loop_disabled"
                     android:text="@string/disableloop"
                     android:textAppearance="@style/TextAppearance.AppCompat.Medium"
@@ -172,8 +172,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
-                android:layout_marginLeft="10dp"
-                android:layout_marginRight="10dp"
+                android:layout_marginStart="10dp"
+                android:layout_marginEnd="10dp"
                 android:text="@string/suspendloop"
                 android:textAppearance="?android:attr/textAppearanceLarge" />
 
@@ -187,8 +187,8 @@
                 android:layout_marginEnd="-4dp"
                 android:layout_weight="0.5"
                 android:drawableTop="@drawable/ic_loop_resume"
-                android:paddingLeft="10dp"
-                android:paddingRight="10dp"
+                android:paddingStart="10dp"
+                android:paddingEnd="10dp"
                 android:text="@string/resumeloop"
                 android:textAppearance="@style/TextAppearance.AppCompat.Medium"
                 android:textSize="11sp"
@@ -208,8 +208,8 @@
                     android:layout_height="fill_parent"
                     android:layout_marginEnd="-4dp"
                     android:layout_weight="0.5"
-                    android:paddingLeft="5dp"
-                    android:paddingRight="5dp"
+                    android:paddingStart="5dp"
+                    android:paddingEnd="5dp"
                     android:drawableTop="@drawable/ic_loop_paused"
                     android:text="@string/duration1h"
                     android:textAppearance="@style/TextAppearance.AppCompat.Medium"
@@ -222,8 +222,8 @@
                     android:layout_height="fill_parent"
                     android:layout_marginEnd="-4dp"
                     android:layout_weight="0.5"
-                    android:paddingLeft="5dp"
-                    android:paddingRight="5dp"
+                    android:paddingStart="5dp"
+                    android:paddingEnd="5dp"
                     android:drawableTop="@drawable/ic_loop_paused"
                     android:text="@string/duration2h"
                     android:textAppearance="@style/TextAppearance.AppCompat.Medium"
@@ -237,8 +237,8 @@
                     android:layout_height="fill_parent"
                     android:layout_marginEnd="-4dp"
                     android:layout_weight="0.5"
-                    android:paddingLeft="5dp"
-                    android:paddingRight="5dp"
+                    android:paddingStart="5dp"
+                    android:paddingEnd="5dp"
                     android:drawableTop="@drawable/ic_loop_paused"
                     android:text="@string/duration3h"
                     android:textAppearance="@style/TextAppearance.AppCompat.Medium"
@@ -252,8 +252,8 @@
                     android:layout_height="fill_parent"
                     android:layout_marginEnd="-4dp"
                     android:layout_weight="0.5"
-                    android:paddingLeft="5dp"
-                    android:paddingRight="5dp"
+                    android:paddingStart="5dp"
+                    android:paddingEnd="5dp"
                     android:drawableTop="@drawable/ic_loop_paused"
                     android:text="@string/duration10h"
                     android:textAppearance="@style/TextAppearance.AppCompat.Medium"
@@ -282,8 +282,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
-                android:layout_marginLeft="10dp"
-                android:layout_marginRight="10dp"
+                android:layout_marginStart="10dp"
+                android:layout_marginEnd="10dp"
                 android:text="@string/disconnectpump"
                 android:textAppearance="?android:attr/textAppearanceLarge" />
 
@@ -296,8 +296,8 @@
                 android:layout_marginEnd="-4dp"
                 android:layout_weight="0.5"
                 android:drawableTop="@drawable/ic_loop_reconnect"
-                android:paddingLeft="10dp"
-                android:paddingRight="10dp"
+                android:paddingStart="10dp"
+                android:paddingEnd="10dp"
                 android:text="@string/reconnect"
                 android:textAppearance="@style/TextAppearance.AppCompat.Medium"
                 android:textSize="11sp"
@@ -317,8 +317,8 @@
                     android:layout_height="fill_parent"
                     android:layout_marginEnd="-4dp"
                     android:layout_weight="0.5"
-                    android:paddingLeft="5dp"
-                    android:paddingRight="5dp"
+                    android:paddingStart="5dp"
+                    android:paddingEnd="5dp"
                     android:drawableTop="@drawable/ic_loop_disconnected"
                     android:text="@string/duration15m"
                     android:textAppearance="@style/TextAppearance.AppCompat.Medium"
@@ -331,8 +331,8 @@
                     android:layout_height="fill_parent"
                     android:layout_marginEnd="-4dp"
                     android:layout_weight="0.5"
-                    android:paddingLeft="5dp"
-                    android:paddingRight="5dp"
+                    android:paddingStart="5dp"
+                    android:paddingEnd="5dp"
                     android:drawableTop="@drawable/ic_loop_disconnected"
                     android:text="@string/duration30m"
                     android:textAppearance="@style/TextAppearance.AppCompat.Medium"
@@ -345,8 +345,8 @@
                     android:layout_height="fill_parent"
                     android:layout_marginEnd="-4dp"
                     android:layout_weight="0.5"
-                    android:paddingLeft="5dp"
-                    android:paddingRight="5dp"
+                    android:paddingStart="5dp"
+                    android:paddingEnd="5dp"
                     android:drawableTop="@drawable/ic_loop_disconnected"
                     android:text="@string/duration1h"
                     android:textAppearance="@style/TextAppearance.AppCompat.Medium"
@@ -359,8 +359,8 @@
                     android:layout_height="fill_parent"
                     android:layout_marginEnd="-4dp"
                     android:layout_weight="0.5"
-                    android:paddingLeft="5dp"
-                    android:paddingRight="5dp"
+                    android:paddingStart="5dp"
+                    android:paddingEnd="5dp"
                     android:drawableTop="@drawable/ic_loop_disconnected"
                     android:text="@string/duration2h"
                     android:textAppearance="@style/TextAppearance.AppCompat.Medium"
@@ -373,8 +373,8 @@
                     android:layout_height="fill_parent"
                     android:layout_marginEnd="-4dp"
                     android:layout_weight="0.5"
-                    android:paddingLeft="5dp"
-                    android:paddingRight="5dp"
+                    android:paddingStart="5dp"
+                    android:paddingEnd="5dp"
                     android:drawableTop="@drawable/ic_loop_disconnected"
                     android:text="@string/duration3h"
                     android:textAppearance="@style/TextAppearance.AppCompat.Medium"
diff --git a/app/src/main/res/layout/dialog_profileswitch.xml b/app/src/main/res/layout/dialog_profileswitch.xml
index f8b51f33b4..e6985c6e85 100644
--- a/app/src/main/res/layout/dialog_profileswitch.xml
+++ b/app/src/main/res/layout/dialog_profileswitch.xml
@@ -30,8 +30,8 @@
                 android:layout_height="wrap_content"
                 android:layout_centerInParent="true"
                 android:layout_gravity="center"
-                android:layout_marginLeft="10dp"
-                android:layout_marginRight="10dp"
+                android:layout_marginStart="10dp"
+                android:layout_marginEnd="10dp"
                 android:text="@string/careportal_profileswitch"
                 android:textAlignment="center"
                 android:textAppearance="?android:attr/textAppearanceLarge" />
@@ -92,8 +92,8 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:width="120dp"
-                android:paddingLeft="10dp"
-                android:paddingRight="10dp"
+                android:paddingStart="10dp"
+                android:paddingEnd="10dp"
                 android:text="@string/careportal_newnstreatment_duration_label"
                 android:textAppearance="@style/TextAppearance.AppCompat.Small"
                 android:textStyle="bold" />
@@ -129,8 +129,8 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:width="120dp"
-                android:paddingLeft="10dp"
-                android:paddingRight="10dp"
+                android:paddingStart="10dp"
+                android:paddingEnd="10dp"
                 android:text="@string/careportal_newnstreatment_percentage_label"
                 android:textAppearance="@style/TextAppearance.AppCompat.Small"
                 android:textStyle="bold" />
@@ -166,8 +166,8 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:width="120dp"
-                android:paddingLeft="10dp"
-                android:paddingRight="10dp"
+                android:paddingStart="10dp"
+                android:paddingEnd="10dp"
                 android:text="@string/careportal_newnstreatment_timeshift_label"
                 android:textAppearance="@style/TextAppearance.AppCompat.Small"
                 android:textStyle="bold" />
@@ -202,8 +202,8 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:width="120dp"
-                android:paddingLeft="10dp"
-                android:paddingRight="10dp"
+                android:paddingStart="10dp"
+                android:paddingEnd="10dp"
                 android:text="@string/careportal_temporarytarget"
                 android:textAppearance="@style/TextAppearance.AppCompat.Small"
                 android:textStyle="bold" />
diff --git a/app/src/main/res/layout/dialog_tempbasal.xml b/app/src/main/res/layout/dialog_tempbasal.xml
index f43b8cc0fc..1df4978e30 100644
--- a/app/src/main/res/layout/dialog_tempbasal.xml
+++ b/app/src/main/res/layout/dialog_tempbasal.xml
@@ -30,8 +30,8 @@
                 android:layout_height="wrap_content"
                 android:layout_centerInParent="true"
                 android:layout_gravity="center"
-                android:layout_marginLeft="10dp"
-                android:layout_marginRight="10dp"
+                android:layout_marginStart="10dp"
+                android:layout_marginEnd="10dp"
                 android:text="@string/tempbasal_label"
                 android:textAlignment="center"
                 android:textAppearance="?android:attr/textAppearanceLarge" />
diff --git a/app/src/main/res/layout/dialog_temptarget.xml b/app/src/main/res/layout/dialog_temptarget.xml
index 581b196fb7..b6449bc7f5 100644
--- a/app/src/main/res/layout/dialog_temptarget.xml
+++ b/app/src/main/res/layout/dialog_temptarget.xml
@@ -30,8 +30,8 @@
                 android:layout_height="wrap_content"
                 android:layout_centerInParent="true"
                 android:layout_gravity="center"
-                android:layout_marginLeft="10dp"
-                android:layout_marginRight="10dp"
+                android:layout_marginStart="10dp"
+                android:layout_marginEnd="10dp"
                 android:text="@string/careportal_temporarytarget"
                 android:textAlignment="center"
                 android:textAppearance="?android:attr/textAppearanceLarge" />
@@ -146,8 +146,8 @@
                 android:layout_marginEnd="-4dp"
                 android:layout_weight="0.5"
                 android:drawableTop="@drawable/ic_target_cancel"
-                android:paddingLeft="5dp"
-                android:paddingRight="5dp"
+                android:paddingStart="5dp"
+                android:paddingEnd="5dp"
                 android:text="@string/cancel"
                 android:textAppearance="@style/TextAppearance.AppCompat.Medium"
                 android:textColor="?attr/tempTargetConfirmation"
@@ -161,8 +161,8 @@
                 android:layout_marginEnd="-4dp"
                 android:layout_weight="0.5"
                 android:drawableTop="@drawable/ic_target_eatingsoon"
-                android:paddingLeft="5dp"
-                android:paddingRight="5dp"
+                android:paddingStart="5dp"
+                android:paddingEnd="5dp"
                 android:text="@string/eatingsoon"
                 android:textAppearance="@style/TextAppearance.AppCompat.Medium"
                 android:textColor="?attr/carbsColor"
@@ -176,8 +176,8 @@
                 android:layout_marginEnd="-4dp"
                 android:layout_weight="0.5"
                 android:drawableTop="@drawable/ic_target_activity"
-                android:paddingLeft="5dp"
-                android:paddingRight="5dp"
+                android:paddingStart="5dp"
+                android:paddingEnd="5dp"
                 android:text="@string/activity"
                 android:textAppearance="@style/TextAppearance.AppCompat.Medium"
                 android:textColor="?attr/exerciseColor"
@@ -190,8 +190,8 @@
                 android:layout_height="fill_parent"
                 android:layout_weight="0.5"
                 android:drawableTop="@drawable/ic_target_hypo"
-                android:paddingLeft="5dp"
-                android:paddingRight="5dp"
+                android:paddingStart="5dp"
+                android:paddingEnd="5dp"
                 android:text="@string/hypo"
                 android:textAppearance="@style/TextAppearance.AppCompat.Medium"
                 android:textColor="?attr/lowColor"
diff --git a/app/src/main/res/layout/dialog_treatment.xml b/app/src/main/res/layout/dialog_treatment.xml
index 7708232cb0..e44fc1c6ef 100644
--- a/app/src/main/res/layout/dialog_treatment.xml
+++ b/app/src/main/res/layout/dialog_treatment.xml
@@ -30,8 +30,8 @@
                 android:layout_height="wrap_content"
                 android:layout_centerInParent="true"
                 android:layout_gravity="center"
-                android:layout_marginLeft="10dp"
-                android:layout_marginRight="10dp"
+                android:layout_marginStart="10dp"
+                android:layout_marginEnd="10dp"
                 android:text="@string/overview_treatment_label"
                 android:textAlignment="center"
                 android:textAppearance="?android:attr/textAppearanceLarge" />
diff --git a/app/src/main/res/layout/dialog_wizard.xml b/app/src/main/res/layout/dialog_wizard.xml
index 69f9ae3459..7ce4846a4d 100644
--- a/app/src/main/res/layout/dialog_wizard.xml
+++ b/app/src/main/res/layout/dialog_wizard.xml
@@ -30,8 +30,8 @@
                 android:layout_height="wrap_content"
                 android:layout_centerInParent="true"
                 android:layout_gravity="center"
-                android:layout_marginLeft="10dp"
-                android:layout_marginRight="10dp"
+                android:layout_marginStart="10dp"
+                android:layout_marginEnd="10dp"
                 android:text="@string/boluswizard"
                 android:textAlignment="center"
                 android:textAppearance="?android:attr/textAppearanceLarge" />
@@ -191,8 +191,8 @@
                 android:id="@+id/total"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:paddingLeft="10dp"
-                android:paddingRight="10dp"
+                android:paddingStart="10dp"
+                android:paddingEnd="10dp"
                 android:text="2.35U 28g"
                 android:textAppearance="?android:attr/textAppearanceLarge"
                 tools:ignore="HardcodedText" />
@@ -202,8 +202,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="10dp"
-                android:paddingLeft="10dp"
-                android:paddingRight="10dp"
+                android:paddingStart="10dp"
+                android:paddingEnd="10dp"
                 android:text="50%"
                 android:textAppearance="?android:attr/textAppearanceLarge"
                 android:textColor="?attr/bolusColor"
diff --git a/app/src/main/res/layout/dialog_wizardinfo.xml b/app/src/main/res/layout/dialog_wizardinfo.xml
index 517d1ecec2..4931058f2a 100644
--- a/app/src/main/res/layout/dialog_wizardinfo.xml
+++ b/app/src/main/res/layout/dialog_wizardinfo.xml
@@ -30,8 +30,8 @@
                 android:layout_height="wrap_content"
                 android:layout_centerInParent="true"
                 android:layout_gravity="center"
-                android:layout_marginLeft="10dp"
-                android:layout_marginRight="10dp"
+                android:layout_marginStart="10dp"
+                android:layout_marginEnd="10dp"
                 android:text="@string/wear_wizard_settings"
                 android:textAlignment="center"
                 android:textAppearance="?android:attr/textAppearanceLarge" />
diff --git a/app/src/main/res/layout/food_item.xml b/app/src/main/res/layout/food_item.xml
index 10da29c42e..af7be5d91d 100644
--- a/app/src/main/res/layout/food_item.xml
+++ b/app/src/main/res/layout/food_item.xml
@@ -28,8 +28,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
-            android:paddingLeft="3dp"
-            android:paddingRight="3dp">
+            android:paddingStart="3dp"
+            android:paddingEnd="3dp">
 
             <LinearLayout
                 android:id="@+id/name_and_info_container"
@@ -65,7 +65,7 @@
                     android:layout_weight="1"
                     android:gravity="start"
                     android:orientation="horizontal"
-                    android:layout_marginLeft="5dp">
+                    android:layout_marginStart="5dp">
 
                     <TextView
                         android:id="@+id/carbs"
diff --git a/app/src/main/res/layout/import_summary_details.xml b/app/src/main/res/layout/import_summary_details.xml
index 8c9c0bd7f2..41d3d9db4a 100644
--- a/app/src/main/res/layout/import_summary_details.xml
+++ b/app/src/main/res/layout/import_summary_details.xml
@@ -3,8 +3,8 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:paddingLeft="8dp"
-    android:paddingRight="8dp">
+    android:paddingStart="8dp"
+    android:paddingEnd="8dp">
 
     <WebView
         android:id="@+id/details_webview"
diff --git a/app/src/main/res/layout/import_summary_item.xml b/app/src/main/res/layout/import_summary_item.xml
index eb05684550..4c90d7c08b 100644
--- a/app/src/main/res/layout/import_summary_item.xml
+++ b/app/src/main/res/layout/import_summary_item.xml
@@ -18,7 +18,7 @@
         android:layout_width="20dp"
         android:layout_height="20dp"
         android:layout_marginTop="4dp"
-        android:layout_marginRight="4dp"
+        android:layout_marginEnd="4dp"
         android:layout_marginBottom="4dp"
         app:srcCompat="@drawable/ic_meta_format"
         android:tint="#ffffff" />
diff --git a/app/src/main/res/layout/localprofile_fragment.xml b/app/src/main/res/layout/localprofile_fragment.xml
index ec8234f334..785cb700c1 100644
--- a/app/src/main/res/layout/localprofile_fragment.xml
+++ b/app/src/main/res/layout/localprofile_fragment.xml
@@ -296,11 +296,11 @@
                 android:layout_width="wrap_content"
                 android:layout_height="0dp"
                 android:layout_gravity="center_horizontal"
-                android:layout_marginLeft="10dp"
-                android:layout_marginRight="10dp"
+                android:layout_marginStart="10dp"
+                android:layout_marginEnd="10dp"
                 android:layout_weight="1"
-                android:paddingLeft="10dp"
-                android:paddingRight="10dp"
+                android:paddingStart="10dp"
+                android:paddingEnd="10dp"
                 android:text="@string/activate_profile"
                 app:icon="@drawable/ic_local_activate"
                 app:iconTint="@color/ic_local_activate" />
@@ -317,11 +317,11 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_horizontal"
-                    android:layout_marginLeft="5dp"
-                    android:layout_marginRight="5dp"
+                    android:layout_marginStart="5dp"
+                    android:layout_marginEnd="5dp"
                     android:layout_weight="1"
-                    android:paddingLeft="1dp"
-                    android:paddingRight="1dp"
+                    android:paddingStart="1dp"
+                    android:paddingEnd="1dp"
                     android:text="@string/reset"
                     app:icon="@drawable/ic_local_reset"
                     app:iconTint="@color/ic_local_reset" />
@@ -332,11 +332,11 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_horizontal"
-                    android:layout_marginLeft="5dp"
-                    android:layout_marginRight="5dp"
+                    android:layout_marginStart="5dp"
+                    android:layout_marginEnd="5dp"
                     android:layout_weight="1"
-                    android:paddingLeft="1dp"
-                    android:paddingRight="1dp"
+                    android:paddingStart="1dp"
+                    android:paddingEnd="1dp"
                     android:text="@string/save"
                     app:icon="@drawable/ic_local_save"
                     app:iconTint="@color/ic_local_save" />
diff --git a/app/src/main/res/layout/loop_fragment.xml b/app/src/main/res/layout/loop_fragment.xml
index 98525ce294..bdd975b74e 100644
--- a/app/src/main/res/layout/loop_fragment.xml
+++ b/app/src/main/res/layout/loop_fragment.xml
@@ -56,9 +56,9 @@
         <View
             android:layout_width="fill_parent"
             android:layout_height="2dip"
-            android:layout_marginLeft="20dp"
+            android:layout_marginStart="20dp"
             android:layout_marginTop="5dp"
-            android:layout_marginRight="20dp"
+            android:layout_marginEnd="20dp"
             android:layout_marginBottom="5dp"
             android:background="?android:attr/dividerHorizontal" />
 
@@ -102,9 +102,9 @@
         <View
             android:layout_width="fill_parent"
             android:layout_height="2dip"
-            android:layout_marginLeft="20dp"
+            android:layout_marginStart="20dp"
             android:layout_marginTop="5dp"
-            android:layout_marginRight="20dp"
+            android:layout_marginEnd="20dp"
             android:layout_marginBottom="5dp"
             android:background="?android:attr/dividerHorizontal" />
 
@@ -147,9 +147,9 @@
         <View
             android:layout_width="fill_parent"
             android:layout_height="2dip"
-            android:layout_marginLeft="20dp"
+            android:layout_marginStart="20dp"
             android:layout_marginTop="5dp"
-            android:layout_marginRight="20dp"
+            android:layout_marginEnd="20dp"
             android:layout_marginBottom="5dp"
             android:background="?android:attr/dividerHorizontal" />
 
@@ -192,9 +192,9 @@
         <View
             android:layout_width="fill_parent"
             android:layout_height="2dip"
-            android:layout_marginLeft="20dp"
+            android:layout_marginStart="20dp"
             android:layout_marginTop="5dp"
-            android:layout_marginRight="20dp"
+            android:layout_marginEnd="20dp"
             android:layout_marginBottom="5dp"
             android:background="?android:attr/dividerHorizontal" />
 
@@ -237,9 +237,9 @@
         <View
             android:layout_width="fill_parent"
             android:layout_height="2dip"
-            android:layout_marginLeft="20dp"
+            android:layout_marginStart="20dp"
             android:layout_marginTop="5dp"
-            android:layout_marginRight="20dp"
+            android:layout_marginEnd="20dp"
             android:layout_marginBottom="5dp"
             android:background="?android:attr/dividerHorizontal" />
 
@@ -282,9 +282,9 @@
         <View
             android:layout_width="fill_parent"
             android:layout_height="2dip"
-            android:layout_marginLeft="20dp"
+            android:layout_marginStart="20dp"
             android:layout_marginTop="5dp"
-            android:layout_marginRight="20dp"
+            android:layout_marginEnd="20dp"
             android:layout_marginBottom="5dp"
             android:background="?android:attr/dividerHorizontal" />
 
@@ -327,9 +327,9 @@
         <View
             android:layout_width="fill_parent"
             android:layout_height="2dip"
-            android:layout_marginLeft="20dp"
+            android:layout_marginStart="20dp"
             android:layout_marginTop="5dp"
-            android:layout_marginRight="20dp"
+            android:layout_marginEnd="20dp"
             android:layout_marginBottom="5dp"
             android:background="?android:attr/dividerHorizontal" />
 
@@ -372,9 +372,9 @@
         <View
             android:layout_width="fill_parent"
             android:layout_height="2dip"
-            android:layout_marginLeft="20dp"
+            android:layout_marginStart="20dp"
             android:layout_marginTop="5dp"
-            android:layout_marginRight="20dp"
+            android:layout_marginEnd="20dp"
             android:layout_marginBottom="5dp"
             android:background="?android:attr/dividerHorizontal" />
 
@@ -417,9 +417,9 @@
         <View
             android:layout_width="fill_parent"
             android:layout_height="2dip"
-            android:layout_marginLeft="20dp"
+            android:layout_marginStart="20dp"
             android:layout_marginTop="5dp"
-            android:layout_marginRight="20dp"
+            android:layout_marginEnd="20dp"
             android:layout_marginBottom="5dp"
             android:background="?android:attr/dividerHorizontal" />
 
@@ -462,9 +462,9 @@
         <View
             android:layout_width="fill_parent"
             android:layout_height="2dip"
-            android:layout_marginLeft="20dp"
+            android:layout_marginStart="20dp"
             android:layout_marginTop="5dp"
-            android:layout_marginRight="20dp"
+            android:layout_marginEnd="20dp"
             android:layout_marginBottom="5dp"
             android:background="?android:attr/dividerHorizontal" />
 
@@ -507,9 +507,9 @@
         <View
             android:layout_width="fill_parent"
             android:layout_height="2dip"
-            android:layout_marginLeft="20dp"
+            android:layout_marginStart="20dp"
             android:layout_marginTop="5dp"
-            android:layout_marginRight="20dp"
+            android:layout_marginEnd="20dp"
             android:layout_marginBottom="5dp"
             android:background="?android:attr/dividerHorizontal" />
 
diff --git a/app/src/main/res/layout/maintenance_fragment.xml b/app/src/main/res/layout/maintenance_fragment.xml
index ff9ae43fd4..b715bf3133 100644
--- a/app/src/main/res/layout/maintenance_fragment.xml
+++ b/app/src/main/res/layout/maintenance_fragment.xml
@@ -24,9 +24,9 @@
             style="@style/GrayButton"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="10dp"
+            android:layout_marginStart="10dp"
             android:layout_marginTop="3dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginEnd="10dp"
             android:layout_marginBottom="3dp"
             android:layout_weight="0.5"
             android:text="@string/nav_logsettings"
@@ -37,9 +37,9 @@
             style="@style/GrayButton"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="10dp"
+            android:layout_marginStart="10dp"
             android:layout_marginTop="3dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginEnd="10dp"
             android:layout_marginBottom="3dp"
             android:layout_weight="0.5"
             android:text="@string/send_all_logs"
@@ -50,9 +50,9 @@
             style="@style/GrayButton"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="10dp"
+            android:layout_marginStart="10dp"
             android:layout_marginTop="3dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginEnd="10dp"
             android:layout_marginBottom="3dp"
             android:layout_weight="0.5"
             android:text="@string/delete_logs"
@@ -63,9 +63,9 @@
             style="@style/GrayButton"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="10dp"
+            android:layout_marginStart="10dp"
             android:layout_marginTop="3dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginEnd="10dp"
             android:layout_marginBottom="3dp"
             android:layout_weight="0.5"
             android:text="@string/nav_export"
@@ -76,9 +76,9 @@
             style="@style/GrayButton"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="10dp"
+            android:layout_marginStart="10dp"
             android:layout_marginTop="3dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginEnd="10dp"
             android:layout_marginBottom="3dp"
             android:layout_weight="0.5"
             android:text="@string/nav_import"
@@ -90,9 +90,9 @@
             style="@style/GrayButton"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="10dp"
+            android:layout_marginStart="10dp"
             android:layout_marginTop="3dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginEnd="10dp"
             android:layout_marginBottom="3dp"
             android:layout_weight="0.5"
             android:text="@string/ue_export_to_csv"
@@ -103,9 +103,9 @@
             style="@style/GrayButton"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="10dp"
+            android:layout_marginStart="10dp"
             android:layout_marginTop="3dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginEnd="10dp"
             android:layout_marginBottom="3dp"
             android:layout_weight="0.5"
             android:text="@string/nav_resetdb"
diff --git a/app/src/main/res/layout/ns_client_fragment.xml b/app/src/main/res/layout/ns_client_fragment.xml
index 7d91e7fdf2..a79fb66dc8 100644
--- a/app/src/main/res/layout/ns_client_fragment.xml
+++ b/app/src/main/res/layout/ns_client_fragment.xml
@@ -8,8 +8,8 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="5dp"
-        android:layout_marginRight="5dp"
+        android:layout_marginStart="5dp"
+        android:layout_marginEnd="5dp"
         android:layout_marginBottom="5dp"
         android:gravity="center_horizontal"
         android:orientation="horizontal">
@@ -23,7 +23,7 @@
             android:id="@+id/url"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="5dp"
+            android:layout_marginStart="5dp"
             android:autoLink="web"
             tools:ignore="RtlHardcoded" />
 
@@ -32,8 +32,8 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="5dp"
-        android:layout_marginRight="5dp"
+        android:layout_marginStart="5dp"
+        android:layout_marginEnd="5dp"
         android:layout_marginBottom="5dp"
         android:gravity="center_horizontal"
         android:orientation="horizontal">
@@ -48,8 +48,8 @@
             android:id="@+id/autoscroll"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="20dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginStart="20dp"
+            android:layout_marginEnd="10dp"
             android:text="@string/nsclientinternal_autoscroll"
             tools:ignore="RtlHardcoded" />
 
@@ -58,14 +58,14 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="5dp"
-        android:layout_marginRight="5dp"
+        android:layout_marginStart="5dp"
+        android:layout_marginEnd="5dp"
         android:orientation="horizontal">
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginRight="5dp"
+            android:layout_marginEnd="5dp"
             android:text="@string/status"
             tools:ignore="RtlHardcoded" />
 
@@ -90,17 +90,17 @@
             android:id="@+id/queue"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="5dp"
-            android:layout_marginRight="5dp" />
+            android:layout_marginStart="5dp"
+            android:layout_marginEnd="5dp" />
 
     </LinearLayout>
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="5dp"
+        android:layout_marginStart="5dp"
         android:layout_marginTop="10dp"
-        android:layout_marginRight="5dp"
+        android:layout_marginEnd="5dp"
         android:layout_marginBottom="10dp"
         android:orientation="horizontal">
 
@@ -150,8 +150,8 @@
         android:id="@+id/log_scrollview"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
-        android:layout_marginLeft="5dp"
-        android:layout_marginRight="5dp">
+        android:layout_marginStart="5dp"
+        android:layout_marginEnd="5dp">
 
         <TextView
             android:id="@+id/log"
diff --git a/app/src/main/res/layout/objectives_fragment.xml b/app/src/main/res/layout/objectives_fragment.xml
index fa2e8c2150..37363a8491 100644
--- a/app/src/main/res/layout/objectives_fragment.xml
+++ b/app/src/main/res/layout/objectives_fragment.xml
@@ -10,8 +10,8 @@
         android:layout_height="wrap_content"
         android:gravity="center_vertical"
         android:orientation="horizontal"
-        android:paddingLeft="16dp"
-        android:paddingRight="16dp"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
         android:paddingTop="16dp"
         android:visibility="gone">
 
@@ -19,7 +19,7 @@
             android:id="@+id/fake"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginRight="16dp"
+            android:layout_marginEnd="16dp"
             android:layout_weight="1"
             android:text="Enable fake time and progress" />
 
diff --git a/app/src/main/res/layout/objectives_item.xml b/app/src/main/res/layout/objectives_item.xml
index 3e2cf47050..07e05be638 100644
--- a/app/src/main/res/layout/objectives_item.xml
+++ b/app/src/main/res/layout/objectives_item.xml
@@ -7,9 +7,9 @@
     android:id="@+id/obj_card"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginLeft="16dp"
+    android:layout_marginStart="16dp"
     android:layout_marginTop="16dp"
-    android:layout_marginRight="16dp"
+    android:layout_marginEnd="16dp"
     app:cardCornerRadius="4dp"
     app:cardElevation="4dp"
     app:cardUseCompatPadding="true"
diff --git a/app/src/main/res/layout/openapsama_fragment.xml b/app/src/main/res/layout/openapsama_fragment.xml
index 099997d324..8420607244 100644
--- a/app/src/main/res/layout/openapsama_fragment.xml
+++ b/app/src/main/res/layout/openapsama_fragment.xml
@@ -63,9 +63,9 @@
         <View
             android:layout_width="fill_parent"
             android:layout_height="2dip"
-            android:layout_marginLeft="20dp"
+            android:layout_marginStart="20dp"
             android:layout_marginTop="5dp"
-            android:layout_marginRight="20dp"
+            android:layout_marginEnd="20dp"
             android:layout_marginBottom="5dp"
             android:background="?android:attr/dividerHorizontal" />
 
@@ -88,9 +88,9 @@
         <View
             android:layout_width="fill_parent"
             android:layout_height="2dip"
-            android:layout_marginLeft="20dp"
+            android:layout_marginStart="20dp"
             android:layout_marginTop="5dp"
-            android:layout_marginRight="20dp"
+            android:layout_marginEnd="20dp"
             android:layout_marginBottom="5dp"
             android:background="?android:attr/dividerHorizontal" />
 
@@ -133,9 +133,9 @@
         <View
             android:layout_width="fill_parent"
             android:layout_height="2dip"
-            android:layout_marginLeft="20dp"
+            android:layout_marginStart="20dp"
             android:layout_marginTop="5dp"
-            android:layout_marginRight="20dp"
+            android:layout_marginEnd="20dp"
             android:layout_marginBottom="5dp"
             android:background="?android:attr/dividerHorizontal" />
 
@@ -178,9 +178,9 @@
         <View
             android:layout_width="fill_parent"
             android:layout_height="2dip"
-            android:layout_marginLeft="20dp"
+            android:layout_marginStart="20dp"
             android:layout_marginTop="5dp"
-            android:layout_marginRight="20dp"
+            android:layout_marginEnd="20dp"
             android:layout_marginBottom="5dp"
             android:background="?android:attr/dividerHorizontal" />
 
@@ -223,9 +223,9 @@
         <View
             android:layout_width="fill_parent"
             android:layout_height="2dip"
-            android:layout_marginLeft="20dp"
+            android:layout_marginStart="20dp"
             android:layout_marginTop="5dp"
-            android:layout_marginRight="20dp"
+            android:layout_marginEnd="20dp"
             android:layout_marginBottom="5dp"
             android:background="?android:attr/dividerHorizontal" />
 
@@ -268,9 +268,9 @@
         <View
             android:layout_width="fill_parent"
             android:layout_height="2dip"
-            android:layout_marginLeft="20dp"
+            android:layout_marginStart="20dp"
             android:layout_marginTop="5dp"
-            android:layout_marginRight="20dp"
+            android:layout_marginEnd="20dp"
             android:layout_marginBottom="5dp"
             android:background="?android:attr/dividerHorizontal" />
 
@@ -313,9 +313,9 @@
         <View
             android:layout_width="fill_parent"
             android:layout_height="2dip"
-            android:layout_marginLeft="20dp"
+            android:layout_marginStart="20dp"
             android:layout_marginTop="5dp"
-            android:layout_marginRight="20dp"
+            android:layout_marginEnd="20dp"
             android:layout_marginBottom="5dp"
             android:background="?android:attr/dividerHorizontal" />
 
@@ -358,9 +358,9 @@
         <View
             android:layout_width="fill_parent"
             android:layout_height="2dip"
-            android:layout_marginLeft="20dp"
+            android:layout_marginStart="20dp"
             android:layout_marginTop="5dp"
-            android:layout_marginRight="20dp"
+            android:layout_marginEnd="20dp"
             android:layout_marginBottom="5dp"
             android:background="?android:attr/dividerHorizontal" />
 
@@ -403,9 +403,9 @@
         <View
             android:layout_width="fill_parent"
             android:layout_height="2dip"
-            android:layout_marginLeft="20dp"
+            android:layout_marginStart="20dp"
             android:layout_marginTop="5dp"
-            android:layout_marginRight="20dp"
+            android:layout_marginEnd="20dp"
             android:layout_marginBottom="5dp"
             android:background="?android:attr/dividerHorizontal" />
 
@@ -428,18 +428,18 @@
         <View
             android:layout_width="fill_parent"
             android:layout_height="2dip"
-            android:layout_marginLeft="20dp"
+            android:layout_marginStart="20dp"
             android:layout_marginTop="5dp"
-            android:layout_marginRight="20dp"
+            android:layout_marginEnd="20dp"
             android:layout_marginBottom="5dp"
             android:background="?android:attr/dividerHorizontal" />
 
         <View
             android:layout_width="fill_parent"
             android:layout_height="0dip"
-            android:layout_marginLeft="20dp"
+            android:layout_marginStart="20dp"
             android:layout_marginTop="5dp"
-            android:layout_marginRight="20dp"
+            android:layout_marginEnd="20dp"
             android:layout_marginBottom="5dp"
             android:background="?android:attr/dividerHorizontal" />
 
@@ -482,9 +482,9 @@
         <View
             android:layout_width="fill_parent"
             android:layout_height="2dip"
-            android:layout_marginLeft="20dp"
+            android:layout_marginStart="20dp"
             android:layout_marginTop="5dp"
-            android:layout_marginRight="20dp"
+            android:layout_marginEnd="20dp"
             android:layout_marginBottom="5dp"
             android:background="?android:attr/dividerHorizontal" />
 
@@ -527,9 +527,9 @@
         <View
             android:layout_width="fill_parent"
             android:layout_height="2dip"
-            android:layout_marginLeft="20dp"
+            android:layout_marginStart="20dp"
             android:layout_marginTop="5dp"
-            android:layout_marginRight="20dp"
+            android:layout_marginEnd="20dp"
             android:layout_marginBottom="5dp"
             android:background="?android:attr/dividerHorizontal" />
 
@@ -572,9 +572,9 @@
         <View
             android:layout_width="fill_parent"
             android:layout_height="2dip"
-            android:layout_marginLeft="20dp"
+            android:layout_marginStart="20dp"
             android:layout_marginTop="5dp"
-            android:layout_marginRight="20dp"
+            android:layout_marginEnd="20dp"
             android:layout_marginBottom="5dp"
             android:background="?android:attr/dividerHorizontal" />
 
diff --git a/app/src/main/res/layout/overview_editquickwizard_dialog.xml b/app/src/main/res/layout/overview_editquickwizard_dialog.xml
index 89a45b5915..25ec9a31ce 100644
--- a/app/src/main/res/layout/overview_editquickwizard_dialog.xml
+++ b/app/src/main/res/layout/overview_editquickwizard_dialog.xml
@@ -28,8 +28,8 @@
                 android:layout_height="wrap_content"
                 android:layout_centerInParent="true"
                 android:layout_gravity="center"
-                android:layout_marginLeft="10dp"
-                android:layout_marginRight="10dp"
+                android:layout_marginStart="10dp"
+                android:layout_marginEnd="10dp"
                 android:text="@string/quickwizardsettings"
                 android:textAlignment="center"
                 android:textAppearance="?android:attr/textAppearanceLarge" />
@@ -368,7 +368,7 @@
             android:ems="10"
             android:inputType="number"
             android:maxLength="3"
-            android:paddingLeft="10dp" />
+            android:paddingStart="10dp" />
 
         <include
             android:id="@+id/okcancel"
diff --git a/app/src/main/res/layout/overview_fragment.xml b/app/src/main/res/layout/overview_fragment.xml
index df329cdcf9..3e605e196f 100644
--- a/app/src/main/res/layout/overview_fragment.xml
+++ b/app/src/main/res/layout/overview_fragment.xml
@@ -214,8 +214,8 @@
             android:id="@+id/pump_status"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="5dp"
-            android:layout_marginRight="5dp"
+            android:layout_marginStart="5dp"
+            android:layout_marginEnd="5dp"
             android:background="?attr/pumpStatusBackground"
             android:gravity="center_vertical|center_horizontal"
             android:paddingTop="6dp"
diff --git a/app/src/main/res/layout/timelistedit_element.xml b/app/src/main/res/layout/timelistedit_element.xml
index 4ff1634cb0..7de7d779fc 100644
--- a/app/src/main/res/layout/timelistedit_element.xml
+++ b/app/src/main/res/layout/timelistedit_element.xml
@@ -12,7 +12,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:layout_marginRight="10dp"
+        android:layout_marginEnd="10dp"
         android:minWidth="80dp" />
 
     <LinearLayout
@@ -24,7 +24,7 @@
             android:id="@+id/timelistedit_edit1"
             android:layout_width="130dp"
             android:layout_height="40dp"
-            android:layout_marginRight="5dp" />
+            android:layout_marginEnd="5dp" />
 
         <info.nightscout.androidaps.utils.ui.NumberPicker
             android:id="@+id/timelistedit_edit2"
@@ -37,7 +37,7 @@
         android:layout_width="35dp"
         android:layout_height="35dp"
         android:layout_gravity="center_vertical"
-        android:layout_marginLeft="15dp"
+        android:layout_marginStart="15dp"
         android:contentDescription="@string/addnew_above"
         app:srcCompat="@drawable/ic_add" />
 
@@ -46,7 +46,7 @@
         android:layout_width="35dp"
         android:layout_height="35dp"
         android:layout_gravity="center_vertical"
-        android:layout_marginLeft="15dp"
+        android:layout_marginStart="15dp"
         android:contentDescription="@string/remove_label"
         app:srcCompat="@drawable/ic_remove" />
 </LinearLayout>
diff --git a/app/src/main/res/layout/timelistedit_element_vertical.xml b/app/src/main/res/layout/timelistedit_element_vertical.xml
index fbe0bce438..5cbe81213e 100644
--- a/app/src/main/res/layout/timelistedit_element_vertical.xml
+++ b/app/src/main/res/layout/timelistedit_element_vertical.xml
@@ -12,7 +12,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:layout_marginRight="10dp"
+        android:layout_marginEnd="10dp"
         android:minWidth="80dp" />
 
     <LinearLayout
@@ -24,7 +24,7 @@
             android:id="@+id/timelistedit_edit1"
             android:layout_width="60dp"
             android:layout_height="100dp"
-            android:layout_marginRight="5dp" />
+            android:layout_marginEnd="5dp" />
 
         <info.nightscout.androidaps.utils.ui.NumberPickerVertical
             android:id="@+id/timelistedit_edit2"
@@ -37,7 +37,7 @@
         android:layout_width="35dp"
         android:layout_height="35dp"
         android:layout_gravity="center_vertical"
-        android:layout_marginLeft="15dp"
+        android:layout_marginStart="15dp"
         android:contentDescription="@string/addnew_above"
         app:srcCompat="@drawable/ic_add" />
 
@@ -46,7 +46,7 @@
         android:layout_width="35dp"
         android:layout_height="35dp"
         android:layout_gravity="center_vertical"
-        android:layout_marginLeft="15dp"
+        android:layout_marginStart="15dp"
         android:contentDescription="@string/remove_label"
         app:srcCompat="@drawable/ic_remove" />
 </LinearLayout>
diff --git a/app/src/main/res/layout/treatments_bolus_carbs_item.xml b/app/src/main/res/layout/treatments_bolus_carbs_item.xml
index 9df632f958..fb64eaf786 100644
--- a/app/src/main/res/layout/treatments_bolus_carbs_item.xml
+++ b/app/src/main/res/layout/treatments_bolus_carbs_item.xml
@@ -21,9 +21,9 @@
             android:id="@+id/date"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="5dp"
+            android:layout_marginStart="5dp"
             android:layout_marginTop="5dp"
-            android:layout_marginRight="5dp"
+            android:layout_marginEnd="5dp"
             android:layout_marginBottom="5dp"
             android:background="?android:attr/dividerHorizontal"
             android:gravity="center"
@@ -270,9 +270,9 @@
             android:id="@+id/delimiter"
             android:layout_width="fill_parent"
             android:layout_height="2dip"
-            android:layout_marginLeft="5dp"
+            android:layout_marginStart="5dp"
             android:layout_marginTop="5dp"
-            android:layout_marginRight="5dp"
+            android:layout_marginEnd="5dp"
             android:layout_marginBottom="5dp"
             android:background="?android:attr/dividerHorizontal" />
 
diff --git a/app/src/main/res/layout/treatments_careportal_item.xml b/app/src/main/res/layout/treatments_careportal_item.xml
index 37d99500c0..3b7ca3b34e 100644
--- a/app/src/main/res/layout/treatments_careportal_item.xml
+++ b/app/src/main/res/layout/treatments_careportal_item.xml
@@ -21,9 +21,9 @@
             android:id="@+id/date"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="5dp"
+            android:layout_marginStart="5dp"
             android:layout_marginTop="5dp"
-            android:layout_marginRight="5dp"
+            android:layout_marginEnd="5dp"
             android:layout_marginBottom="5dp"
             android:background="?android:attr/dividerHorizontal"
             android:gravity="center"
diff --git a/app/src/main/res/layout/treatments_extendedbolus_item.xml b/app/src/main/res/layout/treatments_extendedbolus_item.xml
index 6c691f2117..c96a01e99a 100644
--- a/app/src/main/res/layout/treatments_extendedbolus_item.xml
+++ b/app/src/main/res/layout/treatments_extendedbolus_item.xml
@@ -21,9 +21,9 @@
             android:id="@+id/date"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="5dp"
+            android:layout_marginStart="5dp"
             android:layout_marginTop="5dp"
-            android:layout_marginRight="5dp"
+            android:layout_marginEnd="5dp"
             android:layout_marginBottom="5dp"
             android:background="?android:attr/dividerHorizontal"
             android:gravity="center"
@@ -173,9 +173,9 @@
             android:id="@+id/delimiter"
             android:layout_width="fill_parent"
             android:layout_height="2dip"
-            android:layout_marginLeft="5dp"
+            android:layout_marginStart="5dp"
             android:layout_marginTop="5dp"
-            android:layout_marginRight="5dp"
+            android:layout_marginEnd="5dp"
             android:layout_marginBottom="5dp"
             android:background="?android:attr/dividerHorizontal" />
 
diff --git a/app/src/main/res/layout/treatments_profileswitch_item.xml b/app/src/main/res/layout/treatments_profileswitch_item.xml
index 33133fefd8..8229e389f6 100644
--- a/app/src/main/res/layout/treatments_profileswitch_item.xml
+++ b/app/src/main/res/layout/treatments_profileswitch_item.xml
@@ -21,9 +21,9 @@
             android:id="@+id/date"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="5dp"
+            android:layout_marginStart="5dp"
             android:layout_marginTop="5dp"
-            android:layout_marginRight="5dp"
+            android:layout_marginEnd="5dp"
             android:layout_marginBottom="5dp"
             android:background="?android:attr/dividerHorizontal"
             android:gravity="center"
@@ -141,9 +141,9 @@
             android:id="@+id/delimiter"
             android:layout_width="fill_parent"
             android:layout_height="2dip"
-            android:layout_marginLeft="5dp"
+            android:layout_marginStart="5dp"
             android:layout_marginTop="5dp"
-            android:layout_marginRight="5dp"
+            android:layout_marginEnd="5dp"
             android:layout_marginBottom="5dp"
             android:background="?android:attr/dividerHorizontal" />
 
diff --git a/app/src/main/res/layout/treatments_tempbasals_item.xml b/app/src/main/res/layout/treatments_tempbasals_item.xml
index c7a73f6058..646dc3d2aa 100644
--- a/app/src/main/res/layout/treatments_tempbasals_item.xml
+++ b/app/src/main/res/layout/treatments_tempbasals_item.xml
@@ -21,9 +21,9 @@
             android:id="@+id/date"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="5dp"
+            android:layout_marginStart="5dp"
             android:layout_marginTop="5dp"
-            android:layout_marginRight="5dp"
+            android:layout_marginEnd="5dp"
             android:layout_marginBottom="5dp"
             android:background="?android:attr/dividerHorizontal"
             android:gravity="center"
@@ -144,8 +144,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="top"
-                android:paddingLeft="10dp"
-                android:paddingRight="10dp"
+                android:paddingStart="10dp"
+                android:paddingEnd="10dp"
                 android:text="@string/tempbasals_iob_label_string"
                 android:textAppearance="?android:attr/textAppearanceSmall" />
 
@@ -191,9 +191,9 @@
             android:id="@+id/delimiter"
             android:layout_width="fill_parent"
             android:layout_height="2dip"
-            android:layout_marginLeft="5dp"
+            android:layout_marginStart="5dp"
             android:layout_marginTop="5dp"
-            android:layout_marginRight="5dp"
+            android:layout_marginEnd="5dp"
             android:layout_marginBottom="5dp"
             android:background="?android:attr/dividerHorizontal" />
 
diff --git a/app/src/main/res/layout/treatments_temptarget_item.xml b/app/src/main/res/layout/treatments_temptarget_item.xml
index bcf62e24b5..dde9ad68b6 100644
--- a/app/src/main/res/layout/treatments_temptarget_item.xml
+++ b/app/src/main/res/layout/treatments_temptarget_item.xml
@@ -21,9 +21,9 @@
             android:id="@+id/date"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="5dp"
+            android:layout_marginStart="5dp"
             android:layout_marginTop="5dp"
-            android:layout_marginRight="5dp"
+            android:layout_marginEnd="5dp"
             android:layout_marginBottom="5dp"
             android:background="?android:attr/dividerHorizontal"
             android:gravity="center"
@@ -163,9 +163,9 @@
             android:id="@+id/delimiter"
             android:layout_width="fill_parent"
             android:layout_height="2dip"
-            android:layout_marginLeft="5dp"
+            android:layout_marginStart="5dp"
             android:layout_marginTop="5dp"
-            android:layout_marginRight="5dp"
+            android:layout_marginEnd="5dp"
             android:layout_marginBottom="5dp"
             android:background="?android:attr/dividerHorizontal" />
 
diff --git a/app/src/main/res/layout/treatments_user_entry_item.xml b/app/src/main/res/layout/treatments_user_entry_item.xml
index 04110b1e3d..985a8071e9 100644
--- a/app/src/main/res/layout/treatments_user_entry_item.xml
+++ b/app/src/main/res/layout/treatments_user_entry_item.xml
@@ -11,9 +11,9 @@
         android:id="@+id/date"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="5dp"
+        android:layout_marginStart="5dp"
         android:layout_marginTop="5dp"
-        android:layout_marginRight="5dp"
+        android:layout_marginEnd="5dp"
         android:layout_marginBottom="5dp"
         android:background="?android:attr/dividerHorizontal"
         android:gravity="center"
diff --git a/app/src/main/res/layout/virtualpump_fragment.xml b/app/src/main/res/layout/virtualpump_fragment.xml
index 082f4abeae..ab29406d59 100644
--- a/app/src/main/res/layout/virtualpump_fragment.xml
+++ b/app/src/main/res/layout/virtualpump_fragment.xml
@@ -33,7 +33,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:gravity="end"
-                    android:paddingRight="5dp"
+                    android:paddingEnd="5dp"
                     android:text="@string/basebasalrate_label"
                     android:textSize="14sp" />
 
@@ -53,7 +53,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:gravity="start"
-                    android:paddingLeft="5dp"
+                    android:paddingStart="5dp"
                     android:textSize="14sp" />
 
             </LinearLayout>
@@ -62,8 +62,8 @@
                 android:layout_width="fill_parent"
                 android:layout_height="2dip"
                 android:layout_marginBottom="5dp"
-                android:layout_marginLeft="20dp"
-                android:layout_marginRight="20dp"
+                android:layout_marginStart="20dp"
+                android:layout_marginEnd="20dp"
                 android:layout_marginTop="5dp"
                 android:background="?android:attr/dividerHorizontal" />
 
@@ -78,7 +78,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:gravity="end"
-                    android:paddingRight="5dp"
+                    android:paddingEnd="5dp"
                     android:text="@string/tempbasal_label"
                     android:textSize="14sp" />
 
@@ -98,7 +98,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:gravity="start"
-                    android:paddingLeft="5dp"
+                    android:paddingStart="5dp"
                     android:textSize="14sp" />
 
             </LinearLayout>
@@ -107,8 +107,8 @@
                 android:layout_width="fill_parent"
                 android:layout_height="2dip"
                 android:layout_marginBottom="5dp"
-                android:layout_marginLeft="20dp"
-                android:layout_marginRight="20dp"
+                android:layout_marginStart="20dp"
+                android:layout_marginEnd="20dp"
                 android:layout_marginTop="5dp"
                 android:background="?android:attr/dividerHorizontal" />
 
@@ -123,7 +123,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:gravity="end"
-                    android:paddingRight="5dp"
+                    android:paddingEnd="5dp"
                     android:text="@string/virtualpump_extendedbolus_label"
                     android:textSize="14sp" />
 
@@ -143,7 +143,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:gravity="start"
-                    android:paddingLeft="5dp"
+                    android:paddingStart="5dp"
                     android:textSize="14sp" />
 
             </LinearLayout>
@@ -152,8 +152,8 @@
                 android:layout_width="fill_parent"
                 android:layout_height="2dip"
                 android:layout_marginBottom="5dp"
-                android:layout_marginLeft="20dp"
-                android:layout_marginRight="20dp"
+                android:layout_marginStart="20dp"
+                android:layout_marginEnd="20dp"
                 android:layout_marginTop="5dp"
                 android:background="?android:attr/dividerHorizontal" />
 
@@ -168,7 +168,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:gravity="end"
-                    android:paddingRight="5dp"
+                    android:paddingEnd="5dp"
                     android:text="@string/battery_label"
                     android:textSize="14sp" />
 
@@ -188,7 +188,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:gravity="start"
-                    android:paddingLeft="5dp"
+                    android:paddingStart="5dp"
                     android:textSize="14sp" />
 
             </LinearLayout>
@@ -198,8 +198,8 @@
                 android:layout_width="fill_parent"
                 android:layout_height="2dip"
                 android:layout_marginBottom="5dp"
-                android:layout_marginLeft="20dp"
-                android:layout_marginRight="20dp"
+                android:layout_marginStart="20dp"
+                android:layout_marginEnd="20dp"
                 android:layout_marginTop="5dp"
                 android:background="?android:attr/dividerHorizontal" />
 
@@ -214,7 +214,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:gravity="end"
-                    android:paddingRight="5dp"
+                    android:paddingEnd="5dp"
                     android:text="@string/reservoir_label"
                     android:textSize="14sp" />
 
@@ -234,7 +234,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:gravity="start"
-                    android:paddingLeft="5dp"
+                    android:paddingStart="5dp"
                     android:textSize="14sp" />
 
             </LinearLayout>
@@ -244,8 +244,8 @@
                 android:layout_width="fill_parent"
                 android:layout_height="2dip"
                 android:layout_marginBottom="5dp"
-                android:layout_marginLeft="20dp"
-                android:layout_marginRight="20dp"
+                android:layout_marginStart="20dp"
+                android:layout_marginEnd="20dp"
                 android:layout_marginTop="5dp"
                 android:background="?android:attr/dividerHorizontal" />
 
@@ -260,7 +260,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:gravity="end"
-                    android:paddingRight="5dp"
+                    android:paddingEnd="5dp"
                     android:text="@string/serialnumber"
                     android:textSize="14sp" />
 
@@ -280,7 +280,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:gravity="start"
-                    android:paddingLeft="5dp"
+                    android:paddingStart="5dp"
                     android:textSize="14sp" />
 
             </LinearLayout>
@@ -290,8 +290,8 @@
                 android:layout_width="fill_parent"
                 android:layout_height="2dip"
                 android:layout_marginBottom="5dp"
-                android:layout_marginLeft="20dp"
-                android:layout_marginRight="20dp"
+                android:layout_marginStart="20dp"
+                android:layout_marginEnd="20dp"
                 android:layout_marginTop="5dp"
                 android:background="?android:attr/dividerHorizontal" />
 
@@ -306,7 +306,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:gravity="end"
-                    android:paddingRight="5dp"
+                    android:paddingEnd="5dp"
                     android:text="@string/virtualpump_type"
                     android:textSize="14sp" />
 
@@ -326,7 +326,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:gravity="start"
-                    android:paddingLeft="5dp"
+                    android:paddingStart="5dp"
                     android:textSize="14sp" />
 
             </LinearLayout>
@@ -336,8 +336,8 @@
                 android:layout_width="fill_parent"
                 android:layout_height="2dip"
                 android:layout_marginBottom="5dp"
-                android:layout_marginLeft="20dp"
-                android:layout_marginRight="20dp"
+                android:layout_marginStart="20dp"
+                android:layout_marginEnd="20dp"
                 android:layout_marginTop="5dp"
                 android:background="?android:attr/dividerHorizontal" />
 
@@ -352,7 +352,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:gravity="end"
-                    android:paddingRight="5dp"
+                    android:paddingEnd="5dp"
                     android:text="@string/virtualpump_definition"
                     android:textSize="14sp" />
 
@@ -372,7 +372,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:gravity="start"
-                    android:paddingLeft="5dp"
+                    android:paddingStart="5dp"
                     android:textSize="14sp" />
 
             </LinearLayout>
diff --git a/app/src/main/res/layout/wear_fragment.xml b/app/src/main/res/layout/wear_fragment.xml
index f93423a895..a5eba31c66 100644
--- a/app/src/main/res/layout/wear_fragment.xml
+++ b/app/src/main/res/layout/wear_fragment.xml
@@ -16,8 +16,8 @@
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="3dp"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
             android:layout_marginTop="3dp"
             android:layout_weight="0.5"
             android:text="@string/resend_all_data"
@@ -29,8 +29,8 @@
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="3dp"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
             android:layout_marginTop="3dp"
             android:layout_weight="0.5"
             android:text="@string/open_settings_on_wear"
diff --git a/automation/src/main/res/layout/automation_action_item.xml b/automation/src/main/res/layout/automation_action_item.xml
index a63d9437a0..24697cee75 100644
--- a/automation/src/main/res/layout/automation_action_item.xml
+++ b/automation/src/main/res/layout/automation_action_item.xml
@@ -7,8 +7,8 @@
     android:background="?attr/ribbonDefaultColor"
     android:paddingTop="8dp"
     android:paddingBottom="8dp"
-    android:paddingLeft="4dp"
-    android:paddingRight="4dp"
+    android:paddingStart="4dp"
+    android:paddingEnd="4dp"
     android:layout_marginTop="8dp">
 
     <ImageView
diff --git a/automation/src/main/res/layout/automation_dialog_action.xml b/automation/src/main/res/layout/automation_dialog_action.xml
index 4033009e15..0ec8a68c46 100644
--- a/automation/src/main/res/layout/automation_dialog_action.xml
+++ b/automation/src/main/res/layout/automation_dialog_action.xml
@@ -31,8 +31,8 @@
                 android:layout_height="wrap_content"
                 android:layout_centerInParent="true"
                 android:layout_gravity="center"
-                android:layout_marginLeft="10dp"
-                android:layout_marginRight="10dp"
+                android:layout_marginStart="10dp"
+                android:layout_marginEnd="10dp"
                 android:textAlignment="center"
                 android:textAppearance="?android:attr/textAppearanceLarge" />
 
diff --git a/automation/src/main/res/layout/automation_dialog_choose_action.xml b/automation/src/main/res/layout/automation_dialog_choose_action.xml
index 8bbb4f5010..f3aaebd19b 100644
--- a/automation/src/main/res/layout/automation_dialog_choose_action.xml
+++ b/automation/src/main/res/layout/automation_dialog_choose_action.xml
@@ -31,8 +31,8 @@
                 android:layout_height="wrap_content"
                 android:layout_centerInParent="true"
                 android:layout_gravity="center"
-                android:layout_marginLeft="10dp"
-                android:layout_marginRight="10dp"
+                android:layout_marginStart="10dp"
+                android:layout_marginEnd="10dp"
                 android:text="@string/please_choose_an_action_type"
                 android:textAlignment="center"
                 android:textAppearance="?android:attr/textAppearanceLarge" />
diff --git a/automation/src/main/res/layout/automation_dialog_choose_operation.xml b/automation/src/main/res/layout/automation_dialog_choose_operation.xml
index ad78796e59..f19c77f2fd 100644
--- a/automation/src/main/res/layout/automation_dialog_choose_operation.xml
+++ b/automation/src/main/res/layout/automation_dialog_choose_operation.xml
@@ -30,8 +30,8 @@
                 android:layout_height="wrap_content"
                 android:layout_centerInParent="true"
                 android:layout_gravity="center"
-                android:layout_marginLeft="10dp"
-                android:layout_marginRight="10dp"
+                android:layout_marginStart="10dp"
+                android:layout_marginEnd="10dp"
                 android:text="@string/please_choose_a_operation_type"
                 android:textAlignment="center"
                 android:textAppearance="?android:attr/textAppearanceLarge" />
diff --git a/automation/src/main/res/layout/automation_dialog_choose_trigger.xml b/automation/src/main/res/layout/automation_dialog_choose_trigger.xml
index 99eadab1bd..f88d4a1078 100644
--- a/automation/src/main/res/layout/automation_dialog_choose_trigger.xml
+++ b/automation/src/main/res/layout/automation_dialog_choose_trigger.xml
@@ -30,8 +30,8 @@
                 android:layout_height="wrap_content"
                 android:layout_centerInParent="true"
                 android:layout_gravity="center"
-                android:layout_marginLeft="10dp"
-                android:layout_marginRight="10dp"
+                android:layout_marginStart="10dp"
+                android:layout_marginEnd="10dp"
                 android:text="@string/please_choose_a_trigger_type"
                 android:textAlignment="center"
                 android:textAppearance="?android:attr/textAppearanceLarge" />
diff --git a/automation/src/main/res/layout/automation_dialog_edit_trigger.xml b/automation/src/main/res/layout/automation_dialog_edit_trigger.xml
index dc10ff98b9..97c8d7eebe 100644
--- a/automation/src/main/res/layout/automation_dialog_edit_trigger.xml
+++ b/automation/src/main/res/layout/automation_dialog_edit_trigger.xml
@@ -30,8 +30,8 @@
                 android:layout_height="wrap_content"
                 android:layout_centerInParent="true"
                 android:layout_gravity="center"
-                android:layout_marginLeft="10dp"
-                android:layout_marginRight="10dp"
+                android:layout_marginStart="10dp"
+                android:layout_marginEnd="10dp"
                 android:text="@string/triggers"
                 android:textAlignment="center"
                 android:textAppearance="?android:attr/textAppearanceLarge" />
diff --git a/automation/src/main/res/layout/automation_dialog_event.xml b/automation/src/main/res/layout/automation_dialog_event.xml
index ebbed9ad65..9109c1a520 100644
--- a/automation/src/main/res/layout/automation_dialog_event.xml
+++ b/automation/src/main/res/layout/automation_dialog_event.xml
@@ -29,8 +29,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:layout_marginLeft="10dp"
-                android:layout_marginRight="10dp"
+                android:layout_marginStart="10dp"
+                android:layout_marginEnd="10dp"
                 android:text="@string/automation_event"
                 android:textAlignment="center"
                 android:layout_weight="1"
diff --git a/combo/src/main/res/layout/combopump_fragment.xml b/combo/src/main/res/layout/combopump_fragment.xml
index 616d7e0654..1696ee3c40 100644
--- a/combo/src/main/res/layout/combopump_fragment.xml
+++ b/combo/src/main/res/layout/combopump_fragment.xml
@@ -30,7 +30,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1.5"
                     android:gravity="end"
-                    android:paddingRight="5dp"
+                    android:paddingEnd="5dp"
                     android:text="@string/combo_pump_state_label"
                     android:textSize="14sp" />
 
@@ -50,7 +50,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:gravity="start"
-                    android:paddingLeft="5dp"
+                    android:paddingStart="5dp"
                     android:textSize="14sp" />
 
             </LinearLayout>
@@ -59,8 +59,8 @@
                 android:layout_width="fill_parent"
                 android:layout_height="2dip"
                 android:layout_marginBottom="5dp"
-                android:layout_marginLeft="20dp"
-                android:layout_marginRight="20dp"
+                android:layout_marginStart="20dp"
+                android:layout_marginEnd="20dp"
                 android:layout_marginTop="5dp"
                 android:background="?android:attr/dividerHorizontal" />
 
@@ -75,7 +75,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1.5"
                     android:gravity="end"
-                    android:paddingRight="5dp"
+                    android:paddingEnd="5dp"
                     android:text="@string/combo_pump_activity_label"
                     android:textSize="14sp" />
 
@@ -95,7 +95,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:gravity="start"
-                    android:paddingLeft="5dp"
+                    android:paddingStart="5dp"
                     android:textSize="14sp" />
 
             </LinearLayout>
@@ -104,8 +104,8 @@
                 android:layout_width="fill_parent"
                 android:layout_height="2dip"
                 android:layout_marginBottom="5dp"
-                android:layout_marginLeft="20dp"
-                android:layout_marginRight="20dp"
+                android:layout_marginStart="20dp"
+                android:layout_marginEnd="20dp"
                 android:layout_marginTop="5dp"
                 android:background="?android:attr/dividerHorizontal" />
 
@@ -121,7 +121,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1.5"
                     android:gravity="end"
-                    android:paddingRight="5dp"
+                    android:paddingEnd="5dp"
                     android:text="@string/battery_label"
                     android:textSize="14sp" />
 
@@ -141,7 +141,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:gravity="start"
-                    android:paddingLeft="5dp"
+                    android:paddingStart="5dp"
                     android:text=""
                     android:textSize="14sp" />
 
@@ -151,8 +151,8 @@
                 android:layout_width="fill_parent"
                 android:layout_height="2dip"
                 android:layout_marginBottom="5dp"
-                android:layout_marginLeft="20dp"
-                android:layout_marginRight="20dp"
+                android:layout_marginStart="20dp"
+                android:layout_marginEnd="20dp"
                 android:layout_marginTop="5dp"
                 android:background="?android:attr/dividerHorizontal" />
 
@@ -167,7 +167,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1.5"
                     android:gravity="end"
-                    android:paddingRight="5dp"
+                    android:paddingEnd="5dp"
                     android:text="@string/reservoir_label"
                     android:textSize="14sp" />
 
@@ -187,7 +187,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:gravity="start"
-                    android:paddingLeft="5dp"
+                    android:paddingStart="5dp"
                     android:textSize="14sp" />
 
             </LinearLayout>
@@ -196,8 +196,8 @@
                 android:layout_width="fill_parent"
                 android:layout_height="2dip"
                 android:layout_marginBottom="5dp"
-                android:layout_marginLeft="20dp"
-                android:layout_marginRight="20dp"
+                android:layout_marginStart="20dp"
+                android:layout_marginEnd="20dp"
                 android:layout_marginTop="5dp"
                 android:background="?android:attr/dividerHorizontal" />
 
@@ -212,7 +212,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1.5"
                     android:gravity="end"
-                    android:paddingRight="5dp"
+                    android:paddingEnd="5dp"
                     android:text="@string/lastconnection_label"
                     android:textSize="14sp" />
 
@@ -232,7 +232,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:gravity="start"
-                    android:paddingLeft="5dp"
+                    android:paddingStart="5dp"
                     android:textSize="14sp" />
 
             </LinearLayout>
@@ -241,8 +241,8 @@
                 android:layout_width="fill_parent"
                 android:layout_height="2dip"
                 android:layout_marginBottom="5dp"
-                android:layout_marginLeft="20dp"
-                android:layout_marginRight="20dp"
+                android:layout_marginStart="20dp"
+                android:layout_marginEnd="20dp"
                 android:layout_marginTop="5dp"
                 android:background="?android:attr/dividerHorizontal" />
 
@@ -257,7 +257,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1.5"
                     android:gravity="end"
-                    android:paddingRight="5dp"
+                    android:paddingEnd="5dp"
                     android:text="@string/lastbolus_label"
                     android:textSize="14sp" />
 
@@ -277,7 +277,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:gravity="start"
-                    android:paddingLeft="5dp"
+                    android:paddingStart="5dp"
                     android:textSize="14sp" />
 
             </LinearLayout>
@@ -286,8 +286,8 @@
                 android:layout_width="fill_parent"
                 android:layout_height="2dip"
                 android:layout_marginBottom="5dp"
-                android:layout_marginLeft="20dp"
-                android:layout_marginRight="20dp"
+                android:layout_marginStart="20dp"
+                android:layout_marginEnd="20dp"
                 android:layout_marginTop="5dp"
                 android:background="?android:attr/dividerHorizontal" />
 
@@ -302,7 +302,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1.5"
                     android:gravity="end"
-                    android:paddingRight="5dp"
+                    android:paddingEnd="5dp"
                     android:text="@string/basebasalrate_label"
                     android:textSize="14sp" />
 
@@ -322,7 +322,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:gravity="start"
-                    android:paddingLeft="5dp"
+                    android:paddingStart="5dp"
                     android:textSize="14sp" />
 
             </LinearLayout>
@@ -331,8 +331,8 @@
                 android:layout_width="fill_parent"
                 android:layout_height="2dip"
                 android:layout_marginBottom="5dp"
-                android:layout_marginLeft="20dp"
-                android:layout_marginRight="20dp"
+                android:layout_marginStart="20dp"
+                android:layout_marginEnd="20dp"
                 android:layout_marginTop="5dp"
                 android:background="?android:attr/dividerHorizontal" />
 
@@ -347,7 +347,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1.5"
                     android:gravity="end"
-                    android:paddingRight="5dp"
+                    android:paddingEnd="5dp"
                     android:text="@string/tempbasal_label"
                     android:textSize="14sp" />
 
@@ -367,7 +367,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:gravity="start"
-                    android:paddingLeft="5dp"
+                    android:paddingStart="5dp"
                     android:textSize="14sp" />
 
             </LinearLayout>
@@ -376,8 +376,8 @@
                 android:layout_width="fill_parent"
                 android:layout_height="2dip"
                 android:layout_marginBottom="5dp"
-                android:layout_marginLeft="20dp"
-                android:layout_marginRight="20dp"
+                android:layout_marginStart="20dp"
+                android:layout_marginEnd="20dp"
                 android:layout_marginTop="5dp"
                 android:background="?android:attr/dividerHorizontal" />
 
@@ -392,7 +392,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1.5"
                     android:gravity="end"
-                    android:paddingRight="5dp"
+                    android:paddingEnd="5dp"
                     android:text="@string/combo_bolus_count"
                     android:textSize="14sp" />
 
@@ -412,7 +412,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:gravity="start"
-                    android:paddingLeft="5dp"
+                    android:paddingStart="5dp"
                     android:textSize="14sp" />
 
             </LinearLayout>
@@ -421,8 +421,8 @@
                 android:layout_width="fill_parent"
                 android:layout_height="2dip"
                 android:layout_marginBottom="5dp"
-                android:layout_marginLeft="20dp"
-                android:layout_marginRight="20dp"
+                android:layout_marginStart="20dp"
+                android:layout_marginEnd="20dp"
                 android:layout_marginTop="5dp"
                 android:background="?android:attr/dividerHorizontal" />
 
@@ -437,7 +437,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1.5"
                     android:gravity="end"
-                    android:paddingRight="5dp"
+                    android:paddingEnd="5dp"
                     android:text="@string/combo_tbr_count"
                     android:textSize="14sp" />
 
@@ -457,7 +457,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:gravity="start"
-                    android:paddingLeft="5dp"
+                    android:paddingStart="5dp"
                     android:textSize="14sp" />
 
             </LinearLayout>
@@ -467,8 +467,8 @@
                 android:layout_width="fill_parent"
                 android:layout_height="2dip"
                 android:layout_marginBottom="5dp"
-                android:layout_marginLeft="20dp"
-                android:layout_marginRight="20dp"
+                android:layout_marginStart="20dp"
+                android:layout_marginEnd="20dp"
                 android:layout_marginTop="5dp"
                 android:background="?android:attr/dividerHorizontal" />
 
@@ -483,7 +483,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1.5"
                     android:gravity="end"
-                    android:paddingRight="5dp"
+                    android:paddingEnd="5dp"
                     android:text="@string/pump_commerror_label"
                     android:textSize="14sp" />
 
@@ -503,7 +503,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:gravity="start"
-                    android:paddingLeft="5dp"
+                    android:paddingStart="5dp"
                     android:textSize="14sp" />
 
             </LinearLayout>
@@ -512,8 +512,8 @@
                 android:layout_width="fill_parent"
                 android:layout_height="2dip"
                 android:layout_marginBottom="5dp"
-                android:layout_marginLeft="20dp"
-                android:layout_marginRight="20dp"
+                android:layout_marginStart="20dp"
+                android:layout_marginEnd="20dp"
                 android:layout_marginTop="5dp"
                 android:background="?android:attr/dividerHorizontal" />
 
@@ -528,7 +528,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1.5"
                     android:gravity="end"
-                    android:paddingRight="5dp"
+                    android:paddingEnd="5dp"
                     android:text="@string/serialnumber"
                     android:textSize="14sp" />
 
@@ -548,7 +548,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:gravity="start"
-                    android:paddingLeft="5dp"
+                    android:paddingStart="5dp"
                     android:textSize="14sp" />
 
             </LinearLayout>
@@ -557,8 +557,8 @@
                 android:layout_width="fill_parent"
                 android:layout_height="2dip"
                 android:layout_marginBottom="5dp"
-                android:layout_marginLeft="20dp"
-                android:layout_marginRight="20dp"
+                android:layout_marginStart="20dp"
+                android:layout_marginEnd="20dp"
                 android:layout_marginTop="5dp"
                 android:background="?android:attr/dividerHorizontal" />
 
@@ -577,7 +577,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
-        android:paddingRight="4dp"
+        android:paddingEnd="4dp"
         android:orientation="vertical">
 
         <LinearLayout
@@ -591,10 +591,10 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="0.5"
-                android:layout_marginRight="-4dp"
+                android:layout_marginEnd="-4dp"
                 android:drawableTop="@drawable/ic_actions_refill"
-                android:paddingLeft="0dp"
-                android:paddingRight="0dp"
+                android:paddingStart="0dp"
+                android:paddingEnd="0dp"
                 android:text="@string/refresh" />
         </LinearLayout>
 
diff --git a/core/src/main/res/layout/activity_tdd_stats.xml b/core/src/main/res/layout/activity_tdd_stats.xml
index b405ab8a5b..ee232f769f 100644
--- a/core/src/main/res/layout/activity_tdd_stats.xml
+++ b/core/src/main/res/layout/activity_tdd_stats.xml
@@ -167,8 +167,8 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
             android:background="@drawable/pillborder"
-            android:paddingLeft="10dp"
-            android:paddingRight="10dp"
+            android:paddingStart="10dp"
+            android:paddingEnd="10dp"
             android:text="@string/warning_Message"
             android:textColor="?attr/alarmColor"
             android:textSize="15sp"
diff --git a/core/src/main/res/layout/datetime.xml b/core/src/main/res/layout/datetime.xml
index f4e4d538da..07e7ba30fe 100644
--- a/core/src/main/res/layout/datetime.xml
+++ b/core/src/main/res/layout/datetime.xml
@@ -11,8 +11,8 @@
         android:layout_gravity="center"
         android:width="120dp"
         android:labelFor="@+id/eventtime"
-        android:paddingLeft="10dp"
-        android:paddingRight="4dp"
+        android:paddingStart="10dp"
+        android:paddingEnd="4dp"
         android:text="@string/event_time_label"
         android:textAppearance="@style/TextAppearance.AppCompat.Small"
         android:textStyle="bold" />
diff --git a/core/src/main/res/layout/dialog_bolusprogress.xml b/core/src/main/res/layout/dialog_bolusprogress.xml
index 1fbba9c730..b2fefbbecd 100644
--- a/core/src/main/res/layout/dialog_bolusprogress.xml
+++ b/core/src/main/res/layout/dialog_bolusprogress.xml
@@ -25,8 +25,8 @@
             android:layout_height="wrap_content"
             android:layout_centerInParent="true"
             android:layout_gravity="center"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
             android:layout_toEndOf="@id/header_icon"
             android:textAlignment="center"
             android:textAppearance="?android:attr/textAppearanceLarge"
@@ -46,8 +46,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
-        android:paddingLeft="10dp"
-        android:paddingRight="10dp"
+        android:paddingStart="10dp"
+        android:paddingEnd="10dp"
         tools:text="Delivering 1.9U"/>
 
     <TextView
@@ -67,9 +67,9 @@
         style="@android:style/Widget.Material.ProgressBar.Horizontal"
         android:layout_width="match_parent"
         android:layout_height="20dp"
-        android:layout_marginLeft="5dp"
+        android:layout_marginStart="5dp"
         android:layout_marginTop="20dp"
-        android:layout_marginRight="5dp"
+        android:layout_marginEnd="5dp"
         android:maxHeight="5dp"
         android:minHeight="3dp"
         tools:progress="50"/>
diff --git a/core/src/main/res/layout/dialog_error.xml b/core/src/main/res/layout/dialog_error.xml
index d1a3c83577..23f9f6c08f 100644
--- a/core/src/main/res/layout/dialog_error.xml
+++ b/core/src/main/res/layout/dialog_error.xml
@@ -24,8 +24,8 @@
             android:layout_height="wrap_content"
             android:layout_centerInParent="true"
             android:layout_gravity="center"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
             android:text="@string/error"
             android:textAlignment="center"
             android:textAppearance="?android:attr/textAppearanceLarge" />
@@ -44,8 +44,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
-        android:paddingLeft="10dp"
-        android:paddingRight="10dp"
+        android:paddingStart="10dp"
+        android:paddingEnd="10dp"
         android:textAppearance="@style/TextAppearance.AppCompat.Small" />
 
     <com.google.android.material.button.MaterialButton
@@ -55,8 +55,8 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
         android:layout_marginTop="15dp"
-        android:layout_marginLeft="30dp"
-        android:layout_marginRight="30dp"
+        android:layout_marginStart="30dp"
+        android:layout_marginEnd="30dp"
         android:text="@string/mute5min" />
 
     <com.google.android.material.button.MaterialButton
@@ -66,8 +66,8 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
         android:layout_marginTop="15dp"
-        android:layout_marginLeft="30dp"
-        android:layout_marginRight="30dp"
+        android:layout_marginStart="30dp"
+        android:layout_marginEnd="30dp"
         android:text="@string/mute" />
 
     <com.google.android.material.button.MaterialButton
@@ -78,8 +78,8 @@
         android:layout_gravity="center_horizontal"
         android:layout_marginTop="15dp"
         android:layout_marginBottom="30dp"
-        android:layout_marginLeft="30dp"
-        android:layout_marginRight="30dp"
+        android:layout_marginStart="30dp"
+        android:layout_marginEnd="30dp"
         android:text="@string/ok" />
 
 </LinearLayout>
diff --git a/core/src/main/res/layout/dialog_profileviewer.xml b/core/src/main/res/layout/dialog_profileviewer.xml
index 63205636d9..791a5cdee3 100644
--- a/core/src/main/res/layout/dialog_profileviewer.xml
+++ b/core/src/main/res/layout/dialog_profileviewer.xml
@@ -33,8 +33,8 @@
                 android:layout_centerInParent="true"
                 android:layout_centerHorizontal="true"
                 android:layout_gravity="center"
-                android:layout_marginLeft="10dp"
-                android:layout_marginRight="10dp"
+                android:layout_marginStart="10dp"
+                android:layout_marginEnd="10dp"
                 android:layout_toEndOf="@id/header_icon"
                 android:textAlignment="center"
                 android:textAppearance="?android:attr/textAppearanceLarge" />
@@ -110,9 +110,9 @@
         <View
             android:layout_width="fill_parent"
             android:layout_height="2dip"
-            android:layout_marginLeft="20dp"
+            android:layout_marginStart="20dp"
             android:layout_marginTop="5dp"
-            android:layout_marginRight="20dp"
+            android:layout_marginEnd="20dp"
             android:layout_marginBottom="5dp"
             android:background="?android:attr/dividerHorizontal" />
 
@@ -155,9 +155,9 @@
         <View
             android:layout_width="fill_parent"
             android:layout_height="2dip"
-            android:layout_marginLeft="20dp"
+            android:layout_marginStart="20dp"
             android:layout_marginTop="5dp"
-            android:layout_marginRight="20dp"
+            android:layout_marginEnd="20dp"
             android:layout_marginBottom="5dp"
             android:background="?android:attr/dividerHorizontal" />
 
@@ -200,9 +200,9 @@
         <View
             android:layout_width="fill_parent"
             android:layout_height="2dip"
-            android:layout_marginLeft="20dp"
+            android:layout_marginStart="20dp"
             android:layout_marginTop="5dp"
-            android:layout_marginRight="20dp"
+            android:layout_marginEnd="20dp"
             android:layout_marginBottom="5dp"
             android:background="?android:attr/dividerHorizontal" />
 
@@ -251,9 +251,9 @@
         <View
             android:layout_width="fill_parent"
             android:layout_height="2dip"
-            android:layout_marginLeft="20dp"
+            android:layout_marginStart="20dp"
             android:layout_marginTop="5dp"
-            android:layout_marginRight="20dp"
+            android:layout_marginEnd="20dp"
             android:layout_marginBottom="5dp"
             android:background="?android:attr/dividerHorizontal" />
 
@@ -302,9 +302,9 @@
         <View
             android:layout_width="fill_parent"
             android:layout_height="2dip"
-            android:layout_marginLeft="20dp"
+            android:layout_marginStart="20dp"
             android:layout_marginTop="5dp"
-            android:layout_marginRight="20dp"
+            android:layout_marginEnd="20dp"
             android:layout_marginBottom="5dp"
             android:background="?android:attr/dividerHorizontal" />
 
@@ -388,9 +388,9 @@
         <View
             android:layout_width="fill_parent"
             android:layout_height="2dip"
-            android:layout_marginLeft="20dp"
+            android:layout_marginStart="20dp"
             android:layout_marginTop="5dp"
-            android:layout_marginRight="20dp"
+            android:layout_marginEnd="20dp"
             android:layout_marginBottom="5dp"
             android:background="?android:attr/dividerHorizontal" />
 
diff --git a/core/src/main/res/layout/toast.xml b/core/src/main/res/layout/toast.xml
index 32175b4065..4572e3b408 100644
--- a/core/src/main/res/layout/toast.xml
+++ b/core/src/main/res/layout/toast.xml
@@ -11,7 +11,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
-        android:layout_marginLeft="6dp"
+        android:layout_marginStart="6dp"
         android:layout_marginTop="6dp"
         android:layout_marginBottom="6dp"
         app:srcCompat="@drawable/ic_toast_check"
@@ -22,9 +22,9 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
-        android:layout_marginLeft="6dp"
+        android:layout_marginStart="6dp"
         android:layout_marginTop="4dp"
-        android:layout_marginRight="18dp"
+        android:layout_marginEnd="18dp"
         android:layout_marginBottom="4dp"
         android:text="Toast goes here..."
         android:textColor="?attr/toastBaseTextColor"
diff --git a/core/src/main/res/values-night/styles.xml b/core/src/main/res/values-night/styles.xml
index 1c051f250f..153b751a42 100644
--- a/core/src/main/res/values-night/styles.xml
+++ b/core/src/main/res/values-night/styles.xml
@@ -295,8 +295,8 @@
         <item name="android:stateListAnimator">@null</item>
         <item name="android:background">@drawable/material_button_background</item>
         <item name="android:minWidth">@dimen/material_button_min_width</item>
-        <item name="android:paddingLeft">@dimen/material_button_text_padding_horizontal</item>
-        <item name="android:paddingRight">@dimen/material_button_text_padding_horizontal</item>
+        <item name="android:paddingStart">@dimen/material_button_text_padding_horizontal</item>
+        <item name="android:paddingEnd">@dimen/material_button_text_padding_horizontal</item>
         <item name="android:textColor">@color/okButtonText</item>
         <item name="android:textAllCaps">true</item>
     </style>
diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml
index 362b3c0ea9..b0d4533c8b 100644
--- a/core/src/main/res/values/styles.xml
+++ b/core/src/main/res/values/styles.xml
@@ -311,8 +311,8 @@
         <item name="android:stateListAnimator">@null</item>
         <item name="android:background">@drawable/material_button_background</item>
         <item name="android:minWidth">@dimen/material_button_min_width</item>
-        <item name="android:paddingLeft">@dimen/material_button_text_padding_horizontal</item>
-        <item name="android:paddingRight">@dimen/material_button_text_padding_horizontal</item>
+        <item name="android:paddingStart">@dimen/material_button_text_padding_horizontal</item>
+        <item name="android:paddingEnd">@dimen/material_button_text_padding_horizontal</item>
         <item name="android:textColor">@color/okButtonText</item>
         <item name="android:textAllCaps">true</item>
     </style>
diff --git a/dana/src/main/res/layout/danar_fragment.xml b/dana/src/main/res/layout/danar_fragment.xml
index 1c6c7359f3..034d176906 100644
--- a/dana/src/main/res/layout/danar_fragment.xml
+++ b/dana/src/main/res/layout/danar_fragment.xml
@@ -61,8 +61,8 @@
                 android:layout_width="fill_parent"
                 android:layout_height="2dip"
                 android:layout_marginBottom="5dp"
-                android:layout_marginLeft="20dp"
-                android:layout_marginRight="20dp"
+                android:layout_marginStart="20dp"
+                android:layout_marginEnd="20dp"
                 android:layout_marginTop="5dp"
                 android:background="?android:attr/dividerHorizontal" />
 
@@ -112,8 +112,8 @@
                 android:layout_width="fill_parent"
                 android:layout_height="2dip"
                 android:layout_marginBottom="5dp"
-                android:layout_marginLeft="20dp"
-                android:layout_marginRight="20dp"
+                android:layout_marginStart="20dp"
+                android:layout_marginEnd="20dp"
                 android:layout_marginTop="5dp"
                 android:background="?android:attr/dividerHorizontal" />
 
@@ -161,8 +161,8 @@
                 android:layout_width="fill_parent"
                 android:layout_height="2dip"
                 android:layout_marginBottom="5dp"
-                android:layout_marginLeft="20dp"
-                android:layout_marginRight="20dp"
+                android:layout_marginStart="20dp"
+                android:layout_marginEnd="20dp"
                 android:layout_marginTop="5dp"
                 android:background="?android:attr/dividerHorizontal" />
 
@@ -209,8 +209,8 @@
                 android:layout_width="fill_parent"
                 android:layout_height="2dip"
                 android:layout_marginBottom="5dp"
-                android:layout_marginLeft="20dp"
-                android:layout_marginRight="20dp"
+                android:layout_marginStart="20dp"
+                android:layout_marginEnd="20dp"
                 android:layout_marginTop="5dp"
                 android:background="?android:attr/dividerHorizontal" />
 
@@ -257,8 +257,8 @@
                 android:layout_width="fill_parent"
                 android:layout_height="2dip"
                 android:layout_marginBottom="5dp"
-                android:layout_marginLeft="20dp"
-                android:layout_marginRight="20dp"
+                android:layout_marginStart="20dp"
+                android:layout_marginEnd="20dp"
                 android:layout_marginTop="5dp"
                 android:background="?android:attr/dividerHorizontal" />
 
@@ -305,8 +305,8 @@
                 android:layout_width="fill_parent"
                 android:layout_height="2dip"
                 android:layout_marginBottom="5dp"
-                android:layout_marginLeft="20dp"
-                android:layout_marginRight="20dp"
+                android:layout_marginStart="20dp"
+                android:layout_marginEnd="20dp"
                 android:layout_marginTop="5dp"
                 android:background="?android:attr/dividerHorizontal" />
 
@@ -321,7 +321,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:gravity="end"
-                    android:paddingRight="5dp"
+                    android:paddingEnd="5dp"
                     android:text="@string/basebasalrate_label"
                     android:textSize="14sp"
                     tools:ignore="RtlHardcoded,RtlSymmetry" />
@@ -353,8 +353,8 @@
                 android:layout_width="fill_parent"
                 android:layout_height="2dip"
                 android:layout_marginBottom="5dp"
-                android:layout_marginLeft="20dp"
-                android:layout_marginRight="20dp"
+                android:layout_marginStart="20dp"
+                android:layout_marginEnd="20dp"
                 android:layout_marginTop="5dp"
                 android:background="?android:attr/dividerHorizontal" />
 
@@ -401,8 +401,8 @@
                 android:layout_width="fill_parent"
                 android:layout_height="2dip"
                 android:layout_marginBottom="5dp"
-                android:layout_marginLeft="20dp"
-                android:layout_marginRight="20dp"
+                android:layout_marginStart="20dp"
+                android:layout_marginEnd="20dp"
                 android:layout_marginTop="5dp"
                 android:background="?android:attr/dividerHorizontal" />
 
@@ -449,8 +449,8 @@
                 android:layout_width="fill_parent"
                 android:layout_height="2dip"
                 android:layout_marginBottom="5dp"
-                android:layout_marginLeft="20dp"
-                android:layout_marginRight="20dp"
+                android:layout_marginStart="20dp"
+                android:layout_marginEnd="20dp"
                 android:layout_marginTop="5dp"
                 android:background="?android:attr/dividerHorizontal" />
 
@@ -497,8 +497,8 @@
                 android:layout_width="fill_parent"
                 android:layout_height="2dip"
                 android:layout_marginBottom="5dp"
-                android:layout_marginLeft="20dp"
-                android:layout_marginRight="20dp"
+                android:layout_marginStart="20dp"
+                android:layout_marginEnd="20dp"
                 android:layout_marginTop="5dp"
                 android:background="?android:attr/dividerHorizontal" />
 
@@ -545,8 +545,8 @@
                 android:layout_width="fill_parent"
                 android:layout_height="2dip"
                 android:layout_marginBottom="5dp"
-                android:layout_marginLeft="20dp"
-                android:layout_marginRight="20dp"
+                android:layout_marginStart="20dp"
+                android:layout_marginEnd="20dp"
                 android:layout_marginTop="5dp"
                 android:background="?android:attr/dividerHorizontal" />
 
@@ -593,8 +593,8 @@
                 android:layout_width="fill_parent"
                 android:layout_height="2dip"
                 android:layout_marginBottom="5dp"
-                android:layout_marginLeft="20dp"
-                android:layout_marginRight="20dp"
+                android:layout_marginStart="20dp"
+                android:layout_marginEnd="20dp"
                 android:layout_marginTop="5dp"
                 android:background="?android:attr/dividerHorizontal" />
 
@@ -626,8 +626,8 @@
             android:layout_height="wrap_content"
             android:paddingTop="6dp"
             android:paddingBottom="6dp"
-            android:layout_marginLeft="5dp"
-            android:layout_marginRight="5dp"
+            android:layout_marginStart="5dp"
+            android:layout_marginEnd="5dp"
             android:background="?attr/pumpStatusBackground"
             android:gravity="center_vertical|center_horizontal"
             android:textAppearance="?android:attr/textAppearanceSmall" />
@@ -648,8 +648,8 @@
             android:layout_height="wrap_content"
             android:paddingTop="6dp"
             android:paddingBottom="6dp"
-            android:layout_marginLeft="5dp"
-            android:layout_marginRight="5dp"
+            android:layout_marginStart="5dp"
+            android:layout_marginEnd="5dp"
             android:background="?attr/pumpStatusBackground"
             android:gravity="center_vertical|center_horizontal"
             android:textAppearance="?android:attr/textAppearanceSmall" />
@@ -668,8 +668,8 @@
             android:layout_height="match_parent"
             android:layout_weight="1"
             android:drawableTop="@drawable/ic_danarprofile"
-            android:paddingLeft="0dp"
-            android:paddingRight="0dp"
+            android:paddingStart="0dp"
+            android:paddingEnd="0dp"
             android:text="@string/viewprofile" />
 
 
@@ -680,8 +680,8 @@
             android:layout_height="match_parent"
             android:layout_weight="1"
             android:drawableTop="@drawable/ic_pump_history"
-            android:paddingLeft="0dp"
-            android:paddingRight="0dp"
+            android:paddingStart="0dp"
+            android:paddingEnd="0dp"
             android:text="@string/pumphistory"
             tools:ignore="TooManyViews" />
 
@@ -692,8 +692,8 @@
             android:layout_height="match_parent"
             android:layout_weight="1"
             android:drawableTop="@drawable/ic_danarstats"
-            android:paddingLeft="0dp"
-            android:paddingRight="0dp"
+            android:paddingStart="0dp"
+            android:paddingEnd="0dp"
             android:text="@string/stats" />
 
         <com.google.android.material.button.MaterialButton
@@ -703,8 +703,8 @@
             android:layout_height="match_parent"
             android:layout_weight="1"
             android:drawableTop="@drawable/ic_danar_useropt"
-            android:paddingLeft="0dp"
-            android:paddingRight="0dp"
+            android:paddingStart="0dp"
+            android:paddingEnd="0dp"
             android:text="@string/danar_useroptions" />
 
     </LinearLayout>
diff --git a/dana/src/main/res/layout/danar_history_activity.xml b/dana/src/main/res/layout/danar_history_activity.xml
index 7ad697e463..8ee98515b3 100644
--- a/dana/src/main/res/layout/danar_history_activity.xml
+++ b/dana/src/main/res/layout/danar_history_activity.xml
@@ -38,8 +38,8 @@
             android:layout_centerHorizontal="true"
             android:layout_centerVertical="true"
             android:layout_gravity="center"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
             android:text="@string/pumphistory"
             android:textAlignment="center"
             android:textAppearance="?android:attr/textAppearanceLarge"
diff --git a/dana/src/main/res/layout/danar_history_item.xml b/dana/src/main/res/layout/danar_history_item.xml
index a0e5001855..23b37e9e00 100644
--- a/dana/src/main/res/layout/danar_history_item.xml
+++ b/dana/src/main/res/layout/danar_history_item.xml
@@ -31,7 +31,7 @@
                 android:id="@+id/time"
                 android:layout_width="120dp"
                 android:layout_height="wrap_content"
-                android:paddingLeft="5dp"
+                android:paddingStart="5dp"
                 android:text="27.06.2016 18:00"
                 tools:ignore="HardcodedText,RtlHardcoded,RtlSymmetry" />
 
@@ -40,7 +40,7 @@
                 android:layout_width="50dp"
                 android:layout_height="wrap_content"
                 android:gravity="right"
-                android:paddingLeft="5dp"
+                android:paddingStart="5dp"
                 android:text="0.25"
                 tools:ignore="HardcodedText,RtlHardcoded,RtlSymmetry" />
 
@@ -48,7 +48,7 @@
                 android:id="@+id/bolus_type"
                 android:layout_width="20dp"
                 android:layout_height="wrap_content"
-                android:paddingLeft="5dp"
+                android:paddingStart="5dp"
                 android:text="E"
                 tools:ignore="HardcodedText,RtlHardcoded,RtlSymmetry" />
 
@@ -56,7 +56,7 @@
                 android:id="@+id/string_value"
                 android:layout_width="150dp"
                 android:layout_height="wrap_content"
-                android:paddingLeft="5dp"
+                android:paddingStart="5dp"
                 android:text=""
                 tools:ignore="HardcodedText,RtlHardcoded,RtlSymmetry" />
 
@@ -65,7 +65,7 @@
                 android:layout_width="30dp"
                 android:layout_height="wrap_content"
                 android:gravity="right"
-                android:paddingLeft="5dp"
+                android:paddingStart="5dp"
                 android:text="30"
                 tools:ignore="HardcodedText,RtlHardcoded,RtlSymmetry" />
 
@@ -74,7 +74,7 @@
                 android:layout_width="50dp"
                 android:layout_height="wrap_content"
                 android:gravity="right"
-                android:paddingLeft="5dp"
+                android:paddingStart="5dp"
                 tools:ignore="RtlHardcoded,RtlSymmetry" />
 
             <TextView
@@ -82,7 +82,7 @@
                 android:layout_width="50dp"
                 android:layout_height="wrap_content"
                 android:gravity="right"
-                android:paddingLeft="5dp"
+                android:paddingStart="5dp"
                 tools:ignore="RtlHardcoded,RtlSymmetry" />
 
             <TextView
@@ -90,7 +90,7 @@
                 android:layout_width="56dp"
                 android:layout_height="wrap_content"
                 android:gravity="right"
-                android:paddingLeft="10dp"
+                android:paddingStart="10dp"
                 android:visibility="gone"
                 tools:ignore="RtlHardcoded,RtlSymmetry" />
 
@@ -98,7 +98,7 @@
                 android:id="@+id/alarm"
                 android:layout_width="100dp"
                 android:layout_height="wrap_content"
-                android:paddingLeft="5dp"
+                android:paddingStart="5dp"
                 tools:ignore="RtlHardcoded,RtlSymmetry" />
 
         </LinearLayout>
@@ -106,9 +106,9 @@
         <View
             android:layout_width="fill_parent"
             android:layout_height="2dip"
-            android:layout_marginLeft="5dp"
+            android:layout_marginStart="5dp"
             android:layout_marginTop="5dp"
-            android:layout_marginRight="5dp"
+            android:layout_marginEnd="5dp"
             android:layout_marginBottom="5dp"
             android:background="?android:attr/dividerHorizontal" />
 
diff --git a/dana/src/main/res/layout/danar_user_options_activity.xml b/dana/src/main/res/layout/danar_user_options_activity.xml
index 73ef407562..ee76cba6bf 100644
--- a/dana/src/main/res/layout/danar_user_options_activity.xml
+++ b/dana/src/main/res/layout/danar_user_options_activity.xml
@@ -34,8 +34,8 @@
                 android:layout_height="wrap_content"
                 android:layout_centerInParent="true"
                 android:layout_gravity="center"
-                android:layout_marginLeft="10dp"
-                android:layout_marginRight="10dp"
+                android:layout_marginStart="10dp"
+                android:layout_marginEnd="10dp"
                 android:text="@string/danar_pump_settings"
                 android:textAlignment="center"
                 android:textAppearance="?android:attr/textAppearanceLarge" />
@@ -63,9 +63,9 @@
         <View
             android:layout_width="fill_parent"
             android:layout_height="2dip"
-            android:layout_marginLeft="20dp"
+            android:layout_marginStart="20dp"
             android:layout_marginTop="5dp"
-            android:layout_marginRight="20dp"
+            android:layout_marginEnd="20dp"
             android:layout_marginBottom="5dp"
             android:background="?android:attr/dividerHorizontal" />
 
@@ -82,9 +82,9 @@
         <View
             android:layout_width="fill_parent"
             android:layout_height="2dip"
-            android:layout_marginLeft="20dp"
+            android:layout_marginStart="20dp"
             android:layout_marginTop="5dp"
-            android:layout_marginRight="20dp"
+            android:layout_marginEnd="20dp"
             android:layout_marginBottom="5dp"
             android:background="?android:attr/dividerHorizontal" />
 
@@ -101,9 +101,9 @@
         <View
             android:layout_width="fill_parent"
             android:layout_height="2dip"
-            android:layout_marginLeft="20dp"
+            android:layout_marginStart="20dp"
             android:layout_marginTop="5dp"
-            android:layout_marginRight="20dp"
+            android:layout_marginEnd="20dp"
             android:layout_marginBottom="5dp"
             android:background="?android:attr/dividerHorizontal" />
 
@@ -154,9 +154,9 @@
         <View
             android:layout_width="fill_parent"
             android:layout_height="2dip"
-            android:layout_marginLeft="20dp"
+            android:layout_marginStart="20dp"
             android:layout_marginTop="5dp"
-            android:layout_marginRight="20dp"
+            android:layout_marginEnd="20dp"
             android:layout_marginBottom="5dp"
             android:background="?android:attr/dividerHorizontal" />
 
@@ -181,17 +181,17 @@
                 android:layout_width="wrap_content"
                 android:layout_height="40dp"
                 android:layout_gravity="end"
-                android:paddingLeft="5dp"
-                android:paddingRight="5dp" />
+                android:paddingStart="5dp"
+                android:paddingEnd="5dp" />
 
         </LinearLayout>
 
         <View
             android:layout_width="fill_parent"
             android:layout_height="2dip"
-            android:layout_marginLeft="20dp"
+            android:layout_marginStart="20dp"
             android:layout_marginTop="5dp"
-            android:layout_marginRight="20dp"
+            android:layout_marginEnd="20dp"
             android:layout_marginBottom="5dp"
             android:background="?android:attr/dividerHorizontal" />
 
@@ -218,17 +218,17 @@
                 android:layout_width="wrap_content"
                 android:layout_height="40dp"
                 android:layout_gravity="end"
-                android:paddingLeft="5dp"
-                android:paddingRight="5dp" />
+                android:paddingStart="5dp"
+                android:paddingEnd="5dp" />
 
         </LinearLayout>
 
         <View
             android:layout_width="fill_parent"
             android:layout_height="2dip"
-            android:layout_marginLeft="20dp"
+            android:layout_marginStart="20dp"
             android:layout_marginTop="5dp"
-            android:layout_marginRight="20dp"
+            android:layout_marginEnd="20dp"
             android:layout_marginBottom="5dp"
             android:background="?android:attr/dividerHorizontal" />
 
@@ -247,9 +247,9 @@
         <View
             android:layout_width="fill_parent"
             android:layout_height="2dip"
-            android:layout_marginLeft="20dp"
+            android:layout_marginStart="20dp"
             android:layout_marginTop="5dp"
-            android:layout_marginRight="20dp"
+            android:layout_marginEnd="20dp"
             android:layout_marginBottom="5dp"
             android:background="?android:attr/dividerHorizontal" />
 
@@ -274,17 +274,17 @@
                 android:layout_width="wrap_content"
                 android:layout_height="40dp"
                 android:layout_gravity="end"
-                android:paddingLeft="5dp"
-                android:paddingRight="5dp" />
+                android:paddingStart="5dp"
+                android:paddingEnd="5dp" />
 
         </LinearLayout>
 
         <View
             android:layout_width="fill_parent"
             android:layout_height="2dip"
-            android:layout_marginLeft="20dp"
+            android:layout_marginStart="20dp"
             android:layout_marginTop="5dp"
-            android:layout_marginRight="20dp"
+            android:layout_marginEnd="20dp"
             android:layout_marginBottom="5dp"
             android:background="?android:attr/dividerHorizontal" />
 
@@ -311,8 +311,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="40dp"
                 android:layout_gravity="end"
-                android:paddingLeft="5dp"
-                android:paddingRight="5dp" />
+                android:paddingStart="5dp"
+                android:paddingEnd="5dp" />
 
         </LinearLayout>
 
diff --git a/danars/src/main/res/layout/danars_blescanner_activity.xml b/danars/src/main/res/layout/danars_blescanner_activity.xml
index 2a61d0ba7f..eeb2310de8 100644
--- a/danars/src/main/res/layout/danars_blescanner_activity.xml
+++ b/danars/src/main/res/layout/danars_blescanner_activity.xml
@@ -26,8 +26,8 @@
             android:layout_height="wrap_content"
             android:layout_centerInParent="true"
             android:layout_gravity="center"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
             android:text="@string/danars_pairing"
             android:textAlignment="center"
             android:textAppearance="?android:attr/textAppearanceLarge" />
diff --git a/danars/src/main/res/layout/danars_blescanner_item.xml b/danars/src/main/res/layout/danars_blescanner_item.xml
index 6ff5828f67..df85e66a60 100644
--- a/danars/src/main/res/layout/danars_blescanner_item.xml
+++ b/danars/src/main/res/layout/danars_blescanner_item.xml
@@ -1,8 +1,8 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="52dp"
-    android:layout_marginLeft="15.67dp"
-    android:layout_marginRight="15.67dp">
+    android:layout_marginStart="15.67dp"
+    android:layout_marginEnd="15.67dp">
 
     <TextView
         android:id="@+id/ble_name"
diff --git a/danars/src/main/res/layout/danars_enter_pin_activity.xml b/danars/src/main/res/layout/danars_enter_pin_activity.xml
index 75fd8153ad..0c48780c5d 100644
--- a/danars/src/main/res/layout/danars_enter_pin_activity.xml
+++ b/danars/src/main/res/layout/danars_enter_pin_activity.xml
@@ -26,8 +26,8 @@
             android:layout_height="wrap_content"
             android:layout_centerInParent="true"
             android:layout_gravity="center"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
             android:text="@string/pairing"
             android:textAlignment="center"
             android:textAppearance="?android:attr/textAppearanceLarge" />
diff --git a/danars/src/main/res/layout/danars_pairing_progress_dialog.xml b/danars/src/main/res/layout/danars_pairing_progress_dialog.xml
index b5ce3d531b..044f01f8a8 100644
--- a/danars/src/main/res/layout/danars_pairing_progress_dialog.xml
+++ b/danars/src/main/res/layout/danars_pairing_progress_dialog.xml
@@ -23,8 +23,8 @@
             android:layout_height="wrap_content"
             android:layout_centerInParent="true"
             android:layout_gravity="center"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
             android:text="@string/pairing"
             android:textAlignment="center"
             android:textAppearance="?android:attr/textAppearanceLarge" />
@@ -52,8 +52,8 @@
         android:layout_width="match_parent"
         android:layout_height="20dp"
         android:layout_marginBottom="20dp"
-        android:layout_marginLeft="5dp"
-        android:layout_marginRight="5dp"
+        android:layout_marginStart="5dp"
+        android:layout_marginEnd="5dp"
         android:layout_marginTop="20dp"
         android:maxHeight="5dp"
         android:minHeight="3dp" />
diff --git a/diaconn/src/main/res/layout/diaconn_g8_blescanner_activity.xml b/diaconn/src/main/res/layout/diaconn_g8_blescanner_activity.xml
index 47de6d9e4e..753e5a1e7a 100644
--- a/diaconn/src/main/res/layout/diaconn_g8_blescanner_activity.xml
+++ b/diaconn/src/main/res/layout/diaconn_g8_blescanner_activity.xml
@@ -26,8 +26,8 @@
             android:layout_height="wrap_content"
             android:layout_centerInParent="true"
             android:layout_gravity="center"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
             android:text="@string/diaconn_pairing"
             android:textAlignment="center"
             android:textAppearance="?android:attr/textAppearanceLarge" />
diff --git a/diaconn/src/main/res/layout/diaconn_g8_blescanner_item.xml b/diaconn/src/main/res/layout/diaconn_g8_blescanner_item.xml
index 9a39302163..26b2e0d94c 100644
--- a/diaconn/src/main/res/layout/diaconn_g8_blescanner_item.xml
+++ b/diaconn/src/main/res/layout/diaconn_g8_blescanner_item.xml
@@ -1,8 +1,8 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="52dp"
-    android:layout_marginLeft="15.67dp"
-    android:layout_marginRight="15.67dp">
+    android:layout_marginStart="15.67dp"
+    android:layout_marginEnd="15.67dp">
 
     <TextView
         android:id="@+id/ble_name"
diff --git a/diaconn/src/main/res/layout/diaconn_g8_fragment.xml b/diaconn/src/main/res/layout/diaconn_g8_fragment.xml
index ccdfb8a3b4..ea0bae3d66 100644
--- a/diaconn/src/main/res/layout/diaconn_g8_fragment.xml
+++ b/diaconn/src/main/res/layout/diaconn_g8_fragment.xml
@@ -30,8 +30,8 @@
                         android:id="@+id/diaconn_g8_pumpstatus"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginLeft="5dp"
-                        android:layout_marginRight="5dp"
+                        android:layout_marginStart="5dp"
+                        android:layout_marginEnd="5dp"
                         android:background="@color/pumpStatusBackground"
                         android:gravity="center_vertical|center_horizontal"
                         android:text="@string/initializing"
@@ -49,7 +49,7 @@
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
                         android:gravity="end"
-                        android:paddingRight="5dp"
+                        android:paddingEnd="5dp"
                         android:text="@string/serialnumber"
                         android:textSize="14sp" />
 
@@ -80,8 +80,8 @@
                     android:layout_width="fill_parent"
                     android:layout_height="2dip"
                     android:layout_marginBottom="5dp"
-                    android:layout_marginLeft="20dp"
-                    android:layout_marginRight="20dp"
+                    android:layout_marginStart="20dp"
+                    android:layout_marginEnd="20dp"
                     android:layout_marginTop="5dp"
                     android:background="?android:attr/dividerHorizontal" />
 
@@ -137,8 +137,8 @@
                     android:layout_width="fill_parent"
                     android:layout_height="2dip"
                     android:layout_marginBottom="5dp"
-                    android:layout_marginLeft="20dp"
-                    android:layout_marginRight="20dp"
+                    android:layout_marginStart="20dp"
+                    android:layout_marginEnd="20dp"
                     android:layout_marginTop="5dp"
                     android:background="?android:attr/dividerHorizontal" />
 
@@ -184,8 +184,8 @@
                     android:layout_width="fill_parent"
                     android:layout_height="2dip"
                     android:layout_marginBottom="5dp"
-                    android:layout_marginLeft="20dp"
-                    android:layout_marginRight="20dp"
+                    android:layout_marginStart="20dp"
+                    android:layout_marginEnd="20dp"
                     android:layout_marginTop="5dp"
                     android:background="?android:attr/dividerHorizontal" />
 
@@ -230,8 +230,8 @@
                     android:layout_width="fill_parent"
                     android:layout_height="2dip"
                     android:layout_marginBottom="5dp"
-                    android:layout_marginLeft="20dp"
-                    android:layout_marginRight="20dp"
+                    android:layout_marginStart="20dp"
+                    android:layout_marginEnd="20dp"
                     android:layout_marginTop="5dp"
                     android:background="?android:attr/dividerHorizontal" />
 
@@ -276,8 +276,8 @@
                     android:layout_width="fill_parent"
                     android:layout_height="2dip"
                     android:layout_marginBottom="5dp"
-                    android:layout_marginLeft="20dp"
-                    android:layout_marginRight="20dp"
+                    android:layout_marginStart="20dp"
+                    android:layout_marginEnd="20dp"
                     android:layout_marginTop="5dp"
                     android:background="?android:attr/dividerHorizontal" />
 
@@ -322,8 +322,8 @@
                     android:layout_width="fill_parent"
                     android:layout_height="2dip"
                     android:layout_marginBottom="5dp"
-                    android:layout_marginLeft="20dp"
-                    android:layout_marginRight="20dp"
+                    android:layout_marginStart="20dp"
+                    android:layout_marginEnd="20dp"
                     android:layout_marginTop="5dp"
                     android:background="?android:attr/dividerHorizontal" />
 
@@ -368,8 +368,8 @@
                     android:layout_width="fill_parent"
                     android:layout_height="2dip"
                     android:layout_marginBottom="5dp"
-                    android:layout_marginLeft="20dp"
-                    android:layout_marginRight="20dp"
+                    android:layout_marginStart="20dp"
+                    android:layout_marginEnd="20dp"
                     android:layout_marginTop="5dp"
                     android:background="?android:attr/dividerHorizontal" />
 
@@ -414,8 +414,8 @@
                     android:layout_width="fill_parent"
                     android:layout_height="2dip"
                     android:layout_marginBottom="5dp"
-                    android:layout_marginLeft="20dp"
-                    android:layout_marginRight="20dp"
+                    android:layout_marginStart="20dp"
+                    android:layout_marginEnd="20dp"
                     android:layout_marginTop="5dp"
                     android:background="?android:attr/dividerHorizontal" />
 
@@ -460,8 +460,8 @@
                     android:layout_width="fill_parent"
                     android:layout_height="2dip"
                     android:layout_marginBottom="5dp"
-                    android:layout_marginLeft="20dp"
-                    android:layout_marginRight="20dp"
+                    android:layout_marginStart="20dp"
+                    android:layout_marginEnd="20dp"
                     android:layout_marginTop="5dp"
                     android:background="?android:attr/dividerHorizontal" />
 
@@ -506,8 +506,8 @@
                     android:layout_width="fill_parent"
                     android:layout_height="2dip"
                     android:layout_marginBottom="5dp"
-                    android:layout_marginLeft="20dp"
-                    android:layout_marginRight="20dp"
+                    android:layout_marginStart="20dp"
+                    android:layout_marginEnd="20dp"
                     android:layout_marginTop="5dp"
                     android:background="?android:attr/dividerHorizontal" />
 
@@ -552,8 +552,8 @@
                     android:layout_width="fill_parent"
                     android:layout_height="2dip"
                     android:layout_marginBottom="5dp"
-                    android:layout_marginLeft="20dp"
-                    android:layout_marginRight="20dp"
+                    android:layout_marginStart="20dp"
+                    android:layout_marginEnd="20dp"
                     android:layout_marginTop="5dp"
                     android:background="?android:attr/dividerHorizontal" />
 
@@ -598,8 +598,8 @@
                     android:layout_width="fill_parent"
                     android:layout_height="2dip"
                     android:layout_marginBottom="5dp"
-                    android:layout_marginLeft="20dp"
-                    android:layout_marginRight="20dp"
+                    android:layout_marginStart="20dp"
+                    android:layout_marginEnd="20dp"
                     android:layout_marginTop="5dp"
                     android:background="?android:attr/dividerHorizontal" />
 
@@ -644,8 +644,8 @@
                     android:layout_width="fill_parent"
                     android:layout_height="2dip"
                     android:layout_marginBottom="5dp"
-                    android:layout_marginLeft="20dp"
-                    android:layout_marginRight="20dp"
+                    android:layout_marginStart="20dp"
+                    android:layout_marginEnd="20dp"
                     android:layout_marginTop="5dp"
                     android:background="?android:attr/dividerHorizontal" />
 
@@ -679,8 +679,8 @@
                     android:layout_height="match_parent"
                     android:layout_weight="1"
                     android:drawableTop="@drawable/ic_pump_history"
-                    android:paddingLeft="0dp"
-                    android:paddingRight="0dp"
+                    android:paddingStart="0dp"
+                    android:paddingEnd="0dp"
                     android:text="@string/pumphistory" />
 
                 <com.google.android.material.button.MaterialButton
@@ -690,8 +690,8 @@
                     android:layout_height="match_parent"
                     android:layout_weight="1"
                     android:drawableTop="@drawable/ic_danarstats"
-                    android:paddingLeft="0dp"
-                    android:paddingRight="0dp"
+                    android:paddingStart="0dp"
+                    android:paddingEnd="0dp"
                     android:text="@string/stats" />
 
                 <com.google.android.material.button.MaterialButton
@@ -701,8 +701,8 @@
                     android:layout_height="match_parent"
                     android:layout_weight="1"
                     android:drawableTop="@drawable/ic_danar_useropt"
-                    android:paddingLeft="0dp"
-                    android:paddingRight="0dp"
+                    android:paddingStart="0dp"
+                    android:paddingEnd="0dp"
                     android:text="@string/diagonn_g8_useroptions" />
 
             </LinearLayout>
diff --git a/diaconn/src/main/res/layout/diaconn_g8_history_activity.xml b/diaconn/src/main/res/layout/diaconn_g8_history_activity.xml
index f6af405c5b..548d868952 100644
--- a/diaconn/src/main/res/layout/diaconn_g8_history_activity.xml
+++ b/diaconn/src/main/res/layout/diaconn_g8_history_activity.xml
@@ -28,8 +28,8 @@
             android:layout_height="wrap_content"
             android:layout_centerInParent="true"
             android:layout_gravity="center"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
             android:text="@string/pumphistory"
             android:textAlignment="center"
             android:textAppearance="?android:attr/textAppearanceLarge" />
diff --git a/diaconn/src/main/res/layout/diaconn_g8_history_item.xml b/diaconn/src/main/res/layout/diaconn_g8_history_item.xml
index 71eb680a6e..6ca31e4a7d 100644
--- a/diaconn/src/main/res/layout/diaconn_g8_history_item.xml
+++ b/diaconn/src/main/res/layout/diaconn_g8_history_item.xml
@@ -25,14 +25,14 @@
             android:id="@+id/diaconn_g8_history_time"
             android:layout_width="120dp"
             android:layout_height="wrap_content"
-            android:paddingLeft="5dp"
+            android:paddingStart="5dp"
             android:text="27.06.2016 18:00" />
 
         <TextView
             android:id="@+id/diaconn_g8_history_value"
             android:layout_width="50dp"
             android:layout_height="wrap_content"
-            android:paddingLeft="5dp"
+            android:paddingStart="5dp"
             android:text="0.25"
             android:gravity="right" />
 
@@ -40,7 +40,7 @@
             android:id="@+id/diaconn_g8_history_bolustype"
             android:layout_width="20dp"
             android:layout_height="wrap_content"
-            android:paddingLeft="5dp"
+            android:paddingStart="5dp"
             android:text="E"
 />
 
@@ -48,7 +48,7 @@
             android:id="@+id/diaconn_g8_history_stringvalue"
             android:layout_width="150dp"
             android:layout_height="wrap_content"
-            android:paddingLeft="5dp"
+            android:paddingStart="5dp"
             android:text="XXXXXXX"
 />
 
@@ -56,7 +56,7 @@
             android:id="@+id/diaconn_g8_history_duration"
             android:layout_width="30dp"
             android:layout_height="wrap_content"
-            android:paddingLeft="5dp"
+            android:paddingStart="5dp"
             android:text="30"
             android:gravity="right" />
 
@@ -64,21 +64,21 @@
             android:id="@+id/diaconn_g8_history_dailybasal"
             android:layout_width="50dp"
             android:layout_height="wrap_content"
-            android:paddingLeft="5dp"
+            android:paddingStart="5dp"
             android:gravity="right" />
 
         <TextView
             android:id="@+id/diaconn_g8_history_dailybolus"
             android:layout_width="50dp"
             android:layout_height="wrap_content"
-            android:paddingLeft="5dp"
+            android:paddingStart="5dp"
             android:gravity="right" />
 
         <TextView
             android:id="@+id/diaconn_g8_history_dailytotal"
             android:layout_width="56dp"
             android:layout_height="wrap_content"
-            android:paddingLeft="10dp"
+            android:paddingStart="10dp"
             android:gravity="right"
             android:visibility="gone"/>
 
@@ -86,7 +86,7 @@
             android:id="@+id/diaconn_g8_history_alarm"
             android:layout_width="100dp"
             android:layout_height="wrap_content"
-            android:paddingLeft="5dp" />
+            android:paddingStart="5dp" />
 
     </LinearLayout>
 
diff --git a/diaconn/src/main/res/layout/diaconn_g8_user_options_activity.xml b/diaconn/src/main/res/layout/diaconn_g8_user_options_activity.xml
index 502c2eb97c..61a43250a5 100644
--- a/diaconn/src/main/res/layout/diaconn_g8_user_options_activity.xml
+++ b/diaconn/src/main/res/layout/diaconn_g8_user_options_activity.xml
@@ -34,8 +34,8 @@
                 android:layout_height="wrap_content"
                 android:layout_centerInParent="true"
                 android:layout_gravity="center"
-                android:layout_marginLeft="10dp"
-                android:layout_marginRight="10dp"
+                android:layout_marginStart="10dp"
+                android:layout_marginEnd="10dp"
                 android:text="@string/diaconng8_pump_settings"
                 android:textAlignment="center"
                 android:textAppearance="?android:attr/textAppearanceLarge" />
@@ -69,9 +69,9 @@
         <View
             android:layout_width="fill_parent"
             android:layout_height="2dip"
-            android:layout_marginLeft="20dp"
+            android:layout_marginStart="20dp"
             android:layout_marginTop="5dp"
-            android:layout_marginRight="20dp"
+            android:layout_marginEnd="20dp"
             android:layout_marginBottom="5dp"
             android:background="?android:attr/dividerHorizontal" />
 
@@ -137,9 +137,9 @@
         <View
             android:layout_width="fill_parent"
             android:layout_height="2dip"
-            android:layout_marginLeft="20dp"
+            android:layout_marginStart="20dp"
             android:layout_marginTop="5dp"
-            android:layout_marginRight="20dp"
+            android:layout_marginEnd="20dp"
             android:layout_marginBottom="5dp"
             android:background="?android:attr/dividerHorizontal" />
 
@@ -219,9 +219,9 @@
         <View
             android:layout_width="fill_parent"
             android:layout_height="2dip"
-            android:layout_marginLeft="20dp"
+            android:layout_marginStart="20dp"
             android:layout_marginTop="5dp"
-            android:layout_marginRight="20dp"
+            android:layout_marginEnd="20dp"
             android:layout_marginBottom="5dp"
             android:background="?android:attr/dividerHorizontal" />
 
@@ -300,9 +300,9 @@
         <View
             android:layout_width="fill_parent"
             android:layout_height="2dip"
-            android:layout_marginLeft="20dp"
+            android:layout_marginStart="20dp"
             android:layout_marginTop="5dp"
-            android:layout_marginRight="20dp"
+            android:layout_marginEnd="20dp"
             android:layout_marginBottom="5dp"
             android:background="?android:attr/dividerHorizontal" />
 
diff --git a/insight/src/main/res/layout/activity_insight_alert.xml b/insight/src/main/res/layout/activity_insight_alert.xml
index aa7ef66665..fadc1cc503 100644
--- a/insight/src/main/res/layout/activity_insight_alert.xml
+++ b/insight/src/main/res/layout/activity_insight_alert.xml
@@ -7,8 +7,8 @@
     android:animateLayoutChanges="true"
     android:orientation="vertical"
     android:paddingBottom="8dp"
-    android:paddingLeft="24dp"
-    android:paddingRight="24dp"
+    android:paddingStart="24dp"
+    android:paddingEnd="24dp"
     android:paddingTop="20dp">
 
     <ImageView
diff --git a/insight/src/main/res/layout/bluetooth_device.xml b/insight/src/main/res/layout/bluetooth_device.xml
index fc1aa8579d..16230591ca 100644
--- a/insight/src/main/res/layout/bluetooth_device.xml
+++ b/insight/src/main/res/layout/bluetooth_device.xml
@@ -2,7 +2,7 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:paddingLeft="16dp"
+    android:paddingStart="16dp"
     android:textSize="20sp"
     android:gravity="center_vertical"
     android:textColor="#FFFFFF"
diff --git a/insight/src/main/res/layout/local_insight_status_item.xml b/insight/src/main/res/layout/local_insight_status_item.xml
index 28acf17208..38216e9b33 100644
--- a/insight/src/main/res/layout/local_insight_status_item.xml
+++ b/insight/src/main/res/layout/local_insight_status_item.xml
@@ -10,7 +10,7 @@
         android:layout_height="wrap_content"
         android:layout_weight="1"
         android:gravity="end"
-        android:paddingRight="5dp"
+        android:paddingEnd="5dp"
         android:textSize="14sp" />
 
     <TextView
@@ -29,7 +29,7 @@
         android:layout_height="wrap_content"
         android:layout_weight="1"
         android:gravity="start"
-        android:paddingLeft="5dp"
+        android:paddingStart="5dp"
         android:textColor="@android:color/white"
         android:textSize="14sp" />
 </LinearLayout>
\ No newline at end of file
diff --git a/medtronic/src/main/res/layout/medtronic_fragment.xml b/medtronic/src/main/res/layout/medtronic_fragment.xml
index 125ee1f63e..ea92f2a590 100644
--- a/medtronic/src/main/res/layout/medtronic_fragment.xml
+++ b/medtronic/src/main/res/layout/medtronic_fragment.xml
@@ -30,8 +30,8 @@
                     android:id="@+id/pump_status"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="5dp"
-                    android:layout_marginRight="5dp"
+                    android:layout_marginStart="5dp"
+                    android:layout_marginEnd="5dp"
                     android:background="?attr/pumpStatusBackground"
                     android:gravity="center_vertical|center_horizontal"
                     android:text="@string/initializing"
@@ -42,9 +42,9 @@
             <View
                 android:layout_width="fill_parent"
                 android:layout_height="2dip"
-                android:layout_marginLeft="20dp"
+                android:layout_marginStart="20dp"
                 android:layout_marginTop="5dp"
-                android:layout_marginRight="20dp"
+                android:layout_marginEnd="20dp"
                 android:layout_marginBottom="5dp"
                 android:background="?android:attr/dividerHorizontal" />
 
@@ -94,9 +94,9 @@
                 android:id="@+id/rl_battery_view"
                 android:layout_width="fill_parent"
                 android:layout_height="2dip"
-                android:layout_marginLeft="20dp"
+                android:layout_marginStart="20dp"
                 android:layout_marginTop="5dp"
-                android:layout_marginRight="20dp"
+                android:layout_marginEnd="20dp"
                 android:layout_marginBottom="5dp"
                 android:background="?android:attr/dividerHorizontal" />
 
@@ -148,9 +148,9 @@
             <View
                 android:layout_width="fill_parent"
                 android:layout_height="2dip"
-                android:layout_marginLeft="20dp"
+                android:layout_marginStart="20dp"
                 android:layout_marginTop="5dp"
-                android:layout_marginRight="20dp"
+                android:layout_marginEnd="20dp"
                 android:layout_marginBottom="5dp"
                 android:background="?android:attr/dividerHorizontal" />
 
@@ -206,9 +206,9 @@
             <View
                 android:layout_width="fill_parent"
                 android:layout_height="2dip"
-                android:layout_marginLeft="20dp"
+                android:layout_marginStart="20dp"
                 android:layout_marginTop="5dp"
-                android:layout_marginRight="20dp"
+                android:layout_marginEnd="20dp"
                 android:layout_marginBottom="5dp"
                 android:background="?android:attr/dividerHorizontal" />
 
@@ -255,9 +255,9 @@
             <View
                 android:layout_width="fill_parent"
                 android:layout_height="2dip"
-                android:layout_marginLeft="20dp"
+                android:layout_marginStart="20dp"
                 android:layout_marginTop="5dp"
-                android:layout_marginRight="20dp"
+                android:layout_marginEnd="20dp"
                 android:layout_marginBottom="5dp"
                 android:background="?android:attr/dividerHorizontal" />
 
@@ -303,9 +303,9 @@
             <View
                 android:layout_width="fill_parent"
                 android:layout_height="2dip"
-                android:layout_marginLeft="20dp"
+                android:layout_marginStart="20dp"
                 android:layout_marginTop="5dp"
-                android:layout_marginRight="20dp"
+                android:layout_marginEnd="20dp"
                 android:layout_marginBottom="5dp"
                 android:background="?android:attr/dividerHorizontal" />
 
@@ -352,9 +352,9 @@
             <View
                 android:layout_width="fill_parent"
                 android:layout_height="2dip"
-                android:layout_marginLeft="20dp"
+                android:layout_marginStart="20dp"
                 android:layout_marginTop="5dp"
-                android:layout_marginRight="20dp"
+                android:layout_marginEnd="20dp"
                 android:layout_marginBottom="5dp"
                 android:background="?android:attr/dividerHorizontal" />
 
@@ -400,9 +400,9 @@
             <View
                 android:layout_width="fill_parent"
                 android:layout_height="2dip"
-                android:layout_marginLeft="20dp"
+                android:layout_marginStart="20dp"
                 android:layout_marginTop="5dp"
-                android:layout_marginRight="20dp"
+                android:layout_marginEnd="20dp"
                 android:layout_marginBottom="5dp"
                 android:background="?android:attr/dividerHorizontal" />
 
@@ -448,9 +448,9 @@
             <View
                 android:layout_width="fill_parent"
                 android:layout_height="2dip"
-                android:layout_marginLeft="20dp"
+                android:layout_marginStart="20dp"
                 android:layout_marginTop="5dp"
-                android:layout_marginRight="20dp"
+                android:layout_marginEnd="20dp"
                 android:layout_marginBottom="5dp"
                 android:background="?android:attr/dividerHorizontal" />
 
@@ -498,9 +498,9 @@
             <View
                 android:layout_width="fill_parent"
                 android:layout_height="2dip"
-                android:layout_marginLeft="20dp"
+                android:layout_marginStart="20dp"
                 android:layout_marginTop="5dp"
-                android:layout_marginRight="20dp"
+                android:layout_marginEnd="20dp"
                 android:layout_marginBottom="5dp"
                 android:background="?android:attr/dividerHorizontal" />
 
@@ -546,9 +546,9 @@
             <View
                 android:layout_width="fill_parent"
                 android:layout_height="2dip"
-                android:layout_marginLeft="20dp"
+                android:layout_marginStart="20dp"
                 android:layout_marginTop="5dp"
-                android:layout_marginRight="20dp"
+                android:layout_marginEnd="20dp"
                 android:layout_marginBottom="5dp"
                 android:background="?android:attr/dividerHorizontal" />
 
@@ -577,8 +577,8 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:drawableTop="@drawable/ic_actions_refill"
-            android:paddingLeft="0dp"
-            android:paddingRight="0dp"
+            android:paddingStart="0dp"
+            android:paddingEnd="0dp"
             android:text="@string/refresh" />
 
 
@@ -589,8 +589,8 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:drawableTop="@drawable/ic_pump_history"
-            android:paddingLeft="0dp"
-            android:paddingRight="0dp"
+            android:paddingStart="0dp"
+            android:paddingEnd="0dp"
             android:text="@string/pumphistory" />
 
         <com.google.android.material.button.MaterialButton
@@ -600,8 +600,8 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:drawableTop="@drawable/ic_danarstats"
-            android:paddingLeft="0dp"
-            android:paddingRight="0dp"
+            android:paddingStart="0dp"
+            android:paddingEnd="0dp"
             android:text="RL Stats" />
 
 
diff --git a/medtronic/src/main/res/layout/medtronic_history_activity.xml b/medtronic/src/main/res/layout/medtronic_history_activity.xml
index 5c909f5937..b9e95908df 100644
--- a/medtronic/src/main/res/layout/medtronic_history_activity.xml
+++ b/medtronic/src/main/res/layout/medtronic_history_activity.xml
@@ -18,8 +18,8 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="5dp"
-            android:layout_marginRight="20dp"
+            android:layout_marginStart="5dp"
+            android:layout_marginEnd="20dp"
             android:text="Type:"
             android:textAppearance="?android:attr/textAppearanceSmall" />
 
@@ -27,13 +27,13 @@
             android:id="@+id/medtronic_historytype"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginRight="20dp" />
+            android:layout_marginEnd="20dp" />
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="right"
-            android:layout_marginRight="5dp"
+            android:layout_marginEnd="5dp"
             android:layout_weight="1"
             android:background="@drawable/pillborder"
             android:gravity="center_horizontal"
diff --git a/medtronic/src/main/res/layout/medtronic_history_item.xml b/medtronic/src/main/res/layout/medtronic_history_item.xml
index 55881f0553..e5ee5bdd5b 100644
--- a/medtronic/src/main/res/layout/medtronic_history_item.xml
+++ b/medtronic/src/main/res/layout/medtronic_history_item.xml
@@ -3,7 +3,7 @@
     android:orientation="horizontal"
     android:layout_width="match_parent"
     android:layout_height="40dp"
-    android:paddingLeft="20dp">
+    android:paddingStart="20dp">
 
 
     <TextView
diff --git a/omnipod-common/src/main/res/layout/omnipod_common_overview_pod_info.xml b/omnipod-common/src/main/res/layout/omnipod_common_overview_pod_info.xml
index f1a56425cd..2cfb1daa9e 100644
--- a/omnipod-common/src/main/res/layout/omnipod_common_overview_pod_info.xml
+++ b/omnipod-common/src/main/res/layout/omnipod_common_overview_pod_info.xml
@@ -293,9 +293,9 @@
     <View
         android:layout_width="fill_parent"
         android:layout_height="2dip"
-        android:layout_marginLeft="20dp"
+        android:layout_marginStart="20dp"
         android:layout_marginTop="5dp"
-        android:layout_marginRight="20dp"
+        android:layout_marginEnd="20dp"
         android:layout_marginBottom="5dp"
         android:background="?android:attr/dividerHorizontal" />
 
@@ -341,9 +341,9 @@
     <View
         android:layout_width="fill_parent"
         android:layout_height="2dip"
-        android:layout_marginLeft="20dp"
+        android:layout_marginStart="20dp"
         android:layout_marginTop="5dp"
-        android:layout_marginRight="20dp"
+        android:layout_marginEnd="20dp"
         android:layout_marginBottom="5dp"
         android:background="?android:attr/dividerHorizontal" />
 
@@ -389,9 +389,9 @@
     <View
         android:layout_width="fill_parent"
         android:layout_height="2dip"
-        android:layout_marginLeft="20dp"
+        android:layout_marginStart="20dp"
         android:layout_marginTop="5dp"
-        android:layout_marginRight="20dp"
+        android:layout_marginEnd="20dp"
         android:layout_marginBottom="5dp"
         android:background="?android:attr/dividerHorizontal" />
 
@@ -437,9 +437,9 @@
     <View
         android:layout_width="fill_parent"
         android:layout_height="2dip"
-        android:layout_marginLeft="20dp"
+        android:layout_marginStart="20dp"
         android:layout_marginTop="5dp"
-        android:layout_marginRight="20dp"
+        android:layout_marginEnd="20dp"
         android:layout_marginBottom="5dp"
         android:background="?android:attr/dividerHorizontal" />
 
@@ -485,9 +485,9 @@
     <View
         android:layout_width="fill_parent"
         android:layout_height="2dip"
-        android:layout_marginLeft="20dp"
+        android:layout_marginStart="20dp"
         android:layout_marginTop="5dp"
-        android:layout_marginRight="20dp"
+        android:layout_marginEnd="20dp"
         android:layout_marginBottom="5dp"
         android:background="?android:attr/dividerHorizontal" />
 
@@ -533,9 +533,9 @@
     <View
         android:layout_width="fill_parent"
         android:layout_height="2dip"
-        android:layout_marginLeft="20dp"
+        android:layout_marginStart="20dp"
         android:layout_marginTop="5dp"
-        android:layout_marginRight="20dp"
+        android:layout_marginEnd="20dp"
         android:layout_marginBottom="5dp"
         android:background="?android:attr/dividerHorizontal" />
 
@@ -581,9 +581,9 @@
     <View
         android:layout_width="fill_parent"
         android:layout_height="2dip"
-        android:layout_marginLeft="20dp"
+        android:layout_marginStart="20dp"
         android:layout_marginTop="5dp"
-        android:layout_marginRight="20dp"
+        android:layout_marginEnd="20dp"
         android:layout_marginBottom="5dp"
         android:background="?android:attr/dividerHorizontal" />
 
@@ -629,9 +629,9 @@
     <View
         android:layout_width="fill_parent"
         android:layout_height="2dip"
-        android:layout_marginLeft="20dp"
+        android:layout_marginStart="20dp"
         android:layout_marginTop="5dp"
-        android:layout_marginRight="20dp"
+        android:layout_marginEnd="20dp"
         android:layout_marginBottom="5dp"
         android:background="?android:attr/dividerHorizontal" />
 
@@ -677,9 +677,9 @@
     <View
         android:layout_width="fill_parent"
         android:layout_height="2dip"
-        android:layout_marginLeft="20dp"
+        android:layout_marginStart="20dp"
         android:layout_marginTop="5dp"
-        android:layout_marginRight="20dp"
+        android:layout_marginEnd="20dp"
         android:layout_marginBottom="5dp"
         android:background="?android:attr/dividerHorizontal" />
 
diff --git a/omnipod-dash/src/main/res/layout/omnipod_dash_overview.xml b/omnipod-dash/src/main/res/layout/omnipod_dash_overview.xml
index 6ce53d47de..73a8c90402 100644
--- a/omnipod-dash/src/main/res/layout/omnipod_dash_overview.xml
+++ b/omnipod-dash/src/main/res/layout/omnipod_dash_overview.xml
@@ -18,9 +18,9 @@
             <View
                 android:layout_width="fill_parent"
                 android:layout_height="2dip"
-                android:layout_marginLeft="20dp"
+                android:layout_marginStart="20dp"
                 android:layout_marginTop="5dp"
-                android:layout_marginRight="20dp"
+                android:layout_marginEnd="20dp"
                 android:layout_marginBottom="5dp"
                 android:background="?android:attr/dividerHorizontal" />
 
diff --git a/omnipod-dash/src/main/res/layout/omnipod_dash_overview_bluetooth_status.xml b/omnipod-dash/src/main/res/layout/omnipod_dash_overview_bluetooth_status.xml
index 18f5198cfb..42cf74988f 100644
--- a/omnipod-dash/src/main/res/layout/omnipod_dash_overview_bluetooth_status.xml
+++ b/omnipod-dash/src/main/res/layout/omnipod_dash_overview_bluetooth_status.xml
@@ -163,9 +163,9 @@
     <View
         android:layout_width="fill_parent"
         android:layout_height="2dip"
-        android:layout_marginLeft="20dp"
+        android:layout_marginStart="20dp"
         android:layout_marginTop="5dp"
-        android:layout_marginRight="20dp"
+        android:layout_marginEnd="20dp"
         android:layout_marginBottom="5dp"
         android:background="?android:attr/dividerHorizontal" />
 </merge>
\ No newline at end of file
diff --git a/omnipod-dash/src/main/res/layout/omnipod_dash_pod_management.xml b/omnipod-dash/src/main/res/layout/omnipod_dash_pod_management.xml
index a3ee99cca0..7515079bcd 100644
--- a/omnipod-dash/src/main/res/layout/omnipod_dash_pod_management.xml
+++ b/omnipod-dash/src/main/res/layout/omnipod_dash_pod_management.xml
@@ -16,9 +16,9 @@
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="10dp"
+            android:layout_marginStart="10dp"
             android:layout_marginTop="20dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginEnd="10dp"
             android:gravity="center"
             android:text="@string/omnipod_common_pod_management_title"
             android:textAlignment="center"
diff --git a/omnipod-eros/src/main/res/layout/omnipod_eros_overview.xml b/omnipod-eros/src/main/res/layout/omnipod_eros_overview.xml
index 969c51c98d..aca6451b2e 100644
--- a/omnipod-eros/src/main/res/layout/omnipod_eros_overview.xml
+++ b/omnipod-eros/src/main/res/layout/omnipod_eros_overview.xml
@@ -18,9 +18,9 @@
             <View
                 android:layout_width="fill_parent"
                 android:layout_height="2dip"
-                android:layout_marginLeft="20dp"
+                android:layout_marginStart="20dp"
                 android:layout_marginTop="5dp"
-                android:layout_marginRight="20dp"
+                android:layout_marginEnd="20dp"
                 android:layout_marginBottom="5dp"
                 android:background="?android:attr/dividerHorizontal" />
 
diff --git a/omnipod-eros/src/main/res/layout/omnipod_eros_overview_riley_link_status.xml b/omnipod-eros/src/main/res/layout/omnipod_eros_overview_riley_link_status.xml
index 3b1413977b..1c1c752dae 100644
--- a/omnipod-eros/src/main/res/layout/omnipod_eros_overview_riley_link_status.xml
+++ b/omnipod-eros/src/main/res/layout/omnipod_eros_overview_riley_link_status.xml
@@ -45,9 +45,9 @@
     <View
         android:layout_width="fill_parent"
         android:layout_height="2dip"
-        android:layout_marginLeft="20dp"
+        android:layout_marginStart="20dp"
         android:layout_marginTop="5dp"
-        android:layout_marginRight="20dp"
+        android:layout_marginEnd="20dp"
         android:layout_marginBottom="5dp"
         android:background="?android:attr/dividerHorizontal" />
 </merge>
\ No newline at end of file
diff --git a/omnipod-eros/src/main/res/layout/omnipod_eros_pod_management.xml b/omnipod-eros/src/main/res/layout/omnipod_eros_pod_management.xml
index e16a4eb8e5..09b7955ce9 100644
--- a/omnipod-eros/src/main/res/layout/omnipod_eros_pod_management.xml
+++ b/omnipod-eros/src/main/res/layout/omnipod_eros_pod_management.xml
@@ -16,9 +16,9 @@
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="10dp"
+            android:layout_marginStart="10dp"
             android:layout_marginTop="20dp"
-            android:layout_marginRight="10dp"
+            android:layout_marginEnd="10dp"
             android:gravity="center"
             android:text="@string/omnipod_common_pod_management_title"
             android:textAlignment="center"
@@ -35,16 +35,16 @@
             <ProgressBar
                 android:layout_width="match_parent"
                 android:layout_height="40dp"
-                android:layout_marginLeft="25dp"
+                android:layout_marginStart="25dp"
                 android:layout_marginTop="20dp"
-                android:layout_marginRight="25dp" />
+                android:layout_marginEnd="25dp" />
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
-                android:layout_marginLeft="10dp"
+                android:layout_marginStart="10dp"
                 android:layout_marginTop="10dp"
-                android:layout_marginRight="10dp"
+                android:layout_marginEnd="10dp"
                 android:layout_weight="0.5"
                 android:gravity="center"
                 android:text="@string/omnipod_eros_pod_management_waiting_for_riley_link_connection"
diff --git a/rileylink/src/main/res/layout/rileylink_status_device_item.xml b/rileylink/src/main/res/layout/rileylink_status_device_item.xml
index 179e72e93c..e8a81fbc6f 100644
--- a/rileylink/src/main/res/layout/rileylink_status_device_item.xml
+++ b/rileylink/src/main/res/layout/rileylink_status_device_item.xml
@@ -3,7 +3,7 @@
     android:orientation="horizontal"
     android:layout_width="match_parent"
     android:layout_height="40dp"
-    android:paddingLeft="15dp">
+    android:paddingStart="15dp">
 
     <TextView
         android:id="@+id/rileylink_device_label"
diff --git a/rileylink/src/main/res/layout/rileylink_status_general.xml b/rileylink/src/main/res/layout/rileylink_status_general.xml
index 69aeb0ea84..ed1f4e8159 100644
--- a/rileylink/src/main/res/layout/rileylink_status_general.xml
+++ b/rileylink/src/main/res/layout/rileylink_status_general.xml
@@ -22,7 +22,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="25pt"
-                    android:layout_marginLeft="10dp"
+                    android:layout_marginStart="10dp"
                     android:gravity="center_vertical"
                     android:text="@string/rileylink_title"
                     android:textColor="@android:color/holo_blue_dark" />
@@ -40,7 +40,7 @@
                 <TextView
                     android:layout_width="58dp"
                     android:layout_height="match_parent"
-                    android:layout_marginLeft="30dp"
+                    android:layout_marginStart="30dp"
                     android:layout_weight="35"
                     android:gravity="center_vertical"
                     android:text="@string/rileylink_address" />
@@ -49,7 +49,7 @@
                     android:id="@+id/rls_t1_configured_riley_link_address"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
-                    android:layout_marginLeft="10dp"
+                    android:layout_marginStart="10dp"
                     android:layout_weight="65"
                     android:gravity="center_vertical"
                     android:text="         "
@@ -68,7 +68,7 @@
                 <TextView
                     android:layout_width="58dp"
                     android:layout_height="match_parent"
-                    android:layout_marginLeft="30dp"
+                    android:layout_marginStart="30dp"
                     android:layout_weight="35"
                     android:gravity="center_vertical"
                     android:text="@string/rileylink_name" />
@@ -77,7 +77,7 @@
                     android:id="@+id/rls_t1_configured_riley_link_name"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
-                    android:layout_marginLeft="10dp"
+                    android:layout_marginStart="10dp"
                     android:layout_weight="65"
                     android:gravity="center_vertical"
                     android:text="         "
@@ -98,7 +98,7 @@
                 <TextView
                     android:layout_width="58dp"
                     android:layout_height="match_parent"
-                    android:layout_marginLeft="30dp"
+                    android:layout_marginStart="30dp"
                     android:layout_weight="35"
                     android:gravity="center_vertical"
                     android:text="@string/rileylink_battery_level" />
@@ -107,7 +107,7 @@
                     android:id="@+id/rls_t1_battery_level"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
-                    android:layout_marginLeft="10dp"
+                    android:layout_marginStart="10dp"
                     android:layout_weight="65"
                     android:gravity="center_vertical"
                     android:text="         "
@@ -127,7 +127,7 @@
                 <TextView
                     android:layout_width="58dp"
                     android:layout_height="match_parent"
-                    android:layout_marginLeft="30dp"
+                    android:layout_marginStart="30dp"
                     android:layout_weight="35"
                     android:gravity="center_vertical"
                     android:text="@string/rileylink_connection_status" />
@@ -136,7 +136,7 @@
                     android:id="@+id/rls_t1_connection_status"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
-                    android:layout_marginLeft="10dp"
+                    android:layout_marginStart="10dp"
                     android:layout_weight="65"
                     android:gravity="center_vertical"
                     android:text="         "
@@ -155,7 +155,7 @@
                 <TextView
                     android:layout_width="58dp"
                     android:layout_height="match_parent"
-                    android:layout_marginLeft="30dp"
+                    android:layout_marginStart="30dp"
                     android:layout_weight="35"
                     android:gravity="center_vertical"
                     android:text="@string/rileylink_connection_error" />
@@ -164,7 +164,7 @@
                     android:id="@+id/rls_t1_connection_error"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
-                    android:layout_marginLeft="10dp"
+                    android:layout_marginStart="10dp"
                     android:layout_weight="65"
                     android:gravity="center_vertical"
                     android:text="         "
@@ -183,7 +183,7 @@
                 <TextView
                     android:layout_width="58dp"
                     android:layout_height="match_parent"
-                    android:layout_marginLeft="30dp"
+                    android:layout_marginStart="30dp"
                     android:layout_weight="35"
                     android:gravity="center_vertical"
                     android:text="@string/rileylink_firmware_version" />
@@ -192,7 +192,7 @@
                     android:id="@+id/rls_t1_firmware_version"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
-                    android:layout_marginLeft="10dp"
+                    android:layout_marginStart="10dp"
                     android:layout_weight="65"
                     android:gravity="center_vertical"
                     android:text="         "
@@ -208,7 +208,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="25pt"
-                    android:layout_marginLeft="10dp"
+                    android:layout_marginStart="10dp"
                     android:gravity="center_vertical"
                     android:text="@string/rileylink_device"
                     android:textColor="@android:color/holo_blue_dark" />
@@ -226,7 +226,7 @@
                 <TextView
                     android:layout_width="58dp"
                     android:layout_height="match_parent"
-                    android:layout_marginLeft="30dp"
+                    android:layout_marginStart="30dp"
                     android:layout_weight="35"
                     android:gravity="center_vertical"
                     android:text="@string/rileylink_device_type" />
@@ -235,7 +235,7 @@
                     android:id="@+id/rls_t1_device_type"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
-                    android:layout_marginLeft="10dp"
+                    android:layout_marginStart="10dp"
                     android:layout_weight="65"
                     android:gravity="center_vertical"
                     android:text="        "
@@ -261,7 +261,7 @@
                     <TextView
                         android:layout_width="58dp"
                         android:layout_height="match_parent"
-                        android:layout_marginLeft="30dp"
+                        android:layout_marginStart="30dp"
                         android:layout_weight="35"
                         android:gravity="center_vertical"
                         android:text="@string/rileylink_configured_device_model" />
@@ -270,7 +270,7 @@
                         android:id="@+id/rls_t1_configured_device_model"
                         android:layout_width="wrap_content"
                         android:layout_height="match_parent"
-                        android:layout_marginLeft="10dp"
+                        android:layout_marginStart="10dp"
                         android:layout_weight="65"
                         android:gravity="center_vertical"
                         android:text="        "
@@ -289,7 +289,7 @@
                     <TextView
                         android:layout_width="58dp"
                         android:layout_height="match_parent"
-                        android:layout_marginLeft="30dp"
+                        android:layout_marginStart="30dp"
                         android:layout_weight="35"
                         android:gravity="center_vertical"
                         android:text="@string/rileylink_connected_device_model" />
@@ -298,7 +298,7 @@
                         android:id="@+id/rls_t1_connected_device_model"
                         android:layout_width="wrap_content"
                         android:layout_height="match_parent"
-                        android:layout_marginLeft="10dp"
+                        android:layout_marginStart="10dp"
                         android:layout_weight="65"
                         android:gravity="center_vertical"
                         android:text="        "
@@ -319,7 +319,7 @@
                 <TextView
                     android:layout_width="58dp"
                     android:layout_height="match_parent"
-                    android:layout_marginLeft="30dp"
+                    android:layout_marginStart="30dp"
                     android:layout_weight="35"
                     android:gravity="center_vertical"
                     android:text="@string/rileylink_pump_serial_number" />
@@ -328,7 +328,7 @@
                     android:id="@+id/rls_t1_serial_number"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
-                    android:layout_marginLeft="10dp"
+                    android:layout_marginStart="10dp"
                     android:layout_weight="65"
                     android:gravity="center_vertical"
                     android:text="        "
@@ -348,7 +348,7 @@
                 <TextView
                     android:layout_width="58dp"
                     android:layout_height="match_parent"
-                    android:layout_marginLeft="30dp"
+                    android:layout_marginStart="30dp"
                     android:layout_weight="35"
                     android:gravity="center_vertical"
                     android:text="@string/rileylink_pump_frequency" />
@@ -357,7 +357,7 @@
                     android:id="@+id/rls_t1_pump_frequency"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
-                    android:layout_marginLeft="10dp"
+                    android:layout_marginStart="10dp"
                     android:layout_weight="65"
                     android:gravity="center_vertical"
                     android:text="        "
@@ -376,7 +376,7 @@
                 <TextView
                     android:layout_width="58dp"
                     android:layout_height="match_parent"
-                    android:layout_marginLeft="30dp"
+                    android:layout_marginStart="30dp"
                     android:layout_weight="35"
                     android:gravity="center_vertical"
                     android:text="@string/rileylink_last_used_frequency" />
@@ -385,7 +385,7 @@
                     android:id="@+id/rls_t1_last_used_frequency"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
-                    android:layout_marginLeft="10dp"
+                    android:layout_marginStart="10dp"
                     android:layout_weight="65"
                     android:gravity="center_vertical"
                     android:text="        "
@@ -405,7 +405,7 @@
                 <TextView
                     android:layout_width="58dp"
                     android:layout_height="match_parent"
-                    android:layout_marginLeft="30dp"
+                    android:layout_marginStart="30dp"
                     android:layout_weight="35"
                     android:gravity="center_vertical"
                     android:text="@string/rileylink_last_device_contact" />
@@ -414,7 +414,7 @@
                     android:id="@+id/rls_t1_last_device_contact"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
-                    android:layout_marginLeft="10dp"
+                    android:layout_marginStart="10dp"
                     android:layout_weight="65"
                     android:gravity="center_vertical"
                     android:text="        "
diff --git a/rileylink/src/main/res/layout/rileylink_status_history_item.xml b/rileylink/src/main/res/layout/rileylink_status_history_item.xml
index f7d60830ef..1a9a7a61c2 100644
--- a/rileylink/src/main/res/layout/rileylink_status_history_item.xml
+++ b/rileylink/src/main/res/layout/rileylink_status_history_item.xml
@@ -3,7 +3,7 @@
     android:orientation="horizontal"
     android:layout_width="match_parent"
     android:layout_height="40dp"
-    android:paddingLeft="20dp">
+    android:paddingStart="20dp">
 
 
     <TextView
diff --git a/wear/src/main/res/layout/rect_activity_bigchart.xml b/wear/src/main/res/layout/rect_activity_bigchart.xml
index 8db4a3dd15..10540e5247 100644
--- a/wear/src/main/res/layout/rect_activity_bigchart.xml
+++ b/wear/src/main/res/layout/rect_activity_bigchart.xml
@@ -31,7 +31,7 @@
                 android:textColor="#FFFFFF"
                 android:layout_gravity="bottom"
                 android:gravity="center_horizontal|bottom"
-                android:layout_marginRight="5dp" />
+                android:layout_marginEnd="5dp" />
 
             <TextView
                 android:id="@+id/sgv"
@@ -52,7 +52,7 @@
                 android:textColor="#FFFFFF"
                 android:layout_gravity="bottom"
                 android:gravity="center_horizontal|bottom"
-                android:layout_marginLeft="5dp" />
+                android:layout_marginStart="5dp" />
 
         </LinearLayout>
 
@@ -89,7 +89,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textAlignment="center"
-                android:layout_marginRight="6dp"
+                android:layout_marginEnd="6dp"
                 android:layout_gravity="center_horizontal" />
 
             <TextView
diff --git a/wear/src/main/res/layout/rect_activity_bigchart_small.xml b/wear/src/main/res/layout/rect_activity_bigchart_small.xml
index d080472443..099760767a 100644
--- a/wear/src/main/res/layout/rect_activity_bigchart_small.xml
+++ b/wear/src/main/res/layout/rect_activity_bigchart_small.xml
@@ -27,7 +27,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical|center_horizontal|center"
-                android:layout_marginRight="5dp"
+                android:layout_marginEnd="5dp"
                 android:gravity="center_horizontal|bottom"
                 android:text="---"
                 android:textColor="#FFFFFF"
@@ -48,7 +48,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical|center_horizontal|center"
-                android:layout_marginLeft="5dp"
+                android:layout_marginStart="5dp"
                 android:gravity="center_horizontal|bottom"
                 android:text="---"
                 android:textColor="#FFFFFF"
@@ -88,7 +88,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
-                android:layout_marginRight="6dp"
+                android:layout_marginEnd="6dp"
                 android:paddingTop="-5sp"
                 android:text="12:00"
                 android:textAlignment="center"
diff --git a/wear/src/main/res/layout/rect_activity_digitalstyle.xml b/wear/src/main/res/layout/rect_activity_digitalstyle.xml
index dd612939e4..b7304d1836 100644
--- a/wear/src/main/res/layout/rect_activity_digitalstyle.xml
+++ b/wear/src/main/res/layout/rect_activity_digitalstyle.xml
@@ -277,7 +277,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
-                android:layout_marginLeft="9dp"
+                android:layout_marginStart="9dp"
                 android:layout_weight="1"
                 android:orientation="vertical">
 
@@ -367,7 +367,7 @@
                                 android:id="@+id/month"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:layout_marginLeft="5dp"
+                                android:layout_marginStart="5dp"
                                 android:fontFamily="@font/roboto_condensed_regular"
                                 android:text="MMM"
                                 android:textAllCaps="true"
@@ -416,7 +416,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="left"
-                            android:layout_marginLeft="6sp"
+                            android:layout_marginStart="6sp"
                             android:layout_marginTop="-2sp"
                             android:layout_marginBottom="-8sp"
                             android:fontFamily="@font/roboto_condensed_bold"
@@ -431,7 +431,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="bottom"
-                            android:layout_marginLeft="8sp"
+                            android:layout_marginStart="8sp"
                             android:layout_marginTop="-1.5sp"
                             android:fontFamily="@font/roboto_condensed_bold"
                             android:text="AM"
@@ -446,8 +446,8 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
-                android:layout_marginLeft="7dp"
-                android:layout_marginRight="7dp"
+                android:layout_marginStart="7dp"
+                android:layout_marginEnd="7dp"
                 android:layout_weight="1"
                 android:baselineAligned="false"
                 android:gravity="left|top"
diff --git a/wear/src/main/res/layout/rect_activity_home.xml b/wear/src/main/res/layout/rect_activity_home.xml
index a069b5ed28..a9dfa846bd 100644
--- a/wear/src/main/res/layout/rect_activity_home.xml
+++ b/wear/src/main/res/layout/rect_activity_home.xml
@@ -35,7 +35,7 @@
                 android:gravity="bottom|right"
                 android:layout_marginBottom="-2dp"
                 android:paddingTop="-2dp"
-                android:layout_marginRight="5dp" />
+                android:layout_marginEnd="5dp" />
 
             <LinearLayout
                 android:orientation="vertical"
@@ -108,7 +108,7 @@
                     android:layout_width="wrap_content"
                     android:textAlignment="center"
                     android:textColor="#000000"
-                    android:paddingLeft="10sp"
+                    android:paddingStart="10sp"
                     android:layout_height="wrap_content" />
                 <TextView
                     android:id="@+id/raw"
@@ -117,7 +117,7 @@
                     android:layout_width="wrap_content"
                     android:textAlignment="center"
                     android:textColor="#000000"
-                    android:paddingLeft="10sp"
+                    android:paddingStart="10sp"
                     android:layout_height="wrap_content" />
                 <TextView
                     android:id="@+id/externaltstatus"
@@ -126,7 +126,7 @@
                     android:layout_width="wrap_content"
                     android:textAlignment="center"
                     android:textColor="#000000"
-                    android:paddingLeft="10sp"
+                    android:paddingStart="10sp"
                     android:layout_height="wrap_content" />
 
             </LinearLayout>
diff --git a/wear/src/main/res/layout/rect_activity_home_2.xml b/wear/src/main/res/layout/rect_activity_home_2.xml
index 180ff9efdb..3ebfbaac8e 100644
--- a/wear/src/main/res/layout/rect_activity_home_2.xml
+++ b/wear/src/main/res/layout/rect_activity_home_2.xml
@@ -45,9 +45,9 @@
                 android:layout_gravity="center_horizontal|bottom"
                 android:layout_marginBottom="-2dp"
                 android:gravity="bottom|right"
-                android:paddingLeft="5dp"
+                android:paddingStart="5dp"
                 android:paddingTop="-2dp"
-                android:paddingRight="5dp"
+                android:paddingEnd="5dp"
                 android:text="---"
                 android:textColor="#FFFFFF"
                 android:textSize="38sp" />
diff --git a/wear/src/main/res/layout/rect_activity_home_large.xml b/wear/src/main/res/layout/rect_activity_home_large.xml
index a6da174128..cefee9116b 100644
--- a/wear/src/main/res/layout/rect_activity_home_large.xml
+++ b/wear/src/main/res/layout/rect_activity_home_large.xml
@@ -96,7 +96,7 @@
                     android:layout_width="wrap_content"
                     android:textAlignment="center"
                     android:textColor="#000000"
-                    android:paddingLeft="10sp"
+                    android:paddingStart="10sp"
                     android:layout_height="wrap_content" />
                 <TextView
                     android:id="@+id/raw"
@@ -105,7 +105,7 @@
                     android:layout_width="wrap_content"
                     android:textAlignment="center"
                     android:textColor="#000000"
-                    android:paddingLeft="10sp"
+                    android:paddingStart="10sp"
                     android:layout_height="wrap_content" />
                 <TextView
                     android:id="@+id/externaltstatus"
@@ -114,7 +114,7 @@
                     android:layout_width="wrap_content"
                     android:textAlignment="center"
                     android:textColor="#000000"
-                    android:paddingLeft="10sp"
+                    android:paddingStart="10sp"
                     android:layout_height="wrap_content" />
 
 
diff --git a/wear/src/main/res/layout/rect_activity_nochart.xml b/wear/src/main/res/layout/rect_activity_nochart.xml
index 47938873b2..179b05d021 100644
--- a/wear/src/main/res/layout/rect_activity_nochart.xml
+++ b/wear/src/main/res/layout/rect_activity_nochart.xml
@@ -31,7 +31,7 @@
                 android:textColor="#FFFFFF"
                 android:layout_gravity="bottom"
                 android:gravity="center_horizontal|bottom"
-                android:layout_marginRight="5dp" />
+                android:layout_marginEnd="5dp" />
 
             <TextView
                 android:id="@+id/sgv"
@@ -52,7 +52,7 @@
                 android:textColor="#FFFFFF"
                 android:layout_gravity="bottom"
                 android:gravity="center_horizontal|bottom"
-                android:layout_marginLeft="5dp" />
+                android:layout_marginStart="5dp" />
 
         </LinearLayout>
 
@@ -89,7 +89,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textAlignment="center"
-                android:layout_marginRight="6dp"
+                android:layout_marginEnd="6dp"
                 android:layout_gravity="center_horizontal" />
 
             <TextView
diff --git a/wear/src/main/res/layout/rect_activity_nochart_small.xml b/wear/src/main/res/layout/rect_activity_nochart_small.xml
index 5391cea92a..2a4eae4f7e 100644
--- a/wear/src/main/res/layout/rect_activity_nochart_small.xml
+++ b/wear/src/main/res/layout/rect_activity_nochart_small.xml
@@ -27,7 +27,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:layout_gravity="bottom"
-                android:layout_marginRight="5dp"
+                android:layout_marginEnd="5dp"
                 android:gravity="center_vertical|center_horizontal|center"
                 android:text="---"
                 android:textColor="#FFFFFF"
@@ -48,7 +48,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:layout_gravity="center_horizontal"
-                android:layout_marginLeft="5dp"
+                android:layout_marginStart="5dp"
                 android:gravity="center_vertical|center_horizontal|center"
                 android:text=" ---"
                 android:textColor="#FFFFFF"
@@ -94,7 +94,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
-                android:layout_marginRight="6dp"
+                android:layout_marginEnd="6dp"
                 android:text="23:24"
                 android:textAlignment="center"
                 android:textColor="#FFFFFF"
diff --git a/wear/src/main/res/layout/rect_cockpit.xml b/wear/src/main/res/layout/rect_cockpit.xml
index cf26712258..a1b65652e8 100644
--- a/wear/src/main/res/layout/rect_cockpit.xml
+++ b/wear/src/main/res/layout/rect_cockpit.xml
@@ -321,7 +321,7 @@
                                 android:layout_height="match_parent"
                                 android:layout_gravity="bottom|center_horizontal"
                                 android:gravity="bottom|center_horizontal"
-                                android:paddingLeft="4dp"
+                                android:paddingStart="4dp"
                                 android:text="--%"
                                 android:textAlignment="center"
                                 android:textColor="@color/primary_text_dark"
diff --git a/wear/src/main/res/layout/round_activity_bigchart.xml b/wear/src/main/res/layout/round_activity_bigchart.xml
index 8db4a3dd15..10540e5247 100644
--- a/wear/src/main/res/layout/round_activity_bigchart.xml
+++ b/wear/src/main/res/layout/round_activity_bigchart.xml
@@ -31,7 +31,7 @@
                 android:textColor="#FFFFFF"
                 android:layout_gravity="bottom"
                 android:gravity="center_horizontal|bottom"
-                android:layout_marginRight="5dp" />
+                android:layout_marginEnd="5dp" />
 
             <TextView
                 android:id="@+id/sgv"
@@ -52,7 +52,7 @@
                 android:textColor="#FFFFFF"
                 android:layout_gravity="bottom"
                 android:gravity="center_horizontal|bottom"
-                android:layout_marginLeft="5dp" />
+                android:layout_marginStart="5dp" />
 
         </LinearLayout>
 
@@ -89,7 +89,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textAlignment="center"
-                android:layout_marginRight="6dp"
+                android:layout_marginEnd="6dp"
                 android:layout_gravity="center_horizontal" />
 
             <TextView
diff --git a/wear/src/main/res/layout/round_activity_bigchart_small.xml b/wear/src/main/res/layout/round_activity_bigchart_small.xml
index d080472443..099760767a 100644
--- a/wear/src/main/res/layout/round_activity_bigchart_small.xml
+++ b/wear/src/main/res/layout/round_activity_bigchart_small.xml
@@ -27,7 +27,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical|center_horizontal|center"
-                android:layout_marginRight="5dp"
+                android:layout_marginEnd="5dp"
                 android:gravity="center_horizontal|bottom"
                 android:text="---"
                 android:textColor="#FFFFFF"
@@ -48,7 +48,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical|center_horizontal|center"
-                android:layout_marginLeft="5dp"
+                android:layout_marginStart="5dp"
                 android:gravity="center_horizontal|bottom"
                 android:text="---"
                 android:textColor="#FFFFFF"
@@ -88,7 +88,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
-                android:layout_marginRight="6dp"
+                android:layout_marginEnd="6dp"
                 android:paddingTop="-5sp"
                 android:text="12:00"
                 android:textAlignment="center"
diff --git a/wear/src/main/res/layout/round_activity_digitalstyle.xml b/wear/src/main/res/layout/round_activity_digitalstyle.xml
index 491aa293f2..20aeeef3fc 100644
--- a/wear/src/main/res/layout/round_activity_digitalstyle.xml
+++ b/wear/src/main/res/layout/round_activity_digitalstyle.xml
@@ -278,7 +278,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
-                android:layout_marginLeft="9dp"
+                android:layout_marginStart="9dp"
                 android:layout_weight="1"
                 android:orientation="vertical">
 
@@ -368,7 +368,7 @@
                                 android:id="@+id/month"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:layout_marginLeft="5dp"
+                                android:layout_marginStart="5dp"
                                 android:fontFamily="@font/roboto_condensed_regular"
                                 android:text="MMM"
                                 android:textAllCaps="true"
@@ -416,7 +416,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="left"
-                            android:layout_marginLeft="6sp"
+                            android:layout_marginStart="6sp"
                             android:layout_marginTop="-2sp"
                             android:layout_marginBottom="-8sp"
                             android:fontFamily="@font/roboto_condensed_bold"
@@ -430,7 +430,7 @@
                             android:id="@+id/timePeriod"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_marginLeft="8sp"
+                            android:layout_marginStart="8sp"
                             android:layout_marginTop="-1.5sp"
                             android:fontFamily="@font/roboto_condensed_bold"
                             android:gravity="top"
@@ -446,8 +446,8 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
-                android:layout_marginLeft="7dp"
-                android:layout_marginRight="7dp"
+                android:layout_marginStart="7dp"
+                android:layout_marginEnd="7dp"
                 android:layout_weight="1"
                 android:baselineAligned="false"
                 android:gravity="left|top"
diff --git a/wear/src/main/res/layout/round_activity_home.xml b/wear/src/main/res/layout/round_activity_home.xml
index e647175bf4..f35a32a433 100644
--- a/wear/src/main/res/layout/round_activity_home.xml
+++ b/wear/src/main/res/layout/round_activity_home.xml
@@ -32,7 +32,7 @@
                 android:textColor="#FFFFFF"
                 android:layout_gravity="center_horizontal|bottom"
                 android:gravity="bottom|right"
-                android:paddingRight="5dp"
+                android:paddingEnd="5dp"
                 android:layout_marginBottom="-2dp"
                 android:paddingTop="-2dp" />
 
@@ -104,7 +104,7 @@
                     android:layout_width="wrap_content"
                     android:textAlignment="center"
                     android:textColor="#000000"
-                    android:paddingLeft="10sp"
+                    android:paddingStart="10sp"
                     android:layout_height="wrap_content" />
                 <TextView
                     android:id="@+id/raw"
@@ -113,7 +113,7 @@
                     android:layout_width="wrap_content"
                     android:textAlignment="center"
                     android:textColor="#000000"
-                    android:paddingLeft="10sp"
+                    android:paddingStart="10sp"
                     android:layout_height="wrap_content" />
                 <TextView
                     android:id="@+id/externaltstatus"
@@ -122,7 +122,7 @@
                     android:layout_width="wrap_content"
                     android:textAlignment="center"
                     android:textColor="#000000"
-                    android:paddingLeft="10sp"
+                    android:paddingStart="10sp"
                     android:layout_height="wrap_content" />
 
             </LinearLayout>
diff --git a/wear/src/main/res/layout/round_activity_home_2.xml b/wear/src/main/res/layout/round_activity_home_2.xml
index d1ef61abe5..622076add7 100644
--- a/wear/src/main/res/layout/round_activity_home_2.xml
+++ b/wear/src/main/res/layout/round_activity_home_2.xml
@@ -51,9 +51,9 @@
                 android:layout_gravity="center_horizontal|bottom"
                 android:layout_marginBottom="-2dp"
                 android:gravity="bottom|right"
-                android:paddingLeft="5dp"
+                android:paddingStart="5dp"
                 android:paddingTop="-2dp"
-                android:paddingRight="5dp"
+                android:paddingEnd="5dp"
                 android:text="---"
                 android:textColor="#FFFFFF"
                 android:textSize="38sp" />
diff --git a/wear/src/main/res/layout/round_activity_home_large.xml b/wear/src/main/res/layout/round_activity_home_large.xml
index 9569d5d1ab..d222f785f6 100644
--- a/wear/src/main/res/layout/round_activity_home_large.xml
+++ b/wear/src/main/res/layout/round_activity_home_large.xml
@@ -96,7 +96,7 @@
                     android:layout_width="wrap_content"
                     android:textAlignment="center"
                     android:textColor="#000000"
-                    android:paddingLeft="10sp"
+                    android:paddingStart="10sp"
                     android:layout_height="wrap_content" />
                 <TextView
                     android:id="@+id/raw"
@@ -105,7 +105,7 @@
                     android:layout_width="wrap_content"
                     android:textAlignment="center"
                     android:textColor="#000000"
-                    android:paddingLeft="10sp"
+                    android:paddingStart="10sp"
                     android:layout_height="wrap_content" />
                 <TextView
                     android:id="@+id/externaltstatus"
@@ -114,7 +114,7 @@
                     android:layout_width="wrap_content"
                     android:textAlignment="center"
                     android:textColor="#000000"
-                    android:paddingLeft="10sp"
+                    android:paddingStart="10sp"
                     android:layout_height="wrap_content" />
 
             </LinearLayout>
diff --git a/wear/src/main/res/layout/round_activity_nochart.xml b/wear/src/main/res/layout/round_activity_nochart.xml
index 47938873b2..179b05d021 100644
--- a/wear/src/main/res/layout/round_activity_nochart.xml
+++ b/wear/src/main/res/layout/round_activity_nochart.xml
@@ -31,7 +31,7 @@
                 android:textColor="#FFFFFF"
                 android:layout_gravity="bottom"
                 android:gravity="center_horizontal|bottom"
-                android:layout_marginRight="5dp" />
+                android:layout_marginEnd="5dp" />
 
             <TextView
                 android:id="@+id/sgv"
@@ -52,7 +52,7 @@
                 android:textColor="#FFFFFF"
                 android:layout_gravity="bottom"
                 android:gravity="center_horizontal|bottom"
-                android:layout_marginLeft="5dp" />
+                android:layout_marginStart="5dp" />
 
         </LinearLayout>
 
@@ -89,7 +89,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textAlignment="center"
-                android:layout_marginRight="6dp"
+                android:layout_marginEnd="6dp"
                 android:layout_gravity="center_horizontal" />
 
             <TextView
diff --git a/wear/src/main/res/layout/round_activity_nochart_small.xml b/wear/src/main/res/layout/round_activity_nochart_small.xml
index 5391cea92a..2a4eae4f7e 100644
--- a/wear/src/main/res/layout/round_activity_nochart_small.xml
+++ b/wear/src/main/res/layout/round_activity_nochart_small.xml
@@ -27,7 +27,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:layout_gravity="bottom"
-                android:layout_marginRight="5dp"
+                android:layout_marginEnd="5dp"
                 android:gravity="center_vertical|center_horizontal|center"
                 android:text="---"
                 android:textColor="#FFFFFF"
@@ -48,7 +48,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:layout_gravity="center_horizontal"
-                android:layout_marginLeft="5dp"
+                android:layout_marginStart="5dp"
                 android:gravity="center_vertical|center_horizontal|center"
                 android:text=" ---"
                 android:textColor="#FFFFFF"
@@ -94,7 +94,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
-                android:layout_marginRight="6dp"
+                android:layout_marginEnd="6dp"
                 android:text="23:24"
                 android:textAlignment="center"
                 android:textColor="#FFFFFF"
diff --git a/wear/src/main/res/layout/round_cockpit.xml b/wear/src/main/res/layout/round_cockpit.xml
index c4f2f7d5d2..a6564c00c9 100644
--- a/wear/src/main/res/layout/round_cockpit.xml
+++ b/wear/src/main/res/layout/round_cockpit.xml
@@ -321,7 +321,7 @@
                                 android:layout_height="match_parent"
                                 android:layout_gravity="bottom|center_horizontal"
                                 android:gravity="bottom|center_horizontal"
-                                android:paddingLeft="4dp"
+                                android:paddingStart="4dp"
                                 android:text="--%"
                                 android:textAlignment="center"
                                 android:textColor="@color/primary_text_dark"