diff --git a/F-Droid/res/layout-v11/app_permission_item.xml b/F-Droid/res/layout-v11/app_permission_item.xml
index 0cb5e3405..2f39f8e1e 100644
--- a/F-Droid/res/layout-v11/app_permission_item.xml
+++ b/F-Droid/res/layout-v11/app_permission_item.xml
@@ -29,7 +29,9 @@
         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" />
 
@@ -42,6 +44,7 @@
         android:id="@+id/perm_name"
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:textSize="16sp"
+        android:layout_marginLeft="8dp"
         android:layout_marginStart="8dp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/F-Droid/res/layout/app_details_header.xml b/F-Droid/res/layout/app_details_header.xml
index 622d895c1..5f1a40a91 100644
--- a/F-Droid/res/layout/app_details_header.xml
+++ b/F-Droid/res/layout/app_details_header.xml
@@ -42,7 +42,10 @@
         android:orientation="vertical"
         android:layout_toRightOf="@id/icon"
         android:paddingLeft="16dp"
-        android:paddingStart="16dp">
+        android:paddingStart="16dp"
+        android:paddingRight="16dp"
+        android:paddingEnd="16dp"
+        >
 
         <TextView
             android:id="@+id/title"
diff --git a/F-Droid/res/layout/app_permission_item.xml b/F-Droid/res/layout/app_permission_item.xml
index dcf54023e..1857b9af8 100644
--- a/F-Droid/res/layout/app_permission_item.xml
+++ b/F-Droid/res/layout/app_permission_item.xml
@@ -28,7 +28,9 @@
         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" />
 
@@ -40,6 +42,7 @@
         android:id="@+id/perm_name"
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:textSize="16sp"
+        android:layout_marginLeft="8dp"
         android:layout_marginStart="8dp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/F-Droid/res/layout/app_permission_item_money.xml b/F-Droid/res/layout/app_permission_item_money.xml
index 0e2e7577c..397a17f92 100644
--- a/F-Droid/res/layout/app_permission_item_money.xml
+++ b/F-Droid/res/layout/app_permission_item_money.xml
@@ -29,7 +29,9 @@
         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" />
 
@@ -41,19 +43,23 @@
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="8dp">
+        android:layout_marginLeft="8dp"
+        android:layout_marginStart="8dp"
+        >
         <TextView
             android:id="@+id/perm_name"
             android:textAppearance="?android:attr/textAppearanceSmall"
             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"
@@ -67,8 +73,10 @@
             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/install_app_details.xml b/F-Droid/res/layout/install_app_details.xml
index 24cd14d5a..e129dbb36 100644
--- a/F-Droid/res/layout/install_app_details.xml
+++ b/F-Droid/res/layout/install_app_details.xml
@@ -24,15 +24,19 @@ installation screens
     android:id="@+id/app_snippet"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:paddingLeft="16dip"
     android:paddingStart="16dip"
+    android:paddingRight="16dip"
     android:paddingEnd="16dip"
     android:paddingTop="24dip"
     >
     <ImageView android:id="@+id/app_icon"
         android:layout_width="32dip"
         android:layout_height="32dip"
+        android:layout_marginLeft="8dip"
         android:layout_marginStart="8dip"
         android:background="@android:color/transparent"
+        android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
         android:gravity="start"
         android:scaleType="centerCrop"/>
@@ -44,11 +48,14 @@ installation screens
         android:textColor="?android:attr/textColorPrimary"
         android:shadowColor="@color/shadow"
         android:shadowRadius="2"
+        android:layout_toRightOf="@id/app_icon"
         android:layout_toEndOf="@id/app_icon"
         android:singleLine="true"
         android:layout_centerInParent="true"
+        android:paddingRight="16dip"
         android:paddingEnd="16dip"
         android:paddingTop="3dip"
+        android:paddingLeft="16dip"
         android:paddingStart="16dip"
         android:ellipsize="end"/>
     <FrameLayout