diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SettingsKeyServerActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SettingsKeyServerActivity.java
index 8f025c769..dc203756f 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SettingsKeyServerActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SettingsKeyServerActivity.java
@@ -177,7 +177,7 @@ public class SettingsKeyServerActivity extends BaseActivity implements OnClickLi
         // Create a new Messenger for the communication back
         Messenger messenger = new Messenger(returnHandler);
         AddKeyserverDialogFragment dialogFragment = AddKeyserverDialogFragment
-                .newInstance(messenger, R.string.add_keyserver_dialog_title);
+                .newInstance(messenger);
         dialogFragment.show(getSupportFragmentManager(), "addKeyserverDialog");
     }
 
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/AddKeyserverDialogFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/AddKeyserverDialogFragment.java
index cbef5950f..cfad76fc3 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/AddKeyserverDialogFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/AddKeyserverDialogFragment.java
@@ -58,7 +58,6 @@ import javax.net.ssl.HttpsURLConnection;
 
 public class AddKeyserverDialogFragment extends DialogFragment implements OnEditorActionListener {
     private static final String ARG_MESSENGER = "messenger";
-    private static final String ARG_TITLE = "title";
 
     public static final int MESSAGE_OKAY = 1;
     public static final int MESSAGE_VERIFICATION_FAILED = 2;
@@ -85,10 +84,9 @@ public class AddKeyserverDialogFragment extends DialogFragment implements OnEdit
      * @param messenger to communicate back after setting the passphrase
      * @return
      */
-    public static AddKeyserverDialogFragment newInstance(Messenger messenger, int title) {
+    public static AddKeyserverDialogFragment newInstance(Messenger messenger) {
         AddKeyserverDialogFragment frag = new AddKeyserverDialogFragment();
         Bundle args = new Bundle();
-        args.putInt(ARG_TITLE, title);
         args.putParcelable(ARG_MESSENGER, messenger);
 
         frag.setArguments(args);
@@ -103,12 +101,11 @@ public class AddKeyserverDialogFragment extends DialogFragment implements OnEdit
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         final Activity activity = getActivity();
 
-        int title = getArguments().getInt(ARG_TITLE);
         mMessenger = getArguments().getParcelable(ARG_MESSENGER);
 
         CustomAlertDialogBuilder alert = new CustomAlertDialogBuilder(activity);
 
-        alert.setTitle(title);
+        alert.setTitle(R.string.add_keyserver_dialog_title);
 
         LayoutInflater inflater = activity.getLayoutInflater();
         View view = inflater.inflate(R.layout.add_keyserver_dialog, null);
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 98d91d3cf..f01b2cace 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -16,7 +16,7 @@
     <string name="title_edit_key">"Edit Key"</string>
     <string name="title_preferences">"Settings"</string>
     <string name="title_api_registered_apps">"Apps"</string>
-    <string name="title_key_server_preference">"Keyservers"</string>
+    <string name="title_key_server_preference">"OpenPGP keyservers"</string>
     <string name="title_change_passphrase">"Change Password"</string>
     <string name="title_share_fingerprint_with">"Share fingerprint with…"</string>
     <string name="title_share_key">"Share key with…"</string>
@@ -135,7 +135,7 @@
     <string name="label_passphrase_cache_subs">"Cache passwords by subkey"</string>
     <string name="label_message_compression">"Text compression"</string>
     <string name="label_file_compression">"File compression"</string>
-    <string name="label_keyservers">"Keyservers"</string>
+    <string name="label_keyservers">"Select OpenPGP keyservers"</string>
     <string name="label_key_id">"Key ID"</string>
     <string name="label_key_created">"Key created %s"</string>
     <string name="label_creation">"Creation"</string>
@@ -155,13 +155,13 @@
     <string name="label_enable_compression">"Enable compression"</string>
     <string name="label_encrypt_filenames">"Encrypt filenames"</string>
     <string name="label_hidden_recipients">"Hide recipients"</string>
-    <string name="label_verify_keyserver">"Verify Keyserver"</string>
-    <string name="label_enter_keyserver_url">"Enter Keyserver URL"</string>
+    <string name="label_verify_keyserver">"Verify keyserver"</string>
+    <string name="label_enter_keyserver_url">"Enter keyserver URL"</string>
 
-    <string name="pref_keyserver">"Search Keyserver"</string>
-    <string name="pref_keyserver_summary">"Search HKP keyserver"</string>
-    <string name="pref_keybase">"Search Keybase.io"</string>
-    <string name="pref_keybase_summary">"Search Keybase.io index"</string>
+    <string name="pref_keyserver">"OpenPGP keyservers"</string>
+    <string name="pref_keyserver_summary">"Search keys on selected OpenPGP keyservers (HKP protocol)"</string>
+    <string name="pref_keybase">"keybase.io"</string>
+    <string name="pref_keybase_summary">"Search keys on keybase.io"</string>
 
     <string name="user_id_no_name">"&lt;no name&gt;"</string>
     <string name="none">"&lt;none&gt;"</string>
@@ -331,7 +331,7 @@
     <string name="progress_modify_subkeyrevoke">"revoking subkeys…"</string>
     <string name="progress_modify_subkeystrip">"stripping subkeys…"</string>
     <string name="progress_modify_subkeyadd">"adding subkeys…"</string>
-    <string name="progress_modify_passphrase">"changing passwords…"</string>
+    <string name="progress_modify_passphrase">"changing password…"</string>
 
     <plurals name="progress_exporting_key">
         <item quantity="one">"exporting key…"</item>
@@ -414,7 +414,7 @@
     <string name="import_qr_code_text">"Place your camera over the QR Code!"</string>
 
     <!-- Import from URL -->
-    <string name="import_url_warn_no_search_parameter">"No search parameter found. You may still attempt manually searching the keyserver."</string>
+    <string name="import_url_warn_no_search_parameter">"No search query defined. You can still manually search on this keyserver."</string>
 
     <!-- Generic result toast -->
     <string name="view_log">"Details"</string>
@@ -657,7 +657,7 @@
     <string name="view_key_fragment_no_system_contact">"&lt;none&gt;"</string>
 
     <!-- Add keyserver -->
-    <string name="add_keyserver_dialog_title">"Add Keyserver"</string>
+    <string name="add_keyserver_dialog_title">"Add keyserver"</string>
     <string name="add_keyserver_verified">"Keyserver verified!"</string>
     <string name="add_keyserver_without_verification">"Keyserver added without verification."</string>
     <string name="add_keyserver_invalid_url">"Invalid URL!"</string>
@@ -801,7 +801,7 @@
     <string name="msg_is_subkey_empty">"Marked secret subkey %s as available, with empty password"</string>
     <string name="msg_is_subkey_pin">"Marked secret subkey %s as available, with PIN"</string>
     <string name="msg_is_subkey_stripped">"Marked secret subkey %s as stripped"</string>
-    <string name="msg_is_subkey_divert">"Marked secret subkey %s as 'divert to smartcard/NFC'"</string>
+    <string name="msg_is_subkey_divert">"Marked secret subkey %s as 'divert-to-card'"</string>
     <string name="msg_is_success_identical">"Keyring contains no new data, nothing to do"</string>
     <string name="msg_is_success">"Successfully imported secret keyring"</string>
 
@@ -908,8 +908,8 @@
 
     <!-- modifySecretKeyRing -->
     <string name="msg_mr">"Modifying keyring %s"</string>
-    <string name="msg_mf_divert">"Will divert to card/nfc for crypto operations"</string>
-    <string name="msg_mf_error_divert_serial">"The serial number of a divert-to-card key must be 16 bytes! This is a programming error, please file a bug report!"</string>
+    <string name="msg_mf_divert">"Will divert to smart card for crypto operations"</string>
+    <string name="msg_mf_error_divert_serial">"The serial number of a 'divert-to-card' key must be 16 bytes! This is a programming error, please file a bug report!"</string>
     <string name="msg_mf_error_encode">"Encoding exception!"</string>
     <string name="msg_mf_error_fingerprint">"Actual key fingerprint does not match the expected one!"</string>
     <string name="msg_mf_error_keyid">"No key ID. This is an internal error, please file a bug report!"</string>
@@ -925,6 +925,12 @@
     <string name="msg_mf_error_pgp">"Internal OpenPGP error!"</string>
     <string name="msg_mf_error_sig">"Signature exception!"</string>
     <string name="msg_mf_error_subkey_missing">"Tried to operate on missing subkey %s!"</string>
+<<<<<<< HEAD
+=======
+    <string name="msg_mf_error_conflicting_nfc_commands">"Cannot move key to smart card in same operation that creates an on-card signature."</string>
+    <string name="msg_mf_error_duplicate_keytocard_for_slot">"Smart card supports only one slot per key type."</string>
+    <string name="msg_mf_error_invalid_flags_for_keytocard">"Inappropriate key flags for smart card key."</string>
+>>>>>>> 0f52097... Improve strings
     <string name="msg_mf_master">"Modifying master certifications"</string>
     <string name="msg_mf_notation_empty">"Adding empty notation packet"</string>
     <string name="msg_mf_notation_pin">"Adding PIN notation packet"</string>
@@ -936,13 +942,18 @@
     <string name="msg_mf_primary_new">"Generating new certificate for new primary user ID"</string>
     <string name="msg_mf_restricted_mode">"Changing to restricted operation mode"</string>
     <string name="msg_mf_subkey_change">"Modifying subkey %s"</string>
-    <string name="msg_mf_require_divert">"Diverting to card/nfc for crypto operations"</string>
+    <string name="msg_mf_require_divert">"Diverting to smart card for crypto operations"</string>
     <string name="msg_mf_require_passphrase">"Password required for operations"</string>
     <string name="msg_mf_subkey_new">"Adding new subkey of type %s"</string>
     <string name="msg_mf_subkey_new_id">"New subkey ID: %s"</string>
     <string name="msg_mf_error_past_expiry">"Expiry date cannot be in the past!"</string>
     <string name="msg_mf_subkey_revoke">"Revoking subkey %s"</string>
     <string name="msg_mf_subkey_strip">"Stripping subkey %s"</string>
+<<<<<<< HEAD
+=======
+    <string name="msg_mf_keytocard_start">"Moving subkey %s to smart card"</string>
+    <string name="msg_mf_keytocard_finish">"Moved %1$s to smart card %2$s"</string>
+>>>>>>> 0f52097... Improve strings
     <string name="msg_mf_success">"Keyring successfully modified"</string>
     <string name="msg_mf_uid_add">"Adding user ID %s"</string>
     <string name="msg_mf_uid_primary">"Changing primary user ID to %s"</string>
@@ -997,11 +1008,11 @@
 
     <!-- Promote key -->
     <string name="msg_pr">"Promoting public key to secret key"</string>
-    <string name="msg_pr_all">"Promoting all subkeysp"</string>
+    <string name="msg_pr_all">"Promoting all subkeys"</string>
     <string name="msg_pr_error_key_not_found">"Key not found!"</string>
     <string name="msg_pr_fetching">"Fetching key to modify (%s)"</string>
     <string name="msg_pr_subkey_match">"Promoting subkey: %s"</string>
-    <string name="msg_pr_subkey_nomatch">"Subkey not on Yubikey: %s"</string>
+    <string name="msg_pr_subkey_nomatch">"Subkey not on YubiKey: %s"</string>
     <string name="msg_pr_success">"Key successfully promoted"</string>
 
     <!-- Other messages used in OperationLogs -->
@@ -1117,7 +1128,7 @@
     <string name="msg_crt_error_unlock">"Error unlocking master key!"</string>
     <string name="msg_crt">"Certifying keyrings"</string>
     <string name="msg_crt_master_fetch">"Fetching certifying master key"</string>
-    <string name="msg_crt_nfc_return">"Returning for NFC input"</string>
+    <string name="msg_crt_nfc_return">"Returning to NFC screen"</string>
     <string name="msg_crt_save">"Saving certified key %s"</string>
     <string name="msg_crt_saving">"Saving keyrings"</string>
     <string name="msg_crt_unlock">"Unlocking master key"</string>
@@ -1217,6 +1228,11 @@
     <string name="first_time_import_key">"Import key from file"</string>
     <string name="first_time_yubikey">"Use YubiKey NEO"</string>
     <string name="first_time_skip">"Skip Setup"</string>
+<<<<<<< HEAD
+=======
+    <string name="first_time_blank_smartcard_title">"Blank smart card / YubiKey detected"</string>
+    <string name="first_time_blank_smartcard_message">"Would you like to generate a smart card compatible key?"</string>
+>>>>>>> 0f52097... Improve strings
 
     <!-- unsorted -->
     <string name="section_certifier_id">"Certifier"</string>
@@ -1234,7 +1250,7 @@
     <string name="error_key_not_found">"Key not found!"</string>
     <string name="error_key_processing">"Error processing key!"</string>
     <string name="key_stripped">"stripped"</string>
-    <string name="key_divert">"divert to smartcard/NFC"</string>
+    <string name="key_divert">"divert to smart card"</string>
     <string name="key_no_passphrase">"no password"</string>
     <string name="key_unavailable">"unavailable"</string>
     <string name="secret_cannot_multiple">"Your own keys can only be deleted individually!"</string>
diff --git a/OpenKeychain/src/main/res/xml/cloud_search_prefs.xml b/OpenKeychain/src/main/res/xml/cloud_search_prefs.xml
index 08855fa22..d14f0bc40 100644
--- a/OpenKeychain/src/main/res/xml/cloud_search_prefs.xml
+++ b/OpenKeychain/src/main/res/xml/cloud_search_prefs.xml
@@ -1,20 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
     <CheckBoxPreference
-        android:title="@string/pref_keyserver"
         android:defaultValue="true"
+        android:key="search_keyserver_pref"
         android:summary="@string/pref_keyserver_summary"
-        android:key="search_keyserver_pref" />
-
-    <CheckBoxPreference
-        android:title="@string/pref_keybase"
-        android:defaultValue="true"
-        android:summary="@string/pref_keybase_summary"
-        android:key="search_keybase_pref" />
+        android:title="@string/pref_keyserver" />
 
     <PreferenceScreen
+        android:dependency="search_keyserver_pref"
         android:key="keyServers"
         android:persistent="false"
         android:title="@string/label_keyservers" />
+
+    <CheckBoxPreference
+        android:defaultValue="true"
+        android:key="search_keybase_pref"
+        android:summary="@string/pref_keybase_summary"
+        android:title="@string/pref_keybase" />
+
 </PreferenceScreen>
\ No newline at end of file