diff --git a/src/frontends/android/app/src/main/res/layout/imc_state_fragment.xml b/src/frontends/android/app/src/main/res/layout/imc_state_fragment.xml
index c1e278968..ba1762882 100644
--- a/src/frontends/android/app/src/main/res/layout/imc_state_fragment.xml
+++ b/src/frontends/android/app/src/main/res/layout/imc_state_fragment.xml
@@ -30,15 +30,15 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="20dp"
-            android:layout_marginRight="20dp"
+            android:layout_marginStart="20dp"
+            android:layout_marginEnd="20dp"
             android:layout_marginTop="10dp"
             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/imc_state_label"
                 android:textColor="?android:textColorPrimary"
                 android:textSize="20sp" />
@@ -58,8 +58,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="10dp"
-            android:layout_marginLeft="20dp"
-            android:layout_marginRight="20dp"
+            android:layout_marginStart="20dp"
+            android:layout_marginEnd="20dp"
             android:text="@string/show_remediation_instructions"
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:textColor="?android:attr/textColorSecondary" />
diff --git a/src/frontends/android/app/src/main/res/layout/profile_detail_view.xml b/src/frontends/android/app/src/main/res/layout/profile_detail_view.xml
index 5197c63f7..eb67583bb 100644
--- a/src/frontends/android/app/src/main/res/layout/profile_detail_view.xml
+++ b/src/frontends/android/app/src/main/res/layout/profile_detail_view.xml
@@ -27,7 +27,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@drawable/state_background"
-        android:drawableStart="@android:drawable/ic_dialog_alert"
+        app:drawableStartCompat="@android:drawable/ic_dialog_alert"
         android:drawablePadding="8dp"
         android:padding="8dp"
         android:text="@string/alert_text_vpn_profile_read_only"
@@ -73,7 +73,7 @@
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="4dp"
+                android:layout_marginStart="4dp"
                 android:text="@string/profile_vpn_type_label"
                 android:textSize="12sp" />
 
@@ -140,7 +140,7 @@
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="4dp"
+                    android:layout_marginStart="4dp"
                     android:layout_marginTop="4dp"
                     android:text="@string/profile_user_certificate_label"
                     android:textSize="12sp" />
@@ -153,8 +153,8 @@
                     android:id="@+id/install_user_certificate"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="4dp"
-                    android:layout_marginRight="4dp"
+                    android:layout_marginStart="4dp"
+                    android:layout_marginEnd="4dp"
                     android:text="@string/profile_user_certificate_install" />
 
             </LinearLayout>
@@ -162,7 +162,7 @@
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="4dp"
+                android:layout_marginStart="4dp"
                 android:text="@string/profile_ca_label"
                 android:textSize="12sp" />
 
@@ -210,7 +210,7 @@
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="4dp"
+                    android:layout_marginStart="4dp"
                     android:layout_marginTop="10dp"
                     android:text="@string/profile_advanced_label"
                     android:textSize="20sp" />
@@ -319,14 +319,12 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="4dp"
-                    android:layout_marginLeft="4dp"
                     android:text="@string/profile_cert_req_label" />
 
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="4dp"
-                    android:layout_marginLeft="4dp"
                     android:layout_marginBottom="10dp"
                     android:text="@string/profile_cert_req_hint"
                     android:textSize="12sp" />
@@ -336,14 +334,12 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="4dp"
-                    android:layout_marginLeft="4dp"
                     android:text="@string/profile_use_ocsp_label" />
 
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="4dp"
-                    android:layout_marginLeft="4dp"
                     android:layout_marginBottom="10dp"
                     android:text="@string/profile_use_ocsp_hint"
                     android:textSize="12sp" />
@@ -353,14 +349,12 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="4dp"
-                    android:layout_marginLeft="4dp"
                     android:text="@string/profile_use_crl_label" />
 
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="4dp"
-                    android:layout_marginLeft="4dp"
                     android:layout_marginBottom="10dp"
                     android:text="@string/profile_use_crl_hint"
                     android:textSize="12sp" />
@@ -370,14 +364,12 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="4dp"
-                    android:layout_marginLeft="4dp"
                     android:text="@string/profile_strict_revocation_label" />
 
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="4dp"
-                    android:layout_marginLeft="4dp"
                     android:layout_marginBottom="10dp"
                     android:text="@string/profile_strict_revocation_hint"
                     android:textSize="12sp" />
