diff --git a/OpenKeychain/src/main/res/drawable/yubikey_neo.png b/OpenKeychain/src/main/res/drawable/yubikey_neo.png
deleted file mode 100644
index d4156eb5e..000000000
Binary files a/OpenKeychain/src/main/res/drawable/yubikey_neo.png and /dev/null differ
diff --git a/OpenKeychain/src/main/res/drawable/yubikey_phone.png b/OpenKeychain/src/main/res/drawable/yubikey_phone.png
new file mode 100644
index 000000000..6a03501c6
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable/yubikey_phone.png differ
diff --git a/OpenKeychain/src/main/res/layout/nfc_activity.xml b/OpenKeychain/src/main/res/layout/nfc_activity.xml
index e78fa7c87..034b74a35 100644
--- a/OpenKeychain/src/main/res/layout/nfc_activity.xml
+++ b/OpenKeychain/src/main/res/layout/nfc_activity.xml
@@ -1,30 +1,24 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:orientation="vertical"
     android:paddingLeft="16dp"
     android:paddingRight="16dp"
-    android:paddingTop="8dp"
-    android:paddingBottom="8dp"
-    android:background="#FFFFFFFF"
-    tools:context="org.sufficientlysecure.keychain.nfc.NfcActivityFull">
+    android:paddingTop="16dp"
+    android:paddingBottom="16dp">
 
     <TextView
-        android:text="Hold Yubikey against the back of your device!"
+        android:text="@string/nfc_text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textAppearance="@android:style/TextAppearance.Large"
-        android:id="@+id/textView"
+        android:id="@+id/nfc_text"
         android:gravity="center"
         android:layout_gravity="center" />
 
     <ImageView
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:id="@+id/imageView"
-        android:src="@drawable/yubikey_neo"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentEnd="true"
-        android:layout_below="@+id/textView" />
+        android:src="@drawable/yubikey_phone" />
 
-</RelativeLayout>
+</LinearLayout>
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index e2b92d875..9ea16a0ab 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -115,9 +115,9 @@
     <string name="label_file_ascii_armor">"Enable ASCII Armor"</string>
     <string name="label_write_version_header">"Let others know that you're using OpenKeychain"</string>
     <string name="label_write_version_header_summary">"Writes 'OpenKeychain v2.7' to OpenPGP signatures, ciphertext, and exported keys"</string>
-    <string name="label_use_default_yubikey_pin">"Use default Yubikey PIN"</string>
-    <string name="label_use_num_keypad_for_yubikey_pin">Use number keypad for Yubikey PIN</string>
-    <string name="label_label_use_default_yubikey_pin_summary">"Uses default PIN (123456) to access Yubikeys over NFC"</string>
+    <string name="label_use_default_yubikey_pin">"Use default YubiKey PIN"</string>
+    <string name="label_use_num_keypad_for_yubikey_pin">Use number keypad for YubiKey PIN</string>
+    <string name="label_label_use_default_yubikey_pin_summary">"Uses default PIN (123456) to access YubiKeys over NFC"</string>
     <string name="label_asymmetric_from">"Signed by:"</string>
     <string name="label_to">"Encrypt to:"</string>
     <string name="label_delete_after_encryption">"Delete file after encryption"</string>
@@ -205,7 +205,8 @@
     <string name="passphrase_must_not_be_empty">"Please enter a passphrase."</string>
     <string name="passphrase_for_symmetric_encryption">"Symmetric encryption."</string>
     <string name="passphrase_for">"Enter passphrase for '%s'"</string>
-    <string name="yubikey_pin">"Enter PIN to access Yubikey for '%s'"</string>
+    <string name="yubikey_pin">"Enter PIN to access YubiKey for '%s'"</string>
+    <string name="nfc_text">"Hold YubiKey against the back of your device."</string>
     <string name="file_delete_confirmation">"Are you sure you want to delete\n%s?"</string>
     <string name="file_delete_successful">"Successfully deleted."</string>
     <string name="no_file_selected">"Select a file first."</string>