diff --git a/F-Droid/res/layout-v11/app_permission_item.xml b/F-Droid/res/layout-v11/app_permission_item.xml
index 2f39f8e1e..36aafd1fa 100644
--- a/F-Droid/res/layout-v11/app_permission_item.xml
+++ b/F-Droid/res/layout-v11/app_permission_item.xml
@@ -48,6 +48,6 @@
         android:layout_marginStart="8dp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="top|left" />
+        android:layout_gravity="top|start" />
 
 </view>
diff --git a/F-Droid/res/layout-v17/app_permission_item_money.xml b/F-Droid/res/layout-v17/app_permission_item_money.xml
index 397a17f92..420225c91 100644
--- a/F-Droid/res/layout-v17/app_permission_item_money.xml
+++ b/F-Droid/res/layout-v17/app_permission_item_money.xml
@@ -29,9 +29,7 @@
         android:id="@+id/perm_icon"
         android:layout_width="24dp"
         android:layout_height="24dp"
-        android:layout_marginLeft="16dp"
         android:layout_marginStart="16dp"
-        android:layout_marginRight="8dp"
         android:layout_marginEnd="8dp"
         android:scaleType="fitCenter" />
 
@@ -43,7 +41,6 @@
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="8dp"
         android:layout_marginStart="8dp"
         >
         <TextView
@@ -52,14 +49,12 @@
             android:textSize="16sp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignParentLeft="true"
             android:layout_alignParentStart="true"
             android:layout_alignParentTop="true" />
         <ImageView
             android:id="@+id/perm_money_icon"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignParentLeft="true"
             android:layout_alignParentStart="true"
             android:layout_alignBottom="@+id/perm_money_label"
             android:scaleType="fitCenter"
@@ -73,10 +68,8 @@
             android:textColor="@color/perms_costs_money"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_toRightOf="@id/perm_money_icon"
             android:layout_toEndOf="@id/perm_money_icon"
             android:layout_below="@id/perm_name"
-            android:layout_marginLeft="8dp"
             android:layout_marginStart="8dp"
             android:text="@string/perm_costs_money" />
     </RelativeLayout>
diff --git a/F-Droid/res/layout/app_details_header.xml b/F-Droid/res/layout/app_details_header.xml
index 5f1a40a91..0fb154ba6 100644
--- a/F-Droid/res/layout/app_details_header.xml
+++ b/F-Droid/res/layout/app_details_header.xml
@@ -41,6 +41,7 @@
         android:baselineAligned="false"
         android:orientation="vertical"
         android:layout_toRightOf="@id/icon"
+        android:layout_toEndOf="@id/icon"
         android:paddingLeft="16dp"
         android:paddingStart="16dp"
         android:paddingRight="16dp"
diff --git a/F-Droid/res/layout/app_permission_item.xml b/F-Droid/res/layout/app_permission_item.xml
index 1857b9af8..366c1e07d 100644
--- a/F-Droid/res/layout/app_permission_item.xml
+++ b/F-Droid/res/layout/app_permission_item.xml
@@ -46,6 +46,6 @@
         android:layout_marginStart="8dp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="top|left" />
+        android:layout_gravity="top|start" />
 
 </view>
diff --git a/F-Droid/res/layout/applistitem.xml b/F-Droid/res/layout/applistitem.xml
index 2b22a0bcd..4101232ac 100644
--- a/F-Droid/res/layout/applistitem.xml
+++ b/F-Droid/res/layout/applistitem.xml
@@ -5,7 +5,9 @@
     android:layout_width="match_parent"
     android:layout_height="?attr/listPreferredItemHeight"
     android:paddingLeft="?attr/listPreferredItemPaddingLeft"
+    android:paddingStart="?attr/listPreferredItemPaddingLeft"
     android:paddingRight="?attr/listPreferredItemPaddingRight"
+    android:paddingEnd="?attr/listPreferredItemPaddingRight"
     android:baselineAligned="false">
 
     <ImageView
@@ -38,7 +40,9 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:paddingLeft="?attr/listPreferredItemPaddingLeft"
+                android:paddingStart="?attr/listPreferredItemPaddingLeft"
                 android:paddingRight="?attr/listPreferredItemPaddingRight"
+                android:paddingEnd="?attr/listPreferredItemPaddingRight"
                 android:layout_gravity="center_vertical"
                 android:gravity="start"
                 android:textAlignment="viewStart"
@@ -74,7 +78,9 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:paddingLeft="?attr/listPreferredItemPaddingLeft"
+                android:paddingStart="?attr/listPreferredItemPaddingLeft"
                 android:paddingRight="?attr/listPreferredItemPaddingRight"
+                android:paddingEnd="?attr/listPreferredItemPaddingRight"
                 android:gravity="start"
                 android:textAlignment="viewStart"
                 tools:text="Application manager" />
diff --git a/F-Droid/res/layout/repo_item.xml b/F-Droid/res/layout/repo_item.xml
index bab9b3737..31b2bbbca 100644
--- a/F-Droid/res/layout/repo_item.xml
+++ b/F-Droid/res/layout/repo_item.xml
@@ -5,7 +5,9 @@
     android:orientation="horizontal"
     android:gravity="center_vertical"
     android:paddingLeft="?attr/listPreferredItemPaddingLeft"
+    android:paddingStart="?attr/listPreferredItemPaddingLeft"
     android:paddingRight="?attr/listPreferredItemPaddingRight"
+    android:paddingEnd="?attr/listPreferredItemPaddingRight"
     android:descendantFocusability="blocksDescendants">
     <!--
      descendantFocusability is here because if you have a child that responds
diff --git a/F-Droid/res/layout/repodetails.xml b/F-Droid/res/layout/repodetails.xml
index dfe712438..2ad07534d 100644
--- a/F-Droid/res/layout/repodetails.xml
+++ b/F-Droid/res/layout/repodetails.xml
@@ -8,7 +8,9 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:paddingLeft="?attr/listPreferredItemPaddingLeft"
+        android:paddingStart="?attr/listPreferredItemPaddingLeft"
         android:paddingRight="?attr/listPreferredItemPaddingRight"
+        android:paddingEnd="?attr/listPreferredItemPaddingRight"
         android:orientation="vertical">
 
         <!-- URL of this repo -->