@@ -387,14 +379,12 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="4dp"
-                    android:layout_marginLeft="4dp"
                     android:text="@string/profile_rsa_pss_label" />
 
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="4dp"
-                    android:layout_marginLeft="4dp"
                     android:layout_marginBottom="10dp"
                     android:text="@string/profile_rsa_pss_hint"
                     android:textSize="12sp" />
@@ -404,14 +394,12 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="4dp"
-                    android:layout_marginLeft="4dp"
                     android:text="@string/profile_ipv6_transport_label" />
 
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="4dp"
-                    android:layout_marginLeft="4dp"
                     android:layout_marginBottom="10dp"
                     android:text="@string/profile_ipv6_transport_hint"
                     android:textSize="12sp" />
@@ -420,7 +408,6 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="4dp"
-                    android:layout_marginLeft="4dp"
                     android:layout_marginTop="10dp"
                     android:layout_marginBottom="10dp"
                     android:text="@string/profile_split_tunneling_label"
@@ -429,7 +416,7 @@
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="4dp"
+                    android:layout_marginStart="4dp"
                     android:layout_marginTop="10dp"
                     android:layout_marginBottom="10dp"
                     android:text="@string/profile_split_tunneling_intro"
@@ -484,7 +471,6 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="4dp"
-                    android:layout_marginLeft="4dp"
                     android:layout_marginTop="20dp"
                     android:layout_marginBottom="10dp"
                     android:text="@string/profile_select_apps_label"
@@ -505,7 +491,6 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="4dp"
-                    android:layout_marginLeft="4dp"
                     android:layout_marginTop="10dp"
                     android:layout_marginBottom="10dp"
                     android:text="@string/profile_proposals_label"
@@ -515,7 +500,7 @@
                     android:id="@+id/proposal_intro"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="4dp"
+                    android:layout_marginStart="4dp"
                     android:layout_marginTop="10dp"
                     android:layout_marginBottom="10dp"
                     android:text="@string/profile_proposals_intro"
@@ -558,7 +543,6 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="4dp"
-                    android:layout_marginLeft="4dp"
                     android:layout_marginTop="10dp"
                     android:layout_marginBottom="10dp"
                     android:text="@string/profile_profile_id"
@@ -568,7 +552,6 @@
                     android:id="@+id/profile_id"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="4dp"
                     android:layout_marginTop="10dp"
                     android:layout_marginBottom="10dp"
                     android:textIsSelectable="true"
diff --git a/src/frontends/android/app/src/main/res/layout/profile_import_view.xml b/src/frontends/android/app/src/main/res/layout/profile_import_view.xml
index 6197edae9..bca3ac853 100644
--- a/src/frontends/android/app/src/main/res/layout/profile_import_view.xml
+++ b/src/frontends/android/app/src/main/res/layout/profile_import_view.xml
@@ -40,8 +40,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="8dp"
-            android:drawableLeft="@android:drawable/ic_dialog_alert"
-            android:drawableStart="@android:drawable/ic_dialog_alert"
+            app:drawableStartCompat="@android:drawable/ic_dialog_alert"
             android:drawablePadding="8dp"
             android:textStyle="bold"
             android:text="@string/profile_import_exists"
@@ -57,7 +56,6 @@
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="4dp"
                 android:layout_marginStart="4dp"
                 android:textSize="12sp"
                 android:text="@string/profile_name_label_simple" />
@@ -66,7 +64,6 @@
                 android:id="@+id/name"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="4dp"
                 android:layout_marginStart="4dp"
                 android:textAppearance="?android:attr/textAppearanceMedium"
                 android:textColor="?android:attr/textColorPrimary" />
@@ -75,7 +72,6 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="6dp"
-                android:layout_marginLeft="4dp"
                 android:layout_marginStart="4dp"
                 android:textSize="12sp"
                 android:text="@string/profile_gateway_label" />
@@ -84,7 +80,6 @@
                 android:id="@+id/gateway"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="4dp"
                 android:layout_marginStart="4dp"
                 android:textAppearance="?android:attr/textAppearanceMedium"
                 android:textColor="?android:attr/textColorPrimary" />
@@ -93,7 +88,6 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="6dp"
-                android:layout_marginLeft="4dp"
                 android:layout_marginStart="4dp"
                 android:textSize="12sp"
                 android:text="@string/profile_vpn_type_label" />
@@ -103,7 +97,6 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="4dp"
-                android:layout_marginLeft="4dp"
                 android:layout_marginStart="4dp"
                 android:textAppearance="?android:attr/textAppearanceMedium"
                 android:textColor="?android:attr/textColorPrimary" />
