diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java
index 72087f9bd..b38369dcc 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java
@@ -26,6 +26,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.CheckBox;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.beardedhen.androidbootstrap.BootstrapButton;
diff --git a/OpenPGP-Keychain/src/main/res/layout/decrypt_file_fragment.xml b/OpenPGP-Keychain/src/main/res/layout/decrypt_file_fragment.xml
index 4515c8092..040a05dc3 100644
--- a/OpenPGP-Keychain/src/main/res/layout/decrypt_file_fragment.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/decrypt_file_fragment.xml
@@ -4,8 +4,8 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:paddingTop="4dp"
-    android:paddingLeft="10dp"
-    android:paddingRight="10dp"
+    android:paddingLeft="16dp"
+    android:paddingRight="16dp"
     android:orientation="vertical">
 
     <include layout="@layout/decrypt_signature_include" />
@@ -46,13 +46,13 @@
 
     <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:padding="4dp">
+        android:layout_height="match_parent">
 
         <TextView
             style="@style/SectionHeader"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginTop="4dp"
             android:text="@string/section_decrypt_verify"
             android:layout_above="@+id/decrypt_file_action_decrypt"
             android:layout_alignParentLeft="true"
@@ -61,8 +61,9 @@
         <com.beardedhen.androidbootstrap.BootstrapButton
             android:id="@+id/decrypt_file_action_decrypt"
             android:layout_width="match_parent"
-            android:layout_height="60dp"
-            android:padding="4dp"
+            android:layout_height="50dp"
+            android:layout_marginTop="4dp"
+            android:layout_marginBottom="4dp"
             android:text="@string/btn_decrypt_verify"
             bootstrapbutton:bb_icon_left="fa-unlock"
             bootstrapbutton:bb_type="info"
diff --git a/OpenPGP-Keychain/src/main/res/layout/decrypt_message_fragment.xml b/OpenPGP-Keychain/src/main/res/layout/decrypt_message_fragment.xml
index bfcc42da5..6960532df 100644
--- a/OpenPGP-Keychain/src/main/res/layout/decrypt_message_fragment.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/decrypt_message_fragment.xml
@@ -9,8 +9,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingTop="4dp"
-        android:paddingLeft="10dp"
-        android:paddingRight="10dp"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp"
         android:orientation="vertical">
 
         <include layout="@layout/decrypt_signature_include" />
@@ -35,15 +35,16 @@
             android:id="@+id/decrypt_buttons"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:padding="4dp">
+            android:orientation="horizontal">
 
             <com.beardedhen.androidbootstrap.BootstrapButton
                 android:id="@+id/action_decrypt"
                 android:layout_width="match_parent"
-                android:layout_height="60dp"
+                android:layout_height="50dp"
+                android:layout_marginRight="4dp"
+                android:layout_marginTop="4dp"
+                android:layout_marginBottom="4dp"
                 android:layout_weight="1"
-                android:padding="4dp"
                 android:text="@string/btn_decrypt_verify"
                 bootstrapbutton:bb_icon_left="fa-unlock"
                 bootstrapbutton:bb_type="info" />
@@ -51,9 +52,11 @@
             <com.beardedhen.androidbootstrap.BootstrapButton
                 android:id="@+id/action_decrypt_from_clipboard"
                 android:layout_width="match_parent"
-                android:layout_height="60dp"
+                android:layout_height="50dp"
+                android:layout_marginLeft="4dp"
+                android:layout_marginTop="4dp"
+                android:layout_marginBottom="4dp"
                 android:layout_weight="1"
-                android:padding="4dp"
                 android:text="@string/btn_decrypt_verify_clipboard"
                 bootstrapbutton:bb_icon_left="fa-unlock"
                 bootstrapbutton:bb_type="info" />
