fix

core: allow messages with contact requests
2023-04-07 11:01:33 +01:00 · 2023-04-07 10:15:19 +01:00
598 changed files with 10255 additions and 72008 deletions
--- a/.github/ISSUE_TEMPLATE/bug.yml
+++ b/.github/ISSUE_TEMPLATE/bug.yml
@@ -1,68 +0,0 @@
-name: Bug
-description: File a bug report/issue
-title: "[Bug]: "
-labels: ["type:bug", "type:triage"]
-body:
- type: checkboxes
-  attributes:
-    label: Is there an existing issue for this?
-    description: Please search to see if an issue already exists for the bug you encountered.
-    options:
-    - label: I have searched the existing issues
-      required: true
- type: dropdown
-  attributes:
-    label: Platform
-    description: Multiple selections are possible.
-    multiple: true
-    options:
-      - Linux
-      - Mac
-      - Windows
-      - Android
-      - iOS
-  validations:
-    required: true
- type: input
-  attributes:
-    label: OS version
-    description: Specify the OS version
-    placeholder: ex. Android 12, Ubuntu 20.04
-  validations:
-    required: true
- type: input
-  attributes:
-    label: App version
-    description: Specify the SimpleX version
-    placeholder: ex. 4.3.2
-  validations:
-    required: true
- type: textarea
-  attributes:
-    label: Current Behavior
-    description: A concise description of what you're experiencing.
-    placeholder: Bug happened!
-  validations:
-    required: true
- type: textarea
-  attributes:
-    label: Expected Behavior
-    description: A concise description of what you expected to happen.
-    placeholder: No bug should happen!
-  validations:
-    required: true
- type: textarea
-  attributes:
-    label: Steps To Reproduce
-    description: Steps to reproduce the behavior.
-    placeholder: |
-      1. Go to ...
-      3. Click on ...
-      4. See error...
-  validations:
-    required: true
- type: textarea
-  attributes:
-    label: Relevant log output
-    description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
-    render: shell
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1 +0,0 @@
-blank_issues_enabled: true
--- a/.github/ISSUE_TEMPLATE/feature.yml
+++ b/.github/ISSUE_TEMPLATE/feature.yml
@@ -1,40 +0,0 @@
-name: Feature
-description: Suggest your feature
-title: "[Feature]: "
-labels: ["type:enhancement", "type:triage"]
-body:
- type: checkboxes
-  attributes:
-    label: Is there an existing issue for this?
-    description: Please search to see if an issue already exists for the bug you encountered.
-    options:
-    - label: I have searched the existing issues
-      required: true
- type: dropdown
-  attributes:
-    label: Platform
-    description: Multiple selections are possible. If selected input is "all", this considered to be a general feature.
-    multiple: true
-    options:
-      - Linux
-      - Mac
-      - Windows
-      - Android
-      - iOS
-      - all
-  validations:
-    required: true
- type: input
-  attributes:
-    label: App version
-    description: Specify the SimpleX version
-    placeholder: ex. 4.3.2
-  validations:
-    required: false
- type: textarea
-  attributes:
-    label: Feature
-    description: Describe the feature you would like to see added
-    placeholder: SimpleX Chat should make me coffee! 
-  validations:
-    required: true
--- a/.github/ISSUE_TEMPLATE/question.yml
+++ b/.github/ISSUE_TEMPLATE/question.yml
@@ -1,16 +0,0 @@
-name: Question
-description: Ask your question
-title: "[Q]: "
-labels: ["type:question", "type:triage"]
-body:
- type: markdown
-  attributes:
-    value: |
-      Generally, we encourage you to ask questions in our [official group](https://simplex.chat/invitation/#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23MCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%3Dsimplex:/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23MCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%3D), but you can do it anyway :)
- type: textarea
-  attributes:
-    label: Question
-    description: Please ask your question in plain english.
-    placeholder: Is SimpleX - chat?
-  validations:
-    required: true
--- a/.gitignore
+++ b/.gitignore
@@ -49,8 +49,8 @@ logs/
 # for website
 website/node_modules/
 website/src/blog/
-website/src/docs/
 website/translations.json
+website/src/_data/supported_languages.json
 website/src/img/images/
 website/src/images/
 # Generated files
--- a/README.md
+++ b/README.md
@@ -48,23 +48,7 @@

 ## Join user groups

-**Please note**: The groups below are created for the users to be able to ask questions, make suggestions and ask questions about SimpleX Chat only.
-
-You also can:
- criticize the app, and make comparisons with other messengers.
- share new messengers you think could be interesting for privacy, as long as you don't spam.
- share some privacy related publications, infrequently.
- having preliminary approved with the admin in direct message, share the link to a group you created.
-
-You must:
- be polite to other users
- avoid spam (too frequent messages, even if they are relevant)
- avoid any personal attacks or hostility.
- avoid sharing any content that is not relevant to the above (that includes, but is not limited to, discussing politics or any aspects of society other than privacy, security, technology and communications, sharing any content that may be found offensive by other users, etc.).
-
-Messages not following these rules will be deleted, the right to send messages may be revoked, and the access to the new members to the group may be temporarily restricted, to prevent re-joining under a different name - our imperfect group moderation does not have a better solution at the moment.
-
-You can join an English-speaking users group if you want to ask any questions: [#SimpleX-Group-3](https://simplex.chat/contact#/?v=1-2&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2Fp-j-D_PrY2UMDchFHEUtbSES0nmzCnvD%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEA3gBfMjB_GDEmKQwjNdqGbnX91yfuZ7nRJgQijsx5Khc%253D%26srv%3Dbylepyau3ty4czmn77q4fglvperknl4bi2eb2fdy2bh4jxtf32kf73yd.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%2262MvNZ_Ec2mmlS8V0QNtLQ%3D%3D%22%7D)
+You can join an English-speaking users group if you want to ask any questions: [#SimpleX-Group-2](https://simplex.chat/contact#/?v=1-2&smp=smp%3A%2F%2Fhpq7_4gGJiilmz5Rf-CswuU5kZGkm_zOIooSw6yALRg%3D%40smp5.simplex.im%2FQP8zaGjjmlXV-ix_Er4JgJ0lNPYGS1KX%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEApAgBkRZ3x12ayZ7sHrjHQWNMvqzZpWUgM_fFCUdLXwo%253D%26srv%3Djjbyvoemxysm7qxap7m5d5m35jzv5qq6gnlv7s4rsn7tdwwmuqciwpid.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%22xWpPXEZZsQp_F7vwAcAYDw%3D%3D%22%7D)

 There are groups in other languages, that we have the apps interface translated into. These groups are for testing, and asking questions to other SimpleX Chat users:

@@ -102,11 +86,10 @@ Join our translators to help SimpleX grow!
 |🇫🇷 fr|Français  |[ishi_sama](https://github.com/ishi-sama)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/fr/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/fr/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/fr/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/fr/)|[![website](https://hosted.weblate.org/widgets/simplex-chat/fr/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/fr/)|[✓](https://github.com/simplex-chat/simplex-chat/tree/master/docs/lang/fr)|
 |🇮🇹 it|Italiano  |[unbranched](https://github.com/unbranched)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/it/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/it/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/it/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/it/)|[![website](https://hosted.weblate.org/widgets/simplex-chat/it/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/it/)||
 |🇳🇱 nl|Nederlands|[mika-nl](https://github.com/mika-nl)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/nl/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/nl/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/nl/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/nl/)|[![website](https://hosted.weblate.org/widgets/simplex-chat/nl/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/nl/)||
-|🇵🇱 pl|Polski    |[BxOxSxS](https://github.com/BxOxSxS)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/pl/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/ru/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/ru/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/pl/)|||
 |🇷🇺 ru|Русский   ||[![android app](https://hosted.weblate.org/widgets/simplex-chat/ru/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/ru/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/ru/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/ru/)|||
-|🇨🇳 zh-CHS|简体中文|[sith-on-mars](https://github.com/sith-on-mars)<br><br>[Float-hu](https://github.com/Float-hu)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/zh_Hans/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/zh_Hans/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/zh_Hans/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/zh_Hans/)<br>&nbsp;|<br><br>[![website](https://hosted.weblate.org/widgets/simplex-chat/zh_Hans/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/zh_Hans/)||
+|🇨🇳 zh-CHS|简体中文|[sith-on-mars](https://github.com/sith-on-mars)|[![android app](https://hosted.weblate.org/widgets/simplex-chat/zh_Hans/android/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/android/zh_Hans/)<br>[![ios app](https://hosted.weblate.org/widgets/simplex-chat/zh_Hans/ios/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/ios/zh_Hans/)|[![website](https://hosted.weblate.org/widgets/simplex-chat/zh_Hans/website/svg-badge.svg)](https://hosted.weblate.org/projects/simplex-chat/website/zh_Hans/)||

-Languages in progress: Arabic, Japanese, Korean, Portuguese and [others](https://hosted.weblate.org/projects/simplex-chat/#languages). We will be adding more languages as some of the already added are completed – please suggest new languages, review the [translation guide](./docs/TRANSLATIONS.md) and get in touch with us!
+Languages in progress: Arabic, Hindi, Japanese, Spanish and [many others](https://hosted.weblate.org/projects/simplex-chat/#languages). We will be adding more languages as some of the already added are completed – please suggest new languages, review the [translation guide](./docs/TRANSLATIONS.md) and get in touch with us!

 ## Contribute

@@ -197,8 +180,6 @@ You can use SimpleX with your own servers and still communicate with people usin

 Recent updates:

-[Apr 22, 2023. SimpleX Chat: vision and funding, v5.0 released with videos and files up to 1gb](./blog/20230422-simplex-chat-vision-funding-v5-videos-files-passcode.md).
-
 [Mar 28, 2023. v4.6 released - with Android 8+ and ARMv7a support, hidden profiles, community moderation, improved audio/video calls and reduced battery usage](./blog/20230328-simplex-chat-v4-6-hidden-profiles.md).

 [Mar 1, 2023. SimpleX File Transfer Protocol – send large files efficiently, privately and securely, soon to be integrated into SimpleX Chat apps.](./blog/20230301-simplex-file-transfer-protocol.md).
@@ -313,15 +294,13 @@ If you are considering developing with SimpleX platform please get in touch for
 - ✅ Improved audio & video calls.
 - ✅ Support older Android OS and 32-bit CPUs.
 - ✅ Hidden chat profiles.
- ✅ Sending and receiving large files via [XFTP protocol](./blog/20230301-simplex-file-transfer-protocol.md).
- ✅ Video messages.
- ✅ App access passcode.
- 🏗 Improved Android app UI design.
+- 🏗 Sending and receiving large files via [XFTP protocol](./blog/20230301-simplex-file-transfer-protocol.md).
+- 🏗 Video messages.
 - 🏗 SMP queue redundancy and rotation (manual is supported).
 - 🏗 Reduced battery and traffic usage in large groups.
 - Include optional message into connection request sent via contact address.
 - Ephemeral/disappearing/OTR conversations with the existing contacts.
- Optional alternative access password.
+- Access password/pin (with optional alternative access password).
 - Local app files encryption.
 - Improved navigation and search in the conversation (expand and scroll to quoted message, scroll to search results, etc.).
 - Message delivery confirmation (with sender opt-in or opt-out per contact, TBC).
--- a/apps/android/README.md
+++ b/apps/android/README.md
@@ -4,6 +4,7 @@ This readme is currently a stub and as such is in development.

 Ultimately, this readme will act as a guide to contributing to the develop of the SimpleX android app.

+
 ## Gotchas

 #### SHA Signature for verification for app links/deep links
@@ -22,15 +23,3 @@ To find your SHA certificate fingerprint perform the following steps.
 More information is available [here](https://developer.android.com/training/app-links/verify-site-associations#manual-verification). If there is no response when running the `pm get-app-links` command, the intents in `AndroidManifest.xml` are likely misspecified. A verification attempt can be triggered using `adb shell pm verify-app-links --re-verify chat.simplex.app`. 

 Note that this is not an issue for the app store build of the app as this is signed with our app store credentials and thus there is a stable signature over users. Developers do not have general access to these credentials for development and testing.
-
-## Adding icons
-
-1. Find a [Material symbol](https://fonts.google.com/icons?icon.style=Rounded) in Rounded category.
-
-2. Set weight to 400, grade to -25 and size to 48px.
-
-3. Click on the icon, choose Android and download XML file.
-
-4. Update the color to black (#FF000000) and the size to "24.dp", as in other icons.
-
-For example, this is [add reaction icon](https://fonts.google.com/icons?selected=Material+Symbols+Rounded:add_reaction:FILL@0;wght@300;GRAD@-25;opsz@24&icon.style=Rounded).
--- a/apps/android/app/build.gradle
+++ b/apps/android/app/build.gradle
@@ -11,10 +11,8 @@ android {
        applicationId "chat.simplex.app"
        minSdk 26
        targetSdk 32
-        // !!!
-        // skip version code after release to F-Droid, as it uses two version codes
-        versionCode 120
-        versionName "5.1-beta.1"
+        versionCode 111
+        versionName "4.6.1-beta.2"

        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
        vectorDrawables {
@@ -79,20 +77,7 @@ android {
    def isBundle = gradle.getStartParameter().taskNames.find({ it.toLowerCase().contains("bundle") }) != null
 //    if (isRelease) {
        // Comma separated list of languages that will be included in the apk
-    android.defaultConfig.resConfigs(
-        "en",
-        "cs",
-        "de",
-        "es",
-        "fr",
-        "it",
-        "ja",
-        "nl",
-        "pl",
-        "pt-rBR",
-        "ru",
-        "zh-rCN"
-    )
+    android.defaultConfig.resConfigs("en", "cs", "de", "es", "fr", "it", "nl", "ru", "zh-rCN")
 //    }
    if (isBundle) {
        defaultConfig.ndk.abiFilters 'arm64-v8a', 'armeabi-v7a'
@@ -123,8 +108,7 @@ dependencies {
    implementation 'androidx.fragment:fragment:1.4.1'
    implementation 'org.jetbrains.kotlinx:kotlinx-datetime:0.3.2'
    implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2'
-    implementation 'com.charleskorn.kaml:kaml:0.43.0'
-    //implementation "androidx.compose.material:material-icons-extended:$compose_version"
+    implementation "androidx.compose.material:material-icons-extended:$compose_version"
    implementation "androidx.compose.ui:ui-util:$compose_version"
    implementation "androidx.navigation:navigation-compose:2.4.1"
    implementation "com.google.accompanist:accompanist-insets:0.23.0"
@@ -162,9 +146,6 @@ dependencies {
    // Video support
    implementation "com.google.android.exoplayer:exoplayer:2.17.1"

-    // Wheel picker
-    implementation 'com.github.zj565061763:compose-wheel-picker:1.0.0-alpha10'
-
    testImplementation 'junit:junit:4.13.2'
    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
--- a/apps/android/app/src/main/java/chat/simplex/app/MainActivity.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/MainActivity.kt
@@ -10,36 +10,35 @@ import android.view.WindowManager
 import androidx.activity.compose.setContent
 import androidx.activity.viewModels
 import androidx.compose.animation.core.*
+import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.*
-import androidx.compose.material.*
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Surface
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.Lock
 import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.graphicsLayer
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.fragment.app.FragmentActivity
 import androidx.lifecycle.*
-import chat.simplex.app.MainActivity.Companion.enteredBackground
-import chat.simplex.app.model.*
+import chat.simplex.app.model.ChatModel
+import chat.simplex.app.model.NtfManager
 import chat.simplex.app.model.NtfManager.Companion.getUserIdFromIntent
-import chat.simplex.app.ui.theme.*
+import chat.simplex.app.ui.theme.SimpleButton
+import chat.simplex.app.ui.theme.SimpleXTheme
 import chat.simplex.app.views.SplashView
 import chat.simplex.app.views.call.ActiveCallView
 import chat.simplex.app.views.call.IncomingCallAlertView
 import chat.simplex.app.views.chat.ChatView
-import chat.simplex.app.views.chat.group.ProgressIndicator
 import chat.simplex.app.views.chatlist.*
 import chat.simplex.app.views.database.DatabaseErrorView
 import chat.simplex.app.views.helpers.*
-import chat.simplex.app.views.helpers.DatabaseUtils.ksAppPassword
-import chat.simplex.app.views.helpers.DatabaseUtils.ksSelfDestructPassword
-import chat.simplex.app.views.localauth.SetAppPasscodeView
 import chat.simplex.app.views.newchat.*
 import chat.simplex.app.views.onboarding.*
-import chat.simplex.app.views.usersettings.LAMode
 import kotlinx.coroutines.*
 import kotlinx.coroutines.flow.distinctUntilChanged

@@ -61,7 +60,6 @@ class MainActivity: FragmentActivity() {
    }
  }
  private val vm by viewModels<SimplexViewModel>()
-  private val destroyedAfterBackPress = mutableStateOf(false)

  override fun onCreate(savedInstanceState: Bundle?) {
    super.onCreate(savedInstanceState)
@@ -84,15 +82,18 @@ class MainActivity: FragmentActivity() {
    }
    setContent {
      SimpleXTheme {
-        Surface(color = MaterialTheme.colors.background) {
+        Surface(
+          Modifier
+            .background(MaterialTheme.colors.background)
+            .fillMaxSize()
+        ) {
          MainPage(
            m,
            userAuthorized,
            laFailed,
-            destroyedAfterBackPress,
            ::runAuthenticate,
            ::setPerformLA,
-            showLANotice = { showLANotice(m.controller.appPrefs.laNoticeShown, this) }
+            showLANotice = { m.controller.showLANotice(this) }
          )
        }
      }
@@ -110,14 +111,8 @@ class MainActivity: FragmentActivity() {
  override fun onResume() {
    super.onResume()
    val enteredBackgroundVal = enteredBackground.value
-    val delay = vm.chatModel.controller.appPrefs.laLockDelay.get()
-    if (enteredBackgroundVal == null || elapsedRealtime() - enteredBackgroundVal >= delay * 1000) {
-      if (userAuthorized.value != false) {
-        /** [runAuthenticate] will be called in [MainPage] if needed. Making like this prevents double showing of passcode on start */
-        setAuthState()
-      } else if (!vm.chatModel.activeCallViewIsVisible.value) {
-        runAuthenticate()
-      }
+    if (enteredBackgroundVal == null || elapsedRealtime() - enteredBackgroundVal >= 30_000) {
+      runAuthenticate()
    }
  }

@@ -151,7 +146,6 @@ class MainActivity: FragmentActivity() {
      // When pressed Back and there is no one wants to process the back event, clear auth state to force re-auth on launch
      clearAuthState()
      laFailed.value = true
-      destroyedAfterBackPress.value = true
    }
    if (!onBackPressedDispatcher.hasEnabledCallbacks()) {
      // Drop shared content
@@ -159,41 +153,28 @@ class MainActivity: FragmentActivity() {
    }
  }

-  private fun setAuthState() {
-    userAuthorized.value = !vm.chatModel.controller.appPrefs.performLA.get()
-  }
-
  private fun runAuthenticate() {
    val m = vm.chatModel
-    setAuthState()
-    if (userAuthorized.value == false) {
+    if (!m.controller.appPrefs.performLA.get()) {
+      userAuthorized.value = true
+    } else {
+      userAuthorized.value = false
+      ModalManager.shared.closeModals()
      // To make Main thread free in order to allow to Compose to show blank view that hiding content underneath of it faster on slow devices
      CoroutineScope(Dispatchers.Default).launch {
        delay(50)
        withContext(Dispatchers.Main) {
          authenticate(
-            if (m.controller.appPrefs.laMode.get() == LAMode.SYSTEM)
-              generalGetString(R.string.auth_unlock)
-            else
-              generalGetString(R.string.la_enter_app_passcode),
-            if (m.controller.appPrefs.laMode.get() == LAMode.SYSTEM)
-              generalGetString(R.string.auth_log_in_using_credential)
-            else
-              generalGetString(R.string.auth_unlock),
-            selfDestruct = true,
+            generalGetString(R.string.auth_unlock),
+            generalGetString(R.string.auth_log_in_using_credential),
            this@MainActivity,
            completed = { laResult ->
              when (laResult) {
                LAResult.Success ->
                  userAuthorized.value = true
-                is LAResult.Failed -> { /* Can be called multiple times on every failure */ }
-                is LAResult.Error -> {
+                is LAResult.Error, LAResult.Failed ->
                  laFailed.value = true
-                  if (m.controller.appPrefs.laMode.get() == LAMode.PASSCODE) {
-                    laFailedAlert()
-                  }
-                }
-                is LAResult.Unavailable -> {
+                LAResult.Unavailable -> {
                  userAuthorized.value = true
                  m.performLA.value = false
                  m.controller.appPrefs.performLA.set(false)
@@ -207,117 +188,21 @@ class MainActivity: FragmentActivity() {
    }
  }

-  private fun showLANotice(laNoticeShown: SharedPreference<Boolean>, activity: FragmentActivity) {
-    Log.d(TAG, "showLANotice")
-    if (!laNoticeShown.get()) {
-      laNoticeShown.set(true)
-      AlertManager.shared.showAlertDialog(
-        title = generalGetString(R.string.la_notice_title_simplex_lock),
-        text = generalGetString(R.string.la_notice_to_protect_your_information_turn_on_simplex_lock_you_will_be_prompted_to_complete_authentication_before_this_feature_is_enabled),
-        confirmText = generalGetString(R.string.la_notice_turn_on),
-        onConfirm = {
-          withBGApi { // to remove this call, change ordering of onConfirm call in AlertManager
-            showChooseLAMode(laNoticeShown, activity)
-          }
-        }
-      )
+  private fun setPerformLA(on: Boolean) {
+    vm.chatModel.controller.appPrefs.laNoticeShown.set(true)
+    if (on) {
+      enableLA()
+    } else {
+      disableLA()
    }
  }

-  private fun showChooseLAMode(laNoticeShown: SharedPreference<Boolean>, activity: FragmentActivity) {
-    Log.d(TAG, "showLANotice")
-    laNoticeShown.set(true)
-    AlertManager.shared.showAlertDialogStacked(
-      title = generalGetString(R.string.la_lock_mode),
-      text = null,
-      confirmText = generalGetString(R.string.la_lock_mode_passcode),
-      dismissText = generalGetString(R.string.la_lock_mode_system),
-      onConfirm = {
-        AlertManager.shared.hideAlert()
-        setPasscode()
-      },
-      onDismiss = {
-        AlertManager.shared.hideAlert()
-        initialEnableLA(activity)
-      }
-    )
-  }
-
-  private fun initialEnableLA(activity: FragmentActivity) {
+  private fun enableLA() {
    val m = vm.chatModel
-    val appPrefs = m.controller.appPrefs
-    m.controller.appPrefs.laMode.set(LAMode.SYSTEM)
    authenticate(
      generalGetString(R.string.auth_enable_simplex_lock),
      generalGetString(R.string.auth_confirm_credential),
-      activity = activity,
-      completed = { laResult ->
-        when (laResult) {
-          LAResult.Success -> {
-            m.performLA.value = true
-            appPrefs.performLA.set(true)
-            laTurnedOnAlert()
-          }
-          is LAResult.Failed -> { /* Can be called multiple times on every failure */ }
-          is LAResult.Error -> {
-            m.performLA.value = false
-            appPrefs.performLA.set(false)
-            laFailedAlert()
-          }
-          is LAResult.Unavailable -> {
-            m.performLA.value = false
-            appPrefs.performLA.set(false)
-            m.showAdvertiseLAUnavailableAlert.value = true
-          }
-        }
-      }
-    )
-  }
-
-  private fun setPasscode() {
-    val chatModel = vm.chatModel
-    val appPrefs = chatModel.controller.appPrefs
-    ModalManager.shared.showCustomModal { close ->
-      Surface(Modifier.fillMaxSize(), color = MaterialTheme.colors.background) {
-        SetAppPasscodeView(
-          submit = {
-            chatModel.performLA.value = true
-            appPrefs.performLA.set(true)
-            appPrefs.laMode.set(LAMode.PASSCODE)
-            laTurnedOnAlert()
-          },
-          cancel = {
-            chatModel.performLA.value = false
-            appPrefs.performLA.set(false)
-            laPasscodeNotSetAlert()
-          },
-          close = close
-        )
-      }
-    }
-  }
-
-  private fun setPerformLA(on: Boolean, activity: FragmentActivity) {
-    vm.chatModel.controller.appPrefs.laNoticeShown.set(true)
-    if (on) {
-      enableLA(activity)
-    } else {
-      disableLA(activity)
-    }
-  }
-
-  private fun enableLA(activity: FragmentActivity) {
-    val m = vm.chatModel
-    authenticate(
-      if (m.controller.appPrefs.laMode.get() == LAMode.SYSTEM)
-        generalGetString(R.string.auth_enable_simplex_lock)
-      else
-        generalGetString(R.string.new_passcode),
-      if (m.controller.appPrefs.laMode.get() == LAMode.SYSTEM)
-        generalGetString(R.string.auth_confirm_credential)
-      else
-        "",
-      activity = activity,
+      this@MainActivity,
      completed = { laResult ->
        val prefPerformLA = m.controller.appPrefs.performLA
        when (laResult) {
@@ -326,13 +211,11 @@ class MainActivity: FragmentActivity() {
            prefPerformLA.set(true)
            laTurnedOnAlert()
          }
-          is LAResult.Failed -> { /* Can be called multiple times on every failure */ }
-          is LAResult.Error -> {
+          is LAResult.Error, LAResult.Failed -> {
            m.performLA.value = false
            prefPerformLA.set(false)
-            laFailedAlert()
          }
-          is LAResult.Unavailable -> {
+          LAResult.Unavailable -> {
            m.performLA.value = false
            prefPerformLA.set(false)
            laUnavailableInstructionAlert()
@@ -342,36 +225,24 @@ class MainActivity: FragmentActivity() {
    )
  }

-  private fun disableLA(activity: FragmentActivity) {
+  private fun disableLA() {
    val m = vm.chatModel
    authenticate(
-      if (m.controller.appPrefs.laMode.get() == LAMode.SYSTEM)
-        generalGetString(R.string.auth_disable_simplex_lock)
-      else
-        generalGetString(R.string.la_enter_app_passcode),
-      if (m.controller.appPrefs.laMode.get() == LAMode.SYSTEM)
-        generalGetString(R.string.auth_confirm_credential)
-      else
-        generalGetString(R.string.auth_disable_simplex_lock),
-      activity = activity,
+      generalGetString(R.string.auth_disable_simplex_lock),
+      generalGetString(R.string.auth_confirm_credential),
+      this@MainActivity,
      completed = { laResult ->
        val prefPerformLA = m.controller.appPrefs.performLA
-        val selfDestructPref = m.controller.appPrefs.selfDestruct
        when (laResult) {
          LAResult.Success -> {
            m.performLA.value = false
            prefPerformLA.set(false)
-            ksAppPassword.remove()
-            selfDestructPref.set(false)
-            ksSelfDestructPassword.remove()
          }
-          is LAResult.Failed -> { /* Can be called multiple times on every failure */ }
-          is LAResult.Error -> {
+          is LAResult.Error, LAResult.Failed -> {
            m.performLA.value = true
            prefPerformLA.set(true)
-            laFailedAlert()
          }
-          is LAResult.Unavailable -> {
+          LAResult.Unavailable -> {
            m.performLA.value = false
            prefPerformLA.set(false)
            laUnavailableTurningOffAlert()
@@ -392,9 +263,8 @@ fun MainPage(
  chatModel: ChatModel,
  userAuthorized: MutableState<Boolean?>,
  laFailed: MutableState<Boolean>,
-  destroyedAfterBackPress: MutableState<Boolean>,
  runAuthenticate: () -> Unit,
-  setPerformLA: (Boolean, FragmentActivity) -> Unit,
+  setPerformLA: (Boolean) -> Unit,
  showLANotice: () -> Unit
 ) {
  var showChatDatabaseError by rememberSaveable {
@@ -429,38 +299,43 @@ fun MainPage(
  }

  @Composable
-  fun AuthView() {
-    Surface(color = MaterialTheme.colors.background) {
-      Box(
-        Modifier.fillMaxSize(),
-        contentAlignment = Alignment.Center
-      ) {
-        SimpleButton(
-          stringResource(R.string.auth_unlock),
-          icon = painterResource(R.drawable.ic_lock),
-          click = {
-            laFailed.value = false
-            runAuthenticate()
-          }
-        )
-      }
+  fun authView() {
+    Box(
+      Modifier.fillMaxSize(),
+      contentAlignment = Alignment.Center
+    ) {
+      SimpleButton(
+        stringResource(R.string.auth_unlock),
+        icon = Icons.Outlined.Lock,
+        click = {
+          laFailed.value = false
+          runAuthenticate()
+        }
+      )
    }
  }

  Box {
    val onboarding = chatModel.onboardingStage.value
    val userCreated = chatModel.userCreated.value
-    var showInitializationView by remember { mutableStateOf(false) }
    when {
-      chatModel.chatDbStatus.value == null && showInitializationView -> InitializationView()
      showChatDatabaseError -> {
        chatModel.chatDbStatus.value?.let {
          DatabaseErrorView(chatModel.chatDbStatus, chatModel.controller.appPrefs)
        }
      }
      onboarding == null || userCreated == null -> SplashView()
+      userAuthorized.value != true -> {
+        if (chatModel.controller.appPrefs.performLA.get() && laFailed.value) {
+          authView()
+        } else {
+          SplashView()
+        }
+      }
      onboarding == OnboardingStage.OnboardingComplete && userCreated -> {
        Box {
+          if (chatModel.showCallView.value) ActiveCallView(chatModel)
+          else {
            showAdvertiseLAAlert = true
            BoxWithConstraints {
              var currentChatId by rememberSaveable { mutableStateOf(chatModel.chatId.value) }
@@ -506,65 +381,16 @@ fun MainPage(
              }
            }
          }
+        }
      }
      onboarding == OnboardingStage.Step1_SimpleXInfo -> SimpleXInfo(chatModel, onboarding = true)
      onboarding == OnboardingStage.Step2_CreateProfile -> CreateProfile(chatModel) {}
-      onboarding == OnboardingStage.Step3_CreateSimpleXAddress -> CreateSimpleXAddress(chatModel)
-      onboarding == OnboardingStage.Step4_SetNotificationsMode -> SetNotificationsMode(chatModel)
+      onboarding == OnboardingStage.Step3_SetNotificationsMode -> SetNotificationsMode(chatModel)
    }
    ModalManager.shared.showInView()
-    val unauthorized = remember { derivedStateOf { userAuthorized.value != true } }
-    if (unauthorized.value && !(chatModel.activeCallViewIsVisible.value && chatModel.showCallView.value)) {
-      LaunchedEffect(Unit) {
-        // With these constrains when user presses back button while on ChatList, activity destroys and shows auth request
-        // while the screen moves to a launcher. Detect it and prevent showing the auth
-        if (!(destroyedAfterBackPress.value && chatModel.controller.appPrefs.laMode.get() == LAMode.SYSTEM)) {
-          runAuthenticate()
-        }
-      }
-      if (chatModel.controller.appPrefs.performLA.get() && laFailed.value) {
-        AuthView()
-      } else {
-        SplashView()
-      }
-    } else if (chatModel.showCallView.value) {
-      ActiveCallView(chatModel)
-    }
-    ModalManager.shared.showPasscodeInView()
    val invitation = chatModel.activeCallInvitation.value
    if (invitation != null) IncomingCallAlertView(invitation, chatModel)
    AlertManager.shared.showInView()
-
-    LaunchedEffect(Unit) {
-      delay(1000)
-      if (chatModel.chatDbStatus.value == null) {
-        showInitializationView = true
-      }
-    }
-  }
-
-  DisposableEffectOnRotate {
-    // When using lock delay = 0 and screen rotates, the app will be locked which is not useful.
-    // Let's prolong the unlocked period to 3 sec for screen rotation to take place
-    if (chatModel.controller.appPrefs.laLockDelay.get() == 0) {
-      enteredBackground.value = elapsedRealtime() + 3000
-    }
-  }
-}
-
-@Composable
-private fun InitializationView() {
-  Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
-    Column(horizontalAlignment = Alignment.CenterHorizontally) {
-      CircularProgressIndicator(
-        Modifier
-          .padding(bottom = DEFAULT_PADDING)
-          .size(30.dp),
-        color = MaterialTheme.colors.secondary,
-        strokeWidth = 2.5.dp
-      )
-      Text(stringResource(R.string.opening_database))
-    }
  }
 }

@@ -628,23 +454,14 @@ fun processExternalIntent(intent: Intent?, chatModel: ChatModel) {
      chatModel.chatId.value = null
      chatModel.clearOverlays.value = true
      when {
-        intent.type == "text/plain" -> {
-          val text = intent.getStringExtra(Intent.EXTRA_TEXT)
-          if (text != null) {
-            chatModel.sharedContent.value = SharedContent.Text(text)
-          }
+        "text/plain" == intent.type -> intent.getStringExtra(Intent.EXTRA_TEXT)?.let {
+          chatModel.sharedContent.value = SharedContent.Text(it)
        }
-        isMediaIntent(intent) -> {
-          val uri = intent.getParcelableExtra<Parcelable>(Intent.EXTRA_STREAM) as? Uri
-          if (uri != null) {
-            chatModel.sharedContent.value = SharedContent.Media(intent.getStringExtra(Intent.EXTRA_TEXT) ?: "", listOf(uri))
-          } // All other mime types
-        }
-        else -> {
-          val uri = intent.getParcelableExtra<Parcelable>(Intent.EXTRA_STREAM) as? Uri
-          if (uri != null) {
-            chatModel.sharedContent.value = SharedContent.File(intent.getStringExtra(Intent.EXTRA_TEXT) ?: "", uri)
-          }
+        intent.type?.startsWith("image/") == true -> (intent.getParcelableExtra<Parcelable>(Intent.EXTRA_STREAM) as? Uri)?.let {
+          chatModel.sharedContent.value = SharedContent.Images(intent.getStringExtra(Intent.EXTRA_TEXT) ?: "", listOf(it))
+        } // All other mime types
+        else -> (intent.getParcelableExtra<Parcelable>(Intent.EXTRA_STREAM) as? Uri)?.let {
+          chatModel.sharedContent.value = SharedContent.File(intent.getStringExtra(Intent.EXTRA_TEXT) ?: "", it)
        }
      }
    }
@@ -652,23 +469,16 @@ fun processExternalIntent(intent: Intent?, chatModel: ChatModel) {
      // Close active chat and show a list of chats
      chatModel.chatId.value = null
      chatModel.clearOverlays.value = true
-      Log.e(TAG, "ACTION_SEND_MULTIPLE ${intent.type}")
      when {
-        isMediaIntent(intent) -> {
-          val uris = intent.getParcelableArrayListExtra<Parcelable>(Intent.EXTRA_STREAM) as? List<Uri>
-          if (uris != null) {
-            chatModel.sharedContent.value = SharedContent.Media(intent.getStringExtra(Intent.EXTRA_TEXT) ?: "", uris)
-          } // All other mime types
-        }
+        intent.type?.startsWith("image/") == true -> (intent.getParcelableArrayListExtra<Parcelable>(Intent.EXTRA_STREAM) as? List<Uri>)?.let {
+          chatModel.sharedContent.value = SharedContent.Images(intent.getStringExtra(Intent.EXTRA_TEXT) ?: "", it)
+        } // All other mime types
        else -> {}
      }
    }
  }
 }

-fun isMediaIntent(intent: Intent): Boolean =
-  intent.type?.startsWith("image/") == true || intent.type?.startsWith("video/") == true
-
 fun connectIfOpenedViaUri(uri: Uri, chatModel: ChatModel) {
  Log.d(TAG, "connectIfOpenedViaUri: opened via link")
  if (chatModel.currentUser.value == null) {
@@ -680,7 +490,7 @@ fun connectIfOpenedViaUri(uri: Uri, chatModel: ChatModel) {
        ConnectionLinkType.INVITATION -> generalGetString(R.string.connect_via_invitation_link)
        ConnectionLinkType.GROUP -> generalGetString(R.string.connect_via_group_link)
      }
-      AlertManager.shared.showAlertDialog(
+      AlertManager.shared.showAlertMsg(
        title = title,
        text = if (linkType == ConnectionLinkType.GROUP)
          generalGetString(R.string.you_will_join_group)
--- a/apps/android/app/src/main/java/chat/simplex/app/SimplexApp.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/SimplexApp.kt
@@ -6,7 +6,6 @@ import android.util.Log
 import androidx.lifecycle.*
 import androidx.work.*
 import chat.simplex.app.model.*
-import chat.simplex.app.ui.theme.DefaultTheme
 import chat.simplex.app.views.helpers.*
 import chat.simplex.app.views.onboarding.OnboardingStage
 import chat.simplex.app.views.usersettings.NotificationsMode
@@ -42,7 +41,7 @@ class SimplexApp: Application(), LifecycleEventObserver {

  val defaultLocale: Locale = Locale.getDefault()

-  suspend fun initChatController(useKey: String? = null, confirmMigrations: MigrationConfirmation? = null, startChat: Boolean = true) {
+  fun initChatController(useKey: String? = null, confirmMigrations: MigrationConfirmation? = null, startChat: Boolean = true) {
    val dbKey = useKey ?: DatabaseUtils.useDatabaseKey()
    val dbAbsolutePathPrefix = getFilesDirectory(SimplexApp.context)
    val confirm = confirmMigrations ?: if (appPreferences.confirmDBUpgrades.get()) MigrationConfirmation.Error else MigrationConfirmation.YesUp
@@ -65,22 +64,12 @@ class SimplexApp: Application(), LifecycleEventObserver {
    } else if (startChat) {
      // If we migrated successfully means previous re-encryption process on database level finished successfully too
      if (appPreferences.encryptionStartedAt.get() != null) appPreferences.encryptionStartedAt.set(null)
-      val user = chatController.apiGetActiveUser()
-      if (user == null) {
-        chatModel.controller.appPrefs.onboardingStage.set(OnboardingStage.Step1_SimpleXInfo)
-        chatModel.onboardingStage.value = OnboardingStage.Step1_SimpleXInfo
-        chatModel.currentUser.value = null
-        chatModel.users.clear()
-      } else {
-        val savedOnboardingStage = appPreferences.onboardingStage.get()
-        chatModel.onboardingStage.value = if (listOf(OnboardingStage.Step1_SimpleXInfo, OnboardingStage.Step2_CreateProfile).contains(savedOnboardingStage) && chatModel.users.size == 1) {
-          OnboardingStage.Step3_CreateSimpleXAddress
+      withApi {
+        val user = chatController.apiGetActiveUser()
+        if (user == null) {
+          chatModel.onboardingStage.value = OnboardingStage.Step1_SimpleXInfo
        } else {
-          savedOnboardingStage
-        }
-        chatController.startChat(user)
-        // Prevents from showing "Enable notifications" alert when onboarding wasn't complete yet
-        if (chatModel.onboardingStage.value == OnboardingStage.OnboardingComplete) {
+          chatController.startChat(user)
          chatController.showBackgroundServiceNoticeIfNeeded()
          if (appPreferences.notificationsMode.get() == NotificationsMode.SERVICE.name)
            SimplexService.start(applicationContext)
@@ -103,12 +92,9 @@ class SimplexApp: Application(), LifecycleEventObserver {
  override fun onCreate() {
    super.onCreate()
    context = this
+    initChatController()
+    ProcessLifecycleOwner.get().lifecycle.addObserver(this)
    context.getDir("temp", MODE_PRIVATE).deleteRecursively()
-    runBlocking {
-      initChatController()
-      ProcessLifecycleOwner.get().lifecycle.addObserver(this@SimplexApp)
-      runMigrations()
-    }
  }

  override fun onStateChanged(source: LifecycleOwner, event: Lifecycle.Event) {
@@ -198,23 +184,6 @@ class SimplexApp: Application(), LifecycleEventObserver {
    MessagesFetcherWorker.scheduleWork()
  }

-  private fun runMigrations() {
-    val lastMigration = chatModel.controller.appPrefs.lastMigratedVersionCode
-    if (lastMigration.get() < BuildConfig.VERSION_CODE) {
-      while (true) {
-        if (lastMigration.get() < 117) {
-          if (chatModel.controller.appPrefs.currentTheme.get() == DefaultTheme.DARK.name) {
-            chatModel.controller.appPrefs.currentTheme.set(DefaultTheme.SIMPLEX.name)
-          }
-          lastMigration.set(117)
-        } else {
-          lastMigration.set(BuildConfig.VERSION_CODE)
-          break
-        }
-      }
-    }
-  }
-
  companion object {
    lateinit var context: SimplexApp private set

--- a/apps/android/app/src/main/java/chat/simplex/app/SimplexService.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/SimplexService.kt
@@ -326,4 +326,4 @@ class SimplexService: Service() {

    private fun getPreferences(context: Context): SharedPreferences = context.getSharedPreferences(SHARED_PREFS_ID, Context.MODE_PRIVATE)
  }
-}
+}
--- a/apps/android/app/src/main/java/chat/simplex/app/model/ChatModel.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/model/ChatModel.kt
@@ -2,8 +2,11 @@ package chat.simplex.app.model

 import android.net.Uri
 import androidx.compose.material.MaterialTheme
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.text.SpanStyle
 import androidx.compose.ui.text.font.*
 import androidx.compose.ui.text.style.TextDecoration
@@ -17,16 +20,12 @@ import chat.simplex.app.views.usersettings.NotificationPreviewMode
 import chat.simplex.app.views.usersettings.NotificationsMode
 import kotlinx.coroutines.*
 import kotlinx.datetime.*
-import kotlinx.datetime.TimeZone
 import kotlinx.serialization.*
 import kotlinx.serialization.descriptors.*
 import kotlinx.serialization.encoding.Decoder
 import kotlinx.serialization.encoding.Encoder
 import kotlinx.serialization.json.*
 import java.io.File
-import java.time.format.DateTimeFormatter
-import java.time.format.FormatStyle
-import java.util.*
 import kotlin.random.Random
 import kotlin.time.*

@@ -43,6 +42,7 @@ class ChatModel(val controller: ChatController) {
  val chatDbChanged = mutableStateOf<Boolean>(false)
  val chatDbEncrypted = mutableStateOf<Boolean?>(false)
  val chatDbStatus = mutableStateOf<DBMigrationResult?>(null)
+  val chatDbDeleted = mutableStateOf(false)
  val chats = mutableStateListOf<Chat>()
  // map of connections network statuses, key is agent connection id
  val networkStatuses = mutableStateMapOf<String, NetworkStatus>()
@@ -54,8 +54,10 @@ class ChatModel(val controller: ChatController) {

  val terminalItems = mutableStateListOf<TerminalItem>()
  val userAddress = mutableStateOf<UserContactLinkRec?>(null)
+  val userSMPServers = mutableStateOf<(List<ServerCfg>)?>(null)
  // Allows to temporary save servers that are being edited on multiple screens
  val userSMPServersUnsaved = mutableStateOf<(List<ServerCfg>)?>(null)
+  val presetSMPServers = mutableStateOf<(List<String>)?>(null)
  val chatItemTTL = mutableStateOf<ChatItemTTL>(ChatItemTTL.None)

  // set when app opened from external intent
@@ -76,7 +78,6 @@ class ChatModel(val controller: ChatController) {
  val callInvitations = mutableStateMapOf<String, RcvCallInvitation>()
  val activeCallInvitation = mutableStateOf<RcvCallInvitation?>(null)
  val activeCall = mutableStateOf<Call?>(null)
-  val activeCallViewIsVisible = mutableStateOf<Boolean>(false)
  val callCommand = mutableStateOf<WCallCommand?>(null)
  val showCallView = mutableStateOf(false)
  val switchingCall = mutableStateOf(false)
@@ -240,17 +241,6 @@ class ChatModel(val controller: ChatController) {
    }
  }

-  suspend fun updateChatItem(cInfo: ChatInfo, cItem: ChatItem) {
-    if (chatId.value == cInfo.id) {
-      withContext(Dispatchers.Main) {
-        val itemIndex = chatItems.indexOfFirst { it.id == cItem.id }
-        if (itemIndex >= 0) {
-          chatItems[itemIndex] = cItem
-        }
-      }
-    }
-  }
-
  fun removeChatItem(cInfo: ChatInfo, cItem: ChatItem) {
    if (cItem.isRcvNew) {
      decreaseCounterInChat(cInfo.id)
@@ -474,8 +464,6 @@ data class User(

  val showNotifications: Boolean = activeUser || showNtfs

-  val addressShared: Boolean = profile.contactLink != null
-
  companion object {
    val sampleData = User(
      userId = 1,
@@ -742,15 +730,12 @@ data class Contact(
  override fun featureEnabled(feature: ChatFeature) = when (feature) {
    ChatFeature.TimedMessages -> mergedPreferences.timedMessages.enabled.forUser
    ChatFeature.FullDelete -> mergedPreferences.fullDelete.enabled.forUser
-    ChatFeature.Reactions -> mergedPreferences.reactions.enabled.forUser
    ChatFeature.Voice -> mergedPreferences.voice.enabled.forUser
-    ChatFeature.Calls -> mergedPreferences.calls.enabled.forUser
  }
  override val timedMessagesTTL: Int? get() = with(mergedPreferences.timedMessages) { if (enabled.forUser) userPreference.pref.ttl else null }
  override val displayName get() = localAlias.ifEmpty { profile.displayName }
  override val fullName get() = profile.fullName
  override val image get() = profile.image
-  val contactLink: String? = profile.contactLink
  override val localAlias get() = profile.localAlias
  val verified get() = activeConn.connectionCode != null

@@ -764,16 +749,12 @@ data class Contact(
    ChatFeature.TimedMessages -> mergedPreferences.timedMessages.contactPreference.allow != FeatureAllowed.NO
    ChatFeature.FullDelete -> mergedPreferences.fullDelete.contactPreference.allow != FeatureAllowed.NO
    ChatFeature.Voice -> mergedPreferences.voice.contactPreference.allow != FeatureAllowed.NO
-    ChatFeature.Reactions -> mergedPreferences.reactions.contactPreference.allow != FeatureAllowed.NO
-    ChatFeature.Calls -> mergedPreferences.calls.contactPreference.allow != FeatureAllowed.NO
  }

  fun userAllowsFeature(feature: ChatFeature): Boolean = when (feature) {
    ChatFeature.TimedMessages -> mergedPreferences.timedMessages.userPreference.pref.allow != FeatureAllowed.NO
    ChatFeature.FullDelete -> mergedPreferences.fullDelete.userPreference.pref.allow != FeatureAllowed.NO
-    ChatFeature.Reactions -> mergedPreferences.reactions.userPreference.pref.allow != FeatureAllowed.NO
    ChatFeature.Voice -> mergedPreferences.voice.userPreference.pref.allow != FeatureAllowed.NO
-    ChatFeature.Calls -> mergedPreferences.calls.userPreference.pref.allow != FeatureAllowed.NO
  }

  companion object {
@@ -833,7 +814,6 @@ data class Profile(
  override val fullName: String,
  override val image: String? = null,
  override val localAlias : String = "",
-  val contactLink: String? = null,
  val preferences: ChatPreferences? = null
 ): NamedChat {
  val profileViewName: String
@@ -841,7 +821,7 @@ data class Profile(
      return if (fullName == "" || displayName == fullName) displayName else "$displayName ($fullName)"
    }

-  fun toLocalProfile(profileId: Long): LocalProfile = LocalProfile(profileId, displayName, fullName, image, localAlias, contactLink, preferences)
+  fun toLocalProfile(profileId: Long): LocalProfile = LocalProfile(profileId, displayName, fullName, image, localAlias, preferences)

  companion object {
    val sampleData = Profile(
@@ -852,18 +832,17 @@ data class Profile(
 }

@Serializable
-data class LocalProfile(
+class LocalProfile(
  val profileId: Long,
  override val displayName: String,
  override val fullName: String,
  override val image: String? = null,
  override val localAlias: String,
-  val contactLink: String? = null,
  val preferences: ChatPreferences? = null
 ): NamedChat {
  val profileViewName: String = localAlias.ifEmpty { if (fullName == "" || displayName == fullName) displayName else "$displayName ($fullName)" }

-  fun toProfile(): Profile = Profile(displayName, fullName, image, localAlias, contactLink, preferences)
+  fun toProfile(): Profile = Profile(displayName, fullName, image, localAlias, preferences)

  companion object {
    val sampleData = LocalProfile(
@@ -904,9 +883,7 @@ data class GroupInfo (
  override fun featureEnabled(feature: ChatFeature) = when (feature) {
    ChatFeature.TimedMessages -> fullGroupPreferences.timedMessages.on
    ChatFeature.FullDelete -> fullGroupPreferences.fullDelete.on
-    ChatFeature.Reactions -> fullGroupPreferences.reactions.on
    ChatFeature.Voice -> fullGroupPreferences.voice.on
-    ChatFeature.Calls -> false
  }
  override val timedMessagesTTL: Int? get() = with(fullGroupPreferences.timedMessages) { if (on) ttl else null }
  override val displayName get() = groupProfile.displayName
@@ -974,7 +951,6 @@ data class GroupMember (
  val displayName: String get() = memberProfile.localAlias.ifEmpty { memberProfile.displayName }
  val fullName: String get() = memberProfile.fullName
  val image: String? get() = memberProfile.image
-  val contactLink: String? = memberProfile.contactLink
  val verified get() = activeConn?.connectionCode != null

  val chatViewName: String
@@ -1274,20 +1250,6 @@ class AChatItem (
  val chatItem: ChatItem
 )

-@Serializable
-class ACIReaction(
-  val chatInfo: ChatInfo,
-  val chatReaction: CIReaction
-)
-
-@Serializable
-class CIReaction(
-  val chatDir: CIDirection,
-  val chatItem: ChatItem,
-  val sentAt: Instant,
-  val reaction: MsgReaction
-)
-
@Serializable @Stable
 data class ChatItem (
  val chatDir: CIDirection,
@@ -1295,7 +1257,6 @@ data class ChatItem (
  val content: CIContent,
  val formattedText: List<FormattedText>? = null,
  val quotedItem: CIQuote? = null,
-  val reactions: List<CIReactionCount>,
  val file: CIFile? = null
 ) {
  val id: Long get() = meta.itemId
@@ -1312,11 +1273,6 @@ data class ChatItem (

  val isRcvNew: Boolean get() = meta.isRcvNew

-  val allowAddReaction: Boolean get() =
-    meta.itemDeleted == null && !isLiveDummy && (reactions.count { it.userReacted } < 3)
-
-  private val isLiveDummy: Boolean get() = meta.itemId == TEMP_LIVE_CHAT_ITEM_ID
-
  val memberDisplayName: String? get() =
    if (chatDir is CIDirection.GroupRcv) chatDir.groupMember.displayName
    else null
@@ -1354,7 +1310,6 @@ data class ChatItem (
      is CIContent.SndCall -> showNtfDir
      is CIContent.RcvCall -> false // notification is shown on CallInvitation instead
      is CIContent.RcvIntegrityError -> showNtfDir
-      is CIContent.RcvDecryptionError -> showNtfDir
      is CIContent.RcvGroupInvitation -> showNtfDir
      is CIContent.SndGroupInvitation -> showNtfDir
      is CIContent.RcvGroupEventContent -> when (content.rcvGroupEvent) {
@@ -1406,7 +1361,6 @@ data class ChatItem (
        meta = CIMeta.getSample(id, ts, text, status, itemDeleted, itemEdited, itemTimed, editable),
        content = CIContent.SndMsgContent(msgContent = MsgContent.MCText(text)),
        quotedItem = quotedItem,
-        reactions = listOf(),
        file = file
      )

@@ -1422,7 +1376,6 @@ data class ChatItem (
        meta = CIMeta.getSample(id, Clock.System.now(), text, CIStatus.RcvRead()),
        content = CIContent.RcvMsgContent(msgContent = MsgContent.MCFile(text)),
        quotedItem = null,
-        reactions = listOf(),
        file = CIFile.getSample(fileName = fileName, fileSize = fileSize, fileStatus = fileStatus)
      )

@@ -1438,7 +1391,6 @@ data class ChatItem (
        meta = CIMeta.getSample(id, ts, text, status),
        content = CIContent.RcvDeleted(deleteMode = CIDeleteMode.cidmBroadcast),
        quotedItem = null,
-        reactions = listOf(),
        file = null
      )

@@ -1448,7 +1400,6 @@ data class ChatItem (
        meta = CIMeta.getSample(1, Clock.System.now(), "received invitation to join group team as admin", CIStatus.RcvRead()),
        content = CIContent.RcvGroupInvitation(groupInvitation = CIGroupInvitation.getSample(status = status), memberRole = GroupMemberRole.Admin),
        quotedItem = null,
-        reactions = listOf(),
        file = null
      )

@@ -1458,7 +1409,6 @@ data class ChatItem (
        meta = CIMeta.getSample(1, Clock.System.now(), "group event text", CIStatus.RcvRead()),
        content = CIContent.RcvGroupEventContent(rcvGroupEvent = RcvGroupEvent.MemberAdded(groupMemberId = 1, profile = Profile.sampleData)),
        quotedItem = null,
-        reactions = listOf(),
        file = null
      )

@@ -1469,7 +1419,6 @@ data class ChatItem (
        meta = CIMeta.getSample(1, Clock.System.now(), content.text, CIStatus.RcvRead()),
        content = content,
        quotedItem = null,
-        reactions = listOf(),
        file = null
      )
    }
@@ -1495,7 +1444,6 @@ data class ChatItem (
        ),
        content = CIContent.RcvDeleted(deleteMode = CIDeleteMode.cidmBroadcast),
        quotedItem = null,
-        reactions = listOf(),
        file = null
      )

@@ -1516,17 +1464,15 @@ data class ChatItem (
        ),
        content = CIContent.SndMsgContent(MsgContent.MCText("")),
        quotedItem = null,
-        reactions = listOf(),
        file = null
      )

-    fun invalidJSON(chatDir: CIDirection?, meta: CIMeta?, json: String): ChatItem =
+    fun invalidJSON(json: String): ChatItem =
      ChatItem(
-        chatDir = chatDir ?: CIDirection.DirectSnd(),
-        meta = meta ?: CIMeta.invalidJSON(),
+        chatDir = CIDirection.DirectSnd(),
+        meta = CIMeta.invalidJSON(),
        content = CIContent.InvalidJSON(json),
        quotedItem = null,
-        reactions = listOf(),
        file = null
      )
  }
@@ -1568,12 +1514,12 @@ data class CIMeta (

  val isRcvNew: Boolean get() = itemStatus is CIStatus.RcvNew

-  fun statusIcon(primaryColor: Color, metaColor: Color = CurrentColors.value.colors.secondary): Pair<Int, Color>? =
+  fun statusIcon(primaryColor: Color, metaColor: Color = HighOrLowlight): Pair<ImageVector, Color>? =
    when (itemStatus) {
-      is CIStatus.SndSent -> R.drawable.ic_check_filled to metaColor
-      is CIStatus.SndErrorAuth -> R.drawable.ic_close to Color.Red
-      is CIStatus.SndError -> R.drawable.ic_warning_filled to WarningYellow
-      is CIStatus.RcvNew -> R.drawable.ic_circle_filled to primaryColor
+      is CIStatus.SndSent -> Icons.Filled.Check to metaColor
+      is CIStatus.SndErrorAuth -> Icons.Filled.Close to Color.Red
+      is CIStatus.SndError -> Icons.Filled.WarningAmber to WarningYellow
+      is CIStatus.RcvNew -> Icons.Filled.Circle to primaryColor
      else -> null
    }

@@ -1626,28 +1572,8 @@ fun getTimestampText(t: Instant): String {
  val time: LocalDateTime = t.toLocalDateTime(tz)
  val recent = now.date == time.date ||
      (now.date.minus(time.date).days == 1 && now.hour < 12 && time.hour >= 18 )
-  val dateFormatter =
-    if (recent) {
-      DateTimeFormatter.ofLocalizedTime(FormatStyle.SHORT)
-    } else {
-      DateTimeFormatter.ofPattern(
-        when (Locale.getDefault().country) {
-          "US" -> "M/dd"
-          "DE" -> "dd.MM"
-          "RU" -> "dd.MM"
-          else -> "dd/MM"
-        }
-      )
-//      DateTimeFormatter.ofLocalizedDate(FormatStyle.SHORT)
-    }
-  return time.toJavaLocalDateTime().format(dateFormatter)
-}
-
-fun localTimestamp(t: Instant): String {
-  val tz = TimeZone.currentSystemDefault()
-  val ts: LocalDateTime = t.toLocalDateTime(tz)
-  val dateFormatter = DateTimeFormatter.ofLocalizedDateTime(FormatStyle.MEDIUM)
-  return ts.toJavaLocalDateTime().format(dateFormatter)
+  return if (recent) String.format("%02d:%02d", time.hour, time.minute)
+                else String.format("%02d/%02d", time.dayOfMonth, time.monthNumber)
 }

@Serializable
@@ -1662,8 +1588,8 @@ sealed class CIStatus {

@Serializable
 sealed class CIDeleted {
-  @Serializable @SerialName("deleted") class Deleted(val deletedTs: Instant?): CIDeleted()
-  @Serializable @SerialName("moderated") class Moderated(val deletedTs: Instant?, val byGroupMember: GroupMember): CIDeleted()
+  @Serializable @SerialName("deleted") class Deleted: CIDeleted()
+  @Serializable @SerialName("moderated") class Moderated(val byGroupMember: GroupMember): CIDeleted()
 }

@Serializable
@@ -1687,7 +1613,6 @@ sealed class CIContent: ItemContent {
  @Serializable @SerialName("sndCall") class SndCall(val status: CICallStatus, val duration: Int): CIContent() { override val msgContent: MsgContent? get() = null }
  @Serializable @SerialName("rcvCall") class RcvCall(val status: CICallStatus, val duration: Int): CIContent() { override val msgContent: MsgContent? get() = null }
  @Serializable @SerialName("rcvIntegrityError") class RcvIntegrityError(val msgError: MsgErrorType): CIContent() { override val msgContent: MsgContent? get() = null }
-  @Serializable @SerialName("rcvDecryptionError") class RcvDecryptionError(val msgDecryptError: MsgDecryptError, val msgCount: UInt): CIContent() { override val msgContent: MsgContent? get() = null }
  @Serializable @SerialName("rcvGroupInvitation") class RcvGroupInvitation(val groupInvitation: CIGroupInvitation, val memberRole: GroupMemberRole): CIContent() { override val msgContent: MsgContent? get() = null }
  @Serializable @SerialName("sndGroupInvitation") class SndGroupInvitation(val groupInvitation: CIGroupInvitation, val memberRole: GroupMemberRole): CIContent() { override val msgContent: MsgContent? get() = null }
  @Serializable @SerialName("rcvGroupEvent") class RcvGroupEventContent(val rcvGroupEvent: RcvGroupEvent): CIContent() { override val msgContent: MsgContent? get() = null }
@@ -1714,7 +1639,6 @@ sealed class CIContent: ItemContent {
      is SndCall -> status.text(duration)
      is RcvCall -> status.text(duration)
      is RcvIntegrityError -> msgError.text
-      is RcvDecryptionError -> msgDecryptError.text
      is RcvGroupInvitation -> groupInvitation.text
      is SndGroupInvitation -> groupInvitation.text
      is RcvGroupEventContent -> rcvGroupEvent.text
@@ -1737,33 +1661,22 @@ sealed class CIContent: ItemContent {
  companion object {
    fun featureText(feature: Feature, enabled: String, param: Int?): String =
      if (feature.hasParam) {
-        "${feature.text}: ${timeText(param)}"
+        "${feature.text}: ${TimedMessagesPreference.ttlText(param)}"
      } else {
        "${feature.text}: $enabled"
      }

    fun preferenceText(feature: Feature, allowed: FeatureAllowed, param: Int?): String = when {
      allowed != FeatureAllowed.NO && feature.hasParam && param != null ->
-        String.format(generalGetString(R.string.feature_offered_item_with_param), feature.text, timeText(param))
+        String.format(generalGetString(R.string.feature_offered_item_with_param), feature.text, TimedMessagesPreference.ttlText(param))
      allowed != FeatureAllowed.NO ->
-        String.format(generalGetString(R.string.feature_offered_item), feature.text, timeText(param))
+        String.format(generalGetString(R.string.feature_offered_item), feature.text, TimedMessagesPreference.ttlText(param))
      else ->
-        String.format(generalGetString(R.string.feature_cancelled_item), feature.text, timeText(param))
+        String.format(generalGetString(R.string.feature_cancelled_item), feature.text, TimedMessagesPreference.ttlText(param))
    }
  }
 }

-@Serializable
-enum class MsgDecryptError {
-  @SerialName("ratchetHeader") RatchetHeader,
-  @SerialName("tooManySkipped") TooManySkipped;
-
-  val text: String get() = when (this) {
-    RatchetHeader -> generalGetString(R.string.decryption_error)
-    TooManySkipped -> generalGetString(R.string.decryption_error)
-  }
-}
-
@Serializable
 class CIQuote (
  val chatDir: CIDirection? = null,
@@ -1795,75 +1708,6 @@ class CIQuote (
  }
 }

-@Serializable
-class CIReactionCount(val reaction: MsgReaction, val userReacted: Boolean, val totalReacted: Int)
-
-@Serializable(with = MsgReactionSerializer::class)
-sealed class MsgReaction {
-  @Serializable(with = MsgReactionSerializer::class) class Emoji(val emoji: MREmojiChar): MsgReaction()
-  @Serializable(with = MsgReactionSerializer::class) class Unknown(val type: String? = null, val json: JsonElement): MsgReaction()
-
-  val text: String get() = when (this) {
-    is Emoji -> when (emoji) {
-      MREmojiChar.Heart -> "❤️"
-      else -> emoji.value
-    }
-    is Unknown -> ""
-  }
-
-  companion object {
-    val values: List<MsgReaction> get() = MREmojiChar.values().map(::Emoji)
-  }
-}
-
-object MsgReactionSerializer : KSerializer<MsgReaction> {
-  override val descriptor: SerialDescriptor = buildSerialDescriptor("MsgReaction", PolymorphicKind.SEALED) {
-    element("Emoji", buildClassSerialDescriptor("Emoji") {
-      element<String>("emoji")
-    })
-    element("Unknown", buildClassSerialDescriptor("Unknown"))
-  }
-
-  override fun deserialize(decoder: Decoder): MsgReaction {
-    require(decoder is JsonDecoder)
-    val json = decoder.decodeJsonElement()
-    return if (json is JsonObject && "type" in json) {
-      when(val t = json["type"]?.jsonPrimitive?.content ?: "") {
-        "emoji" -> {
-          val emoji = Json.decodeFromString<MREmojiChar>(json["emoji"].toString())
-          if (emoji == null) MsgReaction.Unknown(t, json) else MsgReaction.Emoji(emoji)
-        }
-        else -> MsgReaction.Unknown(t, json)
-      }
-    } else {
-      MsgReaction.Unknown("", json)
-    }
-  }
-
-  override fun serialize(encoder: Encoder, value: MsgReaction) {
-    require(encoder is JsonEncoder)
-    val json = when (value) {
-      is MsgReaction.Emoji ->
-        buildJsonObject {
-          put("type", "emoji")
-          put("emoji", json.encodeToJsonElement(value.emoji))
-        }
-      is MsgReaction.Unknown -> value.json
-    }
-    encoder.encodeJsonElement(json)
-  }
-}
-
-@Serializable
-enum class MREmojiChar(val value: String) {
-  @SerialName("👍") ThumbsUp("👍"),
-  @SerialName("👎") ThumbsDown("👎"),
-  @SerialName("😀") Smile("😀"),
-  @SerialName("😢") Sad("😢"),
-  @SerialName("❤") Heart("❤"),
-  @SerialName("🚀") Launch("🚀");
-}
-
@Serializable
 class CIFile(
  val fileId: Long,
@@ -1878,32 +1722,23 @@ class CIFile(
    is CIFileStatus.SndTransfer -> true
    is CIFileStatus.SndComplete -> true
    is CIFileStatus.SndCancelled -> true
-    is CIFileStatus.SndError -> true
    is CIFileStatus.RcvInvitation -> false
    is CIFileStatus.RcvAccepted -> false
    is CIFileStatus.RcvTransfer -> false
    is CIFileStatus.RcvCancelled -> false
    is CIFileStatus.RcvComplete -> true
-    is CIFileStatus.RcvError -> false
  }

-  val cancelAction: CancelAction? = when (fileStatus) {
-    is CIFileStatus.SndStored -> sndCancelAction
-    is CIFileStatus.SndTransfer -> sndCancelAction
-    is CIFileStatus.SndComplete ->
-      if (fileProtocol == FileProtocol.XFTP) {
-        revokeCancelAction
-      } else {
-        null
-      }
-    is CIFileStatus.SndCancelled -> null
-    is CIFileStatus.SndError -> null
-    is CIFileStatus.RcvInvitation -> null
-    is CIFileStatus.RcvAccepted -> rcvCancelAction
-    is CIFileStatus.RcvTransfer -> rcvCancelAction
-    is CIFileStatus.RcvCancelled -> null
-    is CIFileStatus.RcvComplete -> null
-    is CIFileStatus.RcvError -> null
+  val cancellable: Boolean = when (fileStatus) {
+    is CIFileStatus.SndStored -> fileProtocol != FileProtocol.XFTP // TODO true - enable when XFTP send supports cancel
+    is CIFileStatus.SndTransfer -> fileProtocol != FileProtocol.XFTP // TODO true
+    is CIFileStatus.SndComplete -> false
+    is CIFileStatus.SndCancelled -> false
+    is CIFileStatus.RcvInvitation -> false
+    is CIFileStatus.RcvAccepted -> true
+    is CIFileStatus.RcvTransfer -> true
+    is CIFileStatus.RcvCancelled -> false
+    is CIFileStatus.RcvComplete -> false
  }

  companion object {
@@ -1918,44 +1753,6 @@ class CIFile(
  }
 }

-@Serializable
-class CancelAction(
-  val uiActionId: Int,
-  val alert: AlertInfo
-)
-
-@Serializable
-class AlertInfo(
-  val titleId: Int,
-  val messageId: Int,
-  val confirmId: Int
-)
-
-private val sndCancelAction: CancelAction = CancelAction(
-  uiActionId = R.string.stop_file__action,
-  alert = AlertInfo(
-    titleId = R.string.stop_snd_file__title,
-    messageId = R.string.stop_snd_file__message,
-    confirmId = R.string.stop_file__confirm
-  )
-)
-private val revokeCancelAction: CancelAction = CancelAction(
-  uiActionId = R.string.revoke_file__action,
-  alert = AlertInfo(
-    titleId = R.string.revoke_file__title,
-    messageId = R.string.revoke_file__message,
-    confirmId = R.string.revoke_file__confirm
-  )
-)
-private val rcvCancelAction: CancelAction = CancelAction(
-  uiActionId = R.string.stop_file__action,
-  alert = AlertInfo(
-    titleId = R.string.stop_rcv_file__title,
-    messageId = R.string.stop_rcv_file__message,
-    confirmId = R.string.stop_file__confirm
-  )
-)
-
@Serializable
 enum class FileProtocol {
  @SerialName("smp") SMP,
@@ -1968,13 +1765,11 @@ sealed class CIFileStatus {
  @Serializable @SerialName("sndTransfer") class SndTransfer(val sndProgress: Long, val sndTotal: Long): CIFileStatus()
  @Serializable @SerialName("sndComplete") object SndComplete: CIFileStatus()
  @Serializable @SerialName("sndCancelled") object SndCancelled: CIFileStatus()
-  @Serializable @SerialName("sndError") object SndError: CIFileStatus()
  @Serializable @SerialName("rcvInvitation") object RcvInvitation: CIFileStatus()
  @Serializable @SerialName("rcvAccepted") object RcvAccepted: CIFileStatus()
  @Serializable @SerialName("rcvTransfer") class RcvTransfer(val rcvProgress: Long, val rcvTotal: Long): CIFileStatus()
  @Serializable @SerialName("rcvComplete") object RcvComplete: CIFileStatus()
  @Serializable @SerialName("rcvCancelled") object RcvCancelled: CIFileStatus()
-  @Serializable @SerialName("rcvError") object RcvError: CIFileStatus()
 }

@Suppress("SERIALIZER_TYPE_INCOMPATIBLE")
@@ -2249,11 +2044,7 @@ enum class CICallStatus {
  }
 }

-fun durationText(sec: Int): String {
-  val s = sec % 60
-  val m = sec / 60
-  return if (m < 60) "%02d:%02d".format(m, s) else "%02d:%02d:%02d".format(m / 60, m % 60, s)
-}
+fun durationText(sec: Int): String = "%02d:%02d".format(sec / 60, sec % 60)

@Serializable
 sealed class MsgErrorType() {
@@ -2384,17 +2175,3 @@ sealed class ChatItemTTL: Comparable<ChatItemTTL?> {
      }
  }
 }
-
-@Serializable
-class ChatItemInfo(
-  val itemVersions: List<ChatItemVersion>,
-)
-
-@Serializable
-data class ChatItemVersion(
-  val chatItemVersionId: Long,
-  val msgContent: MsgContent,
-  val formattedText: List<FormattedText>?,
-  val itemVersionTs: Instant,
-  val createdAt: Instant,
-)
--- a/apps/android/app/src/main/java/chat/simplex/app/model/NtfManager.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/model/NtfManager.kt
@@ -231,10 +231,6 @@ class NtfManager(val context: Context, private val appPreferences: AppPreference
    manager.cancel(CallNotificationId)
  }

-  fun cancelAllNotifications() {
-    manager.cancelAll()
-  }
-
  fun hasNotificationsForChat(chatId: String): Boolean = manager.activeNotifications.any { it.id == chatId.hashCode() }

  private fun hideSecrets(cItem: ChatItem) : String {
--- a/apps/android/app/src/main/java/chat/simplex/app/model/SimpleXAPI.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/model/SimpleXAPI.kt
--- a/apps/android/app/src/main/java/chat/simplex/app/ui/theme/Color.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/ui/theme/Color.kt
@@ -18,11 +18,12 @@ val MessagePreviewDark = Color(179, 175, 174, 255)
 val MessagePreviewLight = Color(49, 45, 44, 255)
 val ToolbarLight = Color(220, 220, 220, 12)
 val ToolbarDark = Color(80, 80, 80, 12)
+val SettingsBackgroundLight = Color(220, 216, 215, 90)
 val SettingsSecondaryLight = Color(200, 196, 195, 90)
 val GroupDark = Color(80, 80, 80, 60)
 val IncomingCallLight = Color(239, 237, 236, 255)
+val IncomingCallDark = Color(34, 30, 29, 255)
 val WarningOrange = Color(255, 127, 0, 255)
 val WarningYellow = Color(255, 192, 0, 255)
 val FileLight = Color(183, 190, 199, 255)
 val FileDark = Color(101, 101, 106, 255)
-val MenuTextColorDark = Color.White.copy(alpha = 0.8f)
--- a/apps/android/app/src/main/java/chat/simplex/app/ui/theme/Shape.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/ui/theme/Shape.kt
@@ -8,4 +8,4 @@ val Shapes = Shapes(
  small = RoundedCornerShape(4.dp),
  medium = RoundedCornerShape(4.dp),
  large = RoundedCornerShape(0.dp)
-)
+)
--- a/apps/android/app/src/main/java/chat/simplex/app/ui/theme/Theme.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/ui/theme/Theme.kt
@@ -2,264 +2,56 @@ package chat.simplex.app.ui.theme

 import android.app.UiModeManager
 import android.content.Context
-import androidx.compose.foundation.background
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.material.*
 import androidx.compose.runtime.*
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.geometry.Offset
-import androidx.compose.ui.graphics.*
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
-import chat.simplex.app.R
 import chat.simplex.app.SimplexApp
-import chat.simplex.app.views.helpers.*
 import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-import okhttp3.internal.toHexString

 enum class DefaultTheme {
-  SYSTEM, LIGHT, DARK, SIMPLEX;
-
-  // Call it only with base theme, not SYSTEM
-  fun hasChangedAnyColor(colors: Colors, appColors: AppColors): Boolean {
-    val palette = when (this) {
-      SYSTEM -> return false
-      LIGHT -> LightColorPalette
-      DARK -> DarkColorPalette
-      SIMPLEX -> SimplexColorPalette
-    }
-    val appPalette = when (this) {
-      SYSTEM -> return false
-      LIGHT -> LightColorPaletteApp
-      DARK -> DarkColorPaletteApp
-      SIMPLEX -> SimplexColorPaletteApp
-    }
-    return colors.primary != palette.primary ||
-        colors.primaryVariant != palette.primaryVariant ||
-        colors.secondary != palette.secondary ||
-        colors.secondaryVariant != palette.secondaryVariant ||
-        colors.background != palette.background ||
-        colors.surface != palette.surface ||
-        appColors != appPalette
-  }
+  SYSTEM, DARK, LIGHT
 }

-data class AppColors(
-  val title: Color,
-  val sentMessage: Color,
-  val receivedMessage: Color
-)
-
-enum class ThemeColor {
-  PRIMARY, PRIMARY_VARIANT, SECONDARY, SECONDARY_VARIANT, BACKGROUND, SURFACE, TITLE, SENT_MESSAGE, RECEIVED_MESSAGE;
-
-  fun fromColors(colors: Colors, appColors: AppColors): Color {
-    return when (this) {
-      PRIMARY -> colors.primary
-      PRIMARY_VARIANT -> colors.primaryVariant
-      SECONDARY -> colors.secondary
-      SECONDARY_VARIANT -> colors.secondaryVariant
-      BACKGROUND -> colors.background
-      SURFACE -> colors.surface
-      TITLE -> appColors.title
-      SENT_MESSAGE -> appColors.sentMessage
-      RECEIVED_MESSAGE -> appColors.receivedMessage
-    }
-  }
-
-  val text: String
-    get() = when (this) {
-      PRIMARY -> generalGetString(R.string.color_primary)
-      PRIMARY_VARIANT -> generalGetString(R.string.color_primary_variant)
-      SECONDARY -> generalGetString(R.string.color_secondary)
-      SECONDARY_VARIANT -> generalGetString(R.string.color_secondary_variant)
-      BACKGROUND -> generalGetString(R.string.color_background)
-      SURFACE -> generalGetString(R.string.color_surface)
-      TITLE -> generalGetString(R.string.color_title)
-      SENT_MESSAGE -> generalGetString(R.string.color_sent_message)
-      RECEIVED_MESSAGE -> generalGetString(R.string.color_received_message)
-    }
-}
-
-@Serializable
-data class ThemeColors(
-  @SerialName("accent")
-  val primary: String? = null,
-  @SerialName("accentVariant")
-  val primaryVariant: String? = null,
-  val secondary: String? = null,
-  val secondaryVariant: String? = null,
-  val background: String? = null,
-  @SerialName("menus")
-  val surface: String? = null,
-  val title: String? = null,
-  val sentMessage: String? = null,
-  val receivedMessage: String? = null,
-) {
-  fun toColors(base: DefaultTheme): Colors {
-    val baseColors = when (base) {
-      DefaultTheme.LIGHT -> LightColorPalette
-      DefaultTheme.DARK -> DarkColorPalette
-      DefaultTheme.SIMPLEX -> SimplexColorPalette
-      // shouldn't be here
-      DefaultTheme.SYSTEM -> LightColorPalette
-    }
-    return baseColors.copy(
-      primary = primary?.colorFromReadableHex() ?: baseColors.primary,
-      primaryVariant = primaryVariant?.colorFromReadableHex() ?: baseColors.primaryVariant,
-      secondary = secondary?.colorFromReadableHex() ?: baseColors.secondary,
-      secondaryVariant = secondaryVariant?.colorFromReadableHex() ?: baseColors.secondaryVariant,
-      background = background?.colorFromReadableHex() ?: baseColors.background,
-      surface = surface?.colorFromReadableHex() ?: baseColors.surface,
-    )
-  }
-
-  fun toAppColors(base: DefaultTheme): AppColors {
-    val baseColors = when (base) {
-      DefaultTheme.LIGHT -> LightColorPaletteApp
-      DefaultTheme.DARK -> DarkColorPaletteApp
-      DefaultTheme.SIMPLEX -> SimplexColorPaletteApp
-      // shouldn't be here
-      DefaultTheme.SYSTEM -> LightColorPaletteApp
-    }
-    return baseColors.copy(
-      title = title?.colorFromReadableHex() ?: baseColors.title,
-      sentMessage = sentMessage?.colorFromReadableHex() ?: baseColors.sentMessage,
-      receivedMessage = receivedMessage?.colorFromReadableHex() ?: baseColors.receivedMessage,
-    )
-  }
-
-  fun withFilledColors(base: DefaultTheme): ThemeColors {
-    val c = toColors(base)
-    val ac = toAppColors(base)
-    return ThemeColors(
-      primary = c.primary.toReadableHex(),
-      primaryVariant = c.primaryVariant.toReadableHex(),
-      secondary = c.secondary.toReadableHex(),
-      secondaryVariant = c.secondaryVariant.toReadableHex(),
-      background = c.background.toReadableHex(),
-      surface = c.surface.toReadableHex(),
-      title = ac.title.toReadableHex(),
-      sentMessage = ac.sentMessage.toReadableHex(),
-      receivedMessage = ac.receivedMessage.toReadableHex()
-    )
-  }
-}
-
-private fun String.colorFromReadableHex(): Color =
-  Color(this.replace("#", "").toLongOrNull(16) ?: Color.White.toArgb().toLong())
-
-private fun Color.toReadableHex(): String = "#" + toArgb().toHexString()
-
-@Serializable
-data class ThemeOverrides (
-  val base: DefaultTheme,
-  val colors: ThemeColors
-) {
-  fun withUpdatedColor(name: ThemeColor, color: String): ThemeOverrides {
-    return copy(colors = when (name) {
-      ThemeColor.PRIMARY -> colors.copy(primary = color)
-      ThemeColor.PRIMARY_VARIANT -> colors.copy(primaryVariant = color)
-      ThemeColor.SECONDARY -> colors.copy(secondary = color)
-      ThemeColor.SECONDARY_VARIANT -> colors.copy(secondaryVariant = color)
-      ThemeColor.BACKGROUND -> colors.copy(background = color)
-      ThemeColor.SURFACE -> colors.copy(surface = color)
-      ThemeColor.TITLE -> colors.copy(title = color)
-      ThemeColor.SENT_MESSAGE -> colors.copy(sentMessage = color)
-      ThemeColor.RECEIVED_MESSAGE -> colors.copy(receivedMessage = color)
-    })
-  }
-}
-
-fun Modifier.themedBackground(baseTheme: DefaultTheme = CurrentColors.value.base, shape: Shape = RectangleShape): Modifier {
-  return if (baseTheme == DefaultTheme.SIMPLEX) {
-    this.background(brush = Brush.linearGradient(
-      listOf(
-        CurrentColors.value.colors.background.darker(0.4f),
-        CurrentColors.value.colors.background.lighter(0.4f)
-      ),
-      Offset(0f, Float.POSITIVE_INFINITY),
-      Offset(Float.POSITIVE_INFINITY, 0f)
-    ), shape = shape)
-  } else {
-    this.background(color = CurrentColors.value.colors.background, shape = shape)
-  }
-}
-
-val DEFAULT_PADDING = 20.dp
+val DEFAULT_PADDING = 16.dp
 val DEFAULT_SPACE_AFTER_ICON = 4.dp
 val DEFAULT_PADDING_HALF = DEFAULT_PADDING / 2
 val DEFAULT_BOTTOM_PADDING = 48.dp
-val DEFAULT_BOTTOM_BUTTON_PADDING = 20.dp

 val DarkColorPalette = darkColors(
  primary = SimplexBlue,  // If this value changes also need to update #0088ff in string resource files
-  primaryVariant = SimplexBlue,
-  secondary = HighOrLowlight,
-  secondaryVariant = DarkGray,
+  primaryVariant = SimplexGreen,
+  secondary = DarkGray,
 //  background = Color.Black,
-  surface = Color(0xFF222222),
+//  surface = Color.Black,
 //  background = Color(0xFF121212),
 //  surface = Color(0xFF121212),
-  error = Color.Red,
+//  error = Color(0xFFCF6679),
  onBackground = Color(0xFFFFFBFA),
  onSurface = Color(0xFFFFFBFA),
 //  onError: Color = Color.Black,
 )
-val DarkColorPaletteApp = AppColors(
-  title = SimplexBlue,
-  sentMessage = Color(0x1E45B8FF),
-  receivedMessage = Color(0x20B1B0B5)
-)
-
 val LightColorPalette = lightColors(
  primary = SimplexBlue,  // If this value changes also need to update #0088ff in string resource files
-  primaryVariant = SimplexBlue,
-  secondary = HighOrLowlight,
-  secondaryVariant = LightGray,
-  error = Color.Red,
+  primaryVariant = SimplexGreen,
+  secondary = LightGray,
 //  background = Color.White,
-  surface = Color.White,
+//  surface = Color.White
 //  onPrimary = Color.White,
 //  onSecondary = Color.Black,
 //  onBackground = Color.Black,
 //  onSurface = Color.Black,
 )
-val LightColorPaletteApp = AppColors(
-  title = SimplexBlue,
-  sentMessage = Color(0x1E45B8FF),
-  receivedMessage = Color(0x20B1B0B5)
-)

-val SimplexColorPalette = darkColors(
-  primary = Color(0xFF70F0F9),  // If this value changes also need to update #0088ff in string resource files
-  primaryVariant = Color(0xFF1298A5),
-  secondary = HighOrLowlight,
-  secondaryVariant = Color(0xFF2C464D),
-  background = Color(0xFF111528),
-  //  surface = Color.Black,
-  //  background = Color(0xFF121212),
-  surface = Color(0xFF121C37),
-  error = Color.Red,
-//  onBackground = Color(0xFFFFFBFA),
-//  onSurface = Color(0xFFFFFBFA),
-  //  onError: Color = Color.Black,
-)
-val SimplexColorPaletteApp = AppColors(
-  title = Color(0xFF267BE5),
-  sentMessage = Color(0x1E45B8FF),
-  receivedMessage = Color(0x20B1B0B5)
-)
-
-val CurrentColors: MutableStateFlow<ThemeManager.ActiveTheme> = MutableStateFlow(ThemeManager.currentColors(isInNightMode()))
+val CurrentColors: MutableStateFlow<Pair<Colors, DefaultTheme>> = MutableStateFlow(ThemeManager.currentColors(isInNightMode()))

 // Non-@Composable implementation
 private fun isInNightMode() =
  (SimplexApp.context.getSystemService(Context.UI_MODE_SERVICE) as UiModeManager).nightMode == UiModeManager.MODE_NIGHT_YES

@Composable
-fun isInDarkTheme(): Boolean = !CurrentColors.collectAsState().value.colors.isLight
+fun isInDarkTheme(): Boolean = !CurrentColors.collectAsState().value.first.isLight

@Composable
 fun SimpleXTheme(darkTheme: Boolean? = null, content: @Composable () -> Unit) {
@@ -270,16 +62,16 @@ fun SimpleXTheme(darkTheme: Boolean? = null, content: @Composable () -> Unit) {
  }
  val systemDark = isSystemInDarkTheme()
  LaunchedEffect(systemDark) {
-    if (SimplexApp.context.chatModel.controller.appPrefs.currentTheme.get() == DefaultTheme.SYSTEM.name && CurrentColors.value.colors.isLight == systemDark) {
+    if (CurrentColors.value.second == DefaultTheme.SYSTEM && CurrentColors.value.first.isLight == systemDark) {
      // Change active colors from light to dark and back based on system theme
      ThemeManager.applyTheme(DefaultTheme.SYSTEM.name, systemDark)
    }
  }
  val theme by CurrentColors.collectAsState()
  MaterialTheme(
-    colors = theme.colors,
+    colors = theme.first,
    typography = Typography,
    shapes = Shapes,
    content = content
  )
-}
+}
--- a/apps/android/app/src/main/java/chat/simplex/app/ui/theme/ThemeManager.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/ui/theme/ThemeManager.kt
@@ -7,53 +7,22 @@ import chat.simplex.app.R
 import chat.simplex.app.SimplexApp
 import chat.simplex.app.model.AppPreferences
 import chat.simplex.app.views.helpers.generalGetString
-import okhttp3.internal.toHexString

 object ThemeManager {
  private val appPrefs: AppPreferences by lazy {
-    SimplexApp.context.chatModel.controller.appPrefs
+    AppPreferences(SimplexApp.context)
  }

-  data class ActiveTheme(val name: String, val base: DefaultTheme, val colors: Colors, val appColors: AppColors)
-
-  private fun systemDarkThemeColors(): Pair<Colors, DefaultTheme> = when (appPrefs.systemDarkTheme.get()) {
-    DefaultTheme.DARK.name -> DarkColorPalette to DefaultTheme.DARK
-    DefaultTheme.SIMPLEX.name -> SimplexColorPalette to DefaultTheme.SIMPLEX
-    else -> SimplexColorPalette to DefaultTheme.SIMPLEX
-  }
-
-  fun currentColors(darkForSystemTheme: Boolean): ActiveTheme {
-    val themeName = appPrefs.currentTheme.get()!!
-    val themeOverrides = appPrefs.themeOverrides.get()
-
-    val nonSystemThemeName = if (themeName != DefaultTheme.SYSTEM.name) {
-      themeName
-    } else {
-      if (darkForSystemTheme) appPrefs.systemDarkTheme.get()!! else DefaultTheme.LIGHT.name
+  fun currentColors(darkForSystemTheme: Boolean): Pair<Colors, DefaultTheme> {
+    val theme = appPrefs.currentTheme.get()!!
+    val systemThemeColors = if (darkForSystemTheme) DarkColorPalette else LightColorPalette
+    val res = when (theme) {
+      DefaultTheme.SYSTEM.name -> Pair(systemThemeColors, DefaultTheme.SYSTEM)
+      DefaultTheme.DARK.name -> Pair(DarkColorPalette, DefaultTheme.DARK)
+      DefaultTheme.LIGHT.name -> Pair(LightColorPalette, DefaultTheme.LIGHT)
+      else -> Pair(systemThemeColors, DefaultTheme.SYSTEM)
    }
-    val theme = themeOverrides[nonSystemThemeName]
-    val baseTheme = when (nonSystemThemeName) {
-      DefaultTheme.LIGHT.name -> Triple(DefaultTheme.LIGHT, LightColorPalette, LightColorPaletteApp)
-      DefaultTheme.DARK.name -> Triple(DefaultTheme.DARK, DarkColorPalette, DarkColorPaletteApp)
-      DefaultTheme.SIMPLEX.name -> Triple(DefaultTheme.SIMPLEX, SimplexColorPalette, SimplexColorPaletteApp)
-      else -> Triple(DefaultTheme.LIGHT, LightColorPalette, LightColorPaletteApp)
-    }
-    if (theme == null) {
-      return ActiveTheme(themeName, baseTheme.first, baseTheme.second, baseTheme.third)
-    }
-    return ActiveTheme(themeName, baseTheme.first, theme.colors.toColors(theme.base), theme.colors.toAppColors(theme.base))
-  }
-
-  fun currentThemeOverridesForExport(darkForSystemTheme: Boolean): ThemeOverrides {
-    val themeName = appPrefs.currentTheme.get()!!
-    val nonSystemThemeName = if (themeName != DefaultTheme.SYSTEM.name) {
-      themeName
-    } else {
-      if (darkForSystemTheme) appPrefs.systemDarkTheme.get()!! else DefaultTheme.LIGHT.name
-    }
-    val overrides = appPrefs.themeOverrides.get().toMutableMap()
-    val nonFilledTheme = overrides[nonSystemThemeName] ?: ThemeOverrides(base = CurrentColors.value.base, colors = ThemeColors())
-    return nonFilledTheme.copy(colors = nonFilledTheme.colors.withFilledColors(CurrentColors.value.base))
+    return res.copy(first = res.first.copy(primary = Color(appPrefs.primaryColor.get())))
  }

  // colors, default theme enum, localized name of theme
@@ -61,7 +30,7 @@ object ThemeManager {
    val allThemes = ArrayList<Triple<Colors, DefaultTheme, String>>()
    allThemes.add(
      Triple(
-        if (darkForSystemTheme) systemDarkThemeColors().first else LightColorPalette,
+        if (darkForSystemTheme) DarkColorPalette else LightColorPalette,
        DefaultTheme.SYSTEM,
        generalGetString(R.string.theme_system)
      )
@@ -80,73 +49,16 @@ object ThemeManager {
        generalGetString(R.string.theme_dark)
      )
    )
-    allThemes.add(
-      Triple(
-        SimplexColorPalette,
-        DefaultTheme.SIMPLEX,
-        generalGetString(R.string.theme_simplex)
-      )
-    )
    return allThemes
  }

-  fun applyTheme(theme: String, darkForSystemTheme: Boolean) {
-    appPrefs.currentTheme.set(theme)
+  fun applyTheme(name: String, darkForSystemTheme: Boolean) {
+    appPrefs.currentTheme.set(name)
    CurrentColors.value = currentColors(darkForSystemTheme)
  }

-  fun changeDarkTheme(theme: String, darkForSystemTheme: Boolean) {
-    appPrefs.systemDarkTheme.set(theme)
-    CurrentColors.value = currentColors(darkForSystemTheme)
-  }
-
-  fun saveAndApplyThemeColor(name: ThemeColor, color: Color? = null, darkForSystemTheme: Boolean) {
-    val themeName = appPrefs.currentTheme.get()!!
-    val nonSystemThemeName = if (themeName != DefaultTheme.SYSTEM.name) {
-      themeName
-    } else {
-      if (darkForSystemTheme) appPrefs.systemDarkTheme.get()!! else DefaultTheme.LIGHT.name
-    }
-    var colorToSet = color
-    if (colorToSet == null) {
-      // Setting default color from a base theme
-      colorToSet = when(nonSystemThemeName) {
-        DefaultTheme.LIGHT.name -> name.fromColors(LightColorPalette, LightColorPaletteApp)
-        DefaultTheme.DARK.name -> name.fromColors(DarkColorPalette, DarkColorPaletteApp)
-        DefaultTheme.SIMPLEX.name -> name.fromColors(SimplexColorPalette, SimplexColorPaletteApp)
-        // Will not be here
-        else -> return
-      }
-    }
-    val overrides = appPrefs.themeOverrides.get().toMutableMap()
-    val prevValue = overrides[nonSystemThemeName] ?: ThemeOverrides(base = CurrentColors.value.base, colors = ThemeColors())
-    overrides[nonSystemThemeName] = prevValue.withUpdatedColor(name, colorToSet.toReadableHex())
-    appPrefs.themeOverrides.set(overrides)
-    CurrentColors.value = currentColors(!CurrentColors.value.colors.isLight)
-  }
-
-  fun saveAndApplyThemeOverrides(theme: ThemeOverrides, darkForSystemTheme: Boolean) {
-    val overrides = appPrefs.themeOverrides.get().toMutableMap()
-    val prevValue = overrides[theme.base.name] ?: ThemeOverrides(base = CurrentColors.value.base, colors = ThemeColors())
-    overrides[theme.base.name] = prevValue.copy(colors = theme.colors)
-    appPrefs.themeOverrides.set(overrides)
-    appPrefs.currentTheme.set(theme.base.name)
-    CurrentColors.value = currentColors(!CurrentColors.value.colors.isLight)
-  }
-
-  fun resetAllThemeColors(darkForSystemTheme: Boolean) {
-    val themeName = appPrefs.currentTheme.get()!!
-    val nonSystemThemeName = if (themeName != DefaultTheme.SYSTEM.name) {
-      themeName
-    } else {
-      if (darkForSystemTheme) appPrefs.systemDarkTheme.get()!! else DefaultTheme.LIGHT.name
-    }
-    val overrides = appPrefs.themeOverrides.get().toMutableMap()
-    val prevValue = overrides[nonSystemThemeName] ?: return
-    overrides[nonSystemThemeName] = prevValue.copy(colors = ThemeColors())
-    appPrefs.themeOverrides.set(overrides)
-    CurrentColors.value = currentColors(!CurrentColors.value.colors.isLight)
+  fun saveAndApplyPrimaryColor(color: Color) {
+    appPrefs.primaryColor.set(color.toArgb())
+    CurrentColors.value = currentColors(!CurrentColors.value.first.isLight)
  }
 }
-
-private fun Color.toReadableHex(): String = "#" + toArgb().toHexString()
--- a/apps/android/app/src/main/java/chat/simplex/app/ui/theme/Type.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/ui/theme/Type.kt
@@ -33,11 +33,6 @@ val Typography = Typography(
    fontWeight = FontWeight.Normal,
    fontSize = 18.5.sp
  ),
-  h4 = TextStyle(
-    fontFamily = Inter,
-    fontWeight = FontWeight.Normal,
-    fontSize = 17.5.sp
-  ),
  body1 = TextStyle(
    fontFamily = Inter,
    fontWeight = FontWeight.Normal,
--- a/apps/android/app/src/main/java/chat/simplex/app/views/SplashView.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/SplashView.kt
@@ -1,5 +1,6 @@
 package chat.simplex.app.views

+import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Surface
@@ -10,8 +11,8 @@ import androidx.compose.ui.Modifier
 fun SplashView() {
  Surface(
    Modifier
-      .fillMaxSize(),
-    color = MaterialTheme.colors.background
+      .background(MaterialTheme.colors.background)
+      .fillMaxSize()
  ) {
 //    Image(
 //      painter = painterResource(R.drawable.logo),
--- a/apps/android/app/src/main/java/chat/simplex/app/views/TerminalView.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/TerminalView.kt
@@ -86,7 +86,7 @@ fun TerminalLayout(
            userIsObserver = false,
            userCanSend = true,
            allowVoiceToContact = {},
-            sendMessage = { sendCommand() },
+            sendMessage = sendCommand,
            sendLiveMessage = null,
            updateLiveMessage = null,
            onMessageChange = ::onMessageChange,
@@ -99,8 +99,8 @@ fun TerminalLayout(
      Surface(
        modifier = Modifier
          .padding(contentPadding)
-          .fillMaxWidth(),
-        color = MaterialTheme.colors.background
+          .fillMaxWidth()
+          .background(MaterialTheme.colors.background)
      ) {
        TerminalLog(terminalItems)
      }
--- a/apps/android/app/src/main/java/chat/simplex/app/views/WelcomeView.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/WelcomeView.kt
@@ -6,20 +6,19 @@ import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.BasicTextField
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material.*
-import androidx.compose.material.MaterialTheme.colors
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.ArrowBackIosNew
+import androidx.compose.material.icons.outlined.ArrowForwardIos
 import androidx.compose.runtime.*
-import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.focus.*
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.SolidColor
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.input.KeyboardCapitalization
-import androidx.compose.ui.text.style.*
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import chat.simplex.app.*
@@ -27,92 +26,83 @@ import chat.simplex.app.R
 import chat.simplex.app.model.ChatModel
 import chat.simplex.app.model.Profile
 import chat.simplex.app.ui.theme.*
-import chat.simplex.app.views.helpers.*
+import chat.simplex.app.views.helpers.AppBarTitle
+import chat.simplex.app.views.helpers.withApi
 import chat.simplex.app.views.onboarding.OnboardingStage
 import chat.simplex.app.views.onboarding.ReadableText
 import com.google.accompanist.insets.navigationBarsWithImePadding
 import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.distinctUntilChanged

 fun isValidDisplayName(name: String) : Boolean {
-  return (name.firstOrNull { it.isWhitespace() }) == null && !name.startsWith("@") && !name.startsWith("#")
+  return (name.firstOrNull { it.isWhitespace() }) == null
 }

@Composable
 fun CreateProfilePanel(chatModel: ChatModel, close: () -> Unit) {
-  val displayName = rememberSaveable { mutableStateOf("") }
-  val fullName = rememberSaveable { mutableStateOf("") }
+  val displayName = remember { mutableStateOf("") }
+  val fullName = remember { mutableStateOf("") }
  val focusRequester = remember { FocusRequester() }

-  Column(
-    modifier = Modifier.fillMaxSize().verticalScroll(rememberScrollState())
-  ) {
-    /*CloseSheetBar(close = {
-      if (chatModel.users.isEmpty()) {
-        chatModel.onboardingStage.value = OnboardingStage.Step1_SimpleXInfo
-      } else {
-        close()
-      }
-    })*/
-    Column(Modifier.padding(horizontal = DEFAULT_PADDING)) {
-      AppBarTitle(stringResource(R.string.create_profile), bottomPadding = DEFAULT_PADDING)
-      ReadableText(R.string.your_profile_is_stored_on_your_device, TextAlign.Center, padding = PaddingValues(), style = MaterialTheme.typography.body1)
-      ReadableText(R.string.profile_is_only_shared_with_your_contacts, TextAlign.Center, style = MaterialTheme.typography.body1)
-      Spacer(Modifier.height(DEFAULT_PADDING))
-      Row(Modifier.padding(bottom = DEFAULT_PADDING_HALF).fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween) {
-        Text(
-          stringResource(R.string.display_name),
-          fontSize = 16.sp
-        )
-        if (!isValidDisplayName(displayName.value)) {
-          Text(
-            stringResource(R.string.no_spaces),
-            fontSize = 16.sp,
-            color = Color.Red
-          )
-        }
-      }
-      ProfileNameField(displayName, "", ::isValidDisplayName, focusRequester)
-      Spacer(Modifier.height(DEFAULT_PADDING))
+  Surface(Modifier.background(MaterialTheme.colors.onBackground)) {
+    Column(
+      modifier = Modifier.fillMaxSize().verticalScroll(rememberScrollState())
+    ) {
+      AppBarTitle(stringResource(R.string.create_profile), false)
+      ReadableText(R.string.your_profile_is_stored_on_your_device)
+      ReadableText(R.string.profile_is_only_shared_with_your_contacts)
+      Spacer(Modifier.height(10.dp))
+      Text(
+        stringResource(R.string.display_name),
+        style = MaterialTheme.typography.h6,
+        modifier = Modifier.padding(bottom = 3.dp)
+      )
+      ProfileNameField(displayName, focusRequester)
+      val errorText = if (!isValidDisplayName(displayName.value)) stringResource(R.string.display_name_cannot_contain_whitespace) else ""
+      Text(
+        errorText,
+        fontSize = 15.sp,
+        color = MaterialTheme.colors.error
+      )
+      Spacer(Modifier.height(3.dp))
      Text(
        stringResource(R.string.full_name_optional__prompt),
-        fontSize = 16.sp,
-        modifier = Modifier.padding(bottom = DEFAULT_PADDING_HALF)
+        style = MaterialTheme.typography.h6,
+        modifier = Modifier.padding(bottom = 5.dp)
      )
-      ProfileNameField(fullName, "", ::isValidDisplayName)
-    }
-    Spacer(Modifier.fillMaxHeight().weight(1f))
-    Row {
-      if (chatModel.users.isEmpty()) {
-        SimpleButtonDecorated(
-          text = stringResource(R.string.about_simplex),
-          icon = painterResource(R.drawable.ic_arrow_back_ios_new),
-          textDecoration = TextDecoration.None,
-          fontWeight = FontWeight.Medium
-        ) { chatModel.onboardingStage.value = OnboardingStage.Step1_SimpleXInfo }
-      }
-      Spacer(Modifier.fillMaxWidth().weight(1f))
-      val enabled = displayName.value.isNotEmpty() && isValidDisplayName(displayName.value)
-      val createModifier: Modifier
-      val createColor: Color
-      if (enabled) {
-        createModifier = Modifier.clickable { createProfile(chatModel, displayName.value, fullName.value, close) }.padding(8.dp)
-        createColor = MaterialTheme.colors.primary
-      } else {
-        createModifier = Modifier.padding(8.dp)
-        createColor = MaterialTheme.colors.secondary
-      }
-      Surface(shape = RoundedCornerShape(20.dp), color = Color.Transparent) {
-        Row(verticalAlignment = Alignment.CenterVertically, modifier = createModifier) {
-          Text(stringResource(R.string.create_profile_button), style = MaterialTheme.typography.caption, color = createColor, fontWeight = FontWeight.Medium)
-          Icon(painterResource(R.drawable.ic_arrow_forward_ios), stringResource(R.string.create_profile_button), tint = createColor)
+      ProfileNameField(fullName)
+      Spacer(Modifier.fillMaxHeight().weight(1f))
+      Row {
+        if (chatModel.users.isEmpty()) {
+          SimpleButton(
+            text = stringResource(R.string.about_simplex),
+            icon = Icons.Outlined.ArrowBackIosNew
+          ) { chatModel.onboardingStage.value = OnboardingStage.Step1_SimpleXInfo }
+        }
+
+        Spacer(Modifier.fillMaxWidth().weight(1f))
+
+        val enabled = displayName.value.isNotEmpty() && isValidDisplayName(displayName.value)
+        val createModifier: Modifier
+        val createColor: Color
+        if (enabled) {
+          createModifier = Modifier.clickable { createProfile(chatModel, displayName.value, fullName.value, close) }.padding(8.dp)
+          createColor = MaterialTheme.colors.primary
+        } else {
+          createModifier = Modifier.padding(8.dp)
+          createColor = HighOrLowlight
+        }
+        Surface(shape = RoundedCornerShape(20.dp)) {
+          Row(verticalAlignment = Alignment.CenterVertically, modifier = createModifier) {
+            Text(stringResource(R.string.create_profile_button), style = MaterialTheme.typography.caption, color = createColor)
+            Icon(Icons.Outlined.ArrowForwardIos, stringResource(R.string.create_profile_button), tint = createColor)
+          }
        }
      }
-    }

-    LaunchedEffect(Unit) {
-      delay(300)
-      focusRequester.requestFocus()
+      LaunchedEffect(Unit) {
+        delay(300)
+        focusRequester.requestFocus()
+      }
    }
  }
 }
@@ -125,67 +115,37 @@ fun createProfile(chatModel: ChatModel, displayName: String, fullName: String, c
    chatModel.currentUser.value = user
    if (chatModel.users.isEmpty()) {
      chatModel.controller.startChat(user)
-      chatModel.controller.appPrefs.onboardingStage.set(OnboardingStage.Step3_CreateSimpleXAddress)
-      chatModel.onboardingStage.value = OnboardingStage.Step3_CreateSimpleXAddress
+      chatModel.onboardingStage.value = OnboardingStage.Step3_SetNotificationsMode
+      SimplexApp.context.chatModel.controller.ntfManager.createNtfChannelsMaybeShowAlert()
    } else {
      val users = chatModel.controller.listUsers()
      chatModel.users.clear()
      chatModel.users.addAll(users)
      chatModel.controller.getUserChatData()
-      // the next two lines are only needed for failure case when because of the database error the app gets stuck on on-boarding screen,
-      // this will get it unstuck.
-      chatModel.controller.appPrefs.onboardingStage.set(OnboardingStage.OnboardingComplete)
-      chatModel.onboardingStage.value = OnboardingStage.OnboardingComplete
      close()
    }
  }
 }

@Composable
-fun ProfileNameField(name: MutableState<String>, placeholder: String = "", isValid: (String) -> Boolean = { true }, focusRequester: FocusRequester? = null) {
-  var valid by rememberSaveable { mutableStateOf(true) }
-  var focused by rememberSaveable { mutableStateOf(false) }
-  val strokeColor by remember {
-    derivedStateOf {
-      if (valid) {
-        if (focused) {
-          CurrentColors.value.colors.secondary.copy(alpha = 0.6f)
-        } else {
-          CurrentColors.value.colors.secondary.copy(alpha = 0.3f)
-        }
-      } else Color.Red
-    }
-  }
+fun ProfileNameField(name: MutableState<String>, focusRequester: FocusRequester? = null) {
  val modifier = Modifier
    .fillMaxWidth()
-    .padding(horizontal = DEFAULT_PADDING)
+    .background(MaterialTheme.colors.secondary)
+    .height(40.dp)
+    .clip(RoundedCornerShape(5.dp))
+    .padding(8.dp)
    .navigationBarsWithImePadding()
-    .onFocusChanged { focused = it.isFocused }
-  Box(
-    Modifier
-      .fillMaxWidth()
-      .height(52.dp)
-      .border(border = BorderStroke(1.dp, strokeColor), shape = RoundedCornerShape(50)),
-    contentAlignment = Alignment.Center
-  ) {
-    BasicTextField(
-      value = name.value,
-      onValueChange = { name.value = it },
-      modifier = if (focusRequester == null) modifier else modifier.focusRequester(focusRequester),
-      textStyle = TextStyle(fontSize = 18.sp, color = colors.onBackground),
-      keyboardOptions = KeyboardOptions(
-        capitalization = KeyboardCapitalization.None,
-        autoCorrect = false
-      ),
-      singleLine = true,
-      cursorBrush = SolidColor(MaterialTheme.colors.secondary)
-    )
-  }
-  LaunchedEffect(Unit) {
-    snapshotFlow { name.value }
-      .distinctUntilChanged()
-      .collect {
-        valid = isValid(it)
-      }
-  }
-}
+  BasicTextField(
+    value = name.value,
+    onValueChange = { name.value = it },
+    modifier = if (focusRequester == null) modifier else modifier.focusRequester(focusRequester),
+    textStyle = MaterialTheme.typography.body1.copy(color = MaterialTheme.colors.onBackground),
+    keyboardOptions = KeyboardOptions(
+      capitalization = KeyboardCapitalization.None,
+      autoCorrect = false
+    ),
+    singleLine = true,
+    cursorBrush = SolidColor(HighOrLowlight)
+  )
+}
--- a/apps/android/app/src/main/java/chat/simplex/app/views/call/CallManager.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/call/CallManager.kt
@@ -26,6 +26,7 @@ class CallManager(val chatModel: ChatModel) {
  }

  fun acceptIncomingCall(invitation: RcvCallInvitation) {
+    ModalManager.shared.closeModals()
    val call = chatModel.activeCall.value
    if (call == null) {
      justAcceptIncomingCall(invitation = invitation)
@@ -105,4 +106,4 @@ class CallManager(val chatModel: ChatModel) {
      chatModel.controller.ntfManager.cancelCallNotification()
    }
  }
-}
+}
--- a/apps/android/app/src/main/java/chat/simplex/app/views/call/CallView.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/call/CallView.kt
@@ -16,15 +16,17 @@ import androidx.activity.compose.BackHandler
 import androidx.annotation.StringRes
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.*
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.*
+import androidx.compose.material.icons.outlined.*
 import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.painter.Painter
+import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalLifecycleOwner
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.tooling.preview.Preview
@@ -185,12 +187,10 @@ fun ActiveCallView(chatModel: ChatModel) {
    activity.volumeControlStream = AudioManager.STREAM_VOICE_CALL
    // Lock orientation to portrait in order to have good experience with calls
    activity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
-    chatModel.activeCallViewIsVisible.value = true
    onDispose {
      activity.volumeControlStream = prevVolumeControlStream
      // Unlock orientation
      activity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED
-      chatModel.activeCallViewIsVisible.value = false
    }
  }
 }
@@ -263,7 +263,7 @@ private fun ActiveCallOverlayLayout(
  toggleSound: () -> Unit,
  flipCamera: () -> Unit
 ) {
-  Column(Modifier.padding(DEFAULT_PADDING)) {
+  Column(Modifier.padding(16.dp)) {
    when (call.peerMedia ?: call.localMedia) {
      CallMediaType.Video -> {
        CallInfoView(call, alignment = Alignment.Start)
@@ -272,14 +272,14 @@ private fun ActiveCallOverlayLayout(
          ToggleAudioButton(call, toggleAudio)
          Spacer(Modifier.size(40.dp))
          IconButton(onClick = dismiss) {
-            Icon(painterResource(R.drawable.ic_call_end_filled), stringResource(R.string.icon_descr_hang_up), tint = Color.Red, modifier = Modifier.size(64.dp))
+            Icon(Icons.Filled.CallEnd, stringResource(R.string.icon_descr_hang_up), tint = Color.Red, modifier = Modifier.size(64.dp))
          }
          if (call.videoEnabled) {
-            ControlButton(call, painterResource(R.drawable.ic_flip_camera_android_filled), R.string.icon_descr_flip_camera, flipCamera)
-            ControlButton(call, painterResource(R.drawable.ic_videocam_filled), R.string.icon_descr_video_off, toggleVideo)
+            ControlButton(call, Icons.Filled.FlipCameraAndroid, R.string.icon_descr_flip_camera, flipCamera)
+            ControlButton(call, Icons.Filled.Videocam, R.string.icon_descr_video_off, toggleVideo)
          } else {
            Spacer(Modifier.size(48.dp))
-            ControlButton(call, painterResource(R.drawable.ic_videocam_off), R.string.icon_descr_video_on, toggleVideo)
+            ControlButton(call, Icons.Outlined.VideocamOff, R.string.icon_descr_video_on, toggleVideo)
          }
        }
      }
@@ -297,7 +297,7 @@ private fun ActiveCallOverlayLayout(
        Box(Modifier.fillMaxWidth().padding(bottom = DEFAULT_BOTTOM_PADDING), contentAlignment = Alignment.CenterStart) {
          Box(Modifier.fillMaxWidth(), contentAlignment = Alignment.Center) {
            IconButton(onClick = dismiss) {
-              Icon(painterResource(R.drawable.ic_call_end_filled), stringResource(R.string.icon_descr_hang_up), tint = Color.Red, modifier = Modifier.size(64.dp))
+              Icon(Icons.Filled.CallEnd, stringResource(R.string.icon_descr_hang_up), tint = Color.Red, modifier = Modifier.size(64.dp))
            }
          }
          Box(Modifier.padding(start = 32.dp)) {
@@ -315,10 +315,10 @@ private fun ActiveCallOverlayLayout(
 }

@Composable
-private fun ControlButton(call: Call, icon: Painter, @StringRes iconText: Int, action: () -> Unit, enabled: Boolean = true) {
+private fun ControlButton(call: Call, icon: ImageVector, @StringRes iconText: Int, action: () -> Unit, enabled: Boolean = true) {
  if (call.hasMedia) {
    IconButton(onClick = action, enabled = enabled) {
-      Icon(icon, stringResource(iconText), tint = if (enabled) Color(0xFFFFFFD8) else MaterialTheme.colors.secondary, modifier = Modifier.size(40.dp))
+      Icon(icon, stringResource(iconText), tint = if (enabled) Color(0xFFFFFFD8) else HighOrLowlight, modifier = Modifier.size(40.dp))
    }
  } else {
    Spacer(Modifier.size(40.dp))
@@ -328,18 +328,18 @@ private fun ControlButton(call: Call, icon: Painter, @StringRes iconText: Int, a
@Composable
 private fun ToggleAudioButton(call: Call, toggleAudio: () -> Unit) {
  if (call.audioEnabled) {
-    ControlButton(call, painterResource(R.drawable.ic_mic), R.string.icon_descr_audio_off, toggleAudio)
+    ControlButton(call, Icons.Outlined.Mic, R.string.icon_descr_audio_off, toggleAudio)
  } else {
-    ControlButton(call, painterResource(R.drawable.ic_mic_off), R.string.icon_descr_audio_on, toggleAudio)
+    ControlButton(call, Icons.Outlined.MicOff, R.string.icon_descr_audio_on, toggleAudio)
  }
 }

@Composable
 private fun ToggleSoundButton(call: Call, enabled: Boolean, toggleSound: () -> Unit) {
  if (call.soundSpeaker) {
-    ControlButton(call, painterResource(R.drawable.ic_volume_up), R.string.icon_descr_speaker_off, toggleSound, enabled)
+    ControlButton(call, Icons.Outlined.VolumeUp, R.string.icon_descr_speaker_off, toggleSound, enabled)
  } else {
-    ControlButton(call, painterResource(R.drawable.ic_volume_down), R.string.icon_descr_speaker_on, toggleSound, enabled)
+    ControlButton(call, Icons.Outlined.VolumeDown, R.string.icon_descr_speaker_on, toggleSound, enabled)
  }
 }

@@ -369,7 +369,7 @@ fun CallInfoView(call: Call, alignment: Alignment.Horizontal) {
 //    horizontalAlignment = Alignment.CenterHorizontally,
 //    verticalArrangement = Arrangement.spacedBy(12.dp),
 //    modifier = Modifier
-//      .themedBackground()
+//      .background(MaterialTheme.colors.background)
 //      .fillMaxSize()
 //  ) {
 //    WebRTCView(callCommand) { apiMsg ->
--- a/apps/android/app/src/main/java/chat/simplex/app/views/call/IncomingCallActivity.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/call/IncomingCallActivity.kt
@@ -12,19 +12,19 @@ import android.view.WindowManager
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.viewModels
-import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.*
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.scale
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.painter.Painter
+import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
@@ -36,6 +36,7 @@ import chat.simplex.app.model.*
 import chat.simplex.app.model.NtfManager.Companion.OpenChatAction
 import chat.simplex.app.ui.theme.*
 import chat.simplex.app.views.helpers.ProfileImage
+import chat.simplex.app.views.onboarding.SimpleXLogo
 import kotlinx.datetime.Clock

 class IncomingCallActivity: ComponentActivity() {
@@ -97,9 +98,8 @@ fun IncomingCallActivityView(m: ChatModel) {
  SimpleXTheme {
    Surface(
      Modifier
-        .fillMaxSize(),
-      color = MaterialTheme.colors.background
-    ) {
+        .background(MaterialTheme.colors.background)
+        .fillMaxSize()) {
      if (showCallView) {
        Box {
          ActiveCallView(m)
@@ -170,35 +170,24 @@ fun IncomingCallLockScreenAlertLayout(
      Text(invitation.contact.chatViewName, style = MaterialTheme.typography.h2)
      Spacer(Modifier.fillMaxHeight().weight(1f))
      Row {
-        LockScreenCallButton(stringResource(R.string.reject), painterResource(R.drawable.ic_call_end_filled), Color.Red, rejectCall)
+        LockScreenCallButton(stringResource(R.string.reject), Icons.Filled.CallEnd, Color.Red, rejectCall)
        Spacer(Modifier.size(48.dp))
-        LockScreenCallButton(stringResource(R.string.ignore), painterResource(R.drawable.ic_close), MaterialTheme.colors.primary, ignoreCall)
+        LockScreenCallButton(stringResource(R.string.ignore), Icons.Filled.Close, MaterialTheme.colors.primary, ignoreCall)
        Spacer(Modifier.size(48.dp))
-        LockScreenCallButton(stringResource(R.string.accept), painterResource(R.drawable.ic_check_filled), SimplexGreen, acceptCall)
+        LockScreenCallButton(stringResource(R.string.accept), Icons.Filled.Check, SimplexGreen, acceptCall)
      }
    } else if (callOnLockScreen == CallOnLockScreen.SHOW) {
      SimpleXLogo()
      Text(stringResource(R.string.open_simplex_chat_to_accept_call), textAlign = TextAlign.Center, lineHeight = 22.sp)
      Text(stringResource(R.string.allow_accepting_calls_from_lock_screen), textAlign = TextAlign.Center, style = MaterialTheme.typography.body2, lineHeight = 22.sp)
      Spacer(Modifier.fillMaxHeight().weight(1f))
-      SimpleButton(text = stringResource(R.string.open_verb), icon = painterResource(R.drawable.ic_check_filled), click = openApp)
+      SimpleButton(text = stringResource(R.string.open_verb), icon = Icons.Filled.Check, click = openApp)
    }
  }
 }

@Composable
-private fun SimpleXLogo() {
-  Image(
-    painter = painterResource(if (isInDarkTheme()) R.drawable.logo_light else R.drawable.logo),
-    contentDescription = stringResource(R.string.image_descr_simplex_logo),
-    modifier = Modifier
-      .padding(vertical = DEFAULT_PADDING)
-      .fillMaxWidth(0.80f)
-  )
-}
-
-@Composable
-private fun LockScreenCallButton(text: String, icon: Painter, color: Color, action: () -> Unit) {
+private fun LockScreenCallButton(text: String, icon: ImageVector, color: Color, action: () -> Unit) {
  Surface(
    shape = RoundedCornerShape(10.dp),
    color = Color.Transparent
@@ -212,8 +201,8 @@ private fun LockScreenCallButton(text: String, icon: Painter, color: Color, acti
      IconButton(action) {
        Icon(icon, text, tint = color, modifier = Modifier.scale(1.75f))
      }
-      Spacer(Modifier.height(DEFAULT_PADDING))
-      Text(text, style = MaterialTheme.typography.body2, color = MaterialTheme.colors.secondary)
+      Spacer(Modifier.height(16.dp))
+      Text(text, style = MaterialTheme.typography.body2, color = HighOrLowlight)
    }
  }
 }
@@ -227,9 +216,8 @@ fun PreviewIncomingCallLockScreenAlert() {
  SimpleXTheme(true) {
    Surface(
      Modifier
-        .fillMaxSize(),
-      color = MaterialTheme.colors.background
-    ) {
+        .background(MaterialTheme.colors.background)
+        .fillMaxSize()) {
      IncomingCallLockScreenAlertLayout(
        invitation = RcvCallInvitation(
          user = User.sampleData,
--- a/apps/android/app/src/main/java/chat/simplex/app/views/call/IncomingCallAlertView.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/call/IncomingCallAlertView.kt
@@ -4,14 +4,15 @@ import androidx.compose.foundation.*
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.*
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.scale
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.painter.Painter
+import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
@@ -50,18 +51,18 @@ fun IncomingCallAlertLayout(
  ignoreCall: () -> Unit,
  acceptCall: () -> Unit
 ) {
-  val color = if (isInDarkTheme()) MaterialTheme.colors.surface else IncomingCallLight
-  Column(Modifier.fillMaxWidth().background(color).padding(top = DEFAULT_PADDING, bottom = DEFAULT_PADDING, start = DEFAULT_PADDING, end = 8.dp)) {
+  val color = if (isInDarkTheme()) IncomingCallDark else IncomingCallLight
+  Column(Modifier.fillMaxWidth().background(color).padding(top = 16.dp, bottom = 16.dp, start = 16.dp, end = 8.dp)) {
    IncomingCallInfo(invitation, chatModel)
    Spacer(Modifier.height(8.dp))
    Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.SpaceBetween) {
      Row(Modifier.fillMaxWidth().weight(1f), verticalAlignment = Alignment.CenterVertically) {
-        ProfilePreview(profileOf = invitation.contact, size = 64.dp)
+        ProfilePreview(profileOf = invitation.contact, size = 64.dp, color = Color.White)
      }
      Row(verticalAlignment = Alignment.CenterVertically) {
-        CallButton(stringResource(R.string.reject), painterResource(R.drawable.ic_call_end_filled), Color.Red, rejectCall)
-        CallButton(stringResource(R.string.ignore), painterResource(R.drawable.ic_close), MaterialTheme.colors.primary, ignoreCall)
-        CallButton(stringResource(R.string.accept), painterResource(R.drawable.ic_check_filled), SimplexGreen, acceptCall)
+        CallButton(stringResource(R.string.reject), Icons.Filled.CallEnd, Color.Red, rejectCall)
+        CallButton(stringResource(R.string.ignore), Icons.Filled.Close, MaterialTheme.colors.primary, ignoreCall)
+        CallButton(stringResource(R.string.accept), Icons.Filled.Check, SimplexGreen, acceptCall)
      }
    }
  }
@@ -69,21 +70,21 @@ fun IncomingCallAlertLayout(

@Composable
 fun IncomingCallInfo(invitation: RcvCallInvitation, chatModel: ChatModel) {
-  @Composable fun CallIcon(icon: Painter, descr: String) = Icon(icon, descr, tint = SimplexGreen)
+  @Composable fun CallIcon(icon: ImageVector, descr: String) = Icon(icon, descr, tint = SimplexGreen)
  Row(verticalAlignment = Alignment.CenterVertically) {
    if (chatModel.users.size > 1) {
-      ProfileImage(size = 32.dp, image = invitation.user.profile.image, color = MaterialTheme.colors.secondaryVariant)
+      ProfileImage(size = 32.dp, image = invitation.user.profile.image, color = MaterialTheme.colors.secondary)
      Spacer(Modifier.width(4.dp))
    }
-    if (invitation.callType.media == CallMediaType.Video) CallIcon(painterResource(R.drawable.ic_videocam_filled), stringResource(R.string.icon_descr_video_call))
-    else CallIcon(painterResource(R.drawable.ic_call_filled), stringResource(R.string.icon_descr_audio_call))
+    if (invitation.callType.media == CallMediaType.Video) CallIcon(Icons.Filled.Videocam, stringResource(R.string.icon_descr_video_call))
+    else CallIcon(Icons.Filled.Phone, stringResource(R.string.icon_descr_audio_call))
    Spacer(Modifier.width(4.dp))
-    Text(invitation.callTypeText, color = MaterialTheme.colors.onBackground)
+    Text(invitation.callTypeText)
  }
 }

@Composable
-private fun CallButton(text: String, icon: Painter, color: Color, action: () -> Unit) {
+private fun CallButton(text: String, icon: ImageVector, color: Color, action: () -> Unit) {
  Surface(
    shape = RoundedCornerShape(10.dp),
    color = Color.Transparent
@@ -96,7 +97,7 @@ private fun CallButton(text: String, icon: Painter, color: Color, action: () ->
      horizontalAlignment = Alignment.CenterHorizontally
    ) {
      Icon(icon, text, tint = color, modifier = Modifier.scale(1.2f))
-      Text(text, style = MaterialTheme.typography.body2, color = MaterialTheme.colors.secondary)
+      Text(text, style = MaterialTheme.typography.body2, color = HighOrLowlight)
    }
  }
 }
--- a/apps/android/app/src/main/java/chat/simplex/app/views/call/SoundPlayer.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/call/SoundPlayer.kt
@@ -48,4 +48,4 @@ class SoundPlayer {
  companion object {
    val shared = SoundPlayer()
  }
-}
+}
--- a/apps/android/app/src/main/java/chat/simplex/app/views/chat/ChatInfoView.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/chat/ChatInfoView.kt
@@ -2,27 +2,26 @@ package chat.simplex.app.views.chat

 import InfoRow
 import InfoRowEllipsis
-import SectionBottomSpacer
-import SectionDividerSpaced
+import SectionDivider
 import SectionItemView
-import SectionItemViewWithIcon
 import SectionSpacer
-import SectionTextFooter
 import SectionView
-import TextIconSpaced
 import android.widget.Toast
 import androidx.activity.compose.BackHandler
 import androidx.compose.foundation.*
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.material.*
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.*
+import androidx.compose.material.icons.outlined.*
 import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.platform.*
-import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.platform.ClipboardManager
+import androidx.compose.ui.platform.LocalClipboardManager
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.TextStyle
@@ -36,7 +35,6 @@ import chat.simplex.app.SimplexApp
 import chat.simplex.app.model.*
 import chat.simplex.app.ui.theme.*
 import chat.simplex.app.views.helpers.*
-import chat.simplex.app.views.newchat.QRCode
 import chat.simplex.app.views.usersettings.*
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.*
@@ -114,7 +112,7 @@ fun ChatInfoView(
 }

 fun deleteContactDialog(chatInfo: ChatInfo, chatModel: ChatModel, close: (() -> Unit)? = null) {
-  AlertManager.shared.showAlertDialog(
+  AlertManager.shared.showAlertMsg(
    title = generalGetString(R.string.delete_contact_question),
    text = generalGetString(R.string.delete_contact_all_messages_deleted_cannot_undo_warning),
    confirmText = generalGetString(R.string.delete_verb),
@@ -128,13 +126,12 @@ fun deleteContactDialog(chatInfo: ChatInfo, chatModel: ChatModel, close: (() ->
          close?.invoke()
        }
      }
-    },
-    destructive = true,
+    }
  )
 }

 fun clearChatDialog(chatInfo: ChatInfo, chatModel: ChatModel, close: (() -> Unit)? = null) {
-  AlertManager.shared.showAlertDialog(
+  AlertManager.shared.showAlertMsg(
    title = generalGetString(R.string.clear_chat_question),
    text = generalGetString(R.string.clear_chat_warning),
    confirmText = generalGetString(R.string.clear_verb),
@@ -147,8 +144,7 @@ fun clearChatDialog(chatInfo: ChatInfo, chatModel: ChatModel, close: (() -> Unit
          close?.invoke()
        }
      }
-    },
-    destructive = true,
+    }
  )
 }

@@ -172,7 +168,8 @@ fun ChatInfoLayout(
  Column(
    Modifier
      .fillMaxWidth()
-      .verticalScroll(rememberScrollState())
+      .verticalScroll(rememberScrollState()),
+    horizontalAlignment = Alignment.Start
  ) {
    Row(
      Modifier.fillMaxWidth(),
@@ -182,34 +179,28 @@ fun ChatInfoLayout(
    }

    LocalAliasEditor(localAlias, updateValue = onLocalAliasChanged)
-    SectionSpacer()
+
    if (customUserProfile != null) {
+      SectionSpacer()
      SectionView(generalGetString(R.string.incognito).uppercase()) {
        InfoRow(generalGetString(R.string.incognito_random_profile), customUserProfile.chatViewName)
      }
-      SectionDividerSpaced()
    }

+    SectionSpacer()
    SectionView {
      if (connectionCode != null) {
        VerifyCodeButton(contact.verified, verifyClicked)
+        SectionDivider()
      }
      ContactPreferencesButton(openPreferences)
    }

-    SectionDividerSpaced()
-    if (contact.contactLink != null) {
-      val context = LocalContext.current
-      SectionView(stringResource(R.string.address_section_title).uppercase()) {
-        QRCode(contact.contactLink, Modifier.padding(horizontal = DEFAULT_PADDING, vertical = DEFAULT_PADDING_HALF).aspectRatio(1f))
-        ShareAddressButton { shareText(context, contact.contactLink) }
-        SectionTextFooter(stringResource(R.string.you_can_share_this_address_with_your_contacts).format(contact.displayName))
-      }
-      SectionDividerSpaced()
-    }
+    SectionSpacer()

    SectionView(title = stringResource(R.string.conn_stats_section_title_servers)) {
      SwitchAddressButton(switchContactAddress)
+      SectionDivider()
      if (connStats != null) {
        SectionItemView({
          AlertManager.shared.showAlertMsg(
@@ -220,28 +211,32 @@ fun ChatInfoLayout(
        }
        val rcvServers = connStats.rcvServers
        if (rcvServers != null && rcvServers.isNotEmpty()) {
+          SectionDivider()
          SimplexServers(stringResource(R.string.receiving_via), rcvServers)
        }
        val sndServers = connStats.sndServers
        if (sndServers != null && sndServers.isNotEmpty()) {
+          SectionDivider()
          SimplexServers(stringResource(R.string.sending_via), sndServers)
        }
      }
    }
-    SectionDividerSpaced()
+    SectionSpacer()
    SectionView {
      ClearChatButton(clearChat)
+      SectionDivider()
      DeleteContactButton(deleteContact)
    }
+    SectionSpacer()

    if (developerTools) {
-      SectionDividerSpaced()
      SectionView(title = stringResource(R.string.section_title_for_console)) {
        InfoRow(stringResource(R.string.info_row_local_name), chat.chatInfo.localDisplayName)
+        SectionDivider()
        InfoRow(stringResource(R.string.info_row_database_id), chat.chatInfo.apiId.toString())
      }
+      SectionSpacer()
    }
-    SectionBottomSpacer()
  }
 }

@@ -254,7 +249,7 @@ fun ChatInfoHeader(cInfo: ChatInfo, contact: Contact) {
    ChatInfoImage(cInfo, size = 192.dp, iconColor = if (isInDarkTheme()) GroupDark else SettingsSecondaryLight)
    Row(Modifier.padding(bottom = 8.dp), verticalAlignment = Alignment.CenterVertically) {
      if (contact.verified) {
-        Icon(painterResource(R.drawable.ic_verified_user), null, Modifier.padding(end = 6.dp, top = 4.dp).size(24.dp), tint = MaterialTheme.colors.secondary)
+        Icon(Icons.Outlined.VerifiedUser, null, Modifier.padding(end = 6.dp, top = 4.dp).size(24.dp), tint = HighOrLowlight)
      }
      Text(
        contact.profile.displayName, style = MaterialTheme.typography.h1.copy(fontWeight = FontWeight.Normal),
@@ -295,13 +290,13 @@ fun LocalAliasEditor(
        Text(
          generalGetString(R.string.text_field_set_contact_placeholder),
          textAlign = if (center) TextAlign.Center else TextAlign.Start,
-          color = MaterialTheme.colors.secondary
+          color = HighOrLowlight
        )
      },
      leadingIcon = if (leadingIcon) {
-        { Icon(painterResource(R.drawable.ic_edit_filled), null, Modifier.padding(start = 7.dp)) }
+        { Icon(Icons.Default.Edit, null, Modifier.padding(start = 7.dp)) }
      } else null,
-      color = MaterialTheme.colors.secondary,
+      color = HighOrLowlight,
      focus = focus,
      textStyle = TextStyle.Default.copy(textAlign = if (value.isEmpty() || !center) TextAlign.Start else TextAlign.Center),
      keyboardActions = KeyboardActions(onDone = { updateValue(value) })
@@ -336,7 +331,7 @@ private fun NetworkStatusRow(networkStatus: NetworkStatus) {
    ) {
      Text(stringResource(R.string.network_status))
      Icon(
-        painterResource(R.drawable.ic_info),
+        Icons.Outlined.Info,
        stringResource(R.string.network_status),
        tint = MaterialTheme.colors.primary
      )
@@ -348,7 +343,7 @@ private fun NetworkStatusRow(networkStatus: NetworkStatus) {
    ) {
      Text(
        networkStatus.statusString,
-        color = MaterialTheme.colors.secondary
+        color = HighOrLowlight
      )
      ServerImage(networkStatus)
    }
@@ -360,12 +355,12 @@ private fun ServerImage(networkStatus: NetworkStatus) {
  Box(Modifier.size(18.dp)) {
    when (networkStatus) {
      is NetworkStatus.Connected ->
-        Icon(painterResource(R.drawable.ic_circle_filled), stringResource(R.string.icon_descr_server_status_connected), tint = MaterialTheme.colors.primaryVariant)
+        Icon(Icons.Filled.Circle, stringResource(R.string.icon_descr_server_status_connected), tint = MaterialTheme.colors.primaryVariant)
      is NetworkStatus.Disconnected ->
-        Icon(painterResource(R.drawable.ic_pending_filled), stringResource(R.string.icon_descr_server_status_disconnected), tint = MaterialTheme.colors.secondary)
+        Icon(Icons.Filled.Pending, stringResource(R.string.icon_descr_server_status_disconnected), tint = HighOrLowlight)
      is NetworkStatus.Error ->
-        Icon(painterResource(R.drawable.ic_error_filled), stringResource(R.string.icon_descr_server_status_error), tint = MaterialTheme.colors.secondary)
-      else -> Icon(painterResource(R.drawable.ic_circle), stringResource(R.string.icon_descr_server_status_pending), tint = MaterialTheme.colors.secondary)
+        Icon(Icons.Filled.Error, stringResource(R.string.icon_descr_server_status_error), tint = HighOrLowlight)
+      else -> Icon(Icons.Outlined.Circle, stringResource(R.string.icon_descr_server_status_pending), tint = HighOrLowlight)
    }
  }
 }
@@ -390,17 +385,17 @@ fun SwitchAddressButton(onClick: () -> Unit) {
@Composable
 fun VerifyCodeButton(contactVerified: Boolean, onClick: () -> Unit) {
  SettingsActionItem(
-    if (contactVerified) painterResource(R.drawable.ic_verified_user) else painterResource(R.drawable.ic_shield),
+    if (contactVerified) Icons.Outlined.VerifiedUser else Icons.Outlined.Shield,
    stringResource(if (contactVerified) R.string.view_security_code else R.string.verify_security_code),
    click = onClick,
-    iconColor = MaterialTheme.colors.secondary,
+    iconColor = HighOrLowlight,
  )
 }

@Composable
 private fun ContactPreferencesButton(onClick: () -> Unit) {
  SettingsActionItem(
-    painterResource(R.drawable.ic_toggle_on),
+    Icons.Outlined.ToggleOn,
    stringResource(R.string.contact_preferences),
    click = onClick
  )
@@ -409,7 +404,7 @@ private fun ContactPreferencesButton(onClick: () -> Unit) {
@Composable
 fun ClearChatButton(onClick: () -> Unit) {
  SettingsActionItem(
-    painterResource(R.drawable.ic_settings_backup_restore),
+    Icons.Outlined.Restore,
    stringResource(R.string.clear_chat_button),
    click = onClick,
    textColor = WarningOrange,
@@ -420,7 +415,7 @@ fun ClearChatButton(onClick: () -> Unit) {
@Composable
 private fun DeleteContactButton(onClick: () -> Unit) {
  SettingsActionItem(
-    painterResource(R.drawable.ic_delete),
+    Icons.Outlined.Delete,
    stringResource(R.string.button_delete_contact),
    click = onClick,
    textColor = Color.Red,
@@ -428,17 +423,6 @@ private fun DeleteContactButton(onClick: () -> Unit) {
  )
 }

-@Composable
-fun ShareAddressButton(onClick: () -> Unit) {
-  SettingsActionItem(
-    painterResource(R.drawable.ic_share_filled),
-    stringResource(R.string.share_address),
-    onClick,
-    iconColor = MaterialTheme.colors.primary,
-    textColor = MaterialTheme.colors.primary,
-  )
-}
-
 private fun setContactAlias(contactApiId: Long, localAlias: String, chatModel: ChatModel) = withApi {
  chatModel.controller.apiSetContactAlias(contactApiId, localAlias)?.let {
    chatModel.updateContact(it)
@@ -446,14 +430,13 @@ private fun setContactAlias(contactApiId: Long, localAlias: String, chatModel: C
 }

 private fun showSwitchContactAddressAlert(m: ChatModel, contactId: Long) {
-  AlertManager.shared.showAlertDialog(
+  AlertManager.shared.showAlertMsg(
    title = generalGetString(R.string.switch_receiving_address_question),
    text = generalGetString(R.string.switch_receiving_address_desc),
    confirmText = generalGetString(R.string.switch_verb),
    onConfirm = {
      switchContactAddress(m, contactId)
-    },
-    destructive = true,
+    }
  )
 }

--- a/apps/android/app/src/main/java/chat/simplex/app/views/chat/ChatItemInfoView.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/chat/ChatItemInfoView.kt
@@ -1,169 +0,0 @@
-package chat.simplex.app.views.chat
-
-import InfoRow
-import SectionBottomSpacer
-import SectionDividerSpaced
-import SectionView
-import androidx.compose.foundation.*
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Text
-import androidx.compose.runtime.*
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalUriHandler
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import chat.simplex.app.R
-import chat.simplex.app.model.*
-import chat.simplex.app.ui.theme.CurrentColors
-import chat.simplex.app.ui.theme.DEFAULT_PADDING
-import chat.simplex.app.views.chat.item.ItemAction
-import chat.simplex.app.views.chat.item.MarkdownText
-import chat.simplex.app.views.helpers.*
-
-@Composable
-fun ChatItemInfoView(ci: ChatItem, ciInfo: ChatItemInfo, devTools: Boolean) {
-  val sent = ci.chatDir.sent
-  val appColors = CurrentColors.collectAsState().value.appColors
-  val itemColor = if (sent) appColors.sentMessage else appColors.receivedMessage
-  val context = LocalContext.current
-  val uriHandler = LocalUriHandler.current
-
-  @Composable
-  fun ItemVersionView(ciVersion: ChatItemVersion, current: Boolean) {
-    val showMenu = remember { mutableStateOf(false) }
-    val text = ciVersion.msgContent.text
-    Column {
-      Box(
-        Modifier.clip(RoundedCornerShape(18.dp)).background(itemColor).padding(bottom = 3.dp)
-          .combinedClickable(onLongClick = { showMenu.value = true }, onClick = {})
-      ) {
-        Box(Modifier.padding(vertical = 6.dp, horizontal = 12.dp)) {
-          MarkdownText(
-            text, if (text.isEmpty()) emptyList() else ciVersion.formattedText,
-            linkMode = SimplexLinkMode.DESCRIPTION, uriHandler = uriHandler,
-            onLinkLongClick = { showMenu.value = true }
-          )
-        }
-      }
-      Row(Modifier.padding(start = 12.dp, top = 3.dp, bottom = 16.dp)) {
-        Text(
-          localTimestamp(ciVersion.itemVersionTs),
-          fontSize = 12.sp,
-          color = MaterialTheme.colors.secondary,
-          modifier = Modifier.padding(end = 6.dp)
-        )
-        if (current && ci.meta.itemDeleted == null) {
-          Text(
-            stringResource(R.string.item_info_current),
-            fontSize = 12.sp,
-            color = MaterialTheme.colors.secondary
-          )
-        }
-      }
-      DefaultDropdownMenu(showMenu) {
-        ItemAction(stringResource(R.string.share_verb), painterResource(R.drawable.ic_share), onClick = {
-          shareText(context, text)
-          showMenu.value = false
-        })
-        ItemAction(stringResource(R.string.copy_verb), painterResource(R.drawable.ic_content_copy), onClick = {
-          copyText(context, text)
-          showMenu.value = false
-        })
-      }
-    }
-  }
-
-  Column(Modifier.fillMaxWidth().verticalScroll(rememberScrollState())) {
-    AppBarTitle(stringResource(if (sent) R.string.sent_message else R.string.received_message))
-    SectionView {
-      InfoRow(stringResource(R.string.info_row_sent_at), localTimestamp(ci.meta.itemTs))
-      if (!sent) {
-        InfoRow(stringResource(R.string.info_row_received_at), localTimestamp(ci.meta.createdAt))
-      }
-      when (val itemDeleted = ci.meta.itemDeleted) {
-        is CIDeleted.Deleted ->
-          if (itemDeleted.deletedTs != null) {
-            InfoRow(stringResource(R.string.info_row_deleted_at), localTimestamp(itemDeleted.deletedTs))
-          }
-        is CIDeleted.Moderated ->
-          if (itemDeleted.deletedTs != null) {
-            InfoRow(stringResource(R.string.info_row_moderated_at), localTimestamp(itemDeleted.deletedTs))
-          }
-        else -> {}
-      }
-      val deleteAt = ci.meta.itemTimed?.deleteAt
-      if (deleteAt != null) {
-        InfoRow(stringResource(R.string.info_row_disappears_at), localTimestamp(deleteAt))
-      }
-      if (devTools) {
-        InfoRow(stringResource(R.string.info_row_database_id), ci.meta.itemId.toString())
-        InfoRow(stringResource(R.string.info_row_updated_at), localTimestamp(ci.meta.updatedAt))
-      }
-    }
-    val versions = ciInfo.itemVersions
-    if (versions.isNotEmpty()) {
-      SectionDividerSpaced(maxTopPadding = false, maxBottomPadding = false)
-      SectionView(padding = PaddingValues(horizontal = DEFAULT_PADDING)) {
-        Text(stringResource(R.string.edit_history), style = MaterialTheme.typography.h2, modifier = Modifier.padding(bottom = DEFAULT_PADDING))
-        versions.forEachIndexed { i, ciVersion ->
-          ItemVersionView(ciVersion, current = i == 0)
-        }
-      }
-    }
-    SectionBottomSpacer()
-  }
-}
-
-fun itemInfoShareText(ci: ChatItem, chatItemInfo: ChatItemInfo, devTools: Boolean): String {
-  val meta = ci.meta
-  val sent = ci.chatDir.sent
-  val shareText = mutableListOf<String>(generalGetString(if (sent) R.string.sent_message else R.string.received_message), "")
-
-  shareText.add(String.format(generalGetString(R.string.share_text_sent_at), localTimestamp(meta.itemTs)))
-  if (!ci.chatDir.sent) {
-    shareText.add(String.format(generalGetString(R.string.share_text_received_at), localTimestamp(meta.createdAt)))
-  }
-  when (val itemDeleted = ci.meta.itemDeleted) {
-    is CIDeleted.Deleted ->
-      if (itemDeleted.deletedTs != null) {
-        shareText.add(String.format(generalGetString(R.string.share_text_deleted_at), localTimestamp(itemDeleted.deletedTs)))
-      }
-    is CIDeleted.Moderated ->
-      if (itemDeleted.deletedTs != null) {
-        shareText.add(String.format(generalGetString(R.string.share_text_moderated_at), localTimestamp(itemDeleted.deletedTs)))
-      }
-    else -> {}
-  }
-  val deleteAt = ci.meta.itemTimed?.deleteAt
-  if (deleteAt != null) {
-    shareText.add(String.format(generalGetString(R.string.share_text_disappears_at), localTimestamp(deleteAt)))
-  }
-  if (devTools) {
-    shareText.add(String.format(generalGetString(R.string.share_text_database_id), meta.itemId))
-    shareText.add(String.format(generalGetString(R.string.share_text_updated_at), meta.updatedAt))
-  }
-  val versions = chatItemInfo.itemVersions
-  if (versions.isNotEmpty()) {
-    shareText.add("")
-    shareText.add(generalGetString(R.string.edit_history))
-    versions.forEachIndexed { index, itemVersion ->
-      val ts = localTimestamp(itemVersion.itemVersionTs)
-      shareText.add("")
-      shareText.add(
-        if (index == 0 && ci.meta.itemDeleted == null) {
-          String.format(generalGetString(R.string.current_version_timestamp), ts)
-        } else {
-          localTimestamp(itemVersion.itemVersionTs)
-        }
-      )
-      shareText.add(itemVersion.msgContent.text)
-    }
-  }
-  return shareText.joinToString(separator = "\n")
-}
--- a/apps/android/app/src/main/java/chat/simplex/app/views/chat/ChatView.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/chat/ChatView.kt
@@ -1,5 +1,6 @@
 package chat.simplex.app.views.chat

+import android.app.Activity
 import android.content.res.Configuration
 import android.graphics.Bitmap
 import android.net.Uri
@@ -12,6 +13,9 @@ import androidx.compose.foundation.lazy.*
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.*
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.*
+import androidx.compose.material.icons.outlined.*
 import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.mapSaver
 import androidx.compose.runtime.saveable.rememberSaveable
@@ -20,7 +24,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.*
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.capitalize
 import androidx.compose.ui.text.font.FontWeight
@@ -101,7 +104,6 @@ fun ChatView(chatId: String, chatModel: ChatModel, onComposed: () -> Unit) {
    }
  }
  val view = LocalView.current
-  val context = LocalContext.current
  if (activeChat.value == null || user == null) {
    chatModel.chatId.value = null
  } else {
@@ -132,6 +134,7 @@ fun ChatView(chatId: String, chatModel: ChatModel, onComposed: () -> Unit) {
      searchText,
      useLinkPreviews = useLinkPreviews,
      linkMode = chatModel.simplexLinkMode.value,
+      allowVideoAttachment = chatModel.controller.appPrefs.xftpSendEnabled.get(),
      chatModelIncognito = chatModel.incognito.value,
      back = {
        hideKeyboard(view)
@@ -259,32 +262,6 @@ fun ChatView(chatId: String, chatModel: ChatModel, onComposed: () -> Unit) {
          chatModel.controller.allowFeatureToContact(contact, feature, param)
        }
      },
-      setReaction = { cInfo, cItem, add, reaction ->
-        withApi {
-          val updatedCI = chatModel.controller.apiChatItemReaction(
-            type = cInfo.chatType,
-            id = cInfo.apiId,
-            itemId = cItem.id,
-            add = add,
-            reaction = reaction
-          )
-          if (updatedCI != null) {
-            chatModel.updateChatItem(cInfo, updatedCI)
-          }
-        }
-      },
-      showItemDetails = { cInfo, cItem ->
-        withApi {
-          val ciInfo = chatModel.controller.apiGetChatItemInfo(cInfo.chatType, cInfo.apiId, cItem.id)
-          if (ciInfo != null) {
-            ModalManager.shared.showModal(endButtons = { ShareButton {
-              shareText(context, itemInfoShareText(cItem, ciInfo, chatModel.controller.appPrefs.developerTools.get()))
-            } }) {
-              ChatItemInfoView(cItem, ciInfo, devTools = chatModel.controller.appPrefs.developerTools.get())
-            }
-          }
-        }
-      },
      addMembers = { groupInfo ->
        hideKeyboard(view)
        withApi {
@@ -331,6 +308,7 @@ fun ChatLayout(
  searchValue: State<String>,
  useLinkPreviews: Boolean,
  linkMode: SimplexLinkMode,
+  allowVideoAttachment: Boolean,
  chatModelIncognito: Boolean,
  back: () -> Unit,
  info: () -> Unit,
@@ -343,8 +321,6 @@ fun ChatLayout(
  startCall: (CallMediaType) -> Unit,
  acceptCall: (Contact) -> Unit,
  acceptFeature: (Contact, ChatFeature, Int?) -> Unit,
-  setReaction: (ChatInfo, ChatItem, Boolean, MsgReaction) -> Unit,
-  showItemDetails: (ChatInfo, ChatItem) -> Unit,
  addMembers: (GroupInfo) -> Unit,
  markRead: (CC.ItemRange, unreadCountAfter: Int?) -> Unit,
  changeNtfsState: (Boolean, currentValue: MutableState<Boolean>) -> Unit,
@@ -355,6 +331,7 @@ fun ChatLayout(
  Box(
    Modifier
      .fillMaxWidth()
+      .background(MaterialTheme.colors.background)
  ) {
    ProvideWindowInsets(windowInsetsAnimationsEnabled = true) {
      ModalBottomSheetLayout(
@@ -363,6 +340,7 @@ fun ChatLayout(
        sheetContent = {
          ChooseAttachmentView(
            attachmentOption,
+            allowVideoAttachment,
            hide = { scope.launch { attachmentBottomSheetState.hide() } }
          )
        },
@@ -380,14 +358,11 @@ fun ChatLayout(
          modifier = Modifier.navigationBarsWithImePadding(),
          floatingActionButton = { floatingButton.value() },
        ) { contentPadding ->
-          BoxWithConstraints(Modifier
-            .fillMaxHeight()
-            .padding(contentPadding)
-          ) {
+          BoxWithConstraints(Modifier.fillMaxHeight().padding(contentPadding)) {
            ChatItemsList(
              chat, unreadCount, composeState, chatItems, searchValue,
              useLinkPreviews, linkMode, chatModelIncognito, showMemberInfo, loadPrevMessages, deleteMessage,
-              receiveFile, cancelFile, joinGroup, acceptCall, acceptFeature, setReaction, showItemDetails, markRead, setFloatingButton, onComposed,
+              receiveFile, cancelFile, joinGroup, acceptCall, acceptFeature, markRead, setFloatingButton, onComposed,
            )
          }
        }
@@ -407,7 +382,7 @@ fun ChatInfoToolbar(
  onSearchValueChanged: (String) -> Unit,
 ) {
  val scope = rememberCoroutineScope()
-  val showMenu = rememberSaveable { mutableStateOf(false) }
+  var showMenu by rememberSaveable { mutableStateOf(false) }
  var showSearch by rememberSaveable { mutableStateOf(false) }
  val onBackClicked = {
    if (!showSearch) {
@@ -421,34 +396,34 @@ fun ChatInfoToolbar(
  val barButtons = arrayListOf<@Composable RowScope.() -> Unit>()
  val menuItems = arrayListOf<@Composable () -> Unit>()
  menuItems.add {
-    ItemAction(stringResource(android.R.string.search_go).capitalize(Locale.current), painterResource(R.drawable.ic_search), onClick = {
-      showMenu.value = false
+    ItemAction(stringResource(android.R.string.search_go).capitalize(Locale.current), Icons.Outlined.Search, onClick = {
+      showMenu = false
      showSearch = true
    })
  }

-  if (chat.chatInfo is ChatInfo.Direct && chat.chatInfo.contact.allowsFeature(ChatFeature.Calls)) {
+  if (chat.chatInfo is ChatInfo.Direct) {
    barButtons.add {
      IconButton({
-        showMenu.value = false
+        showMenu = false
        startCall(CallMediaType.Audio)
      }) {
-        Icon(painterResource(R.drawable.ic_call_500), stringResource(R.string.icon_descr_more_button), tint = MaterialTheme.colors.primary)
+        Icon(Icons.Outlined.Phone, stringResource(R.string.icon_descr_more_button), tint = MaterialTheme.colors.primary)
      }
    }
    menuItems.add {
-      ItemAction(stringResource(R.string.icon_descr_video_call).capitalize(Locale.current), painterResource(R.drawable.ic_videocam), onClick = {
-        showMenu.value = false
+      ItemAction(stringResource(R.string.icon_descr_video_call).capitalize(Locale.current), Icons.Outlined.Videocam, onClick = {
+        showMenu = false
        startCall(CallMediaType.Video)
      })
    }
  } else if (chat.chatInfo is ChatInfo.Group && chat.chatInfo.groupInfo.canAddMembers && !chat.chatInfo.incognito) {
    barButtons.add {
      IconButton({
-        showMenu.value = false
+        showMenu = false
        addMembers(chat.chatInfo.groupInfo)
      }) {
-        Icon(painterResource(R.drawable.ic_person_add_500), stringResource(R.string.icon_descr_add_members), tint = MaterialTheme.colors.primary)
+        Icon(Icons.Outlined.PersonAdd, stringResource(R.string.icon_descr_add_members), tint = MaterialTheme.colors.primary)
      }
    }
  }
@@ -456,9 +431,9 @@ fun ChatInfoToolbar(
  menuItems.add {
    ItemAction(
      if (ntfsEnabled.value) stringResource(R.string.mute_chat) else stringResource(R.string.unmute_chat),
-      if (ntfsEnabled.value) painterResource(R.drawable.ic_notifications_off) else painterResource(R.drawable.ic_notifications),
+      if (ntfsEnabled.value) Icons.Outlined.NotificationsOff else Icons.Outlined.Notifications,
      onClick = {
-        showMenu.value = false
+        showMenu = false
        // Just to make a delay before changing state of ntfsEnabled, otherwise it will redraw menu item with new value before closing the menu
        scope.launch {
          delay(200)
@@ -469,8 +444,8 @@ fun ChatInfoToolbar(
  }

  barButtons.add {
-    IconButton({ showMenu.value = true }) {
-      Icon(MoreVertFilled, stringResource(R.string.icon_descr_more_button), tint = MaterialTheme.colors.primary)
+    IconButton({ showMenu = true }) {
+      Icon(Icons.Default.MoreVert, stringResource(R.string.icon_descr_more_button), tint = MaterialTheme.colors.primary)
    }
  }

@@ -486,14 +461,18 @@ fun ChatInfoToolbar(
  Divider(Modifier.padding(top = AppBarHeight))

  Box(Modifier.fillMaxWidth().wrapContentSize(Alignment.TopEnd).offset(y = AppBarHeight)) {
-    DefaultDropdownMenu(showMenu) {
+    DropdownMenu(
+      expanded = showMenu,
+      onDismissRequest = { showMenu = false },
+      Modifier.widthIn(min = 220.dp)
+    ) {
      menuItems.forEach { it() }
    }
  }
 }

@Composable
-fun ChatInfoToolbarTitle(cInfo: ChatInfo, imageSize: Dp = 40.dp, iconColor: Color = MaterialTheme.colors.secondaryVariant) {
+fun ChatInfoToolbarTitle(cInfo: ChatInfo, imageSize: Dp = 40.dp, iconColor: Color = MaterialTheme.colors.secondary) {
  Row(
    horizontalArrangement = Arrangement.Center,
    verticalAlignment = Alignment.CenterVertically
@@ -527,7 +506,7 @@ fun ChatInfoToolbarTitle(cInfo: ChatInfo, imageSize: Dp = 40.dp, iconColor: Colo

@Composable
 private fun ContactVerifiedShield() {
-  Icon(painterResource(R.drawable.ic_verified_user), null, Modifier.size(18.dp).padding(end = 3.dp, top = 1.dp), tint = MaterialTheme.colors.secondary)
+  Icon(Icons.Outlined.VerifiedUser, null, Modifier.size(18.dp).padding(end = 3.dp, top = 1.dp), tint = HighOrLowlight)
 }

 data class CIListState(val scrolled: Boolean, val itemCount: Int, val keyboardState: KeyboardState)
@@ -560,8 +539,6 @@ fun BoxWithConstraintsScope.ChatItemsList(
  joinGroup: (Long) -> Unit,
  acceptCall: (Contact) -> Unit,
  acceptFeature: (Contact, ChatFeature, Int?) -> Unit,
-  setReaction: (ChatInfo, ChatItem, Boolean, MsgReaction) -> Unit,
-  showItemDetails: (ChatInfo, ChatItem) -> Unit,
  markRead: (CC.ItemRange, unreadCountAfter: Int?) -> Unit,
  setFloatingButton: (@Composable () -> Unit) -> Unit,
  onComposed: () -> Unit,
@@ -649,13 +626,12 @@ fun BoxWithConstraintsScope.ChatItemsList(
            }
          }
        }
-        val voiceWithTransparentBack = cItem.content.msgContent is MsgContent.MCVoice && cItem.content.text.isEmpty() && cItem.quotedItem == null
        if (chat.chatInfo is ChatInfo.Group) {
          if (cItem.chatDir is CIDirection.GroupRcv) {
            val prevItem = if (i < reversedChatItems.lastIndex) reversedChatItems[i + 1] else null
            val member = cItem.chatDir.groupMember
            val showMember = showMemberImage(member, prevItem)
-            Row(Modifier.padding(start = 8.dp, end = if (voiceWithTransparentBack) 12.dp else 66.dp).then(swipeableModifier)) {
+            Row(Modifier.padding(start = 8.dp, end = 66.dp).then(swipeableModifier)) {
              if (showMember) {
                val contactId = member.memberContactId
                if (contactId == null) {
@@ -675,22 +651,22 @@ fun BoxWithConstraintsScope.ChatItemsList(
              } else {
                Spacer(Modifier.size(42.dp))
              }
-              ChatItemView(chat.chatInfo, cItem, composeState, provider, showMember = showMember, useLinkPreviews = useLinkPreviews, linkMode = linkMode, deleteMessage = deleteMessage, receiveFile = receiveFile, cancelFile = cancelFile, joinGroup = {}, acceptCall = acceptCall, acceptFeature = acceptFeature, scrollToItem = scrollToItem, setReaction = setReaction, showItemDetails = showItemDetails)
+              ChatItemView(chat.chatInfo, cItem, composeState, provider, showMember = showMember, useLinkPreviews = useLinkPreviews, linkMode = linkMode, deleteMessage = deleteMessage, receiveFile = receiveFile, cancelFile = cancelFile, joinGroup = {}, acceptCall = acceptCall, acceptFeature = acceptFeature, scrollToItem = scrollToItem)
            }
          } else {
-            Box(Modifier.padding(start = if (voiceWithTransparentBack) 12.dp else 104.dp, end = 12.dp).then(swipeableModifier)) {
-              ChatItemView(chat.chatInfo, cItem, composeState, provider, useLinkPreviews = useLinkPreviews, linkMode = linkMode, deleteMessage = deleteMessage, receiveFile = receiveFile, cancelFile = cancelFile, joinGroup = {}, acceptCall = acceptCall, acceptFeature = acceptFeature, scrollToItem = scrollToItem, setReaction = setReaction, showItemDetails = showItemDetails)
+            Box(Modifier.padding(start = 104.dp, end = 12.dp).then(swipeableModifier)) {
+              ChatItemView(chat.chatInfo, cItem, composeState, provider, useLinkPreviews = useLinkPreviews, linkMode = linkMode, deleteMessage = deleteMessage, receiveFile = receiveFile, cancelFile = cancelFile, joinGroup = {}, acceptCall = acceptCall, acceptFeature = acceptFeature, scrollToItem = scrollToItem)
            }
          }
        } else { // direct message
          val sent = cItem.chatDir.sent
          Box(
            Modifier.padding(
-              start = if (sent && !voiceWithTransparentBack) 76.dp else 12.dp,
-              end = if (sent || voiceWithTransparentBack) 12.dp else 76.dp,
+              start = if (sent) 76.dp else 12.dp,
+              end = if (sent) 12.dp else 76.dp,
            ).then(swipeableModifier)
          ) {
-            ChatItemView(chat.chatInfo, cItem, composeState, provider, useLinkPreviews = useLinkPreviews, linkMode = linkMode, deleteMessage = deleteMessage, receiveFile = receiveFile, cancelFile = cancelFile, joinGroup = joinGroup, acceptCall = acceptCall, acceptFeature = acceptFeature, scrollToItem = scrollToItem, setReaction = setReaction, showItemDetails = showItemDetails)
+            ChatItemView(chat.chatInfo, cItem, composeState, provider, useLinkPreviews = useLinkPreviews, linkMode = linkMode, deleteMessage = deleteMessage, receiveFile = receiveFile, cancelFile = cancelFile, joinGroup = joinGroup, acceptCall = acceptCall, acceptFeature = acceptFeature, scrollToItem = scrollToItem)
          }
        }

@@ -816,27 +792,36 @@ fun BoxWithConstraintsScope.FloatingButtons(
  }
  val showButtonWithCounter = topUnreadCount > 0
  val height = with(LocalDensity.current) { maxHeight.toPx() }
-  val showDropDown = remember { mutableStateOf(false) }
+  var showDropDown by remember { mutableStateOf(false) }

  TopEndFloatingButton(
-    Modifier.padding(end = DEFAULT_PADDING, top = 24.dp).align(Alignment.TopEnd),
+    Modifier.padding(end = 16.dp, top = 24.dp).align(Alignment.TopEnd),
    topUnreadCount,
    showButtonWithCounter,
    onClick = { scope.launch { listState.animateScrollBy(height) } },
-    onLongClick = { showDropDown.value = true }
+    onLongClick = { showDropDown = true }
  )

-  DefaultDropdownMenu(showDropDown, offset = DpOffset(maxWidth - DEFAULT_PADDING, 24.dp + fabSize)) {
-    ItemAction(
-      generalGetString(R.string.mark_read),
-      painterResource(R.drawable.ic_check),
+  DropdownMenu(
+    expanded = showDropDown,
+    onDismissRequest = { showDropDown = false },
+    Modifier.width(220.dp),
+    offset = DpOffset(maxWidth - 16.dp, 24.dp + fabSize)
+  ) {
+    DropdownMenuItem(
      onClick = {
        markRead(
          CC.ItemRange(minUnreadItemId, chatItems[chatItems.size - listState.layoutInfo.visibleItemsInfo.lastIndex - 1].id - 1),
          bottomUnreadCount
        )
-        showDropDown.value = false
-      })
+        showDropDown = false
+      }
+    ) {
+      Text(
+        generalGetString(R.string.mark_read),
+        maxLines = 1,
+      )
+    }
  }
 }

@@ -889,7 +874,6 @@ private fun TopEndFloatingButton(
    FloatingActionButton(
      {}, // no action here
      modifier.size(48.dp),
-      backgroundColor = MaterialTheme.colors.secondaryVariant,
      elevation = FloatingActionButtonDefaults.elevation(0.dp, 0.dp),
      interactionSource = interactionSource,
    ) {
@@ -916,8 +900,7 @@ private fun bottomEndFloatingButton(
      FloatingActionButton(
        onClick = onClickCounter,
        elevation = FloatingActionButtonDefaults.elevation(0.dp, 0.dp, 0.dp, 0.dp),
-        modifier = Modifier.size(48.dp),
-        backgroundColor = MaterialTheme.colors.secondaryVariant,
+        modifier = Modifier.size(48.dp)
      ) {
        Text(
          unreadCountStr(unreadCount),
@@ -932,11 +915,10 @@ private fun bottomEndFloatingButton(
      FloatingActionButton(
        onClick = onClickArrowDown,
        elevation = FloatingActionButtonDefaults.elevation(0.dp, 0.dp, 0.dp, 0.dp),
-        modifier = Modifier.size(48.dp),
-        backgroundColor = MaterialTheme.colors.secondaryVariant,
+        modifier = Modifier.size(48.dp)
      ) {
        Icon(
-          painter = painterResource(R.drawable.ic_keyboard_arrow_down),
+          imageVector = Icons.Default.KeyboardArrowDown,
          contentDescription = null,
          tint = MaterialTheme.colors.primary
        )
@@ -1101,6 +1083,7 @@ fun PreviewChatLayout() {
      searchValue,
      useLinkPreviews = true,
      linkMode = SimplexLinkMode.DESCRIPTION,
+      allowVideoAttachment = true,
      chatModelIncognito = false,
      back = {},
      info = {},
@@ -1113,8 +1096,6 @@ fun PreviewChatLayout() {
      startCall = {},
      acceptCall = { _ -> },
      acceptFeature = { _, _, _ -> },
-      setReaction = { _, _, _, _ -> },
-      showItemDetails = { _, _ -> },
      addMembers = { _ -> },
      markRead = { _, _ -> },
      changeNtfsState = { _, _ -> },
@@ -1163,6 +1144,7 @@ fun PreviewGroupChatLayout() {
      searchValue,
      useLinkPreviews = true,
      linkMode = SimplexLinkMode.DESCRIPTION,
+      allowVideoAttachment = true,
      chatModelIncognito = false,
      back = {},
      info = {},
@@ -1175,8 +1157,6 @@ fun PreviewGroupChatLayout() {
      startCall = {},
      acceptCall = { _ -> },
      acceptFeature = { _, _, _ -> },
-      setReaction = { _, _, _, _ -> },
-      showItemDetails = { _, _ -> },
      addMembers = { _ -> },
      markRead = { _, _ -> },
      changeNtfsState = { _, _ -> },
--- a/apps/android/app/src/main/java/chat/simplex/app/views/chat/ComposeFileView.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/chat/ComposeFileView.kt
@@ -1,30 +1,31 @@
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.*
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.InsertDriveFile
+import androidx.compose.material.icons.outlined.Close
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import chat.simplex.app.R
 import chat.simplex.app.ui.theme.*
+import chat.simplex.app.views.chat.item.SentColorLight

@Composable
 fun ComposeFileView(fileName: String, cancelFile: () -> Unit, cancelEnabled: Boolean) {
-  val sentColor = CurrentColors.collectAsState().value.appColors.sentMessage
  Row(
    Modifier
      .height(60.dp)
      .fillMaxWidth()
      .padding(top = 8.dp)
-      .background(sentColor),
+      .background(SentColorLight),
    verticalAlignment = Alignment.CenterVertically
  ) {
    Icon(
-      painterResource(R.drawable.ic_draft_filled),
+      Icons.Filled.InsertDriveFile,
      stringResource(R.string.icon_descr_file),
      Modifier
        .padding(start = 4.dp, end = 2.dp)
@@ -36,7 +37,7 @@ fun ComposeFileView(fileName: String, cancelFile: () -> Unit, cancelEnabled: Boo
    if (cancelEnabled) {
      IconButton(onClick = cancelFile, modifier = Modifier.padding(0.dp)) {
        Icon(
-          painterResource(R.drawable.ic_close),
+          Icons.Outlined.Close,
          contentDescription = stringResource(R.string.icon_descr_cancel_file_preview),
          tint = MaterialTheme.colors.primary,
          modifier = Modifier.padding(10.dp)
--- a/apps/android/app/src/main/java/chat/simplex/app/views/chat/ComposeImageView.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/chat/ComposeImageView.kt
@@ -4,28 +4,26 @@ import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyRow
-import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.material.*
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.Close
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.asImageBitmap
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import chat.simplex.app.R
-import chat.simplex.app.ui.theme.*
-import chat.simplex.app.views.helpers.UploadContent
+import chat.simplex.app.ui.theme.DEFAULT_PADDING_HALF
+import chat.simplex.app.views.chat.item.SentColorLight
 import chat.simplex.app.views.helpers.base64ToBitmap

@Composable
-fun ComposeImageView(media: ComposePreview.MediaPreview, cancelImages: () -> Unit, cancelEnabled: Boolean) {
-  val sentColor = CurrentColors.collectAsState().value.appColors.sentMessage
+fun ComposeImageView(images: List<String>, cancelImages: () -> Unit, cancelEnabled: Boolean) {
  Row(
    Modifier
      .padding(top = 8.dp)
-      .background(sentColor),
+      .background(SentColorLight),
    verticalAlignment = Alignment.CenterVertically,
  ) {
    LazyRow(
@@ -33,38 +31,19 @@ fun ComposeImageView(media: ComposePreview.MediaPreview, cancelImages: () -> Uni
      verticalAlignment = Alignment.CenterVertically,
      horizontalArrangement = Arrangement.spacedBy(DEFAULT_PADDING_HALF),
    ) {
-      itemsIndexed(media.images) { index, item ->
-        val content = media.content[index]
-        if (content is UploadContent.Video) {
-          Box(contentAlignment = Alignment.Center) {
-            val imageBitmap = base64ToBitmap(item).asImageBitmap()
-            Image(
-              imageBitmap,
-              "preview video",
-              modifier = Modifier.widthIn(max = 80.dp).height(60.dp)
-            )
-            Icon(
-              painterResource(R.drawable.ic_videocam_filled),
-              "preview video",
-              Modifier
-                .size(20.dp),
-              tint = Color.White
-            )
-          }
-        } else {
-          val imageBitmap = base64ToBitmap(item).asImageBitmap()
-          Image(
-            imageBitmap,
-            "preview image",
-            modifier = Modifier.widthIn(max = 80.dp).height(60.dp)
-          )
-        }
+      items(images.size) { index ->
+        val imageBitmap = base64ToBitmap(images[index]).asImageBitmap()
+        Image(
+          imageBitmap,
+          "preview image",
+          modifier = Modifier.widthIn(max = 80.dp).height(60.dp)
+        )
      }
    }
    if (cancelEnabled) {
      IconButton(onClick = cancelImages) {
        Icon(
-          painterResource(R.drawable.ic_close),
+          Icons.Outlined.Close,
          contentDescription = stringResource(R.string.icon_descr_cancel_image_preview),
          tint = MaterialTheme.colors.primary,
        )
--- a/apps/android/app/src/main/java/chat/simplex/app/views/chat/ComposeView.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/chat/ComposeView.kt
@@ -9,16 +9,20 @@ import android.content.*
 import android.content.pm.PackageManager
 import android.graphics.*
 import android.graphics.drawable.AnimatedImageDrawable
+import android.media.MediaMetadataRetriever
 import android.net.Uri
 import android.os.Build
 import android.provider.MediaStore
-import android.webkit.MimeTypeMap
 import android.widget.Toast
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContract
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.*
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.AttachFile
+import androidx.compose.material.icons.filled.Edit
+import androidx.compose.material.icons.outlined.Reply
 import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.Saver
 import androidx.compose.runtime.saveable.rememberSaveable
@@ -26,13 +30,13 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.core.content.ContextCompat
 import chat.simplex.app.*
 import chat.simplex.app.R
 import chat.simplex.app.model.*
+import chat.simplex.app.ui.theme.HighOrLowlight
 import chat.simplex.app.views.chat.item.*
 import chat.simplex.app.views.helpers.*
 import kotlinx.coroutines.*
@@ -45,7 +49,8 @@ import java.nio.file.Files
 sealed class ComposePreview {
  @Serializable object NoPreview: ComposePreview()
  @Serializable class CLinkPreview(val linkPreview: LinkPreview?): ComposePreview()
-  @Serializable class MediaPreview(val images: List<String>, val content: List<UploadContent>): ComposePreview()
+  @Serializable class ImagePreview(val images: List<String>, val content: List<UploadContent>): ComposePreview()
+  @Serializable class VideoPreview(val images: List<String>, val content: List<UploadContent>): ComposePreview()
  @Serializable data class VoicePreview(val voice: String, val durationMs: Int, val finished: Boolean): ComposePreview()
  @Serializable class FilePreview(val fileName: String, val uri: Uri): ComposePreview()
 }
@@ -91,7 +96,8 @@ data class ComposeState(
  val sendEnabled: () -> Boolean
    get() = {
      val hasContent = when (preview) {
-        is ComposePreview.MediaPreview -> true
+        is ComposePreview.ImagePreview -> true
+        is ComposePreview.VideoPreview -> true
        is ComposePreview.VoicePreview -> true
        is ComposePreview.FilePreview -> true
        else -> message.isNotEmpty() || liveMessage != null
@@ -104,7 +110,8 @@ data class ComposeState(
  val linkPreviewAllowed: Boolean
    get() =
      when (preview) {
-        is ComposePreview.MediaPreview -> false
+        is ComposePreview.ImagePreview -> false
+        is ComposePreview.VideoPreview -> false
        is ComposePreview.VoicePreview -> false
        is ComposePreview.FilePreview -> false
        else -> useLinkPreviews
@@ -118,7 +125,7 @@ data class ComposeState(

  val attachmentDisabled: Boolean
    get() {
-      if (editing || liveMessage != null || inProgress) return true
+      if (editing || liveMessage != null) return true
      return when (preview) {
        ComposePreview.NoPreview -> false
        is ComposePreview.CLinkPreview -> false
@@ -154,8 +161,8 @@ fun chatItemPreview(chatItem: ChatItem): ComposePreview {
    is MsgContent.MCText -> ComposePreview.NoPreview
    is MsgContent.MCLink -> ComposePreview.CLinkPreview(linkPreview = mc.preview)
    // TODO: include correct type
-    is MsgContent.MCImage -> ComposePreview.MediaPreview(images = listOf(mc.image), listOf(UploadContent.SimpleImage(getAppFileUri(fileName))))
-    is MsgContent.MCVideo -> ComposePreview.MediaPreview(images = listOf(mc.image), listOf(UploadContent.SimpleImage(getAppFileUri(fileName))))
+    is MsgContent.MCImage -> ComposePreview.ImagePreview(images = listOf(mc.image), listOf(UploadContent.SimpleImage(getAppFileUri(fileName))))
+    is MsgContent.MCVideo -> ComposePreview.VideoPreview(images = listOf(mc.image), listOf(UploadContent.SimpleImage(getAppFileUri(fileName))))
    is MsgContent.MCVoice -> ComposePreview.VoicePreview(voice = fileName, mc.duration / 1000, true)
    is MsgContent.MCFile -> ComposePreview.FilePreview(fileName, getAppFileUri(fileName))
    is MsgContent.MCUnknown, null -> ComposePreview.NoPreview
@@ -176,7 +183,8 @@ fun ComposeView(
  val pendingLinkUrl = rememberSaveable { mutableStateOf<String?>(null) }
  val cancelledLinks = rememberSaveable { mutableSetOf<String>() }
  val useLinkPreviews = chatModel.controller.appPrefs.privacyLinkPreviews.get()
-  val maxFileSize = getMaxFileSize(FileProtocol.XFTP)
+  val xftpSendEnabled = chatModel.controller.appPrefs.xftpSendEnabled.get()
+  val maxFileSize = getMaxFileSize(fileProtocol = if (xftpSendEnabled) FileProtocol.XFTP else FileProtocol.SMP)
  val smallFont = MaterialTheme.typography.body1.copy(color = MaterialTheme.colors.onBackground)
  val textStyle = remember { mutableStateOf(smallFont) }
  val cameraLauncher = rememberCameraLauncher { uri: Uri? ->
@@ -184,7 +192,7 @@ fun ComposeView(
      val bitmap: Bitmap? = getBitmapFromUri(uri)
      if (bitmap != null) {
        val imagePreview = resizeImageToStrSize(bitmap, maxDataSize = 14000)
-        composeState.value = composeState.value.copy(preview = ComposePreview.MediaPreview(listOf(imagePreview), listOf(UploadContent.SimpleImage(uri))))
+        composeState.value = composeState.value.copy(preview = ComposePreview.ImagePreview(listOf(imagePreview), listOf(UploadContent.SimpleImage(uri))))
      }
    }
  }
@@ -195,50 +203,52 @@ fun ComposeView(
      Toast.makeText(context, generalGetString(R.string.toast_permission_denied), Toast.LENGTH_SHORT).show()
    }
  }
-  val processPickedMedia = { uris: List<Uri>, text: String? ->
+  val processPickedImage = { uris: List<Uri>, text: String? ->
    val content = ArrayList<UploadContent>()
    val imagesPreview = ArrayList<String>()
    uris.forEach { uri ->
-      var bitmap: Bitmap? = null
-      val isImage = MimeTypeMap.getSingleton().getMimeTypeFromExtension(getFileName(SimplexApp.context, uri)?.split(".")?.last())?.contains("image/") == true
-      when {
-        isImage -> {
-          // Image
-          val drawable = getDrawableFromUri(uri)
-          bitmap = if (drawable != null) getBitmapFromUri(uri) else null
-          val isAnimNewApi = Build.VERSION.SDK_INT >= 28 && drawable is AnimatedImageDrawable
-          val isAnimOldApi = Build.VERSION.SDK_INT < 28 &&
-              (getFileName(SimplexApp.context, uri)?.endsWith(".gif") == true || getFileName(SimplexApp.context, uri)?.endsWith(".webp") == true)
-          if (isAnimNewApi || isAnimOldApi) {
-            // It's a gif or webp
-            val fileSize = getFileSize(context, uri)
-            if (fileSize != null && fileSize <= maxFileSize) {
-              content.add(UploadContent.AnimatedImage(uri))
-            } else {
-              bitmap = null
-              AlertManager.shared.showAlertMsg(
-                generalGetString(R.string.large_file),
-                String.format(generalGetString(R.string.maximum_supported_file_size), formatBytes(maxFileSize))
-              )
-            }
-          } else {
-            content.add(UploadContent.SimpleImage(uri))
-          }
-        }
-        else -> {
-          // Video
-          val res = getBitmapFromVideo(uri)
-          bitmap = res.preview
-          val durationMs = res.duration
-          content.add(UploadContent.Video(uri, durationMs?.div(1000)?.toInt() ?: 0))
+      val drawable = getDrawableFromUri(uri)
+      var bitmap: Bitmap? = if (drawable != null) getBitmapFromUri(uri) else null
+      val isAnimNewApi = Build.VERSION.SDK_INT >= 28 && drawable is AnimatedImageDrawable
+      val isAnimOldApi = Build.VERSION.SDK_INT < 28 &&
+          (getFileName(SimplexApp.context, uri)?.endsWith(".gif") == true || getFileName(SimplexApp.context, uri)?.endsWith(".webp") == true)
+      if (isAnimNewApi || isAnimOldApi) {
+        // It's a gif or webp
+        val fileSize = getFileSize(context, uri)
+        if (fileSize != null && fileSize <= maxFileSize) {
+          content.add(UploadContent.AnimatedImage(uri))
+        } else {
+          bitmap = null
+          AlertManager.shared.showAlertMsg(
+            generalGetString(R.string.large_file),
+            String.format(generalGetString(R.string.maximum_supported_file_size), formatBytes(maxFileSize))
+          )
        }
+      } else {
+        content.add(UploadContent.SimpleImage(uri))
      }
      if (bitmap != null) {
        imagesPreview.add(resizeImageToStrSize(bitmap, maxDataSize = 14000))
      }
    }
+
    if (imagesPreview.isNotEmpty()) {
-      composeState.value = composeState.value.copy(message = text ?: composeState.value.message, preview = ComposePreview.MediaPreview(imagesPreview, content))
+      composeState.value = composeState.value.copy(message = text ?: composeState.value.message, preview = ComposePreview.ImagePreview(imagesPreview, content))
+    }
+  }
+  val processPickedVideo = { uris: List<Uri>, text: String? ->
+    val content = ArrayList<UploadContent>()
+    val imagesPreview = ArrayList<String>()
+    uris.forEach { uri ->
+      val (bitmap: Bitmap?, durationMs: Long?) = getBitmapFromVideo(uri)
+      content.add(UploadContent.Video(uri, durationMs?.div(1000)?.toInt() ?: 0))
+      if (bitmap != null) {
+        imagesPreview.add(resizeImageToStrSize(bitmap, maxDataSize = 14000))
+      }
+    }
+
+    if (imagesPreview.isNotEmpty()) {
+      composeState.value = composeState.value.copy(message = text ?: composeState.value.message, preview = ComposePreview.VideoPreview(imagesPreview, content))
    }
  }
  val processPickedFile = { uri: Uri?, text: String? ->
@@ -257,17 +267,16 @@ fun ComposeView(
      }
    }
  }
-  val galleryImageLauncher = rememberLauncherForActivityResult(contract = PickMultipleImagesFromGallery()) { processPickedMedia(it, null) }
-  val galleryImageLauncherFallback = rememberGetMultipleContentsLauncher { processPickedMedia(it, null) }
-  val galleryVideoLauncher = rememberLauncherForActivityResult(contract = PickMultipleVideosFromGallery()) { processPickedMedia(it, null) }
-  val galleryVideoLauncherFallback = rememberGetMultipleContentsLauncher { processPickedMedia(it, null) }
-
+  val galleryImageLauncher = rememberLauncherForActivityResult(contract = PickMultipleImagesFromGallery()) { processPickedImage(it, null) }
+  val galleryImageLauncherFallback = rememberGetMultipleContentsLauncher { processPickedImage(it, null) }
+  val galleryVideoLauncher = rememberLauncherForActivityResult(contract = PickMultipleVideosFromGallery()) { processPickedVideo(it, null) }
+  val galleryVideoLauncherFallback = rememberGetMultipleContentsLauncher { processPickedVideo(it, null) }
  val filesLauncher = rememberGetContentLauncher { processPickedFile(it, null) }
  val recState: MutableState<RecordingState> = remember { mutableStateOf(RecordingState.NotStarted) }

  LaunchedEffect(attachmentOption.value) {
    when (attachmentOption.value) {
-      AttachmentOption.CameraPhoto -> {
+      AttachmentOption.TakePhoto -> {
        when (PackageManager.PERMISSION_GRANTED) {
          ContextCompat.checkSelfPermission(context, Manifest.permission.CAMERA) -> {
            cameraLauncher.launchWithFallback()
@@ -278,7 +287,7 @@ fun ComposeView(
        }
        attachmentOption.value = null
      }
-      AttachmentOption.GalleryImage -> {
+      AttachmentOption.PickImage -> {
        try {
          galleryImageLauncher.launch(0)
        } catch (e: ActivityNotFoundException) {
@@ -286,7 +295,7 @@ fun ComposeView(
        }
        attachmentOption.value = null
      }
-      AttachmentOption.GalleryVideo -> {
+      AttachmentOption.PickVideo -> {
        try {
          galleryVideoLauncher.launch(0)
        } catch (e: ActivityNotFoundException) {
@@ -294,7 +303,7 @@ fun ComposeView(
        }
        attachmentOption.value = null
      }
-      AttachmentOption.File -> {
+      AttachmentOption.PickFile -> {
        filesLauncher.launch("*/*")
        attachmentOption.value = null
      }
@@ -366,15 +375,14 @@ fun ComposeView(
    chatModel.filesToDelete.clear()
  }

-  suspend fun send(cInfo: ChatInfo, mc: MsgContent, quoted: Long?, file: String? = null, live: Boolean = false, ttl: Int?): ChatItem? {
+  suspend fun send(cInfo: ChatInfo, mc: MsgContent, quoted: Long?, file: String? = null, live: Boolean = false): ChatItem? {
    val aChatItem = chatModel.controller.apiSendMessage(
      type = cInfo.chatType,
      id = cInfo.apiId,
      file = file,
      quotedItemId = quoted,
      mc = mc,
-      live = live,
-      ttl = ttl
+      live = live
    )
    if (aChatItem != null) chatModel.addChatItem(cInfo, aChatItem.chatItem)
    return aChatItem?.chatItem
@@ -382,7 +390,7 @@ fun ComposeView(



-  suspend fun sendMessageAsync(text: String?, live: Boolean, ttl: Int?): ChatItem? {
+  suspend fun sendMessageAsync(text: String?, live: Boolean): ChatItem? {
    val cInfo = chat.chatInfo
    val cs = composeState.value
    var sent: ChatItem?
@@ -452,20 +460,28 @@ fun ComposeView(
      when (val preview = cs.preview) {
        ComposePreview.NoPreview -> msgs.add(MsgContent.MCText(msgText))
        is ComposePreview.CLinkPreview -> msgs.add(checkLinkPreview())
-        is ComposePreview.MediaPreview -> {
+        is ComposePreview.ImagePreview -> {
          preview.content.forEachIndexed { index, it ->
            val file = when (it) {
              is UploadContent.SimpleImage -> saveImage(context, it.uri)
              is UploadContent.AnimatedImage -> saveAnimImage(context, it.uri)
-              is UploadContent.Video -> saveFileFromUri(context, it.uri)
+              else -> return@forEachIndexed
            }
            if (file != null) {
              files.add(file)
-              if (it is UploadContent.Video) {
-                msgs.add(MsgContent.MCVideo(if (preview.content.lastIndex == index) msgText else "", preview.images[index], it.duration))
-              } else {
-                msgs.add(MsgContent.MCImage(if (preview.content.lastIndex == index) msgText else "", preview.images[index]))
-              }
+              msgs.add(MsgContent.MCImage(if (preview.content.lastIndex == index) msgText else "", preview.images[index]))
+            }
+          }
+        }
+        is ComposePreview.VideoPreview -> {
+          preview.content.forEachIndexed { index, it ->
+            val file = when (it) {
+              is UploadContent.Video -> saveFileFromUri(context, it.uri)
+              else -> return@forEachIndexed
+            }
+            if (file != null) {
+              files.add(file)
+              msgs.add(MsgContent.MCVideo(if (preview.content.lastIndex == index) msgText else "", preview.images[index], it.duration))
            }
          }
        }
@@ -496,25 +512,25 @@ fun ComposeView(
      msgs.forEachIndexed { index, content ->
        if (index > 0) delay(100)
        sent = send(cInfo, content, if (index == 0) quotedItemId else null, files.getOrNull(index),
-          live = if (content !is MsgContent.MCVoice && index == msgs.lastIndex) live else false,
-          ttl = ttl
+          if (content !is MsgContent.MCVoice && index == msgs.lastIndex) live else false
        )
      }
      if (sent == null &&
-        (cs.preview is ComposePreview.MediaPreview ||
+        (cs.preview is ComposePreview.ImagePreview ||
+            cs.preview is ComposePreview.VideoPreview ||
            cs.preview is ComposePreview.FilePreview ||
            cs.preview is ComposePreview.VoicePreview)
        ) {
-        sent = send(cInfo, MsgContent.MCText(msgText), quotedItemId, null, live, ttl)
+        sent = send(cInfo, MsgContent.MCText(msgText), quotedItemId, null, live)
      }
    }
    clearState(live)
    return sent
  }

-  fun sendMessage(ttl: Int?) {
+  fun sendMessage() {
    withBGApi {
-      sendMessageAsync(null, false, ttl)
+      sendMessageAsync(null, false)
    }
  }

@@ -590,7 +606,7 @@ fun ComposeView(
    val cs = composeState.value
    val typedMsg = cs.message
    if ((cs.sendEnabled() || cs.contextItem is ComposeContextItem.QuotedItem) && (cs.liveMessage == null || !cs.liveMessage?.sent)) {
-      val ci = sendMessageAsync(typedMsg, live = true, ttl = null)
+      val ci = sendMessageAsync(typedMsg, live = true)
      if (ci != null) {
        composeState.value = composeState.value.copy(liveMessage = LiveMessage(ci, typedMsg = typedMsg, sentMsg = typedMsg, sent = true))
      }
@@ -611,7 +627,7 @@ fun ComposeView(
    if (liveMessage != null) {
      val sentMsg = liveMessageToSend(liveMessage, typedMsg)
      if (sentMsg != null) {
-        val ci = sendMessageAsync(sentMsg, live = true, ttl = null)
+        val ci = sendMessageAsync(sentMsg, live = true)
        if (ci != null) {
          composeState.value = composeState.value.copy(liveMessage = LiveMessage(ci, typedMsg = typedMsg, sentMsg = sentMsg, sent = true))
        }
@@ -625,27 +641,28 @@ fun ComposeView(
  fun previewView() {
    when (val preview = composeState.value.preview) {
      ComposePreview.NoPreview -> {}
-      is ComposePreview.CLinkPreview -> ComposeLinkView(
-        preview.linkPreview,
-        ::cancelLinkPreview,
-        cancelEnabled = !composeState.value.inProgress
-      )
-      is ComposePreview.MediaPreview -> ComposeImageView(
-        preview,
+      is ComposePreview.CLinkPreview -> ComposeLinkView(preview.linkPreview, ::cancelLinkPreview)
+      is ComposePreview.ImagePreview -> ComposeImageView(
+        preview.images,
        ::cancelImages,
-        cancelEnabled = !composeState.value.editing && !composeState.value.inProgress
+        cancelEnabled = !composeState.value.editing
+      )
+      is ComposePreview.VideoPreview -> ComposeImageView(
+        preview.images,
+        ::cancelImages,
+        cancelEnabled = !composeState.value.editing
      )
      is ComposePreview.VoicePreview -> ComposeVoiceView(
        preview.voice,
        preview.durationMs,
        preview.finished,
-        cancelEnabled = !composeState.value.editing && !composeState.value.inProgress,
+        cancelEnabled = !composeState.value.editing,
        ::cancelVoice
      )
      is ComposePreview.FilePreview -> ComposeFileView(
        preview.fileName,
        ::cancelFile,
-        cancelEnabled = !composeState.value.editing && !composeState.value.inProgress
+        cancelEnabled = !composeState.value.editing
      )
    }
  }
@@ -654,30 +671,22 @@ fun ComposeView(
  fun contextItemView() {
    when (val contextItem = composeState.value.contextItem) {
      ComposeContextItem.NoContextItem -> {}
-      is ComposeContextItem.QuotedItem -> ContextItemView(contextItem.chatItem, painterResource(R.drawable.ic_reply)) {
+      is ComposeContextItem.QuotedItem -> ContextItemView(contextItem.chatItem, Icons.Outlined.Reply) {
        composeState.value = composeState.value.copy(contextItem = ComposeContextItem.NoContextItem)
      }
-      is ComposeContextItem.EditingItem -> ContextItemView(contextItem.chatItem, painterResource(R.drawable.ic_edit_filled)) {
+      is ComposeContextItem.EditingItem -> ContextItemView(contextItem.chatItem, Icons.Filled.Edit) {
        clearState()
      }
    }
  }

-  // In case a user sent something, state is in progress, the user rotates a screen to different orientation.
-  // Without clearing the state the user will be unable to send anything until re-enters ChatView
-  LaunchedEffect(Unit) {
-    if (composeState.value.inProgress) {
-      clearState()
-    }
-  }
-
  LaunchedEffect(chatModel.sharedContent.value) {
    // Important. If it's null, don't do anything, chat is not closed yet but will be after a moment
    if (chatModel.chatId.value == null) return@LaunchedEffect

    when (val shared = chatModel.sharedContent.value) {
      is SharedContent.Text -> onMessageChange(shared.text)
-      is SharedContent.Media -> processPickedMedia(shared.uris, shared.text)
+      is SharedContent.Images -> processPickedImage(shared.uris, shared.text)
      is SharedContent.File -> processPickedFile(shared.uri, shared.text)
      null -> {}
    }
@@ -688,22 +697,11 @@ fun ComposeView(
  val userIsObserver = rememberUpdatedState(chat.userIsObserver)

  Column {
-    if (composeState.value.preview !is ComposePreview.VoicePreview || composeState.value.editing) {
-      contextItemView()
-      when {
-        composeState.value.editing && composeState.value.preview is ComposePreview.VoicePreview -> {}
-        composeState.value.editing && composeState.value.preview is ComposePreview.FilePreview -> {}
-        else -> previewView()
-      }
-    } else {
-      Box {
-        Box(Modifier.align(Alignment.TopStart).padding(bottom = 69.dp)) {
-          contextItemView()
-        }
-        Box(Modifier.align(Alignment.BottomStart)) {
-          previewView()
-        }
-      }
+    contextItemView()
+    when {
+      composeState.value.editing && composeState.value.preview is ComposePreview.VoicePreview -> {}
+      composeState.value.editing && composeState.value.preview is ComposePreview.FilePreview -> {}
+      else -> previewView()
    }
    Row(
      modifier = Modifier.padding(end = 8.dp),
@@ -711,9 +709,9 @@ fun ComposeView(
    ) {
      IconButton(showChooseAttachment, enabled = !composeState.value.attachmentDisabled && rememberUpdatedState(chat.userCanSend).value) {
        Icon(
-          painterResource(R.drawable.ic_attach_file_filled_500),
+          Icons.Filled.AttachFile,
          contentDescription = stringResource(R.string.attach),
-          tint = if (!composeState.value.attachmentDisabled && userCanSend.value) MaterialTheme.colors.primary else MaterialTheme.colors.secondary,
+          tint = if (!composeState.value.attachmentDisabled && userCanSend.value) MaterialTheme.colors.primary else HighOrLowlight,
          modifier = Modifier
            .size(28.dp)
            .clip(CircleShape)
@@ -765,12 +763,10 @@ fun ComposeView(
          if (orientation == activity.resources.configuration.orientation) {
            val cs = composeState.value
            if (cs.liveMessage != null && (cs.message.isNotEmpty() || cs.liveMessage.sent)) {
-              sendMessage(null)
+              sendMessage()
              resetLinkPreview()
              clearCurrentDraft()
              deleteUnusedFiles()
-            } else if (composeState.value.inProgress) {
-              clearCurrentDraft()
            } else if (!composeState.value.empty) {
              if (cs.preview is ComposePreview.VoicePreview && !cs.preview.finished) {
                composeState.value = cs.copy(preview = cs.preview.copy(finished = true))
@@ -786,9 +782,6 @@ fun ComposeView(
        }
      }

-      // TODO in 5.2 - allow if ttl is not configured
-      // val timedMessageAllowed = remember(chat.chatInfo) { chat.chatInfo.featureEnabled(ChatFeature.TimedMessages) }
-      val timedMessageAllowed = remember(chat.chatInfo) { chat.chatInfo.featureEnabled(ChatFeature.TimedMessages) && chat.chatInfo.timedMessagesTTL != null }
      SendMsgView(
        composeState,
        showVoiceRecordIcon = true,
@@ -800,10 +793,8 @@ fun ComposeView(
        allowVoiceToContact = ::allowVoiceToContact,
        userIsObserver = userIsObserver.value,
        userCanSend = userCanSend.value,
-        timedMessageAllowed = timedMessageAllowed,
-        customDisappearingMessageTimePref = chatModel.controller.appPrefs.customDisappearingMessageTime,
-        sendMessage = { ttl ->
-          sendMessage(ttl)
+        sendMessage = {
+          sendMessage()
          resetLinkPreview()
        },
        sendLiveMessage = ::sendLiveMessage,
--- a/apps/android/app/src/main/java/chat/simplex/app/views/chat/ComposeVoiceView.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/chat/ComposeVoiceView.kt
@@ -2,15 +2,13 @@ import androidx.compose.animation.core.Animatable
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.*
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.*
+import androidx.compose.material.icons.outlined.Close
 import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.drawBehind
-import androidx.compose.ui.geometry.Offset
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.platform.LocalDensity
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
@@ -18,6 +16,7 @@ import androidx.compose.ui.unit.sp
 import chat.simplex.app.R
 import chat.simplex.app.model.durationText
 import chat.simplex.app.ui.theme.*
+import chat.simplex.app.views.chat.item.SentColorLight
 import chat.simplex.app.views.helpers.*
 import kotlinx.coroutines.flow.distinctUntilChanged

@@ -29,135 +28,98 @@ fun ComposeVoiceView(
  cancelEnabled: Boolean,
  cancelVoice: () -> Unit
 ) {
-  val progress = rememberSaveable { mutableStateOf(0) }
-  val duration = rememberSaveable(recordedDurationMs) { mutableStateOf(recordedDurationMs) }
-  val sentColor = CurrentColors.collectAsState().value.appColors.sentMessage
-  Box {
-    Box(
+  BoxWithConstraints(Modifier
+    .fillMaxWidth()
+  ) {
+    val audioPlaying = rememberSaveable { mutableStateOf(false) }
+    val progress = rememberSaveable { mutableStateOf(0) }
+    val duration = rememberSaveable(recordedDurationMs) { mutableStateOf(recordedDurationMs) }
+    val progressBarWidth = remember { Animatable(0f) }
+    LaunchedEffect(recordedDurationMs, finishedRecording) {
+      snapshotFlow { progress.value }
+        .distinctUntilChanged()
+        .collect {
+          val startTime = when {
+            finishedRecording -> progress.value
+            else -> recordedDurationMs
+          }
+          val endTime = when {
+            finishedRecording -> duration.value
+            audioPlaying.value -> recordedDurationMs
+            else -> MAX_VOICE_MILLIS_FOR_SENDING
+          }
+          val to = ((startTime.toDouble() / endTime) * maxWidth.value).dp
+          progressBarWidth.animateTo(to.value, audioProgressBarAnimationSpec())
+        }
+    }
+    Spacer(
      Modifier
-        .fillMaxWidth().padding(top = 22.dp)
+        .requiredWidth(progressBarWidth.value.dp)
+        .padding(top = 58.dp)
+        .height(3.dp)
+        .background(MaterialTheme.colors.primary)
+    )
+    Row(
+      Modifier
+        .height(60.dp)
+        .fillMaxWidth()
+        .padding(top = 8.dp)
+        .background(SentColorLight),
+      verticalAlignment = Alignment.CenterVertically
    ) {
-      val audioPlaying = rememberSaveable { mutableStateOf(false) }
-      Row(
-        Modifier
-          .height(57.dp)
-          .fillMaxWidth()
-          .background(sentColor)
-          .padding(top = 3.dp),
-        verticalAlignment = Alignment.CenterVertically
-      ) {
+      IconButton(
+        onClick = {
+          if (!audioPlaying.value) {
+            AudioPlayer.play(filePath, audioPlaying, progress, duration, false)
+          } else {
+            AudioPlayer.pause(audioPlaying, progress)
+          }
+        },
+        enabled = finishedRecording) {
+        Icon(
+          if (audioPlaying.value) Icons.Filled.Pause else Icons.Filled.PlayArrow,
+          stringResource(R.string.icon_descr_file),
+          Modifier
+            .padding(start = 4.dp, end = 2.dp)
+            .size(36.dp),
+          tint = if (finishedRecording) MaterialTheme.colors.primary else HighOrLowlight
+        )
+      }
+      val numberInText = remember(recordedDurationMs, progress.value) {
+        derivedStateOf {
+          when {
+            finishedRecording && progress.value == 0 && !audioPlaying.value -> duration.value / 1000
+            finishedRecording -> progress.value / 1000
+            else -> recordedDurationMs / 1000
+          }
+        }
+      }
+      Text(
+        durationText(numberInText.value),
+        fontSize = 18.sp,
+        color = HighOrLowlight,
+      )
+      Spacer(Modifier.weight(1f))
+      if (cancelEnabled) {
        IconButton(
          onClick = {
-            if (!audioPlaying.value) {
-              AudioPlayer.play(filePath, audioPlaying, progress, duration, false)
-            } else {
-              AudioPlayer.pause(audioPlaying, progress)
-            }
+            AudioPlayer.stop(filePath)
+            cancelVoice()
          },
-          enabled = finishedRecording
+          modifier = Modifier.padding(0.dp)
        ) {
          Icon(
-            if (audioPlaying.value) painterResource(R.drawable.ic_pause_filled) else painterResource(R.drawable.ic_play_arrow_filled),
-            stringResource(R.string.icon_descr_file),
-            Modifier
-              .padding(start = 4.dp, end = 2.dp)
-              .size(36.dp),
-            tint = if (finishedRecording) MaterialTheme.colors.primary else MaterialTheme.colors.secondary
+            Icons.Outlined.Close,
+            contentDescription = stringResource(R.string.icon_descr_cancel_file_preview),
+            tint = MaterialTheme.colors.primary,
+            modifier = Modifier.padding(10.dp)
          )
        }
-        val numberInText = remember(recordedDurationMs, progress.value) {
-          derivedStateOf {
-            when {
-              finishedRecording && progress.value == 0 && !audioPlaying.value -> duration.value / 1000
-              finishedRecording -> progress.value / 1000
-              else -> recordedDurationMs / 1000
-            }
-          }
-        }
-        Text(
-          durationText(numberInText.value),
-          fontSize = 18.sp,
-          color = MaterialTheme.colors.secondary,
-        )
-        Spacer(Modifier.weight(1f))
-        if (cancelEnabled) {
-          IconButton(
-            onClick = {
-              AudioPlayer.stop(filePath)
-              cancelVoice()
-            },
-            modifier = Modifier.padding(0.dp)
-          ) {
-            Icon(
-              painterResource(R.drawable.ic_close),
-              contentDescription = stringResource(R.string.icon_descr_cancel_file_preview),
-              tint = MaterialTheme.colors.primary,
-              modifier = Modifier.padding(10.dp)
-            )
-          }
-        }
      }
    }
-
-    if (finishedRecording) {
-      FinishedRecordingSlider(sentColor, progress, duration, filePath)
-    } else {
-      RecordingInProgressSlider(recordedDurationMs)
-    }
  }
 }

-@Composable
-fun FinishedRecordingSlider(backgroundColor: Color, progress: MutableState<Int>, duration: MutableState<Int>, filePath: String) {
-  val dp4 = with(LocalDensity.current) { 4.dp.toPx() }
-  val dp10 = with(LocalDensity.current) { 10.dp.toPx() }
-  val primary = MaterialTheme.colors.primary
-  val inactiveTrackColor = MaterialTheme.colors.primary.mixWith(
-    backgroundColor.copy(1f).mixWith(MaterialTheme.colors.background, backgroundColor.alpha),
-    0.24f)
-  Slider(
-    progress.value.toFloat(),
-    onValueChange = { AudioPlayer.seekTo(it.toInt(), progress, filePath) },
-    Modifier
-      .fillMaxWidth()
-      .drawBehind {
-        drawRect(primary, Offset(0f, (size.height - dp4) / 2), size = androidx.compose.ui.geometry.Size(dp10, dp4))
-        drawRect(inactiveTrackColor, Offset(size.width - dp10, (size.height - dp4) / 2), size = androidx.compose.ui.geometry.Size(dp10, dp4))
-      },
-    colors = SliderDefaults.colors(inactiveTrackColor = inactiveTrackColor),
-    valueRange = 0f..duration.value.toFloat()
-  )
-}
-
-@Composable
-fun RecordingInProgressSlider(recordedDurationMs: Int) {
-  val thumbPosition = remember { Animatable(0f) }
-  val recDuration = rememberUpdatedState(recordedDurationMs)
-  LaunchedEffect(Unit) {
-    snapshotFlow { recDuration.value }
-      .distinctUntilChanged()
-      .collect {
-        thumbPosition.animateTo(it.toFloat(), audioProgressBarAnimationSpec())
-      }
-  }
-  val dp4 = with(LocalDensity.current) { 4.dp.toPx() }
-  val dp10 = with(LocalDensity.current) { 10.dp.toPx() }
-  val primary = MaterialTheme.colors.primary
-  val inactiveTrackColor = Color.Transparent
-  Slider(
-    thumbPosition.value,
-    onValueChange = {},
-    Modifier
-      .fillMaxWidth()
-      .drawBehind {
-        drawRect(primary, Offset(0f, (size.height - dp4) / 2), size = androidx.compose.ui.geometry.Size(dp10, dp4))
-      },
-    colors = SliderDefaults.colors(disabledInactiveTrackColor = inactiveTrackColor, disabledActiveTrackColor = primary, thumbColor = Color.Transparent, disabledThumbColor = Color.Transparent),
-    enabled = false,
-    valueRange = 0f..MAX_VOICE_MILLIS_FOR_SENDING.toFloat()
-  )
-}
-
@Preview
@Composable
 fun PreviewComposeAudioView() {
--- a/apps/android/app/src/main/java/chat/simplex/app/views/chat/ContactPreferences.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/chat/ContactPreferences.kt
@@ -1,9 +1,9 @@
 package chat.simplex.app.views.chat

 import InfoRow
-import SectionBottomSpacer
-import SectionDividerSpaced
+import SectionDivider
 import SectionItemView
+import SectionSpacer
 import SectionTextFooter
 import SectionView
 import androidx.compose.foundation.*
@@ -12,6 +12,7 @@ import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
 import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
@@ -49,6 +50,7 @@ fun ContactPreferencesView(
      if (featuresAllowed == currentFeaturesAllowed) close()
      else showUnsavedChangesAlert({ savePrefs(close) }, close)
    },
+    background = if (isInDarkTheme()) MaterialTheme.colors.background else SettingsBackgroundLight
  ) {
    ContactPreferencesLayout(
      featuresAllowed,
@@ -79,43 +81,34 @@ private fun ContactPreferencesLayout(
  Column(
    Modifier
      .fillMaxWidth()
-      .verticalScroll(rememberScrollState()),
+      .verticalScroll(rememberScrollState())
+      .padding(bottom = DEFAULT_PADDING),
+    horizontalAlignment = Alignment.Start,
  ) {
    AppBarTitle(stringResource(R.string.contact_preferences))
    val timedMessages: MutableState<Boolean> = remember(featuresAllowed) { mutableStateOf(featuresAllowed.timedMessagesAllowed) }
    val onTTLUpdated = { ttl: Int? ->
-      applyPrefs(featuresAllowed.copy(timedMessagesTTL = ttl))
+      applyPrefs(featuresAllowed.copy(timedMessagesTTL = ttl ?: 86400))
    }
    TimedMessagesFeatureSection(featuresAllowed, contact.mergedPreferences.timedMessages, timedMessages, onTTLUpdated) { allowed, ttl ->
      applyPrefs(featuresAllowed.copy(timedMessagesAllowed = allowed, timedMessagesTTL = ttl ?: currentFeaturesAllowed.timedMessagesTTL))
    }
-    SectionDividerSpaced(true, maxBottomPadding = false)
+    SectionSpacer()
    val allowFullDeletion: MutableState<ContactFeatureAllowed> = remember(featuresAllowed) { mutableStateOf(featuresAllowed.fullDelete) }
    FeatureSection(ChatFeature.FullDelete, user.fullPreferences.fullDelete.allow, contact.mergedPreferences.fullDelete, allowFullDeletion) {
      applyPrefs(featuresAllowed.copy(fullDelete = it))
    }
-    SectionDividerSpaced(true, maxBottomPadding = false)
-//    val allowReactions: MutableState<ContactFeatureAllowed> = remember(featuresAllowed) { mutableStateOf(featuresAllowed.reactions) }
-//    FeatureSection(ChatFeature.Reactions, user.fullPreferences.reactions.allow, contact.mergedPreferences.reactions, allowReactions) {
-//      applyPrefs(featuresAllowed.copy(reactions = it))
-//    }
-//    SectionDividerSpaced(true, maxBottomPadding = false)
+    SectionSpacer()
    val allowVoice: MutableState<ContactFeatureAllowed> = remember(featuresAllowed) { mutableStateOf(featuresAllowed.voice) }
    FeatureSection(ChatFeature.Voice, user.fullPreferences.voice.allow, contact.mergedPreferences.voice, allowVoice) {
      applyPrefs(featuresAllowed.copy(voice = it))
    }
-    SectionDividerSpaced(true, maxBottomPadding = false)
-    val allowCalls: MutableState<ContactFeatureAllowed> = remember(featuresAllowed) { mutableStateOf(featuresAllowed.calls) }
-    FeatureSection(ChatFeature.Calls, user.fullPreferences.calls.allow, contact.mergedPreferences.calls, allowCalls) {
-      applyPrefs(featuresAllowed.copy(calls = it))
-    }
-    SectionDividerSpaced(maxTopPadding = true, maxBottomPadding = false)
+    SectionSpacer()
    ResetSaveButtons(
      reset = reset,
      save = savePrefs,
      disabled = featuresAllowed == currentFeaturesAllowed
    )
-    SectionBottomSpacer()
  }
 }

@@ -135,17 +128,20 @@ private fun FeatureSection(

  SectionView(
    feature.text.uppercase(),
-    icon = feature.iconFilled(),
+    icon = feature.iconFilled,
    iconTint = if (enabled.forUser) SimplexGreen else if (enabled.forContact) WarningYellow else Color.Red,
    leadingIcon = true,
  ) {
-    ExposedDropDownSettingRow(
-      generalGetString(R.string.chat_preferences_you_allow),
-      ContactFeatureAllowed.values(userDefault).map { it to it.text },
-      allowFeature,
-      icon = null,
-      onSelected = onSelected
-    )
+    SectionItemView {
+      ExposedDropDownSettingRow(
+        generalGetString(R.string.chat_preferences_you_allow),
+        ContactFeatureAllowed.values(userDefault).map { it to it.text },
+        allowFeature,
+        icon = null,
+        onSelected = onSelected
+      )
+    }
+    SectionDivider()
    InfoRow(
      generalGetString(R.string.chat_preferences_contact_allows),
      pref.contactPreference.allow.text
@@ -170,33 +166,29 @@ private fun TimedMessagesFeatureSection(

  SectionView(
    ChatFeature.TimedMessages.text.uppercase(),
-    icon = ChatFeature.TimedMessages.iconFilled(),
+    icon = ChatFeature.TimedMessages.iconFilled,
    iconTint = if (enabled.forUser) SimplexGreen else if (enabled.forContact) WarningYellow else Color.Red,
    leadingIcon = true,
  ) {
-    PreferenceToggle(
-      generalGetString(R.string.chat_preferences_you_allow),
-      checked = allowFeature.value,
-    ) { allow ->
-      onSelected(allow, if (allow) featuresAllowed.timedMessagesTTL ?: 86400 else null)
+    SectionItemView {
+      PreferenceToggle(
+        generalGetString(R.string.chat_preferences_you_allow),
+        checked = allowFeature.value,
+      ) { allow ->
+        onSelected(allow, if (allow) featuresAllowed.timedMessagesTTL ?: 86400 else null)
+      }
    }
+    SectionDivider()
    InfoRow(
      generalGetString(R.string.chat_preferences_contact_allows),
      pref.contactPreference.allow.text
    )
+    SectionDivider()
    if (featuresAllowed.timedMessagesAllowed) {
      val ttl = rememberSaveable(featuresAllowed.timedMessagesTTL) { mutableStateOf(featuresAllowed.timedMessagesTTL) }
-      DropdownCustomTimePickerSettingRow(
-        selection = ttl,
-        propagateExternalSelectionUpdate = true, // for Reset
-        label = generalGetString(R.string.delete_after),
-        dropdownValues = TimedMessagesPreference.ttlValues,
-        customPickerTitle = generalGetString(R.string.delete_after),
-        customPickerConfirmButtonText = generalGetString(R.string.custom_time_picker_select),
-        onSelected = onTTLUpdated
-      )
+      TimedMessagesTTLPicker(ttl, onTTLUpdated)
    } else if (pref.contactPreference.allow == FeatureAllowed.YES || pref.contactPreference.allow == FeatureAllowed.ALWAYS) {
-      InfoRow(generalGetString(R.string.delete_after), timeText(pref.contactPreference.ttl))
+      InfoRow(generalGetString(R.string.delete_after), TimedMessagesPreference.ttlText(pref.contactPreference.ttl))
    }
  }
  SectionTextFooter(ChatFeature.TimedMessages.enabledDescription(enabled))
@@ -206,14 +198,29 @@ private fun TimedMessagesFeatureSection(
 private fun ResetSaveButtons(reset: () -> Unit, save: () -> Unit, disabled: Boolean) {
  SectionView {
    SectionItemView(reset, disabled = disabled) {
-      Text(stringResource(R.string.reset_verb), color = if (disabled) MaterialTheme.colors.secondary else MaterialTheme.colors.primary)
+      Text(stringResource(R.string.reset_verb), color = if (disabled) HighOrLowlight else MaterialTheme.colors.primary)
    }
+    SectionDivider()
    SectionItemView(save, disabled = disabled) {
-      Text(stringResource(R.string.save_and_notify_contact), color = if (disabled) MaterialTheme.colors.secondary else MaterialTheme.colors.primary)
+      Text(stringResource(R.string.save_and_notify_contact), color = if (disabled) HighOrLowlight else MaterialTheme.colors.primary)
    }
  }
 }

+@Composable
+fun TimedMessagesTTLPicker(selection: MutableState<Int?>, onSelected: (Int?) -> Unit) {
+  val ttlValues = TimedMessagesPreference.ttlValues
+  val values = ttlValues + if (ttlValues.contains(selection.value)) listOf() else listOf(selection.value)
+  SectionItemView {
+    ExposedDropDownSettingRow(
+      generalGetString(R.string.delete_after),
+      values.map { it to TimedMessagesPreference.ttlText(it) },
+      selection,
+      onSelected = onSelected
+    )
+  }
+}
+
 private fun showUnsavedChangesAlert(save: () -> Unit, revert: () -> Unit) {
  AlertManager.shared.showAlertDialogStacked(
    title = generalGetString(R.string.save_preferences_question),
--- a/apps/android/app/src/main/java/chat/simplex/app/views/chat/ContextItemView.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/chat/ContextItemView.kt
@@ -3,34 +3,34 @@ package chat.simplex.app.views.chat
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.*
-import androidx.compose.ui.graphics.painter.Painter
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Edit
+import androidx.compose.material.icons.outlined.Close
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import chat.simplex.app.R
 import chat.simplex.app.model.*
-import chat.simplex.app.ui.theme.*
+import chat.simplex.app.ui.theme.HighOrLowlight
+import chat.simplex.app.ui.theme.SimpleXTheme
 import chat.simplex.app.views.chat.item.*
 import kotlinx.datetime.Clock

@Composable
 fun ContextItemView(
  contextItem: ChatItem,
-  contextIcon: Painter,
+  contextIcon: ImageVector,
  cancelContextItem: () -> Unit
 ) {
  val sent = contextItem.chatDir.sent
-  val sentColor = CurrentColors.collectAsState().value.appColors.sentMessage
-  val receivedColor = CurrentColors.collectAsState().value.appColors.receivedMessage
  Row(
    Modifier
      .padding(top = 8.dp)
-      .background(if (sent) sentColor else receivedColor),
+      .background(if (sent) SentColorLight else ReceivedColorLight),
    verticalAlignment = Alignment.CenterVertically
  ) {
    Row(
@@ -47,7 +47,7 @@ fun ContextItemView(
          .height(20.dp)
          .width(20.dp),
        contentDescription = stringResource(R.string.icon_descr_context),
-        tint = MaterialTheme.colors.secondary,
+        tint = HighOrLowlight,
      )
      MarkdownText(
        contextItem.text, contextItem.formattedText,
@@ -58,7 +58,7 @@ fun ContextItemView(
    }
    IconButton(onClick = cancelContextItem) {
      Icon(
-        painterResource(R.drawable.ic_close),
+        Icons.Outlined.Close,
        contentDescription = stringResource(R.string.cancel_verb),
        tint = MaterialTheme.colors.primary,
        modifier = Modifier.padding(10.dp)
@@ -73,7 +73,8 @@ fun PreviewContextItemView() {
  SimpleXTheme {
    ContextItemView(
      contextItem = ChatItem.getSampleData(1, CIDirection.DirectRcv(), Clock.System.now(), "hello"),
-      contextIcon = painterResource(R.drawable.ic_edit_filled)
-    ) {}
+      contextIcon = Icons.Filled.Edit,
+      cancelContextItem = {}
+    )
  }
 }
--- a/apps/android/app/src/main/java/chat/simplex/app/views/chat/SendMsgView.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/chat/SendMsgView.kt
@@ -18,8 +18,11 @@ import androidx.compose.animation.core.*
 import androidx.compose.foundation.*
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.shape.*
+import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.*
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.*
+import androidx.compose.material.icons.outlined.*
 import androidx.compose.material.ripple.rememberRipple
 import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.rememberSaveable
@@ -27,16 +30,15 @@ import androidx.compose.ui.*
 import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.*
-import androidx.compose.ui.graphics.painter.Painter
+import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.platform.*
-import androidx.compose.ui.res.*
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.Role
 import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.font.*
+import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.*
 import androidx.compose.ui.viewinterop.AndroidView
-import androidx.compose.ui.window.Dialog
 import androidx.core.graphics.drawable.DrawableCompat
 import androidx.core.view.inputmethod.EditorInfoCompat
 import androidx.core.view.inputmethod.InputConnectionCompat
@@ -44,7 +46,8 @@ import androidx.core.widget.*
 import chat.simplex.app.R
 import chat.simplex.app.SimplexApp
 import chat.simplex.app.model.*
-import chat.simplex.app.ui.theme.*
+import chat.simplex.app.ui.theme.HighOrLowlight
+import chat.simplex.app.ui.theme.SimpleXTheme
 import chat.simplex.app.views.chat.item.ItemAction
 import chat.simplex.app.views.helpers.*
 import com.google.accompanist.permissions.rememberMultiplePermissionsState
@@ -63,43 +66,30 @@ fun SendMsgView(
  userIsObserver: Boolean,
  userCanSend: Boolean,
  allowVoiceToContact: () -> Unit,
-  timedMessageAllowed: Boolean = false,
-  customDisappearingMessageTimePref: SharedPreference<Int>? = null,
-  sendMessage: (Int?) -> Unit,
+  sendMessage: () -> Unit,
  sendLiveMessage: (suspend () -> Unit)? = null,
  updateLiveMessage: (suspend () -> Unit)? = null,
  cancelLiveMessage: (() -> Unit)? = null,
  onMessageChange: (String) -> Unit,
  textStyle: MutableState<TextStyle>
 ) {
-  val showCustomDisappearingMessageDialog = remember { mutableStateOf(false) }
-
-  if (showCustomDisappearingMessageDialog.value) {
-    CustomDisappearingMessageDialog(
-      sendMessage = sendMessage,
-      setShowDialog = { showCustomDisappearingMessageDialog.value = it },
-      customDisappearingMessageTimePref = customDisappearingMessageTimePref
-    )
-  }
-
  Box(Modifier.padding(vertical = 8.dp)) {
    val cs = composeState.value
-    val showProgress = cs.inProgress && (cs.preview is ComposePreview.MediaPreview || cs.preview is ComposePreview.FilePreview)
+    val showProgress = cs.inProgress && (cs.preview is ComposePreview.ImagePreview || cs.preview is ComposePreview.VideoPreview || cs.preview is ComposePreview.FilePreview)
    val showVoiceButton = cs.message.isEmpty() && showVoiceRecordIcon && !composeState.value.editing &&
        cs.liveMessage == null && (cs.preview is ComposePreview.NoPreview || recState.value is RecordingState.Started)
    val showDeleteTextButton = rememberSaveable { mutableStateOf(false) }
    NativeKeyboard(composeState, textStyle, showDeleteTextButton, userIsObserver, onMessageChange)
    // Disable clicks on text field
-    if (cs.preview is ComposePreview.VoicePreview || !userCanSend || cs.inProgress) {
-      Box(
-        Modifier
-          .matchParentSize()
-          .clickable(enabled = !userCanSend, indication = null, interactionSource = remember { MutableInteractionSource() }, onClick = {
-            AlertManager.shared.showAlertMsg(
-              title = generalGetString(R.string.observer_cant_send_message_title),
-              text = generalGetString(R.string.observer_cant_send_message_desc)
-            )
-          })
+    if (cs.preview is ComposePreview.VoicePreview || !userCanSend) {
+      Box(Modifier
+        .matchParentSize()
+        .clickable(enabled = !userCanSend, indication = null, interactionSource = remember { MutableInteractionSource() }, onClick = {
+          AlertManager.shared.showAlertMsg(
+            title = generalGetString(R.string.observer_cant_send_message_title),
+            text = generalGetString(R.string.observer_cant_send_message_desc)
+          )
+        })
      )
    }
    if (showDeleteTextButton.value) {
@@ -136,11 +126,10 @@ fun SendMsgView(
              else ->
                RecordVoiceView(recState, stopRecOnNextClick)
            }
-            if (sendLiveMessage != null
-              && updateLiveMessage != null
-              && (cs.preview !is ComposePreview.VoicePreview || !stopRecOnNextClick.value)
-              && cs.contextItem is ComposeContextItem.NoContextItem
-            ) {
+            if (sendLiveMessage != null 
+                && updateLiveMessage != null
+                && (cs.preview !is ComposePreview.VoicePreview || !stopRecOnNextClick.value)
+                && cs.contextItem is ComposeContextItem.NoContextItem) {
              Spacer(Modifier.width(10.dp))
              StartLiveMessageButton(userCanSend) {
                if (composeState.value.preview is ComposePreview.NoPreview) {
@@ -157,55 +146,31 @@ fun SendMsgView(
        }
        else -> {
          val cs = composeState.value
-          val icon = if (cs.editing || cs.liveMessage != null) painterResource(R.drawable.ic_check_filled) else painterResource(R.drawable.ic_arrow_upward)
+          val icon = if (cs.editing || cs.liveMessage != null) Icons.Filled.Check else Icons.Outlined.ArrowUpward
          val disabled = !cs.sendEnabled() ||
-              (!allowedVoiceByPrefs && cs.preview is ComposePreview.VoicePreview) ||
-              cs.endLiveDisabled
-          val showDropdown = rememberSaveable { mutableStateOf(false) }
+                        (!allowedVoiceByPrefs && cs.preview is ComposePreview.VoicePreview) ||
+                        cs.endLiveDisabled
+          if (cs.liveMessage == null &&
+            cs.preview !is ComposePreview.VoicePreview && !cs.editing &&
+            cs.contextItem is ComposeContextItem.NoContextItem &&
+            sendLiveMessage != null && updateLiveMessage != null
+          ) {
+            var showDropdown by rememberSaveable { mutableStateOf(false) }
+            SendMsgButton(icon, sendButtonSize, sendButtonAlpha, !disabled, sendMessage) { showDropdown = true }

-          @Composable
-          fun MenuItems(): List<@Composable () -> Unit> {
-            val menuItems = mutableListOf<@Composable () -> Unit>()
-
-            if (cs.liveMessage == null && !cs.editing) {
-              if (
-                cs.preview !is ComposePreview.VoicePreview &&
-                cs.contextItem is ComposeContextItem.NoContextItem &&
-                sendLiveMessage != null && updateLiveMessage != null
-              ) {
-                menuItems.add {
-                  ItemAction(
-                    generalGetString(R.string.send_live_message),
-                    BoltFilled,
-                    onClick = {
-                      startLiveMessage(scope, sendLiveMessage, updateLiveMessage, sendButtonSize, sendButtonAlpha, composeState, liveMessageAlertShown)
-                      showDropdown.value = false
-                    }
-                  )
+            DropdownMenu(
+              expanded = showDropdown,
+              onDismissRequest = { showDropdown = false },
+              Modifier.width(220.dp),
+            ) {
+              ItemAction(
+                generalGetString(R.string.send_live_message),
+                Icons.Filled.Bolt,
+                onClick = {
+                  startLiveMessage(scope, sendLiveMessage, updateLiveMessage, sendButtonSize, sendButtonAlpha, composeState, liveMessageAlertShown)
+                  showDropdown = false
                }
-              }
-              if (timedMessageAllowed) {
-                menuItems.add {
-                  ItemAction(
-                    generalGetString(R.string.disappearing_message),
-                    painterResource(R.drawable.ic_timer),
-                    onClick = {
-                      showCustomDisappearingMessageDialog.value = true
-                      showDropdown.value = false
-                    }
-                  )
-                }
-              }
-            }
-
-            return menuItems
-          }
-
-          val menuItems = MenuItems()
-          if (menuItems.isNotEmpty()) {
-            SendMsgButton(icon, sendButtonSize, sendButtonAlpha, !disabled, sendMessage) { showDropdown.value = true }
-            DefaultDropdownMenu(showDropdown) {
-              menuItems.forEach { composable -> composable() }
+              )
            }
          } else {
            SendMsgButton(icon, sendButtonSize, sendButtonAlpha, !disabled, sendMessage)
@@ -216,99 +181,6 @@ fun SendMsgView(
  }
 }

-@Composable
-private fun CustomDisappearingMessageDialog(
-  sendMessage: (Int?) -> Unit,
-  setShowDialog: (Boolean) -> Unit,
-  customDisappearingMessageTimePref: SharedPreference<Int>?
-) {
-  val showCustomTimePicker = remember { mutableStateOf(false) }
-
-  if (showCustomTimePicker.value) {
-    val selectedDisappearingMessageTime = remember {
-      mutableStateOf(customDisappearingMessageTimePref?.get?.invoke() ?: 300)
-    }
-    CustomTimePickerDialog(
-      selectedDisappearingMessageTime,
-      title = generalGetString(R.string.delete_after),
-      confirmButtonText = generalGetString(R.string.send_disappearing_message_send),
-      confirmButtonAction = { ttl ->
-        sendMessage(ttl)
-        customDisappearingMessageTimePref?.set?.invoke(ttl)
-        setShowDialog(false)
-      },
-      cancel = { setShowDialog(false) }
-    )
-  } else {
-    @Composable
-    fun ChoiceButton(
-      text: String,
-      onClick: () -> Unit
-    ) {
-      TextButton(onClick) {
-        Text(
-          text,
-          fontSize = 18.sp,
-          color = MaterialTheme.colors.primary
-        )
-      }
-    }
-
-    Dialog(onDismissRequest = { setShowDialog(false) }) {
-      Surface(
-        shape = RoundedCornerShape(corner = CornerSize(25.dp))
-      ) {
-        Box(
-          contentAlignment = Alignment.Center
-        ) {
-          Column(
-            modifier = Modifier.padding(DEFAULT_PADDING),
-            verticalArrangement = Arrangement.spacedBy(6.dp),
-            horizontalAlignment = Alignment.CenterHorizontally
-          ) {
-            Row(
-              modifier = Modifier.fillMaxWidth(),
-              horizontalArrangement = Arrangement.SpaceBetween,
-              verticalAlignment = Alignment.CenterVertically
-            ) {
-              Text(" ") // centers title
-              Text(
-                generalGetString(R.string.send_disappearing_message),
-                fontSize = 16.sp,
-                color = MaterialTheme.colors.secondary
-              )
-              Icon(
-                painterResource(R.drawable.ic_close),
-                generalGetString(R.string.icon_descr_close_button),
-                tint = MaterialTheme.colors.secondary,
-                modifier = Modifier
-                  .size(25.dp)
-                  .clickable { setShowDialog(false) }
-              )
-            }
-
-            ChoiceButton(generalGetString(R.string.send_disappearing_message_30_seconds)) {
-              sendMessage(30)
-              setShowDialog(false)
-            }
-            ChoiceButton(generalGetString(R.string.send_disappearing_message_1_minute)) {
-              sendMessage(60)
-              setShowDialog(false)
-            }
-            ChoiceButton(generalGetString(R.string.send_disappearing_message_5_minutes)) {
-              sendMessage(300)
-              setShowDialog(false)
-            }
-            ChoiceButton(generalGetString(R.string.send_disappearing_message_custom_time)) {
-              showCustomTimePicker.value = true
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
@Composable
 private fun NativeKeyboard(
  composeState: MutableState<ComposeState>,
@@ -319,7 +191,7 @@ private fun NativeKeyboard(
 ) {
  val cs = composeState.value
  val textColor = MaterialTheme.colors.onBackground
-  val tintColor = MaterialTheme.colors.secondaryVariant
+  val tintColor = MaterialTheme.colors.secondary
  val padding = PaddingValues(12.dp, 7.dp, 45.dp, 0.dp)
  val paddingStart = with(LocalDensity.current) { 12.dp.roundToPx() }
  val paddingTop = with(LocalDensity.current) { 7.dp.roundToPx() }
@@ -355,7 +227,7 @@ private fun NativeKeyboard(
          } catch (e: Exception) {
            return@OnCommitContentListener false
          }
-          SimplexApp.context.chatModel.sharedContent.value = SharedContent.Media("", listOf(inputContentInfo.contentUri))
+          SimplexApp.context.chatModel.sharedContent.value = SharedContent.Images("", listOf(inputContentInfo.contentUri))
          true
        }
        return InputConnectionCompat.createWrapper(connection, editorInfo, onCommit)
@@ -372,7 +244,7 @@ private fun NativeKeyboard(
    editText.setPadding(paddingStart, paddingTop, paddingEnd, paddingBottom)
    editText.setText(cs.message)
    if (Build.VERSION.SDK_INT >= 29) {
-      editText.textCursorDrawable?.let { DrawableCompat.setTint(it, CurrentColors.value.colors.secondary.toArgb()) }
+      editText.textCursorDrawable?.let { DrawableCompat.setTint(it, HighOrLowlight.toArgb()) }
    } else {
      try {
        val f: Field = TextView::class.java.getDeclaredField("mCursorDrawableRes")
@@ -382,20 +254,14 @@ private fun NativeKeyboard(
        Log.e(chat.simplex.app.TAG, e.stackTraceToString())
      }
    }
-    editText.doOnTextChanged { text, _, _, _ ->
-      if (!composeState.value.inProgress) {
-        onMessageChange(text.toString())
-      } else if (text.toString() != composeState.value.message) {
-        editText.setText(composeState.value.message)
-      }
-    }
+    editText.doOnTextChanged { text, _, _, _ -> onMessageChange(text.toString()) }
    editText.doAfterTextChanged { text -> if (composeState.value.preview is ComposePreview.VoicePreview && text.toString() != "") editText.setText("") }
    editText
  }) {
    it.setTextColor(textColor.toArgb())
    it.textSize = textStyle.value.fontSize.value
    DrawableCompat.setTint(it.background, tintColor.toArgb())
-    it.isFocusable = composeState.value.preview !is ComposePreview.VoicePreview && !cs.inProgress
+    it.isFocusable = composeState.value.preview !is ComposePreview.VoicePreview
    it.isFocusableInTouchMode = it.isFocusable
    if (cs.message != it.text.toString()) {
      it.setText(cs.message)
@@ -408,7 +274,7 @@ private fun NativeKeyboard(
      imm.showSoftInput(it, InputMethodManager.SHOW_IMPLICIT)
      showKeyboard = false
    }
-    showDeleteTextButton.value = it.lineCount >= 4 && !cs.inProgress
+    showDeleteTextButton.value = it.lineCount >= 4
  }
  if (composeState.value.preview is ComposePreview.VoicePreview) {
    ComposeOverlay(R.string.voice_message_send_text, textStyle, padding)
@@ -422,7 +288,7 @@ private fun ComposeOverlay(textId: Int, textStyle: MutableState<TextStyle>, padd
  Text(
    generalGetString(textId),
    Modifier.padding(padding),
-    color = MaterialTheme.colors.secondary,
+    color = HighOrLowlight,
    style = textStyle.value.copy(fontStyle = FontStyle.Italic)
  )
 }
@@ -433,13 +299,13 @@ private fun BoxScope.DeleteTextButton(composeState: MutableState<ComposeState>)
    { composeState.value = composeState.value.copy(message = "") },
    Modifier.align(Alignment.TopEnd).size(36.dp)
  ) {
-    Icon(painterResource(R.drawable.ic_close), null, Modifier.padding(7.dp).size(36.dp), tint = MaterialTheme.colors.secondary)
+    Icon(Icons.Filled.Close, null, Modifier.padding(7.dp).size(36.dp), tint = HighOrLowlight)
  }
 }

@Composable
 private fun RecordVoiceView(recState: MutableState<RecordingState>, stopRecOnNextClick: MutableState<Boolean>) {
-  val rec: Recorder = remember { RecorderNative() }
+  val rec: Recorder = remember { RecorderNative(MAX_VOICE_SIZE_FOR_SENDING) }
  DisposableEffect(Unit) { onDispose { rec.stop() } }
  val stopRecordingAndAddAudio: () -> Unit = {
    recState.value.filePathNullable?.let {
@@ -490,9 +356,9 @@ private fun RecordVoiceView(recState: MutableState<RecordingState>, stopRecOnNex
 private fun DisallowedVoiceButton(enabled: Boolean, onClick: () -> Unit) {
  IconButton(onClick, Modifier.size(36.dp), enabled = enabled) {
    Icon(
-      painterResource(R.drawable.ic_keyboard_voice),
+      Icons.Outlined.KeyboardVoice,
      stringResource(R.string.icon_descr_record_voice_message),
-      tint = MaterialTheme.colors.secondary,
+      tint = HighOrLowlight,
      modifier = Modifier
        .size(36.dp)
        .padding(4.dp)
@@ -504,7 +370,7 @@ private fun DisallowedVoiceButton(enabled: Boolean, onClick: () -> Unit) {
 private fun VoiceButtonWithoutPermission(onClick: () -> Unit) {
  IconButton(onClick, Modifier.size(36.dp)) {
    Icon(
-      painterResource(R.drawable.ic_keyboard_voice_filled),
+      Icons.Filled.KeyboardVoice,
      stringResource(R.string.icon_descr_record_voice_message),
      tint = MaterialTheme.colors.primary,
      modifier = Modifier
@@ -536,7 +402,7 @@ private fun LockToCurrentOrientationUntilDispose() {
 private fun StopRecordButton(onClick: () -> Unit) {
  IconButton(onClick, Modifier.size(36.dp)) {
    Icon(
-      painterResource(R.drawable.ic_stop_filled),
+      Icons.Filled.Stop,
      stringResource(R.string.icon_descr_record_voice_message),
      tint = MaterialTheme.colors.primary,
      modifier = Modifier
@@ -550,7 +416,7 @@ private fun StopRecordButton(onClick: () -> Unit) {
 private fun RecordVoiceButton(interactionSource: MutableInteractionSource) {
  IconButton({}, Modifier.size(36.dp), interactionSource = interactionSource) {
    Icon(
-      painterResource(R.drawable.ic_keyboard_voice_filled),
+      Icons.Filled.KeyboardVoice,
      stringResource(R.string.icon_descr_record_voice_message),
      tint = MaterialTheme.colors.primary,
      modifier = Modifier
@@ -562,7 +428,7 @@ private fun RecordVoiceButton(interactionSource: MutableInteractionSource) {

@Composable
 private fun ProgressIndicator() {
-  CircularProgressIndicator(Modifier.size(36.dp).padding(4.dp), color = MaterialTheme.colors.secondary, strokeWidth = 3.dp)
+  CircularProgressIndicator(Modifier.size(36.dp).padding(4.dp), color = HighOrLowlight, strokeWidth = 3.dp)
 }

@Composable
@@ -571,7 +437,7 @@ private fun CancelLiveMessageButton(
 ) {
  IconButton(onClick, Modifier.size(36.dp)) {
    Icon(
-      painterResource(R.drawable.ic_close),
+      Icons.Filled.Close,
      stringResource(R.string.icon_descr_cancel_live_message),
      tint = MaterialTheme.colors.primary,
      modifier = Modifier
@@ -583,18 +449,18 @@ private fun CancelLiveMessageButton(

@Composable
 private fun SendMsgButton(
-  icon: Painter,
+  icon: ImageVector,
  sizeDp: Animatable<Float, AnimationVector1D>,
  alpha: Animatable<Float, AnimationVector1D>,
  enabled: Boolean,
-  sendMessage: (Int?) -> Unit,
+  sendMessage: () -> Unit,
  onLongClick: (() -> Unit)? = null
 ) {
  val interactionSource = remember { MutableInteractionSource() }
  Box(
    modifier = Modifier.requiredSize(36.dp)
      .combinedClickable(
-        onClick = { sendMessage(null) },
+        onClick = sendMessage,
        onLongClick = onLongClick,
        enabled = enabled,
        role = Role.Button,
@@ -612,7 +478,7 @@ private fun SendMsgButton(
        .padding(4.dp)
        .alpha(alpha.value)
        .clip(CircleShape)
-        .background(if (enabled) MaterialTheme.colors.primary else MaterialTheme.colors.secondary)
+        .background(if (enabled) MaterialTheme.colors.primary else HighOrLowlight)
        .padding(3.dp)
    )
  }
@@ -633,9 +499,9 @@ private fun StartLiveMessageButton(enabled: Boolean, onClick: () -> Unit) {
    contentAlignment = Alignment.Center
  ) {
    Icon(
-      BoltFilled,
+      Icons.Filled.Bolt,
      stringResource(R.string.icon_descr_send_message),
-      tint = if (enabled) MaterialTheme.colors.primary else MaterialTheme.colors.secondary,
+      tint = if (enabled) MaterialTheme.colors.primary else HighOrLowlight,
      modifier = Modifier
        .size(36.dp)
        .padding(4.dp)
@@ -739,7 +605,6 @@ fun PreviewSendMsgView() {
      userIsObserver = false,
      userCanSend = true,
      allowVoiceToContact = {},
-      timedMessageAllowed = false,
      sendMessage = {},
      onMessageChange = { _ -> },
      textStyle = textStyle
@@ -770,7 +635,6 @@ fun PreviewSendMsgViewEditing() {
      userIsObserver = false,
      userCanSend = true,
      allowVoiceToContact = {},
-      timedMessageAllowed = false,
      sendMessage = {},
      onMessageChange = { _ -> },
      textStyle = textStyle
@@ -801,7 +665,6 @@ fun PreviewSendMsgViewInProgress() {
      userIsObserver = false,
      userCanSend = true,
      allowVoiceToContact = {},
-      timedMessageAllowed = false,
      sendMessage = {},
      onMessageChange = { _ -> },
      textStyle = textStyle
--- a/apps/android/app/src/main/java/chat/simplex/app/views/chat/VerifyCodeView.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/chat/VerifyCodeView.kt
@@ -1,17 +1,18 @@
 package chat.simplex.app.views.chat

-import SectionBottomSpacer
 import SectionView
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.text.selection.SelectionContainer
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.*
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Share
+import androidx.compose.material.icons.outlined.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.unit.dp
@@ -65,7 +66,7 @@ private fun VerifyCodeLayout(
    val splitCode = splitToParts(connectionCode, 24)
    Row(Modifier.fillMaxWidth().padding(bottom = DEFAULT_PADDING_HALF), horizontalArrangement = Arrangement.Center) {
      if (connectionVerified) {
-        Icon(painterResource(R.drawable.ic_verified_user), null, Modifier.padding(end = 4.dp).size(22.dp), tint = MaterialTheme.colors.secondary)
+        Icon(Icons.Outlined.VerifiedUser, null, Modifier.padding(end = 4.dp).size(22.dp), tint = HighOrLowlight)
        Text(String.format(stringResource(R.string.is_verified), displayName))
      } else {
        Text(String.format(stringResource(R.string.is_not_verified), displayName))
@@ -89,7 +90,7 @@ private fun VerifyCodeLayout(
      val context = LocalContext.current
      Box(Modifier.weight(1f)) {
        IconButton({ shareText(context, connectionCode) }, Modifier.size(20.dp).align(Alignment.CenterStart)) {
-          Icon(painterResource(R.drawable.ic_share_filled), null, tint = MaterialTheme.colors.primary)
+          Icon(Icons.Filled.Share, null, tint = MaterialTheme.colors.primary)
        }
      }
      Spacer(Modifier.weight(1f))
@@ -105,16 +106,16 @@ private fun VerifyCodeLayout(
      horizontalArrangement = Arrangement.spacedBy(10.dp)
    ) {
      if (connectionVerified) {
-        SimpleButton(generalGetString(R.string.clear_verification), painterResource(R.drawable.ic_shield)) {
+        SimpleButton(generalGetString(R.string.clear_verification), Icons.Outlined.Shield) {
          verifyCode(null) {}
        }
      } else {
-        SimpleButton(generalGetString(R.string.scan_code), painterResource(R.drawable.ic_qr_code)) {
+        SimpleButton(generalGetString(R.string.scan_code), Icons.Outlined.QrCode) {
          ModalManager.shared.showModal {
            ScanCodeView(verifyCode) { }
          }
        }
-        SimpleButton(generalGetString(R.string.mark_code_verified), painterResource(R.drawable.ic_verified_user)) {
+        SimpleButton(generalGetString(R.string.mark_code_verified), Icons.Outlined.VerifiedUser) {
          verifyCode(connectionCode) { verified ->
            if (!verified) {
              AlertManager.shared.showAlertMsg(
@@ -125,7 +126,6 @@ private fun VerifyCodeLayout(
        }
      }
    }
-    SectionBottomSpacer()
  }
 }

@@ -134,4 +134,4 @@ private fun splitToParts(s: String, length: Int): String {
  return (0..(s.length - 1) / length)
    .map { s.drop(it * length).take(length) }
    .joinToString(separator = "\n")
-}
+}
--- a/apps/android/app/src/main/java/chat/simplex/app/views/chat/group/AddGroupMembersView.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/chat/group/AddGroupMembersView.kt
@@ -1,8 +1,7 @@
 package chat.simplex.app.views.chat.group

-import SectionBottomSpacer
 import SectionCustomFooter
-import SectionDividerSpaced
+import SectionDivider
 import SectionItemView
 import SectionSpacer
 import SectionView
@@ -10,12 +9,15 @@ import androidx.activity.compose.BackHandler
 import androidx.compose.foundation.*
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.*
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.CheckCircle
+import androidx.compose.material.icons.filled.TheaterComedy
+import androidx.compose.material.icons.outlined.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.painter.Painter
-import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
@@ -26,7 +28,6 @@ import chat.simplex.app.model.*
 import chat.simplex.app.ui.theme.*
 import chat.simplex.app.views.chat.ChatInfoToolbarTitle
 import chat.simplex.app.views.helpers.*
-import chat.simplex.app.views.newchat.InfoAboutIncognito
 import chat.simplex.app.views.usersettings.SettingsActionItem

@Composable
@@ -36,7 +37,6 @@ fun AddGroupMembersView(groupInfo: GroupInfo, creatingGroup: Boolean = false, ch
  var allowModifyMembers by remember { mutableStateOf(true) }
  BackHandler(onBack = close)
  AddGroupMembersLayout(
-    chatModel.incognito.value,
    groupInfo = groupInfo,
    creatingGroup = creatingGroup,
    contactsToAdd = getContactsToAdd(chatModel),
@@ -85,7 +85,6 @@ fun getContactsToAdd(chatModel: ChatModel): List<Contact> {

@Composable
 fun AddGroupMembersLayout(
-  chatModelIncognito: Boolean,
  groupInfo: GroupInfo,
  creatingGroup: Boolean,
  contactsToAdd: List<Contact>,
@@ -103,16 +102,9 @@ fun AddGroupMembersLayout(
    Modifier
      .fillMaxWidth()
      .verticalScroll(rememberScrollState()),
+    horizontalAlignment = Alignment.Start,
  ) {
    AppBarTitle(stringResource(R.string.button_add_members))
-    InfoAboutIncognito(
-      chatModelIncognito,
-      false,
-      generalGetString(R.string.group_unsupported_incognito_main_profile_sent),
-      generalGetString(R.string.group_main_profile_sent),
-      true
-    )
-    Spacer(Modifier.size(DEFAULT_PADDING))
    Row(
      Modifier.fillMaxWidth(),
      horizontalArrangement = Arrangement.Center
@@ -133,7 +125,7 @@ fun AddGroupMembersLayout(
        Text(
          stringResource(R.string.no_contacts_to_add),
          Modifier.padding(),
-          color = MaterialTheme.colors.secondary
+          color = HighOrLowlight
        )
      }
    } else {
@@ -142,8 +134,12 @@ fun AddGroupMembersLayout(
          SectionItemView(openPreferences) {
            Text(stringResource(R.string.set_group_preferences))
          }
+          SectionDivider()
        }
-        RoleSelectionRow(groupInfo, selectedRole, allowModifyMembers)
+        SectionItemView {
+          RoleSelectionRow(groupInfo, selectedRole, allowModifyMembers)
+        }
+        SectionDivider()
        if (creatingGroup && selectedContacts.isEmpty()) {
          SkipInvitingButton(close)
        } else {
@@ -153,13 +149,13 @@ fun AddGroupMembersLayout(
      SectionCustomFooter {
        InviteSectionFooter(selectedContactsCount = selectedContacts.size, allowModifyMembers, clearSelection)
      }
-      SectionDividerSpaced(maxTopPadding = true)
+      SectionSpacer()

      SectionView(stringResource(R.string.select_contacts)) {
        ContactList(contacts = contactsToAdd, selectedContacts, groupInfo, allowModifyMembers, addContact, removeContact)
      }
+      SectionSpacer()
    }
-    SectionBottomSpacer()
  }
 }

@@ -176,15 +172,16 @@ private fun RoleSelectionRow(groupInfo: GroupInfo, selectedRole: MutableState<Gr
      values,
      selectedRole,
      icon = null,
-      enabled = rememberUpdatedState(enabled)
-    ) { selectedRole.value = it }
+      enabled = rememberUpdatedState(enabled),
+      onSelected = { selectedRole.value = it }
+    )
  }
 }

@Composable
 fun InviteMembersButton(onClick: () -> Unit, disabled: Boolean) {
  SettingsActionItem(
-    painterResource(R.drawable.ic_check),
+    Icons.Outlined.Check,
    stringResource(R.string.invite_to_group_button),
    click = onClick,
    textColor = MaterialTheme.colors.primary,
@@ -196,7 +193,7 @@ fun InviteMembersButton(onClick: () -> Unit, disabled: Boolean) {
@Composable
 fun SkipInvitingButton(onClick: () -> Unit) {
  SettingsActionItem(
-    painterResource(R.drawable.ic_check),
+    Icons.Outlined.Check,
    stringResource(R.string.skip_inviting_button),
    click = onClick,
    textColor = MaterialTheme.colors.primary,
@@ -214,7 +211,7 @@ fun InviteSectionFooter(selectedContactsCount: Int, enabled: Boolean, clearSelec
    if (selectedContactsCount >= 1) {
      Text(
        String.format(generalGetString(R.string.num_contacts_selected), selectedContactsCount),
-        color = MaterialTheme.colors.secondary,
+        color = HighOrLowlight,
        fontSize = 12.sp
      )
      Box(
@@ -222,14 +219,14 @@ fun InviteSectionFooter(selectedContactsCount: Int, enabled: Boolean, clearSelec
      ) {
        Text(
          stringResource(R.string.clear_contacts_selection_button),
-          color = if (enabled) MaterialTheme.colors.primary else MaterialTheme.colors.secondary,
+          color = if (enabled) MaterialTheme.colors.primary else HighOrLowlight,
          fontSize = 12.sp
        )
      }
    } else {
      Text(
        stringResource(R.string.no_contacts_selected),
-        color = MaterialTheme.colors.secondary,
+        color = HighOrLowlight,
        fontSize = 12.sp
      )
    }
@@ -252,6 +249,9 @@ fun ContactList(
        checked = selectedContacts.contains(contact.apiId),
        enabled = enabled,
      )
+      if (index < contacts.lastIndex) {
+        SectionDivider()
+      }
    }
  }
 }
@@ -266,17 +266,17 @@ fun ContactCheckRow(
  enabled: Boolean,
 ) {
  val prohibitedToInviteIncognito = !groupInfo.membership.memberIncognito && contact.contactConnIncognito
-  val icon: Painter
+  val icon: ImageVector
  val iconColor: Color
  if (prohibitedToInviteIncognito) {
-    icon = painterResource(R.drawable.ic_theater_comedy_filled)
-    iconColor = MaterialTheme.colors.secondary
+    icon = Icons.Filled.TheaterComedy
+    iconColor = HighOrLowlight
  } else if (checked) {
-    icon = painterResource(R.drawable.ic_check_circle_filled)
-    iconColor = if (enabled) MaterialTheme.colors.primary else MaterialTheme.colors.secondary
+    icon = Icons.Filled.CheckCircle
+    iconColor = if (enabled) MaterialTheme.colors.primary else HighOrLowlight
  } else {
-    icon = painterResource(R.drawable.ic_circle)
-    iconColor = MaterialTheme.colors.secondary
+    icon = Icons.Outlined.Circle
+    iconColor = HighOrLowlight
  }
  SectionItemView(
    click = if (enabled) {
@@ -294,7 +294,7 @@ fun ContactCheckRow(
    Spacer(Modifier.width(DEFAULT_SPACE_AFTER_ICON))
    Text(
      contact.chatViewName, maxLines = 1, overflow = TextOverflow.Ellipsis,
-      color = if (prohibitedToInviteIncognito) MaterialTheme.colors.secondary else Color.Unspecified
+      color = if (prohibitedToInviteIncognito) HighOrLowlight else Color.Unspecified
    )
    Spacer(Modifier.fillMaxWidth().weight(1f))
    Icon(
@@ -318,7 +318,6 @@ fun showProhibitedToInviteIncognitoAlertDialog() {
 fun PreviewAddGroupMembersLayout() {
  SimpleXTheme {
    AddGroupMembersLayout(
-      chatModelIncognito = false,
      groupInfo = GroupInfo.sampleData,
      creatingGroup = false,
      contactsToAdd = listOf(Contact.sampleData, Contact.sampleData, Contact.sampleData),
--- a/apps/android/app/src/main/java/chat/simplex/app/views/chat/group/GroupChatInfoView.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/chat/group/GroupChatInfoView.kt
@@ -1,8 +1,7 @@
 package chat.simplex.app.views.chat.group

 import InfoRow
-import SectionBottomSpacer
-import SectionDividerSpaced
+import SectionDivider
 import SectionItemView
 import SectionSpacer
 import SectionTextFooter
@@ -12,11 +11,12 @@ import androidx.activity.compose.BackHandler
 import androidx.compose.foundation.*
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.*
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
@@ -108,7 +108,7 @@ fun deleteGroupDialog(chatInfo: ChatInfo, groupInfo: GroupInfo, chatModel: ChatM
  val alertTextKey =
    if (groupInfo.membership.memberCurrent) R.string.delete_group_for_all_members_cannot_undo_warning
    else R.string.delete_group_for_self_cannot_undo_warning
-  AlertManager.shared.showAlertDialog(
+  AlertManager.shared.showAlertMsg(
    title = generalGetString(R.string.delete_group_question),
    text = generalGetString(alertTextKey),
    confirmText = generalGetString(R.string.delete_verb),
@@ -122,13 +122,12 @@ fun deleteGroupDialog(chatInfo: ChatInfo, groupInfo: GroupInfo, chatModel: ChatM
          close?.invoke()
        }
      }
-    },
-    destructive = true,
+    }
  )
 }

 fun leaveGroupDialog(groupInfo: GroupInfo, chatModel: ChatModel, close: (() -> Unit)? = null) {
-  AlertManager.shared.showAlertDialog(
+  AlertManager.shared.showAlertMsg(
    title = generalGetString(R.string.leave_group_question),
    text = generalGetString(R.string.you_will_stop_receiving_messages_from_this_group_chat_history_will_be_preserved),
    confirmText = generalGetString(R.string.leave_group_button),
@@ -137,8 +136,7 @@ fun leaveGroupDialog(groupInfo: GroupInfo, chatModel: ChatModel, close: (() -> U
        chatModel.controller.leaveGroup(groupInfo.groupId)
        close?.invoke()
      }
-    },
-    destructive = true,
+    }
  )
 }

@@ -162,7 +160,8 @@ fun GroupChatInfoLayout(
  Column(
    Modifier
      .fillMaxWidth()
-      .verticalScroll(rememberScrollState())
+      .verticalScroll(rememberScrollState()),
+    horizontalAlignment = Alignment.Start
  ) {
    Row(
      Modifier.fillMaxWidth(),
@@ -174,52 +173,63 @@ fun GroupChatInfoLayout(

    SectionView {
      if (groupInfo.canEdit) {
-        EditGroupProfileButton(editGroupProfile)
-      }
-      if (groupInfo.groupProfile.description != null || groupInfo.canEdit) {
-        AddOrEditWelcomeMessage(groupInfo.groupProfile.description, addOrEditWelcomeMessage)
+        SectionItemView(editGroupProfile) { EditGroupProfileButton() }
+        SectionDivider()
+        SectionItemView(addOrEditWelcomeMessage) { AddOrEditWelcomeMessage(groupInfo.groupProfile.description) }
+        SectionDivider()
      }
      GroupPreferencesButton(openPreferences)
    }
    SectionTextFooter(stringResource(R.string.only_group_owners_can_change_prefs))
-    SectionDividerSpaced(maxTopPadding = true)
+    SectionSpacer()

    SectionView(title = String.format(generalGetString(R.string.group_info_section_title_num_members), members.count() + 1)) {
      if (groupInfo.canAddMembers) {
-        if (groupLink == null) {
-          CreateGroupLinkButton(manageGroupLink)
-        } else {
-          GroupLinkButton(manageGroupLink)
+        SectionItemView(manageGroupLink) {
+          if (groupLink == null) {
+            CreateGroupLinkButton()
+          } else {
+            GroupLinkButton()
+          }
        }
-
+        SectionDivider()
        val onAddMembersClick = if (chat.chatInfo.incognito) ::cantInviteIncognitoAlert else addMembers
-        val tint = if (chat.chatInfo.incognito) MaterialTheme.colors.secondary else MaterialTheme.colors.primary
-        AddMembersButton(tint, onAddMembersClick)
+        SectionItemView(onAddMembersClick) {
+          val tint = if (chat.chatInfo.incognito) HighOrLowlight else MaterialTheme.colors.primary
+          AddMembersButton(tint)
+        }
+        SectionDivider()
      }
-      SectionItemView(minHeight = 54.dp) {
+      SectionItemView(minHeight = 50.dp) {
        MemberRow(groupInfo.membership, user = true)
      }
+      if (members.isNotEmpty()) {
+        SectionDivider()
+      }
      MembersList(members, showMemberInfo)
    }
-    SectionDividerSpaced(maxTopPadding = true, maxBottomPadding = false)
+    SectionSpacer()
    SectionView {
      ClearChatButton(clearChat)
      if (groupInfo.canDelete) {
-        DeleteGroupButton(deleteGroup)
+        SectionDivider()
+        SectionItemView(deleteGroup) { DeleteGroupButton() }
      }
      if (groupInfo.membership.memberCurrent) {
-        LeaveGroupButton(leaveGroup)
+        SectionDivider()
+        SectionItemView(leaveGroup) { LeaveGroupButton() }
      }
    }
+    SectionSpacer()

    if (developerTools) {
-      SectionDividerSpaced()
      SectionView(title = stringResource(R.string.section_title_for_console)) {
        InfoRow(stringResource(R.string.info_row_local_name), groupInfo.localDisplayName)
+        SectionDivider()
        InfoRow(stringResource(R.string.info_row_database_id), groupInfo.apiId.toString())
      }
+      SectionSpacer()
    }
-    SectionBottomSpacer()
  }
 }

@@ -250,31 +260,38 @@ private fun GroupChatInfoHeader(cInfo: ChatInfo) {
@Composable
 private fun GroupPreferencesButton(onClick: () -> Unit) {
  SettingsActionItem(
-    painterResource(R.drawable.ic_toggle_on),
+    Icons.Outlined.ToggleOn,
    stringResource(R.string.group_preferences),
    click = onClick
  )
 }

@Composable
-private fun AddMembersButton(tint: Color = MaterialTheme.colors.primary, onClick: () -> Unit) {
-  SettingsActionItem(
-    painterResource(R.drawable.ic_add),
-    stringResource(R.string.button_add_members),
-    onClick,
-    iconColor = tint,
-    textColor = tint
-  )
+private fun AddMembersButton(tint: Color = MaterialTheme.colors.primary) {
+  Row(
+    Modifier.fillMaxSize(),
+    verticalAlignment = Alignment.CenterVertically
+  ) {
+    Icon(
+      Icons.Outlined.Add,
+      stringResource(R.string.button_add_members),
+      tint = tint
+    )
+    Spacer(Modifier.size(8.dp))
+    Text(stringResource(R.string.button_add_members), color = tint)
+  }
 }

@Composable
 private fun MembersList(members: List<GroupMember>, showMemberInfo: (GroupMember) -> Unit) {
  Column {
    members.forEachIndexed { index, member ->
-      Divider()
-      SectionItemView({ showMemberInfo(member) }, minHeight = 54.dp) {
+      SectionItemView({ showMemberInfo(member) }, minHeight = 50.dp) {
        MemberRow(member)
      }
+      if (index < members.lastIndex) {
+        SectionDivider()
+      }
    }
  }
 }
@@ -292,7 +309,6 @@ private fun MemberRow(member: GroupMember, user: Boolean = false) {
      horizontalArrangement = Arrangement.spacedBy(4.dp)
    ) {
      ProfileImage(size = 46.dp, member.image)
-      Spacer(Modifier.width(DEFAULT_PADDING_HALF))
      Column {
        Row(verticalAlignment = Alignment.CenterVertically) {
          if (member.verified) {
@@ -307,7 +323,7 @@ private fun MemberRow(member: GroupMember, user: Boolean = false) {
        val statusDescr = if (user) String.format(generalGetString(R.string.group_info_member_you), s) else s
        Text(
          statusDescr,
-          color = MaterialTheme.colors.secondary,
+          color = HighOrLowlight,
          fontSize = 12.sp,
          maxLines = 1,
          overflow = TextOverflow.Ellipsis
@@ -316,81 +332,119 @@ private fun MemberRow(member: GroupMember, user: Boolean = false) {
    }
    val role = member.memberRole
    if (role == GroupMemberRole.Owner || role == GroupMemberRole.Admin) {
-      Text(role.text, color = MaterialTheme.colors.secondary)
+      Text(role.text, color = HighOrLowlight)
    }
  }
 }

@Composable
 private fun MemberVerifiedShield() {
-  Icon(painterResource(R.drawable.ic_verified_user), null, Modifier.padding(end = 3.dp).size(16.dp), tint = MaterialTheme.colors.secondary)
+  Icon(Icons.Outlined.VerifiedUser, null, Modifier.padding(end = 3.dp).size(16.dp), tint = HighOrLowlight)
 }

@Composable
-private fun GroupLinkButton(onClick: () -> Unit) {
-  SettingsActionItem(
-    painterResource(R.drawable.ic_link),
-    stringResource(R.string.group_link),
-    onClick,
-    iconColor = MaterialTheme.colors.secondary
-  )
+private fun GroupLinkButton() {
+  Row(
+    Modifier
+      .fillMaxSize(),
+    verticalAlignment = Alignment.CenterVertically
+  ) {
+    Icon(
+      Icons.Outlined.Link,
+      stringResource(R.string.group_link),
+      tint = HighOrLowlight
+    )
+    Spacer(Modifier.size(8.dp))
+    Text(stringResource(R.string.group_link))
+  }
 }

@Composable
-private fun CreateGroupLinkButton(onClick: () -> Unit) {
-  SettingsActionItem(
-    painterResource(R.drawable.ic_add_link),
-    stringResource(R.string.create_group_link),
-    onClick,
-    iconColor = MaterialTheme.colors.secondary
-  )
+private fun CreateGroupLinkButton() {
+  Row(
+    Modifier
+      .fillMaxSize(),
+    verticalAlignment = Alignment.CenterVertically
+  ) {
+    Icon(
+      Icons.Outlined.AddLink,
+      stringResource(R.string.create_group_link),
+      tint = HighOrLowlight
+    )
+    Spacer(Modifier.size(8.dp))
+    Text(stringResource(R.string.create_group_link))
+  }
 }

@Composable
-fun EditGroupProfileButton(onClick: () -> Unit) {
-  SettingsActionItem(
-    painterResource(R.drawable.ic_edit),
-    stringResource(R.string.button_edit_group_profile),
-    onClick,
-    iconColor = MaterialTheme.colors.secondary
-  )
+fun EditGroupProfileButton() {
+  Row(
+    Modifier
+      .fillMaxSize(),
+    verticalAlignment = Alignment.CenterVertically
+  ) {
+    Icon(
+      Icons.Outlined.Edit,
+      stringResource(R.string.button_edit_group_profile),
+      tint = HighOrLowlight
+    )
+    Spacer(Modifier.size(8.dp))
+    Text(stringResource(R.string.button_edit_group_profile))
+  }
 }

@Composable
-private fun AddOrEditWelcomeMessage(welcomeMessage: String?, onClick: () -> Unit) {
+private fun AddOrEditWelcomeMessage(welcomeMessage: String?) {
  val text = if (welcomeMessage == null) {
    stringResource(R.string.button_add_welcome_message)
  } else {
    stringResource(R.string.button_welcome_message)
  }
-  SettingsActionItem(
-    painterResource(R.drawable.ic_maps_ugc),
-    text,
-    onClick,
-    iconColor = MaterialTheme.colors.secondary
-  )
+  Row(
+    Modifier
+      .fillMaxSize(),
+    verticalAlignment = Alignment.CenterVertically
+  ) {
+    Icon(
+      Icons.Outlined.MapsUgc,
+      text,
+      tint = HighOrLowlight
+    )
+    Spacer(Modifier.size(8.dp))
+    Text(text)
+  }
 }

@Composable
-private fun LeaveGroupButton(onClick: () -> Unit) {
-  SettingsActionItem(
-    painterResource(R.drawable.ic_logout),
-    stringResource(R.string.button_leave_group),
-    onClick,
-    iconColor = Color.Red,
-    textColor = Color.Red
-  )
+private fun LeaveGroupButton() {
+  Row(
+    Modifier.fillMaxSize(),
+    verticalAlignment = Alignment.CenterVertically
+  ) {
+    Icon(
+      Icons.Outlined.Logout,
+      stringResource(R.string.button_leave_group),
+      tint = Color.Red
+    )
+    Spacer(Modifier.size(8.dp))
+    Text(stringResource(R.string.button_leave_group), color = Color.Red)
+  }
 }

@Composable
-private fun DeleteGroupButton(onClick: () -> Unit) {
-  SettingsActionItem(
-    painterResource(R.drawable.ic_delete),
-    stringResource(R.string.button_delete_group),
-    onClick,
-    iconColor = Color.Red,
-    textColor = Color.Red
-  )
+private fun DeleteGroupButton() {
+  Row(
+    Modifier.fillMaxSize(),
+    verticalAlignment = Alignment.CenterVertically
+  ) {
+    Icon(
+      Icons.Outlined.Delete,
+      stringResource(R.string.button_delete_group),
+      tint = Color.Red
+    )
+    Spacer(Modifier.size(8.dp))
+    Text(stringResource(R.string.button_delete_group), color = Color.Red)
+  }
 }

@Preview
--- a/apps/android/app/src/main/java/chat/simplex/app/views/chat/group/GroupLinkView.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/chat/group/GroupLinkView.kt
@@ -1,17 +1,19 @@
 package chat.simplex.app.views.chat.group

-import SectionBottomSpacer
+import SectionItemView
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.*
+import androidx.compose.material.CircularProgressIndicator
+import androidx.compose.material.Text
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.*
 import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
@@ -65,7 +67,7 @@ fun GroupLinkView(chatModel: ChatModel, groupInfo: GroupInfo, connReqContact: St
      }
    },
    deleteLink = {
-      AlertManager.shared.showAlertDialog(
+      AlertManager.shared.showAlertMsg(
        title = generalGetString(R.string.delete_link_question),
        text = generalGetString(R.string.all_group_members_will_remain_connected),
        confirmText = generalGetString(R.string.delete_verb),
@@ -77,8 +79,7 @@ fun GroupLinkView(chatModel: ChatModel, groupInfo: GroupInfo, connReqContact: St
              onGroupLinkUpdated(null to null)
            }
          }
-        },
-        destructive = true,
+        }
      )
    }
  )
@@ -100,12 +101,15 @@ fun GroupLinkLayout(
 ) {
  Column(
    Modifier
-      .verticalScroll(rememberScrollState()),
+      .verticalScroll(rememberScrollState())
+      .padding(start = DEFAULT_PADDING, bottom = DEFAULT_BOTTOM_PADDING, end = DEFAULT_PADDING),
+    horizontalAlignment = Alignment.Start,
+    verticalArrangement = Arrangement.Top
  ) {
-    AppBarTitle(stringResource(R.string.group_link))
+    AppBarTitle(stringResource(R.string.group_link), false)
    Text(
      stringResource(R.string.you_can_share_group_link_anybody_will_be_able_to_connect),
-      Modifier.padding(start = DEFAULT_PADDING, end = DEFAULT_PADDING, bottom = 12.dp),
+      Modifier.padding(bottom = 12.dp),
      lineHeight = 22.sp
    )
    Column(
@@ -114,9 +118,11 @@ fun GroupLinkLayout(
      verticalArrangement = Arrangement.SpaceEvenly
    ) {
      if (groupLink == null) {
-        SimpleButton(stringResource(R.string.button_create_group_link), icon = painterResource(R.drawable.ic_add_link), disabled = creatingLink, click = createLink)
+        SimpleButton(stringResource(R.string.button_create_group_link), icon = Icons.Outlined.AddLink, disabled = creatingLink, click = createLink)
      } else {
-        RoleSelectionRow(groupInfo, groupLinkMemberRole)
+        SectionItemView(padding = PaddingValues(bottom = DEFAULT_PADDING)) {
+          RoleSelectionRow(groupInfo, groupLinkMemberRole)
+        }
        var initialLaunch by remember { mutableStateOf(true) }
        LaunchedEffect(groupLinkMemberRole.value) {
          if (!initialLaunch) {
@@ -124,27 +130,26 @@ fun GroupLinkLayout(
          }
          initialLaunch = false
        }
-        QRCode(groupLink, Modifier.aspectRatio(1f).padding(horizontal = DEFAULT_PADDING))
+        QRCode(groupLink, Modifier.aspectRatio(1f))
        Row(
          horizontalArrangement = Arrangement.spacedBy(10.dp),
          verticalAlignment = Alignment.CenterVertically,
-          modifier = Modifier.padding(horizontal = DEFAULT_PADDING, vertical = 10.dp)
+          modifier = Modifier.padding(vertical = 10.dp)
        ) {
          SimpleButton(
            stringResource(R.string.share_link),
-            icon = painterResource(R.drawable.ic_share),
+            icon = Icons.Outlined.Share,
            click = share
          )
          SimpleButton(
            stringResource(R.string.delete_link),
-            icon = painterResource(R.drawable.ic_delete),
+            icon = Icons.Outlined.Delete,
            color = Color.Red,
            click = deleteLink
          )
        }
      }
    }
-    SectionBottomSpacer()
  }
 }

@@ -161,8 +166,9 @@ private fun RoleSelectionRow(groupInfo: GroupInfo, selectedRole: MutableState<Gr
      values,
      selectedRole,
      icon = null,
-      enabled = rememberUpdatedState(enabled)
-    ) { selectedRole.value = it }
+      enabled = rememberUpdatedState(enabled),
+      onSelected = { selectedRole.value = it }
+    )
  }
 }

@@ -176,7 +182,7 @@ fun ProgressIndicator() {
      Modifier
        .padding(horizontal = 2.dp)
        .size(30.dp),
-      color = MaterialTheme.colors.secondary,
+      color = HighOrLowlight,
      strokeWidth = 2.5.dp
    )
  }
--- a/apps/android/app/src/main/java/chat/simplex/app/views/chat/group/GroupMemberInfoView.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/chat/group/GroupMemberInfoView.kt
@@ -1,35 +1,30 @@
 package chat.simplex.app.views.chat.group

 import InfoRow
-import SectionBottomSpacer
-import SectionDividerSpaced
+import SectionDivider
+import SectionItemView
 import SectionSpacer
-import SectionTextFooter
 import SectionView
-import android.net.Uri
-import android.util.Log
 import androidx.activity.compose.BackHandler
 import androidx.compose.foundation.*
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.*
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import chat.simplex.app.*
 import chat.simplex.app.R
 import chat.simplex.app.model.*
 import chat.simplex.app.ui.theme.*
 import chat.simplex.app.views.chat.*
 import chat.simplex.app.views.helpers.*
-import chat.simplex.app.views.newchat.*
 import chat.simplex.app.views.usersettings.SettingsActionItem
 import kotlinx.datetime.Clock

@@ -70,15 +65,6 @@ fun GroupMemberInfoView(
          }
        }
      },
-      connectViaAddress = { connReqUri ->
-        val uri = Uri.parse(connReqUri)
-        withUriAction(uri) { linkType ->
-          withApi {
-            Log.d(TAG, "connectViaUri: connecting")
-            connectViaUri(chatModel, linkType, uri)
-          }
-        }
-      },
      removeMember = { removeMemberDialog(groupInfo, member, chatModel, close) },
      onRoleSelected = {
        if (it == newRole.value) return@GroupMemberInfoLayout
@@ -131,7 +117,7 @@ fun GroupMemberInfoView(
 }

 fun removeMemberDialog(groupInfo: GroupInfo, member: GroupMember, chatModel: ChatModel, close: (() -> Unit)? = null) {
-  AlertManager.shared.showAlertDialog(
+  AlertManager.shared.showAlertMsg(
    title = generalGetString(R.string.button_remove_member),
    text = generalGetString(R.string.member_will_be_removed_from_group_cannot_be_undone),
    confirmText = generalGetString(R.string.remove_member_confirmation),
@@ -143,8 +129,7 @@ fun removeMemberDialog(groupInfo: GroupInfo, member: GroupMember, chatModel: Cha
        }
        close?.invoke()
      }
-    },
-    destructive = true,
+    }
  )
 }

@@ -158,25 +143,16 @@ fun GroupMemberInfoLayout(
  connectionCode: String?,
  getContactChat: (Long) -> Chat?,
  openDirectChat: (Long) -> Unit,
-  connectViaAddress: (String) -> Unit,
  removeMember: () -> Unit,
  onRoleSelected: (GroupMemberRole) -> Unit,
  switchMemberAddress: () -> Unit,
  verifyClicked: () -> Unit,
 ) {
-  fun knownDirectChat(contactId: Long): Chat? {
-    val chat = getContactChat(contactId)
-    return if (chat != null && chat.chatInfo is ChatInfo.Direct && chat.chatInfo.contact.directOrUsed) {
-      chat
-    } else {
-      null
-    }
-  }
-
  Column(
    Modifier
      .fillMaxWidth()
      .verticalScroll(rememberScrollState()),
+    horizontalAlignment = Alignment.Start
  ) {
    Row(
      Modifier.fillMaxWidth(),
@@ -186,65 +162,57 @@ fun GroupMemberInfoLayout(
    }
    SectionSpacer()

-    val contactId = member.memberContactId
-
    if (member.memberActive) {
+      val contactId = member.memberContactId
      if (contactId != null) {
        SectionView {
-          if (knownDirectChat(contactId) != null || groupInfo.fullGroupPreferences.directMessages.on) {
+          val chat = getContactChat(contactId)
+          if ((chat != null && chat.chatInfo is ChatInfo.Direct && chat.chatInfo.contact.directOrUsed) || groupInfo.fullGroupPreferences.directMessages.on) {
            OpenChatButton(onClick = { openDirectChat(contactId) })
+            if (connectionCode != null) {
+              SectionDivider()
+            }
          }
          if (connectionCode != null) {
            VerifyCodeButton(member.verified, verifyClicked)
          }
        }
-        SectionDividerSpaced()
+        SectionSpacer()
      }
    }

-    if (member.contactLink != null) {
-      val context = LocalContext.current
-      SectionView(stringResource(R.string.address_section_title).uppercase()) {
-        QRCode(member.contactLink, Modifier.padding(horizontal = DEFAULT_PADDING, vertical = DEFAULT_PADDING_HALF).aspectRatio(1f))
-        ShareAddressButton { shareText(context, member.contactLink) }
-        if (contactId != null) {
-          if (knownDirectChat(contactId) == null && !groupInfo.fullGroupPreferences.directMessages.on) {
-            ConnectViaAddressButton(onClick = { connectViaAddress(member.contactLink) })
-          }
-        } else {
-          ConnectViaAddressButton(onClick = { connectViaAddress(member.contactLink) })
-        }
-        SectionTextFooter(stringResource(R.string.you_can_share_this_address_with_your_contacts).format(member.displayName))
-      }
-      SectionDividerSpaced()
-    }
-
    SectionView(title = stringResource(R.string.member_info_section_title_member)) {
      InfoRow(stringResource(R.string.info_row_group), groupInfo.displayName)
+      SectionDivider()
      val roles = remember { member.canChangeRoleTo(groupInfo) }
      if (roles != null) {
-        RoleSelectionRow(roles, newRole, onRoleSelected)
+        SectionItemView {
+          RoleSelectionRow(roles, newRole, onRoleSelected)
+        }
      } else {
        InfoRow(stringResource(R.string.role_in_group), member.memberRole.text)
      }
      val conn = member.activeConn
      if (conn != null) {
+        SectionDivider()
        val connLevelDesc =
          if (conn.connLevel == 0) stringResource(R.string.conn_level_desc_direct)
          else String.format(generalGetString(R.string.conn_level_desc_indirect), conn.connLevel)
        InfoRow(stringResource(R.string.info_row_connection), connLevelDesc)
      }
    }
+    SectionSpacer()
    if (connStats != null) {
-      SectionDividerSpaced()
      SectionView(title = stringResource(R.string.conn_stats_section_title_servers)) {
      SwitchAddressButton(switchMemberAddress)
+      SectionDivider()
        val rcvServers = connStats.rcvServers
        val sndServers = connStats.sndServers
        if ((rcvServers != null && rcvServers.isNotEmpty()) || (sndServers != null && sndServers.isNotEmpty())) {
          if (rcvServers != null && rcvServers.isNotEmpty()) {
            SimplexServers(stringResource(R.string.receiving_via), rcvServers)
            if (sndServers != null && sndServers.isNotEmpty()) {
+              SectionDivider()
              SimplexServers(stringResource(R.string.sending_via), sndServers)
            }
          } else if (sndServers != null && sndServers.isNotEmpty()) {
@@ -252,23 +220,24 @@ fun GroupMemberInfoLayout(
          }
        }
      }
+      SectionSpacer()
    }

    if (member.canBeRemoved(groupInfo)) {
-      SectionDividerSpaced(maxBottomPadding = false)
      SectionView {
        RemoveMemberButton(removeMember)
      }
+      SectionSpacer()
    }

    if (developerTools) {
-      SectionDividerSpaced()
      SectionView(title = stringResource(R.string.section_title_for_console)) {
        InfoRow(stringResource(R.string.info_row_local_name), member.localDisplayName)
+        SectionDivider()
        InfoRow(stringResource(R.string.info_row_database_id), member.groupMemberId.toString())
      }
+      SectionSpacer()
    }
-    SectionBottomSpacer()
  }
 }

@@ -281,7 +250,7 @@ fun GroupMemberInfoHeader(member: GroupMember) {
    ProfileImage(size = 192.dp, member.image, color = if (isInDarkTheme()) GroupDark else SettingsSecondaryLight)
    Row(verticalAlignment = Alignment.CenterVertically) {
      if (member.verified) {
-        Icon(painterResource(R.drawable.ic_verified_user), null, Modifier.padding(end = 6.dp, top = 4.dp).size(24.dp), tint = MaterialTheme.colors.secondary)
+        Icon(Icons.Outlined.VerifiedUser, null, Modifier.padding(end = 6.dp, top = 4.dp).size(24.dp), tint = HighOrLowlight)
      }
      Text(
        member.displayName, style = MaterialTheme.typography.h1.copy(fontWeight = FontWeight.Normal),
@@ -304,7 +273,7 @@ fun GroupMemberInfoHeader(member: GroupMember) {
@Composable
 fun RemoveMemberButton(onClick: () -> Unit) {
  SettingsActionItem(
-    painterResource(R.drawable.ic_delete),
+    Icons.Outlined.Delete,
    stringResource(R.string.button_remove_member),
    click = onClick,
    textColor = Color.Red,
@@ -315,7 +284,7 @@ fun RemoveMemberButton(onClick: () -> Unit) {
@Composable
 fun OpenChatButton(onClick: () -> Unit) {
  SettingsActionItem(
-    painterResource(R.drawable.ic_chat),
+    Icons.Outlined.Message,
    stringResource(R.string.button_send_direct_message),
    click = onClick,
    textColor = MaterialTheme.colors.primary,
@@ -323,17 +292,6 @@ fun OpenChatButton(onClick: () -> Unit) {
  )
 }

-@Composable
-fun ConnectViaAddressButton(onClick: () -> Unit) {
-  SettingsActionItem(
-    painterResource(R.drawable.ic_link),
-    stringResource(R.string.connect_button),
-    click = onClick,
-    textColor = MaterialTheme.colors.primary,
-    iconColor = MaterialTheme.colors.primary,
-  )
-}
-
@Composable
 private fun RoleSelectionRow(
  roles: List<GroupMemberRole>,
@@ -393,7 +351,6 @@ fun PreviewGroupMemberInfoLayout() {
      connectionCode = "123",
      getContactChat = { Chat.sampleData },
      openDirectChat = {},
-      connectViaAddress = {},
      removeMember = {},
      onRoleSelected = {},
      switchMemberAddress = {},
--- a/apps/android/app/src/main/java/chat/simplex/app/views/chat/group/GroupPreferences.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/chat/group/GroupPreferences.kt
@@ -1,9 +1,9 @@
 package chat.simplex.app.views.chat.group

 import InfoRow
-import SectionBottomSpacer
-import SectionDividerSpaced
+import SectionDivider
 import SectionItemView
+import SectionSpacer
 import SectionTextFooter
 import SectionView
 import androidx.compose.foundation.*
@@ -12,11 +12,13 @@ import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
 import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import chat.simplex.app.R
 import chat.simplex.app.model.*
 import chat.simplex.app.ui.theme.*
+import chat.simplex.app.views.chat.TimedMessagesTTLPicker
 import chat.simplex.app.views.helpers.*
 import chat.simplex.app.views.usersettings.PreferenceToggleWithIcon

@@ -43,6 +45,7 @@ fun GroupPreferencesView(m: ChatModel, chatId: String, close: () -> Unit,) {
      if (preferences == currentPreferences) close()
      else showUnsavedChangesAlert({ savePrefs(close) }, close)
    },
+    background = if (isInDarkTheme()) MaterialTheme.colors.background else SettingsBackgroundLight
  ) {
    GroupPreferencesLayout(
      preferences,
@@ -70,6 +73,7 @@ private fun GroupPreferencesLayout(
 ) {
  Column(
    Modifier.fillMaxWidth().verticalScroll(rememberScrollState()),
+    horizontalAlignment = Alignment.Start,
  ) {
    AppBarTitle(stringResource(R.string.group_preferences))
    val timedMessages = remember(preferences) { mutableStateOf(preferences.timedMessages.enable) }
@@ -83,35 +87,29 @@ private fun GroupPreferencesLayout(
        applyPrefs(preferences.copy(timedMessages = TimedMessagesGroupPreference(enable = enable, ttl = currentPreferences.timedMessages.ttl)))
      }
    }
-    SectionDividerSpaced(true, maxBottomPadding = false)
+    SectionSpacer()
    val allowDirectMessages = remember(preferences) { mutableStateOf(preferences.directMessages.enable) }
    FeatureSection(GroupFeature.DirectMessages, allowDirectMessages, groupInfo, preferences, onTTLUpdated) {
      applyPrefs(preferences.copy(directMessages = GroupPreference(enable = it)))
    }
-    SectionDividerSpaced(true, maxBottomPadding = false)
+    SectionSpacer()
    val allowFullDeletion = remember(preferences) { mutableStateOf(preferences.fullDelete.enable) }
    FeatureSection(GroupFeature.FullDelete, allowFullDeletion, groupInfo, preferences, onTTLUpdated) {
      applyPrefs(preferences.copy(fullDelete = GroupPreference(enable = it)))
    }
-    SectionDividerSpaced(true, maxBottomPadding = false)
-//    val allowReactions = remember(preferences) { mutableStateOf(preferences.reactions.enable) }
-//    FeatureSection(GroupFeature.Reactions, allowReactions, groupInfo, preferences, onTTLUpdated) {
-//      applyPrefs(preferences.copy(reactions = GroupPreference(enable = it)))
-//    }
-//    SectionDividerSpaced(true, maxBottomPadding = false)
+    SectionSpacer()
    val allowVoice = remember(preferences) { mutableStateOf(preferences.voice.enable) }
    FeatureSection(GroupFeature.Voice, allowVoice, groupInfo, preferences, onTTLUpdated) {
      applyPrefs(preferences.copy(voice = GroupPreference(enable = it)))
    }
    if (groupInfo.canEdit) {
-      SectionDividerSpaced(maxTopPadding = true, maxBottomPadding = false)
+      SectionSpacer()
      ResetSaveButtons(
        reset = reset,
        save = savePrefs,
        disabled = preferences == currentPreferences
      )
    }
-    SectionBottomSpacer()
  }
 }

@@ -126,29 +124,24 @@ private fun FeatureSection(
 ) {
  SectionView {
    val on = enableFeature.value == GroupFeatureEnabled.ON
-    val icon = if (on) feature.iconFilled() else feature.icon
-    val iconTint = if (on) SimplexGreen else MaterialTheme.colors.secondary
+    val icon = if (on) feature.iconFilled else feature.icon
+    val iconTint = if (on) SimplexGreen else HighOrLowlight
    val timedOn = feature == GroupFeature.TimedMessages && enableFeature.value == GroupFeatureEnabled.ON
    if (groupInfo.canEdit) {
-      PreferenceToggleWithIcon(
-        feature.text,
-        icon,
-        iconTint,
-        enableFeature.value == GroupFeatureEnabled.ON,
-      ) { checked ->
-        onSelected(if (checked) GroupFeatureEnabled.ON else GroupFeatureEnabled.OFF)
+      SectionItemView {
+        PreferenceToggleWithIcon(
+          feature.text,
+          icon,
+          iconTint,
+          enableFeature.value == GroupFeatureEnabled.ON,
+        ) { checked ->
+          onSelected(if (checked) GroupFeatureEnabled.ON else GroupFeatureEnabled.OFF)
+        }
      }
      if (timedOn) {
+        SectionDivider()
        val ttl = rememberSaveable(preferences.timedMessages) { mutableStateOf(preferences.timedMessages.ttl) }
-        DropdownCustomTimePickerSettingRow(
-          selection = ttl,
-          propagateExternalSelectionUpdate = true, // for Reset
-          label = generalGetString(R.string.delete_after),
-          dropdownValues = TimedMessagesPreference.ttlValues.filterNotNull(), // TODO in 5.2 - allow "off"
-          customPickerTitle = generalGetString(R.string.delete_after),
-          customPickerConfirmButtonText = generalGetString(R.string.custom_time_picker_select),
-          onSelected = onTTLUpdated
-        )
+        TimedMessagesTTLPicker(ttl, onTTLUpdated)
      }
    } else {
      InfoRow(
@@ -158,7 +151,8 @@ private fun FeatureSection(
        iconTint = iconTint,
      )
      if (timedOn) {
-        InfoRow(generalGetString(R.string.delete_after), timeText(preferences.timedMessages.ttl))
+        SectionDivider()
+        InfoRow(generalGetString(R.string.delete_after), TimedMessagesPreference.ttlText(preferences.timedMessages.ttl))
      }
    }
  }
@@ -169,10 +163,11 @@ private fun FeatureSection(
 private fun ResetSaveButtons(reset: () -> Unit, save: () -> Unit, disabled: Boolean) {
  SectionView {
    SectionItemView(reset, disabled = disabled) {
-      Text(stringResource(R.string.reset_verb), color = if (disabled) MaterialTheme.colors.secondary else MaterialTheme.colors.primary)
+      Text(stringResource(R.string.reset_verb), color = if (disabled) HighOrLowlight else MaterialTheme.colors.primary)
    }
+    SectionDivider()
    SectionItemView(save, disabled = disabled) {
-      Text(stringResource(R.string.save_and_notify_group_members), color = if (disabled) MaterialTheme.colors.secondary else MaterialTheme.colors.primary)
+      Text(stringResource(R.string.save_and_notify_group_members), color = if (disabled) HighOrLowlight else MaterialTheme.colors.primary)
    }
  }
 }
--- a/apps/android/app/src/main/java/chat/simplex/app/views/chat/group/GroupProfileView.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/chat/group/GroupProfileView.kt
@@ -1,7 +1,7 @@
 package chat.simplex.app.views.chat.group

-import SectionBottomSpacer
 import android.content.res.Configuration
+import android.graphics.Bitmap
 import android.net.Uri
 import androidx.compose.foundation.*
 import androidx.compose.foundation.layout.*
@@ -14,7 +14,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
@@ -24,7 +23,6 @@ import chat.simplex.app.ui.theme.*
 import chat.simplex.app.views.ProfileNameField
 import chat.simplex.app.views.helpers.*
 import chat.simplex.app.views.isValidDisplayName
-import chat.simplex.app.views.onboarding.ReadableText
 import chat.simplex.app.views.usersettings.*
 import com.google.accompanist.insets.ProvideWindowInsets
 import com.google.accompanist.insets.navigationBarsWithImePadding
@@ -55,32 +53,14 @@ fun GroupProfileLayout(
  saveProfile: (GroupProfile) -> Unit,
 ) {
  val bottomSheetModalState = rememberModalBottomSheetState(initialValue = ModalBottomSheetValue.Hidden)
-  val displayName = rememberSaveable { mutableStateOf(groupProfile.displayName) }
-  val fullName = rememberSaveable { mutableStateOf(groupProfile.fullName) }
+  val displayName = remember { mutableStateOf(groupProfile.displayName) }
+  val fullName = remember { mutableStateOf(groupProfile.fullName) }
  val chosenImage = rememberSaveable { mutableStateOf<Uri?>(null) }
  val profileImage = rememberSaveable { mutableStateOf(groupProfile.image) }
  val scope = rememberCoroutineScope()
  val scrollState = rememberScrollState()
  val focusRequester = remember { FocusRequester() }
-  val dataUnchanged =
-    displayName.value == groupProfile.displayName &&
-        fullName.value == groupProfile.fullName &&
-        groupProfile.image == profileImage.value
-  val closeWithAlert = {
-    if (dataUnchanged || !(displayName.value.isNotEmpty() && isValidDisplayName(displayName.value))) {
-      close()
-    } else {
-      showUnsavedChangesAlert({
-        saveProfile(
-          groupProfile.copy(
-            displayName = displayName.value,
-            fullName = fullName.value,
-            image = profileImage.value
-          )
-        )
-      }, close)
-    }
-  }
+
  ProvideWindowInsets(windowInsetsAnimationsEnabled = true) {
    ModalBottomSheetLayout(
      scrimColor = Color.Black.copy(alpha = 0.12F),
@@ -96,16 +76,23 @@ fun GroupProfileLayout(
      sheetState = bottomSheetModalState,
      sheetShape = RoundedCornerShape(topStart = 18.dp, topEnd = 18.dp)
    ) {
-      ModalView(close = closeWithAlert) {
+      ModalView(close = close) {
        Column(
          Modifier
            .verticalScroll(scrollState)
+            .padding(horizontal = DEFAULT_PADDING),
+          horizontalAlignment = Alignment.Start
        ) {
+          Text(
+            stringResource(R.string.group_profile_is_stored_on_members_devices),
+            Modifier.padding(bottom = 24.dp),
+            color = MaterialTheme.colors.onBackground,
+            lineHeight = 22.sp
+          )
          Column(
-            Modifier.fillMaxWidth()
-              .padding(horizontal = DEFAULT_PADDING)
+            Modifier.fillMaxWidth(),
+            horizontalAlignment = Alignment.Start
          ) {
-            ReadableText(R.string.group_profile_is_stored_on_members_devices, TextAlign.Center)
            Box(
              Modifier
                .fillMaxWidth()
@@ -114,7 +101,7 @@ fun GroupProfileLayout(
            ) {
              Box(contentAlignment = Alignment.TopEnd) {
                Box(contentAlignment = Alignment.Center) {
-                  ProfileImage(108.dp, profileImage.value, color = MaterialTheme.colors.secondary.copy(alpha = 0.1f))
+                  ProfileImage(192.dp, profileImage.value)
                  EditImageButton { scope.launch { bottomSheetModalState.show() } }
                }
                if (profileImage.value != null) {
@@ -122,54 +109,51 @@ fun GroupProfileLayout(
                }
              }
            }
-            Row(Modifier.padding(bottom = DEFAULT_PADDING_HALF).fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween) {
-              Text(
-                stringResource(R.string.group_display_name_field),
-                fontSize = 16.sp
-              )
-              if (!isValidDisplayName(displayName.value)) {
-                Spacer(Modifier.size(DEFAULT_PADDING_HALF))
-                Text(
-                  stringResource(R.string.no_spaces),
-                  fontSize = 16.sp,
-                  color = Color.Red
-                )
-              }
-            }
-            ProfileNameField(displayName, "", ::isValidDisplayName, focusRequester)
-            Spacer(Modifier.height(DEFAULT_PADDING))
+            Text(
+              stringResource(R.string.group_display_name_field),
+              Modifier.padding(bottom = 3.dp)
+            )
+            ProfileNameField(displayName, focusRequester)
+            val errorText = if (!isValidDisplayName(displayName.value)) stringResource(R.string.display_name_cannot_contain_whitespace) else ""
+            Text(
+              errorText,
+              fontSize = 15.sp,
+              color = MaterialTheme.colors.error
+            )
+            Spacer(Modifier.height(3.dp))
            Text(
              stringResource(R.string.group_full_name_field),
-              fontSize = 16.sp,
-              modifier = Modifier.padding(bottom = DEFAULT_PADDING_HALF)
+              Modifier.padding(bottom = 5.dp)
            )
            ProfileNameField(fullName)
-            Spacer(Modifier.height(DEFAULT_PADDING))
-            val enabled = !dataUnchanged && displayName.value.isNotEmpty() && isValidDisplayName(displayName.value)
-            if (enabled) {
-              Text(
-                stringResource(R.string.save_group_profile),
-                modifier = Modifier.clickable {
-                  saveProfile(
-                    groupProfile.copy(
+            Spacer(Modifier.height(16.dp))
+            Row {
+              TextButton(stringResource(R.string.cancel_verb)) {
+                close.invoke()
+              }
+              Spacer(Modifier.padding(horizontal = 8.dp))
+              val enabled = displayName.value.isNotEmpty() && isValidDisplayName(displayName.value)
+              if (enabled) {
+                Text(
+                  stringResource(R.string.save_group_profile),
+                  modifier = Modifier.clickable {
+                    saveProfile(groupProfile.copy(
                      displayName = displayName.value,
                      fullName = fullName.value,
                      image = profileImage.value
-                    )
-                  )
-                },
-                color = MaterialTheme.colors.primary
-              )
-            } else {
-              Text(
-                stringResource(R.string.save_group_profile),
-                color = MaterialTheme.colors.secondary
-              )
+                    ))
+                  },
+                  color = MaterialTheme.colors.primary
+                )
+              } else {
+                Text(
+                  stringResource(R.string.save_group_profile),
+                  color = HighOrLowlight
+                )
+              }
            }
          }

-          SectionBottomSpacer()
-
          LaunchedEffect(Unit) {
            delay(300)
            focusRequester.requestFocus()
@@ -180,16 +164,6 @@ fun GroupProfileLayout(
  }
 }

-private fun showUnsavedChangesAlert(save: () -> Unit, revert: () -> Unit) {
-  AlertManager.shared.showAlertDialogStacked(
-    title = generalGetString(R.string.save_preferences_question),
-    confirmText = generalGetString(R.string.save_and_notify_group_members),
-    dismissText = generalGetString(R.string.exit_without_saving),
-    onConfirm = save,
-    onDismiss = revert,
-  )
-}
-
@Preview(showBackground = true)
@Preview(
  uiMode = Configuration.UI_MODE_NIGHT_YES,
--- a/apps/android/app/src/main/java/chat/simplex/app/views/chat/group/WelcomeMessageView.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/chat/group/WelcomeMessageView.kt
@@ -1,35 +1,26 @@
 package chat.simplex.app.views.chat.group

-import SectionBottomSpacer
-import SectionDividerSpaced
 import SectionItemView
+import SectionSpacer
 import SectionView
-import TextIconSpaced
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.text.selection.SelectionContainer
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.*
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Text
 import androidx.compose.runtime.*
-import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.focus.FocusRequester
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import chat.simplex.app.*
 import chat.simplex.app.R
 import chat.simplex.app.model.*
-import chat.simplex.app.ui.theme.DEFAULT_PADDING
-import chat.simplex.app.views.chat.item.MarkdownText
+import chat.simplex.app.ui.theme.*
 import chat.simplex.app.views.helpers.*
-import kotlinx.coroutines.delay

@Composable
 fun GroupWelcomeView(m: ChatModel, groupInfo: GroupInfo, close: () -> Unit) {
-  var gInfo by remember { mutableStateOf(groupInfo) }
-  val welcomeText = remember { mutableStateOf(gInfo.groupProfile.description ?: "") }
+  var groupInfo by remember { mutableStateOf(groupInfo) }
+  val welcomeText = remember { mutableStateOf(groupInfo.groupProfile.description ?: "") }

  fun save(afterSave: () -> Unit = {}) {
    withApi {
@@ -37,10 +28,10 @@ fun GroupWelcomeView(m: ChatModel, groupInfo: GroupInfo, close: () -> Unit) {
      if (welcome?.length == 0) {
        welcome = null
      }
-      val groupProfileUpdated = gInfo.groupProfile.copy(description = welcome)
-      val res = m.controller.apiUpdateGroup(gInfo.groupId, groupProfileUpdated)
+      val groupProfileUpdated = groupInfo.groupProfile.copy(description = welcome)
+      val res = m.controller.apiUpdateGroup(groupInfo.groupId, groupProfileUpdated)
      if (res != null) {
-        gInfo = res
+        groupInfo = res
        m.updateGroup(res)
        welcomeText.value = welcome ?: ""
      }
@@ -50,14 +41,14 @@ fun GroupWelcomeView(m: ChatModel, groupInfo: GroupInfo, close: () -> Unit) {

  ModalView(
    close = {
-      if (welcomeText.value == gInfo.groupProfile.description || (welcomeText.value == "" && gInfo.groupProfile.description == null)) close()
+      if (welcomeText.value == groupInfo.groupProfile.description || (welcomeText.value == "" && groupInfo.groupProfile.description == null)) close()
      else showUnsavedChangesAlert({ save(close) }, close)
    },
+    background = if (isInDarkTheme()) MaterialTheme.colors.background else SettingsBackgroundLight
  ) {
    GroupWelcomeLayout(
      welcomeText,
-      gInfo,
-      m.controller.appPrefs.simplexLinkMode.get(),
+      groupInfo,
      save = ::save
    )
  }
@@ -67,67 +58,19 @@ fun GroupWelcomeView(m: ChatModel, groupInfo: GroupInfo, close: () -> Unit) {
 private fun GroupWelcomeLayout(
  welcomeText: MutableState<String>,
  groupInfo: GroupInfo,
-  linkMode: SimplexLinkMode,
  save: () -> Unit,
 ) {
  Column(
    Modifier.fillMaxWidth().verticalScroll(rememberScrollState()),
  ) {
-    val editMode = remember { mutableStateOf(true) }
    AppBarTitle(stringResource(R.string.group_welcome_title))
-    val wt = rememberSaveable { welcomeText }
-    if (groupInfo.canEdit) {
-      if (editMode.value) {
-        val focusRequester = remember { FocusRequester() }
-        TextEditor(
-          wt,
-          Modifier.height(140.dp), stringResource(R.string.enter_welcome_message),
-          focusRequester = focusRequester
-        )
-        LaunchedEffect(Unit) {
-          delay(300)
-          focusRequester.requestFocus()
-        }
-      } else {
-        TextPreview(wt.value, linkMode)
-      }
-      ChangeModeButton(
-        editMode.value,
-        click = {
-          editMode.value = !editMode.value
-        },
-        wt.value.isEmpty()
-      )
-      CopyTextButton { copyText(SimplexApp.context, wt.value) }
-      SectionDividerSpaced(maxBottomPadding = false)
-      SaveButton(
-        save = save,
-        disabled = wt.value == groupInfo.groupProfile.description || (wt.value == "" && groupInfo.groupProfile.description == null)
-      )
-    } else {
-      TextPreview(wt.value, linkMode)
-      CopyTextButton { copyText(SimplexApp.context, wt.value) }
-    }
-    SectionBottomSpacer()
-  }
-}
-
-@Composable
-private fun TextPreview(text: String, linkMode: SimplexLinkMode, markdown: Boolean = true) {
-  Column(
-    Modifier.height(140.dp)
-  ) {
-    SelectionContainer(
-      Modifier.verticalScroll(rememberScrollState())
-    ) {
-      MarkdownText(
-        text,
-        formattedText = if (markdown) remember(text) { parseToMarkdown(text) } else null,
-        modifier = Modifier.fillMaxHeight().padding(horizontal = DEFAULT_PADDING),
-        linkMode = linkMode,
-        style = MaterialTheme.typography.body1.copy(color = MaterialTheme.colors.onBackground, lineHeight = 22.sp)
-      )
-    }
+    val welcomeText = remember { welcomeText }
+    TextEditor(Modifier.padding(horizontal = DEFAULT_PADDING).height(160.dp), text = welcomeText)
+    SectionSpacer()
+    SaveButton(
+      save = save,
+      disabled = welcomeText.value == groupInfo.groupProfile.description || (welcomeText.value == "" && groupInfo.groupProfile.description == null)
+    )
  }
 }

@@ -135,40 +78,11 @@ private fun TextPreview(text: String, linkMode: SimplexLinkMode, markdown: Boole
 private fun SaveButton(save: () -> Unit, disabled: Boolean) {
  SectionView {
    SectionItemView(save, disabled = disabled) {
-      Text(stringResource(R.string.save_and_update_group_profile), color = if (disabled) MaterialTheme.colors.secondary else MaterialTheme.colors.primary)
+      Text(stringResource(R.string.save_and_update_group_profile), color = if (disabled) HighOrLowlight else MaterialTheme.colors.primary)
    }
  }
 }

-@Composable
-private fun ChangeModeButton(editMode: Boolean, click: () -> Unit, disabled: Boolean) {
-  SectionItemView(click, disabled = disabled) {
-    Icon(
-      painterResource(if (editMode) R.drawable.ic_visibility else R.drawable.ic_edit),
-      contentDescription = generalGetString(R.string.edit_verb),
-      tint = if (disabled) MaterialTheme.colors.secondary else MaterialTheme.colors.primary,
-    )
-    TextIconSpaced()
-    Text(
-      stringResource(if (editMode) R.string.group_welcome_preview else R.string.edit_verb),
-      color = if (disabled) MaterialTheme.colors.secondary else MaterialTheme.colors.primary
-    )
-  }
-}
-
-@Composable
-private fun CopyTextButton(click: () -> Unit) {
-  SectionItemView(click) {
-    Icon(
-      painterResource(R.drawable.ic_content_copy),
-      contentDescription = generalGetString(R.string.copy_verb),
-      tint = MaterialTheme.colors.primary,
-    )
-    TextIconSpaced()
-    Text(stringResource(R.string.copy_verb), color = MaterialTheme.colors.primary)
-  }
-}
-
 private fun showUnsavedChangesAlert(save: () -> Unit, revert: () -> Unit) {
  AlertManager.shared.showAlertDialogStacked(
    title = generalGetString(R.string.save_welcome_message_question),
--- a/apps/android/app/src/main/java/chat/simplex/app/views/chat/item/CICallItemView.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/chat/item/CICallItemView.kt
@@ -1,12 +1,15 @@
 package chat.simplex.app.views.chat.item

 import androidx.compose.foundation.layout.*
-import androidx.compose.material.*
+import androidx.compose.material.Icon
+import androidx.compose.material.Text
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.PhoneInTalk
+import androidx.compose.material.icons.outlined.*
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
@@ -21,28 +24,28 @@ fun CICallItemView(cInfo: ChatInfo, cItem: ChatItem, status: CICallStatus, durat
    Modifier
      .padding(horizontal = 4.dp)
      .padding(bottom = 8.dp), horizontalAlignment = Alignment.CenterHorizontally) {
-    @Composable fun ConnectingCallIcon() = Icon(painterResource(R.drawable.ic_settings_phone), stringResource(R.string.icon_descr_call_connecting), tint = SimplexGreen)
+    @Composable fun ConnectingCallIcon() = Icon(Icons.Outlined.SettingsPhone, stringResource(R.string.icon_descr_call_connecting), tint = SimplexGreen)
    when (status) {
      CICallStatus.Pending -> if (sent) {
-        Icon(painterResource(R.drawable.ic_call), stringResource(R.string.icon_descr_call_pending_sent))
+        Icon(Icons.Outlined.Call, stringResource(R.string.icon_descr_call_pending_sent))
      } else {
        AcceptCallButton(cInfo, acceptCall)
      }
-      CICallStatus.Missed -> Icon(painterResource(R.drawable.ic_call), stringResource(R.string.icon_descr_call_missed), tint = Color.Red)
-      CICallStatus.Rejected -> Icon(painterResource(R.drawable.ic_call_end), stringResource(R.string.icon_descr_call_rejected), tint = Color.Red)
+      CICallStatus.Missed -> Icon(Icons.Outlined.Call, stringResource(R.string.icon_descr_call_missed), tint = Color.Red)
+      CICallStatus.Rejected -> Icon(Icons.Outlined.CallEnd, stringResource(R.string.icon_descr_call_rejected), tint = Color.Red)
      CICallStatus.Accepted -> ConnectingCallIcon()
      CICallStatus.Negotiated -> ConnectingCallIcon()
-      CICallStatus.Progress -> Icon(painterResource(R.drawable.ic_phone_in_talk_filled), stringResource(R.string.icon_descr_call_progress), tint = SimplexGreen)
+      CICallStatus.Progress -> Icon(Icons.Filled.PhoneInTalk, stringResource(R.string.icon_descr_call_progress), tint = SimplexGreen)
      CICallStatus.Ended -> Row {
-        Icon(painterResource(R.drawable.ic_call_end), stringResource(R.string.icon_descr_call_ended), tint = MaterialTheme.colors.secondary, modifier = Modifier.padding(end = 4.dp))
-        Text(durationText(duration), color = MaterialTheme.colors.secondary)
+        Icon(Icons.Outlined.CallEnd, stringResource(R.string.icon_descr_call_ended), tint = HighOrLowlight, modifier = Modifier.padding(end = 4.dp))
+        Text(durationText(duration), color = HighOrLowlight)
      }
      CICallStatus.Error -> {}
    }

    Text(
      cItem.timestampText,
-      color = MaterialTheme.colors.secondary,
+      color = HighOrLowlight,
      fontSize = 14.sp,
      modifier = Modifier.padding(start = 3.dp)
    )
@@ -52,9 +55,9 @@ fun CICallItemView(cInfo: ChatInfo, cItem: ChatItem, status: CICallStatus, durat
@Composable
 fun AcceptCallButton(cInfo: ChatInfo, acceptCall: (Contact) -> Unit) {
  if (cInfo is ChatInfo.Direct) {
-    SimpleButton(stringResource(R.string.answer_call), painterResource(R.drawable.ic_ring_volume)) { acceptCall(cInfo.contact) }
+    SimpleButton(stringResource(R.string.answer_call), Icons.Outlined.RingVolume) { acceptCall(cInfo.contact) }
  } else {
-    Icon(painterResource(R.drawable.ic_ring_volume), stringResource(R.string.answer_call), tint = MaterialTheme.colors.secondary)
+    Icon(Icons.Outlined.RingVolume, stringResource(R.string.answer_call), tint = HighOrLowlight)
  }
 //    if case let .direct(contact) = chatInfo {
 //      Button {
@@ -151,4 +154,4 @@ fun AcceptCallButton(cInfo: ChatInfo, acceptCall: (Contact) -> Unit) {
 //      Image(systemName: "phone.arrow.down.left").foregroundColor(.secondary)
 //    }
 //  }
-//}
+//}
--- a/apps/android/app/src/main/java/chat/simplex/app/views/chat/item/CIChatFeatureView.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/chat/item/CIChatFeatureView.kt
@@ -6,7 +6,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.painter.Painter
+import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import chat.simplex.app.model.*
@@ -16,14 +16,14 @@ fun CIChatFeatureView(
  chatItem: ChatItem,
  feature: Feature,
  iconColor: Color,
-  icon: Painter? = null
+  icon: ImageVector? = null
 ) {
  Row(
    Modifier.padding(horizontal = 6.dp, vertical = 6.dp),
    verticalAlignment = Alignment.CenterVertically,
    horizontalArrangement = Arrangement.spacedBy(4.dp)
  ) {
-    Icon(icon ?: feature.iconFilled(), feature.text, Modifier.size(18.dp), tint = iconColor)
+    Icon(icon ?: feature.iconFilled, feature.text, Modifier.size(18.dp), tint = iconColor)
    Text(
      chatEventText(chatItem),
      Modifier,
--- a/apps/android/app/src/main/java/chat/simplex/app/views/chat/item/CIEventView.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/chat/item/CIEventView.kt
@@ -13,7 +13,8 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import chat.simplex.app.model.ChatItem
-import chat.simplex.app.ui.theme.*
+import chat.simplex.app.ui.theme.HighOrLowlight
+import chat.simplex.app.ui.theme.SimpleXTheme

@Composable
 fun CIEventView(ci: ChatItem) {
@@ -21,25 +22,28 @@ fun CIEventView(ci: ChatItem) {
  fun chatEventTextView(text: AnnotatedString) {
    Text(text, style = MaterialTheme.typography.body1.copy(lineHeight = 22.sp))
  }
-  Row(
-    Modifier.padding(horizontal = 6.dp, vertical = 6.dp),
-    verticalAlignment = Alignment.CenterVertically
-  ) {
-    val memberDisplayName = ci.memberDisplayName
-    if (memberDisplayName != null) {
-      chatEventTextView(
-        buildAnnotatedString {
-          withStyle(chatEventStyle) { append(memberDisplayName) }
-          append(" ")
-        }.plus(chatEventText(ci))
-      )
-    } else {
-      chatEventTextView(chatEventText(ci))
+
+  Surface {
+    Row(
+      Modifier.padding(horizontal = 6.dp, vertical = 6.dp),
+      verticalAlignment = Alignment.CenterVertically
+    ) {
+      val memberDisplayName = ci.memberDisplayName
+      if (memberDisplayName != null) {
+        chatEventTextView(
+          buildAnnotatedString {
+            withStyle(chatEventStyle) { append(memberDisplayName) }
+            append(" ")
+          }.plus(chatEventText(ci))
+        )
+      } else {
+        chatEventTextView(chatEventText(ci))
+      }
    }
  }
 }

-val chatEventStyle = SpanStyle(fontSize = 12.sp, fontWeight = FontWeight.Light, color = CurrentColors.value.colors.secondary)
+val chatEventStyle = SpanStyle(fontSize = 12.sp, fontWeight = FontWeight.Light, color = HighOrLowlight)

 fun chatEventText(ci: ChatItem): AnnotatedString =
  buildAnnotatedString {
--- a/apps/android/app/src/main/java/chat/simplex/app/views/chat/item/CIFeaturePreferenceView.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/chat/item/CIFeaturePreferenceView.kt
@@ -11,6 +11,7 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import chat.simplex.app.R
 import chat.simplex.app.model.*
+import chat.simplex.app.ui.theme.HighOrLowlight
 import chat.simplex.app.views.helpers.generalGetString

@Composable
@@ -26,7 +27,7 @@ fun CIFeaturePreferenceView(
    verticalAlignment = Alignment.CenterVertically,
    horizontalArrangement = Arrangement.spacedBy(4.dp)
  ) {
-    Icon(feature.icon, feature.text, Modifier.size(18.dp), tint = MaterialTheme.colors.secondary)
+    Icon(feature.icon, feature.text, Modifier.size(18.dp), tint = HighOrLowlight)
    if (contact != null && allowed != FeatureAllowed.NO && contact.allowsFeature(feature) && !contact.userAllowsFeature(feature)) {
      val acceptStyle = SpanStyle(color = MaterialTheme.colors.primary, fontSize = 12.sp)
      val setParam = feature == ChatFeature.TimedMessages && contact.mergedPreferences.timedMessages.userPreference.pref.ttl == null
@@ -47,7 +48,7 @@ fun CIFeaturePreferenceView(
      )
    } else {
      Text(chatItem.content.text + "  " + chatItem.timestampText,
-        fontSize = 12.sp, fontWeight = FontWeight.Light, color = MaterialTheme.colors.secondary)
+        fontSize = 12.sp, fontWeight = FontWeight.Light, color = HighOrLowlight)
    }
  }
 }
--- a/apps/android/app/src/main/java/chat/simplex/app/views/chat/item/CIFileView.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/chat/item/CIFileView.kt
@@ -6,15 +6,18 @@ import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.CornerSize
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.*
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Check
+import androidx.compose.material.icons.filled.InsertDriveFile
+import androidx.compose.material.icons.outlined.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.painter.Painter
+import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalDensity
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.*
 import androidx.compose.ui.unit.dp
@@ -36,14 +39,14 @@ fun CIFileView(

  @Composable
  fun fileIcon(
-    innerIcon: Painter? = null,
+    innerIcon: ImageVector? = null,
    color: Color = if (isInDarkTheme()) FileDark else FileLight
  ) {
    Box(
      contentAlignment = Alignment.Center
    ) {
      Icon(
-        painterResource(R.drawable.ic_draft_filled),
+        Icons.Filled.InsertDriveFile,
        stringResource(R.string.icon_descr_file),
        Modifier.fillMaxSize(),
        tint = color
@@ -151,15 +154,14 @@ fun CIFileView(
              FileProtocol.XFTP -> progressCircle(file.fileStatus.sndProgress, file.fileStatus.sndTotal)
              FileProtocol.SMP -> progressIndicator()
            }
-          is CIFileStatus.SndComplete -> fileIcon(innerIcon = painterResource(R.drawable.ic_check_filled))
-          is CIFileStatus.SndCancelled -> fileIcon(innerIcon = painterResource(R.drawable.ic_close))
-          is CIFileStatus.SndError -> fileIcon(innerIcon = painterResource(R.drawable.ic_close))
+          is CIFileStatus.SndComplete -> fileIcon(innerIcon = Icons.Filled.Check)
+          is CIFileStatus.SndCancelled -> fileIcon(innerIcon = Icons.Outlined.Close)
          is CIFileStatus.RcvInvitation ->
            if (fileSizeValid())
-              fileIcon(innerIcon = painterResource(R.drawable.ic_arrow_downward), color = MaterialTheme.colors.primary)
+              fileIcon(innerIcon = Icons.Outlined.ArrowDownward, color = MaterialTheme.colors.primary)
            else
-              fileIcon(innerIcon = painterResource(R.drawable.ic_priority_high), color = WarningOrange)
-          is CIFileStatus.RcvAccepted -> fileIcon(innerIcon = painterResource(R.drawable.ic_more_horiz))
+              fileIcon(innerIcon = Icons.Outlined.PriorityHigh, color = WarningOrange)
+          is CIFileStatus.RcvAccepted -> fileIcon(innerIcon = Icons.Outlined.MoreHoriz)
          is CIFileStatus.RcvTransfer ->
            if (file.fileProtocol == FileProtocol.XFTP && file.fileStatus.rcvProgress < file.fileStatus.rcvTotal) {
              progressCircle(file.fileStatus.rcvProgress, file.fileStatus.rcvTotal)
@@ -167,8 +169,7 @@ fun CIFileView(
              progressIndicator()
            }
          is CIFileStatus.RcvComplete -> fileIcon()
-          is CIFileStatus.RcvCancelled -> fileIcon(innerIcon = painterResource(R.drawable.ic_close))
-          is CIFileStatus.RcvError -> fileIcon(innerIcon = painterResource(R.drawable.ic_close))
+          is CIFileStatus.RcvCancelled -> fileIcon(innerIcon = Icons.Outlined.Close)
        }
      } else {
        fileIcon()
@@ -187,14 +188,16 @@ fun CIFileView(
    else
      "                 "
    if (file != null) {
-      Column {
+      Column(
+        horizontalAlignment = Alignment.Start
+      ) {
        Text(
          file.fileName,
          maxLines = 1
        )
        Text(
          formatBytes(file.fileSize) + metaReserve,
-          color = MaterialTheme.colors.secondary,
+          color = HighOrLowlight,
          fontSize = 14.sp,
          maxLines = 1
        )
@@ -211,7 +214,6 @@ class ChatItemProvider: PreviewParameterProvider<ChatItem> {
    meta = CIMeta.getSample(1, Clock.System.now(), "", CIStatus.SndSent(), itemEdited = true),
    content = CIContent.SndMsgContent(msgContent = MsgContent.MCFile("")),
    quotedItem = null,
-    reactions = listOf(),
    file = CIFile.getSample(fileStatus = CIFileStatus.SndComplete)
  )
  private val fileChatItemWtFile = ChatItem(
@@ -219,7 +221,6 @@ class ChatItemProvider: PreviewParameterProvider<ChatItem> {
    meta = CIMeta.getSample(1, Clock.System.now(), "", CIStatus.RcvRead(), ),
    content = CIContent.RcvMsgContent(msgContent = MsgContent.MCFile("")),
    quotedItem = null,
-    reactions = listOf(),
    file = null
  )
  override val values = listOf(
--- a/apps/android/app/src/main/java/chat/simplex/app/views/chat/item/CIGroupInvitationView.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/chat/item/CIGroupInvitationView.kt
@@ -1,10 +1,13 @@
 package chat.simplex.app.views.chat.item

 import android.content.res.Configuration
+import android.util.Log
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.*
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.SupervisedUserCircle
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -43,7 +46,7 @@ fun CIGroupInvitationView(
        .padding(vertical = 4.dp)
        .padding(end = 2.dp)
    ) {
-      ProfileImage(size = 60.dp, image = groupInvitation.groupProfile.image, icon = R.drawable.ic_supervised_user_circle_filled, color = iconColor)
+      ProfileImage(size = 60.dp, image = groupInvitation.groupProfile.image, icon = Icons.Filled.SupervisedUserCircle, color = iconColor)
      Spacer(Modifier.padding(horizontal = 3.dp))
      Column(
        Modifier.defaultMinSize(minHeight = 60.dp),
@@ -68,14 +71,12 @@ fun CIGroupInvitationView(
    }
  }

-  val sentColor = CurrentColors.collectAsState().value.appColors.sentMessage
-  val receivedColor = CurrentColors.collectAsState().value.appColors.receivedMessage
  Surface(
    modifier = if (action) Modifier.clickable(onClick = {
      joinGroup(groupInvitation.groupId)
    }) else Modifier,
    shape = RoundedCornerShape(18.dp),
-    color = if (sent) sentColor else receivedColor,
+    color = if (sent) SentColorLight else ReceivedColorLight,
  ) {
    Box(
      Modifier
@@ -88,6 +89,7 @@ fun CIGroupInvitationView(
        Modifier
          .defaultMinSize(minWidth = 220.dp)
          .padding(bottom = 4.dp),
+        horizontalAlignment = Alignment.Start
      ) {
        groupInfoView()
        Column(Modifier.padding(top = 2.dp, start = 5.dp)) {
@@ -106,7 +108,7 @@ fun CIGroupInvitationView(
      }
      Text(
        ci.timestampText,
-        color = MaterialTheme.colors.secondary,
+        color = HighOrLowlight,
        fontSize = 14.sp,
        modifier = Modifier.padding(start = 3.dp)
      )
--- a/apps/android/app/src/main/java/chat/simplex/app/views/chat/item/CIImageView.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/chat/item/CIImageView.kt
@@ -8,6 +8,9 @@ import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.CircularProgressIndicator
 import androidx.compose.material.Icon
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Check
+import androidx.compose.material.icons.outlined.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -15,10 +18,10 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.asImageBitmap
 import androidx.compose.ui.graphics.painter.BitmapPainter
 import androidx.compose.ui.graphics.painter.Painter
+import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.layout.layoutId
 import androidx.compose.ui.platform.*
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
@@ -52,7 +55,7 @@ fun CIImageView(
  }

  @Composable
-  fun fileIcon(icon: Painter, @StringRes stringId: Int) {
+  fun fileIcon(icon: ImageVector, @StringRes stringId: Int) {
    Icon(
      icon,
      stringResource(stringId),
@@ -77,14 +80,12 @@ fun CIImageView(
              FileProtocol.SMP -> {}
            }
          is CIFileStatus.SndTransfer -> progressIndicator()
-          is CIFileStatus.SndComplete -> fileIcon(painterResource(R.drawable.ic_check_filled), R.string.icon_descr_image_snd_complete)
-          is CIFileStatus.SndCancelled -> fileIcon(painterResource(R.drawable.ic_close), R.string.icon_descr_file)
-          is CIFileStatus.SndError -> fileIcon(painterResource(R.drawable.ic_close), R.string.icon_descr_file)
-          is CIFileStatus.RcvInvitation -> fileIcon(painterResource(R.drawable.ic_arrow_downward), R.string.icon_descr_asked_to_receive)
-          is CIFileStatus.RcvAccepted -> fileIcon(painterResource(R.drawable.ic_more_horiz), R.string.icon_descr_waiting_for_image)
+          is CIFileStatus.SndComplete -> fileIcon(Icons.Filled.Check, R.string.icon_descr_image_snd_complete)
+          is CIFileStatus.SndCancelled -> fileIcon(Icons.Outlined.Close, R.string.icon_descr_file)
+          is CIFileStatus.RcvInvitation -> fileIcon(Icons.Outlined.ArrowDownward, R.string.icon_descr_asked_to_receive)
+          is CIFileStatus.RcvAccepted -> fileIcon(Icons.Outlined.MoreHoriz, R.string.icon_descr_waiting_for_image)
          is CIFileStatus.RcvTransfer -> progressIndicator()
-          is CIFileStatus.RcvCancelled -> fileIcon(painterResource(R.drawable.ic_close), R.string.icon_descr_file)
-          is CIFileStatus.RcvError -> fileIcon(painterResource(R.drawable.ic_close), R.string.icon_descr_file)
+          is CIFileStatus.RcvCancelled -> fileIcon(Icons.Outlined.Close, R.string.icon_descr_file)
          else -> {}
        }
      }
--- a/apps/android/app/src/main/java/chat/simplex/app/views/chat/item/CIInvalidJSONView.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/chat/item/CIInvalidJSONView.kt
@@ -5,11 +5,12 @@ import SectionView
 import androidx.compose.foundation.*
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.*
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.Share
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.unit.dp
@@ -34,7 +35,7 @@ fun InvalidJSONView(json: String) {
    Spacer(Modifier.height(DEFAULT_PADDING))
    SectionView {
      val context = LocalContext.current
-      SettingsActionItem(painterResource(R.drawable.ic_share), generalGetString(R.string.share_verb), click = {
+      SettingsActionItem(Icons.Outlined.Share, generalGetString(R.string.share_verb), click = {
        shareText(context, json)
      })
    }
--- a/apps/android/app/src/main/java/chat/simplex/app/views/chat/item/CIMetaView.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/chat/item/CIMetaView.kt
@@ -2,29 +2,31 @@ package chat.simplex.app.views.chat.item

 import androidx.compose.foundation.layout.*
 import androidx.compose.material.*
-import androidx.compose.ui.graphics.painter.Painter
-import androidx.compose.ui.res.painterResource
-import chat.simplex.app.R
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Circle
+import androidx.compose.material.icons.outlined.Edit
+import androidx.compose.material.icons.outlined.Timer
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import chat.simplex.app.model.*
-import chat.simplex.app.ui.theme.CurrentColors
+import chat.simplex.app.ui.theme.HighOrLowlight
 import kotlinx.datetime.Clock

@Composable
-fun CIMetaView(chatItem: ChatItem, timedMessagesTTL: Int?, metaColor: Color = MaterialTheme.colors.secondary) {
+fun CIMetaView(chatItem: ChatItem, timedMessagesTTL: Int?, metaColor: Color = HighOrLowlight) {
  Row(Modifier.padding(start = 3.dp), verticalAlignment = Alignment.CenterVertically) {
    if (chatItem.isDeletedContent) {
      Text(
        chatItem.timestampText,
        color = metaColor,
-        fontSize = 12.sp,
+        fontSize = 14.sp,
        modifier = Modifier.padding(start = 3.dp)
      )
    } else {
@@ -37,27 +39,27 @@ fun CIMetaView(chatItem: ChatItem, timedMessagesTTL: Int?, metaColor: Color = Ma
 // changing this function requires updating reserveSpaceForMeta
 private fun CIMetaText(meta: CIMeta, chatTTL: Int?, color: Color) {
  if (meta.itemEdited) {
-    StatusIconText(painterResource(R.drawable.ic_edit), color)
+    StatusIconText(Icons.Outlined.Edit, color)
    Spacer(Modifier.width(3.dp))
  }
  if (meta.disappearing) {
-    StatusIconText(painterResource(R.drawable.ic_timer), color)
+    StatusIconText(Icons.Outlined.Timer, color)
    val ttl = meta.itemTimed?.ttl
    if (ttl != chatTTL) {
-      Text(shortTimeText(ttl), color = color, fontSize = 12.sp)
+      Text(TimedMessagesPreference.shortTtlText(ttl), color = color, fontSize = 13.sp)
    }
    Spacer(Modifier.width(4.dp))
  }
  val statusIcon = meta.statusIcon(MaterialTheme.colors.primary, color)
  if (statusIcon != null) {
    val (icon, statusColor) = statusIcon
-    StatusIconText(painterResource(icon), statusColor)
+    StatusIconText(icon, statusColor)
    Spacer(Modifier.width(4.dp))
  } else if (!meta.disappearing) {
-    StatusIconText(painterResource(R.drawable.ic_circle_filled), Color.Transparent)
+    StatusIconText(Icons.Filled.Circle, Color.Transparent)
    Spacer(Modifier.width(4.dp))
  }
-  Text(meta.timestampText, color = color, fontSize = 12.sp, maxLines = 1, overflow = TextOverflow.Ellipsis)
+  Text(meta.timestampText, color = color, fontSize = 13.sp, maxLines = 1, overflow = TextOverflow.Ellipsis)
 }

 // the conditions in this function should match CIMetaText
@@ -69,17 +71,17 @@ fun reserveSpaceForMeta(meta: CIMeta, chatTTL: Int?): String {
    res += iconSpace
    val ttl = meta.itemTimed.ttl
    if (ttl != chatTTL) {
-      res += shortTimeText(ttl)
+      res += TimedMessagesPreference.shortTtlText(ttl)
    }
  }
-  if (meta.statusIcon(CurrentColors.value.colors.secondary) != null || !meta.disappearing) {
+  if (meta.statusIcon(HighOrLowlight) != null || !meta.disappearing) {
    res += iconSpace
  }
  return res + meta.timestampText
 }

@Composable
-private fun StatusIconText(icon: Painter, color: Color) {
+private fun StatusIconText(icon: ImageVector, color: Color) {
  Icon(icon, null, Modifier.height(12.dp), tint = color)
 }

--- a/apps/android/app/src/main/java/chat/simplex/app/views/chat/item/CIRcvDecryptionError.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/chat/item/CIRcvDecryptionError.kt
@@ -1,24 +0,0 @@
-package chat.simplex.app.views.chat.item
-
-import androidx.compose.runtime.Composable
-import chat.simplex.app.R
-import chat.simplex.app.model.*
-import chat.simplex.app.views.helpers.AlertManager
-import chat.simplex.app.views.helpers.generalGetString
-
-@Composable
-fun CIRcvDecryptionError(msgDecryptError: MsgDecryptError, msgCount: UInt, ci: ChatItem, timedMessagesTTL: Int?, showMember: Boolean) {
-  CIMsgError(ci, timedMessagesTTL, showMember) {
-    AlertManager.shared.showAlertMsg(
-      title = generalGetString(R.string.decryption_error),
-      text = when (msgDecryptError) {
-        MsgDecryptError.RatchetHeader -> String.format(generalGetString(R.string.alert_text_decryption_error_header), msgCount.toLong()) + "\n" +
-            generalGetString(R.string.alert_text_fragment_encryption_out_of_sync_old_database) + "\n" +
-            generalGetString(R.string.alert_text_fragment_permanent_error_reconnect)
-        MsgDecryptError.TooManySkipped -> String.format(generalGetString(R.string.alert_text_decryption_error_too_many_skipped), msgCount.toLong()) + "\n" +
-            generalGetString(R.string.alert_text_fragment_encryption_out_of_sync_old_database) + "\n" +
-            generalGetString(R.string.alert_text_fragment_permanent_error_reconnect)
-      }
-    )
-  }
-}
--- a/apps/android/app/src/main/java/chat/simplex/app/views/chat/item/CIVideoView.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/chat/item/CIVideoView.kt
@@ -9,15 +9,17 @@ import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.CornerSize
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.*
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.*
+import androidx.compose.material.icons.outlined.*
 import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.*
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.asImageBitmap
-import androidx.compose.ui.graphics.painter.Painter
+import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.layout.*
 import androidx.compose.ui.platform.*
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.*
 import androidx.compose.ui.viewinterop.AndroidView
@@ -161,8 +163,9 @@ private fun BoxScope.PlayButton(error: Boolean = false, onLongClick: () -> Unit,
      contentAlignment = Alignment.Center
    ) {
      Icon(
-        painterResource(R.drawable.ic_play_arrow_filled),
+        imageVector = Icons.Filled.PlayArrow,
        contentDescription = null,
+        Modifier.size(25.dp),
        tint = if (error) WarningOrange else Color.White
      )
    }
@@ -189,7 +192,7 @@ private fun DurationProgress(file: CIFile, playing: MutableState<Boolean>, durat
          color = Color.White
        )
        /*if (!soundEnabled.value) {
-        Icon(painterResource(R.drawable.ic_volume_off_filled), null,
+        Icon(Icons.Outlined.VolumeOff, null,
          Modifier.padding(start = 5.dp).size(10.dp),
          tint = Color.White
        )
@@ -252,7 +255,7 @@ private fun progressIndicator() {
 }

@Composable
-private fun fileIcon(icon: Painter, @StringRes stringId: Int) {
+private fun fileIcon(icon: ImageVector, @StringRes stringId: Int) {
  Icon(
    icon,
    stringResource(stringId),
@@ -295,19 +298,17 @@ private fun loadingIndicator(file: CIFile?) {
            FileProtocol.XFTP -> progressCircle(file.fileStatus.sndProgress, file.fileStatus.sndTotal)
            FileProtocol.SMP -> progressIndicator()
          }
-        is CIFileStatus.SndComplete -> fileIcon(painterResource(R.drawable.ic_check_filled), R.string.icon_descr_video_snd_complete)
-        is CIFileStatus.SndCancelled -> fileIcon(painterResource(R.drawable.ic_close), R.string.icon_descr_file)
-        is CIFileStatus.SndError -> fileIcon(painterResource(R.drawable.ic_close), R.string.icon_descr_file)
-        is CIFileStatus.RcvInvitation -> fileIcon(painterResource(R.drawable.ic_arrow_downward), R.string.icon_descr_video_asked_to_receive)
-        is CIFileStatus.RcvAccepted -> fileIcon(painterResource(R.drawable.ic_more_horiz), R.string.icon_descr_waiting_for_video)
+        is CIFileStatus.SndComplete -> fileIcon(Icons.Filled.Check, R.string.icon_descr_video_snd_complete)
+        is CIFileStatus.SndCancelled -> fileIcon(Icons.Outlined.Close, R.string.icon_descr_file)
+        is CIFileStatus.RcvInvitation -> fileIcon(Icons.Outlined.ArrowDownward, R.string.icon_descr_video_asked_to_receive)
+        is CIFileStatus.RcvAccepted -> fileIcon(Icons.Outlined.MoreHoriz, R.string.icon_descr_waiting_for_video)
        is CIFileStatus.RcvTransfer ->
          if (file.fileProtocol == FileProtocol.XFTP && file.fileStatus.rcvProgress < file.fileStatus.rcvTotal) {
            progressCircle(file.fileStatus.rcvProgress, file.fileStatus.rcvTotal)
          } else {
            progressIndicator()
          }
-        is CIFileStatus.RcvCancelled -> fileIcon(painterResource(R.drawable.ic_close), R.string.icon_descr_file)
-        is CIFileStatus.RcvError -> fileIcon(painterResource(R.drawable.ic_close), R.string.icon_descr_file)
+        is CIFileStatus.RcvCancelled -> fileIcon(Icons.Outlined.Close, R.string.icon_descr_file)
        else -> {}
      }
    }
--- a/apps/android/app/src/main/java/chat/simplex/app/views/chat/item/CIVoiceView.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/chat/item/CIVoiceView.kt
@@ -1,28 +1,28 @@
 package chat.simplex.app.views.chat.item

-import androidx.compose.foundation.background
 import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.CornerSize
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.*
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.*
 import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.*
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.draw.drawWithCache
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.geometry.Size
 import androidx.compose.ui.graphics.*
 import androidx.compose.ui.graphics.drawscope.Stroke
-import androidx.compose.ui.platform.*
-import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.unit.*
-import chat.simplex.app.R
 import chat.simplex.app.model.*
 import chat.simplex.app.ui.theme.*
 import chat.simplex.app.views.helpers.*
-import kotlinx.coroutines.flow.distinctUntilChanged

 // TODO refactor https://github.com/simplex-chat/simplex-chat/pull/1451#discussion_r1033429901

@@ -36,10 +36,9 @@ fun CIVoiceView(
  ci: ChatItem,
  timedMessagesTTL: Int?,
  longClick: () -> Unit,
-  receiveFile: (Long) -> Unit,
 ) {
  Row(
-    Modifier.padding(top = if (hasText) 14.dp else 4.dp, bottom = if (hasText) 14.dp else 6.dp, start = if (hasText) 6.dp else 0.dp, end = if (hasText) 6.dp else 0.dp),
+    Modifier.padding(top = if (hasText) 14.dp else 4.dp, bottom = if (hasText) 14.dp else 6.dp, start = 6.dp, end = 6.dp),
    verticalAlignment = Alignment.CenterVertically
  ) {
    if (file != null) {
@@ -65,11 +64,9 @@ fun CIVoiceView(
          durationText(time / 1000)
        }
      }
-      VoiceLayout(file, ci, text, audioPlaying, progress, duration, brokenAudio, sent, hasText, timedMessagesTTL, play, pause, longClick, receiveFile) {
-        AudioPlayer.seekTo(it, progress, filePath)
-      }
+      VoiceLayout(file, ci, text, audioPlaying, progress, duration, brokenAudio, sent, hasText, timedMessagesTTL, play, pause, longClick)
    } else {
-      VoiceMsgIndicator(null, false, sent, hasText, null, null, false, {}, {}, longClick, receiveFile)
+      VoiceMsgIndicator(null, false, sent, hasText, null, null, false, {}, {}, longClick)
      val metaReserve = if (edited)
        "                     "
      else
@@ -93,89 +90,39 @@ private fun VoiceLayout(
  timedMessagesTTL: Int?,
  play: () -> Unit,
  pause: () -> Unit,
-  longClick: () -> Unit,
-  receiveFile: (Long) -> Unit,
-  onProgressChanged: (Int) -> Unit,
+  longClick: () -> Unit
 ) {
-  @Composable
-  fun RowScope.Slider(backgroundColor: Color, padding: PaddingValues = PaddingValues(horizontal = DEFAULT_PADDING_HALF)) {
-    var movedManuallyTo by rememberSaveable(file.fileId) { mutableStateOf(-1) }
-    if (audioPlaying.value || progress.value > 0 || movedManuallyTo == progress.value) {
-      val dp4 = with(LocalDensity.current) { 4.dp.toPx() }
-      val dp10 = with(LocalDensity.current) { 10.dp.toPx() }
-      val primary = MaterialTheme.colors.primary
-      val inactiveTrackColor =
-        MaterialTheme.colors.primary.mixWith(
-          backgroundColor.copy(1f).mixWith(MaterialTheme.colors.background, backgroundColor.alpha),
-          0.24f)
-      val width = with(LocalDensity.current) { LocalView.current.width.toDp() }
-      val colors = SliderDefaults.colors(
-        inactiveTrackColor = inactiveTrackColor
-      )
-      Slider(
-        progress.value.toFloat(),
-        onValueChange = {
-          onProgressChanged(it.toInt())
-          movedManuallyTo = it.toInt()
-        },
-        Modifier
-          .size(width, 48.dp)
-          .weight(1f)
-          .padding(padding)
-          .drawBehind {
-            drawRect(primary, Offset(0f, (size.height - dp4) / 2), size = androidx.compose.ui.geometry.Size(dp10, dp4))
-            drawRect(inactiveTrackColor, Offset(size.width - dp10, (size.height - dp4) / 2), size = androidx.compose.ui.geometry.Size(dp10, dp4))
-          },
-        valueRange = 0f..duration.value.toFloat(),
-        colors = colors
-      )
-      LaunchedEffect(Unit) {
-        snapshotFlow { audioPlaying.value }
-          .distinctUntilChanged()
-          .collect {
-            movedManuallyTo = -1
-          }
-      }
-    }
-  }
  when {
    hasText -> {
-      val sentColor = CurrentColors.collectAsState().value.appColors.sentMessage
-      val receivedColor = CurrentColors.collectAsState().value.appColors.receivedMessage
      Spacer(Modifier.width(6.dp))
-      VoiceMsgIndicator(file, audioPlaying.value, sent, hasText, progress, duration, brokenAudio, play, pause, longClick, receiveFile)
-      Row(verticalAlignment = Alignment.CenterVertically) {
-        DurationText(text, PaddingValues(start = 12.dp))
-        Slider(if (ci.chatDir.sent) sentColor else receivedColor)
-      }
+      VoiceMsgIndicator(file, audioPlaying.value, sent, hasText, progress, duration, brokenAudio, play, pause, longClick)
+      DurationText(text, PaddingValues(start = 12.dp))
    }
    sent -> {
-      Column(horizontalAlignment = Alignment.End) {
-        Row {
-          Row(Modifier.weight(1f, false), verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.End) {
-            Spacer(Modifier.height(56.dp))
-            Slider(MaterialTheme.colors.background, PaddingValues(end = DEFAULT_PADDING_HALF + 3.dp))
-            DurationText(text, PaddingValues(end = 12.dp))
-          }
-          VoiceMsgIndicator(file, audioPlaying.value, sent, hasText, progress, duration, brokenAudio, play, pause, longClick, receiveFile)
+      Row {
+        Row(verticalAlignment = Alignment.CenterVertically) {
+          Spacer(Modifier.height(56.dp))
+          DurationText(text, PaddingValues(end = 12.dp))
        }
-        Box(Modifier.padding(top = 6.dp, end = 6.dp)) {
-          CIMetaView(ci, timedMessagesTTL)
+        Column {
+          VoiceMsgIndicator(file, audioPlaying.value, sent, hasText, progress, duration, brokenAudio, play, pause, longClick)
+          Box(Modifier.align(Alignment.CenterHorizontally).padding(top = 6.dp)) {
+            CIMetaView(ci, timedMessagesTTL)
+          }
        }
      }
    }
    else -> {
-      Column(horizontalAlignment = Alignment.Start) {
-        Row {
-          VoiceMsgIndicator(file, audioPlaying.value, sent, hasText, progress, duration, brokenAudio, play, pause, longClick, receiveFile)
-          Row(Modifier.weight(1f, false), verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.Start) {
-            DurationText(text, PaddingValues(start = 12.dp))
-            Slider(MaterialTheme.colors.background, PaddingValues(start = DEFAULT_PADDING_HALF + 3.dp))
-            Spacer(Modifier.height(56.dp))
+      Row {
+        Column {
+          VoiceMsgIndicator(file, audioPlaying.value, sent, hasText, progress, duration, brokenAudio, play, pause, longClick)
+          Box(Modifier.align(Alignment.CenterHorizontally).padding(top = 6.dp)) {
+            CIMetaView(ci, timedMessagesTTL)
          }
        }
-        Box(Modifier.padding(top = 6.dp)) {
-          CIMetaView(ci, timedMessagesTTL)
+        Row(verticalAlignment = Alignment.CenterVertically) {
+          DurationText(text, PaddingValues(start = 12.dp))
+          Spacer(Modifier.height(56.dp))
        }
      }
    }
@@ -190,7 +137,7 @@ private fun DurationText(text: State<String>, padding: PaddingValues) {
    Modifier
      .padding(padding)
      .widthIn(min = minWidth),
-    color = MaterialTheme.colors.secondary,
+    color = HighOrLowlight,
    fontSize = 16.sp,
    maxLines = 1
  )
@@ -209,11 +156,9 @@ private fun PlayPauseButton(
  pause: () -> Unit,
  longClick: () -> Unit
 ) {
-  val sentColor = CurrentColors.collectAsState().value.appColors.sentMessage
-  val receivedColor = CurrentColors.collectAsState().value.appColors.receivedMessage
  Surface(
    Modifier.drawRingModifier(angle, strokeColor, strokeWidth),
-    color = if (sent) sentColor else receivedColor,
+    color = if (sent) SentColorLight else ReceivedColorLight,
    shape = MaterialTheme.shapes.small.copy(CornerSize(percent = 50))
  ) {
    Box(
@@ -226,10 +171,10 @@ private fun PlayPauseButton(
      contentAlignment = Alignment.Center
    ) {
      Icon(
-        if (audioPlaying) painterResource(R.drawable.ic_pause_filled) else painterResource(R.drawable.ic_play_arrow_filled),
+        imageVector = if (audioPlaying) Icons.Filled.Pause else Icons.Filled.PlayArrow,
        contentDescription = null,
        Modifier.size(36.dp),
-        tint = if (error) WarningOrange else if (!enabled) MaterialTheme.colors.secondary else MaterialTheme.colors.primary
+        tint = if (error) WarningOrange else if (!enabled) HighOrLowlight else MaterialTheme.colors.primary
      )
    }
  }
@@ -246,8 +191,7 @@ private fun VoiceMsgIndicator(
  error: Boolean,
  play: () -> Unit,
  pause: () -> Unit,
-  longClick: () -> Unit,
-  receiveFile: (Long) -> Unit,
+  longClick: () -> Unit
 ) {
  val strokeWidth = with(LocalDensity.current) { 3.dp.toPx() }
  val strokeColor = MaterialTheme.colors.primary
@@ -256,7 +200,7 @@ private fun VoiceMsgIndicator(
    if (hasText) {
      IconButton({ if (!audioPlaying) play() else pause() }, Modifier.size(56.dp).drawRingModifier(angle, strokeColor, strokeWidth)) {
        Icon(
-          if (audioPlaying) painterResource(R.drawable.ic_pause_filled) else painterResource(R.drawable.ic_play_arrow_filled),
+          imageVector = if (audioPlaying) Icons.Filled.Pause else Icons.Filled.PlayArrow,
          contentDescription = null,
          Modifier.size(36.dp),
          tint = MaterialTheme.colors.primary
@@ -266,9 +210,8 @@ private fun VoiceMsgIndicator(
      PlayPauseButton(audioPlaying, sent, angle, strokeWidth, strokeColor, true, error, play, pause, longClick = longClick)
    }
  } else {
-    if (file?.fileStatus is CIFileStatus.RcvInvitation) {
-      PlayPauseButton(audioPlaying, sent, 0f, strokeWidth, strokeColor, true, error, { receiveFile(file.fileId) }, {}, longClick = longClick)
-    } else if (file?.fileStatus is CIFileStatus.RcvTransfer
+    if (file?.fileStatus is CIFileStatus.RcvInvitation
+      || file?.fileStatus is CIFileStatus.RcvTransfer
      || file?.fileStatus is CIFileStatus.RcvAccepted
    ) {
      Box(
--- a/apps/android/app/src/main/java/chat/simplex/app/views/chat/item/ChatItemView.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/chat/item/ChatItemView.kt
@@ -2,32 +2,31 @@ package chat.simplex.app.views.chat.item

 import android.Manifest
 import android.os.Build
-import androidx.compose.foundation.*
-import androidx.compose.foundation.gestures.scrollable
+import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.*
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Edit
+import androidx.compose.material.icons.outlined.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.platform.*
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
 import chat.simplex.app.*
 import chat.simplex.app.R
 import chat.simplex.app.model.*
-import chat.simplex.app.ui.theme.*
-import chat.simplex.app.views.chat.*
+import chat.simplex.app.ui.theme.HighOrLowlight
+import chat.simplex.app.ui.theme.SimpleXTheme
+import chat.simplex.app.views.chat.ComposeContextItem
+import chat.simplex.app.views.chat.ComposeState
 import chat.simplex.app.views.helpers.*
-import chat.simplex.app.views.usersettings.IncognitoView
 import com.google.accompanist.permissions.rememberPermissionState
 import kotlinx.datetime.Clock

@@ -48,9 +47,7 @@ fun ChatItemView(
  joinGroup: (Long) -> Unit,
  acceptCall: (Contact) -> Unit,
  scrollToItem: (Long) -> Unit,
-  acceptFeature: (Contact, ChatFeature, Int?) -> Unit,
-  setReaction: (ChatInfo, ChatItem, Boolean, MsgReaction) -> Unit,
-  showItemDetails: (ChatInfo, ChatItem) -> Unit,
+  acceptFeature: (Contact, ChatFeature, Int?) -> Unit
 ) {
  val context = LocalContext.current
  val uriHandler = LocalUriHandler.current
@@ -80,248 +77,197 @@ fun ChatItemView(
        else -> {}
      }
    }
+    Column(
+      Modifier
+        .clip(RoundedCornerShape(18.dp))
+        .combinedClickable(onLongClick = { showMenu.value = true }, onClick = onClick),
+    ) {
+      @Composable
+      fun framedItemView() {
+        FramedItemView(cInfo, cItem, uriHandler, imageProvider, showMember = showMember, linkMode = linkMode, showMenu, receiveFile, onLinkLongClick, scrollToItem)
+      }

-    @Composable
-    fun ChatItemReactions() {
-      Row {
-        cItem.reactions.forEach { r ->
-          var modifier = Modifier.padding(horizontal = 5.dp, vertical = 2.dp).clip(RoundedCornerShape(8.dp))
-          if (cInfo.featureEnabled(ChatFeature.Reactions) && (cItem.allowAddReaction || r.userReacted)) {
-            modifier = modifier.clickable {
-              setReaction(cInfo, cItem, !r.userReacted, r.reaction)
+      fun deleteMessageQuestionText(): String {
+        return if (fullDeleteAllowed) {
+          generalGetString(R.string.delete_message_cannot_be_undone_warning)
+        } else {
+          generalGetString(R.string.delete_message_mark_deleted_warning)
+        }
+      }
+
+      fun moderateMessageQuestionText(): String {
+        return if (fullDeleteAllowed) {
+          generalGetString(R.string.moderate_message_will_be_deleted_warning)
+        } else {
+          generalGetString(R.string.moderate_message_will_be_marked_warning)
+        }
+      }
+
+      @Composable
+      fun MsgContentItemDropdownMenu() {
+        DropdownMenu(
+          expanded = showMenu.value,
+          onDismissRequest = { showMenu.value = false },
+          Modifier.width(220.dp)
+        ) {
+          if (cItem.meta.itemDeleted == null && !live) {
+            ItemAction(stringResource(R.string.reply_verb), Icons.Outlined.Reply, onClick = {
+              if (composeState.value.editing) {
+                composeState.value = ComposeState(contextItem = ComposeContextItem.QuotedItem(cItem), useLinkPreviews = useLinkPreviews)
+              } else {
+                composeState.value = composeState.value.copy(contextItem = ComposeContextItem.QuotedItem(cItem))
+              }
+              showMenu.value = false
+            })
+          }
+          ItemAction(stringResource(R.string.share_verb), Icons.Outlined.Share, onClick = {
+            val filePath = getLoadedFilePath(SimplexApp.context, cItem.file)
+            when {
+              filePath != null -> shareFile(context, cItem.text, filePath)
+              else -> shareText(context, cItem.content.text)
+            }
+            showMenu.value = false
+          })
+          ItemAction(stringResource(R.string.copy_verb), Icons.Outlined.ContentCopy, onClick = {
+            copyText(context, cItem.content.text)
+            showMenu.value = false
+          })
+          if (cItem.content.msgContent is MsgContent.MCImage || cItem.content.msgContent is MsgContent.MCVideo || cItem.content.msgContent is MsgContent.MCFile || cItem.content.msgContent is MsgContent.MCVoice) {
+            val filePath = getLoadedFilePath(context, cItem.file)
+            if (filePath != null) {
+              val writePermissionState = rememberPermissionState(permission = Manifest.permission.WRITE_EXTERNAL_STORAGE)
+              ItemAction(stringResource(R.string.save_verb), Icons.Outlined.SaveAlt, onClick = {
+                when (cItem.content.msgContent) {
+                  is MsgContent.MCImage -> {
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R || writePermissionState.hasPermission) {
+                      saveImage(context, cItem.file)
+                    } else {
+                      writePermissionState.launchPermissionRequest()
+                    }
+                  }
+                  is MsgContent.MCFile, is MsgContent.MCVoice, is MsgContent.MCVideo -> saveFileLauncher.launch(cItem.file?.fileName)
+                  else -> {}
+                }
+                showMenu.value = false
+              })
            }
          }
-          Row(modifier.padding(2.dp)) {
-            Text(r.reaction.text, fontSize = 12.sp)
-            if (r.totalReacted > 1) {
-              Spacer(Modifier.width(4.dp))
-              Text("${r.totalReacted}",
-                fontSize = 11.5.sp,
-                fontWeight = if (r.userReacted) FontWeight.Bold else FontWeight.Normal,
-                color = if (r.userReacted) MaterialTheme.colors.primary else MaterialTheme.colors.secondary,
-              )
-            }
+          if (cItem.meta.editable && cItem.content.msgContent !is MsgContent.MCVoice && !live) {
+            ItemAction(stringResource(R.string.edit_verb), Icons.Filled.Edit, onClick = {
+              composeState.value = ComposeState(editingItem = cItem, useLinkPreviews = useLinkPreviews)
+              showMenu.value = false
+            })
+          }
+          if (cItem.meta.itemDeleted != null && revealed.value) {
+            ItemAction(
+              stringResource(R.string.hide_verb),
+              Icons.Outlined.VisibilityOff,
+              onClick = {
+                revealed.value = false
+                showMenu.value = false
+              }
+            )
+          }
+          if (cItem.meta.itemDeleted == null && cItem.file != null && cItem.file.cancellable) {
+            CancelFileItemAction(cItem.file.fileId, showMenu, cancelFile = cancelFile)
+          }
+          if (!(live && cItem.meta.isLive)) {
+            DeleteItemAction(cItem, showMenu, questionText = deleteMessageQuestionText(), deleteMessage)
+          }
+          val groupInfo = cItem.memberToModerate(cInfo)?.first
+          if (groupInfo != null) {
+            ModerateItemAction(cItem, questionText = moderateMessageQuestionText(), showMenu, deleteMessage)
          }
        }
      }
-    }

-    Column(horizontalAlignment = if (cItem.chatDir.sent) Alignment.End else Alignment.Start) {
-      Column(
-        Modifier
-          .clip(RoundedCornerShape(18.dp))
-          .combinedClickable(onLongClick = { showMenu.value = true }, onClick = onClick),
-      ) {
-        @Composable
-        fun framedItemView() {
-          FramedItemView(cInfo, cItem, uriHandler, imageProvider, showMember = showMember, linkMode = linkMode, showMenu, receiveFile, onLinkLongClick, scrollToItem)
-        }
-
-        fun deleteMessageQuestionText(): String {
-          return if (fullDeleteAllowed) {
-            generalGetString(R.string.delete_message_cannot_be_undone_warning)
-          } else {
-            generalGetString(R.string.delete_message_mark_deleted_warning)
-          }
-        }
-
-        fun moderateMessageQuestionText(): String {
-          return if (fullDeleteAllowed) {
-            generalGetString(R.string.moderate_message_will_be_deleted_warning)
-          } else {
-            generalGetString(R.string.moderate_message_will_be_marked_warning)
-          }
-        }
-
-        @Composable
-        fun MsgReactionsMenu() {
-          val rs = MsgReaction.values.mapNotNull { r ->
-            if (null == cItem.reactions.find { it.userReacted && it.reaction.text == r.text }) {
-              r
-            } else {
-              null
-            }
-          }
-          if (rs.isNotEmpty()) {
-            Row(modifier = Modifier.padding(horizontal = DEFAULT_PADDING).horizontalScroll(rememberScrollState())) {
-              rs.forEach() { r ->
-                Box(
-                  Modifier.size(36.dp).clickable {
-                    setReaction(cInfo, cItem, true, r)
-                    showMenu.value = false
-                  },
-                  contentAlignment = Alignment.Center
-                ) {
-                  Text(r.text)
-                }
-              }
-            }
-          }
-        }
-
-        @Composable
-        fun MsgContentItemDropdownMenu() {
-          DefaultDropdownMenu(showMenu) {
-            if (cInfo.featureEnabled(ChatFeature.Reactions) && cItem.allowAddReaction) {
-              MsgReactionsMenu()
-            }
-            if (cItem.meta.itemDeleted == null && !live) {
-              ItemAction(stringResource(R.string.reply_verb), painterResource(R.drawable.ic_reply), onClick = {
-                if (composeState.value.editing) {
-                  composeState.value = ComposeState(contextItem = ComposeContextItem.QuotedItem(cItem), useLinkPreviews = useLinkPreviews)
-                } else {
-                  composeState.value = composeState.value.copy(contextItem = ComposeContextItem.QuotedItem(cItem))
-                }
+      @Composable
+      fun MarkedDeletedItemDropdownMenu() {
+        DropdownMenu(
+          expanded = showMenu.value,
+          onDismissRequest = { showMenu.value = false },
+          Modifier.width(220.dp)
+        ) {
+          if (!cItem.isDeletedContent) {
+            ItemAction(
+              stringResource(R.string.reveal_verb),
+              Icons.Outlined.Visibility,
+              onClick = {
+                revealed.value = true
                showMenu.value = false
-              })
-            }
-            ItemAction(stringResource(R.string.share_verb), painterResource(R.drawable.ic_share), onClick = {
-              val filePath = getLoadedFilePath(SimplexApp.context, cItem.file)
-              when {
-                filePath != null -> shareFile(context, cItem.text, filePath)
-                else -> shareText(context, cItem.content.text)
              }
-              showMenu.value = false
-            })
-            ItemAction(stringResource(R.string.copy_verb), painterResource(R.drawable.ic_content_copy), onClick = {
-              copyText(context, cItem.content.text)
-              showMenu.value = false
-            })
-            if (cItem.content.msgContent is MsgContent.MCImage || cItem.content.msgContent is MsgContent.MCVideo || cItem.content.msgContent is MsgContent.MCFile || cItem.content.msgContent is MsgContent.MCVoice) {
-              val filePath = getLoadedFilePath(context, cItem.file)
-              if (filePath != null) {
-                val writePermissionState = rememberPermissionState(permission = Manifest.permission.WRITE_EXTERNAL_STORAGE)
-                ItemAction(stringResource(R.string.save_verb), painterResource(R.drawable.ic_download), onClick = {
-                  when (cItem.content.msgContent) {
-                    is MsgContent.MCImage -> {
-                      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R || writePermissionState.hasPermission) {
-                        saveImage(context, cItem.file)
-                      } else {
-                        writePermissionState.launchPermissionRequest()
-                      }
-                    }
-                    is MsgContent.MCFile, is MsgContent.MCVoice, is MsgContent.MCVideo -> saveFileLauncher.launch(cItem.file?.fileName)
-                    else -> {}
-                  }
-                  showMenu.value = false
-                })
-              }
-            }
-            if (cItem.meta.editable && cItem.content.msgContent !is MsgContent.MCVoice && !live) {
-              ItemAction(stringResource(R.string.edit_verb), painterResource(R.drawable.ic_edit_filled), onClick = {
-                composeState.value = ComposeState(editingItem = cItem, useLinkPreviews = useLinkPreviews)
-                showMenu.value = false
-              })
-            }
-            if (cItem.meta.itemDeleted != null && revealed.value) {
-              ItemAction(
-                stringResource(R.string.hide_verb),
-                painterResource(R.drawable.ic_visibility_off),
-                onClick = {
-                  revealed.value = false
-                  showMenu.value = false
-                }
-              )
-            }
-            if (cItem.meta.itemDeleted == null && cItem.file != null && cItem.file.cancelAction != null) {
-              CancelFileItemAction(cItem.file.fileId, showMenu, cancelFile = cancelFile, cancelAction = cItem.file.cancelAction)
-            }
-            ItemInfoAction(cInfo, cItem, showItemDetails, showMenu)
-            if (!(live && cItem.meta.isLive)) {
-              DeleteItemAction(cItem, showMenu, questionText = deleteMessageQuestionText(), deleteMessage)
-            }
-            val groupInfo = cItem.memberToModerate(cInfo)?.first
-            if (groupInfo != null) {
-              ModerateItemAction(cItem, questionText = moderateMessageQuestionText(), showMenu, deleteMessage)
-            }
+            )
          }
+          DeleteItemAction(cItem, showMenu, questionText = deleteMessageQuestionText(), deleteMessage)
        }
+      }

-        @Composable
-        fun MarkedDeletedItemDropdownMenu() {
-          DefaultDropdownMenu(showMenu) {
-            if (!cItem.isDeletedContent) {
-              ItemAction(
-                stringResource(R.string.reveal_verb),
-                painterResource(R.drawable.ic_visibility),
-                onClick = {
-                  revealed.value = true
-                  showMenu.value = false
-                }
-              )
-              ItemInfoAction(cInfo, cItem, showItemDetails, showMenu)
-            }
-            DeleteItemAction(cItem, showMenu, questionText = deleteMessageQuestionText(), deleteMessage)
-          }
-        }
-
-        @Composable
-        fun ContentItem() {
-          val mc = cItem.content.msgContent
-          if (cItem.meta.itemDeleted != null && !revealed.value) {
-            MarkedDeletedItemView(cItem, cInfo.timedMessagesTTL, showMember = showMember)
-            MarkedDeletedItemDropdownMenu()
+      @Composable
+      fun ContentItem() {
+        val mc = cItem.content.msgContent
+        if (cItem.meta.itemDeleted != null && !revealed.value) {
+          MarkedDeletedItemView(cItem, cInfo.timedMessagesTTL, showMember = showMember)
+          MarkedDeletedItemDropdownMenu()
+        } else if (cItem.quotedItem == null && cItem.meta.itemDeleted == null && !cItem.meta.isLive) {
+          if (mc is MsgContent.MCText && isShortEmoji(cItem.content.text)) {
+            EmojiItemView(cItem, cInfo.timedMessagesTTL)
+            MsgContentItemDropdownMenu()
+          } else if (mc is MsgContent.MCVoice && cItem.content.text.isEmpty()) {
+            CIVoiceView(mc.duration, cItem.file, cItem.meta.itemEdited, cItem.chatDir.sent, hasText = false, cItem, cInfo.timedMessagesTTL, longClick = { onLinkLongClick("") })
+            MsgContentItemDropdownMenu()
          } else {
-            if (cItem.quotedItem == null && cItem.meta.itemDeleted == null && !cItem.meta.isLive) {
-              if (mc is MsgContent.MCText && isShortEmoji(cItem.content.text)) {
-                EmojiItemView(cItem, cInfo.timedMessagesTTL)
-              } else if (mc is MsgContent.MCVoice && cItem.content.text.isEmpty()) {
-                CIVoiceView(mc.duration, cItem.file, cItem.meta.itemEdited, cItem.chatDir.sent, hasText = false, cItem, cInfo.timedMessagesTTL, longClick = { onLinkLongClick("") }, receiveFile)
-              } else {
-                framedItemView()
-              }
-            } else {
-              framedItemView()
-            }
+            framedItemView()
            MsgContentItemDropdownMenu()
          }
-        }
-
-        @Composable fun DeletedItem() {
-          DeletedItemView(cItem, cInfo.timedMessagesTTL, showMember = showMember)
-          DefaultDropdownMenu(showMenu) {
-            DeleteItemAction(cItem, showMenu, questionText = deleteMessageQuestionText(), deleteMessage)
-          }
-        }
-
-        @Composable fun CallItem(status: CICallStatus, duration: Int) {
-          CICallItemView(cInfo, cItem, status, duration, acceptCall)
-        }
-
-        when (val c = cItem.content) {
-          is CIContent.SndMsgContent -> ContentItem()
-          is CIContent.RcvMsgContent -> ContentItem()
-          is CIContent.SndDeleted -> DeletedItem()
-          is CIContent.RcvDeleted -> DeletedItem()
-          is CIContent.SndCall -> CallItem(c.status, c.duration)
-          is CIContent.RcvCall -> CallItem(c.status, c.duration)
-          is CIContent.RcvIntegrityError -> IntegrityErrorItemView(c.msgError, cItem, cInfo.timedMessagesTTL, showMember = showMember)
-          is CIContent.RcvDecryptionError -> CIRcvDecryptionError(c.msgDecryptError, c.msgCount, cItem, cInfo.timedMessagesTTL, showMember = showMember)
-          is CIContent.RcvGroupInvitation -> CIGroupInvitationView(cItem, c.groupInvitation, c.memberRole, joinGroup = joinGroup, chatIncognito = cInfo.incognito)
-          is CIContent.SndGroupInvitation -> CIGroupInvitationView(cItem, c.groupInvitation, c.memberRole, joinGroup = joinGroup, chatIncognito = cInfo.incognito)
-          is CIContent.RcvGroupEventContent -> CIEventView(cItem)
-          is CIContent.SndGroupEventContent -> CIEventView(cItem)
-          is CIContent.RcvConnEventContent -> CIEventView(cItem)
-          is CIContent.SndConnEventContent -> CIEventView(cItem)
-          is CIContent.RcvChatFeature -> CIChatFeatureView(cItem, c.feature, c.enabled.iconColor)
-          is CIContent.SndChatFeature -> CIChatFeatureView(cItem, c.feature, c.enabled.iconColor)
-          is CIContent.RcvChatPreference -> {
-            val ct = if (cInfo is ChatInfo.Direct) cInfo.contact else null
-            CIFeaturePreferenceView(cItem, ct, c.feature, c.allowed, acceptFeature)
-          }
-          is CIContent.SndChatPreference -> CIChatFeatureView(cItem, c.feature, MaterialTheme.colors.secondary, icon = c.feature.icon,)
-          is CIContent.RcvGroupFeature -> CIChatFeatureView(cItem, c.groupFeature, c.preference.enable.iconColor)
-          is CIContent.SndGroupFeature -> CIChatFeatureView(cItem, c.groupFeature, c.preference.enable.iconColor)
-          is CIContent.RcvChatFeatureRejected -> CIChatFeatureView(cItem, c.feature, Color.Red)
-          is CIContent.RcvGroupFeatureRejected -> CIChatFeatureView(cItem, c.groupFeature, Color.Red)
-          is CIContent.SndModerated -> MarkedDeletedItemView(cItem, cInfo.timedMessagesTTL, showMember = showMember)
-          is CIContent.RcvModerated -> MarkedDeletedItemView(cItem, cInfo.timedMessagesTTL, showMember = showMember)
-          is CIContent.InvalidJSON -> CIInvalidJSONView(c.json)
+        } else {
+          framedItemView()
+          MsgContentItemDropdownMenu()
        }
      }

-      if (cItem.content.msgContent != null && (cItem.meta.itemDeleted == null || revealed.value) && cItem.reactions.isNotEmpty()) {
-        ChatItemReactions()
+      @Composable fun DeletedItem() {
+        DeletedItemView(cItem, cInfo.timedMessagesTTL, showMember = showMember)
+        DropdownMenu(
+          expanded = showMenu.value,
+          onDismissRequest = { showMenu.value = false },
+          Modifier.width(220.dp)
+        ) {
+          DeleteItemAction(cItem, showMenu, questionText = deleteMessageQuestionText(), deleteMessage)
+        }
+      }
+
+      @Composable fun CallItem(status: CICallStatus, duration: Int) {
+        CICallItemView(cInfo, cItem, status, duration, acceptCall)
+      }
+
+      when (val c = cItem.content) {
+        is CIContent.SndMsgContent -> ContentItem()
+        is CIContent.RcvMsgContent -> ContentItem()
+        is CIContent.SndDeleted -> DeletedItem()
+        is CIContent.RcvDeleted -> DeletedItem()
+        is CIContent.SndCall -> CallItem(c.status, c.duration)
+        is CIContent.RcvCall -> CallItem(c.status, c.duration)
+        is CIContent.RcvIntegrityError -> IntegrityErrorItemView(cItem, cInfo.timedMessagesTTL, showMember = showMember)
+        is CIContent.RcvGroupInvitation -> CIGroupInvitationView(cItem, c.groupInvitation, c.memberRole, joinGroup = joinGroup, chatIncognito = cInfo.incognito)
+        is CIContent.SndGroupInvitation -> CIGroupInvitationView(cItem, c.groupInvitation, c.memberRole, joinGroup = joinGroup, chatIncognito = cInfo.incognito)
+        is CIContent.RcvGroupEventContent -> CIEventView(cItem)
+        is CIContent.SndGroupEventContent -> CIEventView(cItem)
+        is CIContent.RcvConnEventContent -> CIEventView(cItem)
+        is CIContent.SndConnEventContent -> CIEventView(cItem)
+        is CIContent.RcvChatFeature -> CIChatFeatureView(cItem, c.feature, c.enabled.iconColor)
+        is CIContent.SndChatFeature -> CIChatFeatureView(cItem, c.feature, c.enabled.iconColor)
+        is CIContent.RcvChatPreference -> {
+          val ct = if (cInfo is ChatInfo.Direct) cInfo.contact else null
+          CIFeaturePreferenceView(cItem, ct, c.feature, c.allowed, acceptFeature)
+        }
+        is CIContent.SndChatPreference -> CIChatFeatureView(cItem, c.feature, HighOrLowlight, icon = c.feature.icon,)
+        is CIContent.RcvGroupFeature -> CIChatFeatureView(cItem, c.groupFeature, c.preference.enable.iconColor)
+        is CIContent.SndGroupFeature -> CIChatFeatureView(cItem, c.groupFeature, c.preference.enable.iconColor)
+        is CIContent.RcvChatFeatureRejected -> CIChatFeatureView(cItem, c.feature, Color.Red)
+        is CIContent.RcvGroupFeatureRejected -> CIChatFeatureView(cItem, c.groupFeature, Color.Red)
+        is CIContent.SndModerated -> MarkedDeletedItemView(cItem, cInfo.timedMessagesTTL, showMember = showMember)
+        is CIContent.RcvModerated -> MarkedDeletedItemView(cItem, cInfo.timedMessagesTTL, showMember = showMember)
+        is CIContent.InvalidJSON -> CIInvalidJSONView(c.json)
      }
    }
  }
@@ -331,38 +277,19 @@ fun ChatItemView(
 fun CancelFileItemAction(
  fileId: Long,
  showMenu: MutableState<Boolean>,
-  cancelFile: (Long) -> Unit,
-  cancelAction: CancelAction
+  cancelFile: (Long) -> Unit
 ) {
  ItemAction(
-    stringResource(cancelAction.uiActionId),
-    painterResource(R.drawable.ic_close),
+    stringResource(R.string.cancel_verb),
+    Icons.Outlined.Close,
    onClick = {
      showMenu.value = false
-      cancelFileAlertDialog(fileId, cancelFile = cancelFile, cancelAction = cancelAction)
+      cancelFileAlertDialog(fileId, cancelFile = cancelFile)
    },
    color = Color.Red
  )
 }

-@Composable
-fun ItemInfoAction(
-  cInfo: ChatInfo,
-  cItem: ChatItem,
-  showItemDetails: (ChatInfo, ChatItem) -> Unit,
-  showMenu: MutableState<Boolean>
-) {
-  ItemAction(
-    stringResource(R.string.info_menu),
-    painterResource(R.drawable.ic_info),
-    onClick = {
-      showItemDetails(cInfo, cItem)
-      showMenu.value = false
-    }
-  )
-}
-
-
@Composable
 fun DeleteItemAction(
  cItem: ChatItem,
@@ -372,7 +299,7 @@ fun DeleteItemAction(
 ) {
  ItemAction(
    stringResource(R.string.delete_verb),
-    painterResource(R.drawable.ic_delete),
+    Icons.Outlined.Delete,
    onClick = {
      showMenu.value = false
      deleteMessageAlertDialog(cItem, questionText, deleteMessage = deleteMessage)
@@ -390,7 +317,7 @@ fun ModerateItemAction(
 ) {
  ItemAction(
    stringResource(R.string.moderate_verb),
-    painterResource(R.drawable.ic_flag),
+    Icons.Outlined.Flag,
    onClick = {
      showMenu.value = false
      moderateMessageAlertDialog(cItem, questionText, deleteMessage = deleteMessage)
@@ -400,50 +327,27 @@ fun ModerateItemAction(
 }

@Composable
-fun ItemAction(text: String, icon: Painter, onClick: () -> Unit, color: Color = Color.Unspecified) {
-  val finalColor = if (color == Color.Unspecified) {
-    if (isInDarkTheme()) MenuTextColorDark else Color.Black
-  } else color
-  DropdownMenuItem(onClick, contentPadding = PaddingValues(horizontal = DEFAULT_PADDING * 1.5f)) {
-    Row(verticalAlignment = Alignment.CenterVertically) {
+fun ItemAction(text: String, icon: ImageVector, onClick: () -> Unit, color: Color = MaterialTheme.colors.onBackground) {
+  DropdownMenuItem(onClick) {
+    Row {
      Text(
        text,
        modifier = Modifier
          .fillMaxWidth()
          .weight(1F)
          .padding(end = 15.dp),
-        color = finalColor
+        color = color
      )
-      Icon(icon, text, tint = finalColor)
+      Icon(icon, text, tint = color)
    }
  }
 }

-@Composable
-fun ItemAction(text: String, icon: ImageVector, onClick: () -> Unit, color: Color = Color.Unspecified) {
-  val finalColor = if (color == Color.Unspecified) {
-    if (isInDarkTheme()) MenuTextColorDark else Color.Black
-  } else color
-  DropdownMenuItem(onClick, contentPadding = PaddingValues(horizontal = DEFAULT_PADDING * 1.5f)) {
-    Row(verticalAlignment = Alignment.CenterVertically) {
-      Text(
-        text,
-        modifier = Modifier
-          .fillMaxWidth()
-          .weight(1F)
-          .padding(end = 15.dp),
-        color = finalColor
-      )
-      Icon(icon, text, tint = finalColor)
-    }
-  }
-}
-
-fun cancelFileAlertDialog(fileId: Long, cancelFile: (Long) -> Unit, cancelAction: CancelAction) {
+fun cancelFileAlertDialog(fileId: Long, cancelFile: (Long) -> Unit) {
  AlertManager.shared.showAlertDialog(
-    title = generalGetString(cancelAction.alert.titleId),
-    text = generalGetString(cancelAction.alert.messageId),
-    confirmText = generalGetString(cancelAction.alert.confirmId),
+    title = generalGetString(R.string.cancel_file__question),
+    text = generalGetString(R.string.file_transfer_will_be_cancelled_warning),
+    confirmText = generalGetString(R.string.confirm_verb),
    destructive = true,
    onConfirm = {
      cancelFile(fileId)
@@ -460,18 +364,18 @@ fun deleteMessageAlertDialog(chatItem: ChatItem, questionText: String, deleteMes
        Modifier
          .fillMaxWidth()
          .padding(horizontal = 8.dp, vertical = 2.dp),
-        horizontalArrangement = Arrangement.Center,
+        horizontalArrangement = Arrangement.End,
      ) {
        TextButton(onClick = {
          deleteMessage(chatItem.id, CIDeleteMode.cidmInternal)
          AlertManager.shared.hideAlert()
-        }) { Text(stringResource(R.string.for_me_only), color = MaterialTheme.colors.error) }
+        }) { Text(stringResource(R.string.for_me_only)) }
        if (chatItem.meta.editable) {
          Spacer(Modifier.padding(horizontal = 4.dp))
          TextButton(onClick = {
            deleteMessage(chatItem.id, CIDeleteMode.cidmBroadcast)
            AlertManager.shared.hideAlert()
-          }) { Text(stringResource(R.string.for_everybody), color = MaterialTheme.colors.error) }
+          }) { Text(stringResource(R.string.for_everybody)) }
        }
      }
    }
@@ -515,9 +419,7 @@ fun PreviewChatItemView() {
      joinGroup = {},
      acceptCall = { _ -> },
      scrollToItem = {},
-      acceptFeature = { _, _, _ -> },
-      setReaction = { _, _, _, _ -> },
-      showItemDetails = { _, _ -> },
+      acceptFeature = { _, _, _ -> }
    )
  }
 }
@@ -538,9 +440,7 @@ fun PreviewChatItemViewDeletedContent() {
      joinGroup = {},
      acceptCall = { _ -> },
      scrollToItem = {},
-      acceptFeature = { _, _, _ -> },
-      setReaction = { _, _, _, _ -> },
-      showItemDetails = { _, _ -> },
+      acceptFeature = { _, _, _ -> }
    )
  }
 }
--- a/apps/android/app/src/main/java/chat/simplex/app/views/chat/item/DeletedItemView.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/chat/item/DeletedItemView.kt
@@ -5,7 +5,6 @@ import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.*
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.*
@@ -14,16 +13,15 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import chat.simplex.app.model.ChatItem
-import chat.simplex.app.ui.theme.*
+import chat.simplex.app.ui.theme.HighOrLowlight
+import chat.simplex.app.ui.theme.SimpleXTheme

@Composable
 fun DeletedItemView(ci: ChatItem, timedMessagesTTL: Int?, showMember: Boolean = false) {
  val sent = ci.chatDir.sent
-  val sentColor = CurrentColors.collectAsState().value.appColors.sentMessage
-  val receivedColor = CurrentColors.collectAsState().value.appColors.receivedMessage
  Surface(
    shape = RoundedCornerShape(18.dp),
-    color = if (sent) sentColor else receivedColor,
+    color = if (sent) SentColorLight else ReceivedColorLight,
  ) {
    Row(
      Modifier.padding(horizontal = 12.dp, vertical = 6.dp),
@@ -32,7 +30,7 @@ fun DeletedItemView(ci: ChatItem, timedMessagesTTL: Int?, showMember: Boolean =
      Text(
        buildAnnotatedString {
          appendSender(this, if (showMember) ci.memberDisplayName else null, true)
-          withStyle(SpanStyle(fontStyle = FontStyle.Italic, color = MaterialTheme.colors.secondary)) { append(ci.content.text) }
+          withStyle(SpanStyle(fontStyle = FontStyle.Italic, color = HighOrLowlight)) { append(ci.content.text) }
        },
        style = MaterialTheme.typography.body1.copy(lineHeight = 22.sp),
        modifier = Modifier.padding(end = 8.dp)
--- a/apps/android/app/src/main/java/chat/simplex/app/views/chat/item/FramedItemView.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/chat/item/FramedItemView.kt
@@ -4,6 +4,10 @@ import androidx.compose.foundation.*
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.*
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.*
+import androidx.compose.material.icons.outlined.Delete
+import androidx.compose.material.icons.outlined.Flag
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -11,10 +15,9 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.draw.clipToBounds
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.asImageBitmap
-import androidx.compose.ui.graphics.painter.Painter
+import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.layout.*
 import androidx.compose.ui.platform.UriHandler
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.*
 import androidx.compose.ui.text.font.FontStyle
@@ -29,6 +32,11 @@ import chat.simplex.app.views.helpers.*
 import kotlinx.datetime.Clock
 import kotlin.math.min

+val SentColorLight = Color(0x1E45B8FF)
+val ReceivedColorLight = Color(0x20B1B0B5)
+val SentQuoteColorLight = Color(0x2545B8FF)
+val ReceivedQuoteColorLight = Color(0x25B1B0B5)
+
@Composable
 fun FramedItemView(
  chatInfo: ChatInfo,
@@ -49,9 +57,6 @@ fun FramedItemView(
    return if (chatInfo is ChatInfo.Group) chatInfo.groupInfo.membership else null
  }

-  @Composable
-  fun Color.toQuote(): Color = if (isInDarkTheme()) lighter(0.12f) else darker(0.12f)
-
  @Composable
  fun ciQuotedMsgView(qi: CIQuote) {
    Box(
@@ -67,12 +72,10 @@ fun FramedItemView(
  }

  @Composable
-  fun FramedItemHeader(caption: String, italic: Boolean, icon: Painter? = null) {
-    val sentColor = CurrentColors.collectAsState().value.appColors.sentMessage
-    val receivedColor = CurrentColors.collectAsState().value.appColors.receivedMessage
+  fun FramedItemHeader(caption: String, italic: Boolean, icon: ImageVector? = null) {
    Row(
      Modifier
-        .background(if (sent) sentColor.toQuote() else receivedColor.toQuote())
+        .background(if (sent) SentQuoteColorLight else ReceivedQuoteColorLight)
        .fillMaxWidth()
        .padding(start = 8.dp, top = 6.dp, end = 12.dp, bottom = if (ci.quotedItem == null) 6.dp else 0.dp),
      horizontalArrangement = Arrangement.spacedBy(4.dp),
@@ -87,7 +90,7 @@ fun FramedItemView(
      }
      Text(
        buildAnnotatedString {
-          withStyle(SpanStyle(fontSize = 12.sp, fontStyle = if (italic) FontStyle.Italic else FontStyle.Normal, color = MaterialTheme.colors.secondary)) {
+          withStyle(SpanStyle(fontSize = 12.sp, fontStyle = if (italic) FontStyle.Italic else FontStyle.Normal, color = HighOrLowlight)) {
            append(caption)
          }
        },
@@ -100,11 +103,9 @@ fun FramedItemView(

  @Composable
  fun ciQuoteView(qi: CIQuote) {
-    val sentColor = CurrentColors.collectAsState().value.appColors.sentMessage
-    val receivedColor = CurrentColors.collectAsState().value.appColors.receivedMessage
    Row(
      Modifier
-        .background(if (sent) sentColor.toQuote() else receivedColor.toQuote())
+        .background(if (sent) SentQuoteColorLight else ReceivedQuoteColorLight)
        .fillMaxWidth()
        .combinedClickable(
          onLongClick = { showMenu.value = true },
@@ -141,7 +142,7 @@ fun FramedItemView(
            ciQuotedMsgView(qi)
          }
          Icon(
-            if (qi.content is MsgContent.MCFile) painterResource(R.drawable.ic_draft_filled) else painterResource(R.drawable.ic_mic_filled),
+            if (qi.content is MsgContent.MCFile) Icons.Filled.InsertDriveFile else Icons.Filled.Mic,
            if (qi.content is MsgContent.MCFile) stringResource(R.string.icon_descr_file) else stringResource(R.string.voice_message),
            Modifier
              .padding(top = 6.dp, end = 4.dp)
@@ -165,26 +166,24 @@ fun FramedItemView(
  val transparentBackground = (ci.content.msgContent is MsgContent.MCImage || ci.content.msgContent is MsgContent.MCVideo) &&
      !ci.meta.isLive && ci.content.text.isEmpty() && ci.quotedItem == null

-  val sentColor = CurrentColors.collectAsState().value.appColors.sentMessage
-  val receivedColor = CurrentColors.collectAsState().value.appColors.receivedMessage
  Box(Modifier
    .clip(RoundedCornerShape(18.dp))
    .background(
      when {
        transparentBackground -> Color.Transparent
-        sent -> sentColor
-        else -> receivedColor
+        sent -> SentColorLight
+        else -> ReceivedColorLight
      }
    )) {
-    var metaColor = MaterialTheme.colors.secondary
+    var metaColor = HighOrLowlight
    Box(contentAlignment = Alignment.BottomEnd) {
      Column(Modifier.width(IntrinsicSize.Max)) {
        PriorityLayout(Modifier, CHAT_IMAGE_LAYOUT_ID) {
          if (ci.meta.itemDeleted != null) {
            if (ci.meta.itemDeleted is CIDeleted.Moderated) {
-              FramedItemHeader(String.format(stringResource(R.string.moderated_item_description), ci.meta.itemDeleted.byGroupMember.chatViewName), true, painterResource(R.drawable.ic_flag))
+              FramedItemHeader(String.format(stringResource(R.string.moderated_item_description), ci.meta.itemDeleted.byGroupMember.chatViewName), true, Icons.Outlined.Flag)
            } else {
-              FramedItemHeader(stringResource(R.string.marked_deleted_description), true, painterResource(R.drawable.ic_delete))
+              FramedItemHeader(stringResource(R.string.marked_deleted_description), true, Icons.Outlined.Delete)
            }
          } else if (ci.meta.isLive) {
            FramedItemHeader(stringResource(R.string.live), false)
@@ -221,7 +220,7 @@ fun FramedItemView(
                }
              }
              is MsgContent.MCVoice -> {
-                CIVoiceView(mc.duration, ci.file, ci.meta.itemEdited, ci.chatDir.sent, hasText = true, ci, timedMessagesTTL = chatTTL, longClick = { onLinkLongClick("") }, receiveFile)
+                CIVoiceView(mc.duration, ci.file, ci.meta.itemEdited, ci.chatDir.sent, hasText = true, ci, timedMessagesTTL = chatTTL, longClick = { onLinkLongClick("") })
                if (mc.text != "") {
                  CIMarkdownText(ci, chatTTL, showMember, linkMode, uriHandler)
                }
--- a/apps/android/app/src/main/java/chat/simplex/app/views/chat/item/IntegrityErrorItemView.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/chat/item/IntegrityErrorItemView.kt
@@ -7,7 +7,6 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.*
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
@@ -18,45 +17,21 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import chat.simplex.app.R
 import chat.simplex.app.model.ChatItem
-import chat.simplex.app.model.MsgErrorType
-import chat.simplex.app.ui.theme.CurrentColors
 import chat.simplex.app.ui.theme.SimpleXTheme
 import chat.simplex.app.views.helpers.AlertManager
 import chat.simplex.app.views.helpers.generalGetString

@Composable
-fun IntegrityErrorItemView(msgError: MsgErrorType, ci: ChatItem, timedMessagesTTL: Int?, showMember: Boolean = false) {
-  CIMsgError(ci, timedMessagesTTL, showMember) {
-    when (msgError) {
-      is MsgErrorType.MsgSkipped ->
-        AlertManager.shared.showAlertMsg(
-          title = generalGetString(R.string.alert_title_skipped_messages),
-          text = generalGetString(R.string.alert_text_skipped_messages_it_can_happen_when)
-        )
-      is MsgErrorType.MsgBadHash ->
-        AlertManager.shared.showAlertMsg(
-          title = generalGetString(R.string.alert_title_msg_bad_hash),
-          text = generalGetString(R.string.alert_text_msg_bad_hash) + "\n" +
-              generalGetString(R.string.alert_text_fragment_encryption_out_of_sync_old_database) + "\n" +
-              generalGetString(R.string.alert_text_fragment_please_report_to_developers)
-        )
-      is MsgErrorType.MsgBadId, is MsgErrorType.MsgDuplicate ->
-        AlertManager.shared.showAlertMsg(
-          title = generalGetString(R.string.alert_title_msg_bad_id),
-          text = generalGetString(R.string.alert_text_msg_bad_id) + "\n" +
-              generalGetString(R.string.alert_text_fragment_please_report_to_developers)
-        )
-    }
-  }
-}
-
-@Composable
-fun CIMsgError(ci: ChatItem, timedMessagesTTL: Int?, showMember: Boolean = false, onClick: () -> Unit) {
-  val receivedColor = CurrentColors.collectAsState().value.appColors.receivedMessage
+fun IntegrityErrorItemView(ci: ChatItem, timedMessagesTTL: Int?, showMember: Boolean = false) {
  Surface(
-    Modifier.clickable(onClick = onClick),
+    Modifier.clickable(onClick = {
+      AlertManager.shared.showAlertMsg(
+        title = generalGetString(R.string.alert_title_skipped_messages),
+        text = generalGetString(R.string.alert_text_skipped_messages_it_can_happen_when)
+      )
+    }),
    shape = RoundedCornerShape(18.dp),
-    color = receivedColor,
+    color = ReceivedColorLight,
  ) {
    Row(
      Modifier.padding(horizontal = 12.dp, vertical = 6.dp),
@@ -84,7 +59,6 @@ fun CIMsgError(ci: ChatItem, timedMessagesTTL: Int?, showMember: Boolean = false
 fun IntegrityErrorItemViewPreview() {
  SimpleXTheme {
    IntegrityErrorItemView(
-      MsgErrorType.MsgBadHash(),
      ChatItem.getDeletedContentSampleData(),
      null
    )
--- a/apps/android/app/src/main/java/chat/simplex/app/views/chat/item/MarkedDeletedItemView.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/chat/item/MarkedDeletedItemView.kt
@@ -5,7 +5,6 @@ import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.*
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.*
@@ -17,17 +16,15 @@ import androidx.compose.ui.unit.sp
 import chat.simplex.app.R
 import chat.simplex.app.model.CIDeleted
 import chat.simplex.app.model.ChatItem
-import chat.simplex.app.ui.theme.*
+import chat.simplex.app.ui.theme.HighOrLowlight
+import chat.simplex.app.ui.theme.SimpleXTheme
 import chat.simplex.app.views.helpers.generalGetString
-import kotlinx.datetime.Clock

@Composable
 fun MarkedDeletedItemView(ci: ChatItem, timedMessagesTTL: Int?, showMember: Boolean = false) {
-  val sentColor = CurrentColors.collectAsState().value.appColors.sentMessage
-  val receivedColor = CurrentColors.collectAsState().value.appColors.receivedMessage
  Surface(
    shape = RoundedCornerShape(18.dp),
-    color = if (ci.chatDir.sent) sentColor else receivedColor,
+    color = if (ci.chatDir.sent) SentColorLight else ReceivedColorLight,
  ) {
    Row(
      Modifier.padding(horizontal = 12.dp, vertical = 6.dp),
@@ -50,7 +47,7 @@ private fun MarkedDeletedText(text: String) {
  Text(
    buildAnnotatedString {
      // appendSender(this, if (showMember) ci.memberDisplayName else null, true) // TODO font size
-      withStyle(SpanStyle(fontSize = 12.sp, fontStyle = FontStyle.Italic, color = MaterialTheme.colors.secondary)) { append(text) }
+      withStyle(SpanStyle(fontSize = 12.sp, fontStyle = FontStyle.Italic, color = HighOrLowlight)) { append(text) }
    },
    style = MaterialTheme.typography.body1.copy(lineHeight = 22.sp),
    modifier = Modifier.padding(end = 8.dp),
@@ -68,7 +65,7 @@ private fun MarkedDeletedText(text: String) {
 fun PreviewMarkedDeletedItemView() {
  SimpleXTheme {
    DeletedItemView(
-      ChatItem.getSampleData(itemDeleted = CIDeleted.Deleted(Clock.System.now())),
+      ChatItem.getSampleData(itemDeleted = CIDeleted.Deleted()),
      null
    )
  }
--- a/apps/android/app/src/main/java/chat/simplex/app/views/chat/item/TextItemView.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/chat/item/TextItemView.kt
@@ -22,7 +22,7 @@ import androidx.compose.ui.unit.*
 import androidx.core.text.BidiFormatter
 import chat.simplex.app.TAG
 import chat.simplex.app.model.*
-import chat.simplex.app.ui.theme.CurrentColors
+import chat.simplex.app.ui.theme.HighOrLowlight
 import chat.simplex.app.views.helpers.detectGesture
 import kotlinx.coroutines.*

@@ -57,7 +57,7 @@ private val typingIndicators: List<AnnotatedString> = listOf(


 private fun typingIndicator(recent: Boolean, @IntRange (from = 0, to = 4) typingIdx: Int): AnnotatedString = buildAnnotatedString {
-  pushStyle(SpanStyle(color = CurrentColors.value.colors.secondary, fontFamily = FontFamily.Monospace, letterSpacing = (-1).sp))
+  pushStyle(SpanStyle(color = HighOrLowlight, fontFamily = FontFamily.Monospace, letterSpacing = (-1).sp))
  append(if (recent) typingIndicators[typingIdx] else noTyping)
 }

@@ -228,7 +228,7 @@ fun ClickableText(
        }
      }
    }, shouldConsumeEvent = { pos ->
-        var consume = false
+      var consume = false
        layoutResult.value?.let { layoutResult ->
          consume = shouldConsumeEvent(layoutResult.getOffsetForPosition(pos))
        }
--- a/apps/android/app/src/main/java/chat/simplex/app/views/chatlist/ChatHelpView.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/chatlist/ChatHelpView.kt
@@ -4,10 +4,12 @@ import android.content.res.Configuration
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.*
-import androidx.compose.ui.res.painterResource
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.PersonAdd
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.SpanStyle
 import androidx.compose.ui.text.font.FontWeight
@@ -17,7 +19,7 @@ import androidx.compose.ui.unit.sp
 import chat.simplex.app.R
 import chat.simplex.app.ui.theme.SimpleXTheme
 import chat.simplex.app.views.helpers.annotatedStringResource
-import chat.simplex.app.views.onboarding.ReadableTextWithLink
+import chat.simplex.app.views.helpers.openUriCatching
 import chat.simplex.app.views.usersettings.MarkdownHelpView
 import chat.simplex.app.views.usersettings.simplexTeamUri

@@ -26,12 +28,23 @@ val bold = SpanStyle(fontWeight = FontWeight.Bold)
@Composable
 fun ChatHelpView(addContact: (() -> Unit)? = null) {
  Column(
+    horizontalAlignment = Alignment.Start,
    verticalArrangement = Arrangement.spacedBy(10.dp)
  ) {
+    val uriHandler = LocalUriHandler.current
+
    Text(stringResource(R.string.thank_you_for_installing_simplex), lineHeight = 22.sp)
-    ReadableTextWithLink(R.string.you_can_connect_to_simplex_chat_founder, simplexTeamUri)
+    Text(
+      annotatedStringResource(R.string.you_can_connect_to_simplex_chat_founder),
+      modifier = Modifier.clickable(onClick = {
+        uriHandler.openUriCatching(simplexTeamUri)
+      }),
+      lineHeight = 22.sp
+    )
+
    Column(
      Modifier.padding(top = 24.dp),
+      horizontalAlignment = Alignment.Start,
      verticalArrangement = Arrangement.spacedBy(10.dp)
    ) {
      Text(
@@ -45,7 +58,7 @@ fun ChatHelpView(addContact: (() -> Unit)? = null) {
      ) {
        Text(stringResource(R.string.chat_help_tap_button))
        Icon(
-          painterResource(R.drawable.ic_person_add),
+          Icons.Outlined.PersonAdd,
          stringResource(R.string.add_contact),
          modifier = if (addContact != null) Modifier.clickable(onClick = addContact) else Modifier,
        )
@@ -57,6 +70,7 @@ fun ChatHelpView(addContact: (() -> Unit)? = null) {

    Column(
      Modifier.padding(top = 24.dp),
+      horizontalAlignment = Alignment.Start,
      verticalArrangement = Arrangement.spacedBy(10.dp)
    ) {
      Text(stringResource(R.string.to_connect_via_link_title), style = MaterialTheme.typography.h2)
@@ -67,6 +81,7 @@ fun ChatHelpView(addContact: (() -> Unit)? = null) {

    Column(
      Modifier.padding(vertical = 24.dp),
+      horizontalAlignment = Alignment.Start,
      verticalArrangement = Arrangement.spacedBy(10.dp)
    ) {
      Text(stringResource(R.string.markdown_in_messages), style = MaterialTheme.typography.h2)
--- a/apps/android/app/src/main/java/chat/simplex/app/views/chatlist/ChatListNavLinkView.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/chatlist/ChatListNavLinkView.kt
@@ -4,12 +4,14 @@ import android.content.res.Configuration
 import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.*
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.*
+import androidx.compose.material.icons.outlined.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalDensity
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
@@ -181,7 +183,7 @@ fun GroupMenuItems(chat: Chat, groupInfo: GroupInfo, chatModel: ChatModel, showM
 fun MarkReadChatAction(chat: Chat, chatModel: ChatModel, showMenu: MutableState<Boolean>) {
  ItemAction(
    stringResource(R.string.mark_read),
-    painterResource(R.drawable.ic_check),
+    Icons.Outlined.Check,
    onClick = {
      markChatRead(chat, chatModel)
      chatModel.controller.ntfManager.cancelNotificationsForChat(chat.id)
@@ -192,21 +194,33 @@ fun MarkReadChatAction(chat: Chat, chatModel: ChatModel, showMenu: MutableState<

@Composable
 fun MarkUnreadChatAction(chat: Chat, chatModel: ChatModel, showMenu: MutableState<Boolean>) {
-  ItemAction(
-    stringResource(R.string.mark_unread),
-    painterResource(R.drawable.ic_mark_chat_unread),
-    onClick = {
-      markChatUnread(chat, chatModel)
-      showMenu.value = false
+  DropdownMenuItem({
+    markChatUnread(chat, chatModel)
+    showMenu.value = false
+  }) {
+    Row {
+      Text(
+        stringResource(R.string.mark_unread),
+        modifier = Modifier
+          .fillMaxWidth()
+          .weight(1F)
+          .padding(end = 15.dp),
+        color = MaterialTheme.colors.onBackground
+      )
+      Icon(
+        Icons.Outlined.MarkChatUnread,
+        stringResource(R.string.mark_unread),
+        tint = MaterialTheme.colors.onBackground
+      )
    }
-  )
+  }
 }

@Composable
 fun ToggleNotificationsChatAction(chat: Chat, chatModel: ChatModel, ntfsEnabled: Boolean, showMenu: MutableState<Boolean>) {
  ItemAction(
    if (ntfsEnabled) stringResource(R.string.mute_chat) else stringResource(R.string.unmute_chat),
-    if (ntfsEnabled) painterResource(R.drawable.ic_notifications_off) else painterResource(R.drawable.ic_notifications),
+    if (ntfsEnabled) Icons.Outlined.NotificationsOff else Icons.Outlined.Notifications,
    onClick = {
      changeNtfsStatePerChat(!ntfsEnabled, mutableStateOf(ntfsEnabled), chat, chatModel)
      showMenu.value = false
@@ -218,7 +232,7 @@ fun ToggleNotificationsChatAction(chat: Chat, chatModel: ChatModel, ntfsEnabled:
 fun ClearChatAction(chat: Chat, chatModel: ChatModel, showMenu: MutableState<Boolean>) {
  ItemAction(
    stringResource(R.string.clear_chat_menu_action),
-    painterResource(R.drawable.ic_settings_backup_restore),
+    Icons.Outlined.Restore,
    onClick = {
      clearChatDialog(chat.chatInfo, chatModel)
      showMenu.value = false
@@ -231,7 +245,7 @@ fun ClearChatAction(chat: Chat, chatModel: ChatModel, showMenu: MutableState<Boo
 fun DeleteContactAction(chat: Chat, chatModel: ChatModel, showMenu: MutableState<Boolean>) {
  ItemAction(
    stringResource(R.string.delete_contact_menu_action),
-    painterResource(R.drawable.ic_delete),
+    Icons.Outlined.Delete,
    onClick = {
      deleteContactDialog(chat.chatInfo, chatModel)
      showMenu.value = false
@@ -244,7 +258,7 @@ fun DeleteContactAction(chat: Chat, chatModel: ChatModel, showMenu: MutableState
 fun DeleteGroupAction(chat: Chat, groupInfo: GroupInfo, chatModel: ChatModel, showMenu: MutableState<Boolean>) {
  ItemAction(
    stringResource(R.string.delete_group_menu_action),
-    painterResource(R.drawable.ic_delete),
+    Icons.Outlined.Delete,
    onClick = {
      deleteGroupDialog(chat.chatInfo, groupInfo, chatModel)
      showMenu.value = false
@@ -258,7 +272,7 @@ fun JoinGroupAction(chat: Chat, groupInfo: GroupInfo, chatModel: ChatModel, show
  val joinGroup: () -> Unit = { withApi { chatModel.controller.apiJoinGroup(groupInfo.groupId) } }
  ItemAction(
    if (chat.chatInfo.incognito) stringResource(R.string.join_group_incognito_button) else stringResource(R.string.join_group_button),
-    if (chat.chatInfo.incognito) painterResource(R.drawable.ic_theater_comedy_filled) else painterResource(R.drawable.ic_login),
+    if (chat.chatInfo.incognito) Icons.Filled.TheaterComedy else Icons.Outlined.Login,
    color = if (chat.chatInfo.incognito) Indigo else MaterialTheme.colors.onBackground,
    onClick = {
      joinGroup()
@@ -271,7 +285,7 @@ fun JoinGroupAction(chat: Chat, groupInfo: GroupInfo, chatModel: ChatModel, show
 fun LeaveGroupAction(groupInfo: GroupInfo, chatModel: ChatModel, showMenu: MutableState<Boolean>) {
  ItemAction(
    stringResource(R.string.leave_group_button),
-    painterResource(R.drawable.ic_logout),
+    Icons.Outlined.Logout,
    onClick = {
      leaveGroupDialog(groupInfo, chatModel)
      showMenu.value = false
@@ -284,7 +298,7 @@ fun LeaveGroupAction(groupInfo: GroupInfo, chatModel: ChatModel, showMenu: Mutab
 fun ContactRequestMenuItems(chatInfo: ChatInfo.ContactRequest, chatModel: ChatModel, showMenu: MutableState<Boolean>) {
  ItemAction(
    if (chatModel.incognito.value) stringResource(R.string.accept_contact_incognito_button) else stringResource(R.string.accept_contact_button),
-    if (chatModel.incognito.value) painterResource(R.drawable.ic_theater_comedy_filled) else painterResource(R.drawable.ic_check),
+    if (chatModel.incognito.value) Icons.Filled.TheaterComedy else Icons.Outlined.Check,
    color = if (chatModel.incognito.value) Indigo else MaterialTheme.colors.onBackground,
    onClick = {
      acceptContactRequest(chatInfo.apiId, chatInfo, true, chatModel)
@@ -293,7 +307,7 @@ fun ContactRequestMenuItems(chatInfo: ChatInfo.ContactRequest, chatModel: ChatMo
  )
  ItemAction(
    stringResource(R.string.reject_contact_button),
-    painterResource(R.drawable.ic_close),
+    Icons.Outlined.Close,
    onClick = {
      rejectContactRequest(chatInfo, chatModel)
      showMenu.value = false
@@ -306,7 +320,7 @@ fun ContactRequestMenuItems(chatInfo: ChatInfo.ContactRequest, chatModel: ChatMo
 fun ContactConnectionMenuItems(chatInfo: ChatInfo.ContactConnection, chatModel: ChatModel, showMenu: MutableState<Boolean>) {
  ItemAction(
    stringResource(R.string.set_contact_name),
-    painterResource(R.drawable.ic_edit),
+    Icons.Outlined.Edit,
    onClick = {
      ModalManager.shared.showModalCloseable(true) { close ->
        ContactConnectionInfoView(chatModel, chatInfo.contactConnection.connReqInv, chatInfo.contactConnection, true, close)
@@ -316,7 +330,7 @@ fun ContactConnectionMenuItems(chatInfo: ChatInfo.ContactConnection, chatModel:
  )
  ItemAction(
    stringResource(R.string.delete_verb),
-    painterResource(R.drawable.ic_delete),
+    Icons.Outlined.Delete,
    onClick = {
      deleteContactConnectionAlert(chatInfo.contactConnection, chatModel) {}
      showMenu.value = false
@@ -328,7 +342,7 @@ fun ContactConnectionMenuItems(chatInfo: ChatInfo.ContactConnection, chatModel:
@Composable
 private fun InvalidDataView() {
  Row {
-    ProfileImage(72.dp, null, R.drawable.ic_account_circle_filled, MaterialTheme.colors.secondary)
+    ProfileImage(72.dp, null, Icons.Filled.AccountCircle, HighOrLowlight)
    Column(
      modifier = Modifier
        .padding(horizontal = 8.dp)
@@ -433,7 +447,7 @@ fun contactConnectionAlertDialog(connection: PendingContactConnection, chatModel
        Modifier
          .fillMaxWidth()
          .padding(horizontal = 8.dp, vertical = 2.dp),
-        horizontalArrangement = Arrangement.Center,
+        horizontalArrangement = Arrangement.End,
      ) {
        TextButton(onClick = {
          AlertManager.shared.hideAlert()
@@ -466,8 +480,7 @@ fun deleteContactConnectionAlert(connection: PendingContactConnection, chatModel
          onSuccess()
        }
      }
-    },
-    destructive = true,
+    }
  )
 }

@@ -485,7 +498,6 @@ fun pendingContactAlertDialog(chatInfo: ChatInfo, chatModel: ChatModel) {
        }
      }
    },
-    destructive = true,
    dismissText = generalGetString(R.string.cancel_verb),
  )
 }
@@ -577,7 +589,15 @@ fun ChatListNavLinkLayout(
      chatLinkPreview()
    }
    if (dropdownMenuItems != null) {
-      DefaultDropdownMenu(showMenu, dropdownMenuItems = dropdownMenuItems)
+      Box(Modifier.padding(horizontal = 16.dp)) {
+        DropdownMenu(
+          expanded = showMenu.value,
+          onDismissRequest = { showMenu.value = false },
+          Modifier.width(220.dp)
+        ) {
+          dropdownMenuItems()
+        }
+      }
    }
  }
  Divider(Modifier.padding(horizontal = 8.dp))
--- a/apps/android/app/src/main/java/chat/simplex/app/views/chatlist/ChatListView.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/chatlist/ChatListView.kt
@@ -7,19 +7,20 @@ import androidx.compose.foundation.lazy.*
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.*
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.*
+import androidx.compose.material.icons.outlined.*
 import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.*
 import androidx.compose.ui.platform.LocalUriHandler
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.capitalize
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.intl.Locale
 import androidx.compose.ui.unit.*
-import androidx.fragment.app.FragmentActivity
 import chat.simplex.app.*
 import chat.simplex.app.R
 import chat.simplex.app.model.*
@@ -35,7 +36,7 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.launch

@Composable
-fun ChatListView(chatModel: ChatModel, setPerformLA: (Boolean, FragmentActivity) -> Unit, stopped: Boolean) {
+fun ChatListView(chatModel: ChatModel, setPerformLA: (Boolean) -> Unit, stopped: Boolean) {
  val newChatSheetState by rememberSaveable(stateSaver = AnimatedViewState.saver()) { mutableStateOf(MutableStateFlow(AnimatedViewState.GONE)) }
  val userPickerState by rememberSaveable(stateSaver = AnimatedViewState.saver()) { mutableStateOf(MutableStateFlow(AnimatedViewState.GONE)) }
  val showNewChatSheet = {
@@ -65,10 +66,10 @@ fun ChatListView(chatModel: ChatModel, setPerformLA: (Boolean, FragmentActivity)
  val scaffoldState = rememberScaffoldState()
  val scope = rememberCoroutineScope()
  val switchingUsers = rememberSaveable { mutableStateOf(false) }
-  Scaffold(topBar = { ChatListToolbar(chatModel, scaffoldState.drawerState, userPickerState, stopped) { searchInList = it.trim() } },
+  Scaffold(
+    topBar = { ChatListToolbar(chatModel, scaffoldState.drawerState, userPickerState, stopped) { searchInList = it.trim() } },
    scaffoldState = scaffoldState,
    drawerContent = { SettingsView(chatModel, setPerformLA) },
-    drawerScrimColor = MaterialTheme.colors.onSurface.copy(alpha = if (isInDarkTheme()) 0.16f else 0.32f),
    floatingActionButton = {
      if (searchInList.isEmpty()) {
        FloatingActionButton(
@@ -77,17 +78,16 @@ fun ChatListView(chatModel: ChatModel, setPerformLA: (Boolean, FragmentActivity)
              if (newChatSheetState.value.isVisible()) hideNewChatSheet(true) else showNewChatSheet()
            }
          },
-          Modifier.padding(end = DEFAULT_PADDING - 16.dp, bottom = DEFAULT_PADDING - 16.dp),
          elevation = FloatingActionButtonDefaults.elevation(
            defaultElevation = 0.dp,
            pressedElevation = 0.dp,
            hoveredElevation = 0.dp,
            focusedElevation = 0.dp,
          ),
-          backgroundColor = if (!stopped) MaterialTheme.colors.primary else MaterialTheme.colors.secondary,
+          backgroundColor = if (!stopped) MaterialTheme.colors.primary else HighOrLowlight,
          contentColor = Color.White
        ) {
-          Icon(if (!newChatSheetState.collectAsState().value.isVisible()) painterResource(R.drawable.ic_edit_filled) else painterResource(R.drawable.ic_close), stringResource(R.string.add_contact_or_create_group))
+          Icon(if (!newChatSheetState.collectAsState().value.isVisible()) Icons.Default.Edit else Icons.Default.Close, stringResource(R.string.add_contact_or_create_group))
        }
      }
    }
@@ -96,6 +96,7 @@ fun ChatListView(chatModel: ChatModel, setPerformLA: (Boolean, FragmentActivity)
      Column(
        modifier = Modifier
          .fillMaxSize()
+          .background(MaterialTheme.colors.background)
      ) {
        if (chatModel.chats.isNotEmpty()) {
          ChatList(chatModel, search = searchInList)
@@ -104,7 +105,7 @@ fun ChatListView(chatModel: ChatModel, setPerformLA: (Boolean, FragmentActivity)
            if (!stopped && !newChatSheetState.collectAsState().value.isVisible()) {
              OnboardingButtons(showNewChatSheet)
            }
-            Text(stringResource(R.string.you_have_no_chats), Modifier.align(Alignment.Center), color = MaterialTheme.colors.secondary)
+            Text(stringResource(R.string.you_have_no_chats), Modifier.align(Alignment.Center), color = HighOrLowlight)
          }
        }
      }
@@ -135,7 +136,7 @@ private fun OnboardingButtons(openNewChatSheet: () -> Unit) {
    }
    Spacer(Modifier.height(DEFAULT_PADDING))
    ConnectButton(generalGetString(R.string.tap_to_start_new_chat), openNewChatSheet)
-    val color = MaterialTheme.colors.primaryVariant
+    val color = MaterialTheme.colors.primary
    Canvas(modifier = Modifier.width(40.dp).height(10.dp), onDraw = {
      val trianglePath = Path().apply {
        moveTo(0.dp.toPx(), 0f)
@@ -158,7 +159,7 @@ private fun ConnectButton(text: String, onClick: () -> Unit) {
    onClick,
    shape = RoundedCornerShape(21.dp),
    colors = ButtonDefaults.textButtonColors(
-      backgroundColor = MaterialTheme.colors.primaryVariant
+      backgroundColor = MaterialTheme.colors.primary
    ),
    elevation = null,
    contentPadding = PaddingValues(horizontal = DEFAULT_PADDING, vertical = DEFAULT_PADDING_HALF),
@@ -179,7 +180,7 @@ private fun ChatListToolbar(chatModel: ChatModel, drawerState: DrawerState, user
  if (chatModel.chats.size >= 8) {
    barButtons.add {
      IconButton({ showSearch = true }) {
-        Icon(painterResource(R.drawable.ic_search_500), stringResource(android.R.string.search_go).capitalize(Locale.current), tint = MaterialTheme.colors.primary)
+        Icon(Icons.Outlined.Search, stringResource(android.R.string.search_go).capitalize(Locale.current), tint = MaterialTheme.colors.primary)
      }
    }
  }
@@ -192,7 +193,7 @@ private fun ChatListToolbar(chatModel: ChatModel, drawerState: DrawerState, user
        )
      }) {
        Icon(
-          painterResource(R.drawable.ic_report_filled),
+          Icons.Filled.Report,
          generalGetString(R.string.chat_is_stopped_indication),
          tint = Color.Red,
        )
@@ -229,7 +230,7 @@ private fun ChatListToolbar(chatModel: ChatModel, drawerState: DrawerState, user
        )
        if (chatModel.incognito.value) {
          Icon(
-            painterResource(R.drawable.ic_theater_comedy_filled),
+            Icons.Filled.TheaterComedy,
            stringResource(R.string.incognito),
            tint = Indigo,
            modifier = Modifier.padding(10.dp).size(26.dp)
@@ -281,7 +282,7 @@ private fun ProgressIndicator() {
    Modifier
      .padding(horizontal = 2.dp)
      .size(30.dp),
-    color = MaterialTheme.colors.secondary,
+    color = HighOrLowlight,
    strokeWidth = 2.5.dp
  )
 }
--- a/apps/android/app/src/main/java/chat/simplex/app/views/chatlist/ChatPreviewView.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/chatlist/ChatPreviewView.kt
@@ -7,12 +7,15 @@ import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.text.InlineTextContent
 import androidx.compose.foundation.text.appendInlineContent
 import androidx.compose.material.*
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.*
+import androidx.compose.material.icons.outlined.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.platform.LocalDensity
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.*
 import androidx.compose.ui.text.font.FontWeight
@@ -43,10 +46,10 @@ fun ChatPreviewView(
  @Composable
  fun groupInactiveIcon() {
    Icon(
-      painterResource(R.drawable.ic_cancel_filled),
+      Icons.Filled.Cancel,
      stringResource(R.string.icon_descr_group_inactive),
      Modifier.size(18.dp).background(MaterialTheme.colors.background, CircleShape),
-      tint = MaterialTheme.colors.secondary
+      tint = HighOrLowlight
    )
  }

@@ -76,15 +79,15 @@ fun ChatPreviewView(

  @Composable
  fun VerifiedIcon() {
-    Icon(painterResource(R.drawable.ic_verified_user), null, Modifier.size(19.dp).padding(end = 3.dp, top = 1.dp), tint = MaterialTheme.colors.secondary)
+    Icon(Icons.Outlined.VerifiedUser, null, Modifier.size(19.dp).padding(end = 3.dp, top = 1.dp), tint = HighOrLowlight)
  }

  fun messageDraft(draft: ComposeState): Pair<AnnotatedString, Map<String, InlineTextContent>> {
-    fun attachment(): Pair<Int, String?>? =
+    fun attachment(): Pair<ImageVector, String?>? =
      when (draft.preview) {
-        is ComposePreview.FilePreview -> R.drawable.ic_draft_filled to draft.preview.fileName
-        is ComposePreview.MediaPreview -> R.drawable.ic_image to null
-        is ComposePreview.VoicePreview -> R.drawable.ic_play_arrow_filled to durationText(draft.preview.durationMs / 1000)
+        is ComposePreview.FilePreview -> Icons.Filled.InsertDriveFile to draft.preview.fileName
+        is ComposePreview.ImagePreview -> Icons.Outlined.Image to null
+        is ComposePreview.VoicePreview -> Icons.Filled.PlayArrow to durationText(draft.preview.durationMs / 1000)
        else -> null
      }

@@ -105,12 +108,12 @@ fun ChatPreviewView(
      "editIcon" to InlineTextContent(
        Placeholder(20.sp, 20.sp, PlaceholderVerticalAlign.TextCenter)
      ) {
-        Icon(painterResource(R.drawable.ic_edit_note), null, tint = MaterialTheme.colors.primary)
+        Icon(Icons.Outlined.EditNote, null, tint = MaterialTheme.colors.primary)
      },
      "attachmentIcon" to InlineTextContent(
        Placeholder(20.sp, 20.sp, PlaceholderVerticalAlign.TextCenter)
      ) {
-        Icon(if (attachment?.first != null) painterResource(attachment.first) else painterResource(R.drawable.ic_edit_note), null, tint = MaterialTheme.colors.secondary)
+        Icon(attachment?.first ?: Icons.Outlined.EditNote, null, tint = HighOrLowlight)
      }
    )
    return text to inlineContent
@@ -124,12 +127,12 @@ fun ChatPreviewView(
          if (cInfo.contact.verified) {
            VerifiedIcon()
          }
-          chatPreviewTitleText(if (cInfo.ready) Color.Unspecified else MaterialTheme.colors.secondary)
+          chatPreviewTitleText(if (cInfo.ready) Color.Unspecified else HighOrLowlight)
        }
      is ChatInfo.Group ->
        when (cInfo.groupInfo.membership.memberStatus) {
          GroupMemberStatus.MemInvited -> chatPreviewTitleText(if (chat.chatInfo.incognito) Indigo else MaterialTheme.colors.primary)
-          GroupMemberStatus.MemAccepted -> chatPreviewTitleText(MaterialTheme.colors.secondary)
+          GroupMemberStatus.MemAccepted -> chatPreviewTitleText(HighOrLowlight)
          else -> chatPreviewTitleText()
        }
      else -> chatPreviewTitleText()
@@ -170,12 +173,12 @@ fun ChatPreviewView(
      when (cInfo) {
        is ChatInfo.Direct ->
          if (!cInfo.ready) {
-            Text(stringResource(R.string.contact_connection_pending), color = MaterialTheme.colors.secondary)
+            Text(stringResource(R.string.contact_connection_pending), color = HighOrLowlight)
          }
        is ChatInfo.Group ->
          when (cInfo.groupInfo.membership.memberStatus) {
            GroupMemberStatus.MemInvited -> Text(groupInvitationPreviewText(chatModelIncognito, currentUserProfileDisplayName, cInfo.groupInfo))
-            GroupMemberStatus.MemAccepted -> Text(stringResource(R.string.group_connection_pending), color = MaterialTheme.colors.secondary)
+            GroupMemberStatus.MemAccepted -> Text(stringResource(R.string.group_connection_pending), color = HighOrLowlight)
            else -> {}
          }
        else -> {}
@@ -208,7 +211,7 @@ fun ChatPreviewView(
    ) {
      Text(
        ts,
-        color = MaterialTheme.colors.secondary,
+        color = HighOrLowlight,
        style = MaterialTheme.typography.body2,
        modifier = Modifier.padding(bottom = 5.dp)
      )
@@ -221,10 +224,10 @@ fun ChatPreviewView(
        ) {
          Text(
            if (n > 0) unreadCountStr(n) else "",
-            color = Color.White,
+            color = MaterialTheme.colors.onPrimary,
            fontSize = 11.sp,
            modifier = Modifier
-              .background(if (stopped || showNtfsIcon) MaterialTheme.colors.secondary else MaterialTheme.colors.primaryVariant, shape = CircleShape)
+              .background(if (stopped || showNtfsIcon) HighOrLowlight else MaterialTheme.colors.primary, shape = CircleShape)
              .badgeLayout()
              .padding(horizontal = 3.dp)
              .padding(vertical = 1.dp)
@@ -236,9 +239,9 @@ fun ChatPreviewView(
          contentAlignment = Alignment.Center
        ) {
          Icon(
-            painterResource(R.drawable.ic_notifications_off_filled),
+            Icons.Filled.NotificationsOff,
            contentDescription = generalGetString(R.string.notifications),
-            tint = MaterialTheme.colors.secondary,
+            tint = HighOrLowlight,
            modifier = Modifier
              .padding(horizontal = 3.dp)
              .padding(vertical = 1.dp)
@@ -278,9 +281,9 @@ fun ChatStatusImage(s: NetworkStatus?) {
  val descr = s?.statusString
  if (s is NetworkStatus.Error) {
    Icon(
-      painterResource(R.drawable.ic_error),
+      Icons.Outlined.ErrorOutline,
      contentDescription = descr,
-      tint = MaterialTheme.colors.secondary,
+      tint = HighOrLowlight,
      modifier = Modifier
        .size(19.dp)
    )
@@ -289,7 +292,7 @@ fun ChatStatusImage(s: NetworkStatus?) {
      Modifier
        .padding(horizontal = 2.dp)
        .size(15.dp),
-      color = MaterialTheme.colors.secondary,
+      color = HighOrLowlight,
      strokeWidth = 1.5.dp
    )
  }
--- a/apps/android/app/src/main/java/chat/simplex/app/views/chatlist/ContactConnectionView.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/chatlist/ContactConnectionView.kt
@@ -3,16 +3,16 @@ package chat.simplex.app.views.chatlist
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalDensity
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import chat.simplex.app.R
 import chat.simplex.app.model.*
 import chat.simplex.app.ui.theme.*
 import chat.simplex.app.views.helpers.ProfileImage
@@ -21,7 +21,7 @@ import chat.simplex.app.views.helpers.ProfileImage
 fun ContactConnectionView(contactConnection: PendingContactConnection) {
  Row {
    Box(Modifier.size(72.dp), contentAlignment = Alignment.Center) {
-      ProfileImage(size = 54.dp, null, if (contactConnection.initiated) R.drawable.ic_add_link else R.drawable.ic_link)
+      ProfileImage(size = 54.dp, null, if (contactConnection.initiated) Icons.Outlined.AddLink else Icons.Outlined.Link)
    }
    Column(
      modifier = Modifier
@@ -34,7 +34,7 @@ fun ContactConnectionView(contactConnection: PendingContactConnection) {
        overflow = TextOverflow.Ellipsis,
        style = MaterialTheme.typography.h3,
        fontWeight = FontWeight.Bold,
-        color = MaterialTheme.colors.secondary
+        color = HighOrLowlight
      )
      val height = with(LocalDensity.current) { 46.sp.toDp() }
      Text(contactConnection.description, Modifier.heightIn(min = height), maxLines = 2, color = if (isInDarkTheme()) MessagePreviewDark else MessagePreviewLight)
@@ -42,10 +42,11 @@ fun ContactConnectionView(contactConnection: PendingContactConnection) {
    val ts = getTimestampText(contactConnection.updatedAt)
    Column(
      Modifier.fillMaxHeight(),
+      verticalArrangement = Arrangement.Top
    ) {
      Text(
        ts,
-        color = MaterialTheme.colors.secondary,
+        color = HighOrLowlight,
        style = MaterialTheme.typography.body2,
        modifier = Modifier.padding(bottom = 5.dp)
      )
--- a/apps/android/app/src/main/java/chat/simplex/app/views/chatlist/ContactRequestView.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/chatlist/ContactRequestView.kt
@@ -39,10 +39,11 @@ fun ContactRequestView(chatModelIncognito: Boolean, contactRequest: ChatInfo.Con
    val ts = getTimestampText(contactRequest.contactRequest.updatedAt)
    Column(
      Modifier.fillMaxHeight(),
+      verticalArrangement = Arrangement.Top
    ) {
      Text(
        ts,
-        color = MaterialTheme.colors.secondary,
+        color = HighOrLowlight,
        style = MaterialTheme.typography.body2,
        modifier = Modifier.padding(bottom = 5.dp)
      )
--- a/apps/android/app/src/main/java/chat/simplex/app/views/chatlist/ShareListView.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/chatlist/ShareListView.kt
@@ -6,12 +6,14 @@ import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.material.*
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.*
+import androidx.compose.material.icons.outlined.*
 import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.capitalize
 import androidx.compose.ui.text.font.FontWeight
@@ -19,7 +21,8 @@ import androidx.compose.ui.text.intl.Locale
 import androidx.compose.ui.unit.dp
 import chat.simplex.app.R
 import chat.simplex.app.model.*
-import chat.simplex.app.ui.theme.*
+import chat.simplex.app.ui.theme.HighOrLowlight
+import chat.simplex.app.ui.theme.Indigo
 import chat.simplex.app.views.helpers.*
 import kotlinx.coroutines.flow.MutableStateFlow

@@ -35,6 +38,7 @@ fun ShareListView(chatModel: ChatModel, stopped: Boolean) {
      Column(
        modifier = Modifier
          .fillMaxSize()
+          .background(MaterialTheme.colors.background)
      ) {
        if (chatModel.chats.isNotEmpty()) {
          ShareList(chatModel, search = searchInList)
@@ -52,7 +56,7 @@ fun ShareListView(chatModel: ChatModel, stopped: Boolean) {
@Composable
 private fun EmptyList() {
  Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
-    Text(stringResource(R.string.you_have_no_chats), color = MaterialTheme.colors.secondary)
+    Text(stringResource(R.string.you_have_no_chats), color = HighOrLowlight)
  }
 }

@@ -82,7 +86,7 @@ private fun ShareListToolbar(chatModel: ChatModel, userPickerState: MutableState
  if (chatModel.chats.size >= 8) {
    barButtons.add {
      IconButton({ showSearch = true }) {
-        Icon(painterResource(R.drawable.ic_search_500), stringResource(android.R.string.search_go).capitalize(Locale.current), tint = MaterialTheme.colors.primary)
+        Icon(Icons.Outlined.Search, stringResource(android.R.string.search_go).capitalize(Locale.current), tint = MaterialTheme.colors.primary)
      }
    }
  }
@@ -95,7 +99,7 @@ private fun ShareListToolbar(chatModel: ChatModel, userPickerState: MutableState
        )
      }) {
        Icon(
-          painterResource(R.drawable.ic_report_filled),
+          Icons.Filled.Report,
          generalGetString(R.string.chat_is_stopped_indication),
          tint = Color.Red,
        )
@@ -110,7 +114,7 @@ private fun ShareListToolbar(chatModel: ChatModel, userPickerState: MutableState
        Text(
          when (chatModel.sharedContent.value) {
            is SharedContent.Text -> stringResource(R.string.share_message)
-            is SharedContent.Media -> stringResource(R.string.share_image)
+            is SharedContent.Images -> stringResource(R.string.share_image)
            is SharedContent.File -> stringResource(R.string.share_file)
            else -> stringResource(R.string.share_message)
          },
@@ -119,7 +123,7 @@ private fun ShareListToolbar(chatModel: ChatModel, userPickerState: MutableState
        )
        if (chatModel.incognito.value) {
          Icon(
-            painterResource(R.drawable.ic_theater_comedy_filled),
+            Icons.Filled.TheaterComedy,
            stringResource(R.string.incognito),
            tint = Indigo,
            modifier = Modifier.padding(10.dp).size(26.dp)
--- a/apps/android/app/src/main/java/chat/simplex/app/views/chatlist/UserPicker.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/chatlist/UserPicker.kt
@@ -1,21 +1,23 @@
 package chat.simplex.app.views.chatlist

-import SectionItemView
+import SectionItemViewSpaceBetween
 import android.util.Log
 import androidx.compose.animation.core.*
 import androidx.compose.foundation.*
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.shape.*
+import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.*
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.*
+import androidx.compose.material.icons.outlined.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.*
-import androidx.compose.ui.draw.*
+import androidx.compose.ui.draw.shadow
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.platform.LocalDensity
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.capitalize
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.intl.Locale
@@ -103,16 +105,15 @@ fun UserPicker(
  ) {
    Column(
      Modifier
-        .widthIn(min = 260.dp)
+        .widthIn(min = 220.dp)
        .width(IntrinsicSize.Min)
        .height(IntrinsicSize.Min)
-        .shadow(8.dp, RoundedCornerShape(corner = CornerSize(25.dp)), clip = true)
-        .background(MaterialTheme.colors.surface, RoundedCornerShape(corner = CornerSize(25.dp)))
-        .clip(RoundedCornerShape(corner = CornerSize(25.dp)))
+        .shadow(8.dp, MaterialTheme.shapes.medium, clip = false)
+        .background(if (isInDarkTheme()) MaterialTheme.colors.background.darker(-0.7f) else MaterialTheme.colors.background, MaterialTheme.shapes.medium)
    ) {
      Column(Modifier.weight(1f).verticalScroll(rememberScrollState())) {
        users.forEach { u ->
-          UserProfilePickerItem(u.user, u.unreadCount, PaddingValues(start = DEFAULT_PADDING_HALF, end = DEFAULT_PADDING), openSettings = {
+          UserProfilePickerItem(u.user, u.unreadCount, openSettings = {
            settingsClicked()
            userPickerState.value = AnimatedViewState.GONE
          }) {
@@ -150,7 +151,7 @@ fun UserPicker(
 }

@Composable
-fun UserProfilePickerItem(u: User, unreadCount: Int = 0, padding: PaddingValues = PaddingValues(start = DEFAULT_PADDING_HALF, end = DEFAULT_PADDING), onLongClick: () -> Unit = {}, openSettings: () -> Unit = {}, onClick: () -> Unit) {
+fun UserProfilePickerItem(u: User, unreadCount: Int = 0, onLongClick: () -> Unit = {}, openSettings: () -> Unit = {}, onClick: () -> Unit) {
  Row(
    Modifier
      .fillMaxWidth()
@@ -161,31 +162,33 @@ fun UserProfilePickerItem(u: User, unreadCount: Int = 0, padding: PaddingValues
        interactionSource = remember { MutableInteractionSource() },
        indication = if (!u.activeUser) LocalIndication.current else null
      )
-      .padding(padding),
+      .padding(PaddingValues(start = 8.dp, end = DEFAULT_PADDING)),
    horizontalArrangement = Arrangement.SpaceBetween,
    verticalAlignment = Alignment.CenterVertically
  ) {
    UserProfileRow(u)
    if (u.activeUser) {
-        Icon(painterResource(R.drawable.ic_done_filled), null, Modifier.size(20.dp), tint = MaterialTheme.colors.onBackground)
+        Icon(Icons.Filled.Done, null, Modifier.size(20.dp), tint = MaterialTheme.colors.onBackground)
    } else if (u.hidden) {
-        Icon(painterResource(R.drawable.ic_lock), null, Modifier.size(20.dp), tint = MaterialTheme.colors.secondary)
+        Icon(Icons.Outlined.Lock, null, Modifier.size(20.dp), tint = HighOrLowlight)
    } else if (unreadCount > 0) {
-      Box(
-        contentAlignment = Alignment.Center
-      ) {
+      Row {
        Text(
          unreadCountStr(unreadCount),
          color = Color.White,
          fontSize = 11.sp,
          modifier = Modifier
-            .background(MaterialTheme.colors.primaryVariant, shape = CircleShape)
-            .padding(2.dp)
-            .badgeLayout()
+            .background(if (u.showNtfs) MaterialTheme.colors.primary else HighOrLowlight, shape = CircleShape)
+            .sizeIn(minWidth = 20.dp, minHeight = 20.dp)
+            .padding(horizontal = 3.dp)
+            .padding(vertical = 1.dp),
+          textAlign = TextAlign.Center,
+          maxLines = 1
        )
+        Spacer(Modifier.width(2.dp))
      }
    } else if (!u.showNtfs) {
-      Icon(painterResource(R.drawable.ic_notifications_off), null, Modifier.size(20.dp), tint = MaterialTheme.colors.secondary)
+      Icon(Icons.Outlined.NotificationsOff, null, Modifier.size(20.dp), tint = HighOrLowlight)
    }  else {
      Box(Modifier.size(20.dp))
    }
@@ -207,8 +210,7 @@ fun UserProfileRow(u: User) {
    Text(
      u.displayName,
      modifier = Modifier
-        .padding(start = 10.dp, end = 8.dp),
-      color = if (isInDarkTheme()) MenuTextColorDark else Color.Black,
+        .padding(start = 8.dp, end = 8.dp),
      fontWeight = if (u.activeUser) FontWeight.Medium else FontWeight.Normal
    )
  }
@@ -216,26 +218,24 @@ fun UserProfileRow(u: User) {

@Composable
 private fun SettingsPickerItem(onClick: () -> Unit) {
-  SectionItemView(onClick, padding = PaddingValues(start = DEFAULT_PADDING + 7.dp, end = DEFAULT_PADDING), minHeight = 68.dp) {
+  SectionItemViewSpaceBetween(onClick, minHeight = 68.dp) {
    val text = generalGetString(R.string.settings_section_title_settings).lowercase().capitalize(Locale.current)
-    Icon(painterResource(R.drawable.ic_settings), text, Modifier.size(20.dp), tint = MaterialTheme.colors.onBackground)
-    Spacer(Modifier.width(DEFAULT_PADDING + 6.dp))
    Text(
      text,
-      color = if (isInDarkTheme()) MenuTextColorDark else Color.Black,
+      color = MaterialTheme.colors.onBackground,
    )
+    Icon(Icons.Outlined.Settings, text, Modifier.size(20.dp), tint = MaterialTheme.colors.onBackground)
  }
 }

@Composable
 private fun CancelPickerItem(onClick: () -> Unit) {
-  SectionItemView(onClick, padding = PaddingValues(start = DEFAULT_PADDING + 7.dp, end = DEFAULT_PADDING), minHeight = 68.dp) {
+  SectionItemViewSpaceBetween(onClick, minHeight = 68.dp) {
    val text = generalGetString(R.string.cancel_verb)
-    Icon(painterResource(R.drawable.ic_close), text, Modifier.size(20.dp), tint = MaterialTheme.colors.onBackground)
-    Spacer(Modifier.width(DEFAULT_PADDING + 6.dp))
    Text(
      text,
-      color = if (isInDarkTheme()) MenuTextColorDark else Color.Black,
+      color = MaterialTheme.colors.onBackground,
    )
+    Icon(Icons.Outlined.Close, text, Modifier.size(20.dp), tint = MaterialTheme.colors.onBackground)
  }
 }
--- a/apps/android/app/src/main/java/chat/simplex/app/views/database/ChatArchiveView.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/database/ChatArchiveView.kt
@@ -1,6 +1,6 @@
 package chat.simplex.app.views.database

-import SectionBottomSpacer
+import SectionDivider
 import SectionTextFooter
 import SectionView
 import android.content.Context
@@ -13,14 +13,16 @@ import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.*
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
 import chat.simplex.app.R
 import chat.simplex.app.TAG
 import chat.simplex.app.model.ChatModel
@@ -55,18 +57,20 @@ fun ChatArchiveLayout(
 ) {
  Column(
    Modifier.fillMaxWidth(),
+    horizontalAlignment = Alignment.Start,
  ) {
    AppBarTitle(title)
    SectionView(stringResource(R.string.chat_archive_section)) {
      SettingsActionItem(
-        painterResource(R.drawable.ic_ios_share),
+        Icons.Outlined.IosShare,
        stringResource(R.string.save_archive),
        saveArchive,
        textColor = MaterialTheme.colors.primary,
        iconColor = MaterialTheme.colors.primary,
      )
+      SectionDivider()
      SettingsActionItem(
-        painterResource(R.drawable.ic_delete),
+        Icons.Outlined.Delete,
        stringResource(R.string.delete_archive),
        deleteArchiveAlert,
        textColor = Color.Red,
@@ -77,7 +81,6 @@ fun ChatArchiveLayout(
    SectionTextFooter(
      String.format(generalGetString(R.string.archive_created_on_ts), archiveTs)
    )
-    SectionBottomSpacer()
  }
 }

@@ -116,8 +119,7 @@ private fun deleteArchiveAlert(m: ChatModel, archivePath: String) {
      } else {
        Log.e(TAG, "deleteArchiveAlert delete() error")
      }
-    },
-    destructive = true,
+    }
  )
 }

--- a/apps/android/app/src/main/java/chat/simplex/app/views/database/DatabaseEncryptionView.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/database/DatabaseEncryptionView.kt
@@ -1,6 +1,6 @@
 package chat.simplex.app.views.database

-import SectionBottomSpacer
+import SectionDivider
 import SectionItemView
 import SectionItemViewSpaceBetween
 import SectionTextFooter
@@ -12,13 +12,15 @@ import androidx.compose.foundation.shape.ZeroCornerSize
 import androidx.compose.foundation.text.*
 import androidx.compose.material.*
 import androidx.compose.material.TextFieldDefaults.indicatorLine
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.*
+import androidx.compose.material.icons.outlined.*
 import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.*
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.SolidColor
 import androidx.compose.ui.platform.LocalSoftwareKeyboardController
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.*
 import androidx.compose.ui.text.font.FontWeight
@@ -40,9 +42,9 @@ fun DatabaseEncryptionView(m: ChatModel) {
  val prefs = m.controller.appPrefs
  val useKeychain = remember { mutableStateOf(prefs.storeDBPassphrase.get()) }
  val initialRandomDBPassphrase = remember { mutableStateOf(prefs.initialRandomDBPassphrase.get()) }
-  val storedKey = remember { val key = DatabaseUtils.ksDatabasePassword.get(); mutableStateOf(key != null && key != "") }
+  val storedKey = remember { val key = DatabaseUtils.getDatabaseKey(); mutableStateOf(key != null && key != "") }
  // Do not do rememberSaveable on current key to prevent saving it on disk in clear text
-  val currentKey = remember { mutableStateOf(if (initialRandomDBPassphrase.value) DatabaseUtils.ksDatabasePassword.get() ?: "" else "") }
+  val currentKey = remember { mutableStateOf(if (initialRandomDBPassphrase.value) DatabaseUtils.getDatabaseKey() ?: "" else "") }
  val newKey = rememberSaveable { mutableStateOf("") }
  val confirmNewKey = rememberSaveable { mutableStateOf("") }

@@ -87,7 +89,7 @@ fun DatabaseEncryptionView(m: ChatModel) {
                prefs.initialRandomDBPassphrase.set(false)
                initialRandomDBPassphrase.value = false
                if (useKeychain.value) {
-                  DatabaseUtils.ksDatabasePassword.set(newKey.value)
+                  DatabaseUtils.setDatabaseKey(newKey.value)
                }
                resetFormAfterEncryption(m, initialRandomDBPassphrase, currentKey, newKey, confirmNewKey, storedKey, useKeychain.value)
                operationEnded(m, progressIndicator) {
@@ -112,7 +114,7 @@ fun DatabaseEncryptionView(m: ChatModel) {
          Modifier
            .padding(horizontal = 2.dp)
            .size(30.dp),
-          color = MaterialTheme.colors.secondary,
+          color = HighOrLowlight,
          strokeWidth = 2.5.dp
        )
      }
@@ -135,6 +137,7 @@ fun DatabaseEncryptionLayout(
 ) {
  Column(
    Modifier.fillMaxWidth().verticalScroll(rememberScrollState()),
+    horizontalAlignment = Alignment.Start,
  ) {
    AppBarTitle(stringResource(R.string.database_passphrase))
    SectionView(null) {
@@ -147,7 +150,7 @@ fun DatabaseEncryptionLayout(
            text = generalGetString(R.string.notifications_will_be_hidden) + "\n" + storeSecurelyDanger(),
            confirmText = generalGetString(R.string.remove_passphrase),
            onConfirm = {
-              DatabaseUtils.ksDatabasePassword.remove()
+              DatabaseUtils.removeDatabaseKey()
              setUseKeychain(false, useKeychain, prefs)
              storedKey.value = false
            },
@@ -159,6 +162,8 @@ fun DatabaseEncryptionLayout(
      }

      if (!initialRandomDBPassphrase.value && chatDbEncrypted == true) {
+        SectionDivider()
+
        PassphraseField(
          currentKey,
          generalGetString(R.string.current_passphrase),
@@ -168,6 +173,8 @@ fun DatabaseEncryptionLayout(
        )
      }

+      SectionDivider()
+
      PassphraseField(
        newKey,
        generalGetString(R.string.new_passphrase),
@@ -199,6 +206,8 @@ fun DatabaseEncryptionLayout(
          !validKey(newKey.value) ||
          progressIndicator.value

+      SectionDivider()
+
      PassphraseField(
        confirmNewKey,
        generalGetString(R.string.confirm_new_passphrase),
@@ -210,8 +219,10 @@ fun DatabaseEncryptionLayout(
        }),
      )

+      SectionDivider()
+
      SectionItemViewSpaceBetween(onClickUpdate, disabled = disabled, minHeight = TextFieldDefaults.MinHeight) {
-        Text(generalGetString(R.string.update_database_passphrase), color = if (disabled) MaterialTheme.colors.secondary else MaterialTheme.colors.primary)
+        Text(generalGetString(R.string.update_database_passphrase), color = if (disabled) HighOrLowlight else MaterialTheme.colors.primary)
      }
    }

@@ -234,7 +245,6 @@ fun DatabaseEncryptionLayout(
        SectionTextFooter(generalGetString(R.string.impossible_to_recover_passphrase))
      }
    }
-    SectionBottomSpacer()
  }
 }

@@ -244,7 +254,7 @@ fun encryptDatabaseSavedAlert(onConfirm: () -> Unit) {
    text = generalGetString(R.string.database_will_be_encrypted_and_passphrase_stored) + "\n" + storeSecurelySaved(),
    confirmText = generalGetString(R.string.encrypt_database),
    onConfirm = onConfirm,
-    destructive = true,
+    destructive = false,
  )
 }

@@ -290,9 +300,9 @@ fun SavePassphraseSetting(
  SectionItemView(minHeight = minHeight) {
    Row(verticalAlignment = Alignment.CenterVertically) {
      Icon(
-        if (storedKey) painterResource(R.drawable.ic_vpn_key_filled) else painterResource(R.drawable.ic_vpn_key_off_filled),
+        if (storedKey) Icons.Filled.VpnKey else Icons.Filled.VpnKeyOff,
        stringResource(R.string.save_passphrase_in_keychain),
-        tint = if (storedKey) SimplexGreen else MaterialTheme.colors.secondary
+        tint = if (storedKey) SimplexGreen else HighOrLowlight
      )
      Spacer(Modifier.padding(horizontal = 4.dp))
      Text(
@@ -301,9 +311,13 @@ fun SavePassphraseSetting(
        color = Color.Unspecified
      )
      Spacer(Modifier.fillMaxWidth().weight(1f))
-      DefaultSwitch(
+      Switch(
        checked = useKeychain,
        onCheckedChange = onCheckedChange,
+        colors = SwitchDefaults.colors(
+          checkedThumbColor = MaterialTheme.colors.primary,
+          uncheckedThumbColor = HighOrLowlight
+        ),
        enabled = !initialRandomDBPassphrase && !progressIndicator
      )
    }
@@ -352,15 +366,15 @@ fun PassphraseField(
  showStrength: Boolean = false,
  isValid: (String) -> Boolean,
  keyboardActions: KeyboardActions = KeyboardActions(),
-  dependsOn: State<Any?>? = null,
+  dependsOn: MutableState<String>? = null,
 ) {
  var valid by remember { mutableStateOf(validKey(key.value)) }
  var showKey by remember { mutableStateOf(false) }
  val icon = if (valid) {
-    if (showKey) painterResource(R.drawable.ic_visibility_off_filled) else painterResource(R.drawable.ic_visibility_filled)
-  } else painterResource(R.drawable.ic_error)
+    if (showKey) Icons.Filled.VisibilityOff else Icons.Filled.Visibility
+  } else Icons.Outlined.Error
  val iconColor = if (valid) {
-    if (showStrength && key.value.isNotEmpty()) PassphraseStrength.check(key.value).color else MaterialTheme.colors.secondary
+    if (showStrength && key.value.isNotEmpty()) PassphraseStrength.check(key.value).color else HighOrLowlight
  } else Color.Red
  val keyboard = LocalSoftwareKeyboardController.current
  val keyboardOptions = KeyboardOptions(
@@ -417,7 +431,7 @@ fun PassphraseField(
      TextFieldDefaults.TextFieldDecorationBox(
        value = state.value.text,
        innerTextField = innerTextField,
-        placeholder = { Text(placeholder, color = MaterialTheme.colors.secondary) },
+        placeholder = { Text(placeholder, color = HighOrLowlight) },
        singleLine = true,
        enabled = enabled,
        isError = !valid,
@@ -465,7 +479,7 @@ private fun passphraseEntropy(s: String): Double {
  return s.length * log2(poolSize.toDouble())
 }

-enum class PassphraseStrength(val color: Color) {
+private enum class PassphraseStrength(val color: Color) {
  VERY_WEAK(Color.Red), WEAK(WarningOrange), REASONABLE(WarningYellow), STRONG(SimplexGreen);

  companion object {
@@ -508,4 +522,4 @@ fun PreviewDatabaseEncryptionLayout() {
      onConfirmEncrypt = {},
    )
  }
-}
+}
--- a/apps/android/app/src/main/java/chat/simplex/app/views/database/DatabaseErrorView.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/database/DatabaseErrorView.kt
@@ -1,6 +1,5 @@
 package chat.simplex.app.views.database

-import SectionBottomSpacer
 import SectionSpacer
 import SectionView
 import android.content.Context
@@ -39,7 +38,7 @@ fun DatabaseErrorView(
 ) {
  val progressIndicator = remember { mutableStateOf(false) }
  val dbKey = remember { mutableStateOf("") }
-  var storedDBKey by remember { mutableStateOf(DatabaseUtils.ksDatabasePassword.get()) }
+  var storedDBKey by remember { mutableStateOf(DatabaseUtils.getDatabaseKey()) }
  var useKeychain by remember { mutableStateOf(appPreferences.storeDBPassphrase.get()) }
  val context = LocalContext.current
  val restoreDbFromBackup = remember { mutableStateOf(shouldShowRestoreDbButton(appPreferences, context)) }
@@ -50,7 +49,7 @@ fun DatabaseErrorView(
  }

  fun saveAndRunChatOnClick() {
-    DatabaseUtils.ksDatabasePassword.set(dbKey.value)
+    DatabaseUtils.setDatabaseKey(dbKey.value)
    storedDBKey = dbKey.value
    appPreferences.storeDBPassphrase.set(true)
    useKeychain = true
@@ -62,7 +61,7 @@ fun DatabaseErrorView(
  fun DatabaseErrorDetails(@StringRes title: Int, content: @Composable ColumnScope.() -> Unit) {
    Text(
      generalGetString(title),
-      Modifier.padding(start = DEFAULT_PADDING, top = DEFAULT_PADDING, bottom = DEFAULT_PADDING),
+      Modifier.padding(start = 16.dp, top = 16.dp, bottom = 16.dp),
      style = MaterialTheme.typography.h1
    )
    SectionView(null, padding = PaddingValues(horizontal = DEFAULT_PADDING, vertical = DEFAULT_PADDING_HALF), content)
@@ -80,6 +79,7 @@ fun DatabaseErrorView(

  Column(
    Modifier.fillMaxSize().verticalScroll(rememberScrollState()),
+    horizontalAlignment = Alignment.Start,
    verticalArrangement = Arrangement.Center,
  ) {
    val buttonEnabled = validKey(dbKey.value) && !progressIndicator.value
@@ -158,7 +158,7 @@ fun DatabaseErrorView(
    if (restoreDbFromBackup.value) {
      SectionSpacer()
      Text(generalGetString(R.string.database_backup_can_be_restored))
-      Spacer(Modifier.size(DEFAULT_PADDING))
+      Spacer(Modifier.size(16.dp))
      RestoreDbButton {
        AlertManager.shared.showAlertDialog(
          title = generalGetString(R.string.restore_database_alert_title),
@@ -169,7 +169,6 @@ fun DatabaseErrorView(
        )
      }
    }
-    SectionBottomSpacer()
  }
  if (progressIndicator.value) {
    Box(
@@ -180,7 +179,7 @@ fun DatabaseErrorView(
        Modifier
          .padding(horizontal = 2.dp)
          .size(30.dp),
-        color = MaterialTheme.colors.secondary,
+        color = HighOrLowlight,
        strokeWidth = 2.5.dp
      )
    }
--- a/apps/android/app/src/main/java/chat/simplex/app/views/database/DatabaseView.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/database/DatabaseView.kt
@@ -1,9 +1,9 @@
 package chat.simplex.app.views.database

-import SectionBottomSpacer
-import SectionDividerSpaced
+import SectionDivider
 import SectionTextFooter
 import SectionItemView
+import SectionSpacer
 import SectionView
 import android.content.Context
 import android.content.res.Configuration
@@ -17,12 +17,14 @@ import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.*
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.*
+import androidx.compose.material.icons.outlined.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.*
 import androidx.compose.ui.text.font.FontWeight
@@ -50,7 +52,7 @@ fun DatabaseView(
 ) {
  val context = LocalContext.current
  val progressIndicator = remember { mutableStateOf(false) }
-  val runChat = remember { m.chatRunning }
+  val runChat = remember { mutableStateOf(m.chatRunning.value ?: true) }
  val prefs = m.controller.appPrefs
  val useKeychain = remember { mutableStateOf(prefs.storeDBPassphrase.get()) }
  val chatArchiveName = remember { mutableStateOf(prefs.chatArchiveName.get()) }
@@ -64,6 +66,7 @@ fun DatabaseView(
      importArchiveAlert(m, context, uri, appFilesCountAndSize, progressIndicator)
    }
  }
+  val chatDbDeleted = remember { m.chatDbDeleted }
  LaunchedEffect(m.chatRunning) {
    runChat.value = m.chatRunning.value ?: true
  }
@@ -73,7 +76,7 @@ fun DatabaseView(
  ) {
    DatabaseLayout(
      progressIndicator.value,
-      runChat.value != false,
+      runChat.value,
      m.chatDbChanged.value,
      useKeychain.value,
      m.chatDbEncrypted.value,
@@ -82,6 +85,7 @@ fun DatabaseView(
      chatArchiveName,
      chatArchiveTime,
      chatLastStart,
+      chatDbDeleted.value,
      m.controller.appPrefs.privacyFullBackup,
      appFilesCountAndSize,
      chatItemTTL,
@@ -112,7 +116,7 @@ fun DatabaseView(
          Modifier
            .padding(horizontal = 2.dp)
            .size(30.dp),
-          color = MaterialTheme.colors.secondary,
+          color = HighOrLowlight,
          strokeWidth = 2.5.dp
        )
      }
@@ -132,6 +136,7 @@ fun DatabaseLayout(
  chatArchiveName: MutableState<String?>,
  chatArchiveTime: MutableState<Instant?>,
  chatLastStart: MutableState<Instant?>,
+  chatDbDeleted: Boolean,
  privacyFullBackup: SharedPreference<Boolean>,
  appFilesCountAndSize: MutableState<Pair<Int, Long>>,
  chatItemTTL: MutableState<ChatItemTTL>,
@@ -149,12 +154,13 @@ fun DatabaseLayout(
  val operationsDisabled = !stopped || progressIndicator

  Column(
-    Modifier.fillMaxWidth().verticalScroll(rememberScrollState()),
+    Modifier.fillMaxWidth().verticalScroll(rememberScrollState()).padding(bottom = DEFAULT_BOTTOM_PADDING),
+    horizontalAlignment = Alignment.Start,
  ) {
    AppBarTitle(stringResource(R.string.your_chat_database))

    SectionView(stringResource(R.string.messages_section_title).uppercase()) {
-      TtlOptions(chatItemTTL, enabled = rememberUpdatedState(!stopped && !progressIndicator), onChatItemTTLSelected)
+      SectionItemView { TtlOptions(chatItemTTL, enabled = rememberUpdatedState(!progressIndicator && !chatDbChanged), onChatItemTTLSelected) }
    }
    SectionTextFooter(
      remember(currentUser?.displayName) {
@@ -167,28 +173,27 @@ fun DatabaseLayout(
        }
      }
    )
-    SectionDividerSpaced(maxTopPadding = true)
+    SectionSpacer()

    SectionView(stringResource(R.string.run_chat_section)) {
-      RunChatSetting(runChat, stopped, startChat, stopChatAlert)
+      RunChatSetting(runChat, stopped, chatDbDeleted, startChat, stopChatAlert)
    }
-    SectionDividerSpaced()
+    SectionSpacer()

    SectionView(stringResource(R.string.chat_database_section)) {
      val unencrypted = chatDbEncrypted == false
      SettingsActionItem(
-        if (unencrypted) painterResource(R.drawable.ic_lock_open) else if (useKeyChain) painterResource(R.drawable.ic_vpn_key_filled)
-        else painterResource(R
-          .drawable.ic_lock),
+        if (unencrypted) Icons.Outlined.LockOpen else if (useKeyChain) Icons.Filled.VpnKey else Icons.Outlined.Lock,
        stringResource(R.string.database_passphrase),
        click = showSettingsModal() { DatabaseEncryptionView(it) },
-        iconColor = if (unencrypted) WarningOrange else MaterialTheme.colors.secondary,
+        iconColor = if (unencrypted) WarningOrange else HighOrLowlight,
        disabled = operationsDisabled
      )
+      SectionDivider()
      AppDataBackupPreference(privacyFullBackup, initialRandomDBPassphrase)
-      SectionDividerSpaced(maxBottomPadding = false)
+      SectionDivider()
      SettingsActionItem(
-        painterResource(R.drawable.ic_ios_share),
+        Icons.Outlined.IosShare,
        stringResource(R.string.export_database),
        click = {
          if (initialRandomDBPassphrase.get()) {
@@ -201,28 +206,31 @@ fun DatabaseLayout(
        iconColor = MaterialTheme.colors.primary,
        disabled = operationsDisabled
      )
+      SectionDivider()
      SettingsActionItem(
-        painterResource(R.drawable.ic_download),
+        Icons.Outlined.FileDownload,
        stringResource(R.string.import_database),
        { importArchiveLauncher.launch("application/zip") },
        textColor = Color.Red,
        iconColor = Color.Red,
        disabled = operationsDisabled
      )
+      SectionDivider()
      val chatArchiveNameVal = chatArchiveName.value
      val chatArchiveTimeVal = chatArchiveTime.value
      val chatLastStartVal = chatLastStart.value
      if (chatArchiveNameVal != null && chatArchiveTimeVal != null && chatLastStartVal != null) {
        val title = chatArchiveTitle(chatArchiveTimeVal, chatLastStartVal)
        SettingsActionItem(
-          painterResource(R.drawable.ic_inventory_2),
+          Icons.Outlined.Inventory2,
          title,
          click = showSettingsModal { ChatArchiveView(it, title, chatArchiveNameVal, chatArchiveTimeVal) },
          disabled = operationsDisabled
        )
+        SectionDivider()
      }
      SettingsActionItem(
-        painterResource(R.drawable.ic_delete_forever),
+        Icons.Outlined.DeleteForever,
        stringResource(R.string.delete_database),
        deleteChatAlert,
        textColor = Color.Red,
@@ -237,7 +245,7 @@ fun DatabaseLayout(
        stringResource(R.string.stop_chat_to_enable_database_actions)
      }
    )
-    SectionDividerSpaced(maxTopPadding = true)
+    SectionSpacer()

    SectionView(stringResource(R.string.files_and_media_section).uppercase()) {
      val deleteFilesDisabled = operationsDisabled || appFilesCountAndSize.value.first == 0
@@ -247,7 +255,7 @@ fun DatabaseLayout(
      ) {
        Text(
          stringResource(if (users.size > 1) R.string.delete_files_and_media_for_all_users else R.string.delete_files_and_media_all),
-          color = if (deleteFilesDisabled) MaterialTheme.colors.secondary else Color.Red
+          color = if (deleteFilesDisabled) HighOrLowlight else Color.Red
        )
      }
    }
@@ -259,23 +267,35 @@ fun DatabaseLayout(
        String.format(stringResource(R.string.total_files_count_and_size), count, formatBytes(size))
      }
    )
-    SectionBottomSpacer()
  }
 }

@Composable
 private fun AppDataBackupPreference(privacyFullBackup: SharedPreference<Boolean>, initialRandomDBPassphrase: SharedPreference<Boolean>) {
-  SettingsPreferenceItem(
-    painterResource(R.drawable.ic_backup),
-    iconColor = MaterialTheme.colors.secondary,
-    pref = privacyFullBackup,
-    text = stringResource(R.string.full_backup)
-  ) {
-    if (initialRandomDBPassphrase.get()) {
-      exportProhibitedAlert()
-      privacyFullBackup.set(false)
-    } else {
-      privacyFullBackup.set(it)
+  SectionItemView {
+    Row(verticalAlignment = Alignment.CenterVertically) {
+      Icon(Icons.Outlined.Backup, stringResource(R.string.full_backup), tint = HighOrLowlight)
+      Spacer(Modifier.padding(horizontal = 4.dp))
+      val prefState = remember { mutableStateOf(privacyFullBackup.get()) }
+      Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) {
+        Text(stringResource(R.string.full_backup), Modifier.padding(end = 24.dp))
+        Spacer(Modifier.fillMaxWidth().weight(1f))
+        Switch(
+          checked = prefState.value,
+          onCheckedChange = {
+            if (initialRandomDBPassphrase.get()) {
+              exportProhibitedAlert()
+            } else {
+              privacyFullBackup.set(it)
+              prefState.value = it
+            }
+          },
+          colors = SwitchDefaults.colors(
+            checkedThumbColor = MaterialTheme.colors.primary,
+            uncheckedThumbColor = HighOrLowlight
+          )
+        )
+      }
    }
  }
 }
@@ -291,8 +311,7 @@ private fun setChatItemTTLAlert(
    text = generalGetString(R.string.enable_automatic_deletion_message),
    confirmText = generalGetString(R.string.delete_messages),
    onConfirm = { setCiTTL(m, selectedChatItemTTL, progressIndicator, appFilesCountAndSize, context) },
-    onDismiss = { selectedChatItemTTL.value = m.chatItemTTL.value },
-    destructive = true,
+    onDismiss = { selectedChatItemTTL.value = m.chatItemTTL.value }
  )
 }

@@ -327,25 +346,40 @@ private fun TtlOptions(current: State<ChatItemTTL>, enabled: State<Boolean>, onS
 fun RunChatSetting(
  runChat: Boolean,
  stopped: Boolean,
+  chatDbDeleted: Boolean,
  startChat: () -> Unit,
  stopChatAlert: () -> Unit
 ) {
-  val chatRunningText = if (stopped) stringResource(R.string.chat_is_stopped) else stringResource(R.string.chat_is_running)
-  SettingsActionItemWithContent(
-    icon = if (stopped) painterResource(R.drawable.ic_report_filled) else painterResource(R.drawable.ic_play_arrow_filled),
-    text = chatRunningText,
-    iconColor = if (stopped) Color.Red else MaterialTheme.colors.primary,
-  ) {
-    DefaultSwitch(
-      checked = runChat,
-      onCheckedChange = { runChatSwitch ->
-        if (runChatSwitch) {
-          startChat()
-        } else {
-          stopChatAlert()
-        }
-      },
-    )
+  SectionItemView() {
+    Row(verticalAlignment = Alignment.CenterVertically) {
+      val chatRunningText = if (stopped) stringResource(R.string.chat_is_stopped) else stringResource(R.string.chat_is_running)
+      Icon(
+        if (stopped) Icons.Filled.Report else Icons.Filled.PlayArrow,
+        chatRunningText,
+        tint = if (stopped) Color.Red else MaterialTheme.colors.primary
+      )
+      Spacer(Modifier.padding(horizontal = 4.dp))
+      Text(
+        chatRunningText,
+        Modifier.padding(end = 24.dp)
+      )
+      Spacer(Modifier.fillMaxWidth().weight(1f))
+      Switch(
+        enabled = !chatDbDeleted,
+        checked = runChat,
+        onCheckedChange = { runChatSwitch ->
+          if (runChatSwitch) {
+            startChat()
+          } else {
+            stopChatAlert()
+          }
+        },
+        colors = SwitchDefaults.colors(
+          checkedThumbColor = MaterialTheme.colors.primary,
+          uncheckedThumbColor = HighOrLowlight
+        ),
+      )
+    }
  }
 }

@@ -354,7 +388,7 @@ fun chatArchiveTitle(chatArchiveTime: Instant, chatLastStart: Instant): String {
  return stringResource(if (chatArchiveTime < chatLastStart) R.string.old_database_archive else R.string.new_database_archive)
 }

-private fun startChat(m: ChatModel, runChat: MutableState<Boolean?>, chatLastStart: MutableState<Instant?>, chatDbChanged: MutableState<Boolean>) {
+private fun startChat(m: ChatModel, runChat: MutableState<Boolean>, chatLastStart: MutableState<Instant?>, chatDbChanged: MutableState<Boolean>) {
  withApi {
    try {
      if (chatDbChanged.value) {
@@ -366,14 +400,9 @@ private fun startChat(m: ChatModel, runChat: MutableState<Boolean?>, chatLastSta
        ModalManager.shared.closeModals()
        return@withApi
      }
-      if (m.currentUser.value == null) {
-        ModalManager.shared.closeModals()
-        return@withApi
-      } else {
-        m.controller.apiStartChat()
-        runChat.value = true
-        m.chatRunning.value = true
-      }
+      m.controller.apiStartChat()
+      runChat.value = true
+      m.chatRunning.value = true
      val ts = Clock.System.now()
      m.controller.appPrefs.chatLastStart.set(ts)
      chatLastStart.value = ts
@@ -388,7 +417,7 @@ private fun startChat(m: ChatModel, runChat: MutableState<Boolean?>, chatLastSta
  }
 }

-private fun stopChatAlert(m: ChatModel, runChat: MutableState<Boolean?>, context: Context) {
+private fun stopChatAlert(m: ChatModel, runChat: MutableState<Boolean>, context: Context) {
  AlertManager.shared.showAlertDialog(
    title = generalGetString(R.string.stop_chat_question),
    text = generalGetString(R.string.stop_chat_to_export_import_or_delete_chat_database),
@@ -405,21 +434,20 @@ private fun exportProhibitedAlert() {
  )
 }

-private fun authStopChat(m: ChatModel, runChat: MutableState<Boolean?>, context: Context) {
+private fun authStopChat(m: ChatModel, runChat: MutableState<Boolean>, context: Context) {
  if (m.controller.appPrefs.performLA.get()) {
    authenticate(
      generalGetString(R.string.auth_stop_chat),
      generalGetString(R.string.auth_log_in_using_credential),
-      activity = context as FragmentActivity,
+      context as FragmentActivity,
      completed = { laResult ->
        when (laResult) {
-          LAResult.Success, is LAResult.Unavailable -> {
+          LAResult.Success, LAResult.Unavailable -> {
            stopChat(m, runChat, context)
          }
          is LAResult.Error -> {
-            runChat.value = true
          }
-          is LAResult.Failed -> {
+          LAResult.Failed -> {
            runChat.value = true
          }
        }
@@ -430,31 +458,21 @@ private fun authStopChat(m: ChatModel, runChat: MutableState<Boolean?>, context:
  }
 }

-private fun stopChat(m: ChatModel, runChat: MutableState<Boolean?>, context: Context) {
+private fun stopChat(m: ChatModel, runChat: MutableState<Boolean>, context: Context) {
  withApi {
    try {
+      m.controller.apiStopChat()
      runChat.value = false
-      stopChatAsync(m)
-      SimplexService.safeStopService(SimplexApp.context)
+      m.chatRunning.value = false
+      SimplexService.safeStopService(context)
      MessagesFetcherWorker.cancelAll()
    } catch (e: Error) {
      runChat.value = true
-      AlertManager.shared.showAlertMsg(generalGetString(R.string.error_stopping_chat), e.toString())
+      AlertManager.shared.showAlertMsg(generalGetString(R.string.error_starting_chat), e.toString())
    }
  }
 }

-suspend fun stopChatAsync(m: ChatModel) {
-  m.controller.apiStopChat()
-  m.chatRunning.value = false
-}
-
-suspend fun deleteChatAsync(m: ChatModel) {
-  m.controller.apiDeleteStorage()
-  DatabaseUtils.ksDatabasePassword.remove()
-  m.controller.appPrefs.storeDBPassphrase.set(true)
-}
-
 private fun exportArchive(
  context: Context,
  m: ChatModel,
@@ -554,8 +572,7 @@ private fun importArchiveAlert(
    title = generalGetString(R.string.import_database_question),
    text = generalGetString(R.string.your_current_chat_database_will_be_deleted_and_replaced_with_the_imported_one),
    confirmText = generalGetString(R.string.import_database_confirmation),
-    onConfirm = { importArchive(m, context, importedArchiveUri, appFilesCountAndSize, progressIndicator) },
-    destructive = true,
+    onConfirm = { importArchive(m, context, importedArchiveUri, appFilesCountAndSize, progressIndicator) }
  )
 }

@@ -575,7 +592,7 @@ private fun importArchive(
        try {
          val config = ArchiveConfig(archivePath, parentTempDirectory = context.cacheDir.toString())
          m.controller.apiImportArchive(config)
-          DatabaseUtils.ksDatabasePassword.remove()
+          DatabaseUtils.removeDatabaseKey()
          appFilesCountAndSize.value = directoryFileCountAndSize(getAppFilesDirectory(context))
          operationEnded(m, progressIndicator) {
            AlertManager.shared.showAlertMsg(generalGetString(R.string.chat_database_imported), generalGetString(R.string.restart_the_app_to_use_imported_chat_database))
@@ -620,8 +637,7 @@ private fun deleteChatAlert(m: ChatModel, progressIndicator: MutableState<Boolea
    title = generalGetString(R.string.delete_chat_profile_question),
    text = generalGetString(R.string.delete_chat_profile_action_cannot_be_undone_warning),
    confirmText = generalGetString(R.string.delete_verb),
-    onConfirm = { deleteChat(m, progressIndicator) },
-    destructive = true,
+    onConfirm = { deleteChat(m, progressIndicator) }
  )
 }

@@ -629,7 +645,10 @@ private fun deleteChat(m: ChatModel, progressIndicator: MutableState<Boolean>) {
  progressIndicator.value = true
  withApi {
    try {
-      deleteChatAsync(m)
+      m.controller.apiDeleteStorage()
+      m.chatDbDeleted.value = true
+      DatabaseUtils.removeDatabaseKey()
+      m.controller.appPrefs.storeDBPassphrase.set(true)
      operationEnded(m, progressIndicator) {
        AlertManager.shared.showAlertMsg(generalGetString(R.string.chat_database_deleted), generalGetString(R.string.restart_the_app_to_create_a_new_chat_profile))
      }
@@ -724,6 +743,7 @@ fun PreviewDatabaseLayout() {
      chatArchiveName = remember { mutableStateOf("dummy_archive") },
      chatArchiveTime = remember { mutableStateOf(Clock.System.now()) },
      chatLastStart = remember { mutableStateOf(Clock.System.now()) },
+      chatDbDeleted = false,
      privacyFullBackup = SharedPreference({ true }, {}),
      appFilesCountAndSize = remember { mutableStateOf(0 to 0L) },
      chatItemTTL = remember { mutableStateOf(ChatItemTTL.None) },
--- a/apps/android/app/src/main/java/chat/simplex/app/views/helpers/AlertManager.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/helpers/AlertManager.kt
@@ -3,15 +3,13 @@ package chat.simplex.app.views.helpers
 import android.util.Log
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.shape.CornerSize
-import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.AnnotatedString
-import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.*
 import androidx.compose.ui.window.Dialog
 import chat.simplex.app.R
@@ -35,13 +33,13 @@ class AlertManager {
    text: String? = null,
    buttons: @Composable () -> Unit,
  ) {
+    val alertText: (@Composable () -> Unit)? = if (text == null) null else { -> Text(text) }
    showAlert {
      AlertDialog(
        onDismissRequest = this::hideAlert,
-        title = alertTitle(title),
-        text = alertText(text),
-        buttons = buttons,
-        shape = RoundedCornerShape(corner = CornerSize(25.dp))
+        title = { Text(title) },
+        text = alertText,
+        buttons = buttons
      )
    }
  }
@@ -53,21 +51,22 @@ class AlertManager {
  ) {
    showAlert {
      Dialog(onDismissRequest = this::hideAlert) {
-        Column(
-          Modifier
-            .background(MaterialTheme.colors.surface, RoundedCornerShape(corner = CornerSize(25.dp)))
-            .padding(bottom = DEFAULT_PADDING)
-        ) {
-          Text(
-            title,
-            Modifier.fillMaxWidth().padding(vertical = DEFAULT_PADDING),
-            textAlign = TextAlign.Center,
-            fontSize = 20.sp
+        Column(Modifier.background(MaterialTheme.colors.background, MaterialTheme.shapes.medium)) {
+          Text(title,
+            Modifier.padding(start = DEFAULT_PADDING, end = DEFAULT_PADDING, top = DEFAULT_PADDING, bottom = if (text == null) DEFAULT_PADDING else DEFAULT_PADDING_HALF),
+            fontSize = 15.sp,
+            fontWeight = FontWeight.SemiBold
          )
-          CompositionLocalProvider(LocalContentAlpha provides ContentAlpha.high) {
-            if (text != null) {
-              Text(text, Modifier.fillMaxWidth().padding(start = DEFAULT_PADDING, end = DEFAULT_PADDING, bottom = DEFAULT_PADDING * 1.5f), fontSize = 16.sp, textAlign = TextAlign.Center, color = MaterialTheme.colors.secondary)
+          if (text != null) {
+            CompositionLocalProvider(LocalContentAlpha provides ContentAlpha.high) {
+              Text(
+                text,
+                Modifier.padding(start = DEFAULT_PADDING, end = DEFAULT_PADDING, bottom = DEFAULT_PADDING),
+                fontSize = 14.sp,
+              )
            }
+          }
+          CompositionLocalProvider(LocalContentAlpha provides ContentAlpha.high) {
            buttons()
          }
        }
@@ -85,27 +84,24 @@ class AlertManager {
    onDismissRequest: (() -> Unit)? = null,
    destructive: Boolean = false
  ) {
+    val alertText: (@Composable () -> Unit)? = if (text == null) null else { -> Text(text) }
    showAlert {
      AlertDialog(
        onDismissRequest = { onDismissRequest?.invoke(); hideAlert() },
-        title = alertTitle(title),
-        text = alertText(text),
-        buttons = {
-          Row (
-            Modifier.fillMaxWidth().padding(horizontal = DEFAULT_PADDING).padding(bottom = DEFAULT_PADDING_HALF),
-            horizontalArrangement = Arrangement.SpaceBetween
-          ) {
-            TextButton(onClick = {
-              onDismiss?.invoke()
-              hideAlert()
-            }) { Text(dismissText) }
-            TextButton(onClick = {
-              onConfirm?.invoke()
-              hideAlert()
-            }) { Text(confirmText, color = if (destructive) MaterialTheme.colors.error else Color.Unspecified) }
-          }
+        title = { Text(title) },
+        text = alertText,
+        confirmButton = {
+          TextButton(onClick = {
+            onConfirm?.invoke()
+            hideAlert()
+          }) { Text(confirmText, color = if (destructive) MaterialTheme.colors.error else Color.Unspecified) }
        },
-        shape = RoundedCornerShape(corner = CornerSize(25.dp))
+        dismissButton = {
+          TextButton(onClick = {
+            onDismiss?.invoke()
+            hideAlert()
+          }) { Text(dismissText) }
+        }
      )
    }
  }
@@ -120,15 +116,16 @@ class AlertManager {
    onDismissRequest: (() -> Unit)? = null,
    destructive: Boolean = false
  ) {
+    val alertText: (@Composable () -> Unit)? = if (text == null) null else { -> Text(text) }
    showAlert {
      AlertDialog(
        onDismissRequest = { onDismissRequest?.invoke(); hideAlert() },
-        title = alertTitle(title),
-        text = alertText(text),
+        title = { Text(title) },
+        text = alertText,
        buttons = {
          Column(
-            Modifier.fillMaxWidth().padding(horizontal = DEFAULT_PADDING_HALF).padding(top = DEFAULT_PADDING, bottom = 2.dp),
-            horizontalAlignment = Alignment.CenterHorizontally
+            Modifier.fillMaxWidth().padding(horizontal = 8.dp).padding(top = 16.dp, bottom = 2.dp),
+            horizontalAlignment = Alignment.End
          ) {
            TextButton(onClick = {
              onDismiss?.invoke()
@@ -137,42 +134,39 @@ class AlertManager {
            TextButton(onClick = {
              onConfirm?.invoke()
              hideAlert()
-            }) { Text(confirmText, color = if (destructive) Color.Red else Color.Unspecified, textAlign = TextAlign.End) }
+            }) { Text(confirmText, color = if (destructive) MaterialTheme.colors.error else Color.Unspecified) }
          }
        },
-        shape = RoundedCornerShape(corner = CornerSize(25.dp))
      )
    }
  }

  fun showAlertMsg(
    title: String, text: String? = null,
-    confirmText: String = generalGetString(R.string.ok)
+    confirmText: String = generalGetString(R.string.ok), onConfirm: (() -> Unit)? = null
  ) {
+    val alertText: (@Composable () -> Unit)? = if (text == null) null else { -> Text(text) }
    showAlert {
      AlertDialog(
        onDismissRequest = this::hideAlert,
-        title = alertTitle(title),
-        text = alertText(text),
-        buttons = {
-          Row(
-            Modifier.fillMaxWidth().padding(horizontal = DEFAULT_PADDING).padding(bottom = DEFAULT_PADDING_HALF),
-            horizontalArrangement = Arrangement.Center
-          ) {
-            TextButton(onClick = {
-              hideAlert()
-            }) { Text(confirmText, color = Color.Unspecified) }
-          }
-        },
-        shape = RoundedCornerShape(corner = CornerSize(25.dp))
+        title = { Text(title) },
+        text = alertText,
+        confirmButton = {
+          TextButton(onClick = {
+            onConfirm?.invoke()
+            hideAlert()
+          }) { Text(confirmText) }
+        }
      )
    }
  }
+
  fun showAlertMsg(
    title: Int,
    text: Int? = null,
    confirmText: Int = R.string.ok,
-  ) = showAlertMsg(generalGetString(title), if (text != null) generalGetString(text) else null, generalGetString(confirmText))
+    onConfirm: (() -> Unit)? = null
+  ) = showAlertMsg(generalGetString(title), if (text != null) generalGetString(text) else null, generalGetString(confirmText), onConfirm)

  @Composable
  fun showInView() {
@@ -183,30 +177,3 @@ class AlertManager {
    val shared = AlertManager()
  }
 }
-
-private fun alertTitle(title: String): (@Composable () -> Unit)? {
-  return {
-    Text(
-      title,
-      Modifier.fillMaxWidth(),
-      textAlign = TextAlign.Center,
-      fontSize = 20.sp
-    )
-  }
-}
-
-private fun alertText(text: String?): (@Composable () -> Unit)? {
-  return if (text == null) {
-    null
-  } else {
-    ({
-      Text(
-        text,
-        Modifier.fillMaxWidth(),
-        textAlign = TextAlign.Center,
-        fontSize = 16.sp,
-        color = MaterialTheme.colors.secondary
-      )
-    })
-  }
-}
--- a/apps/android/app/src/main/java/chat/simplex/app/views/helpers/ChatInfoImage.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/helpers/ChatInfoImage.kt
@@ -5,12 +5,15 @@ import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.Icon
 import androidx.compose.material.MaterialTheme
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.*
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
-import androidx.compose.ui.graphics.*
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.asImageBitmap
+import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.layout.ContentScale
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.Dp
@@ -20,18 +23,18 @@ import chat.simplex.app.model.ChatInfo
 import chat.simplex.app.ui.theme.SimpleXTheme

@Composable
-fun ChatInfoImage(chatInfo: ChatInfo, size: Dp, iconColor: Color = MaterialTheme.colors.secondaryVariant) {
+fun ChatInfoImage(chatInfo: ChatInfo, size: Dp, iconColor: Color = MaterialTheme.colors.secondary) {
  val icon =
-    if (chatInfo is ChatInfo.Group) R.drawable.ic_supervised_user_circle_filled
-                                    else R.drawable.ic_account_circle_filled
+    if (chatInfo is ChatInfo.Group) Icons.Filled.SupervisedUserCircle
+                                    else Icons.Filled.AccountCircle
  ProfileImage(size, chatInfo.image, icon, iconColor)
 }

@Composable
-fun IncognitoImage(size: Dp, iconColor: Color = MaterialTheme.colors.secondaryVariant) {
+fun IncognitoImage(size: Dp, iconColor: Color = MaterialTheme.colors.secondary) {
  Box(Modifier.size(size)) {
    Icon(
-      painterResource(R.drawable.ic_theater_comedy_filled), stringResource(R.string.incognito),
+      Icons.Filled.TheaterComedy, stringResource(R.string.incognito),
      modifier = Modifier.size(size).padding(size / 12),
      iconColor
    )
@@ -42,31 +45,17 @@ fun IncognitoImage(size: Dp, iconColor: Color = MaterialTheme.colors.secondaryVa
 fun ProfileImage(
  size: Dp,
  image: String? = null,
-  icon: Int = R.drawable.ic_account_circle_filled,
-  color: Color = MaterialTheme.colors.secondaryVariant
+  icon: ImageVector = Icons.Filled.AccountCircle,
+  color: Color = MaterialTheme.colors.secondary
 ) {
  Box(Modifier.size(size)) {
    if (image == null) {
-      val iconToReplace = when (icon) {
-        R.drawable.ic_account_circle_filled -> AccountCircleFilled
-        R.drawable.ic_supervised_user_circle_filled -> SupervisedUserCircleFilled
-        else -> null
-      }
-      if (iconToReplace != null) {
-        Icon(
-          iconToReplace,
-          contentDescription = stringResource(R.string.icon_descr_profile_image_placeholder),
-          tint = color,
-          modifier = Modifier.fillMaxSize()
-        )
-      } else {
-        Icon(
-          painterResource(icon),
-          contentDescription = stringResource(R.string.icon_descr_profile_image_placeholder),
-          tint = color,
-          modifier = Modifier.fillMaxSize()
-        )
-      }
+      Icon(
+        icon,
+        contentDescription = stringResource(R.string.icon_descr_profile_image_placeholder),
+        tint = color,
+        modifier = Modifier.fillMaxSize()
+      )
    } else {
      val imageBitmap = base64ToBitmap(image).asImageBitmap()
      Image(
@@ -79,7 +68,6 @@ fun ProfileImage(
  }
 }

-
@Preview
@Composable
 fun PreviewChatInfoImage() {
--- a/apps/android/app/src/main/java/chat/simplex/app/views/helpers/ChooseAttachmentView.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/helpers/ChooseAttachmentView.kt
@@ -1,29 +1,28 @@
 package chat.simplex.app.views.helpers

 import androidx.compose.foundation.layout.*
-import androidx.compose.material.MaterialTheme
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.*
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.MutableState
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.onFocusChanged
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import chat.simplex.app.R
 import chat.simplex.app.views.newchat.ActionButton

 sealed class AttachmentOption {
-  object CameraPhoto: AttachmentOption()
-  object GalleryImage: AttachmentOption()
-  object GalleryVideo: AttachmentOption()
-  object File: AttachmentOption()
+  object TakePhoto: AttachmentOption()
+  object PickImage: AttachmentOption()
+  object PickVideo: AttachmentOption()
+  object PickFile: AttachmentOption()
 }

@Composable
 fun ChooseAttachmentView(
  attachmentOption: MutableState<AttachmentOption?>,
+  allowVideoAttachment: Boolean,
  hide: () -> Unit
 ) {
  Box(
@@ -40,20 +39,22 @@ fun ChooseAttachmentView(
        .padding(horizontal = 8.dp, vertical = 30.dp),
      horizontalArrangement = Arrangement.SpaceEvenly
    ) {
-      ActionButton(Modifier.fillMaxWidth(0.25f), null, stringResource(R.string.use_camera_button), icon = painterResource(R.drawable.ic_camera_enhance)) {
-        attachmentOption.value = AttachmentOption.CameraPhoto
+      ActionButton(null, stringResource(R.string.use_camera_button), icon = Icons.Outlined.PhotoCamera) {
+        attachmentOption.value = AttachmentOption.TakePhoto
        hide()
      }
-      ActionButton(Modifier.fillMaxWidth(0.33f), null, stringResource(R.string.gallery_image_button), icon = painterResource(R.drawable.ic_add_photo)) {
-        attachmentOption.value = AttachmentOption.GalleryImage
+      ActionButton(null, stringResource(R.string.from_gallery_button), icon = Icons.Outlined.Collections) {
+        attachmentOption.value = AttachmentOption.PickImage
        hide()
      }
-      ActionButton(Modifier.fillMaxWidth(0.50f), null, stringResource(R.string.gallery_video_button), icon = painterResource(R.drawable.ic_smart_display)) {
-        attachmentOption.value = AttachmentOption.GalleryVideo
-        hide()
+      if (allowVideoAttachment) {
+        ActionButton(null, stringResource(R.string.from_gallery_button), icon = Icons.Outlined.Videocam) {
+          attachmentOption.value = AttachmentOption.PickVideo
+          hide()
+        }
      }
-      ActionButton(Modifier.fillMaxWidth(1f), null, stringResource(R.string.choose_file), icon = painterResource(R.drawable.ic_note_add)) {
-        attachmentOption.value = AttachmentOption.File
+      ActionButton(null, stringResource(R.string.choose_file), icon = Icons.Outlined.InsertDriveFile) {
+        attachmentOption.value = AttachmentOption.PickFile
        hide()
      }
    }
--- a/apps/android/app/src/main/java/chat/simplex/app/views/helpers/CloseSheetBar.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/helpers/CloseSheetBar.kt
@@ -3,21 +3,16 @@ package chat.simplex.app.views.helpers
 import android.content.res.Configuration
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.*
-import androidx.compose.runtime.*
+import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.geometry.Offset
-import androidx.compose.ui.graphics.Brush
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import chat.simplex.app.ui.theme.*

@Composable
-fun CloseSheetBar(close: (() -> Unit)?, endButtons: @Composable RowScope.() -> Unit = {}) {
+fun CloseSheetBar(close: () -> Unit, endButtons: @Composable RowScope.() -> Unit = {}) {
  Column(
    Modifier
      .fillMaxWidth()
@@ -33,7 +28,7 @@ fun CloseSheetBar(close: (() -> Unit)?, endButtons: @Composable RowScope.() -> U
          horizontalArrangement = Arrangement.SpaceBetween,
          verticalAlignment = Alignment.CenterVertically
        ) {
-          NavigationButtonBack(onButtonClicked = close)
+          NavigationButtonBack(close)
          Row {
            endButtons()
          }
@@ -44,22 +39,18 @@ fun CloseSheetBar(close: (() -> Unit)?, endButtons: @Composable RowScope.() -> U
 }

@Composable
-fun AppBarTitle(title: String, withPadding: Boolean = true, bottomPadding: Dp = DEFAULT_PADDING * 1.5f) {
-  val theme = CurrentColors.collectAsState()
-  val titleColor = CurrentColors.collectAsState().value.appColors.title
-  val brush = if (theme.value.base == DefaultTheme.SIMPLEX)
-    Brush.linearGradient(listOf(titleColor.darker(0.2f), titleColor.lighter(0.35f)), Offset(0f, Float.POSITIVE_INFINITY), Offset(Float.POSITIVE_INFINITY, 0f))
-  else // color is not updated when changing themes if I pass null here
-    Brush.linearGradient(listOf(titleColor, titleColor), Offset(0f, Float.POSITIVE_INFINITY), Offset(Float.POSITIVE_INFINITY, 0f))
+fun AppBarTitle(title: String, withPadding: Boolean = true) {
+  val padding = if (withPadding)
+    PaddingValues(start = DEFAULT_PADDING, end = DEFAULT_PADDING, bottom = DEFAULT_PADDING)
+  else
+    PaddingValues(bottom = DEFAULT_PADDING)
  Text(
    title,
    Modifier
      .fillMaxWidth()
-      .padding(bottom = bottomPadding, start = if (withPadding) DEFAULT_PADDING else 0.dp, end = if (withPadding) DEFAULT_PADDING else 0.dp,),
+      .padding(padding),
    overflow = TextOverflow.Ellipsis,
-    style = MaterialTheme.typography.h1.copy(brush = brush),
-    color = MaterialTheme.colors.primaryVariant,
-    textAlign = TextAlign.Center
+    style = MaterialTheme.typography.h1
  )
 }

--- a/apps/android/app/src/main/java/chat/simplex/app/views/helpers/CustomIcons.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/helpers/CustomIcons.kt
@@ -1,143 +0,0 @@
-package chat.simplex.app.views.helpers
-
-import androidx.compose.material.icons.materialIcon
-import androidx.compose.material.icons.materialPath
-import androidx.compose.ui.graphics.vector.*
-
-val AccountCircleFilled: ImageVector
-  get() {
-    if (_accountCircleFilled != null) {
-      return _accountCircleFilled!!
-    }
-    _accountCircleFilled = materialIcon(name = "Filled.AccountCircle") {
-      materialPath {
-        moveTo(12.0f, 2.0f)
-        curveTo(6.48f, 2.0f, 2.0f, 6.48f, 2.0f, 12.0f)
-        reflectiveCurveToRelative(4.48f, 10.0f, 10.0f, 10.0f)
-        reflectiveCurveToRelative(10.0f, -4.48f, 10.0f, -10.0f)
-        reflectiveCurveTo(17.52f, 2.0f, 12.0f, 2.0f)
-        close()
-        moveTo(12.0f, 5.0f)
-        curveToRelative(1.66f, 0.0f, 3.0f, 1.34f, 3.0f, 3.0f)
-        reflectiveCurveToRelative(-1.34f, 3.0f, -3.0f, 3.0f)
-        reflectiveCurveToRelative(-3.0f, -1.34f, -3.0f, -3.0f)
-        reflectiveCurveToRelative(1.34f, -3.0f, 3.0f, -3.0f)
-        close()
-        moveTo(12.0f, 19.2f)
-        curveToRelative(-2.5f, 0.0f, -4.71f, -1.28f, -6.0f, -3.22f)
-        curveToRelative(0.03f, -1.99f, 4.0f, -3.08f, 6.0f, -3.08f)
-        curveToRelative(1.99f, 0.0f, 5.97f, 1.09f, 6.0f, 3.08f)
-        curveToRelative(-1.29f, 1.94f, -3.5f, 3.22f, -6.0f, 3.22f)
-        close()
-      }
-    }
-    return _accountCircleFilled!!
-  }
-
-private var _accountCircleFilled: ImageVector? = null
-
-val SupervisedUserCircleFilled: ImageVector
-  get() {
-    if (_supervisedUserCircleFilled != null) {
-      return _supervisedUserCircleFilled!!
-    }
-    _supervisedUserCircleFilled = materialIcon(name = "Filled.SupervisedUserCircle") {
-      materialPath {
-        moveTo(11.99f, 2.0f)
-        curveToRelative(-5.52f, 0.0f, -10.0f, 4.48f, -10.0f, 10.0f)
-        reflectiveCurveToRelative(4.48f, 10.0f, 10.0f, 10.0f)
-        reflectiveCurveToRelative(10.0f, -4.48f, 10.0f, -10.0f)
-        reflectiveCurveToRelative(-4.48f, -10.0f, -10.0f, -10.0f)
-        close()
-        moveTo(15.6f, 8.34f)
-        curveToRelative(1.07f, 0.0f, 1.93f, 0.86f, 1.93f, 1.93f)
-        curveToRelative(0.0f, 1.07f, -0.86f, 1.93f, -1.93f, 1.93f)
-        curveToRelative(-1.07f, 0.0f, -1.93f, -0.86f, -1.93f, -1.93f)
-        curveToRelative(-0.01f, -1.07f, 0.86f, -1.93f, 1.93f, -1.93f)
-        close()
-        moveTo(9.6f, 6.76f)
-        curveToRelative(1.3f, 0.0f, 2.36f, 1.06f, 2.36f, 2.36f)
-        curveToRelative(0.0f, 1.3f, -1.06f, 2.36f, -2.36f, 2.36f)
-        reflectiveCurveToRelative(-2.36f, -1.06f, -2.36f, -2.36f)
-        curveToRelative(0.0f, -1.31f, 1.05f, -2.36f, 2.36f, -2.36f)
-        close()
-        moveTo(9.6f, 15.89f)
-        verticalLineToRelative(3.75f)
-        curveToRelative(-2.4f, -0.75f, -4.3f, -2.6f, -5.14f, -4.96f)
-        curveToRelative(1.05f, -1.12f, 3.67f, -1.69f, 5.14f, -1.69f)
-        curveToRelative(0.53f, 0.0f, 1.2f, 0.08f, 1.9f, 0.22f)
-        curveToRelative(-1.64f, 0.87f, -1.9f, 2.02f, -1.9f, 2.68f)
-        close()
-        moveTo(11.99f, 20.0f)
-        curveToRelative(-0.27f, 0.0f, -0.53f, -0.01f, -0.79f, -0.04f)
-        verticalLineToRelative(-4.07f)
-        curveToRelative(0.0f, -1.42f, 2.94f, -2.13f, 4.4f, -2.13f)
-        curveToRelative(1.07f, 0.0f, 2.92f, 0.39f, 3.84f, 1.15f)
-        curveToRelative(-1.17f, 2.97f, -4.06f, 5.09f, -7.45f, 5.09f)
-        close()
-      }
-    }
-    return _supervisedUserCircleFilled!!
-  }
-
-private var _supervisedUserCircleFilled: ImageVector? = null
-
-val BoltFilled: ImageVector
-  get() {
-    if (_boltFilled != null) {
-      return _boltFilled!!
-    }
-    _boltFilled = materialIcon(name = "Filled.Bolt") {
-      materialPath {
-        moveTo(11.0f, 21.0f)
-        horizontalLineToRelative(-1.0f)
-        lineToRelative(1.0f, -7.0f)
-        horizontalLineTo(7.5f)
-        curveToRelative(-0.58f, 0.0f, -0.57f, -0.32f, -0.38f, -0.66f)
-        curveToRelative(0.19f, -0.34f, 0.05f, -0.08f, 0.07f, -0.12f)
-        curveTo(8.48f, 10.94f, 10.42f, 7.54f, 13.0f, 3.0f)
-        horizontalLineToRelative(1.0f)
-        lineToRelative(-1.0f, 7.0f)
-        horizontalLineToRelative(3.5f)
-        curveToRelative(0.49f, 0.0f, 0.56f, 0.33f, 0.47f, 0.51f)
-        lineToRelative(-0.07f, 0.15f)
-        curveTo(12.96f, 17.55f, 11.0f, 21.0f, 11.0f, 21.0f)
-        close()
-      }
-    }
-    return _boltFilled!!
-  }
-
-private var _boltFilled: ImageVector? = null
-
-val MoreVertFilled: ImageVector
-  get() {
-    if (_moreVertFilled != null) {
-      return _moreVertFilled!!
-    }
-    _moreVertFilled = materialIcon(name = "Filled.MoreVert") {
-      materialPath {
-        moveTo(12.0f, 8.0f)
-        curveToRelative(1.1f, 0.0f, 2.0f, -0.9f, 2.0f, -2.0f)
-        reflectiveCurveToRelative(-0.9f, -2.0f, -2.0f, -2.0f)
-        reflectiveCurveToRelative(-2.0f, 0.9f, -2.0f, 2.0f)
-        reflectiveCurveToRelative(0.9f, 2.0f, 2.0f, 2.0f)
-        close()
-        moveTo(12.0f, 10.0f)
-        curveToRelative(-1.1f, 0.0f, -2.0f, 0.9f, -2.0f, 2.0f)
-        reflectiveCurveToRelative(0.9f, 2.0f, 2.0f, 2.0f)
-        reflectiveCurveToRelative(2.0f, -0.9f, 2.0f, -2.0f)
-        reflectiveCurveToRelative(-0.9f, -2.0f, -2.0f, -2.0f)
-        close()
-        moveTo(12.0f, 16.0f)
-        curveToRelative(-1.1f, 0.0f, -2.0f, 0.9f, -2.0f, 2.0f)
-        reflectiveCurveToRelative(0.9f, 2.0f, 2.0f, 2.0f)
-        reflectiveCurveToRelative(2.0f, -0.9f, 2.0f, -2.0f)
-        reflectiveCurveToRelative(-0.9f, -2.0f, -2.0f, -2.0f)
-        close()
-      }
-    }
-    return _moreVertFilled!!
-  }
-
-private var _moreVertFilled: ImageVector? = null
--- a/apps/android/app/src/main/java/chat/simplex/app/views/helpers/CustomTimePicker.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/helpers/CustomTimePicker.kt
@@ -1,290 +0,0 @@
-package chat.simplex.app.views.helpers
-
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.shape.CornerSize
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.*
-import androidx.compose.runtime.*
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import androidx.compose.ui.window.Dialog
-import chat.simplex.app.R
-import chat.simplex.app.model.*
-import chat.simplex.app.ui.theme.DEFAULT_PADDING
-import com.sd.lib.compose.wheel_picker.*
-
-@Composable
-fun CustomTimePicker(
-  selection: MutableState<Int>,
-  timeUnitsLimits: List<TimeUnitLimits> = TimeUnitLimits.defaultUnitsLimits
-) {
-  fun getUnitValues(unit: CustomTimeUnit, selectedValue: Int): List<Int> {
-    val unitLimits = timeUnitsLimits.firstOrNull { it.timeUnit == unit } ?: TimeUnitLimits.defaultUnitLimits(unit)
-    val regularUnitValues = (unitLimits.minValue..unitLimits.maxValue).toList()
-    return regularUnitValues + if (regularUnitValues.contains(selectedValue)) emptyList() else listOf(selectedValue)
-  }
-
-  val (unit, duration) = CustomTimeUnit.toTimeUnit(selection.value)
-  val selectedUnit: MutableState<CustomTimeUnit> = remember { mutableStateOf(unit) }
-  val selectedDuration = remember { mutableStateOf(duration) }
-  val selectedUnitValues = remember { mutableStateOf(getUnitValues(selectedUnit.value, selectedDuration.value)) }
-  val isTriggered = remember { mutableStateOf(false) }
-
-  LaunchedEffect(selectedUnit.value) {
-    // on initial composition, if passed selection doesn't fit into picker bounds, so that selectedDuration is bigger than selectedUnit maxValue
-    // (e.g., for selection = 121 seconds: selectedUnit would be Second, selectedDuration would be 121 > selectedUnit maxValue of 120),
-    // selectedDuration would've been replaced by maxValue - isTriggered check prevents this by skipping LaunchedEffect on initial composition
-    if (isTriggered.value) {
-      val maxValue = timeUnitsLimits.firstOrNull { it.timeUnit == selectedUnit.value }?.maxValue
-      if (maxValue != null && selectedDuration.value > maxValue) {
-        selectedDuration.value = maxValue
-        selectedUnitValues.value = getUnitValues(selectedUnit.value, selectedDuration.value)
-      } else {
-        selectedUnitValues.value = getUnitValues(selectedUnit.value, selectedDuration.value)
-        selection.value = selectedUnit.value.toSeconds * selectedDuration.value
-      }
-    } else {
-      isTriggered.value = true
-    }
-  }
-
-  LaunchedEffect(selectedDuration.value) {
-    selection.value = selectedUnit.value.toSeconds * selectedDuration.value
-  }
-
-  Row(
-    Modifier
-      .fillMaxWidth()
-      .padding(horizontal = DEFAULT_PADDING),
-    horizontalArrangement = Arrangement.spacedBy(0.dp)
-  ) {
-    Column(Modifier.weight(1f)) {
-      val durationPickerState = rememberFWheelPickerState(selectedUnitValues.value.indexOf(selectedDuration.value))
-      FVerticalWheelPicker(
-        count = selectedUnitValues.value.count(),
-        state = durationPickerState,
-        unfocusedCount = 2,
-        focus = {
-          FWheelPickerFocusVertical(dividerColor = MaterialTheme.colors.primary)
-        }
-      ) { index ->
-        Text(
-          selectedUnitValues.value[index].toString(),
-          fontSize = 18.sp,
-          color = MaterialTheme.colors.primary
-        )
-      }
-      LaunchedEffect(durationPickerState) {
-        snapshotFlow { durationPickerState.currentIndex }
-          .collect {
-            selectedDuration.value = selectedUnitValues.value[it]
-          }
-      }
-    }
-    Column(Modifier.weight(1f)) {
-      val unitPickerState = rememberFWheelPickerState(timeUnitsLimits.indexOfFirst { it.timeUnit == selectedUnit.value })
-      FVerticalWheelPicker(
-        count = timeUnitsLimits.count(),
-        state = unitPickerState,
-        unfocusedCount = 2,
-        focus = {
-          FWheelPickerFocusVertical(dividerColor = MaterialTheme.colors.primary)
-        }
-      ) { index ->
-        Text(
-          timeUnitsLimits[index].timeUnit.text,
-          fontSize = 18.sp,
-          color = MaterialTheme.colors.primary
-        )
-      }
-      LaunchedEffect(unitPickerState) {
-        snapshotFlow { unitPickerState.currentIndex }
-          .collect {
-            selectedUnit.value = timeUnitsLimits[it].timeUnit
-          }
-      }
-    }
-  }
-}
-
-data class TimeUnitLimits(
-  val timeUnit: CustomTimeUnit,
-  val minValue: Int = 1,
-  val maxValue: Int
-) {
-  companion object {
-    fun defaultUnitLimits(unit: CustomTimeUnit): TimeUnitLimits {
-      return when (unit) {
-        CustomTimeUnit.Second -> TimeUnitLimits(CustomTimeUnit.Second, maxValue = 120)
-        CustomTimeUnit.Minute -> TimeUnitLimits(CustomTimeUnit.Minute, maxValue = 120)
-        CustomTimeUnit.Hour -> TimeUnitLimits(CustomTimeUnit.Hour, maxValue = 72)
-        CustomTimeUnit.Day -> TimeUnitLimits(CustomTimeUnit.Day, maxValue = 60)
-        CustomTimeUnit.Week -> TimeUnitLimits(CustomTimeUnit.Week, maxValue = 12) // TODO in 5.2 - 54
-        CustomTimeUnit.Month -> TimeUnitLimits(CustomTimeUnit.Month, maxValue = 3) // TODO in 5.2 - 12
-      }
-    }
-
-    val defaultUnitsLimits: List<TimeUnitLimits>
-      get() = listOf(
-        defaultUnitLimits(CustomTimeUnit.Second),
-        defaultUnitLimits(CustomTimeUnit.Minute),
-        defaultUnitLimits(CustomTimeUnit.Hour),
-        defaultUnitLimits(CustomTimeUnit.Day),
-        defaultUnitLimits(CustomTimeUnit.Week),
-        defaultUnitLimits(CustomTimeUnit.Month)
-      )
-  }
-}
-
-@Composable
-fun CustomTimePickerDialog(
-  selection: MutableState<Int>,
-  timeUnitsLimits: List<TimeUnitLimits> = TimeUnitLimits.defaultUnitsLimits,
-  title: String,
-  confirmButtonText: String,
-  confirmButtonAction: (Int) -> Unit,
-  cancel: () -> Unit
-) {
-  Dialog(onDismissRequest = cancel) {
-    Surface(
-      shape = RoundedCornerShape(corner = CornerSize(25.dp))
-    ) {
-      Box(
-        contentAlignment = Alignment.Center
-      ) {
-        Column(
-          modifier = Modifier.padding(DEFAULT_PADDING),
-          verticalArrangement = Arrangement.spacedBy(6.dp),
-          horizontalAlignment = Alignment.CenterHorizontally
-        ) {
-          Row(
-            modifier = Modifier.fillMaxWidth(),
-            horizontalArrangement = Arrangement.SpaceBetween,
-            verticalAlignment = Alignment.CenterVertically
-          ) {
-            Text(" ") // centers title
-            Text(
-              title,
-              fontSize = 16.sp,
-              color = MaterialTheme.colors.secondary
-            )
-            Icon(
-              painterResource(R.drawable.ic_close),
-              generalGetString(R.string.icon_descr_close_button),
-              tint = MaterialTheme.colors.secondary,
-              modifier = Modifier
-                .size(25.dp)
-                .clickable { cancel() }
-            )
-          }
-
-          CustomTimePicker(
-            selection,
-            timeUnitsLimits
-          )
-
-          TextButton(onClick = { confirmButtonAction(selection.value) }) {
-            Text(
-              confirmButtonText,
-              fontSize = 18.sp,
-              color = MaterialTheme.colors.primary
-            )
-          }
-        }
-      }
-    }
-  }
-}
-
-@Composable
-fun DropdownCustomTimePickerSettingRow(
-  selection: MutableState<Int?>,
-  propagateExternalSelectionUpdate: Boolean = false,
-  label: String,
-  dropdownValues: List<Int?>,
-  customPickerTitle: String,
-  customPickerConfirmButtonText: String,
-  customPickerTimeUnitsLimits: List<TimeUnitLimits> = TimeUnitLimits.defaultUnitsLimits,
-  onSelected: (Int?) -> Unit
-) {
-  fun getValues(selectedValue: Int?): List<DropdownSelection> =
-    dropdownValues.map { DropdownSelection.DropdownValue(it) } +
-        (if (dropdownValues.contains(selectedValue)) listOf() else listOf(DropdownSelection.DropdownValue(selectedValue))) +
-        listOf(DropdownSelection.Custom)
-
-  val dropdownSelection: MutableState<DropdownSelection> = remember { mutableStateOf(DropdownSelection.DropdownValue(selection.value)) }
-  val values: MutableState<List<DropdownSelection>> = remember { mutableStateOf(getValues(selection.value)) }
-  val showCustomTimePicker = remember { mutableStateOf(false) }
-
-  fun updateValue(selectedValue: Int?) {
-    values.value = getValues(selectedValue)
-    dropdownSelection.value = DropdownSelection.DropdownValue(selectedValue)
-    onSelected(selectedValue)
-  }
-
-  if (propagateExternalSelectionUpdate) {
-    LaunchedEffect(selection.value) {
-      values.value = getValues(selection.value)
-      dropdownSelection.value = DropdownSelection.DropdownValue(selection.value)
-    }
-  }
-
-  ExposedDropDownSettingRow(
-    label,
-    values.value.map { sel: DropdownSelection ->
-      when (sel) {
-        is DropdownSelection.DropdownValue -> sel to timeText(sel.value)
-        DropdownSelection.Custom -> sel to generalGetString(R.string.custom_time_picker_custom)
-      }
-    },
-    dropdownSelection,
-    onSelected = { sel: DropdownSelection ->
-      when (sel) {
-        is DropdownSelection.DropdownValue -> updateValue(sel.value)
-        DropdownSelection.Custom -> showCustomTimePicker.value = true
-      }
-    }
-  )
-
-  if (showCustomTimePicker.value) {
-    val selectedCustomTime = remember { mutableStateOf(selection.value ?: 86400) }
-    CustomTimePickerDialog(
-      selectedCustomTime,
-      timeUnitsLimits = customPickerTimeUnitsLimits,
-      title = customPickerTitle,
-      confirmButtonText = customPickerConfirmButtonText,
-      confirmButtonAction = { time ->
-        updateValue(time)
-        showCustomTimePicker.value = false
-      },
-      cancel = {
-        dropdownSelection.value = DropdownSelection.DropdownValue(selection.value)
-        showCustomTimePicker.value = false
-      }
-    )
-  }
-}
-
-private sealed class DropdownSelection {
-  data class DropdownValue(val value: Int?): DropdownSelection()
-  object Custom: DropdownSelection()
-
-  override fun equals(other: Any?): Boolean =
-    other is DropdownSelection &&
-        when (other) {
-          is DropdownValue -> this is DropdownValue && this.value == other.value
-          is Custom -> this is Custom
-        }
-
-  override fun hashCode(): Int =
-    // DO NOT REMOVE the as? cast as it will turn them into recursive hashCode calls
-    // https://youtrack.jetbrains.com/issue/KT-31239
-    when (this) {
-      is DropdownValue -> (this as? DropdownValue).hashCode()
-      is Custom -> (this as? Custom).hashCode()
-    }
-}
--- a/apps/android/app/src/main/java/chat/simplex/app/views/helpers/DatabaseUtils.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/helpers/DatabaseUtils.kt
@@ -3,7 +3,6 @@ package chat.simplex.app.views.helpers
 import android.util.Log
 import chat.simplex.app.*
 import chat.simplex.app.model.AppPreferences
-import chat.simplex.app.model.SharedPreference
 import chat.simplex.app.views.usersettings.Cryptor
 import kotlinx.serialization.*
 import java.io.File
@@ -17,38 +16,30 @@ object DatabaseUtils {
  }

  private const val DATABASE_PASSWORD_ALIAS: String = "databasePassword"
-  private const val APP_PASSWORD_ALIAS: String = "appPassword"
-  private const val SELF_DESTRUCT_PASSWORD_ALIAS: String = "selfDestructPassword"
-
-  val ksDatabasePassword = KeyStoreItem(DATABASE_PASSWORD_ALIAS, appPreferences.encryptedDBPassphrase, appPreferences.initializationVectorDBPassphrase)
-  val ksAppPassword = KeyStoreItem(APP_PASSWORD_ALIAS, appPreferences.encryptedAppPassphrase, appPreferences.initializationVectorAppPassphrase)
-  val ksSelfDestructPassword = KeyStoreItem(SELF_DESTRUCT_PASSWORD_ALIAS, appPreferences.encryptedSelfDestructPassphrase, appPreferences.initializationVectorSelfDestructPassphrase)
-
-  class KeyStoreItem(private val alias: String, val passphrase: SharedPreference<String?>, val initVector: SharedPreference<String?>) {
-    fun get(): String? {
-      return cryptor.decryptData(
-        passphrase.get()?.toByteArrayFromBase64() ?: return null,
-        initVector.get()?.toByteArrayFromBase64() ?: return null,
-        alias,
-      )
-    }
-
-    fun set(key: String) {
-      val data = cryptor.encryptText(key, alias)
-      passphrase.set(data.first.toBase64String())
-      initVector.set(data.second.toBase64String())
-    }
-
-    fun remove() {
-      cryptor.deleteKey(alias)
-      passphrase.set(null)
-      initVector.set(null)
-    }
-  }

  private fun hasDatabase(rootDir: String): Boolean =
    File(rootDir + File.separator + "files_chat.db").exists() && File(rootDir + File.separator + "files_agent.db").exists()

+  fun getDatabaseKey(): String? {
+    return cryptor.decryptData(
+      appPreferences.encryptedDBPassphrase.get()?.toByteArrayFromBase64() ?: return null,
+      appPreferences.initializationVectorDBPassphrase.get()?.toByteArrayFromBase64() ?: return null,
+      DATABASE_PASSWORD_ALIAS,
+    )
+  }
+
+  fun setDatabaseKey(key: String) {
+    val data = cryptor.encryptText(key, DATABASE_PASSWORD_ALIAS)
+    appPreferences.encryptedDBPassphrase.set(data.first.toBase64String())
+    appPreferences.initializationVectorDBPassphrase.set(data.second.toBase64String())
+  }
+
+  fun removeDatabaseKey() {
+    cryptor.deleteKey(DATABASE_PASSWORD_ALIAS)
+    appPreferences.encryptedDBPassphrase.set(null)
+    appPreferences.initializationVectorDBPassphrase.set(null)
+  }
+
  fun useDatabaseKey(): String {
    Log.d(TAG, "useDatabaseKey ${appPreferences.storeDBPassphrase.get()}")
    var dbKey = ""
@@ -56,10 +47,10 @@ object DatabaseUtils {
    if (useKeychain) {
      if (!hasDatabase(SimplexApp.context.dataDir.absolutePath)) {
        dbKey = randomDatabasePassword()
-        ksDatabasePassword.set(dbKey)
+        setDatabaseKey(dbKey)
        appPreferences.initialRandomDBPassphrase.set(true)
      } else {
-        dbKey = ksDatabasePassword.get() ?: ""
+        dbKey = getDatabaseKey() ?: ""
      }
    }
    return dbKey
@@ -110,4 +101,4 @@ data class UpMigration(
 sealed class MTRError {
  @Serializable @SerialName("noDown") class NoDown(val dbMigrations: List<String>): MTRError()
  @Serializable @SerialName("different") class Different(val appMigration: String, val dbMigration: String): MTRError()
-}
+}
--- a/apps/android/app/src/main/java/chat/simplex/app/views/helpers/DefaultBasicTextField.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/helpers/DefaultBasicTextField.kt
@@ -3,7 +3,6 @@ package chat.simplex.app.views.helpers
 import androidx.compose.foundation.background
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.defaultMinSize
-import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.shape.ZeroCornerSize
 import androidx.compose.foundation.text.*
 import androidx.compose.material.*
@@ -15,19 +14,13 @@ import androidx.compose.ui.focus.*
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.SolidColor
 import androidx.compose.ui.platform.LocalSoftwareKeyboardController
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.text.*
+import androidx.compose.ui.text.TextRange
+import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.input.*
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import chat.simplex.app.R
-import chat.simplex.app.views.database.PassphraseStrength
-import chat.simplex.app.views.database.validKey
 import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.collect
-import kotlinx.coroutines.flow.distinctUntilChanged
-import kotlinx.coroutines.launch

@OptIn(ExperimentalComposeUiApi::class)
@Composable
@@ -117,109 +110,3 @@ fun DefaultBasicTextField(
    }
  )
 }
-
-@OptIn(ExperimentalComposeUiApi::class)
-@Composable
-fun DefaultConfigurableTextField(
-  state: MutableState<TextFieldValue>,
-  placeholder: String,
-  modifier: Modifier = Modifier,
-  showPasswordStrength: Boolean = false,
-  isValid: (String) -> Boolean,
-  keyboardActions: KeyboardActions = KeyboardActions(),
-  keyboardType: KeyboardType = KeyboardType.Text,
-  dependsOn: State<Any?>? = null,
-) {
-  var valid by remember { mutableStateOf(validKey(state.value.text)) }
-  var showKey by remember { mutableStateOf(false) }
-  val icon = if (valid) {
-    if (showKey) painterResource(R.drawable.ic_visibility_off_filled) else painterResource(R.drawable.ic_visibility_filled)
-  } else painterResource(R.drawable.ic_error)
-  val iconColor = if (valid) {
-    if (showPasswordStrength && state.value.text.isNotEmpty()) PassphraseStrength.check(state.value.text).color else MaterialTheme.colors.secondary
-  } else Color.Red
-  val keyboard = LocalSoftwareKeyboardController.current
-  val keyboardOptions = KeyboardOptions(
-    imeAction = if (keyboardActions.onNext != null) ImeAction.Next else ImeAction.Done,
-    autoCorrect = keyboardType != KeyboardType.Password,
-    keyboardType = keyboardType
-  )
-  val enabled = true
-  val colors = TextFieldDefaults.textFieldColors(
-    backgroundColor = Color.Unspecified,
-    textColor = MaterialTheme.colors.onBackground,
-    focusedIndicatorColor = Color.Unspecified,
-    unfocusedIndicatorColor = Color.Unspecified,
-  )
-  val color = MaterialTheme.colors.onBackground
-  val shape = MaterialTheme.shapes.small.copy(bottomEnd = ZeroCornerSize, bottomStart = ZeroCornerSize)
-  val interactionSource = remember { MutableInteractionSource() }
-  BasicTextField(
-    value = state.value,
-    modifier = modifier
-      .fillMaxWidth()
-      .background(colors.backgroundColor(enabled).value, shape)
-      .indicatorLine(enabled, false, interactionSource, colors)
-      .defaultMinSize(
-        minWidth = TextFieldDefaults.MinWidth,
-        minHeight = TextFieldDefaults.MinHeight
-      ),
-    onValueChange = {
-      state.value = it
-    },
-    cursorBrush = SolidColor(colors.cursorColor(false).value),
-    visualTransformation = if (showKey || keyboardType != KeyboardType.Password)
-      VisualTransformation.None
-    else
-      VisualTransformation { TransformedText(AnnotatedString(it.text.map { "*" }.joinToString(separator = "")), OffsetMapping.Identity) },
-    keyboardOptions = keyboardOptions,
-    keyboardActions = KeyboardActions(onDone = {
-      keyboard?.hide()
-      keyboardActions.onDone?.invoke(this)
-    }),
-    singleLine = true,
-    textStyle = TextStyle.Default.copy(
-      color = color,
-      fontWeight = FontWeight.Normal,
-      fontSize = 16.sp
-    ),
-    interactionSource = interactionSource,
-    decorationBox = @Composable { innerTextField ->
-      TextFieldDefaults.TextFieldDecorationBox(
-        value = state.value.text,
-        innerTextField = innerTextField,
-        placeholder = { Text(placeholder, color = MaterialTheme.colors.secondary) },
-        singleLine = true,
-        enabled = enabled,
-        isError = !valid,
-        trailingIcon = {
-          if (keyboardType == KeyboardType.Password || !valid) {
-            IconButton({ showKey = !showKey }) {
-              Icon(icon, null, tint = iconColor)
-            }
-          }
-        },
-        interactionSource = interactionSource,
-        contentPadding = TextFieldDefaults.textFieldWithLabelPadding(start = 0.dp, end = 0.dp),
-        visualTransformation = VisualTransformation.None,
-        colors = colors
-      )
-    }
-  )
-  LaunchedEffect(Unit) {
-    launch {
-      snapshotFlow { state.value }
-        .distinctUntilChanged()
-        .collect {
-          valid = isValid(it.text)
-        }
-    }
-    launch {
-      snapshotFlow { dependsOn?.value }
-        .distinctUntilChanged()
-        .collect {
-          valid = isValid(state.value.text)
-        }
-    }
-  }
-}
--- a/apps/android/app/src/main/java/chat/simplex/app/views/helpers/DefaultDropdownMenu.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/helpers/DefaultDropdownMenu.kt
@@ -1,61 +0,0 @@
-package chat.simplex.app.views.helpers
-
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.shape.CornerSize
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.*
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.MutableState
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.unit.DpOffset
-import androidx.compose.ui.unit.dp
-import chat.simplex.app.ui.theme.*
-
-@Composable
-fun DefaultDropdownMenu(
-  showMenu: MutableState<Boolean>,
-  offset: DpOffset = DpOffset(0.dp, 0.dp),
-  dropdownMenuItems: (@Composable () -> Unit)?
-) {
-  MaterialTheme(
-    shapes = MaterialTheme.shapes.copy(medium = RoundedCornerShape(corner = CornerSize(25.dp)))
-  ) {
-    DropdownMenu(
-      expanded = showMenu.value,
-      onDismissRequest = { showMenu.value = false },
-      Modifier
-        .widthIn(min = 250.dp)
-        .background(MaterialTheme.colors.surface)
-        .padding(vertical = 4.dp),
-      offset = offset,
-    ) {
-      dropdownMenuItems?.invoke()
-    }
-  }
-}
-
-@Composable
-fun ExposedDropdownMenuBoxScope.DefaultExposedDropdownMenu(
-  expanded: MutableState<Boolean>,
-  modifier: Modifier = Modifier,
-  dropdownMenuItems: (@Composable () -> Unit)?
-) {
-  MaterialTheme(
-    shapes = MaterialTheme.shapes.copy(medium = RoundedCornerShape(corner = CornerSize(25.dp)))
-  ) {
-    ExposedDropdownMenu(
-      modifier = Modifier
-        .widthIn(min = 200.dp)
-        .background(MaterialTheme.colors.surface)
-        .then(modifier),
-      expanded = expanded.value,
-      onDismissRequest = {
-        expanded.value = false
-      }
-    ) {
-      dropdownMenuItems?.invoke()
-    }
-  }
-}
--- a/apps/android/app/src/main/java/chat/simplex/app/views/helpers/DefaultSwitch.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/helpers/DefaultSwitch.kt
@@ -1,39 +0,0 @@
-package chat.simplex.app.views.helpers
-
-import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.material.*
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.drawBehind
-import androidx.compose.ui.geometry.*
-import androidx.compose.ui.platform.LocalDensity
-import androidx.compose.ui.unit.dp
-
-@Composable
-fun DefaultSwitch(
-  checked: Boolean,
-  onCheckedChange: ((Boolean) -> Unit)?,
-  modifier: Modifier = Modifier,
-  enabled: Boolean = true,
-  interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
-  colors: SwitchColors = SwitchDefaults.colors(
-    checkedThumbColor = MaterialTheme.colors.primary,
-    uncheckedThumbColor = MaterialTheme.colors.secondary,
-    checkedTrackAlpha = 0.0f,
-    uncheckedTrackAlpha = 0.0f,
-  )
-) {
-  val color = if (checked) MaterialTheme.colors.primary.copy(alpha = 0.3f) else MaterialTheme.colors.secondary.copy(alpha = 0.3f)
-  val size = with(LocalDensity.current) { Size(46.dp.toPx(), 28.dp.toPx()) }
-  val offset = with(LocalDensity.current) { Offset(1.dp.toPx(), 10.dp.toPx()) }
-  val radius = with(LocalDensity.current) { 28.dp.toPx() }
-  Switch(
-    checked = checked,
-    onCheckedChange = onCheckedChange,
-    modifier.drawBehind { drawRoundRect(color, size = size, topLeft = offset, cornerRadius = CornerRadius(radius, radius)) },
-    colors = colors,
-    enabled = enabled,
-    interactionSource = interactionSource,
-  )
-}
--- a/apps/android/app/src/main/java/chat/simplex/app/views/helpers/DefaultTopAppBar.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/helpers/DefaultTopAppBar.kt
@@ -4,11 +4,12 @@ import chat.simplex.app.R
 import androidx.compose.foundation.*
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.*
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.*
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.*
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import chat.simplex.app.ui.theme.*
@@ -44,10 +45,10 @@ fun DefaultTopAppBar(
 }

@Composable
-fun NavigationButtonBack(onButtonClicked: (() -> Unit)?) {
-  IconButton(onButtonClicked ?: {}, enabled = onButtonClicked != null) {
+fun NavigationButtonBack(onButtonClicked: () -> Unit) {
+  IconButton(onButtonClicked) {
    Icon(
-      painterResource(R.drawable.ic_arrow_back_ios_new), stringResource(R.string.back), tint = if (onButtonClicked != null) MaterialTheme.colors.primary else MaterialTheme.colors.secondary
+      Icons.Outlined.ArrowBackIos, stringResource(R.string.back), tint = MaterialTheme.colors.primary
    )
  }
 }
@@ -56,7 +57,7 @@ fun NavigationButtonBack(onButtonClicked: (() -> Unit)?) {
 fun ShareButton(onButtonClicked: () -> Unit) {
  IconButton(onButtonClicked) {
    Icon(
-      painterResource(R.drawable.ic_share), stringResource(R.string.share_verb), tint = MaterialTheme.colors.primary
+      Icons.Outlined.Share, stringResource(R.string.share_verb), tint = MaterialTheme.colors.primary
    )
  }
 }
@@ -65,7 +66,7 @@ fun ShareButton(onButtonClicked: () -> Unit) {
 fun NavigationButtonMenu(onButtonClicked: () -> Unit) {
  IconButton(onClick = onButtonClicked) {
    Icon(
-      painterResource(R.drawable.ic_menu),
+      Icons.Outlined.Menu,
      stringResource(R.string.icon_descr_settings),
      tint = MaterialTheme.colors.primary,
    )
--- a/apps/android/app/src/main/java/chat/simplex/app/views/helpers/Enums.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/helpers/Enums.kt
@@ -11,7 +11,7 @@ import kotlinx.serialization.encoding.Encoder

 sealed class SharedContent {
  data class Text(val text: String): SharedContent()
-  data class Media(val text: String, val uris: List<Uri>): SharedContent()
+  data class Images(val text: String, val uris: List<Uri>): SharedContent()
  data class File(val text: String, val uri: Uri): SharedContent()
 }

--- a/apps/android/app/src/main/java/chat/simplex/app/views/helpers/ExposedDropDownSettingRow.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/helpers/ExposedDropDownSettingRow.kt
@@ -2,19 +2,21 @@ package chat.simplex.app.views.helpers

 import androidx.compose.foundation.layout.*
 import androidx.compose.material.*
-import androidx.compose.ui.res.painterResource
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.ExpandLess
+import androidx.compose.material.icons.outlined.ExpandMore
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.painter.Painter
+import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import chat.simplex.app.R
-import chat.simplex.app.ui.theme.*
-import chat.simplex.app.views.usersettings.SettingsActionItemWithContent
+import chat.simplex.app.ui.theme.DEFAULT_PADDING
+import chat.simplex.app.ui.theme.HighOrLowlight

@Composable
 fun <T> ExposedDropDownSettingRow(
@@ -22,17 +24,31 @@ fun <T> ExposedDropDownSettingRow(
  values: List<Pair<T, String>>,
  selection: State<T>,
  label: String? = null,
-  icon: Painter? = null,
-  iconTint: Color = MaterialTheme.colors.secondary,
+  icon: ImageVector? = null,
+  iconTint: Color = HighOrLowlight,
  enabled: State<Boolean> = mutableStateOf(true),
  onSelected: (T) -> Unit
 ) {
-  SettingsActionItemWithContent(icon, title, iconColor = iconTint, disabled = !enabled.value) {
-    val expanded = remember { mutableStateOf(false) }
+  Row(
+    Modifier.fillMaxWidth().padding(vertical = 10.dp),
+    verticalAlignment = Alignment.CenterVertically,
+  ) {
+    var expanded by remember { mutableStateOf(false) }
+
+    if (icon != null) {
+      Icon(
+        icon,
+        "",
+        Modifier.padding(end = 8.dp),
+        tint = iconTint
+      )
+    }
+    Text(title, Modifier.weight(1f), color = if (enabled.value) Color.Unspecified else HighOrLowlight)
+
    ExposedDropdownMenuBox(
-      expanded = expanded.value,
+      expanded = expanded,
      onExpandedChange = {
-        expanded.value = !expanded.value && enabled.value
+        expanded = !expanded && enabled.value
      }
    ) {
      Row(
@@ -40,38 +56,39 @@ fun <T> ExposedDropDownSettingRow(
        verticalAlignment = Alignment.CenterVertically,
        horizontalArrangement = Arrangement.End
      ) {
-        val maxWidth = with(LocalDensity.current) { 180.sp.toDp() }
+        val maxWidth = with(LocalDensity.current){ 180.sp.toDp() }
        Text(
          values.first { it.first == selection.value }.second + (if (label != null) " $label" else ""),
          Modifier.widthIn(max = maxWidth),
          maxLines = 1,
          overflow = TextOverflow.Ellipsis,
-          color = MaterialTheme.colors.secondary
+          color = HighOrLowlight
        )
        Spacer(Modifier.size(12.dp))
        Icon(
-          if (!expanded.value) painterResource(R.drawable.ic_expand_more) else painterResource(R.drawable.ic_expand_less),
+          if (!expanded) Icons.Outlined.ExpandMore else Icons.Outlined.ExpandLess,
          generalGetString(R.string.icon_descr_more_button),
-          tint = MaterialTheme.colors.secondary
+          tint = HighOrLowlight
        )
      }
-      DefaultExposedDropdownMenu(
+      ExposedDropdownMenu(
        modifier = Modifier.widthIn(min = 200.dp),
        expanded = expanded,
+        onDismissRequest = {
+          expanded = false
+        }
      ) {
        values.forEach { selectionOption ->
          DropdownMenuItem(
            onClick = {
              onSelected(selectionOption.first)
-              expanded.value = false
-            },
-            contentPadding = PaddingValues(horizontal = DEFAULT_PADDING * 1.5f)
+              expanded = false
+            }
          ) {
            Text(
              selectionOption.second + (if (label != null) " $label" else ""),
              maxLines = 1,
              overflow = TextOverflow.Ellipsis,
-              color = if (isInDarkTheme()) MenuTextColorDark else Color.Black,
            )
          }
        }
--- a/apps/android/app/src/main/java/chat/simplex/app/views/helpers/GestureDetector.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/helpers/GestureDetector.kt
@@ -80,16 +80,10 @@ suspend fun PointerInputScope.detectGesture(
          pressScope.release()
        }
      } catch (_: PointerEventTimeoutCancellationException) {
-        if (onLongPress != null) {
-          onLongPress(down.position)
-          if (shouldConsume)
-            consumeUntilUp()
-          pressScope.cancel()
-        } else {
-          if (shouldConsume)
-            consumeUntilUp()
-          pressScope.release()
-        }
+        onLongPress?.invoke(down.position)
+        if (shouldConsume)
+          consumeUntilUp()
+        pressScope.release()
      }
    }
  }
--- a/apps/android/app/src/main/java/chat/simplex/app/views/helpers/GetImageView.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/helpers/GetImageView.kt
@@ -17,13 +17,15 @@ import androidx.activity.result.contract.ActivityResultContract
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.annotation.CallSuper
 import androidx.compose.foundation.layout.*
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.Collections
+import androidx.compose.material.icons.outlined.PhotoCamera
 import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.Saver
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.onFocusChanged
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.core.content.ContextCompat
@@ -172,18 +174,7 @@ fun rememberGetContentLauncher(cb: (Uri?) -> Unit): ManagedActivityResultLaunche

@Composable
 fun rememberGetMultipleContentsLauncher(cb: (List<Uri>) -> Unit): ManagedActivityResultLauncher<String, List<Uri>> =
-  rememberLauncherForActivityResult(contract = GetMultipleContentsAndMimeTypes(), cb)
-
-class GetMultipleContentsAndMimeTypes: ActivityResultContracts.GetMultipleContents() {
-  override fun createIntent(context: Context, input: String): Intent {
-    val mimeTypes = input.split(";")
-    return super.createIntent(context, mimeTypes[0]).apply {
-      if (mimeTypes.isNotEmpty()) {
-        putExtra(Intent.EXTRA_MIME_TYPES, mimeTypes.toTypedArray())
-      }
-    }
-  }
-}
+  rememberLauncherForActivityResult(contract = ActivityResultContracts.GetMultipleContents(), cb)

 fun ManagedActivityResultLauncher<Void?, Uri?>.launchWithFallback() {
  try {
@@ -246,7 +237,7 @@ fun GetImageBottomSheet(
        .padding(horizontal = 8.dp, vertical = 30.dp),
      horizontalArrangement = Arrangement.SpaceEvenly
    ) {
-      ActionButton(null, stringResource(R.string.use_camera_button), icon = painterResource(R.drawable.ic_photo_camera)) {
+      ActionButton(null, stringResource(R.string.use_camera_button), icon = Icons.Outlined.PhotoCamera) {
        when (PackageManager.PERMISSION_GRANTED) {
          ContextCompat.checkSelfPermission(context, Manifest.permission.CAMERA) -> {
            cameraLauncher.launchWithFallback()
@@ -257,7 +248,7 @@ fun GetImageBottomSheet(
          }
        }
      }
-      ActionButton(null, stringResource(R.string.from_gallery_button), icon = painterResource(R.drawable.ic_image)) {
+      ActionButton(null, stringResource(R.string.from_gallery_button), icon = Icons.Outlined.Collections) {
        try {
          galleryLauncher.launch(0)
        } catch (e: ActivityNotFoundException) {
--- a/apps/android/app/src/main/java/chat/simplex/app/views/helpers/LinkPreviews.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/helpers/LinkPreviews.kt
@@ -6,13 +6,13 @@ import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.*
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.Close
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.asImageBitmap
 import androidx.compose.ui.layout.ContentScale
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
@@ -20,7 +20,9 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import chat.simplex.app.R
 import chat.simplex.app.model.LinkPreview
-import chat.simplex.app.ui.theme.*
+import chat.simplex.app.ui.theme.HighOrLowlight
+import chat.simplex.app.ui.theme.SimpleXTheme
+import chat.simplex.app.views.chat.item.SentColorLight
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import org.jsoup.Jsoup
@@ -77,10 +79,9 @@ suspend fun getLinkPreview(url: String): LinkPreview? {
 }

@Composable
-fun ComposeLinkView(linkPreview: LinkPreview?, cancelPreview: () -> Unit, cancelEnabled: Boolean) {
-  val sentColor = CurrentColors.collectAsState().value.appColors.sentMessage
+fun ComposeLinkView(linkPreview: LinkPreview?, cancelPreview: () -> Unit) {
  Row(
-    Modifier.fillMaxWidth().padding(top = 8.dp).background(sentColor),
+    Modifier.fillMaxWidth().padding(top = 8.dp).background(SentColorLight),
    verticalAlignment = Alignment.CenterVertically
  ) {
    if (linkPreview == null) {
@@ -90,7 +91,7 @@ fun ComposeLinkView(linkPreview: LinkPreview?, cancelPreview: () -> Unit, cancel
      ) {
        CircularProgressIndicator(
          Modifier.size(16.dp),
-          color = MaterialTheme.colors.secondary,
+          color = HighOrLowlight,
          strokeWidth = 2.dp
        )
      }
@@ -109,15 +110,13 @@ fun ComposeLinkView(linkPreview: LinkPreview?, cancelPreview: () -> Unit, cancel
        )
      }
    }
-    if (cancelEnabled) {
-      IconButton(onClick = cancelPreview, modifier = Modifier.padding(0.dp)) {
-        Icon(
-          painterResource(R.drawable.ic_close),
-          contentDescription = stringResource(R.string.icon_descr_cancel_link_preview),
-          tint = MaterialTheme.colors.primary,
-          modifier = Modifier.padding(10.dp)
-        )
-      }
+    IconButton(onClick = cancelPreview, modifier = Modifier.padding(0.dp)) {
+      Icon(
+        Icons.Outlined.Close,
+        contentDescription = stringResource(R.string.icon_descr_cancel_link_preview),
+        tint = MaterialTheme.colors.primary,
+        modifier = Modifier.padding(10.dp)
+      )
    }
  }
 }
@@ -136,7 +135,7 @@ fun ChatItemLinkView(linkPreview: LinkPreview) {
      if (linkPreview.description != "") {
        Text(linkPreview.description, maxLines = 12, overflow = TextOverflow.Ellipsis, fontSize = 14.sp, lineHeight = 20.sp)
      }
-      Text(linkPreview.uri, maxLines = 1, overflow = TextOverflow.Ellipsis, fontSize = 12.sp, color = MaterialTheme.colors.secondary)
+      Text(linkPreview.uri, maxLines = 1, overflow = TextOverflow.Ellipsis, fontSize = 12.sp, color = HighOrLowlight)
    }
  }
 }
@@ -195,7 +194,7 @@ fun PreviewChatItemLinkView() {
@Composable
 fun PreviewComposeLinkView() {
  SimpleXTheme {
-    ComposeLinkView(LinkPreview.sampleData, cancelPreview = { -> }, true)
+    ComposeLinkView(LinkPreview.sampleData) { -> }
  }
 }

@@ -203,6 +202,6 @@ fun PreviewComposeLinkView() {
@Composable
 fun PreviewComposeLinkViewLoading() {
  SimpleXTheme {
-    ComposeLinkView(null, cancelPreview = { -> }, true)
+    ComposeLinkView(null) { -> }
  }
 }
--- a/apps/android/app/src/main/java/chat/simplex/app/views/helpers/LocalAuthentication.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/helpers/LocalAuthentication.kt
@@ -1,73 +1,36 @@
 package chat.simplex.app.views.helpers

+import android.content.Context
 import android.os.Build.VERSION.SDK_INT
-import androidx.activity.compose.BackHandler
+import android.widget.Toast
 import androidx.biometric.BiometricManager
 import androidx.biometric.BiometricManager.Authenticators.*
 import androidx.biometric.BiometricPrompt
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Surface
-import androidx.compose.ui.Modifier
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.FragmentActivity
 import chat.simplex.app.R
-import chat.simplex.app.SimplexApp
-import chat.simplex.app.views.helpers.DatabaseUtils.ksAppPassword
-import chat.simplex.app.views.localauth.LocalAuthView
-import chat.simplex.app.views.usersettings.LAMode

 sealed class LAResult {
  object Success: LAResult()
  class Error(val errString: CharSequence): LAResult()
-  class Failed(val errString: CharSequence? = null): LAResult()
-  class Unavailable(val errString: CharSequence? = null): LAResult()
-}
-
-data class LocalAuthRequest (
-  val title: String?,
-  val reason: String,
-  val password: String,
-  val selfDestruct: Boolean,
-  val completed: (LAResult) -> Unit
-) {
-  companion object {
-    val sample = LocalAuthRequest(generalGetString(R.string.la_enter_app_passcode), generalGetString(R.string.la_authenticate), "", selfDestruct = false) { }
-  }
+  object Failed: LAResult()
+  object Unavailable: LAResult()
 }

 fun authenticate(
  promptTitle: String,
  promptSubtitle: String,
-  selfDestruct: Boolean = false,
  activity: FragmentActivity,
-  usingLAMode: LAMode = SimplexApp.context.chatModel.controller.appPrefs.laMode.get(),
  completed: (LAResult) -> Unit
 ) {
-  when (usingLAMode) {
-    LAMode.SYSTEM -> when {
-      SDK_INT in 28..29 ->
-        // KeyguardManager.isDeviceSecure()? https://developer.android.com/training/sign-in/biometric-auth#declare-supported-authentication-types
-        authenticateWithBiometricManager(promptTitle, promptSubtitle, activity, completed, BIOMETRIC_WEAK or DEVICE_CREDENTIAL)
-      SDK_INT > 29 ->
-        authenticateWithBiometricManager(promptTitle, promptSubtitle, activity, completed, BIOMETRIC_STRONG or DEVICE_CREDENTIAL)
-      else -> completed(LAResult.Unavailable())
-    }
-    LAMode.PASSCODE -> {
-      val password = ksAppPassword.get() ?: return completed(LAResult.Unavailable(generalGetString(R.string.la_no_app_password)))
-      ModalManager.shared.showPasscodeCustomModal { close ->
-        BackHandler {
-          close()
-          completed(LAResult.Error(generalGetString(R.string.authentication_cancelled)))
-        }
-        Surface(Modifier.fillMaxSize(), color = MaterialTheme.colors.background) {
-          LocalAuthView(SimplexApp.context.chatModel, LocalAuthRequest(promptTitle, promptSubtitle, password, selfDestruct && SimplexApp.context.chatModel.controller.appPrefs.selfDestruct.get()) {
-            close()
-            completed(it)
-          })
-        }
-      }
-    }
+  when {
+    SDK_INT in 28..29 ->
+      // KeyguardManager.isDeviceSecure()? https://developer.android.com/training/sign-in/biometric-auth#declare-supported-authentication-types
+      authenticateWithBiometricManager(promptTitle, promptSubtitle, activity, completed, BIOMETRIC_WEAK or DEVICE_CREDENTIAL)
+    SDK_INT > 29 ->
+      authenticateWithBiometricManager(promptTitle, promptSubtitle, activity, completed, BIOMETRIC_STRONG or DEVICE_CREDENTIAL)
+    else ->
+      completed(LAResult.Unavailable)
  }
 }

@@ -103,7 +66,7 @@ private fun authenticateWithBiometricManager(

          override fun onAuthenticationFailed() {
            super.onAuthenticationFailed()
-            completed(LAResult.Failed())
+            completed(LAResult.Failed)
          }
        }
      )
@@ -115,7 +78,9 @@ private fun authenticateWithBiometricManager(
        .build()
      biometricPrompt.authenticate(promptInfo)
    }
-    else -> completed(LAResult.Unavailable())
+    else -> {
+      completed(LAResult.Unavailable)
+    }
  }
 }

@@ -124,18 +89,6 @@ fun laTurnedOnAlert() = AlertManager.shared.showAlertMsg(
  generalGetString(R.string.auth_you_will_be_required_to_authenticate_when_you_start_or_resume)
 )

-fun laPasscodeNotSetAlert() = AlertManager.shared.showAlertMsg(
-  generalGetString(R.string.lock_not_enabled),
-  generalGetString(R.string.you_can_turn_on_lock)
-)
-
-fun laFailedAlert() {
-  AlertManager.shared.showAlertMsg(
-    title = generalGetString(R.string.la_auth_failed),
-    text = generalGetString(R.string.la_could_not_be_verified)
-  )
-}
-
 fun laUnavailableInstructionAlert() = AlertManager.shared.showAlertMsg(
  generalGetString(R.string.auth_unavailable),
  generalGetString(R.string.auth_device_authentication_is_not_enabled_you_can_turn_on_in_settings_once_enabled)
--- a/apps/android/app/src/main/java/chat/simplex/app/views/helpers/ModalView.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/helpers/ModalView.kt
@@ -11,8 +11,8 @@ import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import chat.simplex.app.TAG
+import chat.simplex.app.ui.theme.SettingsBackgroundLight
 import chat.simplex.app.ui.theme.isInDarkTheme
-import chat.simplex.app.ui.theme.themedBackground
 import java.util.concurrent.atomic.AtomicBoolean

@Composable
@@ -25,7 +25,7 @@ fun ModalView(
 ) {
  BackHandler(onBack = close)
  Surface(Modifier.fillMaxSize()) {
-    Column(if (background != MaterialTheme.colors.background) Modifier.background(background) else Modifier.themedBackground()) {
+    Column(Modifier.background(background)) {
      CloseSheetBar(close, endButtons)
      Box(modifier) { content() }
    }
@@ -37,22 +37,21 @@ class ModalManager {
  private val modalCount = mutableStateOf(0)
  private val toRemove = mutableSetOf<Int>()
  private var oldViewChanging = AtomicBoolean(false)
-  private var passcodeView: MutableState<(@Composable (close: () -> Unit) -> Unit)?> = mutableStateOf(null)

  fun showModal(settings: Boolean = false, endButtons: @Composable RowScope.() -> Unit = {}, content: @Composable () -> Unit) {
    showCustomModal { close ->
-      ModalView(close, endButtons = endButtons, content = content)
+      ModalView(close, if (!settings || isInDarkTheme()) MaterialTheme.colors.background else SettingsBackgroundLight, endButtons = endButtons, content = content)
    }
  }

  fun showModalCloseable(settings: Boolean = false, content: @Composable (close: () -> Unit) -> Unit) {
    showCustomModal { close ->
-      ModalView(close, content = { content(close) })
+      ModalView(close, if (!settings || isInDarkTheme()) MaterialTheme.colors.background else SettingsBackgroundLight, content = { content(close) })
    }
  }

  fun showCustomModal(animated: Boolean = true, modal: @Composable (close: () -> Unit) -> Unit) {
-    Log.d(TAG, "ModalManager.showCustomModal")
+    Log.d(TAG, "ModalManager.showModal")
    // Means, animation is in progress or not started yet. Do not wait until animation finishes, just remove all from screen.
    // This is useful when invoking close() and ShowCustomModal one after another without delay. Otherwise, screen will hold prev view
    if (toRemove.isNotEmpty()) {
@@ -62,11 +61,6 @@ class ModalManager {
    modalCount.value = modalViews.size - toRemove.size
  }

-  fun showPasscodeCustomModal(modal: @Composable (close: () -> Unit) -> Unit) {
-    Log.d(TAG, "ModalManager.showPasscodeCustomModal")
-    passcodeView.value = modal
-  }
-
  fun hasModalsOpen() = modalCount.value > 0

  fun closeModal() {
@@ -78,9 +72,7 @@ class ModalManager {
  }

  fun closeModals() {
-    modalViews.clear()
-    toRemove.clear()
-    modalCount.value = 0
+    while (modalCount.value > 0) closeModal()
  }

  @OptIn(ExperimentalAnimationApi::class)
@@ -108,11 +100,6 @@ class ModalManager {
    }
  }

-  @Composable
-  fun showPasscodeInView() {
-    remember { passcodeView }.value?.invoke { passcodeView.value = null }
-  }
-
  /**
  * Allows to modify a list without getting [ConcurrentModificationException]
  * */
--- a/apps/android/app/src/main/java/chat/simplex/app/views/helpers/RecAndPlay.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/helpers/RecAndPlay.kt
@@ -21,7 +21,7 @@ interface Recorder {
  fun stop(): Int
 }

-class RecorderNative(): Recorder {
+class RecorderNative(private val recordedBytesLimit: Long): Recorder {
  companion object {
    // Allows to stop the recorder from outside without having the recorder in a variable
    var stopRecording: (() -> Unit)? = null
@@ -48,8 +48,9 @@ class RecorderNative(): Recorder {
    rec.setAudioEncoder(MediaRecorder.AudioEncoder.AAC)
    rec.setAudioChannels(1)
    rec.setAudioSamplingRate(16000)
-    rec.setAudioEncodingBitRate(32000)
+    rec.setAudioEncodingBitRate(16000)
    rec.setMaxDuration(MAX_VOICE_MILLIS_FOR_SENDING)
+    rec.setMaxFileSize(recordedBytesLimit)
    val tmpDir = SimplexApp.context.getDir("temp", Application.MODE_PRIVATE)
    val fileToSave = File.createTempFile(generateNewFileName(SimplexApp.context, "voice", "${extension}_"), ".tmp", tmpDir)
    fileToSave.deleteOnExit()
@@ -273,13 +274,6 @@ object AudioPlayer {
    audioPlaying.value = false
  }

-  fun seekTo(ms: Int, pro: MutableState<Int>, filePath: String?) {
-    pro.value = ms
-    if (this.currentlyPlaying.value?.first == filePath) {
-      player.seekTo(ms)
-    }
-  }
-
  fun duration(filePath: String): Int? {
    var res: Int? = null
    kotlin.runCatching {
--- a/apps/android/app/src/main/java/chat/simplex/app/views/helpers/SearchTextField.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/helpers/SearchTextField.kt
@@ -8,6 +8,8 @@ import androidx.compose.foundation.text.*
 import androidx.compose.material.*
 import androidx.compose.material.TextFieldDefaults.indicatorLine
 import androidx.compose.material.TextFieldDefaults.textFieldWithLabelPadding
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Close
 import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.ExperimentalComposeUiApi
@@ -17,7 +19,6 @@ import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.graphics.*
 import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.platform.LocalSoftwareKeyboardController
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontWeight
@@ -98,7 +99,7 @@ fun SearchTextField(modifier: Modifier, placeholder: String, alwaysVisible: Bool
            searchText = TextFieldValue("");
            onValueChange("")
          }) {
-            Icon(painterResource(R.drawable.ic_close), stringResource(R.string.icon_descr_close_button), tint = MaterialTheme.colors.primary,)
+            Icon(Icons.Default.Close, stringResource(R.string.icon_descr_close_button), tint = MaterialTheme.colors.primary,)
          }
        }} else null,
        singleLine = true,
--- a/apps/android/app/src/main/java/chat/simplex/app/views/helpers/Section.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/helpers/Section.kt
@@ -3,41 +3,42 @@ import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.material.*
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.Check
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.painter.Painter
+import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.platform.LocalDensity
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.*
-import chat.simplex.app.R
 import chat.simplex.app.ui.theme.*
 import chat.simplex.app.views.helpers.ValueTitleDesc
 import chat.simplex.app.views.helpers.ValueTitle
-import chat.simplex.app.views.usersettings.SettingsActionItemWithContent

@Composable
 fun SectionView(title: String? = null, padding: PaddingValues = PaddingValues(), content: (@Composable ColumnScope.() -> Unit)) {
  Column {
    if (title != null) {
      Text(
-        title, color = MaterialTheme.colors.secondary, style = MaterialTheme.typography.body2,
+        title, color = HighOrLowlight, style = MaterialTheme.typography.body2,
        modifier = Modifier.padding(start = DEFAULT_PADDING, bottom = 5.dp), fontSize = 12.sp
      )
    }
-    Column(Modifier.padding(padding).fillMaxWidth()) { content() }
+    Surface(color = if (isInDarkTheme()) GroupDark else MaterialTheme.colors.background) {
+      Column(Modifier.padding(padding).fillMaxWidth()) { content() }
+    }
  }
 }

@Composable
 fun SectionView(
  title: String,
-  icon: Painter,
-  iconTint: Color = MaterialTheme.colors.secondary,
+  icon: ImageVector,
+  iconTint: Color = HighOrLowlight,
  leadingIcon: Boolean = false,
  padding: PaddingValues = PaddingValues(),
  content: (@Composable ColumnScope.() -> Unit)
@@ -45,11 +46,13 @@ fun SectionView(
  Column {
    val iconSize = with(LocalDensity.current) { 21.sp.toDp() }
    Row(Modifier.padding(start = DEFAULT_PADDING, bottom = 5.dp), verticalAlignment = Alignment.CenterVertically) {
-      if (leadingIcon) Icon(icon, null, Modifier.padding(end = DEFAULT_PADDING_HALF).size(iconSize), tint = iconTint)
-      Text(title, color = MaterialTheme.colors.secondary, style = MaterialTheme.typography.body2, fontSize = 12.sp)
-      if (!leadingIcon) Icon(icon, null, Modifier.padding(start = DEFAULT_PADDING_HALF).size(iconSize), tint = iconTint)
+      if (leadingIcon) Icon(icon, null, Modifier.padding(end = 4.dp).size(iconSize), tint = iconTint)
+      Text(title, color = HighOrLowlight, style = MaterialTheme.typography.body2, fontSize = 12.sp)
+      if (!leadingIcon) Icon(icon, null, Modifier.padding(start = 4.dp).size(iconSize), tint = iconTint)
+    }
+    Surface(color = if (isInDarkTheme()) GroupDark else MaterialTheme.colors.background) {
+      Column(Modifier.padding(padding).fillMaxWidth()) { content() }
    }
-    Column(Modifier.padding(padding).fillMaxWidth()) { content() }
  }
 }

@@ -67,7 +70,7 @@ fun <T> SectionViewSelectable(
        SectionItemViewSpaceBetween({ onSelected(item.value) }) {
          Text(item.title)
          if (currentValue.value == item.value) {
-            Icon(painterResource(R.drawable.ic_check), item.title, tint = MaterialTheme.colors.primary)
+            Icon(Icons.Outlined.Check, item.title, tint = MaterialTheme.colors.primary)
          }
        }
        Spacer(Modifier.padding(horizontal = 4.dp))
@@ -82,30 +85,7 @@ fun SectionItemView(
  click: (() -> Unit)? = null,
  minHeight: Dp = 46.dp,
  disabled: Boolean = false,
-  extraPadding: Boolean = false,
-  padding: PaddingValues = if (extraPadding)
-    PaddingValues(start = DEFAULT_PADDING * 1.7f, end = DEFAULT_PADDING)
-  else
-    PaddingValues(horizontal = DEFAULT_PADDING),
-  content: (@Composable RowScope.() -> Unit)
-) {
-  val modifier = Modifier
-    .fillMaxWidth()
-    .sizeIn(minHeight = minHeight)
-  Row(
-    if (click == null || disabled) modifier.padding(padding) else modifier.clickable(onClick = click).padding(padding),
-    verticalAlignment = Alignment.CenterVertically
-  ) {
-    content()
-  }
-}
-
-@Composable
-fun SectionItemViewWithIcon(
-  click: (() -> Unit)? = null,
-  minHeight: Dp = 46.dp,
-  disabled: Boolean = false,
-  padding: PaddingValues = PaddingValues(start = DEFAULT_PADDING * 1.7f, end = DEFAULT_PADDING),
+  padding: PaddingValues = PaddingValues(horizontal = DEFAULT_PADDING),
  content: (@Composable RowScope.() -> Unit)
 ) {
  val modifier = Modifier
@@ -146,12 +126,24 @@ fun <T> SectionItemWithValue(
  currentValue: State<T>,
  values: List<ValueTitle<T>>,
  label: String? = null,
-  icon: Painter? = null,
-  iconTint: Color = MaterialTheme.colors.secondary,
+  icon: ImageVector? = null,
+  iconTint: Color = HighOrLowlight,
  enabled: State<Boolean> = mutableStateOf(true),
  onSelected: () -> Unit
 ) {
-  SettingsActionItemWithContent(icon = icon, text = title, iconColor = iconTint, click = if (enabled.value) onSelected else null, disabled = !enabled.value) {
+  SectionItemView(click = if (enabled.value) onSelected else null) {
+    if (icon != null) {
+      Icon(
+        icon,
+        title,
+        Modifier.padding(end = 8.dp),
+        tint = iconTint
+      )
+    }
+    Text(title, color = if (enabled.value) Color.Unspecified else HighOrLowlight)
+
+    Spacer(Modifier.fillMaxWidth().weight(1f))
+
    Row(
      Modifier.padding(start = 10.dp),
      verticalAlignment = Alignment.CenterVertically,
@@ -161,7 +153,7 @@ fun <T> SectionItemWithValue(
        values.first { it.value == currentValue.value }.title + (if (label != null) " $label" else ""),
        maxLines = 1,
        overflow = TextOverflow.Ellipsis,
-        color = MaterialTheme.colors.secondary
+        color = HighOrLowlight
      )
    }
  }
@@ -177,7 +169,7 @@ fun SectionTextFooter(text: AnnotatedString) {
  Text(
    text,
    Modifier.padding(start = DEFAULT_PADDING, end = DEFAULT_PADDING, top = DEFAULT_PADDING_HALF).fillMaxWidth(0.9F),
-    color = MaterialTheme.colors.secondary,
+    color = HighOrLowlight,
    lineHeight = 18.sp,
    fontSize = 14.sp
  )
@@ -197,41 +189,20 @@ fun SectionDivider() {
  Divider(Modifier.padding(horizontal = 8.dp))
 }

-@Composable
-fun SectionDividerSpaced(maxTopPadding: Boolean = false, maxBottomPadding: Boolean = true) {
-  Divider(
-    Modifier.padding(
-      start = DEFAULT_PADDING_HALF,
-      top = if (maxTopPadding) 37.dp else 27.dp,
-      end = DEFAULT_PADDING_HALF,
-      bottom = if (maxBottomPadding) 37.dp else 27.dp)
-  )
-}
-
@Composable
 fun SectionSpacer() {
  Spacer(Modifier.height(30.dp))
 }

@Composable
-fun SectionBottomSpacer() {
-  Spacer(Modifier.height(DEFAULT_BOTTOM_PADDING))
-}
-
-@Composable
-fun TextIconSpaced(extraPadding: Boolean = false) {
-  Spacer(Modifier.padding(horizontal = if (extraPadding) 17.dp else DEFAULT_PADDING_HALF))
-}
-
-@Composable
-fun InfoRow(title: String, value: String, icon: Painter? = null, iconTint: Color? = null) {
+fun InfoRow(title: String, value: String, icon: ImageVector? = null, iconTint: Color? = null) {
  SectionItemViewSpaceBetween {
    Row {
      val iconSize = with(LocalDensity.current) { 21.sp.toDp() }
-      if (icon != null) Icon(icon, title, Modifier.padding(end = 8.dp).size(iconSize), tint = iconTint ?: MaterialTheme.colors.secondary)
+      if (icon != null) Icon(icon, title, Modifier.padding(end = 8.dp).size(iconSize), tint = iconTint ?: HighOrLowlight)
      Text(title)
    }
-    Text(value, color = MaterialTheme.colors.secondary)
+    Text(value, color = HighOrLowlight)
  }
 }

@@ -247,7 +218,7 @@ fun InfoRowEllipsis(title: String, value: String, onClick: () -> Unit) {
        .widthIn(max = (configuration.screenWidthDp / 2).dp),
      maxLines = 1,
      overflow = TextOverflow.Ellipsis,
-      color = MaterialTheme.colors.secondary
+      color = HighOrLowlight
    )
  }
 }
--- a/apps/android/app/src/main/java/chat/simplex/app/views/helpers/Share.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/helpers/Share.kt
@@ -4,7 +4,6 @@ import android.Manifest
 import android.content.*
 import android.net.Uri
 import android.provider.MediaStore
-import android.util.Log
 import android.webkit.MimeTypeMap
 import android.widget.Toast
 import androidx.activity.compose.ManagedActivityResultLauncher
@@ -49,17 +48,6 @@ fun copyText(cxt: Context, text: String) {
  clipboard?.setPrimaryClip(ClipData.newPlainText("text", text))
 }

-fun sendEmail(context: Context, subject: String, body: CharSequence) {
-  val emailIntent = Intent(Intent.ACTION_SENDTO, Uri.parse("mailto:"))
-  emailIntent.putExtra(Intent.EXTRA_SUBJECT, subject)
-  emailIntent.putExtra(Intent.EXTRA_TEXT, body)
-  try {
-    context.startActivity(emailIntent)
-  } catch (e: ActivityNotFoundException) {
-    Log.e(TAG, "No activity was found for handling email intent")
-  }
-}
-
@Composable
 fun rememberSaveFileLauncher(cxt: Context, ciFile: CIFile?): ManagedActivityResultLauncher<String, Uri?> =
  rememberLauncherForActivityResult(
--- a/apps/android/app/src/main/java/chat/simplex/app/views/helpers/SimpleButton.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/helpers/SimpleButton.kt
@@ -1,25 +1,22 @@
 package chat.simplex.app.ui.theme

-import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.*
-import androidx.compose.ui.res.painterResource
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.Share
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.painter.Painter
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextDecoration
+import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import chat.simplex.app.R

@Composable
-fun SimpleButton(text: String, icon: Painter,
+fun SimpleButton(text: String, icon: ImageVector,
                 color: Color = MaterialTheme.colors.primary,
                 click: () -> Unit) {
  SimpleButtonFrame(click) {
@@ -31,41 +28,26 @@ fun SimpleButton(text: String, icon: Painter,
  }
 }

-@Composable
-fun SimpleButtonDecorated(text: String, icon: Painter,
-  color: Color = MaterialTheme.colors.primary,
-  textDecoration: TextDecoration = TextDecoration.Underline,
-  fontWeight: FontWeight = FontWeight.Normal,
-  click: () -> Unit) {
-  SimpleButtonFrame(click) {
-    Icon(
-      icon, text, tint = color,
-      modifier = Modifier.padding(end = 8.dp)
-    )
-    Text(text, style = MaterialTheme.typography.caption, fontWeight = fontWeight, color = color, textDecoration = textDecoration)
-  }
-}
-
@Composable
 fun SimpleButton(
-  text: String, icon: Painter,
+  text: String, icon: ImageVector,
  color: Color = MaterialTheme.colors.primary,
  disabled: Boolean,
  click: () -> Unit
 ) {
  SimpleButtonFrame(click, disabled = disabled) {
    Icon(
-      icon, text, tint = if (disabled) MaterialTheme.colors.secondary else color,
+      icon, text, tint = if (disabled) HighOrLowlight else color,
      modifier = Modifier.padding(end = 8.dp)
    )
-    Text(text, style = MaterialTheme.typography.caption, color = if (disabled) MaterialTheme.colors.secondary else color)
+    Text(text, style = MaterialTheme.typography.caption, color = if (disabled) HighOrLowlight else color)
  }
 }

@Composable
 fun SimpleButtonIconEnded(
  text: String,
-  icon: Painter,
+  icon: ImageVector,
  color: Color = MaterialTheme.colors.primary,
  click: () -> Unit
 ) {
@@ -79,9 +61,9 @@ fun SimpleButtonIconEnded(
 }

@Composable
-fun SimpleButtonFrame(click: () -> Unit, modifier: Modifier = Modifier, disabled: Boolean = false, content: @Composable RowScope.() -> Unit) {
-  Box(Modifier.clip(RoundedCornerShape(20.dp))) {
-    val modifier = if (disabled) modifier else modifier.clickable { click() }
+fun SimpleButtonFrame(click: () -> Unit, disabled: Boolean = false, content: @Composable () -> Unit) {
+  Surface(shape = RoundedCornerShape(20.dp)) {
+    val modifier = if (disabled) Modifier else Modifier.clickable { click() }
    Row(
      verticalAlignment = Alignment.CenterVertically,
      modifier = modifier.padding(8.dp)
@@ -93,6 +75,6 @@ fun SimpleButtonFrame(click: () -> Unit, modifier: Modifier = Modifier, disabled
@Composable
 fun PreviewCloseSheetBar() {
  SimpleXTheme {
-    SimpleButton(text = "Share", icon = painterResource(R.drawable.ic_share), click = {})
+    SimpleButton(text = "Share", icon = Icons.Outlined.Share, click = {})
  }
 }
--- a/apps/android/app/src/main/java/chat/simplex/app/views/helpers/TextEditor.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/helpers/TextEditor.kt
@@ -1,117 +1,65 @@
 package chat.simplex.app.views.helpers

-import android.util.Log
-import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.BorderStroke
+import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.BasicTextField
 import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.foundation.text.selection.SelectionContainer
-import androidx.compose.material.*
-import androidx.compose.runtime.*
-import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Surface
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.MutableState
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.focus.*
 import androidx.compose.ui.graphics.*
 import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.input.KeyboardCapitalization
-import androidx.compose.ui.text.input.VisualTransformation
 import androidx.compose.ui.unit.*
-import chat.simplex.app.TAG
-import chat.simplex.app.chatParseMarkdown
-import chat.simplex.app.model.*
-import chat.simplex.app.ui.theme.*
-import chat.simplex.app.views.chat.item.MarkdownText
-import com.google.accompanist.insets.navigationBarsWithImePadding
-import kotlinx.coroutines.flow.distinctUntilChanged
-import kotlinx.serialization.Serializable
-import java.lang.Exception
+import chat.simplex.app.ui.theme.DEFAULT_PADDING
+import chat.simplex.app.ui.theme.HighOrLowlight

@Composable
 fun TextEditor(
-  value: MutableState<String>,
  modifier: Modifier,
-  placeholder: String? = null,
-  contentPadding: PaddingValues = PaddingValues(horizontal = DEFAULT_PADDING),
-  isValid: (String) -> Boolean = { true },
-  focusRequester: FocusRequester? = null
+  text: MutableState<String>,
+  border: Boolean = true,
+  fontSize: TextUnit = 14.sp,
+  background: Color = MaterialTheme.colors.background,
+  onChange: ((String) -> Unit)? = null
 ) {
-  var valid by rememberSaveable { mutableStateOf(true) }
-  var focused by rememberSaveable { mutableStateOf(false) }
-  val strokeColor by remember {
-    derivedStateOf {
-      if (valid) {
-        if (focused) {
-          CurrentColors.value.colors.secondary.copy(alpha = 0.6f)
-        } else {
-          CurrentColors.value.colors.secondary.copy(alpha = 0.3f)
+  BasicTextField(
+    value = text.value,
+    onValueChange = { text.value = it; onChange?.invoke(it) },
+    textStyle = TextStyle(
+      fontFamily = FontFamily.Monospace, fontSize = fontSize,
+      color = MaterialTheme.colors.onBackground
+    ),
+    keyboardOptions = KeyboardOptions.Default.copy(
+      capitalization = KeyboardCapitalization.None,
+      autoCorrect = false
+    ),
+    modifier = modifier,
+    cursorBrush = SolidColor(HighOrLowlight),
+    decorationBox = { innerTextField ->
+      Surface(
+        shape = if (border) RoundedCornerShape(10.dp) else RectangleShape,
+        border = if (border) BorderStroke(1.dp, MaterialTheme.colors.secondary) else null
+      ) {
+        Row(
+          Modifier.background(background),
+          verticalAlignment = Alignment.Top
+        ) {
+          Box(
+            Modifier
+              .weight(1f)
+              .padding(vertical = 5.dp, horizontal = if (border) 7.dp else DEFAULT_PADDING)
+          ) {
+            innerTextField()
+          }
        }
-      } else Color.Red
+      }
    }
-  }
-  Box(
-    Modifier
-      .fillMaxWidth()
-      .padding(contentPadding)
-      .heightIn(min = 52.dp),
-//      .border(border = BorderStroke(1.dp, strokeColor), shape = RoundedCornerShape(26.dp)),
-    contentAlignment = Alignment.Center,
-  ) {
-    val modifier = modifier
-      .fillMaxWidth()
-      .navigationBarsWithImePadding()
-      .onFocusChanged { focused = it.isFocused }
-
-    BasicTextField(
-      value = value.value,
-      onValueChange = { value.value = it },
-      modifier = if (focusRequester == null) modifier else modifier.focusRequester(focusRequester),
-      textStyle = MaterialTheme.typography.body1.copy(color = MaterialTheme.colors.onBackground, lineHeight = 22.sp),
-      keyboardOptions = KeyboardOptions(
-        capitalization = KeyboardCapitalization.None,
-        autoCorrect = false
-      ),
-      singleLine = false,
-      maxLines = 5,
-      cursorBrush = SolidColor(MaterialTheme.colors.secondary),
-      decorationBox = @Composable { innerTextField ->
-        TextFieldDefaults.TextFieldDecorationBox(
-          value = value.value,
-          innerTextField = innerTextField,
-          placeholder = if (placeholder != null) {{ Text(placeholder, style = MaterialTheme.typography.body1.copy(color = MaterialTheme.colors.secondary, lineHeight = 22.sp)) }} else null,
-          contentPadding = PaddingValues(),
-          label = null,
-          visualTransformation = VisualTransformation.None,
-          leadingIcon = null,
-          trailingIcon = null,
-          singleLine = false,
-          enabled = true,
-          isError = false,
-          interactionSource = remember { MutableInteractionSource() },
-        )
-      }
-    )
-  }
-  LaunchedEffect(Unit) {
-    snapshotFlow { value.value }
-      .distinctUntilChanged()
-      .collect {
-        valid = isValid(it)
-      }
-  }
-}
-
-@Serializable
-data class ParsedFormattedText(
-  val formattedText: List<FormattedText>? = null
-)
-
-fun parseToMarkdown(text: String): List<FormattedText>? {
-  val formatted = chatParseMarkdown(text)
-  return try {
-    json.decodeFromString(ParsedFormattedText.serializer(), formatted).formattedText
-  } catch (e: Exception) {
-    Log.e(TAG, "Failed to parse into markdown: " + e.stackTraceToString())
-    null
-  }
+  )
 }
--- a/apps/android/app/src/main/java/chat/simplex/app/views/helpers/Util.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/helpers/Util.kt
@@ -23,11 +23,9 @@ import android.view.View
 import android.view.ViewTreeObserver
 import android.view.inputmethod.InputMethodManager
 import androidx.annotation.StringRes
-import androidx.compose.material.MaterialTheme
 import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.Saver
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.platform.*
 import androidx.compose.ui.text.*
 import androidx.compose.ui.text.font.*
@@ -35,13 +33,10 @@ import androidx.compose.ui.text.style.BaselineShift
 import androidx.compose.ui.text.style.TextDecoration
 import androidx.compose.ui.unit.*
 import androidx.core.content.FileProvider
-import androidx.core.graphics.ColorUtils
 import androidx.core.text.HtmlCompat
 import chat.simplex.app.*
 import chat.simplex.app.R
 import chat.simplex.app.model.*
-import chat.simplex.app.ui.theme.ThemeOverrides
-import com.charleskorn.kaml.decodeFromStream
 import kotlinx.coroutines.*
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.encodeToString
@@ -236,16 +231,16 @@ private fun spannableStringToAnnotatedString(
 }

 // maximum image file size to be auto-accepted
-const val MAX_IMAGE_SIZE: Long = 261_120 // 255KB
+const val MAX_IMAGE_SIZE: Long = 236700
 const val MAX_IMAGE_SIZE_AUTO_RCV: Long = MAX_IMAGE_SIZE * 2
-const val MAX_VOICE_SIZE_AUTO_RCV: Long = MAX_IMAGE_SIZE * 2
-const val MAX_VIDEO_SIZE_AUTO_RCV: Long = 1_047_552 // 1023KB
+const val MAX_VOICE_SIZE_AUTO_RCV: Long = MAX_IMAGE_SIZE

-const val MAX_VOICE_MILLIS_FOR_SENDING: Int = 300_000
+const val MAX_VOICE_SIZE_FOR_SENDING: Long = 94680 // 6 chunks * 15780 bytes per chunk
+const val MAX_VOICE_MILLIS_FOR_SENDING: Int = 43_000

 const val MAX_FILE_SIZE_SMP: Long = 8000000

-const val MAX_FILE_SIZE_XFTP: Long = 1_073_741_824 // 1GB
+const val MAX_FILE_SIZE_XFTP: Long = 1_073_741_824

 fun getFilesDirectory(context: Context): String {
  return context.filesDir.toString()
@@ -393,22 +388,6 @@ fun getDrawableFromUri(uri: Uri, withAlertOnException: Boolean = true): Drawable
  }
 }

-fun getThemeFromUri(uri: Uri, withAlertOnException: Boolean = true): ThemeOverrides? {
-  SimplexApp.context.contentResolver.openInputStream(uri).use {
-    runCatching {
-      return yaml.decodeFromStream<ThemeOverrides>(it!!)
-    }.onFailure {
-      if (withAlertOnException) {
-        AlertManager.shared.showAlertMsg(
-          title = generalGetString(R.string.import_theme_error),
-          text = generalGetString(R.string.import_theme_error_desc),
-        )
-      }
-    }
-  }
-  return null
-}
-
 fun saveImage(context: Context, uri: Uri): String? {
  val bitmap = getBitmapFromUri(uri) ?: return null
  return saveImage(context, bitmap)
@@ -578,7 +557,7 @@ fun getBitmapFromVideo(uri: Uri, timestamp: Long? = null, random: Boolean = true
  val image = when {
    timestamp != null -> mmr.getFrameAtTime(timestamp * 1000, MediaMetadataRetriever.OPTION_CLOSEST)
    random -> mmr.frameAtTime
-    else -> mmr.getFrameAtTime(0)
+    else -> mmr.getFrameAtIndex(0)
  }
  mmr.release()
  return VideoPlayer.PreviewAndDuration(image, durationMs, timestamp ?: 0)
@@ -587,12 +566,6 @@ fun getBitmapFromVideo(uri: Uri, timestamp: Long? = null, random: Boolean = true
 fun Color.darker(factor: Float = 0.1f): Color =
  Color(max(red * (1 - factor), 0f), max(green * (1 - factor), 0f), max(blue * (1 - factor), 0f), alpha)

-fun Color.lighter(factor: Float = 0.1f): Color =
-  Color(min(red * (1 + factor), 1f), min(green * (1 + factor), 1f), min(blue * (1 + factor), 1f), alpha)
-
-fun Color.mixWith(color: Color, alpha: Float): Color =
-  Color(ColorUtils.blendARGB(color.toArgb(), toArgb(), alpha))
-
 fun ByteArray.toBase64String() = Base64.encodeToString(this, Base64.DEFAULT)

 fun String.toByteArrayFromBase64() = Base64.decode(this, Base64.DEFAULT)
@@ -667,20 +640,4 @@ fun DisposableEffectOnGone(always: () -> Unit = {}, whenDispose: () -> Unit = {}
      }
    }
  }
-}
-
-@Composable
-fun DisposableEffectOnRotate(always: () -> Unit = {}, whenDispose: () -> Unit = {}, whenRotate: () -> Unit) {
-  val context = LocalContext.current
-  DisposableEffect(Unit) {
-    always()
-    val activity = context as? Activity ?: return@DisposableEffect onDispose {}
-    val orientation = activity.resources.configuration.orientation
-    onDispose {
-      whenDispose()
-      if (orientation != activity.resources.configuration.orientation) {
-        whenRotate()
-      }
-    }
-  }
-}
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Evgeny Poberezkin	c7f5443920	fix	2023-04-07 11:01:33 +01:00
Evgeny Poberezkin	ccff79aa59	core: allow messages with contact requests	2023-04-07 10:15:19 +01:00