diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index a51c19b27..35e740b0d 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -335,7 +335,8 @@ jobs:
         arch: 'linux_gcc_64'
         modules: ${{ env.QT_MODULES }}
         dir: ${{ runner.temp }}
-        extra: '--external 7z --base ${{ env.QT_MIRROR }}'
+        py7zrversion: '==0.22.*'
+        extra: '--base ${{ env.QT_MIRROR }}'
 
     - name: 'Install android_x86_64 Qt'
       uses: jurplel/install-qt-action@v4
@@ -346,7 +347,8 @@ jobs:
         arch: 'android_x86_64'
         modules: ${{ env.QT_MODULES }}
         dir: ${{ runner.temp }}
-        extra: '--external 7z --base ${{ env.QT_MIRROR }}'
+        py7zrversion: '==0.22.*'
+        extra: '--base ${{ env.QT_MIRROR }}'
 
     - name: 'Install android_x86 Qt'
       uses: jurplel/install-qt-action@v4
@@ -357,7 +359,8 @@ jobs:
         arch: 'android_x86'
         modules: ${{ env.QT_MODULES }}
         dir: ${{ runner.temp }}
-        extra: '--external 7z --base ${{ env.QT_MIRROR }}'
+        py7zrversion: '==0.22.*'
+        extra: '--base ${{ env.QT_MIRROR }}'
 
     - name: 'Install android_armv7 Qt'
       uses: jurplel/install-qt-action@v4
@@ -368,7 +371,8 @@ jobs:
         arch: 'android_armv7'
         modules: ${{ env.QT_MODULES }}
         dir: ${{ runner.temp }}
-        extra: '--external 7z --base ${{ env.QT_MIRROR }}'
+        py7zrversion: '==0.22.*'
+        extra: '--base ${{ env.QT_MIRROR }}'
 
     - name: 'Install android_arm64_v8a Qt'
       uses: jurplel/install-qt-action@v4
@@ -379,7 +383,8 @@ jobs:
         arch: 'android_arm64_v8a'
         modules: ${{ env.QT_MODULES }}
         dir: ${{ runner.temp }}
-        extra: '--external 7z --base ${{ env.QT_MIRROR }}'
+        py7zrversion: '==0.22.*'
+        extra: '--base ${{ env.QT_MIRROR }}'
 
     - name: 'Grant execute permission for qt-cmake'
       shell: bash
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cb6956316..98f3be14a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.25.0 FATAL_ERROR)
 
 set(PROJECT AmneziaVPN)
 
-project(${PROJECT} VERSION 4.8.2.4
+project(${PROJECT} VERSION 4.8.3.0
         DESCRIPTION "AmneziaVPN"
         HOMEPAGE_URL "https://amnezia.org/"
 )
@@ -11,7 +11,7 @@ string(TIMESTAMP CURRENT_DATE "%Y-%m-%d")
 set(RELEASE_DATE "${CURRENT_DATE}")
 
 set(APP_MAJOR_VERSION ${CMAKE_PROJECT_VERSION_MAJOR}.${CMAKE_PROJECT_VERSION_MINOR}.${CMAKE_PROJECT_VERSION_PATCH})
-set(APP_ANDROID_VERSION_CODE 2071)
+set(APP_ANDROID_VERSION_CODE 2072)
 
 if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
     set(MZ_PLATFORM_NAME "linux")
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index 8432f87a2..cfd477f09 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -146,6 +146,7 @@ set(HEADERS ${HEADERS}
     ${CMAKE_CURRENT_LIST_DIR}/core/serialization/transfer.h
     ${CMAKE_CURRENT_LIST_DIR}/core/enums/apiEnums.h
     ${CMAKE_CURRENT_LIST_DIR}/../common/logger/logger.h
+    ${CMAKE_CURRENT_LIST_DIR}/utils/qmlUtils.h
 )
 
 # Mozilla headres
@@ -197,6 +198,7 @@ set(SOURCES ${SOURCES}
     ${CMAKE_CURRENT_LIST_DIR}/core/serialization/vmess.cpp
     ${CMAKE_CURRENT_LIST_DIR}/core/serialization/vmess_new.cpp
     ${CMAKE_CURRENT_LIST_DIR}/../common/logger/logger.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/utils/qmlUtils.cpp
 )
 
 # Mozilla sources
diff --git a/client/amnezia_application.cpp b/client/amnezia_application.cpp
index 4e25097d9..aeed439b6 100644
--- a/client/amnezia_application.cpp
+++ b/client/amnezia_application.cpp
@@ -404,6 +404,9 @@ void AmneziaApplication::initControllers()
     m_pageController.reset(new PageController(m_serversModel, m_settings));
     m_engine->rootContext()->setContextProperty("PageController", m_pageController.get());
 
+    m_focusController.reset(new FocusController(m_engine, this));
+    m_engine->rootContext()->setContextProperty("FocusController", m_focusController.get());
+
     m_installController.reset(new InstallController(m_serversModel, m_containersModel, m_protocolsModel, m_clientManagementModel,
                                                     m_apiServicesModel, m_settings));
     m_engine->rootContext()->setContextProperty("InstallController", m_installController.get());
diff --git a/client/amnezia_application.h b/client/amnezia_application.h
index 645662167..cfeac0d1f 100644
--- a/client/amnezia_application.h
+++ b/client/amnezia_application.h
@@ -19,6 +19,7 @@
 #include "ui/controllers/exportController.h"
 #include "ui/controllers/importController.h"
 #include "ui/controllers/installController.h"
+#include "ui/controllers/focusController.h"
 #include "ui/controllers/pageController.h"
 #include "ui/controllers/settingsController.h"
 #include "ui/controllers/sitesController.h"
@@ -124,6 +125,7 @@ class AmneziaApplication : public AMNEZIA_BASE_CLASS
 #endif
 
     QScopedPointer<ConnectionController> m_connectionController;
+    QScopedPointer<FocusController> m_focusController;
     QScopedPointer<PageController> m_pageController;
     QScopedPointer<InstallController> m_installController;
     QScopedPointer<ImportController> m_importController;
diff --git a/client/android/AndroidManifest.xml b/client/android/AndroidManifest.xml
index 9e44e0221..96f60f539 100644
--- a/client/android/AndroidManifest.xml
+++ b/client/android/AndroidManifest.xml
@@ -11,7 +11,7 @@
     <uses-feature android:name="android.hardware.camera.any" android:required="false" />
     <uses-feature android:name="android.hardware.camera.autofocus" android:required="false" />
     <!-- for TV -->
-    <uses-feature android:name="android.software.leanback" android:required="false" />
+    <uses-feature android:name="android.software.leanback" android:required="true" />
     <uses-feature android:name="android.hardware.touchscreen" android:required="false" />
 
     <!-- The following comment will be replaced upon deployment with default features based on the dependencies
@@ -91,6 +91,13 @@
             android:exported="false"
             android:theme="@style/Translucent" />
 
+        <activity android:name=".TvFilePicker"
+            android:excludeFromRecents="true"
+            android:launchMode="singleTask"
+            android:taskAffinity=""
+            android:exported="false"
+            android:theme="@style/Translucent" />
+
         <activity
             android:name=".ImportConfigActivity"
             android:excludeFromRecents="true"
diff --git a/client/android/res/mipmap-anydpi-v26/ic_banner.xml b/client/android/res/mipmap-anydpi-v26/ic_banner.xml
deleted file mode 100644
index cf3108b36..000000000
--- a/client/android/res/mipmap-anydpi-v26/ic_banner.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_banner_background"/>
-    <foreground android:drawable="@mipmap/ic_banner_foreground"/>
-</adaptive-icon>
\ No newline at end of file
diff --git a/client/android/res/mipmap-hdpi/ic_banner.png b/client/android/res/mipmap-hdpi/ic_banner.png
new file mode 100644
index 000000000..a444777fe
Binary files /dev/null and b/client/android/res/mipmap-hdpi/ic_banner.png differ
diff --git a/client/android/res/mipmap-mdpi/ic_banner.png b/client/android/res/mipmap-mdpi/ic_banner.png
new file mode 100644
index 000000000..b9ad1db7c
Binary files /dev/null and b/client/android/res/mipmap-mdpi/ic_banner.png differ
diff --git a/client/android/res/mipmap-xhdpi/ic_banner_foreground.png b/client/android/res/mipmap-xhdpi/ic_banner_foreground.png
deleted file mode 100644
index 1c21902ec..000000000
Binary files a/client/android/res/mipmap-xhdpi/ic_banner_foreground.png and /dev/null differ
diff --git a/client/android/res/values-ru/strings.xml b/client/android/res/values-ru/strings.xml
index 8bdabfc02..5e35bba51 100644
--- a/client/android/res/values-ru/strings.xml
+++ b/client/android/res/values-ru/strings.xml
@@ -23,4 +23,6 @@
     <string name="notificationSettingsDialogTitle">Настройки уведомлений</string>
     <string name="notificationSettingsDialogMessage">Для показа уведомлений необходимо включить уведомления в системных настройках</string>
     <string name="openNotificationSettings">Открыть настройки уведомлений</string>
+
+    <string name="tvNoFileBrowser">Пожалуйста, установите приложение для просмотра файлов</string>
 </resources>
\ No newline at end of file
diff --git a/client/android/res/values/ic_banner_background.xml b/client/android/res/values/ic_banner_background.xml
deleted file mode 100644
index fa6f91c72..000000000
--- a/client/android/res/values/ic_banner_background.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="ic_banner_background">#1E1E1F</color>
-</resources>
\ No newline at end of file
diff --git a/client/android/res/values/strings.xml b/client/android/res/values/strings.xml
index 5251403b9..bf8d76d1d 100644
--- a/client/android/res/values/strings.xml
+++ b/client/android/res/values/strings.xml
@@ -23,4 +23,6 @@
     <string name="notificationSettingsDialogTitle">Notification settings</string>
     <string name="notificationSettingsDialogMessage">To show notifications, you must enable notifications in the system settings</string>
     <string name="openNotificationSettings">Open notification settings</string>
+
+    <string name="tvNoFileBrowser">Please install a file management utility to browse files</string>
 </resources>
\ No newline at end of file
diff --git a/client/android/src/org/amnezia/vpn/AmneziaActivity.kt b/client/android/src/org/amnezia/vpn/AmneziaActivity.kt
index b2c2ff71e..c6db5e29e 100644
--- a/client/android/src/org/amnezia/vpn/AmneziaActivity.kt
+++ b/client/android/src/org/amnezia/vpn/AmneziaActivity.kt
@@ -4,6 +4,7 @@ import android.Manifest
 import android.annotation.SuppressLint
 import android.app.AlertDialog
 import android.app.NotificationManager
+import android.content.ActivityNotFoundException
 import android.content.BroadcastReceiver
 import android.content.ComponentName
 import android.content.Intent
@@ -12,6 +13,7 @@ import android.content.Intent.FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY
 import android.content.ServiceConnection
 import android.content.pm.PackageManager
 import android.graphics.Bitmap
+import android.net.Uri
 import android.net.VpnService
 import android.os.Build
 import android.os.Bundle
@@ -20,8 +22,13 @@ import android.os.IBinder
 import android.os.Looper
 import android.os.Message
 import android.os.Messenger
+import android.os.ParcelFileDescriptor
+import android.os.SystemClock
+import android.provider.OpenableColumns
 import android.provider.Settings
 import android.view.MotionEvent
+import android.view.View
+import android.view.ViewGroup
 import android.view.WindowManager.LayoutParams
 import android.webkit.MimeTypeMap
 import android.widget.Toast
@@ -30,6 +37,7 @@ import androidx.annotation.RequiresApi
 import androidx.core.content.ContextCompat
 import java.io.IOException
 import kotlin.LazyThreadSafetyMode.NONE
+import kotlin.coroutines.CoroutineContext
 import kotlin.text.RegexOption.IGNORE_CASE
 import AppListProvider
 import kotlinx.coroutines.CompletableDeferred
@@ -71,6 +79,7 @@ class AmneziaActivity : QtActivity() {
     private var isInBoundState = false
     private var notificationStateReceiver: BroadcastReceiver? = null
     private lateinit var vpnServiceMessenger: IpcMessenger
+    private var pfd: ParcelFileDescriptor? = null
 
     private val actionResultHandlers = mutableMapOf<Int, ActivityResultHandler>()
     private val permissionRequestHandlers = mutableMapOf<Int, PermissionRequestHandler>()
@@ -514,21 +523,25 @@ class AmneziaActivity : QtActivity() {
                 type = "text/*"
                 putExtra(Intent.EXTRA_TITLE, fileName)
             }.also {
-                startActivityForResult(it, CREATE_FILE_ACTION_CODE, ActivityResultHandler(
-                    onSuccess = {
-                        it?.data?.let { uri ->
-                            Log.v(TAG, "Save file to $uri")
-                            try {
-                                contentResolver.openOutputStream(uri)?.use { os ->
-                                    os.bufferedWriter().use { it.write(data) }
+                try {
+                    startActivityForResult(it, CREATE_FILE_ACTION_CODE, ActivityResultHandler(
+                        onSuccess = {
+                            it?.data?.let { uri ->
+                                Log.v(TAG, "Save file to $uri")
+                                try {
+                                    contentResolver.openOutputStream(uri)?.use { os ->
+                                        os.bufferedWriter().use { it.write(data) }
+                                    }
+                                } catch (e: IOException) {
+                                    Log.e(TAG, "Failed to save file $uri: $e")
+                                    // todo: send error to Qt
                                 }
-                            } catch (e: IOException) {
-                                Log.e(TAG, "Failed to save file $uri: $e")
-                                // todo: send error to Qt
                             }
                         }
-                    }
-                ))
+                    ))
+                } catch (_: ActivityNotFoundException) {
+                    Toast.makeText(this@AmneziaActivity, "Unsupported", Toast.LENGTH_LONG).show()
+                }
             }
         }
     }
@@ -537,35 +550,46 @@ class AmneziaActivity : QtActivity() {
     fun openFile(filter: String?) {
         Log.v(TAG, "Open file with filter: $filter")
         mainScope.launch {
-            val mimeTypes = if (!filter.isNullOrEmpty()) {
-                val extensionRegex = "\\*\\.([a-z0-9]+)".toRegex(IGNORE_CASE)
-                val mime = MimeTypeMap.getSingleton()
-                extensionRegex.findAll(filter).map {
-                    it.groups[1]?.value?.let { mime.getMimeTypeFromExtension(it) } ?: "*/*"
-                }.toSet()
-            } else emptySet()
-
-            Intent(Intent.ACTION_OPEN_DOCUMENT).apply {
-                addCategory(Intent.CATEGORY_OPENABLE)
-                Log.v(TAG, "File mimyType filter: $mimeTypes")
-                if ("*/*" in mimeTypes) {
-                    type = "*/*"
-                } else {
-                    when (mimeTypes.size) {
-                        1 -> type = mimeTypes.first()
+            val intent = if (!isOnTv()) {
+                val mimeTypes = if (!filter.isNullOrEmpty()) {
+                    val extensionRegex = "\\*\\.([a-z0-9]+)".toRegex(IGNORE_CASE)
+                    val mime = MimeTypeMap.getSingleton()
+                    extensionRegex.findAll(filter).map {
+                        it.groups[1]?.value?.let { mime.getMimeTypeFromExtension(it) } ?: "*/*"
+                    }.toSet()
+                } else emptySet()
+
+                Intent(Intent.ACTION_OPEN_DOCUMENT).apply {
+                    addCategory(Intent.CATEGORY_OPENABLE)
+                    Log.v(TAG, "File mimyType filter: $mimeTypes")
+                    if ("*/*" in mimeTypes) {
+                        type = "*/*"
+                    } else {
+                        when (mimeTypes.size) {
+                            1 -> type = mimeTypes.first()
 
-                        in 2..Int.MAX_VALUE -> {
-                            type = "*/*"
-                            putExtra(EXTRA_MIME_TYPES, mimeTypes.toTypedArray())
-                        }
+                            in 2..Int.MAX_VALUE -> {
+                                type = "*/*"
+                                putExtra(EXTRA_MIME_TYPES, mimeTypes.toTypedArray())
+                            }
 
-                        else -> type = "*/*"
+                            else -> type = "*/*"
+                        }
                     }
                 }
-            }.also {
-                startActivityForResult(it, OPEN_FILE_ACTION_CODE, ActivityResultHandler(
+            } else {
+                Intent(this@AmneziaActivity, TvFilePicker::class.java)
+            }
+
+            try {
+                startActivityForResult(intent, OPEN_FILE_ACTION_CODE, ActivityResultHandler(
                     onAny = {
-                        val uri = it?.data?.toString() ?: ""
+                        if (isOnTv() && it?.hasExtra("activityNotFound") == true) {
+                            showNoFileBrowserAlertDialog()
+                        }
+                        val uri = it?.data?.apply {
+                            grantUriPermission(packageName, this, Intent.FLAG_GRANT_READ_URI_PERMISSION)
+                        }?.toString() ?: ""
                         Log.v(TAG, "Open file: $uri")
                         mainScope.launch {
                             qtInitialized.await()
@@ -573,10 +597,68 @@ class AmneziaActivity : QtActivity() {
                         }
                     }
                 ))
+            } catch (_: ActivityNotFoundException) {
+                showNoFileBrowserAlertDialog()
+                mainScope.launch {
+                    qtInitialized.await()
+                    QtAndroidController.onFileOpened("")
+                }
             }
         }
     }
 
+    private fun showNoFileBrowserAlertDialog() {
+        AlertDialog.Builder(this)
+            .setMessage(R.string.tvNoFileBrowser)
+            .setCancelable(false)
+            .setPositiveButton(android.R.string.ok) { _, _ ->
+                try {
+                    startActivity(Intent(Intent.ACTION_VIEW, Uri.parse("market://webstoreredirect")))
+                } catch (_: Throwable) {}
+            }
+            .show()
+    }
+
+    @Suppress("unused")
+    fun getFd(fileName: String): Int {
+        Log.v(TAG, "Get fd for $fileName")
+        return blockingCall {
+            try {
+                pfd = contentResolver.openFileDescriptor(Uri.parse(fileName), "r")
+                pfd?.fd ?: -1
+            } catch (e: Exception) {
+                Log.e(TAG, "Failed to get fd: $e")
+                -1
+            }
+        }
+    }
+
+    @Suppress("unused")
+    fun closeFd() {
+        Log.v(TAG, "Close fd")
+        mainScope.launch {
+            pfd?.close()
+            pfd = null
+        }
+    }
+
+    @Suppress("unused")
+    fun getFileName(uri: String): String {
+        Log.v(TAG, "Get file name for uri: $uri")
+        return blockingCall {
+            try {
+                contentResolver.query(Uri.parse(uri), arrayOf(OpenableColumns.DISPLAY_NAME), null, null, null)?.use { cursor ->
+                    if (cursor.moveToFirst() && !cursor.isNull(0)) {
+                        return@blockingCall cursor.getString(0) ?: ""
+                    }
+                }
+            } catch (e: Exception) {
+                Log.e(TAG, "Failed to get file name: $e")
+            }
+            ""
+        }
+    }
+
     @Suppress("unused")
     @SuppressLint("UnsupportedChromeOsCameraSystemFeature")
     fun isCameraPresent(): Boolean = applicationContext.packageManager.hasSystemFeature(PackageManager.FEATURE_CAMERA)
@@ -721,6 +803,50 @@ class AmneziaActivity : QtActivity() {
         }
     }
 
+    // method to workaround Qt's problem with calling the keyboard on TVs
+    @Suppress("unused")
+    fun sendTouch(x: Float, y: Float) {
+        Log.v(TAG, "Send touch: $x, $y")
+        blockingCall {
+            findQtWindow(window.decorView)?.let {
+                Log.v(TAG, "Send touch to $it")
+                it.dispatchTouchEvent(createEvent(x, y, SystemClock.uptimeMillis(), MotionEvent.ACTION_DOWN))
+                it.dispatchTouchEvent(createEvent(x, y, SystemClock.uptimeMillis(), MotionEvent.ACTION_UP))
+            }
+        }
+    }
+
+    private fun findQtWindow(view: View): View? {
+        Log.v(TAG, "findQtWindow: process $view")
+        if (view::class.simpleName == "QtWindow") return view
+        else if (view is ViewGroup) {
+            for (i in 0 until view.childCount) {
+                val result = findQtWindow(view.getChildAt(i))
+                if (result != null) return result
+            }
+            return null
+        } else return null
+    }
+
+    private fun createEvent(x: Float, y: Float, eventTime: Long, action: Int): MotionEvent =
+        MotionEvent.obtain(
+            eventTime,
+            eventTime,
+            action,
+            1,
+            arrayOf(MotionEvent.PointerProperties().apply {
+                id = 0
+                toolType = MotionEvent.TOOL_TYPE_FINGER
+            }),
+            arrayOf(MotionEvent.PointerCoords().apply {
+                this.x = x
+                this.y = y
+                pressure = 1f
+                size = 1f
+            }),
+            0, 0, 1.0f, 1.0f, 0, 0, 0,0
+        )
+
     // workaround for a bug in Qt that causes the mouse click event not to be handled
     // also disable right-click, as it causes the application to crash
     private var lastButtonState = 0
@@ -770,6 +896,7 @@ class AmneziaActivity : QtActivity() {
     }
 
     override fun dispatchTouchEvent(ev: MotionEvent?): Boolean {
+        Log.v(TAG, "dispatchTouch: $ev")
         if (ev != null && ev.getToolType(0) == MotionEvent.TOOL_TYPE_MOUSE) {
             return handleMouseEvent(ev) { super.dispatchTouchEvent(it) }
         }
@@ -784,6 +911,13 @@ class AmneziaActivity : QtActivity() {
     /**
      * Utils methods
      */
+    private fun <T> blockingCall(
+        context: CoroutineContext = Dispatchers.Main.immediate,
+        block: suspend () -> T
+    ) = runBlocking {
+        mainScope.async(context) { block() }.await()
+    }
+
     companion object {
         private fun actionCodeToString(actionCode: Int): String =
             when (actionCode) {
diff --git a/client/android/src/org/amnezia/vpn/TvFilePicker.kt b/client/android/src/org/amnezia/vpn/TvFilePicker.kt
new file mode 100644
index 000000000..1ac275ebf
--- /dev/null
+++ b/client/android/src/org/amnezia/vpn/TvFilePicker.kt
@@ -0,0 +1,45 @@
+package org.amnezia.vpn
+
+import android.content.ActivityNotFoundException
+import android.content.Intent
+import android.os.Bundle
+import androidx.activity.ComponentActivity
+import androidx.activity.result.contract.ActivityResultContracts
+import org.amnezia.vpn.util.Log
+
+private const val TAG = "TvFilePicker"
+
+class TvFilePicker : ComponentActivity() {
+
+    private val fileChooseResultLauncher = registerForActivityResult(ActivityResultContracts.GetContent()) {
+        setResult(RESULT_OK, Intent().apply { data = it })
+        finish()
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        Log.v(TAG, "onCreate")
+        getFile()
+    }
+
+    override fun onNewIntent(intent: Intent) {
+        super.onNewIntent(intent)
+        Log.v(TAG, "onNewIntent")
+        getFile()
+    }
+
+    private fun getFile() {
+        try {
+            Log.v(TAG, "getFile")
+            fileChooseResultLauncher.launch("*/*")
+        } catch (_: ActivityNotFoundException) {
+            Log.w(TAG, "Activity not found")
+            setResult(RESULT_CANCELED, Intent().apply { putExtra("activityNotFound", true) })
+            finish()
+        } catch (e: Exception) {
+            Log.e(TAG, "Failed to get file: $e")
+            setResult(RESULT_CANCELED)
+            finish()
+        }
+    }
+}
diff --git a/client/configurators/wireguard_configurator.cpp b/client/configurators/wireguard_configurator.cpp
index 3f96e74c1..1bca973d8 100644
--- a/client/configurators/wireguard_configurator.cpp
+++ b/client/configurators/wireguard_configurator.cpp
@@ -120,7 +120,7 @@ WireguardConfigurator::ConnectionData WireguardConfigurator::prepareWireguardCon
         }
     }
 
-    QString subnetIp = containerConfig.value(config_key::subnet_address).toString(protocols::wireguard::defaultSubnetAddress);
+    QString subnetIp = containerConfig.value(m_protocolName).toObject().value(config_key::subnet_address).toString(protocols::wireguard::defaultSubnetAddress);
     {
         QStringList l = subnetIp.split(".", Qt::SkipEmptyParts);
         if (l.isEmpty()) {
diff --git a/client/core/controllers/serverController.cpp b/client/core/controllers/serverController.cpp
index b6795a01b..7219ff7d4 100644
--- a/client/core/controllers/serverController.cpp
+++ b/client/core/controllers/serverController.cpp
@@ -346,7 +346,9 @@ bool ServerController::isReinstallContainerRequired(DockerContainer container, c
     }
 
     if (container == DockerContainer::Awg) {
-        if ((oldProtoConfig.value(config_key::port).toString(protocols::awg::defaultPort)
+        if ((oldProtoConfig.value(config_key::subnet_address).toString(protocols::wireguard::defaultSubnetAddress)
+             != newProtoConfig.value(config_key::subnet_address).toString(protocols::wireguard::defaultSubnetAddress))
+            || (oldProtoConfig.value(config_key::port).toString(protocols::awg::defaultPort)
              != newProtoConfig.value(config_key::port).toString(protocols::awg::defaultPort))
             || (oldProtoConfig.value(config_key::junkPacketCount).toString(protocols::awg::defaultJunkPacketCount)
                 != newProtoConfig.value(config_key::junkPacketCount).toString(protocols::awg::defaultJunkPacketCount))
@@ -370,8 +372,10 @@ bool ServerController::isReinstallContainerRequired(DockerContainer container, c
     }
 
     if (container == DockerContainer::WireGuard) {
-        if (oldProtoConfig.value(config_key::port).toString(protocols::wireguard::defaultPort)
-            != newProtoConfig.value(config_key::port).toString(protocols::wireguard::defaultPort))
+        if ((oldProtoConfig.value(config_key::subnet_address).toString(protocols::wireguard::defaultSubnetAddress)
+             != newProtoConfig.value(config_key::subnet_address).toString(protocols::wireguard::defaultSubnetAddress))
+            || (oldProtoConfig.value(config_key::port).toString(protocols::wireguard::defaultPort)
+            != newProtoConfig.value(config_key::port).toString(protocols::wireguard::defaultPort)))
             return true;
     }
 
@@ -607,6 +611,8 @@ ServerController::Vars ServerController::genVarsForScript(const ServerCredential
     vars.append({ { "$SFTP_PASSWORD", sftpConfig.value(config_key::password).toString() } });
 
     // Amnezia wireguard vars
+    vars.append({ { "$AWG_SUBNET_IP",
+                    amneziaWireguarConfig.value(config_key::subnet_address).toString(protocols::wireguard::defaultSubnetAddress) } });
     vars.append({ { "$AWG_SERVER_PORT", amneziaWireguarConfig.value(config_key::port).toString(protocols::awg::defaultPort) } });
 
     vars.append({ { "$JUNK_PACKET_COUNT", amneziaWireguarConfig.value(config_key::junkPacketCount).toString() } });
diff --git a/client/core/serialization/vmess_new.cpp b/client/core/serialization/vmess_new.cpp
index 6f3ec3e1b..68d322031 100644
--- a/client/core/serialization/vmess_new.cpp
+++ b/client/core/serialization/vmess_new.cpp
@@ -104,7 +104,7 @@ QJsonObject Deserialize(const QString &vmessStr, QString *alias, QString *errMes
         server.users.first().security = "auto";
     }
 
-    const static auto getQueryValue = [&query](const QString &key, const QString &defaultValue) {
+    const auto getQueryValue = [&query](const QString &key, const QString &defaultValue) {
         if (query.hasQueryItem(key))
             return query.queryItemValue(key, QUrl::FullyDecoded);
         else
diff --git a/client/images/controls/external-link.svg b/client/images/controls/external-link.svg
new file mode 100644
index 000000000..6a51c9025
--- /dev/null
+++ b/client/images/controls/external-link.svg
@@ -0,0 +1,5 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M18 13V19C18 19.5304 17.7893 20.0391 17.4142 20.4142C17.0391 20.7893 16.5304 21 16 21H5C4.46957 21 3.96086 20.7893 3.58579 20.4142C3.21071 20.0391 3 19.5304 3 19V8C3 7.46957 3.21071 6.96086 3.58579 6.58579C3.96086 6.21071 4.46957 6 5 6H11" stroke="#D7D8DB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M15 3H21V9" stroke="#D7D8DB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M10 14L21 3" stroke="#D7D8DB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/client/platforms/android/android_controller.cpp b/client/platforms/android/android_controller.cpp
index 2790eb1bd..d9195f872 100644
--- a/client/platforms/android/android_controller.cpp
+++ b/client/platforms/android/android_controller.cpp
@@ -163,9 +163,7 @@ QString AndroidController::openFile(const QString &filter)
     QString fileName;
     connect(this, &AndroidController::fileOpened, this,
             [&fileName, &wait](const QString &uri) {
-                qDebug() << "Android event: file opened; uri:" << uri;
-                fileName = QQmlFile::urlToLocalFileOrQrc(uri);
-                qDebug() << "Android opened filename:" << fileName;
+                fileName = uri;
                 wait.quit();
             },
             static_cast<Qt::ConnectionType>(Qt::QueuedConnection | Qt::SingleShotConnection));
@@ -175,6 +173,25 @@ QString AndroidController::openFile(const QString &filter)
     return fileName;
 }
 
+int AndroidController::getFd(const QString &fileName)
+{
+    return callActivityMethod<jint>("getFd", "(Ljava/lang/String;)I",
+                                    QJniObject::fromString(fileName).object<jstring>());
+}
+
+void AndroidController::closeFd()
+{
+    callActivityMethod("closeFd", "()V");
+}
+
+QString AndroidController::getFileName(const QString &uri)
+{
+    auto fileName = callActivityMethod<jstring, jstring>("getFileName", "(Ljava/lang/String;)Ljava/lang/String;",
+                                                         QJniObject::fromString(uri).object<jstring>());
+    QJniEnvironment env;
+    return AndroidUtils::convertJString(env.jniEnv(), fileName.object<jstring>());
+}
+
 bool AndroidController::isCameraPresent()
 {
     return callActivityMethod<jboolean>("isCameraPresent", "()Z");
@@ -287,6 +304,11 @@ bool AndroidController::requestAuthentication()
     return result;
 }
 
+void AndroidController::sendTouch(float x, float y)
+{
+    callActivityMethod("sendTouch", "(FF)V", x, y);
+}
+
 // Moving log processing to the Android side
 jclass AndroidController::log;
 jmethodID AndroidController::logDebug;
diff --git a/client/platforms/android/android_controller.h b/client/platforms/android/android_controller.h
index 759c9c3f2..5707771e5 100644
--- a/client/platforms/android/android_controller.h
+++ b/client/platforms/android/android_controller.h
@@ -34,6 +34,9 @@ class AndroidController : public QObject
     void resetLastServer(int serverIndex);
     void saveFile(const QString &fileName, const QString &data);
     QString openFile(const QString &filter);
+    int getFd(const QString &fileName);
+    void closeFd();
+    QString getFileName(const QString &uri);
     bool isCameraPresent();
     bool isOnTv();
     void startQrReaderActivity();
@@ -48,6 +51,7 @@ class AndroidController : public QObject
     bool isNotificationPermissionGranted();
     void requestNotificationPermission();
     bool requestAuthentication();
+    void sendTouch(float x, float y);
 
     static bool initLogging();
     static void messageHandler(QtMsgType type, const QMessageLogContext &context, const QString &message);
diff --git a/client/platforms/linux/daemon/linuxfirewall.cpp b/client/platforms/linux/daemon/linuxfirewall.cpp
index 393c24f26..96194bc77 100644
--- a/client/platforms/linux/daemon/linuxfirewall.cpp
+++ b/client/platforms/linux/daemon/linuxfirewall.cpp
@@ -196,6 +196,8 @@ QStringList LinuxFirewall::getDNSRules(const QStringList& servers)
         result << QStringLiteral("-o amn0+ -d %1 -p tcp --dport 53 -j ACCEPT").arg(server);
         result << QStringLiteral("-o tun0+ -d %1 -p udp --dport 53 -j ACCEPT").arg(server);
         result << QStringLiteral("-o tun0+ -d %1 -p tcp --dport 53 -j ACCEPT").arg(server);
+        result << QStringLiteral("-o tun2+ -d %1 -p udp --dport 53 -j ACCEPT").arg(server);
+        result << QStringLiteral("-o tun2+ -d %1 -p tcp --dport 53 -j ACCEPT").arg(server);
     }
     return result;
 }
@@ -277,6 +279,7 @@ void LinuxFirewall::install()
     installAnchor(Both, QStringLiteral("200.allowVPN"), {
                                                             QStringLiteral("-o amn0+ -j ACCEPT"),
                                                             QStringLiteral("-o tun0+ -j ACCEPT"),
+                                                            QStringLiteral("-o tun2+ -j ACCEPT"),
                                                         });
 
     installAnchor(IPv4, QStringLiteral("120.blockNets"), {});
diff --git a/client/protocols/xrayprotocol.cpp b/client/protocols/xrayprotocol.cpp
index 2dfbcc21a..7c69ccded 100755
--- a/client/protocols/xrayprotocol.cpp
+++ b/client/protocols/xrayprotocol.cpp
@@ -1,7 +1,6 @@
 #include "xrayprotocol.h"
 
 #include "utilities.h"
-#include "containers/containers_defs.h"
 #include "core/networkUtilities.h"
 
 #include <QCryptographicHash>
@@ -22,9 +21,8 @@ XrayProtocol::XrayProtocol(const QJsonObject &configuration, QObject *parent):
 
 XrayProtocol::~XrayProtocol()
 {
+    qDebug() << "XrayProtocol::~XrayProtocol()";
     XrayProtocol::stop();
-    QThread::msleep(200);
-    m_xrayProcess.close();
 }
 
 ErrorCode XrayProtocol::start()
@@ -36,10 +34,6 @@ ErrorCode XrayProtocol::start()
         return lastError();
     }
 
-    if (Utils::processIsRunning(Utils::executable(xrayExecPath(), true))) {
-        Utils::killProcessByName(Utils::executable(xrayExecPath(), true));
-    }
-
 #ifdef QT_DEBUG
     m_xrayCfgFile.setAutoRemove(false);
 #endif
@@ -54,9 +48,16 @@ ErrorCode XrayProtocol::start()
     qDebug().noquote() << "XrayProtocol::start()"
                        << xrayExecPath() << args.join(" ");
 
-    m_xrayProcess.setProcessChannelMode(QProcess::MergedChannels);
 
+
+    m_xrayProcess.setProcessChannelMode(QProcess::MergedChannels);
     m_xrayProcess.setProgram(xrayExecPath());
+
+    if (Utils::processIsRunning(Utils::executable("xray", false))) {
+        qDebug().noquote() << "kill previos xray";
+        Utils::killProcessByName(Utils::executable("xray", false));
+    }
+
     m_xrayProcess.setArguments(args);
 
     connect(&m_xrayProcess, &QProcess::readyReadStandardOutput, this, [this]() {
@@ -68,13 +69,9 @@ ErrorCode XrayProtocol::start()
     connect(&m_xrayProcess, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), this, [this](int exitCode, QProcess::ExitStatus exitStatus) {
         qDebug().noquote() << "XrayProtocol finished, exitCode, exitStatus" << exitCode << exitStatus;
         setConnectionState(Vpn::ConnectionState::Disconnected);
-        if (exitStatus != QProcess::NormalExit) {
-            emit protocolError(amnezia::ErrorCode::XrayExecutableCrashed);
-            stop();
-        }
-        if (exitCode != 0) {
-            emit protocolError(amnezia::ErrorCode::InternalError);
-            stop();
+        if ((exitStatus != QProcess::NormalExit) || (exitCode != 0)) {
+                emit protocolError(amnezia::ErrorCode::XrayExecutableCrashed);
+                emit setConnectionState(Vpn::ConnectionState::Error);
         }
     });
 
@@ -177,14 +174,14 @@ void XrayProtocol::stop()
     IpcClient::Interface()->StartRoutingIpv6();
 #endif
     qDebug() << "XrayProtocol::stop()";
-    m_xrayProcess.terminate();
+    m_xrayProcess.disconnect();
+    m_xrayProcess.kill();
+    m_xrayProcess.waitForFinished(3000);
     if (m_t2sProcess) {
         m_t2sProcess->stop();
     }
 
-#ifdef Q_OS_WIN
-    Utils::signalCtrl(m_xrayProcess.processId(), CTRL_C_EVENT);
-#endif
+    setConnectionState(Vpn::ConnectionState::Disconnected);
 }
 
 QString XrayProtocol::xrayExecPath()
diff --git a/client/resources.qrc b/client/resources.qrc
index e0b85661d..9b18bed70 100644
--- a/client/resources.qrc
+++ b/client/resources.qrc
@@ -1,226 +1,230 @@
 <RCC>
     <qresource prefix="/">
+        <file>fonts/pt-root-ui_vf.ttf</file>
+        <file>images/amneziaBigLogo.png</file>
+        <file>images/AmneziaVPN.png</file>
+        <file>images/controls/alert-circle.svg</file>
+        <file>images/controls/amnezia.svg</file>
+        <file>images/controls/app.svg</file>
+        <file>images/controls/archive-restore.svg</file>
+        <file>images/controls/arrow-left.svg</file>
+        <file>images/controls/arrow-right.svg</file>
+        <file>images/controls/bug.svg</file>
+        <file>images/controls/check.svg</file>
+        <file>images/controls/chevron-down.svg</file>
+        <file>images/controls/chevron-right.svg</file>
+        <file>images/controls/chevron-up.svg</file>
+        <file>images/controls/close.svg</file>
+        <file>images/controls/copy.svg</file>
+        <file>images/controls/delete.svg</file>
+        <file>images/controls/download.svg</file>
+        <file>images/controls/edit-3.svg</file>
+        <file>images/controls/eye-off.svg</file>
+        <file>images/controls/eye.svg</file>
+        <file>images/controls/external-link.svg</file>
+        <file>images/controls/file-check-2.svg</file>
+        <file>images/controls/file-cog-2.svg</file>
+        <file>images/controls/folder-open.svg</file>
+        <file>images/controls/folder-search-2.svg</file>
+        <file>images/controls/gauge.svg</file>
+        <file>images/controls/github.svg</file>
+        <file>images/controls/help-circle.svg</file>
+        <file>images/controls/history.svg</file>
+        <file>images/controls/home.svg</file>
+        <file>images/controls/info.svg</file>
+        <file>images/controls/mail.svg</file>
+        <file>images/controls/map-pin.svg</file>
+        <file>images/controls/more-vertical.svg</file>
+        <file>images/controls/plus.svg</file>
+        <file>images/controls/qr-code.svg</file>
+        <file>images/controls/radio-button-inner-circle-pressed.png</file>
+        <file>images/controls/radio-button-inner-circle.png</file>
+        <file>images/controls/radio-button-pressed.svg</file>
+        <file>images/controls/radio-button.svg</file>
+        <file>images/controls/radio.svg</file>
+        <file>images/controls/refresh-cw.svg</file>
+        <file>images/controls/save.svg</file>
+        <file>images/controls/scan-line.svg</file>
+        <file>images/controls/search.svg</file>
+        <file>images/controls/server.svg</file>
+        <file>images/controls/settings-2.svg</file>
+        <file>images/controls/settings.svg</file>
+        <file>images/controls/share-2.svg</file>
+        <file>images/controls/split-tunneling.svg</file>
+        <file>images/controls/tag.svg</file>
+        <file>images/controls/telegram.svg</file>
+        <file>images/controls/text-cursor.svg</file>
+        <file>images/controls/trash.svg</file>
+        <file>images/controls/x-circle.svg</file>
         <file>images/tray/active.png</file>
         <file>images/tray/default.png</file>
         <file>images/tray/error.png</file>
-        <file>images/AmneziaVPN.png</file>
-        <file>server_scripts/remove_container.sh</file>
-        <file>server_scripts/setup_host_firewall.sh</file>
-        <file>server_scripts/openvpn_cloak/Dockerfile</file>
-        <file>server_scripts/openvpn_cloak/configure_container.sh</file>
-        <file>server_scripts/openvpn_cloak/start.sh</file>
-        <file>server_scripts/openvpn_cloak/template.ovpn</file>
-        <file>server_scripts/install_docker.sh</file>
+        <file>server_scripts/awg/configure_container.sh</file>
+        <file>server_scripts/awg/Dockerfile</file>
+        <file>server_scripts/awg/run_container.sh</file>
+        <file>server_scripts/awg/start.sh</file>
+        <file>server_scripts/awg/template.conf</file>
         <file>server_scripts/build_container.sh</file>
-        <file>server_scripts/prepare_host.sh</file>
         <file>server_scripts/check_connection.sh</file>
-        <file>server_scripts/remove_all_containers.sh</file>
+        <file>server_scripts/check_server_is_busy.sh</file>
+        <file>server_scripts/check_user_in_sudo.sh</file>
+        <file>server_scripts/dns/configure_container.sh</file>
+        <file>server_scripts/dns/Dockerfile</file>
+        <file>server_scripts/dns/run_container.sh</file>
+        <file>server_scripts/install_docker.sh</file>
+        <file>server_scripts/ipsec/configure_container.sh</file>
+        <file>server_scripts/ipsec/Dockerfile</file>
+        <file>server_scripts/ipsec/mobileconfig.plist</file>
+        <file>server_scripts/ipsec/run_container.sh</file>
+        <file>server_scripts/ipsec/start.sh</file>
+        <file>server_scripts/ipsec/template.conf</file>
+        <file>server_scripts/ipsec/strongswan.profile</file>
+        <file>server_scripts/openvpn_cloak/configure_container.sh</file>
+        <file>server_scripts/openvpn_cloak/Dockerfile</file>
         <file>server_scripts/openvpn_cloak/run_container.sh</file>
-        <file>server_scripts/openvpn/configure_container.sh</file>
-        <file>server_scripts/openvpn/run_container.sh</file>
-        <file>server_scripts/openvpn/template.ovpn</file>
-        <file>server_scripts/openvpn/Dockerfile</file>
-        <file>server_scripts/openvpn/start.sh</file>
+        <file>server_scripts/openvpn_cloak/start.sh</file>
+        <file>server_scripts/openvpn_cloak/template.ovpn</file>
         <file>server_scripts/openvpn_shadowsocks/configure_container.sh</file>
         <file>server_scripts/openvpn_shadowsocks/Dockerfile</file>
         <file>server_scripts/openvpn_shadowsocks/run_container.sh</file>
         <file>server_scripts/openvpn_shadowsocks/start.sh</file>
         <file>server_scripts/openvpn_shadowsocks/template.ovpn</file>
+        <file>server_scripts/openvpn/configure_container.sh</file>
+        <file>server_scripts/openvpn/Dockerfile</file>
+        <file>server_scripts/openvpn/run_container.sh</file>
+        <file>server_scripts/openvpn/start.sh</file>
+        <file>server_scripts/openvpn/template.ovpn</file>
+        <file>server_scripts/prepare_host.sh</file>
+        <file>server_scripts/remove_all_containers.sh</file>
+        <file>server_scripts/remove_container.sh</file>
+        <file>server_scripts/setup_host_firewall.sh</file>
+        <file>server_scripts/sftp/configure_container.sh</file>
+        <file>server_scripts/sftp/Dockerfile</file>
+        <file>server_scripts/sftp/run_container.sh</file>
+        <file>server_scripts/socks5_proxy/configure_container.sh</file>
+        <file>server_scripts/socks5_proxy/Dockerfile</file>
+        <file>server_scripts/socks5_proxy/run_container.sh</file>
+        <file>server_scripts/socks5_proxy/start.sh</file>
+        <file>server_scripts/website_tor/configure_container.sh</file>
+        <file>server_scripts/website_tor/Dockerfile</file>
+        <file>server_scripts/website_tor/run_container.sh</file>
         <file>server_scripts/wireguard/configure_container.sh</file>
         <file>server_scripts/wireguard/Dockerfile</file>
         <file>server_scripts/wireguard/run_container.sh</file>
         <file>server_scripts/wireguard/start.sh</file>
         <file>server_scripts/wireguard/template.conf</file>
-        <file>server_scripts/website_tor/configure_container.sh</file>
-        <file>server_scripts/website_tor/run_container.sh</file>
+        <file>server_scripts/xray/configure_container.sh</file>
+        <file>server_scripts/xray/Dockerfile</file>
+        <file>server_scripts/xray/run_container.sh</file>
+        <file>server_scripts/xray/start.sh</file>
+        <file>server_scripts/xray/template.json</file>
+        <file>ui/qml/Components/AdLabel.qml</file>
+        <file>ui/qml/Components/ConnectButton.qml</file>
+        <file>ui/qml/Components/ConnectionTypeSelectionDrawer.qml</file>
+        <file>ui/qml/Components/HomeContainersListView.qml</file>
+        <file>ui/qml/Components/HomeSplitTunnelingDrawer.qml</file>
+        <file>ui/qml/Components/InstalledAppsDrawer.qml</file>
+        <file>ui/qml/Components/QuestionDrawer.qml</file>
+        <file>ui/qml/Components/SelectLanguageDrawer.qml</file>
+        <file>ui/qml/Components/ServersListView.qml</file>
+        <file>ui/qml/Components/SettingsContainersListView.qml</file>
+        <file>ui/qml/Components/ShareConnectionDrawer.qml</file>
+        <file>ui/qml/Components/TransportProtoSelector.qml</file>
         <file>ui/qml/Config/GlobalConfig.qml</file>
         <file>ui/qml/Config/qmldir</file>
-        <file>server_scripts/check_server_is_busy.sh</file>
-        <file>server_scripts/dns/configure_container.sh</file>
-        <file>server_scripts/dns/Dockerfile</file>
-        <file>server_scripts/dns/run_container.sh</file>
-        <file>server_scripts/sftp/configure_container.sh</file>
-        <file>server_scripts/sftp/Dockerfile</file>
-        <file>server_scripts/sftp/run_container.sh</file>
-        <file>server_scripts/ipsec/configure_container.sh</file>
-        <file>server_scripts/ipsec/Dockerfile</file>
-        <file>server_scripts/ipsec/run_container.sh</file>
-        <file>server_scripts/ipsec/start.sh</file>
-        <file>server_scripts/ipsec/mobileconfig.plist</file>
-        <file>server_scripts/ipsec/strongswan.profile</file>
-        <file>server_scripts/website_tor/Dockerfile</file>
-        <file>server_scripts/check_user_in_sudo.sh</file>
+        <file>ui/qml/Controls2/BackButtonType.qml</file>
         <file>ui/qml/Controls2/BasicButtonType.qml</file>
-        <file>ui/qml/Controls2/TextFieldWithHeaderType.qml</file>
-        <file>ui/qml/Controls2/LabelWithButtonType.qml</file>
-        <file>images/controls/arrow-right.svg</file>
-        <file>images/controls/chevron-right.svg</file>
-        <file>ui/qml/Controls2/ImageButtonType.qml</file>
+        <file>ui/qml/Controls2/BusyIndicatorType.qml</file>
         <file>ui/qml/Controls2/CardType.qml</file>
+        <file>ui/qml/Controls2/CardWithIconsType.qml</file>
         <file>ui/qml/Controls2/CheckBoxType.qml</file>
-        <file>images/controls/check.svg</file>
+        <file>ui/qml/Controls2/ContextMenuType.qml</file>
+        <file>ui/qml/Controls2/DividerType.qml</file>
+        <file>ui/qml/Controls2/DrawerType2.qml</file>
         <file>ui/qml/Controls2/DropDownType.qml</file>
-        <file>ui/qml/Pages2/PageSetupWizardStart.qml</file>
-        <file>ui/qml/main2.qml</file>
-        <file>images/amneziaBigLogo.png</file>
         <file>ui/qml/Controls2/FlickableType.qml</file>
-        <file>ui/qml/Pages2/PageSetupWizardCredentials.qml</file>
+        <file>ui/qml/Controls2/Header2Type.qml</file>
         <file>ui/qml/Controls2/HeaderType.qml</file>
-        <file>images/controls/arrow-left.svg</file>
-        <file>ui/qml/Pages2/PageSetupWizardProtocols.qml</file>
-        <file>ui/qml/Pages2/PageSetupWizardEasy.qml</file>
-        <file>images/controls/chevron-down.svg</file>
-        <file>images/controls/chevron-up.svg</file>
-        <file>ui/qml/Controls2/TextTypes/ParagraphTextType.qml</file>
-        <file>ui/qml/Controls2/TextTypes/Header2TextType.qml</file>
         <file>ui/qml/Controls2/HorizontalRadioButton.qml</file>
-        <file>ui/qml/Controls2/VerticalRadioButton.qml</file>
+        <file>ui/qml/Controls2/ImageButtonType.qml</file>
+        <file>ui/qml/Controls2/LabelWithButtonType.qml</file>
+        <file>ui/qml/Controls2/LabelWithImageType.qml</file>
+        <file>ui/qml/Controls2/ListViewWithLabelsType.qml</file>
+        <file>ui/qml/Controls2/ListViewWithRadioButtonType.qml</file>
+        <file>ui/qml/Controls2/PageType.qml</file>
+        <file>ui/qml/Controls2/PopupType.qml</file>
+        <file>ui/qml/Controls2/ProgressBarType.qml</file>
+        <file>ui/qml/Controls2/ScrollBarType.qml</file>
+        <file>ui/qml/Controls2/StackViewType.qml</file>
         <file>ui/qml/Controls2/SwitcherType.qml</file>
         <file>ui/qml/Controls2/TabButtonType.qml</file>
-        <file>ui/qml/Pages2/PageSetupWizardProtocolSettings.qml</file>
-        <file>ui/qml/Pages2/PageSetupWizardInstalling.qml</file>
-        <file>ui/qml/Pages2/PageSetupWizardConfigSource.qml</file>
-        <file>images/controls/folder-open.svg</file>
-        <file>images/controls/qr-code.svg</file>
-        <file>images/controls/text-cursor.svg</file>
-        <file>ui/qml/Pages2/PageSetupWizardTextKey.qml</file>
-        <file>ui/qml/Pages2/PageStart.qml</file>
         <file>ui/qml/Controls2/TabImageButtonType.qml</file>
-        <file>images/controls/home.svg</file>
-        <file>images/controls/settings-2.svg</file>
-        <file>images/controls/share-2.svg</file>
-        <file>ui/qml/Pages2/PageHome.qml</file>
-        <file>ui/qml/Pages2/PageSettingsServersList.qml</file>
-        <file>ui/qml/Pages2/PageShare.qml</file>
-        <file>ui/qml/Controls2/TextTypes/Header1TextType.qml</file>
-        <file>ui/qml/Controls2/TextTypes/LabelTextType.qml</file>
+        <file>ui/qml/Controls2/TextAreaType.qml</file>
+        <file>ui/qml/Controls2/TextAreaWithFooterType.qml</file>
+        <file>ui/qml/Controls2/TextFieldWithHeaderType.qml</file>
         <file>ui/qml/Controls2/TextTypes/ButtonTextType.qml</file>
-        <file>ui/qml/Controls2/Header2Type.qml</file>
-        <file>images/controls/plus.svg</file>
-        <file>ui/qml/Components/ConnectButton.qml</file>
-        <file>images/controls/download.svg</file>
-        <file>ui/qml/Controls2/ProgressBarType.qml</file>
-        <file>ui/qml/Components/ConnectionTypeSelectionDrawer.qml</file>
-        <file>ui/qml/Components/HomeContainersListView.qml</file>
         <file>ui/qml/Controls2/TextTypes/CaptionTextType.qml</file>
-        <file>images/controls/settings.svg</file>
-        <file>ui/qml/Pages2/PageSettingsServerInfo.qml</file>
-        <file>ui/qml/Controls2/PageType.qml</file>
-        <file>ui/qml/Controls2/PopupType.qml</file>
-        <file>images/controls/edit-3.svg</file>
-        <file>ui/qml/Pages2/PageSettingsServerData.qml</file>
-        <file>ui/qml/Components/SettingsContainersListView.qml</file>
+        <file>ui/qml/Controls2/TextTypes/Header1TextType.qml</file>
+        <file>ui/qml/Controls2/TextTypes/Header2TextType.qml</file>
+        <file>ui/qml/Controls2/TextTypes/LabelTextType.qml</file>
         <file>ui/qml/Controls2/TextTypes/ListItemTitleType.qml</file>
-        <file>ui/qml/Controls2/DividerType.qml</file>
-        <file>ui/qml/Controls2/StackViewType.qml</file>
-        <file>ui/qml/Pages2/PageSettings.qml</file>
-        <file>images/controls/amnezia.svg</file>
-        <file>images/controls/app.svg</file>
-        <file>images/controls/radio.svg</file>
-        <file>images/controls/save.svg</file>
-        <file>images/controls/server.svg</file>
-        <file>ui/qml/Pages2/PageSettingsServerProtocols.qml</file>
-        <file>ui/qml/Pages2/PageSettingsServerServices.qml</file>
-        <file>ui/qml/Pages2/PageSetupWizardViewConfig.qml</file>
-        <file>images/controls/file-cog-2.svg</file>
-        <file>ui/qml/Components/QuestionDrawer.qml</file>
-        <file>ui/qml/Pages2/PageDeinstalling.qml</file>
-        <file>ui/qml/Controls2/BackButtonType.qml</file>
-        <file>ui/qml/Pages2/PageSettingsServerProtocol.qml</file>
-        <file>ui/qml/Components/TransportProtoSelector.qml</file>
-        <file>ui/qml/Controls2/ListViewWithRadioButtonType.qml</file>
-        <file>images/controls/radio-button.svg</file>
-        <file>images/controls/radio-button-inner-circle.png</file>
-        <file>images/controls/radio-button-pressed.svg</file>
-        <file>images/controls/radio-button-inner-circle-pressed.png</file>
-        <file>ui/qml/Components/ShareConnectionDrawer.qml</file>
-        <file>ui/qml/Pages2/PageSettingsConnection.qml</file>
-        <file>ui/qml/Pages2/PageSettingsDns.qml</file>
-        <file>ui/qml/Pages2/PageSettingsApplication.qml</file>
-        <file>ui/qml/Pages2/PageSettingsBackup.qml</file>
-        <file>images/controls/delete.svg</file>
-        <file>ui/qml/Pages2/PageSettingsAbout.qml</file>
-        <file>images/controls/github.svg</file>
-        <file>images/controls/mail.svg</file>
-        <file>images/controls/telegram.svg</file>
+        <file>ui/qml/Controls2/TextTypes/ParagraphTextType.qml</file>
         <file>ui/qml/Controls2/TextTypes/SmallTextType.qml</file>
+        <file>ui/qml/Controls2/TopCloseButtonType.qml</file>
+        <file>ui/qml/Controls2/VerticalRadioButton.qml</file>
+        <file>ui/qml/Controls2/WarningType.qml</file>
         <file>ui/qml/Filters/ContainersModelFilters.qml</file>
-        <file>ui/qml/Components/SelectLanguageDrawer.qml</file>
-        <file>ui/qml/Controls2/BusyIndicatorType.qml</file>
+        <file>ui/qml/main2.qml</file>
+        <file>ui/qml/Modules/Style/AmneziaStyle.qml</file>
+        <file>ui/qml/Modules/Style/qmldir</file>
+        <file>ui/qml/Pages2/PageDeinstalling.qml</file>
+        <file>ui/qml/Pages2/PageDevMenu.qml</file>
+        <file>ui/qml/Pages2/PageHome.qml</file>
+        <file>ui/qml/Pages2/PageProtocolAwgSettings.qml</file>
+        <file>ui/qml/Pages2/PageProtocolCloakSettings.qml</file>
         <file>ui/qml/Pages2/PageProtocolOpenVpnSettings.qml</file>
+        <file>ui/qml/Pages2/PageProtocolRaw.qml</file>
         <file>ui/qml/Pages2/PageProtocolShadowSocksSettings.qml</file>
-        <file>ui/qml/Pages2/PageProtocolCloakSettings.qml</file>
+        <file>ui/qml/Pages2/PageProtocolWireGuardSettings.qml</file>
         <file>ui/qml/Pages2/PageProtocolXraySettings.qml</file>
-        <file>ui/qml/Pages2/PageProtocolRaw.qml</file>
-        <file>ui/qml/Pages2/PageSettingsLogging.qml</file>
+        <file>ui/qml/Pages2/PageServiceDnsSettings.qml</file>
         <file>ui/qml/Pages2/PageServiceSftpSettings.qml</file>
-        <file>images/controls/copy.svg</file>
+        <file>ui/qml/Pages2/PageServiceSocksProxySettings.qml</file>
         <file>ui/qml/Pages2/PageServiceTorWebsiteSettings.qml</file>
-        <file>ui/qml/Pages2/PageSetupWizardQrReader.qml</file>
-        <file>images/controls/eye.svg</file>
-        <file>images/controls/eye-off.svg</file>
-        <file>ui/qml/Pages2/PageSettingsSplitTunneling.qml</file>
-        <file>ui/qml/Controls2/ContextMenuType.qml</file>
-        <file>ui/qml/Controls2/TextAreaType.qml</file>
-        <file>images/controls/trash.svg</file>
-        <file>images/controls/more-vertical.svg</file>
-        <file>ui/qml/Controls2/ListViewWithLabelsType.qml</file>
-        <file>ui/qml/Pages2/PageServiceDnsSettings.qml</file>
-        <file>ui/qml/Controls2/TopCloseButtonType.qml</file>
-        <file>images/controls/x-circle.svg</file>
-        <file>ui/qml/Pages2/PageProtocolAwgSettings.qml</file>
-        <file>server_scripts/awg/template.conf</file>
-        <file>server_scripts/awg/start.sh</file>
-        <file>server_scripts/awg/configure_container.sh</file>
-        <file>server_scripts/awg/run_container.sh</file>
-        <file>server_scripts/awg/Dockerfile</file>
-        <file>ui/qml/Pages2/PageShareFullAccess.qml</file>
-        <file>images/controls/close.svg</file>
-        <file>images/controls/search.svg</file>
-        <file>server_scripts/xray/configure_container.sh</file>
-        <file>server_scripts/xray/Dockerfile</file>
-        <file>server_scripts/xray/run_container.sh</file>
-        <file>server_scripts/xray/start.sh</file>
-        <file>server_scripts/xray/template.json</file>
-        <file>ui/qml/Pages2/PageProtocolWireGuardSettings.qml</file>
-        <file>ui/qml/Components/HomeSplitTunnelingDrawer.qml</file>
-        <file>images/controls/split-tunneling.svg</file>
-        <file>ui/qml/Controls2/DrawerType2.qml</file>
+        <file>ui/qml/Pages2/PageSettings.qml</file>
+        <file>ui/qml/Pages2/PageSettingsAbout.qml</file>
+        <file>ui/qml/Pages2/PageSettingsApiLanguageList.qml</file>
+        <file>ui/qml/Pages2/PageSettingsApiServerInfo.qml</file>
+        <file>ui/qml/Pages2/PageSettingsApplication.qml</file>
         <file>ui/qml/Pages2/PageSettingsAppSplitTunneling.qml</file>
-        <file>ui/qml/Components/InstalledAppsDrawer.qml</file>
-        <file>images/controls/alert-circle.svg</file>
-        <file>images/controls/file-check-2.svg</file>
-        <file>ui/qml/Controls2/WarningType.qml</file>
-        <file>fonts/pt-root-ui_vf.ttf</file>
-        <file>ui/qml/Modules/Style/qmldir</file>
-        <file>ui/qml/Modules/Style/AmneziaStyle.qml</file>
-        <file>ui/qml/Pages2/PageServiceSocksProxySettings.qml</file>
-        <file>server_scripts/socks5_proxy/run_container.sh</file>
-        <file>server_scripts/socks5_proxy/Dockerfile</file>
-        <file>server_scripts/socks5_proxy/configure_container.sh</file>
-        <file>server_scripts/socks5_proxy/start.sh</file>
-        <file>server_scripts/ipsec/template.conf</file>
+        <file>ui/qml/Pages2/PageSettingsBackup.qml</file>
+        <file>ui/qml/Pages2/PageSettingsConnection.qml</file>
+        <file>ui/qml/Pages2/PageSettingsDns.qml</file>
+        <file>ui/qml/Pages2/PageSettingsLogging.qml</file>
+        <file>ui/qml/Pages2/PageSettingsServerData.qml</file>
+        <file>ui/qml/Pages2/PageSettingsServerInfo.qml</file>
+        <file>ui/qml/Pages2/PageSettingsServerProtocol.qml</file>
+        <file>ui/qml/Pages2/PageSettingsServerProtocols.qml</file>
+        <file>ui/qml/Pages2/PageSettingsServerServices.qml</file>
+        <file>ui/qml/Pages2/PageSettingsServersList.qml</file>
+        <file>ui/qml/Pages2/PageSettingsSplitTunneling.qml</file>
         <file>ui/qml/Pages2/PageProtocolAwgClientSettings.qml</file>
         <file>ui/qml/Pages2/PageProtocolWireGuardClientSettings.qml</file>
-        <file>ui/qml/Pages2/PageSetupWizardApiServicesList.qml</file>
         <file>ui/qml/Pages2/PageSetupWizardApiServiceInfo.qml</file>
-        <file>ui/qml/Controls2/CardWithIconsType.qml</file>
-        <file>images/controls/tag.svg</file>
-        <file>images/controls/history.svg</file>
-        <file>images/controls/gauge.svg</file>
-        <file>images/controls/map-pin.svg</file>
-        <file>ui/qml/Controls2/LabelWithImageType.qml</file>
-        <file>images/controls/info.svg</file>
-        <file>ui/qml/Controls2/TextAreaWithFooterType.qml</file>
-        <file>images/controls/scan-line.svg</file>
-        <file>images/controls/folder-search-2.svg</file>
-        <file>ui/qml/Pages2/PageSettingsApiServerInfo.qml</file>
-        <file>images/controls/bug.svg</file>
-        <file>ui/qml/Pages2/PageDevMenu.qml</file>
-        <file>images/controls/refresh-cw.svg</file>
-        <file>ui/qml/Pages2/PageSettingsApiLanguageList.qml</file>
-        <file>images/controls/archive-restore.svg</file>
-        <file>images/controls/help-circle.svg</file>
+        <file>ui/qml/Pages2/PageSetupWizardApiServicesList.qml</file>
+        <file>ui/qml/Pages2/PageSetupWizardConfigSource.qml</file>
+        <file>ui/qml/Pages2/PageSetupWizardCredentials.qml</file>
+        <file>ui/qml/Pages2/PageSetupWizardEasy.qml</file>
+        <file>ui/qml/Pages2/PageSetupWizardInstalling.qml</file>
+        <file>ui/qml/Pages2/PageSetupWizardProtocols.qml</file>
+        <file>ui/qml/Pages2/PageSetupWizardProtocolSettings.qml</file>
+        <file>ui/qml/Pages2/PageSetupWizardQrReader.qml</file>
+        <file>ui/qml/Pages2/PageSetupWizardStart.qml</file>
+        <file>ui/qml/Pages2/PageSetupWizardTextKey.qml</file>
+        <file>ui/qml/Pages2/PageSetupWizardViewConfig.qml</file>
+        <file>ui/qml/Pages2/PageShare.qml</file>
+        <file>ui/qml/Pages2/PageShareFullAccess.qml</file>
+        <file>ui/qml/Pages2/PageStart.qml</file>
     </qresource>
     <qresource prefix="/countriesFlags">
         <file>images/flagKit/ZW.svg</file>
diff --git a/client/server_scripts/awg/configure_container.sh b/client/server_scripts/awg/configure_container.sh
index 322cc38fa..2000c9656 100644
--- a/client/server_scripts/awg/configure_container.sh
+++ b/client/server_scripts/awg/configure_container.sh
@@ -12,7 +12,7 @@ echo $WIREGUARD_PSK > /opt/amnezia/awg/wireguard_psk.key
 cat > /opt/amnezia/awg/wg0.conf <<EOF
 [Interface]
 PrivateKey = $WIREGUARD_SERVER_PRIVATE_KEY
-Address = $WIREGUARD_SUBNET_IP/$WIREGUARD_SUBNET_CIDR
+Address = $AWG_SUBNET_IP/$WIREGUARD_SUBNET_CIDR
 ListenPort = $AWG_SERVER_PORT
 Jc = $JUNK_PACKET_COUNT
 Jmin = $JUNK_PACKET_MIN_SIZE
diff --git a/client/server_scripts/awg/start.sh b/client/server_scripts/awg/start.sh
index dc713ec22..108e85df1 100644
--- a/client/server_scripts/awg/start.sh
+++ b/client/server_scripts/awg/start.sh
@@ -17,12 +17,12 @@ iptables -A FORWARD -i wg0 -j ACCEPT
 iptables -A OUTPUT -o wg0 -j ACCEPT
 
 # Allow forwarding traffic only from the VPN.
-iptables -A FORWARD -i wg0 -o eth0 -s $WIREGUARD_SUBNET_IP/$WIREGUARD_SUBNET_CIDR -j ACCEPT
-iptables -A FORWARD -i wg0 -o eth1 -s $WIREGUARD_SUBNET_IP/$WIREGUARD_SUBNET_CIDR -j ACCEPT
+iptables -A FORWARD -i wg0 -o eth0 -s $AWG_SUBNET_IP/$WIREGUARD_SUBNET_CIDR -j ACCEPT
+iptables -A FORWARD -i wg0 -o eth1 -s $AWG_SUBNET_IP/$WIREGUARD_SUBNET_CIDR -j ACCEPT
 
 iptables -A FORWARD -m state --state ESTABLISHED,RELATED -j ACCEPT
 
-iptables -t nat -A POSTROUTING -s $WIREGUARD_SUBNET_IP/$WIREGUARD_SUBNET_CIDR -o eth0 -j MASQUERADE
-iptables -t nat -A POSTROUTING -s $WIREGUARD_SUBNET_IP/$WIREGUARD_SUBNET_CIDR -o eth1 -j MASQUERADE
+iptables -t nat -A POSTROUTING -s $AWG_SUBNET_IP/$WIREGUARD_SUBNET_CIDR -o eth0 -j MASQUERADE
+iptables -t nat -A POSTROUTING -s $AWG_SUBNET_IP/$WIREGUARD_SUBNET_CIDR -o eth1 -j MASQUERADE
 
 tail -f /dev/null
diff --git a/client/settings.cpp b/client/settings.cpp
index 7a572a136..94b11d00e 100644
--- a/client/settings.cpp
+++ b/client/settings.cpp
@@ -538,3 +538,13 @@ void Settings::toggleDevGatewayEnv(bool enabled)
 {
     m_isDevGatewayEnv = enabled;
 }
+
+bool Settings::isHomeAdLabelVisible()
+{
+    return value("Conf/homeAdLabelVisible", true).toBool();
+}
+
+void Settings::disableHomeAdLabel()
+{
+    setValue("Conf/homeAdLabelVisible", false);
+}
diff --git a/client/settings.h b/client/settings.h
index f41f4d29a..b383d3da7 100644
--- a/client/settings.h
+++ b/client/settings.h
@@ -222,6 +222,9 @@ class Settings : public QObject
     bool isDevGatewayEnv();
     void toggleDevGatewayEnv(bool enabled);
 
+    bool isHomeAdLabelVisible();
+    void disableHomeAdLabel();
+
 signals:
     void saveLogsChanged(bool enabled);
     void screenshotsEnabledChanged(bool enabled);
diff --git a/client/translations/amneziavpn_ru_RU.ts b/client/translations/amneziavpn_ru_RU.ts
index 2fb21259e..c0d855b25 100644
--- a/client/translations/amneziavpn_ru_RU.ts
+++ b/client/translations/amneziavpn_ru_RU.ts
@@ -2679,7 +2679,7 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="154"/>
         <source>Where to get connection data, step-by-step instructions for buying a VPS</source>
-        <translation>Где взять данные для подключения, пошаговые инстуркции по покупке VPS</translation>
+        <translation>Где взять данные для подключения, пошаговые инструкции по покупке VPS</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="170"/>
diff --git a/client/ui/controllers/focusController.cpp b/client/ui/controllers/focusController.cpp
new file mode 100644
index 000000000..54bdc7d85
--- /dev/null
+++ b/client/ui/controllers/focusController.cpp
@@ -0,0 +1,209 @@
+#include "focusController.h"
+#include "utils/qmlUtils.h"
+
+#include <QQmlApplicationEngine>
+#include <QQuickWindow>
+
+FocusController::FocusController(QQmlApplicationEngine *engine, QObject *parent)
+    : QObject { parent },
+      m_engine { engine },
+      m_focusChain {},
+      m_focusedItem { nullptr },
+      m_rootObjects {},
+      m_defaultFocusItem { nullptr },
+      m_lvfc { nullptr }
+{
+    QObject::connect(m_engine, &QQmlApplicationEngine::objectCreated, this, [this](QObject *object, const QUrl &url) {
+        QQuickItem *newDefaultFocusItem = object->findChild<QQuickItem *>("defaultFocusItem");
+        if (newDefaultFocusItem && m_defaultFocusItem != newDefaultFocusItem) {
+            m_defaultFocusItem = newDefaultFocusItem;
+        }
+    });
+
+    QObject::connect(this, &FocusController::focusedItemChanged, this,
+                     [this]() { m_focusedItem->forceActiveFocus(Qt::TabFocusReason); });
+}
+
+void FocusController::nextKeyTabItem()
+{
+    nextItem(Direction::Forward);
+}
+
+void FocusController::previousKeyTabItem()
+{
+    nextItem(Direction::Backward);
+}
+
+void FocusController::nextKeyUpItem()
+{
+    nextItem(Direction::Backward);
+}
+
+void FocusController::nextKeyDownItem()
+{
+    nextItem(Direction::Forward);
+}
+
+void FocusController::nextKeyLeftItem()
+{
+    nextItem(Direction::Backward);
+}
+
+void FocusController::nextKeyRightItem()
+{
+    nextItem(Direction::Forward);
+}
+
+void FocusController::setFocusItem(QQuickItem *item)
+{
+    if (m_focusedItem != item) {
+        m_focusedItem = item;
+    }
+    emit focusedItemChanged();
+}
+
+void FocusController::setFocusOnDefaultItem()
+{
+    setFocusItem(m_defaultFocusItem);
+}
+
+void FocusController::pushRootObject(QObject *object)
+{
+    m_rootObjects.push(object);
+    dropListView();
+    // setFocusOnDefaultItem();
+}
+
+void FocusController::dropRootObject(QObject *object)
+{
+    if (m_rootObjects.empty()) {
+        return;
+    }
+
+    if (m_rootObjects.top() == object) {
+        m_rootObjects.pop();
+        dropListView();
+        setFocusOnDefaultItem();
+    } else {
+        qWarning() << "===>> TRY TO DROP WRONG ROOT OBJECT: " << m_rootObjects.top() << " SHOULD BE: " << object;
+    }
+}
+
+void FocusController::resetRootObject()
+{
+    m_rootObjects.clear();
+}
+
+void FocusController::reload(Direction direction)
+{
+    m_focusChain.clear();
+
+    QObject *rootObject = (m_rootObjects.empty() ? m_engine->rootObjects().value(0) : m_rootObjects.top());
+
+    if (!rootObject) {
+        qCritical() << "No ROOT OBJECT found!";
+        resetRootObject();
+        dropListView();
+        return;
+    }
+
+    m_focusChain.append(FocusControl::getSubChain(rootObject));
+
+    std::sort(m_focusChain.begin(), m_focusChain.end(),
+              direction == Direction::Forward ? FocusControl::isLess : FocusControl::isMore);
+
+    if (m_focusChain.empty()) {
+        qWarning() << "Focus chain is empty!";
+        resetRootObject();
+        dropListView();
+        return;
+    }
+}
+
+void FocusController::nextItem(Direction direction)
+{
+    reload(direction);
+
+    if (m_lvfc && FocusControl::isListView(m_focusedItem)) {
+        direction == Direction::Forward ? focusNextListViewItem() : focusPreviousListViewItem();
+
+        return;
+    }
+
+    if (m_focusChain.empty()) {
+        qWarning() << "There are no items to navigate";
+        setFocusOnDefaultItem();
+        return;
+    }
+
+    auto focusedItemIndex = m_focusChain.indexOf(m_focusedItem);
+
+    if (focusedItemIndex == -1) {
+        focusedItemIndex = 0;
+    } else if (focusedItemIndex == (m_focusChain.size() - 1)) {
+        focusedItemIndex = 0;
+    } else {
+        focusedItemIndex++;
+    }
+
+    const auto focusedItem = qobject_cast<QQuickItem *>(m_focusChain.at(focusedItemIndex));
+
+    if (focusedItem == nullptr) {
+        qWarning() << "Failed to get item to focus on. Setting focus on default";
+        setFocusOnDefaultItem();
+        return;
+    }
+
+    if (FocusControl::isListView(focusedItem)) {
+        m_lvfc = new ListViewFocusController(focusedItem, this);
+        m_focusedItem = focusedItem;
+        if (direction == Direction::Forward) {
+            m_lvfc->nextDelegate();
+            focusNextListViewItem();
+        } else {
+            m_lvfc->previousDelegate();
+            focusPreviousListViewItem();
+        }
+        return;
+    }
+
+    setFocusItem(focusedItem);
+}
+
+void FocusController::focusNextListViewItem()
+{
+    m_lvfc->reloadFocusChain();
+    if (m_lvfc->isLastFocusItemInListView() || m_lvfc->isReturnNeeded()) {
+        dropListView();
+        nextItem(Direction::Forward);
+        return;
+    } else if (m_lvfc->isLastFocusItemInDelegate()) {
+        m_lvfc->resetFocusChain();
+        m_lvfc->nextDelegate();
+    }
+
+    m_lvfc->focusNextItem();
+}
+
+void FocusController::focusPreviousListViewItem()
+{
+    m_lvfc->reloadFocusChain();
+    if (m_lvfc->isFirstFocusItemInListView() || m_lvfc->isReturnNeeded()) {
+        dropListView();
+        nextItem(Direction::Backward);
+        return;
+    } else if (m_lvfc->isFirstFocusItemInDelegate()) {
+        m_lvfc->resetFocusChain();
+        m_lvfc->previousDelegate();
+    }
+
+    m_lvfc->focusPreviousItem();
+}
+
+void FocusController::dropListView()
+{
+    if (m_lvfc) {
+        delete m_lvfc;
+        m_lvfc = nullptr;
+    }
+}
diff --git a/client/ui/controllers/focusController.h b/client/ui/controllers/focusController.h
new file mode 100644
index 000000000..11074dae6
--- /dev/null
+++ b/client/ui/controllers/focusController.h
@@ -0,0 +1,57 @@
+#ifndef FOCUSCONTROLLER_H
+#define FOCUSCONTROLLER_H
+
+#include "ui/controllers/listViewFocusController.h"
+
+#include <QQmlApplicationEngine>
+
+/*!
+ * \brief The FocusController class makes focus control more straightforward
+ * \details Focus is handled only for visible and enabled items which have
+ *          `isFocused` property from top left to bottom right.
+ * \note There are items handled differently (e.g. ListView)
+ */
+class FocusController : public QObject
+{
+    Q_OBJECT
+public:
+    explicit FocusController(QQmlApplicationEngine *engine, QObject *parent = nullptr);
+    ~FocusController() override = default;
+
+    Q_INVOKABLE void nextKeyTabItem();
+    Q_INVOKABLE void previousKeyTabItem();
+    Q_INVOKABLE void nextKeyUpItem();
+    Q_INVOKABLE void nextKeyDownItem();
+    Q_INVOKABLE void nextKeyLeftItem();
+    Q_INVOKABLE void nextKeyRightItem();
+    Q_INVOKABLE void setFocusItem(QQuickItem *item);
+    Q_INVOKABLE void setFocusOnDefaultItem();
+    Q_INVOKABLE void pushRootObject(QObject *object);
+    Q_INVOKABLE void dropRootObject(QObject *object);
+    Q_INVOKABLE void resetRootObject();
+
+private:
+    enum class Direction {
+        Forward,
+        Backward,
+    };
+
+    void reload(Direction direction);
+    void nextItem(Direction direction);
+    void focusNextListViewItem();
+    void focusPreviousListViewItem();
+    void dropListView();
+
+    QQmlApplicationEngine *m_engine; // Pointer to engine to get root object
+    QList<QObject *> m_focusChain;   // List of current objects to be focused
+    QQuickItem *m_focusedItem;       // Pointer to the active focus item
+    QStack<QObject *> m_rootObjects; // Pointer to stack of roots for focus chain
+    QQuickItem *m_defaultFocusItem;
+
+    ListViewFocusController *m_lvfc; // ListView focus manager
+
+signals:
+    void focusedItemChanged();
+};
+
+#endif // FOCUSCONTROLLER_H
diff --git a/client/ui/controllers/importController.cpp b/client/ui/controllers/importController.cpp
index f7e96bfff..28bbc9f6b 100644
--- a/client/ui/controllers/importController.cpp
+++ b/client/ui/controllers/importController.cpp
@@ -9,6 +9,7 @@
 
 #include "core/errorstrings.h"
 #include "core/serialization/serialization.h"
+#include "systemController.h"
 #include "utilities.h"
 
 #ifdef Q_OS_ANDROID
@@ -76,17 +77,18 @@ ImportController::ImportController(const QSharedPointer<ServersModel> &serversMo
 
 bool ImportController::extractConfigFromFile(const QString &fileName)
 {
-    QFile file(fileName);
-
-    if (file.open(QIODevice::ReadOnly)) {
-        QString data = file.readAll();
-
-        m_configFileName = QFileInfo(file.fileName()).fileName();
-        return extractConfigFromData(data);
+    QString data;
+    if (!SystemController::readFile(fileName, data)) {
+        emit importErrorOccurred(ErrorCode::ImportOpenConfigError, false);
+        return false;
     }
-
-    emit importErrorOccurred(ErrorCode::ImportOpenConfigError, false);
-    return false;
+    m_configFileName = QFileInfo(QFile(fileName).fileName()).fileName();
+#ifdef Q_OS_ANDROID
+    if (m_configFileName.isEmpty()) {
+        m_configFileName = AndroidController::instance()->getFileName(fileName);
+    }
+#endif
+    return extractConfigFromData(data);
 }
 
 bool ImportController::extractConfigFromData(QString data)
diff --git a/client/ui/controllers/listViewFocusController.cpp b/client/ui/controllers/listViewFocusController.cpp
new file mode 100644
index 000000000..9fa232ca0
--- /dev/null
+++ b/client/ui/controllers/listViewFocusController.cpp
@@ -0,0 +1,309 @@
+#include "listViewFocusController.h"
+#include "utils/qmlUtils.h"
+
+#include <QQuickWindow>
+
+ListViewFocusController::ListViewFocusController(QQuickItem *listView, QObject *parent)
+    : QObject { parent },
+      m_listView { listView },
+      m_focusChain {},
+      m_currentSection { Section::Default },
+      m_header { nullptr },
+      m_footer { nullptr },
+      m_focusedItem { nullptr },
+      m_focusedItemIndex { -1 },
+      m_delegateIndex { 0 },
+      m_isReturnNeeded { false },
+      m_currentSectionString { "Default", "Header", "Delegate", "Footer" }
+{
+    QVariant headerItemProperty = m_listView->property("headerItem");
+    m_header = headerItemProperty.canConvert<QQuickItem *>() ? headerItemProperty.value<QQuickItem *>() : nullptr;
+
+    QVariant footerItemProperty = m_listView->property("footerItem");
+    m_footer = footerItemProperty.canConvert<QQuickItem *>() ? footerItemProperty.value<QQuickItem *>() : nullptr;
+}
+
+ListViewFocusController::~ListViewFocusController()
+{
+}
+
+void ListViewFocusController::viewAtCurrentIndex() const
+{
+    switch (m_currentSection) {
+    case Section::Default: [[fallthrough]];
+    case Section::Header: {
+        QMetaObject::invokeMethod(m_listView, "positionViewAtBeginning");
+        break;
+    }
+    case Section::Delegate: {
+        QMetaObject::invokeMethod(m_listView, "positionViewAtIndex", Q_ARG(int, m_delegateIndex), // Index
+                                  Q_ARG(int, 2)); // PositionMode (0 = Visible)
+        break;
+    }
+    case Section::Footer: {
+        QMetaObject::invokeMethod(m_listView, "positionViewAtEnd");
+        break;
+    }
+    }
+}
+
+int ListViewFocusController::size() const
+{
+    return m_listView->property("count").toInt();
+}
+
+int ListViewFocusController::currentIndex() const
+{
+    return m_delegateIndex;
+}
+
+void ListViewFocusController::setDelegateIndex(int index)
+{
+    m_delegateIndex = index;
+    m_listView->setProperty("currentIndex", index);
+}
+
+void ListViewFocusController::nextDelegate()
+{
+    switch (m_currentSection) {
+    case Section::Default: {
+        if (hasHeader()) {
+            m_currentSection = Section::Header;
+            viewAtCurrentIndex();
+            break;
+        }
+        [[fallthrough]];
+    }
+    case Section::Header: {
+        if (size() > 0) {
+            m_currentSection = Section::Delegate;
+            viewAtCurrentIndex();
+            break;
+        }
+        [[fallthrough]];
+    }
+    case Section::Delegate:
+        if (m_delegateIndex < (size() - 1)) {
+            setDelegateIndex(m_delegateIndex + 1);
+            viewAtCurrentIndex();
+            break;
+        } else if (hasFooter()) {
+            m_currentSection = Section::Footer;
+            viewAtCurrentIndex();
+            break;
+        }
+        [[fallthrough]];
+    case Section::Footer: {
+        m_isReturnNeeded = true;
+        m_currentSection = Section::Default;
+        viewAtCurrentIndex();
+        break;
+    }
+    default: {
+        qCritical() << "Current section is invalid!";
+        break;
+    }
+    }
+}
+
+void ListViewFocusController::previousDelegate()
+{
+    switch (m_currentSection) {
+    case Section::Default: {
+        if (hasFooter()) {
+            m_currentSection = Section::Footer;
+            break;
+        }
+        [[fallthrough]];
+    }
+    case Section::Footer: {
+        if (size() > 0) {
+            m_currentSection = Section::Delegate;
+            setDelegateIndex(size() - 1);
+            break;
+        }
+        [[fallthrough]];
+    }
+    case Section::Delegate: {
+        if (m_delegateIndex > 0) {
+            setDelegateIndex(m_delegateIndex - 1);
+            break;
+        } else if (hasHeader()) {
+            m_currentSection = Section::Header;
+            break;
+        }
+        [[fallthrough]];
+    }
+    case Section::Header: {
+        m_isReturnNeeded = true;
+        m_currentSection = Section::Default;
+        break;
+    }
+    default: {
+        qCritical() << "Current section is invalid!";
+        break;
+    }
+    }
+}
+
+void ListViewFocusController::decrementIndex()
+{
+    m_delegateIndex--;
+}
+
+QQuickItem *ListViewFocusController::itemAtIndex(const int index) const
+{
+    QQuickItem *item { nullptr };
+
+    QMetaObject::invokeMethod(m_listView, "itemAtIndex", Q_RETURN_ARG(QQuickItem *, item), Q_ARG(int, index));
+
+    return item;
+}
+
+QQuickItem *ListViewFocusController::currentDelegate() const
+{
+    QQuickItem *result { nullptr };
+
+    switch (m_currentSection) {
+    case Section::Default: {
+        qWarning() << "No elements...";
+        break;
+    }
+    case Section::Header: {
+        result = m_header;
+        break;
+    }
+    case Section::Delegate: {
+        result = itemAtIndex(m_delegateIndex);
+        break;
+    }
+    case Section::Footer: {
+        result = m_footer;
+        break;
+    }
+    }
+    return result;
+}
+
+QQuickItem *ListViewFocusController::focusedItem() const
+{
+    return m_focusedItem;
+}
+
+void ListViewFocusController::focusNextItem()
+{
+    if (m_isReturnNeeded) {
+        return;
+    }
+
+    reloadFocusChain();
+
+    if (m_focusChain.empty()) {
+        qWarning() << "No elements found in the delegate. Going to next delegate...";
+        nextDelegate();
+        focusNextItem();
+        return;
+    }
+    m_focusedItemIndex++;
+    m_focusedItem = qobject_cast<QQuickItem *>(m_focusChain.at(m_focusedItemIndex));
+    m_focusedItem->forceActiveFocus(Qt::TabFocusReason);
+}
+
+void ListViewFocusController::focusPreviousItem()
+{
+    if (m_isReturnNeeded) {
+        return;
+    }
+
+    if (m_focusChain.empty()) {
+        qInfo() << "Empty focusChain with current delegate: " << currentDelegate() << "Scanning for elements...";
+        reloadFocusChain();
+    }
+    if (m_focusChain.empty()) {
+        qWarning() << "No elements found in the delegate. Going to next delegate...";
+        previousDelegate();
+        focusPreviousItem();
+        return;
+    }
+    if (m_focusedItemIndex == -1) {
+        m_focusedItemIndex = m_focusChain.size();
+    }
+    m_focusedItemIndex--;
+    m_focusedItem = qobject_cast<QQuickItem *>(m_focusChain.at(m_focusedItemIndex));
+    m_focusedItem->forceActiveFocus(Qt::TabFocusReason);
+}
+
+void ListViewFocusController::resetFocusChain()
+{
+    m_focusChain.clear();
+    m_focusedItem = nullptr;
+    m_focusedItemIndex = -1;
+}
+
+void ListViewFocusController::reloadFocusChain()
+{
+    m_focusChain = FocusControl::getItemsChain(currentDelegate());
+}
+
+bool ListViewFocusController::isFirstFocusItemInDelegate() const
+{
+    return m_focusedItem && (m_focusedItem == m_focusChain.first());
+}
+
+bool ListViewFocusController::isLastFocusItemInDelegate() const
+{
+    return m_focusedItem && (m_focusedItem == m_focusChain.last());
+}
+
+bool ListViewFocusController::hasHeader() const
+{
+    return m_header && !FocusControl::getItemsChain(m_header).isEmpty();
+}
+
+bool ListViewFocusController::hasFooter() const
+{
+    return m_footer && !FocusControl::getItemsChain(m_footer).isEmpty();
+}
+
+bool ListViewFocusController::isFirstFocusItemInListView() const
+{
+    switch (m_currentSection) {
+    case Section::Footer: {
+        return isFirstFocusItemInDelegate() && !hasHeader() && (size() == 0);
+    }
+    case Section::Delegate: {
+        return isFirstFocusItemInDelegate() && (m_delegateIndex == 0) && !hasHeader();
+    }
+    case Section::Header: {
+        isFirstFocusItemInDelegate();
+    }
+    case Section::Default: {
+        return true;
+    }
+    default: qWarning() << "Wrong section"; return true;
+    }
+}
+
+bool ListViewFocusController::isLastFocusItemInListView() const
+{
+    switch (m_currentSection) {
+    case Section::Default: {
+        return !hasHeader() && (size() == 0) && !hasFooter();
+    }
+    case Section::Header: {
+        return isLastFocusItemInDelegate() && (size() == 0) && !hasFooter();
+    }
+    case Section::Delegate: {
+        return isLastFocusItemInDelegate() && (m_delegateIndex == size() - 1) && !hasFooter();
+    }
+    case Section::Footer: {
+        return isLastFocusItemInDelegate();
+    }
+    default: qWarning() << "Wrong section"; return true;
+    }
+}
+
+bool ListViewFocusController::isReturnNeeded() const
+{
+    return m_isReturnNeeded;
+}
diff --git a/client/ui/controllers/listViewFocusController.h b/client/ui/controllers/listViewFocusController.h
new file mode 100644
index 000000000..f64057161
--- /dev/null
+++ b/client/ui/controllers/listViewFocusController.h
@@ -0,0 +1,70 @@
+#ifndef LISTVIEWFOCUSCONTROLLER_H
+#define LISTVIEWFOCUSCONTROLLER_H
+
+#include <QList>
+#include <QObject>
+#include <QQuickItem>
+#include <QSharedPointer>
+#include <QStack>
+
+/*!
+ * \brief The ListViewFocusController class manages the focus of elements in ListView
+ * \details This class object moving focus to ListView's controls since ListView stores
+ *          it's data implicitly and it could be got one by one.
+ *
+ *          This class was made to store as less as possible data getting it from QML
+ *          when it's needed.
+ */
+class ListViewFocusController : public QObject
+{
+    Q_OBJECT
+public:
+    explicit ListViewFocusController(QQuickItem *listView, QObject *parent = nullptr);
+    ~ListViewFocusController();
+
+    void nextDelegate();
+    void previousDelegate();
+    void decrementIndex();
+    void focusNextItem();
+    void focusPreviousItem();
+    void resetFocusChain();
+    void reloadFocusChain();
+    bool isFirstFocusItemInListView() const;
+    bool isFirstFocusItemInDelegate() const;
+    bool isLastFocusItemInListView() const;
+    bool isLastFocusItemInDelegate() const;
+    bool isReturnNeeded() const;
+
+private:
+    enum class Section {
+        Default,
+        Header,
+        Delegate,
+        Footer,
+    };
+
+    int size() const;
+    int currentIndex() const;
+    void setDelegateIndex(int index);
+    void viewAtCurrentIndex() const;
+    QQuickItem *itemAtIndex(const int index) const;
+    QQuickItem *currentDelegate() const;
+    QQuickItem *focusedItem() const;
+
+    bool hasHeader() const;
+    bool hasFooter() const;
+
+    QQuickItem *m_listView;
+    QList<QObject *> m_focusChain;
+    Section m_currentSection;
+    QQuickItem *m_header;
+    QQuickItem *m_footer;
+    QQuickItem *m_focusedItem; // Pointer to focused item on Delegate
+    qsizetype m_focusedItemIndex;
+    qsizetype m_delegateIndex;
+    bool m_isReturnNeeded;
+
+    QList<QString> m_currentSectionString;
+};
+
+#endif // LISTVIEWFOCUSCONTROLLER_H
diff --git a/client/ui/controllers/pageController.cpp b/client/ui/controllers/pageController.cpp
index bbcc55a18..d515df498 100644
--- a/client/ui/controllers/pageController.cpp
+++ b/client/ui/controllers/pageController.cpp
@@ -81,7 +81,7 @@ void PageController::keyPressEvent(Qt::Key key)
     case Qt::Key_Escape: {
         if (m_drawerDepth) {
             emit closeTopDrawer();
-            setDrawerDepth(getDrawerDepth() - 1);
+            decrementDrawerDepth();
         } else {
             emit escapePressed();
         }
@@ -142,11 +142,25 @@ void PageController::setDrawerDepth(const int depth)
     }
 }
 
-int PageController::getDrawerDepth()
+int PageController::getDrawerDepth() const
 {
     return m_drawerDepth;
 }
 
+int PageController::incrementDrawerDepth()
+{
+    return ++m_drawerDepth;
+}
+
+int PageController::decrementDrawerDepth()
+{
+    if (m_drawerDepth == 0) {
+        return m_drawerDepth;
+    } else {
+        return --m_drawerDepth;
+    }
+}
+
 void PageController::onShowErrorMessage(ErrorCode errorCode)
 {
     const auto fullErrorMessage = errorString(errorCode);
diff --git a/client/ui/controllers/pageController.h b/client/ui/controllers/pageController.h
index f89d39a11..ffbdd3a1c 100644
--- a/client/ui/controllers/pageController.h
+++ b/client/ui/controllers/pageController.h
@@ -100,7 +100,9 @@ public slots:
     void closeApplication();
 
     void setDrawerDepth(const int depth);
-    int getDrawerDepth();
+    int getDrawerDepth() const;
+    int incrementDrawerDepth();
+    int decrementDrawerDepth();
 
   private slots:
     void onShowErrorMessage(amnezia::ErrorCode errorCode);
@@ -135,9 +137,6 @@ public slots:
     void escapePressed();
     void closeTopDrawer();
 
-    void forceTabBarActiveFocus();
-    void forceStackActiveFocus();
-
 private:
     QSharedPointer<ServersModel> m_serversModel;
 
diff --git a/client/ui/controllers/settingsController.cpp b/client/ui/controllers/settingsController.cpp
index c3945512f..f4e3d83df 100644
--- a/client/ui/controllers/settingsController.cpp
+++ b/client/ui/controllers/settingsController.cpp
@@ -131,12 +131,8 @@ void SettingsController::backupAppConfig(const QString &fileName)
 
 void SettingsController::restoreAppConfig(const QString &fileName)
 {
-    QFile file(fileName);
-
-    file.open(QIODevice::ReadOnly);
-
-    QByteArray data = file.readAll();
-
+    QByteArray data;
+    SystemController::readFile(fileName, data);
     restoreAppConfigFromData(data);
 }
 
@@ -324,4 +320,15 @@ bool SettingsController::isOnTv()
 #else
     return false;
 #endif
-}
\ No newline at end of file
+}
+
+bool SettingsController::isHomeAdLabelVisible()
+{
+    return m_settings->isHomeAdLabelVisible();
+}
+
+void SettingsController::disableHomeAdLabel()
+{
+    m_settings->disableHomeAdLabel();
+    emit isHomeAdLabelVisibleChanged(false);
+}
diff --git a/client/ui/controllers/settingsController.h b/client/ui/controllers/settingsController.h
index efc18a7d0..7781f6c74 100644
--- a/client/ui/controllers/settingsController.h
+++ b/client/ui/controllers/settingsController.h
@@ -29,6 +29,8 @@ class SettingsController : public QObject
     Q_PROPERTY(QString gatewayEndpoint READ getGatewayEndpoint WRITE setGatewayEndpoint NOTIFY gatewayEndpointChanged)
     Q_PROPERTY(bool isDevGatewayEnv READ isDevGatewayEnv WRITE toggleDevGatewayEnv NOTIFY devGatewayEnvChanged)
 
+    Q_PROPERTY(bool isHomeAdLabelVisible READ isHomeAdLabelVisible NOTIFY isHomeAdLabelVisibleChanged)
+
 public slots:
     void toggleAmneziaDns(bool enable);
     bool isAmneziaDnsEnabled();
@@ -89,6 +91,9 @@ public slots:
 
     bool isOnTv();
 
+    bool isHomeAdLabelVisible();
+    void disableHomeAdLabel();
+
 signals:
     void primaryDnsChanged();
     void secondaryDnsChanged();
@@ -112,6 +117,8 @@ public slots:
     void gatewayEndpointChanged(const QString &endpoint);
     void devGatewayEnvChanged(bool enabled);
 
+    void isHomeAdLabelVisibleChanged(bool visible);
+
 private:
     QSharedPointer<ServersModel> m_serversModel;
     QSharedPointer<ContainersModel> m_containersModel;
diff --git a/client/ui/controllers/sitesController.cpp b/client/ui/controllers/sitesController.cpp
index d54dbdd2f..24ae035f0 100644
--- a/client/ui/controllers/sitesController.cpp
+++ b/client/ui/controllers/sitesController.cpp
@@ -82,14 +82,12 @@ void SitesController::removeSite(int index)
 
 void SitesController::importSites(const QString &fileName, bool replaceExisting)
 {
-    QFile file(fileName);
-
-    if (!file.open(QIODevice::ReadOnly)) {
+    QByteArray jsonData;
+    if (!SystemController::readFile(fileName, jsonData)) {
         emit errorOccurred(tr("Can't open file: %1").arg(fileName));
         return;
     }
 
-    QByteArray jsonData = file.readAll();
     QJsonDocument jsonDocument = QJsonDocument::fromJson(jsonData);
     if (jsonDocument.isNull()) {
         emit errorOccurred(tr("Failed to parse JSON data from file: %1").arg(fileName));
diff --git a/client/ui/controllers/systemController.cpp b/client/ui/controllers/systemController.cpp
index 4598bff16..52ca1294a 100644
--- a/client/ui/controllers/systemController.cpp
+++ b/client/ui/controllers/systemController.cpp
@@ -24,7 +24,7 @@ SystemController::SystemController(const std::shared_ptr<Settings> &settings, QO
 {
 }
 
-void SystemController::saveFile(QString fileName, const QString &data)
+void SystemController::saveFile(const QString &fileName, const QString &data)
 {
 #if defined Q_OS_ANDROID
     AndroidController::instance()->saveFile(fileName, data);
@@ -62,6 +62,31 @@ void SystemController::saveFile(QString fileName, const QString &data)
 #endif
 }
 
+bool SystemController::readFile(const QString &fileName, QByteArray &data)
+{
+#ifdef Q_OS_ANDROID
+    int fd = AndroidController::instance()->getFd(fileName);
+    if (fd == -1) return false;
+    QFile file;
+    if(!file.open(fd, QIODevice::ReadOnly)) return false;
+    data = file.readAll();
+    AndroidController::instance()->closeFd();
+#else
+    QFile file(fileName);
+    if (!file.open(QIODevice::ReadOnly)) return false;
+    data = file.readAll();
+#endif
+    return true;
+}
+
+bool SystemController::readFile(const QString &fileName, QString &data)
+{
+    QByteArray byteArray;
+    if(!readFile(fileName, byteArray)) return false;
+    data = byteArray;
+    return true;
+}
+
 QString SystemController::getFileName(const QString &acceptLabel, const QString &nameFilter,
                                       const QString &selectedFile, const bool isSaveMode, const QString &defaultSuffix)
 {
@@ -134,3 +159,10 @@ bool SystemController::isAuthenticated()
     return true;
 #endif
 }
+
+void SystemController::sendTouch(float x, float y)
+{
+#ifdef Q_OS_ANDROID
+    AndroidController::instance()->sendTouch(x, y);
+#endif
+}
diff --git a/client/ui/controllers/systemController.h b/client/ui/controllers/systemController.h
index d2ee6f637..8cb3a0d16 100644
--- a/client/ui/controllers/systemController.h
+++ b/client/ui/controllers/systemController.h
@@ -11,7 +11,9 @@ class SystemController : public QObject
 public:
     explicit SystemController(const std::shared_ptr<Settings> &setting, QObject *parent = nullptr);
 
-    static void saveFile(QString fileName, const QString &data);
+    static void saveFile(const QString &fileName, const QString &data);
+    static bool readFile(const QString &fileName, QByteArray &data);
+    static bool readFile(const QString &fileName, QString &data);
 
 public slots:
     QString getFileName(const QString &acceptLabel, const QString &nameFilter, const QString &selectedFile = "",
@@ -20,6 +22,8 @@ public slots:
     void setQmlRoot(QObject *qmlRoot);
 
     bool isAuthenticated();
+    void sendTouch(float x, float y);
+
 signals:
     void fileDialogClosed(const bool isAccepted);
 
diff --git a/client/ui/models/apiServicesModel.cpp b/client/ui/models/apiServicesModel.cpp
index 81a10f873..3e6841953 100644
--- a/client/ui/models/apiServicesModel.cpp
+++ b/client/ui/models/apiServicesModel.cpp
@@ -70,7 +70,7 @@ QVariant ApiServicesModel::data(const QModelIndex &index, int role) const
                     .arg(speed);
         } else if (serviceType == serviceType::amneziaFree){
             QString description = tr("VPN to access blocked sites in regions with high levels of Internet censorship. ");
-            if (isServiceAvailable) {
+            if (!isServiceAvailable) {
                 description += tr("<p><a style=\"color: #EB5757;\">Not available in your region. If you have VPN enabled, disable it, return to the previous screen, and try again.</a>");
             }
             return description;
@@ -86,7 +86,7 @@ QVariant ApiServicesModel::data(const QModelIndex &index, int role) const
     }
     case IsServiceAvailableRole: {
         if (serviceType == serviceType::amneziaFree) {
-            if (isServiceAvailable) {
+            if (!isServiceAvailable) {
                 return false;
             }
         }
diff --git a/client/ui/models/protocols/awgConfigModel.cpp b/client/ui/models/protocols/awgConfigModel.cpp
index 3a245ebe9..860c83956 100644
--- a/client/ui/models/protocols/awgConfigModel.cpp
+++ b/client/ui/models/protocols/awgConfigModel.cpp
@@ -21,6 +21,7 @@ bool AwgConfigModel::setData(const QModelIndex &index, const QVariant &value, in
     }
 
     switch (role) {
+    case Roles::SubnetAddressRole: m_serverProtocolConfig.insert(config_key::subnet_address, value.toString()); break;
     case Roles::PortRole: m_serverProtocolConfig.insert(config_key::port, value.toString()); break;
 
     case Roles::ClientMtuRole: m_clientProtocolConfig.insert(config_key::mtu, value.toString()); break;
@@ -58,6 +59,7 @@ QVariant AwgConfigModel::data(const QModelIndex &index, int role) const
     }
 
     switch (role) {
+    case Roles::SubnetAddressRole: return m_serverProtocolConfig.value(config_key::subnet_address).toString();
     case Roles::PortRole: return m_serverProtocolConfig.value(config_key::port).toString();
 
     case Roles::ClientMtuRole: return m_clientProtocolConfig.value(config_key::mtu);
@@ -92,6 +94,7 @@ void AwgConfigModel::updateModel(const QJsonObject &config)
     m_serverProtocolConfig.insert(config_key::transport_proto,
                                   serverProtocolConfig.value(config_key::transport_proto).toString(defaultTransportProto));
     m_serverProtocolConfig[config_key::last_config] = serverProtocolConfig.value(config_key::last_config);
+    m_serverProtocolConfig[config_key::subnet_address] = serverProtocolConfig.value(config_key::subnet_address).toString(protocols::wireguard::defaultSubnetAddress);
     m_serverProtocolConfig[config_key::port] = serverProtocolConfig.value(config_key::port).toString(protocols::awg::defaultPort);
     m_serverProtocolConfig[config_key::junkPacketCount] =
             serverProtocolConfig.value(config_key::junkPacketCount).toString(protocols::awg::defaultJunkPacketCount);
@@ -168,6 +171,7 @@ QHash<int, QByteArray> AwgConfigModel::roleNames() const
 {
     QHash<int, QByteArray> roles;
 
+    roles[SubnetAddressRole] = "subnetAddress";
     roles[PortRole] = "port";
 
     roles[ClientMtuRole] = "clientMtu";
@@ -197,6 +201,7 @@ AwgConfig::AwgConfig(const QJsonObject &serverProtocolConfig)
     clientJunkPacketMinSize = clientProtocolConfig.value(config_key::junkPacketMinSize).toString(protocols::awg::defaultJunkPacketMinSize);
     clientJunkPacketMaxSize = clientProtocolConfig.value(config_key::junkPacketMaxSize).toString(protocols::awg::defaultJunkPacketMaxSize);
 
+    subnetAddress = serverProtocolConfig.value(config_key::subnet_address).toString(protocols::wireguard::defaultSubnetAddress);
     port = serverProtocolConfig.value(config_key::port).toString(protocols::awg::defaultPort);
     serverJunkPacketCount = serverProtocolConfig.value(config_key::junkPacketCount).toString(protocols::awg::defaultJunkPacketCount);
     serverJunkPacketMinSize = serverProtocolConfig.value(config_key::junkPacketMinSize).toString(protocols::awg::defaultJunkPacketMinSize);
@@ -216,7 +221,7 @@ AwgConfig::AwgConfig(const QJsonObject &serverProtocolConfig)
 
 bool AwgConfig::hasEqualServerSettings(const AwgConfig &other) const
 {
-    if (port != other.port || serverJunkPacketCount != other.serverJunkPacketCount
+    if (subnetAddress != other.subnetAddress || port != other.port || serverJunkPacketCount != other.serverJunkPacketCount
         || serverJunkPacketMinSize != other.serverJunkPacketMinSize || serverJunkPacketMaxSize != other.serverJunkPacketMaxSize
         || serverInitPacketJunkSize != other.serverInitPacketJunkSize || serverResponsePacketJunkSize != other.serverResponsePacketJunkSize
         || serverInitPacketMagicHeader != other.serverInitPacketMagicHeader
diff --git a/client/ui/models/protocols/awgConfigModel.h b/client/ui/models/protocols/awgConfigModel.h
index 06475bf5d..c1f8bb276 100644
--- a/client/ui/models/protocols/awgConfigModel.h
+++ b/client/ui/models/protocols/awgConfigModel.h
@@ -15,6 +15,7 @@ struct AwgConfig
 {
     AwgConfig(const QJsonObject &jsonConfig);
 
+    QString subnetAddress;
     QString port;
 
     QString clientMtu;
@@ -43,7 +44,8 @@ class AwgConfigModel : public QAbstractListModel
 
 public:
     enum Roles {
-        PortRole = Qt::UserRole + 1,
+        SubnetAddressRole = Qt::UserRole + 1,
+        PortRole,
 
         ClientMtuRole,
         ClientJunkPacketCountRole,
diff --git a/client/ui/models/protocols/wireguardConfigModel.cpp b/client/ui/models/protocols/wireguardConfigModel.cpp
index 555915deb..1c8e13416 100644
--- a/client/ui/models/protocols/wireguardConfigModel.cpp
+++ b/client/ui/models/protocols/wireguardConfigModel.cpp
@@ -21,6 +21,7 @@ bool WireGuardConfigModel::setData(const QModelIndex &index, const QVariant &val
     }
 
     switch (role) {
+    case Roles::SubnetAddressRole: m_serverProtocolConfig.insert(config_key::subnet_address, value.toString()); break;
     case Roles::PortRole: m_serverProtocolConfig.insert(config_key::port, value.toString()); break;
     case Roles::ClientMtuRole: m_clientProtocolConfig.insert(config_key::mtu, value.toString()); break;
     }
@@ -36,6 +37,7 @@ QVariant WireGuardConfigModel::data(const QModelIndex &index, int role) const
     }
 
     switch (role) {
+    case Roles::SubnetAddressRole: return m_serverProtocolConfig.value(config_key::subnet_address).toString();
     case Roles::PortRole: return m_serverProtocolConfig.value(config_key::port).toString();
     case Roles::ClientMtuRole: return m_clientProtocolConfig.value(config_key::mtu);
     }
@@ -56,6 +58,7 @@ void WireGuardConfigModel::updateModel(const QJsonObject &config)
     m_serverProtocolConfig.insert(config_key::transport_proto,
                                   serverProtocolConfig.value(config_key::transport_proto).toString(defaultTransportProto));
     m_serverProtocolConfig[config_key::last_config] = serverProtocolConfig.value(config_key::last_config);
+    m_serverProtocolConfig[config_key::subnet_address] = serverProtocolConfig.value(config_key::subnet_address).toString(protocols::wireguard::defaultSubnetAddress);
     m_serverProtocolConfig[config_key::port] = serverProtocolConfig.value(config_key::port).toString(protocols::wireguard::defaultPort);
 
     auto lastConfig = m_serverProtocolConfig.value(config_key::last_config).toString();
@@ -96,6 +99,7 @@ QHash<int, QByteArray> WireGuardConfigModel::roleNames() const
 {
     QHash<int, QByteArray> roles;
 
+    roles[SubnetAddressRole] = "subnetAddress";
     roles[PortRole] = "port";
     roles[ClientMtuRole] = "clientMtu";
 
@@ -108,12 +112,13 @@ WgConfig::WgConfig(const QJsonObject &serverProtocolConfig)
     QJsonObject clientProtocolConfig = QJsonDocument::fromJson(lastConfig.toUtf8()).object();
     clientMtu = clientProtocolConfig[config_key::mtu].toString(protocols::wireguard::defaultMtu);
 
+    subnetAddress = serverProtocolConfig.value(config_key::subnet_address).toString(protocols::wireguard::defaultSubnetAddress);
     port = serverProtocolConfig.value(config_key::port).toString(protocols::wireguard::defaultPort);
 }
 
 bool WgConfig::hasEqualServerSettings(const WgConfig &other) const
 {
-    if (port != other.port) {
+    if (subnetAddress != other.subnetAddress || port != other.port) {
         return false;
     }
     return true;
diff --git a/client/ui/models/protocols/wireguardConfigModel.h b/client/ui/models/protocols/wireguardConfigModel.h
index a02bea5a5..b1ce2d610 100644
--- a/client/ui/models/protocols/wireguardConfigModel.h
+++ b/client/ui/models/protocols/wireguardConfigModel.h
@@ -10,6 +10,7 @@ struct WgConfig
 {
     WgConfig(const QJsonObject &jsonConfig);
 
+    QString subnetAddress;
     QString port;
     QString clientMtu;
 
@@ -24,7 +25,8 @@ class WireGuardConfigModel : public QAbstractListModel
 
 public:
     enum Roles {
-        PortRole = Qt::UserRole + 1,
+        SubnetAddressRole = Qt::UserRole + 1,
+        PortRole,
         ClientMtuRole
     };
 
diff --git a/client/ui/qml/Components/AdLabel.qml b/client/ui/qml/Components/AdLabel.qml
new file mode 100644
index 000000000..4133a01cd
--- /dev/null
+++ b/client/ui/qml/Components/AdLabel.qml
@@ -0,0 +1,72 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtQuick.Shapes
+import Qt5Compat.GraphicalEffects
+
+import Style 1.0
+
+import "../Config"
+import "../Controls2"
+import "../Controls2/TextTypes"
+
+Rectangle {
+    id: root
+
+    property real contentHeight: ad.implicitHeight + ad.anchors.topMargin + ad.anchors.bottomMargin
+
+    border.width: 1
+    border.color: AmneziaStyle.color.goldenApricot
+    color: AmneziaStyle.color.transparent
+    radius: 13
+
+    visible: GC.isDesktop() && ServersModel.isDefaultServerFromApi
+             && ServersModel.isDefaultServerDefaultContainerHasSplitTunneling && SettingsController.isHomeAdLabelVisible
+
+    MouseArea {
+        anchors.fill: parent
+        cursorShape: Qt.PointingHandCursor
+
+        onClicked: function() {
+            Qt.openUrlExternally(LanguageModel.getCurrentSiteUrl() + "/premium")
+        }
+    }
+
+    RowLayout {
+        id: ad
+        anchors.fill: parent
+        anchors.margins: 16
+
+        Image {
+            source: "qrc:/images/controls/amnezia.svg"
+            sourceSize: Qt.size(36, 36)
+
+            layer {
+                effect: ColorOverlay {
+                    color: AmneziaStyle.color.paleGray
+                }
+            }
+        }
+
+        CaptionTextType {
+            Layout.fillWidth: true
+            Layout.rightMargin: 10
+            Layout.leftMargin: 10
+
+            text: qsTr("Amnezia Premium - for access to any website")
+            color: AmneziaStyle.color.pearlGray
+
+            lineHeight: 18
+            font.pixelSize: 15
+        }
+
+        ImageButtonType {
+            image: "qrc:/images/controls/close.svg"
+            imageColor: AmneziaStyle.color.paleGray
+
+            onClicked: function() {
+                SettingsController.disableHomeAdLabel()
+            }
+        }
+    }
+}
diff --git a/client/ui/qml/Components/ConnectButton.qml b/client/ui/qml/Components/ConnectButton.qml
index fa18703b6..b90891a0b 100644
--- a/client/ui/qml/Components/ConnectButton.qml
+++ b/client/ui/qml/Components/ConnectButton.qml
@@ -16,6 +16,32 @@ Button {
     property string connectedButtonColor: AmneziaStyle.color.goldenApricot
     property bool buttonActiveFocus: activeFocus && (Qt.platform.os !== "android" || SettingsController.isOnTv())
 
+    property bool isFocusable: true
+    
+    Keys.onTabPressed: {
+        FocusController.nextKeyTabItem()
+    }
+
+    Keys.onBacktabPressed: {
+        FocusController.previousKeyTabItem()
+    }
+
+    Keys.onUpPressed: {
+        FocusController.nextKeyUpItem()
+    }
+    
+    Keys.onDownPressed: {
+        FocusController.nextKeyDownItem()
+    }
+    
+    Keys.onLeftPressed: {
+        FocusController.nextKeyLeftItem()
+    }
+
+    Keys.onRightPressed: {
+        FocusController.nextKeyRightItem()
+    }
+        
     implicitWidth: 190
     implicitHeight: 190
 
diff --git a/client/ui/qml/Components/ConnectionTypeSelectionDrawer.qml b/client/ui/qml/Components/ConnectionTypeSelectionDrawer.qml
index 23fe0d2a8..c9124d81e 100644
--- a/client/ui/qml/Components/ConnectionTypeSelectionDrawer.qml
+++ b/client/ui/qml/Components/ConnectionTypeSelectionDrawer.qml
@@ -14,7 +14,7 @@ DrawerType2 {
     width: parent.width
     height: parent.height
 
-    expandedContent: ColumnLayout {
+    expandedStateContent: ColumnLayout {
         id: content
 
         anchors.top: parent.top
@@ -26,14 +26,6 @@ DrawerType2 {
             root.expandedHeight = content.implicitHeight + 32
         }
 
-        Connections {
-            target: root
-            enabled: !GC.isMobile()
-            function onOpened() {
-                focusItem.forceActiveFocus()
-            }
-        }
-
         Header2Type {
             Layout.fillWidth: true
             Layout.topMargin: 24
@@ -44,11 +36,6 @@ DrawerType2 {
             headerText: qsTr("Add new connection")
         }
 
-        Item {
-            id: focusItem
-            KeyNavigation.tab: ip.rightButton
-        }
-
         LabelWithButtonType {
             id: ip
             Layout.fillWidth: true
@@ -59,10 +46,8 @@ DrawerType2 {
 
             clickedFunction: function() {
                 PageController.goToPage(PageEnum.PageSetupWizardCredentials)
-                root.close()
+                root.closeTriggered()
             }
-
-            KeyNavigation.tab: qrCode.rightButton
         }
 
         DividerType {}
@@ -76,10 +61,8 @@ DrawerType2 {
 
             clickedFunction: function() {
                 PageController.goToPage(PageEnum.PageSetupWizardConfigSource)
-                root.close()
+                root.closeTriggered()
             }
-
-            KeyNavigation.tab: focusItem
         }
 
         DividerType {}
diff --git a/client/ui/qml/Components/HomeContainersListView.qml b/client/ui/qml/Components/HomeContainersListView.qml
index b0e074d03..337918f1a 100644
--- a/client/ui/qml/Components/HomeContainersListView.qml
+++ b/client/ui/qml/Components/HomeContainersListView.qml
@@ -17,55 +17,15 @@ ListView {
     property var rootWidth
     property var selectedText
 
-    property bool a: true
-
     width: rootWidth
-    height: menuContent.contentItem.height
+    height: contentItem.height
 
     clip: true
-    interactive: false
-
-    property FlickableType parentFlickable
-    property var lastItemTabClicked
-
-    property int currentFocusIndex: 0
+    snapMode: ListView.SnapToItem
 
-    activeFocusOnTab: true
-    onActiveFocusChanged: {
-        if (activeFocus) {
-            this.currentFocusIndex = 0
-            this.itemAtIndex(currentFocusIndex).forceActiveFocus()
-        }
-    }
-
-    Keys.onTabPressed: {
-        if (currentFocusIndex < this.count - 1) {
-            currentFocusIndex += 1
-            this.itemAtIndex(currentFocusIndex).forceActiveFocus()
-        } else {
-            currentFocusIndex = 0
-            if (lastItemTabClicked && typeof lastItemTabClicked === "function") {
-                lastItemTabClicked()
-            }
-        }
-    }
+    ScrollBar.vertical: ScrollBarType {}
 
-    onVisibleChanged: {
-         if (visible) {
-             currentFocusIndex = 0
-             focusItem.forceActiveFocus()
-         }
-     }
-
-    Item {
-        id: focusItem
-    }
-
-    onCurrentFocusIndexChanged: {
-        if (parentFlickable) {
-            parentFlickable.ensureVisible(this.itemAtIndex(currentFocusIndex))
-        }
-    }
+    property bool isFocusable: true
 
     ButtonGroup {
         id: containersRadioButtonGroup
@@ -75,12 +35,6 @@ ListView {
         implicitWidth: rootWidth
         implicitHeight: content.implicitHeight
 
-        onActiveFocusChanged: {
-            if (activeFocus) {
-                containerRadioButton.forceActiveFocus()
-            }
-        }
-
         ColumnLayout {
             id: content
 
@@ -111,13 +65,13 @@ ListView {
                     }
 
                     if (checked) {
-                        containersDropDown.close()
+                        containersDropDown.closeTriggered()
                         ServersModel.setDefaultContainer(ServersModel.defaultIndex, proxyDefaultServerContainersModel.mapToSource(index))
                     } else {
                         ContainersModel.setProcessedContainerIndex(proxyDefaultServerContainersModel.mapToSource(index))
                         InstallController.setShouldCreateServer(false)
                         PageController.goToPage(PageEnum.PageSetupWizardProtocolSettings)
-                        containersDropDown.close()
+                        containersDropDown.closeTriggered()
                     }
                 }
 
diff --git a/client/ui/qml/Components/HomeSplitTunnelingDrawer.qml b/client/ui/qml/Components/HomeSplitTunnelingDrawer.qml
index 405d4eda6..097274a43 100644
--- a/client/ui/qml/Components/HomeSplitTunnelingDrawer.qml
+++ b/client/ui/qml/Components/HomeSplitTunnelingDrawer.qml
@@ -16,7 +16,7 @@ DrawerType2 {
     anchors.fill: parent
     expandedHeight: parent.height * 0.9
 
-    expandedContent: ColumnLayout {
+    expandedStateContent: ColumnLayout {
         id: content
 
         anchors.top: parent.top
@@ -24,14 +24,6 @@ DrawerType2 {
         anchors.right: parent.right
         spacing: 0
 
-        Connections {
-            target: root
-            enabled: !GC.isMobile()
-            function onOpened() {
-                focusItem.forceActiveFocus()
-            }
-        }
-
         Header2Type {
             Layout.fillWidth: true
             Layout.topMargin: 24
@@ -43,11 +35,6 @@ DrawerType2 {
             descriptionText:  qsTr("Allows you to connect to some sites or applications through a VPN connection and bypass others")
         }
 
-        Item {
-            id: focusItem
-            KeyNavigation.tab: splitTunnelingSwitch.visible ? splitTunnelingSwitch : siteBasedSplitTunnelingSwitch.rightButton
-        }
-
         LabelWithButtonType {
             id: splitTunnelingSwitch
             Layout.fillWidth: true
@@ -59,11 +46,9 @@ DrawerType2 {
             descriptionText: qsTr("Enabled \nCan't be disabled for current server")
             rightImageSource: "qrc:/images/controls/chevron-right.svg"
 
-            KeyNavigation.tab: siteBasedSplitTunnelingSwitch.visible ? siteBasedSplitTunnelingSwitch.rightButton : focusItem
-
             clickedFunction: function() {
-//                PageController.goToPage(PageEnum.PageSettingsSplitTunneling)
-//                root.close()
+               PageController.goToPage(PageEnum.PageSettingsSplitTunneling)
+               root.closeTriggered()
             }
         }
 
@@ -80,13 +65,9 @@ DrawerType2 {
             descriptionText: enabled && SitesModel.isTunnelingEnabled ? qsTr("Enabled") : qsTr("Disabled")
             rightImageSource: "qrc:/images/controls/chevron-right.svg"
 
-            KeyNavigation.tab: appSplitTunnelingSwitch.visible ?
-                                   appSplitTunnelingSwitch.rightButton :
-                                   focusItem
-
             clickedFunction: function() {
                 PageController.goToPage(PageEnum.PageSettingsSplitTunneling)
-                root.close()
+                root.closeTriggered()
             }
         }
 
@@ -103,11 +84,9 @@ DrawerType2 {
             descriptionText: AppSplitTunnelingModel.isTunnelingEnabled ? qsTr("Enabled") : qsTr("Disabled")
             rightImageSource: "qrc:/images/controls/chevron-right.svg"
 
-            KeyNavigation.tab: focusItem
-
             clickedFunction: function() {
                 PageController.goToPage(PageEnum.PageSettingsAppSplitTunneling)
-                root.close()
+                root.closeTriggered()
             }
         }
 
diff --git a/client/ui/qml/Components/InstalledAppsDrawer.qml b/client/ui/qml/Components/InstalledAppsDrawer.qml
index e5d100550..5835e1c6e 100644
--- a/client/ui/qml/Components/InstalledAppsDrawer.qml
+++ b/client/ui/qml/Components/InstalledAppsDrawer.qml
@@ -26,7 +26,7 @@ DrawerType2 {
         id: installedAppsModel
     }
 
-    expandedContent: Item {
+    expandedStateContent: Item {
         id: container
 
         implicitHeight: expandedHeight
@@ -43,7 +43,7 @@ DrawerType2 {
             BackButtonType {
                 backButtonImage: "qrc:/images/controls/arrow-left.svg"
                 backButtonFunction: function() {
-                    root.close()
+                    root.closeTriggered()
                 }
             }
 
@@ -69,6 +69,8 @@ DrawerType2 {
                 clip: true
                 interactive: true
 
+                property bool isFocusable: true
+
                 model: SortFilterProxyModel {
                     id: proxyInstalledAppsModel
                     sourceModel: installedAppsModel
@@ -79,10 +81,7 @@ DrawerType2 {
                     }
                 }
 
-                ScrollBar.vertical: ScrollBar {
-                    id: scrollBar
-                    policy: ScrollBar.AlwaysOn
-                }
+                ScrollBar.vertical: ScrollBarType {}
 
                 ButtonGroup {
                     id: buttonGroup
@@ -155,7 +154,7 @@ DrawerType2 {
                 PageController.showBusyIndicator(true)
                 AppSplitTunnelingController.addApps(installedAppsModel.getSelectedAppsInfo())
                 PageController.showBusyIndicator(false)
-                root.close()
+                root.closeTriggered()
             }
         }
     }
diff --git a/client/ui/qml/Components/QuestionDrawer.qml b/client/ui/qml/Components/QuestionDrawer.qml
index a0e86dbca..0c14e52d4 100644
--- a/client/ui/qml/Components/QuestionDrawer.qml
+++ b/client/ui/qml/Components/QuestionDrawer.qml
@@ -20,7 +20,7 @@ DrawerType2 {
     property var yesButtonFunction
     property var noButtonFunction
 
-    expandedContent: ColumnLayout {
+    expandedStateContent: ColumnLayout {
         id: content
 
         anchors.top: parent.top
@@ -33,14 +33,6 @@ DrawerType2 {
             root.expandedHeight = content.implicitHeight + 32
         }
 
-        Connections {
-            target: root
-            enabled: !GC.isMobile()
-            function onOpened() {
-                focusItem.forceActiveFocus()
-            }
-        }
-
         Header2TextType {
             Layout.fillWidth: true
             Layout.topMargin: 16
@@ -59,11 +51,6 @@ DrawerType2 {
             text: descriptionText
         }
 
-        Item {
-            id: focusItem
-            KeyNavigation.tab: yesButton
-        }
-
         BasicButtonType {
             id: yesButton
             Layout.fillWidth: true
@@ -78,8 +65,6 @@ DrawerType2 {
                     yesButtonFunction()
                 }
             }
-
-            KeyNavigation.tab: noButton
         }
 
         BasicButtonType {
@@ -102,8 +87,6 @@ DrawerType2 {
                     noButtonFunction()
                 }
             }
-
-            KeyNavigation.tab: focusItem
         }
     }
 }
diff --git a/client/ui/qml/Components/SelectLanguageDrawer.qml b/client/ui/qml/Components/SelectLanguageDrawer.qml
index 4d9d7f0e5..2c026848b 100644
--- a/client/ui/qml/Components/SelectLanguageDrawer.qml
+++ b/client/ui/qml/Components/SelectLanguageDrawer.qml
@@ -11,7 +11,7 @@ import "../Config"
 DrawerType2 {
     id: root
 
-    expandedContent: Item {
+    expandedStateContent: Item {
         id: container
 
         implicitHeight: root.height * 0.9
@@ -20,19 +20,6 @@ DrawerType2 {
             root.expandedHeight = container.implicitHeight
         }
 
-        Connections {
-            target: root
-            enabled: !GC.isMobile()
-            function onOpened() {
-                focusItem.forceActiveFocus()
-            }
-        }
-
-        Item {
-            id: focusItem
-            KeyNavigation.tab: backButton
-        }
-
         ColumnLayout {
             id: backButtonLayout
 
@@ -43,167 +30,148 @@ DrawerType2 {
 
             BackButtonType {
                 id: backButton
+
+                Layout.fillWidth: true
+
                 backButtonImage: "qrc:/images/controls/arrow-left.svg"
-                backButtonFunction: function() { root.close() }
-                KeyNavigation.tab: listView
+                backButtonFunction: function() { root.closeTriggered() }
+            }
+
+            Header2Type {
+                id: header
+
+                Layout.fillWidth: true
+                Layout.topMargin: 16
+                Layout.rightMargin: 16
+                Layout.leftMargin: 16
+
+                headerText: qsTr("Choose language")
             }
         }
 
-        FlickableType {
+        ListView {
+            id: listView
+
             anchors.top: backButtonLayout.bottom
             anchors.left: parent.left
             anchors.right: parent.right
             anchors.bottom: parent.bottom
-            contentHeight: content.implicitHeight
 
-            ColumnLayout {
-                id: content
+            property bool isFocusable: true
+            property int selectedIndex: LanguageModel.currentLanguageIndex
 
-                anchors.fill: parent
+            clip: true
+            reuseItems: true
 
-                Header2Type {
-                    id: header
-                    Layout.fillWidth: true
-                    Layout.topMargin: 16
-                    Layout.rightMargin: 16
-                    Layout.leftMargin: 16
+            ScrollBar.vertical: ScrollBarType {}
 
-                    headerText: qsTr("Choose language")
-                }
+            model: LanguageModel
 
-                ListView {
-                    id: listView
+            ButtonGroup {
+                id: buttonGroup
+            }
 
-                    Layout.fillWidth: true
-                    height: listView.contentItem.height
+            delegate: Item {
+                implicitWidth: root.width
+                implicitHeight: delegateContent.implicitHeight
 
-                    clip: true
-                    interactive: false
+                ColumnLayout {
+                    id: delegateContent
 
-                    model: LanguageModel
-                    currentIndex: LanguageModel.currentLanguageIndex
+                    anchors.fill: parent
 
-                    ButtonGroup {
-                        id: buttonGroup
-                    }
+                    RadioButton {
+                        id: radioButton
 
-                    property int currentFocusIndex: 0
+                        implicitWidth: parent.width
+                        implicitHeight: radioButtonContent.implicitHeight
 
-                    activeFocusOnTab: true
-                    onActiveFocusChanged: {
-                        if (activeFocus) {
-                            this.currentFocusIndex = 0
-                            this.itemAtIndex(currentFocusIndex).forceActiveFocus()
-                        }
-                    }
+                        hoverEnabled: true
 
-                    Keys.onTabPressed: {
-                        if (currentFocusIndex < this.count - 1) {
-                            currentFocusIndex += 1
-                            this.itemAtIndex(currentFocusIndex).forceActiveFocus()
-                        } else {
-                            listViewFocusItem.forceActiveFocus()
-                            focusItem.forceActiveFocus()
-                        }
-                    }
+                        property bool isFocusable: true
 
-                    Item {
-                        id: listViewFocusItem
                         Keys.onTabPressed: {
-                            root.forceActiveFocus()
+                            FocusController.nextKeyTabItem()
                         }
-                    }
 
-                    onVisibleChanged: {
-                        if (visible) {
-                            listViewFocusItem.forceActiveFocus()
-                            focusItem.forceActiveFocus()
+                        Keys.onBacktabPressed: {
+                            FocusController.previousKeyTabItem()
                         }
-                    }
-
-                    delegate: Item {
-                        implicitWidth: root.width
-                        implicitHeight: delegateContent.implicitHeight
 
-                        onActiveFocusChanged: {
-                            if (activeFocus) {
-                                radioButton.forceActiveFocus()
-                            }
+                        Keys.onUpPressed: {
+                            FocusController.nextKeyUpItem()
                         }
 
-                        ColumnLayout {
-                            id: delegateContent
-
-                            anchors.fill: parent
-
-                            RadioButton {
-                                id: radioButton
-
-                                implicitWidth: parent.width
-                                implicitHeight: radioButtonContent.implicitHeight
-
-                                hoverEnabled: true
+                        Keys.onDownPressed: {
+                            FocusController.nextKeyDownItem()
+                        }
 
-                                indicator: Rectangle {
-                                    width: parent.width - 1
-                                    height: parent.height
-                                    color: radioButton.hovered ? AmneziaStyle.color.slateGray : AmneziaStyle.color.onyxBlack
-                                    border.color: radioButton.focus ? AmneziaStyle.color.paleGray : AmneziaStyle.color.transparent
-                                    border.width: radioButton.focus ? 1 : 0
+                        Keys.onLeftPressed: {
+                            FocusController.nextKeyLeftItem()
+                        }
 
-                                    Behavior on color {
-                                        PropertyAnimation { duration: 200 }
-                                    }
-                                    Behavior on border.color {
-                                        PropertyAnimation { duration: 200 }
-                                    }
-                                }
+                        Keys.onRightPressed: {
+                            FocusController.nextKeyRightItem()
+                        }
 
-                                RowLayout {
-                                    id: radioButtonContent
-                                    anchors.fill: parent
+                        indicator: Rectangle {
+                            width: parent.width - 1
+                            height: parent.height
+                            color: radioButton.hovered ? AmneziaStyle.color.slateGray : AmneziaStyle.color.onyxBlack
+                            border.color: radioButton.focus ? AmneziaStyle.color.paleGray : AmneziaStyle.color.transparent
+                            border.width: radioButton.focus ? 1 : 0
 
-                                    anchors.rightMargin: 16
-                                    anchors.leftMargin: 16
+                            Behavior on color {
+                                PropertyAnimation { duration: 200 }
+                            }
+                            Behavior on border.color {
+                                PropertyAnimation { duration: 200 }
+                            }
+                        }
 
-                                    spacing: 0
+                        RowLayout {
+                            id: radioButtonContent
+                            anchors.fill: parent
 
-                                    z: 1
+                            anchors.rightMargin: 16
+                            anchors.leftMargin: 16
 
-                                    ParagraphTextType {
-                                        Layout.fillWidth: true
-                                        Layout.topMargin: 20
-                                        Layout.bottomMargin: 20
+                            spacing: 0
 
-                                        text: languageName
-                                    }
+                            z: 1
 
-                                    Image {
-                                        source: "qrc:/images/controls/check.svg"
-                                        visible: radioButton.checked
+                            ParagraphTextType {
+                                Layout.fillWidth: true
+                                Layout.topMargin: 20
+                                Layout.bottomMargin: 20
 
-                                        width: 24
-                                        height: 24
+                                text: languageName
+                            }
 
-                                        Layout.rightMargin: 8
-                                    }
-                                }
+                            Image {
+                                source: "qrc:/images/controls/check.svg"
+                                visible: radioButton.checked
 
-                                ButtonGroup.group: buttonGroup
-                                checked: listView.currentIndex === index
+                                width: 24
+                                height: 24
 
-                                onClicked: {
-                                    listView.currentIndex = index
-                                    LanguageModel.changeLanguage(languageIndex)
-                                    root.close()
-                                }
+                                Layout.rightMargin: 8
                             }
                         }
 
-                        Keys.onEnterPressed: radioButton.clicked()
-                        Keys.onReturnPressed: radioButton.clicked()
+                        ButtonGroup.group: buttonGroup
+                        checked: listView.selectedIndex === index
+
+                        onClicked: {
+                            listView.selectedIndex = index
+                            LanguageModel.changeLanguage(languageIndex)
+                            root.closeTriggered()
+                        }
                     }
                 }
+
+                Keys.onEnterPressed: radioButton.clicked()
+                Keys.onReturnPressed: radioButton.clicked()
             }
         }
     }
diff --git a/client/ui/qml/Components/ServersListView.qml b/client/ui/qml/Components/ServersListView.qml
new file mode 100644
index 000000000..dc5c5a33a
--- /dev/null
+++ b/client/ui/qml/Components/ServersListView.qml
@@ -0,0 +1,126 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+import SortFilterProxyModel 0.2
+
+import PageEnum 1.0
+import ProtocolEnum 1.0
+import ContainerProps 1.0
+import ContainersModelFilters 1.0
+import Style 1.0
+
+import "./"
+import "../Controls2"
+import "../Controls2/TextTypes"
+import "../Config"
+
+ListView {
+    id: root
+
+    property int selectedIndex: ServersModel.defaultIndex
+
+    anchors.top: serversMenuHeader.bottom
+    anchors.right: parent.right
+    anchors.left: parent.left
+    anchors.bottom: parent.bottom
+    anchors.topMargin: 16
+
+    model: ServersModel
+
+    ScrollBar.vertical: ScrollBarType {}
+
+    property bool isFocusable: true
+
+    Connections {
+        target: ServersModel
+        function onDefaultServerIndexChanged(serverIndex) {
+            root.selectedIndex = serverIndex
+        }
+    }
+
+    clip: true
+    reuseItems: true
+
+    delegate: Item {
+        id: menuContentDelegate
+        objectName: "menuContentDelegate"
+
+        property variant delegateData: model
+        property VerticalRadioButton serverRadioButtonProperty: serverRadioButton
+
+        implicitWidth: root.width
+        implicitHeight: serverRadioButtonContent.implicitHeight
+
+        ColumnLayout {
+            id: serverRadioButtonContent
+            objectName: "serverRadioButtonContent"
+
+            anchors.fill: parent
+            anchors.rightMargin: 16
+            anchors.leftMargin: 16
+
+            spacing: 0
+
+            RowLayout {
+                objectName: "serverRadioButtonRowLayout"
+
+                Layout.fillWidth: true
+
+                VerticalRadioButton {
+                    id: serverRadioButton
+                    objectName: "serverRadioButton"
+
+                    Layout.fillWidth: true
+
+                    text: name
+                    descriptionText: serverDescription
+
+                    checked: index === root.selectedIndex
+                    checkable: !ConnectionController.isConnected
+
+                    ButtonGroup.group: serversRadioButtonGroup
+
+                    onClicked: {
+                        if (ConnectionController.isConnected) {
+                            PageController.showNotificationMessage(qsTr("Unable change server while there is an active connection"))
+                            return
+                        }
+
+                        root.selectedIndex = index
+
+                        ServersModel.defaultIndex = index
+                    }
+
+                    Keys.onEnterPressed: serverRadioButton.clicked()
+                    Keys.onReturnPressed: serverRadioButton.clicked()
+                }
+
+                ImageButtonType {
+                    id: serverInfoButton
+                    objectName: "serverInfoButton"
+
+                    image: "qrc:/images/controls/settings.svg"
+                    imageColor: AmneziaStyle.color.paleGray
+
+                    implicitWidth: 56
+                    implicitHeight: 56
+
+                    z: 1
+
+                    onClicked: function() {
+                        ServersModel.processedIndex = index
+                        PageController.goToPage(PageEnum.PageSettingsServerInfo)
+                        drawer.closeTriggered()
+                    }
+                }
+            }
+
+            DividerType {
+                Layout.fillWidth: true
+                Layout.leftMargin: 0
+                Layout.rightMargin: 0
+            }
+        }
+    }
+}
diff --git a/client/ui/qml/Components/SettingsContainersListView.qml b/client/ui/qml/Components/SettingsContainersListView.qml
index 769e1abd6..9e672130b 100644
--- a/client/ui/qml/Components/SettingsContainersListView.qml
+++ b/client/ui/qml/Components/SettingsContainersListView.qml
@@ -20,47 +20,14 @@ ListView {
     height: root.contentItem.height
 
     clip: true
-    interactive: false
-
-    activeFocusOnTab: true
-    Keys.onTabPressed: {
-        if (currentIndex < this.count - 1) {
-            this.incrementCurrentIndex()
-        } else {
-            currentIndex = 0
-            lastItemTabClickedSignal()
-        }
-    }
-
-    onCurrentIndexChanged: {
-        if (visible) {
-            if (fl.contentHeight > fl.height) {
-                var item = this.currentItem
-                if (item.y < fl.height) {
-                    fl.contentY = item.y
-                } else if (item.y + item.height > fl.contentY + fl.height) {
-                    fl.contentY = item.y + item.height - fl.height
-                }
-            }
-        }
-    }
+    reuseItems: true
 
-    onVisibleChanged: {
-        if (visible) {
-            this.currentIndex = 0
-        }
-    }
+    property bool isFocusable: false
 
     delegate: Item {
         implicitWidth: root.width
         implicitHeight: delegateContent.implicitHeight
 
-        onActiveFocusChanged: {
-            if (activeFocus) {
-                containerRadioButton.rightButton.forceActiveFocus()
-            }
-        }
-
         ColumnLayout {
             id: delegateContent
 
diff --git a/client/ui/qml/Components/ShareConnectionDrawer.qml b/client/ui/qml/Components/ShareConnectionDrawer.qml
index d2bf28ab8..f98944f07 100644
--- a/client/ui/qml/Components/ShareConnectionDrawer.qml
+++ b/client/ui/qml/Components/ShareConnectionDrawer.qml
@@ -36,17 +36,9 @@ DrawerType2 {
         configFileName = "amnezia_config"
     }
 
-    expandedContent: Item {
+    expandedStateContent: Item {
         implicitHeight: root.expandedHeight
 
-        Connections {
-            target: root
-            enabled: !GC.isMobile()
-            function onOpened() {
-                header.forceActiveFocus()
-            }
-        }
-
         Header2Type {
             id: header
             anchors.top: parent.top
@@ -57,24 +49,27 @@ DrawerType2 {
             anchors.rightMargin: 16
 
             headerText: root.headerText
-
-            KeyNavigation.tab: shareButton
         }
 
-        FlickableType {
+        ListView {
+            id: listView
+
             anchors.top: header.bottom
             anchors.bottom: parent.bottom
-            contentHeight: content.height + 32
+            anchors.left: parent.left
+            anchors.right: parent.right
+
+            property bool isFocusable: true
 
-            ColumnLayout {
-                id: content
+            ScrollBar.vertical: ScrollBarType {}
 
-                anchors.top: parent.top
-                anchors.left: parent.left
-                anchors.right: parent.right
+            model: 1
 
-                anchors.leftMargin: 16
-                anchors.rightMargin: 16
+            clip: true
+            reuseItems: true
+
+            header: ColumnLayout {
+                width: listView.width
 
                 visible: root.contentVisible
 
@@ -82,12 +77,12 @@ DrawerType2 {
                     id: shareButton
                     Layout.fillWidth: true
                     Layout.topMargin: 16
+                    Layout.leftMargin: 16
+                    Layout.rightMargin: 16
 
                     text: qsTr("Share")
                     leftImageSource: "qrc:/images/controls/share-2.svg"
 
-                    KeyNavigation.tab: copyConfigTextButton
-
                     clickedFunc: function() {
                         var fileName = ""
                         if (GC.isMobile()) {
@@ -111,6 +106,8 @@ DrawerType2 {
                     id: copyConfigTextButton
                     Layout.fillWidth: true
                     Layout.topMargin: 8
+                    Layout.leftMargin: 16
+                    Layout.rightMargin: 16
 
                     defaultColor: AmneziaStyle.color.transparent
                     hoveredColor: AmneziaStyle.color.translucentWhite
@@ -124,14 +121,14 @@ DrawerType2 {
 
                     Keys.onReturnPressed: { copyConfigTextButton.clicked() }
                     Keys.onEnterPressed: { copyConfigTextButton.clicked() }
-
-                    KeyNavigation.tab: copyNativeConfigStringButton.visible ? copyNativeConfigStringButton : showSettingsButton
                 }
 
                 BasicButtonType {
                     id: copyNativeConfigStringButton
                     Layout.fillWidth: true
                     Layout.topMargin: 8
+                    Layout.leftMargin: 16
+                    Layout.rightMargin: 16
 
                     visible: false
 
@@ -153,6 +150,8 @@ DrawerType2 {
 
                     Layout.fillWidth: true
                     Layout.topMargin: 24
+                    Layout.leftMargin: 16
+                    Layout.rightMargin: 16
 
                     defaultColor: AmneziaStyle.color.transparent
                     hoveredColor: AmneziaStyle.color.translucentWhite
@@ -164,10 +163,8 @@ DrawerType2 {
                     text: qsTr("Show connection settings")
 
                     clickedFunc: function() {
-                        configContentDrawer.open()
+                        configContentDrawer.openTriggered()
                     }
-
-                    KeyNavigation.tab: header
                 }
 
                 DrawerType2 {
@@ -178,30 +175,11 @@ DrawerType2 {
                     anchors.fill: parent
                     expandedHeight: parent.height * 0.9
 
-                    onClosed: {
-                        if (!GC.isMobile()) {
-                            header.forceActiveFocus()
-                        }
-                    }
-
-                    expandedContent: Item {
+                    expandedStateContent: Item {
                         id: configContentContainer
 
                         implicitHeight: configContentDrawer.expandedHeight
 
-                        Connections {
-                            target: configContentDrawer
-                            enabled: !GC.isMobile()
-                            function onOpened() {
-                                focusItem.forceActiveFocus()
-                            }
-                        }
-
-                        Item {
-                            id: focusItem
-                            KeyNavigation.tab: backButton
-                        }
-
                         Connections {
                             target: copyNativeConfigStringButton
                             function onClicked() {
@@ -231,9 +209,7 @@ DrawerType2 {
                             anchors.right: parent.right
                             anchors.topMargin: 16
 
-                            backButtonFunction: function() { configContentDrawer.close() }
-
-                            KeyNavigation.tab: focusItem
+                            backButtonFunction: function() { configContentDrawer.closeTriggered() }
                         }
 
                         FlickableType {
@@ -302,6 +278,10 @@ DrawerType2 {
                         }
                     }
                 }
+            }
+
+            delegate: ColumnLayout {
+                width: listView.width
 
                 Rectangle {
                     id: qrCodeContainer
@@ -309,6 +289,8 @@ DrawerType2 {
                     Layout.fillWidth: true
                     Layout.preferredHeight: width
                     Layout.topMargin: 20
+                    Layout.leftMargin: 16
+                    Layout.rightMargin: 16
 
                     visible: ExportController.qrCodesCount > 0
 
@@ -320,6 +302,32 @@ DrawerType2 {
 
                         source: ExportController.qrCodesCount ? ExportController.qrCodes[0] : ""
 
+                        property bool isFocusable: true
+
+                        Keys.onTabPressed: {
+                            FocusController.nextKeyTabItem()
+                        }
+
+                        Keys.onBacktabPressed: {
+                            FocusController.previousKeyTabItem()
+                        }
+
+                        Keys.onUpPressed: {
+                            FocusController.nextKeyUpItem()
+                        }
+
+                        Keys.onDownPressed: {
+                            FocusController.nextKeyDownItem()
+                        }
+
+                        Keys.onLeftPressed: {
+                            FocusController.nextKeyLeftItem()
+                        }
+
+                        Keys.onRightPressed: {
+                            FocusController.nextKeyRightItem()
+                        }
+
                         Timer {
                             property int index: 0
                             interval: 1000
@@ -346,6 +354,8 @@ DrawerType2 {
                     Layout.fillWidth: true
                     Layout.topMargin: 24
                     Layout.bottomMargin: 32
+                    Layout.leftMargin: 16
+                    Layout.rightMargin: 16
 
                     visible: ExportController.qrCodesCount > 0
 
diff --git a/client/ui/qml/Components/TransportProtoSelector.qml b/client/ui/qml/Components/TransportProtoSelector.qml
index e40dd4bbf..323892faa 100644
--- a/client/ui/qml/Components/TransportProtoSelector.qml
+++ b/client/ui/qml/Components/TransportProtoSelector.qml
@@ -39,8 +39,6 @@ Rectangle {
             implicitWidth: (rootWidth - 32) / 2
             text: "UDP"
 
-            KeyNavigation.tab: tcpButton
-
             onClicked: {
                 root.currentIndex = 0
             }
diff --git a/client/ui/qml/Controls2/BackButtonType.qml b/client/ui/qml/Controls2/BackButtonType.qml
index 86fc86a22..40136ad52 100644
--- a/client/ui/qml/Controls2/BackButtonType.qml
+++ b/client/ui/qml/Controls2/BackButtonType.qml
@@ -4,7 +4,7 @@ import Qt5Compat.GraphicalEffects
 
 import Style 1.0
 
-Item {
+FocusScope {
     id: root
 
     property string backButtonImage: "qrc:/images/controls/arrow-left.svg"
@@ -15,12 +15,6 @@ Item {
 
     visible: backButtonImage !== ""
 
-    onActiveFocusChanged: {
-        if (activeFocus) {
-            backButton.forceActiveFocus()
-        }
-    }
-
     RowLayout {
         id: content
 
diff --git a/client/ui/qml/Controls2/BasicButtonType.qml b/client/ui/qml/Controls2/BasicButtonType.qml
index 828c32bcd..b60e96cf3 100644
--- a/client/ui/qml/Controls2/BasicButtonType.qml
+++ b/client/ui/qml/Controls2/BasicButtonType.qml
@@ -24,7 +24,7 @@ Button {
 
     property string leftImageSource
     property string rightImageSource
-    property string leftImageColor
+    property string leftImageColor: textColor
     property bool changeLeftImageSize: true
 
     property bool squareLeftSide: false
@@ -35,10 +35,35 @@ Button {
 
     property alias buttonTextLabel: buttonText
 
+    property bool isFocusable: true
+
+    Keys.onTabPressed: {
+        FocusController.nextKeyTabItem()
+    }
+
+    Keys.onBacktabPressed: {
+        FocusController.previousKeyTabItem()
+    }
+
+    Keys.onUpPressed: {
+        FocusController.nextKeyUpItem()
+    }
+    
+    Keys.onDownPressed: {
+        FocusController.nextKeyDownItem()
+    }
+    
+    Keys.onLeftPressed: {
+        FocusController.nextKeyLeftItem()
+    }
+
+    Keys.onRightPressed: {
+        FocusController.nextKeyRightItem()
+    }
+    
     implicitHeight: 56
 
     hoverEnabled: true
-    focusPolicy: Qt.TabFocus
 
     onFocusChanged: {
         if (root.activeFocus) {
@@ -150,7 +175,7 @@ Button {
             ButtonTextType {
                 id: buttonText
 
-                color: textColor
+                color: root.textColor
                 text: root.text
                 visible: root.text === "" ? false : true
 
diff --git a/client/ui/qml/Controls2/CardType.qml b/client/ui/qml/Controls2/CardType.qml
index f584a8fcd..8e6895411 100644
--- a/client/ui/qml/Controls2/CardType.qml
+++ b/client/ui/qml/Controls2/CardType.qml
@@ -22,6 +22,7 @@ RadioButton {
     property string pressedBorderColor: AmneziaStyle.color.softGoldenApricot
     property string selectedBorderColor: AmneziaStyle.color.goldenApricot
     property string defaultBodredColor: AmneziaStyle.color.transparent
+    property string focusBorderColor: AmneziaStyle.color.paleGray
     property int borderWidth: 0
 
     implicitWidth: content.implicitWidth
@@ -29,6 +30,32 @@ RadioButton {
 
     hoverEnabled: true
 
+    property bool isFocusable: true
+
+    Keys.onTabPressed: {
+        FocusController.nextKeyTabItem()
+    }
+
+    Keys.onBacktabPressed: {
+        FocusController.previousKeyTabItem()
+    }
+
+    Keys.onUpPressed: {
+        FocusController.nextKeyUpItem()
+    }
+
+    Keys.onDownPressed: {
+        FocusController.nextKeyDownItem()
+    }
+
+    Keys.onLeftPressed: {
+        FocusController.nextKeyLeftItem()
+    }
+
+    Keys.onRightPressed: {
+        FocusController.nextKeyRightItem()
+    }
+
     indicator: Rectangle {
         anchors.fill: parent
         radius: 16
@@ -52,6 +79,8 @@ RadioButton {
                     return pressedBorderColor
                 } else if (root.checked) {
                     return selectedBorderColor
+                } else if (root.activeFocus) {
+                    return focusBorderColor
                 }
             }
             return defaultBodredColor
@@ -59,7 +88,7 @@ RadioButton {
 
         border.width: {
             if (root.enabled) {
-                if(root.checked) {
+                if(root.checked || root.activeFocus) {
                     return 1
                 }
                 return root.pressed ? 1 : 0
diff --git a/client/ui/qml/Controls2/CardWithIconsType.qml b/client/ui/qml/Controls2/CardWithIconsType.qml
index 18a29b872..4277d7359 100644
--- a/client/ui/qml/Controls2/CardWithIconsType.qml
+++ b/client/ui/qml/Controls2/CardWithIconsType.qml
@@ -25,10 +25,15 @@ Button {
 
     property real textOpacity: 1.0
 
+    property alias focusItem: rightImage
+
+    property FlickableType parentFlickable
+
     hoverEnabled: true
 
     background: Rectangle {
         id: backgroundRect
+
         anchors.fill: parent
         radius: 16
 
@@ -39,13 +44,31 @@ Button {
         }
     }
 
+    function ensureVisible(item) {
+        if (item.activeFocus) {
+            if (root.parentFlickable) {
+                root.parentFlickable.ensureVisible(root)
+            }
+        }
+    }
+
+    onFocusChanged: {
+        ensureVisible(root)
+    }
+
+    focusItem.onFocusChanged: {
+        root.ensureVisible(focusItem)
+    }
+
     contentItem: Item {
         anchors.left: parent.left
         anchors.right: parent.right
 
         implicitHeight: content.implicitHeight
+
         RowLayout {
             id: content
+
             anchors.fill: parent
 
             Image {
@@ -61,6 +84,7 @@ Button {
             }
 
             ColumnLayout {
+
                 ListItemTitleType {
                     text: root.headerText
                     visible: text !== ""
@@ -123,6 +147,7 @@ Button {
 
                 Rectangle {
                     id: rightImageBackground
+
                     anchors.fill: parent
                     radius: 12
                     color: "transparent"
@@ -131,10 +156,9 @@ Button {
                         PropertyAnimation { duration: 200 }
                     }
                 }
+
                 onClicked: {
-                    if (clickedFunction && typeof clickedFunction === "function") {
-                        clickedFunction()
-                    }
+                    root.clicked()
                 }
             }
         }
diff --git a/client/ui/qml/Controls2/DrawerType2.qml b/client/ui/qml/Controls2/DrawerType2.qml
index c4b584c1e..e67e36a15 100644
--- a/client/ui/qml/Controls2/DrawerType2.qml
+++ b/client/ui/qml/Controls2/DrawerType2.qml
@@ -9,17 +9,14 @@ import "TextTypes"
 Item {
     id: root
 
-    readonly property string drawerExpanded: "expanded"
-    readonly property string drawerCollapsed: "collapsed"
+    readonly property string drawerExpandedStateName: "expanded"
+    readonly property string drawerCollapsedStateName: "collapsed"
 
-    readonly property bool isOpened: drawerContent.state === root.drawerExpanded || (drawerContent.state === root.drawerCollapsed && dragArea.drag.active === true)
-    readonly property bool isClosed: drawerContent.state === root.drawerCollapsed && dragArea.drag.active === false
+    readonly property bool isOpened: isExpandedStateActive() || (isCollapsedStateActive() && (dragArea.drag.active === true))
+    readonly property bool isClosed: isCollapsedStateActive() && (dragArea.drag.active === false)
 
-    readonly property bool isExpanded: drawerContent.state === root.drawerExpanded
-    readonly property bool isCollapsed: drawerContent.state === root.drawerCollapsed
-
-    property Component collapsedContent
-    property Component expandedContent
+    property Component collapsedStateContent
+    property Component expandedStateContent
 
     property string defaultColor: AmneziaStyle.color.onyxBlack
     property string borderColor: AmneziaStyle.color.slateGray
@@ -29,29 +26,41 @@ Item {
 
     property int depthIndex: 0
 
-    signal entered
-    signal exited
+    signal cursorEntered
+    signal cursorExited
     signal pressed(bool pressed, bool entered)
 
     signal aboutToHide
     signal aboutToShow
-    signal close
-    signal open
+    signal closeTriggered
+    signal openTriggered
     signal closed
     signal opened
 
+    function isExpandedStateActive() {
+        return isStateActive(drawerExpandedStateName)
+    }
+
+    function isCollapsedStateActive() {
+        return isStateActive(drawerCollapsedStateName)
+    }
+
+    function isStateActive(stateName) {
+        return drawerContent.state === stateName
+    }
+
     Connections {
         target: PageController
 
         function onCloseTopDrawer() {
             if (depthIndex === PageController.getDrawerDepth()) {
-                if (isCollapsed) {
+                if (isCollapsedStateActive()) {
                     return
                 }
 
                 aboutToHide()
 
-                drawerContent.state = root.drawerCollapsed
+                drawerContent.state = root.drawerCollapsedStateName
                 depthIndex = 0
                 closed()
             }
@@ -61,30 +70,52 @@ Item {
     Connections {
         target: root
 
-        function onClose() {
-            if (isCollapsed) {
+        function onCloseTriggered() {
+            if (isCollapsedStateActive()) {
                 return
             }
 
             aboutToHide()
 
-            drawerContent.state = root.drawerCollapsed
-            depthIndex = 0
-            PageController.setDrawerDepth(PageController.getDrawerDepth() - 1)
             closed()
         }
 
-        function onOpen() {
-            if (isExpanded) {
+        function onClosed() {
+            drawerContent.state = root.drawerCollapsedStateName
+            
+            if (root.isCollapsedStateActive()) {
+                var initialPageNavigationBarColor = PageController.getInitialPageNavigationBarColor()
+                if (initialPageNavigationBarColor !== 0xFF1C1D21) {
+                    PageController.updateNavigationBarColor(initialPageNavigationBarColor)
+                }
+            }
+
+            depthIndex = 0
+            PageController.decrementDrawerDepth()
+            FocusController.dropRootObject(root)
+        }
+
+        function onOpenTriggered() {
+            if (root.isExpandedStateActive()) {
                 return
             }
 
-            aboutToShow()
+            root.aboutToShow()
 
-            drawerContent.state = root.drawerExpanded
-            depthIndex = PageController.getDrawerDepth() + 1
-            PageController.setDrawerDepth(depthIndex)
-            opened()
+            root.opened()
+        }
+
+        function onOpened() {
+            drawerContent.state = root.drawerExpandedStateName
+
+            if (isExpandedStateActive()) {
+                if (PageController.getInitialPageNavigationBarColor() !== 0xFF1C1D21) {
+                    PageController.updateNavigationBarColor(0xFF1C1D21)
+                }
+            }
+
+            depthIndex = PageController.incrementDrawerDepth()
+            FocusController.pushRootObject(root)
         }
     }
 
@@ -92,7 +123,7 @@ Item {
         id: background
 
         anchors.fill: parent
-        color: root.isCollapsed ? AmneziaStyle.color.transparent : AmneziaStyle.color.translucentMidnightBlack
+        color: root.isCollapsedStateActive() ? AmneziaStyle.color.transparent : AmneziaStyle.color.translucentMidnightBlack
 
         Behavior on color {
             PropertyAnimation { duration: 200 }
@@ -102,18 +133,17 @@ Item {
     MouseArea {
         id: emptyArea
         anchors.fill: parent
-        enabled: root.isExpanded
-        visible: enabled
+
         onClicked: {
-            root.close()
+            root.closeTriggered()
         }
     }
 
     MouseArea {
         id: dragArea
+        objectName: "dragArea"
 
         anchors.fill: drawerContentBackground
-        cursorShape: root.isCollapsed ? Qt.PointingHandCursor : Qt.ArrowCursor
         hoverEnabled: true
 
         enabled: drawerContent.implicitHeight > 0
@@ -125,35 +155,36 @@ Item {
 
         /** If drag area is released at any point other than min or max y, transition to the other state */
         onReleased: {
-            if (root.isCollapsed && drawerContent.y < dragArea.drag.maximumY) {
-                root.open()
+            if (isCollapsedStateActive() && drawerContent.y < dragArea.drag.maximumY) {
+                root.openTriggered()
                 return
             }
-            if (root.isExpanded && drawerContent.y > dragArea.drag.minimumY) {
-                root.close()
+            if (isExpandedStateActive() && drawerContent.y > dragArea.drag.minimumY) {
+                root.closeTriggered()
                 return
             }
         }
 
         onEntered: {
-            root.entered()
+            root.cursorEntered()
         }
         onExited: {
-            root.exited()
+            root.cursorExited()
         }
         onPressedChanged: {
             root.pressed(pressed, entered)
         }
 
         onClicked: {
-            if (root.isCollapsed) {
-                root.open()
+            if (isCollapsedStateActive()) {
+                root.openTriggered()
             }
         }
     }
 
     Rectangle {
         id: drawerContentBackground
+        objectName: "drawerContentBackground"
 
         anchors { left: drawerContent.left; right: drawerContent.right; top: drawerContent.top }
         height: root.height
@@ -174,53 +205,80 @@ Item {
 
     Item {
         id: drawerContent
+        objectName: "drawerContent"
 
         Drag.active: dragArea.drag.active
         anchors.right: root.right
         anchors.left: root.left
-        y: root.height - drawerContent.height
-        state: root.drawerCollapsed
 
-        implicitHeight: root.isCollapsed ? collapsedHeight : expandedHeight
-
-        onStateChanged: {
-            if (root.isCollapsed) {
-                var initialPageNavigationBarColor = PageController.getInitialPageNavigationBarColor()
-                if (initialPageNavigationBarColor !== 0xFF1C1D21) {
-                    PageController.updateNavigationBarColor(initialPageNavigationBarColor)
-                }
-                return
-            }
-            if (root.isExpanded) {
-                if (PageController.getInitialPageNavigationBarColor() !== 0xFF1C1D21) {
-                    PageController.updateNavigationBarColor(0xFF1C1D21)
-                }
-                return
-            }
-        }
+        state: root.drawerCollapsedStateName
 
         states: [
             State {
-                name: root.drawerCollapsed
+                name: root.drawerCollapsedStateName
                 PropertyChanges {
                     target: drawerContent
+                    implicitHeight: collapsedHeight
                     y: root.height - root.collapsedHeight
                 }
+                PropertyChanges {
+                    target: background
+                    color: AmneziaStyle.color.transparent
+                }
+                PropertyChanges {
+                    target: dragArea
+                    cursorShape: Qt.PointingHandCursor
+                }
+                PropertyChanges {
+                    target: emptyArea
+                    enabled: false
+                    visible: false
+                }
+                PropertyChanges {
+                    target: collapsedLoader
+                    // visible: true
+                }
+                PropertyChanges {
+                    target: expandedLoader
+                    visible: false
+
+                }
             },
             State {
-                name: root.drawerExpanded
+                name: root.drawerExpandedStateName
                 PropertyChanges {
                     target: drawerContent
+                    implicitHeight: expandedHeight
                     y: dragArea.drag.minimumY
-
+                }
+                PropertyChanges {
+                    target: background
+                    color: Qt.rgba(14/255, 14/255, 17/255, 0.8)
+                }
+                PropertyChanges {
+                    target: dragArea
+                    cursorShape: Qt.ArrowCursor
+                }
+                PropertyChanges {
+                    target: emptyArea
+                    enabled: true
+                    visible: true
+                }
+                PropertyChanges {
+                    target: collapsedLoader
+                    // visible: false
+                }
+                PropertyChanges {
+                    target: expandedLoader
+                    visible: true
                 }
             }
         ]
 
         transitions: [
             Transition {
-                from: root.drawerCollapsed
-                to: root.drawerExpanded
+                from: root.drawerCollapsedStateName
+                to: root.drawerExpandedStateName
                 PropertyAnimation {
                     target: drawerContent
                     properties: "y"
@@ -228,8 +286,8 @@ Item {
                 }
             },
             Transition {
-                from: root.drawerExpanded
-                to: root.drawerCollapsed
+                from: root.drawerExpandedStateName
+                to: root.drawerCollapsedStateName
                 PropertyAnimation {
                     target: drawerContent
                     properties: "y"
@@ -241,7 +299,7 @@ Item {
         Loader {
             id: collapsedLoader
 
-            sourceComponent: root.collapsedContent
+            sourceComponent: root.collapsedStateContent
 
             anchors.right: parent.right
             anchors.left: parent.left
@@ -250,8 +308,7 @@ Item {
         Loader {
             id: expandedLoader
 
-            visible: root.isExpanded
-            sourceComponent: root.expandedContent
+            sourceComponent: root.expandedStateContent
 
             anchors.right: parent.right
             anchors.left: parent.left
diff --git a/client/ui/qml/Controls2/DropDownType.qml b/client/ui/qml/Controls2/DropDownType.qml
index 906cfffef..ae6dac851 100644
--- a/client/ui/qml/Controls2/DropDownType.qml
+++ b/client/ui/qml/Controls2/DropDownType.qml
@@ -45,33 +45,56 @@ Item {
     property Item drawerParent
     property Component listView
 
-    signal open
-    signal close
+    signal openTriggered
+    signal closeTriggered
 
-    function popupClosedFunc() {
-        if (!GC.isMobile()) {
-            this.forceActiveFocus()
-        }
+    readonly property bool isFocusable: true
+
+    Keys.onTabPressed: {
+        FocusController.nextKeyTabItem()
     }
 
-    property var parentFlickable
-    onFocusChanged: {
-        if (root.activeFocus) {
-            if (root.parentFlickable) {
-                root.parentFlickable.ensureVisible(root)
-            }
-        }
+    Keys.onBacktabPressed: {
+        FocusController.previousKeyTabItem()
+    }
+
+    Keys.onUpPressed: {
+        FocusController.nextKeyUpItem()
+    }
+    
+    Keys.onDownPressed: {
+        FocusController.nextKeyDownItem()
+    }
+    
+    Keys.onLeftPressed: {
+        FocusController.nextKeyLeftItem()
+    }
+
+    Keys.onRightPressed: {
+        FocusController.nextKeyRightItem()
     }
 
     implicitWidth: rootButtonContent.implicitWidth
     implicitHeight: rootButtonContent.implicitHeight
 
-    onOpen: {
-        menu.open()
+    onOpenTriggered: {
+        menu.openTriggered()
     }
 
-    onClose: {
-        menu.close()
+    onCloseTriggered: {
+        menu.closeTriggered()
+    }
+
+    Keys.onEnterPressed: {
+        if (menu.isClosed) {
+            menu.openTriggered()
+        }
+    }
+
+    Keys.onReturnPressed: {
+        if (menu.isClosed) {
+            menu.openTriggered()
+        }
     }
 
     Rectangle {
@@ -173,7 +196,7 @@ Item {
             if (rootButtonClickedFunction && typeof rootButtonClickedFunction === "function") {
                 rootButtonClickedFunction()
             } else {
-                menu.open()
+                menu.openTriggered()
             }
         }
     }
@@ -186,93 +209,38 @@ Item {
         anchors.fill: parent
         expandedHeight: drawerParent.height * drawerHeight
 
-        onClosed: {
-            root.popupClosedFunc()
-        }
-
-        expandedContent: Item {
+        expandedStateContent: Item {
             id: container
             implicitHeight: menu.expandedHeight
 
-            Connections {
-                target: menu
-                enabled: !GC.isMobile()
-                function onOpened() {
-                    focusItem.forceActiveFocus()
-                }
-            }
-
-            Item {
-                id: focusItem
-                KeyNavigation.tab: backButton
-            }
-
             ColumnLayout {
                 id: header
 
-                anchors.top: parent.top
-                anchors.left: parent.left
-                anchors.right: parent.right
+                anchors.fill: parent
                 anchors.topMargin: 16
 
                 BackButtonType {
                     id: backButton
                     backButtonImage: root.headerBackButtonImage
-                    backButtonFunction: function() { menu.close() }
-                    KeyNavigation.tab: listViewLoader.item
+                    backButtonFunction: function() { menu.closeTriggered() }
                 }
-            }
-
-            FlickableType {
-                id: flickable
-                anchors.top: header.bottom
-                anchors.topMargin: 16
-                contentHeight: col.implicitHeight
-
-                Column {
-                    id: col
-                    anchors.top: parent.top
-                    anchors.left: parent.left
-                    anchors.right: parent.right
-
-                    spacing: 16
 
-                    Header2Type {
-                        anchors.left: parent.left
-                        anchors.right: parent.right
-                        anchors.leftMargin: 16
-                        anchors.rightMargin: 16
+                Header2Type {
+                    Layout.leftMargin: 16
+                    Layout.rightMargin: 16
+                    Layout.bottomMargin: 16
+                    Layout.fillWidth: true
 
-                        headerText: root.headerText
-
-                        width: parent.width
-                    }
+                    headerText: root.headerText
+                }
 
-                    Loader {
-                        id: listViewLoader
-                        sourceComponent: root.listView
+                Loader {
+                    id: listViewLoader
+                    sourceComponent: root.listView
 
-                        onLoaded: {
-                            listViewLoader.item.parentFlickable = flickable
-                            listViewLoader.item.lastItemTabClicked = function() {
-                                focusItem.forceActiveFocus()
-                            }
-                        }
-                    }
+                    Layout.fillHeight: true
                 }
             }
         }
     }
-
-    Keys.onEnterPressed: {
-        if (menu.isClosed) {
-            menu.open()
-        }
-    }
-
-    Keys.onReturnPressed: {
-        if (menu.isClosed) {
-            menu.open()
-        }
-    }
 }
diff --git a/client/ui/qml/Controls2/FlickableType.qml b/client/ui/qml/Controls2/FlickableType.qml
index bcd14487d..b3e5cabf5 100644
--- a/client/ui/qml/Controls2/FlickableType.qml
+++ b/client/ui/qml/Controls2/FlickableType.qml
@@ -7,10 +7,11 @@ Flickable {
 
     function ensureVisible(item) {
         if (item.y < fl.contentY) {
-            fl.contentY = item.y
+            fl.contentY = item.y - 40 // 40 is a top margin
         } else if (item.y + item.height > fl.contentY + fl.height) {
             fl.contentY = item.y + item.height - fl.height + 40 // 40 is a bottom margin
         }
+        fl.returnToBounds()
     }
 
     clip: true
@@ -24,7 +25,7 @@ Flickable {
     Keys.onUpPressed: scrollBar.decrease()
     Keys.onDownPressed: scrollBar.increase()
 
-    ScrollBar.vertical: ScrollBar {
+    ScrollBar.vertical: ScrollBarType {
         id: scrollBar
         policy: fl.height >= fl.contentHeight ? ScrollBar.AlwaysOff : ScrollBar.AlwaysOn
     }
diff --git a/client/ui/qml/Controls2/HeaderType.qml b/client/ui/qml/Controls2/HeaderType.qml
index f1cafbff7..1366148d8 100644
--- a/client/ui/qml/Controls2/HeaderType.qml
+++ b/client/ui/qml/Controls2/HeaderType.qml
@@ -19,8 +19,6 @@ Item {
 
     property string descriptionText
 
-    focus: true
-
     implicitWidth: content.implicitWidth
     implicitHeight: content.implicitHeight
 
diff --git a/client/ui/qml/Controls2/HorizontalRadioButton.qml b/client/ui/qml/Controls2/HorizontalRadioButton.qml
index 1ac1cd308..89cc16589 100644
--- a/client/ui/qml/Controls2/HorizontalRadioButton.qml
+++ b/client/ui/qml/Controls2/HorizontalRadioButton.qml
@@ -27,6 +27,32 @@ RadioButton {
     implicitWidth: content.implicitWidth
     implicitHeight: content.implicitHeight
 
+    property bool isFocusable: true
+
+    Keys.onTabPressed: {
+        FocusController.nextKeyTabItem()
+    }
+
+    Keys.onBacktabPressed: {
+        FocusController.previousKeyTabItem()
+    }
+
+    Keys.onUpPressed: {
+        FocusController.nextKeyUpItem()
+    }
+    
+    Keys.onDownPressed: {
+        FocusController.nextKeyDownItem()
+    }
+    
+    Keys.onLeftPressed: {
+        FocusController.nextKeyLeftItem()
+    }
+
+    Keys.onRightPressed: {
+        FocusController.nextKeyRightItem()
+    }
+
     indicator: Rectangle {
         anchors.fill: parent
         radius: 16
diff --git a/client/ui/qml/Controls2/ImageButtonType.qml b/client/ui/qml/Controls2/ImageButtonType.qml
index fffb6d844..d5f646a78 100644
--- a/client/ui/qml/Controls2/ImageButtonType.qml
+++ b/client/ui/qml/Controls2/ImageButtonType.qml
@@ -24,21 +24,38 @@ Button {
     property int borderFocusedWidth: 1
 
     hoverEnabled: true
-    focus: true
-    focusPolicy: Qt.TabFocus
 
     icon.source: image
     icon.color: root.enabled ? imageColor : disableImageColor
 
-    property Flickable parentFlickable
+    property bool isFocusable: true
 
-    onFocusChanged: {
-        if (root.activeFocus) {
-            if (root.parentFlickable) {
-                root.parentFlickable.ensureVisible(this)
-            }
-        }
+    Keys.onTabPressed: {
+        FocusController.nextKeyTabItem()
+    }
+
+    Keys.onBacktabPressed: {
+        FocusController.previousKeyTabItem()
+    }
+
+    Keys.onUpPressed: {
+        FocusController.nextKeyUpItem()
     }
+    
+    Keys.onDownPressed: {
+        FocusController.nextKeyDownItem()
+    }
+    
+    Keys.onLeftPressed: {
+        FocusController.nextKeyLeftItem()
+    }
+
+    Keys.onRightPressed: {
+        FocusController.nextKeyRightItem()
+    }
+
+    Keys.onEnterPressed: root.clicked()
+    Keys.onReturnPressed: root.clicked()
 
     Behavior on icon.color {
         PropertyAnimation { duration: 200 }
diff --git a/client/ui/qml/Controls2/LabelWithButtonType.qml b/client/ui/qml/Controls2/LabelWithButtonType.qml
index 41faf1086..087415f7c 100644
--- a/client/ui/qml/Controls2/LabelWithButtonType.qml
+++ b/client/ui/qml/Controls2/LabelWithButtonType.qml
@@ -41,6 +41,32 @@ Item {
     property bool descriptionOnTop: false
     property bool hideDescription: true
 
+    property bool isFocusable: !(eyeImage.visible || rightImage.visible) // TODO: this component already has focusable items
+
+    Keys.onTabPressed: {
+        FocusController.nextKeyTabItem()
+    }
+
+    Keys.onBacktabPressed: {
+        FocusController.previousKeyTabItem()
+    }
+
+    Keys.onUpPressed: {
+        FocusController.nextKeyUpItem()
+    }
+    
+    Keys.onDownPressed: {
+        FocusController.nextKeyDownItem()
+    }
+    
+    Keys.onLeftPressed: {
+        FocusController.nextKeyLeftItem()
+    }
+
+    Keys.onRightPressed: {
+        FocusController.nextKeyRightItem()
+    }
+    
     implicitWidth: content.implicitWidth + content.anchors.topMargin + content.anchors.bottomMargin
     implicitHeight: content.implicitHeight + content.anchors.leftMargin + content.anchors.rightMargin
 
diff --git a/client/ui/qml/Controls2/ListViewWithLabelsType.qml b/client/ui/qml/Controls2/ListViewWithLabelsType.qml
index 5b614c43c..536bc25a0 100644
--- a/client/ui/qml/Controls2/ListViewWithLabelsType.qml
+++ b/client/ui/qml/Controls2/ListViewWithLabelsType.qml
@@ -17,7 +17,7 @@ ListView {
 
     property bool dividerVisible: false
 
-    currentIndex: 0
+    property int selectedIndex: 0
 
     width: rootWidth
     height: menuContent.contentItem.height
@@ -45,7 +45,7 @@ ListView {
                 rightImageSource: imageSource
 
                 clickedFunction: function() {
-                    menuContent.currentIndex = index
+                    menuContent.selectedIndex = index
                     menuContent.selectedText = name
                     if (menuContent.clickedFunction && typeof menuContent.clickedFunction === "function") {
                         menuContent.clickedFunction()
@@ -62,7 +62,7 @@ ListView {
         }
 
         Component.onCompleted: {
-            if (menuContent.currentIndex === index) {
+            if (menuContent.selectedIndex === index) {
                 menuContent.selectedText = name
             }
         }
diff --git a/client/ui/qml/Controls2/ListViewWithRadioButtonType.qml b/client/ui/qml/Controls2/ListViewWithRadioButtonType.qml
index f7b777a7f..bd7ca32e9 100644
--- a/client/ui/qml/Controls2/ListViewWithRadioButtonType.qml
+++ b/client/ui/qml/Controls2/ListViewWithRadioButtonType.qml
@@ -20,155 +20,134 @@ ListView {
 
     property var clickedFunction
 
-    currentIndex: 0
+    property int selectedIndex: 0
 
     width: rootWidth
     height: root.contentItem.height
 
     clip: true
-    interactive: false
+    reuseItems: true
 
-    property FlickableType parentFlickable
-    property var lastItemTabClicked
+    property bool isFocusable: true
 
-    property int currentFocusIndex: 0
+    ScrollBar.vertical: ScrollBarType {}
 
-    activeFocusOnTab: true
-    onActiveFocusChanged: {
-        if (activeFocus) {
-            this.currentFocusIndex = 0
-            this.itemAtIndex(currentFocusIndex).forceActiveFocus()
-        }
+    ButtonGroup {
+        id: buttonGroup
     }
 
-    Keys.onTabPressed: {
-        if (currentFocusIndex < this.count - 1) {
-            currentFocusIndex += 1
-        } else {
-            currentFocusIndex = 0
-        }
-        this.itemAtIndex(currentFocusIndex).forceActiveFocus()
+    function triggerCurrentItem() {
+        var item = root.itemAtIndex(selectedIndex)
+        item.selectable.clicked()
     }
 
-    Item {
-        id: focusItem
-        Keys.onTabPressed: {
-            root.forceActiveFocus()
-        }
-    }
+    delegate: ColumnLayout {
+        id: content
 
-    onVisibleChanged: {
-        if (visible) {
-            focusItem.forceActiveFocus()
-        }
-    }
+        property alias selectable: radioButton
 
-    onCurrentFocusIndexChanged: {
-        if (parentFlickable) {
-            parentFlickable.ensureVisible(this.itemAtIndex(currentFocusIndex))
-        }
-    }
+        implicitWidth: rootWidth
 
-    ButtonGroup {
-        id: buttonGroup
-    }
+        RadioButton {
+            id: radioButton
 
-    function triggerCurrentItem() {
-        var item = root.itemAtIndex(currentIndex)
-        var radioButton = item.children[0].children[0]
-        radioButton.clicked()
-    }
+            implicitWidth: parent.width
+            implicitHeight: radioButtonContent.implicitHeight
 
-    delegate: Item {
-        implicitWidth: rootWidth
-        implicitHeight: content.implicitHeight
+            hoverEnabled: true
 
-        onActiveFocusChanged: {
-            if (activeFocus) {
-                radioButton.forceActiveFocus()
-            }
-        }
+            property bool isFocusable: true
 
-        ColumnLayout {
-            id: content
+            Keys.onTabPressed: {
+                FocusController.nextKeyTabItem()
+            }
 
-            anchors.fill: parent
+            Keys.onBacktabPressed: {
+                FocusController.previousKeyTabItem()
+            }
 
-            RadioButton {
-                id: radioButton
+            Keys.onUpPressed: {
+                FocusController.nextKeyUpItem()
+            }
 
-                implicitWidth: parent.width
-                implicitHeight: radioButtonContent.implicitHeight
+            Keys.onDownPressed: {
+                FocusController.nextKeyDownItem()
+            }
 
-                hoverEnabled: true
+            Keys.onLeftPressed: {
+                FocusController.nextKeyLeftItem()
+            }
 
-                indicator: Rectangle {
-                    width: parent.width - 1
-                    height: parent.height
-                    color: radioButton.hovered ? AmneziaStyle.color.slateGray : AmneziaStyle.color.onyxBlack
-                    border.color: radioButton.focus ? AmneziaStyle.color.paleGray : AmneziaStyle.color.transparent
-                    border.width: radioButton.focus ? 1 : 0
+            Keys.onRightPressed: {
+                FocusController.nextKeyRightItem()
+            }
 
-                    Behavior on color {
-                        PropertyAnimation { duration: 200 }
-                    }
-                    Behavior on border.color {
-                        PropertyAnimation { duration: 200 }
-                    }
+            indicator: Rectangle {
+                width: parent.width - 1
+                height: parent.height
+                color: radioButton.hovered ? AmneziaStyle.color.slateGray : AmneziaStyle.color.onyxBlack
+                border.color: radioButton.focus ? AmneziaStyle.color.paleGray : AmneziaStyle.color.transparent
+                border.width: radioButton.focus ? 1 : 0
 
-                    MouseArea {
-                        anchors.fill: parent
-                        cursorShape: Qt.PointingHandCursor
-                        enabled: false
-                    }
+                Behavior on color {
+                    PropertyAnimation { duration: 200 }
+                }
+                Behavior on border.color {
+                    PropertyAnimation { duration: 200 }
                 }
 
-                RowLayout {
-                    id: radioButtonContent
+                MouseArea {
                     anchors.fill: parent
+                    cursorShape: Qt.PointingHandCursor
+                    enabled: false
+                }
+            }
 
-                    anchors.rightMargin: 16
-                    anchors.leftMargin: 16
+            RowLayout {
+                id: radioButtonContent
+                anchors.fill: parent
 
-                    z: 1
+                anchors.rightMargin: 16
+                anchors.leftMargin: 16
 
-                    ParagraphTextType {
-                        Layout.fillWidth: true
-                        Layout.topMargin: 20
-                        Layout.bottomMargin: 20
+                z: 1
 
-                        text: name
-                        maximumLineCount: root.textMaximumLineCount
-                        elide: root.textElide
+                ParagraphTextType {
+                    Layout.fillWidth: true
+                    Layout.topMargin: 20
+                    Layout.bottomMargin: 20
 
-                    }
+                    text: name
+                    maximumLineCount: root.textMaximumLineCount
+                    elide: root.textElide
 
-                    Image {
-                        source: imageSource
-                        visible: radioButton.checked
+                }
+
+                Image {
+                    source: imageSource
+                    visible: radioButton.checked
 
-                        width: 24
-                        height: 24
+                    width: 24
+                    height: 24
 
-                        Layout.rightMargin: 8
-                    }
+                    Layout.rightMargin: 8
                 }
+            }
 
-                ButtonGroup.group: buttonGroup
-                checked: root.currentIndex === index
+            ButtonGroup.group: buttonGroup
+            checked: root.selectedIndex === index
 
-                onClicked: {
-                    root.currentIndex = index
-                    root.selectedText = name
-                    if (clickedFunction && typeof clickedFunction === "function") {
-                        clickedFunction()
-                    }
+            onClicked: {
+                root.selectedIndex = index
+                root.selectedText = name
+                if (clickedFunction && typeof clickedFunction === "function") {
+                    clickedFunction()
                 }
             }
         }
 
         Component.onCompleted: {
-            if (root.currentIndex === index) {
+            if (root.selectedIndex === index) {
                 root.selectedText = name
             }
         }
diff --git a/client/ui/qml/Controls2/PageType.qml b/client/ui/qml/Controls2/PageType.qml
index 0a2a29984..d7f3317f3 100644
--- a/client/ui/qml/Controls2/PageType.qml
+++ b/client/ui/qml/Controls2/PageType.qml
@@ -9,53 +9,21 @@ Item {
 
     property StackView stackView: StackView.view
 
-    property var defaultActiveFocusItem: null
-
     onVisibleChanged: {
-        if (visible && !GC.isMobile()) {
+        if (visible) {
             timer.start()
         }
     }
 
-    function lastItemTabClicked(focusItem) {
-        if (GC.isMobile()) {
-            return
-        }
-
-        if (focusItem) {
-            focusItem.forceActiveFocus()
-            PageController.forceTabBarActiveFocus()
-        } else {
-            if (defaultActiveFocusItem) {
-                defaultActiveFocusItem.forceActiveFocus()
-            }
-            PageController.forceTabBarActiveFocus()
-        }
-    }
-
-//    MouseArea {
-//        id: globalMouseArea
-//        z: 99
-//        anchors.fill: parent
-
-//        enabled: true
-
-//        onPressed: function(mouse) {
-//            forceActiveFocus()
-//            mouse.accepted = false
-//        }
-//    }
-
     // Set a timer to set focus after a short delay
     Timer {
         id: timer
-        interval: 100 // Milliseconds
+        interval: 200 // Milliseconds
         onTriggered: {
-            if (defaultActiveFocusItem) {
-                defaultActiveFocusItem.forceActiveFocus()
-            }
+            FocusController.resetRootObject()
+            FocusController.setFocusOnDefaultItem()
         }
         repeat: false // Stop the timer after one trigger
-        running: !GC.isMobile()  // Start the timer
+        running: true // Start the timer
     }
 }
diff --git a/client/ui/qml/Controls2/PopupType.qml b/client/ui/qml/Controls2/PopupType.qml
index 7a6a770e0..dfb6f273e 100644
--- a/client/ui/qml/Controls2/PopupType.qml
+++ b/client/ui/qml/Controls2/PopupType.qml
@@ -5,6 +5,7 @@ import QtQuick.Layouts
 import Style 1.0
 
 import "TextTypes"
+import "../Config"
 
 Popup {
     id: root
@@ -28,11 +29,11 @@ Popup {
     }
 
     onOpened: {
-        focusItem.forceActiveFocus()
+        timer.start()
     }
 
     onClosed: {
-        PageController.forceStackActiveFocus()
+        FocusController.dropRootObject(root)
     }
 
     background: Rectangle {
@@ -42,6 +43,17 @@ Popup {
         radius: 4
     }
 
+    Timer {
+        id: timer
+        interval: 200 // Milliseconds
+        onTriggered: {
+            FocusController.pushRootObject(root)
+            FocusController.setFocusItem(closeButton)
+        }
+        repeat: false // Stop the timer after one trigger
+        running: true // Start the timer
+    }
+
     contentItem: Item {
         implicitWidth: content.implicitWidth
         implicitHeight: content.implicitHeight
@@ -72,11 +84,6 @@ Popup {
                 }
             }
 
-            Item {
-                id: focusItem
-                KeyNavigation.tab: closeButton
-            }
-
             BasicButtonType {
                 id: closeButton
                 visible: closeButtonVisible
@@ -92,7 +99,6 @@ Popup {
                 borderWidth: 0
 
                 text: qsTr("Close")
-                KeyNavigation.tab: focusItem
 
                 clickedFunc: function() {
                     root.close()
diff --git a/client/ui/qml/Controls2/ScrollBarType.qml b/client/ui/qml/Controls2/ScrollBarType.qml
new file mode 100644
index 000000000..26e8edb69
--- /dev/null
+++ b/client/ui/qml/Controls2/ScrollBarType.qml
@@ -0,0 +1,11 @@
+import QtQuick
+import QtQuick.Controls
+
+import "./"
+import "../Controls2"
+
+ScrollBar {
+    id: root
+    
+    policy: parent.height >= parent.contentHeight ? ScrollBar.AlwaysOff : ScrollBar.AlwaysOn
+}
diff --git a/client/ui/qml/Controls2/SwitcherType.qml b/client/ui/qml/Controls2/SwitcherType.qml
index 43c35778a..0651390fd 100644
--- a/client/ui/qml/Controls2/SwitcherType.qml
+++ b/client/ui/qml/Controls2/SwitcherType.qml
@@ -35,10 +35,37 @@ Switch {
     property string hoveredIndicatorBackgroundColor: AmneziaStyle.color.translucentWhite
     property string defaultIndicatorBackgroundColor: AmneziaStyle.color.transparent
 
+    property bool isFocusable: true
+
+    Keys.onTabPressed: {
+        FocusController.nextKeyTabItem()
+    }
+
+    Keys.onBacktabPressed: {
+        FocusController.previousKeyTabItem()
+    }
+
+    Keys.onUpPressed: {
+        FocusController.nextKeyUpItem()
+    }
+    
+    Keys.onDownPressed: {
+        FocusController.nextKeyDownItem()
+    }
+    
+    Keys.onLeftPressed: {
+        FocusController.nextKeyLeftItem()
+    }
+
+    Keys.onRightPressed: {
+        FocusController.nextKeyRightItem()
+    }
+
     hoverEnabled: enabled ? true : false
     focusPolicy: Qt.TabFocus
 
     property FlickableType parentFlickable: null
+
     onFocusChanged: {
         if (root.activeFocus) {
             if (root.parentFlickable) {
@@ -131,13 +158,15 @@ Switch {
         enabled: false
     }
 
-    Keys.onEnterPressed: {
-        root.checked = !root.checked
-        root.checkedChanged()
-    }
+    Keys.onEnterPressed: event => handleSwitch(event)
+    Keys.onReturnPressed: event => handleSwitch(event)
+    Keys.onSpacePressed: event => handleSwitch(event)
 
-    Keys.onReturnPressed: {
-        root.checked = !root.checked
-        root.checkedChanged()
+    function handleSwitch(event) {
+        if (!event.isAutoRepeat) {
+            root.checked = !root.checked
+            root.checkedChanged()
+        }
+        event.accepted = true
     }
 }
diff --git a/client/ui/qml/Controls2/TabButtonType.qml b/client/ui/qml/Controls2/TabButtonType.qml
index d57ff3a0c..0e48d975f 100644
--- a/client/ui/qml/Controls2/TabButtonType.qml
+++ b/client/ui/qml/Controls2/TabButtonType.qml
@@ -17,10 +17,35 @@ TabButton {
 
     property bool isSelected: false
 
+    property bool isFocusable: true
+
+    Keys.onTabPressed: {
+        FocusController.nextKeyTabItem()
+    }
+
+    Keys.onBacktabPressed: {
+        FocusController.previousKeyTabItem()
+    }
+
+    Keys.onUpPressed: {
+        FocusController.nextKeyUpItem()
+    }
+    
+    Keys.onDownPressed: {
+        FocusController.nextKeyDownItem()
+    }
+    
+    Keys.onLeftPressed: {
+        FocusController.nextKeyLeftItem()
+    }
+
+    Keys.onRightPressed: {
+        FocusController.nextKeyRightItem()
+    }
+    
     implicitHeight: 48
 
     hoverEnabled: true
-    focusPolicy: Qt.TabFocus
 
     background: Rectangle {
         id: background
diff --git a/client/ui/qml/Controls2/TabImageButtonType.qml b/client/ui/qml/Controls2/TabImageButtonType.qml
index abe544aa6..b49ad8eb4 100644
--- a/client/ui/qml/Controls2/TabImageButtonType.qml
+++ b/client/ui/qml/Controls2/TabImageButtonType.qml
@@ -14,13 +14,38 @@ TabButton {
 
     property bool isSelected: false
 
+	property bool isFocusable: true
+
+    Keys.onTabPressed: {
+        FocusController.nextKeyTabItem()
+    }
+
+    Keys.onBacktabPressed: {
+        FocusController.previousKeyTabItem()
+    }
+
+    Keys.onUpPressed: {
+        FocusController.nextKeyUpItem()
+    }
+    
+    Keys.onDownPressed: {
+        FocusController.nextKeyDownItem()
+    }
+    
+    Keys.onLeftPressed: {
+        FocusController.nextKeyLeftItem()
+    }
+
+    Keys.onRightPressed: {
+        FocusController.nextKeyRightItem()
+    }
+    
     property string borderFocusedColor: AmneziaStyle.color.paleGray
     property int borderFocusedWidth: 1
 
     property var clickedFunc
 
     hoverEnabled: true
-    focusPolicy: Qt.TabFocus
 
     icon.source: image
     icon.color: isSelected ? selectedColor : defaultColor
@@ -41,7 +66,7 @@ TabButton {
         cursorShape: Qt.PointingHandCursor
         enabled: false
     }
-
+    
     Keys.onEnterPressed: {
         if (root.clickedFunc && typeof root.clickedFunc === "function") {
             root.clickedFunc()
diff --git a/client/ui/qml/Controls2/TextAreaWithFooterType.qml b/client/ui/qml/Controls2/TextAreaWithFooterType.qml
index 102929e2e..cf7b91463 100644
--- a/client/ui/qml/Controls2/TextAreaWithFooterType.qml
+++ b/client/ui/qml/Controls2/TextAreaWithFooterType.qml
@@ -78,9 +78,6 @@ Rectangle {
                 placeholderText: root.placeholderText
                 text: root.text
 
-
-                KeyNavigation.tab: firstButton
-
                 onCursorVisibleChanged:  {
                     if (textArea.cursorVisible) {
                         fl.interactive = true
diff --git a/client/ui/qml/Controls2/TextFieldWithHeaderType.qml b/client/ui/qml/Controls2/TextFieldWithHeaderType.qml
index 365faa94c..fbea618b4 100644
--- a/client/ui/qml/Controls2/TextFieldWithHeaderType.qml
+++ b/client/ui/qml/Controls2/TextFieldWithHeaderType.qml
@@ -40,6 +40,7 @@ Item {
     implicitHeight: content.implicitHeight
 
     property FlickableType parentFlickable
+
     Connections {
         target: textField
         function onFocusChanged() {
@@ -84,7 +85,16 @@ Item {
 
                     TextField {
                         id: textField
-                        activeFocusOnTab: false
+
+                        property bool isFocusable: true
+
+                        Keys.onTabPressed: {
+                            FocusController.nextKeyTabItem()
+                        }
+
+                        Keys.onBacktabPressed: {
+                            FocusController.previousKeyTabItem()
+                        }
 
                         enabled: root.textFieldEditable
                         color: root.enabled ? root.textFieldTextColor : root.textFieldTextDisabledColor
@@ -209,9 +219,9 @@ Item {
             clickedFunc()
         }
 
-        if (KeyNavigation.tab) {
-            KeyNavigation.tab.forceActiveFocus();
-        }
+        // if (KeyNavigation.tab) {
+        //     KeyNavigation.tab.forceActiveFocus();
+        // }
     }
 
     Keys.onReturnPressed: {
@@ -219,8 +229,8 @@ Item {
             clickedFunc()
         }
 
-        if (KeyNavigation.tab) {
-            KeyNavigation.tab.forceActiveFocus();
-        }
+        // if (KeyNavigation.tab) {
+        //     KeyNavigation.tab.forceActiveFocus();
+        // }
     }
 }
diff --git a/client/ui/qml/Controls2/VerticalRadioButton.qml b/client/ui/qml/Controls2/VerticalRadioButton.qml
index 1a781f20b..bee8ef7b8 100644
--- a/client/ui/qml/Controls2/VerticalRadioButton.qml
+++ b/client/ui/qml/Controls2/VerticalRadioButton.qml
@@ -28,8 +28,33 @@ RadioButton {
     property string imageSource
     property bool showImage
 
+    property bool isFocusable: true
+
+    Keys.onTabPressed: {
+        FocusController.nextKeyTabItem()
+    }
+
+    Keys.onBacktabPressed: {
+        FocusController.previousKeyTabItem()
+    }
+
+    Keys.onUpPressed: {
+        FocusController.nextKeyUpItem()
+    }
+    
+    Keys.onDownPressed: {
+        FocusController.nextKeyDownItem()
+    }
+    
+    Keys.onLeftPressed: {
+        FocusController.nextKeyLeftItem()
+    }
+
+    Keys.onRightPressed: {
+        FocusController.nextKeyRightItem()
+    }
+
     hoverEnabled: true
-    focusPolicy: Qt.TabFocus
 
     indicator: Rectangle {
         id: background
diff --git a/client/ui/qml/Modules/Style/AmneziaStyle.qml b/client/ui/qml/Modules/Style/AmneziaStyle.qml
index 1abfbe3ae..f54fefcee 100644
--- a/client/ui/qml/Modules/Style/AmneziaStyle.qml
+++ b/client/ui/qml/Modules/Style/AmneziaStyle.qml
@@ -26,5 +26,6 @@ QtObject {
         readonly property color softGoldenApricot: Qt.rgba(251/255, 178/255, 106/255, 0.3)
         readonly property color mistyGray: Qt.rgba(215/255, 216/255, 219/255, 0.8)
         readonly property color cloudyGray: Qt.rgba(215/255, 216/255, 219/255, 0.65)
+        readonly property color pearlGray: '#EAEAEC'
     }
 }
diff --git a/client/ui/qml/Pages2/PageDevMenu.qml b/client/ui/qml/Pages2/PageDevMenu.qml
index 5da40eff5..d93e5a383 100644
--- a/client/ui/qml/Pages2/PageDevMenu.qml
+++ b/client/ui/qml/Pages2/PageDevMenu.qml
@@ -16,40 +16,28 @@ import "../Components"
 PageType {
     id: root
 
-    defaultActiveFocusItem: focusItem
-
-    Item {
-        id: focusItem
-        KeyNavigation.tab: backButton
-    }
-
-    ColumnLayout {
-        id: backButtonLayout
+    BackButtonType {
+        id: backButton
 
         anchors.top: parent.top
         anchors.left: parent.left
         anchors.right: parent.right
-
         anchors.topMargin: 20
-
-        BackButtonType {
-            id: backButton
-            // KeyNavigation.tab: removeButton
-        }
     }
 
-    FlickableType {
-        id: fl
-        anchors.top: backButtonLayout.bottom
+    ListView {
+        id: listView
+        anchors.top: backButton.bottom
         anchors.bottom: parent.bottom
-        contentHeight: content.implicitHeight
+        anchors.right: parent.right
+        anchors.left: parent.left
+
+        property bool isFocusable: true
 
-        ColumnLayout {
-            id: content
+        ScrollBar.vertical: ScrollBarType {}
 
-            anchors.top: parent.top
-            anchors.left: parent.left
-            anchors.right: parent.right
+        header: ColumnLayout {
+            width: listView.width
 
             HeaderType {
                 id: header
@@ -60,7 +48,14 @@ PageType {
 
                 headerText: "Dev menu"
             }
+        }
+        
+        model: 1
+        clip: true
+        spacing: 16
 
+        delegate: ColumnLayout {
+            width: listView.width
 
             TextFieldWithHeaderType {
                 id: passwordTextField
@@ -69,7 +64,6 @@ PageType {
                 Layout.topMargin: 16
                 Layout.rightMargin: 16
                 Layout.leftMargin: 16
-                parentFlickable: fl
 
                 headerText: qsTr("Gateway endpoint")
                 textFieldText: SettingsController.gatewayEndpoint
@@ -86,17 +80,19 @@ PageType {
                         SettingsController.gatewayEndpoint = textFieldText
                     }
                 }
-
-                // KeyNavigation.tab: saveButton
             }
+        }
+
+        footer: ColumnLayout {
+            width: listView.width
 
             SwitcherType {
                 id: switcher
 
                 Layout.fillWidth: true
+                Layout.topMargin: 24
                 Layout.rightMargin: 16
                 Layout.leftMargin: 16
-                Layout.topMargin: 16
 
                 text: qsTr("Dev gateway environment")
                 checked: SettingsController.isDevGatewayEnv
diff --git a/client/ui/qml/Pages2/PageHome.qml b/client/ui/qml/Pages2/PageHome.qml
index 8422a10f2..ae29b80cd 100644
--- a/client/ui/qml/Pages2/PageHome.qml
+++ b/client/ui/qml/Pages2/PageHome.qml
@@ -1,6 +1,7 @@
 import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
+import Qt5Compat.GraphicalEffects
 
 import SortFilterProxyModel 0.2
 
@@ -19,13 +20,13 @@ import "../Components"
 PageType {
     id: root
 
-    defaultActiveFocusItem: focusItem
-
     Connections {
+        objectName: "pageControllerConnections"
+
         target: PageController
 
         function onRestorePageHomeState(isContainerInstalled) {
-            drawer.open()
+            drawer.openTriggered()
             if (isContainerInstalled) {
                 containersDropDown.rootButtonClickedFunction()
             }
@@ -33,23 +34,32 @@ PageType {
     }
 
     Item {
+        objectName: "homeColumnItem"
+
         anchors.fill: parent
         anchors.bottomMargin: drawer.collapsedHeight
 
         ColumnLayout {
+            objectName: "homeColumnLayout"
+
             anchors.fill: parent
-            anchors.topMargin: 34
-            anchors.bottomMargin: 34
-
-            Item {
-                id: focusItem
-                KeyNavigation.tab: loggingButton.visible ?
-                                       loggingButton :
-                                       connectButton
+            anchors.topMargin: 12
+            anchors.bottomMargin: 16
+
+            AdLabel {
+                id: adLabel
+
+                Layout.fillWidth: true
+                Layout.preferredHeight: adLabel.contentHeight
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+                Layout.bottomMargin: 22
             }
 
             BasicButtonType {
                 id: loggingButton
+                objectName: "loggingButton"
+
                 property bool isLoggingEnabled: SettingsController.isLoggingEnabled
 
                 Layout.alignment: Qt.AlignHCenter
@@ -69,8 +79,6 @@ PageType {
                 Keys.onEnterPressed: loggingButton.clicked()
                 Keys.onReturnPressed: loggingButton.clicked()
 
-                KeyNavigation.tab: connectButton
-
                 onClicked: {
                     PageController.goToPage(PageEnum.PageSettingsLogging)
                 }
@@ -78,16 +86,17 @@ PageType {
 
             ConnectButton {
                 id: connectButton
+                objectName: "connectButton"
+
                 Layout.fillHeight: true
                 Layout.alignment: Qt.AlignCenter
-                KeyNavigation.tab: splitTunnelingButton
             }
 
             BasicButtonType {
                 id: splitTunnelingButton
+                objectName: "splitTunnelingButton"
 
                 Layout.alignment: Qt.AlignHCenter | Qt.AlignBottom
-                Layout.bottomMargin: 34
                 leftPadding: 16
                 rightPadding: 16
 
@@ -110,58 +119,43 @@ PageType {
                 text: isSplitTunnelingEnabled ? qsTr("Split tunneling enabled") : qsTr("Split tunneling disabled")
 
                 leftImageSource: isSplitTunnelingEnabled ? "qrc:/images/controls/split-tunneling.svg" : ""
+                leftImageColor: ""
                 rightImageSource: "qrc:/images/controls/chevron-down.svg"
 
                 Keys.onEnterPressed: splitTunnelingButton.clicked()
                 Keys.onReturnPressed: splitTunnelingButton.clicked()
 
-                KeyNavigation.tab: drawer
-
                 onClicked: {
-                    homeSplitTunnelingDrawer.open()
+                    homeSplitTunnelingDrawer.openTriggered()
                 }
 
                 HomeSplitTunnelingDrawer {
                     id: homeSplitTunnelingDrawer
-                    parent: root
+                    objectName: "homeSplitTunnelingDrawer"
 
-                    onClosed: {
-                        if (!GC.isMobile()) {
-                            focusItem.forceActiveFocus()
-                        }
-                    }
+                    parent: root
                 }
             }
         }
     }
 
-
     DrawerType2 {
         id: drawer
+        objectName: "drawerProtocol"
+
         anchors.fill: parent
 
-        onClosed: {
-            if (!GC.isMobile()) {
-                focusItem.forceActiveFocus()
-            }
-        }
+        collapsedStateContent: Item {
+            objectName: "ProtocolDrawerCollapsedContent"
 
-        collapsedContent: Item {
             implicitHeight: Qt.platform.os !== "ios" ? root.height * 0.9 : screen.height * 0.77
             Component.onCompleted: {
                 drawer.expandedHeight = implicitHeight
             }
-            Connections {
-                target: drawer
-                enabled: !GC.isMobile()
-                function onActiveFocusChanged() {
-                    if (drawer.activeFocus && !drawer.isOpened) {
-                        collapsedButtonChevron.forceActiveFocus()
-                    }
-                }
-            }
+
             ColumnLayout {
                 id: collapsed
+                objectName: "collapsedColumnLayout"
 
                 anchors.left: parent.left
                 anchors.right: parent.right
@@ -180,6 +174,8 @@ PageType {
                 }
 
                 RowLayout {
+                    objectName: "rowLayout"
+
                     Layout.topMargin: 14
                     Layout.leftMargin: 24
                     Layout.rightMargin: 24
@@ -188,9 +184,11 @@ PageType {
                     spacing: 0
 
                     Connections {
+                        objectName: "drawerConnections"
+
                         target: drawer
-                        function onEntered() {
-                            if (drawer.isCollapsed) {
+                        function onCursorEntered() {
+                            if (drawer.isCollapsedStateActive) {
                                 collapsedButtonChevron.backgroundColor = collapsedButtonChevron.hoveredColor
                                 collapsedButtonHeader.opacity = 0.8
                             } else {
@@ -198,8 +196,8 @@ PageType {
                             }
                         }
 
-                        function onExited() {
-                            if (drawer.isCollapsed) {
+                        function onCursorExited() {
+                            if (drawer.isCollapsedStateActive) {
                                 collapsedButtonChevron.backgroundColor = collapsedButtonChevron.defaultColor
                                 collapsedButtonHeader.opacity = 1
                             } else {
@@ -208,7 +206,7 @@ PageType {
                         }
 
                         function onPressed(pressed, entered) {
-                            if (drawer.isCollapsed) {
+                            if (drawer.isCollapsedStateActive) {
                                 collapsedButtonChevron.backgroundColor = pressed ? collapsedButtonChevron.pressedColor : entered ? collapsedButtonChevron.hoveredColor : collapsedButtonChevron.defaultColor
                                 collapsedButtonHeader.opacity = 0.7
                             } else {
@@ -219,6 +217,8 @@ PageType {
 
                     Header1TextType {
                         id: collapsedButtonHeader
+                        objectName: "collapsedButtonHeader"
+
                         Layout.maximumWidth: drawer.width - 48 - 18 - 12
 
                         maximumLineCount: 2
@@ -227,8 +227,6 @@ PageType {
                         text: ServersModel.defaultServerName
                         horizontalAlignment: Qt.AlignHCenter
 
-                        KeyNavigation.tab: tabBar
-
                         Behavior on opacity {
                             PropertyAnimation { duration: 200 }
                         }
@@ -236,10 +234,11 @@ PageType {
 
                     ImageButtonType {
                         id: collapsedButtonChevron
+                        objectName: "collapsedButtonChevron"
 
                         Layout.leftMargin: 8
 
-                        visible: drawer.isCollapsed
+                        visible: drawer.isCollapsedStateActive()
 
                         hoverEnabled: false
                         image: "qrc:/images/controls/chevron-down.svg"
@@ -254,25 +253,24 @@ PageType {
 
                         Keys.onEnterPressed: collapsedButtonChevron.clicked()
                         Keys.onReturnPressed: collapsedButtonChevron.clicked()
-                        Keys.onTabPressed: lastItemTabClicked()
-
 
                         onClicked: {
-                            if (drawer.isCollapsed) {
-                                drawer.open()
+                            if (drawer.isCollapsedStateActive()) {
+                                drawer.openTriggered()
                             }
                         }
                     }
                 }
 
                 RowLayout {
+                    objectName: "rowLayoutLabel"
                     Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
                     Layout.topMargin: 8
-                    Layout.bottomMargin: drawer.isCollapsed ? 44 : ServersModel.isDefaultServerFromApi ? 61 : 16
+                    Layout.bottomMargin: drawer.isCollapsedStateActive ? 44 : ServersModel.isDefaultServerFromApi ? 61 : 16
                     spacing: 0
 
                     BasicButtonType {
-                        enabled: (ServersModel.defaultServerImagePathCollapsed !== "") && drawer.isCollapsed
+                        enabled: (ServersModel.defaultServerImagePathCollapsed !== "") && drawer.isCollapsedStateActive
                         hoverEnabled: enabled
 
                         implicitHeight: 36
@@ -290,8 +288,9 @@ PageType {
                         buttonTextLabel.font.pixelSize: 13
                         buttonTextLabel.font.weight: 400
 
-                        text: drawer.isCollapsed ? ServersModel.defaultServerDescriptionCollapsed : ServersModel.defaultServerDescriptionExpanded
+                        text: drawer.isCollapsedStateActive ? ServersModel.defaultServerDescriptionCollapsed : ServersModel.defaultServerDescriptionExpanded
                         leftImageSource: ServersModel.defaultServerImagePathCollapsed
+                        leftImageColor: ""
                         changeLeftImageSize: false
 
                         rightImageSource: hoverEnabled ? "qrc:/images/controls/chevron-down.svg" : ""
@@ -304,18 +303,9 @@ PageType {
                 }
             }
 
-            Connections {
-                target: drawer
-                enabled: !GC.isMobile()
-                function onIsCollapsedChanged() {
-                    if (!drawer.isCollapsed) {
-                        focusItem1.forceActiveFocus()
-                    }
-                }
-            }
-
             ColumnLayout {
                 id: serversMenuHeader
+                objectName: "serversMenuHeader"
 
                 anchors.top: collapsed.bottom
                 anchors.right: parent.right
@@ -327,13 +317,9 @@ PageType {
 
                     visible: !ServersModel.isDefaultServerFromApi
 
-                    Item {
-                        id: focusItem1
-                        KeyNavigation.tab: containersDropDown
-                    }
-
                     DropDownType {
                         id: containersDropDown
+                        objectName: "containersDropDown"
 
                         rootButtonImageColor: AmneziaStyle.color.midnightBlack
                         rootButtonBackgroundColor: AmneziaStyle.color.paleGray
@@ -344,28 +330,28 @@ PageType {
                         rootButtonTextTopMargin: 8
                         rootButtonTextBottomMargin: 8
 
+                        enabled: drawer.isOpened
+
                         text: ServersModel.defaultServerDefaultContainerName
                         textColor: AmneziaStyle.color.midnightBlack
                         headerText: qsTr("VPN protocol")
                         headerBackButtonImage: "qrc:/images/controls/arrow-left.svg"
 
                         rootButtonClickedFunction: function() {
-                            containersDropDown.open()
+                            containersDropDown.openTriggered()
                         }
 
                         drawerParent: root
-                        KeyNavigation.tab: serversMenuContent
 
                         listView: HomeContainersListView {
                             id: containersListView
+                            objectName: "containersListView"
+
                             rootWidth: root.width
-                            onVisibleChanged: {
-                                if (containersDropDown.visible && !GC.isMobile()) {
-                                    focusItem1.forceActiveFocus()
-                                }
-                            }
 
                             Connections {
+                                objectName: "rowLayoutConnections"
+
                                 target: ServersModel
 
                                 function onDefaultServerIndexChanged() {
@@ -407,167 +393,21 @@ PageType {
 
             ButtonGroup {
                 id: serversRadioButtonGroup
+                objectName: "serversRadioButtonGroup"
             }
 
-            ListView {
+            ServersListView {
                 id: serversMenuContent
+                objectName: "serversMenuContent"
 
-                anchors.top: serversMenuHeader.bottom
-                anchors.right: parent.right
-                anchors.left: parent.left
-                anchors.bottom: parent.bottom
-                anchors.topMargin: 16
-
-                model: ServersModel
-                currentIndex: ServersModel.defaultIndex
-
-                ScrollBar.vertical: ScrollBar {
-                    id: scrollBar
-                    policy: serversMenuContent.height >= serversMenuContent.contentHeight ? ScrollBar.AlwaysOff : ScrollBar.AlwaysOn
-                }
-
-
-                activeFocusOnTab: true
-                focus: true
-
-                property int focusItemIndex: 0
-                onActiveFocusChanged: {
-                    if (activeFocus) {
-                        serversMenuContent.focusItemIndex = 0
-                        serversMenuContent.itemAtIndex(focusItemIndex).forceActiveFocus()
-                    }
-                }
-
-                onFocusItemIndexChanged: {
-                    const focusedElement = serversMenuContent.itemAtIndex(focusItemIndex)
-                    if (focusedElement) {
-                        if (focusedElement.y + focusedElement.height > serversMenuContent.height) {
-                            serversMenuContent.contentY = focusedElement.y + focusedElement.height - serversMenuContent.height
-                        } else {
-                            serversMenuContent.contentY = 0
-                        }
-                    }
-                }
-
-                Keys.onUpPressed: scrollBar.decrease()
-                Keys.onDownPressed: scrollBar.increase()
+                isFocusable: false
 
                 Connections {
                     target: drawer
-                    enabled: !GC.isMobile()
-                    function onIsCollapsedChanged() {
-                        if (drawer.isCollapsed) {
-                            const item = serversMenuContent.itemAtIndex(serversMenuContent.focusItemIndex)
-                            if (item) { item.serverRadioButtonProperty.focus = false }
-                        }
-                    }
-                }
-
-                Connections {
-                    target: ServersModel
-                    function onDefaultServerIndexChanged(serverIndex) {
-                        serversMenuContent.currentIndex = serverIndex
-                    }
-                }
-
-                clip: true
-
-                delegate: Item {
-                    id: menuContentDelegate
-
-                    property variant delegateData: model
-                    property VerticalRadioButton serverRadioButtonProperty: serverRadioButton
-
-                    implicitWidth: serversMenuContent.width
-                    implicitHeight: serverRadioButtonContent.implicitHeight
-
-                    onActiveFocusChanged: {
-                        if (activeFocus) {
-                            serverRadioButton.forceActiveFocus()
-                        }
-                    }
-
-                    ColumnLayout {
-                        id: serverRadioButtonContent
-
-                        anchors.fill: parent
-                        anchors.rightMargin: 16
-                        anchors.leftMargin: 16
-
-                        spacing: 0
 
-                        RowLayout {
-                            Layout.fillWidth: true
-                            VerticalRadioButton {
-                                id: serverRadioButton
-
-                                Layout.fillWidth: true
-
-                                text: name
-                                descriptionText: serverDescription
-
-                                checked: index === serversMenuContent.currentIndex
-                                checkable: !ConnectionController.isConnected
-
-                                ButtonGroup.group: serversRadioButtonGroup
-
-                                onClicked: {
-                                    if (ConnectionController.isConnected) {
-                                        PageController.showNotificationMessage(qsTr("Unable change server while there is an active connection"))
-                                        return
-                                    }
-
-                                    serversMenuContent.currentIndex = index
-
-                                    ServersModel.defaultIndex = index
-                                }
-
-                                MouseArea {
-                                    anchors.fill: serverRadioButton
-                                    cursorShape: Qt.PointingHandCursor
-                                    enabled: false
-                                }
-
-                                Keys.onTabPressed: serverInfoButton.forceActiveFocus()
-                                Keys.onEnterPressed: serverRadioButton.clicked()
-                                Keys.onReturnPressed: serverRadioButton.clicked()
-                            }
-
-                            ImageButtonType {
-                                id: serverInfoButton
-                                image: "qrc:/images/controls/settings.svg"
-                                imageColor: AmneziaStyle.color.paleGray
-
-                                implicitWidth: 56
-                                implicitHeight: 56
-
-                                z: 1
-
-                                Keys.onTabPressed: {
-                                    if (serversMenuContent.focusItemIndex < serversMenuContent.count - 1) {
-                                        serversMenuContent.focusItemIndex++
-                                        serversMenuContent.itemAtIndex(serversMenuContent.focusItemIndex).forceActiveFocus()
-                                    } else {
-                                        focusItem1.forceActiveFocus()
-                                        serversMenuContent.contentY = 0
-                                    }
-                                }
-                                Keys.onEnterPressed: serverInfoButton.clicked()
-                                Keys.onReturnPressed: serverInfoButton.clicked()
-
-                                onClicked: function() {
-                                    ServersModel.processedIndex = index
-                                    PageController.goToPage(PageEnum.PageSettingsServerInfo)
-                                    drawer.close()
-                                }
-                            }
-                        }
-
-                        DividerType {
-                            Layout.fillWidth: true
-                            Layout.leftMargin: 0
-                            Layout.rightMargin: 0
-                        }
+                    // this item shouldn't be focused when drawer is closed
+                    function onIsOpenedChanged() {
+                        serversMenuContent.isFocusable = drawer.isOpened
                     }
                 }
             }
diff --git a/client/ui/qml/Pages2/PageProtocolAwgClientSettings.qml b/client/ui/qml/Pages2/PageProtocolAwgClientSettings.qml
index 2b912f18a..d31f63e32 100644
--- a/client/ui/qml/Pages2/PageProtocolAwgClientSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolAwgClientSettings.qml
@@ -16,18 +16,6 @@ import "../Components"
 PageType {
     id: root
 
-    defaultActiveFocusItem: listview.currentItem.mtuTextField.textField
-
-    Item {
-        id: focusItem
-        onFocusChanged: {
-            if (activeFocus) {
-                fl.ensureVisible(focusItem)
-            }
-        }
-        KeyNavigation.tab: backButton
-    }
-
     ColumnLayout {
         id: backButtonLayout
 
@@ -39,229 +27,235 @@ PageType {
 
         BackButtonType {
             id: backButton
-            KeyNavigation.tab: listview.currentItem.mtuTextField.textField
         }
     }
 
-    FlickableType {
-        id: fl
+    ListView {
+        id: listview
+
         anchors.top: backButtonLayout.bottom
-        anchors.bottom: parent.bottom
-        contentHeight: content.implicitHeight + saveButton.implicitHeight + saveButton.anchors.bottomMargin + saveButton.anchors.topMargin
+        anchors.bottom: saveButton.top
 
-        Column {
-            id: content
+        width: parent.width
+
+        clip: true
+
+        property bool isFocusable: true
+
+        Keys.onTabPressed: {
+            FocusController.nextKeyTabItem()
+        }
+
+        Keys.onBacktabPressed: {
+            FocusController.previousKeyTabItem()
+        }
 
-            anchors.top: parent.top
-            anchors.left: parent.left
-            anchors.right: parent.right
+        Keys.onUpPressed: {
+            FocusController.nextKeyUpItem()
+        }
 
-            ListView {
-                id: listview
+        Keys.onDownPressed: {
+            FocusController.nextKeyDownItem()
+        }
 
-                width: parent.width
-                height: listview.contentItem.height
+        Keys.onLeftPressed: {
+            FocusController.nextKeyLeftItem()
+        }
 
-                clip: true
-                interactive: false
+        Keys.onRightPressed: {
+            FocusController.nextKeyRightItem()
+        }
 
-                model: AwgConfigModel
+        model: AwgConfigModel
 
-                delegate: Item {
-                    id: delegateItem
-                    implicitWidth: listview.width
-                    implicitHeight: col.implicitHeight
+        delegate: Item {
+            id: delegateItem
+            implicitWidth: listview.width
+            implicitHeight: col.implicitHeight
 
-                    property alias mtuTextField: mtuTextField
-                    property bool isSaveButtonEnabled: mtuTextField.errorText === "" &&
-                                                       junkPacketMaxSizeTextField.errorText === "" &&
-                                                       junkPacketMinSizeTextField.errorText === "" &&
-                                                       junkPacketCountTextField.errorText === ""
+            property alias mtuTextField: mtuTextField
+            property bool isSaveButtonEnabled: mtuTextField.errorText === "" &&
+                                               junkPacketMaxSizeTextField.errorText === "" &&
+                                               junkPacketMinSizeTextField.errorText === "" &&
+                                               junkPacketCountTextField.errorText === ""
 
-                    ColumnLayout {
-                        id: col
+            ColumnLayout {
+                id: col
 
-                        anchors.top: parent.top
-                        anchors.left: parent.left
-                        anchors.right: parent.right
+                anchors.top: parent.top
+                anchors.left: parent.left
+                anchors.right: parent.right
 
-                        anchors.leftMargin: 16
-                        anchors.rightMargin: 16
+                anchors.leftMargin: 16
+                anchors.rightMargin: 16
 
-                        spacing: 0
+                spacing: 0
 
-                        HeaderType {
-                            Layout.fillWidth: true
+                HeaderType {
+                    Layout.fillWidth: true
 
-                            headerText: qsTr("AmneziaWG settings")
-                        }
+                    headerText: qsTr("AmneziaWG settings")
+                }
 
-                        TextFieldWithHeaderType {
-                            id: mtuTextField
-                            Layout.fillWidth: true
-                            Layout.topMargin: 40
-
-                            headerText: qsTr("MTU")
-                            textFieldText: clientMtu
-                            textField.validator: IntValidator { bottom: 576; top: 65535 }
-
-                            textField.onEditingFinished: {
-                                if (textFieldText !== clientMtu) {
-                                    clientMtu = textFieldText
-                                }
-                            }
-                            checkEmptyText: true
-                            KeyNavigation.tab: junkPacketCountTextField.textField
-                        }
+                TextFieldWithHeaderType {
+                    id: mtuTextField
+                    Layout.fillWidth: true
+                    Layout.topMargin: 40
 
-                        TextFieldWithHeaderType {
-                            id: junkPacketCountTextField
-                            Layout.fillWidth: true
-                            Layout.topMargin: 16
+                    headerText: qsTr("MTU")
+                    textFieldText: clientMtu
+                    textField.validator: IntValidator { bottom: 576; top: 65535 }
 
-                            headerText: "Jc - Junk packet count"
-                            textFieldText: clientJunkPacketCount
-                            textField.validator: IntValidator { bottom: 0 }
-                            parentFlickable: fl
+                    textField.onEditingFinished: {
+                        if (textFieldText !== clientMtu) {
+                            clientMtu = textFieldText
+                        }
+                    }
+                    checkEmptyText: true
+                    KeyNavigation.tab: junkPacketCountTextField.textField
+                }
 
-                            textField.onEditingFinished: {
-                                if (textFieldText !== clientJunkPacketCount) {
-                                    clientJunkPacketCount = textFieldText
-                                }
-                            }
+                TextFieldWithHeaderType {
+                    id: junkPacketCountTextField
+                    Layout.fillWidth: true
+                    Layout.topMargin: 16
 
-                            checkEmptyText: true
+                    headerText: "Jc - Junk packet count"
+                    textFieldText: clientJunkPacketCount
+                    textField.validator: IntValidator { bottom: 0 }
 
-                            KeyNavigation.tab: junkPacketMinSizeTextField.textField
+                    textField.onEditingFinished: {
+                        if (textFieldText !== clientJunkPacketCount) {
+                            clientJunkPacketCount = textFieldText
                         }
+                    }
 
-                        TextFieldWithHeaderType {
-                            id: junkPacketMinSizeTextField
-                            Layout.fillWidth: true
-                            Layout.topMargin: 16
+                    checkEmptyText: true
 
-                            headerText: "Jmin - Junk packet minimum size"
-                            textFieldText: clientJunkPacketMinSize
-                            textField.validator: IntValidator { bottom: 0 }
-                            parentFlickable: fl
+                    KeyNavigation.tab: junkPacketMinSizeTextField.textField
+                }
 
-                            textField.onEditingFinished: {
-                                if (textFieldText !== clientJunkPacketMinSize) {
-                                    clientJunkPacketMinSize = textFieldText
-                                }
-                            }
+                TextFieldWithHeaderType {
+                    id: junkPacketMinSizeTextField
+                    Layout.fillWidth: true
+                    Layout.topMargin: 16
 
-                            checkEmptyText: true
+                    headerText: "Jmin - Junk packet minimum size"
+                    textFieldText: clientJunkPacketMinSize
+                    textField.validator: IntValidator { bottom: 0 }
 
-                            KeyNavigation.tab: junkPacketMaxSizeTextField.textField
+                    textField.onEditingFinished: {
+                        if (textFieldText !== clientJunkPacketMinSize) {
+                            clientJunkPacketMinSize = textFieldText
                         }
+                    }
 
-                        TextFieldWithHeaderType {
-                            id: junkPacketMaxSizeTextField
-                            Layout.fillWidth: true
-                            Layout.topMargin: 16
+                    checkEmptyText: true
 
-                            headerText: "Jmax - Junk packet maximum size"
-                            textFieldText: clientJunkPacketMaxSize
-                            textField.validator: IntValidator { bottom: 0 }
-                            parentFlickable: fl
+                    KeyNavigation.tab: junkPacketMaxSizeTextField.textField
+                }
 
-                            textField.onEditingFinished: {
-                                if (textFieldText !== clientJunkPacketMaxSize) {
-                                    clientJunkPacketMaxSize = textFieldText
-                                }
-                            }
+                TextFieldWithHeaderType {
+                    id: junkPacketMaxSizeTextField
+                    Layout.fillWidth: true
+                    Layout.topMargin: 16
 
-                            checkEmptyText: true
+                    headerText: "Jmax - Junk packet maximum size"
+                    textFieldText: clientJunkPacketMaxSize
+                    textField.validator: IntValidator { bottom: 0 }
 
-                            Keys.onTabPressed: saveButton.forceActiveFocus()
+                    textField.onEditingFinished: {
+                        if (textFieldText !== clientJunkPacketMaxSize) {
+                            clientJunkPacketMaxSize = textFieldText
                         }
+                    }
 
-                        Header2TextType {
-                            Layout.fillWidth: true
-                            Layout.topMargin: 16
+                    checkEmptyText: true
 
-                            text: qsTr("Server settings")
-                        }
+                }
+
+                Header2TextType {
+                    Layout.fillWidth: true
+                    Layout.topMargin: 16
 
-                        TextFieldWithHeaderType {
-                            id: portTextField
-                            Layout.fillWidth: true
-                            Layout.topMargin: 8
+                    text: qsTr("Server settings")
+                }
 
-                            enabled: false
+                TextFieldWithHeaderType {
+                    id: portTextField
+                    Layout.fillWidth: true
+                    Layout.topMargin: 8
 
-                            headerText: qsTr("Port")
-                            textFieldText: port
-                        }
+                    enabled: false
 
-                        TextFieldWithHeaderType {
-                            id: initPacketJunkSizeTextField
-                            Layout.fillWidth: true
-                            Layout.topMargin: 16
+                    headerText: qsTr("Port")
+                    textFieldText: port
+                }
 
-                            enabled: false
+                TextFieldWithHeaderType {
+                    id: initPacketJunkSizeTextField
+                    Layout.fillWidth: true
+                    Layout.topMargin: 16
 
-                            headerText: "S1 - Init packet junk size"
-                            textFieldText: serverInitPacketJunkSize
-                        }
+                    enabled: false
 
-                        TextFieldWithHeaderType {
-                            id: responsePacketJunkSizeTextField
-                            Layout.fillWidth: true
-                            Layout.topMargin: 16
+                    headerText: "S1 - Init packet junk size"
+                    textFieldText: serverInitPacketJunkSize
+                }
 
-                            enabled: false
+                TextFieldWithHeaderType {
+                    id: responsePacketJunkSizeTextField
+                    Layout.fillWidth: true
+                    Layout.topMargin: 16
 
-                            headerText: "S2 - Response packet junk size"
-                            textFieldText: serverResponsePacketJunkSize
-                        }
+                    enabled: false
 
-                        TextFieldWithHeaderType {
-                            id: initPacketMagicHeaderTextField
-                            Layout.fillWidth: true
-                            Layout.topMargin: 16
+                    headerText: "S2 - Response packet junk size"
+                    textFieldText: serverResponsePacketJunkSize
+                }
 
-                            enabled: false
+                TextFieldWithHeaderType {
+                    id: initPacketMagicHeaderTextField
+                    Layout.fillWidth: true
+                    Layout.topMargin: 16
 
-                            headerText: "H1 - Init packet magic header"
-                            textFieldText: serverInitPacketMagicHeader
-                        }
+                    enabled: false
 
-                        TextFieldWithHeaderType {
-                            id: responsePacketMagicHeaderTextField
-                            Layout.fillWidth: true
-                            Layout.topMargin: 16
+                    headerText: "H1 - Init packet magic header"
+                    textFieldText: serverInitPacketMagicHeader
+                }
 
-                            enabled: false
+                TextFieldWithHeaderType {
+                    id: responsePacketMagicHeaderTextField
+                    Layout.fillWidth: true
+                    Layout.topMargin: 16
 
-                            headerText: "H2 - Response packet magic header"
-                            textFieldText: serverResponsePacketMagicHeader
-                        }
+                    enabled: false
 
-                        TextFieldWithHeaderType {
-                            id: underloadPacketMagicHeaderTextField
-                            Layout.fillWidth: true
-                            Layout.topMargin: 16
-                            parentFlickable: fl
+                    headerText: "H2 - Response packet magic header"
+                    textFieldText: serverResponsePacketMagicHeader
+                }
 
-                            enabled: false
+                TextFieldWithHeaderType {
+                    id: underloadPacketMagicHeaderTextField
+                    Layout.fillWidth: true
+                    Layout.topMargin: 16
 
-                            headerText: "H3 - Underload packet magic header"
-                            textFieldText: serverUnderloadPacketMagicHeader
-                        }
+                    enabled: false
 
-                        TextFieldWithHeaderType {
-                            id: transportPacketMagicHeaderTextField
-                            Layout.fillWidth: true
-                            Layout.topMargin: 16
+                    headerText: "H3 - Underload packet magic header"
+                    textFieldText: serverUnderloadPacketMagicHeader
+                }
 
-                            enabled: false
+                TextFieldWithHeaderType {
+                    id: transportPacketMagicHeaderTextField
+                    Layout.fillWidth: true
+                    Layout.topMargin: 16
 
-                            headerText: "H4 - Transport packet magic header"
-                            textFieldText: serverTransportPacketMagicHeader
-                        }
-                    }
+                    enabled: false
+
+                    headerText: "H4 - Transport packet magic header"
+                    textFieldText: serverTransportPacketMagicHeader
                 }
             }
         }
@@ -283,7 +277,11 @@ PageType {
 
         text: qsTr("Save")
 
-        Keys.onTabPressed: lastItemTabClicked(focusItem)
+        onActiveFocusChanged: {
+            if(activeFocus) {
+                listview.positionViewAtEnd()
+            }
+        }
 
         clickedFunc: function() {
             forceActiveFocus()
diff --git a/client/ui/qml/Pages2/PageProtocolAwgSettings.qml b/client/ui/qml/Pages2/PageProtocolAwgSettings.qml
index 27ea66f94..3594cd9dd 100644
--- a/client/ui/qml/Pages2/PageProtocolAwgSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolAwgSettings.qml
@@ -2,6 +2,8 @@ import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
 
+import QtCore
+
 import SortFilterProxyModel 0.2
 
 import PageEnum 1.0
@@ -17,18 +19,6 @@ import "../Components"
 PageType {
     id: root
 
-    defaultActiveFocusItem: listview.currentItem.portTextField.textField
-
-    Item {
-        id: focusItem
-        onFocusChanged: {
-            if (activeFocus) {
-                fl.ensureVisible(focusItem)
-            }
-        }
-        KeyNavigation.tab: backButton
-    }
-
     ColumnLayout {
         id: backButtonLayout
 
@@ -40,341 +30,358 @@ PageType {
 
         BackButtonType {
             id: backButton
-            KeyNavigation.tab: listview.currentItem.portTextField.textField
         }
     }
 
-    FlickableType {
-        id: fl
+    ListView {
+        id: listview
+
+        property bool isFocusable: true
+
         anchors.top: backButtonLayout.bottom
         anchors.bottom: parent.bottom
-        contentHeight: content.implicitHeight
 
-        Column {
-            id: content
+        width: parent.width
 
-            anchors.top: parent.top
-            anchors.left: parent.left
-            anchors.right: parent.right
+        Keys.onTabPressed: {
+            FocusController.nextKeyTabItem()
+        }
 
-            ListView {
-                id: listview
+        Keys.onBacktabPressed: {
+            FocusController.previousKeyTabItem()
+        }
 
-                width: parent.width
-                height: listview.contentItem.height
+        Keys.onUpPressed: {
+            FocusController.nextKeyUpItem()
+        }
 
-                clip: true
-                interactive: false
+        Keys.onDownPressed: {
+            FocusController.nextKeyDownItem()
+        }
 
-                model: AwgConfigModel
+        Keys.onLeftPressed: {
+            FocusController.nextKeyLeftItem()
+        }
 
-                delegate: Item {
-                    id: delegateItem
-                    implicitWidth: listview.width
-                    implicitHeight: col.implicitHeight
+        Keys.onRightPressed: {
+            FocusController.nextKeyRightItem()
+        }
 
-                    property alias portTextField: portTextField
-                    property bool isEnabled: ServersModel.isProcessedServerHasWriteAccess()
+        clip: true
 
-                    ColumnLayout {
-                        id: col
+        model: AwgConfigModel
 
-                        anchors.top: parent.top
-                        anchors.left: parent.left
-                        anchors.right: parent.right
+        delegate: Item {
+            id: delegateItem
+            implicitWidth: listview.width
+            implicitHeight: col.implicitHeight
 
-                        anchors.leftMargin: 16
-                        anchors.rightMargin: 16
+            property alias vpnAddressSubnetTextField: vpnAddressSubnetTextField
+            property bool isEnabled: ServersModel.isProcessedServerHasWriteAccess()
 
-                        spacing: 0
+            ColumnLayout {
+                id: col
 
-                        HeaderType {
-                            Layout.fillWidth: true
+                anchors.top: parent.top
+                anchors.left: parent.left
+                anchors.right: parent.right
 
-                            headerText: qsTr("AmneziaWG settings")
-                        }
+                anchors.leftMargin: 16
+                anchors.rightMargin: 16
 
-                        TextFieldWithHeaderType {
-                            id: portTextField
-                            Layout.fillWidth: true
-                            Layout.topMargin: 40
+                spacing: 0
 
-                            enabled: delegateItem.isEnabled
+                HeaderType {
+                    Layout.fillWidth: true
 
-                            headerText: qsTr("Port")
-                            textFieldText: port
-                            textField.maximumLength: 5
-                            textField.validator: IntValidator { bottom: 1; top: 65535 }
-                            parentFlickable: fl
+                    headerText: qsTr("AmneziaWG settings")
+                }
 
-                            textField.onEditingFinished: {
-                                if (textFieldText !== port) {
-                                    port = textFieldText
-                                }
-                            }
+                TextFieldWithHeaderType {
+                    id: vpnAddressSubnetTextField
 
-                            checkEmptyText: true
+                    Layout.fillWidth: true
+                    Layout.topMargin: 40
 
-                            KeyNavigation.tab: junkPacketCountTextField.textField
-                        }
+                    enabled: delegateItem.isEnabled
 
-                        TextFieldWithHeaderType {
-                            id: junkPacketCountTextField
-                            Layout.fillWidth: true
-                            Layout.topMargin: 16
+                    headerText: qsTr("VPN address subnet")
+                    textFieldText: subnetAddress
 
-                            headerText: qsTr("Jc - Junk packet count")
-                            textFieldText: serverJunkPacketCount
-                            textField.validator: IntValidator { bottom: 0 }
-                            parentFlickable: fl
+                    textField.onEditingFinished: {
+                        if (textFieldText !== subnetAddress) {
+                            subnetAddress = textFieldText
+                        }
+                    }
 
-                            textField.onEditingFinished: {
-                                if (textFieldText === "") {
-                                    textFieldText = "0"
-                                }
+                    checkEmptyText: true
+                }
 
-                                if (textFieldText !== serverJunkPacketCount) {
-                                    serverJunkPacketCount = textFieldText
-                                }
-                            }
+                TextFieldWithHeaderType {
+                    id: portTextField
+                    Layout.fillWidth: true
+                    Layout.topMargin: 16
 
-                            checkEmptyText: true
+                    enabled: delegateItem.isEnabled
 
-                            KeyNavigation.tab: junkPacketMinSizeTextField.textField
-                        }
+                    headerText: qsTr("Port")
+                    textFieldText: port
+                    textField.maximumLength: 5
+                    textField.validator: IntValidator { bottom: 1; top: 65535 }
 
-                        TextFieldWithHeaderType {
-                            id: junkPacketMinSizeTextField
-                            Layout.fillWidth: true
-                            Layout.topMargin: 16
+                    textField.onEditingFinished: {
+                        if (textFieldText !== port) {
+                            port = textFieldText
+                        }
+                    }
 
-                            headerText: qsTr("Jmin - Junk packet minimum size")
-                            textFieldText: serverJunkPacketMinSize
-                            textField.validator: IntValidator { bottom: 0 }
-                            parentFlickable: fl
+                    checkEmptyText: true
+                }
 
-                            textField.onEditingFinished: {
-                                if (textFieldText !== serverJunkPacketMinSize) {
-                                    serverJunkPacketMinSize = textFieldText
-                                }
-                            }
+                TextFieldWithHeaderType {
+                    id: junkPacketCountTextField
+                    Layout.fillWidth: true
+                    Layout.topMargin: 16
 
-                            checkEmptyText: true
+                    headerText: qsTr("Jc - Junk packet count")
+                    textFieldText: serverJunkPacketCount
+                    textField.validator: IntValidator { bottom: 0 }
 
-                            KeyNavigation.tab: junkPacketMaxSizeTextField.textField
+                    textField.onEditingFinished: {
+                        if (textFieldText === "") {
+                            textFieldText = "0"
                         }
 
-                        TextFieldWithHeaderType {
-                            id: junkPacketMaxSizeTextField
-                            Layout.fillWidth: true
-                            Layout.topMargin: 16
+                        if (textFieldText !== serverJunkPacketCount) {
+                            serverJunkPacketCount = textFieldText
+                        }
+                    }
 
-                            headerText: qsTr("Jmax - Junk packet maximum size")
-                            textFieldText: serverJunkPacketMaxSize
-                            textField.validator: IntValidator { bottom: 0 }
-                            parentFlickable: fl
+                    checkEmptyText: true
+                }
 
-                            textField.onEditingFinished: {
-                                if (textFieldText !== serverJunkPacketMaxSize) {
-                                    serverJunkPacketMaxSize = textFieldText
-                                }
-                            }
+                TextFieldWithHeaderType {
+                    id: junkPacketMinSizeTextField
+                    Layout.fillWidth: true
+                    Layout.topMargin: 16
 
-                            checkEmptyText: true
+                    headerText: qsTr("Jmin - Junk packet minimum size")
+                    textFieldText: serverJunkPacketMinSize
+                    textField.validator: IntValidator { bottom: 0 }
 
-                            KeyNavigation.tab: initPacketJunkSizeTextField.textField
+                    textField.onEditingFinished: {
+                        if (textFieldText !== serverJunkPacketMinSize) {
+                            serverJunkPacketMinSize = textFieldText
                         }
+                    }
 
-                        TextFieldWithHeaderType {
-                            id: initPacketJunkSizeTextField
-                            Layout.fillWidth: true
-                            Layout.topMargin: 16
+                    checkEmptyText: true
+                }
 
-                            headerText: qsTr("S1 - Init packet junk size")
-                            textFieldText: serverInitPacketJunkSize
-                            textField.validator: IntValidator { bottom: 0 }
-                            parentFlickable: fl
+                TextFieldWithHeaderType {
+                    id: junkPacketMaxSizeTextField
+                    Layout.fillWidth: true
+                    Layout.topMargin: 16
 
-                            textField.onEditingFinished: {
-                                if (textFieldText !== serverInitPacketJunkSize) {
-                                    serverInitPacketJunkSize = textFieldText
-                                }
-                            }
+                    headerText: qsTr("Jmax - Junk packet maximum size")
+                    textFieldText: serverJunkPacketMaxSize
+                    textField.validator: IntValidator { bottom: 0 }
+
+                    textField.onEditingFinished: {
+                        if (textFieldText !== serverJunkPacketMaxSize) {
+                            serverJunkPacketMaxSize = textFieldText
+                        }
+                    }
+
+                    checkEmptyText: true
+                }
 
-                            checkEmptyText: true
+                TextFieldWithHeaderType {
+                    id: initPacketJunkSizeTextField
+                    Layout.fillWidth: true
+                    Layout.topMargin: 16
 
-                            KeyNavigation.tab: responsePacketJunkSizeTextField.textField
+                    headerText: qsTr("S1 - Init packet junk size")
+                    textFieldText: serverInitPacketJunkSize
+                    textField.validator: IntValidator { bottom: 0 }
+
+                    textField.onEditingFinished: {
+                        if (textFieldText !== serverInitPacketJunkSize) {
+                            serverInitPacketJunkSize = textFieldText
                         }
+                    }
 
-                        TextFieldWithHeaderType {
-                            id: responsePacketJunkSizeTextField
-                            Layout.fillWidth: true
-                            Layout.topMargin: 16
+                    checkEmptyText: true
 
-                            headerText: qsTr("S2 - Response packet junk size")
-                            textFieldText: serverResponsePacketJunkSize
-                            textField.validator: IntValidator { bottom: 0 }
-                            parentFlickable: fl
+                    onActiveFocusChanged: {
+                        if(activeFocus) {
+                            listview.positionViewAtEnd()
+                        }
+                    }
+                }
 
-                            textField.onEditingFinished: {
-                                if (textFieldText !== serverResponsePacketJunkSize) {
-                                    serverResponsePacketJunkSize = textFieldText
-                                }
-                            }
+                TextFieldWithHeaderType {
+                    id: responsePacketJunkSizeTextField
+                    Layout.fillWidth: true
+                    Layout.topMargin: 16
 
-                            checkEmptyText: true
+                    headerText: qsTr("S2 - Response packet junk size")
+                    textFieldText: serverResponsePacketJunkSize
+                    textField.validator: IntValidator { bottom: 0 }
 
-                            KeyNavigation.tab: initPacketMagicHeaderTextField.textField
+                    textField.onEditingFinished: {
+                        if (textFieldText !== serverResponsePacketJunkSize) {
+                            serverResponsePacketJunkSize = textFieldText
                         }
+                    }
 
-                        TextFieldWithHeaderType {
-                            id: initPacketMagicHeaderTextField
-                            Layout.fillWidth: true
-                            Layout.topMargin: 16
+                    checkEmptyText: true
 
-                            headerText: qsTr("H1 - Init packet magic header")
-                            textFieldText: serverInitPacketMagicHeader
-                            textField.validator: IntValidator { bottom: 0 }
-                            parentFlickable: fl
+                    onActiveFocusChanged: {
+                        if(activeFocus) {
+                            listview.positionViewAtEnd()
+                        }
+                    }
+                }
 
-                            textField.onEditingFinished: {
-                                if (textFieldText !== serverInitPacketMagicHeader) {
-                                    serverInitPacketMagicHeader = textFieldText
-                                }
-                            }
+                TextFieldWithHeaderType {
+                    id: initPacketMagicHeaderTextField
+                    Layout.fillWidth: true
+                    Layout.topMargin: 16
 
-                            checkEmptyText: true
+                    headerText: qsTr("H1 - Init packet magic header")
+                    textFieldText: serverInitPacketMagicHeader
+                    textField.validator: IntValidator { bottom: 0 }
 
-                            KeyNavigation.tab: responsePacketMagicHeaderTextField.textField
+                    textField.onEditingFinished: {
+                        if (textFieldText !== serverInitPacketMagicHeader) {
+                            serverInitPacketMagicHeader = textFieldText
                         }
+                    }
+
+                    checkEmptyText: true
+                }
 
-                        TextFieldWithHeaderType {
-                            id: responsePacketMagicHeaderTextField
-                            Layout.fillWidth: true
-                            Layout.topMargin: 16
+                TextFieldWithHeaderType {
+                    id: responsePacketMagicHeaderTextField
+                    Layout.fillWidth: true
+                    Layout.topMargin: 16
 
-                            headerText: qsTr("H2 - Response packet magic header")
-                            textFieldText: serverResponsePacketMagicHeader
-                            textField.validator: IntValidator { bottom: 0 }
-                            parentFlickable: fl
+                    headerText: qsTr("H2 - Response packet magic header")
+                    textFieldText: serverResponsePacketMagicHeader
+                    textField.validator: IntValidator { bottom: 0 }
 
-                            textField.onEditingFinished: {
-                                if (textFieldText !== serverResponsePacketMagicHeader) {
-                                    serverResponsePacketMagicHeader = textFieldText
-                                }
-                            }
+                    textField.onEditingFinished: {
+                        if (textFieldText !== serverResponsePacketMagicHeader) {
+                            serverResponsePacketMagicHeader = textFieldText
+                        }
+                    }
+
+                    checkEmptyText: true
+                }
+
+                TextFieldWithHeaderType {
+                    id: transportPacketMagicHeaderTextField
+                    Layout.fillWidth: true
+                    Layout.topMargin: 16
 
-                            checkEmptyText: true
+                    headerText: qsTr("H4 - Transport packet magic header")
+                    textFieldText: serverTransportPacketMagicHeader
+                    textField.validator: IntValidator { bottom: 0 }
 
-                            KeyNavigation.tab: transportPacketMagicHeaderTextField.textField
+                    textField.onEditingFinished: {
+                        if (textFieldText !== serverTransportPacketMagicHeader) {
+                            serverTransportPacketMagicHeader = textFieldText
                         }
+                    }
+
+                    checkEmptyText: true
+                }
 
-                        TextFieldWithHeaderType {
-                            id: transportPacketMagicHeaderTextField
-                            Layout.fillWidth: true
-                            Layout.topMargin: 16
+                TextFieldWithHeaderType {
+                    id: underloadPacketMagicHeaderTextField
+                    Layout.fillWidth: true
+                    Layout.topMargin: 16
 
-                            headerText: qsTr("H4 - Transport packet magic header")
-                            textFieldText: serverTransportPacketMagicHeader
-                            textField.validator: IntValidator { bottom: 0 }
-                            parentFlickable: fl
+                    headerText: qsTr("H3 - Underload packet magic header")
+                    textFieldText: serverUnderloadPacketMagicHeader
+                    textField.validator: IntValidator { bottom: 0 }
 
-                            textField.onEditingFinished: {
-                                if (textFieldText !== serverTransportPacketMagicHeader) {
-                                    serverTransportPacketMagicHeader = textFieldText
-                                }
-                            }
+                    textField.onEditingFinished: {
+                        if (textFieldText !== serverUnderloadPacketMagicHeader) {
+                            serverUnderloadPacketMagicHeader = textFieldText
+                        }
+                    }
 
-                            checkEmptyText: true
+                    checkEmptyText: true
+                }
 
-                            KeyNavigation.tab: underloadPacketMagicHeaderTextField.textField
+                BasicButtonType {
+                    id: saveRestartButton
+
+                    Layout.fillWidth: true
+                    Layout.topMargin: 24
+                    Layout.bottomMargin: 24
+
+                    enabled: underloadPacketMagicHeaderTextField.errorText === "" &&
+                             transportPacketMagicHeaderTextField.errorText === "" &&
+                             responsePacketMagicHeaderTextField.errorText === "" &&
+                             initPacketMagicHeaderTextField.errorText === "" &&
+                             responsePacketJunkSizeTextField.errorText === "" &&
+                             initPacketJunkSizeTextField.errorText === "" &&
+                             junkPacketMaxSizeTextField.errorText === "" &&
+                             junkPacketMinSizeTextField.errorText === "" &&
+                             junkPacketCountTextField.errorText === "" &&
+                             portTextField.errorText === "" &&
+                             vpnAddressSubnetTextField.errorText === ""
+
+                    text: qsTr("Save")
+
+                    onActiveFocusChanged: {
+                        if(activeFocus) {
+                            listview.positionViewAtEnd()
                         }
+                    }
 
-                        TextFieldWithHeaderType {
-                            id: underloadPacketMagicHeaderTextField
-                            Layout.fillWidth: true
-                            Layout.topMargin: 16
-                            parentFlickable: fl
+                    clickedFunc: function() {
+                        forceActiveFocus()
 
-                            headerText: qsTr("H3 - Underload packet magic header")
-                            textFieldText: serverUnderloadPacketMagicHeader
-                            textField.validator: IntValidator { bottom: 0 }
+                        if (delegateItem.isEnabled) {
+                            if (AwgConfigModel.isHeadersEqual(underloadPacketMagicHeaderTextField.textField.text,
+                                                              transportPacketMagicHeaderTextField.textField.text,
+                                                              responsePacketMagicHeaderTextField.textField.text,
+                                                              initPacketMagicHeaderTextField.textField.text)) {
+                                PageController.showErrorMessage(qsTr("The values of the H1-H4 fields must be unique"))
+                                return
+                            }
 
-                            textField.onEditingFinished: {
-                                if (textFieldText !== serverUnderloadPacketMagicHeader) {
-                                    serverUnderloadPacketMagicHeader = textFieldText
-                                }
+                            if (AwgConfigModel.isPacketSizeEqual(parseInt(initPacketJunkSizeTextField.textField.text),
+                                                                 parseInt(responsePacketJunkSizeTextField.textField.text))) {
+                                PageController.showErrorMessage(qsTr("The value of the field S1 + message initiation size (148) must not equal S2 + message response size (92)"))
+                                return
                             }
+                        }
 
-                            checkEmptyText: true
+                        var headerText = qsTr("Save settings?")
+                        var descriptionText = qsTr("All users with whom you shared a connection with will no longer be able to connect to it.")
+                        var yesButtonText = qsTr("Continue")
+                        var noButtonText = qsTr("Cancel")
 
-                            KeyNavigation.tab: saveRestartButton
-                        }
+                        var yesButtonFunction = function() {
+                            if (ConnectionController.isConnected && ServersModel.getDefaultServerData("defaultContainer") === ContainersModel.getProcessedContainerIndex()) {
+                                PageController.showNotificationMessage(qsTr("Unable change settings while there is an active connection"))
+                                return
+                            }
 
-                        BasicButtonType {
-                            id: saveRestartButton
-                            parentFlickable: fl
-
-                            Layout.fillWidth: true
-                            Layout.topMargin: 24
-                            Layout.bottomMargin: 24
-
-                            enabled: underloadPacketMagicHeaderTextField.errorText === "" &&
-                                     transportPacketMagicHeaderTextField.errorText === "" &&
-                                     responsePacketMagicHeaderTextField.errorText === "" &&
-                                     initPacketMagicHeaderTextField.errorText === "" &&
-                                     responsePacketJunkSizeTextField.errorText === "" &&
-                                     initPacketJunkSizeTextField.errorText === "" &&
-                                     junkPacketMaxSizeTextField.errorText === "" &&
-                                     junkPacketMinSizeTextField.errorText === "" &&
-                                     junkPacketCountTextField.errorText === "" &&
-                                     portTextField.errorText === ""
-
-                            text: qsTr("Save")
-
-                            Keys.onTabPressed: lastItemTabClicked(focusItem)
-
-                            clickedFunc: function() {
-                                forceActiveFocus()
-
-                                if (delegateItem.isEnabled) {
-                                    if (AwgConfigModel.isHeadersEqual(underloadPacketMagicHeaderTextField.textField.text,
-                                                                      transportPacketMagicHeaderTextField.textField.text,
-                                                                      responsePacketMagicHeaderTextField.textField.text,
-                                                                      initPacketMagicHeaderTextField.textField.text)) {
-                                        PageController.showErrorMessage(qsTr("The values of the H1-H4 fields must be unique"))
-                                        return
-                                    }
-
-                                    if (AwgConfigModel.isPacketSizeEqual(parseInt(initPacketJunkSizeTextField.textField.text),
-                                                                         parseInt(responsePacketJunkSizeTextField.textField.text))) {
-                                        PageController.showErrorMessage(qsTr("The value of the field S1 + message initiation size (148) must not equal S2 + message response size (92)"))
-                                        return
-                                    }
-                                }
-
-                                var headerText = qsTr("Save settings?")
-                                var descriptionText = qsTr("All users with whom you shared a connection with will no longer be able to connect to it.")
-                                var yesButtonText = qsTr("Continue")
-                                var noButtonText = qsTr("Cancel")
-
-                                var yesButtonFunction = function() {
-                                    if (ConnectionController.isConnected && ServersModel.getDefaultServerData("defaultContainer") === ContainersModel.getProcessedContainerIndex()) {
-                                        PageController.showNotificationMessage(qsTr("Unable change settings while there is an active connection"))
-                                        return
-                                    }
-
-                                    PageController.goToPage(PageEnum.PageSetupWizardInstalling);
-                                    InstallController.updateContainer(AwgConfigModel.getConfig())
-                                }
-                                var noButtonFunction = function() {
-                                    if (!GC.isMobile()) {
-                                        saveRestartButton.forceActiveFocus()
-                                    }
-                                }
-                                showQuestionDrawer(headerText, descriptionText, yesButtonText, noButtonText, yesButtonFunction, noButtonFunction)
+                            PageController.goToPage(PageEnum.PageSetupWizardInstalling);
+                            InstallController.updateContainer(AwgConfigModel.getConfig())
+                        }
+                        var noButtonFunction = function() {
+                            if (!GC.isMobile()) {
+                                saveRestartButton.forceActiveFocus()
                             }
                         }
+                        showQuestionDrawer(headerText, descriptionText, yesButtonText, noButtonText, yesButtonFunction, noButtonFunction)
                     }
                 }
             }
diff --git a/client/ui/qml/Pages2/PageProtocolCloakSettings.qml b/client/ui/qml/Pages2/PageProtocolCloakSettings.qml
index 5089a7642..e90325ba2 100644
--- a/client/ui/qml/Pages2/PageProtocolCloakSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolCloakSettings.qml
@@ -16,13 +16,6 @@ import "../Components"
 PageType {
     id: root
 
-    defaultActiveFocusItem: listview.currentItem.trafficFromField.textField
-
-    Item {
-        id: focusItem
-        KeyNavigation.tab: backButton
-    }
-
     ColumnLayout {
         id: backButtonLayout
 
@@ -34,7 +27,6 @@ PageType {
 
         BackButtonType {
             id: backButton
-            KeyNavigation.tab: listview.currentItem.trafficFromField.textField
         }
     }
 
@@ -56,11 +48,13 @@ PageType {
             ListView {
                 id: listview
 
+                property int selectedIndex: 0
+
                 width: parent.width
                 height: listview.contentItem.height
 
                 clip: true
-                interactive: false
+                reuseItems: true
 
                 model: CloakConfigModel
 
@@ -110,8 +104,6 @@ PageType {
                                     }
                                 }
                             }
-
-                            KeyNavigation.tab: portTextField.textField
                         }
 
                         TextFieldWithHeaderType {
@@ -130,8 +122,6 @@ PageType {
                                     port = textFieldText
                                 }
                             }
-
-                            KeyNavigation.tab: cipherDropDown
                         }
 
                         DropDownType {
@@ -143,7 +133,6 @@ PageType {
                             headerText: qsTr("Cipher")
 
                             drawerParent: root
-                            KeyNavigation.tab: saveRestartButton
 
                             listView: ListViewWithRadioButtonType {
                                 id: cipherListView
@@ -161,7 +150,7 @@ PageType {
                                 clickedFunction: function() {
                                     cipherDropDown.text = selectedText
                                     cipher = cipherDropDown.text
-                                    cipherDropDown.close()
+                                    cipherDropDown.closeTriggered()
                                 }
 
                                 Component.onCompleted: {
@@ -169,7 +158,7 @@ PageType {
 
                                     for (var i = 0; i < cipherListView.model.count; i++) {
                                         if (cipherListView.model.get(i).name === cipherDropDown.text) {
-                                            currentIndex = i
+                                            selectedIndex = i
                                         }
                                     }
                                 }
@@ -184,7 +173,6 @@ PageType {
                             Layout.bottomMargin: 24
 
                             text: qsTr("Save")
-                            Keys.onTabPressed: lastItemTabClicked(focusItem)
 
                             clickedFunc: function() {
                                 forceActiveFocus()
diff --git a/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml b/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
index 30540a932..6c5ad23f0 100644
--- a/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
@@ -17,18 +17,6 @@ import "../Components"
 PageType {
     id: root
 
-    defaultActiveFocusItem: listview.currentItem.vpnAddressSubnetTextField.textField
-
-    Item {
-        id: focusItem
-        KeyNavigation.tab: backButton
-        onActiveFocusChanged: {
-            if (activeFocus) {
-                fl.ensureVisible(focusItem)
-            }
-        }
-    }
-
     ColumnLayout {
         id: backButtonLayout
 
@@ -40,7 +28,6 @@ PageType {
 
         BackButtonType {
             id: backButton
-            KeyNavigation.tab: listview.currentItem.vpnAddressSubnetTextField.textField
         }
     }
 
@@ -104,7 +91,6 @@ PageType {
                             textFieldText: subnetAddress
 
                             parentFlickable: fl
-                            KeyNavigation.tab: transportProtoSelector
 
                             textField.onEditingFinished: {
                                 if (textFieldText !== subnetAddress) {
@@ -132,8 +118,6 @@ PageType {
                                 return transportProto === "tcp" ? 1 : 0
                             }
 
-                            KeyNavigation.tab: portTextField.enabled ? portTextField.textField : autoNegotiateEncryprionSwitcher
-
                             onCurrentIndexChanged: {
                                 if (transportProto === "tcp" && currentIndex === 0) {
                                     transportProto = "udp"
@@ -162,8 +146,6 @@ PageType {
                                     port = textFieldText
                                 }
                             }
-
-                            KeyNavigation.tab: autoNegotiateEncryprionSwitcher
                         }
 
                         SwitcherType {
@@ -181,10 +163,6 @@ PageType {
                                     autoNegotiateEncryprion = checked
                                 }
                             }
-
-                            KeyNavigation.tab: hashDropDown.enabled ?
-                                                   hashDropDown :
-                                                   tlsAuthCheckBox
                         }
 
                         DropDownType {
@@ -198,10 +176,6 @@ PageType {
                             headerText: qsTr("Hash")
 
                             drawerParent: root
-                            parentFlickable: fl
-                            KeyNavigation.tab: cipherDropDown.enabled ?
-                                               cipherDropDown :
-                                               tlsAuthCheckBox
 
                             listView: ListViewWithRadioButtonType {
                                 id: hashListView
@@ -224,7 +198,7 @@ PageType {
                                 clickedFunction: function() {
                                     hashDropDown.text = selectedText
                                     hash = hashDropDown.text
-                                    hashDropDown.close()
+                                    hashDropDown.closeTriggered()
                                 }
 
                                 Component.onCompleted: {
@@ -250,9 +224,6 @@ PageType {
                             headerText: qsTr("Cipher")
 
                             drawerParent: root
-                            parentFlickable: fl
-
-                            KeyNavigation.tab: tlsAuthCheckBox
 
                             listView: ListViewWithRadioButtonType {
                                 id: cipherListView
@@ -275,7 +246,7 @@ PageType {
                                 clickedFunction: function() {
                                     cipherDropDown.text = selectedText
                                     cipher = cipherDropDown.text
-                                    cipherDropDown.close()
+                                    cipherDropDown.closeTriggered()
                                 }
 
                                 Component.onCompleted: {
@@ -320,8 +291,6 @@ PageType {
                                     text: qsTr("TLS auth")
                                     checked: tlsAuth
 
-                                    KeyNavigation.tab: blockDnsCheckBox
-
                                     onCheckedChanged: {
                                         if (checked !== tlsAuth) {
                                             console.log("tlsAuth changed to: " + checked)
@@ -339,8 +308,6 @@ PageType {
                                     text: qsTr("Block DNS requests outside of VPN")
                                     checked: blockDns
 
-                                    KeyNavigation.tab: additionalClientCommandsSwitcher
-
                                     onCheckedChanged: {
                                         if (checked !== blockDns) {
                                             blockDns = checked
@@ -355,9 +322,6 @@ PageType {
                             Layout.fillWidth: true
                             Layout.topMargin: 32
                             parentFlickable: fl
-                            KeyNavigation.tab: additionalClientCommandsTextArea.visible ?
-                                               additionalClientCommandsTextArea.textArea :
-                                               additionalServerCommandsSwitcher
 
                             checked: additionalClientCommands !== ""
 
@@ -376,7 +340,7 @@ PageType {
                             Layout.topMargin: 16
 
                             visible: additionalClientCommandsSwitcher.checked
-                            KeyNavigation.tab: additionalServerCommandsSwitcher
+
                             parentFlickable: fl
 
                             textAreaText: additionalClientCommands
@@ -394,9 +358,6 @@ PageType {
                             Layout.fillWidth: true
                             Layout.topMargin: 16
                             parentFlickable: fl
-                            KeyNavigation.tab: additionalServerCommandsTextArea.visible ?
-                                               additionalServerCommandsTextArea.textArea :
-                                               saveRestartButton
 
                             checked: additionalServerCommands !== ""
 
@@ -419,7 +380,6 @@ PageType {
                             textAreaText: additionalServerCommands
                             placeholderText: qsTr("Commands:")
                             parentFlickable: fl
-                            KeyNavigation.tab: saveRestartButton
                             textArea.onEditingFinished: {
                                 if (additionalServerCommands !== textAreaText) {
                                     additionalServerCommands = textAreaText
@@ -436,7 +396,6 @@ PageType {
 
                             text: qsTr("Save")
                             parentFlickable: fl
-                            Keys.onTabPressed: lastItemTabClicked(focusItem)
 
                             clickedFunc: function() {
                                 forceActiveFocus()
diff --git a/client/ui/qml/Pages2/PageProtocolRaw.qml b/client/ui/qml/Pages2/PageProtocolRaw.qml
index 24853afda..03b4e297a 100644
--- a/client/ui/qml/Pages2/PageProtocolRaw.qml
+++ b/client/ui/qml/Pages2/PageProtocolRaw.qml
@@ -19,13 +19,6 @@ import "../Components"
 PageType {
     id: root
 
-    defaultActiveFocusItem: focusItem
-
-    Item {
-        id: focusItem
-        KeyNavigation.tab: backButton
-    }
-
     ColumnLayout {
         id: header
 
@@ -37,7 +30,6 @@ PageType {
 
         BackButtonType {
             id: backButton
-            KeyNavigation.tab: listView
         }
 
         HeaderType {
@@ -75,13 +67,6 @@ PageType {
                 activeFocusOnTab: true
                 focus: true
 
-                onActiveFocusChanged: {
-                    if (focus) {
-                        listView.currentIndex = 0
-                        listView.currentItem.focusItem.forceActiveFocus()
-                    }
-                }
-
                 delegate: Item {
                     implicitWidth: parent.width
                     implicitHeight: delegateContent.implicitHeight
@@ -101,11 +86,9 @@ PageType {
                             text: qsTr("Show connection options")
 
                             clickedFunction: function() {
-                                configContentDrawer.open()
+                                configContentDrawer.openTriggered()
                             }
 
-                            KeyNavigation.tab: removeButton
-
                             MouseArea {
                                 anchors.fill: button
                                 cursorShape: Qt.PointingHandCursor
@@ -120,31 +103,12 @@ PageType {
 
                             expandedHeight: root.height * 0.9
 
-                            onClosed: {
-                                if (!GC.isMobile()) {
-                                    defaultActiveFocusItem.forceActiveFocus()
-                                }
-                            }
-
                             parent: root
                             anchors.fill: parent
 
-                            expandedContent: Item {
+                            expandedStateContent: Item {
                                 implicitHeight: configContentDrawer.expandedHeight
 
-                                Connections {
-                                    target: configContentDrawer
-                                    enabled: !GC.isMobile()
-                                    function onOpened() {
-                                        focusItem1.forceActiveFocus()
-                                    }
-                                }
-
-                                Item {
-                                    id: focusItem1
-                                    KeyNavigation.tab: backButton1
-                                }
-
                                 BackButtonType {
                                     id: backButton1
 
@@ -154,10 +118,8 @@ PageType {
                                     anchors.topMargin: 16
 
                                     backButtonFunction: function() {
-                                        configContentDrawer.close()
+                                        configContentDrawer.closeTriggered()
                                     }
-
-                                    KeyNavigation.tab: focusItem1
                                 }
 
                                 FlickableType {
@@ -226,7 +188,6 @@ PageType {
                 text: qsTr("Remove ") + ContainersModel.getProcessedContainerName()
                 textColor: AmneziaStyle.color.vibrantRed
 
-                Keys.onTabPressed: lastItemTabClicked(focusItem)
                 clickedFunction: function() {
                     var headerText = qsTr("Remove %1 from server?").arg(ContainersModel.getProcessedContainerName())
                     var descriptionText = qsTr("All users with whom you shared a connection with will no longer be able to connect to it.")
diff --git a/client/ui/qml/Pages2/PageProtocolShadowSocksSettings.qml b/client/ui/qml/Pages2/PageProtocolShadowSocksSettings.qml
index 4d3b2c4e7..44cbd1cea 100644
--- a/client/ui/qml/Pages2/PageProtocolShadowSocksSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolShadowSocksSettings.qml
@@ -16,15 +16,6 @@ import "../Components"
 PageType {
     id: root
 
-    defaultActiveFocusItem: listview.currentItem.focusItemId.enabled ?
-                                listview.currentItem.focusItemId.textField :
-                                focusItem
-
-    Item {
-        id: focusItem
-        KeyNavigation.tab: backButton
-    }
-
     ColumnLayout {
         id: backButtonLayout
 
@@ -36,9 +27,6 @@ PageType {
 
         BackButtonType {
             id: backButton
-            KeyNavigation.tab: listview.currentItem.focusItemId.enabled ?
-                                   listview.currentItem.focusItemId.textField :
-                                   focusItem
         }
     }
 
@@ -114,8 +102,6 @@ PageType {
                                     port = textFieldText
                                 }
                             }
-
-                            KeyNavigation.tab: cipherDropDown
                         }
 
                         DropDownType {
@@ -129,9 +115,9 @@ PageType {
                             headerText: qsTr("Cipher")
 
                             drawerParent: root
-                            KeyNavigation.tab: saveRestartButton
 
                             listView: ListViewWithRadioButtonType {
+
                                 id: cipherListView
 
                                 rootWidth: root.width
@@ -147,7 +133,7 @@ PageType {
                                 clickedFunction: function() {
                                     cipherDropDown.text = selectedText
                                     cipher = cipherDropDown.text
-                                    cipherDropDown.close()
+                                    cipherDropDown.closeTriggered()
                                 }
 
                                 Component.onCompleted: {
@@ -172,7 +158,6 @@ PageType {
                             enabled: isPortEditable | isCipherEditable
 
                             text: qsTr("Save")
-                            Keys.onTabPressed: lastItemTabClicked(focusItem)
 
                             clickedFunc: function() {
                                 forceActiveFocus()
diff --git a/client/ui/qml/Pages2/PageProtocolWireGuardClientSettings.qml b/client/ui/qml/Pages2/PageProtocolWireGuardClientSettings.qml
index 007de5cac..7413df385 100644
--- a/client/ui/qml/Pages2/PageProtocolWireGuardClientSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolWireGuardClientSettings.qml
@@ -16,8 +16,6 @@ import "../Components"
 PageType {
     id: root
 
-    defaultActiveFocusItem: listview.currentItem.mtuTextField.textField
-
     Item {
         id: focusItem
         onFocusChanged: {
@@ -150,8 +148,6 @@ PageType {
 
         text: qsTr("Save")
 
-        Keys.onTabPressed: lastItemTabClicked(focusItem)
-
         clickedFunc: function() {
             forceActiveFocus()
             var headerText = qsTr("Save settings?")
diff --git a/client/ui/qml/Pages2/PageProtocolWireGuardSettings.qml b/client/ui/qml/Pages2/PageProtocolWireGuardSettings.qml
index b5d081322..f83d97fdf 100644
--- a/client/ui/qml/Pages2/PageProtocolWireGuardSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolWireGuardSettings.qml
@@ -16,13 +16,6 @@ import "../Components"
 PageType {
     id: root
 
-    defaultActiveFocusItem: listview
-
-    Item {
-        id: focusItem
-        KeyNavigation.tab: backButton
-    }
-
     ColumnLayout {
         id: backButtonLayout
 
@@ -34,7 +27,6 @@ PageType {
 
         BackButtonType {
             id: backButton
-            KeyNavigation.tab: listview
         }
     }
 
@@ -64,17 +56,10 @@ PageType {
 
                 model: WireGuardConfigModel
 
-                activeFocusOnTab: true
-                onActiveFocusChanged: {
-                    if (activeFocus) {
-                        listview.itemAtIndex(0)?.focusItemId.forceActiveFocus()
-                    }
-                }
-
                 delegate: Item {
                     id: delegateItem
 
-                    property alias focusItemId: portTextField.textField
+                    property alias focusItemId: vpnAddressSubnetTextField
                     property bool isEnabled: ServersModel.isProcessedServerHasWriteAccess()
 
                     implicitWidth: listview.width
@@ -98,19 +83,36 @@ PageType {
                         }
 
                         TextFieldWithHeaderType {
-                            id: portTextField
+                            id: vpnAddressSubnetTextField
                             Layout.fillWidth: true
                             Layout.topMargin: 40
 
                             enabled: delegateItem.isEnabled
 
+                            headerText: qsTr("VPN address subnet")
+                            textFieldText: subnetAddress
+
+                            textField.onEditingFinished: {
+                                if (textFieldText !== subnetAddress) {
+                                    subnetAddress = textFieldText
+                                }
+                            }
+
+                            checkEmptyText: true
+                        }
+
+                        TextFieldWithHeaderType {
+                            id: portTextField
+                            Layout.fillWidth: true
+                            Layout.topMargin: 16
+
+                            enabled: delegateItem.isEnabled
+
                             headerText: qsTr("Port")
                             textFieldText: port
                             textField.maximumLength: 5
                             textField.validator: IntValidator { bottom: 1; top: 65535 }
 
-                            KeyNavigation.tab: saveButton
-
                             textField.onEditingFinished: {
                                 if (textFieldText !== port) {
                                     port = textFieldText
@@ -126,12 +128,11 @@ PageType {
                             Layout.topMargin: 24
                             Layout.bottomMargin: 24
 
-                            enabled: portTextField.errorText === ""
+                            enabled: portTextField.errorText === "" &&
+                                     vpnAddressSubnetTextField.errorText === ""
 
                             text: qsTr("Save")
 
-                            Keys.onTabPressed: lastItemTabClicked(focusItem)
-
                             onClicked: function() {
                                 forceActiveFocus()
 
diff --git a/client/ui/qml/Pages2/PageProtocolXraySettings.qml b/client/ui/qml/Pages2/PageProtocolXraySettings.qml
index 20ee1da6c..6d2ad3d1d 100644
--- a/client/ui/qml/Pages2/PageProtocolXraySettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolXraySettings.qml
@@ -17,13 +17,6 @@ import "../Components"
 PageType {
     id: root
 
-    defaultActiveFocusItem: listview
-
-    Item {
-        id: focusItem
-        KeyNavigation.tab: backButton
-    }
-
     ColumnLayout {
         id: backButtonLayout
 
@@ -35,7 +28,6 @@ PageType {
 
         BackButtonType {
             id: backButton
-            KeyNavigation.tab: listview
         }
     }
 
@@ -65,13 +57,6 @@ PageType {
 
                 model: XrayConfigModel
 
-                activeFocusOnTab: true
-                onActiveFocusChanged: {
-                    if (activeFocus) {
-                        listview.itemAtIndex(0)?.focusItemId.forceActiveFocus()
-                    }
-                }
-
                 delegate: Item {
                     property alias focusItemId: textFieldWithHeaderType.textField
 
@@ -103,8 +88,6 @@ PageType {
                             headerText: qsTr("Disguised as traffic from")
                             textFieldText: site
 
-                            KeyNavigation.tab: basicButton
-
                             textField.onEditingFinished: {
                                 if (textFieldText !== site) {
                                     var tmpText = textFieldText
@@ -128,8 +111,6 @@ PageType {
 
                             text: qsTr("Save")
 
-                            Keys.onTabPressed: lastItemTabClicked(focusItem)
-
                             onClicked: {
                                 forceActiveFocus()
 
diff --git a/client/ui/qml/Pages2/PageServiceDnsSettings.qml b/client/ui/qml/Pages2/PageServiceDnsSettings.qml
index bb3cbf963..cef298139 100644
--- a/client/ui/qml/Pages2/PageServiceDnsSettings.qml
+++ b/client/ui/qml/Pages2/PageServiceDnsSettings.qml
@@ -16,13 +16,6 @@ import "../Components"
 PageType {
     id: root
 
-    defaultActiveFocusItem: focusItem
-
-    Item {
-        id: focusItem
-        KeyNavigation.tab: backButton
-    }
-
     ColumnLayout {
         id: backButtonLayout
 
@@ -34,7 +27,6 @@ PageType {
 
         BackButtonType {
             id: backButton
-            KeyNavigation.tab: removeButton
         }
     }
 
@@ -72,8 +64,6 @@ PageType {
                 text: qsTr("Remove ") + ContainersModel.getProcessedContainerName()
                 textColor: AmneziaStyle.color.vibrantRed
 
-                Keys.onTabPressed: root.lastItemTabClicked()
-
                 clickedFunction: function() {
                     var headerText = qsTr("Remove %1 from server?").arg(ContainersModel.getProcessedContainerName())
                     var yesButtonText = qsTr("Continue")
diff --git a/client/ui/qml/Pages2/PageServiceSftpSettings.qml b/client/ui/qml/Pages2/PageServiceSftpSettings.qml
index 9bdbf2db3..2deb315c0 100644
--- a/client/ui/qml/Pages2/PageServiceSftpSettings.qml
+++ b/client/ui/qml/Pages2/PageServiceSftpSettings.qml
@@ -16,8 +16,6 @@ import "../Components"
 PageType {
     id: root
 
-    defaultActiveFocusItem: focusItem
-
     Connections {
         target: InstallController
 
@@ -26,11 +24,6 @@ PageType {
         }
     }
 
-    Item {
-        id: focusItem
-        KeyNavigation.tab: backButton
-    }
-
     ColumnLayout {
         id: backButtonLayout
 
@@ -42,7 +35,6 @@ PageType {
 
         BackButtonType {
             id: backButton
-            KeyNavigation.tab: listview
         }
     }
 
@@ -107,7 +99,6 @@ PageType {
                             Layout.topMargin: 32
 
                             parentFlickable: fl
-                            KeyNavigation.tab: portLabel.rightButton
 
                             text: qsTr("Host")
                             descriptionText: ServersModel.getProcessedServerData("hostName")
@@ -136,7 +127,6 @@ PageType {
                             descriptionOnTop: true
 
                             parentFlickable: fl
-                            KeyNavigation.tab: usernameLabel.rightButton
 
                             rightImageSource: "qrc:/images/controls/copy.svg"
                             rightImageColor: AmneziaStyle.color.paleGray
@@ -160,7 +150,6 @@ PageType {
                             descriptionOnTop: true
 
                             parentFlickable: fl
-                            KeyNavigation.tab: passwordLabel.eyeButton
 
                             rightImageSource: "qrc:/images/controls/copy.svg"
                             rightImageColor: AmneziaStyle.color.paleGray
@@ -184,14 +173,6 @@ PageType {
                             descriptionOnTop: true
 
                             parentFlickable: fl
-                            eyeButton.KeyNavigation.tab: passwordLabel.rightButton
-                            rightButton.Keys.onTabPressed: {
-                                if (mountButton.visible) {
-                                    mountButton.forceActiveFocus()
-                                } else {
-                                    detailedInstructionsButton.forceActiveFocus()
-                                }
-                            }
 
                             rightImageSource: "qrc:/images/controls/copy.svg"
                             rightImageColor: AmneziaStyle.color.paleGray
@@ -225,7 +206,6 @@ PageType {
                             borderWidth: 1
 
                             parentFlickable: fl
-                            KeyNavigation.tab: detailedInstructionsButton
 
                             text: qsTr("Mount folder on device")
 
@@ -290,7 +270,6 @@ PageType {
                             text: qsTr("Detailed instructions")
 
                             parentFlickable: fl
-                            Keys.onTabPressed: lastItemTabClicked(focusItem)
 
                             clickedFunc: function() {
 //                                Qt.openUrlExternally("https://github.com/amnezia-vpn/desktop-client/releases/latest")
diff --git a/client/ui/qml/Pages2/PageServiceSocksProxySettings.qml b/client/ui/qml/Pages2/PageServiceSocksProxySettings.qml
index 9d21963dc..5eee9a1ea 100644
--- a/client/ui/qml/Pages2/PageServiceSocksProxySettings.qml
+++ b/client/ui/qml/Pages2/PageServiceSocksProxySettings.qml
@@ -17,8 +17,6 @@ import "../Components"
 PageType {
     id: root
 
-    defaultActiveFocusItem: listview
-
     Connections {
         target: InstallController
 
@@ -27,11 +25,6 @@ PageType {
         }
     }
 
-    Item {
-        id: focusItem
-        KeyNavigation.tab: backButton
-    }
-
     ColumnLayout {
         id: backButtonLayout
 
@@ -43,7 +36,6 @@ PageType {
 
         BackButtonType {
             id: backButton
-            KeyNavigation.tab: listview
         }
     }
 
@@ -99,7 +91,6 @@ PageType {
                         Layout.topMargin: 32
 
                         parentFlickable: fl
-                        KeyNavigation.tab: portLabel.rightButton
 
                         text: qsTr("Host")
                         descriptionText: ServersModel.getProcessedServerData("hostName")
@@ -128,7 +119,6 @@ PageType {
                         descriptionOnTop: true
 
                         parentFlickable: fl
-                        KeyNavigation.tab: usernameLabel.rightButton
 
                         rightImageSource: "qrc:/images/controls/copy.svg"
                         rightImageColor: AmneziaStyle.color.paleGray
@@ -152,7 +142,6 @@ PageType {
                         descriptionOnTop: true
 
                         parentFlickable: fl
-                        KeyNavigation.tab: passwordLabel.eyeButton
 
                         rightImageSource: "qrc:/images/controls/copy.svg"
                         rightImageColor: AmneziaStyle.color.paleGray
@@ -176,8 +165,6 @@ PageType {
                         descriptionOnTop: true
 
                         parentFlickable: fl
-                        eyeButton.KeyNavigation.tab: passwordLabel.rightButton
-                        rightButton.KeyNavigation.tab: changeSettingsButton
 
                         rightImageSource: "qrc:/images/controls/copy.svg"
                         rightImageColor: AmneziaStyle.color.paleGray
@@ -200,13 +187,7 @@ PageType {
                         anchors.fill: parent
                         expandedHeight: root.height * 0.9
 
-                        onClosed: {
-                            if (!GC.isMobile()) {
-                                focusItem.forceActiveFocus()
-                            }
-                        }
-
-                        expandedContent: ColumnLayout {
+                        expandedStateContent: ColumnLayout {
                             property string tempPort: port
                             property string tempUsername: username
                             property string tempPassword: password
@@ -222,9 +203,6 @@ PageType {
                             Connections {
                                 target: changeSettingsDrawer
                                 function onOpened() {
-                                    if (!GC.isMobile()) {
-                                        drawerFocusItem.forceActiveFocus()
-                                    }
                                     tempPort = port
                                     tempUsername = username
                                     tempPassword = password
@@ -239,11 +217,6 @@ PageType {
                                 }
                             }
 
-                            Item {
-                                id: drawerFocusItem
-                                KeyNavigation.tab: portTextField.textField
-                            }
-
                             HeaderType {
                                 Layout.fillWidth: true
 
@@ -268,8 +241,6 @@ PageType {
                                         port = textFieldText
                                     }
                                 }
-
-                                KeyNavigation.tab: usernameTextField.textField
                             }
 
                             TextFieldWithHeaderType {
@@ -290,8 +261,6 @@ PageType {
                                         username = textFieldText
                                     }
                                 }
-
-                                KeyNavigation.tab: passwordTextField.textField
                             }
 
                             TextFieldWithHeaderType {
@@ -322,8 +291,6 @@ PageType {
                                         password = textFieldText
                                     }
                                 }
-
-                                KeyNavigation.tab: saveButton
                             }
 
                             BasicButtonType {
@@ -334,7 +301,6 @@ PageType {
                                 Layout.bottomMargin: 24
 
                                 text: qsTr("Change connection settings")
-                                Keys.onTabPressed: lastItemTabClicked(drawerFocusItem)
 
                                 clickedFunc: function() {
                                     forceActiveFocus()
@@ -356,7 +322,7 @@ PageType {
                                     tempPort = portTextField.textFieldText
                                     tempUsername = usernameTextField.textFieldText
                                     tempPassword = passwordTextField.textFieldText
-                                    changeSettingsDrawer.close()
+                                    changeSettingsDrawer.closeTriggered()
                                 }
                             }
                         }
@@ -372,11 +338,10 @@ PageType {
                         Layout.rightMargin: 16
 
                         text: qsTr("Change connection settings")
-                        Keys.onTabPressed: lastItemTabClicked(focusItem)
 
                         clickedFunc: function() {
                             forceActiveFocus()
-                            changeSettingsDrawer.open()
+                            changeSettingsDrawer.openTriggered()
                         }
                     }
                 }
diff --git a/client/ui/qml/Pages2/PageServiceTorWebsiteSettings.qml b/client/ui/qml/Pages2/PageServiceTorWebsiteSettings.qml
index 946a77bb1..249c70c7b 100644
--- a/client/ui/qml/Pages2/PageServiceTorWebsiteSettings.qml
+++ b/client/ui/qml/Pages2/PageServiceTorWebsiteSettings.qml
@@ -17,8 +17,6 @@ import "../Components"
 PageType {
     id: root
 
-    defaultActiveFocusItem: focusItem
-
     Connections {
         target: InstallController
 
@@ -27,11 +25,6 @@ PageType {
         }
     }
 
-    Item {
-        id: focusItem
-        KeyNavigation.tab: backButton
-    }
-
     ColumnLayout {
         id: backButtonLayout
 
@@ -43,7 +36,6 @@ PageType {
 
         BackButtonType {
             id: backButton
-            KeyNavigation.tab: websiteName.rightButton
         }
     }
 
@@ -88,8 +80,6 @@ PageType {
                 rightImageSource: "qrc:/images/controls/copy.svg"
                 rightImageColor: AmneziaStyle.color.paleGray
 
-                Keys.onTabPressed: lastItemTabClicked(focusItem)
-
                 clickedFunction: function() {
                     GC.copyToClipBoard(descriptionText)
                     PageController.showNotificationMessage(qsTr("Copied"))
diff --git a/client/ui/qml/Pages2/PageSettings.qml b/client/ui/qml/Pages2/PageSettings.qml
index bb5ca7667..c44e52ae7 100644
--- a/client/ui/qml/Pages2/PageSettings.qml
+++ b/client/ui/qml/Pages2/PageSettings.qml
@@ -14,8 +14,6 @@ import "../Config"
 PageType {
     id: root
 
-    defaultActiveFocusItem: header
-
     FlickableType {
         id: fl
         anchors.top: parent.top
@@ -39,8 +37,6 @@ PageType {
                 Layout.leftMargin: 16
 
                 headerText: qsTr("Settings")
-
-                KeyNavigation.tab: account.rightButton
             }
 
             LabelWithButtonType {
@@ -55,8 +51,6 @@ PageType {
                 clickedFunction: function() {
                     PageController.goToPage(PageEnum.PageSettingsServersList)
                 }
-
-                KeyNavigation.tab: connection.rightButton
             }
 
             DividerType {}
@@ -72,8 +66,6 @@ PageType {
                 clickedFunction: function() {
                     PageController.goToPage(PageEnum.PageSettingsConnection)
                 }
-
-                KeyNavigation.tab: application.rightButton
             }
 
             DividerType {}
@@ -89,14 +81,13 @@ PageType {
                 clickedFunction: function() {
                     PageController.goToPage(PageEnum.PageSettingsApplication)
                 }
-
-                KeyNavigation.tab: backup.rightButton
             }
 
             DividerType {}
 
             LabelWithButtonType {
                 id: backup
+                visible: !SettingsController.isOnTv()
                 Layout.fillWidth: true
 
                 text: qsTr("Backup")
@@ -106,11 +97,11 @@ PageType {
                 clickedFunction: function() {
                     PageController.goToPage(PageEnum.PageSettingsBackup)
                 }
-
-                KeyNavigation.tab: about.rightButton
             }
 
-            DividerType {}
+            DividerType {
+                visible: !SettingsController.isOnTv()
+            }
 
             LabelWithButtonType {
                 id: about
@@ -123,8 +114,6 @@ PageType {
                 clickedFunction: function() {
                     PageController.goToPage(PageEnum.PageSettingsAbout)
                 }
-                KeyNavigation.tab: close
-
             }
 
             DividerType {}
@@ -138,8 +127,6 @@ PageType {
                 rightImageSource: "qrc:/images/controls/chevron-right.svg"
                 leftImageSource: "qrc:/images/controls/bug.svg"
 
-                // Keys.onTabPressed: lastItemTabClicked(header)
-
                 clickedFunction: function() {
                     PageController.goToPage(PageEnum.PageDevMenu)
                 }
@@ -157,9 +144,7 @@ PageType {
 
                 text: qsTr("Close application")
                 leftImageSource: "qrc:/images/controls/x-circle.svg"
-                isLeftImageHoverEnabled: false                
-
-                Keys.onTabPressed: lastItemTabClicked(header)
+                isLeftImageHoverEnabled: false
 
                 clickedFunction: function() {
                     PageController.closeApplication()
diff --git a/client/ui/qml/Pages2/PageSettingsAbout.qml b/client/ui/qml/Pages2/PageSettingsAbout.qml
index cde9ee200..2160692b5 100644
--- a/client/ui/qml/Pages2/PageSettingsAbout.qml
+++ b/client/ui/qml/Pages2/PageSettingsAbout.qml
@@ -14,19 +14,6 @@ import "../Components"
 PageType {
     id: root
 
-    defaultActiveFocusItem: focusItem
-
-    Item {
-        id: focusItem
-        KeyNavigation.tab: backButton
-
-        onFocusChanged: {
-            if (focusItem.activeFocus) {
-                fl.contentY = 0
-            }
-        }
-    }
-
     BackButtonType {
         id: backButton
 
@@ -35,21 +22,107 @@ PageType {
         anchors.right: parent.right
         anchors.topMargin: 20
 
-        KeyNavigation.tab: telegramButton
+        onActiveFocusChanged: {
+            if(backButton.enabled && backButton.activeFocus) {
+                listView.positionViewAtBeginning()
+            }
+        }
+    }
+
+    QtObject {
+        id: telegramGroup
+
+        readonly property string title: qsTr("Telegram group")
+        readonly property string description: qsTr("To discuss features")
+        readonly property string imageSource: "qrc:/images/controls/telegram.svg"
+        readonly property var handler: function() {
+            Qt.openUrlExternally(qsTr("https://t.me/amnezia_vpn_en"))
+        }
+    }
+
+    QtObject {
+        id: mail
+
+        readonly property string title: qsTr("support@amnezia.org")
+        readonly property string description: qsTr("For reviews and bug reports")
+        readonly property string imageSource: "qrc:/images/controls/mail.svg"
+        readonly property var handler: function() {
+            GC.copyToClipBoard(title)
+            PageController.showNotificationMessage(qsTr("Copied"))
+        }
+    }
+
+    QtObject {
+        id: github
+
+        readonly property string title: qsTr("GitHub")
+        readonly property string description: qsTr("Discover the source code")
+        readonly property string imageSource: "qrc:/images/controls/github.svg"
+        readonly property var handler: function() {
+            Qt.openUrlExternally(qsTr("https://github.com/amnezia-vpn/amnezia-client"))
+        }
+    }
+
+    QtObject {
+        id: website
+
+        readonly property string title: qsTr("Website")
+        readonly property string description: qsTr("Visit official website")
+        readonly property string imageSource: "qrc:/images/controls/amnezia.svg"
+        readonly property var handler: function() {
+            Qt.openUrlExternally(LanguageModel.getCurrentSiteUrl())
+        }
     }
 
-    FlickableType {
-        id: fl
+    property list<QtObject> contacts: [
+        telegramGroup,
+        mail,
+        github,
+        website
+    ]
+
+    ListView {
+        id: listView
+
         anchors.top: backButton.bottom
         anchors.bottom: parent.bottom
-        contentHeight: content.height
+        anchors.right: parent.right
+        anchors.left: parent.left
+
+        property bool isFocusable: true
+
+        Keys.onTabPressed: {
+            FocusController.nextKeyTabItem()
+        }
+
+        Keys.onBacktabPressed: {
+            FocusController.previousKeyTabItem()
+        }
+
+        Keys.onUpPressed: {
+            FocusController.nextKeyUpItem()
+        }
+
+        Keys.onDownPressed: {
+            FocusController.nextKeyDownItem()
+        }
+
+        Keys.onLeftPressed: {
+            FocusController.nextKeyLeftItem()
+        }
+
+        Keys.onRightPressed: {
+            FocusController.nextKeyRightItem()
+        }
+
+        ScrollBar.vertical: ScrollBarType {}
 
-        ColumnLayout {
-            id: content
+        model: contacts
 
-            anchors.top: parent.top
-            anchors.left: parent.left
-            anchors.right: parent.right
+        clip: true
+
+        header: ColumnLayout {
+            width: listView.width
 
             Image {
                 id: image
@@ -96,81 +169,29 @@ PageType {
 
                 text: qsTr("Contacts")
             }
+        }
 
-            LabelWithButtonType {
-                id: telegramButton
-                Layout.fillWidth: true
-                Layout.topMargin: 16
-
-                text: qsTr("Telegram group")
-                descriptionText: qsTr("To discuss features")
-                leftImageSource: "qrc:/images/controls/telegram.svg"
-
-                KeyNavigation.tab: mailButton
-                parentFlickable: fl
-
-                clickedFunction: function() {
-                    Qt.openUrlExternally(qsTr("https://t.me/amnezia_vpn_en"))
-                }
-            }
-
-            DividerType {}
-
-            LabelWithButtonType {
-                id: mailButton
-                Layout.fillWidth: true
-
-                text: qsTr("support@amnezia.org")
-                descriptionText: qsTr("For reviews and bug reports")
-                leftImageSource: "qrc:/images/controls/mail.svg"
-
-                KeyNavigation.tab: githubButton
-                parentFlickable: fl
-
-                clickedFunction: function() {
-                    GC.copyToClipBoard(text)
-                    PageController.showNotificationMessage(qsTr("Copied"))
-                }
-
-            }
-
-            DividerType {}
+        delegate: ColumnLayout {
+            width: listView.width
 
             LabelWithButtonType {
-                id: githubButton
+                id: telegramButton
                 Layout.fillWidth: true
+                Layout.topMargin: 6
 
-                text: qsTr("GitHub")
-                leftImageSource: "qrc:/images/controls/github.svg"
-
-                KeyNavigation.tab: websiteButton
-                parentFlickable: fl
-
-                clickedFunction: function() {
-                    Qt.openUrlExternally(qsTr("https://github.com/amnezia-vpn/amnezia-client"))
-                }
+                text: title
+                descriptionText: description
+                leftImageSource: imageSource
 
+                clickedFunction: handler
             }
 
             DividerType {}
 
-            LabelWithButtonType {
-                id: websiteButton
-                Layout.fillWidth: true
-
-                text: qsTr("Website")
-                leftImageSource: "qrc:/images/controls/amnezia.svg"
-
-                KeyNavigation.tab: checkUpdatesButton
-                parentFlickable: fl
-
-                clickedFunction: function() {
-                    Qt.openUrlExternally(LanguageModel.getCurrentSiteUrl())
-                }
-
-            }
+        }
 
-            DividerType {}
+        footer: ColumnLayout {
+            width: listView.width
 
             CaptionTextType {
                 Layout.fillWidth: true
@@ -196,6 +217,7 @@ PageType {
 
             BasicButtonType {
                 id: checkUpdatesButton
+
                 Layout.alignment: Qt.AlignHCenter
                 Layout.topMargin: 8
                 Layout.bottomMargin: 16
@@ -209,35 +231,30 @@ PageType {
 
                 text: qsTr("Check for updates")
 
-                KeyNavigation.tab: privacyPolicyButton
-                parentFlickable: fl
-
                 clickedFunc: function() {
                     Qt.openUrlExternally("https://github.com/amnezia-vpn/desktop-client/releases/latest")
                 }
             }
 
             BasicButtonType {
-              id: privacyPolicyButton
-              Layout.alignment: Qt.AlignHCenter
-              Layout.bottomMargin: 16
-              Layout.topMargin: -15
-              implicitHeight: 25
-
-              defaultColor: AmneziaStyle.color.transparent
-              hoveredColor: AmneziaStyle.color.translucentWhite
-              pressedColor: AmneziaStyle.color.sheerWhite
-              disabledColor: AmneziaStyle.color.mutedGray
-              textColor: AmneziaStyle.color.goldenApricot
-
-              text: qsTr("Privacy Policy")
-
-              Keys.onTabPressed: lastItemTabClicked()
-              parentFlickable: fl
-
-              clickedFunc: function() {
-                Qt.openUrlExternally(LanguageModel.getCurrentSiteUrl() + "/policy")
-              }
+                id: privacyPolicyButton
+
+                Layout.alignment: Qt.AlignHCenter
+                Layout.bottomMargin: 16
+                Layout.topMargin: -15
+                implicitHeight: 25
+
+                defaultColor: AmneziaStyle.color.transparent
+                hoveredColor: AmneziaStyle.color.translucentWhite
+                pressedColor: AmneziaStyle.color.sheerWhite
+                disabledColor: AmneziaStyle.color.mutedGray
+                textColor: AmneziaStyle.color.goldenApricot
+
+                text: qsTr("Privacy Policy")
+
+                clickedFunc: function() {
+                    Qt.openUrlExternally(LanguageModel.getCurrentSiteUrl() + "/policy")
+                }
             }
         }
     }
diff --git a/client/ui/qml/Pages2/PageSettingsApiLanguageList.qml b/client/ui/qml/Pages2/PageSettingsApiLanguageList.qml
index 600db85d1..30968b38b 100644
--- a/client/ui/qml/Pages2/PageSettingsApiLanguageList.qml
+++ b/client/ui/qml/Pages2/PageSettingsApiLanguageList.qml
@@ -18,91 +18,87 @@ PageType {
     ListView {
         id: menuContent
 
-        property var selectedText
+        property bool isFocusable: true
 
         width: parent.width
-        height: menuContent.contentItem.height
+        height: parent.height
 
         clip: true
-        interactive: false
+        interactive: true
         model: ApiCountryModel
 
         ButtonGroup {
             id: containersRadioButtonGroup
         }
 
-        delegate: Item {
-            implicitWidth: parent.width
-            implicitHeight: content.implicitHeight
+        delegate: ColumnLayout {
+            id: content
 
-            ColumnLayout {
-                id: content
+            width: menuContent.width
+            height: content.implicitHeight
 
-                anchors.fill: parent
+            RowLayout {
+                VerticalRadioButton {
+                    id: containerRadioButton
 
-                RowLayout {
-                    VerticalRadioButton {
-                        id: containerRadioButton
-
-                        Layout.fillWidth: true
-                        Layout.leftMargin: 16
+                    Layout.fillWidth: true
+                    Layout.leftMargin: 16
 
-                        text: countryName
+                    text: countryName
 
-                        ButtonGroup.group: containersRadioButtonGroup
+                    ButtonGroup.group: containersRadioButtonGroup
 
-                        imageSource: "qrc:/images/controls/download.svg"
+                    imageSource: "qrc:/images/controls/download.svg"
 
-                        checked: index === ApiCountryModel.currentIndex
-                        checkable: !ConnectionController.isConnected
+                    checked: index === ApiCountryModel.currentIndex
+                    checkable: !ConnectionController.isConnected
 
-                        onClicked: {
-                            if (ConnectionController.isConnected) {
-                                PageController.showNotificationMessage(qsTr("Unable change server location while there is an active connection"))
-                                return
-                            }
+                    onClicked: {
+                        if (ConnectionController.isConnected) {
+                            PageController.showNotificationMessage(qsTr("Unable change server location while there is an active connection"))
+                            return
+                        }
 
-                            if (index !== ApiCountryModel.currentIndex) {
-                                PageController.showBusyIndicator(true)
-                                var prevIndex = ApiCountryModel.currentIndex
-                                ApiCountryModel.currentIndex = index
-                                if (!InstallController.updateServiceFromApi(ServersModel.defaultIndex, countryCode, countryName)) {
-                                    ApiCountryModel.currentIndex = prevIndex
-                                }
+                        if (index !== ApiCountryModel.currentIndex) {
+                            PageController.showBusyIndicator(true)
+                            var prevIndex = ApiCountryModel.currentIndex
+                            ApiCountryModel.currentIndex = index
+                            if (!InstallController.updateServiceFromApi(ServersModel.defaultIndex, countryCode, countryName)) {
+                                ApiCountryModel.currentIndex = prevIndex
                             }
                         }
+                    }
 
-                        MouseArea {
-                            anchors.fill: containerRadioButton
-                            cursorShape: Qt.PointingHandCursor
-                            enabled: false
-                        }
+                    MouseArea {
+                        anchors.fill: containerRadioButton
+                        cursorShape: Qt.PointingHandCursor
+                        enabled: false
+                    }
 
-                        Keys.onEnterPressed: {
-                            if (checkable) {
-                                checked = true
-                            }
-                            containerRadioButton.clicked()
+                    Keys.onEnterPressed: {
+                        if (checkable) {
+                            checked = true
                         }
-                        Keys.onReturnPressed: {
-                            if (checkable) {
-                                checked = true
-                            }
-                            containerRadioButton.clicked()
+                        containerRadioButton.clicked()
+                    }
+                    Keys.onReturnPressed: {
+                        if (checkable) {
+                            checked = true
                         }
+                        containerRadioButton.clicked()
                     }
+                }
 
-                    Image {
-                        Layout.rightMargin: 32
-                        Layout.alignment: Qt.AlignRight
+                Image {
+                    Layout.rightMargin: 32
+                    Layout.alignment: Qt.AlignRight
 
-                        source: "qrc:/countriesFlags/images/flagKit/" + countryImageCode + ".svg"
-                    }
+                    source: "qrc:/countriesFlags/images/flagKit/" + countryImageCode + ".svg"
                 }
+            }
 
-                DividerType {
-                    Layout.fillWidth: true
-                }
+            DividerType {
+                Layout.fillWidth: true
             }
         }
     }
diff --git a/client/ui/qml/Pages2/PageSettingsApiServerInfo.qml b/client/ui/qml/Pages2/PageSettingsApiServerInfo.qml
index 167e56e5a..392074864 100644
--- a/client/ui/qml/Pages2/PageSettingsApiServerInfo.qml
+++ b/client/ui/qml/Pages2/PageSettingsApiServerInfo.qml
@@ -15,8 +15,6 @@ import "../Components"
 PageType {
     id: root
 
-    defaultActiveFocusItem: focusItem
-
     FlickableType {
         id: fl
         anchors.top: parent.top
@@ -32,11 +30,6 @@ PageType {
 
             spacing: 0
 
-            Item {
-                id: focusItem
-//                KeyNavigation.tab: backButton
-            }
-
             LabelWithImageType {
                 Layout.fillWidth: true
                 Layout.margins: 16
@@ -111,9 +104,6 @@ PageType {
 
                 descriptionOnTop: true
 
-//                parentFlickable: fl
-//                KeyNavigation.tab: passwordLabel.eyeButton
-
                 rightImageSource: "qrc:/images/controls/copy.svg"
                 rightImageColor: AmneziaStyle.color.paleGray
 
@@ -141,8 +131,6 @@ PageType {
 
                 text: qsTr("Reload API config")
 
-//                Keys.onTabPressed: lastItemTabClicked(focusItem)
-
                 clickedFunc: function() {
                     var headerText = qsTr("Reload API config?")
                     var yesButtonText = qsTr("Continue")
@@ -181,8 +169,6 @@ PageType {
 
                 text: qsTr("Remove from application")
 
-//                Keys.onTabPressed: lastItemTabClicked(focusItem)
-
                 clickedFunc: function() {
                     var headerText = qsTr("Remove from application?")
                     var yesButtonText = qsTr("Continue")
diff --git a/client/ui/qml/Pages2/PageSettingsAppSplitTunneling.qml b/client/ui/qml/Pages2/PageSettingsAppSplitTunneling.qml
index 2e8bda2f5..a78ae4461 100644
--- a/client/ui/qml/Pages2/PageSettingsAppSplitTunneling.qml
+++ b/client/ui/qml/Pages2/PageSettingsAppSplitTunneling.qml
@@ -21,8 +21,6 @@ import "../Components"
 PageType {
     id: root
 
-    defaultActiveFocusItem: focusItem
-
     property bool pageEnabled
 
     Component.onCompleted: {
@@ -48,13 +46,15 @@ PageType {
 
     QtObject {
         id: onlyForwardApps
-        property string name: qsTr("Only the apps from the list should have access via VPN")
-        property int type: routeMode.onlyForwardApps
+
+        readonly property string name: qsTr("Only the apps from the list should have access via VPN")
+        readonly property int type: routeMode.onlyForwardApps
     }
     QtObject {
         id: allExceptApps
-        property string name: qsTr("Apps from the list should not have access via VPN")
-        property int type: routeMode.allExceptApps
+        
+        readonly property string name: qsTr("Apps from the list should not have access via VPN")
+        readonly property int type: routeMode.allExceptApps
     }
 
     function getRouteModesModelIndex() {
@@ -66,11 +66,6 @@ PageType {
         }
     }
 
-    Item {
-        id: focusItem
-        KeyNavigation.tab: backButton
-    }
-
     ColumnLayout {
         id: header
 
@@ -82,7 +77,6 @@ PageType {
 
         BackButtonType {
             id: backButton
-            KeyNavigation.tab: switcher
         }
 
         RowLayout {
@@ -103,10 +97,6 @@ PageType {
 
                 enabled: root.pageEnabled
 
-                KeyNavigation.tab: selector.enabled ?
-                                       selector :
-                                       searchField.textField
-
                 checked: AppSplitTunnelingModel.isTunnelingEnabled
                 onToggled: {                    
                     AppSplitTunnelingModel.toggleSplitTunneling(checked)
@@ -130,25 +120,23 @@ PageType {
 
             enabled: Qt.platform.os === "android" && root.pageEnabled
 
-            KeyNavigation.tab: searchField.textField
-
             listView: ListViewWithRadioButtonType {
                 rootWidth: root.width
 
                 model: root.routeModesModel
 
-                currentIndex: getRouteModesModelIndex()
+                selectedIndex: getRouteModesModelIndex()
 
                 clickedFunction: function() {
                     selector.text = selectedText
-                    selector.close()
-                    if (AppSplitTunnelingModel.routeMode !== root.routeModesModel[currentIndex].type) {
-                        AppSplitTunnelingModel.routeMode = root.routeModesModel[currentIndex].type
+                    selector.closeTriggered()
+                    if (AppSplitTunnelingModel.routeMode !== root.routeModesModel[selectedIndex].type) {
+                        AppSplitTunnelingModel.routeMode = root.routeModesModel[selectedIndex].type
                     }
                 }
 
                 Component.onCompleted: {
-                    if (root.routeModesModel[currentIndex].type === AppSplitTunnelingModel.routeMode) {
+                    if (root.routeModesModel[selectedIndex].type === AppSplitTunnelingModel.routeMode) {
                         selector.text = selectedText
                     } else {
                         selector.text = root.routeModesModel[0].name
@@ -158,7 +146,7 @@ PageType {
                 Connections {
                     target: AppSplitTunnelingModel
                     function onRouteModeChanged() {
-                        currentIndex = getRouteModesModelIndex()
+                        selectedIndex = getRouteModesModelIndex()
                     }
                 }
             }
@@ -267,7 +255,6 @@ PageType {
             textFieldPlaceholderText: qsTr("application name")
             buttonImageSource: "qrc:/images/controls/plus.svg"
 
-            Keys.onTabPressed: lastItemTabClicked(focusItem)
             rightButtonClickedOnEnter: true
 
             clickedFunc: function() {
@@ -281,7 +268,7 @@ PageType {
                         AppSplitTunnelingController.addApp(fileName)
                     }
                 } else if (Qt.platform.os === "android"){
-                    installedAppDrawer.open()
+                    installedAppDrawer.openTriggered()
                 }
 
                 PageController.showBusyIndicator(false)
diff --git a/client/ui/qml/Pages2/PageSettingsApplication.qml b/client/ui/qml/Pages2/PageSettingsApplication.qml
index 0f85ac30b..6f77a521b 100644
--- a/client/ui/qml/Pages2/PageSettingsApplication.qml
+++ b/client/ui/qml/Pages2/PageSettingsApplication.qml
@@ -14,19 +14,6 @@ import "../Components"
 PageType {
     id: root
 
-    defaultActiveFocusItem: focusItem
-
-    Item {
-        id: focusItem
-        KeyNavigation.tab: backButton
-
-        onFocusChanged: {
-            if (focusItem.activeFocus) {
-                fl.contentY = 0
-            }
-        }
-    }
-
     BackButtonType {
         id: backButton
 
@@ -34,8 +21,6 @@ PageType {
         anchors.left: parent.left
         anchors.right: parent.right
         anchors.topMargin: 20
-
-        KeyNavigation.tab: GC.isMobile() ? switcher : switcherAutoStart
     }
 
     FlickableType {
@@ -77,8 +62,8 @@ PageType {
                     }
                 }
 
-                KeyNavigation.tab: Qt.platform.os === "android" && !SettingsController.isNotificationPermissionGranted ?
-                    labelWithButtonNotification.rightButton : labelWithButtonLanguage.rightButton
+                // KeyNavigation.tab: Qt.platform.os === "android" && !SettingsController.isNotificationPermissionGranted ?
+                //     labelWithButtonNotification.rightButton : labelWithButtonLanguage.rightButton
                 parentFlickable: fl
             }
 
@@ -95,7 +80,6 @@ PageType {
                 descriptionText: qsTr("Enable notifications to show the VPN state in the status bar")
                 rightImageSource: "qrc:/images/controls/chevron-right.svg"
 
-                KeyNavigation.tab: labelWithButtonLanguage.rightButton
                 parentFlickable: fl
 
                 clickedFunction: function() {
@@ -117,7 +101,6 @@ PageType {
                 text: qsTr("Auto start")
                 descriptionText: qsTr("Launch the application every time the device is starts")
 
-                KeyNavigation.tab: switcherAutoConnect
                 parentFlickable: fl
 
                 checked: SettingsController.isAutoStartEnabled()
@@ -142,7 +125,6 @@ PageType {
                 text: qsTr("Auto connect")
                 descriptionText: qsTr("Connect to VPN on app start")
 
-                KeyNavigation.tab: switcherStartMinimized
                 parentFlickable: fl
 
                 checked: SettingsController.isAutoConnectEnabled()
@@ -167,7 +149,6 @@ PageType {
                 text: qsTr("Start minimized")
                 descriptionText: qsTr("Launch application minimized")
 
-                KeyNavigation.tab: labelWithButtonLanguage.rightButton
                 parentFlickable: fl
 
                 checked: SettingsController.isStartMinimizedEnabled()
@@ -190,11 +171,10 @@ PageType {
                 descriptionText: LanguageModel.currentLanguageName
                 rightImageSource: "qrc:/images/controls/chevron-right.svg"
 
-                KeyNavigation.tab: labelWithButtonLogging.rightButton
                 parentFlickable: fl
 
                 clickedFunction: function() {
-                    selectLanguageDrawer.open()
+                    selectLanguageDrawer.openTriggered()
                 }
             }
 
@@ -208,7 +188,6 @@ PageType {
                 descriptionText: SettingsController.isLoggingEnabled ? qsTr("Enabled") : qsTr("Disabled")
                 rightImageSource: "qrc:/images/controls/chevron-right.svg"
 
-                KeyNavigation.tab: labelWithButtonReset.rightButton
                 parentFlickable: fl
 
                 clickedFunction: function() {
@@ -226,7 +205,6 @@ PageType {
                 rightImageSource: "qrc:/images/controls/chevron-right.svg"
                 textColor: AmneziaStyle.color.vibrantRed
 
-                Keys.onTabPressed: lastItemTabClicked()
                 parentFlickable: fl
 
                 clickedFunction: function() {
@@ -243,15 +221,8 @@ PageType {
                             SettingsController.clearSettings()
                             PageController.goToPageHome()
                         }
-
-                        if (!GC.isMobile()) {
-                            root.defaultActiveFocusItem.forceActiveFocus()
-                        }
                     }
                     var noButtonFunction = function() {
-                        if (!GC.isMobile()) {
-                            root.defaultActiveFocusItem.forceActiveFocus()
-                        }
                     }
 
                     showQuestionDrawer(headerText, descriptionText, yesButtonText, noButtonText, yesButtonFunction, noButtonFunction)
@@ -267,11 +238,5 @@ PageType {
 
         width: root.width
         height: root.height
-
-        onClosed: {
-            if (!GC.isMobile()) {
-                focusItem.forceActiveFocus()
-            }
-        }
     }
 }
diff --git a/client/ui/qml/Pages2/PageSettingsBackup.qml b/client/ui/qml/Pages2/PageSettingsBackup.qml
index abede9b3c..d2dd4f2aa 100644
--- a/client/ui/qml/Pages2/PageSettingsBackup.qml
+++ b/client/ui/qml/Pages2/PageSettingsBackup.qml
@@ -17,8 +17,6 @@ import "../Controls2/TextTypes"
 PageType {
     id: root
 
-    defaultActiveFocusItem: focusItem
-
     Connections {
         target: SettingsController
 
@@ -36,11 +34,6 @@ PageType {
         }
     }
 
-    Item {
-        id: focusItem
-        KeyNavigation.tab: backButton
-    }
-
     BackButtonType {
         id: backButton
 
@@ -48,8 +41,6 @@ PageType {
         anchors.left: parent.left
         anchors.right: parent.right
         anchors.topMargin: 20
-
-        KeyNavigation.tab: makeBackupButton
     }
 
     FlickableType {
@@ -93,6 +84,8 @@ PageType {
 
                 text: qsTr("Make a backup")
 
+                parentFlickable: fl
+
                 clickedFunc: function() {
                     var fileName = ""
                     if (GC.isMobile()) {
@@ -111,8 +104,6 @@ PageType {
                         PageController.showNotificationMessage(qsTr("Backup file saved"))
                     }
                 }
-
-                KeyNavigation.tab: restoreBackupButton
             }
 
             BasicButtonType {
@@ -129,6 +120,8 @@ PageType {
 
                 text: qsTr("Restore from backup")
 
+                parentFlickable: fl
+
                 clickedFunc: function() {
                     var filePath = SystemController.getFileName(qsTr("Open backup file"),
                                                                 qsTr("Backup files (*.backup)"))
@@ -136,8 +129,6 @@ PageType {
                         restoreBackup(filePath)
                     }
                 }
-
-                Keys.onTabPressed: lastItemTabClicked()
             }
         }
     }
diff --git a/client/ui/qml/Pages2/PageSettingsConnection.qml b/client/ui/qml/Pages2/PageSettingsConnection.qml
index 31b1c764f..d3743b969 100644
--- a/client/ui/qml/Pages2/PageSettingsConnection.qml
+++ b/client/ui/qml/Pages2/PageSettingsConnection.qml
@@ -12,15 +12,8 @@ import "../Config"
 PageType {
     id: root
 
-    defaultActiveFocusItem: focusItem
-
     property bool isAppSplitTinnelingEnabled: Qt.platform.os === "windows" || Qt.platform.os === "android"
 
-    Item {
-        id: focusItem
-        KeyNavigation.tab: backButton
-    }
-
     BackButtonType {
         id: backButton
 
@@ -28,8 +21,6 @@ PageType {
         anchors.left: parent.left
         anchors.right: parent.right
         anchors.topMargin: 20
-
-        KeyNavigation.tab: amneziaDnsSwitch
     }
 
     FlickableType {
@@ -67,8 +58,6 @@ PageType {
                         SettingsController.toggleAmneziaDns(checked)
                     }
                 }
-
-                KeyNavigation.tab: dnsServersButton.rightButton
             }
 
             DividerType {}
@@ -81,11 +70,11 @@ PageType {
                 descriptionText: qsTr("When AmneziaDNS is not used or installed")
                 rightImageSource: "qrc:/images/controls/chevron-right.svg"
 
+                parentFlickable: fl
+
                 clickedFunction: function() {
                     PageController.goToPage(PageEnum.PageSettingsDns)
                 }
-
-                KeyNavigation.tab: splitTunnelingButton.rightButton
             }
 
             DividerType {}
@@ -98,19 +87,11 @@ PageType {
                 descriptionText: qsTr("Allows you to select which sites you want to access through the VPN")
                 rightImageSource: "qrc:/images/controls/chevron-right.svg"
 
+                parentFlickable: fl
+
                 clickedFunction: function() {
                     PageController.goToPage(PageEnum.PageSettingsSplitTunneling)
                 }
-
-                Keys.onTabPressed: {
-                    if (splitTunnelingButton2.visible) {
-                        return splitTunnelingButton2.rightButton.forceActiveFocus()
-                    } else if (killSwitchSwitcher.visible) {
-                        return killSwitchSwitcher.forceActiveFocus()
-                    } else {
-                        lastItemTabClicked()
-                    }
-                }
             }
 
             DividerType {
@@ -127,17 +108,11 @@ PageType {
                 descriptionText: qsTr("Allows you to use the VPN only for certain Apps")
                 rightImageSource: "qrc:/images/controls/chevron-right.svg"
 
+                parentFlickable: fl
+
                 clickedFunction: function() {
                     PageController.goToPage(PageEnum.PageSettingsAppSplitTunneling)
                 }
-
-                Keys.onTabPressed: {
-                    if (killSwitchSwitcher.visible) {
-                        return killSwitchSwitcher.forceActiveFocus()
-                    } else {
-                        lastItemTabClicked()
-                    }
-                }
             }
 
             DividerType {
@@ -154,6 +129,8 @@ PageType {
                 text: qsTr("KillSwitch")
                 descriptionText: qsTr("Disables your internet if your encrypted VPN connection drops out for any reason.")
 
+                parentFlickable: fl
+
                 checked: SettingsController.isKillSwitchEnabled()
                 checkable: !ConnectionController.isConnected
                 onCheckedChanged: {
@@ -166,8 +143,6 @@ PageType {
                         PageController.showNotificationMessage(qsTr("Cannot change killSwitch settings during active connection"))
                     }
                 }
-
-                Keys.onTabPressed: lastItemTabClicked()
             }
 
             DividerType {
diff --git a/client/ui/qml/Pages2/PageSettingsDns.qml b/client/ui/qml/Pages2/PageSettingsDns.qml
index 1d7517d92..11e49cf9f 100644
--- a/client/ui/qml/Pages2/PageSettingsDns.qml
+++ b/client/ui/qml/Pages2/PageSettingsDns.qml
@@ -14,13 +14,6 @@ import "../Components"
 PageType {
     id: root
 
-    defaultActiveFocusItem: primaryDns.textField
-
-    Item {
-        id: focusItem
-        KeyNavigation.tab: backButton
-    }
-
     BackButtonType {
         id: backButton
 
@@ -28,8 +21,6 @@ PageType {
         anchors.left: parent.left
         anchors.right: parent.right
         anchors.topMargin: 20
-
-        KeyNavigation.tab: root.defaultActiveFocusItem
     }
 
     FlickableType {
@@ -80,8 +71,6 @@ PageType {
                 textField.validator: RegularExpressionValidator {
                     regularExpression: InstallController.ipAddressRegExp()
                 }
-
-                KeyNavigation.tab: secondaryDns.textField
             }
 
             TextFieldWithHeaderType {
@@ -94,8 +83,6 @@ PageType {
                 textField.validator: RegularExpressionValidator {
                     regularExpression: InstallController.ipAddressRegExp()
                 }
-
-                KeyNavigation.tab: restoreDefaultButton
             }
 
             BasicButtonType {
@@ -122,21 +109,12 @@ PageType {
                         SettingsController.secondaryDns = "1.0.0.1"
                         secondaryDns.textFieldText = SettingsController.secondaryDns
                         PageController.showNotificationMessage(qsTr("Settings have been reset"))
-
-                        if (!GC.isMobile()) {
-                            defaultActiveFocusItem.forceActiveFocus()
-                        }
                     }
                     var noButtonFunction = function() {
-                        if (!GC.isMobile()) {
-                            defaultActiveFocusItem.forceActiveFocus()
-                        }
                     }
 
                     showQuestionDrawer(headerText, "", yesButtonText, noButtonText, yesButtonFunction, noButtonFunction)
                 }
-
-                KeyNavigation.tab: saveButton
             }
 
             BasicButtonType {
@@ -155,8 +133,6 @@ PageType {
                     }
                     PageController.showNotificationMessage(qsTr("Settings saved"))
                 }
-
-                Keys.onTabPressed: lastItemTabClicked(focusItem)
             }
         }
     }
diff --git a/client/ui/qml/Pages2/PageSettingsLogging.qml b/client/ui/qml/Pages2/PageSettingsLogging.qml
index 9abfc4539..7d85e2b3d 100644
--- a/client/ui/qml/Pages2/PageSettingsLogging.qml
+++ b/client/ui/qml/Pages2/PageSettingsLogging.qml
@@ -16,13 +16,6 @@ import "../Controls2/TextTypes"
 PageType {
     id: root
 
-    defaultActiveFocusItem: focusItem
-
-    Item {
-        id: focusItem
-        KeyNavigation.tab: backButton
-    }
-
     BackButtonType {
         id: backButton
 
@@ -30,23 +23,22 @@ PageType {
         anchors.left: parent.left
         anchors.right: parent.right
         anchors.topMargin: 20
-
-        KeyNavigation.tab: switcher
     }
 
-    FlickableType {
-        id: fl
+    ListView {
+        id: listView
+
         anchors.top: backButton.bottom
         anchors.bottom: parent.bottom
-        contentHeight: content.height
+        anchors.right: parent.right
+        anchors.left: parent.left
+
+        property bool isFocusable: true
 
-        ColumnLayout {
-            id: content
+        ScrollBar.vertical: ScrollBarType {}
 
-            anchors.top: parent.top
-            anchors.left: parent.left
-            anchors.right: parent.right
-            spacing: 0
+        header: ColumnLayout {
+            width: listView.width
 
             HeaderType {
                 Layout.fillWidth: true
@@ -60,6 +52,7 @@ PageType {
 
             SwitcherType {
                 id: switcher
+
                 Layout.fillWidth: true
                 Layout.topMargin: 16
                 Layout.leftMargin: 16
@@ -68,7 +61,7 @@ PageType {
                 text: qsTr("Enable logs")
 
                 checked: SettingsController.isLoggingEnabled
-                //KeyNavigation.tab: openFolderButton
+                
                 onCheckedChanged: {
                     if (checked !== SettingsController.isLoggingEnabled) {
                         SettingsController.isLoggingEnabled = checked
@@ -79,7 +72,6 @@ PageType {
             DividerType {}
 
             LabelWithButtonType {
-                // id: labelWithButton2
                 Layout.fillWidth: true
                 Layout.topMargin: -8
 
@@ -87,8 +79,6 @@ PageType {
                 leftImageSource: "qrc:/images/controls/trash.svg"
                 isSmallLeftImage: true
 
-                // KeyNavigation.tab: labelWithButton3
-
                 clickedFunction: function() {
                     var headerText = qsTr("Clear logs?")
                     var yesButtonText = qsTr("Continue")
@@ -99,19 +89,28 @@ PageType {
                         SettingsController.clearLogs()
                         PageController.showBusyIndicator(false)
                         PageController.showNotificationMessage(qsTr("Logs have been cleaned up"))
-                        if (!GC.isMobile()) {
-                            focusItem.forceActiveFocus()
-                        }
                     }
+
                     var noButtonFunction = function() {
-                        if (!GC.isMobile()) {
-                            focusItem.forceActiveFocus()
-                        }
+
                     }
 
                     showQuestionDrawer(headerText, "", yesButtonText, noButtonText, yesButtonFunction, noButtonFunction)
                 }
             }
+        }
+
+        model: logTypes
+        clip: true
+        reuseItems: true
+        snapMode: ListView.SnapOneItem
+
+        delegate: ColumnLayout {
+            id: delegateContent
+
+            width: listView.width
+
+            enabled: isVisible
 
             ListItemTitleType {
                 Layout.fillWidth: true
@@ -119,7 +118,7 @@ PageType {
                 Layout.leftMargin: 16
                 Layout.rightMargin: 16
 
-                text: qsTr("Client logs")
+                text: title
             }
 
             ParagraphTextType {
@@ -129,11 +128,11 @@ PageType {
                 Layout.rightMargin: 16
 
                 color: AmneziaStyle.color.mutedGray
-                text: qsTr("AmneziaVPN logs")
+
+                text: description
             }
 
             LabelWithButtonType {
-                // id: labelWithButton2
                 Layout.fillWidth: true
                 Layout.topMargin: -8
                 Layout.bottomMargin: -8
@@ -142,17 +141,12 @@ PageType {
                 leftImageSource: "qrc:/images/controls/folder-open.svg"
                 isSmallLeftImage: true
 
-                // KeyNavigation.tab: labelWithButton3
-
-                clickedFunction: function() {
-                    SettingsController.openLogsFolder()
-                }
+                clickedFunction: openLogsHandler
             }
 
             DividerType {}
 
             LabelWithButtonType {
-                // id: labelWithButton2
                 Layout.fillWidth: true
                 Layout.topMargin: -8
                 Layout.bottomMargin: -8
@@ -161,114 +155,72 @@ PageType {
                 leftImageSource: "qrc:/images/controls/save.svg"
                 isSmallLeftImage: true
 
-                // KeyNavigation.tab: labelWithButton3
-
-                clickedFunction: function() {
-                    var fileName = ""
-                    if (GC.isMobile()) {
-                        fileName = "AmneziaVPN.log"
-                    } else {
-                        fileName = SystemController.getFileName(qsTr("Save"),
-                                                                qsTr("Logs files (*.log)"),
-                                                                StandardPaths.standardLocations(StandardPaths.DocumentsLocation) + "/AmneziaVPN",
-                                                                true,
-                                                                ".log")
-                    }
-                    if (fileName !== "") {
-                        PageController.showBusyIndicator(true)
-                        SettingsController.exportLogsFile(fileName)
-                        PageController.showBusyIndicator(false)
-                        PageController.showNotificationMessage(qsTr("Logs file saved"))
-                    }
-                }
+                clickedFunction: exportLogsHandler
             }
 
             DividerType {}
+        }
+    }
 
-            ListItemTitleType {
-                visible: !GC.isMobile()
-
-                Layout.fillWidth: true
-                Layout.topMargin: 32
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
-
-                text: qsTr("Service logs")
-            }
-
-            ParagraphTextType {
-                visible: !GC.isMobile()
-
-                Layout.fillWidth: true
-                Layout.topMargin: 8
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
-
-                color: AmneziaStyle.color.mutedGray
-                text: qsTr("AmneziaVPN-service logs")
-            }
-
-            LabelWithButtonType {
-                // id: labelWithButton2
-
-                visible: !GC.isMobile()
-
-                Layout.fillWidth: true
-                Layout.topMargin: -8
-                Layout.bottomMargin: -8
-
-                text: qsTr("Open logs folder")
-                leftImageSource: "qrc:/images/controls/folder-open.svg"
-                isSmallLeftImage: true
+    property list<QtObject> logTypes: [
+        clientLogs,
+        serviceLogs
+    ]
 
-                // KeyNavigation.tab: labelWithButton3
+    QtObject {
+        id: clientLogs
 
-                clickedFunction: function() {
-                    SettingsController.openServiceLogsFolder()
-                }
+        readonly property string title: qsTr("Client logs")
+        readonly property string description: qsTr("AmneziaVPN logs")
+        readonly property bool isVisible: true
+        readonly property var openLogsHandler: function() {
+            SettingsController.openLogsFolder()
+        }
+        readonly property var exportLogsHandler: function() {
+            var fileName = ""
+            if (GC.isMobile()) {
+                fileName = "AmneziaVPN.log"
+            } else {
+                fileName = SystemController.getFileName(qsTr("Save"),
+                                                        qsTr("Logs files (*.log)"),
+                                                        StandardPaths.standardLocations(StandardPaths.DocumentsLocation) + "/AmneziaVPN",
+                                                        true,
+                                                        ".log")
             }
-
-            DividerType {
-                visible: !GC.isMobile()
+            if (fileName !== "") {
+                PageController.showBusyIndicator(true)
+                SettingsController.exportLogsFile(fileName)
+                PageController.showBusyIndicator(false)
+                PageController.showNotificationMessage(qsTr("Logs file saved"))
             }
+        }
+    }
 
-            LabelWithButtonType {
-                // id: labelWithButton2
-
-                visible: !GC.isMobile()
-
-                Layout.fillWidth: true
-                Layout.topMargin: -8
-                Layout.bottomMargin: -8
-
-                text: qsTr("Export logs")
-                leftImageSource: "qrc:/images/controls/save.svg"
-                isSmallLeftImage: true
-
-                // KeyNavigation.tab: labelWithButton3
+    QtObject {
+        id: serviceLogs
 
-                clickedFunction: function() {
-                    var fileName = ""
-                    if (GC.isMobile()) {
-                        fileName = "AmneziaVPN-service.log"
-                    } else {
-                        fileName = SystemController.getFileName(qsTr("Save"),
-                                                                qsTr("Logs files (*.log)"),
-                                                                StandardPaths.standardLocations(StandardPaths.DocumentsLocation) + "/AmneziaVPN-service",
-                                                                true,
-                                                                ".log")
-                    }
-                    if (fileName !== "") {
-                        PageController.showBusyIndicator(true)
-                        SettingsController.exportServiceLogsFile(fileName)
-                        PageController.showBusyIndicator(false)
-                        PageController.showNotificationMessage(qsTr("Logs file saved"))
-                    }
-                }
+        readonly property string title: qsTr("Service logs")
+        readonly property string description: qsTr("AmneziaVPN-service logs")
+        readonly property bool isVisible: !GC.isMobile()
+        readonly property var openLogsHandler: function() {
+            SettingsController.openServiceLogsFolder()
+        }
+        readonly property var exportLogsHandler: function() {
+            var fileName = ""
+            if (GC.isMobile()) {
+                fileName = "AmneziaVPN-service.log"
+            } else {
+                fileName = SystemController.getFileName(qsTr("Save"),
+                                                        qsTr("Logs files (*.log)"),
+                                                        StandardPaths.standardLocations(StandardPaths.DocumentsLocation) + "/AmneziaVPN-service",
+                                                        true,
+                                                        ".log")
             }
-
-            DividerType {
-                visible: !GC.isMobile()
+            if (fileName !== "") {
+                PageController.showBusyIndicator(true)
+                SettingsController.exportServiceLogsFile(fileName)
+                PageController.showBusyIndicator(false)
+                PageController.showNotificationMessage(qsTr("Logs file saved"))
             }
         }
     }
diff --git a/client/ui/qml/Pages2/PageSettingsServerData.qml b/client/ui/qml/Pages2/PageSettingsServerData.qml
index e170a351b..cd736d39e 100644
--- a/client/ui/qml/Pages2/PageSettingsServerData.qml
+++ b/client/ui/qml/Pages2/PageSettingsServerData.qml
@@ -100,8 +100,6 @@ PageType {
                 text: qsTr("Check the server for previously installed Amnezia services")
                 descriptionText: qsTr("Add them to the application if they were not displayed")
 
-                KeyNavigation.tab: labelWithButton2
-
                 clickedFunction: function() {
                     PageController.showBusyIndicator(true)
                     InstallController.scanServerForInstalledContainers()
@@ -121,8 +119,6 @@ PageType {
                 text: qsTr("Reboot server")
                 textColor: AmneziaStyle.color.vibrantRed
 
-                KeyNavigation.tab: labelWithButton3
-
                 clickedFunction: function() {
                     var headerText = qsTr("Do you want to reboot the server?")
                     var descriptionText = qsTr("The reboot process may take approximately 30 seconds. Are you sure you wish to proceed?")
@@ -162,16 +158,6 @@ PageType {
                 text: qsTr("Remove server from application")
                 textColor: AmneziaStyle.color.vibrantRed
 
-                Keys.onTabPressed: {
-                    if (content.isServerWithWriteAccess) {
-                        labelWithButton4.forceActiveFocus()
-                    } else {
-                        labelWithButton5.visible ?
-                            labelWithButton5.forceActiveFocus() :
-                            lastItemTabClickedSignal()
-                    }
-                }
-
                 clickedFunction: function() {
                     var headerText = qsTr("Do you want to remove the server from application?")
                     var descriptionText = qsTr("All installed AmneziaVPN services will still remain on the server.")
@@ -210,10 +196,6 @@ PageType {
                 text: qsTr("Clear server from Amnezia software")
                 textColor: AmneziaStyle.color.vibrantRed
 
-                Keys.onTabPressed: labelWithButton5.visible ?
-                                    labelWithButton5.forceActiveFocus() :
-                                    root.lastItemTabClickedSignal()
-
                 clickedFunction: function() {
                     var headerText = qsTr("Do you want to clear server from Amnezia software?")
                     var descriptionText = qsTr("All users whom you shared a connection with will no longer be able to connect to it.")
@@ -253,8 +235,6 @@ PageType {
                 text: qsTr("Reset API config")
                 textColor: AmneziaStyle.color.vibrantRed
 
-                Keys.onTabPressed: root.lastItemTabClickedSignal()
-
                 clickedFunction: function() {
                     var headerText = qsTr("Do you want to reset API config?")
                     var descriptionText = ""
diff --git a/client/ui/qml/Pages2/PageSettingsServerInfo.qml b/client/ui/qml/Pages2/PageSettingsServerInfo.qml
index ffcfb4411..3172d31ba 100644
--- a/client/ui/qml/Pages2/PageSettingsServerInfo.qml
+++ b/client/ui/qml/Pages2/PageSettingsServerInfo.qml
@@ -19,21 +19,19 @@ import "../Components"
 PageType {
     id: root
 
-    property int pageSettingsServerProtocols: 0
-    property int pageSettingsServerServices: 1
-    property int pageSettingsServerData: 2
-    property int pageSettingsApiServerInfo: 3
-    property int pageSettingsApiLanguageList: 4
+    readonly property int pageSettingsServerProtocols: 0
+    readonly property int pageSettingsServerServices: 1
+    readonly property int pageSettingsServerData: 2
+    readonly property int pageSettingsApiServerInfo: 3
+    readonly property int pageSettingsApiLanguageList: 4
 
     property var processedServer
 
-    defaultActiveFocusItem: focusItem
-
     Connections {
         target: PageController
 
         function onGoToPageSettingsServerServices() {
-            tabBar.currentIndex = root.pageSettingsServerServices
+            tabBar.setCurrentIndex(root.pageSettingsServerServices)
         }
     }
 
@@ -62,21 +60,17 @@ PageType {
         }
     }
 
-    Item {
-        id: focusItem
-        //KeyNavigation.tab: header
-    }
-
     ColumnLayout {
+        objectName: "mainLayout"
+
         anchors.fill: parent
+        anchors.topMargin: 20
 
         spacing: 4
 
         BackButtonType {
             id: backButton
-
-            Layout.topMargin: 20
-            KeyNavigation.tab: headerContent.actionButton
+            objectName: "backButton"
 
             backButtonFunction: function() {
                 if (nestedStackView.currentIndex === root.pageSettingsApiServerInfo &&
@@ -90,9 +84,12 @@ PageType {
 
         HeaderType {
             id: headerContent
+            objectName: "headerContent"
+
             Layout.fillWidth: true
             Layout.leftMargin: 16
             Layout.rightMargin: 16
+            Layout.bottomMargin: 10
 
             actionButtonImage: nestedStackView.currentIndex === root.pageSettingsApiLanguageList ? "qrc:/images/controls/settings.svg"
                                                                                                  : "qrc:/images/controls/edit-3.svg"
@@ -114,32 +111,25 @@ PageType {
                 }
             }
 
-            KeyNavigation.tab: tabBar
-
             actionButtonFunction: function() {
                 if (nestedStackView.currentIndex === root.pageSettingsApiLanguageList) {
                     nestedStackView.currentIndex = root.pageSettingsApiServerInfo
                 } else {
-                    serverNameEditDrawer.open()
+                    serverNameEditDrawer.openTriggered()
                 }
             }
         }
 
         DrawerType2 {
             id: serverNameEditDrawer
+            objectName: "serverNameEditDrawer"
 
             parent: root
 
             anchors.fill: parent
             expandedHeight: root.height * 0.35
 
-            onClosed: {
-                if (!GC.isMobile()) {
-                    headerContent.actionButton.forceActiveFocus()
-                }
-            }
-
-            expandedContent: ColumnLayout {
+            expandedStateContent: ColumnLayout {
                 anchors.top: parent.top
                 anchors.left: parent.left
                 anchors.right: parent.right
@@ -147,19 +137,6 @@ PageType {
                 anchors.leftMargin: 16
                 anchors.rightMargin: 16
 
-                Connections {
-                    target: serverNameEditDrawer
-                    enabled: !GC.isMobile()
-                    function onOpened() {
-                        serverName.textField.forceActiveFocus()
-                    }
-                }
-
-                Item {
-                    id: focusItem1
-                    KeyNavigation.tab: serverName.textField
-                }
-
                 TextFieldWithHeaderType {
                     id: serverName
 
@@ -168,8 +145,6 @@ PageType {
                     textFieldText: root.processedServer.name
                     textField.maximumLength: 30
                     checkEmptyText: true
-
-                    KeyNavigation.tab: saveButton
                 }
 
                 BasicButtonType {
@@ -178,7 +153,6 @@ PageType {
                     Layout.fillWidth: true
 
                     text: qsTr("Save")
-                    KeyNavigation.tab: focusItem1
 
                     clickedFunc: function() {
                         if (serverName.textFieldText === "") {
@@ -188,7 +162,7 @@ PageType {
                         if (serverName.textFieldText !== root.processedServer.name) {
                             ServersModel.setProcessedServerData("name", serverName.textFieldText);
                         }
-                        serverNameEditDrawer.close()
+                        serverNameEditDrawer.closeTriggered()
                     }
                 }
             }
@@ -209,35 +183,27 @@ PageType {
 
             visible: !ServersModel.getProcessedServerData("isServerFromGatewayApi")
 
-            activeFocusOnTab: true
-            onFocusChanged: {
-                if (activeFocus) {
-                    protocolsTab.forceActiveFocus()
-                }
-            }
 
             TabButtonType {
                 id: protocolsTab
                 visible: protocolsPage.installedProtocolsCount
                 width: protocolsPage.installedProtocolsCount ? undefined : 0
-                isSelected: tabBar.currentIndex === root.pageSettingsServerProtocols
+                isSelected: TabBar.tabBar.currentIndex === root.pageSettingsServerProtocols
                 text: qsTr("Protocols")
 
-                KeyNavigation.tab: servicesTab
-                Keys.onReturnPressed: tabBar.currentIndex = root.pageSettingsServerProtocols
-                Keys.onEnterPressed: tabBar.currentIndex = root.pageSettingsServerProtocols
+                Keys.onReturnPressed: TabBar.tabBar.setCurrentIndex(root.pageSettingsServerProtocols)
+                Keys.onEnterPressed: TabBar.tabBar.setCurrentIndex(root.pageSettingsServerProtocols)
             }
 
             TabButtonType {
                 id: servicesTab
                 visible: servicesPage.installedServicesCount
                 width: servicesPage.installedServicesCount ? undefined : 0
-                isSelected: tabBar.currentIndex === root.pageSettingsServerServices
+                isSelected: TabBar.tabBar.currentIndex === root.pageSettingsServerServices
                 text: qsTr("Services")
 
-                KeyNavigation.tab: dataTab
-                Keys.onReturnPressed: tabBar.currentIndex = root.pageSettingsServerServices
-                Keys.onEnterPressed: tabBar.currentIndex = root.pageSettingsServerServices
+                Keys.onReturnPressed: TabBar.tabBar.setCurrentIndex(root.pageSettingsServerServices)
+                Keys.onEnterPressed: TabBar.tabBar.setCurrentIndex(root.pageSettingsServerServices)
             }
 
             TabButtonType {
@@ -245,22 +211,14 @@ PageType {
                 isSelected: tabBar.currentIndex === root.pageSettingsServerData
                 text: qsTr("Management")
 
-                Keys.onReturnPressed: tabBar.currentIndex = root.pageSettingsServerData
-                Keys.onEnterPressed: tabBar.currentIndex = root.pageSettingsServerData
-                Keys.onTabPressed: function() {
-                    if (nestedStackView.currentIndex === root.pageSettingsServerProtocols) {
-                        return protocolsPage
-                    } else if (nestedStackView.currentIndex === root.pageSettingsServerProtocols) {
-                        return servicesPage
-                    } else {
-                        return dataPage
-                    }
-                }
+                Keys.onReturnPressed: TabBar.tabBar.setCurrentIndex(root.pageSettingsServerData)
+                Keys.onEnterPressed: TabBar.tabBar.setCurrentIndex(root.pageSettingsServerData)
             }
         }
 
         StackLayout {
             id: nestedStackView
+
             Layout.fillWidth: true
 
             currentIndex: ServersModel.getProcessedServerData("isServerFromGatewayApi") ?
@@ -270,38 +228,27 @@ PageType {
             PageSettingsServerProtocols {
                 id: protocolsPage
                 stackView: root.stackView
-
-                onLastItemTabClickedSignal: lastItemTabClicked(focusItem)
             }
 
             PageSettingsServerServices {
                 id: servicesPage
                 stackView: root.stackView
-
-                onLastItemTabClickedSignal: lastItemTabClicked(focusItem)
             }
 
             PageSettingsServerData {
                 id: dataPage
                 stackView: root.stackView
-
-                onLastItemTabClickedSignal: lastItemTabClicked(focusItem)
             }
 
             PageSettingsApiServerInfo {
                 id: apiInfoPage
                 stackView: root.stackView
-
-//                onLastItemTabClickedSignal: lastItemTabClicked(focusItem)
             }
 
             PageSettingsApiLanguageList {
                 id: apiLanguageListPage
                 stackView: root.stackView
-
-//                onLastItemTabClickedSignal: lastItemTabClicked(focusItem)
             }
         }
-
     }
 }
diff --git a/client/ui/qml/Pages2/PageSettingsServerProtocol.qml b/client/ui/qml/Pages2/PageSettingsServerProtocol.qml
index dcdf01af8..ade94ebb6 100644
--- a/client/ui/qml/Pages2/PageSettingsServerProtocol.qml
+++ b/client/ui/qml/Pages2/PageSettingsServerProtocol.qml
@@ -21,13 +21,6 @@ PageType {
 
     property bool isClearCacheVisible: ServersModel.isProcessedServerHasWriteAccess() && !ContainersModel.isServiceContainer(ContainersModel.getProcessedContainerIndex())
 
-    defaultActiveFocusItem: focusItem
-
-    Item {
-        id: focusItem
-        KeyNavigation.tab: backButton
-    }
-
     ColumnLayout {
         id: header
 
@@ -39,7 +32,6 @@ PageType {
 
         BackButtonType {
             id: backButton
-            KeyNavigation.tab: protocols
         }
 
         HeaderType {
@@ -57,30 +49,36 @@ PageType {
             height: protocols.contentItem.height
             clip: true
             interactive: true
-            model: ProtocolsModel
 
-            property int currentFocusIndex: 0
+            property bool isFocusable: true
 
-            activeFocusOnTab: true
-            onActiveFocusChanged: {
-                if (activeFocus) {
-                    this.currentFocusIndex = 0
-                    protocols.itemAtIndex(currentFocusIndex).focusItem.forceActiveFocus()
-                }
+            Keys.onTabPressed: {
+                FocusController.nextKeyTabItem()
             }
 
-            Keys.onTabPressed: {
-                if (currentFocusIndex < this.count - 1) {
-                    currentFocusIndex += 1
-                    protocols.itemAtIndex(currentFocusIndex).focusItem.forceActiveFocus()
-                } else {
-                    clearCacheButton.forceActiveFocus()
-                }
+            Keys.onBacktabPressed: {
+                FocusController.previousKeyTabItem()
             }
 
-            delegate: Item {
-                property var focusItem: clientSettings.rightButton
+            Keys.onUpPressed: {
+                FocusController.nextKeyUpItem()
+            }
+
+            Keys.onDownPressed: {
+                FocusController.nextKeyDownItem()
+            }
+
+            Keys.onLeftPressed: {
+                FocusController.nextKeyLeftItem()
+            }
+
+            Keys.onRightPressed: {
+                FocusController.nextKeyRightItem()
+            }
 
+            model: ProtocolsModel
+
+            delegate: Item {
                 implicitWidth: protocols.width
                 implicitHeight: delegateContent.implicitHeight
 
@@ -160,109 +158,112 @@ PageType {
                     }
                 }
             }
-        }
 
-        LabelWithButtonType {
-            id: clearCacheButton
+            footer: ColumnLayout {
+                width: header.width
 
-            Layout.fillWidth: true
+                LabelWithButtonType {
+                    id: clearCacheButton
+
+                    Layout.fillWidth: true
+
+                    visible: root.isClearCacheVisible
 
-            visible: root.isClearCacheVisible
-            KeyNavigation.tab: removeButton
+                    text: qsTr("Clear profile")
 
-            text: qsTr("Clear profile")
+                    clickedFunction: function() {
+                        var headerText = qsTr("Clear %1 profile?").arg(ContainersModel.getProcessedContainerName())
+                        var descriptionText = qsTr("The connection configuration will be deleted for this device only")
+                        var yesButtonText = qsTr("Continue")
+                        var noButtonText = qsTr("Cancel")
 
-            clickedFunction: function() {
-                var headerText = qsTr("Clear %1 profile?").arg(ContainersModel.getProcessedContainerName())
-                var descriptionText = qsTr("The connection configuration will be deleted for this device only")
-                var yesButtonText = qsTr("Continue")
-                var noButtonText = qsTr("Cancel")
+                        var yesButtonFunction = function() {
+                            if (ConnectionController.isConnected && ServersModel.getDefaultServerData("defaultContainer") === ContainersModel.getProcessedContainerIndex()) {
+                                var message = qsTr("Unable to clear %1 profile while there is an active connection").arg(ContainersModel.getProcessedContainerName())
+                                PageController.showNotificationMessage(message)
+                                return
+                            }
+
+                            PageController.showBusyIndicator(true)
+                            InstallController.clearCachedProfile()
+                            PageController.showBusyIndicator(false)
+                        }
+                        var noButtonFunction = function() {
+                            // if (!GC.isMobile()) {
+                            //     focusItem.forceActiveFocus()
+                            // }
+                        }
 
-                var yesButtonFunction = function() {
-                    if (ConnectionController.isConnected && ServersModel.getDefaultServerData("defaultContainer") === ContainersModel.getProcessedContainerIndex()) {
-                        var message = qsTr("Unable to clear %1 profile while there is an active connection").arg(ContainersModel.getProcessedContainerName())
-                        PageController.showNotificationMessage(message)
-                        return
+                        showQuestionDrawer(headerText, descriptionText, yesButtonText, noButtonText, yesButtonFunction, noButtonFunction)
                     }
 
-                    PageController.showBusyIndicator(true)
-                    InstallController.clearCachedProfile()
-                    PageController.showBusyIndicator(false)
-                }
-                var noButtonFunction = function() {
-                    if (!GC.isMobile()) {
-                        focusItem.forceActiveFocus()
+                    MouseArea {
+                        anchors.fill: clearCacheButton
+                        cursorShape: Qt.PointingHandCursor
+                        enabled: false
                     }
                 }
 
-                showQuestionDrawer(headerText, descriptionText, yesButtonText, noButtonText, yesButtonFunction, noButtonFunction)
-            }
+                DividerType {
+                    Layout.fillWidth: true
+                    Layout.leftMargin: 16
+                    Layout.rightMargin: 16
 
-            MouseArea {
-                anchors.fill: clearCacheButton
-                cursorShape: Qt.PointingHandCursor
-                enabled: false
-            }
-        }
+                    visible: root.isClearCacheVisible
+                }
 
-        DividerType {
-            Layout.fillWidth: true
-            Layout.leftMargin: 16
-            Layout.rightMargin: 16
+                LabelWithButtonType {
+                    id: removeButton
 
-            visible: root.isClearCacheVisible
-        }
+                    Layout.fillWidth: true
 
-        LabelWithButtonType {
-            id: removeButton
+                    visible: ServersModel.isProcessedServerHasWriteAccess()
 
-            Layout.fillWidth: true
+                    text: qsTr("Remove ")
+                    textColor: AmneziaStyle.color.vibrantRed
+
+                    clickedFunction: function() {
+                        var headerText = qsTr("Remove %1 from server?").arg(ContainersModel.getProcessedContainerName())
+                        var descriptionText = qsTr("All users with whom you shared a connection will no longer be able to connect to it.")
+                        var yesButtonText = qsTr("Continue")
+                        var noButtonText = qsTr("Cancel")
+
+                        var yesButtonFunction = function() {
+                            if (ServersModel.isDefaultServerCurrentlyProcessed() && ConnectionController.isConnected
+                                    && ServersModel.getDefaultServerData("defaultContainer") === ContainersModel.getProcessedContainerIndex()) {
+                                PageController.showNotificationMessage(qsTr("Cannot remove active container"))
+                            } else
+                            {
+                                PageController.goToPage(PageEnum.PageDeinstalling)
+                                InstallController.removeProcessedContainer()
+                            }
+                        }
+                        var noButtonFunction = function() {
+                            if (!GC.isMobile()) {
+                                focusItem.forceActiveFocus()
+                            }
+                        }
 
-            visible: ServersModel.isProcessedServerHasWriteAccess()
-            Keys.onTabPressed: lastItemTabClicked(focusItem)
-
-            text: qsTr("Remove ")
-            textColor: AmneziaStyle.color.vibrantRed
-
-            clickedFunction: function() {
-                var headerText = qsTr("Remove %1 from server?").arg(ContainersModel.getProcessedContainerName())
-                var descriptionText = qsTr("All users with whom you shared a connection will no longer be able to connect to it.")
-                var yesButtonText = qsTr("Continue")
-                var noButtonText = qsTr("Cancel")
-
-                var yesButtonFunction = function() {
-                    if (ServersModel.isDefaultServerCurrentlyProcessed() && ConnectionController.isConnected
-                    && ServersModel.getDefaultServerData("defaultContainer") === ContainersModel.getProcessedContainerIndex()) {
-                        PageController.showNotificationMessage(qsTr("Cannot remove active container"))
-                    } else
-                    {
-                        PageController.goToPage(PageEnum.PageDeinstalling)
-                        InstallController.removeProcessedContainer()
+                        showQuestionDrawer(headerText, descriptionText, yesButtonText, noButtonText, yesButtonFunction, noButtonFunction)
                     }
-                }
-                var noButtonFunction = function() {
-                    if (!GC.isMobile()) {
-                        focusItem.forceActiveFocus()
+
+                    MouseArea {
+                        anchors.fill: removeButton
+                        cursorShape: Qt.PointingHandCursor
+                        enabled: false
                     }
                 }
 
-                showQuestionDrawer(headerText, descriptionText, yesButtonText, noButtonText, yesButtonFunction, noButtonFunction)
-            }
+                DividerType {
+                    Layout.fillWidth: true
+                    Layout.leftMargin: 16
+                    Layout.rightMargin: 16
 
-            MouseArea {
-                anchors.fill: removeButton
-                cursorShape: Qt.PointingHandCursor
-                enabled: false
+                    visible: ServersModel.isProcessedServerHasWriteAccess()
+                }
             }
         }
 
-        DividerType {
-            Layout.fillWidth: true
-            Layout.leftMargin: 16
-            Layout.rightMargin: 16
-
-            visible: ServersModel.isProcessedServerHasWriteAccess()
-        }
     }
 }
 
diff --git a/client/ui/qml/Pages2/PageSettingsServerProtocols.qml b/client/ui/qml/Pages2/PageSettingsServerProtocols.qml
index 0bc1fc7d3..ba72957ef 100644
--- a/client/ui/qml/Pages2/PageSettingsServerProtocols.qml
+++ b/client/ui/qml/Pages2/PageSettingsServerProtocols.qml
@@ -21,53 +21,45 @@ PageType {
 
     property var installedProtocolsCount
 
-    onFocusChanged: settingsContainersListView.forceActiveFocus()
-    signal lastItemTabClickedSignal()
-
-    FlickableType {
-        id: fl
-        anchors.top: parent.top
-        anchors.bottom: parent.bottom
-        contentHeight: content.implicitHeight
-
-        Column {
-            id: content
+    function resetView() {
+        settingsContainersListView.positionViewAtBeginning()
+    }
 
-            anchors.top: parent.top
-            anchors.left: parent.left
-            anchors.right: parent.right
+    SettingsContainersListView {
+        id: settingsContainersListView
 
-            SettingsContainersListView {
-                id: settingsContainersListView
+        anchors.fill: parent
 
-                Connections {
-                    target: ServersModel
+        Connections {
+            target: ServersModel
 
-                    function onProcessedServerIndexChanged() {
-                        settingsContainersListView.updateContainersModelFilters()
-                    }
-                }
+            function onProcessedServerIndexChanged() {
+                settingsContainersListView.updateContainersModelFilters()
+            }
+        }
 
-                function updateContainersModelFilters() {
-                    if (ServersModel.isProcessedServerHasWriteAccess()) {
-                        proxyContainersModel.filters = ContainersModelFilters.getWriteAccessProtocolsListFilters()
-                    } else {
-                        proxyContainersModel.filters = ContainersModelFilters.getReadAccessProtocolsListFilters()
-                    }
-                    root.installedProtocolsCount = proxyContainersModel.count
-                }
+        function updateContainersModelFilters() {
+            if (ServersModel.isProcessedServerHasWriteAccess()) {
+                proxyContainersModel.filters = ContainersModelFilters.getWriteAccessProtocolsListFilters()
+            } else {
+                proxyContainersModel.filters = ContainersModelFilters.getReadAccessProtocolsListFilters()
+            }
+            root.installedProtocolsCount = proxyContainersModel.count
+        }
 
-                model: SortFilterProxyModel {
-                    id: proxyContainersModel
-                    sourceModel: ContainersModel
-                    sorters: [
-                        RoleSorter { roleName: "isInstalled"; sortOrder: Qt.DescendingOrder },
-                        RoleSorter { roleName: "installPageOrder"; sortOrder: Qt.AscendingOrder }
-                    ]
-                }
+        model: SortFilterProxyModel {
+            id: proxyContainersModel
+            sourceModel: ContainersModel
+            sorters: [
+                RoleSorter { roleName: "isInstalled"; sortOrder: Qt.DescendingOrder },
+                RoleSorter { roleName: "installPageOrder"; sortOrder: Qt.AscendingOrder }
+            ]
+        }
 
-                Component.onCompleted: updateContainersModelFilters()
-            }
+        Component.onCompleted: {
+            settingsContainersListView.isFocusable = true
+            settingsContainersListView.interactive = true
+            updateContainersModelFilters()
         }
     }
 }
diff --git a/client/ui/qml/Pages2/PageSettingsServerServices.qml b/client/ui/qml/Pages2/PageSettingsServerServices.qml
index 440fd8dbe..a46d4051e 100644
--- a/client/ui/qml/Pages2/PageSettingsServerServices.qml
+++ b/client/ui/qml/Pages2/PageSettingsServerServices.qml
@@ -21,52 +21,40 @@ PageType {
 
     property var installedServicesCount
 
-    onFocusChanged: settingsContainersListView.forceActiveFocus()
-    signal lastItemTabClickedSignal()
+    SettingsContainersListView {
+        id: settingsContainersListView
 
-    FlickableType {
-        id: fl
-        anchors.top: parent.top
-        anchors.bottom: parent.bottom
-        contentHeight: content.implicitHeight
+        anchors.fill: parent
 
-        Column {
-            id: content
+        Connections {
+            target: ServersModel
 
-            anchors.top: parent.top
-            anchors.left: parent.left
-            anchors.right: parent.right
-
-            SettingsContainersListView {
-                id: settingsContainersListView
-
-                Connections {
-                    target: ServersModel
-
-                    function onProcessedServerIndexChanged() {
-                        settingsContainersListView.updateContainersModelFilters()
-                    }
-                }
+            function onProcessedServerIndexChanged() {
+                settingsContainersListView.updateContainersModelFilters()
+            }
+        }
 
-                function updateContainersModelFilters() {
-                    if (ServersModel.isProcessedServerHasWriteAccess()) {
-                        proxyContainersModel.filters = ContainersModelFilters.getWriteAccessServicesListFilters()
-                    } else {
-                        proxyContainersModel.filters = ContainersModelFilters.getReadAccessServicesListFilters()
-                    }
-                    root.installedServicesCount = proxyContainersModel.count
-                }
+        function updateContainersModelFilters() {
+            if (ServersModel.isProcessedServerHasWriteAccess()) {
+                proxyContainersModel.filters = ContainersModelFilters.getWriteAccessServicesListFilters()
+            } else {
+                proxyContainersModel.filters = ContainersModelFilters.getReadAccessServicesListFilters()
+            }
+            root.installedServicesCount = proxyContainersModel.count
+        }
 
-                model: SortFilterProxyModel {
-                    id: proxyContainersModel
-                    sourceModel: ContainersModel
-                    sorters: [
-                        RoleSorter { roleName: "isInstalled"; sortOrder: Qt.DescendingOrder }
-                    ]
-                }
+        model: SortFilterProxyModel {
+            id: proxyContainersModel
+            sourceModel: ContainersModel
+            sorters: [
+                RoleSorter { roleName: "isInstalled"; sortOrder: Qt.DescendingOrder }
+            ]
+        }
 
-                Component.onCompleted: updateContainersModelFilters()
-            }
+        Component.onCompleted: {
+            settingsContainersListView.isFocusable = true
+            settingsContainersListView.interactive = true
+            updateContainersModelFilters()
         }
     }
 }
diff --git a/client/ui/qml/Pages2/PageSettingsServersList.qml b/client/ui/qml/Pages2/PageSettingsServersList.qml
index 102dd46ff..17337a487 100644
--- a/client/ui/qml/Pages2/PageSettingsServersList.qml
+++ b/client/ui/qml/Pages2/PageSettingsServersList.qml
@@ -18,13 +18,6 @@ import "../Components"
 PageType {
     id: root
 
-    defaultActiveFocusItem: focusItem
-
-    Item {
-        id: focusItem
-        KeyNavigation.tab: backButton
-    }
-
     ColumnLayout {
         id: header
 
@@ -36,7 +29,6 @@ PageType {
 
         BackButtonType {
             id: backButton
-            KeyNavigation.tab: servers
         }
 
         HeaderType {
@@ -48,95 +40,64 @@ PageType {
         }
     }
 
-    FlickableType {
-        id: fl
+    ListView {
+        id: servers
+        objectName: "servers"
+
+        width: parent.width
         anchors.top: header.bottom
         anchors.topMargin: 16
-        contentHeight: col.implicitHeight
-
-        Column {
-            id: col
-            anchors.top: parent.top
-            anchors.left: parent.left
-            anchors.right: parent.right
-
-            ListView {
-                id: servers
-                width: parent.width
-                height: servers.contentItem.height
-
-                model: ServersModel
-
-                clip: true
-                interactive: false
-
-                activeFocusOnTab: true
-                focus: true
-                Keys.onTabPressed: {
-                    if (currentIndex < servers.count - 1) {
-                        servers.incrementCurrentIndex()
-                    } else {
-                        servers.currentIndex = 0
-                        focusItem.forceActiveFocus()
-                        root.lastItemTabClicked()
-                    }
+        anchors.left: parent.left
+        anchors.right: parent.right
 
-                    fl.ensureVisible(this.currentItem)
-                }
+        height: 500
 
-                onVisibleChanged: {
-                    if (visible) {
-                        currentIndex = 0
-                    }
-                }
+        property bool isFocusable: true
 
-                delegate: Item {
-                    implicitWidth: servers.width
-                    implicitHeight: delegateContent.implicitHeight
+        model: ServersModel
 
-                    onFocusChanged: {
-                        if (focus) {
-                            server.rightButton.forceActiveFocus()
+        clip: true
+        reuseItems: true
+
+        delegate: Item {
+            implicitWidth: servers.width
+            implicitHeight: delegateContent.implicitHeight
+
+            ColumnLayout {
+                id: delegateContent
+
+                anchors.top: parent.top
+                anchors.left: parent.left
+                anchors.right: parent.right
+
+                LabelWithButtonType {
+                    id: server
+                    Layout.fillWidth: true
+
+                    text: name
+
+                    descriptionText: {
+                        var servicesNameString = ""
+                        var servicesName = ServersModel.getAllInstalledServicesName(index)
+                        for (var i = 0; i < servicesName.length; i++) {
+                            servicesNameString += servicesName[i] + " · "
                         }
-                    }
 
-                    ColumnLayout {
-                        id: delegateContent
-
-                        anchors.top: parent.top
-                        anchors.left: parent.left
-                        anchors.right: parent.right
-
-                        LabelWithButtonType {
-                            id: server
-                            Layout.fillWidth: true
-
-                            text: name
-                            parentFlickable: fl
-                            descriptionText: {
-                                var servicesNameString = ""
-                                var servicesName = ServersModel.getAllInstalledServicesName(index)
-                                for (var i = 0; i < servicesName.length; i++) {
-                                    servicesNameString += servicesName[i] + " · "
-                                }
-
-                                if (ServersModel.isServerFromApi(index)) {
-                                    return servicesNameString + serverDescription
-                                } else {
-                                    return servicesNameString + hostName
-                                }
-                            }
-                            rightImageSource: "qrc:/images/controls/chevron-right.svg"
-
-                            clickedFunction: function() {
-                                ServersModel.processedIndex = index
-                                PageController.goToPage(PageEnum.PageSettingsServerInfo)
-                            }
+                        if (ServersModel.isServerFromApi(index)) {
+                            return servicesNameString + serverDescription
+                        } else {
+                            return servicesNameString + hostName
                         }
+                    }
+                    rightImageSource: "qrc:/images/controls/chevron-right.svg"
 
-                        DividerType {}
+                    clickedFunction: function() {
+                        ServersModel.processedIndex = index
+                        PageController.goToPage(PageEnum.PageSettingsServerInfo)
                     }
                 }
+
+                DividerType {}
             }
         }
     }
diff --git a/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml b/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml
index f5fe285a1..23a9bfa47 100644
--- a/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml
+++ b/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml
@@ -23,13 +23,6 @@ PageType {
 
     property var isServerFromTelegramApi: ServersModel.getDefaultServerData("isServerFromTelegramApi")
     
-    defaultActiveFocusItem: searchField.textField
-
-    Item {
-        id: focusItem
-        KeyNavigation.tab: backButton
-    }
-
     property bool pageEnabled
 
     Component.onCompleted: {
@@ -99,7 +92,6 @@ PageType {
 
         BackButtonType {
             id: backButton
-            KeyNavigation.tab: switcher
         }
 
         RowLayout {
@@ -129,8 +121,6 @@ PageType {
                 onToggled: { onToggledFunc() }
                 Keys.onEnterPressed: { onToggledFunc() }
                 Keys.onReturnPressed: { onToggledFunc() }
-
-                KeyNavigation.tab: selector
             }
         }
 
@@ -154,18 +144,17 @@ PageType {
 
                 model: root.routeModesModel
 
-                currentIndex: getRouteModesModelIndex()
 
                 clickedFunction: function() {
                     selector.text = selectedText
-                    selector.close()
-                    if (SitesModel.routeMode !== root.routeModesModel[currentIndex].type) {
-                        SitesModel.routeMode = root.routeModesModel[currentIndex].type
+                    selector.closeTriggered()
+                    if (SitesModel.routeMode !== root.routeModesModel[selectedIndex].type) {
+                        SitesModel.routeMode = root.routeModesModel[selectedIndex].type
                     }
                 }
 
                 Component.onCompleted: {
-                    if (root.routeModesModel[currentIndex].type === SitesModel.routeMode) {
+                    if (root.routeModesModel[selectedIndex].type === SitesModel.routeMode) {
                         selector.text = selectedText
                     } else {
                         selector.text = root.routeModesModel[0].name
@@ -175,128 +164,89 @@ PageType {
                 Connections {
                     target: SitesModel
                     function onRouteModeChanged() {
-                        currentIndex = getRouteModesModelIndex()
+                        selectedIndex = getRouteModesModelIndex()
                     }
                 }
             }
-
-            KeyNavigation.tab: {
-                return sites.count > 0 ?
-                            sites :
-                            searchField.textField
-            }
         }
     }
 
-    FlickableType {
-        id: fl
+    ListView {
+        id: listView
+
         anchors.top: header.bottom
         anchors.topMargin: 16
-        contentHeight: col.implicitHeight + addSiteButton.implicitHeight + addSiteButton.anchors.bottomMargin + addSiteButton.anchors.topMargin
+        anchors.bottom: addSiteButton.top
 
-        enabled: root.pageEnabled
+        width: parent.width
 
-        Column {
-            id: col
-            anchors.top: parent.top
-            anchors.left: parent.left
-            anchors.right: parent.right
+        enabled: root.pageEnabled
 
-            ListView {
-                id: sites
-                width: parent.width
-                height: sites.contentItem.height
-
-                model: SortFilterProxyModel {
-                    id: proxySitesModel
-                    sourceModel: SitesModel
-                    filters: [
-                        AnyOf {
-                            RegExpFilter {
-                                roleName: "url"
-                                pattern: ".*" + searchField.textField.text + ".*"
-                                caseSensitivity: Qt.CaseInsensitive
-                            }
-                            RegExpFilter {
-                                roleName: "ip"
-                                pattern: ".*" + searchField.textField.text + ".*"
-                                caseSensitivity: Qt.CaseInsensitive
-                            }
-                        }
-                    ]
+        property bool isFocusable: true
+
+        model: SortFilterProxyModel {
+            id: proxySitesModel
+            sourceModel: SitesModel
+            filters: [
+                AnyOf {
+                    RegExpFilter {
+                        roleName: "url"
+                        pattern: ".*" + searchField.textField.text + ".*"
+                        caseSensitivity: Qt.CaseInsensitive
+                    }
+                    RegExpFilter {
+                        roleName: "ip"
+                        pattern: ".*" + searchField.textField.text + ".*"
+                        caseSensitivity: Qt.CaseInsensitive
+                    }
                 }
+            ]
+        }
 
-                clip: true
-                interactive: false
+        clip: true
 
-                activeFocusOnTab: true
-                focus: true
-                Keys.onTabPressed: {
-                    if (currentIndex < this.count - 1) {
-                        this.incrementCurrentIndex()
-                    } else {
-                        currentIndex = 0
-                        searchField.textField.forceActiveFocus()
-                    }
+        reuseItems: true
 
-                    fl.ensureVisible(currentItem)
-                }
+        delegate: ColumnLayout {
+            id: delegateContent
 
-                delegate: Item {
-                    implicitWidth: sites.width
-                    implicitHeight: delegateContent.implicitHeight
+            width: listView.width
 
-                    onActiveFocusChanged: {
-                        if (activeFocus) {
+            LabelWithButtonType {
+                id: site
+                Layout.fillWidth: true
+
+                text: url
+                descriptionText: ip
+                rightImageSource: "qrc:/images/controls/trash.svg"
+                rightImageColor: AmneziaStyle.color.paleGray
+
+                clickedFunction: function() {
+                    var headerText = qsTr("Remove ") + url + "?"
+                    var yesButtonText = qsTr("Continue")
+                    var noButtonText = qsTr("Cancel")
+
+                    var yesButtonFunction = function() {
+                        SitesController.removeSite(proxySitesModel.mapToSource(index))
+                        if (!GC.isMobile()) {
                             site.rightButton.forceActiveFocus()
                         }
                     }
-
-                    ColumnLayout {
-                        id: delegateContent
-
-                        anchors.top: parent.top
-                        anchors.left: parent.left
-                        anchors.right: parent.right
-
-                        LabelWithButtonType {
-                            id: site
-                            Layout.fillWidth: true
-
-                            text: url
-                            descriptionText: ip
-                            rightImageSource: "qrc:/images/controls/trash.svg"
-                            rightImageColor: AmneziaStyle.color.paleGray
-
-                            clickedFunction: function() {
-                                var headerText = qsTr("Remove ") + url + "?"
-                                var yesButtonText = qsTr("Continue")
-                                var noButtonText = qsTr("Cancel")
-
-                                var yesButtonFunction = function() {
-                                    SitesController.removeSite(proxySitesModel.mapToSource(index))
-                                    if (!GC.isMobile()) {
-                                        site.rightButton.forceActiveFocus()
-                                    }
-                                }
-                                var noButtonFunction = function() {
-                                    if (!GC.isMobile()) {
-                                        site.rightButton.forceActiveFocus()
-                                    }
-                                }
-
-                                showQuestionDrawer(headerText, "", yesButtonText, noButtonText, yesButtonFunction, noButtonFunction)
-                            }
+                    var noButtonFunction = function() {
+                        if (!GC.isMobile()) {
+                            site.rightButton.forceActiveFocus()
                         }
-
-                        DividerType {}
                     }
+
+                    showQuestionDrawer(headerText, "", yesButtonText, noButtonText, yesButtonFunction, noButtonFunction)
                 }
             }
 
+            DividerType {}
         }
     }
 
+
     Rectangle {
         anchors.fill: addSiteButton
         anchors.bottomMargin: -24
@@ -325,7 +275,6 @@ PageType {
 
             textFieldPlaceholderText: qsTr("website or IP")
             buttonImageSource: "qrc:/images/controls/plus.svg"
-            KeyNavigation.tab: GC.isMobile() ? focusItem : addSiteButtonImage
 
             clickedFunc: function() {
                 PageController.showBusyIndicator(true)
@@ -344,13 +293,11 @@ PageType {
             imageColor: AmneziaStyle.color.paleGray
 
             onClicked: function () {
-                moreActionsDrawer.open()
+                moreActionsDrawer.openTriggered()
             }
 
             Keys.onReturnPressed: addSiteButtonImage.clicked()
             Keys.onEnterPressed: addSiteButtonImage.clicked()
-
-            Keys.onTabPressed: lastItemTabClicked(focusItem)
         }
     }
 
@@ -360,38 +307,13 @@ PageType {
         anchors.fill: parent
         expandedHeight: parent.height * 0.4375
 
-        onClosed: {
-            if (root.defaultActiveFocusItem && !GC.isMobile()) {
-                root.defaultActiveFocusItem.forceActiveFocus()
-            }
-        }
-
-        expandedContent: ColumnLayout {
+        expandedStateContent: ColumnLayout {
             id: moreActionsDrawerContent
 
             anchors.top: parent.top
             anchors.left: parent.left
             anchors.right: parent.right
 
-            Connections {
-                target: moreActionsDrawer
-
-                function onOpened() {
-                    focusItem1.forceActiveFocus()
-                }
-
-                function onActiveFocusChanged() {
-                    if (!GC.isMobile()) {
-                        focusItem1.forceActiveFocus()
-                    }
-                }
-            }
-
-            Item {
-                id: focusItem1
-                KeyNavigation.tab: importSitesButton.rightButton
-            }
-
             Header2Type {
                 Layout.fillWidth: true
                 Layout.margins: 16
@@ -407,21 +329,18 @@ PageType {
                 rightImageSource: "qrc:/images/controls/chevron-right.svg"
 
                 clickedFunction: function() {
-                    importSitesDrawer.open()
+                    importSitesDrawer.openTriggered()
                 }
-
-                KeyNavigation.tab: exportSitesButton
             }
 
             DividerType {}
 
             LabelWithButtonType {
                 id: exportSitesButton
+                enabled: !SettingsController.isOnTv()
                 Layout.fillWidth: true
                 text: qsTr("Save site list")
 
-                KeyNavigation.tab: focusItem1
-
                 clickedFunction: function() {
                     var fileName = ""
                     if (GC.isMobile()) {
@@ -436,13 +355,15 @@ PageType {
                     if (fileName !== "") {
                         PageController.showBusyIndicator(true)
                         SitesController.exportSites(fileName)
-                        moreActionsDrawer.close()
+                        moreActionsDrawer.closeTriggered()
                         PageController.showBusyIndicator(false)
                     }
                 }
             }
 
-            DividerType {}
+            DividerType {
+                enabled: !SettingsController.isOnTv()
+            }
         }
     }
 
@@ -452,28 +373,9 @@ PageType {
         anchors.fill: parent
         expandedHeight: parent.height * 0.4375
 
-        onClosed: {
-            if (!GC.isMobile()) {
-                moreActionsDrawer.forceActiveFocus()
-            }
-        }
-
-        expandedContent: Item {
+        expandedStateContent: Item {
             implicitHeight: importSitesDrawer.expandedHeight
 
-            Connections {
-                target: importSitesDrawer
-                enabled: !GC.isMobile()
-                function onOpened() {
-                    focusItem2.forceActiveFocus()
-                }
-            }
-
-            Item {
-                id: focusItem2
-                KeyNavigation.tab: importSitesDrawerBackButton
-            }
-
             BackButtonType {
                 id: importSitesDrawerBackButton
 
@@ -482,10 +384,8 @@ PageType {
                 anchors.right: parent.right
                 anchors.topMargin: 16
 
-                KeyNavigation.tab: importSitesButton2
-
                 backButtonFunction: function() {
-                    importSitesDrawer.close()
+                    importSitesDrawer.closeTriggered()
                 }
             }
 
@@ -516,7 +416,6 @@ PageType {
                         Layout.fillWidth: true
 
                         text: qsTr("Replace site list")
-                        KeyNavigation.tab: importSitesButton3
 
                         clickedFunction: function() {
                             var fileName = SystemController.getFileName(qsTr("Open sites file"),
@@ -533,7 +432,6 @@ PageType {
                         id: importSitesButton3
                         Layout.fillWidth: true
                         text: qsTr("Add imported sites to existing ones")
-                        KeyNavigation.tab: focusItem2
 
                         clickedFunction: function() {
                             var fileName = SystemController.getFileName(qsTr("Open sites file"),
@@ -548,8 +446,8 @@ PageType {
                         PageController.showBusyIndicator(true)
                         SitesController.importSites(fileName, replaceExistingSites)
                         PageController.showBusyIndicator(false)
-                        importSitesDrawer.close()
-                        moreActionsDrawer.close()
+                        importSitesDrawer.closeTriggered()
+                        moreActionsDrawer.closeTriggered()
                     }
 
                     DividerType {}
diff --git a/client/ui/qml/Pages2/PageSetupWizardApiServiceInfo.qml b/client/ui/qml/Pages2/PageSetupWizardApiServiceInfo.qml
index 75fd3d47e..9e541ded7 100644
--- a/client/ui/qml/Pages2/PageSetupWizardApiServiceInfo.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardApiServiceInfo.qml
@@ -15,8 +15,6 @@ import "../Components"
 PageType {
     id: root
 
-    defaultActiveFocusItem: focusItem
-
     FlickableType {
         id: fl
         anchors.top: parent.top
@@ -32,15 +30,9 @@ PageType {
 
             spacing: 0
 
-            Item {
-                id: focusItem
-                KeyNavigation.tab: backButton
-            }
-
             BackButtonType {
                 id: backButton
                 Layout.topMargin: 20
-//                KeyNavigation.tab: fileButton.rightButton
             }
 
             HeaderType {
diff --git a/client/ui/qml/Pages2/PageSetupWizardApiServicesList.qml b/client/ui/qml/Pages2/PageSetupWizardApiServicesList.qml
index f726cd49a..c3e3edbc8 100644
--- a/client/ui/qml/Pages2/PageSetupWizardApiServicesList.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardApiServicesList.qml
@@ -14,8 +14,6 @@ import "../Config"
 PageType {
     id: root
 
-    defaultActiveFocusItem: focusItem
-
     ColumnLayout {
         id: header
 
@@ -25,15 +23,9 @@ PageType {
 
         spacing: 0
 
-        Item {
-            id: focusItem
-            KeyNavigation.tab: backButton
-        }
-
         BackButtonType {
             id: backButton
             Layout.topMargin: 20
-//                KeyNavigation.tab: fileButton.rightButton
         }
 
         HeaderType {
@@ -50,6 +42,7 @@ PageType {
 
     ListView {
         id: servicesListView
+
         anchors.top: header.bottom
         anchors.right: parent.right
         anchors.left: parent.left
@@ -57,16 +50,21 @@ PageType {
         anchors.topMargin: 16
         spacing: 0
 
-        currentIndex: 1
+        property bool isFocusable: true
+        
         clip: true
+        reuseItems: true
+
         model: ApiServicesModel
 
-        ScrollBar.vertical: ScrollBar {}
+        ScrollBar.vertical: ScrollBarType {}
 
         delegate: Item {
             implicitWidth: servicesListView.width
             implicitHeight: delegateContent.implicitHeight
 
+            enabled: isServiceAvailable
+
             ColumnLayout {
                 id: delegateContent
 
@@ -86,14 +84,15 @@ PageType {
 
                     rightImageSource: "qrc:/images/controls/chevron-right.svg"
 
-                    enabled: isServiceAvailable
-
                     onClicked: {
                         if (isServiceAvailable) {
                             ApiServicesModel.setServiceIndex(index)
                             PageController.goToPage(PageEnum.PageSetupWizardApiServiceInfo)
                         }
                     }
+                    
+                    Keys.onEnterPressed: clicked()
+                    Keys.onReturnPressed: clicked()
                 }
             }
         }
diff --git a/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml b/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
index f973c89cf..17d733d86 100644
--- a/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
@@ -25,31 +25,29 @@ PageType {
         }
     }
 
-    defaultActiveFocusItem: focusItem
+    ListView {
+        id: listView
 
-    FlickableType {
-        id: fl
-        anchors.top: parent.top
-        anchors.bottom: parent.bottom
-        contentHeight: content.height
+        anchors.fill: parent
 
-        ColumnLayout {
-            id: content
+        property bool isFocusable: true
 
-            anchors.top: parent.top
-            anchors.left: parent.left
-            anchors.right: parent.right
+        ScrollBar.vertical: ScrollBarType {}
 
-            spacing: 0
+        model: variants
 
-            Item {
-                id: focusItem
-                KeyNavigation.tab: textKey.textField
-            }
+        clip: true
+
+        reuseItems: true
+
+        header: ColumnLayout {
+            width: listView.width
 
             HeaderType {
-                property bool isVisible: SettingsController.getInstallationUuid() !== "" || PageController.isStartPageVisible()
+                id: moreButton
 
+                property bool isVisible: SettingsController.getInstallationUuid() !== "" || PageController.isStartPageVisible()
+                
                 Layout.fillWidth: true
                 Layout.topMargin: 24
                 Layout.rightMargin: 16
@@ -59,7 +57,7 @@ PageType {
 
                 actionButtonImage: isVisible ? "qrc:/images/controls/more-vertical.svg" : ""
                 actionButtonFunction: function() {
-                    moreActionsDrawer.open()
+                    moreActionsDrawer.openTriggered()
                 }
 
                 DrawerType2 {
@@ -70,7 +68,7 @@ PageType {
                     anchors.fill: parent
                     expandedHeight: root.height * 0.5
 
-                    expandedContent: ColumnLayout {
+                    expandedStateContent: ColumnLayout {
                         anchors.top: parent.top
                         anchors.left: parent.left
                         anchors.right: parent.right
@@ -130,6 +128,8 @@ PageType {
             }
 
             ParagraphTextType {
+                objectName: "insertKeyLabel"
+
                 Layout.fillWidth: true
                 Layout.topMargin: 32
                 Layout.rightMargin: 16
@@ -153,8 +153,6 @@ PageType {
                     textField.text = ""
                     textField.paste()
                 }
-
-                KeyNavigation.tab: continueButton
             }
 
             BasicButtonType {
@@ -168,7 +166,6 @@ PageType {
                 visible: textKey.textFieldText !== ""
 
                 text: qsTr("Continue")
-                Keys.onTabPressed: lastItemTabClicked(focusItem)
 
                 clickedFunc: function() {
                     if (ImportController.extractConfigFromData(textKey.textFieldText)) {
@@ -187,143 +184,155 @@ PageType {
                 color: AmneziaStyle.color.charcoalGray
                 text: qsTr("Other connection options")
             }
+        }
 
-            CardWithIconsType {
-                id: apiInstalling
-
-                Layout.fillWidth: true
-                Layout.rightMargin: 16
-                Layout.leftMargin: 16
-                Layout.bottomMargin: 16
-
-                headerText: qsTr("VPN by Amnezia")
-                bodyText: qsTr("Connect to classic paid and free VPN services from Amnezia")
-
-                rightImageSource: "qrc:/images/controls/chevron-right.svg"
-                leftImageSource: "qrc:/images/controls/amnezia.svg"
-
-                onClicked: function() {
-                    PageController.showBusyIndicator(true)
-                    var result = InstallController.fillAvailableServices()
-                    PageController.showBusyIndicator(false)
-                    if (result) {
-                        PageController.goToPage(PageEnum.PageSetupWizardApiServicesList)
-                    }
-                }
-            }
+        delegate: ColumnLayout {
+            width: listView.width
 
             CardWithIconsType {
-                id: manualInstalling
-
                 Layout.fillWidth: true
                 Layout.rightMargin: 16
                 Layout.leftMargin: 16
                 Layout.bottomMargin: 16
 
-                headerText: qsTr("Self-hosted VPN")
-                bodyText: qsTr("Configure Amnezia VPN on your own server")
+                visible: isVisible
+
+                headerText: title
+                bodyText: description
 
                 rightImageSource: "qrc:/images/controls/chevron-right.svg"
-                leftImageSource: "qrc:/images/controls/server.svg"
+                leftImageSource: imageSource
 
-                onClicked: {
-                    PageController.goToPage(PageEnum.PageSetupWizardCredentials)
-                }
+                onClicked: { handler() }
             }
+        }
 
-            CardWithIconsType {
-                id: backupRestore
+        footer: ColumnLayout {
+            width: listView.width
 
-                Layout.fillWidth: true
-                Layout.rightMargin: 16
-                Layout.leftMargin: 16
+            BasicButtonType {
+                id: siteLink2
+                Layout.topMargin: 24
                 Layout.bottomMargin: 16
+                Layout.alignment: Qt.AlignHCenter
+                implicitHeight: 32
 
-                visible: PageController.isStartPageVisible()
-
-                headerText: qsTr("Restore from backup")
+                defaultColor: AmneziaStyle.color.transparent
+                hoveredColor: AmneziaStyle.color.translucentWhite
+                pressedColor: AmneziaStyle.color.sheerWhite
+                disabledColor: AmneziaStyle.color.mutedGray
+                textColor: AmneziaStyle.color.goldenApricot
 
-                rightImageSource: "qrc:/images/controls/chevron-right.svg"
-                leftImageSource: "qrc:/images/controls/archive-restore.svg"
-
-                onClicked: {
-                    var filePath = SystemController.getFileName(qsTr("Open backup file"),
-                                                                qsTr("Backup files (*.backup)"))
-                    if (filePath !== "") {
-                        PageController.showBusyIndicator(true)
-                        SettingsController.restoreAppConfig(filePath)
-                        PageController.showBusyIndicator(false)
-                    }
-                }
-            }
-
-            CardWithIconsType {
-                id: openFile
-
-                Layout.fillWidth: true
-                Layout.rightMargin: 16
-                Layout.leftMargin: 16
-                Layout.bottomMargin: 16
+                text: qsTr("Site Amnezia")
 
-                headerText: qsTr("File with connection settings")
+                rightImageSource: "qrc:/images/controls/external-link.svg"
 
-                rightImageSource: "qrc:/images/controls/chevron-right.svg"
-                leftImageSource: "qrc:/images/controls/folder-search-2.svg"
-
-                onClicked: {
-                    var nameFilter = !ServersModel.getServersCount() ? "Config or backup files (*.vpn *.ovpn *.conf *.json *.backup)" :
-                                                                       "Config files (*.vpn *.ovpn *.conf *.json)"
-                    var fileName = SystemController.getFileName(qsTr("Open config file"), nameFilter)
-                    if (fileName !== "") {
-                        if (ImportController.extractConfigFromFile(fileName)) {
-                            PageController.goToPage(PageEnum.PageSetupWizardViewConfig)
-                        }
-                    }
+                clickedFunc: function() {
+                    Qt.openUrlExternally(LanguageModel.getCurrentSiteUrl())
                 }
             }
+        }
+    }
 
-            CardWithIconsType {
-                id: scanQr
-
-                Layout.fillWidth: true
-                Layout.rightMargin: 16
-                Layout.leftMargin: 16
-                Layout.bottomMargin: 16
+    property list<QtObject> variants: [
+        amneziaVpn,
+        selfHostVpn,
+        backupRestore,
+        fileOpen,
+        qrScan,
+        siteLink
+    ]
+    
+    QtObject {
+        id: amneziaVpn
+
+        property string title: qsTr("VPN by Amnezia")
+        property string description: qsTr("Connect to classic paid and free VPN services from Amnezia")
+        property string imageSource: "qrc:/images/controls/amnezia.svg"
+        property bool isVisible: true
+        property var handler: function() {
+            PageController.showBusyIndicator(true)
+            var result = InstallController.fillAvailableServices()
+            PageController.showBusyIndicator(false)
+            if (result) {
+                PageController.goToPage(PageEnum.PageSetupWizardApiServicesList)
+            }
+        }
+    }
 
-                visible: SettingsController.isCameraPresent()
+    QtObject {
+        id: selfHostVpn
 
-                headerText: qsTr("QR code")
+        property string title: qsTr("Self-hosted VPN")
+        property string description: qsTr("Configure Amnezia VPN on your own server")
+        property string imageSource: "qrc:/images/controls/server.svg"
+        property bool isVisible: true
+        property var handler: function() {
+            PageController.goToPage(PageEnum.PageSetupWizardCredentials)
+        }
+    }
 
-                rightImageSource: "qrc:/images/controls/chevron-right.svg"
-                leftImageSource: "qrc:/images/controls/scan-line.svg"
+    QtObject {
+        id: backupRestore
+
+        property string title: qsTr("Restore from backup")
+        property string description: qsTr("")
+        property string imageSource: "qrc:/images/controls/archive-restore.svg"
+        property bool isVisible: PageController.isStartPageVisible()
+        property var handler: function() {
+            var filePath = SystemController.getFileName(qsTr("Open backup file"),
+                                                        qsTr("Backup files (*.backup)"))
+            if (filePath !== "") {
+                PageController.showBusyIndicator(true)
+                SettingsController.restoreAppConfig(filePath)
+                PageController.showBusyIndicator(false)
+            }
+        }
+    }
 
-                onClicked: {
-                    ImportController.startDecodingQr()
-                    if (Qt.platform.os === "ios") {
-                        PageController.goToPage(PageEnum.PageSetupWizardQrReader)
-                    }
+    QtObject {
+        id: fileOpen
+
+        property string title: qsTr("File with connection settings")
+        property string description: qsTr("")
+        property string imageSource: "qrc:/images/controls/folder-search-2.svg"
+        property bool isVisible: true
+        property var handler: function() {
+            var nameFilter = !ServersModel.getServersCount() ? "Config or backup files (*.vpn *.ovpn *.conf *.json *.backup)" :
+                                                               "Config files (*.vpn *.ovpn *.conf *.json)"
+            var fileName = SystemController.getFileName(qsTr("Open config file"), nameFilter)
+            if (fileName !== "") {
+                if (ImportController.extractConfigFromFile(fileName)) {
+                    PageController.goToPage(PageEnum.PageSetupWizardViewConfig)
                 }
             }
+        }
+    }
 
-            CardWithIconsType {
-                id: siteLink
-
-                Layout.fillWidth: true
-                Layout.rightMargin: 16
-                Layout.leftMargin: 16
-                Layout.bottomMargin: 16
-
-                visible: PageController.isStartPageVisible()
+    QtObject {
+        id: qrScan
 
-                headerText: qsTr("I have nothing")
+        property string title: qsTr("QR code")
+        property string description: qsTr("")
+        property string imageSource: "qrc:/images/controls/scan-line.svg"
+        property bool isVisible: SettingsController.isCameraPresent()
+        property var handler: function() {
+            ImportController.startDecodingQr()
+            if (Qt.platform.os === "ios") {
+                PageController.goToPage(PageEnum.PageSetupWizardQrReader)
+            }
+        }
+    }
 
-                rightImageSource: "qrc:/images/controls/chevron-right.svg"
-                leftImageSource: "qrc:/images/controls/help-circle.svg"
+    QtObject {
+        id: siteLink
 
-                onClicked: {
-                    Qt.openUrlExternally(LanguageModel.getCurrentSiteUrl())
-                }
-            }
+        property string title: qsTr("I have nothing")
+        property string description: qsTr("")
+        property string imageSource: "qrc:/images/controls/help-circle.svg"
+        property bool isVisible: PageController.isStartPageVisible()
+        property var handler: function() {
+            Qt.openUrlExternally(LanguageModel.getCurrentSiteUrl())
         }
     }
 }
diff --git a/client/ui/qml/Pages2/PageSetupWizardCredentials.qml b/client/ui/qml/Pages2/PageSetupWizardCredentials.qml
index aced12b14..20b855501 100644
--- a/client/ui/qml/Pages2/PageSetupWizardCredentials.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardCredentials.qml
@@ -13,13 +13,6 @@ import "../Controls2/TextTypes"
 PageType {
     id: root
 
-    defaultActiveFocusItem: hostname.textField
-
-    Item {
-        id: focusItem
-        KeyNavigation.tab: backButton
-    }
-
     BackButtonType {
         id: backButton
 
@@ -28,100 +21,133 @@ PageType {
         anchors.right: parent.right
         anchors.topMargin: 20
 
-        KeyNavigation.tab: hostname.textField
+        onFocusChanged: {
+            if (this.activeFocus) {
+                listView.positionViewAtBeginning()
+            }
+        }
     }
 
-    FlickableType {
-        id: fl
+    ListView {
+        id: listView
         anchors.top: backButton.bottom
         anchors.bottom: parent.bottom
-        contentHeight: content.height
+        anchors.right: parent.right
+        anchors.left: parent.left
+
+        property bool isFocusable: true
+
+        Keys.onTabPressed: {
+            FocusController.nextKeyTabItem()
+        }
+
+        Keys.onBacktabPressed: {
+            FocusController.previousKeyTabItem()
+        }
+
+        Keys.onUpPressed: {
+            FocusController.nextKeyUpItem()
+        }
+
+        Keys.onDownPressed: {
+            FocusController.nextKeyDownItem()
+        }
+
+        Keys.onLeftPressed: {
+            FocusController.nextKeyLeftItem()
+        }
 
-        ColumnLayout {
-            id: content
+        Keys.onRightPressed: {
+            FocusController.nextKeyRightItem()
+        }
 
-            anchors.top: parent.top
-            anchors.left: parent.left
-            anchors.right: parent.right
-            anchors.rightMargin: 16
-            anchors.leftMargin: 16
+        ScrollBar.vertical: ScrollBarType {}
 
-            spacing: 16
+        header: ColumnLayout {
+            width: listView.width
 
             HeaderType {
                 Layout.fillWidth: true
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+                Layout.bottomMargin: 16
 
                 headerText: qsTr("Configure your server")
             }
+        }
 
-            TextFieldWithHeaderType {
-                id: hostname
+        model: inputFields
+        spacing: 16
+        clip: true
+        reuseItems: true
 
-                Layout.fillWidth: true
-                headerText: qsTr("Server IP address [:port]")
-                textFieldPlaceholderText: qsTr("255.255.255.255:22")
+        delegate: ColumnLayout {
+            property alias textField: _textField.textField
 
-                textField.onFocusChanged: {
-                    textField.text = textField.text.replace(/^\s+|\s+$/g, '')
-                }
-
-                KeyNavigation.tab: username.textField
-            }
+            width: listView.width
 
             TextFieldWithHeaderType {
-                id: username
+                id: _textField
 
                 Layout.fillWidth: true
-                headerText: qsTr("SSH Username")
-                textFieldPlaceholderText: "root"
-
-                textField.onFocusChanged: {
-                    textField.text = textField.text.replace(/^\s+|\s+$/g, '')
-                }
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
-                KeyNavigation.tab: secretData.textField
-            }
-
-            TextFieldWithHeaderType {
-                id: secretData
+                property bool hidePassword: hideText
 
-                property bool hidePassword: true
+                headerText: title
+                textField.echoMode: hideText ? TextInput.Password : TextInput.Normal
+                buttonImageSource: imageSource
+                textFieldPlaceholderText: placeholderText
+                textField.text: textFieldText
 
-                Layout.fillWidth: true
-                headerText: qsTr("Password or SSH private key")
-                textField.echoMode: hidePassword ? TextInput.Password : TextInput.Normal
-                buttonImageSource: textFieldText !== "" ? (hidePassword ? "qrc:/images/controls/eye.svg" : "qrc:/images/controls/eye-off.svg")
-                                                        : ""
+                rightButtonClickedOnEnter: true
 
-                clickedFunc: function() {
-                    hidePassword = !hidePassword
+                clickedFunc: function () {
+                    clickedHandler()
                 }
 
                 textField.onFocusChanged: {
-                    textField.text = textField.text.replace(/^\s+|\s+$/g, '')
+                    var _currentIndex = listView.currentIndex
+                    var _currentItem = listView.itemAtIndex(_currentIndex).children[0]
+                    listView.model[_currentIndex].textFieldText = _currentItem.textFieldText.replace(/^\s+|\s+$/g, '')
                 }
 
-                KeyNavigation.tab: continueButton
+                textField.onTextChanged: {
+                    var _currentIndex = listView.currentIndex
+                    textFieldText = textField.text
+
+                    if (_currentIndex === vars.secretDataIndex) {
+                        buttonImageSource = textFieldText !== "" ? (hideText ? "qrc:/images/controls/eye.svg" : "qrc:/images/controls/eye-off.svg") : ""
+                    }
+                }
             }
+        }
+
+        footer: ColumnLayout {
+            width: listView.width
 
             BasicButtonType {
                 id: continueButton
 
                 Layout.fillWidth: true
-                Layout.topMargin: 24
+                Layout.topMargin: 32
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
                 text: qsTr("Continue")
 
-                Keys.onTabPressed: lastItemTabClicked(focusItem)
-
                 clickedFunc: function() {
-                    forceActiveFocus()
-                    if (!isCredentialsFilled()) {
+                    if (!root.isCredentialsFilled()) {
                         return
                     }
 
                     InstallController.setShouldCreateServer(true)
-                    InstallController.setProcessedServerCredentials(hostname.textField.text, username.textField.text, secretData.textField.text)
+                    var _hostname = listView.itemAtIndex(vars.hostnameIndex).children[0].textFieldText
+                    var _username = listView.itemAtIndex(vars.usernameIndex).children[0].textFieldText
+                    var _secretData = listView.itemAtIndex(vars.secretDataIndex).children[0].textFieldText
+
+                    InstallController.setProcessedServerCredentials(_hostname, _username, _secretData)
 
                     PageController.showBusyIndicator(true)
                     var isConnectionOpened = InstallController.checkSshConnection()
@@ -136,7 +162,10 @@ PageType {
 
             LabelTextType {
                 Layout.fillWidth: true
-                Layout.topMargin: 12
+                Layout.topMargin: 24
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+                Layout.bottomMargin: 16
 
                 text: qsTr("All data you enter will remain strictly confidential and will not be shared or disclosed to the Amnezia or any third parties")
             }
@@ -145,6 +174,8 @@ PageType {
                 id: siteLink
 
                 Layout.fillWidth: true
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
                 Layout.bottomMargin: 16
 
                 headerText: qsTr("How to run your VPN server")
@@ -163,21 +194,78 @@ PageType {
     function isCredentialsFilled() {
         var hasEmptyField = false
 
-        if (hostname.textFieldText === "") {
-            hostname.errorText = qsTr("Ip address cannot be empty")
+        var _hostname = listView.itemAtIndex(vars.hostnameIndex).children[0]
+        if (_hostname.textFieldText === "") {
+            _hostname.errorText = qsTr("Ip address cannot be empty")
             hasEmptyField = true
-        } else if (!hostname.textField.acceptableInput) {
-            hostname.errorText = qsTr("Enter the address in the format 255.255.255.255:88")
+        } else if (!_hostname.textField.acceptableInput) {
+            _hostname.errorText = qsTr("Enter the address in the format 255.255.255.255:88")
         }
 
-        if (username.textFieldText === "") {
-            username.errorText = qsTr("Login cannot be empty")
+        var _username = listView.itemAtIndex(vars.usernameIndex).children[0]
+        if (_username.textFieldText === "") {
+            _username.errorText = qsTr("Login cannot be empty")
             hasEmptyField = true
         }
-        if (secretData.textFieldText === "") {
-            secretData.errorText = qsTr("Password/private key cannot be empty")
+
+        var _secretData = listView.itemAtIndex(vars.secretDataIndex).children[0]
+        if (_secretData.textFieldText === "") {
+            _secretData.errorText = qsTr("Password/private key cannot be empty")
             hasEmptyField = true
         }
+
         return !hasEmptyField
     }
+
+    property list<QtObject> inputFields: [
+        hostname,
+        username,
+        secretData
+    ]
+
+    QtObject {
+        id: hostname
+
+        property string title: qsTr("Server IP address [:port]")
+        readonly property string placeholderText: qsTr("255.255.255.255:22")
+        property string textFieldText: ""
+        property bool hideText: false
+        property string imageSource: ""
+        readonly property var clickedHandler: function() {
+            console.debug(">>> Server IP address text field was clicked!!!")
+            clicked()
+        }
+    }
+
+    QtObject {
+        id: username
+
+        property string title: qsTr("SSH Username")
+        readonly property string placeholderText: "root"
+        property string textFieldText: ""
+        property bool hideText: false
+        property string imageSource: ""
+        readonly property var clickedHandler: undefined
+    }
+
+    QtObject {
+        id: secretData
+
+        property string title: qsTr("Password or SSH private key")
+        readonly property string placeholderText: ""
+        property string textFieldText: ""
+        property bool hideText: true
+        property string imageSource: textFieldText !== "" ? (hideText ? "qrc:/images/controls/eye.svg" : "qrc:/images/controls/eye-off.svg") : ""
+        readonly property var clickedHandler: function() {
+            hideText = !hideText
+        }
+    }
+
+    QtObject {
+        id: vars
+
+        readonly property int hostnameIndex: 0
+        readonly property int usernameIndex: 1
+        readonly property int secretDataIndex: 2
+    }
 }
diff --git a/client/ui/qml/Pages2/PageSetupWizardEasy.qml b/client/ui/qml/Pages2/PageSetupWizardEasy.qml
index 02a7c928d..eb6000c23 100644
--- a/client/ui/qml/Pages2/PageSetupWizardEasy.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardEasy.qml
@@ -17,7 +17,6 @@ PageType {
     id: root
 
     property bool isEasySetup: true
-    defaultActiveFocusItem: focusItem
 
     SortFilterProxyModel {
         id: proxyContainersModel
@@ -34,14 +33,6 @@ PageType {
         }
     }
 
-    Item {
-        id: focusItem
-        implicitWidth: 1
-        implicitHeight: 54
-
-        KeyNavigation.tab: backButton
-    }
-
     BackButtonType {
         id: backButton
 
@@ -49,8 +40,6 @@ PageType {
         anchors.left: parent.left
         anchors.right: parent.right
         anchors.topMargin: 20
-
-        KeyNavigation.tab: continueButton
     }
 
     FlickableType {
@@ -98,6 +87,8 @@ PageType {
                 property int containerDefaultPort
                 property int containerDefaultTransportProto
 
+                property bool isFocusable: true
+
                 delegate: Item {
                     implicitWidth: containers.width
                     implicitHeight: delegateContent.implicitHeight
@@ -163,7 +154,7 @@ PageType {
                 implicitWidth: parent.width
 
                 text: qsTr("Continue")
-                KeyNavigation.tab: setupLaterButton
+                
                 parentFlickable: fl
 
                 clickedFunc: function() {
diff --git a/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml b/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
index 6b4c0a1c2..0de4da6b0 100644
--- a/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
@@ -49,6 +49,32 @@ PageType {
                 interactive: false
                 model: proxyContainersModel
 
+                property bool isFocusable: true
+
+                Keys.onTabPressed: {
+                    FocusController.nextKeyTabItem()
+                }
+
+                Keys.onBacktabPressed: {
+                    FocusController.previousKeyTabItem()
+                }
+
+                Keys.onUpPressed: {
+                    FocusController.nextKeyUpItem()
+                }
+
+                Keys.onDownPressed: {
+                    FocusController.nextKeyDownItem()
+                }
+
+                Keys.onLeftPressed: {
+                    FocusController.nextKeyLeftItem()
+                }
+
+                Keys.onRightPressed: {
+                    FocusController.nextKeyRightItem()
+                }
+
                 delegate: Item {
                     implicitWidth: processedContainerListView.width
                     implicitHeight: (delegateContent.implicitHeight > root.height) ? delegateContent.implicitHeight : root.height
@@ -62,19 +88,12 @@ PageType {
                         anchors.rightMargin: 16
                         anchors.leftMargin: 16
 
-                        Item {
-                            id: focusItem
-                            KeyNavigation.tab: backButton
-                        }
-
                         BackButtonType {
                             id: backButton
 
                             Layout.topMargin: 20
                             Layout.rightMargin: -16
                             Layout.leftMargin: -16
-
-                            KeyNavigation.tab: showDetailsButton
                         }
 
                         HeaderType {
@@ -104,42 +123,19 @@ PageType {
                             KeyNavigation.tab: transportProtoSelector
 
                             clickedFunc: function() {
-                                showDetailsDrawer.open()
+                                showDetailsDrawer.openTriggered()
                             }
                         }
 
                         DrawerType2 {
                             id: showDetailsDrawer
                             parent: root
-                            onClosed: {
-                                if (!GC.isMobile()) {
-                                    defaultActiveFocusItem.forceActiveFocus()
-                                }
-                            }
 
                             anchors.fill: parent
                             expandedHeight: parent.height * 0.9
-                            expandedContent: Item {
-                                Connections {
-                                    target: showDetailsDrawer
-                                    enabled: !GC.isMobile()
-                                    function onOpened() {
-                                        focusItem2.forceActiveFocus()
-                                    }
-                                }
-
+                            expandedStateContent: Item {
                                 implicitHeight: showDetailsDrawer.expandedHeight
 
-                                Item {
-                                    id: focusItem2
-                                    KeyNavigation.tab: showDetailsBackButton
-                                    onFocusChanged: {
-                                        if (focusItem2.activeFocus) {
-                                            fl.contentY = 0
-                                        }
-                                    }
-                                }
-
                                 BackButtonType {
                                     id: showDetailsBackButton
 
@@ -148,10 +144,8 @@ PageType {
                                     anchors.right: parent.right
                                     anchors.topMargin: 16
 
-                                    KeyNavigation.tab: showDetailsCloseButton
-
                                     backButtonFunction: function() {
-                                        showDetailsDrawer.close()
+                                        showDetailsDrawer.closeTriggered()
                                     }
                                 }
 
@@ -205,10 +199,9 @@ PageType {
                                             parentFlickable: fl
 
                                             text: qsTr("Close")
-                                            Keys.onTabPressed: lastItemTabClicked(focusItem2)
 
 											clickedFunc: function()  {
-                                                showDetailsDrawer.close()
+                                                showDetailsDrawer.closeTriggered()
                                             }
                                         }
                                     }
@@ -229,8 +222,6 @@ PageType {
 
                             Layout.fillWidth: true
                             rootWidth: root.width
-
-                            KeyNavigation.tab: (port.visible && port.enabled) ? port.textField : installButton
                         }
 
                         TextFieldWithHeaderType {
@@ -242,8 +233,6 @@ PageType {
                             headerText: qsTr("Port")
                             textField.maximumLength: 5
                             textField.validator: IntValidator { bottom: 1; top: 65535 }
-
-                            KeyNavigation.tab: installButton
                         }
 
                         Rectangle {
@@ -259,8 +248,6 @@ PageType {
 
                             text: qsTr("Install")
 
-                            Keys.onTabPressed: lastItemTabClicked(focusItem)
-
                             clickedFunc: function() {
                                 if (!port.textField.acceptableInput &&
                                         ContainerProps.containerTypeToString(dockerContainer) !== "torwebsite" &&
@@ -288,11 +275,6 @@ PageType {
                             var protocolSelectorVisible = ProtocolProps.defaultTransportProtoChangeable(defaultContainerProto)
                             transportProtoSelector.visible = protocolSelectorVisible
                             transportProtoHeader.visible = protocolSelectorVisible
-
-                            if (port.visible && port.enabled)
-                                defaultActiveFocusItem = port.textField
-                            else
-                                defaultActiveFocusItem = focusItem
                         }
                     }
                 }
diff --git a/client/ui/qml/Pages2/PageSetupWizardProtocols.qml b/client/ui/qml/Pages2/PageSetupWizardProtocols.qml
index 48265f666..6b6b6038f 100644
--- a/client/ui/qml/Pages2/PageSetupWizardProtocols.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardProtocols.qml
@@ -15,13 +15,6 @@ import "../Config"
 PageType {
     id: root
 
-    defaultActiveFocusItem: focusItem
-
-    Item {
-        id: focusItem
-        KeyNavigation.tab: backButton
-    }
-
     SortFilterProxyModel {
         id: proxyContainersModel
         sourceModel: ContainersModel
@@ -41,126 +34,66 @@ PageType {
         }
     }
 
-    ColumnLayout {
-        id: backButtonLayout
+    BackButtonType {
+        id: backButton
 
         anchors.top: parent.top
         anchors.left: parent.left
         anchors.right: parent.right
 
         anchors.topMargin: 20
-
-        BackButtonType {
-            id: backButton
-            KeyNavigation.tab: containers
-        }
     }
 
-    FlickableType {
-        id: fl
-        anchors.top: backButtonLayout.bottom
+    ListView {
+        id: listView
+        anchors.top: backButton.bottom
         anchors.bottom: parent.bottom
-        contentHeight: content.implicitHeight + content.anchors.topMargin + content.anchors.bottomMargin
-
-        Column {
-            id: content
-
-            anchors.top: parent.top
-            anchors.left: parent.left
-            anchors.right: parent.right
-            anchors.bottomMargin: 20
+        anchors.right: parent.right
+        anchors.left: parent.left
 
-            Item {
-                width: parent.width
-                height: header.implicitHeight
+        property bool isFocusable: true
 
-                HeaderType {
-                    id: header
+        ScrollBar.vertical: ScrollBarType {}
 
-                    anchors.fill: parent
+        header: ColumnLayout {
+            width: listView.width
 
-                    anchors.leftMargin: 16
-                    anchors.rightMargin: 16
+            HeaderType {
+                id: header
 
-                    width: parent.width
+                Layout.fillWidth: true
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+                Layout.bottomMargin: 16
 
-                    headerText: qsTr("VPN protocol")
-                    descriptionText: qsTr("Choose the one with the highest priority for you. Later, you can install other protocols and additional services, such as DNS proxy and SFTP.")
-                }
+                headerText: qsTr("VPN protocol")
+                descriptionText: qsTr("Choose the one with the highest priority for you. Later, you can install other protocols and additional services, such as DNS proxy and SFTP.")
             }
+        }
 
-            ListView {
-                id: containers
-                width: parent.width
-                height: containers.contentItem.height
-                // currentIndex: -1
-                clip: true
-                interactive: false
-                model: proxyContainersModel
-
-                function ensureCurrentItemVisible() {
-                    if (currentIndex >= 0) {
-                        if (currentItem.y < fl.contentY) {
-                            fl.contentY = currentItem.y
-                        } else if (currentItem.y + currentItem.height + header.height > fl.contentY + fl.height) {
-                            fl.contentY = currentItem.y + currentItem.height  + header.height - fl.height + 40 // 40 is a bottom margin
-                        }
-                    }
-                }
-
-                activeFocusOnTab: true
-                Keys.onTabPressed: {
-                    if (currentIndex < this.count - 1) {
-                        this.incrementCurrentIndex()
-                    } else {
-                        this.currentIndex = 0
-                        focusItem.forceActiveFocus()
-                    }
-
-                    ensureCurrentItemVisible()
-                }
-
-                onVisibleChanged: {
-                    if (visible) {
-                        currentIndex = 0
-                    }
-                }
-
-                delegate: Item {
-                    implicitWidth: containers.width
-                    implicitHeight: delegateContent.implicitHeight
-
-                    onActiveFocusChanged: {
-                        if (activeFocus) {
-                            container.rightButton.forceActiveFocus()
-                        }
-                    }
-
-                    ColumnLayout {
-                        id: delegateContent
-
-                        anchors.top: parent.top
-                        anchors.left: parent.left
-                        anchors.right: parent.right
+        model: proxyContainersModel
+        clip: true
+        spacing: 0
+        reuseItems: true
+        snapMode: ListView.SnapToItem
 
-                        LabelWithButtonType {
-                            id: container
-                            Layout.fillWidth: true
+        delegate: ColumnLayout {
+            width: listView.width
 
-                            text: name
-                            descriptionText: description
-                            rightImageSource: "qrc:/images/controls/chevron-right.svg"
+            LabelWithButtonType {
+                Layout.fillWidth: true
 
-                            clickedFunction: function() {
-                                ContainersModel.setProcessedContainerIndex(proxyContainersModel.mapToSource(index))
-                                PageController.goToPage(PageEnum.PageSetupWizardProtocolSettings)
-                            }
-                        }
+                text: name
+                descriptionText: description
+                rightImageSource: "qrc:/images/controls/chevron-right.svg"
 
-                        DividerType {}
-                    }
+                clickedFunction: function() {
+                    ContainersModel.setProcessedContainerIndex(proxyContainersModel.mapToSource(index))
+                    PageController.goToPage(PageEnum.PageSetupWizardProtocolSettings)
                 }
             }
+
+            DividerType {}
         }
     }
 }
diff --git a/client/ui/qml/Pages2/PageSetupWizardStart.qml b/client/ui/qml/Pages2/PageSetupWizardStart.qml
index b12c78301..2d6790baf 100644
--- a/client/ui/qml/Pages2/PageSetupWizardStart.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardStart.qml
@@ -14,8 +14,6 @@ import "../Components"
 PageType {
     id: root
 
-    defaultActiveFocusItem: focusItem
-
     ColumnLayout {
         id: content
 
@@ -32,11 +30,6 @@ PageType {
             Layout.preferredHeight: 287
         }
 
-        Item {
-            id: focusItem
-            KeyNavigation.tab: startButton
-        }
-
         BasicButtonType {
             id: startButton
             Layout.fillWidth: true
@@ -50,8 +43,6 @@ PageType {
             clickedFunc: function() {
                 PageController.goToPage(PageEnum.PageSetupWizardConfigSource)
             }
-
-            Keys.onTabPressed: lastItemTabClicked(focusItem)
         }
     }
 }
diff --git a/client/ui/qml/Pages2/PageSetupWizardTextKey.qml b/client/ui/qml/Pages2/PageSetupWizardTextKey.qml
index c4227df14..126a7c919 100644
--- a/client/ui/qml/Pages2/PageSetupWizardTextKey.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardTextKey.qml
@@ -13,14 +13,6 @@ import "../Config"
 PageType {
     id: root
 
-    defaultActiveFocusItem: textKey.textField
-
-
-    Item {
-        id: focusItem
-        KeyNavigation.tab: backButton
-    }
-
     FlickableType {
         id: fl
         anchors.top: parent.top
@@ -39,7 +31,6 @@ PageType {
             BackButtonType {
                 id: backButton
                 Layout.topMargin: 20
-                KeyNavigation.tab: textKey.textField
             }
 
             HeaderType {
@@ -67,8 +58,6 @@ PageType {
                     textField.text = ""
                     textField.paste()
                 }
-
-                KeyNavigation.tab: continueButton
             }
         }
     }
@@ -84,7 +73,6 @@ PageType {
         anchors.bottomMargin: 32
 
         text: qsTr("Continue")
-        Keys.onTabPressed: lastItemTabClicked(focusItem)
 
         clickedFunc: function() {
             if (ImportController.extractConfigFromData(textKey.textFieldText)) {
diff --git a/client/ui/qml/Pages2/PageSetupWizardViewConfig.qml b/client/ui/qml/Pages2/PageSetupWizardViewConfig.qml
index 92048f363..140967421 100644
--- a/client/ui/qml/Pages2/PageSetupWizardViewConfig.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardViewConfig.qml
@@ -16,13 +16,6 @@ PageType {
 
     property bool showContent: false
 
-    defaultActiveFocusItem: focusItem
-
-    Item {
-        id: focusItem
-        KeyNavigation.tab: backButton
-    }
-
     BackButtonType {
         id: backButton
 
@@ -30,8 +23,6 @@ PageType {
         anchors.left: parent.left
         anchors.right: parent.right
         anchors.topMargin: 20
-
-        KeyNavigation.tab: showContentButton
     }
 
     Connections {
@@ -107,7 +98,8 @@ PageType {
                 textColor: AmneziaStyle.color.goldenApricot
 
                 text: showContent ? qsTr("Collapse content") : qsTr("Show content")
-                KeyNavigation.tab: connectButton
+
+                parentFlickable: fl
 
                 clickedFunc: function() {
                     showContent = !showContent
@@ -186,8 +178,6 @@ PageType {
         anchors.rightMargin: 16
         anchors.leftMargin: 16
 
-        Keys.onTabPressed: lastItemTabClicked(focusItem)
-
         BasicButtonType {
             id: connectButton
             Layout.fillWidth: true
diff --git a/client/ui/qml/Pages2/PageShare.qml b/client/ui/qml/Pages2/PageShare.qml
index d6ce78488..f5c85a5f1 100644
--- a/client/ui/qml/Pages2/PageShare.qml
+++ b/client/ui/qml/Pages2/PageShare.qml
@@ -18,8 +18,6 @@ import "../Config"
 PageType {
     id: root
 
-    defaultActiveFocusItem: clientNameTextField.textField
-
     enum ConfigType {
         AmneziaConnection,
         OpenVpn,
@@ -47,7 +45,7 @@ PageType {
             shareConnectionDrawer.headerText = qsTr("Connection to ") + serverSelector.text
             shareConnectionDrawer.configContentHeaderText = qsTr("File with connection settings to ") + serverSelector.text
 
-            shareConnectionDrawer.open()
+            shareConnectionDrawer.openTriggered()
             shareConnectionDrawer.contentVisible = false
             PageController.showBusyIndicator(true)
 
@@ -104,7 +102,7 @@ PageType {
         }
 
         function onExportErrorOccurred(error) {
-            shareConnectionDrawer.close()
+            shareConnectionDrawer.closeTriggered()
 
             PageController.showErrorMessage(error)
         }
@@ -119,38 +117,38 @@ PageType {
 
     QtObject {
         id: amneziaConnectionFormat
-        property string name: qsTr("For the AmneziaVPN app")
-        property var type: PageShare.ConfigType.AmneziaConnection
+        readonly property string name: qsTr("For the AmneziaVPN app")
+        readonly property int type: PageShare.ConfigType.AmneziaConnection
     }
     QtObject {
         id: openVpnConnectionFormat
-        property string name: qsTr("OpenVPN native format")
-        property var type: PageShare.ConfigType.OpenVpn
+        readonly property string name: qsTr("OpenVPN native format")
+        readonly property int type: PageShare.ConfigType.OpenVpn
     }
     QtObject {
         id: wireGuardConnectionFormat
-        property string name: qsTr("WireGuard native format")
-        property var type: PageShare.ConfigType.WireGuard
+        readonly property string name: qsTr("WireGuard native format")
+        readonly property int type: PageShare.ConfigType.WireGuard
     }
     QtObject {
         id: awgConnectionFormat
-        property string name: qsTr("AmneziaWG native format")
-        property var type: PageShare.ConfigType.Awg
+        readonly property string name: qsTr("AmneziaWG native format")
+        readonly property int type: PageShare.ConfigType.Awg
     }
     QtObject {
         id: shadowSocksConnectionFormat
-        property string name: qsTr("Shadowsocks native format")
-        property var type: PageShare.ConfigType.ShadowSocks
+        readonly property string name: qsTr("Shadowsocks native format")
+        readonly property int type: PageShare.ConfigType.ShadowSocks
     }
     QtObject {
         id: cloakConnectionFormat
-        property string name: qsTr("Cloak native format")
-        property var type: PageShare.ConfigType.Cloak
+        readonly property string name: qsTr("Cloak native format")
+        readonly property int type: PageShare.ConfigType.Cloak
     }
     QtObject {
         id: xrayConnectionFormat
-        property string name: qsTr("XRay native format")
-        property var type: PageShare.ConfigType.Xray
+        readonly property string name: qsTr("XRay native format")
+        readonly property int type: PageShare.ConfigType.Xray
     }
 
     FlickableType {
@@ -172,16 +170,6 @@ PageType {
 
             spacing: 0
 
-            Item {
-                id: focusItem
-                KeyNavigation.tab: header.actionButton
-                onFocusChanged: {
-                    if (focusItem.activeFocus) {
-                        a.contentY = 0
-                    }
-                }
-            }
-
             HeaderType {
                 id: header
                 Layout.fillWidth: true
@@ -191,11 +179,9 @@ PageType {
 
                 actionButtonImage: "qrc:/images/controls/more-vertical.svg"
                 actionButtonFunction: function() {
-                    shareFullAccessDrawer.open()
+                    shareFullAccessDrawer.openTriggered()
                 }
 
-                KeyNavigation.tab: connectionRadioButton
-
                 DrawerType2 {
                     id: shareFullAccessDrawer
 
@@ -203,13 +189,8 @@ PageType {
 
                     anchors.fill: parent
                     expandedHeight: root.height
-                    onClosed: {
-                        if (!GC.isMobile()) {
-                            clientNameTextField.textField.forceActiveFocus()
-                        }
-                    }
 
-                    expandedContent: ColumnLayout {
+                    expandedStateContent: ColumnLayout {
                         id: shareFullAccessDrawerContent
                         anchors.top: parent.top
                         anchors.left: parent.left
@@ -222,14 +203,6 @@ PageType {
                             shareFullAccessDrawer.expandedHeight = shareFullAccessDrawerContent.implicitHeight + 32
                         }
 
-                        Connections {
-                            target: shareFullAccessDrawer
-                            enabled: !GC.isMobile()
-                            function onOpened() {
-                                focusItem.forceActiveFocus()
-                            }
-                        }
-
                         Header2Type {
                             Layout.fillWidth: true
                             Layout.bottomMargin: 16
@@ -240,24 +213,17 @@ PageType {
                             descriptionText: qsTr("Use for your own devices, or share with those you trust to manage the server.")
                         }
 
-                        Item {
-                            id: focusItem
-                            KeyNavigation.tab: shareFullAccessButton.rightButton
-                        }
-
                         LabelWithButtonType {
                             id: shareFullAccessButton
                             Layout.fillWidth: true
 
                             text: qsTr("Share")
                             rightImageSource: "qrc:/images/controls/chevron-right.svg"
-                            KeyNavigation.tab: focusItem
 
                             clickedFunction: function() {
                                 PageController.goToPage(PageEnum.PageShareFullAccess)
-                                shareFullAccessDrawer.close()
+                                shareFullAccessDrawer.closeTriggered()
                             }
-
                         }
                     }
                 }
@@ -288,13 +254,8 @@ PageType {
                         implicitWidth: (root.width - 32) / 2
                         text: qsTr("Connection")
 
-                        KeyNavigation.tab: usersRadioButton
-
                         onClicked: {
                             accessTypeSelector.currentIndex = 0
-                            if (!GC.isMobile()) {
-                                clientNameTextField.textField.forceActiveFocus()
-                            }
                         }
                     }
 
@@ -305,15 +266,12 @@ PageType {
                         implicitWidth: (root.width - 32) / 2
                         text: qsTr("Users")
 
-                        KeyNavigation.tab: accessTypeSelector.currentIndex === 0 ? clientNameTextField.textField : serverSelector
-
                         onClicked: {
                             accessTypeSelector.currentIndex = 1
                             PageController.showBusyIndicator(true)
                             ExportController.updateClientManagementModel(ContainersModel.getProcessedContainerIndex(),
                                                                          ServersModel.getProcessedServerCredentials())
                             PageController.showBusyIndicator(false)
-                            focusItem.forceActiveFocus()
                         }
                     }
                 }
@@ -342,9 +300,6 @@ PageType {
                 textField.maximumLength: 20
 
                 checkEmptyText: true
-
-                KeyNavigation.tab: serverSelector
-
             }
 
             DropDownType {
@@ -385,31 +340,30 @@ PageType {
                     clickedFunction: function() {
                         handler()
 
-                        if (serverSelector.currentIndex !== serverSelectorListView.currentIndex) {
-                            serverSelector.currentIndex = serverSelectorListView.currentIndex
+                        if (serverSelector.currentIndex !== serverSelectorListView.selectedIndex) {
+                            serverSelector.currentIndex = serverSelectorListView.selectedIndex
                             serverSelector.severSelectorIndexChanged()
                         }
 
-                        serverSelector.close()
+                        serverSelector.closeTriggered()
                     }
 
                     Component.onCompleted: {
                         if (ServersModel.isDefaultServerHasWriteAccess() && ServersModel.getDefaultServerData("hasInstalledContainers")) {
-                            serverSelectorListView.currentIndex = proxyServersModel.mapFromSource(ServersModel.defaultIndex)
+                            serverSelectorListView.selectedIndex = proxyServersModel.mapFromSource(ServersModel.defaultIndex)
                         } else {
-                            serverSelectorListView.currentIndex = 0
+                            serverSelectorListView.selectedIndex = 0
                         }
 
+                        serverSelectorListView.positionViewAtIndex(selectedIndex, ListView.Beginning)
                         serverSelectorListView.triggerCurrentItem()
                     }
 
                     function handler() {
                         serverSelector.text = selectedText
-                        ServersModel.processedIndex = proxyServersModel.mapToSource(currentIndex)
+                        ServersModel.processedIndex = proxyServersModel.mapToSource(selectedIndex)
                     }
                 }
-
-                KeyNavigation.tab: protocolSelector
             }
 
             DropDownType {
@@ -445,12 +399,10 @@ PageType {
                         ]
                     }
 
-                    currentIndex: 0
-
                     clickedFunction: function() {
                         handler()
 
-                        protocolSelector.close()
+                        protocolSelector.closeTriggered()
                     }
 
                     Connections {
@@ -458,7 +410,8 @@ PageType {
 
                         function onSeverSelectorIndexChanged() {
                             var defaultContainer = proxyContainersModel.mapFromSource(ServersModel.getProcessedServerData("defaultContainer"))
-                            protocolSelectorListView.currentIndex = defaultContainer
+                            protocolSelectorListView.selectedIndex = defaultContainer
+                            protocolSelectorListView.positionViewAtIndex(selectedIndex, ListView.Beginning)
                             protocolSelectorListView.triggerCurrentItem()
                         }
                     }
@@ -473,7 +426,7 @@ PageType {
 
                         protocolSelector.text = selectedText
 
-                        ContainersModel.setProcessedContainerIndex(proxyContainersModel.mapToSource(currentIndex))
+                        ContainersModel.setProcessedContainerIndex(proxyContainersModel.mapToSource(selectedIndex))
 
                         fillConnectionTypeModel()
 
@@ -488,7 +441,7 @@ PageType {
                     function fillConnectionTypeModel() {
                         root.connectionTypesModel = [amneziaConnectionFormat]
 
-                        var index = proxyContainersModel.mapToSource(currentIndex)
+                        var index = proxyContainersModel.mapToSource(selectedIndex)
 
                         if (index === ContainerProps.containerFromString("amnezia-openvpn")) {
                             root.connectionTypesModel.push(openVpnConnectionFormat)
@@ -508,12 +461,6 @@ PageType {
                         }
                     }
                 }
-
-                KeyNavigation.tab: accessTypeSelector.currentIndex === 0 ?
-                                       exportTypeSelector :
-                                       isSearchBarVisible ?
-                                           searchTextField.textField :
-                                           usersHeader.actionButton
             }
 
             DropDownType {
@@ -549,7 +496,7 @@ PageType {
                     clickedFunction: function() {
                         exportTypeSelector.text = selectedText
                         exportTypeSelector.currentIndex = currentIndex
-                        exportTypeSelector.close()
+                        exportTypeSelector.closeTriggered()
                     }
 
                     Component.onCompleted: {
@@ -557,9 +504,6 @@ PageType {
                         exportTypeSelector.currentIndex = currentIndex
                     }
                 }
-
-                KeyNavigation.tab: shareButton
-
             }
 
             BasicButtonType {
@@ -575,7 +519,6 @@ PageType {
                 text: qsTr("Share")
                 leftImageSource: "qrc:/images/controls/share-2.svg"
 
-                Keys.onTabPressed: lastItemTabClicked(focusItem)
 
                 parentFlickable: a
 
@@ -584,7 +527,6 @@ PageType {
                         ExportController.generateConfig(root.connectionTypesModel[exportTypeSelector.currentIndex].type)
                     }
                 }
-
             }
 
             Header2Type {
@@ -600,11 +542,6 @@ PageType {
                 actionButtonFunction: function() {
                     root.isSearchBarVisible = true
                 }
-
-                Keys.onTabPressed: clientsListView.model.count > 0 ?
-                                       clientsListView.forceActiveFocus() :
-                                       lastItemTabClicked(focusItem)
-
             }
 
             RowLayout {
@@ -618,35 +555,13 @@ PageType {
 
                     textFieldPlaceholderText: qsTr("Search")
 
-                    Connections {
-                        target: root
-                        function onIsSearchBarVisibleChanged() {
-                            if (root.isSearchBarVisible) {
-                                searchTextField.textField.forceActiveFocus()
-                            } else {
-                                searchTextField.textFieldText = ""
-                                if (!GC.isMobile()) {
-                                    usersHeader.actionButton.forceActiveFocus()
-                                }
-                            }
-                        }
-                    }
-
                     Keys.onEscapePressed: {
                         root.isSearchBarVisible = false
                     }
 
                     function navigateTo() {
-                        if (GC.isMobile()) {
-                            focusItem.forceActiveFocus()
-                            return;
-                        }
-
                         if (searchTextField.textFieldText === "") {
                             root.isSearchBarVisible = false
-                            usersHeader.actionButton.forceActiveFocus()
-                        } else {
-                            closeSearchButton.forceActiveFocus()
                         }
                     }
 
@@ -660,16 +575,6 @@ PageType {
                     image: "qrc:/images/controls/close.svg"
                     imageColor: AmneziaStyle.color.paleGray
 
-                    Keys.onTabPressed: {
-                        if (!GC.isMobile()) {
-                            if (clientsListView.model.count > 0) {
-                                clientsListView.forceActiveFocus()
-                            } else {
-                                lastItemTabClicked(focusItem)
-                            }
-                        }
-                    }
-
                     function clickedFunc() {
                         root.isSearchBarVisible = false
                     }
@@ -687,6 +592,8 @@ PageType {
 
                 visible: accessTypeSelector.currentIndex === 1
 
+                property bool isFocusable: true
+
                 model: SortFilterProxyModel {
                     id: proxyClientManagementModel
                     sourceModel: ClientManagementModel
@@ -699,44 +606,12 @@ PageType {
 
                 clip: true
                 interactive: false
-
-                activeFocusOnTab: true
-                focus: true
-                Keys.onTabPressed: {
-                    if (!GC.isMobile()) {
-                        if (currentIndex < this.count - 1) {
-                            this.incrementCurrentIndex()
-                            currentItem.focusItem.forceActiveFocus()
-                        } else {
-                            this.currentIndex = 0
-                            lastItemTabClicked(focusItem)
-                        }
-                    }
-                }
-
-                onActiveFocusChanged: {
-                    if (focus && !GC.isMobile()) {
-                        currentIndex = 0
-                        currentItem.focusItem.forceActiveFocus()
-                    }
-                }
-
-                onCurrentIndexChanged: {
-                    if (currentItem) {
-                        if (currentItem.y < a.contentY) {
-                            a.contentY = currentItem.y
-                        } else if (currentItem.y + currentItem.height + clientsListView.y > a.contentY + a.height) {
-                            a.contentY = currentItem.y + clientsListView.y + currentItem.height - a.height
-                        }
-                    }
-                }
+                reuseItems: true
 
                 delegate: Item {
                     implicitWidth: clientsListView.width
                     implicitHeight: delegateContent.implicitHeight
 
-                    property alias focusItem: clientFocusItem.rightButton
-
                     ColumnLayout {
                         id: delegateContent
 
@@ -755,7 +630,7 @@ PageType {
                             rightImageSource: "qrc:/images/controls/chevron-right.svg"
 
                             clickedFunction: function() {
-                                clientInfoDrawer.open()
+                                clientInfoDrawer.openTriggered()
                             }
                         }
 
@@ -766,17 +641,11 @@ PageType {
 
                             parent: root
 
-                            onClosed: {
-                                if (!GC.isMobile()) {
-                                    focusItem.forceActiveFocus()
-                                }
-                            }
-
                             width: root.width
                             height: root.height
 
-                            expandedContent: ColumnLayout {
-                                id: expandedContent
+                            expandedStateContent: ColumnLayout {
+                                id: expandedStateContent
                                 anchors.top: parent.top
                                 anchors.left: parent.left
                                 anchors.right: parent.right
@@ -785,15 +654,7 @@ PageType {
                                 anchors.rightMargin: 16
 
                                 onImplicitHeightChanged: {
-                                    clientInfoDrawer.expandedHeight = expandedContent.implicitHeight + 32
-                                }
-
-                                Connections {
-                                    target: clientInfoDrawer
-                                    enabled: !GC.isMobile()
-                                    function onOpened() {
-                                        focusItem1.forceActiveFocus()
-                                    }
+                                    clientInfoDrawer.expandedHeight = expandedStateContent.implicitHeight + 32
                                 }
 
                                 Header2TextType {
@@ -809,7 +670,11 @@ PageType {
                                 ParagraphTextType {
                                     color: AmneziaStyle.color.mutedGray
                                     visible: creationDate
-                                    Layout.fillWidth: true
+                                    Layout.maximumWidth: parent.width
+
+                                    maximumLineCount: 2
+                                    wrapMode: Text.Wrap
+                                    elide: Qt.ElideRight
 
                                     text: qsTr("Creation date: %1").arg(creationDate)
                                 }
@@ -817,7 +682,11 @@ PageType {
                                 ParagraphTextType {
                                     color: AmneziaStyle.color.mutedGray
                                     visible: latestHandshake
-                                    Layout.fillWidth: true
+                                    Layout.maximumWidth: parent.width
+
+                                    maximumLineCount: 2
+                                    wrapMode: Text.Wrap
+                                    elide: Qt.ElideRight
 
                                     text: qsTr("Latest handshake: %1").arg(latestHandshake)
                                 }
@@ -825,7 +694,11 @@ PageType {
                                 ParagraphTextType {
                                     color: AmneziaStyle.color.mutedGray
                                     visible: dataReceived
-                                    Layout.fillWidth: true
+                                    Layout.maximumWidth: parent.width
+
+                                    maximumLineCount: 2
+                                    wrapMode: Text.Wrap
+                                    elide: Qt.ElideRight
 
                                     text: qsTr("Data received: %1").arg(dataReceived)
                                 }
@@ -833,7 +706,11 @@ PageType {
                                 ParagraphTextType {
                                     color: AmneziaStyle.color.mutedGray
                                     visible: dataSent
-                                    Layout.fillWidth: true
+                                    Layout.maximumWidth: parent.width
+
+                                    maximumLineCount: 2
+                                    wrapMode: Text.Wrap
+                                    elide: Qt.ElideRight
 
                                     text: qsTr("Data sent: %1").arg(dataSent)
                                 }
@@ -841,14 +718,11 @@ PageType {
                                 ParagraphTextType {
                                     color: AmneziaStyle.color.mutedGray
                                     visible: allowedIps
-                                    Layout.fillWidth: true
+                                    Layout.maximumWidth: parent.width
 
-                                    text: qsTr("Allowed IPs: %1").arg(allowedIps)
-                                }
+                                    wrapMode: Text.Wrap
 
-                                Item {
-                                    id: focusItem1
-                                    KeyNavigation.tab: renameButton
+                                    text: qsTr("Allowed IPs: %1").arg(allowedIps)
                                 }
 
                                 BasicButtonType {
@@ -865,10 +739,8 @@ PageType {
 
                                     text: qsTr("Rename")
 
-                                    KeyNavigation.tab: revokeButton
-
                                     clickedFunc: function() {
-                                        clientNameEditDrawer.open()
+                                        clientNameEditDrawer.openTriggered()
                                     }
 
                                     DrawerType2 {
@@ -879,13 +751,7 @@ PageType {
                                         anchors.fill: parent
                                         expandedHeight: root.height * 0.35
 
-                                        onClosed: {
-                                            if (!GC.isMobile()) {
-                                                focusItem1.forceActiveFocus()
-                                            }
-                                        }
-
-                                        expandedContent: ColumnLayout {
+                                        expandedStateContent: ColumnLayout {
                                             anchors.top: parent.top
                                             anchors.left: parent.left
                                             anchors.right: parent.right
@@ -893,19 +759,6 @@ PageType {
                                             anchors.leftMargin: 16
                                             anchors.rightMargin: 16
 
-                                            Connections {
-                                                target: clientNameEditDrawer
-                                                enabled: !GC.isMobile()
-                                                function onOpened() {
-                                                    clientNameEditor.textField.forceActiveFocus()
-                                                }
-                                            }
-
-                                            Item {
-                                                id: focusItem2
-                                                KeyNavigation.tab: clientNameEditor.textField
-                                            }
-
                                             TextFieldWithHeaderType {
                                                 id: clientNameEditor
                                                 Layout.fillWidth: true
@@ -913,8 +766,6 @@ PageType {
                                                 textFieldText: clientName
                                                 textField.maximumLength: 20
                                                 checkEmptyText: true
-
-                                                KeyNavigation.tab: saveButton
                                             }
 
                                             BasicButtonType {
@@ -923,7 +774,6 @@ PageType {
                                                 Layout.fillWidth: true
 
                                                 text: qsTr("Save")
-                                                KeyNavigation.tab: focusItem2
 
                                                 clickedFunc: function() {
                                                     if (clientNameEditor.textFieldText === "") {
@@ -937,7 +787,7 @@ PageType {
                                                                                       ContainersModel.getProcessedContainerIndex(),
                                                                                       ServersModel.getProcessedServerCredentials())
                                                         PageController.showBusyIndicator(false)
-                                                        clientNameEditDrawer.close()
+                                                        clientNameEditDrawer.closeTriggered()
                                                     }
                                                 }
                                             }
@@ -958,7 +808,6 @@ PageType {
                                     borderWidth: 1
 
                                     text: qsTr("Revoke")
-                                    KeyNavigation.tab: focusItem1
 
                                     clickedFunc: function() {
                                         var headerText = qsTr("Revoke the config for a user - %1?").arg(clientName)
@@ -967,12 +816,12 @@ PageType {
                                         var noButtonText = qsTr("Cancel")
 
                                         var yesButtonFunction = function() {
-                                            clientInfoDrawer.close()
+                                            clientInfoDrawer.closeTriggered()
                                             root.revokeConfig(index)
                                         }
                                         var noButtonFunction = function() {
                                             if (!GC.isMobile()) {
-                                                focusItem1.forceActiveFocus()
+                                                // focusItem1.forceActiveFocus()
                                             }
                                         }
 
@@ -991,18 +840,5 @@ PageType {
         id: shareConnectionDrawer
 
         anchors.fill: parent
-        onClosed: {
-            if (!GC.isMobile()) {
-                clientNameTextField.textField.forceActiveFocus()
-            }
-        }
-    }
-
-    MouseArea {
-        anchors.fill: parent
-        onPressed: function(mouse) {
-            forceActiveFocus()
-            mouse.accepted = false
-        }
     }
 }
diff --git a/client/ui/qml/Pages2/PageShareFullAccess.qml b/client/ui/qml/Pages2/PageShareFullAccess.qml
index 404ba563f..af409d722 100644
--- a/client/ui/qml/Pages2/PageShareFullAccess.qml
+++ b/client/ui/qml/Pages2/PageShareFullAccess.qml
@@ -18,13 +18,6 @@ import "../Config"
 PageType {
     id: root
 
-    defaultActiveFocusItem: focusItem
-
-    Item {
-        id: focusItem
-        KeyNavigation.tab: backButton
-    }
-
     BackButtonType {
         id: backButton
 
@@ -32,8 +25,6 @@ PageType {
         anchors.left: parent.left
         anchors.right: parent.right
         anchors.topMargin: 20
-
-        KeyNavigation.tab: serverSelector
     }
 
     FlickableType {
@@ -85,8 +76,6 @@ PageType {
                 descriptionText: qsTr("Server")
                 headerText: qsTr("Server")
 
-                KeyNavigation.tab: shareButton
-
                 listView: ListViewWithRadioButtonType {
                     id: serverSelectorListView
 
@@ -113,7 +102,7 @@ PageType {
 
                         shareConnectionDrawer.headerText = qsTr("Accessing ") + serverSelector.text
                         shareConnectionDrawer.configContentHeaderText = qsTr("File with accessing settings to ") + serverSelector.text
-                        serverSelector.close()
+                        serverSelector.closeTriggered()
                     }
 
                     Component.onCompleted: {
@@ -137,8 +126,6 @@ PageType {
                 text: qsTr("Share")
                 leftImageSource: "qrc:/images/controls/share-2.svg"
 
-                Keys.onTabPressed: lastItemTabClicked(focusItem)
-
                 clickedFunc: function() {
                     PageController.showBusyIndicator(true)
 
@@ -153,7 +140,7 @@ PageType {
                     shareConnectionDrawer.headerText = qsTr("Connection to ") + serverSelector.text
                     shareConnectionDrawer.configContentHeaderText = qsTr("File with connection settings to ") + serverSelector.text
 
-                    shareConnectionDrawer.open()
+                    shareConnectionDrawer.openTriggered()
                     shareConnectionDrawer.contentVisible = true
 
                     PageController.showBusyIndicator(false)
@@ -166,10 +153,5 @@ PageType {
         id: shareConnectionDrawer
 
         anchors.fill: parent
-        onClosed: {
-            if (!GC.isMobile()) {
-                focusItem.forceActiveFocus()
-            }
-        }
     }
 }
diff --git a/client/ui/qml/Pages2/PageStart.qml b/client/ui/qml/Pages2/PageStart.qml
index 640c61ef4..83e7626d8 100644
--- a/client/ui/qml/Pages2/PageStart.qml
+++ b/client/ui/qml/Pages2/PageStart.qml
@@ -15,12 +15,12 @@ import "../Components"
 PageType {
     id: root
 
-    defaultActiveFocusItem: homeTabButton
-
     property bool isControlsDisabled: false
     property bool isTabBarDisabled: false
 
     Connections {
+        objectName: "pageControllerConnection"
+
         target: PageController
 
         function onGoToPageHome() {
@@ -90,19 +90,11 @@ PageType {
                 PageController.closePage()
             }
         }
-
-        function onForceTabBarActiveFocus() {
-            homeTabButton.focus = true
-            tabBar.forceActiveFocus()
-        }
-
-        function onForceStackActiveFocus() {
-            homeTabButton.focus = true
-            tabBarStackView.forceActiveFocus()
-        }
     }
 
     Connections {
+        objectName: "installControllerConnections"
+
         target: InstallController
 
         function onInstallationErrorOccurred(error) {
@@ -165,6 +157,8 @@ PageType {
     }
 
     Connections {
+        objectName: "connectionControllerConnections"
+
         target: ConnectionController
 
         function onReconnectWithUpdatedContainer(message) {
@@ -182,6 +176,8 @@ PageType {
     }
 
     Connections {
+        objectName: "importControllerConnections"
+
         target: ImportController
 
         function onImportErrorOccurred(error, goToPageHome) {
@@ -196,6 +192,8 @@ PageType {
     }
 
     Connections {
+        objectName: "settingsControllerConnections"
+
         target: SettingsController
 
         function onLoggingDisableByWatcher() {
@@ -218,6 +216,7 @@ PageType {
 
     StackViewType {
         id: tabBarStackView
+        objectName: "tabBarStackView"
 
         anchors.top: parent.top
         anchors.right: parent.right
@@ -247,13 +246,28 @@ PageType {
         }
 
         Keys.onPressed: function(event) {
-            PageController.keyPressEvent(event.key)
-            event.accepted = true
+            console.debug(">>>> ", event.key, " Event is caught by StartPage")
+            switch (event.key) {
+            case Qt.Key_Tab:
+            case Qt.Key_Down:
+            case Qt.Key_Right:
+                FocusController.nextKeyTabItem()
+                break
+            case Qt.Key_Backtab:
+            case Qt.Key_Up:
+            case Qt.Key_Left:
+                FocusController.previousKeyTabItem()
+                break
+            default:
+                PageController.keyPressEvent(event.key)
+                event.accepted = true
+            }
         }
     }
 
     TabBar {
         id: tabBar
+        objectName: "tabBar"
 
         anchors.right: parent.right
         anchors.left: parent.left
@@ -269,6 +283,8 @@ PageType {
         enabled: !root.isControlsDisabled && !root.isTabBarDisabled
 
         background: Shape {
+            objectName: "backgroundShape"
+
             width: parent.width
             height: parent.height
 
@@ -289,6 +305,8 @@ PageType {
 
         TabImageButtonType {
             id: homeTabButton
+            objectName: "homeTabButton"
+
             isSelected: tabBar.currentIndex === 0
             image: "qrc:/images/controls/home.svg"
             clickedFunc: function () {
@@ -296,27 +314,26 @@ PageType {
                 ServersModel.processedIndex = ServersModel.defaultIndex
                 tabBar.currentIndex = 0
             }
-
-            KeyNavigation.tab: shareTabButton
-            Keys.onEnterPressed: this.clicked()
-            Keys.onReturnPressed: this.clicked()
         }
 
         TabImageButtonType {
             id: shareTabButton
+            objectName: "shareTabButton"
 
             Connections {
                 target: ServersModel
 
                 function onModelReset() {
-                    var hasServerWithWriteAccess = ServersModel.hasServerWithWriteAccess()
-                    shareTabButton.visible = hasServerWithWriteAccess
-                    shareTabButton.width = hasServerWithWriteAccess ? undefined : 0
+                    if (!SettingsController.isOnTv()) {
+                        var hasServerWithWriteAccess = ServersModel.hasServerWithWriteAccess()
+                        shareTabButton.visible = hasServerWithWriteAccess
+                        shareTabButton.width = hasServerWithWriteAccess ? undefined : 0
+                    }
                 }
             }
 
-            visible: ServersModel.hasServerWithWriteAccess()
-            width: ServersModel.hasServerWithWriteAccess() ? undefined : 0
+            visible: !SettingsController.isOnTv() && ServersModel.hasServerWithWriteAccess()
+            width: !SettingsController.isOnTv() && ServersModel.hasServerWithWriteAccess() ? undefined : 0
 
             isSelected: tabBar.currentIndex === 1
             image: "qrc:/images/controls/share-2.svg"
@@ -324,32 +341,30 @@ PageType {
                 tabBarStackView.goToTabBarPage(PageEnum.PageShare)
                 tabBar.currentIndex = 1
             }
-
-            KeyNavigation.tab: settingsTabButton
         }
 
         TabImageButtonType {
             id: settingsTabButton
+            objectName: "settingsTabButton"
+
             isSelected: tabBar.currentIndex === 2
             image: "qrc:/images/controls/settings-2.svg"
             clickedFunc: function () {
                 tabBarStackView.goToTabBarPage(PageEnum.PageSettings)
                 tabBar.currentIndex = 2
             }
-
-            KeyNavigation.tab: plusTabButton
         }
 
         TabImageButtonType {
             id: plusTabButton
+            objectName: "plusTabButton"
+
             isSelected: tabBar.currentIndex === 3
             image: "qrc:/images/controls/plus.svg"
             clickedFunc: function () {
                 tabBarStackView.goToTabBarPage(PageEnum.PageSetupWizardConfigSource)
                 tabBar.currentIndex = 3
             }
-
-            Keys.onTabPressed: PageController.forceStackActiveFocus()
         }
     }
 }
diff --git a/client/ui/qml/main2.qml b/client/ui/qml/main2.qml
index fb99559f4..8b73e62d2 100644
--- a/client/ui/qml/main2.qml
+++ b/client/ui/qml/main2.qml
@@ -15,6 +15,7 @@ import "Pages2"
 Window  {
     id: root
     objectName: "mainWindow"
+
     visible: true
     width: GC.screenWidth
     height: GC.screenHeight
@@ -26,13 +27,39 @@ Window  {
     color: AmneziaStyle.color.midnightBlack
 
     onClosing: function() {
-        console.debug("QML onClosing signal")
         PageController.closeWindow()
     }
 
     title: "AmneziaVPN"
 
+    Item { // This item is needed for focus handling
+        id: defaultFocusItem
+        objectName: "defaultFocusItem"
+
+        focus: true
+
+        Keys.onPressed: function(event) {
+            switch (event.key) {
+            case Qt.Key_Tab:
+            case Qt.Key_Down:
+            case Qt.Key_Right:
+                FocusController.nextKeyTabItem()
+                break
+            case Qt.Key_Backtab:
+            case Qt.Key_Up:
+            case Qt.Key_Left:
+                FocusController.previousKeyTabItem()
+                break
+            default:
+                PageController.keyPressEvent(event.key)
+                event.accepted = true
+            }
+        }
+    }
+
     Connections {
+        objectName: "pageControllerConnections"
+
         target: PageController
 
         function onRaiseMainWindow() {
@@ -58,7 +85,7 @@ Window  {
         }
 
         function onShowPassphraseRequestDrawer() {
-            privateKeyPassphraseDrawer.open()
+            privateKeyPassphraseDrawer.openTriggered()
         }
 
         function onGoToPageSettingsBackup() {
@@ -72,6 +99,8 @@ Window  {
     }
 
     Connections {
+        objectName: "settingsControllerConnections"
+
         target: SettingsController
 
         function onChangeSettingsFinished(finishedMessage) {
@@ -80,11 +109,15 @@ Window  {
     }
 
     PageStart {
+        objectName: "pageStart"
+
         width: root.width
         height: root.height
     }
 
     Item {
+        objectName: "popupNotificationItem"
+
         anchors.right: parent.right
         anchors.left: parent.left
         anchors.bottom: parent.bottom
@@ -108,6 +141,8 @@ Window  {
     }
 
     Item {
+        objectName: "popupErrorMessageItem"
+
         anchors.right: parent.right
         anchors.left: parent.left
         anchors.bottom: parent.bottom
@@ -120,6 +155,8 @@ Window  {
     }
 
     Item {
+        objectName: "privateKeyPassphraseDrawerItem"
+
         anchors.fill: parent
 
         DrawerType2 {
@@ -128,7 +165,7 @@ Window  {
             anchors.fill: parent
             expandedHeight: root.height * 0.35
 
-            expandedContent: ColumnLayout {
+            expandedStateContent: ColumnLayout {
                 anchors.top: parent.top
                 anchors.left: parent.left
                 anchors.right: parent.right
@@ -167,8 +204,6 @@ Window  {
                     clickedFunc: function() {
                         hidePassword = !hidePassword
                     }
-
-                    KeyNavigation.tab: saveButton
                 }
 
                 BasicButtonType {
@@ -186,7 +221,7 @@ Window  {
                     text: qsTr("Save")
 
                     clickedFunc: function() {
-                        privateKeyPassphraseDrawer.close()
+                        privateKeyPassphraseDrawer.closeTriggered()
                         PageController.passphraseRequestDrawerClosed(passphrase.textFieldText)
                     }
                 }
@@ -195,6 +230,8 @@ Window  {
     }
 
     Item {
+        objectName: "questionDrawerItem"
+
         anchors.fill: parent
 
         QuestionDrawer {
@@ -205,6 +242,8 @@ Window  {
     }
 
     Item {
+        objectName: "busyIndicatorItem"
+
         anchors.fill: parent
 
         BusyIndicatorType {
@@ -221,26 +260,26 @@ Window  {
         questionDrawer.noButtonText = noButtonText
 
         questionDrawer.yesButtonFunction = function() {
-            questionDrawer.close()
+            questionDrawer.closeTriggered()
             if (yesButtonFunction && typeof yesButtonFunction === "function") {
                 yesButtonFunction()
             }
         }
         questionDrawer.noButtonFunction = function() {
-            questionDrawer.close()
+            questionDrawer.closeTriggered()
             if (noButtonFunction && typeof noButtonFunction === "function") {
                 noButtonFunction()
             }
         }
-        questionDrawer.open()
+        questionDrawer.openTriggered()
     }
 
     FileDialog {
         id: mainFileDialog
+        objectName: "mainFileDialog"
 
         property bool isSaveMode: false
 
-        objectName: "mainFileDialog"
         fileMode: isSaveMode ? FileDialog.SaveFile : FileDialog.OpenFile
 
         onAccepted: SystemController.fileDialogClosed(true)
diff --git a/client/utilities.cpp b/client/utilities.cpp
index 1cc69aeb1..61944e510 100755
--- a/client/utilities.cpp
+++ b/client/utilities.cpp
@@ -194,8 +194,13 @@ bool Utils::processIsRunning(const QString &fileName, const bool fullFlag)
     return false;
 #else
     QProcess process;
+    QStringList arguments;
+    if (fullFlag) {
+        arguments << "-f";
+    }
+    arguments << fileName;
     process.setProcessChannelMode(QProcess::MergedChannels);
-    process.start("pgrep", QStringList({ fullFlag ? "-f" : "", fileName }));
+    process.start("pgrep", arguments);
     process.waitForFinished();
     if (process.exitStatus() == QProcess::NormalExit) {
         if (fullFlag) {
@@ -248,7 +253,7 @@ bool Utils::killProcessByName(const QString &name)
 #elif defined Q_OS_IOS || defined(Q_OS_ANDROID)
     return false;
 #else
-    QProcess::execute(QString("pkill %1").arg(name));
+    return QProcess::execute("pkill", { name }) == 0;
 #endif
 }
 
diff --git a/client/utils/qmlUtils.cpp b/client/utils/qmlUtils.cpp
new file mode 100644
index 000000000..b9557b147
--- /dev/null
+++ b/client/utils/qmlUtils.cpp
@@ -0,0 +1,128 @@
+#include "qmlUtils.h"
+
+#include <QPointF>
+#include <QQuickItem>
+#include <QQuickWindow>
+
+namespace FocusControl
+{
+    QPointF getItemCenterPointOnScene(QQuickItem *item)
+    {
+        const auto x0 = item->x() + (item->width() / 2);
+        const auto y0 = item->y() + (item->height() / 2);
+        return item->parentItem()->mapToScene(QPointF { x0, y0 });
+    }
+
+    bool isEnabled(QObject *obj)
+    {
+        const auto item = qobject_cast<QQuickItem *>(obj);
+        return item && item->isEnabled();
+    }
+
+    bool isVisible(QObject *item)
+    {
+        const auto res = item->property("visible").toBool();
+        return res;
+    }
+
+    bool isFocusable(QObject *item)
+    {
+        const auto res = item->property("isFocusable").toBool();
+        return res;
+    }
+
+    bool isListView(QObject *item)
+    {
+        return item->inherits("QQuickListView");
+    }
+
+    bool isOnTheScene(QObject *object)
+    {
+        QQuickItem *item = qobject_cast<QQuickItem *>(object);
+        if (!item) {
+            qWarning() << "Couldn't recognize object as item";
+            return false;
+        }
+
+        if (!item->isVisible()) {
+            return false;
+        }
+
+        QRectF itemRect = item->mapRectToScene(item->childrenRect());
+
+        QQuickWindow *window = item->window();
+        if (!window) {
+            qWarning() << "Couldn't get the window on the Scene check";
+            return false;
+        }
+
+        const auto contentItem = window->contentItem();
+        if (!contentItem) {
+            qWarning() << "Couldn't get the content item on the Scene check";
+            return false;
+        }
+        QRectF windowRect = contentItem->childrenRect();
+        const auto res = (windowRect.contains(itemRect) || isListView(item));
+        return res;
+    }
+
+    bool isMore(QObject *item1, QObject *item2)
+    {
+        return !isLess(item1, item2);
+    }
+
+    bool isLess(QObject *item1, QObject *item2)
+    {
+        const auto p1 = getItemCenterPointOnScene(qobject_cast<QQuickItem *>(item1));
+        const auto p2 = getItemCenterPointOnScene(qobject_cast<QQuickItem *>(item2));
+        return (p1.y() == p2.y()) ? (p1.x() < p2.x()) : (p1.y() < p2.y());
+    }
+
+    QList<QObject *> getSubChain(QObject *object)
+    {
+        QList<QObject *> res;
+        if (!object) {
+            return res;
+        }
+
+        const auto children = object->children();
+
+        for (const auto child : children) {
+            if (child && isFocusable(child) && isOnTheScene(child) && isEnabled(child)) {
+                res.append(child);
+            } else {
+                res.append(getSubChain(child));
+            }
+        }
+        return res;
+    }
+
+    QList<QObject *> getItemsChain(QObject *object)
+    {
+        QList<QObject *> res;
+        if (!object) {
+            return res;
+        }
+
+        const auto children = object->children();
+
+        for (const auto child : children) {
+            if (child && isFocusable(child) && isEnabled(child) && isVisible(child)) {
+                res.append(child);
+            } else {
+                res.append(getItemsChain(child));
+            }
+        }
+        return res;
+    }
+
+    void printItems(const QList<QObject *> &items, QObject *current_item)
+    {
+        for (const auto &item : items) {
+            QQuickItem *i = qobject_cast<QQuickItem *>(item);
+            QPointF coords { getItemCenterPointOnScene(i) };
+            QString prefix = current_item == i ? "==>" : "   ";
+            qDebug() << prefix << " Item: " << i << " with coords: " << coords;
+        }
+    }
+} // namespace FocusControl
\ No newline at end of file
diff --git a/client/utils/qmlUtils.h b/client/utils/qmlUtils.h
new file mode 100644
index 000000000..535377c4f
--- /dev/null
+++ b/client/utils/qmlUtils.h
@@ -0,0 +1,30 @@
+#ifndef FOCUSCONTROL_H
+#define FOCUSCONTROL_H
+
+#include <QList>
+#include <QObject>
+
+namespace FocusControl
+{
+    bool isEnabled(QObject *item);
+    bool isVisible(QObject *item);
+    bool isFocusable(QObject *item);
+    bool isListView(QObject *item);
+    bool isOnTheScene(QObject *object);
+    bool isMore(QObject *item1, QObject *item2);
+    bool isLess(QObject *item1, QObject *item2);
+
+    /*!
+     * \brief Make focus chain of elements which are on the scene
+     */
+    QList<QObject *> getSubChain(QObject *object);
+
+    /*!
+     * \brief Make focus chain of elements which could be not on the scene
+     */
+    QList<QObject *> getItemsChain(QObject *object);
+
+    void printItems(const QList<QObject *> &items, QObject *current_item);
+} // namespace FocusControl
+
+#endif // FOCUSCONTROL_H
diff --git a/ipc/ipcserver.cpp b/ipc/ipcserver.cpp
index 679c34405..11afe4e3e 100644
--- a/ipc/ipcserver.cpp
+++ b/ipc/ipcserver.cpp
@@ -230,6 +230,8 @@ bool IpcServer::enableKillSwitch(const QJsonObject &configStr, int vpnAdapterInd
 
 #ifdef Q_OS_LINUX
     // double-check + ensure our firewall is installed and enabled
+    if (!LinuxFirewall::isInstalled())
+        LinuxFirewall::install();
     LinuxFirewall::setAnchorEnabled(LinuxFirewall::Both, QStringLiteral("000.allowLoopback"), true);
     LinuxFirewall::setAnchorEnabled(LinuxFirewall::Both, QStringLiteral("100.blockAll"), blockAll);
     LinuxFirewall::setAnchorEnabled(LinuxFirewall::IPv4, QStringLiteral("110.allowNets"), allowNets);
diff --git a/ipc/ipctun2socksprocess.cpp b/ipc/ipctun2socksprocess.cpp
index ffcb1bcd0..2125f6ab0 100644
--- a/ipc/ipctun2socksprocess.cpp
+++ b/ipc/ipctun2socksprocess.cpp
@@ -11,7 +11,6 @@ IpcProcessTun2Socks::IpcProcessTun2Socks(QObject *parent) :
     IpcProcessTun2SocksSource(parent),
     m_t2sProcess(QSharedPointer<QProcess>(new QProcess()))
 {
-    connect(m_t2sProcess.data(), &QProcess::stateChanged, this, &IpcProcessTun2Socks::stateChanged);
     qDebug() << "IpcProcessTun2Socks::IpcProcessTun2Socks()";
 
 }
@@ -23,8 +22,10 @@ IpcProcessTun2Socks::~IpcProcessTun2Socks()
 
 void IpcProcessTun2Socks::start()
 {
+    connect(m_t2sProcess.data(), &QProcess::stateChanged, this, &IpcProcessTun2Socks::stateChanged);
     qDebug() << "IpcProcessTun2Socks::start()";
     m_t2sProcess->setProgram(amnezia::permittedProcessPath(static_cast<amnezia::PermittedProcess>(amnezia::PermittedProcess::Tun2Socks)));
+
     QString XrayConStr = "socks5://127.0.0.1:10808";
 
 #ifdef Q_OS_WIN
@@ -41,7 +42,11 @@ void IpcProcessTun2Socks::start()
 
     m_t2sProcess->setArguments(arguments);
 
-    Utils::killProcessByName(m_t2sProcess->program());
+    if (Utils::processIsRunning(Utils::executable("tun2socks", false))) {
+        qDebug().noquote() << "kill previos tun2socks";
+        Utils::killProcessByName(Utils::executable("tun2socks", false));
+    }
+
     m_t2sProcess->start();
 
     connect(m_t2sProcess.data(), &QProcess::readyReadStandardOutput, this, [this]() {
@@ -54,12 +59,10 @@ void IpcProcessTun2Socks::start()
     connect(m_t2sProcess.data(), QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), this, [this](int exitCode, QProcess::ExitStatus exitStatus) {
         qDebug().noquote() << "tun2socks finished, exitCode, exiStatus" << exitCode << exitStatus;
         emit setConnectionState(Vpn::ConnectionState::Disconnected);
-        if (exitStatus != QProcess::NormalExit){
-            stop();
-        }
-        if (exitCode !=0 ){
-            stop();
+        if ((exitStatus != QProcess::NormalExit) || (exitCode != 0)) {
+            emit setConnectionState(Vpn::ConnectionState::Error);
         }
+
     });
 
     m_t2sProcess->start();
@@ -69,6 +72,8 @@ void IpcProcessTun2Socks::start()
 void IpcProcessTun2Socks::stop()
 {
     qDebug() << "IpcProcessTun2Socks::stop()";
-    m_t2sProcess->close();
+    m_t2sProcess->disconnect();
+    m_t2sProcess->kill();
+    m_t2sProcess->waitForFinished(3000);
 }
 #endif
diff --git a/service/server/router_linux.cpp b/service/server/router_linux.cpp
index fb7a108cc..852c878f7 100644
--- a/service/server/router_linux.cpp
+++ b/service/server/router_linux.cpp
@@ -152,21 +152,29 @@ bool RouterLinux::routeDeleteList(const QString &gw, const QStringList &ips)
     return cnt;
 }
 
+bool RouterLinux::isServiceActive(const QString &serviceName) {
+    QProcess process;
+    process.start("systemctl", { "is-active", "--quiet", serviceName });
+    process.waitForFinished();
+
+    return process.exitCode() == 0;
+}
+
 void RouterLinux::flushDns()
 {
     QProcess p;
     p.setProcessChannelMode(QProcess::MergedChannels);
 
     //check what the dns manager use
-    if (QFileInfo::exists("/usr/bin/nscd")
-        || QFileInfo::exists("/usr/sbin/nscd")
-        || QFileInfo::exists("/usr/lib/systemd/system/nscd.service"))
-    {
-        p.start("systemctl restart nscd");
-    }
-    else
-    {
-        p.start("systemctl restart systemd-resolved");
+    if (isServiceActive("nscd.service")) {
+        qDebug() << "Restarting nscd.service";
+        p.start("systemctl", { "restart", "nscd" });
+    } else if (isServiceActive("systemd-resolved.service")) {
+        qDebug() << "Restarting systemd-resolved.service";
+        p.start("systemctl", { "restart", "systemd-resolved" });
+    } else {
+        qDebug() << "No suitable DNS manager found.";
+        return;
     }
 
     p.waitForFinished();
diff --git a/service/server/router_linux.h b/service/server/router_linux.h
index 04a26fd2e..2094f5967 100644
--- a/service/server/router_linux.h
+++ b/service/server/router_linux.h
@@ -43,6 +43,7 @@ public slots:
     RouterLinux(RouterLinux const &) = delete;
     RouterLinux& operator= (RouterLinux const&) = delete;
 
+    bool isServiceActive(const QString &serviceName);
     QList<Route> m_addedRoutes;
     DnsUtilsLinux *m_dnsUtil;
 };