diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeySectionedListAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeySectionedListAdapter.java
index d26c7b9ec..01c72919b 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeySectionedListAdapter.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeySectionedListAdapter.java
@@ -299,7 +299,7 @@ public class KeySectionedListAdapter extends SectionCursorAdapter<KeySectionedLi
                 if (TextUtils.isEmpty(userId)) {
                     return null;
                 } else {
-                    return userId.substring(0, 1);
+                    return userId.substring(0, 1).toUpperCase();
                 }
             }
         } else {
diff --git a/OpenKeychain/src/main/res/layout/key_list_fragment.xml b/OpenKeychain/src/main/res/layout/key_list_fragment.xml
index c620ea3fc..d53afb940 100644
--- a/OpenKeychain/src/main/res/layout/key_list_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/key_list_fragment.xml
@@ -43,6 +43,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:clipToPadding="false"
+                    android:paddingBottom="72dp"
                     android:paddingLeft="16dp"
                     android:paddingRight="32dp"
                     android:paddingStart="16dp" />
@@ -53,8 +54,7 @@
                     android:layout_height="match_parent"
                     android:layout_alignParentRight="true"
                     android:orientation="vertical"
-                    app:fastscroll__bubbleColor="@color/primary"
-                    app:fastscroll__handleColor="@color/md_white_1000" />
+                    app:fastscroll__bubbleColor="@color/primary" />
 
             </RelativeLayout>
 
diff --git a/OpenKeychain/src/main/res/layout/key_list_item.xml b/OpenKeychain/src/main/res/layout/key_list_item.xml
index 2ee819328..43f12342b 100644
--- a/OpenKeychain/src/main/res/layout/key_list_item.xml
+++ b/OpenKeychain/src/main/res/layout/key_list_item.xml
@@ -76,7 +76,7 @@
             android:layout_height="match_parent"
             android:layout_gravity="center"
             android:src="@drawable/ic_repeat_grey_24dp"
-            android:padding="12dp"
+            android:padding="16dp"
             android:background="?android:selectableItemBackground"
             android:contentDescription="@string/cd_exchange_keys"/>