diff --git a/res/layout/local_repo_activity.xml b/res/layout/local_repo_activity.xml
index 17908b176..d7a8a6045 100644
--- a/res/layout/local_repo_activity.xml
+++ b/res/layout/local_repo_activity.xml
@@ -32,6 +32,7 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_marginLeft="15dp"
+            android:layout_marginStart="15dp"
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:textStyle="bold"
             android:typeface="monospace" />
@@ -51,6 +52,7 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_marginLeft="15dp"
+            android:layout_marginStart="15dp"
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:textStyle="bold"
             android:typeface="monospace" />
@@ -70,6 +72,7 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_marginLeft="15dp"
+            android:layout_marginStart="15dp"
             android:typeface="monospace" />
     </LinearLayout>
 
@@ -78,7 +81,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginLeft="20dp"
+        android:layout_marginStart="20dp"
         android:layout_marginRight="20dp"
+        android:layout_marginEnd="20dp"
         android:text="@string/same_wifi_instructions" />
 
     <ImageView
@@ -87,4 +92,4 @@
         android:layout_height="wrap_content"
         android:contentDescription="@string/qr_content_description" />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/res/layout/qr_wizard_activity.xml b/res/layout/qr_wizard_activity.xml
index 5d2fac14a..b461f9eb8 100644
--- a/res/layout/qr_wizard_activity.xml
+++ b/res/layout/qr_wizard_activity.xml
@@ -23,6 +23,7 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_marginLeft="15dp"
+            android:layout_marginStart="15dp"
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:textStyle="bold"
             android:typeface="monospace" />
@@ -40,4 +41,4 @@
         android:layout_height="wrap_content"
         android:text="@string/next" />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/res/layout/select_local_apps_list_item.xml b/res/layout/select_local_apps_list_item.xml
index c29cd761b..eb77c8fd7 100644
--- a/res/layout/select_local_apps_list_item.xml
+++ b/res/layout/select_local_apps_list_item.xml
@@ -27,6 +27,7 @@
     <ImageView
         android:layout_width="48dip"
         android:layout_height="48dip"
+        android:layout_marginLeft="?android:attr/listPreferredItemPaddingStart"
         android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
         android:layout_marginTop="6dip"
         tools:ignore="ContentDescription" />
@@ -40,6 +41,7 @@
             android:id="@+id/application_label"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginLeft="?android:attr/listPreferredItemPaddingStart"
             android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
             android:layout_marginTop="6dip"
             android:textAppearance="?android:attr/textAppearanceListItem" />
@@ -53,4 +55,4 @@
             android:textAppearance="?android:attr/textAppearanceSmall" />
     </TwoLineListItem>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>