diff --git a/OpenKeychain/src/main/res/layout/import_keys_activity.xml b/OpenKeychain/src/main/res/layout/import_keys_activity.xml
index 876374700..2a332823e 100644
--- a/OpenKeychain/src/main/res/layout/import_keys_activity.xml
+++ b/OpenKeychain/src/main/res/layout/import_keys_activity.xml
@@ -1,20 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
     android:id="@+id/content_frame"
     android:layout_marginLeft="@dimen/drawer_content_padding"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_centerHorizontal="true">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
     <FrameLayout
         android:id="@+id/import_navigation_fragment"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
-        android:orientation="vertical"
-        android:paddingLeft="4dp"
-        android:paddingRight="4dp" />
+        android:orientation="vertical" />
 
     <LinearLayout
         android:id="@+id/import_footer"
@@ -56,6 +52,7 @@
         android:layout_alignParentLeft="true"
         android:layout_below="@+id/import_navigation_fragment"
         android:orientation="vertical"
-        android:paddingLeft="4dp"
-        android:paddingRight="4dp" />
+        android:paddingTop="8dp"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/import_keys_clipboard_fragment.xml b/OpenKeychain/src/main/res/layout/import_keys_clipboard_fragment.xml
index 046768495..739c34fba 100644
--- a/OpenKeychain/src/main/res/layout/import_keys_clipboard_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/import_keys_clipboard_fragment.xml
@@ -3,13 +3,15 @@
     xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:paddingTop="8dp"
+    android:paddingLeft="16dp"
+    android:paddingRight="16dp"
     android:orientation="horizontal" >
 
     <com.beardedhen.androidbootstrap.BootstrapButton
         android:id="@+id/import_clipboard_button"
         android:layout_width="match_parent"
         android:layout_height="70dp"
-        android:layout_margin="10dp"
         android:text="@string/import_clipboard_button"
         bootstrapbutton:bb_icon_left="fa-clipboard"
         bootstrapbutton:bb_size="default"
diff --git a/OpenKeychain/src/main/res/layout/import_keys_file_fragment.xml b/OpenKeychain/src/main/res/layout/import_keys_file_fragment.xml
index 0a49571d1..c07d2bb40 100644
--- a/OpenKeychain/src/main/res/layout/import_keys_file_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/import_keys_file_fragment.xml
@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:paddingTop="8dp"
+    android:paddingLeft="16dp"
+    android:paddingRight="16dp"
     android:orientation="vertical">
 
     <com.beardedhen.androidbootstrap.BootstrapButton
         android:id="@+id/import_keys_file_browse"
         android:layout_width="match_parent"
         android:layout_height="70dp"
-        android:layout_margin="10dp"
         android:text="@string/filemanager_title_open"
         android:contentDescription="@string/filemanager_title_open"
         bootstrapbutton:bb_icon_left="fa-folder-open"
diff --git a/OpenKeychain/src/main/res/layout/import_keys_keybase_fragment.xml b/OpenKeychain/src/main/res/layout/import_keys_keybase_fragment.xml
index 248581342..ceba0e1ce 100644
--- a/OpenKeychain/src/main/res/layout/import_keys_keybase_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/import_keys_keybase_fragment.xml
@@ -3,49 +3,36 @@
     xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="horizontal" >
+    android:paddingTop="8dp"
+    android:paddingLeft="16dp"
+    android:paddingRight="16dp"
+    android:orientation="horizontal">
 
-    <LinearLayout
-        android:layout_width="match_parent"
+
+    <EditText
+        android:id="@+id/import_keybase_query"
+        android:layout_width="0dip"
         android:layout_height="wrap_content"
-        android:orientation="horizontal">
+        android:layout_weight="1"
+        android:gravity="top|left"
+        android:hint="@string/hint_keybase_search"
+        android:imeOptions="actionSearch"
+        android:inputType="textNoSuggestions"
+        android:singleLine="true"
+        android:lines="1"
+        android:maxLines="1"
+        android:minLines="1"
+        android:layout_gravity="center_vertical" />
 
-        <EditText
-            android:id="@+id/import_keybase_query"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:gravity="top|left"
-            android:hint="@string/hint_keybase_search"
-            android:imeOptions="actionSearch"
-            android:inputType="textNoSuggestions"
-            android:singleLine="true"
-            android:lines="1"
-            android:maxLines="1"
-            android:minLines="1"
-            android:layout_gravity="center_vertical" />
-
-        <com.beardedhen.androidbootstrap.BootstrapButton
-            android:id="@+id/import_keybase_search"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:layout_marginLeft="10dp"
-            bootstrapbutton:bb_icon_left="fa-search"
-            bootstrapbutton:bb_roundedCorners="true"
-            bootstrapbutton:bb_size="default"
-            bootstrapbutton:bb_type="default" />
-    </LinearLayout>
-
-    <!--
     <com.beardedhen.androidbootstrap.BootstrapButton