diff --git a/OpenPGP-Keychain/src/main/res/layout/encrypt_asymmetric_fragment.xml b/OpenPGP-Keychain/src/main/res/layout/encrypt_asymmetric_fragment.xml
index 95ed5afa4..5041b5fa6 100644
--- a/OpenPGP-Keychain/src/main/res/layout/encrypt_asymmetric_fragment.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/encrypt_asymmetric_fragment.xml
@@ -2,11 +2,13 @@
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
-    xmlns:custom="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:padding="4dp">
+    android:paddingTop="4dp"
+    android:paddingBottom="4dp"
+    android:paddingRight="16dp"
+    android:paddingLeft="16dp">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -34,7 +36,7 @@
                 android:layout_gravity="right"
                 android:ellipsize="end"
                 android:singleLine="true"
-                android:text="Alice"
+                android:text=""
                 android:textAppearance="?android:attr/textAppearanceMedium" />
 
             <TextView
@@ -44,7 +46,7 @@
                 android:layout_gravity="right"
                 android:ellipsize="end"
                 android:singleLine="true"
-                android:text="alice@example.com"
+                android:text=""
                 android:textAppearance="?android:attr/textAppearanceSmall" />
         </LinearLayout>
     </LinearLayout>
@@ -52,8 +54,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:paddingBottom="3dip">
+        android:orientation="horizontal">
 
         <TextView
             android:id="@+id/label_selectPublicKeys"
diff --git a/OpenPGP-Keychain/src/main/res/layout/encrypt_file_fragment.xml b/OpenPGP-Keychain/src/main/res/layout/encrypt_file_fragment.xml
index bdca11423..fe0b28a27 100644
--- a/OpenPGP-Keychain/src/main/res/layout/encrypt_file_fragment.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/encrypt_file_fragment.xml
@@ -5,8 +5,8 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:paddingTop="4dp"
-    android:paddingLeft="10dp"
-    android:paddingRight="10dp"
+    android:paddingLeft="16dp"
+    android:paddingRight="16dp"
     android:orientation="vertical">
 
     <LinearLayout
@@ -51,13 +51,13 @@
 
     <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:padding="4dp">
+        android:layout_height="match_parent">
 
         <TextView
             style="@style/SectionHeader"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginTop="4dp"
             android:text="@string/section_encrypt_and_or_sign"
             android:layout_above="@+id/action_encrypt_file"
             android:layout_alignParentLeft="true"
@@ -66,8 +66,9 @@
         <com.beardedhen.androidbootstrap.BootstrapButton
             android:id="@+id/action_encrypt_file"
             android:layout_width="match_parent"
-            android:layout_height="60dp"
-            android:padding="4dp"
+            android:layout_height="50dp"
+            android:layout_marginTop="4dp"
+            android:layout_marginBottom="4dp"
             android:text="@string/btn_encrypt_file"
             bootstrapbutton:bb_icon_left="fa-lock"
             bootstrapbutton:bb_type="info"
diff --git a/OpenPGP-Keychain/src/main/res/layout/encrypt_message_fragment.xml b/OpenPGP-Keychain/src/main/res/layout/encrypt_message_fragment.xml
index bc2a2b4a6..1fa338426 100644
--- a/OpenPGP-Keychain/src/main/res/layout/encrypt_message_fragment.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/encrypt_message_fragment.xml
@@ -9,8 +9,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingTop="4dp"
-        android:paddingLeft="10dp"
-        android:paddingRight="10dp"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp"
         android:orientation="vertical">
 
         <EditText
@@ -26,20 +26,20 @@
             style="@style/SectionHeader"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="4dp"
             android:text="@string/section_encrypt_and_or_sign" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:padding="4dp">
+            android:orientation="horizontal">
 
             <com.beardedhen.androidbootstrap.BootstrapButton
                 android:id="@+id/action_encrypt_share"
                 android:layout_width="match_parent"
