diff --git a/app/build.gradle b/app/build.gradle
index b6688d00ce..b0b5705caf 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -67,8 +67,7 @@ dependencies {
// implementation 'com.github.TangemCash:card-common:0.1.2'
// implementation 'com.github.TangemCash:card-android:0.1.3'
// implementation 'com.github.TangemCash:server-android:0.1.4'
- implementation 'androidx.appcompat:appcompat:1.1.0-alpha03'
- implementation 'androidx.appcompat:appcompat:1.1.0-alpha01'
+ implementation 'androidx.appcompat:appcompat:1.1.0-alpha04'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0'
implementation 'androidx.biometric:biometric:1.0.0-alpha04'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ea530e48e4..eb065936b9 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -68,6 +68,11 @@
android:resource="@xml/nfc_tech_filter" />
+
+
{
+ navigator.showSettings(this)
+ return true
+ }
+
R.id.about -> {
navigator.showLogo(this, false)
return true
diff --git a/app/src/main/java/com/tangem/ui/activity/SettingsActivity.kt b/app/src/main/java/com/tangem/ui/activity/SettingsActivity.kt
new file mode 100644
index 0000000000..46d52e2600
--- /dev/null
+++ b/app/src/main/java/com/tangem/ui/activity/SettingsActivity.kt
@@ -0,0 +1,31 @@
+package com.tangem.ui.activity
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.widget.Toolbar
+import com.tangem.wallet.R
+
+class SettingsActivity : AppCompatActivity() {
+
+ companion object {
+ fun callingIntent(context: Context) = Intent(context, SettingsActivity::class.java)
+ }
+
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ setContentView(R.layout.activity_settings)
+
+ initToolbar()
+ }
+
+ private fun initToolbar() {
+ val toolbar = findViewById(R.id.toolbar)
+ toolbar.setTitle(R.string.settings)
+ toolbar.setNavigationIcon(android.R.drawable.ic_menu_close_clear_cancel)
+ setSupportActionBar(toolbar)
+ toolbar.setNavigationOnClickListener { finish() }
+ }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/ui/fragment/Settings.kt b/app/src/main/java/com/tangem/ui/fragment/Settings.kt
new file mode 100644
index 0000000000..e9c0e86d69
--- /dev/null
+++ b/app/src/main/java/com/tangem/ui/fragment/Settings.kt
@@ -0,0 +1,15 @@
+package com.tangem.ui.fragment
+
+import android.os.Bundle
+import android.preference.PreferenceFragment
+
+import com.tangem.wallet.R
+
+class Settings : PreferenceFragment() {
+
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ addPreferencesFromResource(R.xml.pref_main)
+ }
+
+}
\ 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
new file mode 100644
index 0000000000..0ba5ab7527
--- /dev/null
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/toolbar.xml b/app/src/main/res/layout/toolbar.xml
new file mode 100644
index 0000000000..13ba0bdc2b
--- /dev/null
+++ b/app/src/main/res/layout/toolbar.xml
@@ -0,0 +1,10 @@
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
index 1690a37722..aab64fe9e6 100644
--- a/app/src/main/res/menu/menu_main.xml
+++ b/app/src/main/res/menu/menu_main.xml
@@ -1,28 +1,24 @@
-