force C.UTF-8 assignment

Force C.UTF-8 if the system language is other than en_US. Temporary simplification of script stopping for moby and podman. Stop script execution if Docker is not active.
locale check simplified
2026-05-27 21:36:46 +03:00 · 2024-02-15 01:22:15 +04:00 · 2024-02-14 09:45:46 +04:00 · 2024-02-14 07:53:21 +04:00 · 2024-02-14 04:27:01 +04:00 · 2024-02-14 03:46:03 +04:00
136 changed files with 3683 additions and 11895 deletions
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -14,8 +14,8 @@ jobs:
    runs-on: ubuntu-20.04

    env:
-      QT_VERSION: 6.6.2
-      QIF_VERSION: 4.7
+      QT_VERSION: 6.5.1
+      QIF_VERSION: 4.6

    steps:
    - name: 'Install Qt'
@@ -72,8 +72,8 @@ jobs:
    runs-on: windows-latest

    env:
-      QT_VERSION: 6.6.2
-      QIF_VERSION: 4.7
+      QT_VERSION: 6.5.1
+      QIF_VERSION: 4.6
      BUILD_ARCH: 64

    steps:
@@ -134,7 +134,7 @@ jobs:
    runs-on: macos-13

    env:
-      QT_VERSION: 6.6.2
+      QT_VERSION: 6.5.2
      CC: cc
      CXX: c++

@@ -245,15 +245,10 @@ jobs:
        modules: 'qtremoteobjects qt5compat qtshadertools'
        dir: ${{ runner.temp }}
        setup-python: 'true'
+        tools: 'tools_ifw'
        set-env: 'true'
        extra: '--external 7z --base ${{ env.QT_MIRROR }}'

-    - name: 'Install Qt Installer Framework ${{ env.QIF_VERSION }}'
-      run: |
-        mkdir -pv ${{ runner.temp }}/Qt/Tools/QtInstallerFramework
-        wget https://qt.amzsvc.com/tools/ifw/${{ env.QIF_VERSION }}.zip
-        unzip ${{ env.QIF_VERSION }}.zip -d ${{ runner.temp }}/Qt/Tools/QtInstallerFramework/
-
    - name: 'Get sources'
      uses: actions/checkout@v4
      with:
@@ -291,7 +286,7 @@ jobs:

    env:
      ANDROID_BUILD_PLATFORM: android-34
-      QT_VERSION: 6.6.2
+      QT_VERSION: 6.6.1
      QT_MODULES: 'qtremoteobjects qt5compat qtimageformats qtshadertools'

    steps:
--- a/.gitignore
+++ b/.gitignore
@@ -131,6 +131,3 @@ client/3rd/ShadowSocks/ss_ios.xcconfig

 # UML generated pics
 out/
-
-# CMake files
-CMakeFiles/
--- 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.4.1.2
+project(${PROJECT} VERSION 4.4.0.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 47)
+set(APP_ANDROID_VERSION_CODE 45)

 if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
    set(MZ_PLATFORM_NAME "linux")
--- a/README.md
+++ b/README.md
@@ -7,15 +7,13 @@
 Amnezia is an open-source VPN client, with a key feature that enables you to deploy your own VPN server on your server.

 ## Features
-
- Very easy to use - enter your IP address, SSH login, and password, and Amnezia will automatically install VPN docker containers to your server and connect to the VPN.
- OpenVPN, ShadowSocks, WireGuard, and IKEv2 protocols support.
+- Very easy to use - enter your ip address, ssh login and password, and Amnezia will automatically install VPN docker containers to your server and connect to VPN.
+- OpenVPN, ShadowSocks, WireGuard, IKEv2 protocols support.
 - Masking VPN with OpenVPN over Cloak plugin
- Split tunneling support - add any sites to the client to enable VPN only for them (only for desktops)
+- Split tunneling support - add any sites to client to enable VPN only for them (only for desktops)
 - Windows, MacOS, Linux, Android, iOS releases.

 ## Links