-                android:layout_height="60dp"
-                android:padding="4dp"
+                android:layout_height="50dp"
+                android:layout_marginRight="4dp"
+                android:layout_marginTop="4dp"
+                android:layout_marginBottom="4dp"
                 android:layout_weight="1"
                 android:text="@string/btn_share"
                 bootstrapbutton:bb_icon_left="fa-share-square"
@@ -48,8 +48,10 @@
             <com.beardedhen.androidbootstrap.BootstrapButton
                 android:id="@+id/action_encrypt_clipboard"
                 android:layout_width="match_parent"
-                android:layout_height="60dp"
-                android:padding="4dp"
+                android:layout_height="50dp"
+                android:layout_marginLeft="4dp"
+                android:layout_marginTop="4dp"
+                android:layout_marginBottom="4dp"
                 android:layout_weight="1"
                 android:text="@string/btn_clipboard"
                 bootstrapbutton:bb_icon_left="fa-clipboard"
diff --git a/OpenPGP-Keychain/src/main/res/layout/encrypt_symmetric_fragment.xml b/OpenPGP-Keychain/src/main/res/layout/encrypt_symmetric_fragment.xml
index 019c1cddf..0d07e9e72 100644
--- a/OpenPGP-Keychain/src/main/res/layout/encrypt_symmetric_fragment.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/encrypt_symmetric_fragment.xml
@@ -3,7 +3,10 @@
     android:id="@+id/modeSymmetric"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:padding="4dp"
+    android:paddingTop="4dp"
+    android:paddingBottom="4dp"
+    android:paddingRight="16dp"
+    android:paddingLeft="16dp"
     android:stretchColumns="1">
 
     <TableRow>
@@ -13,7 +16,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:paddingRight="10dip"
+            android:paddingRight="8dp"
             android:text="@string/label_passphrase"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
@@ -31,7 +34,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:paddingRight="10dip"
+            android:paddingRight="8dp"
             android:text="@string/label_passphrase_again"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
diff --git a/OpenPGP-Keychain/src/main/res/layout/import_keys_activity.xml b/OpenPGP-Keychain/src/main/res/layout/import_keys_activity.xml
index b11f99757..c82607a33 100644
--- a/OpenPGP-Keychain/src/main/res/layout/import_keys_activity.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/import_keys_activity.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
     android:id="@+id/drawer_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent" >
diff --git a/OpenPGP-Keychain/src/main/res/layout/import_keys_content.xml b/OpenPGP-Keychain/src/main/res/layout/import_keys_content.xml
index fae8147e5..eb1333704 100644
--- a/OpenPGP-Keychain/src/main/res/layout/import_keys_content.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/import_keys_content.xml
@@ -1,56 +1,50 @@
 <?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">
+<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">
 
     <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: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" />
 
     <LinearLayout
-            android:id="@+id/import_footer"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:orientation="vertical"
-            android:paddingLeft="10dp"
-            android:paddingRight="10dp">
+        android:id="@+id/import_footer"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:orientation="vertical"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp">
 
         <com.beardedhen.androidbootstrap.BootstrapButton
-                android:id="@+id/import_import"
-                android:layout_width="match_parent"
-                android:layout_height="60dp"
-                android:padding="4dp"
-                android:text="@string/import_import"
-                bootstrapbutton:bb_icon_left="fa-download"
-                bootstrapbutton:bb_type="info"/>
+            android:id="@+id/import_import"
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:layout_marginTop="4dp"
+            android:layout_marginBottom="4dp"
+            android:text="@string/import_import"
+            bootstrapbutton:bb_icon_left="fa-download"
+            bootstrapbutton:bb_type="info" />
 
-        <!-- <com.beardedhen.androidbootstrap.BootstrapButton -->
-        <!-- android:id="@+id/import_sign_and_upload" -->
-        <!-- android:layout_width="match_parent" -->
-        <!-- android:layout_height="60dp" -->
-        <!-- android:padding="4dp" -->
-        <!-- android:text="@string/import_sign_and_upload" -->
-        <!-- bootstrapbutton:bb_type="info" /> -->
     </LinearLayout>
 
     <FrameLayout
