diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 65278943..52791941 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -9,8 +9,9 @@
           <package name="io.ktor" alias="false" withSubpackages="true" />
         </value>
       </option>
-      <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
-      <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
+      <option name="LINE_BREAK_AFTER_MULTILINE_WHEN_ENTRY" value="false" />
+      <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="5" />
+      <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="3" />
       <option name="ALLOW_TRAILING_COMMA" value="true" />
       <option name="BLANK_LINES_BEFORE_DECLARATION_WITH_COMMENT_OR_ANNOTATION_ON_SEPARATE_LINE" value="0" />
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
@@ -200,4 +201,4 @@
       </indentOptions>
     </codeStyleSettings>
   </code_scheme>
-</component>
+</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
index 6e6eec11..79ee123c 100644
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -1,6 +1,5 @@
 <component name="ProjectCodeStyleConfiguration">
   <state>
     <option name="USE_PER_PROJECT_SETTINGS" value="true" />
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
   </state>
 </component>
\ No newline at end of file
diff --git a/tangem-sdk-android/src/main/java/com/tangem/sdk/ui/common/TextInputEditTextExt.kt b/tangem-sdk-android/src/main/java/com/tangem/sdk/ui/common/TextInputEditTextExt.kt
new file mode 100644
index 00000000..9a9fad61
--- /dev/null
+++ b/tangem-sdk-android/src/main/java/com/tangem/sdk/ui/common/TextInputEditTextExt.kt
@@ -0,0 +1,41 @@
+package com.tangem.sdk.ui.common
+
+import android.os.Build
+import android.view.ActionMode
+import android.view.Menu
+import android.view.MenuItem
+import android.view.View
+import com.google.android.material.textfield.TextInputEditText
+import com.tangem.sdk.R
+
+internal fun TextInputEditText.disableContextMenu() {
+    setOnCreateContextMenuListener { _, _, _ -> }
+
+    customInsertionActionModeCallback = EmptyActionModeCallback
+    customSelectionActionModeCallback = EmptyActionModeCallback
+
+    setTextIsSelectable(false)
+
+    isLongClickable = false
+    setOnLongClickListener { false }
+
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+        setTextSelectHandle(R.drawable.empty_text_selector)
+        setTextSelectHandleLeft(R.drawable.empty_text_selector)
+        setTextSelectHandleRight(R.drawable.empty_text_selector)
+    }
+}
+
+internal fun TextInputEditText.disableAutofill() {
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+        setAutofillHints(null)
+        importantForAutofill = View.IMPORTANT_FOR_AUTOFILL_NO
+    }
+}
+
+private object EmptyActionModeCallback : ActionMode.Callback {
+    override fun onCreateActionMode(mode: ActionMode?, menu: Menu?): Boolean = false
+    override fun onPrepareActionMode(mode: ActionMode?, menu: Menu?): Boolean = false
+    override fun onActionItemClicked(mode: ActionMode?, item: MenuItem?): Boolean = false
+    override fun onDestroyActionMode(mode: ActionMode?) = Unit
+}
diff --git a/tangem-sdk-android/src/main/java/com/tangem/sdk/ui/widget/PinCodeModificationWidget.kt b/tangem-sdk-android/src/main/java/com/tangem/sdk/ui/widget/PinCodeModificationWidget.kt
index 3ed30f36..561fa1a0 100644
--- a/tangem-sdk-android/src/main/java/com/tangem/sdk/ui/widget/PinCodeModificationWidget.kt
+++ b/tangem-sdk-android/src/main/java/com/tangem/sdk/ui/widget/PinCodeModificationWidget.kt
@@ -18,6 +18,8 @@ import com.tangem.sdk.SessionViewDelegateState
 import com.tangem.sdk.extensions.hideSoftKeyboard
 import com.tangem.sdk.extensions.showSoftKeyboard
 import com.tangem.sdk.postUI
