diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java
index a34d470bc..743536bdf 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java
@@ -84,7 +84,10 @@ public class MainActivity extends BaseSecurityTokenActivity implements FabContai
                                 .withIdentifier(ID_APPS).withSelectable(false),
                         new PrimaryDrawerItem().withName(R.string.nav_backup).withIcon(CommunityMaterial.Icon.cmd_backup_restore)
                                 .withIdentifier(ID_BACKUP).withSelectable(false),
-                        new PrimaryDrawerItem().withName(R.string.nav_transfer).withIcon(CommunityMaterial.Icon.cmd_backup_restore)
+                        new PrimaryDrawerItem().withName(R.string.nav_transfer)
+                                .withIcon(R.drawable.ic_wifi_lock_24dp)
+                                .withIconColorRes(R.color.md_grey_600)
+                                .withIconTintingEnabled(true)
                                 .withIdentifier(ID_TRANSFER).withSelectable(false),
                         new DividerDrawerItem(),
                         new PrimaryDrawerItem().withName(R.string.menu_preferences).withIcon(GoogleMaterial.Icon.gmd_settings).withIdentifier(ID_SETTINGS).withSelectable(false),
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_wifi_lock_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_wifi_lock_24dp.png
new file mode 100644
index 000000000..3881c3f1b
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_wifi_lock_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_wifi_lock_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_wifi_lock_24dp.png
new file mode 100644
index 000000000..5d4b657d3
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_wifi_lock_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_wifi_lock_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_wifi_lock_24dp.png
new file mode 100644
index 000000000..621506209
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_wifi_lock_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_wifi_lock_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_wifi_lock_24dp.png
new file mode 100644
index 000000000..e80019793
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_wifi_lock_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_wifi_lock_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_wifi_lock_24dp.png
new file mode 100644
index 000000000..447c5d155
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_wifi_lock_24dp.png differ
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index cd28f0126..3cbb268de 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -848,7 +848,7 @@
     <string name="drawer_close">"Close navigation drawer"</string>
     <string name="my_keys">"My Keys"</string>
     <string name="nav_backup">"Backup/Restore"</string>
-    <string name="nav_transfer">"Transfer"</string>
+    <string name="nav_transfer">"Secure Device Setup"</string>
 
     <!-- hints -->
     <string name="encrypt_content_edit_text_hint">"Type text"</string>
diff --git a/graphics/drawables/ic_wifi_lock.svg b/graphics/drawables/ic_wifi_lock.svg
new file mode 100644
index 000000000..b06541558
--- /dev/null
+++ b/graphics/drawables/ic_wifi_lock.svg
@@ -0,0 +1,4 @@
+<svg fill="#000000" height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg">
+    <path d="M0 0h24v24H0V0z" fill="none"/>
+    <path d="M23 16v-1.5c0-1.4-1.1-2.5-2.5-2.5S18 13.1 18 14.5V16c-.5 0-1 .5-1 1v4c0 .5.5 1 1 1h5c.5 0 1-.5 1-1v-4c0-.5-.5-1-1-1zm-1 0h-3v-1.5c0-.8.7-1.5 1.5-1.5s1.5.7 1.5 1.5V16zm-6.5-1.5c0-2.8 2.2-5 5-5 .4 0 .7 0 1 .1L23.6 7c-.4-.3-4.9-4-11.6-4C5.3 3 .8 6.7.4 7L12 21.5l3.5-4.4v-2.6z"/>
+</svg>
\ No newline at end of file
diff --git a/graphics/update-drawables.sh b/graphics/update-drawables.sh
index 1df705739..ec4f972ed 100755
--- a/graphics/update-drawables.sh
+++ b/graphics/update-drawables.sh
@@ -22,7 +22,7 @@ SRC_DIR=./drawables/
 #inkscape -w 512 -h 512 -e "$PLAY_DIR/$NAME.png" $NAME.svg
 
 
-for NAME in "ic_cloud_unknown" "ic_cloud_off" "broken_heart" "ic_cloud_search" "ic_action_encrypt_file" "ic_action_encrypt_text" "ic_action_verified_cutout" "ic_action_encrypt_copy" "ic_action_encrypt_paste" "ic_action_encrypt_save" "ic_action_encrypt_share" "status_lock_closed" "status_lock_error" "status_lock_open" "status_signature_expired_cutout" "status_signature_invalid_cutout" "status_signature_revoked_cutout" "status_signature_unknown_cutout" "status_signature_unverified_cutout" "status_signature_verified_cutout" "key_flag_authenticate" "key_flag_certify" "key_flag_encrypt" "key_flag_sign" "yubi_icon" "ic_stat_notify" "status_signature_verified_inner" "link" "octo_link"
+for NAME in "ic_cloud_unknown" "ic_cloud_off" "ic_wifi_lock" "broken_heart" "ic_cloud_search" "ic_action_encrypt_file" "ic_action_encrypt_text" "ic_action_verified_cutout" "ic_action_encrypt_copy" "ic_action_encrypt_paste" "ic_action_encrypt_save" "ic_action_encrypt_share" "status_lock_closed" "status_lock_error" "status_lock_open" "status_signature_expired_cutout" "status_signature_invalid_cutout" "status_signature_revoked_cutout" "status_signature_unknown_cutout" "status_signature_unverified_cutout" "status_signature_verified_cutout" "key_flag_authenticate" "key_flag_certify" "key_flag_encrypt" "key_flag_sign" "yubi_icon" "ic_stat_notify" "status_signature_verified_inner" "link" "octo_link"
 do
 echo $NAME
 inkscape -w 24 -h 24 -e "$MDPI_DIR/${NAME}_24dp.png" "$SRC_DIR/$NAME.svg"