diff --git a/.idea/encodings.xml b/.idea/encodings.xml
new file mode 100644
index 0000000000..15a15b218a
--- /dev/null
+++ b/.idea/encodings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" addBOMForNewFiles="with NO BOM" />
+</project>
\ No newline at end of file
diff --git a/.idea/navEditor.xml b/.idea/navEditor.xml
index 6b2f2e8d08..5227e32389 100644
--- a/.idea/navEditor.xml
+++ b/.idea/navEditor.xml
@@ -13,8 +13,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="-141" />
-                            <option name="y" value="-166" />
+                            <option name="x" value="-203" />
+                            <option name="y" value="-292" />
                           </Point>
                         </option>
                       </LayoutPositions>
diff --git a/app/src/main/java/com/tangem/ui/activity/PinRequestActivity.kt b/app/src/main/java/com/tangem/ui/activity/PinRequestActivity.kt
index c5570a6285..a881cc687d 100644
--- a/app/src/main/java/com/tangem/ui/activity/PinRequestActivity.kt
+++ b/app/src/main/java/com/tangem/ui/activity/PinRequestActivity.kt
@@ -246,7 +246,7 @@ class PinRequestActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, Finge
 
     @SuppressLint("NewApi")
     private fun testFingerPrintSettings(): Boolean {
-        LOG.i(TAG, "Testing Fingerprint Settings")
+        LOG.i(TAG, "Testing Fingerprint SettingsFragment")
 
         val keyguardManager = getSystemService(Context.KEYGUARD_SERVICE) as KeyguardManager
         fingerprintManager = getSystemService(Context.FINGERPRINT_SERVICE) as FingerprintManager
diff --git a/app/src/main/java/com/tangem/ui/fragment/MainFragment.kt b/app/src/main/java/com/tangem/ui/fragment/MainFragment.kt
index 1c756225c2..ca3f8d64c6 100644
--- a/app/src/main/java/com/tangem/ui/fragment/MainFragment.kt
+++ b/app/src/main/java/com/tangem/ui/fragment/MainFragment.kt
@@ -344,7 +344,6 @@ class MainFragment : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific
             popup.menu.findItem(R.id.managePIN).isEnabled = true
             popup.menu.findItem(R.id.managePIN2).isEnabled = true
             popup.menu.findItem(R.id.sendLogs).isVisible = true
-            popup.menu.findItem(R.id.settings).isVisible = true
         }
 
         popup.setOnMenuItemClickListener(this)