+import com.tangem.sdk.ui.common.disableAutofill
+import com.tangem.sdk.ui.common.disableContextMenu
 
 /**
  * Created by Anton Zhilenkov on 05/08/2020.
@@ -32,7 +34,6 @@ class PinCodeModificationWidget(
     private val tvScreenTitle: TextView = mainView.findViewById(R.id.tvScreenTitle)
 
     private val tilPinCode: TextInputLayout = mainView.findViewById(R.id.tilPinCode)
-    private val tilNewPinCode: TextInputLayout = mainView.findViewById(R.id.tilNewPinCode)
     private val tilPinCodeConfirm: TextInputLayout = mainView.findViewById(R.id.tilPinCodeConfirm)
 
     private val etPinCode: TextInputEditText = mainView.findViewById(R.id.etPinCode)
@@ -51,6 +52,12 @@ class PinCodeModificationWidget(
     init {
         setStateByMode()
         setupInnerLogic()
+
+        etPinCode.disableContextMenu()
+        etPinCodeConfirm.disableContextMenu()
+
+        etPinCode.disableAutofill()
+        etPinCodeConfirm.disableAutofill()
     }
 
     override fun setState(params: SessionViewDelegateState) {
@@ -73,7 +80,6 @@ class PinCodeModificationWidget(
             Mode.SET -> {
                 tvScreenTitle.text = getFormattedString(R.string.pin_set_code_format, nameOfPin)
                 tilPinCode.hint = nameOfPin
-                tilNewPinCode.visibility = View.GONE
                 tilPinCodeConfirm.hint = getFormattedString(R.string.pin_set_code_confirm_format, nameOfPin)
                 btnSave.text = getString(R.string.common_continue)
             }
@@ -81,7 +87,6 @@ class PinCodeModificationWidget(
                 tvScreenTitle.text = getFormattedString(R.string.pin_change_new_code_format, nameOfPin)
                 tilPinCode.hint = nameOfPin
                 etPinCode.inputType = InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD
-                tilNewPinCode.visibility = View.GONE
                 tilPinCodeConfirm.hint = getFormattedString(R.string.pin_set_code_confirm_format, nameOfPin)
                 etPinCodeConfirm.inputType = InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD
                 btnSave.text = getString(R.string.common_continue)
diff --git a/tangem-sdk-android/src/main/java/com/tangem/sdk/ui/widget/PinCodeRequestWidget.kt b/tangem-sdk-android/src/main/java/com/tangem/sdk/ui/widget/PinCodeRequestWidget.kt
index 3991b908..bab43e06 100644
--- a/tangem-sdk-android/src/main/java/com/tangem/sdk/ui/widget/PinCodeRequestWidget.kt
+++ b/tangem-sdk-android/src/main/java/com/tangem/sdk/ui/widget/PinCodeRequestWidget.kt
@@ -17,6 +17,8 @@ import com.tangem.sdk.extensions.localizedDescription
 import com.tangem.sdk.extensions.show
 import com.tangem.sdk.extensions.showSoftKeyboard
 import com.tangem.sdk.postUI
+import com.tangem.sdk.ui.common.disableAutofill
+import com.tangem.sdk.ui.common.disableContextMenu
 
 /**
  * Created by Anton Zhilenkov on 09/08/2020.
@@ -29,23 +31,24 @@ class PinCodeRequestWidget(mainView: View) : BaseSessionDelegateStateWidget(main
     private val etPinCode = mainView.findViewById<TextInputEditText>(R.id.etPinCode)
     private val btnContinue = mainView.findViewById<Button>(R.id.btnContinue)
     private val btnForgotCode = mainView.findViewById<Button>(R.id.btnForgotCode)
-    private val expandingView = mainView.findViewById<View>(R.id.expandingView)
 
     init {
         etPinCode.isSingleLine = true
         etPinCode.imeOptions = EditorInfo.IME_ACTION_DONE
-        etPinCode.setOnEditorActionListener { v, actionId, event ->
+        etPinCode.setOnEditorActionListener { _, actionId, _ ->
             if (actionId == EditorInfo.IME_ACTION_DONE) {
                 btnContinue.performClick()
-                return@setOnEditorActionListener true
+                true
+            } else {
+                false
             }
-            return@setOnEditorActionListener false
         }
         val hiddenPassword = InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_VARIATION_PASSWORD
         etPinCode.inputType = hiddenPassword
-    }
 
-    fun canExpand(): Boolean = expandingView != null
+        etPinCode.disableContextMenu()
+        etPinCode.disableAutofill()
+    }
 
     override fun setState(params: SessionViewDelegateState) {
         when (params) {
diff --git a/tangem-sdk-android/src/main/res/drawable/empty_text_selector.xml b/tangem-sdk-android/src/main/res/drawable/empty_text_selector.xml
new file mode 100644
index 00000000..0da04e15
--- /dev/null
+++ b/tangem-sdk-android/src/main/res/drawable/empty_text_selector.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <size
+        android:width="0dp"
+        android:height="0dp" />
+</shape>
\ No newline at end of file
diff --git a/tangem-sdk-android/src/main/res/layout/pin_code_change_layout.xml b/tangem-sdk-android/src/main/res/layout/pin_code_change_layout.xml
index e84743e0..d1c2e977 100644
--- a/tangem-sdk-android/src/main/res/layout/pin_code_change_layout.xml
+++ b/tangem-sdk-android/src/main/res/layout/pin_code_change_layout.xml
@@ -44,25 +44,6 @@
 
         </com.google.android.material.textfield.TextInputLayout>
 
-        <com.google.android.material.textfield.TextInputLayout
-            android:id="@+id/tilNewPinCode"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            app:boxBackgroundColor="@android:color/transparent"
-            tools:hint="@string/pin_change_new_code_format">
-
-            <com.google.android.material.textfield.TextInputEditText
-                android:id="@+id/etNewPinCode"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:background="@android:color/transparent"
-                android:inputType="textPassword"
-                android:paddingStart="0dp"
-                android:paddingEnd="0dp" />
-
-        </com.google.android.material.textfield.TextInputLayout>
-
         <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/tilPinCodeConfirm"
             android:layout_width="match_parent"
diff --git a/tangem-sdk-android/src/main/res/layout/reset_codes_layout.xml b/tangem-sdk-android/src/main/res/layout/reset_codes_layout.xml
index 8ad721e4..4d98ae5d 100644
--- a/tangem-sdk-android/src/main/res/layout/reset_codes_layout.xml
+++ b/tangem-sdk-android/src/main/res/layout/reset_codes_layout.xml
@@ -5,16 +5,13 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:focusable="true"
-    android:focusableInTouchMode="true"
-
-    >
+    android:focusableInTouchMode="true">
 
     <View
         android:id="@+id/expandingView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical">
-
     </View>
 
     <LinearLayout
@@ -30,7 +27,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textSize="20sp"
-            android:textStyle="bold" />
+            android:textStyle="bold"
+            tools:text="Reset pin1" />
 
         <FrameLayout
             android:id="@+id/leapfrog_views_container"
@@ -99,7 +97,7 @@
                 android:textColor="@color/sdk_message_header"
                 android:textSize="20sp"
                 android:textStyle="bold"
-                tools:text="Connect card and phone" />
+                tools:text="Tap the card or ring you want to restore" />
 
             <TextView
                 android:id="@+id/tvMessageSubtitle"
@@ -109,7 +107,8 @@
                 android:fontFamily="sans-serif-medium"
                 android:gravity="center"
                 android:textColor="@color/sdk_message_body"
-                android:textSize="15sp" />
+                android:textSize="15sp"
+                tools:text="First, prepare the card or ring for restore process"/>
         </LinearLayout>