-            android:id="@+id/import_keys_list_container"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_above="@+id/import_footer"
-            android:layout_alignParentLeft="true"
-            android:layout_below="@+id/import_navigation_fragment"
-            android:orientation="vertical"
-            android:paddingLeft="4dp"
-            android:paddingRight="4dp"/>
+        android:id="@+id/import_keys_list_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@+id/import_footer"
+        android:layout_alignParentLeft="true"
+        android:layout_below="@+id/import_navigation_fragment"
+        android:orientation="vertical"
+        android:paddingLeft="4dp"
+        android:paddingRight="4dp" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/src/main/res/layout/view_key_certs_fragment.xml b/OpenPGP-Keychain/src/main/res/layout/view_key_certs_fragment.xml
index 299471c66..9c0ecb15d 100644
--- a/OpenPGP-Keychain/src/main/res/layout/view_key_certs_fragment.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/view_key_certs_fragment.xml
@@ -21,15 +21,15 @@
             style="@style/SectionHeader"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="4dp"
             android:layout_marginTop="14dp"
             android:text="@string/section_actions" />
 
         <com.beardedhen.androidbootstrap.BootstrapButton
             android:id="@+id/action_certify"
             android:layout_width="match_parent"
-            android:layout_height="60dp"
-            android:padding="4dp"
+            android:layout_height="50dp"
+            android:layout_marginTop="4dp"
+            android:layout_marginBottom="4dp"
             android:text="@string/key_view_action_certify"
             bootstrapbutton:bb_icon_left="fa-pencil"
             bootstrapbutton:bb_type="info" />
diff --git a/OpenPGP-Keychain/src/main/res/layout/view_key_main_fragment.xml b/OpenPGP-Keychain/src/main/res/layout/view_key_main_fragment.xml
index adbdb98dd..6d2bc8874 100644
--- a/OpenPGP-Keychain/src/main/res/layout/view_key_main_fragment.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/view_key_main_fragment.xml
@@ -226,16 +226,15 @@
             style="@style/SectionHeader"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="4dp"
             android:layout_marginTop="14dp"
             android:text="@string/section_actions" />
 
         <com.beardedhen.androidbootstrap.BootstrapButton
             android:id="@+id/action_edit"
             android:layout_width="match_parent"
-            android:layout_height="60dp"
-            android:padding="4dp"
-            android:layout_marginBottom="10dp"
+            android:layout_height="50dp"
+            android:layout_marginTop="4dp"
+            android:layout_marginBottom="4dp"
             android:text="@string/key_view_action_edit"
             bootstrapbutton:bb_icon_left="fa-key"
             bootstrapbutton:bb_type="info"
@@ -244,20 +243,19 @@
         <com.beardedhen.androidbootstrap.BootstrapButton
             android:id="@+id/action_encrypt"
             android:layout_width="match_parent"
-            android:layout_height="60dp"
-            android:padding="4dp"
-            android:layout_marginBottom="10dp"
+            android:layout_height="50dp"
+            android:layout_marginTop="4dp"
+            android:layout_marginBottom="4dp"
             android:text="@string/key_view_action_encrypt"
             bootstrapbutton:bb_icon_left="fa-lock"
             bootstrapbutton:bb_type="info" />
 
-
         <com.beardedhen.androidbootstrap.BootstrapButton
             android:id="@+id/action_certify"
             android:layout_width="match_parent"
-            android:layout_height="60dp"
-            android:padding="4dp"
-            android:layout_marginBottom="10dp"
+            android:layout_height="50dp"
+            android:layout_marginTop="4dp"
+            android:layout_marginBottom="4dp"
             android:text="@string/key_view_action_certify"
             bootstrapbutton:bb_icon_left="fa-pencil"
             bootstrapbutton:bb_type="info" />