diff --git a/app/src/main/java/com/tangem/presentation/dialog/PINSwapWarningDialog.java b/app/src/main/java/com/tangem/presentation/dialog/PINSwapWarningDialog.java
index 264e04a5a2..2f4d2ba00d 100644
--- a/app/src/main/java/com/tangem/presentation/dialog/PINSwapWarningDialog.java
+++ b/app/src/main/java/com/tangem/presentation/dialog/PINSwapWarningDialog.java
@@ -4,6 +4,8 @@ import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
+
+import androidx.annotation.NonNull;
 import androidx.fragment.app.DialogFragment;
 
 import com.tangem.wallet.R;
@@ -29,9 +31,9 @@ public class PINSwapWarningDialog extends DialogFragment {
         message = getArguments().getString(EXTRA_MESSAGE);
     }
 
+    @NonNull
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
-
         return new AlertDialog.Builder(getActivity())
                 .setIcon(R.drawable.tangem_logo_small_new)
                 .setTitle(R.string.your_money_is_at_risk)
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d490e04416..5864598db5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -10,10 +10,6 @@
     <string name="wrong_tag_err">Not ISO tag!</string>
     <string name="msgCardMustBeLoaded">Card must be loaded first!</string>
     <string name="tag_lost_err">Tag lost!</string>
-    <string name="dialog_ok">OK</string>
-    <string name="dialog_quit">Quit</string>
-    <string name="nfc_disabled">Enable NFC?</string>
-    <string name="enable_nfc">This app is useless when NFC is disabled. Reader mode depends on it. Hit OK to go to Settings, where you can enable NFC.</string>
     <string name="cmd_suffix">command</string>
     <string name="rsp_suffix">response</string>
     <string name="section_format">Hello World from section: %1$d</string>
diff --git a/tangemcard-android/src/main/java/com/tangem/tangemcard/android/presentation/dialog/NfcEnableDialog.kt b/tangemcard-android/src/main/java/com/tangem/tangemcard/android/presentation/dialog/NfcEnableDialog.kt
index 5e02553731..fd198bec10 100644
--- a/tangemcard-android/src/main/java/com/tangem/tangemcard/android/presentation/dialog/NfcEnableDialog.kt
+++ b/tangemcard-android/src/main/java/com/tangem/tangemcard/android/presentation/dialog/NfcEnableDialog.kt
@@ -4,20 +4,18 @@ import android.app.Dialog
 import android.content.Intent
 import android.os.Bundle
 import android.provider.Settings
-import androidx.fragment.app.DialogFragment
 
 import androidx.appcompat.app.AlertDialog
+import androidx.fragment.app.DialogFragment
 
 import com.tangem.tangemcard.R
 
-class NfcEnableDialog : androidx.fragment.app.DialogFragment() {
-
+class NfcEnableDialog : DialogFragment() {
     companion object {
         val TAG: String = NfcEnableDialog::class.java.simpleName
     }
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-
         val builder = context?.let { AlertDialog.Builder(it) }
         builder?.setCancelable(false)
                 ?.setIcon(R.drawable.ic_action_nfc_gray)
@@ -25,8 +23,7 @@ class NfcEnableDialog : androidx.fragment.app.DialogFragment() {
                 ?.setMessage(R.string.enable_nfc)
                 ?.setPositiveButton(R.string.dialog_ok
                 ) { _, _ ->
-                    // take user to wireless settings
-                    activity?.startActivity(Intent(Settings.ACTION_WIRELESS_SETTINGS))
+                    activity?.startActivity(Intent(Settings.ACTION_NFC_SETTINGS))
                 }
                 ?.setNegativeButton(R.string.dialog_quit
                 ) { dialog, _ ->
diff --git a/tangemcard-android/src/main/java/com/tangem/tangemcard/android/reader/NfcManager.java b/tangemcard-android/src/main/java/com/tangem/tangemcard/android/reader/NfcManager.java
index ca6a441dad..eff969ccec 100644
--- a/tangemcard-android/src/main/java/com/tangem/tangemcard/android/reader/NfcManager.java
+++ b/tangemcard-android/src/main/java/com/tangem/tangemcard/android/reader/NfcManager.java
@@ -13,6 +13,7 @@ import android.nfc.Tag;
 import android.nfc.tech.IsoDep;
 import android.os.Build;
 import android.os.Bundle;
+
 import androidx.core.app.ActivityCompat;
 import androidx.fragment.app.FragmentActivity;
 
@@ -99,7 +100,6 @@ public class NfcManager {
     }
 
     private final BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() {
-        @SuppressWarnings("deprecation")
         @Override
         public void onReceive(Context context, Intent intent) {
             String action = intent.getAction();
@@ -156,11 +156,7 @@ public class NfcManager {
 
         if (permission != PackageManager.PERMISSION_GRANTED) {
             // We don't have permission so prompt the user
-            ActivityCompat.requestPermissions(
-                    activity,
-                    PERMISSIONS_NFC,
-                    REQUEST_NFC_PERMISSIONS
-            );
+            ActivityCompat.requestPermissions(activity, PERMISSIONS_NFC, REQUEST_NFC_PERMISSIONS);
         }
     }
 
diff --git a/tangemcard-android/src/main/res/values/strings.xml b/tangemcard-android/src/main/res/values/strings.xml
index 3be1a76c7b..c604935c0f 100644
--- a/tangemcard-android/src/main/res/values/strings.xml
+++ b/tangemcard-android/src/main/res/values/strings.xml
@@ -1,4 +1,5 @@
 <resources>
+
     <string name="app_name">tangemcard</string>
     <string name="dialog_ok">OK</string>
     <string name="dialog_quit">Quit</string>
diff --git a/tangemserver-android/src/main/res/values/strings.xml b/tangemserver-android/src/main/res/values/strings.xml
index 7c2c6570f5..e8367bfe4f 100644
--- a/tangemserver-android/src/main/res/values/strings.xml
+++ b/tangemserver-android/src/main/res/values/strings.xml
@@ -1,3 +1,5 @@
 <resources>
+
     <string name="app_name">TangemServer</string>
+
 </resources>