diff --git a/app/src/main/java/com/tangem/ui/fragment/Settings.kt b/app/src/main/java/com/tangem/ui/fragment/Settings.kt
deleted file mode 100644
index a2a54a60e4..0000000000
--- a/app/src/main/java/com/tangem/ui/fragment/Settings.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.tangem.ui.fragment
-
-import android.os.Bundle
-import androidx.preference.PreferenceFragmentCompat
-import com.tangem.wallet.R
-
-class Settings : PreferenceFragmentCompat() {
-    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-        addPreferencesFromResource(R.xml.pref_main)
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/ui/fragment/SettingsFragment.kt b/app/src/main/java/com/tangem/ui/fragment/SettingsFragment.kt
new file mode 100644
index 0000000000..95f604cba2
--- /dev/null
+++ b/app/src/main/java/com/tangem/ui/fragment/SettingsFragment.kt
@@ -0,0 +1,25 @@
+package com.tangem.ui.fragment
+
+import android.os.Bundle
+import androidx.preference.ListPreference
+import androidx.preference.Preference
+import androidx.preference.PreferenceCategory
+import androidx.preference.PreferenceFragmentCompat
+import com.tangem.wallet.BuildConfig
+import com.tangem.wallet.R
+
+class SettingsFragment : PreferenceFragmentCompat() {
+    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+        addPreferencesFromResource(R.xml.pref_main)
+
+        val categoryCommon = findPreference<PreferenceCategory>(getString(R.string.pref_category_common))
+        val selectNodes = findPreference<Preference>(getString(R.string.pref_select_nodes))
+        val encryptionModes = findPreference<ListPreference>(getString(R.string.pref_encryption_modes))
+
+        if (!BuildConfig.DEBUG) {
+            categoryCommon?.removePreference(selectNodes)
+            categoryCommon?.removePreference(encryptionModes)
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 0ba5ab7527..68269087e1 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -20,7 +20,7 @@
 
     <fragment
         android:id="@+id/thanks_fragment"
-        android:name="com.tangem.ui.fragment.Settings"
+        android:name="com.tangem.ui.fragment.SettingsFragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_below="@+id/abl"
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
index 27013ed373..fd9028cb22 100644
--- a/app/src/main/res/menu/menu_main.xml
+++ b/app/src/main/res/menu/menu_main.xml
@@ -1,25 +1,24 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item
-        android:id="@+id/managePIN"
-        android:enabled="false"
-        android:title="@string/manage_user_pin_1" />
-    <item
-        android:id="@+id/managePIN2"
-        android:enabled="false"
-        android:title="@string/manage_user_pin_2" />
-    <item
-        android:id="@+id/sendLogs"
-        android:title="@string/send_logs"
-        android:visible="false" />
-
-    <item
-        android:id="@+id/settings"
-        android:visible="false"
-        android:title="@string/settings" />
-
-    <item
-        android:id="@+id/about"
-        android:title="@string/about" />
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:id="@+id/managePIN"
+        android:enabled="false"
+        android:title="@string/manage_user_pin_1" />
+    <item
+        android:id="@+id/managePIN2"
+        android:enabled="false"
+        android:title="@string/manage_user_pin_2" />
+    <item
+        android:id="@+id/sendLogs"
+        android:title="@string/send_logs"
+        android:visible="false" />
+
+    <item
+        android:id="@+id/settings"
+        android:title="@string/settings" />
+
+    <item
+        android:id="@+id/about"
+        android:title="@string/about" />
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index dceb1d6cdd..002f70699b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -58,6 +58,8 @@
     <string name="cardano">Cardano</string>
 
     <!-- SettingsActivity -->
+    <string name="сommon">Common</string>
+    <string name="manual_editing_fee">Manual editing Fee</string>
     <string name="settings">Settings</string>
     <string name="encryption_modes">Encryption modes</string>
     <string-array name="encryption_modes_entries">
diff --git a/app/src/main/res/values/strings_untranslatable.xml b/app/src/main/res/values/strings_untranslatable.xml
index 13279d3f9c..7783a7ef97 100644
--- a/app/src/main/res/values/strings_untranslatable.xml
+++ b/app/src/main/res/values/strings_untranslatable.xml
@@ -23,4 +23,9 @@
     <string name="log_file_provider_authorities">com.tangem.data.LogFileProvider</string>
     <string name="ex_cant_create_coinEngine">Can\'t create CoinEngine!</string>
 
+    <string name="pref_category_common">category_common</string>
+    <string name="pref_manual_editing_fee">manual_editing_fee</string>
+    <string name="pref_select_nodes">select_nodes</string>
+    <string name="pref_encryption_modes">encryption_modes</string>
+
 </resources>
diff --git a/app/src/main/res/xml/pref_main.xml b/app/src/main/res/xml/pref_main.xml
index ff16adfc67..9227025a9c 100644
--- a/app/src/main/res/xml/pref_main.xml
+++ b/app/src/main/res/xml/pref_main.xml
@@ -1,20 +1,25 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <PreferenceCategory android:title="Common">
+    <PreferenceCategory
+        android:key="@string/pref_category_common"
+        android:title="@string/сommon">
+
+        <CheckBoxPreference
+            android:defaultValue="false"
+            android:key="@string/pref_manual_editing_fee"
+            android:title="@string/manual_editing_fee" />
 
         <Preference
-            android:defaultValue="true"
-            android:key="select_nodes"
+            android:key="@string/pref_select_nodes"
             android:title="@string/select_nodes" />
 
         <ListPreference
             android:defaultValue="0"
             android:entries="@array/encryption_modes_entries"
             android:entryValues="@array/encryption_mode_values"
-            android:key="encryption_modes"
+            android:key="@string/pref_encryption_modes"
             android:title="@string/encryption_modes" />
 
     </PreferenceCategory>
 
-
 </PreferenceScreen>
\ No newline at end of file