@@ -162,7 +155,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="4dp"
-                android:layout_marginLeft="4dp"
+                android:layout_marginStart="4dp"
                 android:textSize="12sp"
                 android:text="@string/profile_user_certificate_label" />
 
@@ -174,8 +167,8 @@
                 android:id="@+id/import_user_certificate"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="4dp"
-                android:layout_marginRight="4dp"
+                android:layout_marginStart="4dp"
+                android:layout_marginEnd="4dp"
                 android:text="@string/profile_cert_import" />
 
         </LinearLayout>
@@ -190,7 +183,7 @@
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="4dp"
+                android:layout_marginStart="4dp"
                 android:textSize="12sp"
                 android:text="@string/profile_ca_label" />
 
diff --git a/src/frontends/android/app/src/main/res/layout/profile_list_fragment.xml b/src/frontends/android/app/src/main/res/layout/profile_list_fragment.xml
index 7308f6d48..6cc9d5b9c 100644
--- a/src/frontends/android/app/src/main/res/layout/profile_list_fragment.xml
+++ b/src/frontends/android/app/src/main/res/layout/profile_list_fragment.xml
@@ -19,8 +19,8 @@
     android:layout_height="match_parent"
     android:paddingBottom="10dp"
     android:paddingTop="10dp"
-    android:paddingLeft="5dp"
-    android:paddingRight="5dp" >
+    android:paddingStart="5dp"
+    android:paddingEnd="5dp" >
 
     <ListView
         android:id="@+id/profile_list"
@@ -33,7 +33,7 @@
      <TextView android:id="@+id/profile_list_empty"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginLeft="15dp"
+        android:layout_marginStart="15dp"
         android:text="@string/no_profiles"/>
 
 </FrameLayout>
diff --git a/src/frontends/android/app/src/main/res/layout/remediation_instruction.xml b/src/frontends/android/app/src/main/res/layout/remediation_instruction.xml
index 8bae732f6..9a3899144 100644
--- a/src/frontends/android/app/src/main/res/layout/remediation_instruction.xml
+++ b/src/frontends/android/app/src/main/res/layout/remediation_instruction.xml
@@ -24,7 +24,7 @@
         android:id="@+id/title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="10dp"
+        android:layout_marginStart="10dp"
         android:textIsSelectable="true"
         android:textAppearance="?android:attr/textAppearanceLarge" />
 
@@ -32,7 +32,7 @@
         android:id="@+id/description"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="10dp"
+        android:layout_marginStart="10dp"
         android:textIsSelectable="true"
         android:textColor="?android:textColorSecondary"
         android:textAppearance="?android:attr/textAppearanceMedium" />
@@ -41,7 +41,7 @@
         android:id="@+id/list_header"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="10dp"
+        android:layout_marginStart="10dp"
         android:layout_marginTop="20dp"
         android:textIsSelectable="true"
         android:textAppearance="?android:attr/textAppearanceMedium" />
diff --git a/src/frontends/android/app/src/main/res/layout/remediation_instruction_item.xml b/src/frontends/android/app/src/main/res/layout/remediation_instruction_item.xml
index cb14fe89a..ddd9f67a5 100644
--- a/src/frontends/android/app/src/main/res/layout/remediation_instruction_item.xml
+++ b/src/frontends/android/app/src/main/res/layout/remediation_instruction_item.xml
@@ -27,8 +27,8 @@
         android:id="@android:id/text1"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="15dp"
-        android:layout_marginRight="15dp"
+        android:layout_marginStart="15dp"
+        android:layout_marginEnd="15dp"
         android:textAppearance="?android:attr/textAppearanceMedium"
         android:textIsSelectable="false" />
 
@@ -37,8 +37,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@android:id/text1"
-        android:layout_alignLeft="@android:id/text1"
-        android:layout_alignRight="@android:id/text1"
+        android:layout_alignStart="@android:id/text1"
+        android:layout_alignEnd="@android:id/text1"
         android:textColor="?android:textColorSecondary"
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:singleLine="true"
diff --git a/src/frontends/android/app/src/main/res/layout/selected_application_item.xml b/src/frontends/android/app/src/main/res/layout/selected_application_item.xml
index aacbb3b09..1f666478a 100644
--- a/src/frontends/android/app/src/main/res/layout/selected_application_item.xml
+++ b/src/frontends/android/app/src/main/res/layout/selected_application_item.xml
@@ -19,8 +19,8 @@
     android:orientation="horizontal"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingLeft="8dp"