-
 [https://amnezia.org](https://amnezia.org) - project website  
 [https://www.reddit.com/r/AmneziaVPN](https://www.reddit.com/r/AmneziaVPN) - Reddit  
 [https://t.me/amnezia_vpn_en](https://t.me/amnezia_vpn_en) - Telegram support channel (English)  
@@ -23,13 +21,13 @@ Amnezia is an open-source VPN client, with a key feature that enables you to dep

 ## Tech

-AmneziaVPN uses several open-source projects to work:
+AmneziaVPN uses a number of open source projects to work:

 - [OpenSSL](https://www.openssl.org/)
 - [OpenVPN](https://openvpn.net/)
 - [ShadowSocks](https://shadowsocks.org/)
 - [Qt](https://www.qt.io/)
- [LibSsh](https://libssh.org) - forked from Qt Creator
+- [LibSsh](https://libssh.org) - forked form Qt Creator
 - and more...

 ## Checking out the source code
@@ -45,15 +43,14 @@ git submodule update --init --recursive
 Want to contribute? Welcome!

 ### Building sources and deployment
+Look deploy folder for build scripts. 

-Check deploy folder for build scripts. 
-
-### How to build an iOS app from source code on MacOS
+### How to build iOS app from source code on MacOS

 1. First, make sure you have [XCode](https://developer.apple.com/xcode/) installed, at least version 14 or higher.

-2. We use QT to generate the XCode project. We need QT version 6.6.1. Install QT for MacOS [here](https://doc.qt.io/qt-6/macos.html) or [QT Online Installer](https://www.qt.io/download-open-source). Required modules:
-   - MacOS
+2. We use QT to generate the XCode project. we need QT version 6.6.1. Install QT for macos in [here](https://doc.qt.io/qt-6/macos.html) or [QT Online Installer](https://www.qt.io/download-open-source). Required modules:
+   - macOS
   - iOS
   - Qt 5 Compatibility Module
   - Qt Shader Tools
@@ -62,18 +59,18 @@ Check deploy folder for build scripts.
     - Qt Multimedia
     - Qt Remote Objects 

-3. Install CMake if required. We recommend CMake version 3.25. You can install CMake [here](https://cmake.org/download/)
+3. Install cmake is require. We recommend cmake version 3.25. You can install cmake in [here](https://cmake.org/download/)

-4. You also need to install go >= v1.16. If you don't have it installed already,
+4. You also need to install go >= v1.16. If you don't have it done already,
 download go from the [official website](https://golang.org/dl/) or use Homebrew. 
-The latest version is recommended. Install gomobile
+Latest version is recommended. Install gomobile
 ```bash
 export PATH=$PATH:~/go/bin
 go install golang.org/x/mobile/cmd/gomobile@latest
 gomobile init
 ```

-5. Build the project
+5. Build project
 ```bash
 export QT_BIN_DIR="<PATH-TO-QT-FOLDER>/Qt/<QT-VERSION>/ios/bin"
 export QT_MACOS_ROOT_DIR="<PATH-TO-QT-FOLDER>/Qt/<QT-VERSION>/macos"
@@ -91,63 +88,62 @@ of the bin folder where gomobile was installed. Usually, it's in `GOPATH`.
 export PATH=$(PATH):/path/to/GOPATH/bin
 ```

-6. Open the XCode project. You can then run /test/archive/ship the app.
+5. Open XCode project. You can then run/test/archive/ship the app.

-If the build fails with the following error
+If build fails with the following error
 ```
 make: *** 
 [$(PROJECTDIR)/client/build/AmneziaVPN.build/Debug-iphoneos/wireguard-go-bridge/goroot/.prepared] 
 Error 1
 ```
-Add a user-defined variable to both AmneziaVPN and WireGuardNetworkExtension targets' build settings with
+Add a user defined variable to both AmneziaVPN and WireGuardNetworkExtension targets' build settings with
 key `PATH` and value `${PATH}/path/to/bin/folder/with/go/executable`, e.g. `${PATH}:/usr/local/go/bin`.

-if the above error persists on your M1 Mac, then most probably you need to install arch based CMake 
+if above error still persists on you M1 Mac, then most probably you need to install arch based cmake 
 ```
 arch -arm64 brew install cmake
 ```

-Build might fail with the "source files not found" error the first time you try it, because the modern XCode build system compiles dependencies in parallel, and some dependencies end up being built after the ones that
-require them. In this case, simply restart the build.
+Build might fail with "source files not found" error the first time you try it, because modern XCode build system compiles
+dependencies in parallel, and some dependencies end up being built after the ones that
+require them. In this case simply restart the build.

 ## How to build the Android app
-
-_Tested on Mac OS_
+_tested on Mac OS_

 The Android app has the following requirements:
 * JDK 11
 * Android platform SDK 33
-* CMake 3.25.0
+* cmake 3.25.0

-After you have installed QT, QT Creator, and Android Studio, you need to configure QT Creator correctly. Click in the top menu bar on `QT Creator` -> `Preferences` -> `Devices` and select the tab `Android`. 
-    * set path to JDK 11
+After you have installed QT, QT Creator and Android Studio installed, you need to configure QT Creator correctly. Click in the top menu bar on `QT Creator` -> `Preferences` -> `Devices` and select the tab `Android`. 
+    * set path to jdk 11
    * set path to Android SDK ($ANDROID_HOME)

-In case you get errors regarding missing SDK or 'SDK manager not running', you cannot fix them by correcting the paths. If you have some spare GBs on your disk, you can let QT Creator install all requirements by choosing an empty folder for `Android SDK location` and clicking on `Set Up SDK`. Be aware: This will install a second Android SDK and NDK on your machine! 
-Double-check that the right CMake version is configured:  Click on `QT Creator` -> `Preferences` and click on the side menu on `Kits`. Under the center content view's `Kits` tab, you'll find an entry for `CMake Tool`. If the default selected CMake version is lower than 3.25.0, install on your system CMake >= 3.25.0 and choose `System CMake at <path>` from the drop-down list. If this entry is missing, you either have not installed CMake yet or QT Creator hasn't found the path to it. In that case, click in the preferences window on the side menu item `CMake`, then on the tab `Tools` in the center content view, and finally on the button `Add` to set the path to your installed CMake. 
-Please make sure that you have selected Android Platform SDK 33 for your project: click in the main view's side menu on `Projects`, and on the left, you'll see a section `Build & Run` showing different Android build targets. You can select any of them, Amnezia VPN's project setup is designed in a way that all Android targets will be built. Click on the targets submenu item `Build` and scroll in the center content view to `Build Steps`. Click on `Details` at the end of the headline `Build Android APK` (the `Details` button might be hidden in case the QT Creator Window is not running in full screen!). Here we are: Choose `android-33` as `Android Build Platform SDK`.
+In case you get errors regarding missing SDK or 'sdkmanager not running', you cannot fix them by correcting the paths and you have some spare GBs on your disk, you can let QT Creator install all requirements by choosing an empty folder for `Android SDK location` and click on `Set Up SDK`. Be aware: This will install a second Android SDK and NDK on your machine! 

-That's it! You should be ready to compile the project from QT Creator!
+Double check that the right cmake version is configured:  Click on `QT Creator` -> `Preferences` and click on the side menu on `Kits`. Under the center content view's `Kits` tab you'll find an entry `CMake Tool`. If the default selected CMake version is lower than 3.25.0, install on your system CMake >= 3.25.0 and choose `System CMake at <path>` from the drop down list. If this entry is missing, you either have not installed CMake yet or QT Creator hasn't found the path to it. In that case click in the preferences window on the side menu item `CMake`, then on the tab `Tools`in the center content view and finally on the Button `Add` to set the path to your installed CMake. 
+
+Please make sure that you have selected Android Platform SDK 33 for your project: click in the main view's side menu on on `Projects`, on the left you'll see a section `Build & Run` showing different Android build targets. You can select any of them, Amnezia VPN's project setup is designed in a way that always all Android targets will be build. Click on the targets submenu item `Build` and scroll in the center content view to `Build Steps`. Click on `Details` at the end of the headline `Build Android APK` (The `Details` button might be hidden in case QT Creator Window is not running in full screen!). Here we are: choose `android-33` as `Android Build platform SDK`.
+
+That's it you should be ready to compile the project from QT Creator!

 ### Development flow
+After you've hit the build button, QT-Creator copies the whole project to a folder in the repositories parent directory. The folder should look something like `build-amnezia-client-Android_Qt_<version>_Clang_<architecture>-<BuildType>`.
+If you want to develop Amnezia VPNs Android components written in Kotlin, such as components using system APIs, you need to import the generated project in Android Studio with `build-amnezia-client-Android_Qt_<version>_Clang_<architecture>-<BuildType>/client/android-build` as the projects root directory. While you should be able to compile the generated project from Android Studio, you cannot work directly in the repository's Android project. So whenever you are confident with your work in the generated project, you'll need to copy and paste the affected files to the corresponding path in the repositories Android project so that you can add and commit your changes!

-After you've hit the build button, QT-Creator copies the whole project to a folder in the repository parent directory. The folder should look something like `build-amnezia-client-Android_Qt_<version>_Clang_<architecture>-<BuildType>`.
-If you want to develop Amnezia VPNs Android components written in Kotlin, such as components using system APIs, you need to import the generated project in Android Studio with `build-amnezia-client-Android_Qt_<version>_Clang_<architecture>-<BuildType>/client/android-build` as the projects root directory. While you should be able to compile the generated project from Android Studio, you cannot work directly in the repository's Android project. So whenever you are confident with your work in the generated project, you'll need to copy and paste the affected files to the corresponding path in the repository's Android project so that you can add and commit your changes!
-
-You may face compiling issues in QT Creator after you've worked in Android Studio on the generated project. Just do a `./gradlew clean` in the generated project's root directory (`<path>/client/android-build/.`) and you should be good to go.
+You may face compiling issues in QT Creator after you've worked in Android Studio on the generated project. Just do a `./gradlew clean` in the generated project's root directory (`<path>/client/android-build/.`) and you should be good to continue.

 ## License
-
-GPL v3.0
+GPL v.3

 ## Donate
-
 Bitcoin: bc1qn9rhsffuxwnhcuuu4qzrwp4upkrq94xnh8r26u  
 XMR: 48spms39jt1L2L5vyw2RQW6CXD6odUd4jFu19GZcDyKKQV9U88wsJVjSbL4CfRys37jVMdoaWVPSvezCQPhHXUW5UKLqUp3  
 payeer.com: P2561305  
 ko-fi.com: [https://ko-fi.com/amnezia_vpn](https://ko-fi.com/amnezia_vpn)  

-## Acknowledgments

+## etc
 This project is tested with BrowserStack.
 We express our gratitude to [BrowserStack](https://www.browserstack.com) for supporting our project.
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -15,15 +15,6 @@ set(PACKAGES
    Core5Compat Concurrent LinguistTools
 )

-execute_process(
-  WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
-  COMMAND git rev-parse --short HEAD
-  OUTPUT_VARIABLE GIT_COMMIT_HASH
-  OUTPUT_STRIP_TRAILING_WHITESPACE
-)
-
-add_definitions(-DGIT_COMMIT_HASH="${GIT_COMMIT_HASH}")
-
 if(IOS)
    set(PACKAGES ${PACKAGES} Multimedia)
 endif()
@@ -66,8 +57,6 @@ set(AMNEZIAVPN_TS_FILES
    ${CMAKE_CURRENT_LIST_DIR}/translations/amneziavpn_ru.ts
    ${CMAKE_CURRENT_LIST_DIR}/translations/amneziavpn_zh_CN.ts
    ${CMAKE_CURRENT_LIST_DIR}/translations/amneziavpn_fa_IR.ts
-    ${CMAKE_CURRENT_LIST_DIR}/translations/amneziavpn_ar.ts
-    ${CMAKE_CURRENT_LIST_DIR}/translations/amneziavpn_my_MM.ts
 )

 file(GLOB_RECURSE AMNEZIAVPN_TS_SOURCES *.qrc *.cpp *.h *.ui)
--- a/client/amnezia_application.cpp
+++ b/client/amnezia_application.cpp
@@ -24,7 +24,6 @@

 #if defined(Q_OS_IOS)
    #include "platforms/ios/ios_controller.h"
-    #include <AmneziaVPN-Swift.h>
 #endif

 #if defined(Q_OS_ANDROID) || defined(Q_OS_IOS)
@@ -96,18 +95,7 @@ void AmneziaApplication::init()
        qFatal("Android logging initialization failed");
    }
    AndroidController::instance()->setSaveLogs(m_settings->isSaveLogs());
-    connect(m_settings.get(), &Settings::saveLogsChanged,
-            AndroidController::instance(), &AndroidController::setSaveLogs);
-
-    AndroidController::instance()->setScreenshotsEnabled(m_settings->isScreenshotsEnabled());
-    connect(m_settings.get(), &Settings::screenshotsEnabledChanged,
-            AndroidController::instance(), &AndroidController::setScreenshotsEnabled);
-
-    connect(m_settings.get(), &Settings::serverRemoved,
-            AndroidController::instance(), &AndroidController::resetLastServer);
-
-    connect(m_settings.get(), &Settings::settingsCleared,
-            [](){ AndroidController::instance()->resetLastServer(-1); });
+    connect(m_settings.get(), &Settings::saveLogsChanged, AndroidController::instance(), &AndroidController::setSaveLogs);

    connect(AndroidController::instance(), &AndroidController::initConnectionState, this,
            [this](Vpn::ConnectionState state) {
@@ -139,14 +127,6 @@ void AmneziaApplication::init()
        m_pageController->goToPageSettingsBackup();
        m_settingsController->importBackupFromOutside(filePath);
    });
-
-    QTimer::singleShot(0, this, [this](){
-        AmneziaVPN::toggleScreenshots(m_settings->isScreenshotsEnabled());
-    });
-
-    connect(m_settings.get(), &Settings::screenshotsEnabledChanged, [](bool enabled) {
-        AmneziaVPN::toggleScreenshots(enabled);
-    });
 #endif

    m_notificationHandler.reset(NotificationHandler::create(nullptr));
@@ -306,16 +286,10 @@ void AmneziaApplication::initModels()
    m_containersModel.reset(new ContainersModel(this));
    m_engine->rootContext()->setContextProperty("ContainersModel", m_containersModel.get());

-    m_defaultServerContainersModel.reset(new ContainersModel(this));
-    m_engine->rootContext()->setContextProperty("DefaultServerContainersModel", m_defaultServerContainersModel.get());
-
    m_serversModel.reset(new ServersModel(m_settings, this));
    m_engine->rootContext()->setContextProperty("ServersModel", m_serversModel.get());
    connect(m_serversModel.get(), &ServersModel::containersUpdated, m_containersModel.get(),
            &ContainersModel::updateModel);
-    connect(m_serversModel.get(), &ServersModel::defaultServerContainersUpdated, m_defaultServerContainersModel.get(),
-            &ContainersModel::updateModel);
-    m_serversModel->resetModel();

    m_languageModel.reset(new LanguageModel(m_settings, this));
    m_engine->rootContext()->setContextProperty("LanguageModel", m_languageModel.get());
@@ -359,7 +333,7 @@ void AmneziaApplication::initModels()
    connect(m_configurator.get(), &VpnConfigurator::newVpnConfigCreated, this,
            [this](const QString &clientId, const QString &clientName, const DockerContainer container,
                   ServerCredentials credentials) {
-                m_serversModel->reloadDefaultServerContainerConfig();
+                m_serversModel->reloadContainerConfig();
                m_clientManagementModel->appendClient(clientId, clientName, container, credentials);
                emit m_configurator->clientModelUpdated();
            });
@@ -411,13 +385,7 @@ void AmneziaApplication::initControllers()
    m_engine->rootContext()->setContextProperty("ApiController", m_apiController.get());
    connect(m_apiController.get(), &ApiController::updateStarted, this,
            [this]() { emit m_vpnConnection->connectionStateChanged(Vpn::ConnectionState::Connecting); });
-    connect(m_apiController.get(), &ApiController::errorOccurred, this, [this](const QString &errorMessage) {
-        if (m_connectionController->isConnectionInProgress()) {
-            emit m_pageController->showErrorMessage(errorMessage);
-        }
-
-        emit m_vpnConnection->connectionStateChanged(Vpn::ConnectionState::Disconnected);
-    });
-    connect(m_apiController.get(), &ApiController::updateFinished, m_connectionController.get(),
-            &ConnectionController::toggleConnection);
+    connect(m_apiController.get(), &ApiController::errorOccurred, this,
+            [this]() { emit m_vpnConnection->connectionStateChanged(Vpn::ConnectionState::Disconnected); });
+    connect(m_apiController.get(), &ApiController::updateFinished, m_connectionController.get(), &ConnectionController::toggleConnection);
 }
--- a/client/amnezia_application.h
+++ b/client/amnezia_application.h
@@ -92,7 +92,6 @@ private:
    QCommandLineParser m_parser;

    QSharedPointer<ContainersModel> m_containersModel;
-    QSharedPointer<ContainersModel> m_defaultServerContainersModel;
    QSharedPointer<ServersModel> m_serversModel;
    QSharedPointer<LanguageModel> m_languageModel;
    QSharedPointer<ProtocolsModel> m_protocolsModel;
--- a/client/android/AndroidManifest.xml
+++ b/client/android/AndroidManifest.xml
@@ -22,7 +22,7 @@
    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="28" />
    <uses-permission android:name="android.permission.CAMERA" />
    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SYSTEM_EXEMPTED" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />

    <!-- Enable when VPN-per-app mode will be implemented -->
@@ -56,10 +56,6 @@
                <category android:name="android.intent.category.DEFAULT" />
            </intent-filter>

-            <intent-filter>
-                <action android:name="android.service.quicksettings.action.QS_TILE_PREFERENCES" />
-            </intent-filter>
-
            <meta-data
                android:name="android.app.lib_name"
                android:value="-- %%INSERT_APP_LIB_NAME%% --" />
@@ -141,29 +137,14 @@
            android:name=".AmneziaVpnService"
            android:process=":amneziaVpnService"
            android:permission="android.permission.BIND_VPN_SERVICE"
-            android:foregroundServiceType="systemExempted"
-            android:exported="false"
-            tools:ignore="ForegroundServicePermission">
+            android:foregroundServiceType="specialUse"
+            android:exported="false">

            <intent-filter>
                <action android:name="android.net.VpnService" />
            </intent-filter>
-        </service>

-        <service
-            android:name=".AmneziaTileService"
-            android:process=":amneziaTileService"
-            android:icon="@drawable/ic_amnezia_round"
-            android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"
-            android:exported="true">
-
-            <intent-filter>
-                <action android:name="android.service.quicksettings.action.QS_TILE" />
-            </intent-filter>
-
-            <meta-data
-                android:name="android.service.quicksettings.TOGGLEABLE_TILE"
-                android:value="true" />
+            <property android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE" android:value="vpn" />
        </service>

        <provider
--- a/client/android/build.gradle.kts
+++ b/client/android/build.gradle.kts
@@ -111,5 +111,4 @@ dependencies {
    implementation(libs.kotlinx.coroutines)
    implementation(libs.bundles.androidx.camera)
    implementation(libs.google.mlkit)
-    implementation(libs.androidx.datastore)
 }
--- a/client/android/gradle/libs.versions.toml
+++ b/client/android/gradle/libs.versions.toml
@@ -6,7 +6,6 @@ androidx-activity = "1.8.1"
 androidx-annotation = "1.7.0"
 androidx-camera = "1.3.0"
 androidx-security-crypto = "1.1.0-alpha06"
-androidx-datastore = "1.1.0-beta01"
 kotlinx-coroutines = "1.7.3"
 google-mlkit = "17.2.0"

@@ -19,7 +18,6 @@ androidx-camera-camera2 = { module = "androidx.camera:camera-camera2", version.r
 androidx-camera-lifecycle = { module = "androidx.camera:camera-lifecycle", version.ref = "androidx-camera" }
 androidx-camera-view = { module = "androidx.camera:camera-view", version.ref = "androidx-camera" }
 androidx-security-crypto = { module = "androidx.security:security-crypto-ktx", version.ref = "androidx-security-crypto" }
-androidx-datastore = { module = "androidx.datastore:datastore-preferences", version.ref = "androidx-datastore" }
 kotlinx-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "kotlinx-coroutines" }
 google-mlkit = { module = "com.google.mlkit:barcode-scanning", version.ref = "google-mlkit" }

--- a/client/android/protocolApi/src/main/kotlin/ProtocolState.kt
+++ b/client/android/protocolApi/src/main/kotlin/ProtocolState.kt
@@ -2,9 +2,9 @@ package org.amnezia.vpn.protocol

 // keep synchronized with client/platforms/android/android_controller.h ConnectionState
 enum class ProtocolState {
-    DISCONNECTED,
    CONNECTED,
    CONNECTING,
+    DISCONNECTED,
    DISCONNECTING,
    RECONNECTING,
    UNKNOWN
--- a/client/android/protocolApi/src/main/kotlin/Status.kt
+++ b/client/android/protocolApi/src/main/kotlin/Status.kt
@@ -28,10 +28,6 @@ fun Bundle.putStatus(status: Status) {
    putInt(STATE_KEY, status.state.ordinal)
 }

-fun Bundle.putStatus(state: ProtocolState) {
-    putInt(STATE_KEY, state.ordinal)
-}
-
 fun Bundle.getStatus(): Status =
    Status.build {
        setState(ProtocolState.entries[getInt(STATE_KEY)])
--- a/client/android/res/values-ru/strings.xml
+++ b/client/android/res/values-ru/strings.xml
@@ -1,5 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<resources>
-    <string name="connecting">Подключение</string>
-    <string name="disconnecting">Отключение</string>
-</resources>
--- a/client/android/res/values/strings.xml
+++ b/client/android/res/values/strings.xml
@@ -1,5 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<resources>
-    <string name="connecting">Connecting</string>
-    <string name="disconnecting">Disconnecting</string>
-</resources>
--- a/client/android/src/org/amnezia/vpn/AmneziaActivity.kt
+++ b/client/android/src/org/amnezia/vpn/AmneziaActivity.kt
@@ -14,7 +14,6 @@ import android.os.IBinder
 import android.os.Looper
 import android.os.Message
 import android.os.Messenger
-import android.view.WindowManager.LayoutParams
 import android.webkit.MimeTypeMap
 import android.widget.Toast
 import androidx.annotation.MainThread
@@ -27,7 +26,9 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.cancel
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
+import org.amnezia.vpn.protocol.ProtocolState
 import org.amnezia.vpn.protocol.getStatistics
 import org.amnezia.vpn.protocol.getStatus
 import org.amnezia.vpn.qt.QtAndroidController
@@ -35,11 +36,11 @@ import org.amnezia.vpn.util.Log
 import org.qtproject.qt.android.bindings.QtActivity

 private const val TAG = "AmneziaActivity"
-const val ACTIVITY_MESSENGER_NAME = "Activity"

 private const val CHECK_VPN_PERMISSION_ACTION_CODE = 1
 private const val CREATE_FILE_ACTION_CODE = 2
 private const val OPEN_FILE_ACTION_CODE = 3
+private const val BIND_SERVICE_TIMEOUT = 1000L

 class AmneziaActivity : QtActivity() {

@@ -57,17 +58,25 @@ class AmneziaActivity : QtActivity() {
                val event = msg.extractIpcMessage<ServiceEvent>()
                Log.d(TAG, "Handle event: $event")
                when (event) {
-                    ServiceEvent.STATUS_CHANGED -> {
-                        msg.data?.getStatus()?.let { (state) ->
-                            Log.d(TAG, "Handle protocol state: $state")
-                            QtAndroidController.onVpnStateChanged(state.ordinal)
-                        }
+                    ServiceEvent.CONNECTED -> {
+                        QtAndroidController.onVpnConnected()
+                    }
+
+                    ServiceEvent.DISCONNECTED -> {
+                        QtAndroidController.onVpnDisconnected()
+                        doUnbindService()
+                    }
+
+                    ServiceEvent.RECONNECTING -> {
+                        QtAndroidController.onVpnReconnecting()
                    }

                    ServiceEvent.STATUS -> {
                        if (isWaitingStatus) {
                            isWaitingStatus = false
-                            msg.data?.getStatus()?.let { QtAndroidController.onStatus(it) }
+                            msg.data?.getStatus()?.let { (state) ->
+                                QtAndroidController.onStatus(state.ordinal)
+                            }
                        }
                    }

@@ -78,7 +87,7 @@ class AmneziaActivity : QtActivity() {
                    }

                    ServiceEvent.ERROR -> {
-                        msg.data?.getString(MSG_ERROR)?.let { error ->
+                        msg.data?.getString(ERROR_MSG)?.let { error ->
                            Log.e(TAG, "From VpnService: $error")
                        }
                        // todo: add error reporting to Qt
@@ -100,15 +109,14 @@ class AmneziaActivity : QtActivity() {
                // get a messenger from the service to send actions to the service
                vpnServiceMessenger.set(Messenger(service))
                // send a messenger to the service to process service events
-                vpnServiceMessenger.send(
-                    Action.REGISTER_CLIENT.packToMessage {
-                        putString(MSG_CLIENT_NAME, ACTIVITY_MESSENGER_NAME)
-                    },
-                    replyTo = activityMessenger
-                )
+                vpnServiceMessenger.send {
+                    Action.REGISTER_CLIENT.packToMessage().apply {
+                        replyTo = activityMessenger
+                    }
+                }
                isServiceConnected = true
                if (isWaitingStatus) {
-                    vpnServiceMessenger.send(Action.REQUEST_STATUS, replyTo = activityMessenger)
+                    vpnServiceMessenger.send(Action.REQUEST_STATUS)
                }
            }

@@ -118,7 +126,6 @@ class AmneziaActivity : QtActivity() {
                vpnServiceMessenger.reset()
                isWaitingStatus = true
                QtAndroidController.onServiceDisconnected()
-                doBindService()
            }

            override fun onBindingDied(name: ComponentName?) {
@@ -141,11 +148,8 @@ class AmneziaActivity : QtActivity() {
        Log.d(TAG, "Create Amnezia activity: $intent")
        mainScope = CoroutineScope(SupervisorJob() + Dispatchers.Main.immediate)
        vpnServiceMessenger = IpcMessenger(
-            "VpnService",
-            onDeadObjectException = {
-                doUnbindService()
-                doBindService()
-            }
+            onDeadObjectException = ::doUnbindService,
+            messengerName = "VpnService"
        )
        intent?.let(::processIntent)
    }
@@ -240,9 +244,10 @@ class AmneziaActivity : QtActivity() {
    private fun doBindService() {
        Log.d(TAG, "Bind service")
        Intent(this, AmneziaVpnService::class.java).also {
-            bindService(it, serviceConnection, BIND_ABOVE_CLIENT and BIND_AUTO_CREATE)
+            bindService(it, serviceConnection, BIND_ABOVE_CLIENT)
        }
        isInBoundState = true
+        handleBindTimeout()
    }

    @MainThread
@@ -251,14 +256,26 @@ class AmneziaActivity : QtActivity() {
            Log.d(TAG, "Unbind service")
            isWaitingStatus = true
            QtAndroidController.onServiceDisconnected()
-            isServiceConnected = false
-            vpnServiceMessenger.send(Action.UNREGISTER_CLIENT, activityMessenger)
            vpnServiceMessenger.reset()
+            isServiceConnected = false
            isInBoundState = false
            unbindService(serviceConnection)
        }
    }

+    private fun handleBindTimeout() {
+        mainScope.launch {
+            if (isWaitingStatus) {
+                delay(BIND_SERVICE_TIMEOUT)
+                if (isWaitingStatus && !isServiceConnected) {
+                    Log.d(TAG, "Bind timeout, reset connection status")
+                    isWaitingStatus = false
+                    QtAndroidController.onStatus(ProtocolState.DISCONNECTED.ordinal)
+                }
+            }
+        }
+    }
+
    /**
     * Methods of starting and stopping VpnService
     */
@@ -295,7 +312,7 @@ class AmneziaActivity : QtActivity() {
        Log.d(TAG, "Connect to VPN")
        vpnServiceMessenger.send {
            Action.CONNECT.packToMessage {
-                putString(MSG_VPN_CONFIG, vpnConfig)
+                putString(VPN_CONFIG, vpnConfig)
            }
        }
    }
@@ -303,7 +320,7 @@ class AmneziaActivity : QtActivity() {
    private fun startVpnService(vpnConfig: String) {
        Log.d(TAG, "Start VPN service")
        Intent(this, AmneziaVpnService::class.java).apply {
-            putExtra(MSG_VPN_CONFIG, vpnConfig)
+            putExtra(VPN_CONFIG, vpnConfig)
        }.also {
            ContextCompat.startForegroundService(this, it)
        }
@@ -352,22 +369,6 @@ class AmneziaActivity : QtActivity() {
        }
    }

-    @Suppress("unused")
-    fun resetLastServer(index: Int) {
-        Log.v(TAG, "Reset server: $index")
-        mainScope.launch {
-            VpnStateStore.store {
-                if (index == -1 || it.serverIndex == index) {
-                    VpnState.defaultState
-                } else if (it.serverIndex > index) {
-                    it.copy(serverIndex = it.serverIndex - 1)
-                } else {
-                    it
-                }
-            }
-        }
-    }
-
    @Suppress("unused")
    fun saveFile(fileName: String, data: String) {
        Log.d(TAG, "Save file $fileName")
@@ -437,7 +438,7 @@ class AmneziaActivity : QtActivity() {
            Log.saveLogs = enabled
            vpnServiceMessenger.send {
                Action.SET_SAVE_LOGS.packToMessage {
-                    putBoolean(MSG_SAVE_LOGS, enabled)
+                    putBoolean(SAVE_LOGS, enabled)
                }
            }
        }
@@ -454,13 +455,4 @@ class AmneziaActivity : QtActivity() {
        Log.v(TAG, "Clear logs")
        Log.clearLogs()
    }
-
-    @Suppress("unused")
-    fun setScreenshotsEnabled(enabled: Boolean) {
-        Log.v(TAG, "Set screenshots enabled: $enabled")
-        mainScope.launch {
-            val flag = if (enabled) 0 else LayoutParams.FLAG_SECURE
-            window.setFlags(flag, LayoutParams.FLAG_SECURE)
-        }
-    }
 }
--- a/client/android/src/org/amnezia/vpn/AmneziaApplication.kt
+++ b/client/android/src/org/amnezia/vpn/AmneziaApplication.kt
@@ -18,7 +18,6 @@ class AmneziaApplication : QtApplication(), CameraXConfig.Provider {
        super.onCreate()
        Prefs.init(this)
        Log.init(this)
-        VpnStateStore.init(this)
        Log.d(TAG, "Create Amnezia application")
        createNotificationChannel()
    }
--- a/client/android/src/org/amnezia/vpn/AmneziaTileService.kt
+++ b/client/android/src/org/amnezia/vpn/AmneziaTileService.kt
@@ -1,272 +0,0 @@
-package org.amnezia.vpn
-
-import android.annotation.SuppressLint
-import android.app.PendingIntent
-import android.content.ComponentName
-import android.content.Intent
-import android.content.ServiceConnection
-import android.net.VpnService
-import android.os.Build
-import android.os.IBinder
-import android.os.Messenger
-import android.service.quicksettings.Tile
-import android.service.quicksettings.TileService
-import androidx.core.content.ContextCompat
-import kotlin.LazyThreadSafetyMode.NONE
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.SupervisorJob
-import kotlinx.coroutines.cancel
-import kotlinx.coroutines.flow.collectLatest
-import kotlinx.coroutines.launch
-import org.amnezia.vpn.protocol.ProtocolState
-import org.amnezia.vpn.protocol.ProtocolState.CONNECTED
-import org.amnezia.vpn.protocol.ProtocolState.CONNECTING
-import org.amnezia.vpn.protocol.ProtocolState.DISCONNECTED
-import org.amnezia.vpn.protocol.ProtocolState.DISCONNECTING
-import org.amnezia.vpn.protocol.ProtocolState.RECONNECTING
-import org.amnezia.vpn.protocol.ProtocolState.UNKNOWN
-import org.amnezia.vpn.util.Log
-
-private const val TAG = "AmneziaTileService"
-private const val DEFAULT_TILE_LABEL = "AmneziaVPN"
-
-class AmneziaTileService : TileService() {
-
-    private lateinit var scope: CoroutineScope
-    private var vpnStateListeningJob: Job? = null
-    private lateinit var vpnServiceMessenger: IpcMessenger
-
-    @Volatile
-    private var isServiceConnected = false
-    private var isInBoundState = false
-    @Volatile
-    private var isVpnConfigExists = false
-
-    private val serviceConnection: ServiceConnection by lazy(NONE) {
-        object : ServiceConnection {
-            override fun onServiceConnected(name: ComponentName?, service: IBinder?) {
-                Log.d(TAG, "Service ${name?.flattenToString()} was connected")
-                vpnServiceMessenger.set(Messenger(service))
-                isServiceConnected = true
-            }
-
-            override fun onServiceDisconnected(name: ComponentName?) {
-                Log.w(TAG, "Service ${name?.flattenToString()} was unexpectedly disconnected")
-                isServiceConnected = false
-                vpnServiceMessenger.reset()
-                updateVpnState(DISCONNECTED)
-            }
-
-            override fun onBindingDied(name: ComponentName?) {
-                Log.w(TAG, "Binding to the ${name?.flattenToString()} unexpectedly died")
-                doUnbindService()
-                doBindService()
-            }
-        }
-    }
-
-    override fun onCreate() {
-        super.onCreate()
-        Log.d(TAG, "Create Amnezia Tile Service")
-        scope = CoroutineScope(SupervisorJob())
-        vpnServiceMessenger = IpcMessenger(
-            "VpnService",
-            onDeadObjectException = ::doUnbindService
-        )
-    }
-
-    override fun onDestroy() {
-        Log.d(TAG, "Destroy Amnezia Tile Service")
-        doUnbindService()
-        scope.cancel()
-        super.onDestroy()
-    }
-
-    // Workaround for some bugs
-    override fun onBind(intent: Intent?): IBinder? =
-        try {
-            super.onBind(intent)
-        } catch (e: Throwable) {
-            Log.e(TAG, "Failed to bind AmneziaTileService: $e")
-            null
-        }
-
-    override fun onStartListening() {
-        super.onStartListening()
-        Log.d(TAG, "Start listening")
-        if (AmneziaVpnService.isRunning(applicationContext)) {
-            Log.d(TAG, "Vpn service is running")
-            doBindService()
-        } else {
-            Log.d(TAG, "Vpn service is not running")
-            isServiceConnected = false
-            updateVpnState(DISCONNECTED)
-        }
-        vpnStateListeningJob = launchVpnStateListening()
-    }
-
-    override fun onStopListening() {
-        Log.d(TAG, "Stop listening")
-        vpnStateListeningJob?.cancel()
-        vpnStateListeningJob = null
-        doUnbindService()
-        super.onStopListening()
-    }
-
-    override fun onClick() {
-        Log.d(TAG, "onClick")
-        if (isLocked) {
-            unlockAndRun { onClickInternal() }
-        } else {
-            onClickInternal()
-        }
-    }
-
-    private fun onClickInternal() {
-        if (isVpnConfigExists) {
-            Log.d(TAG, "Change VPN state")
-            if (qsTile.state == Tile.STATE_INACTIVE) {
-                Log.d(TAG, "Start VPN")
-                updateVpnState(CONNECTING)
-                startVpn()
-            } else if (qsTile.state == Tile.STATE_ACTIVE) {
-                Log.d(TAG, "Stop vpn")
-                updateVpnState(DISCONNECTING)
-                stopVpn()
-            }
-        } else {
-            Log.d(TAG, "Start Activity")
-            Intent(this, AmneziaActivity::class.java).apply {
-                addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-            }.also {
-                startActivityAndCollapseCompat(it)
-            }
-        }
-    }
-
-    private fun doBindService() {
-        Log.d(TAG, "Bind service")
-        Intent(this, AmneziaVpnService::class.java).also {
-            bindService(it, serviceConnection, BIND_ABOVE_CLIENT)
-        }
-        isInBoundState = true
-    }
-
-    private fun doUnbindService() {
-        if (isInBoundState) {
-            Log.d(TAG, "Unbind service")
-            isServiceConnected = false
-            vpnServiceMessenger.reset()
-            isInBoundState = false
-            unbindService(serviceConnection)
-        }
-    }
-
-    private fun startVpn() {
-        if (isServiceConnected) {
-            connectToVpn()
-        } else {
-            if (checkPermission()) {
-                startVpnService()
-                doBindService()
-            } else {
-                updateVpnState(DISCONNECTED)
-            }
-        }
-    }
-
-    private fun checkPermission() =
-        if (VpnService.prepare(applicationContext) != null) {
-            Intent(this, VpnRequestActivity::class.java).apply {
-                addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-            }.also {
-                startActivityAndCollapseCompat(it)
-            }
-            false
-        } else {
-            true
-        }
-
-    private fun startVpnService() =
-        ContextCompat.startForegroundService(
-            applicationContext,
-            Intent(this, AmneziaVpnService::class.java)
-        )
-
-    private fun connectToVpn() = vpnServiceMessenger.send(Action.CONNECT)
-
-    private fun stopVpn() = vpnServiceMessenger.send(Action.DISCONNECT)
-
-    @SuppressLint("StartActivityAndCollapseDeprecated")
-    private fun startActivityAndCollapseCompat(intent: Intent) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
-            startActivityAndCollapse(
-                PendingIntent.getActivity(
-                    applicationContext,
-                    0,
-                    intent,
-                    PendingIntent.FLAG_IMMUTABLE
-                )
-            )
-        } else {
-            @Suppress("DEPRECATION")
-            startActivityAndCollapse(intent)
-        }
-    }
-
-    private fun updateVpnState(state: ProtocolState) {
-        scope.launch {
-            VpnStateStore.store { it.copy(protocolState = state) }
-        }
-    }
-
-    private fun launchVpnStateListening() =
-        scope.launch { VpnStateStore.dataFlow().collectLatest(::updateTile) }
-
-    private fun updateTile(vpnState: VpnState) {
-        Log.d(TAG, "Update tile: $vpnState")
-        isVpnConfigExists = vpnState.serverName != null
-        val tile = qsTile ?: return
-        tile.apply {
-            label = vpnState.serverName ?: DEFAULT_TILE_LABEL
-            when (vpnState.protocolState) {
-                CONNECTED -> {
-                    state = Tile.STATE_ACTIVE
-                    subtitleCompat = null
-                }
-
-                DISCONNECTED, UNKNOWN -> {
-                    state = Tile.STATE_INACTIVE
-                    subtitleCompat = null
-                }
-
-                CONNECTING, RECONNECTING -> {
-                    state = Tile.STATE_UNAVAILABLE
-                    subtitleCompat = resources.getString(R.string.connecting)
-                }
-
-                DISCONNECTING -> {
-                    state = Tile.STATE_UNAVAILABLE
-                    subtitleCompat = resources.getString(R.string.disconnecting)
-                }
-            }
-            updateTile()
-        }
-        // double update to fix weird visual glitches
-        tile.updateTile()
-    }
-
-    private var Tile.subtitleCompat: CharSequence?
-        set(value) {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-                this.subtitle = value
-            }
-        }
-        get() {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-                return this.subtitle
-            }
-            return null
-        }
-}
--- a/client/android/src/org/amnezia/vpn/AmneziaVpnService.kt
+++ b/client/android/src/org/amnezia/vpn/AmneziaVpnService.kt
@@ -1,13 +1,10 @@
 package org.amnezia.vpn

-import android.app.ActivityManager
-import android.app.ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND_SERVICE
 import android.app.Notification
 import android.app.PendingIntent
-import android.content.Context
 import android.content.Intent
 import android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_MANIFEST
-import android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_SYSTEM_EXEMPTED
+import android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_SPECIAL_USE
 import android.net.VpnService
 import android.os.Build
 import android.os.Handler
@@ -19,7 +16,6 @@ import android.os.Process
 import androidx.annotation.MainThread
 import androidx.core.app.NotificationCompat
 import androidx.core.app.ServiceCompat
-import java.util.concurrent.ConcurrentHashMap
 import kotlin.LazyThreadSafetyMode.NONE
 import kotlinx.coroutines.CoroutineExceptionHandler
 import kotlinx.coroutines.CoroutineScope
@@ -30,7 +26,6 @@ import kotlinx.coroutines.TimeoutCancellationException
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.drop
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
@@ -44,11 +39,14 @@ import org.amnezia.vpn.protocol.ProtocolState.DISCONNECTED
 import org.amnezia.vpn.protocol.ProtocolState.DISCONNECTING
 import org.amnezia.vpn.protocol.ProtocolState.RECONNECTING
 import org.amnezia.vpn.protocol.ProtocolState.UNKNOWN
+import org.amnezia.vpn.protocol.Statistics
+import org.amnezia.vpn.protocol.Status
 import org.amnezia.vpn.protocol.VpnException
 import org.amnezia.vpn.protocol.VpnStartException
 import org.amnezia.vpn.protocol.awg.Awg
 import org.amnezia.vpn.protocol.cloak.Cloak
 import org.amnezia.vpn.protocol.openvpn.OpenVpn
+import org.amnezia.vpn.protocol.putStatistics
 import org.amnezia.vpn.protocol.putStatus
 import org.amnezia.vpn.protocol.wireguard.Wireguard
 import org.amnezia.vpn.util.Log
@@ -59,16 +57,12 @@ import org.json.JSONObject

 private const val TAG = "AmneziaVpnService"

-const val MSG_VPN_CONFIG = "VPN_CONFIG"
-const val MSG_ERROR = "ERROR"
-const val MSG_SAVE_LOGS = "SAVE_LOGS"
-const val MSG_CLIENT_NAME = "CLIENT_NAME"
+const val VPN_CONFIG = "VPN_CONFIG"
+const val ERROR_MSG = "ERROR_MSG"
+const val SAVE_LOGS = "SAVE_LOGS"

 const val AFTER_PERMISSION_CHECK = "AFTER_PERMISSION_CHECK"
 private const val PREFS_CONFIG_KEY = "LAST_CONF"
-private const val PREFS_SERVER_NAME = "LAST_SERVER_NAME"
-private const val PREFS_SERVER_INDEX = "LAST_SERVER_INDEX"
-private const val PROCESS_NAME = "org.amnezia.vpn:amneziaVpnService"
 private const val NOTIFICATION_ID = 1337
 private const val STATISTICS_SENDING_TIMEOUT = 1000L
 private const val DISCONNECT_TIMEOUT = 5000L
@@ -82,8 +76,6 @@ class AmneziaVpnService : VpnService() {
    private var protocol: Protocol? = null
    private val protocolCache = mutableMapOf<String, Protocol>()
    private var protocolState = MutableStateFlow(UNKNOWN)
-    private var serverName: String? = null
-    private var serverIndex: Int = -1

    private val isConnected
        get() = protocolState.value == CONNECTED
@@ -97,11 +89,8 @@ class AmneziaVpnService : VpnService() {
    private var connectionJob: Job? = null
    private var disconnectionJob: Job? = null
    private var statisticsSendingJob: Job? = null
+    private lateinit var clientMessenger: IpcMessenger
    private lateinit var networkState: NetworkState
-    private val clientMessengers = ConcurrentHashMap<Messenger, IpcMessenger>()
-
-    private val isActivityConnected
-        get() = clientMessengers.any { it.value.name == ACTIVITY_MESSENGER_NAME }

    private val connectionExceptionHandler = CoroutineExceptionHandler { _, e ->
        protocolState.value = DISCONNECTED
@@ -127,22 +116,13 @@ class AmneziaVpnService : VpnService() {
                Log.d(TAG, "Handle action: $action")
                when (action) {
                    Action.REGISTER_CLIENT -> {
-                        val clientName = msg.data.getString(MSG_CLIENT_NAME)
-                        val messenger = IpcMessenger(msg.replyTo, clientName)
-                        clientMessengers[msg.replyTo] = messenger
-                        Log.d(TAG, "Messenger client '$clientName' was registered")
-                        if (clientName == ACTIVITY_MESSENGER_NAME && isConnected) launchSendingStatistics()
-                    }
-
-                    Action.UNREGISTER_CLIENT -> {
-                        clientMessengers.remove(msg.replyTo)?.let {
-                            Log.d(TAG, "Messenger client '${it.name}' was unregistered")
-                            if (it.name == ACTIVITY_MESSENGER_NAME) stopSendingStatistics()
-                        }
+                        clientMessenger.set(msg.replyTo)
                    }

                    Action.CONNECT -> {
-                        connect(msg.data.getString(MSG_VPN_CONFIG))
+                        val vpnConfig = msg.data.getString(VPN_CONFIG)
+                        Prefs.save(PREFS_CONFIG_KEY, vpnConfig)
+                        connect(vpnConfig)
                    }

                    Action.DISCONNECT -> {
@@ -150,17 +130,17 @@ class AmneziaVpnService : VpnService() {
                    }

                    Action.REQUEST_STATUS -> {
-                        clientMessengers[msg.replyTo]?.let { clientMessenger ->
-                            clientMessenger.send {
-                                ServiceEvent.STATUS.packToMessage {
-                                    putStatus(this@AmneziaVpnService.protocolState.value)
-                                }
+                        clientMessenger.send {
+                            ServiceEvent.STATUS.packToMessage {
+                                putStatus(Status.build {
+                                    setState(this@AmneziaVpnService.protocolState.value)
+                                })
                            }
                        }
                    }

                    Action.SET_SAVE_LOGS -> {
-                        Log.saveLogs = msg.data.getBoolean(MSG_SAVE_LOGS)
+                        Log.saveLogs = msg.data.getBoolean(SAVE_LOGS)
                    }
                }
            }
@@ -176,7 +156,7 @@ class AmneziaVpnService : VpnService() {
     */
    private val foregroundServiceTypeCompat
        get() = when {
-            Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE -> FOREGROUND_SERVICE_TYPE_SYSTEM_EXEMPTED
+            Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE -> FOREGROUND_SERVICE_TYPE_SPECIAL_USE
            Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q -> FOREGROUND_SERVICE_TYPE_MANIFEST
            else -> 0
        }
@@ -209,7 +189,7 @@ class AmneziaVpnService : VpnService() {
        Log.d(TAG, "Create Amnezia VPN service")
        mainScope = CoroutineScope(SupervisorJob() + Dispatchers.Main.immediate)
        connectionScope = CoroutineScope(SupervisorJob() + Dispatchers.IO + connectionExceptionHandler)
-        loadServerData()
+        clientMessenger = IpcMessenger(messengerName = "Client")
        launchProtocolStateHandler()
        networkState = NetworkState(this, ::reconnect)
    }
@@ -221,13 +201,15 @@ class AmneziaVpnService : VpnService() {

        if (isAlwaysOnCompat) {
            Log.d(TAG, "Start service via Always-on")
-            connect()
+            connect(Prefs.load(PREFS_CONFIG_KEY))
        } else if (intent?.getBooleanExtra(AFTER_PERMISSION_CHECK, false) == true) {
            Log.d(TAG, "Start service after permission check")
-            connect()
+            connect(Prefs.load(PREFS_CONFIG_KEY))
        } else {
            Log.d(TAG, "Start service")
-            connect(intent?.getStringExtra(MSG_VPN_CONFIG))
+            val vpnConfig = intent?.getStringExtra(VPN_CONFIG)
+            Prefs.save(PREFS_CONFIG_KEY, vpnConfig)
+            connect(vpnConfig)
        }
        ServiceCompat.startForeground(this, NOTIFICATION_ID, notification, foregroundServiceTypeCompat)
        return START_REDELIVER_INTENT
@@ -237,16 +219,17 @@ class AmneziaVpnService : VpnService() {
        Log.d(TAG, "onBind by $intent")
        if (intent?.action == SERVICE_INTERFACE) return super.onBind(intent)
        isServiceBound = true
+        if (isConnected) launchSendingStatistics()
        return vpnServiceMessenger.binder
    }

    override fun onUnbind(intent: Intent?): Boolean {
        Log.d(TAG, "onUnbind by $intent")
        if (intent?.action != SERVICE_INTERFACE) {
-            if (clientMessengers.isEmpty()) {
-                isServiceBound = false
-                if (isUnknown || isDisconnected) stopService()
-            }
+            isServiceBound = false
+            stopSendingStatistics()
+            clientMessenger.reset()
+            if (isUnknown || isDisconnected) stopService()
        }
        return true
    }
@@ -255,6 +238,7 @@ class AmneziaVpnService : VpnService() {
        Log.d(TAG, "onRebind by $intent")
        if (intent?.action != SERVICE_INTERFACE) {
            isServiceBound = true
+            if (isConnected) launchSendingStatistics()
        }
        super.onRebind(intent)
    }
@@ -294,16 +278,17 @@ class AmneziaVpnService : VpnService() {
     */
    private fun launchProtocolStateHandler() {
        mainScope.launch {
-            // drop first default UNKNOWN state
-            protocolState.drop(1).collect { protocolState ->
+            protocolState.collect { protocolState ->
                Log.d(TAG, "Protocol state changed: $protocolState")
                when (protocolState) {
                    CONNECTED -> {
+                        clientMessenger.send(ServiceEvent.CONNECTED)
                        networkState.bindNetworkListener()
-                        if (isActivityConnected) launchSendingStatistics()
+                        if (isServiceBound) launchSendingStatistics()
                    }

                    DISCONNECTED -> {
+                        clientMessenger.send(ServiceEvent.DISCONNECTED)
                        networkState.unbindNetworkListener()
                        stopSendingStatistics()
                        if (!isServiceBound) stopService()
@@ -315,19 +300,12 @@ class AmneziaVpnService : VpnService() {
                    }

                    RECONNECTING -> {
+                        clientMessenger.send(ServiceEvent.RECONNECTING)
                        stopSendingStatistics()
                    }

                    CONNECTING, UNKNOWN -> {}
                }
-
-                clientMessengers.send {
-                    ServiceEvent.STATUS_CHANGED.packToMessage {
-                        putStatus(protocolState)
-                    }
-                }
-
-                VpnStateStore.store { VpnState(protocolState, serverName, serverIndex) }
            }
        }
    }
@@ -354,17 +332,7 @@ class AmneziaVpnService : VpnService() {
    }

    @MainThread
-    private fun connect(vpnConfig: String? = null) {
-        if (vpnConfig == null) {
-            connectToVpn(Prefs.load(PREFS_CONFIG_KEY))
-        } else {
-            Prefs.save(PREFS_CONFIG_KEY, vpnConfig)
-            connectToVpn(vpnConfig)
-        }
-    }
-
-    @MainThread
-    private fun connectToVpn(vpnConfig: String) {
+    private fun connect(vpnConfig: String?) {
        if (isConnected || protocolState.value == CONNECTING) return

        Log.d(TAG, "Start VPN connection")
@@ -372,7 +340,6 @@ class AmneziaVpnService : VpnService() {
        protocolState.value = CONNECTING

        val config = parseConfigToJson(vpnConfig)
-        saveServerData(config)
        if (config == null) {
            onError("Invalid VPN config")
            protocolState.value = DISCONNECTED
@@ -450,38 +417,24 @@ class AmneziaVpnService : VpnService() {
    private fun onError(msg: String) {
        Log.e(TAG, msg)
        mainScope.launch {
-            clientMessengers.send {
+            clientMessenger.send {
                ServiceEvent.ERROR.packToMessage {
-                    putString(MSG_ERROR, msg)
+                    putString(ERROR_MSG, msg)
                }
            }
        }
    }

-    private fun parseConfigToJson(vpnConfig: String): JSONObject? =
-        if (vpnConfig.isBlank()) {
-            null
-        } else {
-            try {
-                JSONObject(vpnConfig)
-            } catch (e: JSONException) {
-                onError("Invalid VPN config json format: ${e.message}")
-                null
+    private fun parseConfigToJson(vpnConfig: String?): JSONObject? =
+        try {
+            vpnConfig?.let {
+                JSONObject(it)
            }
+        } catch (e: JSONException) {
+            onError("Invalid VPN config json format: ${e.message}")
+            null
        }

-    private fun saveServerData(config: JSONObject?) {
-        serverName = config?.opt("description") as String?
-        serverIndex = config?.opt("serverIndex") as Int? ?: -1
-        Prefs.save(PREFS_SERVER_NAME, serverName)
-        Prefs.save(PREFS_SERVER_INDEX, serverIndex)
-    }
-
-    private fun loadServerData() {
-        serverName = Prefs.load<String>(PREFS_SERVER_NAME).ifBlank { null }
-        if (serverName != null) serverIndex = Prefs.load(PREFS_SERVER_INDEX)
-    }
-
    private fun checkPermission(): Boolean =
        if (prepare(applicationContext) != null) {
            Intent(this, VpnRequestActivity::class.java).apply {
@@ -493,12 +446,4 @@ class AmneziaVpnService : VpnService() {
        } else {
            true
        }
-
-    companion object {
-        fun isRunning(context: Context): Boolean =
-            (context.getSystemService(ACTIVITY_SERVICE) as ActivityManager)
-                .runningAppProcesses.any {
-                    it.processName == PROCESS_NAME && it.importance <= IMPORTANCE_FOREGROUND_SERVICE
-                }
-    }
 }
--- a/client/android/src/org/amnezia/vpn/IpcMessage.kt
+++ b/client/android/src/org/amnezia/vpn/IpcMessage.kt
@@ -20,7 +20,9 @@ sealed interface IpcMessage {
 }

 enum class ServiceEvent : IpcMessage {
-    STATUS_CHANGED,
+    CONNECTED,
+    DISCONNECTED,
+    RECONNECTING,
    STATUS,
    STATISTICS_UPDATE,
    ERROR
@@ -28,7 +30,6 @@ enum class ServiceEvent : IpcMessage {

 enum class Action : IpcMessage {
    REGISTER_CLIENT,
-    UNREGISTER_CLIENT,
    CONNECT,
    DISCONNECT,
    REQUEST_STATUS,
--- a/client/android/src/org/amnezia/vpn/IpcMessenger.kt
+++ b/client/android/src/org/amnezia/vpn/IpcMessenger.kt
@@ -9,21 +9,11 @@ import org.amnezia.vpn.util.Log
 private const val TAG = "IpcMessenger"

 class IpcMessenger(
-    messengerName: String? = null,
    private val onDeadObjectException: () -> Unit = {},
-    private val onRemoteException: () -> Unit = {}
+    private val onRemoteException: () -> Unit = {},
+    private val messengerName: String = "Unknown"
 ) {
    private var messenger: Messenger? = null
-    val name = messengerName ?: "Unknown"
-
-    constructor(
-        messenger: Messenger,
-        messengerName: String? = null,
-        onDeadObjectException: () -> Unit = {},
-        onRemoteException: () -> Unit = {}
-    ) : this(messengerName, onDeadObjectException, onRemoteException) {
-        this.messenger = messenger
-    }

    fun set(messenger: Messenger) {
        this.messenger = messenger
@@ -35,29 +25,19 @@ class IpcMessenger(

    fun send(msg: () -> Message) = messenger?.sendMsg(msg())

-    fun send(msg: Message, replyTo: Messenger) = messenger?.sendMsg(msg.apply { this.replyTo = replyTo })
-
    fun <T> send(msg: T)
        where T : Enum<T>, T : IpcMessage = messenger?.sendMsg(msg.packToMessage())

-    fun <T> send(msg: T, replyTo: Messenger)
-        where T : Enum<T>, T : IpcMessage = messenger?.sendMsg(msg.packToMessage().apply { this.replyTo = replyTo })
-
    private fun Messenger.sendMsg(msg: Message) {
        try {
            send(msg)
        } catch (e: DeadObjectException) {
-            Log.w(TAG, "$name messenger is dead")
+            Log.w(TAG, "$messengerName messenger is dead")
            messenger = null
            onDeadObjectException()
        } catch (e: RemoteException) {
-            Log.w(TAG, "Sending a message to the $name messenger failed: ${e.message}")
+            Log.w(TAG, "Sending a message to the $messengerName messenger failed: ${e.message}")
            onRemoteException()
        }
    }
 }
-
-fun Map<Messenger, IpcMessenger>.send(msg: () -> Message) = this.values.forEach { it.send(msg) }
-
-fun <T> Map<Messenger, IpcMessenger>.send(msg: T)
-    where T : Enum<T>, T : IpcMessage = this.values.forEach { it.send(msg) }
--- a/client/android/src/org/amnezia/vpn/VpnState.kt
+++ b/client/android/src/org/amnezia/vpn/VpnState.kt
@@ -1,75 +0,0 @@
-package org.amnezia.vpn
-
-import android.app.Application
-import androidx.datastore.core.MultiProcessDataStoreFactory
-import androidx.datastore.core.Serializer
-import androidx.datastore.dataStoreFile
-import java.io.InputStream
-import java.io.ObjectInputStream
-import java.io.ObjectOutputStream
-import java.io.OutputStream
-import java.io.Serializable
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.withContext
-import org.amnezia.vpn.protocol.ProtocolState
-import org.amnezia.vpn.protocol.ProtocolState.DISCONNECTED
-import org.amnezia.vpn.util.Log
-
-private const val TAG = "VpnState"
-private const val STORE_FILE_NAME = "vpnState"
-
-data class VpnState(
-    val protocolState: ProtocolState,
-    val serverName: String? = null,
-    val serverIndex: Int = -1
-) : Serializable {
-    companion object {
-        private const val serialVersionUID: Long = -1760654961004181606
-        val defaultState: VpnState = VpnState(DISCONNECTED)
-    }
-}
-
-object VpnStateStore {
-    private lateinit var app: Application
-
-    private val dataStore = MultiProcessDataStoreFactory.create(
-        serializer = VpnStateSerializer(),
-        produceFile = { app.dataStoreFile(STORE_FILE_NAME) }
-    )
-
-    fun init(app: Application) {
-        Log.v(TAG, "Init VpnStateStore")
-        this.app = app
-    }
-
-    fun dataFlow(): Flow<VpnState> = dataStore.data
-
-    suspend fun store(f: (vpnState: VpnState) -> VpnState) {
-        try {
-            dataStore.updateData(f)
-        } catch (e : Exception) {
-            Log.e(TAG, "Failed to store VpnState: $e")
-        }
-    }
-}
-
-private class VpnStateSerializer : Serializer<VpnState> {
-    override val defaultValue: VpnState = VpnState.defaultState
-
-    override suspend fun readFrom(input: InputStream): VpnState {
-        return withContext(Dispatchers.IO) {
-            ObjectInputStream(input).use {
-                it.readObject() as VpnState
-            }
-        }
-    }
-
-    override suspend fun writeTo(t: VpnState, output: OutputStream) {
-        withContext(Dispatchers.IO) {
-            ObjectOutputStream(output).use {
-                it.writeObject(t)
-            }
-        }
-    }
-}
--- a/client/android/src/org/amnezia/vpn/qt/QtAndroidController.kt
+++ b/client/android/src/org/amnezia/vpn/qt/QtAndroidController.kt
@@ -1,23 +1,18 @@
 package org.amnezia.vpn.qt

-import org.amnezia.vpn.protocol.ProtocolState
-import org.amnezia.vpn.protocol.Status
-
 /**
 * JNI functions of the AndroidController class from android_controller.cpp,
 * called by events in the Android part of the client
 */
 object QtAndroidController {
-
-    fun onStatus(status: Status) = onStatus(status.state)
-    fun onStatus(protocolState: ProtocolState) = onStatus(protocolState.ordinal)
-
    external fun onStatus(stateCode: Int)
    external fun onServiceDisconnected()
    external fun onServiceError()

    external fun onVpnPermissionRejected()
-    external fun onVpnStateChanged(stateCode: Int)
+    external fun onVpnConnected()
+    external fun onVpnDisconnected()
+    external fun onVpnReconnecting()
    external fun onStatisticsUpdate(rxBytes: Long, txBytes: Long)

    external fun onFileOpened(uri: String)
--- a/client/cmake/ios.cmake
+++ b/client/cmake/ios.cmake
@@ -107,7 +107,6 @@ target_sources(${PROJECT} PRIVATE
    ${CLIENT_ROOT_DIR}/platforms/ios/LogController.swift
    ${CLIENT_ROOT_DIR}/platforms/ios/Log.swift
    ${CLIENT_ROOT_DIR}/platforms/ios/LogRecord.swift
-    ${CLIENT_ROOT_DIR}/platforms/ios/ScreenProtection.swift
 )

 target_sources(${PROJECT} PRIVATE
--- a/client/configurators/openvpn_configurator.cpp
+++ b/client/configurators/openvpn_configurator.cpp
@@ -76,7 +76,7 @@ OpenVpnConfigurator::ConnectionData OpenVpnConfigurator::prepareOpenVpnConfig(co

    if (connData.caCert.isEmpty() || connData.clientCert.isEmpty() || connData.taKey.isEmpty()) {
        if (errorCode)
-            *errorCode = ErrorCode::SshScpFailureError;
+            *errorCode = ErrorCode::SshSftpFailureError;
    }

    return connData;
--- a/client/configurators/wireguard_configurator.cpp
+++ b/client/configurators/wireguard_configurator.cpp
@@ -159,7 +159,7 @@ WireguardConfigurator::ConnectionData WireguardConfigurator::prepareWireguardCon
                                 .arg(connData.clientPubKey, connData.pskKey, connData.clientIP);

    e = serverController.uploadTextFileToContainer(container, credentials, configPart, m_serverConfigPath,
-                                                   libssh::ScpOverwriteMode::ScpAppendToExisting);
+                                                   libssh::SftpOverwriteMode::SftpAppendToExisting);

    if (e) {
        if (errorCode)
--- a/client/core/controllers/serverController.cpp
+++ b/client/core/controllers/serverController.cpp
@@ -118,7 +118,7 @@ ServerController::runContainerScript(const ServerCredentials &credentials, Docke

 ErrorCode ServerController::uploadTextFileToContainer(DockerContainer container, const ServerCredentials &credentials,
                                                      const QString &file, const QString &path,
-                                                      libssh::ScpOverwriteMode overwriteMode)
+                                                      libssh::SftpOverwriteMode overwriteMode)
 {
    ErrorCode e = ErrorCode::NoError;
    QString tmpFileName = QString("/tmp/%1.tmp").arg(Utils::getRandomString(16));
@@ -139,7 +139,7 @@ ErrorCode ServerController::uploadTextFileToContainer(DockerContainer container,
    if (e)
        return e;

-    if (overwriteMode == libssh::ScpOverwriteMode::ScpOverwriteExisting) {
+    if (overwriteMode == libssh::SftpOverwriteMode::SftpOverwriteExisting) {
        e = runScript(credentials,
                      replaceVars(QString("sudo docker cp %1 $CONTAINER_NAME:/%2").arg(tmpFileName).arg(path),
                                  genVarsForScript(credentials, container)),
@@ -147,7 +147,7 @@ ErrorCode ServerController::uploadTextFileToContainer(DockerContainer container,

        if (e)
            return e;
-    } else if (overwriteMode == libssh::ScpOverwriteMode::ScpAppendToExisting) {
+    } else if (overwriteMode == libssh::SftpOverwriteMode::SftpAppendToExisting) {
        e = runScript(credentials,
                      replaceVars(QString("sudo docker cp %1 $CONTAINER_NAME:/%2").arg(tmpFileName).arg(tmpFileName),
                                  genVarsForScript(credentials, container)),
@@ -199,7 +199,7 @@ QByteArray ServerController::getTextFileFromContainer(DockerContainer container,
 }

 ErrorCode ServerController::uploadFileToHost(const ServerCredentials &credentials, const QByteArray &data,
-                                             const QString &remotePath, libssh::ScpOverwriteMode overwriteMode)
+                                             const QString &remotePath, libssh::SftpOverwriteMode overwriteMode)
 {
    auto error = m_sshClient.connectToHost(credentials);
    if (error != ErrorCode::NoError) {
@@ -211,7 +211,13 @@ ErrorCode ServerController::uploadFileToHost(const ServerCredentials &credential
    localFile.write(data);
    localFile.close();

-    error = m_sshClient.scpFileCopy(overwriteMode, localFile.fileName(), remotePath, "non_desc");
+#ifdef Q_OS_WINDOWS
+    error = m_sshClient.sftpFileCopy(overwriteMode, localFile.fileName().toLocal8Bit().toStdString(), remotePath.toStdString(),
+                                     "non_desc");
+#else
+    error = m_sshClient.sftpFileCopy(overwriteMode, localFile.fileName().toStdString(), remotePath.toStdString(),
+                                     "non_desc");
+#endif

    if (error != ErrorCode::NoError) {
        return error;
--- a/client/core/controllers/serverController.h
+++ b/client/core/controllers/serverController.h
@@ -38,7 +38,7 @@ public:

    ErrorCode uploadTextFileToContainer(
            DockerContainer container, const ServerCredentials &credentials, const QString &file, const QString &path,
-            libssh::ScpOverwriteMode overwriteMode = libssh::ScpOverwriteMode::ScpOverwriteExisting);
+            libssh::SftpOverwriteMode overwriteMode = libssh::SftpOverwriteMode::SftpOverwriteExisting);
    QByteArray getTextFileFromContainer(DockerContainer container, const ServerCredentials &credentials,
                                        const QString &path, ErrorCode *errorCode = nullptr);

@@ -80,7 +80,7 @@ private:
    ErrorCode isServerDpkgBusy(const ServerCredentials &credentials, DockerContainer container);

    ErrorCode uploadFileToHost(const ServerCredentials &credentials, const QByteArray &data, const QString &remotePath,
-                               libssh::ScpOverwriteMode overwriteMode = libssh::ScpOverwriteMode::ScpOverwriteExisting);
+                               libssh::SftpOverwriteMode overwriteMode = libssh::SftpOverwriteMode::SftpOverwriteExisting);

    ErrorCode setupServerFirewall(const ServerCredentials &credentials);

--- a/client/core/defs.h
+++ b/client/core/defs.h
@@ -46,12 +46,25 @@ namespace amnezia
        SshPrivateKeyFormatError = 304,
        SshTimeoutError = 305,

-        // Ssh scp errors
-        SshScpFailureError = 400,
+        // Ssh sftp errors
+        SshSftpEofError = 400,
+        SshSftpNoSuchFileError = 401,
+        SshSftpPermissionDeniedError = 402,
+        SshSftpFailureError = 403,
+        SshSftpBadMessageError = 404,
+        SshSftpNoConnectionError = 405,
+        SshSftpConnectionLostError = 406,
+        SshSftpOpUnsupportedError = 407,
+        SshSftpInvalidHandleError = 408,
+        SshSftpNoSuchPathError = 409,
+        SshSftpFileAlreadyExistsError = 410,
+        SshSftpWriteProtectError = 411,
+        SshSftpNoMediaError = 412,

        // Local errors
        OpenVpnConfigMissing = 500,
        OpenVpnManagementServerError = 501,
+        ConfigMissing = 502,

        // Distro errors
        OpenVpnExecutableMissing = 600,
@@ -79,15 +92,7 @@ namespace amnezia

        // Api errors
        ApiConfigDownloadError = 1100,
-        ApiConfigAlreadyAdded = 1101,
-
-        // QFile errors
-        OpenError = 1200,
-        ReadError = 1201,
-        PermissionsError = 1202,
-        UnspecifiedError = 1203,
-        FatalError = 1204,
-        AbortError = 1205
+        ApiConfigAlreadyAdded = 1101
    };

 } // namespace amnezia
--- a/client/core/errorstrings.cpp
+++ b/client/core/errorstrings.cpp
@@ -28,8 +28,20 @@ QString errorString(ErrorCode code) {
    case(SshPrivateKeyFormatError): errorMessage = QObject::tr("The selected private key format is not supported, use openssh ED25519 key types or PEM key types"); break;
    case(SshTimeoutError): errorMessage = QObject::tr("Timeout connecting to server"); break;

-    // Ssh scp errors
-    case(SshScpFailureError): errorMessage = QObject::tr("Scp error: Generic failure"); break;
+    // Libssh sftp errors
+    case(SshSftpEofError): errorMessage = QObject::tr("Sftp error: End-of-file encountered"); break;
+    case(SshSftpNoSuchFileError): errorMessage = QObject::tr("Sftp error: File does not exist"); break;
+    case(SshSftpPermissionDeniedError): errorMessage = QObject::tr("Sftp error: Permission denied"); break;
+    case(SshSftpFailureError): errorMessage = QObject::tr("Sftp error: Generic failure"); break;
+    case(SshSftpBadMessageError): errorMessage = QObject::tr("Sftp error: Garbage received from server"); break;
+    case(SshSftpNoConnectionError): errorMessage = QObject::tr("Sftp error: No connection has been set up"); break;
+    case(SshSftpConnectionLostError): errorMessage = QObject::tr("Sftp error: There was a connection, but we lost it"); break;
+    case(SshSftpOpUnsupportedError): errorMessage = QObject::tr("Sftp error: Operation not supported by libssh yet"); break;
+    case(SshSftpInvalidHandleError): errorMessage = QObject::tr("Sftp error: Invalid file handle"); break;
+    case(SshSftpNoSuchPathError): errorMessage = QObject::tr("Sftp error: No such file or directory path exists"); break;
+    case(SshSftpFileAlreadyExistsError): errorMessage = QObject::tr("Sftp error: An attempt to create an already existing file or directory has been made"); break;
+    case(SshSftpWriteProtectError): errorMessage = QObject::tr("Sftp error: Write-protected filesystem"); break;
+    case(SshSftpNoMediaError): errorMessage = QObject::tr("Sftp error: No media was in remote drive"); break;

    // Local errors
    case (OpenVpnConfigMissing): errorMessage = QObject::tr("OpenVPN config missing"); break;
@@ -56,14 +68,6 @@ QString errorString(ErrorCode code) {
    case (ApiConfigDownloadError): errorMessage = QObject::tr("Error when retrieving configuration from API"); break;
    case (ApiConfigAlreadyAdded): errorMessage = QObject::tr("This config has already been added to the application"); break;

-    // QFile errors
-    case(OpenError): errorMessage = QObject::tr("QFile error: The file could not be opened"); break;
-    case(ReadError): errorMessage = QObject::tr("QFile error: An error occurred when reading from the file"); break;
-    case(PermissionsError): errorMessage = QObject::tr("QFile error: The file could not be accessed"); break;
-    case(UnspecifiedError): errorMessage =  QObject::tr("QFile error: An unspecified error occurred"); break;
-    case(FatalError): errorMessage =  QObject::tr("QFile error: A fatal error occurred"); break;
-    case(AbortError): errorMessage =  QObject::tr("QFile error: The operation was aborted"); break;
-
    case(InternalError):
    default:
        errorMessage = QObject::tr("Internal error"); break;
--- a/client/core/sshclient.cpp
+++ b/client/core/sshclient.cpp
@@ -10,10 +10,16 @@ const uint32_t S_IRWXU = 0644;
 #endif

 namespace libssh {
-    constexpr auto libsshTimeoutError{"Timeout connecting to"};
+    const QString libsshTimeoutError = "Timeout connecting to";

    std::function<QString()> Client::m_passphraseCallback;

+    Client::Client(QObject *parent) : QObject(parent)
+    { }
+
+    Client::~Client()
+    { }
+
    int Client::callback(const char *prompt, char *buf, size_t len, int echo, int verify, void *userdata)
    {
        auto passphrase = m_passphraseCallback();
@@ -165,13 +171,13 @@ namespace libssh {
                    return ErrorCode::NoError;
                };

-                auto errorCode = readOutput(false);
-                if (errorCode != ErrorCode::NoError) {
-                    return errorCode;
+                auto error = readOutput(false);
+                if (error != ErrorCode::NoError) {
+                    return error;
                }
-                errorCode = readOutput(true);
-                if (errorCode != ErrorCode::NoError) {
-                    return errorCode;
+                error = readOutput(true);
+                if (error != ErrorCode::NoError) {
+                    return error;
                }
            } else {
                return closeChannel();
@@ -216,79 +222,102 @@ namespace libssh {
        return fromLibsshErrorCode();
    }

-    ErrorCode Client::scpFileCopy(const ScpOverwriteMode overwriteMode, const QString& localPath, const QString& remotePath, const QString &fileDesc)
+    ErrorCode Client::sftpFileCopy(const SftpOverwriteMode overwriteMode, const std::string& localPath, const std::string& remotePath, const std::string& fileDesc)
    {
-        m_scpSession = ssh_scp_new(m_session, SSH_SCP_WRITE, remotePath.toStdString().c_str());
+        m_sftpSession = sftp_new(m_session);

-        if (m_scpSession == nullptr) {
-            return fromLibsshErrorCode();
+        if (m_sftpSession == nullptr) {
+            return closeSftpSession();
        }

-        if (ssh_scp_init(m_scpSession) != SSH_OK) {
-            auto errorCode = fromLibsshErrorCode();
-            closeScpSession();
-            return errorCode;
+        int result = sftp_init(m_sftpSession);
+
+        if (result != SSH_OK) {
+            return closeSftpSession();
        }

        QFutureWatcher<ErrorCode> watcher;
-        connect(&watcher, &QFutureWatcher<ErrorCode>::finished, this, &Client::scpFileCopyFinished);
-        QFuture<ErrorCode> future = QtConcurrent::run([this, overwriteMode, &localPath, &remotePath, &fileDesc]() {
-            const int accessType = O_WRONLY | O_CREAT | overwriteMode;
-            const int localFileSize = QFileInfo(localPath).size();
+        connect(&watcher, &QFutureWatcher<ErrorCode>::finished, this, &Client::sftpFileCopyFinished);

-            int result = ssh_scp_push_file(m_scpSession, remotePath.toStdString().c_str(), localFileSize, accessType);
-            if (result != SSH_OK) {
-                return fromLibsshErrorCode();
+        QFuture<ErrorCode> future = QtConcurrent::run([this, overwriteMode, &localPath, &remotePath, &fileDesc]() {
+            int accessType = O_WRONLY | O_CREAT | overwriteMode;
+            sftp_file file;
+            const size_t bufferSize = 16384;
+            char buffer[bufferSize];
+
+            file = sftp_open(m_sftpSession, remotePath.c_str(), accessType, S_IRWXU);
+
+            if (file == nullptr) {
+                return closeSftpSession();
            }

-            QFile fin(localPath);
+            int localFileSize = std::filesystem::file_size(localPath);
+            int chunksCount = localFileSize / (bufferSize);

-            if (fin.open(QIODevice::ReadOnly)) {
-                constexpr size_t bufferSize = 16384;
-                int transferred = 0;
-                int currentChunkSize = bufferSize;
+            std::ifstream fin(localPath, std::ios::binary | std::ios::in);

-                while (transferred < localFileSize) {
+            if (fin.is_open()) {
+                for (int currentChunkId = 0; currentChunkId < chunksCount; currentChunkId++) {
+                    fin.read(buffer, bufferSize);

-                    // Last Chunk
-                    if ((localFileSize - transferred) < bufferSize) {
-                        currentChunkSize = localFileSize % bufferSize;
+                    int bytesWritten = sftp_write(file, buffer, bufferSize);
+
+                    std::string chunk(buffer, bufferSize);
+
+                    if (bytesWritten != bufferSize) {
+                        fin.close();
+                        sftp_close(file);
+                        return closeSftpSession();
                    }
+                }

-                    QByteArray chunk = fin.read(currentChunkSize);
-                    if (chunk.size() != currentChunkSize) {
-                        return fromFileErrorCode(fin.error());
+                int lastChunkSize = localFileSize % (bufferSize);
+
+                if (lastChunkSize != 0) {
+                    fin.read(buffer, lastChunkSize);
+
+                    std::string chunk(buffer, lastChunkSize);
+
+                    int bytesWritten = sftp_write(file, buffer, lastChunkSize);
+
+                    if (bytesWritten != lastChunkSize) {
+                        fin.close();
+                        sftp_close(file);
+                        return closeSftpSession();
                    }
-
-                    result = ssh_scp_write(m_scpSession, chunk.data(), chunk.size());
-                    if (result != SSH_OK) {
-                        return fromLibsshErrorCode();
-                    }
-
-                    transferred += currentChunkSize;
                }
            } else {
-                return fromFileErrorCode(fin.error());
+                sftp_close(file);
+                return closeSftpSession();
            }

-            return ErrorCode::NoError;
+            fin.close();
+
+            int result = sftp_close(file);
+            if (result != SSH_OK) {
+                return closeSftpSession();
+            }
+
+            return closeSftpSession();
        });
        watcher.setFuture(future);

        QEventLoop wait;
-        QObject::connect(this, &Client::scpFileCopyFinished, &wait, &QEventLoop::quit);
+        QObject::connect(this, &Client::sftpFileCopyFinished, &wait, &QEventLoop::quit);
        wait.exec();

-        closeScpSession();
        return watcher.result();
    }

-    void Client::closeScpSession()
+    ErrorCode Client::closeSftpSession()
    {
-        if (m_scpSession != nullptr) {
-            ssh_scp_free(m_scpSession);
-            m_scpSession = nullptr;
+        auto errorCode = fromLibsshSftpErrorCode(sftp_get_error(m_sftpSession));
+        if (m_sftpSession != nullptr) {
+            sftp_free(m_sftpSession);
+            m_sftpSession = nullptr;
        }
+        qCritical() << ssh_get_error(m_session);
+        return errorCode;
    }

    ErrorCode Client::fromLibsshErrorCode()
@@ -310,17 +339,24 @@ namespace libssh {
        default: return ErrorCode::SshInternalError;
        }
    }
-
-    ErrorCode Client::fromFileErrorCode(QFileDevice::FileError fileError)
+    ErrorCode Client::fromLibsshSftpErrorCode(int errorCode)
    {
-        switch (fileError) {
-        case QFileDevice::NoError: return ErrorCode::NoError;
-        case QFileDevice::ReadError: return ErrorCode::ReadError;
-        case QFileDevice::OpenError: return ErrorCode::OpenError;
-        case QFileDevice::PermissionsError: return ErrorCode::PermissionsError;
-        case QFileDevice::FatalError: return ErrorCode::FatalError;
-        case QFileDevice::AbortError: return ErrorCode::AbortError;
-        default: return ErrorCode::UnspecifiedError;
+        switch (errorCode) {
+        case(SSH_FX_OK): return ErrorCode::NoError;
+        case(SSH_FX_EOF): return ErrorCode::SshSftpEofError;
+        case(SSH_FX_NO_SUCH_FILE): return ErrorCode::SshSftpNoSuchFileError;
+        case(SSH_FX_PERMISSION_DENIED): return ErrorCode::SshSftpPermissionDeniedError;
+        case(SSH_FX_FAILURE): return ErrorCode::SshSftpFailureError;
+        case(SSH_FX_BAD_MESSAGE): return ErrorCode::SshSftpBadMessageError;
+        case(SSH_FX_NO_CONNECTION): return ErrorCode::SshSftpNoConnectionError;
+        case(SSH_FX_CONNECTION_LOST): return ErrorCode::SshSftpConnectionLostError;
+        case(SSH_FX_OP_UNSUPPORTED): return ErrorCode::SshSftpOpUnsupportedError;
+        case(SSH_FX_INVALID_HANDLE): return ErrorCode::SshSftpInvalidHandleError;
+        case(SSH_FX_NO_SUCH_PATH): return ErrorCode::SshSftpNoSuchPathError;
+        case(SSH_FX_FILE_ALREADY_EXISTS): return ErrorCode::SshSftpFileAlreadyExistsError;
+        case(SSH_FX_WRITE_PROTECT): return ErrorCode::SshSftpWriteProtectError;
+        case(SSH_FX_NO_MEDIA): return ErrorCode::SshSftpNoMediaError;
+        default: return ErrorCode::SshSftpFailureError;
        }
    }

--- a/client/core/sshclient.h
+++ b/client/core/sshclient.h
@@ -2,29 +2,29 @@
 #define SSHCLIENT_H

 #include <QObject>
-#include <QFile>

 #include <fcntl.h>

 #include <libssh/libssh.h>
+#include <libssh/sftp.h>

 #include "defs.h"

 using namespace amnezia;

 namespace libssh {
-    enum ScpOverwriteMode {
+    enum SftpOverwriteMode {
        /*! Overwrite any existing files */
-        ScpOverwriteExisting = O_TRUNC,
+        SftpOverwriteExisting = O_TRUNC,
        /*! Append new content if the file already exists */
-        ScpAppendToExisting = O_APPEND
+        SftpAppendToExisting = O_APPEND
    };
    class Client : public QObject
    {
        Q_OBJECT
    public:
-        Client() = default;
-        ~Client() = default;
+        Client(QObject *parent = nullptr);
+        ~Client();

        ErrorCode connectToHost(const ServerCredentials &credentials);
        void disconnectFromHost();
@@ -32,26 +32,26 @@ namespace libssh {
                                 const std::function<ErrorCode (const QString &, Client &)> &cbReadStdOut,
                                 const std::function<ErrorCode (const QString &, Client &)> &cbReadStdErr);
        ErrorCode writeResponse(const QString &data);
-        ErrorCode scpFileCopy(const ScpOverwriteMode overwriteMode,
-                               const QString &localPath,
-                               const QString &remotePath,
-                               const QString &fileDesc);
+        ErrorCode sftpFileCopy(const SftpOverwriteMode overwriteMode,
+                               const std::string& localPath,
+                               const std::string& remotePath,
+                               const std::string& fileDesc);
        ErrorCode getDecryptedPrivateKey(const ServerCredentials &credentials, QString &decryptedPrivateKey, const std::function<QString()> &passphraseCallback);
    private:
        ErrorCode closeChannel();
-        void closeScpSession();
+        ErrorCode closeSftpSession();
        ErrorCode fromLibsshErrorCode();
-        ErrorCode fromFileErrorCode(QFileDevice::FileError fileError);
+        ErrorCode fromLibsshSftpErrorCode(int errorCode);
        static int callback(const char *prompt, char *buf, size_t len, int echo, int verify, void *userdata);

        ssh_session m_session = nullptr;
        ssh_channel m_channel = nullptr;
-        ssh_scp m_scpSession = nullptr;
+        sftp_session m_sftpSession = nullptr;

        static std::function<QString()> m_passphraseCallback;
    signals:
        void writeToChannelFinished();
-        void scpFileCopyFinished();
+        void sftpFileCopyFinished();
    };
 }

--- a/client/images/controls/split-tunneling.svg
+++ b/client/images/controls/split-tunneling.svg
@@ -1,6 +0,0 @@
-<svg width="19" height="18" viewBox="0 0 19 18" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect x="0.5" width="18" height="18" rx="5" fill="white"/>
-<path d="M8.49219 13.5L8.49219 9.44141L14.0191 4.99484" stroke="#0E0E11" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M4.47363 5.49805L6.98828 8.0127" stroke="#0E0E11" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M14.4727 9.5L14.4727 4.5033L9.50195 4.5033" stroke="#0E0E11" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
--- a/client/ios/networkextension/CMakeLists.txt
+++ b/client/ios/networkextension/CMakeLists.txt
@@ -85,7 +85,6 @@ target_sources(networkextension PRIVATE
    ${CLIENT_ROOT_DIR}/platforms/ios/LogRecord.swift
    ${CLIENT_ROOT_DIR}/platforms/ios/PacketTunnelProvider.swift
    ${CLIENT_ROOT_DIR}/platforms/ios/PacketTunnelProvider+OpenVPNAdapterDelegate.swift
-    ${CLIENT_ROOT_DIR}/platforms/ios/WGConfig.swift
    ${CLIENT_ROOT_DIR}/platforms/ios/iosglue.mm
 )

--- a/client/main.cpp
+++ b/client/main.cpp
@@ -48,6 +48,10 @@ int main(int argc, char *argv[])
    AllowSetForegroundWindow(0);
 #endif

+#if defined(Q_OS_IOS)
+    QtAppDelegateInitialize();
+#endif
+
    app.registerTypes();

    app.setApplicationName(APPLICATION_NAME);
@@ -61,7 +65,7 @@ int main(int argc, char *argv[])
    if (doExec) {
        app.init();

-        qInfo().noquote() << QString("Started %1 version %2 %3").arg(APPLICATION_NAME, APP_VERSION, GIT_COMMIT_HASH);
+        qInfo().noquote() << QString("Started %1 version %2").arg(APPLICATION_NAME, APP_VERSION);
        qInfo().noquote() << QString("%1 (%2)").arg(QSysInfo::prettyProductName(), QSysInfo::currentCpuArchitecture());

        return app.exec();
--- a/client/mozilla/localsocketcontroller.cpp
+++ b/client/mozilla/localsocketcontroller.cpp
@@ -124,10 +124,7 @@ void LocalSocketController::activate(const QJsonObject &rawConfig) {
  //  json.insert("hopindex", QJsonValue((double)hop.m_hopindex));
  json.insert("privateKey", wgConfig.value(amnezia::config_key::client_priv_key));
  json.insert("deviceIpv4Address", wgConfig.value(amnezia::config_key::client_ip));
-  // todo review wg ipv6
-#ifdef Q_OS_MACOS
  json.insert("deviceIpv6Address", "dead::1");
-#endif
  json.insert("serverPublicKey", wgConfig.value(amnezia::config_key::server_pub_key));
  json.insert("serverPskKey", wgConfig.value(amnezia::config_key::psk_key));
  json.insert("serverIpv4AddrIn", wgConfig.value(amnezia::config_key::hostName));
--- a/client/platforms/android/android_controller.cpp
+++ b/client/platforms/android/android_controller.cpp
@@ -56,10 +56,26 @@ AndroidController::AndroidController() : QObject()
        Qt::QueuedConnection);

    connect(
-        this, &AndroidController::vpnStateChanged, this,
-        [this](AndroidController::ConnectionState state) {
-            qDebug() << "Android event: VPN state changed:" << textConnectionState(state);
-            emit connectionStateChanged(convertState(state));
+        this, &AndroidController::vpnConnected, this,
+        [this]() {
+            qDebug() << "Android event: VPN connected";
+            emit connectionStateChanged(Vpn::ConnectionState::Connected);
+        },
+        Qt::QueuedConnection);
+
+    connect(
+        this, &AndroidController::vpnDisconnected, this,
+        [this]() {
+            qDebug() << "Android event: VPN disconnected";
+            emit connectionStateChanged(Vpn::ConnectionState::Disconnected);
+        },
+        Qt::QueuedConnection);
+
+    connect(
+        this, &AndroidController::vpnReconnecting, this,
+        [this]() {
+            qDebug() << "Android event: VPN reconnecting";
+            emit connectionStateChanged(Vpn::ConnectionState::Reconnecting);
        },
        Qt::QueuedConnection);

@@ -90,7 +106,9 @@ bool AndroidController::initialize()
        {"onServiceDisconnected", "()V", reinterpret_cast<void *>(onServiceDisconnected)},
        {"onServiceError", "()V", reinterpret_cast<void *>(onServiceError)},
        {"onVpnPermissionRejected", "()V", reinterpret_cast<void *>(onVpnPermissionRejected)},
-        {"onVpnStateChanged", "(I)V", reinterpret_cast<void *>(onVpnStateChanged)},
+        {"onVpnConnected", "()V", reinterpret_cast<void *>(onVpnConnected)},
+        {"onVpnDisconnected", "()V", reinterpret_cast<void *>(onVpnDisconnected)},
+        {"onVpnReconnecting", "()V", reinterpret_cast<void *>(onVpnReconnecting)},
        {"onStatisticsUpdate", "(JJ)V", reinterpret_cast<void *>(onStatisticsUpdate)},
        {"onFileOpened", "(Ljava/lang/String;)V", reinterpret_cast<void *>(onFileOpened)},
        {"onConfigImported", "(Ljava/lang/String;)V", reinterpret_cast<void *>(onConfigImported)},
@@ -140,11 +158,6 @@ void AndroidController::stop()
    callActivityMethod("stop", "()V");
 }

-void AndroidController::resetLastServer(int serverIndex)
-{
-    callActivityMethod("resetLastServer", "(I)V", serverIndex);
-}
-
 void AndroidController::saveFile(const QString &fileName, const QString &data)
 {
    callActivityMethod("saveFile", "(Ljava/lang/String;Ljava/lang/String;)V",
@@ -204,11 +217,6 @@ void AndroidController::clearLogs()
    callActivityMethod("clearLogs", "()V");
 }

-void AndroidController::setScreenshotsEnabled(bool enabled)
-{
-    callActivityMethod("setScreenshotsEnabled", "(Z)V", enabled);
-}
-
 // Moving log processing to the Android side
 jclass AndroidController::log;
 jmethodID AndroidController::logDebug;
@@ -362,14 +370,30 @@ void AndroidController::onVpnPermissionRejected(JNIEnv *env, jobject thiz)
 }

 // static
-void AndroidController::onVpnStateChanged(JNIEnv *env, jobject thiz, jint stateCode)
+void AndroidController::onVpnConnected(JNIEnv *env, jobject thiz)
 {
    Q_UNUSED(env);
    Q_UNUSED(thiz);

-    auto state = ConnectionState(stateCode);
+    emit AndroidController::instance()->vpnConnected();
+}

-    emit AndroidController::instance()->vpnStateChanged(state);
+// static
+void AndroidController::onVpnDisconnected(JNIEnv *env, jobject thiz)
+{
+    Q_UNUSED(env);
+    Q_UNUSED(thiz);
+
+    emit AndroidController::instance()->vpnDisconnected();
+}
+
+// static
+void AndroidController::onVpnReconnecting(JNIEnv *env, jobject thiz)
+{
+    Q_UNUSED(env);
+    Q_UNUSED(thiz);
+
+    emit AndroidController::instance()->vpnReconnecting();
 }

 // static
--- a/client/platforms/android/android_controller.h
+++ b/client/platforms/android/android_controller.h
@@ -20,9 +20,9 @@ public:
    // keep synchronized with org.amnezia.vpn.protocol.ProtocolState
    enum class ConnectionState
    {
-        DISCONNECTED,
        CONNECTED,
        CONNECTING,
+        DISCONNECTED,
        DISCONNECTING,
        RECONNECTING,
        UNKNOWN
@@ -30,7 +30,6 @@ public:

    ErrorCode start(const QJsonObject &vpnConfig);
    void stop();
-    void resetLastServer(int serverIndex);
    void setNotificationText(const QString &title, const QString &message, int timerSec);
    void saveFile(const QString &fileName, const QString &data);
    QString openFile(const QString &filter);
@@ -39,7 +38,6 @@ public:
    void setSaveLogs(bool enabled);
    void exportLogsFile(const QString &fileName);
    void clearLogs();
-    void setScreenshotsEnabled(bool enabled);

    static bool initLogging();
    static void messageHandler(QtMsgType type, const QMessageLogContext &context, const QString &message);
@@ -50,7 +48,9 @@ signals:
    void serviceDisconnected();
    void serviceError();
    void vpnPermissionRejected();
-    void vpnStateChanged(ConnectionState state);
+    void vpnConnected();
+    void vpnDisconnected();
+    void vpnReconnecting();
    void statisticsUpdated(quint64 rxBytes, quint64 txBytes);
    void fileOpened(QString uri);
    void configImported(QString config);
@@ -77,7 +77,9 @@ private:
    static void onServiceDisconnected(JNIEnv *env, jobject thiz);
    static void onServiceError(JNIEnv *env, jobject thiz);
    static void onVpnPermissionRejected(JNIEnv *env, jobject thiz);
-    static void onVpnStateChanged(JNIEnv *env, jobject thiz, jint stateCode);
+    static void onVpnConnected(JNIEnv *env, jobject thiz);
+    static void onVpnDisconnected(JNIEnv *env, jobject thiz);
+    static void onVpnReconnecting(JNIEnv *env, jobject thiz);
    static void onStatisticsUpdate(JNIEnv *env, jobject thiz, jlong rxBytes, jlong txBytes);
    static void onConfigImported(JNIEnv *env, jobject thiz, jstring data);
    static void onFileOpened(JNIEnv *env, jobject thiz, jstring uri);
--- a/client/platforms/ios/LogController.swift
+++ b/client/platforms/ios/LogController.swift
@@ -1,5 +1,4 @@
 import Foundation
-import NetworkExtension

 public func swiftUpdateLogData(_ qtString: std.string) -> std.string {
  let qtLog = Log(String(describing: qtString))
@@ -25,26 +24,3 @@ public func swiftDeleteLog() {
 public func toggleLogging(_ isEnabled: Bool) {
  Log.isLoggingEnabled = isEnabled
 }
-
-public func clearSettings() {
-  NETunnelProviderManager.loadAllFromPreferences { managers, error in
-    if let error {
-      NSLog("clearSettings removeFromPreferences error: \(error.localizedDescription)")
-      return
-    }
-
-    managers?.forEach { manager in
-      manager.removeFromPreferences { error in
-        if let error {
-          NSLog("NE removeFromPreferences error: \(error.localizedDescription)")
-        } else {
-          manager.loadFromPreferences { error in
-            if let error {
-              NSLog("NE loadFromPreferences after remove error: \(error.localizedDescription)")
-            }
-          }
-        }
-      }
-    }
-  }
-}
--- a/client/platforms/ios/PacketTunnelProvider+OpenVPNAdapterDelegate.swift
+++ b/client/platforms/ios/PacketTunnelProvider+OpenVPNAdapterDelegate.swift
@@ -18,32 +18,40 @@ extension PacketTunnelProvider: OpenVPNAdapterDelegate {
    // send empty string to NEDNSSettings.matchDomains
    networkSettings?.dnsSettings?.matchDomains = [""]

-    if splitTunnelType == 1 {
+    if splitTunnelType == "1" {
      var ipv4IncludedRoutes = [NEIPv4Route]()
-
-      for allowedIPString in splitTunnelSites {
-        if let allowedIP = IPAddressRange(from: allowedIPString) {
-          ipv4IncludedRoutes.append(NEIPv4Route(
-            destinationAddress: "\(allowedIP.address)",
-            subnetMask: "\(allowedIP.subnetMask())"))
+      let STSdata = Data(splitTunnelSites!.utf8)
+      do {
+        guard let STSArray = try JSONSerialization.jsonObject(with: STSdata) as? [String] else { return }
+        for allowedIPString in STSArray {
+          if let allowedIP = IPAddressRange(from: allowedIPString) {
+            ipv4IncludedRoutes.append(NEIPv4Route(
+              destinationAddress: "\(allowedIP.address)",
+              subnetMask: "\(allowedIP.subnetMask())"))
+          }
        }
+      } catch {
+        wg_log(.error, message: "Parse JSONSerialization Error")
      }
-
      networkSettings?.ipv4Settings?.includedRoutes = ipv4IncludedRoutes
    } else {
-      if splitTunnelType == 2 {
+      if splitTunnelType == "2" {
        var ipv4ExcludedRoutes = [NEIPv4Route]()
        var ipv4IncludedRoutes = [NEIPv4Route]()
        var ipv6IncludedRoutes = [NEIPv6Route]()
-
-        for excludeIPString in splitTunnelSites {
-          if let excludeIP = IPAddressRange(from: excludeIPString) {
-            ipv4ExcludedRoutes.append(NEIPv4Route(
-              destinationAddress: "\(excludeIP.address)",
-              subnetMask: "\(excludeIP.subnetMask())"))
+        let STSdata = Data(splitTunnelSites!.utf8)
+        do {
+          guard let STSArray = try JSONSerialization.jsonObject(with: STSdata) as? [String] else { return }
+          for excludeIPString in STSArray {
+            if let excludeIP = IPAddressRange(from: excludeIPString) {
+              ipv4ExcludedRoutes.append(NEIPv4Route(
+                destinationAddress: "\(excludeIP.address)",
+                subnetMask: "\(excludeIP.subnetMask())"))
+            }
          }
+        } catch {
+          wg_log(.error, message: "Parse JSONSerialization Error")
        }
-
        if let allIPv4 = IPAddressRange(from: "0.0.0.0/0") {
          ipv4IncludedRoutes.append(NEIPv4Route(
            destinationAddress: "\(allIPv4.address)",
--- a/client/platforms/ios/PacketTunnelProvider.swift
+++ b/client/platforms/ios/PacketTunnelProvider.swift
@@ -50,8 +50,8 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
  private let dispatchQueue = DispatchQueue(label: "PacketTunnel", qos: .utility)

  private var openVPNConfig: Data?
-  var splitTunnelType: Int!
-  var splitTunnelSites: [String]!
+  var splitTunnelType: String?
+  var splitTunnelSites: String?

  let vpnReachability = OpenVPNReachability()

@@ -59,6 +59,10 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
  var stopHandler: (() -> Void)?
  var protoType: TunnelProtoType = .none

+  override init() {
+    super.init()
+  }
+
  override func handleAppMessage(_ messageData: Data, completionHandler: ((Data?) -> Void)? = nil) {
    let tmpStr = String(data: messageData, encoding: .utf8)!
    wg_log(.error, message: tmpStr)
@@ -67,7 +71,7 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
      return
    }

-    guard let completionHandler else {
+    guard let completionHandler = completionHandler else {
      log(.error, message: "Missing message completion handler")
      return
    }
@@ -81,6 +85,22 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
    if action == Constants.kActionStatus {
      handleStatusAppMessage(messageData, completionHandler: completionHandler)
    }
+
+    if action == Constants.kActionStart {
+      splitTunnelType = message[Constants.kMessageKeySplitTunnelType] as? String
+      splitTunnelSites = message[Constants.kMessageKeySplitTunnelSites] as? String
+    }
+
+    let callbackWrapper: (NSNumber?) -> Void = { errorCode in
+      // let tunnelId = self.tunnelConfig?.id ?? ""
+      let response: [String: Any] = [
+        Constants.kMessageKeyAction: action,
+        Constants.kMessageKeyErrorCode: errorCode ?? NSNull(),
+        Constants.kMessageKeyTunnelId: 0
+      ]
+
+      completionHandler(try? JSONSerialization.data(withJSONObject: response, options: []))
+    }
  }

  override func startTunnel(options: [String: NSObject]?, completionHandler: @escaping (Error?) -> Void) {
@@ -153,118 +173,108 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
                              completionHandler: @escaping (Error?) -> Void) {
    guard let protocolConfiguration = self.protocolConfiguration as? NETunnelProviderProtocol,
          let providerConfiguration = protocolConfiguration.providerConfiguration,
-          let wgConfigData: Data = providerConfiguration[Constants.wireGuardConfigKey] as? Data else {
+          let wgConfig: Data = providerConfiguration[Constants.wireGuardConfigKey] as? Data else {
      wg_log(.error, message: "Can't start WireGuard config missing")
      completionHandler(nil)
      return
    }

-    do {
-      let wgConfig = try JSONDecoder().decode(WGConfig.self, from: wgConfigData)
-      let wgConfigStr = wgConfig.str
-      log(.info, message: "wgConfig: \(wgConfig.redux.replacingOccurrences(of: "\n", with: " "))")
+    let wgConfigStr = String(data: wgConfig, encoding: .utf8)!

-      let tunnelConfiguration = try TunnelConfiguration(fromWgQuickConfig: wgConfigStr)
+    guard let tunnelConfiguration = try? TunnelConfiguration(fromWgQuickConfig: wgConfigStr) else {
+      wg_log(.error, message: "Can't parse WireGuard config")
+      completionHandler(nil)
+      return
+    }

-      if tunnelConfiguration.peers.first!.allowedIPs
-        .map({ $0.stringRepresentation })
-        .joined(separator: ", ") == "0.0.0.0/0, ::/0" {
-        if wgConfig.splitTunnelType == 1 {
-          for index in tunnelConfiguration.peers.indices {
-            tunnelConfiguration.peers[index].allowedIPs.removeAll()
-            var allowedIPs = [IPAddressRange]()
-
-            for allowedIPString in wgConfig.splitTunnelSites {
+    if tunnelConfiguration.peers.first!.allowedIPs
+      .map({ $0.stringRepresentation })
+      .joined(separator: ", ") == "0.0.0.0/0, ::/0" {
+      if splitTunnelType == "1" {
+        for index in tunnelConfiguration.peers.indices {
+          tunnelConfiguration.peers[index].allowedIPs.removeAll()
+          var allowedIPs = [IPAddressRange]()
+          let STSdata = Data(splitTunnelSites!.utf8)
+          do {
+            guard let STSArray = try JSONSerialization.jsonObject(with: STSdata) as? [String] else { return }
+            for allowedIPString in STSArray {
              if let allowedIP = IPAddressRange(from: allowedIPString) {
                allowedIPs.append(allowedIP)
              }
            }
-
-            tunnelConfiguration.peers[index].allowedIPs = allowedIPs
+          } catch {
+            wg_log(.error, message: "Parse JSONSerialization Error")
          }
-        } else if wgConfig.splitTunnelType == 2 {
-          for index in tunnelConfiguration.peers.indices {
-            var excludeIPs = [IPAddressRange]()
-
-            for excludeIPString in wgConfig.splitTunnelSites {
+          tunnelConfiguration.peers[index].allowedIPs = allowedIPs
+        }
+      } else if splitTunnelType == "2" {
+        for index in tunnelConfiguration.peers.indices {
+          var excludeIPs = [IPAddressRange]()
+          let STSdata = Data(splitTunnelSites!.utf8)
+          do {
+            guard let STSArray = try JSONSerialization.jsonObject(with: STSdata) as? [String] else { return }
+            for excludeIPString in STSArray {
              if let excludeIP = IPAddressRange(from: excludeIPString) {
                excludeIPs.append(excludeIP)
              }
            }
-
-            tunnelConfiguration.peers[index].excludeIPs = excludeIPs
+          } catch {
+            wg_log(.error, message: "Parse JSONSerialization Error")
          }
+          tunnelConfiguration.peers[index].excludeIPs = excludeIPs
        }
      }
+    }

-      wg_log(.info, message: "Starting wireguard tunnel from the " +
-             (activationAttemptId == nil ? "OS directly, rather than the app" : "app"))
+    wg_log(.info, message: "Starting wireguard tunnel from the " +
+           (activationAttemptId == nil ? "OS directly, rather than the app" : "app"))

-      // Start the tunnel
-      wgAdapter.start(tunnelConfiguration: tunnelConfiguration) { adapterError in
-        guard let adapterError else {
-          let interfaceName = self.wgAdapter.interfaceName ?? "unknown"
-          wg_log(.info, message: "Tunnel interface is \(interfaceName)")
-          completionHandler(nil)
-          return
-        }
-
-        switch adapterError {
-        case .cannotLocateTunnelFileDescriptor:
-          wg_log(.error, staticMessage: "Starting tunnel failed: could not determine file descriptor")
-          errorNotifier.notify(PacketTunnelProviderError.couldNotDetermineFileDescriptor)
-          completionHandler(PacketTunnelProviderError.couldNotDetermineFileDescriptor)
-        case .dnsResolution(let dnsErrors):
-          let hostnamesWithDnsResolutionFailure = dnsErrors.map { $0.address }
-            .joined(separator: ", ")
-          wg_log(.error, message:
-                  "DNS resolution failed for the following hostnames: \(hostnamesWithDnsResolutionFailure)")
-          errorNotifier.notify(PacketTunnelProviderError.dnsResolutionFailure)
-          completionHandler(PacketTunnelProviderError.dnsResolutionFailure)
-        case .setNetworkSettings(let error):
-          wg_log(.error, message:
-                  "Starting tunnel failed with setTunnelNetworkSettings returning \(error.localizedDescription)")
-          errorNotifier.notify(PacketTunnelProviderError.couldNotSetNetworkSettings)
-          completionHandler(PacketTunnelProviderError.couldNotSetNetworkSettings)
-        case .startWireGuardBackend(let errorCode):
-          wg_log(.error, message: "Starting tunnel failed with wgTurnOn returning \(errorCode)")
-          errorNotifier.notify(PacketTunnelProviderError.couldNotStartBackend)
-          completionHandler(PacketTunnelProviderError.couldNotStartBackend)
-        case .invalidState:
-          fatalError()
-        }
+    // Start the tunnel
+    wgAdapter.start(tunnelConfiguration: tunnelConfiguration) { adapterError in
+      guard let adapterError else {
+        let interfaceName = self.wgAdapter.interfaceName ?? "unknown"
+        wg_log(.info, message: "Tunnel interface is \(interfaceName)")
+        completionHandler(nil)
+        return
+      }
+
+      switch adapterError {
+      case .cannotLocateTunnelFileDescriptor:
+        wg_log(.error, staticMessage: "Starting tunnel failed: could not determine file descriptor")
+        errorNotifier.notify(PacketTunnelProviderError.couldNotDetermineFileDescriptor)
+        completionHandler(PacketTunnelProviderError.couldNotDetermineFileDescriptor)
+      case .dnsResolution(let dnsErrors):
+        let hostnamesWithDnsResolutionFailure = dnsErrors.map { $0.address }
+          .joined(separator: ", ")
+        wg_log(.error, message:
+                "DNS resolution failed for the following hostnames: \(hostnamesWithDnsResolutionFailure)")
+        errorNotifier.notify(PacketTunnelProviderError.dnsResolutionFailure)
+        completionHandler(PacketTunnelProviderError.dnsResolutionFailure)
+      case .setNetworkSettings(let error):
+        wg_log(.error, message:
+                "Starting tunnel failed with setTunnelNetworkSettings returning \(error.localizedDescription)")
+        errorNotifier.notify(PacketTunnelProviderError.couldNotSetNetworkSettings)
+        completionHandler(PacketTunnelProviderError.couldNotSetNetworkSettings)
+      case .startWireGuardBackend(let errorCode):
+        wg_log(.error, message: "Starting tunnel failed with wgTurnOn returning \(errorCode)")
+        errorNotifier.notify(PacketTunnelProviderError.couldNotStartBackend)
+        completionHandler(PacketTunnelProviderError.couldNotStartBackend)
+      case .invalidState:
+        fatalError()
      }
-    } catch {
-      log(.error, message: "Can't parse WG config: \(error.localizedDescription)")
-      completionHandler(nil)
-      return
    }
  }

  private func startOpenVPN(completionHandler: @escaping (Error?) -> Void) {
    guard let protocolConfiguration = self.protocolConfiguration as? NETunnelProviderProtocol,
          let providerConfiguration = protocolConfiguration.providerConfiguration,
-          let openVPNConfigData = providerConfiguration[Constants.ovpnConfigKey] as? Data else {
+          let ovpnConfiguration: Data = providerConfiguration[Constants.ovpnConfigKey] as? Data else {
+
      wg_log(.error, message: "Can't start startOpenVPN()")
      return
    }

-    do {
-      log(.info, message: "providerConfiguration: \(String(decoding: openVPNConfigData, as: UTF8.self).replacingOccurrences(of: "\n", with: " "))")
-
-      let openVPNConfig = try JSONDecoder().decode(OpenVPNConfig.self, from: openVPNConfigData)
-      log(.info, message: "openVPNConfig: \(openVPNConfig.str.replacingOccurrences(of: "\n", with: " "))")
-      let ovpnConfiguration = Data(openVPNConfig.config.utf8)
-      setupAndlaunchOpenVPN(withConfig: ovpnConfiguration, completionHandler: completionHandler)
-    } catch {
-      log(.error, message: "Can't parse OpenVPN config: \(error.localizedDescription)")
-
-      if let underlyingError = (error as NSError).userInfo[NSUnderlyingErrorKey] as? NSError {
-        log(.error, message: "Can't parse OpenVPN config: \(underlyingError.localizedDescription)")
-      }
-
-      return
-    }
+    setupAndlaunchOpenVPN(withConfig: ovpnConfiguration, completionHandler: completionHandler)
  }

  private func stopWireguard(with reason: NEProviderStopReason, completionHandler: @escaping () -> Void) {
--- a/client/platforms/ios/QtAppDelegate.h
+++ b/client/platforms/ios/QtAppDelegate.h
@@ -1,7 +1,4 @@
 #import <UIKit/UIKit.h>

-@interface QIOSApplicationDelegate
-@end
-
-@interface QIOSApplicationDelegate (AmneziaVPNDelegate)
+@interface QtAppDelegate : UIResponder <UIApplicationDelegate>
@end
--- a/client/platforms/ios/QtAppDelegate.mm
+++ b/client/platforms/ios/QtAppDelegate.mm
@@ -3,17 +3,41 @@

 #include <QFile>

+@implementation QtAppDelegate {
+    UIView *_screen;
+}
+
+(QtAppDelegate *)sharedQtAppDelegate {
+    static dispatch_once_t pred;
+    static QtAppDelegate *shared = nil;
+    dispatch_once(&pred, ^{
+        shared = [[super alloc] init];
+    });
+    return shared;
+}

-@implementation QIOSApplicationDelegate (AmneziaVPNDelegate)

 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
    [application setMinimumBackgroundFetchInterval: UIApplicationBackgroundFetchIntervalMinimum];
    // Override point for customization after application launch.
-    NSLog(@"Application didFinishLaunchingWithOptions");
+    NSLog(@"Did this launch option happen");
    return YES;
 }

+- (void)applicationWillResignActive:(UIApplication *)application
+{
+    // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
+    // Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.
+    _screen = [UIScreen.mainScreen snapshotViewAfterScreenUpdates: false];
+    UIBlurEffect *blurEffect = [UIBlurEffect effectWithStyle: UIBlurEffectStyleDark];
+    UIVisualEffectView *blurBackground = [[UIVisualEffectView alloc] initWithEffect: blurEffect];
+    [_screen addSubview: blurBackground];
+    blurBackground.frame = _screen.frame;
+    UIWindow *_window = UIApplication.sharedApplication.keyWindow;
+    [_window addSubview: _screen];
+}
+
 - (void)applicationDidEnterBackground:(UIApplication *)application
 {
    // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
@@ -27,6 +51,17 @@
    NSLog(@"In the foreground");
 }

+- (void)applicationDidBecomeActive:(UIApplication *)application
+{
+    // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
+    [_screen removeFromSuperview];
+}
+
+- (void)applicationWillTerminate:(UIApplication *)application
+{
+    // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
+}
+
 -(void)application:(UIApplication *)application performFetchWithCompletionHandler:(void (^)(UIBackgroundFetchResult))completionHandler {
    // We will add content here soon.
    NSLog(@"In the completionHandler");
@@ -35,27 +70,31 @@
 - (BOOL)application:(UIApplication *)app
            openURL:(NSURL *)url
            options:(NSDictionary<UIApplicationOpenURLOptionsKey, id> *)options {
+    
+    NSLog(@"Application openURL: %@", url);
    if (url.fileURL) {
        QString filePath(url.path.UTF8String);
        if (filePath.isEmpty()) return NO;

-        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 1 * NSEC_PER_SEC), dispatch_get_main_queue(), ^{
-            NSLog(@"Application openURL: %@", url);
-
-            if (filePath.contains("backup")) {
-                IosController::Instance()->importBackupFromOutside(filePath);
-            } else {
-                QFile file(filePath);
-                bool isOpenFile = file.open(QIODevice::ReadOnly);
-                QByteArray data = file.readAll();
-
-                IosController::Instance()->importConfigFromOutside(QString(data));
-            }
-        });
-
+        if (filePath.contains("backup")) {
+            IosController::Instance()->importBackupFromOutside(filePath);
+        } else {
+            QFile file(filePath);
+            bool isOpenFile = file.open(QIODevice::ReadOnly);
+            QByteArray data = file.readAll();
+            
+            IosController::Instance()->importConfigFromOutside(QString(data));
+        }
        return YES;
    }
    return NO;
 }

+
+void QtAppDelegateInitialize()
+{
+    [[UIApplication sharedApplication] setDelegate: [QtAppDelegate sharedQtAppDelegate]];
+    NSLog(@"Created a new AppDelegate");
+}
+
@end
--- a/client/platforms/ios/ScreenProtection.swift
+++ b/client/platforms/ios/ScreenProtection.swift
@@ -1,87 +0,0 @@
-import UIKit
-
-public func toggleScreenshots(_ isEnabled: Bool) {
-  let window = UIApplication.shared.keyWindows.first!
-
-  if isEnabled {
-    ScreenProtection.shared.disable(for: window.rootViewController!.view)
-  } else {
-    ScreenProtection.shared.enable(for: window.rootViewController!.view)
-  }
-}
-
-extension UIApplication {
-  var keyWindows: [UIWindow] {
-    connectedScenes
-      .compactMap {
-        if #available(iOS 15.0, *) {
-          ($0 as? UIWindowScene)?.keyWindow
-        } else {
-          ($0 as? UIWindowScene)?.windows.first { $0.isKeyWindow }
-        }
-      }
-  }
-}
-
-class ScreenProtection {
-  public static let shared = ScreenProtection()
-
-  var pairs = [ProtectionPair]()
-
-  private var blurView: UIVisualEffectView?
-  private var recordingObservation: NSKeyValueObservation?
-
-  public func enable(for view: UIView) {
-    DispatchQueue.main.asyncAfter(deadline: .now() + 1.0) {
-      view.subviews.forEach {
-        self.pairs.append(ProtectionPair(from: $0))
-      }
-    }
-  }
-
-  public func disable(for view: UIView) {
-    DispatchQueue.main.asyncAfter(deadline: .now() + 1.0) {
-      self.pairs.forEach {
-        $0.removeProtection()
-      }
-
-      self.pairs.removeAll()
-    }
-  }
-}
-
-struct ProtectionPair {
-  let textField: UITextField
-  let layer: CALayer
-
-  init(from view: UIView) {
-    let secureTextField = UITextField()
-    secureTextField.backgroundColor = .clear
-    secureTextField.translatesAutoresizingMaskIntoConstraints = false
-    secureTextField.isSecureTextEntry = true
-
-    view.insertSubview(secureTextField, at: 0)
-    secureTextField.isUserInteractionEnabled = false
-
-    view.layer.superlayer?.addSublayer(secureTextField.layer)
-    secureTextField.layer.sublayers?.last?.addSublayer(view.layer)
-
-    secureTextField.topAnchor.constraint(equalTo: view.topAnchor, constant: 0).isActive = true
-    secureTextField.bottomAnchor.constraint(equalTo: view.bottomAnchor, constant: 0).isActive = true
-    secureTextField.leadingAnchor.constraint(equalTo: view.leadingAnchor, constant: 0).isActive = true
-    secureTextField.trailingAnchor.constraint(equalTo: view.trailingAnchor, constant: 0).isActive = true
-
-    self.init(textField: secureTextField, layer: view.layer)
-  }
-
-  init(textField: UITextField, layer: CALayer) {
-    self.textField = textField
-    self.layer = layer
-  }
-
-  func removeProtection() {
-    textField.superview?.superview?.layer.addSublayer(layer)
-    textField.layer.removeFromSuperlayer()
-    textField.removeFromSuperview()
-  }
-}
--- a/client/platforms/ios/WGConfig.swift
+++ b/client/platforms/ios/WGConfig.swift
@@ -1,97 +0,0 @@
-import Foundation
-
-struct WGConfig: Decodable {
-  let initPacketMagicHeader, responsePacketMagicHeader: String?
-  let underloadPacketMagicHeader, transportPacketMagicHeader: String?
-  let junkPacketCount, junkPacketMinSize, junkPacketMaxSize: String?
-  let initPacketJunkSize, responsePacketJunkSize: String?
-  let dns1: String
-  let dns2: String
-  let hostName: String
-  let port: Int
-  let clientIP: String
-  let clientPrivateKey: String
-  let serverPublicKey: String
-  let presharedKey: String
-  var allowedIPs: [String]
-  var persistentKeepAlive: String
-  let splitTunnelType: Int
-  let splitTunnelSites: [String]
-
-  enum CodingKeys: String, CodingKey {
-    case initPacketMagicHeader = "H1", responsePacketMagicHeader = "H2"
-    case underloadPacketMagicHeader = "H3", transportPacketMagicHeader = "H4"
-    case junkPacketCount = "Jc", junkPacketMinSize = "Jmin", junkPacketMaxSize = "Jmax"
-    case initPacketJunkSize = "S1", responsePacketJunkSize = "S2"
-    case dns1
-    case dns2
-    case hostName
-    case port
-    case clientIP = "client_ip"
-    case clientPrivateKey = "client_priv_key"
-    case serverPublicKey = "server_pub_key"
-    case presharedKey = "psk_key"
-    case allowedIPs = "allowed_ips"
-    case persistentKeepAlive = "persistent_keep_alive"
-    case splitTunnelType
-    case splitTunnelSites
-  }
-
-  var settings: String {
-    junkPacketCount == nil ? "" :
-    """
-    Jc = \(junkPacketCount!)
-    Jmin = \(junkPacketMinSize!)
-    Jmax = \(junkPacketMaxSize!)
-    S1 = \(initPacketJunkSize!)
-    S2 = \(responsePacketJunkSize!)
-    H1 = \(initPacketMagicHeader!)
-    H2 = \(responsePacketMagicHeader!)
-    H3 = \(underloadPacketMagicHeader!)
-    H4 = \(transportPacketMagicHeader!)
-
-    """
-  }
-
-  var str: String {
-    """
-    [Interface]
-    Address = \(clientIP)
-    DNS = \(dns1), \(dns2)
-    PrivateKey = \(clientPrivateKey)
-    \(settings)
-    [Peer]
-    PublicKey = \(serverPublicKey)
-    PresharedKey = \(presharedKey)
-    AllowedIPs = \(allowedIPs.joined(separator: ", "))
-    Endpoint = \(hostName):\(port)
-    PersistentKeepalive = \(persistentKeepAlive)
-    """
-  }
-
-  var redux: String {
-    """
-    [Interface]
-    Address = \(clientIP)
-    DNS = \(dns1), \(dns2)
-    PrivateKey = ***
-    \(settings)
-    [Peer]
-    PublicKey = ***
-    PresharedKey = ***
-    AllowedIPs = \(allowedIPs.joined(separator: ", "))
-    Endpoint = \(hostName):\(port)
-    PersistentKeepalive = \(persistentKeepAlive)
-    """
-  }
-}
-
-struct OpenVPNConfig: Decodable {
-  let config: String
-  let splitTunnelType: Int
-  let splitTunnelSites: [String]
-
-  var str: String {
-    "splitTunnelType: \(splitTunnelType) splitTunnelSites: \(splitTunnelSites) config: \(config)"
-  }
-}
--- a/client/platforms/ios/ios_controller.mm
+++ b/client/platforms/ios/ios_controller.mm
@@ -235,6 +235,7 @@ void IosController::checkStatus()
        m_rxBytes = rxBytes;
        m_txBytes = txBytes;
    });
+    
 }

 void IosController::vpnStatusDidChange(void *pNotification)
@@ -243,13 +244,13 @@ void IosController::vpnStatusDidChange(void *pNotification)

    if (session /* && session == TunnelManager.session */ ) {
        qDebug() << "IosController::vpnStatusDidChange" << iosStatusToState(session.status) << session;
-
+       
        if (session.status == NEVPNStatusDisconnected) {
            if (@available(iOS 16.0, *)) {
                [session fetchLastDisconnectErrorWithCompletionHandler:^(NSError * _Nullable error) {
                    if (error != nil) {
                        qDebug() << "Disconnect error" << error.domain << error.code << error.localizedDescription;
-
+                        
                        if ([error.domain isEqualToString:NEVPNConnectionErrorDomain]) {
                            switch (error.code) {
                                case NEVPNConnectionErrorOverslept:
@@ -314,11 +315,11 @@ void IosController::vpnStatusDidChange(void *pNotification)
                                    break;
                            }
                        }
-
+                        
                        NSError *underlyingError = error.userInfo[@"NSUnderlyingError"];
                        if (underlyingError != nil) {
                            qDebug() << "Disconnect underlying error" << underlyingError.domain << underlyingError.code << underlyingError.localizedDescription;
-
+                            
                            if ([underlyingError.domain isEqualToString:@"NEAgentErrorDomain"]) {
                                switch (underlyingError.code) {
                                    case 1:
@@ -341,7 +342,7 @@ void IosController::vpnStatusDidChange(void *pNotification)
                qDebug() << "Disconnect error is unavailable on iOS < 16.0";
            }
        }
-
+        
        emit connectionStateChanged(iosStatusToState(session.status));
    }
 }
@@ -356,22 +357,7 @@ bool IosController::setupOpenVPN()
    QJsonObject ovpn = m_rawConfig[ProtocolProps::key_proto_config_data(amnezia::Proto::OpenVpn)].toObject();
    QString ovpnConfig = ovpn[config_key::config].toString();

-    QJsonObject openVPNConfig {};
-    openVPNConfig.insert(config_key::config, ovpnConfig);
-    openVPNConfig.insert(config_key::splitTunnelType, m_rawConfig[config_key::splitTunnelType]);
-
-    QJsonArray splitTunnelSites = m_rawConfig[config_key::splitTunnelSites].toArray();
-
-    for(int index = 0; index < splitTunnelSites.count(); index++) {
-        splitTunnelSites[index] = splitTunnelSites[index].toString().remove(" ");
-    }
-
-    openVPNConfig.insert(config_key::splitTunnelSites, splitTunnelSites);
-
-    QJsonDocument openVPNConfigDoc(openVPNConfig);
-    QString openVPNConfigStr(openVPNConfigDoc.toJson(QJsonDocument::Compact));
-
-    return startOpenVPN(openVPNConfigStr);
+    return startOpenVPN(ovpnConfig);
 }

 bool IosController::setupCloak()
@@ -408,123 +394,25 @@ bool IosController::setupCloak()
    ovpnConfig.append(cloakBase64);
    ovpnConfig.append("\n</cloak>\n");

-    QJsonObject openVPNConfig {};
-    openVPNConfig.insert(config_key::config, ovpnConfig);
-    openVPNConfig.insert(config_key::splitTunnelType, m_rawConfig[config_key::splitTunnelType]);
-
-    QJsonArray splitTunnelSites = m_rawConfig[config_key::splitTunnelSites].toArray();
-
-    for(int index = 0; index < splitTunnelSites.count(); index++) {
-        splitTunnelSites[index] = splitTunnelSites[index].toString().remove(" ");
-    }
-
-    openVPNConfig.insert(config_key::splitTunnelSites, splitTunnelSites);
-
-    QJsonDocument openVPNConfigDoc(openVPNConfig);
-    QString openVPNConfigStr(openVPNConfigDoc.toJson(QJsonDocument::Compact));
-
-    return startOpenVPN(openVPNConfigStr);
+    return startOpenVPN(ovpnConfig);
 }

 bool IosController::setupWireGuard()
 {
    QJsonObject config = m_rawConfig[ProtocolProps::key_proto_config_data(amnezia::Proto::WireGuard)].toObject();

-    QJsonObject wgConfig {};
-    wgConfig.insert(config_key::dns1, m_rawConfig[config_key::dns1]);
-    wgConfig.insert(config_key::dns2, m_rawConfig[config_key::dns2]);
-    wgConfig.insert(config_key::hostName, config[config_key::hostName]);
-    wgConfig.insert(config_key::port, config[config_key::port]);
-    wgConfig.insert(config_key::client_ip, config[config_key::client_ip]);
-    wgConfig.insert(config_key::client_priv_key, config[config_key::client_priv_key]);
-    wgConfig.insert(config_key::server_pub_key, config[config_key::server_pub_key]);
-    wgConfig.insert(config_key::psk_key, config[config_key::psk_key]);
-    wgConfig.insert(config_key::splitTunnelType, m_rawConfig[config_key::splitTunnelType]);
-
-    QJsonArray splitTunnelSites = m_rawConfig[config_key::splitTunnelSites].toArray();
-
-    for(int index = 0; index < splitTunnelSites.count(); index++) {
-        splitTunnelSites[index] = splitTunnelSites[index].toString().remove(" ");
-    }
-
-    wgConfig.insert(config_key::splitTunnelSites, splitTunnelSites);
-
-    if (config.contains(config_key::allowed_ips)) {
-        QJsonArray allowed_ips;
-        QStringList allowed_ips_list = config[config_key::allowed_ips].toString().split(", ");
-
-        for(int index = 0; index < allowed_ips_list.length(); index++) {
-            allowed_ips.append(allowed_ips_list[index]);
-        }
-
-        wgConfig.insert(config_key::allowed_ips, allowed_ips);
-    } else {
-        QJsonArray allowed_ips { "0.0.0.0/0", "::/0" };
-        wgConfig.insert(config_key::allowed_ips, allowed_ips);
-    }
-
-    wgConfig.insert("persistent_keep_alive", "25");
-
-    QJsonDocument wgConfigDoc(wgConfig);
-    QString wgConfigDocStr(wgConfigDoc.toJson(QJsonDocument::Compact));
-
-    return startWireGuard(wgConfigDocStr);
+    QString wgConfig = config[config_key::config].toString();
+    
+    return startWireGuard(wgConfig);
 }

 bool IosController::setupAwg()
 {
    QJsonObject config = m_rawConfig[ProtocolProps::key_proto_config_data(amnezia::Proto::Awg)].toObject();

-    QJsonObject wgConfig {};
-    wgConfig.insert(config_key::dns1, m_rawConfig[config_key::dns1]);
-    wgConfig.insert(config_key::dns2, m_rawConfig[config_key::dns2]);
-    wgConfig.insert(config_key::hostName, config[config_key::hostName]);
-    wgConfig.insert(config_key::port, config[config_key::port]);
-    wgConfig.insert(config_key::client_ip, config[config_key::client_ip]);
-    wgConfig.insert(config_key::client_priv_key, config[config_key::client_priv_key]);
-    wgConfig.insert(config_key::server_pub_key, config[config_key::server_pub_key]);
-    wgConfig.insert(config_key::psk_key, config[config_key::psk_key]);
-    wgConfig.insert(config_key::splitTunnelType, m_rawConfig[config_key::splitTunnelType]);
-
-    QJsonArray splitTunnelSites = m_rawConfig[config_key::splitTunnelSites].toArray();
-
-    for(int index = 0; index < splitTunnelSites.count(); index++) {
-        splitTunnelSites[index] = splitTunnelSites[index].toString().remove(" ");
-    }
-
-    wgConfig.insert(config_key::splitTunnelSites, splitTunnelSites);
-
-    if (config.contains(config_key::allowed_ips)) {
-        QJsonArray allowed_ips;
-        QStringList allowed_ips_list = config[config_key::allowed_ips].toString().split(", ");
-
-        for(int index = 0; index < allowed_ips_list.length(); index++) {
-            allowed_ips.append(allowed_ips_list[index]);
-        }
-
-        wgConfig.insert(config_key::allowed_ips, allowed_ips);
-    } else {
-        QJsonArray allowed_ips { "0.0.0.0/0", "::/0" };
-        wgConfig.insert(config_key::allowed_ips, allowed_ips);
-    }
-
-    wgConfig.insert("persistent_keep_alive", "25");
-    wgConfig.insert(config_key::initPacketMagicHeader, config[config_key::initPacketMagicHeader]);
-    wgConfig.insert(config_key::responsePacketMagicHeader, config[config_key::responsePacketMagicHeader]);
-    wgConfig.insert(config_key::underloadPacketMagicHeader, config[config_key::underloadPacketMagicHeader]);
-    wgConfig.insert(config_key::transportPacketMagicHeader, config[config_key::transportPacketMagicHeader]);
-
-    wgConfig.insert(config_key::initPacketJunkSize, config[config_key::initPacketJunkSize]);
-    wgConfig.insert(config_key::responsePacketJunkSize, config[config_key::responsePacketJunkSize]);
-
-    wgConfig.insert(config_key::junkPacketCount, config[config_key::junkPacketCount]);
-    wgConfig.insert(config_key::junkPacketMinSize, config[config_key::junkPacketMinSize]);
-    wgConfig.insert(config_key::junkPacketMaxSize, config[config_key::junkPacketMaxSize]);
-
-    QJsonDocument wgConfigDoc(wgConfig);
-    QString wgConfigDocStr(wgConfigDoc.toJson(QJsonDocument::Compact));
-
-    return startWireGuard(wgConfigDocStr);
+    QString wgConfig = config[config_key::config].toString();
+    
+    return startWireGuard(wgConfig);
 }

 bool IosController::startOpenVPN(const QString &config)
@@ -558,17 +446,23 @@ bool IosController::startWireGuard(const QString &config)
 void IosController::startTunnel()
 {
    NSString *protocolName = @"Unknown";
-
+    
    NETunnelProviderProtocol *tunnelProtocol = (NETunnelProviderProtocol *)m_currentTunnel.protocolConfiguration;
    if (tunnelProtocol.providerConfiguration[@"wireguard"] != nil) {
        protocolName = @"WireGuard";
    } else if (tunnelProtocol.providerConfiguration[@"ovpn"] != nil) {
        protocolName = @"OpenVPN";
    }
-
+    
    m_rxBytes = 0;
    m_txBytes = 0;
-
+    
+    int STT = m_rawConfig["splitTunnelType"].toInt();
+    QJsonArray splitTunnelSites = m_rawConfig["splitTunnelSites"].toArray();
+    QJsonDocument doc;
+    doc.setArray(splitTunnelSites);
+    QString STS(doc.toJson());
+    
    [m_currentTunnel setEnabled:YES];

    [m_currentTunnel saveToPreferencesWithCompletionHandler:^(NSError *saveError) {
@@ -589,6 +483,23 @@ void IosController::startTunnel()
                    NSError *startError = nil;
                    qDebug() << iosStatusToState(m_currentTunnel.connection.status);

+
+                    NSString *actionKey = [NSString stringWithUTF8String:MessageKey::action];
+                    NSString *actionValue = [NSString stringWithUTF8String:Action::start];
+                    NSString *tunnelIdKey = [NSString stringWithUTF8String:MessageKey::tunnelId];
+                    NSString *tunnelIdValue = !m_tunnelId.isEmpty() ? m_tunnelId.toNSString() : @"";
+                    NSString *SplitTunnelTypeKey = [NSString stringWithUTF8String:MessageKey::SplitTunnelType];
+                    NSString *SplitTunnelTypeValue = [NSString stringWithFormat:@"%d",STT];
+                    NSString *SplitTunnelSitesKey = [NSString stringWithUTF8String:MessageKey::SplitTunnelSites];
+                    NSString *SplitTunnelSitesValue = STS.toNSString();
+                
+
+                    NSDictionary* message = @{actionKey: actionValue, tunnelIdKey: tunnelIdValue,
+                    SplitTunnelTypeKey: SplitTunnelTypeValue, SplitTunnelSitesKey: SplitTunnelSitesValue};
+                
+                    sendVpnExtensionMessage(message);
+
+
                    BOOL started = [m_currentTunnel.connection startVPNTunnelWithOptions:nil andReturnError:&startError];

                    if (!started || startError) {
@@ -603,6 +514,7 @@ void IosController::startTunnel()
    }];
 }

+
 bool IosController::isOurManager(NETunnelProviderManager* manager) {
    NETunnelProviderProtocol* tunnelProto = (NETunnelProviderProtocol*)manager.protocolConfiguration;

@@ -664,7 +576,7 @@ void IosController::sendVpnExtensionMessage(NSDictionary* message, std::function
    NETunnelProviderSession *session = (NETunnelProviderSession *)m_currentTunnel.connection;

    NSError *sendError = nil;
-
+    
    if ([session respondsToSelector:@selector(sendProviderMessage:returnError:responseHandler:)]) {
        [session sendProviderMessage:data returnError:&sendError responseHandler:completionHandler];
    } else {
--- a/client/platforms/ios/ios_controller_wrapper.mm
+++ b/client/platforms/ios/ios_controller_wrapper.mm
@@ -21,7 +21,7 @@
 }

 - (void) vpnConfigurationDidChange:(NSNotification *)notification {
-//    cppController->vpnStatusDidChange(notification);
+    cppController->vpnStatusDidChange(notification);
 }


--- a/client/protocols/protocols_defs.h
+++ b/client/protocols/protocols_defs.h
@@ -20,7 +20,6 @@ namespace amnezia
        constexpr char dns1[] = "dns1";
        constexpr char dns2[] = "dns2";

-        constexpr char serverIndex[] = "serverIndex";
        constexpr char description[] = "description";
        constexpr char name[] = "name";
        constexpr char cert[] = "cert";
--- a/client/resources.qrc
+++ b/client/resources.qrc
@@ -160,6 +160,7 @@
        <file>ui/qml/Components/SettingsContainersListView.qml</file>
        <file>ui/qml/Controls2/TextTypes/ListItemTitleType.qml</file>
        <file>ui/qml/Controls2/DividerType.qml</file>
+        <file>ui/qml/Controls2/DrawerType.qml</file>
        <file>ui/qml/Controls2/StackViewType.qml</file>
        <file>ui/qml/Pages2/PageSettings.qml</file>
        <file>images/controls/amnezia.svg</file>
@@ -224,8 +225,5 @@
        <file>ui/qml/Pages2/PageShareFullAccess.qml</file>
        <file>images/controls/close.svg</file>
        <file>images/controls/search.svg</file>
-        <file>ui/qml/Components/HomeSplitTunnelingDrawer.qml</file>
-        <file>images/controls/split-tunneling.svg</file>
-        <file>ui/qml/Controls2/DrawerType2.qml</file>
    </qresource>
 </RCC>
--- a/client/server_scripts/build_container.sh
+++ b/client/server_scripts/build_container.sh
@@ -1 +1 @@
-sudo docker build --no-cache --pull -t $CONTAINER_NAME $DOCKERFILE_FOLDER
+sudo docker build --no-cache --pull -t $CONTAINER_NAME $DOCKERFILE_FOLDER --build-arg SERVER_ARCH=$(uname -m)
--- a/client/server_scripts/install_docker.sh
+++ b/client/server_scripts/install_docker.sh
@@ -1,20 +1,35 @@
-if which apt-get > /dev/null 2>&1; then pm=$(which apt-get); silent_inst="-yq install"; check_pkgs="-yq update"; docker_pkg="docker.io"; dist="debian";\
-elif which dnf > /dev/null 2>&1; then pm=$(which dnf); silent_inst="-yq install"; check_pkgs="-yq check-update"; docker_pkg="docker"; dist="fedora";\
-elif which yum > /dev/null 2>&1; then pm=$(which yum); silent_inst="-y -q install"; check_pkgs="-y -q check-update"; docker_pkg="docker"; dist="centos";\
-elif which pacman > /dev/null 2>&1; then pm=$(which pacman); silent_inst="-S --noconfirm --noprogressbar --quiet"; check_pkgs="> /dev/null 2>&1"; docker_pkg="docker"; dist="archlinux";\
+if which apt-get > /dev/null 2>&1; then pm=$(which apt-get); silent_inst="-yq install"; check_pkgs="-yq update"; what_pkg="-s install"; docker_pkg="docker.io"; dist="debian";\
+elif which dnf > /dev/null 2>&1; then pm=$(which dnf); silent_inst="-yq install"; check_pkgs="-yq check-update"; what_pkg="--assumeno install --setopt=tsflags=test"; docker_pkg="docker"; dist="fedora";\
+elif which yum > /dev/null 2>&1; then pm=$(which yum); silent_inst="-y -q install"; check_pkgs="-y -q check-update"; what_pkg="--assumeno install --setopt=tsflags=test"; docker_pkg="docker"; dist="centos";\
+elif which pacman > /dev/null 2>&1; then pm=$(which pacman); silent_inst="-S --noconfirm --noprogressbar --quiet"; check_pkgs="-Sup"; what_pkg="-Sp"; docker_pkg="docker"; dist="archlinux";\
 else echo "Packet manager not found"; exit 1; fi;\
-echo "Dist: $dist, Packet manager: $pm, Install command: $silent_inst, Check pkgs command: $check_pkgs, Docker pkg: $docker_pkg";\
+echo "Dist: $dist, Packet manager: $pm, Install command: $silent_inst, Check pkgs command: $check_pkgs, What pkg command: $what_pkg, Docker pkg: $docker_pkg";\
 if [ "$dist" = "debian" ]; then export DEBIAN_FRONTEND=noninteractive; fi;\
-if ! command -v sudo > /dev/null 2>&1; then $pm $check_pkgs; $pm $silent_inst sudo; fi;\
-if ! command -v fuser > /dev/null 2>&1; then sudo $pm $check_pkgs; sudo $pm $silent_inst psmisc; fi;\
-if ! command -v lsof > /dev/null 2>&1; then sudo $pm $check_pkgs; sudo $pm $silent_inst lsof; fi;\
-if ! command -v docker > /dev/null 2>&1; then \
-  sudo $pm $check_pkgs; sudo $pm $silent_inst $docker_pkg;\
-  sleep 5; sudo systemctl enable --now docker; sleep 5;\
+if [ "$(echo $LANG)" != "en_US.UTF-8" ] && [ "$(echo $LANG)" != "C.UTF-8" ]; then \
+  if [ "$(locale -a | grep -c 'en_US.utf8')" != "0" ]; then export LC_ALL=en_US.UTF-8;\
+  else export LC_ALL=C.UTF-8; fi;\
+fi;\
+if ! command -v sudo > /dev/null 2>&1; then $pm $check_pkgs; $pm $silent_inst sudo;\
+  if ! command -v sudo > /dev/null 2>&1; then sudo; exit 1; fi;\
+fi;\
+if ! command -v fuser > /dev/null 2>&1; then sudo $pm $check_pkgs; sudo $pm $silent_inst psmisc;\
+  if ! command -v fuser > /dev/null 2>&1; then fuser; exit 1; fi;\
+fi;\
+if ! command -v lsof > /dev/null 2>&1; then sudo $pm $check_pkgs; sudo $pm $silent_inst lsof;\
+  if ! command -v lsof > /dev/null 2>&1; then lsof; exit 1; fi;\
+fi;\
+if ! command -v docker > /dev/null 2>&1; then sudo $pm $check_pkgs;\
+  check_podman=$(sudo $pm $what_pkg $docker_pkg 2>&1 | grep -c podman-docker);\
+  check_moby=$(sudo $pm $what_pkg $docker_pkg 2>&1 | grep -c moby-engine);\
+  if [ "$check_podman" != "0" ] || [ "$check_moby" != "0" ]; then echo "Docker is not supported"; docker; exit 1;\
+  else sudo $pm $silent_inst $docker_pkg;\
+    if ! command -v docker > /dev/null 2>&1; then docker; exit 1;\
+    else sleep 5; sudo systemctl enable --now docker; sleep 5; fi;\
+  fi;\
 fi;\
 if [ "$(systemctl is-active docker)" != "active" ]; then \
  sudo $pm $check_pkgs; sudo $pm $silent_inst $docker_pkg;\
  sleep 5; sudo systemctl start docker; sleep 5;\
+    if [ "$(systemctl is-active docker)" != "active" ]; then echo "Failed to status docker, command not found"; fi;\
 fi;\
-if ! command -v sudo > /dev/null 2>&1; then echo "Failed to install sudo, command not found"; exit 1; fi;\
 docker --version
--- a/client/server_scripts/openvpn_cloak/Dockerfile
+++ b/client/server_scripts/openvpn_cloak/Dockerfile
@@ -1,8 +1,9 @@
 FROM alpine:3.15
 LABEL maintainer="AmneziaVPN"

-ARG SS_RELEASE="v1.18.1"
-ARG CLOAK_RELEASE="v2.8.0"
+ARG SS_RELEASE="v1.13.1"
+ARG CLOAK_RELEASE="v2.5.5"
+ARG SERVER_ARCH

 #Install required packages
 RUN apk add --no-cache curl openvpn easy-rsa bash netcat-openbsd dumb-init rng-tools
@@ -15,19 +16,20 @@ RUN mkdir -p /opt/amnezia
 RUN echo -e "#!/bin/bash\ntail -f /dev/null" > /opt/amnezia/start.sh
 RUN chmod a+x /opt/amnezia/start.sh

-RUN SERVER_ARCH=$(uname -m) && \
-  if [ $SERVER_ARCH="x86_64" ]; then CK_ARCH="amd64"; \
-  elif [ $SERVER_ARCH="i686" ]; then CK_ARCH="386"; \
-  elif [ $SERVER_ARCH="aarch64" ]; then CK_ARCH="arm64"; \
-  elif [ $SERVER_ARCH="arm" ]; then CK_ARCH="arm"; \
-  else exit -1; fi && \
-  curl -L https://github.com/cbeuw/Cloak/releases/download/${CLOAK_RELEASE}/ck-server-linux-${CK_ARCH}-${CLOAK_RELEASE} > /usr/bin/ck-server && \
-  chmod a+x /usr/bin/ck-server && \
-  curl -L https://github.com/shadowsocks/shadowsocks-rust/releases/download/${SS_RELEASE}/shadowsocks-${SS_RELEASE}.${SERVER_ARCH}-unknown-linux-musl.tar.xz  > /usr/bin/ss.tar.xz && \
-  tar -Jxvf /usr/bin/ss.tar.xz -C /usr/bin/ && \
-  chmod a+x /usr/bin/ssserver
+RUN if [ $SERVER_ARCH="x86_64" ]; then CK_ARCH="amd64"; \
+    elif [ $SERVER_ARCH="i686" ]; then CK_ARCH="386"; \
+    elif [ $SERVER_ARCH="aarch64" ]; then CK_ARCH="arm64"; \
+    elif [ $SERVER_ARCH="arm" ]; then CK_ARCH="arm"; \
+    else exit -1; fi && \
+    curl -L https://github.com/cbeuw/Cloak/releases/download/${CLOAK_RELEASE}/ck-server-linux-${CK_ARCH}-${CLOAK_RELEASE} > /usr/bin/ck-server
+RUN chmod a+x /usr/bin/ck-server

-# Tune network
+RUN curl -L https://github.com/shadowsocks/shadowsocks-rust/releases/download/${SS_RELEASE}/shadowsocks-${SS_RELEASE}.${SERVER_ARCH}-unknown-linux-musl.tar.xz  > /usr/bin/ss.tar.xz
+
+RUN tar -Jxvf /usr/bin/ss.tar.xz -C /usr/bin/
+RUN chmod a+x /usr/bin/ssserver
+
+# Tune network  
 RUN echo -e " \n\
  fs.file-max = 51200 \n\
  \n\
--- a/client/server_scripts/openvpn_shadowsocks/Dockerfile
+++ b/client/server_scripts/openvpn_shadowsocks/Dockerfile
@@ -1,7 +1,8 @@
 FROM alpine:3.15
 LABEL maintainer="AmneziaVPN"

-ARG SS_RELEASE="v1.18.1"
+ARG SS_RELEASE="v1.13.1"
+ARG SERVER_ARCH

 #Install required packages
 RUN apk add --no-cache curl openvpn easy-rsa bash netcat-openbsd dumb-init rng-tools xz
@@ -14,16 +15,7 @@ RUN mkdir -p /opt/amnezia
 RUN echo -e "#!/bin/bash\ntail -f /dev/null" > /opt/amnezia/start.sh
 RUN chmod a+x /opt/amnezia/start.sh

-RUN SERVER_ARCH=$(uname -m); \
-  SUFFIX=""; \
-  if [ ! -z "$(echo ${SERVER_ARCH} | grep -i arm)" ]; then \
-    if [ ! -z "$(cat /proc/cpuinfo | grep -i vfp)" ]; then \
-      SUFFIX="eabihf"; \
-    else \
-      SUFFIX="eabi"; \
-    fi; \
-  fi; \
-  curl -L https://github.com/shadowsocks/shadowsocks-rust/releases/download/${SS_RELEASE}/shadowsocks-${SS_RELEASE}.${SERVER_ARCH}-unknown-linux-musl${SUFFIX}.tar.xz > /usr/bin/ss.tar.xz;\
+RUN curl -L https://github.com/shadowsocks/shadowsocks-rust/releases/download/${SS_RELEASE}/shadowsocks-${SS_RELEASE}.${SERVER_ARCH}-unknown-linux-musl.tar.xz  > /usr/bin/ss.tar.xz;\
  tar -Jxvf /usr/bin/ss.tar.xz -C /usr/bin/;\
  chmod a+x /usr/bin/ssserver;

--- a/client/server_scripts/remove_all_containers.sh
+++ b/client/server_scripts/remove_all_containers.sh
@@ -1,5 +1,4 @@
-sudo docker ps -a | grep amnezia | awk '{print $1}' | xargs sudo docker stop;\
-sudo docker ps -a | grep amnezia | awk '{print $1}' | xargs sudo docker rm -fv;\
-sudo docker images -a | grep amnezia | awk '{print $3}' | xargs sudo docker rmi;\
-sudo docker network ls | grep amnezia-dns-net | awk '{print $1}' | xargs sudo docker network rm;\
-sudo rm -frd /opt/amnezia
+sudo docker ps -a | grep amnezia | awk '{print $1}' | xargs sudo docker stop
+sudo docker ps -a | grep amnezia | awk '{print $1}' | xargs sudo docker rm -fv
+sudo docker images -a | grep amnezia | awk '{print $3}' | xargs sudo docker rmi
+sudo docker network ls | grep amnezia-dns-net | awk '{print $1}' | xargs sudo docker network rm
--- a/client/server_scripts/remove_container.sh
+++ b/client/server_scripts/remove_container.sh
@@ -1,3 +1,3 @@
-sudo docker stop $CONTAINER_NAME;\
-sudo docker rm -fv $CONTAINER_NAME;\
+sudo docker stop $CONTAINER_NAME
+sudo docker rm -fv $CONTAINER_NAME
 sudo docker rmi $CONTAINER_NAME
--- a/client/settings.cpp
+++ b/client/settings.cpp
@@ -68,7 +68,6 @@ void Settings::removeServer(int index)

    servers.removeAt(index);
    setServersArray(servers);
-    emit serverRemoved(index);
 }

 bool Settings::editServer(int index, const QJsonObject &server)
@@ -339,7 +338,6 @@ QString Settings::secondaryDns() const
 void Settings::clearSettings()
 {
    m_settings.clearSettings();
-    emit settingsCleared();
 }

 ServerCredentials Settings::defaultServerCredentials() const
--- a/client/settings.h
+++ b/client/settings.h
@@ -185,16 +185,12 @@ public:
    void setScreenshotsEnabled(bool enabled)
    {
        setValue("Conf/screenshotsEnabled", enabled);
-        emit screenshotsEnabledChanged(enabled);
    }

    void clearSettings();

 signals:
    void saveLogsChanged(bool enabled);
-    void screenshotsEnabledChanged(bool enabled);
-    void serverRemoved(int serverIndex);
-    void settingsCleared();

 private:
    QVariant value(const QString &key, const QVariant &defaultValue = QVariant()) const;
--- a/client/translations/amneziavpn_ar.ts
+++ b/client/translations/amneziavpn_ar.ts
--- a/client/translations/amneziavpn_fa_IR.ts
+++ b/client/translations/amneziavpn_fa_IR.ts
--- a/client/translations/amneziavpn_my_MM.ts
+++ b/client/translations/amneziavpn_my_MM.ts
--- a/client/translations/amneziavpn_ru.ts
+++ b/client/translations/amneziavpn_ru.ts
--- a/client/translations/amneziavpn_zh_CN.ts
+++ b/client/translations/amneziavpn_zh_CN.ts
--- a/client/ui/controllers/apiController.cpp
+++ b/client/ui/controllers/apiController.cpp
@@ -70,17 +70,14 @@ QJsonObject ApiController::fillApiPayload(const QString &protocol, const ApiCont
 void ApiController::updateServerConfigFromApi()
 {
    QtConcurrent::run([this]() {
-        if (m_isConfigUpdateStarted) {
-            emit updateFinished(false);
-            return;
-        }
-
        auto serverConfig = m_serversModel->getDefaultServerConfig();
        auto containerConfig = serverConfig.value(config_key::containers).toArray();

+        bool isConfigUpdateStarted = false;
+
        if (serverConfig.value(config_key::configVersion).toInt() && containerConfig.isEmpty()) {
            emit updateStarted();
-            m_isConfigUpdateStarted = true;
+            isConfigUpdateStarted = true;

            QNetworkAccessManager manager;

@@ -90,7 +87,7 @@ void ApiController::updateServerConfigFromApi()
            request.setRawHeader("Authorization",
                                 "Api-Key " + serverConfig.value(configKey::accessToken).toString().toUtf8());
            QString endpoint = serverConfig.value(configKey::apiEdnpoint).toString();
-            request.setUrl(endpoint);
+            request.setUrl(endpoint.replace("https", "http")); // todo remove

            QString protocol = serverConfig.value(configKey::protocol).toString();

@@ -113,12 +110,6 @@ void ApiController::updateServerConfigFromApi()
                QByteArray ba = QByteArray::fromBase64(data.toUtf8(),
                                                       QByteArray::Base64UrlEncoding | QByteArray::OmitTrailingEquals);

-                if (ba.isEmpty()) {
-                    emit errorOccurred(errorString(ApiConfigDownloadError));
-                    m_isConfigUpdateStarted = false;
-                    return;
-                }
-
                QByteArray ba_uncompressed = qUncompress(ba);
                if (!ba_uncompressed.isEmpty()) {
                    ba = ba_uncompressed;
@@ -136,21 +127,17 @@ void ApiController::updateServerConfigFromApi()

                auto defaultContainer = apiConfig.value(config_key::defaultContainer).toString();
                serverConfig.insert(config_key::defaultContainer, defaultContainer);
-                m_serversModel->editServer(serverConfig, m_serversModel->getDefaultServerIndex());
+                m_serversModel->editServer(serverConfig);
+                emit m_serversModel->defaultContainerChanged(ContainerProps::containerFromString(defaultContainer));
            } else {
-                QString err = reply->errorString();
-                qDebug() << QString::fromUtf8(reply->readAll());
                qDebug() << reply->error();
-                qDebug() << err;
                qDebug() << reply->attribute(QNetworkRequest::HttpStatusCodeAttribute);
                emit errorOccurred(errorString(ApiConfigDownloadError));
-                m_isConfigUpdateStarted = false;
                return;
            }
        }

-        emit updateFinished(m_isConfigUpdateStarted);
-        m_isConfigUpdateStarted = false;
+        emit updateFinished(isConfigUpdateStarted);
        return;
    });
 }
@@ -166,5 +153,5 @@ void ApiController::clearApiConfig()

    serverConfig.insert(config_key::defaultContainer, ContainerProps::containerToString(DockerContainer::None));

-    m_serversModel->editServer(serverConfig, m_serversModel->getDefaultServerIndex());
+    m_serversModel->editServer(serverConfig);
 }
--- a/client/ui/controllers/apiController.h
+++ b/client/ui/controllers/apiController.h
@@ -39,8 +39,6 @@ private:

    QSharedPointer<ServersModel> m_serversModel;
    QSharedPointer<ContainersModel> m_containersModel;
-
-    bool m_isConfigUpdateStarted = false;
 };

 #endif // APICONTROLLER_H
--- a/client/ui/controllers/connectionController.cpp
+++ b/client/ui/controllers/connectionController.cpp
@@ -25,16 +25,15 @@ ConnectionController::ConnectionController(const QSharedPointer<ServersModel> &s

 void ConnectionController::openConnection()
 {
-    int serverIndex = m_serversModel->getDefaultServerIndex();
-
-    if (!m_serversModel->data(serverIndex, ServersModel::Roles::HasInstalledContainers).toBool()) {
+    if (!m_containersModel->isAnyContainerInstalled()) {
        emit noInstalledContainers();
        return;
    }

+    int serverIndex = m_serversModel->getDefaultServerIndex();
    ServerCredentials credentials = m_serversModel->getServerCredentials(serverIndex);

-    DockerContainer container = qvariant_cast<DockerContainer>(m_serversModel->data(serverIndex, ServersModel::Roles::DefaultContainerRole));
+    DockerContainer container = m_serversModel->getDefaultContainer(serverIndex);
    const QJsonObject &containerConfig = m_containersModel->getContainerConfig(container);

    if (container == DockerContainer::None) {
--- a/client/ui/controllers/exportController.cpp
+++ b/client/ui/controllers/exportController.cpp
@@ -8,7 +8,6 @@
 #include <QImage>
 #include <QStandardPaths>

-#include "configurators/awg_configurator.h"
 #include "configurators/cloak_configurator.h"
 #include "configurators/openvpn_configurator.h"
 #include "configurators/shadowsocks_configurator.h"
@@ -46,7 +45,7 @@ void ExportController::generateFullAccessConfig()
 {
    clearPreviousConfig();

-    int serverIndex = m_serversModel->getProcessedServerIndex();
+    int serverIndex = m_serversModel->getCurrentlyProcessedServerIndex();
    QJsonObject config = m_settings->server(serverIndex);

    QJsonArray containers = config.value(config_key::containers).toArray();
@@ -100,7 +99,7 @@ void ExportController::generateConnectionConfig(const QString &clientName)
 {
    clearPreviousConfig();

-    int serverIndex = m_serversModel->getProcessedServerIndex();
+    int serverIndex = m_serversModel->getCurrentlyProcessedServerIndex();
    ServerCredentials credentials = m_serversModel->getServerCredentials(serverIndex);

    DockerContainer container = static_cast<DockerContainer>(m_containersModel->getCurrentlyProcessedContainerIndex());
@@ -156,7 +155,7 @@ void ExportController::generateOpenVpnConfig(const QString &clientName)
 {
    clearPreviousConfig();

-    int serverIndex = m_serversModel->getProcessedServerIndex();
+    int serverIndex = m_serversModel->getCurrentlyProcessedServerIndex();
    ServerCredentials credentials = m_serversModel->getServerCredentials(serverIndex);

    DockerContainer container = static_cast<DockerContainer>(m_containersModel->getCurrentlyProcessedContainerIndex());
@@ -194,7 +193,7 @@ void ExportController::generateWireGuardConfig(const QString &clientName)
 {
    clearPreviousConfig();

-    int serverIndex = m_serversModel->getProcessedServerIndex();
+    int serverIndex = m_serversModel->getCurrentlyProcessedServerIndex();
    ServerCredentials credentials = m_serversModel->getServerCredentials(serverIndex);

    DockerContainer container = static_cast<DockerContainer>(m_containersModel->getCurrentlyProcessedContainerIndex());
@@ -229,50 +228,11 @@ void ExportController::generateWireGuardConfig(const QString &clientName)
    emit exportConfigChanged();
 }

-void ExportController::generateAwgConfig(const QString &clientName)
-{
-    clearPreviousConfig();
-
-    int serverIndex = m_serversModel->getProcessedServerIndex();
-    ServerCredentials credentials = m_serversModel->getServerCredentials(serverIndex);
-
-    DockerContainer container = static_cast<DockerContainer>(m_containersModel->getCurrentlyProcessedContainerIndex());
-    QJsonObject containerConfig = m_containersModel->getContainerConfig(container);
-    containerConfig.insert(config_key::container, ContainerProps::containerToString(container));
-
-    QString clientId;
-    ErrorCode errorCode = ErrorCode::NoError;
-    QString config = m_configurator->awgConfigurator->genAwgConfig(credentials, container, containerConfig,
-                                                                               clientId, &errorCode);
-    if (errorCode) {
-        emit exportErrorOccurred(errorString(errorCode));
-        return;
-    }
-    config = m_configurator->processConfigWithExportSettings(serverIndex, container, Proto::Awg, config);
-
-    auto configJson = QJsonDocument::fromJson(config.toUtf8()).object();
-    QStringList lines = configJson.value(config_key::config).toString().replace("\r", "").split("\n");
-    for (const QString &line : lines) {
-        m_config.append(line + "\n");
-    }
-
-    qrcodegen::QrCode qr = qrcodegen::QrCode::encodeText(m_config.toUtf8(), qrcodegen::QrCode::Ecc::LOW);
-    m_qrCodes << svgToBase64(QString::fromStdString(toSvgString(qr, 1)));
-
-    errorCode = m_clientManagementModel->appendClient(clientId, clientName, container, credentials);
-    if (errorCode) {
-        emit exportErrorOccurred(errorString(errorCode));
-        return;
-    }
-
-    emit exportConfigChanged();
-}
-
 void ExportController::generateShadowSocksConfig()
 {
    clearPreviousConfig();

-    int serverIndex = m_serversModel->getProcessedServerIndex();
+    int serverIndex = m_serversModel->getCurrentlyProcessedServerIndex();
    ServerCredentials credentials = m_serversModel->getServerCredentials(serverIndex);

    DockerContainer container = static_cast<DockerContainer>(m_containersModel->getCurrentlyProcessedContainerIndex());
@@ -308,7 +268,7 @@ void ExportController::generateCloakConfig()
 {
    clearPreviousConfig();

-    int serverIndex = m_serversModel->getProcessedServerIndex();
+    int serverIndex = m_serversModel->getCurrentlyProcessedServerIndex();
    ServerCredentials credentials = m_serversModel->getServerCredentials(serverIndex);

    DockerContainer container = static_cast<DockerContainer>(m_containersModel->getCurrentlyProcessedContainerIndex());
@@ -368,7 +328,7 @@ void ExportController::updateClientManagementModel(const DockerContainer contain
 void ExportController::revokeConfig(const int row, const DockerContainer container, ServerCredentials credentials)
 {
    ErrorCode errorCode = m_clientManagementModel->revokeClient(row, container, credentials,
-                                                                m_serversModel->getProcessedServerIndex());
+                                                                m_serversModel->getCurrentlyProcessedServerIndex());
    if (errorCode != ErrorCode::NoError) {
        emit exportErrorOccurred(errorString(errorCode));
    }
@@ -418,6 +378,4 @@ void ExportController::clearPreviousConfig()
    m_config.clear();
    m_nativeConfigString.clear();
    m_qrCodes.clear();
-
-    emit exportConfigChanged();
 }
--- a/client/ui/controllers/exportController.h
+++ b/client/ui/controllers/exportController.h
@@ -34,7 +34,6 @@ public slots:
    void generateConnectionConfig(const QString &clientName);
    void generateOpenVpnConfig(const QString &clientName);
    void generateWireGuardConfig(const QString &clientName);
-    void generateAwgConfig(const QString &clientName);
    void generateShadowSocksConfig();
    void generateCloakConfig();

--- a/client/ui/controllers/installController.cpp
+++ b/client/ui/controllers/installController.cpp
@@ -176,7 +176,7 @@ void InstallController::installServer(DockerContainer container, QJsonObject &co

 void InstallController::installContainer(DockerContainer container, QJsonObject &config)
 {
-    int serverIndex = m_serversModel->getProcessedServerIndex();
+    int serverIndex = m_serversModel->getCurrentlyProcessedServerIndex();
    ServerCredentials serverCredentials =
            qvariant_cast<ServerCredentials>(m_serversModel->data(serverIndex, ServersModel::Roles::CredentialsRole));

@@ -238,7 +238,7 @@ bool InstallController::isServerAlreadyExists()

 void InstallController::scanServerForInstalledContainers()
 {
-    int serverIndex = m_serversModel->getProcessedServerIndex();
+    int serverIndex = m_serversModel->getCurrentlyProcessedServerIndex();
    ServerCredentials serverCredentials =
            qvariant_cast<ServerCredentials>(m_serversModel->data(serverIndex, ServersModel::Roles::CredentialsRole));

@@ -267,7 +267,7 @@ void InstallController::scanServerForInstalledContainers()

 void InstallController::updateContainer(QJsonObject config)
 {
-    int serverIndex = m_serversModel->getProcessedServerIndex();
+    int serverIndex = m_serversModel->getCurrentlyProcessedServerIndex();
    ServerCredentials serverCredentials =
            qvariant_cast<ServerCredentials>(m_serversModel->data(serverIndex, ServersModel::Roles::CredentialsRole));

@@ -283,8 +283,8 @@ void InstallController::updateContainer(QJsonObject config)
        m_serversModel->updateContainerConfig(container, config);
        m_protocolModel->updateModel(config);

-        auto defaultContainer = qvariant_cast<DockerContainer>(m_serversModel->data(serverIndex, ServersModel::Roles::DefaultContainerRole));
-        if ((serverIndex == m_serversModel->getDefaultServerIndex()) && (container == defaultContainer)) {
+        if ((serverIndex == m_serversModel->getDefaultServerIndex())
+            && (container == m_serversModel->getDefaultContainer(serverIndex))) {
            emit currentContainerUpdated();
        } else {
            emit updateContainerFinished(tr("Settings updated successfully"));
@@ -296,27 +296,27 @@ void InstallController::updateContainer(QJsonObject config)
    emit installationErrorOccurred(errorString(errorCode));
 }

-void InstallController::rebootProcessedServer()
+void InstallController::rebootCurrentlyProcessedServer()
 {
-    int serverIndex = m_serversModel->getProcessedServerIndex();
+    int serverIndex = m_serversModel->getCurrentlyProcessedServerIndex();
    QString serverName = m_serversModel->data(serverIndex, ServersModel::Roles::NameRole).toString();

    m_serversModel->rebootServer();
-    emit rebootProcessedServerFinished(tr("Server '%1' was rebooted").arg(serverName));
+    emit rebootCurrentlyProcessedServerFinished(tr("Server '%1' was rebooted").arg(serverName));
 }

-void InstallController::removeProcessedServer()
+void InstallController::removeCurrentlyProcessedServer()
 {
-    int serverIndex = m_serversModel->getProcessedServerIndex();
+    int serverIndex = m_serversModel->getCurrentlyProcessedServerIndex();
    QString serverName = m_serversModel->data(serverIndex, ServersModel::Roles::NameRole).toString();

    m_serversModel->removeServer();
-    emit removeProcessedServerFinished(tr("Server '%1' was removed").arg(serverName));
+    emit removeCurrentlyProcessedServerFinished(tr("Server '%1' was removed").arg(serverName));
 }

 void InstallController::removeAllContainers()
 {
-    int serverIndex = m_serversModel->getProcessedServerIndex();
+    int serverIndex = m_serversModel->getCurrentlyProcessedServerIndex();
    QString serverName = m_serversModel->data(serverIndex, ServersModel::Roles::NameRole).toString();

    ErrorCode errorCode = m_serversModel->removeAllContainers();
@@ -329,7 +329,7 @@ void InstallController::removeAllContainers()

 void InstallController::removeCurrentlyProcessedContainer()
 {
-    int serverIndex = m_serversModel->getProcessedServerIndex();
+    int serverIndex = m_serversModel->getCurrentlyProcessedServerIndex();
    QString serverName = m_serversModel->data(serverIndex, ServersModel::Roles::NameRole).toString();

    int container = m_containersModel->getCurrentlyProcessedContainerIndex();
@@ -377,7 +377,7 @@ void InstallController::mountSftpDrive(const QString &port, const QString &passw
    QString mountPath;
    QString cmd;

-    int serverIndex = m_serversModel->getProcessedServerIndex();
+    int serverIndex = m_serversModel->getCurrentlyProcessedServerIndex();
    ServerCredentials serverCredentials =
            qvariant_cast<ServerCredentials>(m_serversModel->data(serverIndex, ServersModel::Roles::CredentialsRole));
    QString hostname = serverCredentials.hostName;
--- a/client/ui/controllers/installController.h
+++ b/client/ui/controllers/installController.h
@@ -30,8 +30,8 @@ public slots:

    void updateContainer(QJsonObject config);

-    void removeProcessedServer();
-    void rebootProcessedServer();
+    void removeCurrentlyProcessedServer();
+    void rebootCurrentlyProcessedServer();
    void removeAllContainers();
    void removeCurrentlyProcessedContainer();

@@ -54,8 +54,8 @@ signals:

    void scanServerFinished(bool isInstalledContainerFound);

-    void rebootProcessedServerFinished(const QString &finishedMessage);
-    void removeProcessedServerFinished(const QString &finishedMessage);
+    void rebootCurrentlyProcessedServerFinished(const QString &finishedMessage);
+    void removeCurrentlyProcessedServerFinished(const QString &finishedMessage);
    void removeAllContainersFinished(const QString &finishedMessage);
    void removeCurrentlyProcessedContainerFinished(const QString &finishedMessage);

--- a/client/ui/controllers/pageController.cpp
+++ b/client/ui/controllers/pageController.cpp
@@ -77,16 +77,7 @@ void PageController::closeWindow()
 void PageController::keyPressEvent(Qt::Key key)
 {
    switch (key) {
-    case Qt::Key_Back:
-    case Qt::Key_Escape: {
-        if (m_drawerDepth) {
-            emit closeTopDrawer();
-            setDrawerDepth(getDrawerDepth() - 1);
-        } else {
-            emit escapePressed();
-        }
-        break;
-    }
+    case Qt::Key_Back: emit closePage();
    default: return;
    }
 }
@@ -127,12 +118,42 @@ void PageController::showOnStartup()
    }
 }

+void PageController::updateDrawerRootPage(PageLoader::PageEnum page)
+{
+    m_drawerLayer = 0;
+    m_currentRootPage = page;
+}
+
+void PageController::goToDrawerRootPage()
+{
+
+    m_drawerLayer = 0;
+
+    emit showTopCloseButton(false);
+    emit forceCloseDrawer();
+}
+
+void PageController::drawerOpen()
+{
+    m_drawerLayer = m_drawerLayer + 1;
+    emit showTopCloseButton(true);
+}
+
+void PageController::drawerClose()
+{
+    m_drawerLayer = m_drawerLayer -1;
+    if (m_drawerLayer <= 0) {
+        emit showTopCloseButton(false);
+        m_drawerLayer = 0;
+    }
+}
+
 bool PageController::isTriggeredByConnectButton()
 {
    return m_isTriggeredByConnectButton;
 }

-void PageController::setTriggeredByConnectButton(bool trigger)
+void PageController::setTriggeredBtConnectButton(bool trigger)
 {
    m_isTriggeredByConnectButton = trigger;
 }
@@ -141,15 +162,3 @@ void PageController::closeApplication()
 {
    qApp->quit();
 }
-
-void PageController::setDrawerDepth(const int depth)
-{
-    if (depth >= 0) {
-        m_drawerDepth = depth;
-    }
-}
-
-int PageController::getDrawerDepth()
-{
-    return m_drawerDepth;
-}
--- a/client/ui/controllers/pageController.h
+++ b/client/ui/controllers/pageController.h
@@ -82,14 +82,16 @@ public slots:

    void showOnStartup();

+    void updateDrawerRootPage(PageLoader::PageEnum page);
+    void goToDrawerRootPage();
+    void drawerOpen();
+    void drawerClose();
+
    bool isTriggeredByConnectButton();
-    void setTriggeredByConnectButton(bool trigger);
+    void setTriggeredBtConnectButton(bool trigger);

    void closeApplication();

-    void setDrawerDepth(const int depth);
-    int getDrawerDepth();
-
 signals:
    void goToPage(PageLoader::PageEnum page, bool slide = true);
    void goToStartPage();
@@ -108,7 +110,7 @@ signals:
    void showNotificationMessage(const QString &message);

    void showBusyIndicator(bool visible);
-    void disableControls(bool disabled);
+    void enableTabBar(bool enabled);

    void hideMainWindow();
    void raiseMainWindow();
@@ -116,17 +118,18 @@ signals:
    void showPassphraseRequestDrawer();
    void passphraseRequestDrawerClosed(QString passphrase);

-    void escapePressed();
-    void closeTopDrawer();
+    void showTopCloseButton(bool visible);
+    void forceCloseDrawer();

 private:
    QSharedPointer<ServersModel> m_serversModel;

    std::shared_ptr<Settings> m_settings;

-    bool m_isTriggeredByConnectButton;
+    PageLoader::PageEnum m_currentRootPage;
+    int m_drawerLayer;

-    int m_drawerDepth = 0;
+    bool m_isTriggeredByConnectButton;
 };

 #endif // PAGECONTROLLER_H
--- a/client/ui/controllers/settingsController.cpp
+++ b/client/ui/controllers/settingsController.cpp
@@ -7,7 +7,9 @@
 #include "ui/qautostart.h"
 #include "version.h"
 #ifdef Q_OS_ANDROID
+    #include "platforms/android/android_utils.h"
    #include "platforms/android/android_controller.h"
+    #include <QJniObject>
 #endif

 #ifdef Q_OS_IOS
@@ -26,7 +28,21 @@ SettingsController::SettingsController(const QSharedPointer<ServersModel> &serve
      m_sitesModel(sitesModel),
      m_settings(settings)
 {
-    m_appVersion = QString("%1 (%2, %3)").arg(QString(APP_VERSION), __DATE__, GIT_COMMIT_HASH);
+    m_appVersion = QString("%1: %2 (%3)").arg(tr("Software version"), QString(APP_VERSION), __DATE__);
+
+#ifdef Q_OS_ANDROID
+    if (!m_settings->isScreenshotsEnabled()) {
+        // Set security screen for Android app
+        AndroidUtils::runOnAndroidThreadSync([]() {
+            QJniObject activity = AndroidUtils::getActivity();
+            QJniObject window = activity.callObjectMethod("getWindow", "()Landroid/view/Window;");
+            if (window.isValid()) {
+                const int FLAG_SECURE = 8192;
+                window.callMethod<void>("addFlags", "(I)V", FLAG_SECURE);
+            }
+        });
+    }
+#endif
 }

 void SettingsController::toggleAmneziaDns(bool enable)
@@ -136,12 +152,7 @@ void SettingsController::clearSettings()
    m_languageModel->changeLanguage(
            static_cast<LanguageSettings::AvailableLanguageEnum>(m_languageModel->getCurrentLanguageIndex()));
    m_sitesModel->setRouteMode(Settings::RouteMode::VpnAllSites);
-
    emit changeSettingsFinished(tr("All settings have been reset to default values"));
-
-#ifdef Q_OS_IOS
-    AmneziaVPN::clearSettings();
-#endif
 }

 void SettingsController::clearCachedProfiles()
@@ -188,6 +199,19 @@ bool SettingsController::isScreenshotsEnabled()
 void SettingsController::toggleScreenshotsEnabled(bool enable)
 {
    m_settings->setScreenshotsEnabled(enable);
+#ifdef Q_OS_ANDROID
+    std::string command = enable ? "clearFlags" : "addFlags";
+
+    // Set security screen for Android app
+    AndroidUtils::runOnAndroidThreadSync([&command]() {
+        QJniObject activity = AndroidUtils::getActivity();
+        QJniObject window = activity.callObjectMethod("getWindow", "()Landroid/view/Window;");
+        if (window.isValid()) {
+            const int FLAG_SECURE = 8192;
+            window.callMethod<void>(command.c_str(), "(I)V", FLAG_SECURE);
+        }
+    });
+#endif
 }

 bool SettingsController::isCameraPresent()
--- a/client/ui/controllers/systemController.cpp
+++ b/client/ui/controllers/systemController.cpp
@@ -92,11 +92,11 @@ QString SystemController::getFileName(const QString &acceptLabel, const QString

    mainFileDialog->setProperty("acceptLabel", QVariant::fromValue(acceptLabel));
    mainFileDialog->setProperty("nameFilters", QVariant::fromValue(QStringList(nameFilter)));
-    mainFileDialog->setProperty("defaultSuffix", QVariant::fromValue(defaultSuffix));
-    mainFileDialog->setProperty("isSaveMode", QVariant::fromValue(isSaveMode));
    if (!selectedFile.isEmpty()) {
-        mainFileDialog->setProperty("selectedFile", QVariant::fromValue(QUrl(selectedFile)));
+        mainFileDialog->setProperty("selectedFile", QVariant::fromValue(selectedFile));
    }
+    mainFileDialog->setProperty("isSaveMode", QVariant::fromValue(isSaveMode));
+    mainFileDialog->setProperty("defaultSuffix", QVariant::fromValue(defaultSuffix));
    QMetaObject::invokeMethod(mainFileDialog, "open");

    bool isFileDialogAccepted = false;
--- a/client/ui/models/containers_model.cpp
+++ b/client/ui/models/containers_model.cpp
@@ -83,6 +83,20 @@ QJsonObject ContainersModel::getContainerConfig(const int containerIndex)
    return qvariant_cast<QJsonObject>(data(index(containerIndex), ConfigRole));
 }

+bool ContainersModel::isAnyContainerInstalled()
+{
+    for (int row=0; row < rowCount(); row++) {
+        QModelIndex idx = this->index(row, 0);
+
+        if (this->data(idx, IsInstalledRole).toBool() &&
+            this->data(idx, ServiceTypeRole).toInt() == ServiceType::Vpn) {
+            return true;
+        }
+    }
+
+    return false;
+}
+
 QHash<int, QByteArray> ContainersModel::roleNames() const
 {
    QHash<int, QByteArray> roles;
--- a/client/ui/models/containers_model.h
+++ b/client/ui/models/containers_model.h
@@ -49,6 +49,8 @@ public slots:

    QJsonObject getContainerConfig(const int containerIndex);

+    bool isAnyContainerInstalled();
+
 protected:
    QHash<int, QByteArray> roleNames() const override;

--- a/client/ui/models/languageModel.cpp
+++ b/client/ui/models/languageModel.cpp
@@ -45,8 +45,6 @@ QString LanguageModel::getLocalLanguageName(const LanguageSettings::AvailableLan
    case LanguageSettings::AvailableLanguageEnum::Russian: strLanguage = "Русский"; break;
    case LanguageSettings::AvailableLanguageEnum::China_cn: strLanguage = "\347\256\200\344\275\223\344\270\255\346\226\207"; break;
    case LanguageSettings::AvailableLanguageEnum::Persian: strLanguage = "فارسی"; break;
-    case LanguageSettings::AvailableLanguageEnum::Arabic: strLanguage = "العربية"; break;
-    case LanguageSettings::AvailableLanguageEnum::Burmese: strLanguage = "မြန်မာဘာသာ"; break;
    default:
        break;
    }
@@ -61,8 +59,6 @@ void LanguageModel::changeLanguage(const LanguageSettings::AvailableLanguageEnum
    case LanguageSettings::AvailableLanguageEnum::Russian: emit updateTranslations(QLocale::Russian); break;
    case LanguageSettings::AvailableLanguageEnum::China_cn: emit updateTranslations(QLocale::Chinese); break;
    case LanguageSettings::AvailableLanguageEnum::Persian: emit updateTranslations(QLocale::Persian); break;
-    case LanguageSettings::AvailableLanguageEnum::Arabic: emit updateTranslations(QLocale::Arabic); break;
-    case LanguageSettings::AvailableLanguageEnum::Burmese: emit updateTranslations(QLocale::Burmese); break;
    default: emit updateTranslations(QLocale::English); break;
    }
 }
@@ -75,8 +71,6 @@ int LanguageModel::getCurrentLanguageIndex()
    case QLocale::Russian: return static_cast<int>(LanguageSettings::AvailableLanguageEnum::Russian); break;
    case QLocale::Chinese: return static_cast<int>(LanguageSettings::AvailableLanguageEnum::China_cn); break;
    case QLocale::Persian: return static_cast<int>(LanguageSettings::AvailableLanguageEnum::Persian); break;
-    case QLocale::Arabic: return static_cast<int>(LanguageSettings::AvailableLanguageEnum::Arabic); break;
-    case QLocale::Burmese: return static_cast<int>(LanguageSettings::AvailableLanguageEnum::Burmese); break;
    default: return static_cast<int>(LanguageSettings::AvailableLanguageEnum::English); break;
    }
 }
--- a/client/ui/models/languageModel.h
+++ b/client/ui/models/languageModel.h
@@ -13,9 +13,7 @@ namespace LanguageSettings
        English,
        Russian,
        China_cn,
-        Persian,
-        Arabic,
-        Burmese
+        Persian
    };
    Q_ENUM_NS(AvailableLanguageEnum)

--- a/client/ui/models/servers_model.cpp
+++ b/client/ui/models/servers_model.cpp
@@ -5,13 +5,19 @@
 ServersModel::ServersModel(std::shared_ptr<Settings> settings, QObject *parent)
    : m_settings(settings), QAbstractListModel(parent)
 {
-    connect(this, &ServersModel::defaultServerIndexChanged, this, &ServersModel::defaultServerNameChanged);
+    m_servers = m_settings->serversArray();
+    m_defaultServerIndex = m_settings->defaultServerIndex();
+    m_currentlyProcessedServerIndex = m_defaultServerIndex;

+    connect(this, &ServersModel::defaultServerIndexChanged, this, &ServersModel::defaultServerNameChanged);
+    connect(this, &ServersModel::defaultContainerChanged, this, &ServersModel::defaultServerDescriptionChanged);
    connect(this, &ServersModel::defaultServerIndexChanged, this, [this](const int serverIndex) {
        auto defaultContainer = ContainerProps::containerFromString(m_servers.at(serverIndex).toObject().value(config_key::defaultContainer).toString());
-        emit ServersModel::defaultServerDefaultContainerChanged(defaultContainer);
-        emit ServersModel::defaultServerNameChanged();
-        updateDefaultServerContainersModel();
+        emit ServersModel::defaultContainerChanged(defaultContainer);
+    });
+    connect(this, &ServersModel::currentlyProcessedServerIndexChanged, this, [this](const int serverIndex) {
+        auto defaultContainer = ContainerProps::containerFromString(m_servers.at(serverIndex).toObject().value(config_key::defaultContainer).toString());
+        emit ServersModel::defaultContainerChanged(defaultContainer);
    });
 }

@@ -68,14 +74,16 @@ QVariant ServersModel::data(const QModelIndex &index, int role) const
        return name;
    }
    case ServerDescriptionRole: {
-        auto description = getServerDescription(server, index.row());
-        return configVersion ? description : description + server.value(config_key::hostName).toString();
+        if (configVersion) {
+            return server.value(config_key::description).toString();
+        }
+        return server.value(config_key::hostName).toString();
    }
    case HostNameRole: return server.value(config_key::hostName).toString();
    case CredentialsRole: return QVariant::fromValue(serverCredentials(index.row()));
    case CredentialsLoginRole: return serverCredentials(index.row()).userName;
    case IsDefaultRole: return index.row() == m_defaultServerIndex;
-    case IsCurrentlyProcessedRole: return index.row() == m_processedServerIndex;
+    case IsCurrentlyProcessedRole: return index.row() == m_currentlyProcessedServerIndex;
    case HasWriteAccessRole: {
        auto credentials = serverCredentials(index.row());
        return (!credentials.userName.isEmpty() && !credentials.secretData.isEmpty());
@@ -87,16 +95,6 @@ QVariant ServersModel::data(const QModelIndex &index, int role) const
    case DefaultContainerRole: {
        return ContainerProps::containerFromString(server.value(config_key::defaultContainer).toString());
    }
-    case HasInstalledContainers: {
-        return serverHasInstalledContainers(index.row());
-    }
-    case IsServerFromApiRole: {
-        return server.value(config_key::configVersion).toInt();
-    }
-    case HasAmneziaDns: {
-        QString primaryDns = server.value(config_key::dns1).toString();
-        return primaryDns == protocols::dns::amneziaDnsIp;
-    }
    }

    return QVariant();
@@ -113,9 +111,8 @@ void ServersModel::resetModel()
    beginResetModel();
    m_servers = m_settings->serversArray();
    m_defaultServerIndex = m_settings->defaultServerIndex();
-    m_processedServerIndex = m_defaultServerIndex;
+    m_currentlyProcessedServerIndex = m_defaultServerIndex;
    endResetModel();
-    emit defaultServerIndexChanged(m_defaultServerIndex);
 }

 void ServersModel::setDefaultServerIndex(const int index)
@@ -135,7 +132,12 @@ const QString ServersModel::getDefaultServerName()
    return qvariant_cast<QString>(data(m_defaultServerIndex, NameRole));
 }

-QString ServersModel::getServerDescription(const QJsonObject &server, const int index) const
+const QString ServersModel::getDefaultServerHostName()
+{
+    return qvariant_cast<QString>(data(m_defaultServerIndex, HostNameRole));
+}
+
+QString ServersModel::getDefaultServerDescription(const QJsonObject &server)
 {
    const auto configVersion = server.value(config_key::configVersion).toInt();

@@ -143,12 +145,13 @@ QString ServersModel::getServerDescription(const QJsonObject &server, const int

    if (configVersion) {
        return server.value(config_key::description).toString();
-    } else if (data(index, HasWriteAccessRole).toBool()) {
-        if (m_isAmneziaDnsEnabled && isAmneziaDnsContainerInstalled(index)) {
+    } else if (isDefaultServerHasWriteAccess()) {
+        if (m_isAmneziaDnsEnabled
+            && isAmneziaDnsContainerInstalled(m_defaultServerIndex)) {
            description += "Amnezia DNS | ";
        }
    } else {
-        if (data(index, HasAmneziaDns).toBool()) {
+        if (isDefaultServerConfigContainsAmneziaDns()) {
            description += "Amnezia DNS | ";
        }
    }
@@ -159,7 +162,7 @@ const QString ServersModel::getDefaultServerDescriptionCollapsed()
 {
    const QJsonObject server = m_servers.at(m_defaultServerIndex).toObject();
    const auto configVersion = server.value(config_key::configVersion).toInt();
-    auto description = getServerDescription(server, m_defaultServerIndex);
+    auto description = getDefaultServerDescription(server);
    if (configVersion) {
        return description;
    }
@@ -173,7 +176,7 @@ const QString ServersModel::getDefaultServerDescriptionExpanded()
 {
    const QJsonObject server = m_servers.at(m_defaultServerIndex).toObject();
    const auto configVersion = server.value(config_key::configVersion).toInt();
-    auto description = getServerDescription(server, m_defaultServerIndex);
+    auto description = getDefaultServerDescription(server);
    if (configVersion) {
        return description;
    }
@@ -196,21 +199,26 @@ bool ServersModel::hasServerWithWriteAccess()
    return false;
 }

-void ServersModel::setProcessedServerIndex(const int index)
+void ServersModel::setCurrentlyProcessedServerIndex(const int index)
 {
-    m_processedServerIndex = index;
+    m_currentlyProcessedServerIndex = index;
    updateContainersModel();
-    emit processedServerIndexChanged(m_processedServerIndex);
+    emit currentlyProcessedServerIndexChanged(m_currentlyProcessedServerIndex);
 }

-int ServersModel::getProcessedServerIndex()
+int ServersModel::getCurrentlyProcessedServerIndex()
 {
-    return m_processedServerIndex;
+    return m_currentlyProcessedServerIndex;
 }

-const ServerCredentials ServersModel::getProcessedServerCredentials()
+QString ServersModel::getCurrentlyProcessedServerHostName()
 {
-    return serverCredentials(m_processedServerIndex);
+    return qvariant_cast<QString>(data(m_currentlyProcessedServerIndex, HostNameRole));
+}
+
+const ServerCredentials ServersModel::getCurrentlyProcessedServerCredentials()
+{
+    return serverCredentials(m_currentlyProcessedServerIndex);
 }

 const ServerCredentials ServersModel::getServerCredentials(const int index)
@@ -220,17 +228,12 @@ const ServerCredentials ServersModel::getServerCredentials(const int index)

 bool ServersModel::isDefaultServerCurrentlyProcessed()
 {
-    return m_defaultServerIndex == m_processedServerIndex;
+    return m_defaultServerIndex == m_currentlyProcessedServerIndex;
 }

-bool ServersModel::isDefaultServerFromApi()
+bool ServersModel::isCurrentlyProcessedServerHasWriteAccess()
 {
-    return qvariant_cast<bool>(data(m_defaultServerIndex, IsServerFromApiRole));
-}
-
-bool ServersModel::isProcessedServerHasWriteAccess()
-{
-    return qvariant_cast<bool>(data(m_processedServerIndex, HasWriteAccessRole));
+    return qvariant_cast<bool>(data(m_currentlyProcessedServerIndex, HasWriteAccessRole));
 }

 bool ServersModel::isDefaultServerHasWriteAccess()
@@ -246,42 +249,40 @@ void ServersModel::addServer(const QJsonObject &server)
    endResetModel();
 }

-void ServersModel::editServer(const QJsonObject &server, const int serverIndex)
+void ServersModel::editServer(const QJsonObject &server)
 {
-    m_settings->editServer(serverIndex, server);
-    m_servers.replace(serverIndex, m_settings->serversArray().at(serverIndex));
-    emit dataChanged(index(serverIndex, 0), index(serverIndex, 0));
-
-    if (serverIndex == m_defaultServerIndex) {
-        updateDefaultServerContainersModel();
-    }
+    m_settings->editServer(m_currentlyProcessedServerIndex, server);
+    m_servers.replace(m_currentlyProcessedServerIndex, m_settings->serversArray().at(m_currentlyProcessedServerIndex));
+    emit dataChanged(index(m_currentlyProcessedServerIndex, 0), index(m_currentlyProcessedServerIndex, 0));
    updateContainersModel();
-
-    if (serverIndex == m_defaultServerIndex) {
-        auto defaultContainer = qvariant_cast<DockerContainer>(getDefaultServerData("defaultContainer"));
-        emit defaultServerDefaultContainerChanged(defaultContainer);
-    }
 }

 void ServersModel::removeServer()
 {
    beginResetModel();
-    m_settings->removeServer(m_processedServerIndex);
+    m_settings->removeServer(m_currentlyProcessedServerIndex);
    m_servers = m_settings->serversArray();

-    if (m_settings->defaultServerIndex() == m_processedServerIndex) {
+    if (m_settings->defaultServerIndex() == m_currentlyProcessedServerIndex) {
        setDefaultServerIndex(0);
-    } else if (m_settings->defaultServerIndex() > m_processedServerIndex) {
+    } else if (m_settings->defaultServerIndex() > m_currentlyProcessedServerIndex) {
        setDefaultServerIndex(m_settings->defaultServerIndex() - 1);
    }

    if (m_settings->serversCount() == 0) {
        setDefaultServerIndex(-1);
    }
-    setProcessedServerIndex(m_defaultServerIndex);
+    setCurrentlyProcessedServerIndex(m_defaultServerIndex);
    endResetModel();
 }

+bool ServersModel::isDefaultServerConfigContainsAmneziaDns()
+{
+    const QJsonObject server = m_servers.at(m_defaultServerIndex).toObject();
+    QString primaryDns = server.value(config_key::dns1).toString();
+    return primaryDns == protocols::dns::amneziaDnsIp;
+}
+
 QHash<int, QByteArray> ServersModel::roleNames() const
 {
    QHash<int, QByteArray> roles;
@@ -289,8 +290,6 @@ QHash<int, QByteArray> ServersModel::roleNames() const
    roles[NameRole] = "serverName";
    roles[NameRole] = "name";
    roles[ServerDescriptionRole] = "serverDescription";
-    roles[CollapsedServerDescriptionRole] = "collapsedServerDescription";
-    roles[ExpandedServerDescriptionRole] = "expandedServerDescription";

    roles[HostNameRole] = "hostName";

@@ -305,9 +304,6 @@ QHash<int, QByteArray> ServersModel::roleNames() const
    roles[ContainsAmneziaDnsRole] = "containsAmneziaDns";

    roles[DefaultContainerRole] = "defaultContainer";
-    roles[HasInstalledContainers] = "hasInstalledContainers";
-
-    roles[IsServerFromApiRole] = "isServerFromApi";
    return roles;
 }

@@ -326,29 +322,28 @@ ServerCredentials ServersModel::serverCredentials(int index) const

 void ServersModel::updateContainersModel()
 {
-    auto containers = m_servers.at(m_processedServerIndex).toObject().value(config_key::containers).toArray();
+    auto containers = m_servers.at(m_currentlyProcessedServerIndex).toObject().value(config_key::containers).toArray();
    emit containersUpdated(containers);
 }

-void ServersModel::updateDefaultServerContainersModel()
-{
-    auto containers = m_servers.at(m_defaultServerIndex).toObject().value(config_key::containers).toArray();
-    emit defaultServerContainersUpdated(containers);
-}
-
 QJsonObject ServersModel::getDefaultServerConfig()
 {
    return m_servers.at(m_defaultServerIndex).toObject();
 }

-void ServersModel::reloadDefaultServerContainerConfig()
+QJsonObject ServersModel::getCurrentlyProcessedServerConfig()
 {
-    QJsonObject server = m_servers.at(m_defaultServerIndex).toObject();
+    return m_servers.at(m_currentlyProcessedServerIndex).toObject();
+}
+
+void ServersModel::reloadContainerConfig()
+{
+    QJsonObject server = m_servers.at(m_currentlyProcessedServerIndex).toObject();
    auto container = ContainerProps::containerFromString(server.value(config_key::defaultContainer).toString());

    auto containers = server.value(config_key::containers).toArray();

-    auto config = m_settings->containerConfig(m_defaultServerIndex, container);
+    auto config = m_settings->containerConfig(m_currentlyProcessedServerIndex, container);
    for (auto i = 0; i < containers.size(); i++) {
        auto c = ContainerProps::containerFromString(containers.at(i).toObject().value(config_key::container).toString());
        if (c == container) {
@@ -358,13 +353,13 @@ void ServersModel::reloadDefaultServerContainerConfig()
    }

    server.insert(config_key::containers, containers);
-    editServer(server, m_defaultServerIndex);
+    editServer(server);
 }

 void ServersModel::updateContainerConfig(const int containerIndex, const QJsonObject config)
 {
    auto container = static_cast<DockerContainer>(containerIndex);
-    QJsonObject server = m_servers.at(m_processedServerIndex).toObject();
+    QJsonObject server = m_servers.at(m_currentlyProcessedServerIndex).toObject();

    auto containers = server.value(config_key::containers).toArray();
    for (auto i = 0; i < containers.size(); i++) {
@@ -382,25 +377,30 @@ void ServersModel::updateContainerConfig(const int containerIndex, const QJsonOb
        server.insert(config_key::defaultContainer, ContainerProps::containerToString(container));
    }

-    editServer(server, m_processedServerIndex);
+    editServer(server);
 }

 void ServersModel::addContainerConfig(const int containerIndex, const QJsonObject config)
 {
    auto container = static_cast<DockerContainer>(containerIndex);
-    QJsonObject server = m_servers.at(m_processedServerIndex).toObject();
+    QJsonObject server = m_servers.at(m_currentlyProcessedServerIndex).toObject();

    auto containers = server.value(config_key::containers).toArray();
    containers.push_back(config);

    server.insert(config_key::containers, containers);

+    bool isDefaultContainerChanged = false;
    auto defaultContainer = server.value(config_key::defaultContainer).toString();
    if ((ContainerProps::containerFromString(defaultContainer) == DockerContainer::None || ContainerProps::containerService(container) != ServiceType::Other)) {
        server.insert(config_key::defaultContainer, ContainerProps::containerToString(container));
+        isDefaultContainerChanged = true;
    }

-    editServer(server, m_processedServerIndex);
+    editServer(server);
+    if (isDefaultContainerChanged) {
+        emit defaultContainerChanged(container);
+    }
 }

 void ServersModel::setDefaultContainer(const int serverIndex, const int containerIndex)
@@ -408,12 +408,18 @@ void ServersModel::setDefaultContainer(const int serverIndex, const int containe
    auto container = static_cast<DockerContainer>(containerIndex);
    QJsonObject s = m_servers.at(serverIndex).toObject();
    s.insert(config_key::defaultContainer, ContainerProps::containerToString(container));
-    editServer(s, serverIndex); //check
+    editServer(s); //check
+    emit defaultContainerChanged(container);
 }

-const QString ServersModel::getDefaultServerDefaultContainerName()
+DockerContainer ServersModel::getDefaultContainer(const int serverIndex)
 {
-    auto defaultContainer = qvariant_cast<DockerContainer>(getDefaultServerData("defaultContainer"));
+    return qvariant_cast<DockerContainer>(data(serverIndex, DefaultContainerRole));
+}
+
+const QString ServersModel::getDefaultContainerName()
+{
+    auto defaultContainer = getDefaultContainer(m_defaultServerIndex);
    return ContainerProps::containerHumanNames().value(defaultContainer);
 }

@@ -421,14 +427,15 @@ ErrorCode ServersModel::removeAllContainers()
 {
    ServerController serverController(m_settings);
    ErrorCode errorCode =
-            serverController.removeAllContainers(m_settings->serverCredentials(m_processedServerIndex));
+            serverController.removeAllContainers(m_settings->serverCredentials(m_currentlyProcessedServerIndex));

    if (errorCode == ErrorCode::NoError) {
-        QJsonObject s = m_servers.at(m_processedServerIndex).toObject();
+        QJsonObject s = m_servers.at(m_currentlyProcessedServerIndex).toObject();
        s.insert(config_key::containers, {});
        s.insert(config_key::defaultContainer, ContainerProps::containerToString(DockerContainer::None));

-        editServer(s, m_processedServerIndex);
+        editServer(s);
+        emit defaultContainerChanged(DockerContainer::None);
    }
    return errorCode;
 }
@@ -436,7 +443,7 @@ ErrorCode ServersModel::removeAllContainers()
 ErrorCode ServersModel::rebootServer()
 {
    ServerController serverController(m_settings);
-    auto credentials = m_settings->serverCredentials(m_processedServerIndex);
+    auto credentials = m_settings->serverCredentials(m_currentlyProcessedServerIndex);

    ErrorCode errorCode = serverController.rebootServer(credentials);
    return errorCode;
@@ -445,13 +452,13 @@ ErrorCode ServersModel::rebootServer()
 ErrorCode ServersModel::removeContainer(const int containerIndex)
 {
    ServerController serverController(m_settings);
-    auto credentials = m_settings->serverCredentials(m_processedServerIndex);
+    auto credentials = m_settings->serverCredentials(m_currentlyProcessedServerIndex);
    auto dockerContainer = static_cast<DockerContainer>(containerIndex);

    ErrorCode errorCode = serverController.removeContainer(credentials, dockerContainer);

    if (errorCode == ErrorCode::NoError) {
-        QJsonObject server = m_servers.at(m_processedServerIndex).toObject();
+        QJsonObject server = m_servers.at(m_currentlyProcessedServerIndex).toObject();

        auto containers = server.value(config_key::containers).toArray();
        for (auto it = containers.begin(); it != containers.end(); it++) {
@@ -473,37 +480,32 @@ ErrorCode ServersModel::removeContainer(const int containerIndex)
            server.insert(config_key::defaultContainer, ContainerProps::containerToString(defaultContainer));
        }

-        editServer(server, m_processedServerIndex);
+        editServer(server);
+        emit defaultContainerChanged(defaultContainer);
    }
    return errorCode;
 }

 void ServersModel::clearCachedProfiles()
 {
-    const auto &containers = m_settings->containers(m_processedServerIndex);
+    const auto &containers = m_settings->containers(m_currentlyProcessedServerIndex);
    for (DockerContainer container : containers.keys()) {
-        m_settings->clearLastConnectionConfig(m_processedServerIndex, container);
+        m_settings->clearLastConnectionConfig(m_currentlyProcessedServerIndex, container);
    }

-    m_servers.replace(m_processedServerIndex, m_settings->server(m_processedServerIndex));
-    if (m_processedServerIndex == m_defaultServerIndex) {
-        updateDefaultServerContainersModel();
-    }
+    m_servers.replace(m_currentlyProcessedServerIndex, m_settings->server(m_currentlyProcessedServerIndex));
    updateContainersModel();
 }

 void ServersModel::clearCachedProfile(const DockerContainer container)
 {
-    m_settings->clearLastConnectionConfig(m_processedServerIndex, container);
+    m_settings->clearLastConnectionConfig(m_currentlyProcessedServerIndex, container);

-    m_servers.replace(m_processedServerIndex, m_settings->server(m_processedServerIndex));
-    if (m_processedServerIndex == m_defaultServerIndex) {
-        updateDefaultServerContainersModel();
-    }
+    m_servers.replace(m_currentlyProcessedServerIndex, m_settings->server(m_currentlyProcessedServerIndex));
    updateContainersModel();
 }

-bool ServersModel::isAmneziaDnsContainerInstalled(const int serverIndex) const
+bool ServersModel::isAmneziaDnsContainerInstalled(const int serverIndex)
 {
    QJsonObject server = m_servers.at(serverIndex).toObject();
    auto containers = server.value(config_key::containers).toArray();
@@ -542,6 +544,16 @@ void ServersModel::toggleAmneziaDns(bool enabled)
    emit defaultServerDescriptionChanged();
 }

+bool ServersModel::isDefaultServerFromApi()
+{
+    return m_settings->server(m_defaultServerIndex).value(config_key::configVersion).toInt();
+}
+
+bool ServersModel::isCurrentlyProcessedServerFromApi()
+{
+    return m_settings->server(m_currentlyProcessedServerIndex).value(config_key::configVersion).toInt();
+}
+
 bool ServersModel::isServerFromApiAlreadyExists(const quint16 crc)
 {
    for (const auto &server : qAsConst(m_servers)) {
@@ -552,55 +564,3 @@ bool ServersModel::isServerFromApiAlreadyExists(const quint16 crc)
    return false;
 }

-bool ServersModel::serverHasInstalledContainers(const int serverIndex) const
-{
-    QJsonObject server = m_servers.at(serverIndex).toObject();
-    const auto containers = server.value(config_key::containers).toArray();
-    for (auto it = containers.begin(); it != containers.end(); it++) {
-        auto container = ContainerProps::containerFromString(it->toObject().value(config_key::container).toString());
-        if (ContainerProps::containerService(container) == ServiceType::Vpn) {
-            return true;
-        }
-    }
-    return false;
-}
-
-QVariant ServersModel::getDefaultServerData(const QString roleString)
-{
-    auto roles = roleNames();
-    for (auto it = roles.begin(); it != roles.end(); it++) {
-        if (QString(it.value()) == roleString) {
-            return data(m_defaultServerIndex, it.key());
-        }
-    }
-
-    return {};
-}
-
-QVariant ServersModel::getProcessedServerData(const QString roleString)
-{
-    auto roles = roleNames();
-    for (auto it = roles.begin(); it != roles.end(); it++) {
-        if (QString(it.value()) == roleString) {
-            return data(m_processedServerIndex, it.key());
-        }
-    }
-
-    return {};
-}
-
-bool ServersModel::isDefaultServerDefaultContainerHasSplitTunneling()
-{
-    auto server = m_servers.at(m_defaultServerIndex).toObject();
-    auto defaultContainer = ContainerProps::containerFromString(server.value(config_key::defaultContainer).toString());
-    auto containerConfig = server.value(config_key::containers).toArray().at(defaultContainer).toObject();
-    auto protocolConfig = containerConfig.value(ContainerProps::containerTypeToString(defaultContainer)).toObject();
-
-    if (defaultContainer == DockerContainer::Awg || defaultContainer == DockerContainer::WireGuard) {
-        return !(protocolConfig.value(config_key::last_config).toString().contains("AllowedIPs = 0.0.0.0/0, ::/0"));
-    } else if (defaultContainer == DockerContainer::Cloak || defaultContainer == DockerContainer::OpenVpn || defaultContainer == DockerContainer::ShadowSocks) {
-        return !(protocolConfig.value(config_key::last_config).toString().contains("redirect-gateway"));
-    }
-
-    return false;
-}
--- a/client/ui/models/servers_model.h
+++ b/client/ui/models/servers_model.h
@@ -12,8 +12,7 @@ public:
    enum Roles {
        NameRole = Qt::UserRole + 1,
        ServerDescriptionRole,
-        CollapsedServerDescriptionRole,
-        ExpandedServerDescriptionRole,
+
        HostNameRole,

        CredentialsRole,
@@ -26,12 +25,7 @@ public:

        ContainsAmneziaDnsRole,

-        DefaultContainerRole,
-
-        HasInstalledContainers,
-        IsServerFromApiRole,
-
-        HasAmneziaDns
+        DefaultContainerRole
    };

    ServersModel(std::shared_ptr<Settings> settings, QObject *parent = nullptr);
@@ -46,43 +40,47 @@ public:

    Q_PROPERTY(int defaultIndex READ getDefaultServerIndex WRITE setDefaultServerIndex NOTIFY defaultServerIndexChanged)
    Q_PROPERTY(QString defaultServerName READ getDefaultServerName NOTIFY defaultServerNameChanged)
-    Q_PROPERTY(QString defaultServerDefaultContainerName READ getDefaultServerDefaultContainerName NOTIFY defaultServerDefaultContainerChanged)
-    Q_PROPERTY(QString defaultServerDescriptionCollapsed READ getDefaultServerDescriptionCollapsed NOTIFY defaultServerDefaultContainerChanged)
-    Q_PROPERTY(QString defaultServerDescriptionExpanded READ getDefaultServerDescriptionExpanded NOTIFY defaultServerDefaultContainerChanged)
-    Q_PROPERTY(bool isDefaultServerDefaultContainerHasSplitTunneling READ isDefaultServerDefaultContainerHasSplitTunneling NOTIFY defaultServerDefaultContainerChanged)
-    Q_PROPERTY(bool isDefaultServerFromApi READ isDefaultServerFromApi NOTIFY defaultServerIndexChanged)
+    Q_PROPERTY(QString defaultServerHostName READ getDefaultServerHostName NOTIFY defaultServerIndexChanged)
+    Q_PROPERTY(QString defaultContainerName READ getDefaultContainerName NOTIFY defaultContainerChanged)
+    Q_PROPERTY(QString defaultServerDescriptionCollapsed READ getDefaultServerDescriptionCollapsed NOTIFY defaultServerDescriptionChanged)
+    Q_PROPERTY(QString defaultServerDescriptionExpanded READ getDefaultServerDescriptionExpanded NOTIFY defaultServerDescriptionChanged)

-    Q_PROPERTY(int processedIndex READ getProcessedServerIndex WRITE setProcessedServerIndex NOTIFY processedServerIndexChanged)
+    Q_PROPERTY(int currentlyProcessedIndex READ getCurrentlyProcessedServerIndex WRITE setCurrentlyProcessedServerIndex
+                       NOTIFY currentlyProcessedServerIndexChanged)

 public slots:
    void setDefaultServerIndex(const int index);
    const int getDefaultServerIndex();
    const QString getDefaultServerName();
+    const QString getDefaultServerHostName();
    const QString getDefaultServerDescriptionCollapsed();
    const QString getDefaultServerDescriptionExpanded();
-    const QString getDefaultServerDefaultContainerName();
    bool isDefaultServerCurrentlyProcessed();
-    bool isDefaultServerFromApi();

-    bool isProcessedServerHasWriteAccess();
+    bool isCurrentlyProcessedServerHasWriteAccess();
    bool isDefaultServerHasWriteAccess();
    bool hasServerWithWriteAccess();

    const int getServersCount();

-    void setProcessedServerIndex(const int index);
-    int getProcessedServerIndex();
+    void setCurrentlyProcessedServerIndex(const int index);
+    int getCurrentlyProcessedServerIndex();

-    const ServerCredentials getProcessedServerCredentials();
+    QString getCurrentlyProcessedServerHostName();
+    const ServerCredentials getCurrentlyProcessedServerCredentials();
    const ServerCredentials getServerCredentials(const int index);

    void addServer(const QJsonObject &server);
-    void editServer(const QJsonObject &server, const int serverIndex);
+    void editServer(const QJsonObject &server);
    void removeServer();

-    QJsonObject getDefaultServerConfig();
+    bool isDefaultServerConfigContainsAmneziaDns();
+    bool isAmneziaDnsContainerInstalled(const int serverIndex);

-    void reloadDefaultServerContainerConfig();
+    QJsonObject getDefaultServerConfig();
+    QJsonObject getCurrentlyProcessedServerConfig();
+
+    void reloadContainerConfig();
    void updateContainerConfig(const int containerIndex, const QJsonObject config);
    void addContainerConfig(const int containerIndex, const QJsonObject config);

@@ -94,50 +92,42 @@ public slots:
    ErrorCode rebootServer();

    void setDefaultContainer(const int serverIndex, const int containerIndex);
+    DockerContainer getDefaultContainer(const int serverIndex);
+    const QString getDefaultContainerName();

    QStringList getAllInstalledServicesName(const int serverIndex);

    void toggleAmneziaDns(bool enabled);

+    bool isDefaultServerFromApi();
+    bool isCurrentlyProcessedServerFromApi();
+
    bool isServerFromApiAlreadyExists(const quint16 crc);

-    QVariant getDefaultServerData(const QString roleString);
-
-    QVariant getProcessedServerData(const QString roleString);
-
-    bool isDefaultServerDefaultContainerHasSplitTunneling();
-
 protected:
    QHash<int, QByteArray> roleNames() const override;

 signals:
-    void processedServerIndexChanged(const int index);
+    void currentlyProcessedServerIndexChanged(const int index);
    void defaultServerIndexChanged(const int index);
    void defaultServerNameChanged();
    void defaultServerDescriptionChanged();

    void containersUpdated(const QJsonArray &containers);
-    void defaultServerContainersUpdated(const QJsonArray &containers);
-    void defaultServerDefaultContainerChanged(const int containerIndex);
+    void defaultContainerChanged(const int containerIndex);

 private:
    ServerCredentials serverCredentials(int index) const;
-
    void updateContainersModel();
-    void updateDefaultServerContainersModel();

-    QString getServerDescription(const QJsonObject &server, const int index) const;
-
-    bool isAmneziaDnsContainerInstalled(const int serverIndex) const;
-
-    bool serverHasInstalledContainers(const int serverIndex) const;
+    QString getDefaultServerDescription(const QJsonObject &server);

    QJsonArray m_servers;

    std::shared_ptr<Settings> m_settings;

    int m_defaultServerIndex;
-    int m_processedServerIndex;
+    int m_currentlyProcessedServerIndex;

    bool m_isAmneziaDnsEnabled = m_settings->useAmneziaDns();
 };
--- a/client/ui/models/sites_model.cpp
+++ b/client/ui/models/sites_model.cpp
@@ -113,7 +113,6 @@ void SitesModel::toggleSplitTunneling(bool enabled)
        m_settings->setRouteMode(Settings::RouteMode::VpnAllSites);
    }
    m_isSplitTunnelingEnabled = enabled;
-    emit splitTunnelingToggled();
 }

 QVector<QPair<QString, QString> > SitesModel::getCurrentSites()
--- a/client/ui/models/sites_model.h
+++ b/client/ui/models/sites_model.h
@@ -22,7 +22,6 @@ public:
    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;

    Q_PROPERTY(int routeMode READ getRouteMode WRITE setRouteMode NOTIFY routeModeChanged)
-    Q_PROPERTY(bool isTunnelingEnabled READ isSplitTunnelingEnabled NOTIFY splitTunnelingToggled)

 public slots:
    bool addSite(const QString &hostname, const QString &ip);
@@ -39,7 +38,6 @@ public slots:

 signals:
    void routeModeChanged();
-    void splitTunnelingToggled();

 protected:
    QHash<int, QByteArray> roleNames() const override;
--- a/client/ui/qml/Components/ConnectButton.qml
+++ b/client/ui/qml/Components/ConnectButton.qml
@@ -138,7 +138,9 @@ Button {
    }

    onClicked: {
-        ServersModel.setProcessedServerIndex(ServersModel.defaultIndex)
-        ApiController.updateServerConfigFromApi()
+        if (!ConnectionController.isConnectionInProgress) {
+            ServersModel.setCurrentlyProcessedServerIndex(ServersModel.defaultIndex)
+            ApiController.updateServerConfigFromApi()
+        }
    }
 }
--- a/client/ui/qml/Components/ConnectionTypeSelectionDrawer.qml
+++ b/client/ui/qml/Components/ConnectionTypeSelectionDrawer.qml
@@ -8,32 +8,18 @@ import "../Controls2"
 import "../Controls2/TextTypes"
 import "../Config"

-DrawerType2 {
+DrawerType {
    id: root

    width: parent.width
-    height: parent.height
-
-    expandedContent: ColumnLayout {
-        id: content
+    height: parent.height * 0.4375

+    ColumnLayout {
        anchors.top: parent.top
        anchors.left: parent.left
        anchors.right: parent.right
        spacing: 0

-        Component.onCompleted: {
-            root.expandedHeight = content.implicitHeight + 32
-        }
-
-        Connections {
-            target: root
-            enabled: !GC.isMobile()
-            function onOpened() {
-                config.rightButton.forceActiveFocus()
-            }
-        }
-
        Header2Type {
            Layout.fillWidth: true
            Layout.topMargin: 24
@@ -45,7 +31,7 @@ DrawerType2 {
        }

        LabelWithButtonType {
-            id: config
+            id: ip
            Layout.fillWidth: true
            Layout.topMargin: 16

@@ -54,16 +40,13 @@ DrawerType2 {

            clickedFunction: function() {
                PageController.goToPage(PageEnum.PageSetupWizardCredentials)
-                root.close()
+                root.visible = false
            }
-
-            KeyNavigation.tab: configFromFile.rightButton
        }

        DividerType {}

        LabelWithButtonType {
-            id: configFromFile
            Layout.fillWidth: true

            text: qsTr("Open config file, key or QR code")
@@ -71,10 +54,8 @@ DrawerType2 {

            clickedFunction: function() {
                PageController.goToPage(PageEnum.PageSetupWizardConfigSource)
-                root.close()
+                root.visible = false
            }
-
-            KeyNavigation.tab: config.rightButton
        }

        DividerType {}
--- a/client/ui/qml/Components/HomeContainersListView.qml
+++ b/client/ui/qml/Components/HomeContainersListView.qml
@@ -15,7 +15,6 @@ ListView {
    id: menuContent

    property var rootWidth
-    property var selectedText

    width: rootWidth
    height: menuContent.contentItem.height
@@ -52,7 +51,7 @@ ListView {
                showImage: !isInstalled

                checkable: isInstalled && !ConnectionController.isConnected && isSupported
-                checked: proxyDefaultServerContainersModel.mapToSource(index) === ServersModel.getDefaultServerData("defaultContainer")
+                checked: proxyContainersModel.mapToSource(index) === ServersModel.getDefaultContainer(ServersModel.defaultIndex)

                onClicked: {
                    if (ConnectionController.isConnected && isInstalled) {
@@ -61,18 +60,18 @@ ListView {
                    }

                    if (checked) {
-                        containersDropDown.close()
-                        ServersModel.setDefaultContainer(ServersModel.defaultIndex, proxyDefaultServerContainersModel.mapToSource(index))
+                        containersDropDown.menuVisible = false
+                        ServersModel.setDefaultContainer(ServersModel.defaultIndex, proxyContainersModel.mapToSource(index))
                    } else {
                        if (!isSupported && isInstalled) {
                            PageController.showErrorMessage(qsTr("The selected protocol is not supported on the current platform"))
                            return
                        }

-                        ContainersModel.setCurrentlyProcessedContainerIndex(proxyDefaultServerContainersModel.mapToSource(index))
+                        ContainersModel.setCurrentlyProcessedContainerIndex(proxyContainersModel.mapToSource(index))
                        InstallController.setShouldCreateServer(false)
                        PageController.goToPage(PageEnum.PageSetupWizardProtocolSettings)
-                        containersDropDown.close()
+                        containersDropDown.menuVisible = false
                    }
                }

--- a/client/ui/qml/Components/HomeSplitTunnelingDrawer.qml
+++ b/client/ui/qml/Components/HomeSplitTunnelingDrawer.qml
@@ -1,112 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Layouts
-
-import PageEnum 1.0
-
-import "../Controls2"
-import "../Controls2/TextTypes"
-import "../Config"
-
-DrawerType2 {
-    id: root
-
-    anchors.fill: parent
-    expandedHeight: parent.height * 0.7
-
-    expandedContent: ColumnLayout {
-        id: content
-
-        anchors.top: parent.top
-        anchors.left: parent.left
-        anchors.right: parent.right
-        spacing: 0
-
-        Connections {
-            target: root
-            enabled: !GC.isMobile()
-            function onOpened() {
-                if (splitTunneling.visible) {
-                    splitTunneling.rightButton.forceActiveFocus()
-                } else {
-                    splitTunnelingSiteBased.rightButton.forceActiveFocus()
-                }
-            }
-        }
-
-        Header2Type {
-            Layout.fillWidth: true
-            Layout.topMargin: 24
-            Layout.rightMargin: 16
-            Layout.leftMargin: 16
-            Layout.bottomMargin: 16
-
-            headerText: qsTr("Split tunneling")
-            descriptionText:  qsTr("Allows you to connect to some sites or applications through a VPN connection and bypass others")
-        }
-
-        LabelWithButtonType {
-            id: splitTunneling
-            Layout.fillWidth: true
-            Layout.topMargin: 16
-
-            visible: ServersModel.isDefaultServerDefaultContainerHasSplitTunneling && ServersModel.getDefaultServerData("isServerFromApi")
-
-            text: qsTr("Split tunneling on the server")
-            descriptionText: qsTr("Enabled \nCan't be disabled for current server")
-            rightImageSource: "qrc:/images/controls/chevron-right.svg"
-
-            clickedFunction: function() {
-//                PageController.goToPage(PageEnum.PageSettingsSplitTunneling)
-//                root.close()
-            }
-
-            KeyNavigation.tab: splitTunnelingSiteBased.rightButton
-        }
-
-        DividerType {
-            visible: ServersModel.isDefaultServerDefaultContainerHasSplitTunneling && ServersModel.getDefaultServerData("isServerFromApi")
-        }
-
-        LabelWithButtonType {
-            id: splitTunnelingSiteBased
-            Layout.fillWidth: true
-            Layout.topMargin: 16
-
-            enabled: ! ServersModel.isDefaultServerDefaultContainerHasSplitTunneling || !ServersModel.getDefaultServerData("isServerFromApi")
-
-            text: qsTr("Site-based split tunneling")
-            descriptionText: enabled && SitesModel.isTunnelingEnabled ? qsTr("Enabled") : qsTr("Disabled")
-            rightImageSource: "qrc:/images/controls/chevron-right.svg"
-
-            clickedFunction: function() {
-                PageController.goToPage(PageEnum.PageSettingsSplitTunneling)
-                root.close()
-            }
-            KeyNavigation.tab: appBasedSplitTunneling.visible ? appBasedSplitTunneling.rightButton : null
-        }
-
-        DividerType {
-        }
-
-        LabelWithButtonType {
-            id: appBasedSplitTunneling
-            Layout.fillWidth: true
-            visible: false
-
-            text: qsTr("App-based split tunneling")
-            rightImageSource: "qrc:/images/controls/chevron-right.svg"
-
-            clickedFunction: function() {
-//                PageController.goToPage(PageEnum.PageSetupWizardConfigSource)
-                root.close()
-            }
-
-            KeyNavigation.tab: splitTunneling.rightButton
-        }
-
-        DividerType {
-            visible: false
-        }
-    }
-}
--- a/client/ui/qml/Components/QuestionDrawer.qml
+++ b/client/ui/qml/Components/QuestionDrawer.qml
@@ -4,9 +4,8 @@ import QtQuick.Layouts

 import "../Controls2"
 import "../Controls2/TextTypes"
-import "../Config"

-DrawerType2 {
+DrawerType {
    id: root

    property string headerText
@@ -17,32 +16,23 @@ DrawerType2 {
    property var yesButtonFunction
    property var noButtonFunction

-    expandedContent: ColumnLayout {
+    width: parent.width
+    height: content.implicitHeight + 32
+
+    ColumnLayout {
        id: content

        anchors.top: parent.top
        anchors.left: parent.left
        anchors.right: parent.right
+        anchors.topMargin: 16
+        anchors.rightMargin: 16
+        anchors.leftMargin: 16

        spacing: 8

-        onImplicitHeightChanged: {
-            root.expandedHeight = content.implicitHeight + 32
-        }
-
-        Connections {
-            target: root
-            enabled: !GC.isMobile()
-            function onOpened() {
-                yesButton.forceActiveFocus()
-            }
-        }
-
        Header2TextType {
            Layout.fillWidth: true
-            Layout.topMargin: 16
-            Layout.rightMargin: 16
-            Layout.leftMargin: 16

            text: headerText
        }
@@ -50,34 +40,25 @@ DrawerType2 {
        ParagraphTextType {
            Layout.fillWidth: true
            Layout.topMargin: 8
-            Layout.rightMargin: 16
-            Layout.leftMargin: 16

            text: descriptionText
        }

        BasicButtonType {
-            id: yesButton
            Layout.fillWidth: true
            Layout.topMargin: 16
-            Layout.rightMargin: 16
-            Layout.leftMargin: 16

            text: yesButtonText

-            clickedFunc: function() {
+            onClicked: {
                if (yesButtonFunction && typeof yesButtonFunction === "function") {
                    yesButtonFunction()
                }
            }
-            KeyNavigation.tab: noButton
        }

        BasicButtonType {
-            id: noButton
            Layout.fillWidth: true
-            Layout.rightMargin: 16
-            Layout.leftMargin: 16

            defaultColor: "transparent"
            hoveredColor: Qt.rgba(1, 1, 1, 0.08)
@@ -88,12 +69,11 @@ DrawerType2 {

            text: noButtonText

-            clickedFunc: function() {
+            onClicked: {
                if (noButtonFunction && typeof noButtonFunction === "function") {
                    noButtonFunction()
                }
            }
-            KeyNavigation.tab: yesButton
        }
    }
 }
--- a/client/ui/qml/Components/SelectLanguageDrawer.qml
+++ b/client/ui/qml/Components/SelectLanguageDrawer.qml
@@ -5,136 +5,129 @@ import QtQuick.Layouts
 import "../Controls2"
 import "../Controls2/TextTypes"

-DrawerType2 {
+DrawerType {
    id: root

-    expandedContent: Item {
-        id: container
+    width: parent.width
+    height: parent.height * 0.9

-        implicitHeight: root.height * 0.9
+    ColumnLayout {
+        id: backButton

-        Component.onCompleted: {
-            root.expandedHeight = container.implicitHeight
-        }
+        anchors.top: parent.top
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.topMargin: 16

-        ColumnLayout {
-            id: backButton
-
-            anchors.top: parent.top
-            anchors.left: parent.left
-            anchors.right: parent.right
-            anchors.topMargin: 16
-
-            BackButtonType {
-                backButtonImage: "qrc:/images/controls/arrow-left.svg"
-                backButtonFunction: function() {
-                    root.close()
-                }
+        BackButtonType {
+            backButtonImage: "qrc:/images/controls/arrow-left.svg"
+            backButtonFunction: function() {
+                root.close()
            }
        }
+    }

-        FlickableType {
-            anchors.top: backButton.bottom
-            anchors.left: parent.left
-            anchors.right: parent.right
-            anchors.bottom: parent.bottom
-            contentHeight: content.implicitHeight
+    FlickableType {
+        anchors.top: backButton.bottom
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.bottom: parent.bottom
+        contentHeight: content.implicitHeight

-            ColumnLayout {
-                id: content
+        ColumnLayout {
+            id: content

-                anchors.fill: parent
+            anchors.fill: parent

-                Header2Type {
-                    id: header
-                    Layout.fillWidth: true
-                    Layout.topMargin: 16
-                    Layout.rightMargin: 16
-                    Layout.leftMargin: 16
+            Header2Type {
+                id: header
+                Layout.fillWidth: true
+                Layout.topMargin: 16
+                Layout.rightMargin: 16
+                Layout.leftMargin: 16

-                    headerText: qsTr("Choose language")
+                headerText: qsTr("Choose language")
+            }
+
+            ListView {
+                id: listView
+
+                Layout.fillWidth: true
+                height: listView.contentItem.height
+
+                clip: true
+                interactive: false
+
+                model: LanguageModel
+                currentIndex: LanguageModel.currentLanguageIndex
+
+                ButtonGroup {
+                    id: buttonGroup
                }

-                ListView {
-                    id: listView
+                delegate: Item {
+                    implicitWidth: root.width
+                    implicitHeight: delegateContent.implicitHeight

-                    Layout.fillWidth: true
-                    height: listView.contentItem.height
+                    ColumnLayout {
+                        id: delegateContent

-                    clip: true
-                    interactive: false
+                        anchors.fill: parent

-                    model: LanguageModel
-                    currentIndex: LanguageModel.currentLanguageIndex
+                        RadioButton {
+                            id: radioButton

-                    ButtonGroup {
-                        id: buttonGroup
-                    }
+                            implicitWidth: parent.width
+                            implicitHeight: radioButtonContent.implicitHeight

-                    delegate: Item {
-                        implicitWidth: root.width
-                        implicitHeight: delegateContent.implicitHeight
+                            hoverEnabled: true

-                        ColumnLayout {
-                            id: delegateContent
+                            indicator: Rectangle {
+                                anchors.fill: parent
+                                color: radioButton.hovered ? "#2C2D30" : "#1C1D21"

-                            anchors.fill: parent
+                                Behavior on color {
+                                    PropertyAnimation { duration: 200 }
+                                }
+                            }

-                            RadioButton {
-                                id: radioButton
+                            RowLayout {
+                                id: radioButtonContent
+                                anchors.fill: parent

-                                implicitWidth: parent.width
-                                implicitHeight: radioButtonContent.implicitHeight
+                                anchors.rightMargin: 16
+                                anchors.leftMargin: 16

-                                hoverEnabled: true
+                                spacing: 0

-                                indicator: Rectangle {
-                                    anchors.fill: parent
-                                    color: radioButton.hovered ? "#2C2D30" : "#1C1D21"
+                                z: 1

-                                    Behavior on color {
-                                        PropertyAnimation { duration: 200 }
-                                    }
+                                ParagraphTextType {
+                                    Layout.fillWidth: true
+                                    Layout.topMargin: 20
+                                    Layout.bottomMargin: 20
+
+                                    text: languageName
                                }

-                                RowLayout {
-                                    id: radioButtonContent
-                                    anchors.fill: parent
+                                Image {
+                                    source: "qrc:/images/controls/check.svg"
+                                    visible: radioButton.checked

-                                    anchors.rightMargin: 16
-                                    anchors.leftMargin: 16
+                                    width: 24
+                                    height: 24

-                                    spacing: 0
-
-                                    z: 1
-
-                                    ParagraphTextType {
-                                        Layout.fillWidth: true
-                                        Layout.topMargin: 20
-                                        Layout.bottomMargin: 20
-
-                                        text: languageName
-                                    }
-
-                                    Image {
-                                        source: "qrc:/images/controls/check.svg"
-                                        visible: radioButton.checked
-
-                                        width: 24
-                                        height: 24
-
-                                        Layout.rightMargin: 8
-                                    }
+                                    Layout.rightMargin: 8
                                }
+                            }

-                                ButtonGroup.group: buttonGroup
-                                checked: listView.currentIndex === index
+                            ButtonGroup.group: buttonGroup
+                            checked: listView.currentIndex === index

-                                onClicked: {
-                                    listView.currentIndex = index
-                                    LanguageModel.changeLanguage(languageIndex)
-                                    root.close()
-                                }
+                            onClicked: {
+                                listView.currentIndex = index
+                                LanguageModel.changeLanguage(languageIndex)
+                                root.close()
                            }
                        }
                    }
--- a/client/ui/qml/Components/ShareConnectionDrawer.qml
+++ b/client/ui/qml/Components/ShareConnectionDrawer.qml
@@ -16,18 +16,19 @@ import "../Controls2/TextTypes"
 import "../Config"
 import "../Components"

-DrawerType2 {
+DrawerType {
    id: root

-    property string headerText
-    property string configContentHeaderText
-    property string contentVisible
+    property alias headerText: header.headerText
+    property alias configContentHeaderText: configContentHeader.headerText
+    property alias contentVisible: content.visible

    property string configExtension: ".vpn"
    property string configCaption: qsTr("Save AmneziaVPN config")
    property string configFileName: "amnezia_config"

-    expandedHeight: parent.height * 0.9
+    width: parent.width
+    height: parent.height * 0.9

    onClosed: {
        configExtension = ".vpn"
@@ -35,16 +36,8 @@ DrawerType2 {
        configFileName = "amnezia_config"
    }

-    expandedContent: Item {
-        implicitHeight: root.expandedHeight
-
-        Connections {
-            target: root
-            enabled: !GC.isMobile()
-            function onOpened() {
-                shareButton.forceActiveFocus()
-            }
-        }
+    Item {
+        anchors.fill: parent

        Header2Type {
            id: header
@@ -54,8 +47,6 @@ DrawerType2 {
            anchors.topMargin: 20
            anchors.leftMargin: 16
            anchors.rightMargin: 16
-
-            headerText: root.headerText
        }

        FlickableType {
@@ -73,17 +64,14 @@ DrawerType2 {
                anchors.leftMargin: 16
                anchors.rightMargin: 16

-                visible: root.contentVisible
-
                BasicButtonType {
-                    id: shareButton
                    Layout.fillWidth: true
                    Layout.topMargin: 16

                    text: qsTr("Share")
                    imageSource: "qrc:/images/controls/share-2.svg"

-                    clickedFunc: function() {
+                    onClicked: {
                        var fileName = ""
                        if (GC.isMobile()) {
                            fileName = configFileName + configExtension
@@ -100,12 +88,9 @@ DrawerType2 {
                            PageController.showBusyIndicator(false)
                        }
                    }
-
-                    KeyNavigation.tab: copyConfigTextButton
                }

                BasicButtonType {
-                    id: copyConfigTextButton
                    Layout.fillWidth: true
                    Layout.topMargin: 8

@@ -119,15 +104,19 @@ DrawerType2 {
                    text: qsTr("Copy")
                    imageSource: "qrc:/images/controls/copy.svg"

-                    KeyNavigation.tab: copyNativeConfigStringButton.visible ? copyNativeConfigStringButton : showSettingsButton
+                    onClicked: {
+                        configText.selectAll()
+                        configText.copy()
+                        configText.select(0, 0)
+                        PageController.showNotificationMessage(qsTr("Copied"))
+                    }
                }

                BasicButtonType {
-                    id: copyNativeConfigStringButton
                    Layout.fillWidth: true
                    Layout.topMargin: 8

-                    visible: false
+                    visible: nativeConfigString.text !== ""

                    defaultColor: "transparent"
                    hoveredColor: Qt.rgba(1, 1, 1, 0.08)
@@ -139,12 +128,15 @@ DrawerType2 {
                    text: qsTr("Copy config string")
                    imageSource: "qrc:/images/controls/copy.svg"

-                    KeyNavigation.tab: showSettingsButton
+                    onClicked: {
+                        nativeConfigString.selectAll()
+                        nativeConfigString.copy()
+                        nativeConfigString.select(0, 0)
+                        PageController.showNotificationMessage(qsTr("Copied"))
+                    }
                }

                BasicButtonType {
-                    id: showSettingsButton
-
                    Layout.fillWidth: true
                    Layout.topMargin: 24

@@ -157,119 +149,83 @@ DrawerType2 {

                    text: qsTr("Show connection settings")

-                    clickedFunc: function() {
-                        configContentDrawer.open()
+                    onClicked: {
+                        configContentDrawer.visible = true
                    }
-
-                    KeyNavigation.tab: shareButton
                }

-                DrawerType2 {
+                DrawerType {
                    id: configContentDrawer

-                    parent: root.parent
+                    width: parent.width
+                    height: parent.height * 0.9

-                    anchors.fill: parent
-                    expandedHeight: parent.height * 0.9
+                    BackButtonType {
+                        id: backButton

-                    expandedContent: Item {
-                        id: configContentContainer
+                        anchors.top: parent.top
+                        anchors.left: parent.left
+                        anchors.right: parent.right
+                        anchors.topMargin: 16

-                        implicitHeight: configContentDrawer.expandedHeight
-
-                        Connections {
-                            target: copyNativeConfigStringButton
-                            function onClicked() {
-                                nativeConfigString.selectAll()
-                                nativeConfigString.copy()
-                                nativeConfigString.select(0, 0)
-                                PageController.showNotificationMessage(qsTr("Copied"))
-                            }
+                        backButtonFunction: function() {
+                            configContentDrawer.visible = false
                        }
+                    }

-                        Connections {
-                            target: copyConfigTextButton
-                            function onClicked() {
-                                configText.selectAll()
-                                configText.copy()
-                                configText.select(0, 0)
-                                PageController.showNotificationMessage(qsTr("Copied"))
+                    FlickableType {
+                        anchors.top: backButton.bottom
+                        anchors.left: parent.left
+                        anchors.right: parent.right
+                        anchors.bottom: parent.bottom
+                        contentHeight: configContent.implicitHeight + configContent.anchors.topMargin + configContent.anchors.bottomMargin
+
+                        ColumnLayout {
+                            id: configContent
+
+                            anchors.fill: parent
+                            anchors.rightMargin: 16
+                            anchors.leftMargin: 16
+
+                            Header2Type {
+                                id: configContentHeader
+                                Layout.fillWidth: true
+                                Layout.topMargin: 16
                            }
-                        }

-                        BackButtonType {
-                            id: backButton
-
-                            anchors.top: parent.top
-                            anchors.left: parent.left
-                            anchors.right: parent.right
-                            anchors.topMargin: 16
-
-                            backButtonFunction: function() {
-                                configContentDrawer.close()
+                            TextField {
+                                id: nativeConfigString
+                                visible: false
+                                text: ExportController.nativeConfigString
                            }
-                        }

-                        FlickableType {
-                            anchors.top: backButton.bottom
-                            anchors.left: parent.left
-                            anchors.right: parent.right
-                            anchors.bottom: parent.bottom
-                            contentHeight: configContent.implicitHeight + configContent.anchors.topMargin + configContent.anchors.bottomMargin
+                            TextArea {
+                                id: configText

-                            ColumnLayout {
-                                id: configContent
+                                Layout.fillWidth: true
+                                Layout.topMargin: 16
+                                Layout.bottomMargin: 16

-                                anchors.fill: parent
-                                anchors.rightMargin: 16
-                                anchors.leftMargin: 16
+                                padding: 0
+                                leftPadding: 0
+                                height: 24

-                                Header2Type {
-                                    id: configContentHeader
-                                    Layout.fillWidth: true
-                                    Layout.topMargin: 16
+                                readOnly: true

-                                    headerText: root.configContentHeaderText
-                                }
+                                color: "#D7D8DB"
+                                selectionColor:  "#633303"
+                                selectedTextColor: "#D7D8DB"

-                                TextField {
-                                    id: nativeConfigString
-                                    visible: false
-                                    text: ExportController.nativeConfigString
+                                font.pixelSize: 16
+                                font.weight: Font.Medium
+                                font.family: "PT Root UI VF"

-                                    onTextChanged: {
-                                        copyNativeConfigStringButton.visible = nativeConfigString.text !== ""
-                                    }
-                                }
+                                text: ExportController.config

-                                TextArea {
-                                    id: configText
+                                wrapMode: Text.Wrap

-                                    Layout.fillWidth: true
-                                    Layout.topMargin: 16
-                                    Layout.bottomMargin: 16
-
-                                    padding: 0
-                                    leftPadding: 0
-                                    height: 24
-
-                                    readOnly: true
-
-                                    color: "#D7D8DB"
-                                    selectionColor:  "#633303"
-                                    selectedTextColor: "#D7D8DB"
-
-                                    font.pixelSize: 16
-                                    font.weight: Font.Medium
-                                    font.family: "PT Root UI VF"
-
-                                    text: ExportController.config
-
-                                    wrapMode: Text.Wrap
-
-                                    background: Rectangle {
-                                        color: "transparent"
-                                    }
+                                background: Rectangle {
+                                    color: "transparent"
                                }
                            }
                        }
@@ -277,8 +233,6 @@ DrawerType2 {
                }

                Rectangle {
-                    id: qrCodeContainer
-
                    Layout.fillWidth: true
                    Layout.preferredHeight: width
                    Layout.topMargin: 20
--- a/client/ui/qml/Controls2/BasicButtonType.qml
+++ b/client/ui/qml/Controls2/BasicButtonType.qml
@@ -16,40 +16,47 @@ Button {
    property string textColor: "#0E0E11"

    property string borderColor: "#D7D8DB"
-    property string borderFocusedColor: "#D7D8DB"
    property int borderWidth: 0
-    property int borderFocusedWidth: 1

    property string imageSource
-    property string rightImageSource
-    property string leftImageColor: textColor

    property bool squareLeftSide: false

-    property var clickedFunc
-
    implicitHeight: 56

    hoverEnabled: true

    background: Rectangle {
-        id: focusBorder
-
-        color: "transparent"
-        border.color: root.activeFocus ? root.borderFocusedColor : "transparent"
-        border.width: root.activeFocus ? root.borderFocusedWidth : "transparent"
-
+        id: background
        anchors.fill: parent
-
        radius: 16
+        color: {
+            if (root.enabled) {
+                if (root.pressed) {
+                    return pressedColor
+                }
+                return root.hovered ? hoveredColor : defaultColor
+            } else {
+                return disabledColor
+            }
+        }
+        border.color: borderColor
+        border.width: borderWidth
+
+        Behavior on color {
+            PropertyAnimation { duration: 200 }
+        }

        Rectangle {
-            id: background
+            visible: root.squareLeftSide

-            anchors.fill: focusBorder
-            anchors.margins: root.activeFocus ? 2 : 0
+            z: 1

-            radius: root.activeFocus ? 14 : 16
+            width: parent.radius
+            height: parent.radius
+            anchors.top: parent.top
+            anchors.bottom: parent.bottom
+            anchors.left: parent.left
            color: {
                if (root.enabled) {
                    if (root.pressed) {
@@ -60,53 +67,24 @@ Button {
                    return disabledColor
                }
            }
-            border.color: borderColor
-            border.width: borderWidth

            Behavior on color {
                PropertyAnimation { duration: 200 }
            }
-
-            Rectangle {
-                visible: root.squareLeftSide
-
-                z: 1
-
-                width: parent.radius
-                height: parent.radius
-                anchors.top: parent.top
-                anchors.bottom: parent.bottom
-                anchors.left: parent.left
-                color: {
-                    if (root.enabled) {
-                        if (root.pressed) {
-                            return pressedColor
-                        }
-                        return root.hovered ? hoveredColor : defaultColor
-                    } else {
-                        return disabledColor
-                    }
-                }
-
-                Behavior on color {
-                    PropertyAnimation { duration: 200 }
-                }
-            }
        }
    }

    MouseArea {
-        anchors.fill: focusBorder
+        anchors.fill: background
        enabled: false
        cursorShape: Qt.PointingHandCursor
    }

    contentItem: Item {
-        anchors.fill: focusBorder
+        anchors.fill: background

        implicitWidth: content.implicitWidth
        implicitHeight: content.implicitHeight
-
        RowLayout {
            id: content
            anchors.centerIn: parent
@@ -121,7 +99,7 @@ Button {
                layer {
                    enabled: true
                    effect: ColorOverlay {
-                        color: leftImageColor
+                        color: textColor
                    }
                }
            }
@@ -134,39 +112,6 @@ Button {
                horizontalAlignment: Text.AlignLeft
                verticalAlignment: Text.AlignVCenter
            }
-
-            Image {
-                Layout.preferredHeight: 20
-                Layout.preferredWidth: 20
-
-                source: root.rightImageSource
-                visible: root.rightImageSource === "" ? false : true
-
-                layer {
-                    enabled: true
-                    effect: ColorOverlay {
-                        color: textColor
-                    }
-                }
-            }
-        }
-    }
-
-    Keys.onEnterPressed: {
-        if (root.clickedFunc && typeof root.clickedFunc === "function") {
-            root.clickedFunc()
-        }
-    }
-
-    Keys.onReturnPressed: {
-        if (root.clickedFunc && typeof root.clickedFunc === "function") {
-            root.clickedFunc()
-        }
-    }
-
-    onClicked: {
-        if (root.clickedFunc && typeof root.clickedFunc === "function") {
-            root.clickedFunc()
        }
    }
 }
--- a/client/ui/qml/Controls2/DrawerType.qml
+++ b/client/ui/qml/Controls2/DrawerType.qml
@@ -0,0 +1,84 @@
+import QtQuick
+import QtQuick.Controls
+
+import "../Config"
+
+Drawer {
+    id: drawer
+    property bool needCloseButton: true
+
+    Connections {
+        target: PageController
+
+        function onForceCloseDrawer() {
+            visible = false
+        }
+    }
+
+    edge: Qt.BottomEdge
+
+    clip: true
+    modal: true
+    dragMargin: -10
+
+    enter: Transition {
+        SmoothedAnimation {
+            velocity: 4
+        }
+    }
+
+    exit: Transition {
+        SmoothedAnimation {
+            velocity: 4
+        }
+    }
+
+    background: Rectangle {
+        anchors.fill: parent
+        anchors.bottomMargin: -radius
+        radius: 16
+        color: "#1C1D21"
+
+        border.color: "#2C2D30"
+        border.width: 1
+
+        Rectangle {
+            visible: GC.isMobile()
+
+            anchors.top: parent.top
+            anchors.horizontalCenter: parent.horizontalCenter
+            anchors.topMargin: 10
+
+            width: 20
+            height: 2
+            color: "#2C2D30"
+        }
+    }
+
+    Overlay.modal: Rectangle {
+        color: Qt.rgba(14/255, 14/255, 17/255, 0.8)
+    }
+
+    onAboutToShow: {
+        if (PageController.getInitialPageNavigationBarColor() !== 0xFF1C1D21) {
+            PageController.updateNavigationBarColor(0xFF1C1D21)
+        }
+    }
+
+    onOpened: {
+        if (needCloseButton) {
+            PageController.drawerOpen()
+        }
+    }
+
+    onClosed: {
+        if (needCloseButton) {
+            PageController.drawerClose()
+        }
+
+        var initialPageNavigationBarColor = PageController.getInitialPageNavigationBarColor()
+        if (initialPageNavigationBarColor !== 0xFF1C1D21) {
+            PageController.updateNavigationBarColor(initialPageNavigationBarColor)
+        }
+    }
+}
--- a/client/ui/qml/Controls2/DrawerType2.qml
+++ b/client/ui/qml/Controls2/DrawerType2.qml
@@ -1,266 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Layouts
-
-import "TextTypes"
-
-Item {
-    id: root
-
-    readonly property string drawerExpanded: "expanded"
-    readonly property string drawerCollapsed: "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 isExpanded: drawerContent.state === root.drawerExpanded
-    readonly property bool isCollapsed: drawerContent.state === root.drawerCollapsed
-
-    property Component collapsedContent
-    property Component expandedContent
-
-    property string defaultColor: "#1C1D21"
-    property string borderColor: "#2C2D30"
-
-    property real expandedHeight
-    property real collapsedHeight: 0
-
-    property int depthIndex: 0
-
-    signal entered
-    signal exited
-    signal pressed(bool pressed, bool entered)
-
-    signal aboutToHide
-    signal aboutToShow
-    signal close
-    signal open
-    signal closed
-    signal opened
-
-    Connections {
-        target: PageController
-
-        function onCloseTopDrawer() {
-            if (depthIndex === PageController.getDrawerDepth()) {
-                if (isCollapsed) {
-                    return
-                }
-
-                aboutToHide()
-
-                drawerContent.state = root.drawerCollapsed
-                depthIndex = 0
-                closed()
-            }
-        }
-    }
-
-    Connections {
-        target: root
-
-        function onClose() {
-            if (isCollapsed) {
-                return
-            }
-
-            aboutToHide()
-
-            drawerContent.state = root.drawerCollapsed
-            depthIndex = 0
-            PageController.setDrawerDepth(PageController.getDrawerDepth() - 1)
-            closed()
-        }
-
-        function onOpen() {
-            if (isExpanded) {
-                return
-            }
-
-            aboutToShow()
-
-            drawerContent.state = root.drawerExpanded
-            depthIndex = PageController.getDrawerDepth() + 1
-            PageController.setDrawerDepth(depthIndex)
-            opened()
-        }
-    }
-
-    /** Set once based on first implicit height change once all children are layed out */
-    Component.onCompleted: {
-        if (root.isCollapsed && root.collapsedHeight == 0) {
-            root.collapsedHeight = drawerContent.implicitHeight
-        }
-    }
-
-    Rectangle {
-        id: background
-
-        anchors.fill: parent
-        color: root.isCollapsed ? "transparent" : Qt.rgba(14/255, 14/255, 17/255, 0.8)
-
-        Behavior on color {
-            PropertyAnimation { duration: 200 }
-        }
-    }
-
-    MouseArea {
-        id: emptyArea
-        anchors.fill: parent
-        enabled: root.isExpanded
-        visible: enabled
-        onClicked: {
-            root.close()
-        }
-    }
-
-    MouseArea {
-        id: dragArea
-
-        anchors.fill: drawerContentBackground
-        cursorShape: root.isCollapsed ? Qt.PointingHandCursor : Qt.ArrowCursor
-        hoverEnabled: true
-
-        enabled: drawerContent.implicitHeight > 0
-
-        drag.target: drawerContent
-        drag.axis: Drag.YAxis
-        drag.maximumY: root.height - root.collapsedHeight
-        drag.minimumY: root.height - root.expandedHeight
-
-        /** 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()
-                return
-            }
-            if (root.isExpanded && drawerContent.y > dragArea.drag.minimumY) {
-                root.close()
-                return
-            }
-        }
-
-        onEntered: {
-            root.entered()
-        }
-        onExited: {
-            root.exited()
-        }
-        onPressedChanged: {
-            root.pressed(pressed, entered)
-        }
-
-        onClicked: {
-            if (root.isCollapsed) {
-                root.open()
-            }
-        }
-    }
-
-    Rectangle {
-        id: drawerContentBackground
-
-        anchors { left: drawerContent.left; right: drawerContent.right; top: drawerContent.top }
-        height: root.height
-        radius: 16
-        color: root.defaultColor
-        border.color: root.borderColor
-        border.width: 1
-
-        Rectangle {
-            width: parent.radius
-            height: parent.radius
-            anchors.bottom: parent.bottom
-            anchors.right: parent.right
-            anchors.left: parent.left
-            color: parent.color
-        }
-    }
-
-    Item {
-        id: 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 ? collapsedLoader.implicitHeight : expandedLoader.implicitHeight
-
-        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
-            }
-        }
-
-        states: [
-            State {
-                name: root.drawerCollapsed
-                PropertyChanges {
-                    target: drawerContent
-                    y: root.height - root.collapsedHeight
-                }
-            },
-            State {
-                name: root.drawerExpanded
-                PropertyChanges {
-                    target: drawerContent
-                    y: dragArea.drag.minimumY
-
-                }
-            }
-        ]
-
-        transitions: [
-            Transition {
-                from: root.drawerCollapsed
-                to: root.drawerExpanded
-                PropertyAnimation {
-                    target: drawerContent
-                    properties: "y"
-                    duration: 200
-                }
-            },
-            Transition {
-                from: root.drawerExpanded
-                to: root.drawerCollapsed
-                PropertyAnimation {
-                    target: drawerContent
-                    properties: "y"
-                    duration: 200
-                }
-            }
-        ]
-
-        Loader {
-            id: collapsedLoader
-
-            visible: root.isCollapsed
-            sourceComponent: root.collapsedContent
-
-            anchors.right: parent.right
-            anchors.left: parent.left
-        }
-
-        Loader {
-            id: expandedLoader
-
-            visible: root.isExpanded
-            sourceComponent: root.expandedContent
-
-            anchors.right: parent.right
-            anchors.left: parent.left
-        }
-    }
-}
--- a/client/ui/qml/Controls2/DropDownType.qml
+++ b/client/ui/qml/Controls2/DropDownType.qml
@@ -36,23 +36,19 @@ Item {
    property int rootButtonTextBottomMargin: 16

    property real drawerHeight: 0.9
-    property Item drawerParent
    property Component listView

-    signal open
-    signal close
+    property alias menuVisible: menu.visible

    implicitWidth: rootButtonContent.implicitWidth
    implicitHeight: rootButtonContent.implicitHeight

-    onOpen: {
-        menu.open()
-        rootButtonBackground.border.color = rootButtonPressedBorderColor
-    }
-
-    onClose: {
-        menu.close()
-        rootButtonBackground.border.color = rootButtonDefaultBorderColor
+    onMenuVisibleChanged: {
+        if (menuVisible) {
+            rootButtonBackground.border.color = rootButtonPressedBorderColor
+        } else {
+            rootButtonBackground.border.color = rootButtonDefaultBorderColor
+        }
    }

    onEnabledChanged: {
@@ -137,21 +133,21 @@ Item {
        hoverEnabled: root.enabled ? true : false

        onEntered: {
-            if (menu.isClosed) {
+            if (menu.visible === false) {
                rootButtonBackground.border.color = rootButtonHoveredBorderColor
                rootButtonBackground.color = rootButtonBackgroundHoveredColor
            }
        }

        onExited: {
-            if (menu.isClosed) {
+            if (menu.visible === false) {
                rootButtonBackground.border.color = rootButtonDefaultBorderColor
                rootButtonBackground.color = rootButtonBackgroundColor
            }
        }

        onPressed: {
-            if (menu.isClosed) {
+            if (menu.visible === false) {
                rootButtonBackground.color = pressed ? rootButtonBackgroundPressedColor : entered ? rootButtonHoveredBorderColor : rootButtonDefaultBorderColor
            }
        }
@@ -160,68 +156,60 @@ Item {
            if (rootButtonClickedFunction && typeof rootButtonClickedFunction === "function") {
                rootButtonClickedFunction()
            } else {
-                menu.open()
+                menu.visible = true
            }
        }
    }

-    DrawerType2 {
+    DrawerType {
        id: menu

-        parent: drawerParent
+        width: parent.width
+        height: parent.height * drawerHeight

-        anchors.fill: parent
-        expandedHeight: drawerParent.height * drawerHeight
+        ColumnLayout {
+            id: header

-        expandedContent: Item {
-            id: container
+            anchors.top: parent.top
+            anchors.left: parent.left
+            anchors.right: parent.right
+            anchors.topMargin: 16

-            implicitHeight: menu.expandedHeight
+            BackButtonType {
+                backButtonImage: root.headerBackButtonImage
+                backButtonFunction: function() {
+                    root.menuVisible = false
+                }
+            }
+        }

-            ColumnLayout {
-                id: header
+        FlickableType {
+            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
-                anchors.topMargin: 16

-                BackButtonType {
-                    backButtonImage: root.headerBackButtonImage
-                    backButtonFunction: function() {
-                        menu.close()
-                    }
-                }
-            }
+                spacing: 16

-            FlickableType {
-                anchors.top: header.bottom
-                anchors.topMargin: 16
-                contentHeight: col.implicitHeight
-
-                Column {
-                    id: col
-                    anchors.top: parent.top
+                Header2Type {
                    anchors.left: parent.left
                    anchors.right: parent.right
+                    anchors.leftMargin: 16
+                    anchors.rightMargin: 16

-                    spacing: 16
+                    headerText: root.headerText

-                    Header2Type {
-                        anchors.left: parent.left
-                        anchors.right: parent.right
-                        anchors.leftMargin: 16
-                        anchors.rightMargin: 16
+                    width: parent.width
+                }

-                        headerText: root.headerText
-
-                        width: parent.width
-                    }
-
-                    Loader {
-                        id: listViewLoader
-                        sourceComponent: root.listView
-                    }
+                Loader {
+                    id: listViewLoader
+                    sourceComponent: root.listView
                }
            }
        }
--- a/client/ui/qml/Controls2/ImageButtonType.qml
+++ b/client/ui/qml/Controls2/ImageButtonType.qml
@@ -12,9 +12,6 @@ Button {
    property string pressedColor: Qt.rgba(1, 1, 1, 0.12)
    property string disableColor: "#2C2D30"

-    property string borderFocusedColor: "#D7D8DB"
-    property int borderFocusedWidth: 1
-
    property string imageColor: "#878B91"
    property string disableImageColor: "#2C2D30"

@@ -34,9 +31,6 @@ Button {
        id: background

        anchors.fill: parent
-        border.color: root.activeFocus ? root.borderFocusedColor : "transparent"
-        border.width: root.activeFocus ? root.borderFocusedWidth : "transparent"
-
        color: {
            if (root.enabled) {
                if (root.pressed) {
--- a/client/ui/qml/Controls2/LabelWithButtonType.qml
+++ b/client/ui/qml/Controls2/LabelWithButtonType.qml
@@ -27,8 +27,6 @@ Item {

    property string rightImageColor: "#d7d8db"

-    property alias rightButton: rightImage
-
    property bool descriptionOnTop: false

    implicitWidth: content.implicitWidth + content.anchors.topMargin + content.anchors.bottomMargin
@@ -209,16 +207,4 @@ Item {
            }
        }
    }
-
-    Keys.onEnterPressed: {
-        if (clickedFunction && typeof clickedFunction === "function") {
-            clickedFunction()
-        }
-    }
-
-    Keys.onReturnPressed: {
-        if (clickedFunction && typeof clickedFunction === "function") {
-            clickedFunction()
-        }
-    }
 }
--- a/client/ui/qml/Controls2/PageType.qml
+++ b/client/ui/qml/Controls2/PageType.qml
@@ -2,21 +2,11 @@ import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts

-import "../Config"
-
 Item {
    id: root

    property StackView stackView: StackView.view

-    property var defaultActiveFocusItem: null
-
-    onVisibleChanged: {
-        if (visible && !GC.isMobile()) {
-            timer.start()
-        }
-    }
-
 //    MouseArea {
 //        id: globalMouseArea
 //        z: 99
@@ -29,17 +19,4 @@ Item {
 //            mouse.accepted = false
 //        }
 //    }
-
-    // Set a timer to set focus after a short delay
-    Timer {
-        id: timer
-        interval: 100 // Milliseconds
-        onTriggered: {
-            if (defaultActiveFocusItem) {
-                defaultActiveFocusItem.forceActiveFocus()
-            }
-        }
-        repeat: false // Stop the timer after one trigger
-        running: !GC.isMobile()  // Start the timer
-    }
 }
--- a/client/ui/qml/Controls2/PopupType.qml
+++ b/client/ui/qml/Controls2/PopupType.qml
@@ -66,7 +66,7 @@ Popup {
                borderWidth: 0

                text: qsTr("Close")
-                clickedFunc: function() {
+                onClicked: {
                    root.close()
                }
            }
--- a/client/ui/qml/Controls2/TextFieldWithHeaderType.qml
+++ b/client/ui/qml/Controls2/TextFieldWithHeaderType.qml
@@ -69,13 +69,10 @@ Item {

                    TextField {
                        id: textField
-                        activeFocusOnTab: false

                        enabled: root.textFieldEditable
                        color: root.enabled ? root.textFieldTextColor : root.textFieldTextDisabledColor

-                        inputMethodHints: Qt.ImhNoAutoUppercase | Qt.ImhSensitiveData | Qt.ImhNoPredictiveText
-
                        placeholderText: root.textFieldPlaceholderText
                        placeholderTextColor: "#494B50"

@@ -137,7 +134,6 @@ Item {
 //                    textColor: "#D7D8DB"
 //                    borderWidth: 0

-                    focusPolicy: Qt.NoFocus
                    text: root.buttonText
                    imageSource: root.buttonImageSource

@@ -146,7 +142,7 @@ Item {
                    Layout.preferredWidth: content.implicitHeight
                    squareLeftSide: true

-                    clickedFunc: function() {
+                    onClicked: {
                        if (root.clickedFunc && typeof root.clickedFunc === "function") {
                            root.clickedFunc()
                        }
@@ -190,14 +186,4 @@ Item {
    function getBackgroundBorderColor(noneFocusedColor) {
        return textField.focus ? root.borderFocusedColor : noneFocusedColor
    }
-
-    Keys.onEnterPressed: {
-        if (KeyNavigation.tab)
-            KeyNavigation.tab.forceActiveFocus();
-    }
-
-    Keys.onReturnPressed: {
-        if (KeyNavigation.tab)
-            KeyNavigation.tab.forceActiveFocus();
-    }
 }
--- a/client/ui/qml/Pages2/PageDeinstalling.qml
+++ b/client/ui/qml/Pages2/PageDeinstalling.qml
@@ -14,8 +14,8 @@ import "../Config"
 PageType {
    id: root

-    Component.onCompleted: PageController.disableControls(true)
-    Component.onDestruction: PageController.disableControls(false)
+    Component.onCompleted: PageController.enableTabBar(false)
+    Component.onDestruction: PageController.enableTabBar(true)

    SortFilterProxyModel {
        id: proxyServersModel
--- a/client/ui/qml/Pages2/PageHome.qml
+++ b/client/ui/qml/Pages2/PageHome.qml
@@ -18,382 +18,484 @@ import "../Components"
 PageType {
    id: root

+    property string defaultColor: "#1C1D21"
+
+    property string borderColor: "#2C2D30"
+
    Connections {
        target: PageController

        function onRestorePageHomeState(isContainerInstalled) {
-            drawer.open()
+            buttonContent.state = "expanded"
            if (isContainerInstalled) {
                containersDropDown.rootButtonClickedFunction()
            }
        }
+
+        function onForceCloseDrawer() {
+            buttonContent.state = "collapsed"
+        }
+    }
+
+    MouseArea {
+        anchors.fill: parent
+        enabled: buttonContent.state === "expanded"
+        onClicked: {
+            buttonContent.state = "collapsed"
+        }
    }

    Item {
        anchors.fill: parent
-        anchors.bottomMargin: drawer.collapsedHeight
+        anchors.bottomMargin: buttonContent.collapsedHeight

        ConnectButton {
-            id: connectButton
            anchors.centerIn: parent
        }
+    }

-        BasicButtonType {
-            anchors.horizontalCenter: parent.horizontalCenter
-            anchors.bottom: parent.bottom
-            anchors.bottomMargin: 34
-            leftPadding: 16
-            rightPadding: 16
+    MouseArea {
+        id: dragArea

-            implicitHeight: 36
+        anchors.fill: buttonBackground
+        cursorShape: buttonContent.state === "collapsed" ? Qt.PointingHandCursor : Qt.ArrowCursor
+        hoverEnabled: true

-            defaultColor: "transparent"
-            hoveredColor: Qt.rgba(1, 1, 1, 0.08)
-            pressedColor: Qt.rgba(1, 1, 1, 0.12)
-            disabledColor: "#878B91"
-            textColor: "#878B91"
-            leftImageColor: "transparent"
-            borderWidth: 0
+        drag.target: buttonContent
+        drag.axis: Drag.YAxis
+        drag.maximumY: root.height - buttonContent.collapsedHeight
+        drag.minimumY: root.height - root.height * 0.9

-            property bool isSplitTunnelingEnabled: SitesModel.isTunnelingEnabled ||
-                                                   (ServersModel.isDefaultServerDefaultContainerHasSplitTunneling && ServersModel.getDefaultServerData("isServerFromApi"))
-
-            text: isSplitTunnelingEnabled ? qsTr("Split tunneling enabled") : qsTr("Split tunneling disabled")
-
-            imageSource: isSplitTunnelingEnabled ? "qrc:/images/controls/split-tunneling.svg" : ""
-            rightImageSource: "qrc:/images/controls/chevron-down.svg"
-
-            onClicked: {
-                homeSplitTunnelingDrawer.open()
+        /** If drag area is released at any point other than min or max y, transition to the other state */
+        onReleased: {
+            if (buttonContent.state === "collapsed" && buttonContent.y < dragArea.drag.maximumY) {
+                buttonContent.state = "expanded"
+                return
            }
+            if (buttonContent.state === "expanded" && buttonContent.y > dragArea.drag.minimumY) {
+                buttonContent.state = "collapsed"
+                return
+            }
+        }

-            HomeSplitTunnelingDrawer {
-                id: homeSplitTunnelingDrawer
+        onEntered: {
+            collapsedButtonChevron.backgroundColor = collapsedButtonChevron.hoveredColor
+            collapsedButtonHeader.opacity = 0.8
+        }
+        onExited: {
+            collapsedButtonChevron.backgroundColor = collapsedButtonChevron.defaultColor
+            collapsedButtonHeader.opacity = 1
+        }
+        onPressedChanged: {
+            collapsedButtonChevron.backgroundColor = pressed ? collapsedButtonChevron.pressedColor : entered ? collapsedButtonChevron.hoveredColor : collapsedButtonChevron.defaultColor
+            collapsedButtonHeader.opacity = 0.7
+        }

-                parent: root
+
+        onClicked: {
+            if (buttonContent.state === "collapsed") {
+                buttonContent.state = "expanded"
            }
        }
    }

+    Rectangle {
+        id: buttonBackground

-    DrawerType2 {
-        id: drawer
-        anchors.fill: parent
+        anchors { left: buttonContent.left; right: buttonContent.right; top: buttonContent.top }
+        height: root.height
+        radius: 16
+        color: root.defaultColor
+        border.color: root.borderColor
+        border.width: 1

-        collapsedContent:  ColumnLayout {
-            DividerType {
-                Layout.topMargin: 10
-                Layout.fillWidth: false
-                Layout.preferredWidth: 20
-                Layout.preferredHeight: 2
-                Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
+        Rectangle {
+            width: parent.radius
+            height: parent.radius
+            anchors.bottom: parent.bottom
+            anchors.right: parent.right
+            anchors.left: parent.left
+            color: parent.color
+        }
+    }
+
+    ColumnLayout {
+        id: buttonContent
+
+        /** Initial height of button content */
+        property int collapsedHeight: 0
+        /** True when expanded objects should be visible */
+        property bool expandedVisibility: buttonContent.state === "expanded" || (buttonContent.state === "collapsed" && dragArea.drag.active === true)
+        /** True when collapsed objects should be visible */
+        property bool collapsedVisibility: buttonContent.state === "collapsed" && dragArea.drag.active === false
+
+        Drag.active: dragArea.drag.active
+        anchors.right: root.right
+        anchors.left: root.left
+        y: root.height - buttonContent.height
+
+        Component.onCompleted: {
+            buttonContent.state = "collapsed"
+        }
+
+        /** Set once based on first implicit height change once all children are layed out */
+        onImplicitHeightChanged: {
+            if (buttonContent.state === "collapsed" && collapsedHeight == 0) {
+                collapsedHeight = implicitHeight
+            }
+        }
+
+        onStateChanged: {
+            if (buttonContent.state === "collapsed") {
+                var initialPageNavigationBarColor = PageController.getInitialPageNavigationBarColor()
+                if (initialPageNavigationBarColor !== 0xFF1C1D21) {
+                    PageController.updateNavigationBarColor(initialPageNavigationBarColor)
+                }
+                PageController.drawerClose()
+                return
+            }
+            if (buttonContent.state === "expanded") {
+                if (PageController.getInitialPageNavigationBarColor() !== 0xFF1C1D21) {
+                    PageController.updateNavigationBarColor(0xFF1C1D21)
+                }
+                PageController.drawerOpen()
+                return
+            }
+        }
+
+        /** Two states of buttonContent, great place to add any future animations for the drawer */
+        states: [
+            State {
+                name: "collapsed"
+                PropertyChanges {
+                    target: buttonContent
+                    y: root.height - collapsedHeight
+                }
+            },
+            State {
+                name: "expanded"
+                PropertyChanges {
+                    target: buttonContent
+                    y: dragArea.drag.minimumY
+
+                }
+            }
+        ]
+
+        transitions: [
+            Transition {
+                from: "collapsed"
+                to: "expanded"
+                PropertyAnimation {
+                    target: buttonContent
+                    properties: "y"
+                    duration: 200
+                }
+            },
+            Transition {
+                from: "expanded"
+                to: "collapsed"
+                PropertyAnimation {
+                    target: buttonContent
+                    properties: "y"
+                    duration: 200
+                }
+            }
+        ]
+
+        DividerType {
+            Layout.topMargin: 10
+            Layout.fillWidth: false
+            Layout.preferredWidth: 20
+            Layout.preferredHeight: 2
+            Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
+
+            visible: (buttonContent.collapsedVisibility || buttonContent.expandedVisibility)
+        }
+
+        RowLayout {
+            Layout.topMargin: 14
+            Layout.leftMargin: 24
+            Layout.rightMargin: 24
+            Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
+            visible: buttonContent.collapsedVisibility
+
+            spacing: 0
+
+            Header1TextType {
+                id: collapsedButtonHeader
+                Layout.maximumWidth: buttonContent.width - 48 - 18 - 12 // todo
+
+                maximumLineCount: 2
+                elide: Qt.ElideRight
+
+                text: ServersModel.defaultServerName
+                horizontalAlignment: Qt.AlignHCenter
+
+                Behavior on opacity {
+                    PropertyAnimation { duration: 200 }
+                }
            }

-            RowLayout {
+            ImageButtonType {
+                id: collapsedButtonChevron
+
+                Layout.leftMargin: 8
+
+                hoverEnabled: false
+                image: "qrc:/images/controls/chevron-down.svg"
+                imageColor: "#d7d8db"
+
+                icon.width: 18
+                icon.height: 18
+                backgroundRadius: 16
+                horizontalPadding: 4
+                topPadding: 4
+                bottomPadding: 3
+
+                onClicked: {
+                    if (buttonContent.state === "collapsed") {
+                        buttonContent.state = "expanded"
+                    }
+                }
+            }
+        }
+
+        LabelTextType {
+            id: collapsedServerMenuDescription
+            Layout.bottomMargin: 44
+            Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
+            visible: buttonContent.collapsedVisibility
+            text: ServersModel.defaultServerDescriptionCollapsed
+        }
+
+        ColumnLayout {
+            id: serversMenuHeader
+
+            Layout.alignment: Qt.AlignTop | Qt.AlignHCenter
+            Layout.fillWidth: true
+            visible: buttonContent.expandedVisibility
+
+            Header1TextType {
+                Layout.fillWidth: true
                Layout.topMargin: 14
-                Layout.leftMargin: 24
-                Layout.rightMargin: 24
-                Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16

-                spacing: 0
-
-                Connections {
-                    target: drawer
-                    function onEntered() {
-                        collapsedButtonChevron.backgroundColor = collapsedButtonChevron.hoveredColor
-                        collapsedButtonHeader.opacity = 0.8
-                    }
-
-                    function onExited() {
-                        collapsedButtonChevron.backgroundColor = collapsedButtonChevron.defaultColor
-                        collapsedButtonHeader.opacity = 1
-                    }
-
-                    function onPressed(pressed, entered) {
-                        collapsedButtonChevron.backgroundColor = pressed ? collapsedButtonChevron.pressedColor : entered ? collapsedButtonChevron.hoveredColor : collapsedButtonChevron.defaultColor
-                        collapsedButtonHeader.opacity = 0.7
-                    }
-                }
-
-                Header1TextType {
-                    id: collapsedButtonHeader
-                    Layout.maximumWidth: drawer.width - 48 - 18 - 12 // todo
-
-                    maximumLineCount: 2
-                    elide: Qt.ElideRight
-
-                    text: ServersModel.defaultServerName
-                    horizontalAlignment: Qt.AlignHCenter
-
-                    Behavior on opacity {
-                        PropertyAnimation { duration: 200 }
-                    }
-                }
-
-                ImageButtonType {
-                    id: collapsedButtonChevron
-
-                    Layout.leftMargin: 8
-
-                    hoverEnabled: false
-                    image: "qrc:/images/controls/chevron-down.svg"
-                    imageColor: "#d7d8db"
-
-                    icon.width: 18
-                    icon.height: 18
-                    backgroundRadius: 16
-                    horizontalPadding: 4
-                    topPadding: 4
-                    bottomPadding: 3
-
-                    onClicked: {
-                        if (drawer.isCollapsed) {
-                            drawer.open()
-                        }
-                    }
-                }
+                text: ServersModel.defaultServerName
+                horizontalAlignment: Qt.AlignHCenter
+                maximumLineCount: 2
+                elide: Qt.ElideRight
            }

            LabelTextType {
-                id: collapsedServerMenuDescription
-                Layout.bottomMargin: 44
+                id: expandedServersMenuDescription
+                Layout.bottomMargin: 24
+                Layout.fillWidth: true
+                horizontalAlignment: Qt.AlignHCenter
+                verticalAlignment: Qt.AlignVCenter
+                text: ServersModel.defaultServerDescriptionExpanded
+            }
+
+            RowLayout {
                Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
-                text: ServersModel.defaultServerDescriptionCollapsed
-            }
-        }
-        expandedContent: Item {
-            id: serverMenuContainer
+                spacing: 8

-            implicitHeight: Qt.platform.os !== "ios" ? root.height * 0.9 : screen.height * 0.77
+                DropDownType {
+                    id: containersDropDown

-            Component.onCompleted: {
-                drawer.expandedHeight = serverMenuContainer.implicitHeight
-            }
+                    rootButtonImageColor: "#0E0E11"
+                    rootButtonBackgroundColor: "#D7D8DB"
+                    rootButtonBackgroundHoveredColor: Qt.rgba(215, 216, 219, 0.8)
+                    rootButtonBackgroundPressedColor: Qt.rgba(215, 216, 219, 0.65)
+                    rootButtonHoveredBorderColor: "transparent"
+                    rootButtonDefaultBorderColor: "transparent"
+                    rootButtonTextTopMargin: 8
+                    rootButtonTextBottomMargin: 8

-            ColumnLayout {
-                id: serversMenuHeader
+                    text: ServersModel.defaultContainerName
+                    textColor: "#0E0E11"
+                    headerText: qsTr("VPN protocol")
+                    headerBackButtonImage: "qrc:/images/controls/arrow-left.svg"

-                anchors.top: parent.top
-                anchors.right: parent.right
-                anchors.left: parent.left
-
-
-                Header1TextType {
-                    Layout.fillWidth: true
-                    Layout.topMargin: 14
-                    Layout.leftMargin: 16
-                    Layout.rightMargin: 16
-
-                    text: ServersModel.defaultServerName
-                    horizontalAlignment: Qt.AlignHCenter
-                    maximumLineCount: 2
-                    elide: Qt.ElideRight
-                }
-
-                LabelTextType {
-                    id: expandedServersMenuDescription
-                    Layout.bottomMargin: ServersModel.isDefaultServerFromApi ? 69 : 24
-                    Layout.fillWidth: true
-                    horizontalAlignment: Qt.AlignHCenter
-                    verticalAlignment: Qt.AlignVCenter
-                    text: ServersModel.defaultServerDescriptionExpanded
-                }
-
-                RowLayout {
-                    Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
-                    spacing: 8
-
-                    visible: !ServersModel.isDefaultServerFromApi
-                    onVisibleChanged: expandedServersMenuDescription.Layout
-
-                    DropDownType {
-                        id: containersDropDown
-
-                        rootButtonImageColor: "#0E0E11"
-                        rootButtonBackgroundColor: "#D7D8DB"
-                        rootButtonBackgroundHoveredColor: Qt.rgba(215, 216, 219, 0.8)
-                        rootButtonBackgroundPressedColor: Qt.rgba(215, 216, 219, 0.65)
-                        rootButtonHoveredBorderColor: "transparent"
-                        rootButtonDefaultBorderColor: "transparent"
-                        rootButtonTextTopMargin: 8
-                        rootButtonTextBottomMargin: 8
-
-                        text: ServersModel.defaultServerDefaultContainerName
-                        textColor: "#0E0E11"
-                        headerText: qsTr("VPN protocol")
-                        headerBackButtonImage: "qrc:/images/controls/arrow-left.svg"
-
-                        rootButtonClickedFunction: function() {
-                            containersDropDown.open()
-                        }
-
-                        drawerParent: root
-
-                        listView: HomeContainersListView {
-                            rootWidth: root.width
-
-                            Connections {
-                                target: ServersModel
-
-                                function onDefaultServerIndexChanged() {
-                                    updateContainersModelFilters()
-                                }
-                            }
-
-                            function updateContainersModelFilters() {
-                                if (ServersModel.isDefaultServerHasWriteAccess()) {
-                                    proxyDefaultServerContainersModel.filters = ContainersModelFilters.getWriteAccessProtocolsListFilters()
-                                } else {
-                                    proxyDefaultServerContainersModel.filters = ContainersModelFilters.getReadAccessProtocolsListFilters()
-                                }
-                            }
-
-                            model: SortFilterProxyModel {
-                                id: proxyDefaultServerContainersModel
-                                sourceModel: DefaultServerContainersModel
-
-                                sorters: [
-                                    RoleSorter { roleName: "isInstalled"; sortOrder: Qt.DescendingOrder }
-                                ]
-                            }
-
-                            Component.onCompleted: updateContainersModelFilters()
-                        }
-                    }
-                }
-
-                Header2Type {
-                    Layout.fillWidth: true
-                    Layout.topMargin: 48
-                    Layout.leftMargin: 16
-                    Layout.rightMargin: 16
-
-                    headerText: qsTr("Servers")
-                }
-            }
-
-            Flickable {
-                id: serversContainer
-
-                anchors.top: serversMenuHeader.bottom
-                anchors.right: parent.right
-                anchors.left: parent.left
-                anchors.topMargin: 16
-
-                contentHeight: col.height + col.anchors.bottomMargin
-                implicitHeight: parent.height - serversMenuHeader.implicitHeight
-                clip: true
-
-                ScrollBar.vertical: ScrollBar {
-                    id: scrollBar
-                    policy: serversContainer.height >= serversContainer.contentHeight ? ScrollBar.AlwaysOff : ScrollBar.AlwaysOn
-                }
-
-                Keys.onUpPressed: scrollBar.decrease()
-                Keys.onDownPressed: scrollBar.increase()
-
-                Column {
-                    id: col
-                    anchors.top: parent.top
-                    anchors.left: parent.left
-                    anchors.right: parent.right
-                    anchors.bottomMargin: 32
-
-                    spacing: 16
-
-                    ButtonGroup {
-                        id: serversRadioButtonGroup
+                    rootButtonClickedFunction: function() {
+                        ServersModel.currentlyProcessedIndex = serversMenuContent.currentIndex
+                        containersDropDown.menuVisible = true
                    }

-                    ListView {
-                        id: serversMenuContent
-                        width: parent.width
-                        height: serversMenuContent.contentItem.height
-
-                        model: ServersModel
-                        currentIndex: ServersModel.defaultIndex
+                    listView: HomeContainersListView {
+                        rootWidth: root.width

                        Connections {
                            target: ServersModel
-                            function onDefaultServerIndexChanged(serverIndex) {
-                                serversMenuContent.currentIndex = serverIndex
+
+                            function onCurrentlyProcessedServerIndexChanged() {
+                                updateContainersModelFilters()
                            }
                        }

-                        clip: true
-                        interactive: false
+                        function updateContainersModelFilters() {
+                            if (ServersModel.isCurrentlyProcessedServerHasWriteAccess()) {
+                                proxyContainersModel.filters = ContainersModelFilters.getWriteAccessProtocolsListFilters()
+                            } else {
+                                proxyContainersModel.filters = ContainersModelFilters.getReadAccessProtocolsListFilters()
+                            }
+                        }

-                        delegate: Item {
-                            id: menuContentDelegate
+                        model: SortFilterProxyModel {
+                            id: proxyContainersModel
+                            sourceModel: ContainersModel
+                        }

-                            property variant delegateData: model
+                        Component.onCompleted: updateContainersModelFilters()
+                    }
+                }
+            }

-                            implicitWidth: serversMenuContent.width
-                            implicitHeight: serverRadioButtonContent.implicitHeight
+            Header2Type {
+                Layout.fillWidth: true
+                Layout.topMargin: 48
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+                visible: buttonContent.expandedVisibility

-                            ColumnLayout {
-                                id: serverRadioButtonContent
+                headerText: qsTr("Servers")
+            }
+        }

-                                anchors.fill: parent
-                                anchors.rightMargin: 16
-                                anchors.leftMargin: 16
+        Flickable {
+            id: serversContainer
+            Layout.alignment: Qt.AlignTop | Qt.AlignHCenter
+            Layout.fillWidth: true
+            Layout.topMargin: 16
+            contentHeight: col.implicitHeight
+            implicitHeight: root.height - (root.height * 0.1) - serversMenuHeader.implicitHeight - 52 //todo 52 is tabbar height
+            visible: buttonContent.expandedVisibility
+            clip: true

-                                spacing: 0
+            ScrollBar.vertical: ScrollBar {
+                id: scrollBar
+                policy: serversContainer.height >= serversContainer.contentHeight ? ScrollBar.AlwaysOff : ScrollBar.AlwaysOn
+            }

-                                RowLayout {
-                                    VerticalRadioButton {
-                                        id: serverRadioButton
+            Keys.onUpPressed: scrollBar.decrease()
+            Keys.onDownPressed: scrollBar.increase()

-                                        Layout.fillWidth: true
+            Column {
+                id: col
+                anchors.top: parent.top
+                anchors.left: parent.left
+                anchors.right: parent.right

-                                        text: name
-                                        descriptionText: serverDescription
+                spacing: 16

-                                        checked: index === serversMenuContent.currentIndex
-                                        checkable: !ConnectionController.isConnected
+                ButtonGroup {
+                    id: serversRadioButtonGroup
+                }

-                                        ButtonGroup.group: serversRadioButtonGroup
+                ListView {
+                    id: serversMenuContent
+                    width: parent.width
+                    height: serversMenuContent.contentItem.height

-                                        onClicked: {
-                                            if (ConnectionController.isConnected) {
-                                                PageController.showNotificationMessage(qsTr("Unable change server while there is an active connection"))
-                                                return
-                                            }
+                    model: ServersModel
+                    currentIndex: ServersModel.defaultIndex

-                                            serversMenuContent.currentIndex = index
+                    Connections {
+                        target: ServersModel
+                        function onDefaultServerIndexChanged(serverIndex) {
+                            serversMenuContent.currentIndex = serverIndex
+                        }
+                    }

-                                            ServersModel.defaultIndex = index
-                                        }
+                    clip: true
+                    interactive: false

-                                        MouseArea {
-                                            anchors.fill: serverRadioButton
-                                            cursorShape: Qt.PointingHandCursor
-                                            enabled: false
-                                        }
-                                    }
+                    delegate: Item {
+                        id: menuContentDelegate

-                                    ImageButtonType {
-                                        image: "qrc:/images/controls/settings.svg"
-                                        imageColor: "#D7D8DB"
+                        property variant delegateData: model

-                                        implicitWidth: 56
-                                        implicitHeight: 56
+                        implicitWidth: serversMenuContent.width
+                        implicitHeight: serverRadioButtonContent.implicitHeight

-                                        z: 1
+                        ColumnLayout {
+                            id: serverRadioButtonContent

-                                        onClicked: function() {
-                                            ServersModel.processedIndex = index
-                                            PageController.goToPage(PageEnum.PageSettingsServerInfo)
-                                            drawer.close()
-                                        }
-                                    }
-                                }
+                            anchors.fill: parent
+                            anchors.rightMargin: 16
+                            anchors.leftMargin: 16
+
+                            spacing: 0
+
+                            RowLayout {
+                                VerticalRadioButton {
+                                    id: serverRadioButton

-                                DividerType {
                                    Layout.fillWidth: true
-                                    Layout.leftMargin: 0
-                                    Layout.rightMargin: 0
+
+                                    text: name
+                                    descriptionText: {
+                                        var fullDescription = ""
+                                        if (hasWriteAccess) {
+                                            if (SettingsController.isAmneziaDnsEnabled()
+                                                    && ServersModel.isAmneziaDnsContainerInstalled(index)) {
+                                                fullDescription += "Amnezia DNS | "
+                                            }
+                                        } else {
+                                            if (containsAmneziaDns) {
+                                                fullDescription += "Amnezia DNS | "
+                                            }
+                                        }
+
+                                        return fullDescription += 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.currentlyProcessedIndex = index
+                                        ServersModel.defaultIndex = index
+                                    }
+
+                                    MouseArea {
+                                        anchors.fill: serverRadioButton
+                                        cursorShape: Qt.PointingHandCursor
+                                        enabled: false
+                                    }
                                }
+
+                                ImageButtonType {
+                                    image: "qrc:/images/controls/settings.svg"
+                                    imageColor: "#D7D8DB"
+
+                                    implicitWidth: 56
+                                    implicitHeight: 56
+
+                                    z: 1
+
+                                    onClicked: function() {
+                                        ServersModel.currentlyProcessedIndex = index
+                                        PageController.goToPage(PageEnum.PageSettingsServerInfo)
+                                        buttonContent.state = "collapsed"
+                                    }
+                                }
+                            }
+
+                            DividerType {
+                                Layout.fillWidth: true
+                                Layout.leftMargin: 0
+                                Layout.rightMargin: 0
                            }
                        }
                    }
--- a/client/ui/qml/Pages2/PageProtocolAwgSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolAwgSettings.qml
@@ -12,12 +12,9 @@ import "../Controls2/TextTypes"
 import "../Config"
 import "../Components"

-
 PageType {
    id: root

-    defaultActiveFocusItem: listview.currentItem.portTextField.textField
-
    ColumnLayout {
        id: backButton

@@ -44,11 +41,9 @@ PageType {
            anchors.left: parent.left
            anchors.right: parent.right

-            enabled: ServersModel.isProcessedServerHasWriteAccess()
+            enabled: ServersModel.isCurrentlyProcessedServerHasWriteAccess()

            ListView {
-
-
                id: listview

                width: parent.width
@@ -60,13 +55,9 @@ PageType {
                model: AwgConfigModel

                delegate: Item {
-                    id: _delegate
-
                    implicitWidth: listview.width
                    implicitHeight: col.implicitHeight

-                    property alias portTextField:portTextField
-
                    ColumnLayout {
                        id: col

@@ -102,8 +93,6 @@ PageType {
                            }

                            checkEmptyText: true
-
-                            KeyNavigation.tab: junkPacketCountTextField.textField
                        }

                        TextFieldWithHeaderType {
@@ -111,7 +100,7 @@ PageType {
                            Layout.fillWidth: true
                            Layout.topMargin: 16

-                            headerText: "Jc - Junk packet count"
+                            headerText: qsTr("Junk packet count")
                            textFieldText: junkPacketCount
                            textField.validator: IntValidator { bottom: 0 }

@@ -127,8 +116,6 @@ PageType {
                            }

                            checkEmptyText: true
-
-                            KeyNavigation.tab: junkPacketMinSizeTextField.textField
                        }

                        TextFieldWithHeaderType {
@@ -136,7 +123,7 @@ PageType {
                            Layout.fillWidth: true
                            Layout.topMargin: 16

-                            headerText: "Jmin - Junk packet minimum size"
+                            headerText: qsTr("Junk packet minimum size")
                            textFieldText: junkPacketMinSize
                            textField.validator: IntValidator { bottom: 0 }

@@ -147,8 +134,6 @@ PageType {
                            }

                            checkEmptyText: true
-
-                            KeyNavigation.tab: junkPacketMaxSizeTextField.textField
                        }

                        TextFieldWithHeaderType {
@@ -156,7 +141,7 @@ PageType {
                            Layout.fillWidth: true
                            Layout.topMargin: 16

-                            headerText: "Jmax - Junk packet maximum size"
+                            headerText: qsTr("Junk packet maximum size")
                            textFieldText: junkPacketMaxSize
                            textField.validator: IntValidator { bottom: 0 }

@@ -167,8 +152,6 @@ PageType {
                            }

                            checkEmptyText: true
-
-                            KeyNavigation.tab: initPacketJunkSizeTextField.textField
                        }

                        TextFieldWithHeaderType {
@@ -176,7 +159,7 @@ PageType {
                            Layout.fillWidth: true
                            Layout.topMargin: 16

-                            headerText: "S1 - Init packet junk size"
+                            headerText: qsTr("Init packet junk size")
                            textFieldText: initPacketJunkSize
                            textField.validator: IntValidator { bottom: 0 }

@@ -187,8 +170,6 @@ PageType {
                            }

                            checkEmptyText: true
-
-                            KeyNavigation.tab: responsePacketJunkSizeTextField.textField
                        }

                        TextFieldWithHeaderType {
@@ -196,7 +177,7 @@ PageType {
                            Layout.fillWidth: true
                            Layout.topMargin: 16

-                            headerText: "S2 - Response packet junk size"
+                            headerText: qsTr("Response packet junk size")
                            textFieldText: responsePacketJunkSize
                            textField.validator: IntValidator { bottom: 0 }

@@ -207,8 +188,6 @@ PageType {
                            }

                            checkEmptyText: true
-
-                            KeyNavigation.tab: initPacketMagicHeaderTextField.textField
                        }

                        TextFieldWithHeaderType {
@@ -216,7 +195,7 @@ PageType {
                            Layout.fillWidth: true
                            Layout.topMargin: 16

-                            headerText: "H1 - Init packet magic header"
+                            headerText: qsTr("Init packet magic header")
                            textFieldText: initPacketMagicHeader
                            textField.validator: IntValidator { bottom: 0 }

@@ -227,8 +206,6 @@ PageType {
                            }

                            checkEmptyText: true
-
-                            KeyNavigation.tab: responsePacketMagicHeaderTextField.textField
                        }

                        TextFieldWithHeaderType {
@@ -236,7 +213,7 @@ PageType {
                            Layout.fillWidth: true
                            Layout.topMargin: 16

-                            headerText: "H2 - Response packet magic header"
+                            headerText: qsTr("Response packet magic header")
                            textFieldText: responsePacketMagicHeader
                            textField.validator: IntValidator { bottom: 0 }

@@ -247,8 +224,6 @@ PageType {
                            }

                            checkEmptyText: true
-
-                            KeyNavigation.tab: transportPacketMagicHeaderTextField.textField
                        }

                        TextFieldWithHeaderType {
@@ -256,7 +231,7 @@ PageType {
                            Layout.fillWidth: true
                            Layout.topMargin: 16

-                            headerText: "H4 - Transport packet magic header"
+                            headerText: qsTr("Transport packet magic header")
                            textFieldText: transportPacketMagicHeader
                            textField.validator: IntValidator { bottom: 0 }

@@ -267,8 +242,6 @@ PageType {
                            }

                            checkEmptyText: true
-
-                            KeyNavigation.tab: underloadPacketMagicHeaderTextField.textField
                        }

                        TextFieldWithHeaderType {
@@ -276,7 +249,7 @@ PageType {
                            Layout.fillWidth: true
                            Layout.topMargin: 16

-                            headerText: "H3 - Underload packet magic header"
+                            headerText: qsTr("Underload packet magic header")
                            textFieldText: underloadPacketMagicHeader
                            textField.validator: IntValidator { bottom: 0 }

@@ -287,8 +260,6 @@ PageType {
                            }

                            checkEmptyText: true
-
-                            KeyNavigation.tab: saveRestartButton
                        }

                        BasicButtonType {
@@ -304,24 +275,24 @@ PageType {
                            text: qsTr("Remove AmneziaWG")

                            onClicked: {
-                                var headerText = qsTr("Remove AmneziaWG from server?")
-                                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")
+                                questionDrawer.headerText = qsTr("Remove AmneziaWG from server?")
+                                questionDrawer.descriptionText = qsTr("All users with whom you shared a connection will no longer be able to connect to it.")
+                                questionDrawer.yesButtonText = qsTr("Continue")
+                                questionDrawer.noButtonText = qsTr("Cancel")

-                                var yesButtonFunction = function() {
+                                questionDrawer.yesButtonFunction = function() {
+                                    questionDrawer.visible = false
                                    PageController.goToPage(PageEnum.PageDeinstalling)
                                    InstallController.removeCurrentlyProcessedContainer()
                                }
-                                var noButtonFunction = function() {
+                                questionDrawer.noButtonFunction = function() {
+                                    questionDrawer.visible = false
                                }
-                                showQuestionDrawer(headerText, descriptionText, yesButtonText, noButtonText, yesButtonFunction, noButtonFunction)
+                                questionDrawer.visible = true
                            }
                        }

                        BasicButtonType {
-                            id: saveRestartButton
-
                            Layout.fillWidth: true
                            Layout.topMargin: 24
                            Layout.bottomMargin: 24
@@ -339,7 +310,7 @@ PageType {

                            text: qsTr("Save and Restart Amnezia")

-                            clickedFunc: function() {
+                            onClicked: {
                                forceActiveFocus()
                                PageController.goToPage(PageEnum.PageSetupWizardInstalling);
                                InstallController.updateContainer(AwgConfigModel.getConfig())
@@ -347,8 +318,11 @@ PageType {
                        }
                    }
                }
-
            }
        }
+
+        QuestionDrawer {
+            id: questionDrawer
+        }
    }
 }
--- a/client/ui/qml/Pages2/PageProtocolCloakSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolCloakSettings.qml
@@ -15,8 +15,6 @@ import "../Components"
 PageType {
    id: root

-    defaultActiveFocusItem: listview.currentItem.trafficFromField.textField
-
    ColumnLayout {
        id: backButton

@@ -43,7 +41,7 @@ PageType {
            anchors.left: parent.left
            anchors.right: parent.right

-            enabled: ServersModel.isProcessedServerHasWriteAccess()
+            enabled: ServersModel.isCurrentlyProcessedServerHasWriteAccess()

            ListView {
                id: listview
@@ -60,8 +58,6 @@ PageType {
                    implicitWidth: listview.width
                    implicitHeight: col.implicitHeight

-                    property alias trafficFromField: trafficFromField
-
                    ColumnLayout {
                        id: col

@@ -81,8 +77,6 @@ PageType {
                        }

                        TextFieldWithHeaderType {
-                            id: trafficFromField
-
                            Layout.fillWidth: true
                            Layout.topMargin: 32

@@ -102,13 +96,9 @@ PageType {
                                    }
                                }
                            }
-
-                            KeyNavigation.tab: portTextField.textField
                        }

                        TextFieldWithHeaderType {
-                            id: portTextField
-
                            Layout.fillWidth: true
                            Layout.topMargin: 16

@@ -122,8 +112,6 @@ PageType {
                                    port = textFieldText
                                }
                            }
-
-                            KeyNavigation.tab: saveRestartButton
                        }

                        DropDownType {
@@ -134,8 +122,6 @@ PageType {
                            descriptionText: qsTr("Cipher")
                            headerText: qsTr("Cipher")

-                            drawerParent: root
-
                            listView: ListViewWithRadioButtonType {
                                id: cipherListView

@@ -152,7 +138,7 @@ PageType {
                                clickedFunction: function() {
                                    cipherDropDown.text = selectedText
                                    cipher = cipherDropDown.text
-                                    cipherDropDown.close()
+                                    cipherDropDown.menuVisible = false
                                }

                                Component.onCompleted: {
@@ -168,15 +154,13 @@ PageType {
                        }

                        BasicButtonType {
-                            id: saveRestartButton
-
                            Layout.fillWidth: true
                            Layout.topMargin: 24
                            Layout.bottomMargin: 24

                            text: qsTr("Save and Restart Amnezia")

-                            clickedFunc: function() {
+                            onClicked: {
                                forceActiveFocus()
                                PageController.goToPage(PageEnum.PageSetupWizardInstalling);
                                InstallController.updateContainer(CloakConfigModel.getConfig())
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
lunardunno	6dceb3df54	force C.UTF-8 assignment Force C.UTF-8 if the system language is other than en_US. Temporary simplification of script stopping for moby and podman. Stop script execution if Docker is not active.	2024-02-15 01:22:15 +04:00
lunardunno	cc8ce440a8	locale check simplified	2024-02-14 09:45:46 +04:00
lunardunno	03b5f84574	Introduction of direct checking of package installation results. (#591 ) Introduction of direct checking of package installation results.	2024-02-14 07:53:21 +04:00
lunardunno	1aec417fc9	Merge pull request #588 from amnezia-vpn/test/docker-ce Check which containerization application will be installed	2024-02-14 04:27:01 +04:00
lunardunno	fc0a9fd74f	check and change locale Checking and changing the locale for correct error handling by the server controller.	2024-02-14 03:46:03 +04:00
lunardunno	11fef3c653	checking of docker installation results	2024-02-14 03:39:07 +04:00
lunardunno	1226d1b287	Check moby and podman	2024-02-13 17:25:36 +04:00
lunardunno	1028f6998f	docker-ce support Implementation of docker-ce support, for Fedora and CentOS	2024-02-12 06:18:59 +04:00