diff --git a/app/src/main/res/drawable-hdpi/ico_add.png b/app/src/main/res/drawable-hdpi/ico_add.png
new file mode 100644
index 000000000..fbbf25aa2
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ico_add.png differ
diff --git a/app/src/main/res/drawable-hdpi/ico_cancel.png b/app/src/main/res/drawable-hdpi/ico_cancel.png
new file mode 100644
index 000000000..49215a943
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ico_cancel.png differ
diff --git a/app/src/main/res/drawable-hdpi/ico_check.png b/app/src/main/res/drawable-hdpi/ico_check.png
new file mode 100644
index 000000000..b9cb0f93c
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ico_check.png differ
diff --git a/app/src/main/res/drawable-hdpi/ico_del.png b/app/src/main/res/drawable-hdpi/ico_del.png
new file mode 100644
index 000000000..7be9fc76f
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ico_del.png differ
diff --git a/app/src/main/res/drawable-hdpi/ico_key.png b/app/src/main/res/drawable-hdpi/ico_key.png
new file mode 100644
index 000000000..35c2fa311
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ico_key.png differ
diff --git a/app/src/main/res/drawable-hdpi/ico_undo.png b/app/src/main/res/drawable-hdpi/ico_undo.png
new file mode 100644
index 000000000..d28e49639
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ico_undo.png differ
diff --git a/app/src/main/res/drawable-mdpi/ico_add.png b/app/src/main/res/drawable-mdpi/ico_add.png
new file mode 100644
index 000000000..c35e0c91b
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ico_add.png differ
diff --git a/app/src/main/res/drawable-mdpi/ico_cancel.png b/app/src/main/res/drawable-mdpi/ico_cancel.png
new file mode 100644
index 000000000..2c6edbcf4
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ico_cancel.png differ
diff --git a/app/src/main/res/drawable-mdpi/ico_check.png b/app/src/main/res/drawable-mdpi/ico_check.png
new file mode 100644
index 000000000..1040ae02e
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ico_check.png differ
diff --git a/app/src/main/res/drawable-mdpi/ico_del.png b/app/src/main/res/drawable-mdpi/ico_del.png
new file mode 100644
index 000000000..78e2dbd18
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ico_del.png differ
diff --git a/app/src/main/res/drawable-mdpi/ico_key.png b/app/src/main/res/drawable-mdpi/ico_key.png
new file mode 100644
index 000000000..5dc650bff
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ico_key.png differ
diff --git a/app/src/main/res/drawable-mdpi/ico_undo.png b/app/src/main/res/drawable-mdpi/ico_undo.png
new file mode 100644
index 000000000..bce52b807
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ico_undo.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ico_add.png b/app/src/main/res/drawable-xhdpi/ico_add.png
new file mode 100644
index 000000000..4bd0d714d
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ico_add.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ico_cancel.png b/app/src/main/res/drawable-xhdpi/ico_cancel.png
new file mode 100644
index 000000000..610d19f6f
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ico_cancel.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ico_check.png b/app/src/main/res/drawable-xhdpi/ico_check.png
new file mode 100644
index 000000000..ab20156aa
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ico_check.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ico_del.png b/app/src/main/res/drawable-xhdpi/ico_del.png
new file mode 100644
index 000000000..66c779f2a
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ico_del.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ico_key.png b/app/src/main/res/drawable-xhdpi/ico_key.png
new file mode 100644
index 000000000..2bb671ada
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ico_key.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ico_undo.png b/app/src/main/res/drawable-xhdpi/ico_undo.png
new file mode 100644
index 000000000..3cac411c4
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ico_undo.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ico_add.png b/app/src/main/res/drawable-xxhdpi/ico_add.png
new file mode 100644
index 000000000..6ecf95674
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ico_add.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ico_cancel.png b/app/src/main/res/drawable-xxhdpi/ico_cancel.png
new file mode 100644
index 000000000..fb9b3dac8
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ico_cancel.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ico_check.png b/app/src/main/res/drawable-xxhdpi/ico_check.png
new file mode 100644
index 000000000..998b2bf88
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ico_check.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ico_del.png b/app/src/main/res/drawable-xxhdpi/ico_del.png
new file mode 100644
index 000000000..d8d0a61a9
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ico_del.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ico_key.png b/app/src/main/res/drawable-xxhdpi/ico_key.png
new file mode 100644
index 000000000..2d05b5c6b
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ico_key.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ico_undo.png b/app/src/main/res/drawable-xxhdpi/ico_undo.png
new file mode 100644
index 000000000..01de3cb53
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ico_undo.png differ
diff --git a/libraries/openpgp-api-lib b/libraries/openpgp-api-lib
new file mode 160000
index 000000000..e515a4902
--- /dev/null
+++ b/libraries/openpgp-api-lib
@@ -0,0 +1 @@
+Subproject commit e515a49027fc5de36b8977cf8b096afc9838a9be