-    android:paddingRight="8dp"
+    android:paddingStart="8dp"
+    android:paddingEnd="8dp"
     android:minHeight="?android:listPreferredItemHeight"
     android:background="@drawable/activated_background"
     android:gravity="center_vertical" >
@@ -29,7 +29,6 @@
         android:duplicateParentState="true"
         android:layout_width="@android:dimen/app_icon_size"
         android:layout_height="@android:dimen/app_icon_size"
-        android:layout_marginRight="8dip"
         android:layout_marginEnd="8dip"
         android:scaleType="centerInside" />
 
@@ -47,7 +46,6 @@
         android:duplicateParentState="true"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="16dp"
         android:layout_marginStart="16dp" />
 
 </org.strongswan.android.ui.widget.CheckableLinearLayout>
diff --git a/src/frontends/android/app/src/main/res/layout/trusted_certificates_item.xml b/src/frontends/android/app/src/main/res/layout/trusted_certificates_item.xml
index 6677a618a..7b54b6751 100644
--- a/src/frontends/android/app/src/main/res/layout/trusted_certificates_item.xml
+++ b/src/frontends/android/app/src/main/res/layout/trusted_certificates_item.xml
@@ -30,7 +30,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@id/subject_primary"
-        android:layout_alignLeft="@id/subject_primary"
+        android:layout_alignStart="@id/subject_primary"
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:textColor="?android:attr/textColorSecondary" />
 
diff --git a/src/frontends/android/app/src/main/res/layout/two_line_button.xml b/src/frontends/android/app/src/main/res/layout/two_line_button.xml
index c8edc04c2..f7ceaf1c8 100644
--- a/src/frontends/android/app/src/main/res/layout/two_line_button.xml
+++ b/src/frontends/android/app/src/main/res/layout/two_line_button.xml
@@ -34,7 +34,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@android:id/text1"
-        android:layout_alignLeft="@android:id/text1"
+        android:layout_alignStart="@android:id/text1"
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:textColor="?android:attr/textColorSecondary" />
 
diff --git a/src/frontends/android/app/src/main/res/layout/vpn_state_fragment.xml b/src/frontends/android/app/src/main/res/layout/vpn_state_fragment.xml
index 4616adf0a..9227007fb 100644
--- a/src/frontends/android/app/src/main/res/layout/vpn_state_fragment.xml
+++ b/src/frontends/android/app/src/main/res/layout/vpn_state_fragment.xml
@@ -34,8 +34,8 @@
             android:id="@+id/vpn_error_text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="20dp"
-            android:layout_marginRight="20dp"
+            android:layout_marginStart="20dp"
+            android:layout_marginEnd="20dp"
             android:layout_marginTop="24dp"
             android:layout_marginBottom="12dp"
             android:text="Failed to establish VPN: Server is unreachable"
@@ -53,7 +53,7 @@
                 android:id="@+id/show_log"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="8dp"
+                android:layout_marginStart="8dp"
                 android:text="@string/show_log"
                 android:textColor="@color/primary"
                 android:textSize="14sp"
@@ -84,8 +84,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="10dp"
-            android:layout_marginLeft="20dp"
-            android:layout_marginRight="20dp"
+            android:layout_marginStart="20dp"
+            android:layout_marginEnd="20dp"
             android:layout_marginTop="10dp"
             android:columnCount="2"
             android:rowCount="2" >
@@ -93,7 +93,7 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginRight="5dp"
+                android:layout_marginEnd="5dp"
                 android:gravity="top"
                 android:text="@string/state_label"
                 android:textColor="?android:textColorPrimary"
@@ -112,7 +112,7 @@
                 android:id="@+id/vpn_profile_label"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginRight="5dp"
+                android:layout_marginEnd="5dp"
                 android:gravity="top"
                 android:text="@string/profile_label"
                 android:textColor="?android:textColorPrimary"
@@ -135,8 +135,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="10dp"
-            android:layout_marginLeft="20dp"
-            android:layout_marginRight="20dp"
+            android:layout_marginStart="20dp"
+            android:layout_marginEnd="20dp"
             android:indeterminate="true"
             android:visibility="gone"
             style="@style/Widget.AppCompat.ProgressBar.Horizontal" />
@@ -146,8 +146,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="10dp"
-            android:layout_marginLeft="20dp"
-            android:layout_marginRight="20dp"
+            android:layout_marginStart="20dp"
+            android:layout_marginEnd="20dp"
             android:text="@string/disconnect"
             style="?android:attr/borderlessButtonStyle" >
         </Button>