diff --git a/Graphics/drawables/ic_cloud_search_24px.svg b/Graphics/drawables/ic_cloud_search_24px.svg
new file mode 100644
index 000000000..3b20e2d90
--- /dev/null
+++ b/Graphics/drawables/ic_cloud_search_24px.svg
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   viewBox="0 0 24 24"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="ic_cloud_search_24px.svg">
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1364"
+     inkscape:window-height="747"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="9.8333333"
+     inkscape:cx="12"
+     inkscape:cy="12"
+     inkscape:window-x="0"
+     inkscape:window-y="19"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <path
+     d="M 12 4 C 9.11 4 6.59375 5.63125 5.34375 8.03125 C 2.33375 8.35125 -1.1842379e-15 10.91 0 14 C 0 17.31 2.69 20 6 20 L 19 20 C 21.76 20 24 17.76 24 15 C 24 12.36 21.94375 10.21125 19.34375 10.03125 C 18.66375 6.58125 15.64 4 12 4 z M 11 6.8125 C 13.421061 6.8125 15.375 8.7664396 15.375 11.1875 C 15.375 12.273268 14.973402 13.293695 14.3125 14.0625 L 14.5 14.21875 L 15.03125 14.21875 L 18.40625 17.59375 L 17.40625 18.625 L 14.03125 15.25 L 14.03125 14.71875 L 13.84375 14.53125 C 13.074945 15.192153 12.085769 15.59375 11 15.59375 C 8.5789402 15.59375 6.625 13.608561 6.625 11.1875 C 6.625 8.7664396 8.5789402 6.8125 11 6.8125 z M 11 8.15625 C 9.3207692 8.15625 7.96875 9.5082682 7.96875 11.1875 C 7.96875 12.866731 9.3207692 14.21875 11 14.21875 C 12.679232 14.21875 14.03125 12.866731 14.03125 11.1875 C 14.03125 9.5082682 12.679232 8.15625 11 8.15625 z "
+     id="path4"
+     style="fill:#ffffff" />
+</svg>
diff --git a/Graphics/drawables/originals/ic_cloud_24px.svg b/Graphics/drawables/originals/ic_cloud_24px.svg
new file mode 100644
index 000000000..63f946c3e
--- /dev/null
+++ b/Graphics/drawables/originals/ic_cloud_24px.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M19.35 10.04C18.67 6.59 15.64 4 12 4 9.11 4 6.6 5.64 5.35 8.04 2.34 8.36 0 10.91 0 14c0 3.31 2.69 6 6 6h13c2.76 0 5-2.24 5-5 0-2.64-2.05-4.78-4.65-4.96z"/></svg>
\ No newline at end of file
diff --git a/Graphics/drawables/originals/ic_search_24px.svg b/Graphics/drawables/originals/ic_search_24px.svg
new file mode 100644
index 000000000..12440059b
--- /dev/null
+++ b/Graphics/drawables/originals/ic_search_24px.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z"/></svg>
\ No newline at end of file
diff --git a/Graphics/update-drawables.sh b/Graphics/update-drawables.sh
index eef97c7c3..c96b6dd90 100755
--- a/Graphics/update-drawables.sh
+++ b/Graphics/update-drawables.sh
@@ -38,7 +38,7 @@ SRC_DIR=./drawables/
 # xhdpi: 64x64
 # xxhdpi: 96x96
 
-for NAME in "ic_action_nfc" "ic_action_qr_code" "ic_action_safeslinger" "ic_action_search_cloud"
+for NAME in "ic_action_nfc" "ic_action_qr_code" "ic_action_safeslinger" "ic_action_search_cloud" "ic_cloud_search_24px"
 do
 echo $NAME
 inkscape -w 32 -h 32 -e "$MDPI_DIR/$NAME.png" "$SRC_DIR/$NAME.svg"
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_cloud_search_24px.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_cloud_search_24px.png
new file mode 100644
index 000000000..6f9b343ad
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_cloud_search_24px.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_cloud_search_24px.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_cloud_search_24px.png
new file mode 100644
index 000000000..7a69993fd
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_cloud_search_24px.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_cloud_search_24px.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_cloud_search_24px.png
new file mode 100644
index 000000000..1f0db264a
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_cloud_search_24px.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_cloud_search_24px.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_cloud_search_24px.png
new file mode 100644
index 000000000..852cdc2a6
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_cloud_search_24px.png differ
diff --git a/OpenKeychain/src/main/res/menu/key_list.xml b/OpenKeychain/src/main/res/menu/key_list.xml
index f61172a0a..8a682badc 100644
--- a/OpenKeychain/src/main/res/menu/key_list.xml
+++ b/OpenKeychain/src/main/res/menu/key_list.xml
@@ -11,13 +11,12 @@
 
     <item
         android:id="@+id/menu_key_list_search_cloud"
-        android:icon="@drawable/ic_action_search_cloud"
+        android:icon="@drawable/ic_cloud_search_24px"
         android:title="@string/menu_search_cloud"
         app:showAsAction="ifRoom|withText" />
 
     <item
         android:id="@+id/menu_key_list_add"
-        android:icon="@drawable/ic_action_qr_code"
         android:title="@string/import_qr_code_button"
         app:showAsAction="ifRoom|withText" />
 
diff --git a/extern/openpgp-api-lib b/extern/openpgp-api-lib
index 9509cfbb9..ee2eb274a 160000
--- a/extern/openpgp-api-lib
+++ b/extern/openpgp-api-lib
@@ -1 +1 @@
-Subproject commit 9509cfbb986ba8d28e1031b3600d07ff3014eea3
+Subproject commit ee2eb274a42a05518f2bc26fa8af816dde271d63