-        android:id="@+id/import_keybase_button"
-        android:layout_width="match_parent"
-        android:layout_height="70dp"
-        android:layout_margin="10dp"
-        android:text="@string/import_keybase_button"
+        android:id="@+id/import_keybase_search"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:layout_marginLeft="8dp"
+        bootstrapbutton:bb_icon_left="fa-search"
+        bootstrapbutton:bb_roundedCorners="true"
         bootstrapbutton:bb_size="default"
         bootstrapbutton:bb_type="default" />
-        -->
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/import_keys_list_entry.xml b/OpenKeychain/src/main/res/layout/import_keys_list_entry.xml
index f5ec71abe..c91335a5b 100644
--- a/OpenKeychain/src/main/res/layout/import_keys_list_entry.xml
+++ b/OpenKeychain/src/main/res/layout/import_keys_list_entry.xml
@@ -25,8 +25,7 @@
         android:id="@+id/selected"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        android:layout_marginLeft="4dp"
-        android:layout_marginRight="4dp"
+        android:paddingRight="8dp"
         android:clickable="false"
         android:focusable="false"
         android:focusableInTouchMode="false" />
@@ -46,8 +45,7 @@
                 android:layout_width="0dip"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:orientation="vertical"
-                android:paddingRight="4dip">
+                android:orientation="vertical">
 
                 <TextView
                     android:id="@+id/mainUserId"
diff --git a/OpenKeychain/src/main/res/layout/import_keys_nfc_fragment.xml b/OpenKeychain/src/main/res/layout/import_keys_nfc_fragment.xml
index 2a8e74fc2..8c0a80e4e 100644
--- a/OpenKeychain/src/main/res/layout/import_keys_nfc_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/import_keys_nfc_fragment.xml
@@ -3,8 +3,10 @@
     xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
-    android:padding="10dp"
-    android:orientation="horizontal" >
+    android:paddingTop="8dp"
+    android:paddingLeft="16dp"
+    android:paddingRight="16dp"
+    android:orientation="horizontal">
 
     <com.beardedhen.androidbootstrap.BootstrapButton
         android:id="@+id/import_nfc_button"
@@ -12,7 +14,7 @@
         android:layout_height="70dp"
         android:layout_alignParentRight="true"
         android:layout_alignParentTop="true"
-        android:layout_marginLeft="10dp"
+        android:layout_marginLeft="8dp"
         android:text="@string/import_nfc_help_button"
         bootstrapbutton:bb_icon_left="fa-question"
         bootstrapbutton:bb_size="default"
diff --git a/OpenKeychain/src/main/res/layout/import_keys_qr_code_fragment.xml b/OpenKeychain/src/main/res/layout/import_keys_qr_code_fragment.xml
index 472c05e65..590f7f797 100644
--- a/OpenKeychain/src/main/res/layout/import_keys_qr_code_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/import_keys_qr_code_fragment.xml
@@ -3,13 +3,15 @@
     xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical" >
+    android:paddingTop="8dp"
+    android:paddingLeft="16dp"
+    android:paddingRight="16dp"
+    android:orientation="vertical">
 
     <com.beardedhen.androidbootstrap.BootstrapButton
         android:id="@+id/import_qrcode_button"
         android:layout_width="match_parent"
         android:layout_height="70dp"
-        android:layout_margin="10dp"
         android:text="@string/import_qr_scan_button"
         bootstrapbutton:bb_icon_left="fa-barcode"
         bootstrapbutton:bb_size="default"
@@ -19,8 +21,9 @@
         android:id="@+id/import_qrcode_text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:paddingLeft="10dp"
-        android:paddingRight="10dp"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp"
+        android:paddingTop="8dp"
         android:visibility="gone" />
 
     <ProgressBar
@@ -28,8 +31,8 @@
         style="?android:attr/progressBarStyleHorizontal"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingLeft="10dp"
-        android:paddingRight="10dp"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp"
         android:progress="0"
         android:visibility="gone" />
 
diff --git a/OpenKeychain/src/main/res/layout/import_keys_server_fragment.xml b/OpenKeychain/src/main/res/layout/import_keys_server_fragment.xml
index 2438dd785..e17dbe783 100644
--- a/OpenKeychain/src/main/res/layout/import_keys_server_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/import_keys_server_fragment.xml
@@ -2,7 +2,9 @@
     xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:padding="10dp"
+    android:paddingTop="8dp"
+    android:paddingLeft="16dp"
+    android:paddingRight="16dp"
     android:orientation="vertical">
 
     <Spinner
@@ -35,7 +37,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:layout_marginLeft="10dp"
+            android:layout_marginLeft="8dp"
             bootstrapbutton:bb_icon_left="fa-search"
             bootstrapbutton:bb_roundedCorners="true"
             bootstrapbutton:bb_size="default"
diff --git a/OpenKeychain/src/main/res/layout/view_key_userids_item.xml b/OpenKeychain/src/main/res/layout/view_key_userids_item.xml
index 2f4041f8c..03e619aff 100644
--- a/OpenKeychain/src/main/res/layout/view_key_userids_item.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_userids_item.xml
@@ -4,7 +4,6 @@
     android:layout_height="wrap_content"
     android:minHeight="?android:attr/listPreferredItemHeight"
     android:orientation="horizontal"
-    android:paddingRight="3dip"
     android:singleLine="true">
 
     <CheckBox