diff --git a/app-core/src/main/java/com/topjohnwu/magisk/utils/LocaleManager.java b/app-core/src/main/java/com/topjohnwu/magisk/utils/LocaleManager.java
index 39535fff7..3b0d4a3b6 100644
--- a/app-core/src/main/java/com/topjohnwu/magisk/utils/LocaleManager.java
+++ b/app-core/src/main/java/com/topjohnwu/magisk/utils/LocaleManager.java
@@ -100,13 +100,9 @@ public class LocaleManager {
     }
 
     public static Context getLocaleContext(Context context, Locale locale) {
-        if (Build.VERSION.SDK_INT >= 17) {
-            Configuration config = new Configuration(context.getResources().getConfiguration());
-            config.setLocale(locale);
-            return context.createConfigurationContext(config);
-        } else {
-            return context;
-        }
+        Configuration config = new Configuration(context.getResources().getConfiguration());
+        config.setLocale(locale);
+        return context.createConfigurationContext(config);
     }
 
     public static Context getLocaleContext(Locale locale) {
@@ -118,8 +114,6 @@ public class LocaleManager {
     }
 
     public static void loadAvailableLocales(@StringRes int compareId) {
-        if (Build.VERSION.SDK_INT < 17)
-            return;
         Shell.EXECUTOR.execute(() -> {
             locales = new ArrayList<>();
             HashSet<String> set = new HashSet<>();
diff --git a/app-core/src/main/java/com/topjohnwu/magisk/utils/Utils.java b/app-core/src/main/java/com/topjohnwu/magisk/utils/Utils.java
index 23a47f641..d2cb23f54 100644
--- a/app-core/src/main/java/com/topjohnwu/magisk/utils/Utils.java
+++ b/app-core/src/main/java/com/topjohnwu/magisk/utils/Utils.java
@@ -77,7 +77,7 @@ public class Utils {
 
     public static String getAppLabel(ApplicationInfo info, PackageManager pm) {
         try {
-            if (info.labelRes > 0 && Build.VERSION.SDK_INT >= 17) {
+            if (info.labelRes > 0) {
                 Resources res = pm.getResourcesForApplication(info);
                 Configuration config = new Configuration();
                 config.setLocale(LocaleManager.locale);
diff --git a/app/src/full/java/com/topjohnwu/magisk/SuRequestActivity.java b/app/src/full/java/com/topjohnwu/magisk/SuRequestActivity.java
index 52cfec56e..260b9c518 100644
--- a/app/src/full/java/com/topjohnwu/magisk/SuRequestActivity.java
+++ b/app/src/full/java/com/topjohnwu/magisk/SuRequestActivity.java
@@ -129,13 +129,8 @@ public class SuRequestActivity extends BaseActivity {
         appIcon.setImageDrawable(policy.info.loadIcon(pm));
         appNameView.setText(policy.appName);
         packageNameView.setText(policy.packageName);
-        if (Build.VERSION.SDK_INT >= 17) {
-            warning.setCompoundDrawablesRelativeWithIntrinsicBounds(
-                    AppCompatResources.getDrawable(this, R.drawable.ic_warning), null, null, null);
-        } else {
-            warning.setCompoundDrawablesWithIntrinsicBounds(
-                    AppCompatResources.getDrawable(this, R.drawable.ic_warning), null, null, null);
-        }
+        warning.setCompoundDrawablesRelativeWithIntrinsicBounds(
+                AppCompatResources.getDrawable(this, R.drawable.ic_warning), null, null, null);
 
         ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(this,
                 R.array.allow_timeout, android.R.layout.simple_spinner_item);
diff --git a/app/src/full/java/com/topjohnwu/magisk/adapters/StringListAdapter.java b/app/src/full/java/com/topjohnwu/magisk/adapters/StringListAdapter.java
index b2cd680e0..0aacad2e8 100644
--- a/app/src/full/java/com/topjohnwu/magisk/adapters/StringListAdapter.java
+++ b/app/src/full/java/com/topjohnwu/magisk/adapters/StringListAdapter.java
@@ -73,7 +73,7 @@ public abstract class StringListAdapter<VH extends StringListAdapter.ViewHolder>
         ((Activity) rv.getContext()).getWindowManager()
                 .getDefaultDisplay().getMetrics(displayMetrics);
         screenWidth = displayMetrics.widthPixels;
-        padding = rv.getPaddingLeft() + rv.getPaddingRight();
+        padding = rv.getPaddingStart() + rv.getPaddingEnd();
         this.rv = rv;
     }
 
diff --git a/app/src/full/java/com/topjohnwu/magisk/fragments/SettingsFragment.java b/app/src/full/java/com/topjohnwu/magisk/fragments/SettingsFragment.java
index fe502e414..c709c8764 100644
--- a/app/src/full/java/com/topjohnwu/magisk/fragments/SettingsFragment.java
+++ b/app/src/full/java/com/topjohnwu/magisk/fragments/SettingsFragment.java
@@ -111,10 +111,6 @@ public class SettingsFragment extends BasePreferenceFragment implements Topic.Su
 
         setSummary();
 
-        // Remove language setting when API < 17
-        if (Build.VERSION.SDK_INT < 17)
-            generalCatagory.removePreference(findPreference(Config.Key.LOCALE));
-
         // Disable dangerous settings in secondary user
         if (Const.USER_ID > 0) {
             suCategory.removePreference(multiuserConfig);
diff --git a/app/src/full/res/layout/activity_flash.xml b/app/src/full/res/layout/activity_flash.xml
index 5a8e2eb68..0bc141964 100644
--- a/app/src/full/res/layout/activity_flash.xml
+++ b/app/src/full/res/layout/activity_flash.xml
@@ -17,8 +17,8 @@
             android:id="@+id/recyclerView"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:paddingLeft="8dp"
-            android:paddingRight="8dp"
+            android:paddingStart="8dp"
+            android:paddingEnd="8dp"
             app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
 
     </HorizontalScrollView>
diff --git a/app/src/full/res/layout/activity_request.xml b/app/src/full/res/layout/activity_request.xml
index b0efb9d26..7d4b6eaa5 100644
--- a/app/src/full/res/layout/activity_request.xml
+++ b/app/src/full/res/layout/activity_request.xml
@@ -27,8 +27,8 @@
         android:layout_marginTop="10dp"
         android:layout_marginBottom="10dp"
         android:orientation="horizontal"
-        android:paddingLeft="10dp"
-        android:paddingRight="10dp">
+        android:paddingStart="10dp"
+        android:paddingEnd="10dp">
 
         <ImageView
             android:id="@+id/app_icon"
@@ -36,9 +36,7 @@
             android:layout_height="50dp"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="5dp"
-            android:layout_marginLeft="5dp"
             android:layout_marginEnd="10dp"
-            android:layout_marginRight="10dp"
             android:layout_weight="0" />
 
         <LinearLayout
@@ -94,8 +92,8 @@
         android:layout_height="match_parent"
         android:gravity="bottom"
         android:orientation="horizontal"
-        android:paddingLeft="30dp"
-        android:paddingRight="30dp">
+        android:paddingStart="30dp"
+        android:paddingEnd="30dp">
 
         <Button
             android:id="@+id/deny_btn"
diff --git a/app/src/full/res/layout/alert_dialog.xml b/app/src/full/res/layout/alert_dialog.xml
index fc2f55ac1..30c88115d 100644
--- a/app/src/full/res/layout/alert_dialog.xml
+++ b/app/src/full/res/layout/alert_dialog.xml
@@ -11,9 +11,9 @@
         style="?android:attr/textAppearanceMedium"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingLeft="25dp"
+        android:paddingStart="25dp"
         android:paddingTop="12dp"
-        android:paddingRight="25dp"
+        android:paddingEnd="25dp"
         android:paddingBottom="12dp"
         android:textColor="?android:attr/textColorPrimary" />
 
diff --git a/app/src/full/res/layout/custom_channel_dialog.xml b/app/src/full/res/layout/custom_channel_dialog.xml
index e80f4b1f3..273902aa2 100644
--- a/app/src/full/res/layout/custom_channel_dialog.xml
+++ b/app/src/full/res/layout/custom_channel_dialog.xml
@@ -3,9 +3,9 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:paddingLeft="15dp"
+    android:paddingStart="15dp"
     android:paddingTop="5dp"
-    android:paddingRight="15dp"
+    android:paddingEnd="15dp"
     android:paddingBottom="5dp">
 
     <TextView
diff --git a/app/src/full/res/layout/fragment_magisk.xml b/app/src/full/res/layout/fragment_magisk.xml
index a40534473..a83e96333 100644
--- a/app/src/full/res/layout/fragment_magisk.xml
+++ b/app/src/full/res/layout/fragment_magisk.xml
@@ -23,9 +23,9 @@
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:layout_marginLeft="5dp"
+                android:layout_marginStart="5dp"
                 android:layout_marginTop="4dp"
-                android:layout_marginRight="5dp"
+                android:layout_marginEnd="5dp"
                 android:layout_marginBottom="4dp"
                 app:cardCornerRadius="@dimen/card_corner_radius"
                 app:cardElevation="@dimen/card_elevation">
@@ -41,7 +41,6 @@
                         android:layout_width="wrap_content"
                         android:layout_height="0dp"
                         android:layout_marginEnd="16dp"
-                        android:layout_marginRight="16dp"
                         app:layout_constraintBottom_toBottomOf="@+id/app_name"
                         app:layout_constraintEnd_toStartOf="@+id/app_name"
                         app:layout_constraintHorizontal_bias="0.42"
@@ -75,9 +74,9 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:layout_marginLeft="5dp"
+                android:layout_marginStart="5dp"
                 android:layout_marginTop="4dp"
-                android:layout_marginRight="5dp"
+                android:layout_marginEnd="5dp"
                 android:layout_marginBottom="4dp"
                 android:visibility="gone"
                 app:cardCornerRadius="@dimen/card_corner_radius"
@@ -111,7 +110,6 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginStart="16dp"
-                            android:layout_marginLeft="16dp"
                             android:tint="?attr/imageColorTint"
                             app:layout_constraintBottom_toBottomOf="parent"
                             app:layout_constraintStart_toEndOf="@+id/title"
@@ -130,16 +128,16 @@
                             android:id="@+id/keep_force_enc"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_marginLeft="50dp"
-                            android:layout_marginRight="50dp"
+                            android:layout_marginStart="50dp"
+                            android:layout_marginEnd="50dp"
                             android:text="@string/keep_force_encryption" />
 
                         <CheckBox
                             android:id="@+id/keep_verity"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_marginLeft="50dp"
-                            android:layout_marginRight="50dp"
+                            android:layout_marginStart="50dp"
+                            android:layout_marginEnd="50dp"
                             android:text="@string/keep_dm_verity" />
 
                     </LinearLayout>
@@ -153,9 +151,9 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
-                android:layout_marginLeft="5dp"
+                android:layout_marginStart="5dp"
                 android:layout_marginTop="4dp"
-                android:layout_marginRight="5dp"
+                android:layout_marginEnd="5dp"
                 android:layout_marginBottom="4dp"
                 app:cardCornerRadius="@dimen/card_corner_radius"
                 app:cardElevation="@dimen/card_elevation">
@@ -175,7 +173,6 @@
                             android:layout_height="30dp"
                             android:layout_marginTop="12dp"
                             android:layout_marginEnd="24dp"
-                            android:layout_marginRight="24dp"
                             android:layout_marginBottom="12dp"
                             android:tint="@color/green500"
                             app:layout_constraintBottom_toBottomOf="parent"
@@ -218,7 +215,6 @@
                             android:layout_width="25dp"
                             android:layout_height="25dp"
                             android:layout_marginStart="24dp"
-                            android:layout_marginLeft="24dp"
                             app:layout_constraintBottom_toBottomOf="parent"
                             app:layout_constraintStart_toEndOf="@+id/safetyNet_status"
                             app:layout_constraintTop_toTopOf="parent"
@@ -247,7 +243,6 @@
                             android:layout_width="25dp"
                             android:layout_height="25dp"
                             android:layout_marginEnd="8dp"
-                            android:layout_marginRight="8dp"
                             app:layout_constraintBottom_toBottomOf="@+id/cts_status"
                             app:layout_constraintEnd_toStartOf="@+id/cts_status"
                             app:layout_constraintTop_toTopOf="@+id/cts_status" />
@@ -267,7 +262,6 @@
                             android:layout_width="25dp"
                             android:layout_height="25dp"
                             android:layout_marginEnd="8dp"
-                            android:layout_marginRight="8dp"
                             app:layout_constraintBottom_toBottomOf="@+id/basic_status"
                             app:layout_constraintEnd_toStartOf="@+id/basic_status"
                             app:layout_constraintHorizontal_bias="0.5"
@@ -299,9 +293,9 @@
                 style="?attr/cardStyle"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_marginLeft="5dp"
+                android:layout_marginStart="5dp"
                 android:layout_marginTop="4dp"
-                android:layout_marginRight="5dp"
+                android:layout_marginEnd="5dp"
                 android:layout_marginBottom="4dp"
                 app:cardCornerRadius="@dimen/card_corner_radius"
                 app:cardElevation="@dimen/card_elevation">
@@ -446,9 +440,9 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_gravity="center"
-                android:layout_marginLeft="5dp"
+                android:layout_marginStart="5dp"
                 android:layout_marginTop="4dp"
-                android:layout_marginRight="5dp"
+                android:layout_marginEnd="5dp"
                 android:layout_marginBottom="4dp"
                 android:clickable="true"
                 android:focusable="true"
diff --git a/app/src/full/res/layout/fragment_magisk_hide.xml b/app/src/full/res/layout/fragment_magisk_hide.xml
index 2779c6ddf..2164701df 100644
--- a/app/src/full/res/layout/fragment_magisk_hide.xml
+++ b/app/src/full/res/layout/fragment_magisk_hide.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-xmlns:android="http://schemas.android.com/apk/res/android"
-xmlns:app="http://schemas.android.com/apk/res-auto"
-android:id="@+id/swipeRefreshLayout"
-android:layout_width="match_parent"
-android:layout_height="fill_parent"
-android:orientation="vertical">
+<androidx.swiperefreshlayout.widget.SwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/swipeRefreshLayout"
+    android:layout_width="match_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical">
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/full/res/layout/fragment_magisk_log.xml b/app/src/full/res/layout/fragment_magisk_log.xml
index bad51f745..385389e11 100644
--- a/app/src/full/res/layout/fragment_magisk_log.xml
+++ b/app/src/full/res/layout/fragment_magisk_log.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<HorizontalScrollView
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<HorizontalScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
diff --git a/app/src/full/res/layout/fragment_modules.xml b/app/src/full/res/layout/fragment_modules.xml
index 2441de70f..df11725f3 100644
--- a/app/src/full/res/layout/fragment_modules.xml
+++ b/app/src/full/res/layout/fragment_modules.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+<androidx.swiperefreshlayout.widget.SwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/swipeRefreshLayout"
     android:layout_width="match_parent"
     android:layout_height="fill_parent"
@@ -21,8 +20,8 @@
             android:layout_height="match_parent"
             android:clipToPadding="false"
             android:dividerHeight="@dimen/card_divider_space"
-            app:layout_behavior="@string/appbar_scrolling_view_behavior"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
         <TextView
             android:id="@+id/empty_rv"
diff --git a/app/src/full/res/layout/fragment_repos.xml b/app/src/full/res/layout/fragment_repos.xml
index b8ab7f924..a00d6c9f6 100644
--- a/app/src/full/res/layout/fragment_repos.xml
+++ b/app/src/full/res/layout/fragment_repos.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.swiperefreshlayout.widget.SwipeRefreshLayout android:id="@+id/swipeRefreshLayout"
+<androidx.swiperefreshlayout.widget.SwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/swipeRefreshLayout"
     android:layout_width="match_parent"
     android:layout_height="fill_parent"
-    android:orientation="vertical"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    android:orientation="vertical">
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/full/res/layout/fragment_su_log.xml b/app/src/full/res/layout/fragment_su_log.xml
index 3abaa9783..39f82ec25 100644
--- a/app/src/full/res/layout/fragment_su_log.xml
+++ b/app/src/full/res/layout/fragment_su_log.xml
@@ -1,10 +1,8 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
-    tools:context="com.topjohnwu.magisk.fragments.SuLogFragment">
+    android:orientation="vertical">
 
     <TextView
         android:id="@+id/empty_rv"
diff --git a/app/src/full/res/layout/fragment_superuser.xml b/app/src/full/res/layout/fragment_superuser.xml
index 2145f4a6d..a09b31fdd 100644
--- a/app/src/full/res/layout/fragment_superuser.xml
+++ b/app/src/full/res/layout/fragment_superuser.xml
@@ -1,9 +1,8 @@
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:orientation="vertical"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:orientation="vertical">
 
     <TextView
         android:id="@+id/empty_rv"
diff --git a/app/src/full/res/layout/list_item_app.xml b/app/src/full/res/layout/list_item_app.xml
index 24a3ec8da..bf7fdc040 100644
--- a/app/src/full/res/layout/list_item_app.xml
+++ b/app/src/full/res/layout/list_item_app.xml
@@ -6,9 +6,9 @@
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:layout_gravity="center"
-    android:layout_marginLeft="@dimen/card_horizontal_margin"
+    android:layout_marginStart="@dimen/card_horizontal_margin"
     android:layout_marginTop="@dimen/card_vertical_margin"
-    android:layout_marginRight="@dimen/card_horizontal_margin"
+    android:layout_marginEnd="@dimen/card_horizontal_margin"
     android:layout_marginBottom="@dimen/card_vertical_margin"
     android:minHeight="?android:attr/listPreferredItemHeight"
     app:cardCornerRadius="@dimen/card_corner_radius"
@@ -24,10 +24,8 @@
             android:layout_width="50dp"
             android:layout_height="50dp"
             android:layout_marginStart="8dp"
-            android:layout_marginLeft="8dp"
             android:layout_marginTop="8dp"
             android:layout_marginEnd="8dp"
-            android:layout_marginRight="8dp"
             android:layout_marginBottom="8dp"
             android:gravity="end"
             app:layout_constraintBottom_toBottomOf="parent"
@@ -69,9 +67,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="5dp"
-            android:layout_marginLeft="5dp"
             android:layout_marginEnd="5dp"
-            android:layout_marginRight="5dp"
             android:checked="false"
             android:focusable="false"
             app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/full/res/layout/list_item_module.xml b/app/src/full/res/layout/list_item_module.xml
index f6cce9a3c..cc82443c7 100644
--- a/app/src/full/res/layout/list_item_module.xml
+++ b/app/src/full/res/layout/list_item_module.xml
@@ -6,9 +6,9 @@
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:layout_gravity="center"
-    android:layout_marginLeft="@dimen/card_horizontal_margin"
+    android:layout_marginStart="@dimen/card_horizontal_margin"
     android:layout_marginTop="@dimen/card_vertical_margin"
-    android:layout_marginRight="@dimen/card_horizontal_margin"
+    android:layout_marginEnd="@dimen/card_horizontal_margin"
     android:layout_marginBottom="@dimen/card_vertical_margin"
     android:minHeight="?android:attr/listPreferredItemHeight"
     app:cardCornerRadius="@dimen/card_corner_radius"
@@ -90,9 +90,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="5dp"
-            android:layout_marginLeft="5dp"
             android:layout_marginEnd="5dp"
-            android:layout_marginRight="5dp"
             android:focusable="false"
             app:layout_constraintBottom_toTopOf="@+id/description"
             app:layout_constraintEnd_toStartOf="@+id/delete"
diff --git a/app/src/full/res/layout/list_item_policy.xml b/app/src/full/res/layout/list_item_policy.xml
index 7969b8460..6830c1e04 100644
--- a/app/src/full/res/layout/list_item_policy.xml
+++ b/app/src/full/res/layout/list_item_policy.xml
@@ -5,9 +5,9 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_gravity="center"
-    android:layout_marginLeft="@dimen/card_horizontal_margin"
+    android:layout_marginStart="@dimen/card_horizontal_margin"
     android:layout_marginTop="@dimen/card_vertical_margin"
-    android:layout_marginRight="@dimen/card_horizontal_margin"
+    android:layout_marginEnd="@dimen/card_horizontal_margin"
     android:layout_marginBottom="@dimen/card_vertical_margin"
     android:minHeight="?android:attr/listPreferredItemHeight"
     app:cardCornerRadius="@dimen/card_corner_radius"
@@ -28,10 +28,8 @@
                 android:layout_width="50dp"
                 android:layout_height="50dp"
                 android:layout_marginStart="8dp"
-                android:layout_marginLeft="8dp"
                 android:layout_marginTop="8dp"
                 android:layout_marginEnd="8dp"
-                android:layout_marginRight="8dp"
                 android:layout_marginBottom="8dp"
                 android:gravity="end"
                 app:layout_constraintBottom_toBottomOf="parent"
@@ -72,7 +70,6 @@
                 android:layout_width="20dp"
                 android:layout_height="20dp"
                 android:layout_marginStart="5dp"
-                android:layout_marginLeft="5dp"
                 android:tint="?attr/imageColorTint"
                 app:layout_constraintBottom_toBottomOf="@+id/package_name"
                 app:layout_constraintEnd_toEndOf="@+id/app_name"
@@ -95,9 +92,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:layout_marginStart="8dp"
-                android:layout_marginLeft="8dp"
                 android:layout_marginEnd="8dp"
-                android:layout_marginRight="8dp"
                 android:checked="false"
                 android:gravity="center_vertical"
                 app:layout_constraintBottom_toBottomOf="parent"
@@ -125,7 +120,6 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:layout_marginStart="16dp"
-                android:layout_marginLeft="16dp"
                 android:tint="@color/icon_grey"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toStartOf="@+id/notification_switch"
@@ -170,7 +164,6 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:layout_marginEnd="16dp"
-                android:layout_marginRight="16dp"
                 android:checked="false"
                 android:gravity="center_vertical"
                 app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/full/res/layout/list_item_repo.xml b/app/src/full/res/layout/list_item_repo.xml
index 370cdffac..aa50b056d 100644
--- a/app/src/full/res/layout/list_item_repo.xml
+++ b/app/src/full/res/layout/list_item_repo.xml
@@ -5,9 +5,9 @@
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:layout_gravity="center"
-    android:layout_marginLeft="@dimen/card_horizontal_margin"
+    android:layout_marginStart="@dimen/card_horizontal_margin"
     android:layout_marginTop="@dimen/card_vertical_margin"
-    android:layout_marginRight="@dimen/card_horizontal_margin"
+    android:layout_marginEnd="@dimen/card_horizontal_margin"
     android:layout_marginBottom="@dimen/card_vertical_margin"
     android:minHeight="?android:attr/listPreferredItemHeight"
     app:cardCornerRadius="@dimen/card_corner_radius"
@@ -101,7 +101,6 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="8dp"
-            android:layout_marginLeft="8dp"
             android:background="?android:attr/selectableItemBackground"
             android:clickable="true"
             android:focusable="true"
diff --git a/app/src/full/res/layout/list_item_sulog.xml b/app/src/full/res/layout/list_item_sulog.xml
index 95f4a5f8f..5df989cf1 100644
--- a/app/src/full/res/layout/list_item_sulog.xml
+++ b/app/src/full/res/layout/list_item_sulog.xml
@@ -5,9 +5,9 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_gravity="center"
-    android:layout_marginLeft="@dimen/card_horizontal_margin"
+    android:layout_marginStart="@dimen/card_horizontal_margin"
     android:layout_marginTop="2dp"
-    android:layout_marginRight="@dimen/card_horizontal_margin"
+    android:layout_marginEnd="@dimen/card_horizontal_margin"
     android:layout_marginBottom="2dp"
     card_view:cardCornerRadius="@dimen/card_corner_radius"
     card_view:cardElevation="@dimen/card_elevation">
diff --git a/app/src/full/res/layout/list_item_sulog_group.xml b/app/src/full/res/layout/list_item_sulog_group.xml
index 8961c3b76..baffe09be 100644
--- a/app/src/full/res/layout/list_item_sulog_group.xml
+++ b/app/src/full/res/layout/list_item_sulog_group.xml
@@ -14,7 +14,6 @@
         android:layout_width="wrap_content"
         android:layout_height="25dp"
         android:layout_marginEnd="10dp"
-        android:layout_marginRight="10dp"
         android:tint="?attr/imageColorTint"
         app:srcCompat="@drawable/ic_arrow" />
 
diff --git a/app/src/full/res/layout/markdown_window.xml b/app/src/full/res/layout/markdown_window.xml
index 55780cc55..f5b3d43be 100644
--- a/app/src/full/res/layout/markdown_window.xml
+++ b/app/src/full/res/layout/markdown_window.xml
@@ -7,8 +7,8 @@
         android:id="@+id/md_txt"
         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:paddingTop="10dp" />
 
 </ScrollView>
\ No newline at end of file
diff --git a/app/src/full/res/layout/section.xml b/app/src/full/res/layout/section.xml
index 2c6c624e4..e6797c322 100644
--- a/app/src/full/res/layout/section.xml
+++ b/app/src/full/res/layout/section.xml
@@ -8,7 +8,6 @@
     android:gravity="center_vertical"
     android:maxLines="1"
     android:paddingStart="16dp"
-    android:paddingLeft="16dp"
     android:textAllCaps="true"
     android:textColor="?colorAccent"
     android:textSize="16sp"
diff --git a/app/src/full/res/layout/update_card.xml b/app/src/full/res/layout/update_card.xml
index 6fafc7c40..103f62725 100644
--- a/app/src/full/res/layout/update_card.xml
+++ b/app/src/full/res/layout/update_card.xml
@@ -4,9 +4,9 @@
     style="?attr/cardStyle"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginLeft="5dp"
+    android:layout_marginStart="5dp"
     android:layout_marginTop="4dp"
-    android:layout_marginRight="5dp"
+    android:layout_marginEnd="5dp"
     android:layout_marginBottom="4dp"
     android:foreground="?android:attr/selectableItemBackground"
     app:cardCornerRadius="@dimen/card_corner_radius"
@@ -23,9 +23,7 @@
             android:layout_width="25dp"
             android:layout_height="25dp"
             android:layout_marginStart="16dp"
-            android:layout_marginLeft="16dp"
             android:layout_marginEnd="16dp"
-            android:layout_marginRight="16dp"
             android:visibility="invisible"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@+id/status"
@@ -48,7 +46,6 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginEnd="8dp"
-            android:layout_marginRight="8dp"
             android:maxLines="1"
             android:paddingTop="3dp"
             android:paddingBottom="3dp"
@@ -102,7 +99,6 @@
             android:layout_width="90dp"
             android:layout_height="wrap_content"
             android:layout_marginEnd="8dp"
-            android:layout_marginRight="8dp"
             android:maxLines="1"
             android:text="@string/install"
             android:visibility="gone"
diff --git a/build.gradle b/build.gradle
index 9ebb63e83..07ccf8f3f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -34,7 +34,7 @@ subprojects {
 
                 defaultConfig {
                     if (minSdkVersion == null)
-                        minSdkVersion 16
+                        minSdkVersion 17
                     targetSdkVersion 28
                 }